diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig index 2708258a9..7ca1204e0 100644 --- a/buildroot-external/configs/intel_nuc_defconfig +++ b/buildroot-external/configs/intel_nuc_defconfig @@ -58,7 +58,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 7e0fcc76b..b87a8cbdb 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -51,7 +51,7 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index a8976e9e2..e0221ee08 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -51,7 +51,7 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 547d152b9..299c49b0a 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -54,7 +54,7 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 06a038cab..dbe4fe1d8 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -47,7 +47,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index fbb5877b3..0da845811 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -54,7 +54,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index 4676c5040..9c71d9883 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -53,7 +53,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 0015eba68..e16f72f76 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -54,7 +54,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index 0d702e4d0..18188b835 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -54,7 +54,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index 9a739d578..43cf610c3 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -38,7 +38,7 @@ BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_PACKAGE_SQUASHFS=y BR2_PACKAGE_RPI_FIRMWARE=y -BR2_PACKAGE_RPI_FIRMWARE_PI4=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y BR2_PACKAGE_RPI_WIFI_FIRMWARE=y BR2_PACKAGE_GPTFDISK=y BR2_PACKAGE_GPTFDISK_SGDISK=y @@ -55,7 +55,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index e7ee5f7f6..4f7ebcdd1 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -38,7 +38,7 @@ BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_PACKAGE_SQUASHFS=y BR2_PACKAGE_RPI_FIRMWARE=y -BR2_PACKAGE_RPI_FIRMWARE_PI4=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y BR2_PACKAGE_RPI_WIFI_FIRMWARE=y BR2_PACKAGE_GPTFDISK=y BR2_PACKAGE_GPTFDISK_SGDISK=y @@ -55,7 +55,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index 4a0114c88..cb253029d 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -53,7 +53,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index d66ed69b5..0abf834d2 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -54,7 +54,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_WIREGUARD=y +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_DROPBEAR=y # BR2_PACKAGE_DROPBEAR_CLIENT is not set # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/buildroot-external/scripts/post-build.sh b/buildroot-external/scripts/post-build.sh index dee8699da..6b9a0c0b1 100755 --- a/buildroot-external/scripts/post-build.sh +++ b/buildroot-external/scripts/post-build.sh @@ -15,6 +15,7 @@ BOARD_DIR=${2} # HassOS tasks fix_rootfs +install_tini_docker install_hassos_cli # Write os-release diff --git a/buildroot-external/scripts/rootfs-layer.sh b/buildroot-external/scripts/rootfs-layer.sh index 79ab0c332..1da204b83 100755 --- a/buildroot-external/scripts/rootfs-layer.sh +++ b/buildroot-external/scripts/rootfs-layer.sh @@ -36,3 +36,8 @@ function install_hassos_cli() { echo "/usr/sbin/hassos-cli" >> "${TARGET_DIR}/etc/shells" fi } + + +function install_tini_docker() { + ln -fs /usr/bin/tini "${TARGET_DIR}/usr/bin/docker-init" +} diff --git a/buildroot-patches/0002-Docker-tini-static.patch b/buildroot-patches/0002-Docker-tini-static.patch deleted file mode 100644 index 32815ddfb..000000000 --- a/buildroot-patches/0002-Docker-tini-static.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 81bf3979ac5aec0dd8d4bccc690fe1bcef5de139 Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Mon, 13 Jan 2020 12:30:48 +0000 -Subject: [PATCH 1/1] Docker: tini & static - -Signed-off-by: Pascal Vizeli ---- - package/docker-engine/docker-engine.mk | 6 ++++++ - package/tini/tini.mk | 1 + - 2 files changed, 7 insertions(+) - -diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk -index 14673f3183..b0eaae9580 100644 ---- a/package/docker-engine/docker-engine.mk -+++ b/package/docker-engine/docker-engine.mk -@@ -82,4 +82,10 @@ define DOCKER_ENGINE_USERS - - - docker -1 * - - - Docker Application Container Framework - endef - -+define DOCKER_ENGINE_INSTALL_SYMLINKS -+ ln -fs tini $(TARGET_DIR)/usr/bin/docker-init -+endef -+ -+DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INSTALL_SYMLINKS -+ - $(eval $(golang-package)) -diff --git a/package/tini/tini.mk b/package/tini/tini.mk -index 132bfc99dd..b6d7d80b22 100644 ---- a/package/tini/tini.mk -+++ b/package/tini/tini.mk -@@ -12,6 +12,7 @@ TINI_LICENSE_FILES = LICENSE - TINI_CFLAGS = $(TARGET_CFLAGS) \ - -DTINI_VERSION=\"$(TINI_VERSION)\" \ - -DTINI_GIT=\"\" -+TINI_CFLAGS += -static - - ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y) - TINI_CFLAGS += -DTINI_MINIMAL --- -2.17.1 - diff --git a/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch b/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch new file mode 100644 index 000000000..6cf6b5cc6 --- /dev/null +++ b/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch @@ -0,0 +1,36 @@ +From 73246b185df88a6e6d810e9f91fa54bea2bfcb05 Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Thu, 16 Apr 2020 11:51:46 +0000 +Subject: [PATCH 1/1] rpi-firmware: Bump firmware + +Signed-off-by: Pascal Vizeli +--- + package/rpi-firmware/rpi-firmware.hash | 2 +- + package/rpi-firmware/rpi-firmware.mk | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash +index 59ab1da0c6..e3ba1bf99c 100644 +--- a/package/rpi-firmware/rpi-firmware.hash ++++ b/package/rpi-firmware/rpi-firmware.hash +@@ -1,3 +1,3 @@ + # Locally computed +-sha256 31a84340be08be319570a9d1439f25c0e3513fed73065a56aa5dd61dd605d5d9 rpi-firmware-01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5.tar.gz ++sha256 06e6cd4df5f6543a962a434668883e50f33e22a1f4964ece63432c947291cf50 rpi-firmware-dd8cbec5a6d27090e5eb080e13d83c35fdd759f7.tar.gz + sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom +diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk +index 6fee60b08c..2177ca9859 100644 +--- a/package/rpi-firmware/rpi-firmware.mk ++++ b/package/rpi-firmware/rpi-firmware.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-RPI_FIRMWARE_VERSION = 01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5 ++RPI_FIRMWARE_VERSION = dd8cbec5a6d27090e5eb080e13d83c35fdd759f7 + RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) + RPI_FIRMWARE_LICENSE = BSD-3-Clause + RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom +-- +2.17.1 + diff --git a/buildroot-patches/0003-network-manager-wpa_supplicant.patch b/buildroot-patches/0003-network-manager-wpa_supplicant.patch new file mode 100644 index 000000000..ffdb2c868 --- /dev/null +++ b/buildroot-patches/0003-network-manager-wpa_supplicant.patch @@ -0,0 +1,43 @@ +From 297ba4e3286e590bd1c2d2e6ec778a84748b5807 Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Thu, 16 Apr 2020 14:32:45 +0000 +Subject: [PATCH 1/1] network-manager: wpa_supplicant + +Signed-off-by: Pascal Vizeli +--- + package/network-manager/Config.in | 5 +++-- + package/network-manager/network-manager.mk | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in +index e6a3f5f04f..accea923af 100644 +--- a/package/network-manager/Config.in ++++ b/package/network-manager/Config.in +@@ -15,8 +15,9 @@ config BR2_PACKAGE_NETWORK_MANAGER + select BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID +- select BR2_PACKAGE_WIRELESS_TOOLS +- select BR2_PACKAGE_WIRELESS_TOOLS_LIB ++ select BR2_PACKAGE_WPA_SUPPLICANT ++ select BR2_PACKAGE_WPA_SUPPLICANT_DBUS ++ select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION + select BR2_PACKAGE_READLINE + select BR2_PACKAGE_LIBNDP + help +diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk +index 56b768cdef..727cfb98a4 100644 +--- a/package/network-manager/network-manager.mk ++++ b/package/network-manager/network-manager.mk +@@ -10,7 +10,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz + NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) + NETWORK_MANAGER_INSTALL_STAGING = YES + NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ +- libgcrypt wireless_tools util-linux host-intltool readline libndp ++ libgcrypt wpa_supplicant util-linux host-intltool readline libndp + # Even though the COPYING file only contains the GPL-2.0 text, many + # parts of network-manager are under LGPL-2.0. See the "Legal" section + # of the CONTRIBUTING file for details. +-- +2.17.1 + diff --git a/buildroot-patches/0003-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch b/buildroot-patches/0003-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch deleted file mode 100644 index a46ca16f1..000000000 --- a/buildroot-patches/0003-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 3c3fc8727fcdfec1521f5dde0b70c0a1dcc722cc Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Mon, 15 Jul 2019 17:11:29 +0000 -Subject: [PATCH 1/1] rpi-firmware: Bump firmware for kernel 4.19 / RPi4 - ---- - package/rpi-firmware/Config.in | 6 ++++++ - package/rpi-firmware/rpi-firmware.hash | 2 +- - package/rpi-firmware/rpi-firmware.mk | 6 +++--- - 3 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in -index 0ebbe7a4cd..143ef4c712 100644 ---- a/package/rpi-firmware/Config.in -+++ b/package/rpi-firmware/Config.in -@@ -40,11 +40,17 @@ config BR2_PACKAGE_RPI_FIRMWARE_CD - The cut-down firmware, for emergency situations, with only - features required to boot a Linux kernel. - -+config BR2_PACKAGE_RPI_FIRMWARE_PI4 -+ bool "Pi 4" -+ help -+ The Raspberry Pi 4 boot files -+ - endchoice - - config BR2_PACKAGE_RPI_FIRMWARE_BOOT - string - default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT -+ default "4" if BR2_PACKAGE_RPI_FIRMWARE_PI4 - default "_x" if BR2_PACKAGE_RPI_FIRMWARE_X - default "_cd" if BR2_PACKAGE_RPI_FIRMWARE_CD - -diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash -index 9988dda717..3eae7e270b 100644 ---- a/package/rpi-firmware/rpi-firmware.hash -+++ b/package/rpi-firmware/rpi-firmware.hash -@@ -1,2 +1,2 @@ - # Locally computed --sha256 f1d631920ed4ae15f368ba7b8b3caa4ed604f5223372cc6debbd39a101eb8d74 rpi-firmware-81cca1a9380c828299e884dba5efd0d4acb39e8d.tar.gz -+sha256 06e6cd4df5f6543a962a434668883e50f33e22a1f4964ece63432c947291cf50 rpi-firmware-dd8cbec5a6d27090e5eb080e13d83c35fdd759f7.tar.gz -diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk -index 630bc670ca..fd2970333e 100644 ---- a/package/rpi-firmware/rpi-firmware.mk -+++ b/package/rpi-firmware/rpi-firmware.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --RPI_FIRMWARE_VERSION = 81cca1a9380c828299e884dba5efd0d4acb39e8d -+RPI_FIRMWARE_VERSION = dd8cbec5a6d27090e5eb080e13d83c35fdd759f7 - RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) - RPI_FIRMWARE_LICENSE = BSD-3-Clause - RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom -@@ -43,8 +43,8 @@ endif # INSTALL_VCDBG - - define RPI_FIRMWARE_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin -- $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf -- $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat -+ $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf -+ $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat - $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt - $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt - $(RPI_FIRMWARE_INSTALL_DTB) --- -2.17.1 - diff --git a/buildroot-patches/0004-Fix-dhcp-client.patch b/buildroot-patches/0004-Fix-dhcp-client.patch new file mode 100644 index 000000000..60a460764 --- /dev/null +++ b/buildroot-patches/0004-Fix-dhcp-client.patch @@ -0,0 +1,27 @@ +From 0e0679ca2ab40de3b6b629901909385c310010b1 Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Thu, 16 Apr 2020 12:01:44 +0000 +Subject: [PATCH 1/1] Fix dhcp client + +Signed-off-by: Pascal Vizeli +--- + package/dhcp/dhcp.mk | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk +index 335c631119..518e8a4681 100644 +--- a/package/dhcp/dhcp.mk ++++ b/package/dhcp/dhcp.mk +@@ -76,8 +76,7 @@ endif + + ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) + define DHCP_INSTALL_CLIENT +- mkdir -p $(TARGET_DIR)/var/lib +- (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) ++ mkdir -p $(TARGET_DIR)/var/lib/dhcp + $(MAKE) -C $(@D)/client DESTDIR=$(TARGET_DIR) sbindir=/sbin \ + install-sbinPROGRAMS + $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ +-- +2.17.1 + diff --git a/buildroot-patches/0004-network-manager-Bump-version-1.16.2.patch b/buildroot-patches/0004-network-manager-Bump-version-1.16.2.patch deleted file mode 100644 index b596e0d2e..000000000 --- a/buildroot-patches/0004-network-manager-Bump-version-1.16.2.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 1f92066037ff71aa895fe552d4821247010da72e Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Wed, 26 Jun 2019 12:46:09 +0000 -Subject: [PATCH 1/1] network-manager: Bump version 1.16.2 - -Signed-off-by: Pascal Vizeli ---- - ...we-have-enough-space-for-the-DHCP6-o.patch | 38 ------------------- - package/network-manager/Config.in | 5 ++- - package/network-manager/network-manager.hash | 3 +- - package/network-manager/network-manager.mk | 10 +++-- - 4 files changed, 11 insertions(+), 45 deletions(-) - delete mode 100644 package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch - -diff --git a/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch b/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch -deleted file mode 100644 -index c6066abe28..0000000000 ---- a/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch -+++ /dev/null -@@ -1,38 +0,0 @@ --From 01ca2053bbea09f35b958c8cc7631e15469acb79 Mon Sep 17 00:00:00 2001 --From: Lennart Poettering --Date: Fri, 19 Oct 2018 12:12:33 +0200 --Subject: dhcp6: make sure we have enough space for the DHCP6 option header -- --Fixes a vulnerability originally discovered by Felix Wilhelm from --Google. -- --CVE-2018-15688 --LP: #1795921 --https://bugzilla.redhat.com/show_bug.cgi?id=1639067 -- --(cherry picked from commit 4dac5eaba4e419b29c97da38a8b1f82336c2c892) -- --Patch downloaded from upstream commit: --https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=01ca2053bbea09f35b958c8cc7631e15469acb79 -- --Signed-off-by: Bernd Kuhls ----- -- src/systemd/src/libsystemd-network/dhcp6-option.c | 2 +- -- 1 file changed, 1 insertion(+), 1 deletion(-) -- --diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c --index d178fe2..9027c14 100644 ----- a/src/systemd/src/libsystemd-network/dhcp6-option.c --+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c --@@ -108,7 +108,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) { -- return -EINVAL; -- } -- --- if (*buflen < len) --+ if (*buflen < offsetof(DHCP6Option, data) + len) -- return -ENOBUFS; -- -- ia_hdr = *buf; ---- --cgit v1.1 -- -diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in -index ca508185f0..1db6f32d31 100644 ---- a/package/network-manager/Config.in -+++ b/package/network-manager/Config.in -@@ -16,8 +16,9 @@ config BR2_PACKAGE_NETWORK_MANAGER - select BR2_PACKAGE_LIBGUDEV - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID -- select BR2_PACKAGE_WIRELESS_TOOLS -- select BR2_PACKAGE_WIRELESS_TOOLS_LIB -+ select BR2_PACKAGE_WPA_SUPPLICANT -+ select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW -+ select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION - select BR2_PACKAGE_READLINE - select BR2_PACKAGE_LIBNDP - help -diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash -index 3439439175..f1bc5d1b09 100644 ---- a/package/network-manager/network-manager.hash -+++ b/package/network-manager/network-manager.hash -@@ -1,5 +1,4 @@ - # From https://download.gnome.org/sources/NetworkManager/1.10/NetworkManager-1.10.8.sha256sum --sha256 eb4ac8ce75fed5ec804f409caec7b54342d4e01512baf7d7fc119fd40ac8a938 NetworkManager-1.10.8.tar.xz -+sha256 8fe9cd2c45bd661c58a91b03d8a922d6d2ab6b25bc185b2d3f050c80f427589f NetworkManager-1.16.2.tar.xz - # Locally computed - sha256 49d9659a4f9a09747c320d51d3cf9dfde210de67b70862acf849890f6477b00d COPYING --sha256 3a2968e3abb4fea464cd8dc1146d71996f9544af91a5f687bc4f3a2932df49b4 libnm-util/COPYING -diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk -index 2b9f68a030..2951f1230e 100644 ---- a/package/network-manager/network-manager.mk -+++ b/package/network-manager/network-manager.mk -@@ -4,13 +4,13 @@ - # - ################################################################################ - --NETWORK_MANAGER_VERSION_MAJOR = 1.10 --NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).8 -+NETWORK_MANAGER_VERSION_MAJOR = 1.16 -+NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2 - NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz - NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) - NETWORK_MANAGER_INSTALL_STAGING = YES - NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \ -- libgcrypt wireless_tools util-linux host-intltool readline libndp libgudev -+ libgcrypt wpa_supplicant util-linux host-intltool readline libndp libgudev - NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.0+ (libnm-util) - NETWORK_MANAGER_LICENSE_FILES = COPYING libnm-util/COPYING - -@@ -93,6 +93,7 @@ endef - - define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants -+ mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants - - ln -sf /usr/lib/systemd/system/NetworkManager.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service -@@ -100,6 +101,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD - ln -sf /usr/lib/systemd/system/NetworkManager.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service - -+ ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \ -+ $(TARGET_DIR)/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service -+ - ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service - endef --- -2.17.1 - diff --git a/buildroot-patches/0005-Fix-dhcp-client.patch b/buildroot-patches/0005-Fix-dhcp-client.patch deleted file mode 100644 index b66173e23..000000000 --- a/buildroot-patches/0005-Fix-dhcp-client.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 07169ea27b84230299685f84031f07f8af74dbb4 Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Wed, 4 Jul 2018 20:31:14 +0000 -Subject: [PATCH 1/1] Fix dhcp client - -Signed-off-by: Pascal Vizeli ---- - package/dhcp/dhcp.mk | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk -index a1285184d3..7ea7589a28 100644 ---- a/package/dhcp/dhcp.mk -+++ b/package/dhcp/dhcp.mk -@@ -75,8 +75,7 @@ endif - - ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) - define DHCP_INSTALL_CLIENT -- mkdir -p $(TARGET_DIR)/var/lib -- (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) -+ mkdir -p $(TARGET_DIR)/var/lib/dhcp - $(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \ - $(TARGET_DIR)/sbin/dhclient - $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ --- -2.17.1 - diff --git a/buildroot-patches/0005-rpi-use-latest-wifi-driver.patch b/buildroot-patches/0005-rpi-use-latest-wifi-driver.patch new file mode 100644 index 000000000..b48de8b2f --- /dev/null +++ b/buildroot-patches/0005-rpi-use-latest-wifi-driver.patch @@ -0,0 +1,45 @@ +From d2abd5e12736237ae381ab09cab12a222b22d8f0 Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Thu, 16 Apr 2020 12:05:21 +0000 +Subject: [PATCH 1/1] rpi: use latest wifi driver + +Signed-off-by: Pascal Vizeli +--- + package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +- + package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +index 5de9e0f13f..90aa03218f 100644 +--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash ++++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +@@ -1,3 +1,3 @@ + # Locally calculated +-sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-wifi-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz ++sha256 26e6e4aace9c9d1e9b9b1447f57ebd743dc15f3a337deac9e77d964885fcb3b3 rpi-wifi-firmware-00daf85ffa373ecce7836df7543c6ebe4cf43639.tar.gz + sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +index 9dd1854b9a..0c697bddbe 100644 +--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk ++++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +@@ -4,14 +4,14 @@ + # + ################################################################################ + +-RPI_WIFI_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327 +-RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) ++RPI_WIFI_FIRMWARE_VERSION = 00daf85ffa373ecce7836df7543c6ebe4cf43639 ++RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION)) + RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY + RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx + + define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm +- $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm ++ $(INSTALL) -m 0644 $(@D)/brcm/brcmfmac434* $(TARGET_DIR)/lib/firmware/brcm + endef + + $(eval $(generic-package)) +-- +2.17.1 + diff --git a/buildroot-patches/0007-odroid-ux4-firmware.patch b/buildroot-patches/0006-odroid-ux4-firmware.patch similarity index 100% rename from buildroot-patches/0007-odroid-ux4-firmware.patch rename to buildroot-patches/0006-odroid-ux4-firmware.patch diff --git a/buildroot-patches/0006-rpi-use-latest-wifi-driver.patch b/buildroot-patches/0006-rpi-use-latest-wifi-driver.patch deleted file mode 100644 index 0e57429b8..000000000 --- a/buildroot-patches/0006-rpi-use-latest-wifi-driver.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 76e3a48b94cc0f44d05af3eedb5199ff230848fb Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Sun, 25 Nov 2018 16:58:13 +0000 -Subject: [PATCH 1/1] rpi: use latest wifi driver - -Signed-off-by: Pascal Vizeli ---- - package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +- - package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash -index c61a47e..84e02f3 100644 ---- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash -+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash -@@ -1,3 +1,3 @@ - # Locally calculated --sha256 155ebd5f08b819e0ce4e1950fcc972b2086cee3c16d36aba348beba1910c1fd2 rpi-wifi-firmware-8c1e2bff1da9850f68efcfff3da5d939ec27a2ee.tar.gz -+sha256 26e6e4aace9c9d1e9b9b1447f57ebd743dc15f3a337deac9e77d964885fcb3b3 rpi-wifi-firmware-00daf85ffa373ecce7836df7543c6ebe4cf43639.tar.gz - sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx -diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk -index 2eb8cee..da915bd 100644 ---- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk -+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk -@@ -4,14 +4,14 @@ - # - ################################################################################ - --RPI_WIFI_FIRMWARE_VERSION = 8c1e2bff1da9850f68efcfff3da5d939ec27a2ee --RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) -+RPI_WIFI_FIRMWARE_VERSION = 00daf85ffa373ecce7836df7543c6ebe4cf43639 -+RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION)) - RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY - RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx - - define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm -- $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm -+ $(INSTALL) -m 0644 $(@D)/brcm/brcmfmac434* $(TARGET_DIR)/lib/firmware/brcm - endef - - $(eval $(generic-package)) --- -2.17.1 - diff --git a/buildroot-patches/0008-Add-kernel-5.4.patch b/buildroot-patches/0008-Add-kernel-5.4.patch deleted file mode 100644 index 9d80de044..000000000 --- a/buildroot-patches/0008-Add-kernel-5.4.patch +++ /dev/null @@ -1,65 +0,0 @@ -From beadf75fe1bb7257d8d3be95c6d415a39f48f89e Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Mon, 30 Dec 2019 11:21:02 +0000 -Subject: [PATCH 1/1] Add kernel 5.4 - -Signed-off-by: Pascal Vizeli ---- - package/linux-headers/Config.in.host | 4 ++++ - toolchain/Config.in | 5 +++++ - .../toolchain-external-custom/Config.in.options | 4 ++++ - 3 files changed, 13 insertions(+) - -diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host -index ff5959ac47..074aee0cb4 100644 ---- a/package/linux-headers/Config.in.host -+++ b/package/linux-headers/Config.in.host -@@ -116,6 +116,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_5_4 -+ bool "5.4.x" -+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 -+ - config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20 - bool "4.20.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 -diff --git a/toolchain/Config.in b/toolchain/Config.in -index 87d7bc30bb..9d566cbf72 100644 ---- a/toolchain/Config.in -+++ b/toolchain/Config.in -@@ -398,10 +398,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 - -+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 -+ bool -+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 -+ - # 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 "5.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 - default "4.20" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - default "4.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 - default "4.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 -diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options -index 08a79ee4d9..81c48a11b4 100644 ---- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options -+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options -@@ -123,6 +123,10 @@ choice - m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF - p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF - -+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4 -+ bool "5.4.x" -+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 -+ - config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_20 - bool "4.20.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 --- -2.17.1 - diff --git a/buildroot-patches/0009-Bump-bluez-5.52.patch b/buildroot-patches/0009-Bump-bluez-5.52.patch deleted file mode 100644 index 81ef9ef31..000000000 --- a/buildroot-patches/0009-Bump-bluez-5.52.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 4e3d6b2b4d600babb79492fbcd04d7bbd16a2a58 Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Mon, 30 Dec 2019 13:18:34 +0000 -Subject: [PATCH 1/1] Bump bluez 5.52 - -Signed-off-by: Pascal Vizeli ---- - package/bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- - package/bluez5_utils/bluez5_utils.hash | 2 +- - package/bluez5_utils/bluez5_utils.mk | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk -index 020e8b4d4e..c61f93a23c 100644 ---- a/package/bluez5_utils-headers/bluez5_utils-headers.mk -+++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk -@@ -5,7 +5,7 @@ - ################################################################################ - - # Keep the version and patches in sync with bluez5_utils --BLUEZ5_UTILS_HEADERS_VERSION = 5.50 -+BLUEZ5_UTILS_HEADERS_VERSION = 5.52 - BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz - BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth - BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils -diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash -index b965708559..00112bc0b6 100644 ---- a/package/bluez5_utils/bluez5_utils.hash -+++ b/package/bluez5_utils/bluez5_utils.hash -@@ -1,4 +1,4 @@ - # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: --sha256 5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911 bluez-5.50.tar.xz -+sha256 f7144ce2039202cfac18ccb52426efea11c98e4f6e1bb8041bcb994b8378560a bluez-5.52.tar.xz - sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING - sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB -diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk -index 15c9b670a7..7c5202b717 100644 ---- a/package/bluez5_utils/bluez5_utils.mk -+++ b/package/bluez5_utils/bluez5_utils.mk -@@ -5,7 +5,7 @@ - ################################################################################ - - # Keep the version and patches in sync with bluez5_utils-headers --BLUEZ5_UTILS_VERSION = 5.50 -+BLUEZ5_UTILS_VERSION = 5.52 - BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz - BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth - BLUEZ5_UTILS_INSTALL_STAGING = YES --- -2.17.1 - diff --git a/buildroot-patches/0010-Bump-WireGuard-20191219.patch b/buildroot-patches/0010-Bump-WireGuard-20191219.patch deleted file mode 100644 index 4faf30c60..000000000 --- a/buildroot-patches/0010-Bump-WireGuard-20191219.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7da4f3e43f393ce09156cdb902bd879e2b6d7431 Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Mon, 30 Dec 2019 13:44:59 +0000 -Subject: [PATCH 1/1] Bump WireGuard 20191219 - -Signed-off-by: Pascal Vizeli ---- - package/wireguard/wireguard.hash | 2 +- - package/wireguard/wireguard.mk | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/package/wireguard/wireguard.hash b/package/wireguard/wireguard.hash -index 70558de720..8097aeb95b 100644 ---- a/package/wireguard/wireguard.hash -+++ b/package/wireguard/wireguard.hash -@@ -1,4 +1,4 @@ - # https://lists.zx2c4.com/pipermail/wireguard/2019-January/003805.html --sha256 edd13c7631af169e3838621b1a1bff3ef73cf7bc778eec2bd55f7c1089ffdf9b WireGuard-0.0.20190123.tar.xz -+sha256 5aba6f0c38e97faa0b155623ba594bb0e4bd5e29deacd8d5ed8bda8d8283b0e7 WireGuard-0.0.20191219.tar.xz - # Locally calculated - sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -diff --git a/package/wireguard/wireguard.mk b/package/wireguard/wireguard.mk -index 8d6cdb8e56..500c7dbd21 100644 ---- a/package/wireguard/wireguard.mk -+++ b/package/wireguard/wireguard.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --WIREGUARD_VERSION = 0.0.20190123 -+WIREGUARD_VERSION = 0.0.20191219 - WIREGUARD_SITE = https://git.zx2c4.com/WireGuard/snapshot - WIREGUARD_SOURCE = WireGuard-$(WIREGUARD_VERSION).tar.xz - WIREGUARD_LICENSE = GPL-2.0 --- -2.17.1 - diff --git a/buildroot/.br2-external.in.jpeg b/buildroot/.br2-external.in.jpeg new file mode 100644 index 000000000..19d58283d --- /dev/null +++ b/buildroot/.br2-external.in.jpeg @@ -0,0 +1,5 @@ +# +# Automatically generated file; DO NOT EDIT. +# + +# No br2-external tree defined. diff --git a/buildroot/.br2-external.in.menus b/buildroot/.br2-external.in.menus new file mode 100644 index 000000000..19d58283d --- /dev/null +++ b/buildroot/.br2-external.in.menus @@ -0,0 +1,5 @@ +# +# Automatically generated file; DO NOT EDIT. +# + +# No br2-external tree defined. diff --git a/buildroot/.br2-external.in.openssl b/buildroot/.br2-external.in.openssl new file mode 100644 index 000000000..19d58283d --- /dev/null +++ b/buildroot/.br2-external.in.openssl @@ -0,0 +1,5 @@ +# +# Automatically generated file; DO NOT EDIT. +# + +# No br2-external tree defined. diff --git a/buildroot/.br2-external.in.paths b/buildroot/.br2-external.in.paths new file mode 100644 index 000000000..19d58283d --- /dev/null +++ b/buildroot/.br2-external.in.paths @@ -0,0 +1,5 @@ +# +# Automatically generated file; DO NOT EDIT. +# + +# No br2-external tree defined. diff --git a/buildroot/.br2-external.in.toolchains b/buildroot/.br2-external.in.toolchains new file mode 100644 index 000000000..19d58283d --- /dev/null +++ b/buildroot/.br2-external.in.toolchains @@ -0,0 +1,5 @@ +# +# Automatically generated file; DO NOT EDIT. +# + +# No br2-external tree defined. diff --git a/buildroot/.br-external.mk b/buildroot/.br2-external.mk similarity index 100% rename from buildroot/.br-external.mk rename to buildroot/.br2-external.mk diff --git a/buildroot/.flake8 b/buildroot/.flake8 index 7dd7b541c..ee3d5035a 100644 --- a/buildroot/.flake8 +++ b/buildroot/.flake8 @@ -2,4 +2,4 @@ exclude= # copied from the kernel sources utils/diffconfig -max-line-length=132 +max-line-length=80 diff --git a/buildroot/.gitlab-ci.yml b/buildroot/.gitlab-ci.yml index c373d4a79..b4dad3173 100644 --- a/buildroot/.gitlab-ci.yml +++ b/buildroot/.gitlab-ci.yml @@ -4,27 +4,15 @@ # It needs to be regenerated every time a defconfig is added, using # "make .gitlab-ci.yml". -image: buildroot/base:20180318.1724 +image: buildroot/base:20191027.2027 -.defconfig_script: - script: - - echo 'Configure Buildroot' - - make ${CI_JOB_NAME} - - echo 'Build buildroot' - - | - make > >(tee build.log |grep '>>>') 2>&1 || { - echo 'Failed build last output' - tail -200 build.log - exit 1 - } - -check-gitlab-ci.yml: - script: - - mv .gitlab-ci.yml .gitlab-ci.yml.orig - - make .gitlab-ci.yml - - diff -u .gitlab-ci.yml.orig .gitlab-ci.yml +.check_base: + except: + - /^.*-.*_defconfig$/ + - /^.*-tests\..*$/ check-DEVELOPERS: + extends: .check_base # get-developers should print just "No action specified"; if it prints # anything else, it's a parse error. # The initial ! is removed by YAML so we need to quote it. @@ -32,28 +20,40 @@ check-DEVELOPERS: - "! utils/get-developers | grep -v 'No action specified'" check-flake8: + extends: .check_base before_script: # Help flake8 to find the Python files without .py extension. - find * -type f -name '*.py' > files.txt - find * -type f -print0 | xargs -0 file | grep 'Python script' | cut -d':' -f1 >> files.txt - sort -u files.txt | tee files.processed script: - - python -m flake8 --statistics --count $(cat files.processed) + - python -m flake8 --statistics --count --max-line-length=132 $(cat files.processed) after_script: - wc -l files.processed +check-gitlab-ci.yml: + extends: .check_base + script: + - mv .gitlab-ci.yml .gitlab-ci.yml.orig + - make .gitlab-ci.yml + - diff -u .gitlab-ci.yml.orig .gitlab-ci.yml + check-package: + extends: .check_base script: - make check-package -.defconfig: - extends: .defconfig_script - # Running the defconfigs for every push is too much, so limit to - # explicit triggers through the API. - only: - - triggers - - tags - - /-defconfigs$/ +.defconfig_base: + script: + - echo "Configure Buildroot for ${DEFCONFIG_NAME}" + - make ${DEFCONFIG_NAME} + - echo 'Build buildroot' + - | + make > >(tee build.log |grep '>>>') 2>&1 || { + echo 'Failed build last output' + tail -200 build.log + exit 1 + } artifacts: when: always expire_in: 2 weeks @@ -65,18 +65,32 @@ check-package: - output/build/packages-file-list.txt - output/build/*/.config -.runtime_test: - # Running the runtime tests for every push is too much, so limit to +.defconfig: + extends: .defconfig_base + # Running the defconfigs for every push is too much, so limit to # explicit triggers through the API. only: - triggers - tags - - /-runtime-tests$/ + - /-defconfigs$/ + before_script: + - DEFCONFIG_NAME=${CI_JOB_NAME} + +one-defconfig: + extends: .defconfig_base + only: + - /^.*-.*_defconfig$/ + before_script: + - DEFCONFIG_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g') + +.runtime_test_base: # Keep build directories so the rootfs can be an artifact of the job. The # runner will clean up those files for us. # Multiply every emulator timeout by 10 to avoid sporadic failures in # elastic runners. - script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_JOB_NAME} + script: + - echo "Starting runtime test ${TEST_CASE_NAME}" + - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} artifacts: when: always expire_in: 2 weeks @@ -84,6 +98,24 @@ check-package: - test-output/*.log - test-output/*/.config - test-output/*/images/* + +.runtime_test: + extends: .runtime_test_base + # Running the runtime tests for every push is too much, so limit to + # explicit triggers through the API. + only: + - triggers + - tags + - /-runtime-tests$/ + before_script: + - TEST_CASE_NAME=${CI_JOB_NAME} + +one-runtime_test: + extends: .runtime_test_base + only: + - /^.*-tests\..*$/ + before_script: + - TEST_CASE_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g') aarch64_efi_defconfig: { extends: .defconfig } acmesystems_aria_g25_128mb_defconfig: { extends: .defconfig } acmesystems_aria_g25_256mb_defconfig: { extends: .defconfig } @@ -91,6 +123,7 @@ acmesystems_arietta_g25_128mb_defconfig: { extends: .defconfig } acmesystems_arietta_g25_256mb_defconfig: { extends: .defconfig } amarula_a64_relic_defconfig: { extends: .defconfig } amarula_vyasa_rk3288_defconfig: { extends: .defconfig } +andes_ae3xx_defconfig: { extends: .defconfig } arcturus_ucls1012a_defconfig: { extends: .defconfig } arcturus_ucp1020_defconfig: { extends: .defconfig } arm_foundationv8_defconfig: { extends: .defconfig } @@ -127,6 +160,8 @@ bananapro_defconfig: { extends: .defconfig } beagleboardx15_defconfig: { extends: .defconfig } beaglebone_defconfig: { extends: .defconfig } beaglebone_qt5_defconfig: { extends: .defconfig } +beagleboneai_defconfig: { extends: .defconfig } +beelink_gs1_defconfig: { extends: .defconfig } chromebook_snow_defconfig: { extends: .defconfig } ci20_defconfig: { extends: .defconfig } csky_gx6605s_defconfig: { extends: .defconfig } @@ -143,14 +178,19 @@ freescale_imx6qsabreauto_defconfig: { extends: .defconfig } freescale_imx6qsabresd_defconfig: { extends: .defconfig } freescale_imx6sxsabresd_defconfig: { extends: .defconfig } freescale_imx7dsabresd_defconfig: { extends: .defconfig } +freescale_imx8mmevk_defconfig: { extends: .defconfig } freescale_imx8mqevk_defconfig: { extends: .defconfig } +freescale_imx8qxpmek_defconfig: { extends: .defconfig } freescale_p1025twr_defconfig: { extends: .defconfig } freescale_t1040d4rdb_defconfig: { extends: .defconfig } +freescale_t2080_qds_rdb_defconfig: { extends: .defconfig } friendlyarm_nanopi_a64_defconfig: { extends: .defconfig } friendlyarm_nanopi_neo2_defconfig: { extends: .defconfig } +friendlyarm_nanopi_neo_plus2_defconfig: { extends: .defconfig } galileo_defconfig: { extends: .defconfig } grinn_chiliboard_defconfig: { extends: .defconfig } grinn_liteboard_defconfig: { extends: .defconfig } +hifive_unleashed_defconfig: { extends: .defconfig } imx23evk_defconfig: { extends: .defconfig } imx6-sabreauto_defconfig: { extends: .defconfig } imx6-sabresd_defconfig: { extends: .defconfig } @@ -161,7 +201,11 @@ imx6ulevk_defconfig: { extends: .defconfig } imx6ulpico_defconfig: { extends: .defconfig } imx7d-sdb_defconfig: { extends: .defconfig } imx7dpico_defconfig: { extends: .defconfig } +imx8mmpico_defconfig: { extends: .defconfig } +imx8mpico_defconfig: { extends: .defconfig } +lafrite_defconfig: { extends: .defconfig } lego_ev3_defconfig: { extends: .defconfig } +licheepi_zero_defconfig: { extends: .defconfig } linksprite_pcduino_defconfig: { extends: .defconfig } minnowboard_max-graphical_defconfig: { extends: .defconfig } minnowboard_max_defconfig: { extends: .defconfig } @@ -179,14 +223,13 @@ nitrogen6sx_defconfig: { extends: .defconfig } nitrogen6x_defconfig: { extends: .defconfig } nitrogen7_defconfig: { extends: .defconfig } nitrogen8m_defconfig: { extends: .defconfig } -odroidc2_defconfig: { extends: .defconfig } odroidxu4_defconfig: { extends: .defconfig } olimex_a10_olinuxino_lime_defconfig: { extends: .defconfig } olimex_a13_olinuxino_defconfig: { extends: .defconfig } olimex_a20_olinuxino_lime2_defconfig: { extends: .defconfig } olimex_a20_olinuxino_lime_defconfig: { extends: .defconfig } -olimex_a20_olinuxino_lime_legacy_defconfig: { extends: .defconfig } olimex_a20_olinuxino_micro_defconfig: { extends: .defconfig } +olimex_a33_olinuxino_defconfig: { extends: .defconfig } olimex_a64_olinuxino_defconfig: { extends: .defconfig } olimex_imx233_olinuxino_defconfig: { extends: .defconfig } openblocks_a6_defconfig: { extends: .defconfig } @@ -199,6 +242,7 @@ orangepi_pc_defconfig: { extends: .defconfig } orangepi_pc_plus_defconfig: { extends: .defconfig } orangepi_plus_defconfig: { extends: .defconfig } orangepi_prime_defconfig: { extends: .defconfig } +orangepi_r1_defconfig: { extends: .defconfig } orangepi_win_defconfig: { extends: .defconfig } orangepi_zero_defconfig: { extends: .defconfig } orangepi_zero_plus2_defconfig: { extends: .defconfig } @@ -211,6 +255,11 @@ qemu_aarch64_virt_defconfig: { extends: .defconfig } qemu_arm_versatile_defconfig: { extends: .defconfig } qemu_arm_versatile_nommu_defconfig: { extends: .defconfig } qemu_arm_vexpress_defconfig: { extends: .defconfig } +qemu_arm_vexpress_tz_defconfig: { extends: .defconfig } +qemu_csky610_virt_defconfig: { extends: .defconfig } +qemu_csky807_virt_defconfig: { extends: .defconfig } +qemu_csky810_virt_defconfig: { extends: .defconfig } +qemu_csky860_virt_defconfig: { extends: .defconfig } qemu_m68k_mcf5208_defconfig: { extends: .defconfig } qemu_m68k_q800_defconfig: { extends: .defconfig } qemu_microblazebe_mmu_defconfig: { extends: .defconfig } @@ -229,6 +278,7 @@ qemu_ppc64_e5500_defconfig: { extends: .defconfig } qemu_ppc64_pseries_defconfig: { extends: .defconfig } qemu_ppc64le_pseries_defconfig: { extends: .defconfig } qemu_ppc_g3beige_defconfig: { extends: .defconfig } +qemu_ppc_mac99_defconfig: { extends: .defconfig } qemu_ppc_mpc8544ds_defconfig: { extends: .defconfig } qemu_ppc_virtex_ml507_defconfig: { extends: .defconfig } qemu_riscv32_virt_defconfig: { extends: .defconfig } @@ -247,6 +297,8 @@ raspberrypi2_defconfig: { extends: .defconfig } raspberrypi3_64_defconfig: { extends: .defconfig } raspberrypi3_defconfig: { extends: .defconfig } raspberrypi3_qt5we_defconfig: { extends: .defconfig } +raspberrypi4_64_defconfig: { extends: .defconfig } +raspberrypi4_defconfig: { extends: .defconfig } raspberrypi_defconfig: { extends: .defconfig } riotboard_defconfig: { extends: .defconfig } rock64_defconfig: { extends: .defconfig } @@ -261,12 +313,13 @@ snps_archs38_hsdk_defconfig: { extends: .defconfig } snps_archs38_vdk_defconfig: { extends: .defconfig } socrates_cyclone5_defconfig: { extends: .defconfig } solidrun_clearfog_defconfig: { extends: .defconfig } +solidrun_clearfog_gt_8k_defconfig: { extends: .defconfig } solidrun_macchiatobin_mainline_defconfig: { extends: .defconfig } solidrun_macchiatobin_marvell_defconfig: { extends: .defconfig } stm32f429_disco_defconfig: { extends: .defconfig } stm32f469_disco_defconfig: { extends: .defconfig } +stm32mp157c_dk2_defconfig: { extends: .defconfig } toradex_apalis_imx6_defconfig: { extends: .defconfig } -ts4800_defconfig: { extends: .defconfig } ts4900_defconfig: { extends: .defconfig } ts5500_defconfig: { extends: .defconfig } ts7680_defconfig: { extends: .defconfig } @@ -288,6 +341,7 @@ tests.core.test_hardening.TestRelroPartial: { extends: .runtime_test } tests.core.test_hardening.TestSspNone: { extends: .runtime_test } tests.core.test_hardening.TestSspStrong: { extends: .runtime_test } tests.core.test_post_scripts.TestPostScripts: { extends: .runtime_test } +tests.core.test_root_password.TestRootPassword: { extends: .runtime_test } tests.core.test_rootfs_overlay.TestRootfsOverlay: { extends: .runtime_test } tests.core.test_timezone.TestGlibcAllTimezone: { extends: .runtime_test } tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone: { extends: .runtime_test } @@ -321,12 +375,51 @@ tests.init.test_systemd.TestInitSystemSystemdRwFull: { extends: .runtime_test } tests.init.test_systemd.TestInitSystemSystemdRwIfupdown: { extends: .runtime_test } tests.init.test_systemd.TestInitSystemSystemdRwNetworkd: { extends: .runtime_test } tests.package.test_atop.TestAtop: { extends: .runtime_test } +tests.package.test_crudini.TestCrudiniPy2: { extends: .runtime_test } +tests.package.test_crudini.TestCrudiniPy3: { extends: .runtime_test } tests.package.test_docker_compose.TestDockerCompose: { extends: .runtime_test } tests.package.test_dropbear.TestDropbear: { extends: .runtime_test } -tests.package.test_ipython.TestIPythonPy2: { extends: .runtime_test } +tests.package.test_glxinfo.TestGlxinfo: { extends: .runtime_test } tests.package.test_ipython.TestIPythonPy3: { extends: .runtime_test } +tests.package.test_libftdi1.TestPythonPy2Libftdi1: { extends: .runtime_test } +tests.package.test_libftdi1.TestPythonPy3Libftdi1: { extends: .runtime_test } +tests.package.test_lpeg.TestLuaLPeg: { extends: .runtime_test } +tests.package.test_lpeg.TestLuajitLPeg: { extends: .runtime_test } +tests.package.test_lsqlite3.TestLuaLsqlite3: { extends: .runtime_test } +tests.package.test_lsqlite3.TestLuajitLsqlite3: { extends: .runtime_test } tests.package.test_lua.TestLua: { extends: .runtime_test } tests.package.test_lua.TestLuajit: { extends: .runtime_test } +tests.package.test_lua_cqueues.TestLuaLuaCqueues: { extends: .runtime_test } +tests.package.test_lua_cqueues.TestLuajitLuaCqueues: { extends: .runtime_test } +tests.package.test_lua_curl.TestLuaLuacURL: { extends: .runtime_test } +tests.package.test_lua_curl.TestLuajitLuacURL: { extends: .runtime_test } +tests.package.test_lua_gd.TestLuaLuaGD: { extends: .runtime_test } +tests.package.test_lua_gd.TestLuajitLuaGD: { extends: .runtime_test } +tests.package.test_lua_http.TestLuaHttp: { extends: .runtime_test } +tests.package.test_lua_http.TestLuajitHttp: { extends: .runtime_test } +tests.package.test_lua_sdl2.TestLuaLuaSDL2: { extends: .runtime_test } +tests.package.test_lua_sdl2.TestLuajitLuaSDL2: { extends: .runtime_test } +tests.package.test_lua_utf8.TestLuaUtf8: { extends: .runtime_test } +tests.package.test_lua_utf8.TestLuajitUtf8: { extends: .runtime_test } +tests.package.test_luaexpat.TestLuaLuaExpat: { extends: .runtime_test } +tests.package.test_luaexpat.TestLuajitLuaExpat: { extends: .runtime_test } +tests.package.test_luafilesystem.TestLuaLuaFileSystem: { extends: .runtime_test } +tests.package.test_luafilesystem.TestLuajitLuaFileSystem: { extends: .runtime_test } +tests.package.test_luaossl.TestLuaLuaossl: { extends: .runtime_test } +tests.package.test_luaossl.TestLuajitLuaossl: { extends: .runtime_test } +tests.package.test_luaposix.TestLuaLuaPosix: { extends: .runtime_test } +tests.package.test_luaposix.TestLuajitLuaPosix: { extends: .runtime_test } +tests.package.test_luasec.TestLuaLuaSec: { extends: .runtime_test } +tests.package.test_luasec.TestLuajitLuaSec: { extends: .runtime_test } +tests.package.test_luasocket.TestLuaLuaSocket: { extends: .runtime_test } +tests.package.test_luasocket.TestLuajitLuaSocket: { extends: .runtime_test } +tests.package.test_luasyslog.TestLuaLuasyslog: { extends: .runtime_test } +tests.package.test_luasyslog.TestLuajitLuasyslog: { extends: .runtime_test } +tests.package.test_luvi.TestLuvi: { extends: .runtime_test } +tests.package.test_lxc.TestLxc: { extends: .runtime_test } +tests.package.test_lzlib.TestLuaLzlib: { extends: .runtime_test } +tests.package.test_openjdk.TestOpenJdk: { extends: .runtime_test } +tests.package.test_opkg.TestOpkg: { extends: .runtime_test } tests.package.test_perl.TestPerl: { extends: .runtime_test } tests.package.test_perl_class_load.TestPerlClassLoad: { extends: .runtime_test } tests.package.test_perl_dbd_mysql.TestPerlDBDmysql: { extends: .runtime_test } @@ -350,8 +443,11 @@ tests.package.test_python_autobahn.TestPythonPy2Autobahn: { extends: .runtime_te tests.package.test_python_autobahn.TestPythonPy3Autobahn: { extends: .runtime_test } tests.package.test_python_automat.TestPythonPy2Automat: { extends: .runtime_test } tests.package.test_python_automat.TestPythonPy3Automat: { extends: .runtime_test } +tests.package.test_python_avro.TestPythonAvro: { extends: .runtime_test } tests.package.test_python_bitstring.TestPythonPy2Bitstring: { extends: .runtime_test } tests.package.test_python_bitstring.TestPythonPy3Bitstring: { extends: .runtime_test } +tests.package.test_python_can.TestPythonPy2Can: { extends: .runtime_test } +tests.package.test_python_can.TestPythonPy3Can: { extends: .runtime_test } tests.package.test_python_cbor.TestPythonPy2Cbor: { extends: .runtime_test } tests.package.test_python_cbor.TestPythonPy3Cbor: { extends: .runtime_test } tests.package.test_python_click.TestPythonPy2Click: { extends: .runtime_test } @@ -361,6 +457,10 @@ tests.package.test_python_constantly.TestPythonPy3Constantly: { extends: .runtim tests.package.test_python_crossbar.TestPythonPy3Crossbar: { extends: .runtime_test } tests.package.test_python_cryptography.TestPythonPy2Cryptography: { extends: .runtime_test } tests.package.test_python_cryptography.TestPythonPy3Cryptography: { extends: .runtime_test } +tests.package.test_python_django.TestPythonPy3Django: { extends: .runtime_test } +tests.package.test_python_gitdb2.TestPythonPy2Gitdb2: { extends: .runtime_test } +tests.package.test_python_gitdb2.TestPythonPy3Gitdb2: { extends: .runtime_test } +tests.package.test_python_gobject.TestPythonPy2Gobject: { extends: .runtime_test } tests.package.test_python_incremental.TestPythonPy2Incremental: { extends: .runtime_test } tests.package.test_python_incremental.TestPythonPy3Incremental: { extends: .runtime_test } tests.package.test_python_passlib.TestPythonPy2Passlib: { extends: .runtime_test } @@ -373,6 +473,8 @@ tests.package.test_python_pyyaml.TestPythonPy2Pyyaml: { extends: .runtime_test } tests.package.test_python_pyyaml.TestPythonPy3Pyyaml: { extends: .runtime_test } tests.package.test_python_service_identity.TestPythonPy2ServiceIdentity: { extends: .runtime_test } tests.package.test_python_service_identity.TestPythonPy3ServiceIdentity: { extends: .runtime_test } +tests.package.test_python_smmap2.TestPythonPy2Smmap2: { extends: .runtime_test } +tests.package.test_python_smmap2.TestPythonPy3Smmap2: { extends: .runtime_test } tests.package.test_python_subprocess32.TestPythonPy2Subprocess32: { extends: .runtime_test } tests.package.test_python_treq.TestPythonPy2Treq: { extends: .runtime_test } tests.package.test_python_treq.TestPythonPy3Treq: { extends: .runtime_test } @@ -384,9 +486,13 @@ tests.package.test_python_txtorcon.TestPythonPy2Txtorcon: { extends: .runtime_te tests.package.test_python_txtorcon.TestPythonPy3Txtorcon: { extends: .runtime_test } tests.package.test_python_ubjson.TestPythonPy2Ubjson: { extends: .runtime_test } tests.package.test_python_ubjson.TestPythonPy3Ubjson: { extends: .runtime_test } +tests.package.test_rings.TestLuaRings: { extends: .runtime_test } +tests.package.test_rings.TestLuajitRings: { extends: .runtime_test } tests.package.test_rust.TestRust: { extends: .runtime_test } tests.package.test_rust.TestRustBin: { extends: .runtime_test } tests.package.test_syslog_ng.TestSyslogNg: { extends: .runtime_test } +tests.package.test_tmux.TestTmux: { extends: .runtime_test } +tests.package.test_turbolua.TestLuajitTurbolua: { extends: .runtime_test } tests.toolchain.test_external.TestExternalToolchainBuildrootMusl: { extends: .runtime_test } tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc: { extends: .runtime_test } tests.toolchain.test_external.TestExternalToolchainCCache: { extends: .runtime_test } @@ -395,3 +501,4 @@ tests.toolchain.test_external.TestExternalToolchainLinaroArm: { extends: .runtim tests.toolchain.test_external.TestExternalToolchainSourceryArmv4: { extends: .runtime_test } tests.toolchain.test_external.TestExternalToolchainSourceryArmv5: { extends: .runtime_test } tests.toolchain.test_external.TestExternalToolchainSourceryArmv7: { extends: .runtime_test } +tests.utils.test_check_package.TestCheckPackage: { extends: .runtime_test } diff --git a/buildroot/.gitlab-ci.yml.in b/buildroot/.gitlab-ci.yml.in index a50684089..7e6a7598a 100644 --- a/buildroot/.gitlab-ci.yml.in +++ b/buildroot/.gitlab-ci.yml.in @@ -4,27 +4,15 @@ # It needs to be regenerated every time a defconfig is added, using # "make .gitlab-ci.yml". -image: buildroot/base:20180318.1724 +image: buildroot/base:20191027.2027 -.defconfig_script: - script: - - echo 'Configure Buildroot' - - make ${CI_JOB_NAME} - - echo 'Build buildroot' - - | - make > >(tee build.log |grep '>>>') 2>&1 || { - echo 'Failed build last output' - tail -200 build.log - exit 1 - } - -check-gitlab-ci.yml: - script: - - mv .gitlab-ci.yml .gitlab-ci.yml.orig - - make .gitlab-ci.yml - - diff -u .gitlab-ci.yml.orig .gitlab-ci.yml +.check_base: + except: + - /^.*-.*_defconfig$/ + - /^.*-tests\..*$/ check-DEVELOPERS: + extends: .check_base # get-developers should print just "No action specified"; if it prints # anything else, it's a parse error. # The initial ! is removed by YAML so we need to quote it. @@ -32,28 +20,40 @@ check-DEVELOPERS: - "! utils/get-developers | grep -v 'No action specified'" check-flake8: + extends: .check_base before_script: # Help flake8 to find the Python files without .py extension. - find * -type f -name '*.py' > files.txt - find * -type f -print0 | xargs -0 file | grep 'Python script' | cut -d':' -f1 >> files.txt - sort -u files.txt | tee files.processed script: - - python -m flake8 --statistics --count $(cat files.processed) + - python -m flake8 --statistics --count --max-line-length=132 $(cat files.processed) after_script: - wc -l files.processed +check-gitlab-ci.yml: + extends: .check_base + script: + - mv .gitlab-ci.yml .gitlab-ci.yml.orig + - make .gitlab-ci.yml + - diff -u .gitlab-ci.yml.orig .gitlab-ci.yml + check-package: + extends: .check_base script: - make check-package -.defconfig: - extends: .defconfig_script - # Running the defconfigs for every push is too much, so limit to - # explicit triggers through the API. - only: - - triggers - - tags - - /-defconfigs$/ +.defconfig_base: + script: + - echo "Configure Buildroot for ${DEFCONFIG_NAME}" + - make ${DEFCONFIG_NAME} + - echo 'Build buildroot' + - | + make > >(tee build.log |grep '>>>') 2>&1 || { + echo 'Failed build last output' + tail -200 build.log + exit 1 + } artifacts: when: always expire_in: 2 weeks @@ -65,18 +65,32 @@ check-package: - output/build/packages-file-list.txt - output/build/*/.config -.runtime_test: - # Running the runtime tests for every push is too much, so limit to +.defconfig: + extends: .defconfig_base + # Running the defconfigs for every push is too much, so limit to # explicit triggers through the API. only: - triggers - tags - - /-runtime-tests$/ + - /-defconfigs$/ + before_script: + - DEFCONFIG_NAME=${CI_JOB_NAME} + +one-defconfig: + extends: .defconfig_base + only: + - /^.*-.*_defconfig$/ + before_script: + - DEFCONFIG_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g') + +.runtime_test_base: # Keep build directories so the rootfs can be an artifact of the job. The # runner will clean up those files for us. # Multiply every emulator timeout by 10 to avoid sporadic failures in # elastic runners. - script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_JOB_NAME} + script: + - echo "Starting runtime test ${TEST_CASE_NAME}" + - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} artifacts: when: always expire_in: 2 weeks @@ -84,3 +98,21 @@ check-package: - test-output/*.log - test-output/*/.config - test-output/*/images/* + +.runtime_test: + extends: .runtime_test_base + # Running the runtime tests for every push is too much, so limit to + # explicit triggers through the API. + only: + - triggers + - tags + - /-runtime-tests$/ + before_script: + - TEST_CASE_NAME=${CI_JOB_NAME} + +one-runtime_test: + extends: .runtime_test_base + only: + - /^.*-tests\..*$/ + before_script: + - TEST_CASE_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -e 's,^.*-,,g') diff --git a/buildroot/CHANGES b/buildroot/CHANGES index a4d732bd2..5b54eb0e3 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,891 @@ +2020.02.1, released April 10th, 2020 + + Important / security related fixes. + + core: Also fixup /lib references in libtool .la files, similar + to how it is done for /usr/*. + + Various fixes for builds with per-package target/host + directories. + + toolchain: Fix kernel headers validation check for external + toolchains. Fix make 4.3+ compatibility in external toolchain + logic. + + fs/initramfs: fix show-info so it also shows the usual + rootfs-related variables. + + Updated/fixed packages: arm-trusted-firmware, barebox-aux, + bluez5_utils, bubblewrap, busybox, civetweb, cog, collectd, + ffmpeg, gcc, gnutls, gssdp, gvfs, haproxy, hiredis, hostapd, + kmscube, kodi-screensaver-rsxs, libical, libinput, libexif, + libopenssl, libsndfile, linux, linux-tools, llvm, localedef, + mcrypt, mesa3d, meson, monit, nftables, ntp, opencv3, + oprofile, php, pinentry, polkit, pure-ftpd, python-pyyaml, + qt5, quagga, radvd, rcw, redis, rocksdb, samba4, screen, + sdbusplus, swupdate, sysdig, sysklogd, syslinux, syslog-ng, + tor, tslib, uacme, util-linux, vala, vlc, + wireguard-linux-compat, wireguard-tools, wireshark, + wpa_supplicant, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #12711: host-localedef 2.30-20 fails to compile on fedora 32 + #12746: "sysdig" package description points to http://sysdig.org, .. + +2020.02, released March 8th, 2020 + + Various fixes. + + br2-external: Fix compatibility with make 4.3+ + + Updated/fixed packages: bash, bcm2835, binutils, cups, + erlang-p1-acme, fbgrab, gr-osmosdr, gst1-plugins-base, + gst1-validate, gstreamer1, guile, jhead, libdrm, libevdev, + libinput, libnss, libsndfile, libvncserver, linux-firmware, + mesa3d, nodejs, openjdk-bin, openvmtools, optee-test, patch, + php, piglit, pppd, python-django, qemu, qt5base, ruby, + ser2net, swupdate, thrift, zziplib + + Removed packages: classpath, jamvm + + Issues resolved (http://bugs.uclibc.org): + + #12606: fbgrab location has changed + +2020.02-rc3, released March 2nd, 2020 + + Fixes all over the tree. + + Infrastructure: Rework file list handling to fix race + conditions when building with per-package target and host + directories and top-level parallel builds. + + Updated/fixed packages: aufs, binutils, blktrace, brltty, + cairo, dnsmasq, docker-compose, elf2flt, exim, exiv2, git, + kodi-inputstream-adaptive, libarchive, libcgroup, libgdiplus, + libssh2, libvncserver, libvorbis, linknx, linux-firmware, lxc, + lz4, mosquitto, openjpeg, openrc, poco, proftpd, pure-ftpd, + python3, python-multidict, python-setuptools-scm-git-archive, + qpdf, qt5tools, rdesktop, rocksdb, shellinabox, squid, + suricata, swig, systemd, taglib, util-linux, wireshark, zsh + + Issues resolved (http://bugs.uclibc.org): + + #12571: ltp-testsuite : Build failure + #12576: 2020.02-RC1: error while loading shared libraries: ... + #12581: 2020.02-rc1 glibc failing to build on fedora 31 + +2020.02-rc2, released February 26th, 2020 + + Fixes all over the tree. + + Toolchain: Ensure strong SSP can only be enabled if the + (external) toolchain supports it. + + Fix a race condition related to creating the output/staging + symlink on systems with coreutils < 8.27. + + Drop support for the (end of life) Qt 5.6 variant. + + Updated/fixed packages: at, armadillo, audiofile, bash, + busybox, erlang, fail2ban, fluidsynth, ipsec-tools, jpeg-turbo, + kvm-unit-tests, libftdi1, libinput, libsvgtiny, libtomcrypt, + libupnpp, libxml2, linux-tools, luv, mbedtls, mesa3d, minicom, + openvmtools, php, qt5, qt5webengine, qwt, radvd, rcw, + sdbusplus, systemd, tpm2-tss, vorbis-tools + + Issues resolved (http://bugs.uclibc.org): + + #12581: 2020.02-rc1 glibc failing to build on fedora 31 + +2020.02-rc1, released February 18th, 2020 + + Fixes all over the tree and new features. + + Add experimental support for building with a per-package + target and host directory. This still has some rough edges, + but brings a number of advantages: + + - Packages will only be able to access the explicitly listed + dependencies and not any other packages that happen to be + built before, ensuring correct dependency information in + Buildroot. + + - Possibility for top-level parallel builds, speeding up + builds on multicore machines. + + Core: Ensure package-file-lists data is correct after + incremental builds as well. + + Architecture: Add support for ARC-HS38 with 64bit multiplier + variant, allow building glibc for big endian ARC, handle 16KB + MMU page size for ARC in toolchain wrapper. + + Toolchain: Add binutils 2.33.1, GCC 7.5.0, Arm 9.2-2019.12 + toolchains, ARC 2019.09 toolchain. Allow using custom kernel + headers newer than what is known by Buildroot. + + pkg-stats: Support for CVE vulnerability reporting by + comparing to NVD database. + + Reproducible builds: The go -trimpath option is now used to + get rid of absolute build paths, __FILE__ and __BASE_FILE__ + defines are now handled in the toolchain wrapper. + + Systemd: Build host variant and use systemctl to automatically + enable unit files rather than manually managing symlinks. + + Util-linux: Ensure that hwclock is built without GPLv3 + code. Notice that builds with hwclock has contained + GPLv3-licensed code since util-linux 2.30 (Buildroot 2017.08+) + + New defconfigs: Beelink GS1, Raspberrypi4 64bit + + New packages: alura, avro-c, bubblewrap, cctz, cereal, + cpuburn-arm, elixir, erlang-base64url, erlang-idna, + erlang-jose, erlang-p1-acme, erlang-p1-mqtree, + erlang-p1-yconf, fluid-soundfont, fluidsynth, gcnano-binaries, + gensio, glslsandbox-player, libargon2, libmodsecurity, + libpam-nfc, libtelnet, lua-codegen, lua-livr, lua-livr-extra, + lua-rotas, lua-silva, mfoc, network-manager-openvpn, + nginx-modsecurity, perl-crypt-openssl-aes, + perl-math-prime-util, pipewire, ptm2human, python-aenum, + python-aiohttp-debugtoolbar, python-aiohttp-mako, + python-aiologstash, python-aiosignal, python-aiozipkin, + python-async-lru, python-avro, python-bunch, python-crontab, + python-dnspython, python-entrypoints, python-esptool, + python-frozenlist, python-future, python-gitdb, python-janus, + python-lockfile, python-logstash, python-nested-dict, + python-pbr, python-pyaes, python-pydantic, python-smmap2, + python-sockjs, python-zc-lockfile, raspi-gpio, rocksdb, + sdbusplus, spidermonkey, thermald, ti-sgx-libgbm, tinyssh, + tio, umtprd, weston-imx, wireguard-linux-compat, + wireguard-tools, xdg-dbus-proxy + + Removed packages: bluez_utils, celt051, erlang-p1-iconv, fis, + gadgetfs-test, libplayer, gstreamer, gst-ffmpeg, + gst-fsl-plugins, gst-omapfb, gst-plugins-bad, + gst-plugins-base, gst-plugins-good, gst-plugins-ugly, + perl-digest-md5, perl-mime-base64, perl-net-ping, + python-scapy3k, wireguard + + Issues resolved (http://bugs.uclibc.org): + + #11906: the new version of mesa3d cannot support etnaviv when.. + #11996: opencv3 SIGILL on Cortex-A5 with VFPv4-D16 + #12121: PyQt5.QtSerialPort and other modules not being built + #12256: package tar is outdated (1.29 is 3 years old + #12286: Can't import gobject in python 3.8 + #12376: python-scapy3k is deprecated + #12386: carriage return issue when "make menuconfig" + #12441: qt5webengine build error: asm/errno.h: No such file or.. + #12446: Buildroot fails to finish installing packages + #12456: qtvirtualkeyboard: No such file or directory + #12461: libglib2 build files with deep directory structure + #12481: minicom fails when output directory path contains "m4" + #12501: libnss-3.49.1: ld error: multiple definition of `gcm_.. + #12526: host-nodejs 12.14.1: configure fail: AttributeError: .. + #12536: Linux-Headers extracting failure + #12546: Ninja 1.10 build Error + +2019.11.1, released January 12th, 2020 + + Important / security related fixes. + + Infrastructure: kconfig: Fix reconfigure logic, python: Ensure + correct compiler and linker flags are used for compiled code + + utils/scanpypi: Remind users to update DEVELOPERS + + Defconfigs: imx6-sabresd: Fix the Qt5 display names, + imx8: Drop extra copy of U-Boot DTB + + Updated/fixed packages: acsccid, bitcoin, boost, busybox, + cc-tool, cmocka, cpio, cups, dante, dialog, dillo, docker-cli, + docker-containerd, docker-engine, easy-rsa, ebtables, + ecryptfs-utils, efl, ffmpeg, gdb, git, glibc, gnupg2, go, + gpsd, grpc, gst1-plugins-bad, iputils, jasper, + kf5-kcoreaddons, leveldb, libarchive, libfribi, libgit2, + libkrb5, libp11, librsvg, libssh, libtomcrypt, libuio, libv4l, + lirc-tools, log4cplus, lrzip, lvm2, mali-t76x, + matchbox-desktop, mender-grubenv, mmc-utils, mosquitto, + nodejs, ntp, openipmi, opencv3, openpowerlink, openrc, pango, + perl-sys-cpu, pimd, postgresql, pulseaudio, python-brotli, + python-coherence, python-crc16, python-django, python-dpkt, + python-gobject, python-pyasn-modules, python-pypcap, + python-pyqt5, python-subprocess32, python3, qpdf, + qt-webkit-kiosk, qt5virtualkeyboard, qt5webengine, quota, + rabbitmq-c, rauc, rpcbind, rtl8821au, runc, rygel, samba4, + sdl2, setserial, snort, spidev_test, + sunxi-mali-mainline-driver, syslog-ng, sysrepo, tcllib, tftpd, + usbmount, w_scan, wavpack, wsapi, wsapi-fcgi, wsapi-xavante, + x265, xserver_xorg-server, ytree, zip + + Issues resolved (http://bugs.uclibc.org): + + #12121: PyQt5.QtSerialPort and other modules not being built + #12286: Can't import gobject in python 3.8 + +2019.11, released December 1st, 2019 + + Various fixes. + + Infrastructure: Make HOST__DL_OPTS inherit from + _DL_OPTS by default, just like it is done for a number of + other package variables. + + Add _KEEP_PY_FILES to exclude specific python .py files + from the removal done by BR2_PACKAGE_PYTHON{,3}_PYC_ONLY for + the (rare) case where the .py files are needed at runtime + rather than .pyc. + + Updated/fixed packages: am33x-cm3, bind, collectd, go, gob2, + gst1-plugins-bad, haproxy, jasper, jpeg-turbo, libdrm, + libftdi, libftdi1, libnss, libselinux, libstrophe, lzma, + minicom, network-manager, nodejs, oniguruma, opencv3, + openvmtools, perl-gdgraph, perl-gdtextutil, prosody, + python-cchardet, systemd, tiff, wolfssl, + + Issues resolved (http://bugs.uclibc.org): + + #11416: check-uniq-files staging issue + #12146: Oprofile runtime issue + #12166: Compiling nodejs for SAMA5D3 always crash with illegal inst.. + #12171: Python-opencv needs config.py and config-3.7.py to run.. + #12196: duma package + #12211: host-nodejs 10.15.3 package fail to build + #12316: tzdata fails to install with empty "default local time" + #12326: network-manager build fails with missing glib error + #12366: Gstreamer1 gst1-plugins-bad do not compile with RPI-Userland + +2019.11-rc3, released November 24th, 2019 + + Fixes all over the tree. + + Updated/fixed packages: asterisk, clamav, domoticz, faifa, + gerbera, kmod, kvm-unit-tests, libupnp18, linux-serial-test, + lsof, ltp-testsuite, lxc, mesa3d, mesa3d-headers, perl, php, + postgresql, qemu, rauc, redis, rpcbind, spice, spice-protocol, + systemd, tftpd, waylandpp, webkitgtk, zip + +2019.11-rc2, released November 16th, 2019 + + Fixes all over the tree. + + Toolchain: ARC tools bumped to arc-2019.09-rc1, ensure + external toolchain kernel headers version check correctly stop + the build on mismatch + + Meson: Fix generation of global cross-compilation.conf + + Download: Also use the package download method for extra + downloads from the same site, so it does not get confused by + URLs containing '+' + + Defconfigs: Fix boot issue for beaglebone + + Updated/fixed packages: bird, chrony, connman, dhcp, domoticz, + dropwatch, dtc, elf2flt, gettext-tiny, glog, intel-microcode, + ipsec-tools, jailhouse, kodi, libfribi, libmbim, libressl, + libsigrokdecode, libsvgtiny, linux-serial-test, ltp-testsuite, + lvm2, lxc, mariadb, mesa3d, minizip, ndisc6, neardal, ninja, + ofono, openvmtools, oracle-mysql, qt5wayland, safeclib, socat, + sudo, systemd, wpewebkit, xserver_xorg-server + +2019.11-rc1, released November 5th, 2019 + + Fixes all over the tree and new features. + + Dependencies: Gcc/g++ 4.8 or newer is now required on the + build host. + Ensure host has JSON::PP perl module installed if + webkitgtk/wpewebkit packages are enabled as it is needed + during their build process. + + Toolchain: Add support for the D programming language (GCC + 9.x, Glibc). + GCC 9.x updated to 9.2.0, Glibc updated to 2.30, Musl updated + to 1.1.24, uClibc-ng updated to 1.0.32, ARC toolchain updated + to arc-2019.09-eng002. + Musl: Add a patch to add support for + sched_{get,set}scheduler() and sched_{get,set}param() for + compatibility. + Generate check-headers program under BUILD_DIR rather than + /tmp to fix issues with distributions mounting /tmp noexec. + Also copy libssp.so for external toolchains if SSP + to handle toolchains providing SSP support in libssp rather + than in the C library + + New defconfigs: Beaglebone AI, FriendlyARM Nanopi NEO Plus2, + Libre Computer "La Frite", QEMU Armv7-A with trustzone/OP-TEE, + STM32MP157 Discovery Kit + + Arch: RISC-V: Default to a sensible floating point ABI based + on the selected ISA extensions rather than always defaulting + to ILP32/64 + + Graph-size: Package sizes are now shown in human readable form + (Kib/Mib/Gib) rather than always in Kib. Binary (KB/MB/GB) + format can be selected using the --binary option. The cut-off + limit for classifying packages as "other" is now configurable + using the --size-limit option. + + Br2-external: Linux kernel extensions can now also be provided + in an external tree by adding packages under + linux/linux-ext-*.mk. See the manual for details. + + Fakeroot now works correctly under Microsoft Windows 10 + Services for Linux, which does not provide SYSV IPC support + + The check-uniq-files logic which would complain if multiple + packages would touch the same files has been removed as it + causes issues in certain situations (when packages are + rebuilt) and the issue is no longer considered a problem for + toplevel parallel builds as those will use a per-package + staging/target directory. + With this removed, Python is no longer required for a basic + build (only for optional scripts). + + support/scripts/genimage.sh will no longer make a copy of + TARGET_DIR, speeding up post-build/image scripts. + + The runtime test logic now uses Python 3.x. + + A 'v' prefix has been dropped from the _SOURCE variable + for a number of packages to match the version numbers used by + https://release-monitoring.org + + New packages: caps, collectl, dav1d, fstrcmp, ima-evm-utils, + jitterentropy-library, kodi-vfs-rar, kodi-vfs-sftp, libavl, + libhttpserver, libmspack, libnetconf2, libolm, libyang, + linux-serial-test, lrzip, mdevd, minimodem, musl-fts, netifrc, + ogre, openlayers, python-aioredis, python-asgiref, + python-backports-functools-lru-cache, python-bluezero, + python-brotli, python-channels, python-channels-redis, + python-colorlog, python-daphne, python-django-enumfields, + python-jaraco-functools, python-kiwisolver, python-msgfy, + python-rpi-ws281x, python-setuptools-scm-git-archive, + python-simplelogging, python-soupsieve, python-sqliteschema, + python-sqlparse, python-tqdm, python-webencodings, qt5webview, + restclient-cpp, ripgrep, snmpclitools, sunwait, sysrepo, + uacme, utf8proc, uvw, ytree + + Removed packages: alljoyn, alljoyn-base, alljoyn-tcl-base, + devmem2, eventlog, kodi-audiodecoder-opus, + kodi-screensaver-planestate, kodi-visualisation-waveforhue, + python-pysnmp-apps, riscv-pk, ustr + + Issues resolved (http://bugs.uclibc.org): + + #9881: systemd-resolved not setting resolv.conf link + #10171: devmem2 w (word) is 8 bytes in x86 64 systems + #10586: musl gcc has ifunc enabled when musl doesn't support it + #10806: Allow nfs-utils to use ipv6 + #11366: [2018.08] SysV IPC not available for fakeroot on WSL + #11411: check-uniq-files target issue + #11766: Console (getty) issues with systemd + #11781: mariadb build error + #12031: Build of cups-filters fails while linking, apparently due.. + #12116: console prompt does not appear after login + #12141: eudev package is missing "render" and "kvm" groups + #12181: dropbear: norootlogin (-w) no longer works when PAM is enabled + #12186: Raspberry Pi Zero-W build fails on newer kernel versions + #12191: cmake BUILDDIR + #12241: Permission denied while running "make" + #12261: sudo versions prior to 1.8.28 are affected. + #12276: make clean/distclean does not remove BR2_DL_DIR and BR2_HOST_DIR + #12281: Custom configuration fails to build (based on raspberrypi3_.. + +2019.08.3, released December 7th, 2019 + + Important / security related fixes. + + Infrastructure: Make HOST__DL_OPTS inherit from + _DL_OPTS by default, just like it is done for a number of + other package variables + + Add _KEEP_PY_FILES to exclude specific python .py files + from the removal done by BR2_PACKAGE_PYTHON{,3}_PYC_ONLY for + the (rare) case where the .py files are needed at runtime + rather than .pyc. + + Fix -reconfigure handling for packages using the kconfig + infrastructure. + + Toolchain: ensure external toolchain kernel headers version + check correctly stop the build on mismatch + + Deconfigs: beaglebone: fix boot issue + + Updated/fixed packages: am33x-cm3, asterisk, bind, chrony, + clamav, cmocka, collectd, connman, dhcp, dropwatch, faifa, + gettext-tiny, gob2, haproxy, intel-microcode, ipsec-tools, + jailhouse, jasper, jpeg-turbo, kodi, kvm-unit-tests, libftdi, + libftdi1, libnss, libressl, libstrophe, libsvgtiny, lvm2, + lzma, mariadb, minicom, mosquitto, neardal, ninja, nodejs, + oniguruma, openvmtools, oracle-mysql, perl-gdgraph, + perl-gdtextutil, php, postgresql, prosody, python-cchardet, + python-django, qt5wayland, rabbitmq, rauc, redis, rpcbind, + socat, spice, spice-protocol, tftpd, tiff, webkitgtk + + New packages: libmspack + + Issues resolved (http://bugs.uclibc.org): + + #12166: Compiling nodejs for SAMA5D3 always crash with illegal inst.. + #12171: Python-opencv needs config.py and config-3.7.py to run.. + #12211: host-nodejs 10.15.3 package fail to build + #12316: tzdata fails to install with empty "default local time" + +2019.08.2, released November 9th, 2019 + + Important / security related fixes. + + Toolchain: Also copy libssp.so for external toolchains if SSP + to handle toolchains providing SSP support in libssp rather + than in the C library + + Download: Also use the package download method for extra + downloads from the same site, so it does not get confused by + URLs containing '+' + + Fakeroot now works correctly under Microsoft Windows 10 + Services for Linux, which does not provide SYSV IPC support + + utils/test-pkg: ensure to exit with an error upon failure + + Updated/fixed packages: asterisk, azmq, binutils, + cups-filters, domoticz, dtc, duma, elf2flt, eudev, exfat, + exfat-utils, fakeroot, fdk-aac, file, freerdp, gcc, gd, + ghostscript, go, gpsd, grpc, gst1-plugins-base, gvfs, icu, + intel-microcode, kvm-unit-tests, libfribidi, libnspr, libnss, + libopenssl, libpcap, libpciaccess, librsvg, libseccomp, + libsigrok, libtorrent, libunwind, libva, linux-tools, + lua-sdl2, lxc, minizip, mjpegtools, mongoose, mono, nbd, + nfs-utils, php, piglit, python, python-autobahn, + python-pysnmp-apps, python-tornado, python3, qemu, qt5base, + ruby, safeclib, samba4, sdl_mixer, sox, sudo, suricata, + systemd, tcpdump, unscd, util-linux, vdr-plugin-vnsiserver, + vtun, wireshark, xvisor, yaffs2utils + + Issues resolved (http://bugs.uclibc.org): + + #11366: [2018.08] SysV IPC not available for fakeroot on WSL + #12261: sudo versions prior to 1.8.28 are affected + +2019.08.1, released October 3rd, 2019 + + Important / security related fixes. + + Defconfigs: AArch64-efi: Fix grub configuration, Beaglebone: + Use default console settings + + Dependencies: Ensure host has JSON::PP perl module installed + if webkitgtk/wpewebkit packages are enabled as it is needed + during their build process. + + Toolchain: Generate check-headers program under BUILD_DIR + rather than /tmp to fix issues with distributions mounting + /tmp noexec. + + Updated/fixed packages: asterisk, augeas, axel, bind, bwm-ng, + cups, cups-filters, docker-cli, docker-engine, docker-proxy, + e2fsprogs, eudev, exim, expat, gcc, go, haveged, ifplugd, joe, + kf5-extra-cmake-modules, kf5-modemmanager-qt, + kf5-networkmanager-qt, libcamera, libcurl, libgcrypt, + libglib2, libgpg-error, libnspr, libnss, libopenssl, + logrotate, luksmeta, mariadb, mbedtls, mongodb, mosquitto, + ncurses, nfs-utils, nghttp2, nodejs, openvmtools, php, + protobuf, putty, qemu, samba4, snort, swupdate, + systemd-bootchart, thttpd, uclibc, unzip, util-linux, + wireshark + + Issues resolved (http://bugs.uclibc.org): + + #10806: Allow nfs-utils to use ipv6 + #11781: mariadb build error + #12031: Build of cups-filters fails while linking, apparently due.. + #12141: eudev package is missing "render" and "kvm" groups + #12241: Permission denied while running "make" + +2019.08, released September 1st, 2019 + + Various fixes. + + Defconfigs: Removed nanopc t4, nanopi m4 and neo4, pine64 + rockpro64 and raxda rock pi4 as they rely on a ARM32 toolchain + on the build host to build ATF. These defconfigs will be added + back once a package providing such toolchain is + available. Also dropped ts4800 defconfig as it does not build + with GCC >= 8.x. + + Updated/fixed packages: libxcb, php, python-numpy, webkitgtk, + wpewebkit, xfont_font-util + + Issues resolved (http://bugs.uclibc.org): + + #12156: buildroot-2019.08-rc3 does not build for Pi Zero W + +2019.08-rc3, released August 28th, 2019 + + Fixes all over the tree. + + Updated/fixed packages: clamav, dovecot, dovecot-pigeonhole, + gcc, intel-microcode, libmicrohttpd, libmodplug, mpg123, + nginx, openldap, python, qemu, samba4, squid, strace, vlc + + Issues resolved (http://bugs.uclibc.org): + + #11686: fbdev_drv.so: undefined symbol: shadowUpdatePackedWeak,.. + +2019.08-rc2, released August 20th, 2019 + + Fixes all over the tree. + + Compile fixes for a number of defconfigs. + + Updated/fixed packages: apache, autofs, batctl, batman-adv, + bind, collectd, cwiid, dahdi-linux, dahdi-tools, daq, + dehydrated, dhcp, dtc, efl, enlightenment, evtest, giflib, + gnutls, go, gst-plugins-bad, gst-plugins-base, + gst1-plugins-bad, gst1-plugins-base, gst1-rtsp-server, gtkmm3, + gupnp, harfbuzz, imagemagick, lftp, libbsd, libcpprestsdk, + libdnet, libfm, libgit2, libgtk2, libgtk3, libpri, librsvg, + libss7, libssh2, libwpe, lua-cqueues, metacity, micropython, + mpd, mpg123, musl, mpv, openblas, openbox, opencv, pango, + pcmanfm, piglit, pigpio, pinentry, postgresql, qemu, qt5base, + qt5enginio, qt5multimedia, qt5serialbus, quagga, quazip, + rrdtool, rygel, samba4, stellarium, tcpreplay, ti-gfx, vte, + wampcc, wilink-bt-firmware, wireless-regdb, wpebackend-fdo, + xscreensaver + + Removed packages: libamcodec, odroid-mali, odroid-scripts + + Issues resolved (http://bugs.uclibc.org): + + #9481: NetworkManager/Ping unable to resolve domains + #10566: php.mk is missing option --with-pgsql + #10861: Package batman_adv Makefile is missing include header direct.. + #11641: linux kernel .config timestamp always out of date fixed with.. + #11671: russian locale ru_RU:145: LC_TIME: syntax error + #11701: recuuring of usr and in bin shortcuts are created + #11741: pigpio does not build host-pigpio + #11876: automount using host mount/umount + #11881: Build breaks with lftp package enabled and libexpat1-dev inst.. + #11921: dahdi fails to build + #11936: libcpprestsdk should install to staging + #11946: wilink-bt-firmware: moved from github to http://git.ti.com/ti-bt + #11961: libpri build failure + #12086: dhcp shared libraries not installed to target + #12096: tcpreplay: build fails if libdumbnet-dev is installed in the.. + #12106: daq: build fails if libdumbnet-dev is installed in the host + #12126: vc4 has neon as hard dependency + +2019.08-rc1, released August 9th, 2019 + + Fixes all over the tree and new features. + + toolchain: ARC toolchain updated to 2019.03 (binutils 2.32.51 + / GCC 8.3.1 / glibc 2.29), ARM AAarch64/ARM toolchains updated + to 2019.03. Add GCC 9.1.0, remove GCC 4.9 and 6.5, add GDB + 8.3, remove GDB 7.12 and 8.0.1, default to GDB 8.2, GCC + 8.3.0. Musl updated to 1.1.23, bringing support for RISC-V 64. + + Architectures: Internal toolchain support for C-SKY, support + for ARC HS48 v3.1 and HS38 with Quad MAC & FPU, support for + ARM A76, A76/A55 big.LITTLE, emag, neoverse-N1, phecda and + tsv110. + + Filesystems: Pass extra pax options to tar for binary + reproducibility. Build host-cpio for the --reproducible option + support when BR2_REPRODUCIBLE is enabled. Genimage updated to + version 11, bringing GPT support. + + Br2-external: Add support for injecting additional options to + the list of preconfigured external toolchains and libjpeg and + openssl providers using files under provides/. See the manual + for details. + + Ensure custom _OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS are + passed before the standard exclusions so they are not ignored + by rsync when using override-srcdir. + + Gnuconfig updated to 2019-05-28, adding C-SKY support. + + test-pkg: Correct long option handling and clean output dir + after a successful build to save disk space. + + support/testing: Emulate a machine with 256MB RAM to fix + issues with certain tests running out of memory, use + virtio-rng to provide needed entrophy. + + pkg-stats: support outputting in JSON format with --json for + easier post processing. The classic HTML output is still + available with --html. Parallelize access to + release-monitoring.org to speed up runtime. + + Drop non-conventional version prefix/suffix/separators for + packages for better compatibility with release-monitoring.org + + Packages: + Init systems: Add basic openrc support and + _INSTALL_INIT_OPENRC variable in the infrastructure to + install openrc service scripts if enabled. + + busybox: Build each applet as a separate binary when SELinux + is enabled for more finegrained policy control. Use daemon + mode for mdev rather than legacy hotplug. + + linux: Workaround -Werror related build failure on powerpc, + by forcing CONFIG_PPC_DISABLE_WERROR on. + + Defconfigs: QEMU: use 'rootwait' kernel option to ensure root + partition is available before mounting. + + New defconfigs: HiFive Unleashed, I.MX8MM EVK and Pico, Nanopi + m4 and neo4, Nanopc t4, Olimex A33 olinuxino, Pine64 + Rockpro64, PowerPC mac99, QEMU C-SKY 610/807/810/860 virt, + Raspberry Pi 4, Raxda rock pi4, Solidrun Clearfog GT-8K + + Removed defconfigs: Odroid C2 + + New packages: bitcoin, c-capnproto, fatcat, ifmetric, jack1, + jailhouse, libubootenv, luasyslog, mender-grubenv, + murata-cyw-fw, openrc, piglit, python-colorama, python-cycler, + python-hiredis, python-ifaddr, python-inflection, + python-iptables, python-matplotlib, python-periphery, + python-pycairo, python-redis, python-termcolor, + python-tinyrpc, python-txdbus, skeleton-init-openrc, spdlog, + sshguard, stellarium, zziplib + + Removed packages: xapp_mkfontdir + + Issues resolved (http://bugs.uclibc.org): + + #11096: Upgrade from glibc 2.26 to 2.27 broke some locales... + #11271: utils/check-package fails with exception depending on.. + #11991: [numpy] segfault when compiling for RPi3 64bits + #12016: Grub fails to boot bzImage after upgrade to 2019.05 + #12046: Can’t login as root user after upgrading to buildroot.. + #12051: package/dhcp installs libtool wrapper scripts on tar... + #12076: Patchelf can link against an incompatible libc++ ver... + +2019.05.3, Released October 3rd, 2019 + + Important / security related fixes. + + Defconfigs: AArch64-efi: Fix grub configuration, Beaglebone: + Use default console settings + + Dependencies: Ensure host has JSON::PP perl module installed + if webkitgtk/wpewebkit packages are enabled as it is needed + during their build process. + + Toolchain: Generate check-headers program under BUILD_DIR + rather than /tmp to fix issues with distributions mounting + /tmp noexec. + + Updated/fixed packages: asterisk, augeas, bind, bwm-ng, cups, + cups-filters, docker-cli, docker-engine, docker-proxy, + e2fsprogs, eudev, exim, expat, gcc, go, haveged, ifplugd, + iptables, joe, kf5-extra-cmake-modules, kf5-modemmanager-qt, + kf5-networkmanager-qtlibcamera, libcurl, libgcrypt, + libgpg-error, libnftl, libnspr, libnss, libopenssl, + libtorrent-rasterbar, luksmeta, mariadb, mbedtls, mongodb, + mosquitto, ncurses, nfs-utils, nghttp2, nodejs, openvmtools, + php, protobuf, putty, qemu, samba4, swupdate, + systemd-bootchart, thttpd, uclibc, unzip, util-linux, + wireshark + + Issues resolved (http://bugs.uclibc.org): + + #10806: Allow nfs-utils to use ipv6 + #11781: mariadb build error + #12031: Build of cups-filters fails while linking, apparently due.. + #12141: eudev package is missing "render" and "kvm" groups + #12241: Permission denied while running "make" + +2019.05.2, Released September 3rd, 2019 + + Important / security related fixes. + + Filesystems: Pass extra pax options to tar for binary + reproducibility. + + Updated/fixed packages: apache, arm-trusted-firmware, + asterisk, atk, autofs, batctl, batman-adv, berkeleydb, + busybox, bzip2, clamav, cloop, cmake, collectd, connman-gtk, + dahdi-linux, dahdi-tools, daq, dehydrated, dhcp, dovecot, + dovecot-pigeonhole,, elfutils, evtest, exim, expect, giflib, + git, glib-networking, glibc, gnupg2, gnutls, go, + gst1-rtsp-server, gtkperf, gupnp-tools, gvfs, imagemagick, + imx-uuc, intel-microcode, json-glib, lftp, libbsd, libcurl, + libgit2, libgtk2, libgtk3, libmodplug, libnss, libpri, + libshout, libss7, libssh2, libvips, libxcb, linux-headers, + mdadm, mesa3d, metacity, mpg123, mosquitto, musl, nginx, + oniguruma, openblas, opencv3, openjdk, openjdk-bin, openldap, + openvmtools, pcmanfm, php, pigpio, postgresql, prboom, + proftpd, proj, python, python-django, python-idna, + python-numpy, python-urllib3, python3, qemu, qt5, qt5base, + qt5enginio, quagga, rygel, squid, subversion, tcpreplay, + unzip, vlc, vte, webkitgtk, wireless-regdb, xen, + xfont_font-util, xlib_libICE, xlib_libXfont, xlib_libXfont2, + yad, zeromq + + Issues resolved (http://bugs.uclibc.org): + + #11741: pigpio does not build host-pigpio + #11876: automount using host mount/umount + #11881: Build breaks with lftp package enabled and libexpat1-dev inst.. + #11921: dahdi fails to build + #11961: libpri build failure + #12086: (dhcpd-missing-libs) - dhcp shared libraries not installed to.. + #12096: tcpreplay: build fails if libdumbnet-dev is installed in the.. + #12106: daq: build fails if libdumbnet-dev is installed in the host + #12126: vc4 has neon as hard dependency + +2019.05.1, Released July 7th, 2019 + + Important / security related fixes. + + arch: x86: Fix typo breaking 'core-avx2' variant + + linux: Workaround -Werror related build failure on powerpc, + by forcing CONFIG_PPC_DISABLE_WERROR on. + + support/testing: Emulate a machine with 256MB RAM to fix + issues with certain tests running out of memory. + + test-pkg: Correct long option handling and clean output dir + after a successful build to save disk space. + + Defconfigs: QEMU: use 'rootwait' kernel option to ensure root + partition is available before mounting. + + Updated/fixed packages: barebox, busybox, bzip2, davfs2, + dialog, docker-cli, docker-engine, exim, expat, faad2, + haveged, irssi, libcamera, libcdaudio, libcurl, libglib2, + libressl, libsecret, lmbench, meson, monit, php, postgresql, + psplash, python-django, qt5base, tvheadend, webkitgtk, + xserver_xorg-server, znc + +2019.05, released June 2nd, 2019 + + Various fixes. + + Toolchain: Ensure pre-built Andes toolchains can only be + selected when x86 32bit support is available on the host. + Disallow PowerPC SPE ABI for GCC >= 8.x, as it is no longer + supported. + + Infra: pkg-config: Use a dedicated timestamp file rather than + .config as that gets touched by linux-4.19+, causing repeated + builds. + + Add C-SKY support to our config.sub (gnuconfig) + + Updated/fixed packages: dosfstools, botan, brotli, dropbear, + flare-engine, gst1-plugins-bad, libhtp, libnss, libopenssl, + linuxptp, matchbox-panel, mender, mutt, netsurf, + network-manager, opencv3, openjdk, openmpi, php, + python-cython, qt5multimedia, qtwayland, qt5webkit-examples, + supertux, suricata, tpm2-totp, v4l2loopback, wireshark, + wpewebkit + +2019.05-rc3, released May 25th, 2019 + + Fixes all over the tree. + + check-bin-arch: Ignore /usr/lib/grub, similar to how /lib/grub + is ignored. + + check-package: Warn about utf-8 characters in .mk files + + Linux: Default to 5.1.x series + + Updated/fixed packages: assimp, atop, chocolate-doom, cjson, + ddrescue, dhcp, ffmpeg, gerbera, glibmm, gpsd, gst-ffmpeg, + intel-microcode, jasper, keepalived, kismet, libcpprestsdk, + libcurl, libssh2, libupnp18, luarocks, mono-gtksharp3, opus, + postgresql, pcsc-lite, python, tslib, webkitgtk, + wpebackend-fdo, wpewebkit + +2019.05-rc2, released May 15th, 2019 + + Fixes all over the tree. + + Updated/fixed packages: bind, bullet, ca-certificates, + collectd, cracklib, dhcp, gdb, libinput, libtorrent-rasterbar, + linknx, lynx, mono, netsurf, optee-os, postgresql, qt5enginio, + qt5multimedia, rpm, samba4, sqlite, strace, uclibc, woff2 + + Issues resolved (http://bugs.uclibc.org): + + #11841: grub-efi.cfg not used when building EFI disk image + +2019.05-rc1, Released May 8th, 2019 + + Fixes all over the tree and new features. + + Architecture: Andes 32-bit (nds32) support added. + + Only build host-lzip / host-xz when really needed by packages, + not just when not available on the build host. + + Toolchain: Glibc bumped to 2.29, musl bumped to 1.1.22, + binutils 2.32 added, 2.28/2.29 removed, default changed to + 2.31.1. + + fs: Set FAKEROOTDONTTRYCHOWN environment variable to not + forward {f,l,}chown calls to libc when running under fakeroot + to fix issues when building in restricted environments + (E.G. user namespace with bubblewrap). + + Linux: Also build default make target to ensure extra files + like the gdb scripts enabled by CONFIG_GDB_SCRIPTS are also + built. Notice: This may mean that extra host utilities like + uboot-mkimage are needed. + + Infrastructure: show-info and -show-info make targets + added to output package metadata in JSON format for external + use. + + pkg-generic: Only tweak .la files needing it to ensure they + are not included in subsequent package file lists. + + test-pkg: Generate a basic package config if none is + specified. + + Gettext-tiny package added as an lightweight replacement for + GNU gettext for situations where NLS support is not needed. + + New defconfigs: Andes AE3XX, Freescale imx8mpico / imx8qxpmek + / T2080 QDS RDB, Licheepi zero, Orangepi R1 + + Removed defconfigs: Olimx A20 Olinuxino Lime legacy + + New packages: bats-core, bayer2rgb-neon, brickd, cog, dacapo, + enet, gettext-tiny, gli, gst1-plugins-bayer2rgb-neon, + imx-sc-firmware, intel-mediadriver, intel-mediasdk, libcamera, + libhtp, libp11, libwpe, lua-binaryheap, lua-gd, lua-lunitx, + mender-artifact, most, oniguruma, openjdk, openjdk-bin, + opensbi, optee-benchmark, optee-client, optee-examples, + optee-os, optee-test, paho-mqtt-cpp, python-aioblescan, + python-aioconsole, python-aiohttp-cors, python-aiomonitor, + python-backcall, python-jedi, python-parso, python-pyjwt, + python-terminaltables, suricata, tpm2-totp, uftp, + wpebackend-fdo, wpewebkit + + Removed packages: libump, lunit, sunxi-mali + + Issues resolved (http://bugs.uclibc.org): + + #11716: Typo on website, saying latest release is 2018.2.11 + #11756: package/syslinux: MBR's don't fit because of binutils.. + #11761: Building custom kernel 5.1-rc3 or later breaks on objtool + #11816: Only selected coreutils binaries are installed + 2019.02.9, released January 12th, 2020 Important / security related fixes. @@ -516,6 +1404,18 @@ #11656: Custom device tree and u-boot boot.scr not integrated.. #11666: Touchscreen with (Py)Qt5 should use tslib instead of evdev +2018.11.4, Released March 28th, 2019 + + Important / security related fixes. + + Updated/fixed packages: avahi, beecrypt, binutils, botan, + busybox, clamav, cups, devmem2, efl, fetchmail, file, fltk, + gcc, gdb, git, go, gst-plugins-bad, iproute2, jq, + kf5-modemmanager-qt, leveldb, libopenssl, libraw, libseccomp, + libsoxr, libssh2, mariadb, mosquitto, nodejs, ntp, openjpeg, + perl, php, putty, qt5webkit, rdesktop, runc, samba4, swupdate, + systemd, tor, vsftpd, wireshark, xapp_xdm, xen, xlib_libXdmcp + 2018.11.3, Released February 23th, 2019 Important / security related fixes. @@ -1327,6 +2227,17 @@ #10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is enabled +2018.02.12, Released March 29th, 2019 + + Important / security related fixes. + + Updated/fixed packages: avahi, beecrypt, busybox, clamav, + cups, devmem2, fetchmail, file, fltk, gcc, gdb, git, jq, + leveldb, libopenssl, libraw, libseccomp, libssh2, + libunistring, mariadb, mosquitto, nodejs, ntp, openjpeg, perl, + php, putty, qt5webkit, rdesktop, systemd, wireshark, vsftpd, + xapp_xdm, xlib_libXdmcp + 2018.02.11, Released February 23th, 2019 Important / security related fixes. diff --git a/buildroot/Config.in b/buildroot/Config.in index d58d8dc04..48fd36ff9 100644 --- a/buildroot/Config.in +++ b/buildroot/Config.in @@ -14,38 +14,21 @@ config BR2_HOSTARCH string option env="HOSTARCH" -config BR2_BUILD_DIR +config BR2_BASE_DIR string - option env="BUILD_DIR" + option env="BASE_DIR" + +# br2-external paths definitions +source "$BR2_BASE_DIR/.br2-external.in.paths" # Hidden config symbols for packages to check system gcc version config BR2_HOST_GCC_VERSION string option env="HOST_GCC_VERSION" -config BR2_HOST_GCC_AT_LEAST_4_5 - bool - default y if BR2_HOST_GCC_VERSION = "4 5" - -config BR2_HOST_GCC_AT_LEAST_4_6 - bool - default y if BR2_HOST_GCC_VERSION = "4 6" - select BR2_HOST_GCC_AT_LEAST_4_5 - -config BR2_HOST_GCC_AT_LEAST_4_7 - bool - default y if BR2_HOST_GCC_VERSION = "4 7" - select BR2_HOST_GCC_AT_LEAST_4_6 - -config BR2_HOST_GCC_AT_LEAST_4_8 - bool - default y if BR2_HOST_GCC_VERSION = "4 8" - select BR2_HOST_GCC_AT_LEAST_4_7 - config BR2_HOST_GCC_AT_LEAST_4_9 bool default y if BR2_HOST_GCC_VERSION = "4 9" - select BR2_HOST_GCC_AT_LEAST_4_8 config BR2_HOST_GCC_AT_LEAST_5 bool @@ -67,6 +50,11 @@ config BR2_HOST_GCC_AT_LEAST_8 default y if BR2_HOST_GCC_VERSION = "8" select BR2_HOST_GCC_AT_LEAST_7 +config BR2_HOST_GCC_AT_LEAST_9 + bool + default y if BR2_HOST_GCC_VERSION = "9" + select BR2_HOST_GCC_AT_LEAST_8 + # When adding new entries above, be sure to update # the HOSTCC_MAX_VERSION variable in the Makefile. @@ -75,16 +63,6 @@ config BR2_HOST_GCC_AT_LEAST_8 config BR2_NEEDS_HOST_JAVA bool -# Hidden boolean selected by packages in need of javac in order to build -# (example: classpath) -config BR2_NEEDS_HOST_JAVAC - bool - -# Hidden boolean selected by packages in need of jar in order to build -# (example: classpath) -config BR2_NEEDS_HOST_JAR - bool - # Hidden boolean selected by pre-built packages for x86, when they # need to run on x86-64 machines (example: pre-built external # toolchains, binary tools like SAM-BA, etc.). @@ -553,7 +531,6 @@ endchoice config BR2_GOOGLE_BREAKPAD_ENABLE bool "Enable google-breakpad support" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS @@ -708,10 +685,40 @@ config BR2_REPRODUCIBLE This is labeled as an experimental feature, as not all packages behave properly to ensure reproducibility. +config BR2_PER_PACKAGE_DIRECTORIES + bool "Use per-package directories (experimental)" + help + This option will change the build process of Buildroot + package to use per-package target and host directories. + + This is useful for two related purposes: + + - Cleanly isolate the build of each package, so that a + given package only "sees" the dependencies it has + explicitly expressed, and not other packages that may + have by chance been built before. + + - Enable top-level parallel build. + + This is labeled as an experimental feature, as not all + packages behave properly with per-package directories. + endmenu comment "Security Hardening Options" +config BR2_PIC_PIE + bool "Build code with PIC/PIE" + depends on BR2_SHARED_LIBS + depends on BR2_TOOLCHAIN_SUPPORTS_PIE + help + Generate Position-Independent Code (PIC) and link + Position-Independent Executables (PIE). + +comment "PIC/PIE needs a toolchain w/ PIE" + depends on BR2_SHARED_LIBS + depends on !BR2_TOOLCHAIN_SUPPORTS_PIE + choice bool "Stack Smashing Protection" default BR2_SSP_ALL if BR2_ENABLE_SSP # legacy @@ -746,14 +753,15 @@ config BR2_SSP_REGULAR config BR2_SSP_STRONG bool "-fstack-protector-strong" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_HAS_SSP_STRONG help Like -fstack-protector but includes additional functions to be protected - those that have local array definitions, or have references to local frame addresses. -comment "Stack Smashing Protection strong needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + -fstack-protector-strong officially appeared in gcc 4.9, but + some vendors have backported -fstack-protector-strong to older + versions of gcc. config BR2_SSP_ALL bool "-fstack-protector-all" @@ -764,6 +772,12 @@ config BR2_SSP_ALL endchoice +config BR2_SSP_OPTION + string + default "-fstack-protector" if BR2_SSP_REGULAR + default "-fstack-protector-strong" if BR2_SSP_STRONG + default "-fstack-protector-all" if BR2_SSP_ALL + comment "Stack Smashing Protection needs a toolchain w/ SSP" depends on !BR2_TOOLCHAIN_HAS_SSP @@ -788,11 +802,16 @@ config BR2_RELRO_PARTIAL config BR2_RELRO_FULL bool "Full" + depends on BR2_TOOLCHAIN_SUPPORTS_PIE + select BR2_PIC_PIE help This option includes the partial configuration, but also marks the GOT as read-only at the cost of initialization time during program loading, i.e every time an executable is started. +comment "RELRO Full needs a toolchain w/ PIE" + depends on !BR2_TOOLCHAIN_SUPPORTS_PIE + endchoice comment "RELocation Read Only (RELRO) needs shared libraries" @@ -859,4 +878,5 @@ source "package/Config.in.host" source "Config.in.legacy" -source "$BR2_BUILD_DIR/.br2-external.in" +# br2-external menus definitions +source "$BR2_BASE_DIR/.br2-external.in.menus" diff --git a/buildroot/Config.in.legacy b/buildroot/Config.in.legacy index 7e8b51508..b925e563d 100644 --- a/buildroot/Config.in.legacy +++ b/buildroot/Config.in.legacy @@ -144,7 +144,550 @@ endif ############################################################################### -comment "Legacy options removed in 2019.02" +comment "Legacy options removed in 2020.02" + +config BR2_PACKAGE_JAMVM + bool "jamvm removed" + select BR2_LEGACY + help + JamVM has not had a release since 2014 and is unmaintained. + +config BR2_PACKAGE_CLASSPATH + bool "classpath removed" + select BR2_LEGACY + help + GNU Classpath package was removed. The last upstream + release was in 2012 and there hasn't been a commit + since 2016. + +config BR2_PACKAGE_QT5_VERSION_5_6 + bool "qt 5.6 support removed" + select BR2_LEGACY + help + Support for Qt 5.6 is EOL and has been removed. The current + version (5.12 or later) has been selected instead. + +config BR2_PACKAGE_CURL + bool "BR2_PACKAGE_CURL was renamed" + select BR2_PACKAGE_LIBCURL_CURL + select BR2_LEGACY + help + The BR2_PACKAGE_CURL config symbol was renamed to + BR2_PACKAGE_LIBCURL_CURL. + +config BR2_PACKAGE_GSTREAMER + bool "gstreamer-0.10 removed" + select BR2_LEGACY + help + Gstreamer-0.10 package was removed. It has been deprecated + upstream since 2012, and is missing a lot of features and + fixes compared to gstreamer-1.x. + +config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS + bool "nvidia-tegra23 binaries gstreamer 0.10.x support removed" + select BR2_LEGACY + help + Gstreamer 0.10.x is no longer available in Buildroot, so + neither is the support in nvidia-tegra23 binaries. + +config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_NV_SAMPLE_APPS + bool "nvidia-tegra23 binaries sample apps removed" + select BR2_LEGACY + help + Gstreamer 0.10.x is no longer available in Buildroot, so + neither is the support in nvidia-tegra23 binaries. + +config BR2_PACKAGE_FREERDP_GSTREAMER + bool "freerdp gstreamer 0.10.x support removed" + select BR2_LEGACY + help + Gstreamer 0.10.x is no longer available in Buildroot, so + neither is the support in freerdp. + +config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER + bool "opencv3 gstreamer 0.10.x support removed" + select BR2_LEGACY + help + Gstreamer 0.10.x is no longer available in Buildroot, so + neither is the support in opencv3. + +config BR2_PACKAGE_OPENCV_WITH_GSTREAMER + bool "opencv gstreamer 0.10.x support removed" + select BR2_LEGACY + help + Gstreamer 0.10.x is no longer available in Buildroot, so + neither is the support in opencv. + +config BR2_PACKAGE_LIBPLAYER + bool "libplayer package was removed" + select BR2_LEGACY + help + The libplayer package was removed. The latest release is + from 2010 and none of the backends are available in + Buildroot any more. + +config BR2_GCC_VERSION_OR1K + bool "gcc 5.x fork for or1k has been removed" + select BR2_LEGACY + help + Support for gcc 5.x for or1k has been removed. The current + default version (9.x or later) has been selected instead. + +config BR2_PACKAGE_BLUEZ_UTILS + bool "bluez-utils was removed" + select BR2_LEGACY + select BR2_PACKAGE_BLUEZ5_UTILS if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \ + && BR2_TOOLCHAIN_HAS_SYNC_4 + help + The bluez-utils (BlueZ 4.x) package was removed as it is + deprecated since a long time. As an alternative, the + bluez5-utils (BlueZ 5.x) has been automatically selected in + your configuration. + +config BR2_PACKAGE_GADGETFS_TEST + bool "gadgetfs-test was removed" + select BR2_LEGACY + help + The gadgetfs-test package was removed. Gadgetfs has been + deprecated in favour of functionfs. Consider using + gadget-tool (gt) instead. + +config BR2_PACKAGE_FIS + bool "fis was removed" + select BR2_LEGACY + help + The fis package was removed. + +config BR2_PACKAGE_REFPOLICY_POLICY_VERSION + string "refpolicy policy version" + help + The refpolicy policy version option has been moved to the + libsepol package. + +config BR2_PACKAGE_REFPOLICY_POLICY_VERSION_WRAP + bool + default y if BR2_PACKAGE_REFPOLICY_POLICY_VERSION != "" + select BR2_LEGACY + +config BR2_PACKAGE_CELT051 + bool "celt051 package was removed" + select BR2_LEGACY + select BR2_PACKAGE_OPUS + help + The celt051 package was removed as it is now obsolete since + the CELT codec has been merged into the IETF Opus codec. As + a result, the opus package has been automatically selected + in your configuration. + +config BR2_PACKAGE_WIREGUARD + bool "wireguard package renamed" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + select BR2_LEGACY + select BR2_PACKAGE_WIREGUARD_LINUX_COMPAT if BR2_LINUX_KERNEL + select BR2_PACKAGE_WIREGUARD_TOOLS + help + The wireguard package has been renamed to wireguard-tools + for the userspace tooling and wireguard-linux-compat for the + kernel side for legacy (<5.6) kernels to match upstream. + +config BR2_PACKAGE_PERL_NET_PING + bool "perl-net-ping was removed" + select BR2_LEGACY + help + Net::Ping is a Perl core module (ie. bundled with perl). + +config BR2_PACKAGE_PERL_MIME_BASE64 + bool "perl-mime-base64 was removed" + select BR2_LEGACY + help + MIME::Base64 is a Perl core module (ie. bundled with perl). + +config BR2_PACKAGE_PERL_DIGEST_MD5 + bool "perl-digest-md5 was removed" + select BR2_LEGACY + help + Digest::MD5 is a Perl core module (ie. bundled with perl). + +config BR2_PACKAGE_ERLANG_P1_ICONV + bool "erlang-p1-iconv has been removed" + select BR2_LEGACY + help + The erlang-p1-iconv package was no longer used by ejabberd, + and was no longer maintained upstream, so it was removed. + +config BR2_KERNEL_HEADERS_5_3 + bool "kernel headers version 5.3.x are no longer supported" + select BR2_LEGACY + help + Version 5.3.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_PYTHON_SCAPY3K + bool "python-scapy3k is replaced by python-scapy" + select BR2_LEGACY + select BR2_PACKAGE_PYTHON_SCAPY + help + python-scapy3k has been deprecated, since python-scapy has + gained Python 3 support. Use BR2_PACKAGE_PYTHON_SCAPY + instead. + +config BR2_BINUTILS_VERSION_2_30_X + bool "binutils version 2.30 support removed" + select BR2_LEGACY + help + Support for binutils version 2.30 has been removed. The + current default version (2.31 or later) has been selected + instead. + +config BR2_PACKAGE_RPI_USERLAND_START_VCFILED + bool "rpi-userland start vcfiled was removed" + select BR2_LEGACY + help + The vcfiled support was removed upstream. + +comment "Legacy options removed in 2019.11" + +config BR2_PACKAGE_OPENVMTOOLS_PROCPS + bool "openvmtools' procps support was removed" + select BR2_LEGACY + help + Upstream stopped supporting this option a while ago. + +config BR2_PACKAGE_ALLJOYN + bool "alljoyn was removed" + select BR2_LEGACY + help + The alljoyn framework is dead + +config BR2_PACKAGE_ALLJOYN_BASE + bool "alljoyn-base was removed" + select BR2_LEGACY + help + The alljoyn framework is dead + +config BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL + bool "alljoyn-base control panel was removed" + select BR2_LEGACY + help + The alljoyn framework is dead + +config BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION + bool "alljoyn-base notification was removed" + select BR2_LEGACY + help + The alljoyn framework is dead + +config BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING + bool "alljoyn-base onboarding was removed" + select BR2_LEGACY + help + The alljoyn framework is dead + +config BR2_PACKAGE_ALLJOYN_TCL_BASE + bool "alljoyn-tcl-base was removed" + select BR2_LEGACY + help + The alljoyn framework is dead + +config BR2_PACKAGE_ALLJOYN_TCL + bool "alljoyn-tcl was removed" + select BR2_LEGACY + help + The alljoyn framework is dead + +config BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS + string "toolchain-external extra libs option has been renamed" + help + The option BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS has + been renamed to BR2_TOOLCHAIN_EXTRA_LIBS. + +config BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS_WRAP + bool + default y if BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS != "" + select BR2_LEGACY + +config BR2_PACKAGE_PYTHON_PYSNMP_APPS + bool "python-pysnmp-apps was removed" + select BR2_LEGACY + select BR2_PACKAGE_SNMPCLITOOLS + help + Following upstream changes, the python-pysnmp-apps package + has been removed, and snmpclitools should be used as a + replacement. + +config BR2_KERNEL_HEADERS_5_2 + bool "kernel headers version 5.2.x are no longer supported" + select BR2_LEGACY + help + Version 5.2.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_TARGET_RISCV_PK + bool "riscv-pk was removed" + select BR2_LEGACY + help + The RISC-V Proxy Kernel (pk) and Berkley Boot Loader (BBL) + have been replaced with OpenSBI. + +config BR2_PACKAGE_SQLITE_STAT3 + bool "sqlite stat3 support was removed" + select BR2_LEGACY + help + Upstream removed the support for stat3. + +config BR2_KERNEL_HEADERS_5_1 + bool "kernel headers version 5.1.x are no longer supported" + select BR2_LEGACY + help + Version 5.1.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_DEVMEM2 + bool "devmem2 package was removed" + select BR2_LEGACY + help + Use the the Busybox devmem utility, instead, which provides + the same functionality. + +config BR2_PACKAGE_USTR + bool "ustr package removed" + select BR2_LEGACY + help + The 'ustr' package was only used by SELinux libsemanage, but + since SELinux 2.7, ustr is no longer used. Therefore, we + removed this package from Buildroot. + +config BR2_PACKAGE_KODI_SCREENSAVER_PLANESTATE + bool "kodi-screensaver-planestate package was removed" + select BR2_LEGACY + help + This package is incompatible with Kodi 18.x. + +config BR2_PACKAGE_KODI_VISUALISATION_WAVEFORHUE + bool "kodi-visualisation-waveforhue package was removed" + select BR2_LEGACY + help + This package is incompatible with Kodi 18.x. + +config BR2_PACKAGE_KODI_AUDIODECODER_OPUS + bool "kodi-audiodecoder-opus package was removed" + select BR2_LEGACY + help + This package is incompatible with Kodi 18.x. + +config BR2_PACKAGE_MESA3D_OSMESA + bool "mesa OSMesa option renamed" + select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC if BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST + select BR2_LEGACY + help + The option was renamed in order to match the naming used + by the meson buildsystem. + +config BR2_PACKAGE_HOSTAPD_DRIVER_RTW + bool "hostapd rtl871xdrv driver removed" + select BR2_LEGACY + help + Since the update of hostapd to 2.9, the patch provided for + the rtl871xdrv no longer works, although it + applies. Moreover, AP support for Realtek chips is broken + anyway in kernels > 4.9. Therefore, this option has been + removed. + +config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW + bool "new dbus support option in wpa_supplicant was renamed" + select BR2_PACKAGE_WPA_SUPPLICANT_DBUS if BR2_TOOLCHAIN_HAS_THREADS + select BR2_LEGACY + help + The new dbus support option was renamed. + +config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD + bool "old dbus support in wpa_supplicant was removed" + select BR2_LEGACY + help + The old dbus support was removed. + +comment "Legacy options removed in 2019.08" + +config BR2_TARGET_TS4800_MBRBOOT + bool "ts4800-mbrboot package was removed" + select BR2_LEGACY + help + The defconfig for the TS4800 platform has been removed, so + the ts4800-mbrboot package, containing the boot code for + this specific platform has been removed as welL. + +config BR2_PACKAGE_LIBAMCODEC + bool "liamcodec package was removed" + select BR2_LEGACY + help + Support for odroidc2 based systems was removed, making the + libamcodec package useless. + +config BR2_PACKAGE_ODROID_SCRIPTS + bool "odroid-scripts package was removed" + select BR2_LEGACY + help + Support for odroidc2 based systems was removed, making the + odroid-scripts package useless. + +config BR2_PACKAGE_ODROID_MALI + bool "odroid-mali package was removed" + select BR2_LEGACY + help + Support for odroidc2 based systems was removed, making the + odroid-mali package useless. + +config BR2_PACKAGE_KODI_PLATFORM_AML + bool "Kodi AMLogic support was removed" + select BR2_LEGACY + help + Support for AMLogic was removed due to the removal of the + odroidc2 defconfig. + +config BR2_GCC_VERSION_6_X + bool "gcc 6.x support removed" + select BR2_LEGACY + help + Support for gcc version 6.x has been removed. The current + default version (8.x or later) has been selected instead. + +config BR2_GCC_VERSION_4_9_X + bool "gcc 4.9.x support removed" + select BR2_LEGACY + help + Support for gcc version 4.9.x has been removed. The current + default version (8.x or later) has been selected instead. + +config BR2_GDB_VERSION_7_12 + bool "gdb 7.12.x has been removed" + select BR2_LEGACY + help + The 7.12.x version of gdb has been removed. Use a newer + version instead. + +config BR2_PACKAGE_XAPP_MKFONTDIR + bool "mkfontdir is now included in xapp_mkfontscale" + select BR2_PACKAGE_XAPP_MKFONTSCALE + select BR2_LEGACY + help + xapp_mkfontscale now includes the mkfontdir script previously + distributed separately for compatibility with older X11 + versions. + +config BR2_GDB_VERSION_8_0 + bool "gdb 8.0.x has been removed" + select BR2_LEGACY + help + The 8.0.x version of gdb has been removed. Use a newer + version instead. + +config BR2_KERNEL_HEADERS_4_20 + bool "kernel headers version 4.20.x are no longer supported" + select BR2_LEGACY + help + Version 4.20.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_KERNEL_HEADERS_5_0 + bool "kernel headers version 5.0.x are no longer supported" + select BR2_LEGACY + help + Version 5.0.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +comment "Legacy options removed in 2019.05" + +config BR2_CSKY_DSP + bool "C-SKY DSP support removed" + select BR2_LEGACY + help + C-SKY DSP instruction support for ck810 / ck807 was removed, + as it was no longer supported in C-SKY gcc. Perhaps the VDSP + instructions should be used instead, using the BR2_CSKY_VDSP + option. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR + bool "compositor moved to gst1-plugins-base" + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR + select BR2_LEGACY + help + The gst1-plugins-bad compositor plugin has moved + to gst1-plugins-base. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IQA + bool "gst-plugins-bad IQA option was removed" + select BR2_LEGACY + help + The gst1-plugins-bad IQA option was removed. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV + bool "gst-plugins-bad opencv option was removed" + select BR2_LEGACY + help + The gst1-plugins-bad opencv option was removed because + buildroot does not have the opencv_contrib package which + is required for the bgsegm module which gst1-plugins-bad + now requires along with opencv3. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO + bool "stereo was merged into audiofx in gst1-plugins-good" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX + help + The gst1-plugins-bad stereo plugin has merged with the + gst1-plugins-base audiofx plugin. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD + bool "gst-plugins-bad vcd plugin was removed." + select BR2_LEGACY + help + The gst1-plugins-bad vcd plugin was removed. + +config BR2_PACKAGE_LUNIT + bool "lunit package removed" + select BR2_LEGACY + select BR2_PACKAGE_LUA_LUNITX + help + The lunit package was removed in favor of its fork lunitx, + which supports all versions of Lua. + +config BR2_PACKAGE_FFMPEG_FFSERVER + bool "ffmpeg ffserver removed" + select BR2_LEGACY + help + On July 10th, 2016, ffserver program has been dropped. + +config BR2_PACKAGE_LIBUMP + bool "libump package removed" + select BR2_LEGACY + help + The libump package was removed, it was only used as a + dependency of sunxi-mali, which itself was removed. + +config BR2_PACKAGE_SUNXI_MALI + bool "sunxi-mali package removed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_MAINLINE + help + The sunxi-mali package was removed, as the + sunxi-mali-mainline package replaces it for mainline + kernels on Allwinner platforms. + +config BR2_BINUTILS_VERSION_2_29_X + bool "binutils version 2.29 support removed" + select BR2_LEGACY + help + Support for binutils version 2.29 has been removed. The + current default version (2.31 or later) has been selected + instead. + +config BR2_BINUTILS_VERSION_2_28_X + bool "binutils version 2.28 support removed" + select BR2_LEGACY + help + Support for binutils version 2.28 has been removed. The + current default version (2.31 or later) has been selected + instead. config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK bool "gst-plugins-bad apexsink option removed" @@ -152,6 +695,8 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK help The gst-plugins-bad apexsink option was removed. +comment "Legacy options removed in 2019.02" + config BR2_PACKAGE_QT bool "qt package removed" select BR2_LEGACY @@ -1651,16 +2196,6 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD bool "mad (*.mp3 audio) removed" select BR2_LEGACY -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC - bool "gst1-plugins-bad webrtc renamed to webrtcdsp" - select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP - select BR2_LEGACY - help - The WebRTC plugin in GStreamer 1.x has always been named - webrtcdsp, but was wrongly introduced in Buildroot under the - name webrtc. Therefore, we have renamed the option to match - the actual name of the GStreamer plugin. - config BR2_STRIP_none bool "Strip command 'none' has been removed" select BR2_LEGACY diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index 58adad5c1..dd44331b8 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -47,15 +47,31 @@ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ F: package/libwebsockets/ +F: package/mender-grubenv/ F: package/nginx-naxsi/ +F: package/openjdk/ +F: package/openjdk-bin/ F: package/php/ F: package/policycoreutils/ +F: package/polkit/ F: package/python3/ +F: package/python-aioredis/ +F: package/python-asgiref/ +F: package/python-channels/ +F: package/python-channels-redis/ +F: package/python-daphne/ +F: package/python-django-enumfields/ F: package/python-flask-sqlalchemy/ +F: package/python-gitdb2/ +F: package/python-lockfile/ F: package/python-mutagen/ +F: package/python-nested-dict/ +F: package/python-pbr/ F: package/python-pip/ F: package/python-psycopg2/ +F: package/python-smmap2/ F: package/python-sqlalchemy/ +F: package/python-sqlparse/ F: package/python-visitor/ F: package/restorecond/ F: package/refpolicy/ @@ -63,13 +79,24 @@ F: package/selinux-python/ F: package/semodule-utils/ F: package/setools/ F: package/sngrep/ +F: package/spidermonkey/ F: package/systemd/ +F: support/testing/tests/package/test_python_gobject.py + +N: Adam Heinrich +F: package/jack1/ N: Adrian Perez de Castro F: package/brotli/ +F: package/bubblewrap/ +F: package/cog/ F: package/libepoxy/ +F: package/libwpe/ F: package/webkitgtk/ F: package/woff2/ +F: package/wpebackend-fdo/ +F: package/wpewebkit/ +F: package/xdg-dbus-proxy/ N: Adrien Gallouët F: package/bird/ @@ -80,6 +107,9 @@ F: package/libmbim/ F: package/libqmi/ F: package/modem-manager/ +N: Alex Michel +F: package/network-manager-openvpn/ + N: Alex Suykov F: board/chromebook/snow/ F: configs/chromebook_snow_defconfig @@ -93,11 +123,11 @@ F: package/fastd/ F: package/libuecc/ F: package/putty/ -N: Alexander Lukichev -F: package/openpgm/ +N: Alexander Kurz +F: package/minimodem/ -N: Alexander Mukhin -F: package/hostapd/ +N: Alexander Lukichev +F: package/openpgm/ N: Alexander Sverdlin F: package/mini-snmpd/ @@ -112,7 +142,14 @@ N: Alexandre Esse F: package/kvazaar/ F: package/v4l2loopback/ +N: Alexey Brodkin +F: board/cubietech/cubieboard2/ +F: configs/cubieboard2_defconfig + N: Alistair Francis +F: board/sifive/ +F: boot/opensbi/ +F: configs/hifive_unleashed_defconfig F: package/xen/ N: Alvaro G. M @@ -124,6 +161,9 @@ N: Anders Darander F: package/ktap/ N: André Hentschel +F: board/freescale/imx8qxpmek/ +F: configs/freescale_imx8qxpmek_defconfig +F: package/freescale-imx/imx-sc-firmware/ F: package/libkrb5/ F: package/openal/ F: package/p7zip/ @@ -149,13 +189,17 @@ F: package/corkscrew/ F: package/fail2ban/ F: package/i2c-tools/ F: package/mender/ +F: package/mender-artifact/ F: package/mono/ F: package/mono-gtksharp3/ F: package/monolite/ F: package/python-can/ F: package/python-pillow/ F: package/python-pydal/ +F: package/python-spidev/ F: package/python-web2py/ +F: package/sshguard/ +F: package/sunwait/ F: package/sysdig/ N: Anisse Astier @@ -193,7 +237,6 @@ F: package/arp-scan/ F: package/dehydrated/ F: package/freescale-imx/firmware-imx/ F: package/freescale-imx/imx-lib/ -F: package/gstreamer/gst-fsl-plugins/ F: package/libpagekite/ F: package/lua-bit32/ F: package/owfs/ @@ -201,10 +244,18 @@ F: package/python-bottle/ F: package/sqlcipher/ F: package/stress/ +N: Arthur Courtel +F: board/raspberrypi/genimage-raspberrypi4-64.cfg +F: configs/raspberrypi4_64_defconfig + N: Asaf Kahlon F: package/collectd/ F: package/libuv/ F: package/python* +F: package/snmpclitools/ +F: package/spdlog/ +F: package/uftp/ +F: package/uvw/ F: package/zeromq/ N: Ash Charles @@ -221,7 +272,10 @@ F: package/lua-ev/ F: package/orbit/ N: Bartosz Bilas +F: package/python-esptool/ +F: package/python-pyaes/ F: package/qt5/qt5scxml/ +F: package/qt5/qt5webview/ N: Bartosz Golaszewski F: package/autoconf-archive/ @@ -235,7 +289,10 @@ F: package/pulseview/ F: package/sigrok-cli/ N: Baruch Siach +F: board/solidrun/clearfog_gt_8k/ +F: configs/solidrun_clearfog_gt_8k_defconfig F: package/18xx-ti-utils/ +F: package/cpuburn-arm/ F: package/daemon/ F: package/dropbear/ F: package/ebtables/ @@ -265,6 +322,7 @@ F: package/bcg729/ F: package/bluez-tools/ F: package/boinc/ F: package/clamav/ +F: package/dav1d/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ @@ -272,11 +330,16 @@ F: package/eudev/ F: package/exim/ F: package/fetchmail/ F: package/ffmpeg/ +F: package/flac/ F: package/freeswitch/ F: package/freeswitch-mod-bcg729/ +F: package/freetype/ +F: package/fstrcmp/ F: package/ghostscript/ F: package/giflib/ +F: package/gli/ F: package/glmark2/ +F: package/gpsd/ F: package/hdparm/ F: package/jsoncpp/ F: package/kodi* @@ -351,7 +414,6 @@ F: package/perl-io-html/ F: package/perl-lwp-mediatypes/ F: package/perl-mail-dkim/ F: package/perl-mailtools/ -F: package/perl-mime-base64/ F: package/perl-net-dns/ F: package/perl-net-http/ F: package/perl-netaddr-ip/ @@ -361,6 +423,7 @@ F: package/perl-www-robotrules/ F: package/pixman/ F: package/pngquant/ F: package/pound/ +F: package/pulseaudio/ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ @@ -379,12 +442,14 @@ F: package/samba4/ F: package/softether/ F: package/spandsp/ F: package/sqlite/ +F: package/stellarium/ F: package/taglib/ F: package/tinyxml2/ F: package/tor/ F: package/transmission/ F: package/tvheadend/ F: package/unixodbc/ +F: package/utf8proc/ F: package/vdr/ F: package/vdr-plugin-vnsiserver/ F: package/vlc/ @@ -393,6 +458,7 @@ F: package/waylandpp/ F: package/x11r7/ F: package/x264/ F: package/x265/ +F: package/ytree/ F: package/znc/ N: Biagio Montaruli @@ -413,15 +479,19 @@ N: Brock Williams F: package/pdmenu/ N: Carlo Caione +F: package/jailhouse/ F: package/sunxi-boards/ N: Carlos Santos F: package/busybox/ +F: package/cups/ +F: package/cups-filters/ F: package/gtest/ F: package/initscripts/ F: package/intel-microcode/ F: package/libpam-radius-auth/ F: package/libpam-tacplus/ +F: package/liburiparser/ F: package/modem-manager/ F: package/pamtester/ F: package/pcm-tools/ @@ -436,6 +506,7 @@ F: package/sysvinit/ F: package/util-linux/ F: package/tpm2-abrmd/ F: package/tpm2-tools/ +F: package/tpm2-totp/ F: package/tpm2-tss/ N: Carsten Schoenert @@ -458,7 +529,6 @@ F: configs/olimex_a13_olinuxino_defconfig F: configs/orangepi_plus_defconfig N: Chris Packham -F: package/eventlog/ F: package/gstreamer1/gst1-shark/ F: package/micropython/ F: package/micropython-lib/ @@ -483,6 +553,12 @@ F: package/rtl8821au/ F: package/runc/ F: package/tini/ +N: Christophe Priouzeau +F: board/stmicroelectronics/stm32f429-disco/ +F: board/stmicroelectronics/stm32f469-disco/ +F: configs/stm32f429_disco_defconfig +F: configs/stm32f469_disco_defconfig + N: Christophe Vu-Brugier F: package/drbd-utils/ F: package/iotop/ @@ -534,7 +610,10 @@ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ F: package/policycoreutils/ -F: package/ustr/ + +N: Clément Péron +F: board/beelink/gs1/ +F: configs/beelink_gs1_defconfig N: Corentin Guillevic F: package/libloki/ @@ -543,12 +622,8 @@ N: Cyril Bur F: arch/Config.in.powerpc F: package/kvm-unit-tests -N: Dagg Stompler -F: board/hardkernel/odroidc2 -F: configs/odroidc2_defconfig -F: package/libamcodec/ -F: package/odroid-mali/ -F: package/odroid-scripts/ +N: Daniel J. Leach +F: package/dacapo/ N: Damien Lanson F: package/libvdpau/ @@ -598,6 +673,7 @@ N: David Lechner F: board/lego/ev3/ F: configs/lego_ev3_defconfig F: linux/linux-ext-ev3dev-linux-drivers.mk +F: package/brickd/ F: package/ev3dev-linux-drivers/ N: Davide Viti @@ -624,6 +700,10 @@ F: package/unscd/ N: Dushara Jayasinghe F: package/prosody/ +N: Eloi Bail +F: package/bayer2rgb-neon/ +F: package/gstreamer1/gst1-plugins-bayer2rgb-neon/ + N: Eric Le Bihan F: docs/manual/adding-packages-meson.txt F: package/adwaita-icon-theme/ @@ -634,6 +714,7 @@ F: package/eudev/ F: package/execline/ F: package/hicolor-icon-theme/ F: package/jemalloc/ +F: package/mdevd/ F: package/meson/ F: package/ninja/ F: package/pkg-meson.mk @@ -675,6 +756,17 @@ F: package/mxsldr/ N: Ernesto L. Williams Jr F: package/szip/ +N: Esben Haabendal +F: boot/gummiboot/ +F: package/python-kiwisolver/ + +N: Etienne Carriere +F: boot/optee-os/ +F: package/optee-benchmark/ +F: package/optee-client/ +F: package/optee-examples/ +F: package/optee-test/ + N: Eugene Tarassov F: package/tcf-agent/ @@ -695,6 +787,7 @@ F: package/rtl8723bs/ F: package/supertuxkart/ N: Fabio Estevam +F: board/freescale/warpboard/ F: board/warp7/ F: configs/freescale_imx* F: configs/imx23evk_defconfig @@ -713,12 +806,16 @@ F: configs/mx6sx_udoo_neo_defconfig F: configs/mx6udoo_defconfig F: configs/wandboard_defconfig F: configs/warp7_defconfig +F: configs/warpboard_defconfig F: package/atest/ F: package/kmscube/ N: Fabio Porcedda F: package/netsurf-buildsystem/ +N: Fabio Urquiza +F: package/bitcoin/ + N: Fabrice Fontaine F: package/domoticz/ F: package/libmediaart/ @@ -726,10 +823,6 @@ F: package/libmaxminddb/ F: package/openzwave/ N: Fabrice Fontaine -F: package/alljoyn/ -F: package/alljoyn-base/ -F: package/alljoyn-tcl/ -F: package/alljoyn-tcl-base/ F: package/boinc/ F: package/cairo/ F: package/duktape/ @@ -758,6 +851,7 @@ F: package/libgee/ F: package/libglib2/ F: package/libgtk2/ F: package/libgtk3/ +F: package/libhtp/ F: package/libidn/ F: package/libidn2/ F: package/libjpeg/ @@ -786,10 +880,16 @@ F: package/mongodb/ F: package/motion/ F: package/mutt/ F: package/ncmpc/ +F: package/oniguruma/ F: package/oprofile/ F: package/pcmanfm/ +F: package/python-backcall/ +F: package/python-jedi/ +F: package/python-parso/ +F: package/rocksdb/ F: package/rygel/ F: package/safeclib/ +F: package/suricata/ F: package/tinycbor/ F: package/tinydtls/ F: package/tinymembench/ @@ -811,12 +911,17 @@ F: board/olimex/imx233_olinuxino/ F: configs/olimex_a20_olinuxino_* F: configs/olimex_imx233_olinuxino_defconfig F: package/4th/ +F: package/cgilua/ F: package/chipmunk/ +F: package/cog/ +F: package/collectl/ +F: package/copas/ +F: package/coxpcall/ F: package/dado/ F: package/ficl/ F: package/libtomcrypt/ F: package/libtommath/ -F: package/libump/ +F: package/libwpe/ F: package/linenoise/ F: package/ljlinenoise/ F: package/lpeg/ @@ -824,16 +929,20 @@ F: package/lpty/ F: package/lrandom/ F: package/lsqlite3/ F: package/lua* -F: package/lunit/ F: package/lzlib/ F: package/moarvm/ F: package/netsurf/ F: package/perl* F: package/pkg-perl.mk F: package/pkg-luarocks.mk +F: package/rings/ F: package/tekui/ +F: package/wpebackend-fdo/ +F: package/wpewebkit/ +F: package/wsapi/ F: package/wsapi-fcgi/ F: package/wsapi-xavante/ +F: package/xavante/ F: utils/scancpan N: Frank Hunleth @@ -849,6 +958,11 @@ F: package/ucl/ F: package/upx/ F: package/zxing-cpp/ +N: Frank Vanbever +F: package/elixir/ +F: package/libmodsecurity/ +F: package/nginx-modsecurity/ + N: Gaël Portay F: package/qt5/qt5virtualkeyboard/ F: package/qt5/qt5webengine/ @@ -872,18 +986,33 @@ N: Geoffrey Ragot F: package/python-pycli/ F: package/python-pyyaml/ +N: Gerome Burlats +F: board/qemu/ +F: configs/qemu_* + N: Gilles Talis +F: board/freescale/imx8mmevk/ +F: configs/freescale_imx8mmevk_defconfig +F: package/cctz/ F: package/fdk-aac/ F: package/httping/ F: package/iozone/ F: package/leptonica/ +F: package/libeXosip2/ +F: package/libolm/ +F: package/libosip2/ F: package/ocrad/ +F: package/restclient-cpp/ F: package/tesseract-ocr/ F: package/webp/ F: package/xapian/ N: Giulio Benetti +F: package/at/ +F: package/libnspr/ +F: package/libnss/ F: package/minicom/ +F: package/nfs-utils/ F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ @@ -901,9 +1030,17 @@ F: fs/f2fs/ F: package/bluez5_utils-headers/ F: package/f2fs-tools/ F: package/pigpio/ +F: package/python-aioblescan/ +F: package/python-bluezero/ +F: package/python-crontab/ F: package/python-falcon/ +F: package/python-ifaddr/ +F: package/python-hiredis/ F: package/python-mimeparse/ F: package/python-pigpio/ +F: package/python-pyjwt/ +F: package/python-redis/ +F: package/python-rpi-ws281x/ F: package/python-wtforms/ N: Guillaume Gardet @@ -919,7 +1056,9 @@ F: package/reaver/ N: Guo Ren F: arch/Config.in.csky F: board/csky/ +F: board/qemu/csky F: configs/csky_* +F: configs/qemu_csky* N: Gustavo Pimentel F: configs/arm_juno_defconfig @@ -935,6 +1074,11 @@ F: package/python-markdown/ F: package/python-remi/ F: package/python-sip/ +N: Heiko Thiery +F: package/libnetconf2/ +F: package/libyang/ +F: package/sysrepo/ + N: Henrique Camargo F: package/json-glib/ @@ -965,6 +1109,7 @@ F: board/bananapi/ F: board/engicam/ F: board/friendlyarm/nanopi-a64/ F: board/friendlyarm/nanopi-neo2/ +F: board/olimex/a33_olinuxino/ F: board/olimex/a64-olinuxino/ F: board/orangepi/orangepi-lite2/ F: board/orangepi/orangepi-one-plus @@ -985,6 +1130,7 @@ F: configs/engicam_imx6ul_geam_defconfig F: configs/engicam_imx6ul_isiot_defconfig F: configs/friendlyarm_nanopi_a64_defconfig F: configs/friendlyarm_nanopi_neo2_defconfig +F: configs/olimex_a33_olinuxino_defconfig F: configs/olimex_a64_olinuxino_defconfig F: configs/orangepi_lite2_defconfig F: configs/orangepi_one_plus_defconfig @@ -996,21 +1142,38 @@ F: configs/pine64_defconfig F: configs/pine64_sopine_defconfig N: James Hilliard +F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/pipewire/ +F: package/python-aioconsole/ F: package/python-aiodns/ F: package/python-aiohttp/ +F: package/python-aiohttp-cors/ +F: package/python-aiohttp-debugtoolbar/ F: package/python-aiohttp-jinja2/ +F: package/python-aiohttp-mako/ F: package/python-aiohttp-remotes/ F: package/python-aiohttp-security/ F: package/python-aiohttp-session/ F: package/python-aiohttp-sse/ +F: package/python-aiologstash/ +F: package/python-aiomonitor/ F: package/python-aiojobs/ F: package/python-aiorwlock/ +F: package/python-aiosignal/ +F: package/python-aiozipkin/ +F: package/python-async-lru/ F: package/python-async-timeout/ +F: package/python-brotli/ F: package/python-cchardet/ +F: package/python-frozenlist/ +F: package/python-janus/ +F: package/python-logstash/ F: package/python-multidict/ F: package/python-pycares/ +F: package/python-sockjs/ +F: package/python-terminaltables/ F: package/python-yarl/ N: James Knight @@ -1034,6 +1197,9 @@ F: configs/orangepi_lite_defconfig N: Jan Kundrát F: configs/solidrun_clearfog_defconfig F: board/solidrun/clearfog/ +F: package/libnetconf2/ +F: package/libyang/ +F: package/sysrepo/ N: Jan Pedersen F: package/zip/ @@ -1052,6 +1218,9 @@ F: package/quota/ N: Jason Pruitt F: package/librtlsdr/ +N: Jens Kleintje +F: package/gcnano-binaries/ + N: Jens Rosenboom F: package/sl/ @@ -1075,7 +1244,12 @@ F: package/wmctrl/ F: package/x11r7/xdriver_xf86-video-imx/ F: package/x11r7/xdriver_xf86-video-imx-viv/ +N: Joao Pinto +F: board/synopsys/vdk/ +F: configs/snps_aarch64_vdk_defconfig + N: Joel Carlson +F: package/c-capnproto/ F: package/capnproto/ F: package/cmocka/ F: package/flatcc/ @@ -1085,19 +1259,26 @@ N: Joel Stanley F: package/pdbg/ F: board/qemu/ppc64le-pseries/ F: configs/qemu_ppc64le_pseries_defconfig +F: board/qemu/ppc-mac99/ +F: configs/qemu_ppc_mac99_defconfig N: Johan Derycke F: package/python-libconfig/ N: Johan Oudinet F: package/ejabberd/ +F: package/erlang-base64url/ F: package/erlang-eimp/ F: package/erlang-goldrush/ +F: package/erlang-idna/ F: package/erlang-jiffy/ +F: package/erlang-jose/ F: package/erlang-lager/ +F: package/erlang-p1-acme/ F: package/erlang-p1-cache-tab/ -F: package/erlang-p1-iconv/ +F: package/erlang-p1-mqtree/ F: package/erlang-p1-oauth2/ +F: package/erlang-p1-pkix/ F: package/erlang-p1-sip/ F: package/erlang-p1-stringprep/ F: package/erlang-p1-stun/ @@ -1106,12 +1287,17 @@ F: package/erlang-p1-utils/ F: package/erlang-p1-xml/ F: package/erlang-p1-xmpp/ F: package/erlang-p1-yaml/ +F: package/erlang-p1-yconf/ F: package/erlang-p1-zlib/ F: package/nginx-dav-ext/ N: John Stile F: package/dhcpcd/ +N: John Faith +F: package/python-inflection/ +F: package/sdbusplus/ + N: Jonathan Ben Avraham F: arch/Config.in.xtensa F: package/autofs/ @@ -1121,11 +1307,16 @@ F: package/phidgetwebservice/ F: package/rapidxml/ F: package/sphinxbase/ +N: Joris Offouga +F: package/python-colorlog/ +F: package/python-simplelogging/ + N: Jörg Krause F: board/lemaker/bananapro/ F: configs/bananapro_defconfig F: package/augeas/ F: package/bluez-alsa/ +F: package/caps/ F: package/freescale-imx/imx-alsa-plugins/ F: package/libopusenc/ F: package/libupnpp/ @@ -1151,6 +1342,7 @@ F: package/at-spi2-core/ F: package/clang/ F: package/gconf/ F: package/libnss/ +F: package/lld/ F: package/llvm/ F: package/python-cython/ F: package/python-raven/ @@ -1162,6 +1354,10 @@ F: package/python-xlib/ N: Joshua Henderson F: package/qt5/qt5wayland/ +N: Jugurtha BELKALEM +F: package/python-cycler/ +F: package/python-matplotlib/ + N: Juha Rantanen F: package/acsccid/ @@ -1188,8 +1384,20 @@ N: Julien Corjon F: package/qt5/ N: Julien Grossholtz +F: board/technologic/ts7680/ +F: configs/ts7680_defconfig F: package/paho-mqtt-c +N: Julien Olivain +F: board/technexion/imx8mmpico/ +F: board/technexion/imx8mpico/ +F: configs/imx8mmpico_defconfig +F: configs/imx8mpico_defconfig +F: package/fluid-soundfont/ +F: package/fluidsynth/ +F: package/glslsandbox-player/ +F: package/ptm2human/ + N: Julien Viard de Galbert F: package/dieharder/ F: package/easy-rsa/ @@ -1206,6 +1414,9 @@ F: package/cpuload/ F: package/bwm-ng/ F: package/ramsmp/ +N: Kieran Bingham +F: package/libcamera/ + N: Koen Martens F: package/capnproto/ F: package/linuxconsoletools/ @@ -1240,20 +1451,38 @@ F: package/mongrel2/ N: Lothar Felten F: board/bananapi/bananapi-m2-ultra/ +F: board/beaglebone/ F: configs/bananapi_m2_ultra_defconfig +F: configs/beaglebone_defconfig +F: configs/beaglebone_qt5_defconfig F: package/ti-sgx-demos/ +F: package/ti-sgx-libgbm/ F: package/ti-sgx-km/ F: package/ti-sgx-um/ +N: Louis Aussedat +F: board/friendlyarm/nanopi-neo-plus2/ +F: configs/friendlyarm_nanopi_neo_plus2_defconfig +F: package/mfoc +F: package/libpam-nfc +F: package/python-dnspython/ +F: package/python-future/ +F: package/python-huepy/ +F: package/python-tqdm/ + N: Louis-Paul Cordier F: package/intel-gmmlib/ +F: package/intel-mediadriver/ +F: package/intel-mediasdk/ N: Luca Ceresoli F: board/olimex/a20_olinuxino/ F: board/zynq/ F: board/zynqmp/ F: configs/olimex_a20_olinuxino_* +F: configs/zynq_microzed_defconfig F: configs/zynq_zed_defconfig +F: configs/zynq_zc706_defconfig F: configs/zynqmp_zcu106_defconfig F: package/agentpp/ F: package/exim/ @@ -1306,6 +1535,7 @@ F: package/easydbus/ F: package/lua-flu/ F: package/lua-stdlib/ F: package/luaossl/ +F: package/murata-cyw-fw/ F: package/rs485conf/ F: package/turbolua/ @@ -1336,7 +1566,6 @@ F: arch/arch.mk.riscv F: arch/Config.in.riscv F: board/qemu/riscv32-virt/ F: board/qemu/riscv64-virt/ -F: boot/riscv-pk/ F: configs/qemu_riscv32_virt_defconfig F: configs/qemu_riscv64_virt_defconfig @@ -1360,6 +1589,10 @@ F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ F: package/x11vnc/ +N: Masahiro Yamada +F: board/arm/foundation-v8/ +F: configs/arm_foundationv8_defconfig + N: Mathieu Audat F: board/technologic/ts4900/ F: configs/ts4900_defconfig @@ -1382,7 +1615,7 @@ F: package/checksec/ F: package/cgroupfs-mount/ F: package/crda/ F: package/cunit/ -F: package/devmem2/ +F: package/dacapo/ F: package/dnsmasq/ F: package/dosfstools/ F: package/eigen/ @@ -1400,6 +1633,7 @@ F: package/iperf/ F: package/iperf3/ F: package/iputils/ F: package/iw/ +F: package/jitterentropy-library/ F: package/kvm-unit-tests/ F: package/kvmtool/ F: package/libcsv/ @@ -1429,11 +1663,17 @@ F: package/policycoreutils/ F: package/proftpd/ F: package/protobuf-c/ F: package/protobuf/ +F: package/python-bunch/ +F: package/python-colorama/ F: package/python-flask-cors/ +F: package/python-iptables/ F: package/python-ipy/ F: package/python-posix-ipc/ +F: package/python-pycairo/ F: package/python-pypcap/ F: package/python-pyrex/ +F: package/python-tinyrpc/ +F: package/python-txdbus/ F: package/raptor/ F: package/rcw/ F: package/rng-tools/ @@ -1448,6 +1688,10 @@ F: package/valijson/ F: package/wpa_supplicant/ F: package/wireless_tools/ F: package/xen/ +F: support/testing/tests/package/br2-external/openjdk/ +F: support/testing/tests/package/test_openjdk.py +F: support/testing/tests/package/test_opkg/ +F: support/testing/tests/package/test_opkg.py N: Mauro Condarelli F: package/mc/ @@ -1512,6 +1756,10 @@ F: board/arcturus/ F: configs/arcturus_ucp1020_defconfig F: configs/arcturus_ucls1012a_defconfig +N: Michael Fischer +F: package/gnuplot/ +F: package/sdl2/ + N: Michael Rommel F: package/knock/ F: package/python-crc16/ @@ -1522,12 +1770,23 @@ F: package/python-spidev/ N: Michael Vetter F: package/jasper/ +F: package/libstrophe/ + +N: Michael Walle +F: package/libavl/ N: Michał Łyszczek F: board/altera/socrates_cyclone5/ F: board/pine64/rock64 F: configs/rock64_defconfig F: configs/socrates_cyclone5_defconfig +F: package/netifrc/ +F: package/openrc/ +F: package/skeleton-init-openrc/ + +N: Michel Stempin +F: board/licheepi/ +F: configs/licheepi_zero_defconfig N: Mike Harmony F: board/sinovoip/m2-plus/ @@ -1541,6 +1800,7 @@ F: package/shadowsocks-libev/ N: Mirza Krak F: package/mender/ +F: package/mender-artifact/ N: Murat Demirten F: package/jpeg-turbo/ @@ -1557,6 +1817,13 @@ N: Naumann Andreas F: package/evemu/ F: package/libevdev/ +N: Nicola Di Lieto +F: package/uacme/ + +N: Nicholas Sielicki +F: board/intel/galileo/ +F: configs/galileo_defconfig + N: Nicolas Cavallari F: package/libgit2/ @@ -1564,6 +1831,7 @@ N: Nicolas Serafini F: package/exiv2/ F: package/nvidia-tegra23/nvidia-tegra23-binaries/ F: package/nvidia-tegra23/nvidia-tegra23-codecs/ +F: package/ofono/ N: Nikolay Dimitrov F: board/embest/riotboard/ @@ -1579,6 +1847,12 @@ F: package/trousers/ N: Norbert Lange F: package/tcf-agent/ +N: Nylon Chen +F: arch/Config.in.nds32 +F: board/andes +F: configs/andes_ae3xx_defconfig +F: toolchain/toolchain-external/toolchain-external-andes-nds32/ + N: Olaf Rempel F: package/ctorrent/ @@ -1611,39 +1885,58 @@ F: package/checksec/ N: Parnell Springmeyer F: package/scrypt/ +N: Pascal de Bruijn +F: package/libargon2/ +F: package/linux-tools/S10hyperv +F: package/linux-tools/hyperv*.service +F: package/linux-tools/linux-tool-hv.mk.in + N: Pascal Huerst F: package/google-breakpad/ N: Patrick Gerber F: package/yavta/ +N: Patrick Havelange +F: support/testing/tests/package/test_lxc.py +F: support/testing/tests/package/test_lxc/ + N: Paul Cercueil F: package/libiio/ F: package/lightning/ +F: package/umtprd/ N: Pedro Aguilar F: package/libunistring/ N: Peter Korsgaard +F: board/beagleboneai/ F: board/minnowboard/ +F: board/librecomputer/lafrite/ F: board/nexbox/a95x/ F: board/openblocks/a6/ F: board/orangepi/ F: board/pandaboard/ F: board/roseapplepi/ F: boot/shim/ +F: configs/beagleboneai_defconfig +F: configs/lafrite_defconfig F: configs/minnowboard_max-graphical_defconfig F: configs/minnowboard_max_defconfig F: configs/nexbox_a95x_defconfig F: configs/openblocks_a6_defconfig F: configs/orangepi_pc_defconfig +F: configs/orangepi_r1_defconfig F: configs/pandaboard_defconfig F: configs/roseapplepi_defconfig F: configs/sheevaplug_defconfig +F: package/bats-core/ F: package/docker-compose/ F: package/dump1090/ +F: package/fatcat/ F: package/flickcurl/ F: package/fscryptctl/ +F: package/ifmetric/ F: package/jo/ F: package/jose/ F: package/libfastjson/ @@ -1670,13 +1963,15 @@ F: package/python-validators/ F: package/python-webob/ F: package/python-websocket-client/ F: package/sedutil/ +F: package/tpm2-totp/ F: package/triggerhappy/ -F: package/wireguard/ +F: package/wireguard-linux-compat/ +F: package/wireguard-tools/ F: support/testing/tests/package/test_docker_compose.py N: Peter Seiderer F: board/raspberrypi/ -F: configs/raspberrypi3_defconfig +F: configs/raspberrypi*_defconfig F: package/assimp/ F: package/bcm2835/ F: package/ddrescue/ @@ -1706,19 +2001,13 @@ N: Petr Kulhavy F: package/linuxptp/ N: Petr Vorel -F: package/connman/ -F: package/feh/ -F: package/imlib2/ +F: package/ima-evm-utils/ F: package/iproute2/ F: package/iputils/ -F: package/libmbim/ -F: package/libqmi/ +F: package/libtirpc/ F: package/linux-backports/ F: package/ltp-testsuite/ -F: package/modem-manager/ -F: package/network-manager/ -F: package/ofono/ -F: package/python-networkmanager/ +F: package/nfs-utils/ F: support/kconfig/ N: Phil Eichinger @@ -1748,6 +2037,24 @@ F: package/kf5/ N: Pierre Floury F: package/trace-cmd/ +N: Pierre-Jean Texier +F: package/fping/ +F: package/genimage/ +F: package/haveged/ +F: package/ipset/ +F: package/libarchive/ +F: package/libevent/ +F: package/libubootenv/ +F: package/libxml2/ +F: package/mongoose/ +F: package/mxml/ +F: package/numactl/ +F: package/python-periphery/ +F: package/raspi-gpio/ +F: package/sbc/ +F: package/stunnel/ +F: package/tree/ + N: Pieter De Gendt F: package/libvips/ @@ -1756,8 +2063,9 @@ F: package/libdvbpsi/ F: package/mraa/ F: package/synergy/ -N: Qais Yousef -F: package/bellagio/ +N: Rafal Susz +F: board/avnet/s6lx9_microboard/ +F: configs/s6lx9_microboard_defconfig N: Rahul Bedarkar F: package/cxxtest/ @@ -1773,6 +2081,9 @@ N: Rahul Jain F: package/uhttpd/ F: package/ustream-ssl/ +N: Refik Tuzakli +F: package/paho-mqtt-cpp/ + N: Rémi Rérolle F: package/libfreeimage/ @@ -1784,6 +2095,7 @@ F: package/lirc-tools/ N: Ricardo Martincoski F: package/atop/ +F: package/thermald/ N: Ricardo Martincoski F: support/testing/infra/ @@ -1793,6 +2105,8 @@ F: support/testing/tests/download/ F: support/testing/tests/package/*_python*.py F: support/testing/tests/package/test_atop.py F: support/testing/tests/package/test_syslog_ng.py +F: support/testing/tests/package/test_tmux.py +F: support/testing/tests/utils/test_check_package.py F: utils/check-package F: utils/checkpackagelib/ @@ -1800,10 +2114,6 @@ N: Richard Braun F: package/curlftpfs/ F: package/tzdata/ -N: Rico Bachmann -F: package/apr-util/ -F: package/subversion/ - N: RJ Ascani F: package/azmq/ @@ -1816,14 +2126,21 @@ F: package/irssi/ F: package/vnstat/ N: Romain Naour +F: board/qemu/ +F: configs/qemu_* +F: package/alure/ F: package/aubio/ +F: package/binutils/ F: package/bullet/ F: package/clang/ F: package/clinfo/ F: package/efl/ +F: package/enet/ F: package/enlightenment/ F: package/flare-engine/ F: package/flare-game/ +F: package/gcc/ +F: package/glibc/ F: package/irrlicht/ F: package/liblinear/ F: package/lensfun/ @@ -1837,8 +2154,10 @@ F: package/mcelog/ F: package/mesa3d/ F: package/minetest/ F: package/minetest-game/ +F: package/ogre/ F: package/openpowerlink/ F: package/physfs/ +F: package/piglit/ F: package/solarus/ F: package/stress-ng/ F: package/supertux/ @@ -1848,9 +2167,9 @@ F: package/tk/ F: package/upower/ F: package/waffle/ F: package/xenomai/ -F: toolchain/toolchain-external/toolchain-external-arm-aarch64/ -F: toolchain/toolchain-external/toolchain-external-arm-aarch64-be/ -F: toolchain/toolchain-external/toolchain-external-arm-arm/ +F: package/zziplib/ +F: support/testing/tests/package/test_glxinfo.py +F: toolchain/ N: Roman Gorbenkov F: package/davfs2/ @@ -1861,7 +2180,6 @@ F: package/miraclecast/ F: package/python-pyasn/ F: package/python-pycrypto/ F: package/python-pysnmp/ -F: package/python-pysnmp-apps/ F: package/python-pysnmp-mibs/ F: package/python-tornado/ F: package/websocketpp/ @@ -1874,9 +2192,8 @@ F: package/mariadb/ N: Ryan Wilkins F: package/biosdevname/ -N: Sam Bobroff -F: arch/Config.in.powerpc -F: package/librtas/ +N: Sam Lancia +F: package/lrzip/ N: Samuel Martin F: package/armadillo/ @@ -1895,6 +2212,9 @@ F: package/urg/ F: package/ussp-push/ F: support/misc/toolchainfile.cmake.in +N: Sam Voss +F: package/ripgrep/ + N: Santosh Multhalli F: package/valijson/ @@ -1930,10 +2250,14 @@ F: configs/orangepi_zero_defconfig F: configs/solidrun_macchiatobin_mainline_defconfig F: configs/solidrun_macchiatobin_marvell_defconfig F: package/armbian-firmware/ +F: package/hostapd/ F: package/rtl8189fs/ +F: package/wpa_supplicant/ F: package/xr819-xradio/ N: Sergio Prado +F: board/toradex/apalis-imx6/ +F: configs/toradex_apalis_imx6_defconfig F: package/aoetools/ F: package/curlpp/ F: package/daq/ @@ -1941,6 +2265,7 @@ F: package/libgdiplus/ F: package/pimd/ F: package/snort/ F: package/stella/ +F: package/tio/ F: package/traceroute/ F: package/tunctl/ F: package/ubus/ @@ -1987,7 +2312,6 @@ F: package/a10disp/ F: package/glmark2/ F: package/libvpx/ F: package/mesa3d-demos/ -F: package/sunxi-mali/ F: package/ti-gfx/ N: Stefan Sørensen @@ -2001,6 +2325,9 @@ F: package/gtest/ F: package/mtdev/ F: package/mtdev2tuio/ +N: Stephan Hoffmann +F: package/libhttpserver/ + N: Steve Calfee F: package/python-pymysql/ F: package/python-pyratemp/ @@ -2026,14 +2353,12 @@ N: Sven Haardiek F: package/lcdproc/ F: package/python-influxdb/ -N: Sven Neumann -F: package/glib-networking/ -F: package/gstreamer1/gst1-libav/ -F: package/libmms/ -F: package/orc/ -F: package/wampcc/ +N: Sven Oliver Moll +F: package/most/ N: Theo Debrouwere +F: board/beagleboardx15/ +F: configs/beagleboardx15_defconfig F: package/pugixml/ N: Thierry Bultel @@ -2045,20 +2370,23 @@ F: package/x265/ N: Thomas Claveirole F: package/fcgiwrap/ +F: package/openlayers/ N: Thomas Davis F: package/civetweb/ N: Thomas De Schampheleire F: docs/manual/ +F: package/cereal/ +F: package/libtelnet/ F: package/opkg-utils/ F: package/perl-convert-asn1/ F: package/perl-crypt-blowfish/ F: package/perl-crypt-cbc/ -F: package/perl-digest-md5/ +F: package/perl-crypt-openssl-aes/ +F: package/perl-math-prime-util/ F: package/perl-mime-base64-urlsafe/ F: package/perl-mojolicious-plugin-authentication/ -F: package/perl-net-ping/ F: package/perl-net-snmp/ F: package/perl-net-ssh2/ F: package/perl-net-telnet/ @@ -2068,11 +2396,16 @@ F: support/scripts/size-stats F: utils/size-stats-compare F: toolchain/ +N: Thomas Huth +F: package/ascii-invaders/ + N: Thomas Petazzoni F: arch/Config.in.arm +F: board/stmicroelectronics/stm32mp157c-dk2/ F: boot/boot-wrapper-aarch64/ F: boot/grub2/ F: boot/gummiboot/ +F: configs/stm32mp157c_dk2_defconfig F: package/android-tools/ F: package/b43-firmware/ F: package/b43-fwcutter/ @@ -2105,6 +2438,7 @@ F: package/monit/ F: package/mpdecimal/ F: package/msmtp/ F: package/musl/ +F: package/musl-fts/ F: package/ne10/ F: package/pkg-python.mk F: package/pkg-autotools.mk @@ -2127,12 +2461,28 @@ F: toolchain/ N: Timo Ketola F: package/fbgrab/ +N: Titouan Christophe +F: package/avro-c/ +F: package/mosquitto/ +F: package/python-avro/ +F: package/redis/ +F: package/waf/ +F: support/testing/tests/package/test_crudini.py + +N: Trent Piepho +F: package/libp11/ + +N: Tudor Holton +F: package/openjdk/ + N: Tzu-Jung Lee F: package/dropwatch/ F: package/tstools/ N: Vadim Kochan F: package/brcm-patchram-plus/ +F: package/gettext-tiny/ +F: package/tinyssh/ N: Valentin Korenblit F: package/clang/ @@ -2143,6 +2493,9 @@ F: package/llvm/ N: Vanya Sergeev F: package/lua-periphery/ +N: Victor Huesca +F: support/testing/tests/core/test_root_password.py + N: Vincent Prince F: package/nss-myhostname/ F: package/utp_com/ @@ -2190,10 +2543,11 @@ N: Wojciech Niziński F: package/fwup/ N: Yann E. MORIN +F: board/friendlyarm/nanopi-neo/ +F: configs/nanopi_neo_defconfig F: fs/squashfs/ F: package/asterisk/ F: package/cegui06/ -F: package/celt051/ F: package/dahdi-linux/ F: package/dahdi-tools/ F: package/dtc/ @@ -2241,7 +2595,6 @@ F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig F: package/acl/ F: package/attr/ -F: package/bluez_utils/ F: package/boost/ F: package/bootstrap/ F: package/cannelloni/ @@ -2254,6 +2607,7 @@ F: package/imlib2/ F: package/jquery-datetimepicker/ F: package/jquery-sidebar/ F: package/kmod/ +F: package/libftdi1/ F: package/libical/ F: package/libmbim/ F: package/libndp/ @@ -2263,6 +2617,7 @@ F: package/libsocketcan/ F: package/libubox/ F: package/libuci/ F: package/linux-firmware/ +F: package/linux-serial-test/ F: package/modem-manager/ F: package/nftables/ F: package/nuttcp/ @@ -2272,17 +2627,22 @@ F: package/poco/ F: package/python* F: package/ser2net/ F: package/socketcand/ +F: package/swig/ F: package/qt5/qt5serialbus/ F: package/sdparm/ F: package/ti-utils/ F: package/x11r7/xapp_xconsole/ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ +F: support/testing/tests/package/test_libftdi1.py +F: support/testing/tests/package/test_python_can.py F: utils/scanpypi N: Zoltan Gyarmati F: package/crudini/ F: package/grantlee/ +F: package/libusb/ +F: package/libusb-compat/ F: package/proj/ F: package/python-configobj/ F: package/python-iniparse/ diff --git a/buildroot/Makefile b/buildroot/Makefile index 93d30ff14..ddc1265d0 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -2,7 +2,7 @@ # # Copyright (C) 1999-2005 by Erik Andersen # Copyright (C) 2006-2014 by the Buildroot developers -# Copyright (C) 2014-2019 by the Buildroot developers +# Copyright (C) 2014-2020 by the Buildroot developers # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2019.02.9 +export BR2_VERSION := 2020.02.1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1578842000 +BR2_VERSION_EPOCH = 1586551000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -179,16 +179,18 @@ $(if $(BASE_DIR),, $(error output directory "$(O)" does not exist)) # still be overridden on the command line, therefore the file is re-created # every time make is run. -BR2_EXTERNAL_FILE = $(BASE_DIR)/.br-external.mk +BR2_EXTERNAL_FILE = $(BASE_DIR)/.br2-external.mk -include $(BR2_EXTERNAL_FILE) -$(shell support/scripts/br2-external \ - -m -o '$(BR2_EXTERNAL_FILE)' $(BR2_EXTERNAL)) +$(shell support/scripts/br2-external -d '$(BASE_DIR)' $(BR2_EXTERNAL)) BR2_EXTERNAL_ERROR = include $(BR2_EXTERNAL_FILE) ifneq ($(BR2_EXTERNAL_ERROR),) $(error $(BR2_EXTERNAL_ERROR)) endif +# Workaround bug in make-4.3: https://savannah.gnu.org/bugs/?57676 +$(BASE_DIR)/.br2-external.mk:; + # To make sure that the environment variable overrides the .config option, # set this before including .config. ifneq ($(BR2_DL_DIR),) @@ -205,6 +207,7 @@ BR_GRAPH_OUT := $(or $(BR2_GRAPH_OUT),pdf) BUILD_DIR := $(BASE_DIR)/build BINARIES_DIR := $(BASE_DIR)/images BASE_TARGET_DIR := $(BASE_DIR)/target +PER_PACKAGE_DIR := $(BASE_DIR)/per-package # initial definition so that 'make clean' works for most users, even without # .config. HOST_DIR will be overwritten later when .config is included. HOST_DIR := $(BASE_DIR)/host @@ -227,21 +230,12 @@ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) -include $(BR2_CONFIG) endif -# Parallel execution of this Makefile is disabled because it changes -# the packages building order, that can be a problem for two reasons: -# - If a package has an unspecified optional dependency and that -# dependency is present when the package is built, it is used, -# otherwise it isn't (but compilation happily proceeds) so the end -# result will differ if the order is swapped due to parallel -# building. -# - Also changing the building order can be a problem if two packages -# manipulate the same file in the target directory. -# -# Taking into account the above considerations, if you still want to execute -# this top-level Makefile in parallel comment the ".NOTPARALLEL" line and -# use the -j option when building, e.g: -# make -j$((`getconf _NPROCESSORS_ONLN`+1)) +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),) +# Disable top-level parallel build if per-package directories is not +# used. Indeed, per-package directories is necessary to guarantee +# determinism and reproducibility with top-level parallel build. .NOTPARALLEL: +endif # timezone and locale may affect build output ifeq ($(BR2_REPRODUCIBLE),y) @@ -349,7 +343,7 @@ export HOSTARCH := $(shell LC_ALL=C $(HOSTCC_NOCCACHE) -v 2>&1 | \ # When adding a new host gcc version in Config.in, # update the HOSTCC_MAX_VERSION variable: -HOSTCC_MAX_VERSION := 8 +HOSTCC_MAX_VERSION := 9 HOSTCC_VERSION := $(shell V=$$($(HOSTCC_NOCCACHE) --version | \ sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p'); \ @@ -438,6 +432,7 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \ -e s/arceb/arc/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -e s/aarch64.*/arm64/ \ + -e s/nds32.*/nds32/ \ -e s/or1k/openrisc/ \ -e s/parisc64/parisc/ \ -e s/powerpc64.*/powerpc/ \ @@ -452,19 +447,24 @@ XZCAT := $(call qstrip,$(BR2_XZCAT)) LZCAT := $(call qstrip,$(BR2_LZCAT)) TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf -# packages compiled for the host go here +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +HOST_DIR = $(if $(PKG),$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/host,$(call qstrip,$(BR2_HOST_DIR))) +TARGET_DIR = $(if $(ROOTFS),$(ROOTFS_$(ROOTFS)_TARGET_DIR),$(if $(PKG),$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/target,$(BASE_TARGET_DIR))) +else HOST_DIR := $(call qstrip,$(BR2_HOST_DIR)) - -# The target directory is common to all packages, -# but there is one that is specific to each filesystem. TARGET_DIR = $(if $(ROOTFS),$(ROOTFS_$(ROOTFS)_TARGET_DIR),$(BASE_TARGET_DIR)) +endif ifneq ($(HOST_DIR),$(BASE_DIR)/host) HOST_DIR_SYMLINK = $(BASE_DIR)/host $(HOST_DIR_SYMLINK): $(BASE_DIR) - ln -snf $(HOST_DIR) $(BASE_DIR)/host + ln -snf $(HOST_DIR) $(HOST_DIR_SYMLINK) endif +STAGING_DIR_SYMLINK = $(BASE_DIR)/staging +$(STAGING_DIR_SYMLINK): $(BASE_DIR) + ln -snf $(STAGING_DIR) $(STAGING_DIR_SYMLINK) + # Quotes are needed for spaces and all in the original PATH content. BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)" @@ -593,8 +593,8 @@ world: target-post-image .PHONY: prepare-sdk prepare-sdk: world @$(call MESSAGE,"Rendering the SDK relocatable") - $(TOPDIR)/support/scripts/fix-rpath host - $(TOPDIR)/support/scripts/fix-rpath staging + PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath host + PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath staging $(INSTALL) -m 755 $(TOPDIR)/support/misc/relocate-sdk.sh $(HOST_DIR)/relocate-sdk.sh mkdir -p $(HOST_DIR)/share/buildroot echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location @@ -698,8 +698,9 @@ define PURGE_LOCALES rm -f $(LOCALE_WHITELIST) for i in $(LOCALE_NOPURGE) locale-archive; do echo $$i >> $(LOCALE_WHITELIST); done - for dir in $(wildcard $(addprefix $(TARGET_DIR),/usr/share/locale /usr/share/X11/locale /usr/lib/locale)); \ + for dir in $(addprefix $(TARGET_DIR),/usr/share/locale /usr/share/X11/locale /usr/lib/locale); \ do \ + if [ ! -d $$dir ]; then continue; fi; \ for langdir in $$dir/*; \ do \ if [ -e "$${langdir}" ]; \ @@ -727,19 +728,22 @@ $(TARGETS_ROOTFS): target-finalize # Avoid the rootfs name leaking down the dependency chain target-finalize: ROOTFS= -host-finalize: $(HOST_DIR_SYMLINK) +TARGET_DIR_FILES_LISTS = $(sort $(wildcard $(BUILD_DIR)/*/.files-list.txt)) +HOST_DIR_FILES_LISTS = $(sort $(wildcard $(BUILD_DIR)/*/.files-list-host.txt)) +STAGING_DIR_FILES_LISTS = $(sort $(wildcard $(BUILD_DIR)/*/.files-list-staging.txt)) + +.PHONY: host-finalize +host-finalize: $(PACKAGES) $(HOST_DIR) $(HOST_DIR_SYMLINK) + @$(call MESSAGE,"Finalizing host directory") + $(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR)) .PHONY: staging-finalize -staging-finalize: - @ln -snf $(STAGING_DIR) $(BASE_DIR)/staging +staging-finalize: $(STAGING_DIR_SYMLINK) .PHONY: target-finalize -target-finalize: $(PACKAGES) host-finalize +target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize @$(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 + $(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR)) $(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 \ @@ -779,7 +783,7 @@ endif ln -sf ../usr/lib/os-release $(TARGET_DIR)/etc @$(call MESSAGE,"Sanitizing RPATH in target tree") - $(TOPDIR)/support/scripts/fix-rpath target + PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath target # For a merged /usr, ensure that /lib, /bin and /sbin and their /usr # counterparts are appropriately setup as symlinks ones to the others. @@ -801,6 +805,13 @@ endif # merged /usr $(call MESSAGE,"Copying overlay $(d)"); \ $(call SYSTEM_RSYNC,$(d),$(TARGET_DIR))$(sep)) + $(if $(TARGET_DIR_FILES_LISTS), \ + cat $(TARGET_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list.txt + $(if $(HOST_DIR_FILES_LISTS), \ + cat $(HOST_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list-host.txt + $(if $(STAGING_DIR_FILES_LISTS), \ + cat $(STAGING_DIR_FILES_LISTS)) > $(BUILD_DIR)/packages-file-list-staging.txt + @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ $(call MESSAGE,"Executing post-build script $(s)"); \ $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) @@ -892,13 +903,29 @@ graph-size: $(Q)$(TOPDIR)/support/scripts/size-stats --builddir $(BASE_DIR) \ --graph $(GRAPHS_DIR)/graph-size.$(BR_GRAPH_OUT) \ --file-size-csv $(GRAPHS_DIR)/file-size-stats.csv \ - --package-size-csv $(GRAPHS_DIR)/package-size-stats.csv + --package-size-csv $(GRAPHS_DIR)/package-size-stats.csv \ + $(BR2_GRAPH_SIZE_OPTS) .PHONY: check-dependencies check-dependencies: @cd "$(CONFIG_DIR)"; \ $(TOPDIR)/support/scripts/graph-depends -C +.PHONY: show-info +show-info: + @: + $(info $(call clean-json, \ + { $(foreach p, \ + $(sort $(foreach i,$(PACKAGES) $(TARGETS_ROOTFS), \ + $(i) \ + $($(call UPPERCASE,$(i))_FINAL_RECURSIVE_DEPENDENCIES) \ + ) \ + ), \ + $(call json-info,$(call UPPERCASE,$(p)))$(comma) \ + ) } \ + ) \ + ) + else # ifeq ($(BR2_HAVE_DOT_CONFIG),y) # Some subdirectories are also package names. To avoid that "make linux" @@ -918,9 +945,6 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y) HOSTCFLAGS = $(CFLAGS_FOR_BUILD) export HOSTCFLAGS -.PHONY: prepare-kconfig -prepare-kconfig: outputmakefile $(BUILD_DIR)/.br2-external.in - $(BUILD_DIR)/buildroot-config/%onf: mkdir -p $(@D)/lxdialog PKG_CONFIG_PATH="$(HOST_PKG_CONFIG_PATH)" $(MAKE) CC="$(HOSTCC_NOCCACHE)" HOSTCC="$(HOSTCC_NOCCACHE)" \ @@ -937,22 +961,22 @@ COMMON_CONFIG_ENV = \ KCONFIG_TRISTATE=$(BUILD_DIR)/buildroot-config/tristate.config \ BR2_CONFIG=$(BR2_CONFIG) \ HOST_GCC_VERSION="$(HOSTCC_VERSION)" \ - BUILD_DIR=$(BUILD_DIR) \ + BASE_DIR=$(BASE_DIR) \ SKIP_LEGACY= -xconfig: $(BUILD_DIR)/buildroot-config/qconf prepare-kconfig +xconfig: $(BUILD_DIR)/buildroot-config/qconf outputmakefile @$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN) -gconfig: $(BUILD_DIR)/buildroot-config/gconf prepare-kconfig +gconfig: $(BUILD_DIR)/buildroot-config/gconf outputmakefile @$(COMMON_CONFIG_ENV) srctree=$(TOPDIR) $< $(CONFIG_CONFIG_IN) -menuconfig: $(BUILD_DIR)/buildroot-config/mconf prepare-kconfig +menuconfig: $(BUILD_DIR)/buildroot-config/mconf outputmakefile @$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN) -nconfig: $(BUILD_DIR)/buildroot-config/nconf prepare-kconfig +nconfig: $(BUILD_DIR)/buildroot-config/nconf outputmakefile @$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN) -config: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig +config: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN) # For the config targets that automatically select options, we pass @@ -960,11 +984,11 @@ config: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig # no values are set for the legacy options so a subsequent oldconfig # will query them. Therefore, run an additional olddefconfig. -randconfig allyesconfig alldefconfig allnoconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig +randconfig allyesconfig alldefconfig allnoconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --$@ $(CONFIG_CONFIG_IN) @$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null -randpackageconfig allyespackageconfig allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig +randpackageconfig allyespackageconfig allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg @$(COMMON_CONFIG_ENV) SKIP_LEGACY=y \ KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \ @@ -972,15 +996,15 @@ randpackageconfig allyespackageconfig allnopackageconfig: $(BUILD_DIR)/buildroot @rm -f $(CONFIG_DIR)/.config.nopkg @$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null -oldconfig syncconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig +oldconfig syncconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< --$@ $(CONFIG_CONFIG_IN) -defconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig +defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN) define percent_defconfig # Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig -%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig prepare-kconfig +%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) endef @@ -988,7 +1012,7 @@ $(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent update-defconfig: savedefconfig -savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig +savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< \ --savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \ $(CONFIG_CONFIG_IN) @@ -1004,7 +1028,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig # staging and target directories do NOT list these as # dependencies anywhere else -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST): +$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a @@ -1016,13 +1040,6 @@ ifeq ($(NEED_WRAPPER),y) $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) endif -# Even though the target is a real file, we mark it as PHONY as we -# want it to be re-generated each time make is invoked, in case the -# value of BR2_EXTERNAL is changed. -.PHONY: $(BUILD_DIR)/.br2-external.in -$(BUILD_DIR)/.br2-external.in: $(BUILD_DIR) - $(Q)support/scripts/br2-external -k -o "$(@)" $(BR2_EXTERNAL) - # printvars prints all the variables currently defined in our # Makefiles. Alternatively, if a non-empty VARS variable is passed, # only the variables matching the make pattern passed in VARS are @@ -1031,7 +1048,7 @@ $(BUILD_DIR)/.br2-external.in: $(BUILD_DIR) printvars: @: $(foreach V, \ - $(sort $(if $(VARS),$(filter $(VARS),$(.VARIABLES)),$(.VARIABLES))), \ + $(sort $(filter $(VARS),$(.VARIABLES))), \ $(if $(filter-out environment% default automatic, \ $(origin $V)), \ $(if $(QUOTED_VARS),\ @@ -1043,7 +1060,7 @@ printvars: clean: rm -rf $(BASE_TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) $(HOST_DIR_SYMLINK) \ $(BUILD_DIR) $(BASE_DIR)/staging \ - $(LEGAL_INFO_DIR) $(GRAPHS_DIR) + $(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR) .PHONY: distclean distclean: clean @@ -1051,7 +1068,7 @@ ifeq ($(O),$(CURDIR)/output) rm -rf $(O) endif rm -rf $(TOPDIR)/dl $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/..config.tmp \ - $(CONFIG_DIR)/.auto.deps $(BR2_EXTERNAL_FILE) + $(CONFIG_DIR)/.auto.deps $(BASE_DIR)/.br2-external.* .PHONY: help help: @@ -1092,6 +1109,7 @@ help: @echo ' -depends - Build '\''s dependencies' @echo ' -configure - Build up to the configure step' @echo ' -build - Build up to the build step' + @echo ' -show-info - generate info about , as a JSON blurb' @echo ' -show-depends - List packages on which depends' @echo ' -show-rdepends - List packages which have as a dependency' @echo ' -show-recursive-depends' @@ -1124,7 +1142,8 @@ help: @echo ' source - download all sources needed for offline-build' @echo ' external-deps - list external packages used' @echo ' legal-info - generate info about license compliance' - @echo ' printvars - dump all the internal variables' + @echo ' show-info - generate info about packages, as a JSON blurb' + @echo ' printvars - dump internal variables selected with VARS=...' @echo @echo ' make V=0|1 - 0 => quiet build (default), 1 => verbose build' @echo ' make O=dir - Locate all output files in "dir", including .config' diff --git a/buildroot/arch/Config.in b/buildroot/arch/Config.in index f50760a0c..94bd2150c 100644 --- a/buildroot/arch/Config.in +++ b/buildroot/arch/Config.in @@ -77,8 +77,10 @@ config BR2_aarch64_be config BR2_csky bool "csky" - select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT select BR2_ARCH_HAS_MMU_MANDATORY + # Most variants are supported by gcc-9+, except one that is + # handled as a special exception in package/gcc/Config.in.host + select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 help csky is processor IP from china. http://www.c-sky.com/ @@ -154,6 +156,14 @@ config BR2_mips64el http://www.mips.com/ http://en.wikipedia.org/wiki/MIPS_Technologies +config BR2_nds32 + bool "nds32" + select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT + select BR2_ARCH_HAS_MMU_MANDATORY + help + nds32 is a 32-bit architecture developed by Andes Technology. + https://en.wikipedia.org/wiki/Andes_Technology + config BR2_nios2 bool "Nios II" select BR2_ARCH_HAS_MMU_MANDATORY @@ -294,6 +304,10 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_8 bool select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 +config BR2_ARCH_NEEDS_GCC_AT_LEAST_9 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 + # The following string values are defined by the individual # Config.in.$ARCH files config BR2_ARCH @@ -419,6 +433,10 @@ if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el source "arch/Config.in.mips" endif +if BR2_nds32 +source "arch/Config.in.nds32" +endif + if BR2_nios2 source "arch/Config.in.nios2" endif diff --git a/buildroot/arch/Config.in.arc b/buildroot/arch/Config.in.arc index 156384b9a..fdfafda31 100644 --- a/buildroot/arch/Config.in.arc +++ b/buildroot/arch/Config.in.arc @@ -13,13 +13,43 @@ config BR2_arc770d config BR2_archs38 bool "ARC HS38" + help + Generic ARC HS capable of running Linux, i.e. with MMU, + caches and 32-bit multiplier. Also it corresponds to the + default configuration in older GNU toolchain versions. + +config BR2_archs38_64mpy + bool "ARC HS38 with 64-bit mpy" + help + Fully featured ARC HS capable of running Linux, i.e. with + MMU, caches and 64-bit multiplier. + + If you're not sure which version of ARC HS core you build + for use this one. + +config BR2_archs38_full + bool "ARC HS38 with Quad MAC & FPU" + help + Fully featured ARC HS with additional support for + - Dual- and quad multiply and MC oprations + - Double-precision FPU + + It corresponds to "hs38_slc_full" ARC HS template in + ARChitect. + +config BR2_archs4x_rel31 + bool "ARC HS48 rel 31" + help + Latest release of HS48 processor + - Dual- and quad multiply and MC oprations + - Double-precision FPU endchoice # Choice of atomic instructions presence config BR2_ARC_ATOMIC_EXT bool "Atomic extension (LLOCK/SCOND instructions)" - default y if BR2_arc770d || BR2_archs38 + default y if BR2_arc770d || BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31 config BR2_ARCH default "arc" if BR2_arcle @@ -37,10 +67,13 @@ config BR2_GCC_TARGET_CPU default "arc700" if BR2_arc750d default "arc700" if BR2_arc770d default "archs" if BR2_archs38 + default "hs38" if BR2_archs38_64mpy + default "hs38_linux" if BR2_archs38_full + default "hs4x_rel31" if BR2_archs4x_rel31 config BR2_READELF_ARCH_NAME default "ARCompact" if BR2_arc750d || BR2_arc770d - default "ARCv2" if BR2_archs38 + default "ARCv2" if BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31 choice prompt "MMU Page Size" @@ -60,7 +93,7 @@ choice config BR2_ARC_PAGE_SIZE_4K bool "4KB" - depends on BR2_arc770d || BR2_archs38 + depends on BR2_arc770d || BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31 config BR2_ARC_PAGE_SIZE_8K bool "8KB" @@ -70,7 +103,7 @@ config BR2_ARC_PAGE_SIZE_8K config BR2_ARC_PAGE_SIZE_16K bool "16KB" - depends on BR2_arc770d || BR2_archs38 + depends on BR2_arc770d || BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31 endchoice @@ -79,3 +112,6 @@ config BR2_ARC_PAGE_SIZE default "4K" if BR2_ARC_PAGE_SIZE_4K default "8K" if BR2_ARC_PAGE_SIZE_8K default "16K" if BR2_ARC_PAGE_SIZE_16K + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.arm b/buildroot/arch/Config.in.arm index a9972978d..4c0910e4f 100644 --- a/buildroot/arch/Config.in.arm +++ b/buildroot/arch/Config.in.arm @@ -367,6 +367,13 @@ 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_emag + bool "emag" + depends on 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_9 config BR2_exynos_m1 bool "exynos-m1" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 @@ -376,50 +383,62 @@ config BR2_exynos_m1 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 -if BR2_ARCH_IS_64 config BR2_falkor bool "falkor" + depends on 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_phecda + bool "phecda" + depends on 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_9 config BR2_qdf24xx bool "qdf24xx" + depends on 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_thunderx - bool "thunderx" + bool "thunderx (aka octeontx)" + depends on 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_thunderxt81 - bool "thunderxt81" + bool "thunderxt81 (aka octeontx81)" + depends on 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_thunderxt83 - bool "thunderxt83" + bool "thunderxt83 (aka octeontx83)" + depends on 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_thunderxt88 bool "thunderxt88" + depends on 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_thunderxt88p1 bool "thunderxt88p1" + depends on 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 config BR2_xgene1 bool "xgene1" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 @@ -430,59 +449,94 @@ config BR2_xgene1 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" + depends on 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" + depends on 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" + depends on 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 -if BR2_ARCH_IS_64 comment "armv8.2a cores" config BR2_cortex_a55 bool "cortex-A55" + depends on 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_8 config BR2_cortex_a75 bool "cortex-A75" + depends on 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_8 config BR2_cortex_a75_a55 bool "cortex-A75/A55 big.LITTLE" + depends on 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_8 -endif # BR2_ARCH_IS_64 +config BR2_cortex_a76 + bool "cortex-A76" + 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_9 +config BR2_cortex_a76_a55 + bool "cortex-A76/A55 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_9 +config BR2_neoverse_n1 + bool "neoverse-N1 (aka ares)" + 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_9 +config BR2_tsv110 + bool "tsv110" + depends on 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_9 -if BR2_ARCH_IS_64 -comment "armv8.3a cores" +comment "armv8.4a cores" config BR2_saphira bool "saphira" + depends on 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_8 -endif # BR2_ARCH_IS_64 endchoice config BR2_ARM_ENABLE_NEON @@ -815,12 +869,17 @@ 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 "emag" if BR2_emag default "exynos-m1" if BR2_exynos_m1 default "falkor" if BR2_falkor + default "phecda" if BR2_phecda default "qdf24xx" if BR2_qdf24xx - default "thunderx" if BR2_thunderx - default "thunderxt81" if BR2_thunderxt81 - default "thunderxt83" if BR2_thunderxt83 + default "thunderx" if BR2_thunderx && !BR2_TOOLCHAIN_GCC_AT_LEAST_9 + default "octeontx" if BR2_thunderx && BR2_TOOLCHAIN_GCC_AT_LEAST_9 + default "thunderxt81" if BR2_thunderxt81 && !BR2_TOOLCHAIN_GCC_AT_LEAST_9 + default "octeontx81" if BR2_thunderxt81 && BR2_TOOLCHAIN_GCC_AT_LEAST_9 + default "thunderxt83" if BR2_thunderxt83 && !BR2_TOOLCHAIN_GCC_AT_LEAST_9 + default "octeontx83" if BR2_thunderxt83 && BR2_TOOLCHAIN_GCC_AT_LEAST_9 default "thunderxt88" if BR2_thunderxt88 default "thunderxt88p1" if BR2_thunderxt88p1 default "xgene1" if BR2_xgene1 @@ -832,7 +891,11 @@ config BR2_GCC_TARGET_CPU default "cortex-a55" if BR2_cortex_a55 default "cortex-a75" if BR2_cortex_a75 default "cortex-a75.cortex-a55" if BR2_cortex_a75_a55 - # armv8.3a + default "cortex-a76" if BR2_cortex_a76 + default "cortex-a76.cortex-a55" if BR2_cortex_a76_a55 + default "neoverse-n1" if BR2_neoverse_n1 + default "tsv110" if BR2_tsv110 + # armv8.4a default "saphira" if BR2_saphira config BR2_GCC_TARGET_ABI @@ -866,3 +929,6 @@ config BR2_GCC_TARGET_MODE config BR2_READELF_ARCH_NAME default "ARM" if BR2_arm || BR2_armeb default "AArch64" if BR2_aarch64 || BR2_aarch64_be + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.csky b/buildroot/arch/Config.in.csky index e88e4e2d1..7e2029f75 100644 --- a/buildroot/arch/Config.in.csky +++ b/buildroot/arch/Config.in.csky @@ -5,6 +5,8 @@ choice Specific CPU variant to use config BR2_ck610 + # Not supported by upstream gcc <= 9, and handled as a special + # exception in package/gcc/Config.in.host bool "ck610" config BR2_ck807 @@ -13,19 +15,26 @@ config BR2_ck807 config BR2_ck810 bool "ck810" +config BR2_ck860 + bool "ck860" + endchoice config BR2_CSKY_FPU bool "Enable FPU coprocessor" - depends on BR2_ck810 || BR2_ck807 + depends on BR2_ck810 || BR2_ck807 || BR2_ck860 help You can say N here if your C-SKY CPU doesn't have a Floating-Point Coprocessor or if you don't need FPU support for your user-space programs. -config BR2_CSKY_DSP - bool "Enable DSP enhanced instructions" - depends on BR2_ck810 || BR2_ck807 +config BR2_CSKY_VDSP + bool "Enable VDSP enhanced instructions Co-processor" + depends on BR2_CSKY_FPU + +config BR2_GCC_TARGET_FLOAT_ABI + default "soft" if !BR2_CSKY_FPU + default "hard" if BR2_CSKY_FPU config BR2_ARCH default "csky" @@ -33,16 +42,8 @@ config BR2_ARCH config BR2_ENDIAN default "LITTLE" -config BR2_GCC_TARGET_CPU - default "ck610" if (BR2_ck610 && !BR2_CSKY_FPU && !BR2_CSKY_DSP) - default "ck807" if (BR2_ck807 && !BR2_CSKY_FPU && !BR2_CSKY_DSP) - default "ck807e" if (BR2_ck807 && !BR2_CSKY_FPU && BR2_CSKY_DSP) - default "ck807f" if (BR2_ck807 && BR2_CSKY_FPU && !BR2_CSKY_DSP) - default "ck807ef" if (BR2_ck807 && BR2_CSKY_FPU && BR2_CSKY_DSP) - default "ck810" if (BR2_ck810 && !BR2_CSKY_FPU && !BR2_CSKY_DSP) - default "ck810e" if (BR2_ck810 && !BR2_CSKY_FPU && BR2_CSKY_DSP) - default "ck810f" if (BR2_ck810 && BR2_CSKY_FPU && !BR2_CSKY_DSP) - default "ck810ef" if (BR2_ck810 && BR2_CSKY_FPU && BR2_CSKY_DSP) - config BR2_READELF_ARCH_NAME default "CSKY" + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.m68k b/buildroot/arch/Config.in.m68k index c134df2f1..275f47f1d 100644 --- a/buildroot/arch/Config.in.m68k +++ b/buildroot/arch/Config.in.m68k @@ -38,3 +38,6 @@ config BR2_GCC_TARGET_CPU config BR2_READELF_ARCH_NAME default "MC68000" + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.microblaze b/buildroot/arch/Config.in.microblaze index 042712a1b..5fe2906d4 100644 --- a/buildroot/arch/Config.in.microblaze +++ b/buildroot/arch/Config.in.microblaze @@ -12,3 +12,6 @@ config BR2_READELF_ARCH_NAME config BR2_microblaze bool default y if BR2_microblazeel || BR2_microblazebe + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.mips b/buildroot/arch/Config.in.mips index 7f7aa63f0..619456c2d 100644 --- a/buildroot/arch/Config.in.mips +++ b/buildroot/arch/Config.in.mips @@ -271,3 +271,6 @@ config BR2_GCC_TARGET_ABI config BR2_READELF_ARCH_NAME default "MIPS R3000" + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.nds32 b/buildroot/arch/Config.in.nds32 new file mode 100644 index 000000000..322ff49f2 --- /dev/null +++ b/buildroot/arch/Config.in.nds32 @@ -0,0 +1,14 @@ +config BR2_ARCH + default "nds32le" + +config BR2_GCC_TARGET_ARCH + default "v3" + +config BR2_ENDIAN + default "LITTLE" + +config BR2_READELF_ARCH_NAME + default "Andes Technology compact code size embedded RISC processor family" + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.nios2 b/buildroot/arch/Config.in.nios2 index 746633101..aae435fa1 100644 --- a/buildroot/arch/Config.in.nios2 +++ b/buildroot/arch/Config.in.nios2 @@ -6,3 +6,6 @@ config BR2_ENDIAN config BR2_READELF_ARCH_NAME default "Altera Nios II" + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.or1k b/buildroot/arch/Config.in.or1k index b31ab3e95..abdf498fb 100644 --- a/buildroot/arch/Config.in.or1k +++ b/buildroot/arch/Config.in.or1k @@ -6,3 +6,6 @@ config BR2_ENDIAN config BR2_READELF_ARCH_NAME default "OpenRISC 1000" + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.powerpc b/buildroot/arch/Config.in.powerpc index 7a452a630..56c4b526e 100644 --- a/buildroot/arch/Config.in.powerpc +++ b/buildroot/arch/Config.in.powerpc @@ -205,14 +205,9 @@ config BR2_GCC_TARGET_CPU default "power7" if BR2_powerpc_power7 default "power8" if BR2_powerpc_power8 -config BR2_GCC_TARGET_ABI - default "altivec" if BR2_PPC_ABI_altivec - default "no-altivec" if BR2_PPC_ABI_no-altivec - default "spe" if BR2_PPC_ABI_spe - default "no-spe" if BR2_PPC_ABI_no-spe - default "ibmlongdouble" if BR2_PPC_ABI_ibmlongdouble - default "ieeelongdouble" if BR2_PPC_ABI_ieeelongdouble - config BR2_READELF_ARCH_NAME default "PowerPC" if BR2_powerpc default "PowerPC64" if BR2_powerpc64 || BR2_powerpc64le + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.riscv b/buildroot/arch/Config.in.riscv index 097719e84..1fc20e5de 100644 --- a/buildroot/arch/Config.in.riscv +++ b/buildroot/arch/Config.in.riscv @@ -80,8 +80,12 @@ endchoice choice prompt "Target ABI" - default BR2_RISCV_ABI_ILP32 if !BR2_ARCH_IS_64 - default BR2_RISCV_ABI_LP64 if BR2_ARCH_IS_64 + default BR2_RISCV_ABI_ILP32D if !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD + default BR2_RISCV_ABI_ILP32F if !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVF + default BR2_RISCV_ABI_ILP32 if !BR2_ARCH_IS_64 + default BR2_RISCV_ABI_LP64D if BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD + default BR2_RISCV_ABI_LP64F if BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVF + default BR2_RISCV_ABI_LP64 if BR2_ARCH_IS_64 config BR2_RISCV_ABI_ILP32 bool "ilp32" @@ -125,3 +129,6 @@ config BR2_GCC_TARGET_ABI config BR2_READELF_ARCH_NAME default "RISC-V" + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.sh b/buildroot/arch/Config.in.sh index 1cb2db90a..b5cce18e2 100644 --- a/buildroot/arch/Config.in.sh +++ b/buildroot/arch/Config.in.sh @@ -30,3 +30,6 @@ config BR2_ENDIAN config BR2_READELF_ARCH_NAME default "Renesas / SuperH SH" + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.sparc b/buildroot/arch/Config.in.sparc index b22b55142..4c4dc6174 100644 --- a/buildroot/arch/Config.in.sparc +++ b/buildroot/arch/Config.in.sparc @@ -32,3 +32,6 @@ config BR2_GCC_TARGET_CPU config BR2_READELF_ARCH_NAME default "Sparc" if BR2_sparc default "Sparc v9" if BR2_sparc64 + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.x86 b/buildroot/arch/Config.in.x86 index 331ee06bf..eb655adbc 100644 --- a/buildroot/arch/Config.in.x86 +++ b/buildroot/arch/Config.in.x86 @@ -301,3 +301,6 @@ config BR2_GCC_TARGET_ARCH config BR2_READELF_ARCH_NAME default "Intel 80386" if BR2_i386 default "Advanced Micro Devices X86-64" if BR2_x86_64 + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/Config.in.xtensa b/buildroot/arch/Config.in.xtensa index 14049480e..a79d90698 100644 --- a/buildroot/arch/Config.in.xtensa +++ b/buildroot/arch/Config.in.xtensa @@ -50,3 +50,6 @@ config BR2_ARCH config BR2_READELF_ARCH_NAME default "Tensilica Xtensa Processor" + +# vim: ft=kconfig +# -*- mode:kconfig; -*- diff --git a/buildroot/arch/arch.mk.arc b/buildroot/arch/arch.mk.arc new file mode 100644 index 000000000..32b818b0e --- /dev/null +++ b/buildroot/arch/arch.mk.arc @@ -0,0 +1,17 @@ +ifeq ($(BR2_arc),y) + +# -matomic is always required when the ARC core has the atomic extensions +ifeq ($(BR2_ARC_ATOMIC_EXT),y) +ARCH_TOOLCHAIN_WRAPPER_OPTS = -matomic +endif + +# Explicitly set LD's "max-page-size" instead of relying on some defaults +ifeq ($(BR2_ARC_PAGE_SIZE_4K),y) +ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=4096 +else ifeq ($(BR2_ARC_PAGE_SIZE_8K),y) +ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=8192 +else ifeq ($(BR2_ARC_PAGE_SIZE_16K),y) +ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=16384 +endif + +endif diff --git a/buildroot/arch/arch.mk.csky b/buildroot/arch/arch.mk.csky new file mode 100644 index 000000000..fb59ae22f --- /dev/null +++ b/buildroot/arch/arch.mk.csky @@ -0,0 +1,26 @@ +# +# Configure the GCC_TARGET_ARCH variable and append the +# appropriate C-SKY ISA extensions. +# + +ifeq ($(BR2_csky),y) + +ifeq ($(BR2_ck610),y) +GCC_TARGET_CPU := ck610 +else ifeq ($(BR2_ck807),y) +GCC_TARGET_CPU := ck807 +else ifeq ($(BR2_ck810),y) +GCC_TARGET_CPU := ck810 +else ifeq ($(BR2_ck860),y) +GCC_TARGET_CPU := ck860 +endif + +ifeq ($(BR2_CSKY_FPU),y) +GCC_TARGET_CPU := $(GCC_TARGET_CPU)f +endif + +ifeq ($(BR2_CSKY_VDSP),y) +GCC_TARGET_CPU := $(GCC_TARGET_CPU)v +endif + +endif diff --git a/buildroot/board/acmesystems/aria-g25/genimage.cfg b/buildroot/board/acmesystems/aria-g25/genimage.cfg index 2e2eb129a..b40ad9edf 100644 --- a/buildroot/board/acmesystems/aria-g25/genimage.cfg +++ b/buildroot/board/acmesystems/aria-g25/genimage.cfg @@ -11,7 +11,7 @@ image boot.vfat { } file boot.bin { - image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.6.bin" + image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.13.bin" } } size = 16M diff --git a/buildroot/board/acmesystems/aria-g25/post-image.sh b/buildroot/board/acmesystems/aria-g25/post-image.sh deleted file mode 100755 index 2846f56d7..000000000 --- a/buildroot/board/acmesystems/aria-g25/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/buildroot/board/acmesystems/arietta-g25/genimage.cfg b/buildroot/board/acmesystems/arietta-g25/genimage.cfg index 420f1b6be..7c3112dd5 100644 --- a/buildroot/board/acmesystems/arietta-g25/genimage.cfg +++ b/buildroot/board/acmesystems/arietta-g25/genimage.cfg @@ -11,7 +11,7 @@ image boot.vfat { } file boot.bin { - image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.6.bin" + image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.13.bin" } } size = 16M diff --git a/buildroot/board/acmesystems/arietta-g25/post-image.sh b/buildroot/board/acmesystems/arietta-g25/post-image.sh deleted file mode 100755 index 2846f56d7..000000000 --- a/buildroot/board/acmesystems/arietta-g25/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/buildroot/board/andes/ae3xx/ae3xx.fragment b/buildroot/board/andes/ae3xx/ae3xx.fragment new file mode 100644 index 000000000..3b13d1074 --- /dev/null +++ b/buildroot/board/andes/ae3xx/ae3xx.fragment @@ -0,0 +1 @@ +CONFIG_NDS32_BUILTIN_DTB="ae3xx" diff --git a/buildroot/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/buildroot/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch new file mode 100644 index 000000000..adb60937b --- /dev/null +++ b/buildroot/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch @@ -0,0 +1,28 @@ +From 90d52d180dcc5d1300dc352ca709eb6453894143 Mon Sep 17 00:00:00 2001 +From: Nylon Chen +Date: Wed, 28 Nov 2018 16:26:46 +0800 +Subject: [PATCH] nds32: Fix boot messages garbled + +In order to display uart correctly we have to pass the correct setting of uart to kernel by bootarg. +This patch will provide such settings to set the correct uart baud rate. + +Signed-off-by: Nylon Chen +--- + arch/nds32/boot/dts/ae3xx.dts | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/nds32/boot/dts/ae3xx.dts b/arch/nds32/boot/dts/ae3xx.dts +index bb39749a6673..aefe2090926a 100644 +--- a/arch/nds32/boot/dts/ae3xx.dts ++++ b/arch/nds32/boot/dts/ae3xx.dts +@@ -6,6 +6,7 @@ + interrupt-parent = <&intc>; + + chosen { ++ bootargs = "memblock=debug earlycon console=ttyS0,38400n8 debug loglevel=7"; + stdout-path = &serial0; + }; + +-- +2.18.0 + diff --git a/buildroot/board/andes/readme.txt b/buildroot/board/andes/readme.txt new file mode 100644 index 000000000..0f95c6554 --- /dev/null +++ b/buildroot/board/andes/readme.txt @@ -0,0 +1,49 @@ +Intro +===== + +Andestech(nds32) AE3XX Platform + +The AE3XX prototype demonstrates the AE3XX example platform on the FPGA. +It is composed of one Andestech(nds32) processor and AE3XX. + +How to build it +=============== + +Configure Buildroot +------------------- + +The andes_ae3xx_defconfig configuration is a sample configuration with +all that is required to bring the FPGA Development Board: + + $ make andes_ae3xx_defconfig + +Build everything +---------------- +Note: you will need to have access to the network, since Buildroot will +download the packages' sources. + + $ make + +Result of the build +------------------- + +After building, you should obtain this tree: + +output/images/ + +-- vmlinux + +-- rootfs.cpio + +-- rootfs.tar + +How to run it +============= + +Run +--- + + Setup the Console with the rate 38400/8-N-1. + + $ cd output/images + $ ../host/bin/nds32le-linux-gdb vmlinux + $ target remote [your host] + $ lo + $ c diff --git a/buildroot/board/arcturus/ppc-ucp1020/configs/linux-4.1.x.config b/buildroot/board/arcturus/ppc-ucp1020/configs/linux-4.1.x.config deleted file mode 100644 index a371df810..000000000 --- a/buildroot/board/arcturus/ppc-ucp1020/configs/linux-4.1.x.config +++ /dev/null @@ -1,269 +0,0 @@ -CONFIG_PPC_85xx=y -CONFIG_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_CROSS_COMPILE="powerpc-linux-" -CONFIG_LOCALVERSION="-ANI-uCP1020-64EE512" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_DEFAULT_HOSTNAME="uCP1020-64EE512" -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_AUDIT=y -CONFIG_NO_HZ_IDLE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_LOG_CPU_MAX_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED=y -CONFIG_BLK_DEV_INITRD=y -# CONFIG_RD_BZIP2 is not set -# CONFIG_RD_LZMA is not set -# CONFIG_RD_XZ is not set -# CONFIG_RD_LZO is not set -# CONFIG_RD_LZ4 is not set -CONFIG_SYSCTL_SYSCALL=y -CONFIG_EMBEDDED=y -# CONFIG_SLUB_DEBUG is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_JUMP_LABEL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y -# CONFIG_EFI_PARTITION is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_UCP1020_SOM=y -CONFIG_HIGHMEM=y -CONFIG_PREEMPT=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_MATH_EMULATION=y -CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED=y -CONFIG_SWIOTLB=y -# CONFIG_COMPACTION is not set -CONFIG_PCI=y -CONFIG_PCIEPORTBUS=y -# CONFIG_PCIEAER is not set -# CONFIG_PCIEASPM is not set -CONFIG_PCI_MSI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_SYN_COOKIES=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_IPV6 is not set -CONFIG_NETFILTER=y -CONFIG_BRIDGE_NETFILTER=y -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_FTP=y -CONFIG_NETFILTER_XT_TARGET_CONNMARK=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_MATCH_COMMENT=y -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_HELPER=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_NETMAP=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_MANGLE=y -CONFIG_BRIDGE=y -CONFIG_VLAN_8021Q=y -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_HTB=y -CONFIG_CFG80211=y -# CONFIG_CFG80211_DEFAULT_PS is not set -CONFIG_MAC80211=y -# CONFIG_MAC80211_RC_MINSTREL is not set -CONFIG_UEVENT_HELPER_PATH="/bin/hotplug" -CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_FTL=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_SST25L=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_PLATFORM=y -CONFIG_MTD_NAND_FSL_ELBC=y -CONFIG_MTD_NAND_FSL_UPM=y -CONFIG_MTD_SPI_NOR=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=131072 -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_SCSI_LOGGING=y -CONFIG_NETDEVICES=y -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_NET_VENDOR_ADAPTEC is not set -# CONFIG_NET_VENDOR_AGERE is not set -# CONFIG_NET_VENDOR_ALTEON is not set -# CONFIG_NET_VENDOR_AMD is not set -# CONFIG_NET_VENDOR_ARC is not set -# CONFIG_NET_VENDOR_ATHEROS is not set -# CONFIG_NET_CADENCE is not set -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_BROCADE is not set -# CONFIG_NET_VENDOR_CHELSIO is not set -# CONFIG_NET_VENDOR_CISCO is not set -# CONFIG_NET_VENDOR_DEC is not set -# CONFIG_NET_VENDOR_DLINK is not set -# CONFIG_NET_VENDOR_EMULEX is not set -# CONFIG_NET_VENDOR_EXAR is not set -CONFIG_GIANFAR=y -# CONFIG_NET_VENDOR_HP is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MELLANOX is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set -# CONFIG_NET_VENDOR_MYRI is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_NVIDIA is not set -# CONFIG_NET_VENDOR_OKI is not set -# CONFIG_NET_PACKET_ENGINE is not set -# CONFIG_NET_VENDOR_QLOGIC is not set -# CONFIG_NET_VENDOR_QUALCOMM is not set -# CONFIG_NET_VENDOR_REALTEK is not set -# CONFIG_NET_VENDOR_RDC is not set -# CONFIG_NET_VENDOR_ROCKER is not set -# CONFIG_NET_VENDOR_SAMSUNG is not set -# CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SILAN is not set -# CONFIG_NET_VENDOR_SIS is not set -# CONFIG_NET_VENDOR_SMSC is not set -# CONFIG_NET_VENDOR_STMICRO is not set -# CONFIG_NET_VENDOR_SUN is not set -# CONFIG_NET_VENDOR_TEHUTI is not set -# CONFIG_NET_VENDOR_TI is not set -# CONFIG_NET_VENDOR_VIA is not set -# CONFIG_NET_VENDOR_WIZNET is not set -# CONFIG_NET_VENDOR_XILINX is not set -CONFIG_MICREL_PHY=y -CONFIG_IWLWIFI=m -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIO_LIBPS2=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_NOZOMI=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=2 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_NVRAM=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MPC=y -CONFIG_SPI=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_FSL_ESPI=y -CONFIG_SPI_SPIDEV=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_MPC8XXX=y -CONFIG_SENSORS_LM90=y -CONFIG_THERMAL=y -CONFIG_WATCHDOG=y -CONFIG_BOOKE_WDT=y -CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=36 -CONFIG_MEDIA_SUPPORT=y -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_USB_VIDEO_CLASS=y -CONFIG_USB_GSPCA=y -CONFIG_USB_PWC=y -CONFIG_USB_ZR364XX=y -CONFIG_USB_STKWEBCAM=y -CONFIG_VIDEO_EM28XX=y -CONFIG_VIDEO_EM28XX_V4L2=y -# CONFIG_HID is not set -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_MON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_FSL=y -CONFIG_USB_ACM=y -CONFIG_USB_WDM=y -CONFIG_USB_TMC=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DEBUG=y -CONFIG_USB_MDC800=y -CONFIG_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_OF_ESDHC=y -CONFIG_DMADEVICES=y -CONFIG_FSL_DMA=y -CONFIG_ASYNC_TX_DMA=y -# CONFIG_IOMMU_SUPPORT is not set -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_EXT4_FS=y -CONFIG_XFS_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_NTFS_FS=y -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_WBUF_VERIFY=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_FS_XATTR=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RUBIN=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V4=y -CONFIG_NFSD=y -CONFIG_CIFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_CRC_T10DIF=y -CONFIG_CRC_ITU_T=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -# CONFIG_RCU_CPU_STALL_INFO is not set -# CONFIG_FTRACE is not set -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_PCBC=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA1_PPC=y -CONFIG_CRYPTO_DEFLATE=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_TALITOS=y diff --git a/buildroot/board/arcturus/ppc-ucp1020/patches/linux/0001-Arcturus-uCP1020-BSP-support.patch b/buildroot/board/arcturus/ppc-ucp1020/patches/linux/0001-Arcturus-uCP1020-BSP-support.patch deleted file mode 100644 index 759712714..000000000 --- a/buildroot/board/arcturus/ppc-ucp1020/patches/linux/0001-Arcturus-uCP1020-BSP-support.patch +++ /dev/null @@ -1,462 +0,0 @@ -From a243628639e12a4bd0a737eac78a12ed240cd137 Mon Sep 17 00:00:00 2001 -From: Oleksandr G Zhadan -Date: Mon, 18 Jul 2016 10:40:16 -0400 -Subject: [PATCH] Arcturus uCP1020 BSP support - -The uCP1020 product family (ucp1020) is an Arcturus Networks Inc. -System on Modules product featuring a NXP QorIQ P1020 CPU, -optionally populated with 1 or 2 Gig-Ethernet PHYs, -DDR3, NOR Flash, eMMC NAND Flash and/or SPI Flash. - -Signed-off-by: Oleksandr G Zhadan -Signed-off-by: Michael Durrant ---- - arch/powerpc/boot/dts/ucp1020.dts | 87 ++++++++++++ - arch/powerpc/boot/dts/ucp1020.dtsi | 211 ++++++++++++++++++++++++++++++ - arch/powerpc/platforms/85xx/Kconfig | 7 + - arch/powerpc/platforms/85xx/Makefile | 1 + - arch/powerpc/platforms/85xx/ucp1020_som.c | 92 +++++++++++++ - 5 files changed, 398 insertions(+) - create mode 100644 arch/powerpc/boot/dts/ucp1020.dts - create mode 100644 arch/powerpc/boot/dts/ucp1020.dtsi - create mode 100644 arch/powerpc/platforms/85xx/ucp1020_som.c - -diff --git a/arch/powerpc/boot/dts/ucp1020.dts b/arch/powerpc/boot/dts/ucp1020.dts -new file mode 100644 -index 0000000..291e70a ---- /dev/null -+++ b/arch/powerpc/boot/dts/ucp1020.dts -@@ -0,0 +1,87 @@ -+/* -+ * uCP1020 Tree Source (32-bit address map) -+ * -+ * Copyright 2013-2016 Arcturus Networks Inc. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * * Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * * Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * * Neither the name of Freescale Semiconductor nor the -+ * names of its contributors may be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * -+ * ALTERNATIVELY, this software may be distributed under the terms of the -+ * GNU General Public License ("GPL") as published by the Free Software -+ * Foundation, either version 2 of that License or (at your option) any -+ * later version. -+ * -+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY -+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY -+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/include/ "fsl/p1020si-pre.dtsi" -+/ { -+ model = "arcturus,uCP1020"; -+ compatible = "arcturus,uCP1020"; -+ -+ memory { -+ device_type = "memory"; -+ }; -+ -+ lbc: localbus@ffe05000 { -+ reg = <0 0xffe05000 0 0x1000>; -+ -+ /* NOR Flash */ -+ ranges = <0x0 0x0 0x0 0xec000000 0x04000000>; -+ }; -+ -+ soc: soc@ffe00000 { -+ ranges = <0x0 0x0 0xffe00000 0x100000>; -+ }; -+ -+ pci0: pcie@ffe09000 { -+ ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000 -+ 0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>; -+ reg = <0 0xffe09000 0 0x1000>; -+ pcie@0 { -+ ranges = <0x2000000 0x0 0xa0000000 -+ 0x2000000 0x0 0xa0000000 -+ 0x0 0x20000000 -+ -+ 0x1000000 0x0 0x0 -+ 0x1000000 0x0 0x0 -+ 0x0 0x100000>; -+ }; -+ }; -+ -+ pci1: pcie@ffe0a000 { -+ reg = <0 0xffe0a000 0 0x1000>; -+ ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000 -+ 0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>; -+ pcie@0 { -+ ranges = <0x2000000 0x0 0x80000000 -+ 0x2000000 0x0 0x80000000 -+ 0x0 0x20000000 -+ -+ 0x1000000 0x0 0x0 -+ 0x1000000 0x0 0x0 -+ 0x0 0x100000>; -+ }; -+ }; -+}; -+ -+/include/ "ucp1020.dtsi" -+/include/ "fsl/p1020si-post.dtsi" -diff --git a/arch/powerpc/boot/dts/ucp1020.dtsi b/arch/powerpc/boot/dts/ucp1020.dtsi -new file mode 100644 -index 0000000..7cff949 ---- /dev/null -+++ b/arch/powerpc/boot/dts/ucp1020.dtsi -@@ -0,0 +1,211 @@ -+/* -+ * uCP1020 Device Tree Source stub (no addresses or top-level ranges) -+ * -+ * Copyright 2013-2016 Arcturus Networks Inc. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * * Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * * Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * * Neither the name of Freescale Semiconductor nor the -+ * names of its contributors may be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * -+ * ALTERNATIVELY, this software may be distributed under the terms of the -+ * GNU General Public License ("GPL") as published by the Free Software -+ * Foundation, either version 2 of that License or (at your option) any -+ * later version. -+ * -+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY -+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY -+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+&lbc { -+ nor@0,0 { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ compatible = "cfi-flash"; -+ reg = <0x0 0x0 0x04000000>; -+ bank-width = <2>; -+ device-width = <1>; -+ -+ partition@100000 { -+ /* 7MB - PART 0 */ -+ reg = <0x00100000 0x00700000>; -+ label = "0"; -+ }; -+ -+ partition@800000 { -+ /* 32MB - PART 1 */ -+ reg = <0x0800000 0x02000000>; -+ label = "1"; -+ }; -+ -+ partition@2800000 { -+ /* 8MB - PART 2 */ -+ reg = <0x02800000 0x00800000>; -+ label = "2"; -+ }; -+ -+ partition@3000000 { -+ /* (16MB - 512K) - PART 3 JFFS 2 */ -+ reg = <0x03000000 0x00f80000>; -+ label = "3"; -+ }; -+ -+ partition@0 { -+ /* 512KB - bootloader[u-boot, uCbootloader] */ -+ reg = <0x0 0x00080000>; -+ label = "BOOT_SPI"; -+ }; -+ -+ partition@3f80000 { -+ /* 512KB - bootloade NOR r[u-boot, uCbootloader] */ -+ reg = <0x03f80000 0x00080000>; -+ label = "B"; -+ }; -+ -+ partition@80000 { -+ /* 256KB - bootloaders environment (uCenv) */ -+ reg = <0x00080000 0x00040000>; -+ -+ label = "E"; -+ }; -+ -+ partition@C0000 { -+ /* 256KB - bootloaders environment (u-boot) */ -+ reg = <0x000C0000 0x00040000>; -+ label = "UENV"; -+ }; -+ }; -+}; -+ -+&soc { -+ i2c@3000 { -+ spoc@14 { -+ compatible = "conexant,cx2070x"; -+ reg = <0x14>; -+ }; -+ }; -+ -+ i2c@3100 { -+ dtt@4C { -+ compatible = "national,lm90"; -+ reg = <0x4C>; -+ }; -+ }; -+ -+ spi@7000 { -+ flash@0 { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ compatible = "winbond,w25q80bl"; -+ reg = <0>; -+ spi-max-frequency = <40000000>; /* input clock */ -+ -+ partition@0 { -+ label = "SPI MBR"; -+ reg = <0x00000000 0x00002000>; -+ read-only; -+ }; -+ partition@2000 { -+ label = "SPI ENV"; -+ reg = <0x00002000 0x00006000>; -+ read-only; -+ }; -+ partition@8000 { -+ label = "SPI FS"; -+ reg = <0x00008000 0x000F8000>; -+ }; -+ }; -+ flash@3 { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ compatible = "spansion,s25fl008k"; -+ reg = <3>; -+ spi-max-frequency = <40000000>; /* input clock */ -+ partition@0 { -+ label = "SPI USER"; -+ reg = <0x00000000 0x00100000>; -+ }; -+ }; -+ }; -+ -+ usb@22000 { -+ phy_type = "ulpi"; -+ dr_mode = "host"; -+ }; -+ -+ mdio@24000 { -+ phy0: ethernet-phy@4 { -+ interrupt-parent = <&mpic>; -+ interrupts = <4 1>; -+ reg = <0x04>; -+ }; -+ -+ phy1: ethernet-phy@6 { -+ interrupt-parent = <&mpic>; -+ interrupts = <8 1>; -+ reg = <0x6>; -+ }; -+ }; -+ -+ enet0: ethernet@b0000 { -+ phy-handle = <&phy0>; -+ phy-connection-type = "rgmii-id"; -+ }; -+ -+ enet1: ethernet@b1000 { -+ status = "disabled"; -+ }; -+ -+ enet2: ethernet@b2000 { -+ phy-handle = <&phy1>; -+ phy-connection-type = "rgmii-id"; -+ }; -+ -+ gpio0: gpio@f000 { -+ compatible = "fsl,mpc8572-gpio", "fsl,pq3-gpio"; -+ reg = <0xf000 0x1000>; -+ interrupts = <47 2>; -+ interrupt-parent = <&mpic>; -+ #gpio-cells = <2>; -+ gpio-controller; -+ }; -+ -+ gpio-leds { -+ compatible = "gpio-leds"; -+ gpio5 { -+ label = "led1"; /* LED15 */ -+ gpios = <&gpio0 5 0>; -+ }; -+ gpio12 { -+ label = "led2"; /* LED16 */ -+ gpios = <&gpio0 12 0>; -+ }; -+ gpio13 { -+ label = "led3"; /* LED17 */ -+ gpios = <&gpio0 13 0>; -+ }; -+ gpio7 { -+ label = "led4"; /* LED18 */ -+ gpios = <&gpio0 7 0>; -+ }; -+ gpio6 { -+ label = "led5"; /* LED19 */ -+ gpios = <&gpio0 6 0>; -+ }; -+ }; -+}; -diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig -index 2fb4b24..81a944f 100644 ---- a/arch/powerpc/platforms/85xx/Kconfig -+++ b/arch/powerpc/platforms/85xx/Kconfig -@@ -241,6 +241,13 @@ config SGY_CTS1000 - help - Enable this to support functionality in Servergy's CTS-1000 systems. - -+config UCP1020_SOM -+ bool "Arcturus uCP1020 Rev.1.3 System on Module" -+ select DEFAULT_UIMAGE -+ help -+ This option enables support for the Arcturus Networks Inc. -+ uCP1020 System on Module. -+ - config MVME2500 - bool "Artesyn MVME2500" - select DEFAULT_UIMAGE -diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile -index 1fe7fb9..84f2b9a 100644 ---- a/arch/powerpc/platforms/85xx/Makefile -+++ b/arch/powerpc/platforms/85xx/Makefile -@@ -31,4 +31,5 @@ obj-$(CONFIG_XES_MPC85xx) += xes_mpc85xx.o - obj-$(CONFIG_GE_IMP3A) += ge_imp3a.o - obj-$(CONFIG_PPC_QEMU_E500) += qemu_e500.o - obj-$(CONFIG_SGY_CTS1000) += sgy_cts1000.o -+obj-$(CONFIG_UCP1020_SOM) += ucp1020_som.o - obj-$(CONFIG_MVME2500) += mvme2500.o -diff --git a/arch/powerpc/platforms/85xx/ucp1020_som.c b/arch/powerpc/platforms/85xx/ucp1020_som.c -new file mode 100644 -index 0000000..777e8ad ---- /dev/null -+++ b/arch/powerpc/platforms/85xx/ucp1020_som.c -@@ -0,0 +1,92 @@ -+/* -+ * Arcturus Networks Inc. uCP1020 module Setup -+ * -+ * Copyright 2014-2016 Arcturus Networks Inc. -+ * -+ * by Oleksandr G Zhadan & Michael Durrant (www.ArcturusNetworks.com) -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License as published by the -+ * Free Software Foundation; either version 2 of the License, or (at your -+ * option) any later version. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include "smp.h" -+ -+#include "mpc85xx.h" -+ -+void __init ucp1020_som_pic_init(void) -+{ -+ struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN | -+ MPIC_SINGLE_DEST_CPU, -+ 0, 256, " OpenPIC "); -+ -+ BUG_ON(mpic == NULL); -+ -+ mpic_init(mpic); -+} -+ -+/* -+ * Setup the architecture -+ */ -+static void __init ucp1020_som_setup_arch(void) -+{ -+ if (ppc_md.progress) -+ ppc_md.progress("uCP1020_SoM_setup_arch()", 0); -+ -+ mpc85xx_smp_init(); -+ -+ fsl_pci_assign_primary(); -+ pr_info("\n\t%s (http://www.arcturusnetworks.com)\n", ppc_md.name); -+} -+ -+machine_arch_initcall(ucp1020, mpc85xx_common_publish_devices); -+machine_arch_initcall(ucp1020, swiotlb_setup_bus_notifier); -+ -+/* -+ * Called very early, device-tree isn't unflattened -+ */ -+static int __init ucp1020_probe(void) -+{ -+ unsigned long root = of_get_flat_dt_root(); -+ -+ if (of_flat_dt_is_compatible(root, "arcturus,uCP1020")) -+ return 1; -+ return 0; -+} -+ -+define_machine(ucp1020) { -+ .name = "uCP1020 SoM - Arcturus Networks Inc.", -+ .probe = ucp1020_probe, -+ .setup_arch = ucp1020_som_setup_arch, -+ .init_IRQ = ucp1020_som_pic_init, -+#ifdef CONFIG_PCI -+ .pcibios_fixup_bus = fsl_pcibios_fixup_bus, -+#endif -+ .get_irq = mpic_get_irq, -+ .restart = fsl_rstcr_restart, -+ .calibrate_decr = generic_calibrate_decr, -+#ifdef DEBUG -+ .progress = udbg_progress, -+#endif -+}; --- -2.1.4 - diff --git a/buildroot/board/arcturus/ppc-ucp1020/patches/linux/0002-p1020-esdhc-controller-reserved-bit.patch b/buildroot/board/arcturus/ppc-ucp1020/patches/linux/0002-p1020-esdhc-controller-reserved-bit.patch deleted file mode 100644 index 9694140f8..000000000 --- a/buildroot/board/arcturus/ppc-ucp1020/patches/linux/0002-p1020-esdhc-controller-reserved-bit.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4c74fd1266287deca0c1ff091071c5b8558b9735 Mon Sep 17 00:00:00 2001 -From: Oleksandr G Zhadan -Date: Mon, 18 Jul 2016 10:45:41 -0400 -Subject: [PATCH 1/1] p1020 esdhc controller reserved bit - -Prevent SDHCI core from writing reserved bits, where -p1020 reserved bit is SDHCI_CTRL_HISPD, not 0x01(SDHCI_CTRL_LED). - -Signed-off-by: Oleksandr G Zhadan -Signed-off-by: Michael Durrant ---- - drivers/mmc/host/sdhci-esdhc.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/mmc/host/sdhci-esdhc.h b/drivers/mmc/host/sdhci-esdhc.h -index a870c42..b45de0a 100644 ---- a/drivers/mmc/host/sdhci-esdhc.h -+++ b/drivers/mmc/host/sdhci-esdhc.h -@@ -45,6 +45,6 @@ - #define ESDHC_DMA_SYSCTL 0x40c - #define ESDHC_DMA_SNOOP 0x00000040 - --#define ESDHC_HOST_CONTROL_RES 0x01 -+#define ESDHC_HOST_CONTROL_RES (SDHCI_CTRL_HISPD) - - #endif /* _DRIVERS_MMC_SDHCI_ESDHC_H */ --- -2.1.4 diff --git a/buildroot/board/arcturus/ppc-ucp1020/patches/linux/0003-powerpc-ptrace-Fix-out-of-bounds-array-access-warning.patch b/buildroot/board/arcturus/ppc-ucp1020/patches/linux/0003-powerpc-ptrace-Fix-out-of-bounds-array-access-warning.patch deleted file mode 100644 index aac15a121..000000000 --- a/buildroot/board/arcturus/ppc-ucp1020/patches/linux/0003-powerpc-ptrace-Fix-out-of-bounds-array-access-warning.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 35b7ce4f8f290794d3b89db7461e8c568b5defa1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 25 Apr 2016 09:19:17 -0700 -Subject: powerpc/ptrace: Fix out of bounds array access warning - -commit 1e407ee3b21f981140491d5b8a36422979ca246f upstream. - -gcc-6 correctly warns about a out of bounds access - -arch/powerpc/kernel/ptrace.c:407:24: warning: index 32 denotes an offset greater than size of 'u64[32][1] {aka long long unsigned int[32][1]}' [-Warray-bounds] - offsetof(struct thread_fp_state, fpr[32][0])); - ^ - -check the end of array instead of beginning of next element to fix this - -Signed-off-by: Khem Raj -Cc: Kees Cook -Cc: Michael Ellerman -Cc: Segher Boessenkool -Tested-by: Aaro Koskinen -Acked-by: Olof Johansson -Cc: Arnd Bergmann -Signed-off-by: Michael Ellerman -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Oleksandr Zhadan ---- - arch/powerpc/kernel/ptrace.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c -index f21897b..93f200f 100644 ---- a/arch/powerpc/kernel/ptrace.c -+++ b/arch/powerpc/kernel/ptrace.c -@@ -376,7 +376,7 @@ static int fpr_get(struct task_struct *target, const struct user_regset *regset, - - #else - BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) != -- offsetof(struct thread_fp_state, fpr[32][0])); -+ offsetof(struct thread_fp_state, fpr[32])); - - return user_regset_copyout(&pos, &count, &kbuf, &ubuf, - &target->thread.fp_state, 0, -1); -@@ -404,7 +404,7 @@ static int fpr_set(struct task_struct *target, const struct user_regset *regset, - return 0; - #else - BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) != -- offsetof(struct thread_fp_state, fpr[32][0])); -+ offsetof(struct thread_fp_state, fpr[32])); - - return user_regset_copyin(&pos, &count, &kbuf, &ubuf, - &target->thread.fp_state, 0, -1); --- -cgit v1.1 diff --git a/buildroot/board/arcturus/ppc-ucp1020/readme.txt b/buildroot/board/arcturus/ppc-ucp1020/readme.txt index c46fd80e7..07986f50e 100644 --- a/buildroot/board/arcturus/ppc-ucp1020/readme.txt +++ b/buildroot/board/arcturus/ppc-ucp1020/readme.txt @@ -38,6 +38,7 @@ You'll need to program the files created by buildroot into the NOR flash. B$ protect off 0xeff80000 +$filesize B$ erase 0xeff80000 +$filesize B$ cp.b $loadaddr 0xeff80000 $filesize + B$ protect on 0xeff80000 +$filesize 2. Program the kernel diff --git a/buildroot/board/armadeus/readme.txt b/buildroot/board/armadeus/readme.txt index 98c7b0824..c03508c60 100644 --- a/buildroot/board/armadeus/readme.txt +++ b/buildroot/board/armadeus/readme.txt @@ -44,11 +44,11 @@ Result of the build When the build is finished, you will end up with: output/images/ - ├── imx**-apfxxdev.dtb [1] - ├── rootfs.tar - ├── rootfs.ubi - ├── rootfs.ubifs - └── uImage + +-- imx**-apfxxdev.dtb [1] + +-- rootfs.tar + +-- rootfs.ubi + +-- rootfs.ubifs + +-- uImage [1] Only if the kernel version used uses a Device Tree. diff --git a/buildroot/board/atmel/sama5d27_som1_ek_mmc/genimage.cfg b/buildroot/board/atmel/sama5d27_som1_ek_mmc/genimage.cfg index f5222ff89..eaa3896fc 100644 --- a/buildroot/board/atmel/sama5d27_som1_ek_mmc/genimage.cfg +++ b/buildroot/board/atmel/sama5d27_som1_ek_mmc/genimage.cfg @@ -5,9 +5,6 @@ image boot.vfat { files = { "zImage", "at91-sama5d27_som1_ek.dtb", - "at91-sama5d27_som1_ek_pda4.dtb", - "at91-sama5d27_som1_ek_pda7.dtb", - "at91-sama5d27_som1_ek_pda7b.dtb", "boot.bin", "u-boot.bin" } diff --git a/buildroot/board/atmel/sama5d2_xplained_mmc/genimage.cfg b/buildroot/board/atmel/sama5d2_xplained_mmc/genimage.cfg index d3b7af5b5..3cc8ae2f8 100644 --- a/buildroot/board/atmel/sama5d2_xplained_mmc/genimage.cfg +++ b/buildroot/board/atmel/sama5d2_xplained_mmc/genimage.cfg @@ -5,9 +5,6 @@ image boot.vfat { files = { "zImage", "at91-sama5d2_xplained.dtb", - "at91-sama5d2_xplained_pda4.dtb", - "at91-sama5d2_xplained_pda7.dtb", - "at91-sama5d2_xplained_pda7b.dtb", "boot.bin", "u-boot.bin" } diff --git a/buildroot/board/atmel/sama5d3_xplained_mmc/genimage.cfg b/buildroot/board/atmel/sama5d3_xplained_mmc/genimage.cfg index 277ce5f9c..1b4649512 100644 --- a/buildroot/board/atmel/sama5d3_xplained_mmc/genimage.cfg +++ b/buildroot/board/atmel/sama5d3_xplained_mmc/genimage.cfg @@ -5,9 +5,6 @@ image boot.vfat { files = { "zImage", "at91-sama5d3_xplained.dtb", - "at91-sama5d3_xplained_pda4.dtb", - "at91-sama5d3_xplained_pda7.dtb", - "at91-sama5d3_xplained_pda7b.dtb", "boot.bin", "u-boot.bin" } diff --git a/buildroot/board/atmel/sama5d4_xplained_mmc/genimage.cfg b/buildroot/board/atmel/sama5d4_xplained_mmc/genimage.cfg index 70bb3e4ff..004f2fddb 100644 --- a/buildroot/board/atmel/sama5d4_xplained_mmc/genimage.cfg +++ b/buildroot/board/atmel/sama5d4_xplained_mmc/genimage.cfg @@ -5,10 +5,6 @@ image boot.vfat { files = { "zImage", "at91-sama5d4_xplained.dtb", - "at91-sama5d4_xplained_hdmi.dtb", - "at91-sama5d4_xplained_pda4.dtb", - "at91-sama5d4_xplained_pda7.dtb", - "at91-sama5d4_xplained_pda7b.dtb", "boot.bin", "u-boot.bin" } diff --git a/buildroot/board/beagleboardx15/post-image.sh b/buildroot/board/beagleboardx15/post-image.sh deleted file mode 100755 index f52682f5d..000000000 --- a/buildroot/board/beagleboardx15/post-image.sh +++ /dev/null @@ -1,15 +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/buildroot/board/beagleboardx15/readme.txt b/buildroot/board/beagleboardx15/readme.txt index 56ebca8c5..5af2c914b 100644 --- a/buildroot/board/beagleboardx15/readme.txt +++ b/buildroot/board/beagleboardx15/readme.txt @@ -26,17 +26,17 @@ Result of the build After building, you should get a tree like this: output/images/ - ├── am57xx-beagle-x15.dtb - ├── am57xx-beagle-x15-revb1.dtb - ├── boot.vfat - ├── MLO - ├── rootfs.ext2 - ├── rootfs.ext4 - ├── rootfs.tar - ├── sdcard.img - ├── u-boot.img - ├── u-boot-spl.bin - └── zImage + +-- am57xx-beagle-x15.dtb + +-- am57xx-beagle-x15-revb1.dtb + +-- boot.vfat + +-- MLO + +--rootfs.ext2 + +-- rootfs.ext4 + +-- rootfs.tar + +-- sdcard.img + +-- u-boot.img + +-- u-boot-spl.bin + +-- zImage How to write the microSD card ============================= diff --git a/buildroot/board/beaglebone/linux-4.1-sgx.fragment b/buildroot/board/beaglebone/linux-4.1-sgx.fragment deleted file mode 100644 index c0d2e7b28..000000000 --- a/buildroot/board/beaglebone/linux-4.1-sgx.fragment +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y -CONFIG_OMAP2_DSS_INIT=y -CONFIG_OMAP_DSS_BASE=y -CONFIG_OMAP2_DSS=y -CONFIG_OMAP2_DSS_DPI=y -CONFIG_DRM_OMAP=y -CONFIG_DRM_OMAP_NUM_CRTCS=2 -CONFIG_DRM_OMAP_WB_M2M=y -CONFIG_DRM_TILCDC=y -CONFIG_DRM_I2C_NXP_TDA998X=y -CONFIG_DRM=y diff --git a/buildroot/board/beaglebone/linux-sgx.fragment b/buildroot/board/beaglebone/linux-sgx.fragment new file mode 100644 index 000000000..58d46f588 --- /dev/null +++ b/buildroot/board/beaglebone/linux-sgx.fragment @@ -0,0 +1,13 @@ +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y +CONFIG_OMAP2_DSS_INIT=y +CONFIG_OMAP_DSS_BASE=y +CONFIG_OMAP2_DSS=y +CONFIG_OMAP2_DSS_DPI=y +CONFIG_DRM_OMAP=y +CONFIG_DRM_OMAP_NUM_CRTCS=2 +CONFIG_DRM_OMAP_WB_M2M=y +CONFIG_DRM_TILCDC=y +CONFIG_DRM_I2C_NXP_TDA998X=y +CONFIG_DRM=y +CONFIG_DRM_LEGACY=y diff --git a/buildroot/board/beaglebone/post-build.sh b/buildroot/board/beaglebone/post-build.sh new file mode 100755 index 000000000..ffdd19138 --- /dev/null +++ b/buildroot/board/beaglebone/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt diff --git a/buildroot/board/beaglebone/post-image.sh b/buildroot/board/beaglebone/post-image.sh deleted file mode 100755 index 68fe0896c..000000000 --- a/buildroot/board/beaglebone/post-image.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# post-image.sh for CircuitCo BeagleBone and TI am335x-evm -# 2014, Marcin Jabrzyk -# 2016, Lothar Felten - -BOARD_DIR="$(dirname $0)" - -# copy the uEnv.txt to the output/images directory -cp board/beaglebone/uEnv.txt $BINARIES_DIR/uEnv.txt - -# the 4.1 kernel does not provide a dtb for beaglebone green, so we -# use a different genimage config if am335x-bonegreen.dtb is not -# built: -if [ -e ${BINARIES_DIR}/am335x-bonegreen.dtb ] ; then - GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -else - GENIMAGE_CFG="${BOARD_DIR}/genimage_linux41.cfg" -fi - -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/buildroot/board/beaglebone/readme.txt b/buildroot/board/beaglebone/readme.txt index e908b2223..e6647dad2 100644 --- a/buildroot/board/beaglebone/readme.txt +++ b/buildroot/board/beaglebone/readme.txt @@ -27,18 +27,18 @@ $ make Result of the build =================== output/images/ -├── am335x-boneblack.dtb -├── am335x-bone.dtb -├── am335x-evm.dtb -├── am335x-evmsk.dtb -├── boot.vfat -├── MLO -├── rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.img -├── uEnv.txt -└── zImage ++-- am335x-boneblack.dtb ++-- am335x-bone.dtb ++-- am335x-evm.dtb ++-- am335x-evmsk.dtb ++-- boot.vfat ++-- MLO ++-- rootfs.ext2 ++-- rootfs.tar ++-- sdcard.img ++-- u-boot.img ++-- uEnv.txt ++-- zImage To copy the image file to the sdcard use dd: $ dd if=output/images/sdcard.img of=/dev/XXX diff --git a/buildroot/board/beagleboneai/genimage.cfg b/buildroot/board/beagleboneai/genimage.cfg new file mode 100644 index 000000000..0bdfa64d3 --- /dev/null +++ b/buildroot/board/beagleboneai/genimage.cfg @@ -0,0 +1,29 @@ +image boot.vfat { + vfat { + files = { + "MLO", + "u-boot.img", + "zImage", + "am5729-beagleboneai.dtb", + "uEnv.txt" + } + } + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/buildroot/board/beagleboneai/patches/uboot/0001-BeagleBone-AI-support.patch b/buildroot/board/beagleboneai/patches/uboot/0001-BeagleBone-AI-support.patch new file mode 100644 index 000000000..2d9accf95 --- /dev/null +++ b/buildroot/board/beagleboneai/patches/uboot/0001-BeagleBone-AI-support.patch @@ -0,0 +1,1783 @@ +From 989c27c791a453550ff6c1440b41c55c6e70615d Mon Sep 17 00:00:00 2001 +From: Jason Kridner +Date: Wed, 27 Mar 2019 14:06:24 -0400 +Subject: [PATCH] BeagleBone AI support + +Patch from: +https://github.com/beagleboard/beaglebone-ai/blob/master/SW/buildroot/local/patches/uboot/0001-BeagleBone-AI-support.patch + +Signed-off-by: Peter Korsgaard +--- + arch/arm/dts/Makefile | 1 + + arch/arm/dts/am5729-beagleboneai.dts | 494 +++++++++++++++++++++++++++ + arch/arm/mach-omap2/omap5/hw_data.c | 3 +- + board/ti/am57xx/board.c | 134 +++++++- + board/ti/am57xx/mux_data.h | 390 +++++++++++++++++++++ + configs/am57xx_evm_defconfig | 10 +- + include/configs/am57xx_evm.h | 2 +- + include/configs/ti_armv7_common.h | 357 +++++++++++++++++++ + include/configs/ti_omap5_common.h | 5 + + include/environment/ti/boot.h | 49 +-- + include/environment/ti/mmc.h | 45 ++- + 11 files changed, 1447 insertions(+), 43 deletions(-) + create mode 100644 arch/arm/dts/am5729-beagleboneai.dts + +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index 2a040b20a5..6771d457a4 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -232,6 +232,7 @@ dtb-$(CONFIG_TARGET_DRA7XX_EVM) += dra72-evm.dtb dra7-evm.dtb \ + dtb-$(CONFIG_TARGET_AM57XX_EVM) += am57xx-beagle-x15.dtb \ + am57xx-beagle-x15-revb1.dtb \ + am57xx-beagle-x15-revc.dtb \ ++ am5729-beagleboneai.dtb \ + am574x-idk.dtb \ + am572x-idk.dtb \ + am571x-idk.dtb +diff --git a/arch/arm/dts/am5729-beagleboneai.dts b/arch/arm/dts/am5729-beagleboneai.dts +new file mode 100644 +index 0000000000..d1afe55751 +--- /dev/null ++++ b/arch/arm/dts/am5729-beagleboneai.dts +@@ -0,0 +1,494 @@ ++/* ++ * Copyright (C) 2014-2018 Texas Instruments Incorporated - http://www.ti.com/ ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++/dts-v1/; ++ ++#include "dra74x.dtsi" ++#include "am57xx-commercial-grade.dtsi" ++#include "dra74x-mmc-iodelay.dtsi" ++#include ++#include ++#include ++ ++/ { ++ model = "BeagleBoard.org BeagleBone AI"; ++ compatible = "beagleboard.org,am57xx-beagleboneai", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"; ++ ++ chosen { ++ stdout-path = &uart1; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x80000000 0x0 0x40000000>; ++ }; ++ ++ vdd_5v: fixedregulator-vdd_5v { ++ compatible = "regulator-fixed"; ++ regulator-name = "vdd_5v"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ vtt_fixed: fixedregulator-vtt { ++ /* TPS51200 */ ++ compatible = "regulator-fixed"; ++ regulator-name = "vtt_fixed"; ++ vin-supply = <&vdd_3v3>; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ src_clk_x1: src_clk_x1 { ++ #clock-cells = <0>; ++ compatible = "fixed-clock"; ++ clock-frequency = <20000000>; ++ }; ++ ++ src_clk_osc1: src_clk_osc1 { ++ #clock-cells = <0>; ++ compatible = "fixed-clock"; ++ clock-frequency = <24000000>; ++ }; ++ ++ src_clk_osc4: src_clk_osc4 { ++ #clock-cells = <0>; ++ compatible = "fixed-clock"; ++ clock-frequency = <24000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led0 { ++ label = "beaglebone:green:usr0"; ++ gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; ++ default-state = "off"; ++ }; ++ ++ led1 { ++ label = "beaglebone:green:usr1"; ++ gpios = <&gpio3 15 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "mmc0"; ++ default-state = "off"; ++ }; ++ ++ led2 { ++ label = "beaglebone:green:usr2"; ++ gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "cpu"; ++ default-state = "off"; ++ }; ++ ++ led3 { ++ label = "beaglebone:green:usr3"; ++ gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "mmc1"; ++ default-state = "off"; ++ }; ++ }; ++}; ++ ++&i2c1 { ++ status = "okay"; ++ clock-frequency = <400000>; ++ ++ tps659038: tps659038@58 { ++ compatible = "ti,tps659038"; ++ reg = <0x58>; ++ interrupts-extended = <&gpio6 16 IRQ_TYPE_LEVEL_HIGH ++ &dra7_pmx_core 0x418>; ++ ++ #interrupt-cells = <2>; ++ interrupt-controller; ++ ++ ti,system-power-controller; ++ ti,palmas-override-powerhold; ++ ++ tps659038_pmic { ++ compatible = "ti,tps659038-pmic"; ++ ++ smps12-in-supply = <&vdd_5v>; ++ smps3-in-supply = <&vdd_5v>; ++ smps45-in-supply = <&vdd_5v>; ++ smps6-in-supply = <&vdd_5v>; ++ smps7-in-supply = <&vdd_5v>; ++ mps3-in-supply = <&vdd_5v>; ++ smps8-in-supply = <&vdd_5v>; ++ smps9-in-supply = <&vdd_5v>; ++ ldo1-in-supply = <&vdd_5v>; ++ ldo2-in-supply = <&vdd_5v>; ++ ldo3-in-supply = <&vdd_5v>; ++ ldo4-in-supply = <&vdd_5v>; ++ ldo9-in-supply = <&vdd_5v>; ++ ldoln-in-supply = <&vdd_5v>; ++ ldousb-in-supply = <&vdd_5v>; ++ ldortc-in-supply = <&vdd_5v>; ++ ++ regulators { ++ vdd_mpu: smps12 { ++ /* VDD_MPU */ ++ regulator-name = "smps12"; ++ regulator-min-microvolt = <850000>; ++ regulator-max-microvolt = <1250000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ vdd_ddr: smps3 { ++ /* VDD_DDR EMIF1 EMIF2 */ ++ regulator-name = "smps3"; ++ regulator-min-microvolt = <1350000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ vdd_dspeve: smps45 { ++ /* VDD_DSPEVE on AM572 */ ++ /* VDD_IVA + VDD_DSP on AM571 */ ++ regulator-name = "smps45"; ++ regulator-min-microvolt = <850000>; ++ regulator-max-microvolt = <1250000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ vdd_gpu: smps6 { ++ /* VDD_GPU */ ++ regulator-name = "smps6"; ++ regulator-min-microvolt = <850000>; ++ regulator-max-microvolt = <1250000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ vdd_core: smps7 { ++ /* VDD_CORE */ ++ regulator-name = "smps7"; ++ regulator-min-microvolt = <850000>; /*** 1.15V */ ++ regulator-max-microvolt = <1150000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ vdd_iva: smps8 { ++ /* 5728 - VDD_IVAHD */ /*** 1.06V */ ++ /* 5718 - N.C. test point */ ++ regulator-name = "smps8"; ++ }; ++ ++ vdd_3v3: smps9 { ++ /* VDD_3V3 */ ++ regulator-name = "smps9"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ vdd_sd: ldo1 { ++ /* VDDSHV8 - VSDMMC */ ++ regulator-name = "ldo1"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ vdd_1v8: ldo2 { ++ /* VDDSH18V */ ++ regulator-name = "ldo2"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ vdd_1v8_phy_ldo3: ldo3 { ++ /* R1.3a 572x V1_8PHY_LDO3: USB, SATA */ ++ regulator-name = "ldo3"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ vdd_1v8_phy_ldo4: ldo4 { ++ /* R1.3a 572x V1_8PHY_LDO4: PCIE, HDMI*/ ++ regulator-name = "ldo4"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ /* LDO5-8 unused */ ++ ++ vdd_rtc: ldo9 { ++ /* VDD_RTC */ ++ regulator-name = "ldo9"; ++ regulator-min-microvolt = <840000>; ++ regulator-max-microvolt = <1160000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ vdd_1v8_pll: ldoln { ++ /* VDDA_1V8_PLL */ ++ regulator-name = "ldoln"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ ldousb_reg: ldousb { ++ /* VDDA_3V_USB: VDDA_USBHS33 */ ++ regulator-name = "ldousb"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ ldortc_reg: ldortc { ++ /* VDDA_RTC */ ++ regulator-name = "ldortc"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ regen1: regen1 { ++ /* VDD_3V3_ON */ ++ regulator-name = "regen1"; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ regen2: regen2 { ++ /* Needed for PMIC internal resource */ ++ regulator-name = "regen2"; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ }; ++ }; ++ ++ tps659038_rtc: tps659038_rtc { ++ compatible = "ti,palmas-rtc"; ++ interrupt-parent = <&tps659038>; ++ interrupts = <8 IRQ_TYPE_EDGE_FALLING>; ++ wakeup-source; ++ }; ++ ++ tps659038_pwr_button: tps659038_pwr_button { ++ compatible = "ti,palmas-pwrbutton"; ++ interrupt-parent = <&tps659038>; ++ interrupts = <1 IRQ_TYPE_EDGE_FALLING>; ++ wakeup-source; ++ ti,palmas-long-press-seconds = <12>; ++ }; ++ ++ tps659038_gpio: tps659038_gpio { ++ compatible = "ti,palmas-gpio"; ++ gpio-controller; ++ #gpio-cells = <2>; ++ }; ++ ++ extcon_usb2: tps659038_usb { ++ compatible = "ti,palmas-usb-vid"; ++ }; ++ ++ }; ++ ++ eeprom: eeprom@50 { ++ compatible = "atmel,24c32"; ++ reg = <0x50>; ++ }; ++}; ++ ++&i2c2 { ++ status = "okay"; ++ clock-frequency = <400000>; ++}; ++ ++&i2c3 { ++ status = "okay"; ++ clock-frequency = <400000>; ++}; ++ ++&i2c4 { ++ status = "okay"; ++ clock-frequency = <100000>; ++}; ++ ++&i2c5 { ++ status = "okay"; ++ clock-frequency = <100000>; ++}; ++ ++&cpu0 { ++ vdd-supply = <&vdd_mpu>; ++ voltage-tolerance = <1>; ++}; ++ ++&uart1 { ++ status = "okay"; ++ interrupts-extended = <&crossbar_mpu GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>, ++ <&dra7_pmx_core 0x3e0>; ++}; ++ ++&uart3 { ++ status = "okay"; ++ interrupts-extended = <&crossbar_mpu GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>, ++ <&dra7_pmx_core 0x3f8>; ++}; ++ ++&davinci_mdio { ++ reset-gpios = <&gpio2 23 GPIO_ACTIVE_LOW>; ++ reset-delay-us = <2>; ++ ++ phy0: ethernet-phy@1 { ++ reg = <4>; ++ }; ++}; ++ ++&mac { ++ slaves = <1>; ++ status = "okay"; ++ //dual_emac; ++}; ++ ++&cpsw_emac0 { ++ phy-handle = <&phy0>; ++ phy-mode = "rgmii"; ++ //dual_emac_res_vlan = <1>; ++}; ++ ++&mmc1 { ++ status = "okay"; ++ vmmc-supply = <&vdd_3v3>; ++ vmmc_aux-supply = <&vdd_sd>; ++ vqmmc-supply = <&vdd_sd>; /* IO Line Power */ ++ bus-width = <4>; ++ max-frequency = <24000000>; ++ cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */ ++ ++ pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; ++ pinctrl-0 = <&mmc1_pins_default>; ++ pinctrl-1 = <&mmc1_pins_hs>; ++ pinctrl-2 = <&mmc1_pins_sdr12>; ++ pinctrl-3 = <&mmc1_pins_sdr25>; ++ pinctrl-4 = <&mmc1_pins_sdr50>; ++ pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev20_conf>; ++ pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>; ++}; ++ ++&mmc2 { ++ status = "okay"; ++ vmmc-supply = <&vdd_3v3>; ++ //FUTURE: vqmmc-supply = <&vdd_3v3>; /* IO Line Power */ ++ bus-width = <8>; ++ ti,non-removable; ++ non-removable; ++ max-frequency = <96000000>; ++ no-1-8-v; ++ /delete-property/ mmc-hs200-1_8v; ++ ++ pinctrl-names = "default", "hs"; ++ pinctrl-0 = <&mmc2_pins_default>; ++ pinctrl-1 = <&mmc2_pins_hs>; ++}; ++ ++&usb2_phy1 { ++ phy-supply = <&ldousb_reg>; ++}; ++ ++&usb2_phy2 { ++ phy-supply = <&ldousb_reg>; ++}; ++ ++&usb1 { ++ dr_mode = "host"; ++}; ++ ++&omap_dwc3_2 { ++ extcon = <&extcon_usb2>; ++}; ++ ++&usb2 { ++ dr_mode = "peripheral"; ++}; ++ ++&cpu_trips { ++ cpu_alert1: cpu_alert1 { ++ temperature = <50000>; /* millicelsius */ ++ hysteresis = <2000>; /* millicelsius */ ++ type = "active"; ++ }; ++}; ++ ++&cpu_cooling_maps { ++ map1 { ++ trip = <&cpu_alert1>; ++ }; ++}; ++ ++&thermal_zones { ++ board_thermal: board_thermal { ++ polling-delay-passive = <1250>; /* milliseconds */ ++ polling-delay = <1500>; /* milliseconds */ ++ ++ board_trips: trips { ++ board_alert0: board_alert { ++ temperature = <40000>; /* millicelsius */ ++ hysteresis = <2000>; /* millicelsius */ ++ type = "active"; ++ }; ++ ++ board_crit: board_crit { ++ temperature = <105000>; /* millicelsius */ ++ hysteresis = <0>; /* millicelsius */ ++ type = "critical"; ++ }; ++ }; ++ ++ board_cooling_maps: cooling-maps { ++ map0 { ++ trip = <&board_alert0>; ++ }; ++ }; ++ }; ++}; ++ ++&mailbox5 { ++ status = "okay"; ++ mbox_ipu1_ipc3x: mbox_ipu1_ipc3x { ++ status = "okay"; ++ }; ++ mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { ++ status = "okay"; ++ }; ++}; ++ ++&mailbox6 { ++ status = "okay"; ++ mbox_ipu2_ipc3x: mbox_ipu2_ipc3x { ++ status = "okay"; ++ }; ++ mbox_dsp2_ipc3x: mbox_dsp2_ipc3x { ++ status = "okay"; ++ }; ++}; +diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c +index c4a41db92a..57b23b93b5 100644 +--- a/arch/arm/mach-omap2/omap5/hw_data.c ++++ b/arch/arm/mach-omap2/omap5/hw_data.c +@@ -418,8 +418,10 @@ void enable_basic_clocks(void) + (*prcm)->cm_l3init_hsmmc2_clkctrl, + (*prcm)->cm_l4per_gptimer2_clkctrl, + (*prcm)->cm_wkup_wdtimer2_clkctrl, ++ (*prcm)->cm_l4per_uart1_clkctrl, + (*prcm)->cm_l4per_uart3_clkctrl, + (*prcm)->cm_l4per_i2c1_clkctrl, ++ (*prcm)->cm_l4per_i2c4_clkctrl, + #ifdef CONFIG_DRIVER_TI_CPSW + (*prcm)->cm_gmac_gmac_clkctrl, + #endif +@@ -493,7 +495,6 @@ void enable_basic_uboot_clocks(void) + (*prcm)->cm_l4per_mcspi1_clkctrl, + (*prcm)->cm_l4per_i2c2_clkctrl, + (*prcm)->cm_l4per_i2c3_clkctrl, +- (*prcm)->cm_l4per_i2c4_clkctrl, + #if defined(CONFIG_DRA7XX) + (*prcm)->cm_ipu_i2c5_clkctrl, + #else +diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c +index 7063345dcc..47a8391de8 100644 +--- a/board/ti/am57xx/board.c ++++ b/board/ti/am57xx/board.c +@@ -30,6 +30,8 @@ + #include + #include + #include ++#include ++#include + + #include "../common/board_detect.h" + #include "mux_data.h" +@@ -46,6 +48,7 @@ + #define board_is_am574x_idk() board_ti_is("AM574IDK") + #define board_is_am572x_idk() board_ti_is("AM572IDK") + #define board_is_am571x_idk() board_ti_is("AM571IDK") ++#define board_is_bbai() board_ti_is("BBBBAI__") //no EEPROM... + + #ifdef CONFIG_DRIVER_TI_CPSW + #include +@@ -75,6 +78,12 @@ DECLARE_GLOBAL_DATA_PTR; + #define TPS65903X_PRIMARY_SECONDARY_PAD2 0xFB + #define TPS65903X_PAD2_POWERHOLD_MASK 0x20 + ++#define CAPE_EEPROM_BUS_NUM 3 ++#define CAPE_EEPROM_ADDR0 0x54 ++#define CAPE_EEPROM_ADDR3 0x57 ++ ++#define CAPE_EEPROM_ADDR_LEN 0x10 ++ + const struct omap_sysinfo sysinfo = { + "Board: UNKNOWN(BeagleBoard X15?) REV UNKNOWN\n" + }; +@@ -84,6 +93,12 @@ static const struct dmm_lisa_map_regs beagle_x15_lisa_regs = { + .is_ma_present = 0x1 + }; + ++static const struct dmm_lisa_map_regs bbai_lisa_regs = { ++ ///FIXME: Document, where this magic number come from? ++ .dmm_lisa_map_3 = 0x80640100, ++ .is_ma_present = 0x1 ++}; ++ + static const struct dmm_lisa_map_regs am571x_idk_lisa_regs = { + .dmm_lisa_map_3 = 0x80640100, + .is_ma_present = 0x1 +@@ -101,6 +116,8 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs) + *dmm_lisa_regs = &am571x_idk_lisa_regs; + else if (board_is_am574x_idk()) + *dmm_lisa_regs = &am574x_idk_lisa_regs; ++ else if (board_is_bbai()) ++ *dmm_lisa_regs = &bbai_lisa_regs; + else + *dmm_lisa_regs = &beagle_x15_lisa_regs; + } +@@ -502,8 +519,30 @@ void do_board_detect(void) + + rc = ti_i2c_eeprom_am_get(CONFIG_EEPROM_BUS_ADDRESS, + CONFIG_EEPROM_CHIP_ADDRESS); +- if (rc) ++ if (rc) { + printf("ti_i2c_eeprom_init failed %d\n", rc); ++ ti_i2c_eeprom_am_set("BBBBAI__", "A"); ++ }; ++ ++ puts("in do_board_detect\n"); ++ printf("do_board_detect\n"); ++} ++ ++void write_hex (unsigned char i) ++{ ++ char cc; ++ ++ cc = i >> 4; ++ cc &= 0xf; ++ if (cc > 9) ++ serial_putc (cc + 55); ++ else ++ serial_putc (cc + 48); ++ cc = i & 0xf; ++ if (cc > 9) ++ serial_putc (cc + 55); ++ else ++ serial_putc (cc + 48); + } + + #else /* CONFIG_SPL_BUILD */ +@@ -521,6 +560,8 @@ void do_board_detect(void) + + if (board_is_x15()) + bname = "BeagleBoard X15"; ++ else if (board_is_bbai()) ++ bname = "BeagleBone AI"; + else if (board_is_am572x_evm()) + bname = "AM572x EVM"; + else if (board_is_am574x_idk()) +@@ -535,6 +576,23 @@ void do_board_detect(void) + "Board: %s REV %s\n", bname, board_ti_get_rev()); + } + ++void write_hex (unsigned char i) ++{ ++ char cc; ++ ++ cc = i >> 4; ++ cc &= 0xf; ++ if (cc > 9) ++ serial_putc (cc + 55); ++ else ++ serial_putc (cc + 48); ++ cc = i & 0xf; ++ if (cc > 9) ++ serial_putc (cc + 55); ++ else ++ serial_putc (cc + 48); ++} ++ + static void setup_board_eeprom_env(void) + { + char *name = "beagle_x15"; +@@ -557,6 +615,8 @@ static void setup_board_eeprom_env(void) + name = "am57xx_evm_reva3"; + else + name = "am57xx_evm"; ++ } else if (board_is_bbai()) { ++ name = "am5729_beagleboneai"; + } else if (board_is_am574x_idk()) { + name = "am574x_idk"; + } else if (board_is_am572x_idk()) { +@@ -626,7 +686,7 @@ void am57x_idk_lcd_detect(void) + struct udevice *dev; + + /* Only valid for IDKs */ +- if (board_is_x15() || board_is_am572x_evm()) ++ if (board_is_x15() || board_is_am572x_evm() || board_is_bbai()) + return; + + /* Only AM571x IDK has gpio control detect.. so check that */ +@@ -720,6 +780,28 @@ int board_late_init(void) + + am57x_idk_lcd_detect(); + ++ ///FIXME, too late!! But useful for testing function... ++ unsigned char addr; ++ struct udevice *dev; ++ int rc; ++ ++ for ( addr = CAPE_EEPROM_ADDR0; addr <= CAPE_EEPROM_ADDR3; addr++ ) { ++ puts("BeagleBone: cape eeprom: i2c_probe: 0x"); write_hex(addr); puts(":\n"); ++ rc = i2c_get_chip_for_busnum(CAPE_EEPROM_BUS_NUM, addr, 1, &dev); ++ if (rc) { ++ printf("failed to get device for EEPROM at address 0x%x\n", ++ addr); ++// goto out; ++ } ++// out: ++ } ++ ++ if (board_is_bbai()) { ++ env_set("console", "ttyS0,115200n8"); ++ } else { ++ env_set("console", "ttyO2,115200n8"); ++ } ++ + #if !defined(CONFIG_SPL_BUILD) + board_ti_set_ethaddr(2); + #endif +@@ -762,6 +844,13 @@ void recalibrate_iodelay(void) + pconf_sz = ARRAY_SIZE(core_padconf_array_essential_am571x_idk); + iod = iodelay_cfg_array_am571x_idk; + iod_sz = ARRAY_SIZE(iodelay_cfg_array_am571x_idk); ++ } else if (board_is_bbai()) { ++ /* Common for X15/GPEVM */ ++ pconf = core_padconf_array_essential_bbai; ++ pconf_sz = ARRAY_SIZE(core_padconf_array_essential_bbai); ++ /* Since full production should switch to SR2.0 */ ++ iod = iodelay_cfg_array_bbai; ++ iod_sz = ARRAY_SIZE(iodelay_cfg_array_bbai); + } else { + /* Common for X15/GPEVM */ + pconf = core_padconf_array_essential_x15; +@@ -863,12 +952,50 @@ const struct mmc_platform_fixups *platform_fixups_mmc(uint32_t addr) + #endif + + #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_OS_BOOT) ++ ++//static int eeprom_has_been_read; ++//static struct id_eeprom eeprom; ++ ++struct am335x_cape_eeprom_id { ++ unsigned int header; ++ char eeprom_rev[2]; ++ char board_name[32]; ++ char version[4]; ++ char manufacture[16]; ++ char part_number[16]; ++ char number_of_pins[2]; ++ char serial_number[12]; ++ char pin_usage[140]; ++ char vdd_3v3exp[ 2]; ++ char vdd_5v[ 2]; ++ char sys_5v[2]; ++ char dc_supplied[2]; ++}; ++ + int spl_start_uboot(void) + { + /* break into full u-boot on 'c' */ + if (serial_tstc() && serial_getc() == 'c') + return 1; + ++ //FIXME, i2c doesn't see to be up.. ++ puts("spl_start_uboot\n"); ++ unsigned char addr; ++ struct udevice *dev; ++ int rc; ++ ++ for ( addr = CAPE_EEPROM_ADDR0; addr <= CAPE_EEPROM_ADDR3; addr++ ) { ++ puts("BeagleBone: cape eeprom: i2c_probe: 0x"); write_hex(addr); puts(":\n"); ++ rc = i2c_get_chip_for_busnum(CAPE_EEPROM_BUS_NUM, addr, 1, &dev); ++ if (rc) { ++ printf("failed to get device for EEPROM at address 0x%x\n", ++ addr); ++// goto out; ++ } ++// out: ++ } ++ ++ + #ifdef CONFIG_SPL_ENV_SUPPORT + env_init(); + env_load(); +@@ -1084,6 +1211,9 @@ int board_fit_config_name_match(const char *name) + } else if (board_is_am572x_evm() && + !strcmp(name, "am57xx-beagle-x15")) { + return 0; ++ } else if (board_is_bbai() && ++ !strcmp(name, "am5729-beagleboneai")) { ++ return 0; + } else if (board_is_am572x_idk() && !strcmp(name, "am572x-idk")) { + return 0; + } else if (board_is_am574x_idk() && !strcmp(name, "am574x-idk")) { +diff --git a/board/ti/am57xx/mux_data.h b/board/ti/am57xx/mux_data.h +index d4a15ae93d..9b8ee944f8 100644 +--- a/board/ti/am57xx/mux_data.h ++++ b/board/ti/am57xx/mux_data.h +@@ -233,6 +233,272 @@ const struct pad_conf_entry core_padconf_array_essential_x15[] = { + {RSTOUTN, (M0 | PIN_OUTPUT)}, /* rstoutn.rstoutn */ + }; + ++const struct pad_conf_entry core_padconf_array_essential_bbai[] = { ++ {GPMC_AD0, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad0.vin3a_d0 */ ++ {GPMC_AD1, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad1.vin3a_d1 */ ++ {GPMC_AD2, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad2.vin3a_d2 */ ++ {GPMC_AD3, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad3.vin3a_d3 */ ++ {GPMC_AD4, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad4.vin3a_d4 */ ++ {GPMC_AD5, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad5.vin3a_d5 */ ++ {GPMC_AD6, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad6.vin3a_d6 */ ++ {GPMC_AD7, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad7.vin3a_d7 */ ++ {GPMC_AD8, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad8.vin3a_d8 */ ++ {GPMC_AD9, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad9.vin3a_d9 */ ++ {GPMC_AD10, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad10.vin3a_d10 */ ++ {GPMC_AD11, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad11.vin3a_d11 */ ++ {GPMC_AD12, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad12.vin3a_d12 */ ++ {GPMC_AD13, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad13.vin3a_d13 */ ++ {GPMC_AD14, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad14.vin3a_d14 */ ++ {GPMC_AD15, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad15.vin3a_d15 */ ++ ++ /* Cape Bus i2c */ ++ {GPMC_A0, (M7 | PIN_INPUT_PULLUP)}, /* R6_GPIO7_3: gpmc_a0.i2c4_scl (Shared with F4_UART10_RTSN) */ ++ {GPMC_A1, (M7 | PIN_INPUT_PULLUP)}, /* T9_GPIO7_4: gpmc_a1.i2c4_sda (Shared with D2_UART10_CTSN) */ ++ ++ {GPMC_A2, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a2.vin3a_d18 */ ++ {GPMC_A3, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a3.vin3a_d19 */ ++ {GPMC_A4, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a4.vin3a_d20 */ ++ {GPMC_A5, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a5.vin3a_d21 */ ++ {GPMC_A6, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a6.vin3a_d22 */ ++ {GPMC_A7, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a7.vin3a_d23 */ ++ {GPMC_A8, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a8.vin3a_hsync0 */ ++ {GPMC_A9, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a9.vin3a_vsync0 */ ++ {GPMC_A10, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a10.vin3a_de0 */ ++ {GPMC_A11, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a11.vin3a_fld0 */ ++ {GPMC_A12, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_a12.gpio2_2 */ ++ {GPMC_A13, (M14 | PIN_INPUT_PULLDOWN)}, /* gpmc_a13.gpio2_3 */ ++ {GPMC_A14, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_a14.gpio2_4 */ ++ {GPMC_A15, (M14 | PIN_INPUT_PULLDOWN)}, /* gpmc_a15.gpio2_5 */ ++ {GPMC_A16, (M14 | PIN_INPUT_PULLDOWN)}, /* gpmc_a16.gpio2_6 */ ++ {GPMC_A17, (M14 | PIN_INPUT_PULLDOWN)}, /* gpmc_a17.gpio2_7 */ ++ {GPMC_A18, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_a18.gpio2_8 */ ++ ++ /* eMMC */ ++ {GPMC_A19, (M1 | PIN_INPUT_PULLUP)}, /* K7: gpmc_a19.mmc2_dat4 */ ++ {GPMC_A20, (M1 | PIN_INPUT_PULLUP)}, /* M7: gpmc_a20.mmc2_dat5 */ ++ {GPMC_A21, (M1 | PIN_INPUT_PULLUP)}, /* J5: gpmc_a21.mmc2_dat6 */ ++ {GPMC_A22, (M1 | PIN_INPUT_PULLUP)}, /* K6: gpmc_a22.mmc2_dat7 */ ++ {GPMC_A23, (M1 | PIN_INPUT_PULLUP)}, /* J7: gpmc_a23.mmc2_clk */ ++ {GPMC_A24, (M1 | PIN_INPUT_PULLUP)}, /* J4: gpmc_a24.mmc2_dat0 */ ++ {GPMC_A25, (M1 | PIN_INPUT_PULLUP)}, /* J6: gpmc_a25.mmc2_dat1 */ ++ {GPMC_A26, (M1 | PIN_INPUT_PULLUP)}, /* H4: gpmc_a26.mmc2_dat2 */ ++ {GPMC_A27, (M1 | PIN_INPUT_PULLUP)}, /* H5: gpmc_a27.mmc2_dat3 */ ++ {GPMC_CS1, (M1 | PIN_INPUT_PULLUP)}, /* H6: gpmc_cs1.mmc2_cmd */ ++ ++ {GPMC_CS0, (M14 | PIN_INPUT_PULLDOWN)}, /* gpmc_cs0.gpio2_19 */ ++ {GPMC_CS2, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_cs2.gpio2_20 */ ++ {GPMC_CS3, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_cs3.vin3a_clk0 */ ++ {GPMC_CLK, (M9 | PIN_INPUT_PULLDOWN)}, /* gpmc_clk.dma_evt1 */ ++ {GPMC_ADVN_ALE, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_advn_ale.gpio2_23 */ ++ {GPMC_OEN_REN, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_oen_ren.gpio2_24 */ ++ {GPMC_WEN, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_wen.gpio2_25 */ ++ {GPMC_BEN0, (M9 | PIN_INPUT_PULLDOWN)}, /* gpmc_ben0.dma_evt3 */ ++ {GPMC_BEN1, (M9 | PIN_INPUT_PULLDOWN)}, /* gpmc_ben1.dma_evt4 */ ++ {GPMC_WAIT0, (M14 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* gpmc_wait0.gpio2_28 */ ++ {VIN1A_CLK0, (M14 | PIN_INPUT)}, /* vin1a_clk0.gpio2_30 */ ++ {VIN1B_CLK1, (M14 | PIN_INPUT_SLEW)}, /* vin1b_clk1.gpio2_31 */ ++ {VIN1A_D2, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d2.gpio3_6 */ ++ {VIN1A_D3, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d3.gpio3_7 */ ++ {VIN1A_D4, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d4.gpio3_8 */ ++ {VIN1A_D5, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d5.gpio3_9 */ ++ {VIN1A_D6, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d6.gpio3_10 */ ++ {VIN1A_D7, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d7.gpio3_11 */ ++ {VIN1A_D8, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d8.gpio3_12 */ ++ {VIN1A_D10, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d10.gpio3_14 */ ++ {VIN1A_D11, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d11.gpio3_15 */ ++ {VIN1A_D12, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d12.gpio3_16 */ ++ {VIN1A_D14, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d14.gpio3_18 */ ++ {VIN1A_D16, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d16.gpio3_20 */ ++ {VIN1A_D19, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d19.gpio3_23 */ ++ {VIN1A_D20, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d20.gpio3_24 */ ++ {VIN1A_D22, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d22.gpio3_26 */ ++ {VIN2A_CLK0, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_clk0.gpio3_28 */ ++ {VIN2A_DE0, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_de0.gpio3_29 */ ++ {VIN2A_FLD0, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_fld0.gpio3_30 */ ++ {VIN2A_HSYNC0, (M11 | PIN_INPUT_PULLUP)}, /* vin2a_hsync0.pr1_uart0_cts_n */ ++ {VIN2A_VSYNC0, (M11 | PIN_OUTPUT_PULLUP)}, /* vin2a_vsync0.pr1_uart0_rts_n */ ++ {VIN2A_D0, (M11 | PIN_INPUT_PULLUP)}, /* vin2a_d0.pr1_uart0_rxd */ ++ {VIN2A_D1, (M11 | PIN_OUTPUT)}, /* vin2a_d1.pr1_uart0_txd */ ++ {VIN2A_D2, (M8 | PIN_INPUT_PULLUP)}, /* vin2a_d2.uart10_rxd */ ++ {VIN2A_D3, (M8 | PIN_OUTPUT)}, /* vin2a_d3.uart10_txd */ ++ ++ /* Cape Bus i2c (gpio shared) */ ++ {VIN2A_D4, (M15 | PIN_INPUT)}, /* D2_UART10_CTSN: vin2a_d4.uart10_ctsn (Shared with T9_GPIO7_4) */ ++ {VIN2A_D5, (M15 | PIN_INPUT)}, /* F4_UART10_RTSN: vin2a_d5.uart10_rtsn (Shared with R6_GPIO7_3) */ ++ ++ {VIN2A_D6, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_d6.gpio4_7 */ ++ {VIN2A_D7, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_d7.gpio4_8 */ ++ {VIN2A_D8, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_d8.gpio4_9 */ ++ {VIN2A_D9, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_d9.gpio4_10 */ ++ {VIN2A_D10, (M10 | PIN_OUTPUT_PULLDOWN)}, /* vin2a_d10.ehrpwm2B */ ++ {VIN2A_D11, (M10 | PIN_INPUT_PULLDOWN)}, /* vin2a_d11.ehrpwm2_tripzone_input */ ++ {VIN2A_D12, (M3 | PIN_OUTPUT | MANUAL_MODE)}, /* vin2a_d12.rgmii1_txc */ ++ {VIN2A_D13, (M3 | PIN_OUTPUT | MANUAL_MODE)}, /* vin2a_d13.rgmii1_txctl */ ++ {VIN2A_D14, (M3 | PIN_OUTPUT | MANUAL_MODE)}, /* vin2a_d14.rgmii1_txd3 */ ++ {VIN2A_D15, (M3 | PIN_OUTPUT | MANUAL_MODE)}, /* vin2a_d15.rgmii1_txd2 */ ++ {VIN2A_D16, (M3 | PIN_OUTPUT | MANUAL_MODE)}, /* vin2a_d16.rgmii1_txd1 */ ++ {VIN2A_D17, (M3 | PIN_OUTPUT | MANUAL_MODE)}, /* vin2a_d17.rgmii1_txd0 */ ++ {VIN2A_D18, (M3 | PIN_INPUT | MANUAL_MODE)}, /* vin2a_d18.rgmii1_rxc */ ++ {VIN2A_D19, (M3 | PIN_INPUT | MANUAL_MODE)}, /* vin2a_d19.rgmii1_rxctl */ ++ {VIN2A_D20, (M3 | PIN_INPUT | MANUAL_MODE)}, /* vin2a_d20.rgmii1_rxd3 */ ++ {VIN2A_D21, (M3 | PIN_INPUT | MANUAL_MODE)}, /* vin2a_d21.rgmii1_rxd2 */ ++ {VIN2A_D22, (M3 | PIN_INPUT | MANUAL_MODE)}, /* vin2a_d22.rgmii1_rxd1 */ ++ {VIN2A_D23, (M3 | PIN_INPUT | MANUAL_MODE)}, /* vin2a_d23.rgmii1_rxd0 */ ++ {VOUT1_CLK, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_clk.vout1_clk */ ++ {VOUT1_DE, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_de.vout1_de */ ++ {VOUT1_FLD, (M14 | PIN_INPUT)}, /* vout1_fld.gpio4_21 */ ++ {VOUT1_HSYNC, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_hsync.vout1_hsync */ ++ {VOUT1_VSYNC, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_vsync.vout1_vsync */ ++ {VOUT1_D0, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d0.vout1_d0 */ ++ {VOUT1_D1, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d1.vout1_d1 */ ++ {VOUT1_D2, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d2.vout1_d2 */ ++ {VOUT1_D3, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d3.vout1_d3 */ ++ {VOUT1_D4, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d4.vout1_d4 */ ++ {VOUT1_D5, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d5.vout1_d5 */ ++ {VOUT1_D6, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d6.vout1_d6 */ ++ {VOUT1_D7, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d7.vout1_d7 */ ++ {VOUT1_D8, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d8.vout1_d8 */ ++ {VOUT1_D9, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d9.vout1_d9 */ ++ {VOUT1_D10, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d10.vout1_d10 */ ++ {VOUT1_D11, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d11.vout1_d11 */ ++ {VOUT1_D12, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d12.vout1_d12 */ ++ {VOUT1_D13, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d13.vout1_d13 */ ++ {VOUT1_D14, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d14.vout1_d14 */ ++ {VOUT1_D15, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d15.vout1_d15 */ ++ {VOUT1_D16, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d16.vout1_d16 */ ++ {VOUT1_D17, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d17.vout1_d17 */ ++ {VOUT1_D18, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d18.vout1_d18 */ ++ {VOUT1_D19, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d19.vout1_d19 */ ++ {VOUT1_D20, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d20.vout1_d20 */ ++ {VOUT1_D21, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d21.vout1_d21 */ ++ {VOUT1_D22, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d22.vout1_d22 */ ++ {VOUT1_D23, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d23.vout1_d23 */ ++ {MDIO_MCLK, (M0 | PIN_OUTPUT | SLEWCONTROL)}, /* mdio_mclk.mdio_mclk */ ++ {MDIO_D, (M0 | PIN_INPUT | SLEWCONTROL)}, /* mdio_d.mdio_d */ ++ {RMII_MHZ_50_CLK, (M14 | PIN_INPUT_PULLUP)}, /* RMII_MHZ_50_CLK.gpio5_17 */ ++ {UART3_RXD, (M14 | PIN_INPUT_SLEW)}, /* uart3_rxd.gpio5_18 */ ++ {UART3_TXD, (M14 | PIN_INPUT_SLEW)}, /* uart3_txd.gpio5_19 */ ++ {RGMII0_TXC, (M0 | PIN_OUTPUT | MANUAL_MODE)}, /* rgmii0_txc.rgmii0_txc */ ++ {RGMII0_TXCTL, (M0 | PIN_OUTPUT | MANUAL_MODE)}, /* rgmii0_txctl.rgmii0_txctl */ ++ {RGMII0_TXD3, (M0 | PIN_OUTPUT | MANUAL_MODE)}, /* rgmii0_txd3.rgmii0_txd3 */ ++ {RGMII0_TXD2, (M0 | PIN_OUTPUT | MANUAL_MODE)}, /* rgmii0_txd2.rgmii0_txd2 */ ++ {RGMII0_TXD1, (M0 | PIN_OUTPUT | MANUAL_MODE)}, /* rgmii0_txd1.rgmii0_txd1 */ ++ {RGMII0_TXD0, (M0 | PIN_OUTPUT | MANUAL_MODE)}, /* rgmii0_txd0.rgmii0_txd0 */ ++ {RGMII0_RXC, (M0 | PIN_INPUT | MANUAL_MODE)}, /* rgmii0_rxc.rgmii0_rxc */ ++ {RGMII0_RXCTL, (M0 | PIN_INPUT | MANUAL_MODE)}, /* rgmii0_rxctl.rgmii0_rxctl */ ++ {RGMII0_RXD3, (M0 | PIN_INPUT | MANUAL_MODE)}, /* rgmii0_rxd3.rgmii0_rxd3 */ ++ {RGMII0_RXD2, (M0 | PIN_INPUT | MANUAL_MODE)}, /* rgmii0_rxd2.rgmii0_rxd2 */ ++ {RGMII0_RXD1, (M0 | PIN_INPUT | MANUAL_MODE)}, /* rgmii0_rxd1.rgmii0_rxd1 */ ++ {RGMII0_RXD0, (M0 | PIN_INPUT | MANUAL_MODE)}, /* rgmii0_rxd0.rgmii0_rxd0 */ ++ {USB1_DRVVBUS, (M0 | PIN_OUTPUT | SLEWCONTROL)}, /* usb1_drvvbus.usb1_drvvbus */ ++ {USB2_DRVVBUS, (M0 | PIN_OUTPUT_PULLDOWN | SLEWCONTROL)}, /* usb2_drvvbus.usb2_drvvbus */ ++ {GPIO6_14, (M10 | PIN_INPUT_PULLUP)}, /* gpio6_14.timer1 */ ++ {GPIO6_15, (M10 | PIN_INPUT_PULLUP)}, /* gpio6_15.timer2 */ ++ {GPIO6_16, (M10 | PIN_INPUT_PULLUP)}, /* gpio6_16.timer3 */ ++ {XREF_CLK0, (M9 | PIN_OUTPUT_PULLDOWN)}, /* xref_clk0.clkout2 */ ++ {XREF_CLK1, (M14 | PIN_INPUT_PULLDOWN)}, /* xref_clk1.gpio6_18 */ ++ {XREF_CLK2, (M14 | PIN_INPUT_PULLDOWN)}, /* xref_clk2.gpio6_19 */ ++ {XREF_CLK3, (M9 | PIN_OUTPUT_PULLDOWN)}, /* xref_clk3.clkout3 */ ++ {MCASP1_ACLKX, (M10 | PIN_INPUT_PULLUP)}, /* mcasp1_aclkx.i2c3_sda */ ++ {MCASP1_FSX, (M10 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* mcasp1_fsx.i2c3_scl */ ++ {MCASP1_ACLKR, (M10 | PIN_INPUT_PULLUP)}, /* mcasp1_aclkr.i2c4_sda */ ++ {MCASP1_FSR, (M10 | PIN_INPUT_PULLUP)}, /* mcasp1_fsr.i2c4_scl */ ++ {MCASP1_AXR0, (M10 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* mcasp1_axr0.i2c5_sda */ ++ {MCASP1_AXR1, (M10 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* mcasp1_axr1.i2c5_scl */ ++ {MCASP1_AXR2, (M14 | PIN_INPUT_PULLDOWN)}, /* mcasp1_axr2.gpio5_4 */ ++ {MCASP1_AXR3, (M14 | PIN_INPUT_PULLDOWN)}, /* mcasp1_axr3.gpio5_5 */ ++ {MCASP1_AXR4, (M14 | PIN_INPUT_PULLDOWN)}, /* mcasp1_axr4.gpio5_6 */ ++ {MCASP1_AXR5, (M14 | PIN_INPUT_PULLDOWN)}, /* mcasp1_axr5.gpio5_7 */ ++ {MCASP1_AXR6, (M14 | PIN_INPUT_PULLDOWN)}, /* mcasp1_axr6.gpio5_8 */ ++ {MCASP1_AXR7, (M14 | PIN_INPUT_PULLDOWN)}, /* mcasp1_axr7.gpio5_9 */ ++ {MCASP1_AXR8, (M14 | PIN_INPUT | SLEWCONTROL)}, /* mcasp1_axr8.gpio5_10 */ ++ {MCASP1_AXR9, (M14 | PIN_INPUT | SLEWCONTROL)}, /* mcasp1_axr9.gpio5_11 */ ++ {MCASP1_AXR10, (M14 | PIN_INPUT | SLEWCONTROL)}, /* mcasp1_axr10.gpio5_12 */ ++ {MCASP1_AXR11, (M14 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* mcasp1_axr11.gpio4_17 */ ++ {MCASP1_AXR12, (M1 | PIN_INPUT_SLEW | VIRTUAL_MODE10)}, /* mcasp1_axr12.mcasp7_axr0 */ ++ {MCASP1_AXR13, (M1 | PIN_INPUT_SLEW | VIRTUAL_MODE10)}, /* mcasp1_axr13.mcasp7_axr1 */ ++ {MCASP1_AXR14, (M1 | PIN_INPUT_SLEW | VIRTUAL_MODE10)}, /* mcasp1_axr14.mcasp7_aclkx */ ++ {MCASP1_AXR15, (M1 | PIN_INPUT_SLEW | VIRTUAL_MODE10)}, /* mcasp1_axr15.mcasp7_fsx */ ++ {MCASP3_ACLKX, (M0 | PIN_INPUT_PULLDOWN)}, /* mcasp3_aclkx.mcasp3_aclkx */ ++ {MCASP3_FSX, (M0 | PIN_INPUT_SLEW)}, /* mcasp3_fsx.mcasp3_fsx */ ++ {MCASP3_AXR0, (M0 | PIN_INPUT_SLEW)}, /* mcasp3_axr0.mcasp3_axr0 */ ++ {MCASP3_AXR1, (M0 | PIN_INPUT_SLEW)}, /* mcasp3_axr1.mcasp3_axr1 */ ++ {MCASP4_ACLKX, (M3 | PIN_INPUT_PULLUP)}, /* mcasp4_aclkx.uart8_rxd */ ++ {MCASP4_FSX, (M3 | PIN_OUTPUT)}, /* mcasp4_fsx.uart8_txd */ ++ {MCASP4_AXR0, (M3 | PIN_INPUT_PULLUP)}, /* mcasp4_axr0.uart8_ctsn */ ++ {MCASP4_AXR1, (M3 | PIN_OUTPUT_PULLUP)}, /* mcasp4_axr1.uart8_rtsn */ ++ {MCASP5_ACLKX, (M3 | PIN_INPUT_PULLUP)}, /* mcasp5_aclkx.uart9_rxd */ ++ {MCASP5_FSX, (M3 | PIN_OUTPUT)}, /* mcasp5_fsx.uart9_txd */ ++ {MCASP5_AXR0, (M3 | PIN_INPUT_PULLUP)}, /* mcasp5_axr0.uart9_ctsn */ ++ {MCASP5_AXR1, (M3 | PIN_OUTPUT_PULLUP)}, /* mcasp5_axr1.uart9_rtsn */ ++ ++ /* microSD Socket */ ++ {MMC1_CLK, (M0 | PIN_INPUT_PULLUP)}, /* W6: mmc1_clk.mmc1_clk */ ++ {MMC1_CMD, (M0 | PIN_INPUT_PULLUP)}, /* Y6: mmc1_cmd.mmc1_cmd */ ++ {MMC1_DAT0, (M0 | PIN_INPUT_PULLUP)}, /* AA6: mmc1_dat0.mmc1_dat0 */ ++ {MMC1_DAT1, (M0 | PIN_INPUT_PULLUP)}, /* Y4: mmc1_dat1.mmc1_dat1 */ ++ {MMC1_DAT2, (M0 | PIN_INPUT_PULLUP)}, /* AA5: mmc1_dat2.mmc1_dat2 */ ++ {MMC1_DAT3, (M0 | PIN_INPUT_PULLUP)}, /* Y3: mmc1_dat3.mmc1_dat3 */ ++ {MMC1_SDCD, (M14 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* W7: mmc1_sdcd.gpio6_27 */ ++ ++ {GPIO6_10, (M10 | PIN_OUTPUT_PULLDOWN)}, /* gpio6_10.ehrpwm2A */ ++ {GPIO6_11, (M0 | PIN_INPUT_PULLUP)}, /* gpio6_11.gpio6_11 */ ++ {MMC3_CLK, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_clk.mmc3_clk */ ++ {MMC3_CMD, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_cmd.mmc3_cmd */ ++ {MMC3_DAT0, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat0.mmc3_dat0 */ ++ {MMC3_DAT1, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat1.mmc3_dat1 */ ++ {MMC3_DAT2, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat2.mmc3_dat2 */ ++ {MMC3_DAT3, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat3.mmc3_dat3 */ ++ {MMC3_DAT4, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat4.mmc3_dat4 */ ++ {MMC3_DAT5, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat5.mmc3_dat5 */ ++ {MMC3_DAT6, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat6.mmc3_dat6 */ ++ {MMC3_DAT7, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat7.mmc3_dat7 */ ++ {SPI1_SCLK, (M14 | PIN_INPUT_PULLDOWN)}, /* spi1_sclk.gpio7_7 */ ++ {SPI1_D1, (M14 | PIN_INPUT_PULLDOWN)}, /* spi1_d1.gpio7_8 */ ++ {SPI1_D0, (M14 | PIN_INPUT_PULLDOWN)}, /* spi1_d0.gpio7_9 */ ++ {SPI1_CS0, (M14 | PIN_INPUT)}, /* spi1_cs0.gpio7_10 */ ++ {SPI1_CS1, (M14 | PIN_INPUT)}, /* spi1_cs1.gpio7_11 */ ++ {SPI1_CS2, (M14 | PIN_INPUT_SLEW)}, /* spi1_cs2.gpio7_12 */ ++ {SPI1_CS3, (M6 | PIN_INPUT | SLEWCONTROL)}, /* spi1_cs3.hdmi1_cec */ ++ {SPI2_SCLK, (M14 | PIN_INPUT_PULLDOWN)}, /* spi2_sclk.gpio7_14 */ ++ {SPI2_D1, (M14 | PIN_INPUT_SLEW)}, /* spi2_d1.gpio7_15 */ ++ {SPI2_D0, (M14 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* spi2_d0.gpio7_16 */ ++ {SPI2_CS0, (M14 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* spi2_cs0.gpio7_17 */ ++ {DCAN1_TX, (M0 | PIN_OUTPUT | SLEWCONTROL)}, /* dcan1_tx.dcan1_tx */ ++ {DCAN1_RX, (M0 | PIN_INPUT | SLEWCONTROL)}, /* dcan1_rx.dcan1_rx */ ++ ++ /* BeagleBone AI: Debug UART */ ++ {UART1_RXD, (M0 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* uart1_rxd.uart1_rxd */ ++ {UART1_TXD, (M0 | PIN_OUTPUT | SLEWCONTROL)}, /* uart1_txd.uart1_txd */ ++ ++ {UART1_CTSN, (M14 | PIN_INPUT_PULLDOWN)}, /* uart1_ctsn.gpio7_24 */ ++ {UART1_RTSN, (M14 | PIN_INPUT)}, /* uart1_rtsn.gpio7_25 */ ++ {UART2_RXD, (M14 | PIN_INPUT_PULLDOWN)}, /* uart2_rxd.gpio7_26 */ ++ {UART2_TXD, (M14 | PIN_INPUT_PULLDOWN)}, /* uart2_txd.gpio7_27 */ ++ {UART2_CTSN, (M2 | PIN_INPUT_PULLUP)}, /* uart2_ctsn.uart3_rxd */ ++ {UART2_RTSN, (M1 | PIN_OUTPUT)}, /* uart2_rtsn.uart3_txd */ ++ {I2C1_SDA, (M0 | PIN_INPUT_PULLUP)}, /* i2c1_sda.i2c1_sda */ ++ {I2C1_SCL, (M0 | PIN_INPUT_PULLUP)}, /* i2c1_scl.i2c1_scl */ ++ {I2C2_SDA, (M1 | PIN_INPUT_PULLUP)}, /* i2c2_sda.hdmi1_ddc_scl */ ++ {I2C2_SCL, (M1 | PIN_INPUT_PULLUP)}, /* i2c2_scl.hdmi1_ddc_sda */ ++ {WAKEUP0, (M0 | PIN_INPUT)}, /* Wakeup0.Wakeup0 */ ++ {WAKEUP1, (M0 | PIN_INPUT)}, /* Wakeup1.Wakeup1 */ ++ {WAKEUP2, (M0 | PIN_INPUT)}, /* Wakeup2.Wakeup2 */ ++ {WAKEUP3, (M0 | PIN_INPUT)}, /* Wakeup3.Wakeup3 */ ++ {ON_OFF, (M0 | PIN_OUTPUT)}, /* on_off.on_off */ ++ {RTC_PORZ, (M0 | PIN_INPUT)}, /* rtc_porz.rtc_porz */ ++ {TMS, (M0 | PIN_INPUT_PULLUP)}, /* tms.tms */ ++ {TDI, (M0 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* tdi.tdi */ ++ {TDO, (M0 | PIN_OUTPUT)}, /* tdo.tdo */ ++ {TCLK, (M0 | PIN_INPUT_PULLDOWN)}, /* tclk.tclk */ ++ {TRSTN, (M0 | PIN_INPUT)}, /* trstn.trstn */ ++ {RTCK, (M0 | PIN_OUTPUT)}, /* rtck.rtck */ ++ {EMU0, (M0 | PIN_INPUT)}, /* emu0.emu0 */ ++ {EMU1, (M0 | PIN_INPUT)}, /* emu1.emu1 */ ++ {NMIN_DSP, (M0 | PIN_INPUT)}, /* nmin_dsp.nmin_dsp */ ++ {RSTOUTN, (M0 | PIN_OUTPUT)}, /* rstoutn.rstoutn */ ++}; ++ + const struct pad_conf_entry core_padconf_array_delta_x15_sr1_1[] = { + {MMC1_SDWP, (M14 | PIN_INPUT | SLEWCONTROL)}, /* mmc1_sdwp.gpio6_28 */ + {VOUT1_CLK, (M0 | PIN_OUTPUT | SLEWCONTROL)}, /* vout1_clk.vout1_clk */ +@@ -998,6 +1264,17 @@ const struct pad_conf_entry early_padconf[] = { + {UART2_RTSN, (M1 | PIN_INPUT_SLEW)}, /* uart2_rtsn.uart3_txd */ + {I2C1_SDA, (PIN_INPUT_PULLUP | M0)}, /* I2C1_SDA */ + {I2C1_SCL, (PIN_INPUT_PULLUP | M0)}, /* I2C1_SCL */ ++ ++ /* BeagleBone AI: Debug UART */ ++ {UART1_RXD, (M0 | PIN_INPUT_SLEW)}, /* UART1_RXD */ ++ {UART1_TXD, (M0 | PIN_INPUT_SLEW)}, /* UART1_TXD */ ++ ++ /* Cape Bus i2c */ ++ {GPMC_A0, (M7 | PIN_INPUT_PULLUP)}, /* R6_GPIO7_3: gpmc_a0.i2c4_scl (Shared with F4_UART10_RTSN) */ ++ {GPMC_A1, (M7 | PIN_INPUT_PULLUP)}, /* T9_GPIO7_4: gpmc_a1.i2c4_sda (Shared with D2_UART10_CTSN) */ ++ /* Cape Bus i2c (gpio shared) */ ++ {VIN2A_D4, (M14 | PIN_INPUT_PULLUP)}, /* D2_UART10_CTSN: vin2a_d4.uart10_ctsn (Shared with T9_GPIO7_4) */ ++ {VIN2A_D5, (M14 | PIN_INPUT_PULLUP)}, /* F4_UART10_RTSN: vin2a_d5.uart10_rtsn (Shared with R6_GPIO7_3) */ + }; + + #ifdef CONFIG_IODELAY_RECALIBRATION +@@ -1199,6 +1476,119 @@ const struct iodelay_cfg_entry iodelay_cfg_array_x15_sr2_0[] = { + {0x0CEC, 2739, 0}, /* CFG_VOUT1_VSYNC_OUT */ + }; + ++const struct iodelay_cfg_entry iodelay_cfg_array_bbai[] = { ++ {0x0114, 2519, 702}, /* CFG_GPMC_A0_IN */ ++ {0x0120, 2435, 411}, /* CFG_GPMC_A10_IN */ ++ {0x012C, 2379, 755}, /* CFG_GPMC_A11_IN */ ++ {0x0198, 2384, 778}, /* CFG_GPMC_A1_IN */ ++ {0x0204, 2499, 1127}, /* CFG_GPMC_A2_IN */ ++ {0x0210, 2455, 1181}, /* CFG_GPMC_A3_IN */ ++ {0x021C, 2486, 1039}, /* CFG_GPMC_A4_IN */ ++ {0x0228, 2456, 938}, /* CFG_GPMC_A5_IN */ ++ {0x0234, 2463, 573}, /* CFG_GPMC_A6_IN */ ++ {0x0240, 2608, 783}, /* CFG_GPMC_A7_IN */ ++ {0x024C, 2430, 656}, /* CFG_GPMC_A8_IN */ ++ {0x0258, 2465, 850}, /* CFG_GPMC_A9_IN */ ++ {0x0264, 2316, 301}, /* CFG_GPMC_AD0_IN */ ++ {0x0270, 2324, 406}, /* CFG_GPMC_AD10_IN */ ++ {0x027C, 2278, 352}, /* CFG_GPMC_AD11_IN */ ++ {0x0288, 2297, 160}, /* CFG_GPMC_AD12_IN */ ++ {0x0294, 2278, 108}, /* CFG_GPMC_AD13_IN */ ++ {0x02A0, 2035, 0}, /* CFG_GPMC_AD14_IN */ ++ {0x02AC, 2279, 378}, /* CFG_GPMC_AD15_IN */ ++ {0x02B8, 2440, 70}, /* CFG_GPMC_AD1_IN */ ++ {0x02C4, 2404, 446}, /* CFG_GPMC_AD2_IN */ ++ {0x02D0, 2343, 212}, /* CFG_GPMC_AD3_IN */ ++ {0x02DC, 2355, 322}, /* CFG_GPMC_AD4_IN */ ++ {0x02E8, 2337, 192}, /* CFG_GPMC_AD5_IN */ ++ {0x02F4, 2270, 314}, /* CFG_GPMC_AD6_IN */ ++ {0x0300, 2339, 259}, /* CFG_GPMC_AD7_IN */ ++ {0x030C, 2308, 577}, /* CFG_GPMC_AD8_IN */ ++ {0x0318, 2334, 166}, /* CFG_GPMC_AD9_IN */ ++ {0x0378, 0, 0}, /* CFG_GPMC_CS3_IN */ ++ {0x0678, 0, 386}, /* CFG_MMC3_CLK_IN */ ++ {0x0680, 605, 0}, /* CFG_MMC3_CLK_OUT */ ++ {0x0684, 0, 0}, /* CFG_MMC3_CMD_IN */ ++ {0x0688, 0, 0}, /* CFG_MMC3_CMD_OEN */ ++ {0x068C, 0, 0}, /* CFG_MMC3_CMD_OUT */ ++ {0x0690, 171, 0}, /* CFG_MMC3_DAT0_IN */ ++ {0x0694, 0, 0}, /* CFG_MMC3_DAT0_OEN */ ++ {0x0698, 0, 0}, /* CFG_MMC3_DAT0_OUT */ ++ {0x069C, 221, 0}, /* CFG_MMC3_DAT1_IN */ ++ {0x06A0, 0, 0}, /* CFG_MMC3_DAT1_OEN */ ++ {0x06A4, 0, 0}, /* CFG_MMC3_DAT1_OUT */ ++ {0x06A8, 0, 0}, /* CFG_MMC3_DAT2_IN */ ++ {0x06AC, 0, 0}, /* CFG_MMC3_DAT2_OEN */ ++ {0x06B0, 0, 0}, /* CFG_MMC3_DAT2_OUT */ ++ {0x06B4, 474, 0}, /* CFG_MMC3_DAT3_IN */ ++ {0x06B8, 0, 0}, /* CFG_MMC3_DAT3_OEN */ ++ {0x06BC, 0, 0}, /* CFG_MMC3_DAT3_OUT */ ++ {0x06C0, 792, 0}, /* CFG_MMC3_DAT4_IN */ ++ {0x06C4, 0, 0}, /* CFG_MMC3_DAT4_OEN */ ++ {0x06C8, 0, 0}, /* CFG_MMC3_DAT4_OUT */ ++ {0x06CC, 782, 0}, /* CFG_MMC3_DAT5_IN */ ++ {0x06D0, 0, 0}, /* CFG_MMC3_DAT5_OEN */ ++ {0x06D4, 0, 0}, /* CFG_MMC3_DAT5_OUT */ ++ {0x06D8, 942, 0}, /* CFG_MMC3_DAT6_IN */ ++ {0x06DC, 0, 0}, /* CFG_MMC3_DAT6_OEN */ ++ {0x06E0, 0, 0}, /* CFG_MMC3_DAT6_OUT */ ++ {0x06E4, 636, 0}, /* CFG_MMC3_DAT7_IN */ ++ {0x06E8, 0, 0}, /* CFG_MMC3_DAT7_OEN */ ++ {0x06EC, 0, 0}, /* CFG_MMC3_DAT7_OUT */ ++ {0x06F0, 260, 0}, /* CFG_RGMII0_RXC_IN */ ++ {0x06FC, 0, 1412}, /* CFG_RGMII0_RXCTL_IN */ ++ {0x0708, 123, 1047}, /* CFG_RGMII0_RXD0_IN */ ++ {0x0714, 139, 1081}, /* CFG_RGMII0_RXD1_IN */ ++ {0x0720, 195, 1100}, /* CFG_RGMII0_RXD2_IN */ ++ {0x072C, 239, 1216}, /* CFG_RGMII0_RXD3_IN */ ++ {0x0740, 89, 0}, /* CFG_RGMII0_TXC_OUT */ ++ {0x074C, 15, 125}, /* CFG_RGMII0_TXCTL_OUT */ ++ {0x0758, 339, 162}, /* CFG_RGMII0_TXD0_OUT */ ++ {0x0764, 146, 94}, /* CFG_RGMII0_TXD1_OUT */ ++ {0x0770, 0, 27}, /* CFG_RGMII0_TXD2_OUT */ ++ {0x077C, 291, 205}, /* CFG_RGMII0_TXD3_OUT */ ++ {0x0A70, 0, 0}, /* CFG_VIN2A_D12_OUT */ ++ {0x0A7C, 219, 101}, /* CFG_VIN2A_D13_OUT */ ++ {0x0A88, 92, 58}, /* CFG_VIN2A_D14_OUT */ ++ {0x0A94, 135, 100}, /* CFG_VIN2A_D15_OUT */ ++ {0x0AA0, 154, 101}, /* CFG_VIN2A_D16_OUT */ ++ {0x0AAC, 78, 27}, /* CFG_VIN2A_D17_OUT */ ++ {0x0AB0, 411, 0}, /* CFG_VIN2A_D18_IN */ ++ {0x0ABC, 0, 382}, /* CFG_VIN2A_D19_IN */ ++ {0x0AD4, 320, 750}, /* CFG_VIN2A_D20_IN */ ++ {0x0AE0, 192, 836}, /* CFG_VIN2A_D21_IN */ ++ {0x0AEC, 294, 669}, /* CFG_VIN2A_D22_IN */ ++ {0x0AF8, 50, 700}, /* CFG_VIN2A_D23_IN */ ++ {0x0B9C, 0, 706}, /* CFG_VOUT1_CLK_OUT */ ++ {0x0BA8, 2313, 0}, /* CFG_VOUT1_D0_OUT */ ++ {0x0BB4, 2199, 0}, /* CFG_VOUT1_D10_OUT */ ++ {0x0BC0, 2266, 0}, /* CFG_VOUT1_D11_OUT */ ++ {0x0BCC, 3159, 0}, /* CFG_VOUT1_D12_OUT */ ++ {0x0BD8, 2100, 0}, /* CFG_VOUT1_D13_OUT */ ++ {0x0BE4, 2229, 0}, /* CFG_VOUT1_D14_OUT */ ++ {0x0BF0, 2202, 0}, /* CFG_VOUT1_D15_OUT */ ++ {0x0BFC, 2084, 0}, /* CFG_VOUT1_D16_OUT */ ++ {0x0C08, 2195, 0}, /* CFG_VOUT1_D17_OUT */ ++ {0x0C14, 2342, 0}, /* CFG_VOUT1_D18_OUT */ ++ {0x0C20, 2463, 0}, /* CFG_VOUT1_D19_OUT */ ++ {0x0C2C, 2439, 0}, /* CFG_VOUT1_D1_OUT */ ++ {0x0C38, 2304, 0}, /* CFG_VOUT1_D20_OUT */ ++ {0x0C44, 2103, 0}, /* CFG_VOUT1_D21_OUT */ ++ {0x0C50, 2145, 0}, /* CFG_VOUT1_D22_OUT */ ++ {0x0C5C, 1932, 0}, /* CFG_VOUT1_D23_OUT */ ++ {0x0C68, 2200, 0}, /* CFG_VOUT1_D2_OUT */ ++ {0x0C74, 2355, 0}, /* CFG_VOUT1_D3_OUT */ ++ {0x0C80, 3215, 0}, /* CFG_VOUT1_D4_OUT */ ++ {0x0C8C, 2314, 0}, /* CFG_VOUT1_D5_OUT */ ++ {0x0C98, 2238, 0}, /* CFG_VOUT1_D6_OUT */ ++ {0x0CA4, 2381, 0}, /* CFG_VOUT1_D7_OUT */ ++ {0x0CB0, 2138, 0}, /* CFG_VOUT1_D8_OUT */ ++ {0x0CBC, 2383, 0}, /* CFG_VOUT1_D9_OUT */ ++ {0x0CC8, 1984, 0}, /* CFG_VOUT1_DE_OUT */ ++ {0x0CE0, 1947, 0}, /* CFG_VOUT1_HSYNC_OUT */ ++ {0x0CEC, 2739, 0}, /* CFG_VOUT1_VSYNC_OUT */ ++}; ++ + const struct iodelay_cfg_entry iodelay_cfg_array_am574x_idk[] = { + {0x0114, 2199, 621}, /* CFG_GPMC_A0_IN */ + {0x0120, 0, 0}, /* CFG_GPMC_A10_IN */ +diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig +index 3e2c166e0d..b1e2960a9f 100644 +--- a/configs/am57xx_evm_defconfig ++++ b/configs/am57xx_evm_defconfig +@@ -27,14 +27,20 @@ CONFIG_SPL_DMA_SUPPORT=y + CONFIG_SPL_OS_BOOT=y + CONFIG_SPL_SPI_LOAD=y + CONFIG_SPL_YMODEM_SUPPORT=y ++CONFIG_AUTOBOOT_KEYED=y ++CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" ++CONFIG_AUTOBOOT_DELAY_STR="d" ++CONFIG_AUTOBOOT_STOP_STR=" " + CONFIG_CMD_SPL=y + # CONFIG_CMD_FLASH is not set + # CONFIG_CMD_SETEXPR is not set + # CONFIG_CMD_PMIC is not set ++CONFIG_CMD_BTRFS=y + CONFIG_OF_CONTROL=y + CONFIG_SPL_OF_CONTROL=y +-CONFIG_DEFAULT_DEVICE_TREE="am572x-idk" +-CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc am572x-idk am571x-idk am574x-idk" ++CONFIG_DEFAULT_DEVICE_TREE="am5729-beagleboneai" ++CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc am5729-beagleboneai am572x-idk am571x-idk am574x-idk" ++# CONFIG_ENV_IS_IN_FAT is not set + CONFIG_ENV_IS_IN_MMC=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y + CONFIG_DM=y +diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h +index 70aa425060..fcc6ac7f8f 100644 +--- a/include/configs/am57xx_evm.h ++++ b/include/configs/am57xx_evm.h +@@ -24,7 +24,7 @@ + #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) + #define CONFIG_SYS_REDUNDAND_ENVIRONMENT + +-#define CONSOLEDEV "ttyO2" ++//#define CONSOLEDEV "ttyO2" + #define CONFIG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */ + #define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ + #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ +diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h +index 1e2a62dd6f..47f641165d 100644 +--- a/include/configs/ti_armv7_common.h ++++ b/include/configs/ti_armv7_common.h +@@ -80,6 +80,363 @@ + #define CONFIG_SYS_I2C + #endif + ++#define EEPROM_PROGRAMMING \ ++ "eeprom_dump=i2c dev 0; " \ ++ "i2c md 0x50 0x00.2 20; " \ ++ "\0" \ ++ "eeprom_blank=i2c dev 0; " \ ++ "i2c mw 0x50 0x00.2 ff; " \ ++ "i2c mw 0x50 0x01.2 ff; " \ ++ "i2c mw 0x50 0x02.2 ff; " \ ++ "i2c mw 0x50 0x03.2 ff; " \ ++ "i2c mw 0x50 0x04.2 ff; " \ ++ "i2c mw 0x50 0x05.2 ff; " \ ++ "i2c mw 0x50 0x06.2 ff; " \ ++ "i2c mw 0x50 0x07.2 ff; " \ ++ "i2c mw 0x50 0x08.2 ff; " \ ++ "i2c mw 0x50 0x09.2 ff; " \ ++ "i2c mw 0x50 0x0a.2 ff; " \ ++ "i2c mw 0x50 0x0b.2 ff; " \ ++ "i2c mw 0x50 0x0c.2 ff; " \ ++ "i2c mw 0x50 0x0d.2 ff; " \ ++ "i2c mw 0x50 0x0e.2 ff; " \ ++ "i2c mw 0x50 0x0f.2 ff; " \ ++ "i2c mw 0x50 0x10.2 ff; " \ ++ "i2c mw 0x50 0x11.2 ff; " \ ++ "i2c mw 0x50 0x12.2 ff; " \ ++ "i2c mw 0x50 0x13.2 ff; " \ ++ "i2c mw 0x50 0x14.2 ff; " \ ++ "i2c mw 0x50 0x15.2 ff; " \ ++ "i2c mw 0x50 0x16.2 ff; " \ ++ "i2c mw 0x50 0x17.2 ff; " \ ++ "i2c mw 0x50 0x18.2 ff; " \ ++ "i2c mw 0x50 0x19.2 ff; " \ ++ "i2c mw 0x50 0x1a.2 ff; " \ ++ "i2c mw 0x50 0x1b.2 ff; " \ ++ "i2c mw 0x50 0x1c.2 ff; " \ ++ "i2c mw 0x50 0x1d.2 ff; " \ ++ "i2c mw 0x50 0x1e.2 ff; " \ ++ "i2c mw 0x50 0x1f.2 ff; " \ ++ "i2c md 0x50 0x00.2 20; " \ ++ "\0" \ ++ "eeprom_x15_b1=i2c dev 0; " \ ++ "i2c mw 0x50 0x00.2 aa; " \ ++ "i2c mw 0x50 0x01.2 55; " \ ++ "i2c mw 0x50 0x02.2 33; " \ ++ "i2c mw 0x50 0x03.2 ee; " \ ++ "i2c mw 0x50 0x04.2 42; " \ ++ "i2c mw 0x50 0x05.2 42; " \ ++ "i2c mw 0x50 0x06.2 52; " \ ++ "i2c mw 0x50 0x07.2 44; " \ ++ "i2c mw 0x50 0x08.2 58; " \ ++ "i2c mw 0x50 0x09.2 31; " \ ++ "i2c mw 0x50 0x0a.2 35; " \ ++ "i2c mw 0x50 0x0b.2 5f; " \ ++ "i2c mw 0x50 0x0c.2 42; " \ ++ "i2c mw 0x50 0x0d.2 2e; " \ ++ "i2c mw 0x50 0x0e.2 31; " \ ++ "i2c mw 0x50 0x0f.2 30; " \ ++ "i2c mw 0x50 0x10.2 57; " \ ++ "i2c mw 0x50 0x11.2 57; " \ ++ "i2c mw 0x50 0x12.2 59; " \ ++ "i2c mw 0x50 0x13.2 59; " \ ++ "i2c mw 0x50 0x14.2 34; " \ ++ "i2c mw 0x50 0x15.2 50; " \ ++ "i2c mw 0x50 0x16.2 35; " \ ++ "i2c mw 0x50 0x17.2 35; " \ ++ "i2c mw 0x50 0x18.2 30; " \ ++ "i2c mw 0x50 0x19.2 30; " \ ++ "i2c mw 0x50 0x1a.2 30; " \ ++ "i2c mw 0x50 0x1b.2 30; " \ ++ "i2c mw 0x50 0x1c.2 ff; " \ ++ "i2c mw 0x50 0x1d.2 ff; " \ ++ "i2c mw 0x50 0x1e.2 ff; " \ ++ "i2c mw 0x50 0x1f.2 ff; " \ ++ "i2c md 0x50 0x00.2 20; " \ ++ "\0" \ ++ "eeprom_x15_c=i2c dev 0; " \ ++ "i2c mw 0x50 0x00.2 aa; " \ ++ "i2c mw 0x50 0x01.2 55; " \ ++ "i2c mw 0x50 0x02.2 33; " \ ++ "i2c mw 0x50 0x03.2 ee; " \ ++ "i2c mw 0x50 0x04.2 42; " \ ++ "i2c mw 0x50 0x05.2 42; " \ ++ "i2c mw 0x50 0x06.2 52; " \ ++ "i2c mw 0x50 0x07.2 44; " \ ++ "i2c mw 0x50 0x08.2 58; " \ ++ "i2c mw 0x50 0x09.2 31; " \ ++ "i2c mw 0x50 0x0a.2 35; " \ ++ "i2c mw 0x50 0x0b.2 5f; " \ ++ "i2c mw 0x50 0x0c.2 43; " \ ++ "i2c mw 0x50 0x0d.2 2e; " \ ++ "i2c mw 0x50 0x0e.2 30; " \ ++ "i2c mw 0x50 0x0f.2 30; " \ ++ "i2c mw 0x50 0x10.2 79; " \ ++ "i2c mw 0x50 0x11.2 79; " \ ++ "i2c mw 0x50 0x12.2 77; " \ ++ "i2c mw 0x50 0x13.2 77; " \ ++ "i2c mw 0x50 0x14.2 50; " \ ++ "i2c mw 0x50 0x15.2 58; " \ ++ "i2c mw 0x50 0x16.2 31; " \ ++ "i2c mw 0x50 0x17.2 35; " \ ++ "i2c mw 0x50 0x18.2 6e; " \ ++ "i2c mw 0x50 0x19.2 6e; " \ ++ "i2c mw 0x50 0x1a.2 6e; " \ ++ "i2c mw 0x50 0x1b.2 6e; " \ ++ "i2c mw 0x50 0x1c.2 ff; " \ ++ "i2c mw 0x50 0x1d.2 ff; " \ ++ "i2c mw 0x50 0x1e.2 ff; " \ ++ "i2c mw 0x50 0x1f.2 ff; " \ ++ "i2c md 0x50 0x00.2 20; " \ ++ "\0" \ ++ ++#define EEWIKI_MMC_BOOT \ ++ "mmc_boot=${devtype} dev ${mmcdev}; ${devtype} part; " \ ++ "if ${devtype} rescan; then " \ ++ "echo Scanning ${devtype} device ${mmcdev};" \ ++ "setenv bootpart ${mmcdev}:1; " \ ++ "echo Checking for: /uEnv.txt ...;" \ ++ "if test -e ${devtype} ${bootpart} /uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} /uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from /uEnv.txt;" \ ++ "echo Checking if uenvcmd is set ...;" \ ++ "if test -n ${uenvcmd}; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "fi; " \ ++ "echo Checking for: /boot/uEnv.txt ...;" \ ++ "for i in 1 2 3 4 5 6 7 ; do " \ ++ "setenv mmcpart ${i};" \ ++ "setenv bootpart ${mmcdev}:${mmcpart};" \ ++ "if test -e ${devtype} ${bootpart} /boot/uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from /boot/uEnv.txt;" \ ++ "if test -n ${dtb}; then " \ ++ "setenv fdtfile ${dtb};" \ ++ "echo debug: [dtb=${fdtfile}] ...;" \ ++ "fi;" \ ++ "echo Checking if uname_r is set in /boot/uEnv.txt ...;" \ ++ "if test -n ${uname_r}; then " \ ++ "echo debug: [uname_r=${uname_r}] ...;" \ ++ "setenv oldroot /dev/mmcblk${mmcdev}p${mmcpart};" \ ++ "run uname_boot;" \ ++ "fi;" \ ++ "fi;" \ ++ "done;" \ ++ "fi;\0" \ ++ ++#define EEWIKI_SCSI_BOOT \ ++ "scsi_boot=${devtype} reset ; " \ ++ "if ${devtype} dev ${mmcdev}; then " \ ++ "echo Scanning ${devtype} device ${mmcdev};" \ ++ "setenv bootpart ${mmcdev}:1; " \ ++ "echo Checking for: /uEnv.txt ...;" \ ++ "if test -e ${devtype} ${bootpart} /uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} /uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from /uEnv.txt;" \ ++ "echo Checking if uenvcmd is set ...;" \ ++ "if test -n ${uenvcmd}; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "fi; " \ ++ "echo Checking for: /boot/uEnv.txt ...;" \ ++ "for i in 1 2 3 4 ; do " \ ++ "setenv mmcpart ${i};" \ ++ "setenv bootpart ${mmcdev}:${mmcpart};" \ ++ "if test -e ${devtype} ${bootpart} /boot/uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from /boot/uEnv.txt;" \ ++ "if test -n ${dtb}; then " \ ++ "setenv fdtfile ${dtb};" \ ++ "echo debug: [dtb=${fdtfile}] ...;" \ ++ "fi;" \ ++ "echo Checking if uname_r is set in /boot/uEnv.txt ...;" \ ++ "if test -n ${uname_r}; then " \ ++ "echo debug: [uname_r=${uname_r}] ...;" \ ++ "setenv oldroot /dev/sda${mmcpart};" \ ++ "run uname_boot;" \ ++ "fi;" \ ++ "fi;" \ ++ "done;" \ ++ "fi;\0" \ ++ ++#define EEWIKI_USB_BOOT \ ++ "usb_boot=${devtype} reset ; " \ ++ "if ${devtype} dev ${mmcdev}; then " \ ++ "echo Scanning ${devtype} device ${mmcdev};" \ ++ "setenv bootpart ${mmcdev}:1; " \ ++ "echo Checking for: /uEnv.txt ...;" \ ++ "if test -e ${devtype} ${bootpart} /uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} /uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from /uEnv.txt;" \ ++ "echo Checking if uenvcmd is set in /uEnv.txt ...;" \ ++ "if test -n ${uenvcmd}; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "fi; " \ ++ "echo Checking for: /boot/uEnv.txt ...;" \ ++ "for i in 1 2 3 4 ; do " \ ++ "setenv mmcpart ${i};" \ ++ "setenv bootpart ${mmcdev}:${mmcpart};" \ ++ "if test -e ${devtype} ${bootpart} /boot/uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from /boot/uEnv.txt;" \ ++ "if test -n ${dtb}; then " \ ++ "setenv fdtfile ${dtb};" \ ++ "echo debug: [dtb=${fdtfile}] ...;" \ ++ "fi;" \ ++ "echo Checking if uname_r is set in /boot/uEnv.txt ...;" \ ++ "if test -n ${uname_r}; then " \ ++ "echo debug: [uname_r=${uname_r}] ...;" \ ++ "setenv oldroot /dev/sda${mmcpart};" \ ++ "run uname_boot;" \ ++ "fi;" \ ++ "fi;" \ ++ "done;" \ ++ "fi;\0" \ ++ ++#define EEWIKI_UNAME_BOOT \ ++ "uname_boot="\ ++ "setenv bootdir /boot; " \ ++ "setenv bootfile vmlinuz-${uname_r}; " \ ++ "if test -e ${devtype} ${bootpart} ${bootdir}/${bootfile}; then " \ ++ "echo loading ${bootdir}/${bootfile} ...; "\ ++ "run loadimage;" \ ++ "setenv fdtdir /boot/dtbs/${uname_r}; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "setenv fdtdir /usr/lib/linux-image-${uname_r}; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "setenv fdtdir /lib/firmware/${uname_r}/device-tree; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "setenv fdtdir /boot/dtb-${uname_r}; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "setenv fdtdir /boot/dtbs; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "setenv fdtdir /boot/dtb; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "setenv fdtdir /boot; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "echo; echo unable to find ${fdtfile} ...; echo booting legacy ...;"\ ++ "run args_mmc;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr}] ... ;" \ ++ "bootz ${loadaddr}; " \ ++ "fi;" \ ++ "fi;" \ ++ "fi;" \ ++ "fi;" \ ++ "fi;" \ ++ "fi;" \ ++ "fi; " \ ++ "if test -n ${enable_uboot_overlays}; then " \ ++ "setenv fdt_buffer 0x60000;" \ ++ "if test -n ${uboot_fdt_buffer}; then " \ ++ "setenv fdt_buffer ${uboot_fdt_buffer};" \ ++ "fi;" \ ++ "echo uboot_overlays: [fdt_buffer=${fdt_buffer}] ... ;" \ ++ "if test -n ${uboot_overlay_addr0}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_addr0}; " \ ++ "run capeloadoverlay;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr1}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_addr1}; " \ ++ "run capeloadoverlay;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr2}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_addr2}; " \ ++ "run capeloadoverlay;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr3}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_addr3}; " \ ++ "run capeloadoverlay;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr4}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_addr4}; " \ ++ "run capeloadoverlay;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr5}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_addr5}; " \ ++ "run capeloadoverlay;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr6}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_addr6}; " \ ++ "run capeloadoverlay;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr7}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_addr7}; " \ ++ "run capeloadoverlay;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_pru}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_pru}; " \ ++ "run virtualloadoverlay;" \ ++ "fi;" \ ++ "else " \ ++ "echo uboot_overlays: add [enable_uboot_overlays=1] to /boot/uEnv.txt to enable...;" \ ++ "fi;" \ ++ "setenv rdfile initrd.img-${uname_r}; " \ ++ "if test -e ${devtype} ${bootpart} ${bootdir}/${rdfile}; then " \ ++ "echo loading ${bootdir}/${rdfile} ...; "\ ++ "run loadrd;" \ ++ "if test -n ${netinstall_enable}; then " \ ++ "run args_netinstall; run message;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ ++ "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ ++ "fi;" \ ++ "if test -n ${uenv_root}; then " \ ++ "run args_uenv_root;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ ++ "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ ++ "fi;" \ ++ "if test -n ${uuid}; then " \ ++ "run args_mmc_uuid;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ ++ "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ ++ "else " \ ++ "run args_mmc_old;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ ++ "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ ++ "fi;" \ ++ "else " \ ++ "if test -n ${uenv_root}; then " \ ++ "run args_uenv_root;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr} - ${fdtaddr}] ... ;" \ ++ "bootz ${loadaddr} - ${fdtaddr}; " \ ++ "fi;" \ ++ "run args_mmc_old;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr} - ${fdtaddr}] ... ;" \ ++ "bootz ${loadaddr} - ${fdtaddr}; " \ ++ "fi;" \ ++ "fi;\0" \ ++ + /* + * The following are general good-enough settings for U-Boot. We set a + * large malloc pool as we generally have a lot of DDR, and we opt for +diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h +index ba57c40182..93368cdc51 100644 +--- a/include/configs/ti_omap5_common.h ++++ b/include/configs/ti_omap5_common.h +@@ -63,6 +63,11 @@ + DEFAULT_FIT_TI_ARGS \ + DEFAULT_COMMON_BOOT_TI_ARGS \ + DEFAULT_FDT_TI_ARGS \ ++ EEWIKI_USB_BOOT \ ++ EEWIKI_SCSI_BOOT \ ++ EEWIKI_MMC_BOOT \ ++ EEWIKI_UNAME_BOOT \ ++ EEPROM_PROGRAMMING \ + DFUARGS \ + NETARGS \ + +diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h +index 05bdbbc23e..b0254b064a 100644 +--- a/include/environment/ti/boot.h ++++ b/include/environment/ti/boot.h +@@ -64,32 +64,18 @@ + "bootpart=0:2\0" \ + "bootdir=/boot\0" \ + "bootfile=zImage\0" \ ++ "board_eeprom_header=undefined\0" \ + "usbtty=cdc_acm\0" \ + "vram=16M\0" \ + AVB_VERIFY_CMD \ + "partitions=" PARTS_DEFAULT "\0" \ + "optargs=\0" \ + "dofastboot=0\0" \ +- "emmc_linux_boot=" \ +- "echo Trying to boot Linux from eMMC ...; " \ +- "setenv mmcdev 1; " \ +- "setenv bootpart 1:2; " \ +- "setenv mmcroot /dev/mmcblk0p2 rw; " \ +- "run mmcboot;\0" \ +- "emmc_android_boot=" \ +- "echo Trying to boot Android from eMMC ...; " \ +- "run update_to_fit; " \ +- "setenv eval_bootargs setenv bootargs $bootargs; " \ +- "run eval_bootargs; " \ +- "setenv mmcdev 1; " \ +- "setenv machid fe6; " \ +- "mmc dev $mmcdev; " \ +- "mmc rescan; " \ +- AVB_VERIFY_CHECK \ +- "part start mmc ${mmcdev} boot boot_start; " \ +- "part size mmc ${mmcdev} boot boot_size; " \ +- "mmc read ${loadaddr} ${boot_start} ${boot_size}; " \ +- "bootm ${loadaddr}#${fdtfile};\0 " ++ "read_board_eeprom="\ ++ "if test $board_eeprom_header = beagle_x15_revb1_blank; then " \ ++ "run eeprom_dump; run eeprom_x15_b1; reset; fi; " \ ++ "if test $board_eeprom_header = beagle_x15_revc_blank; then " \ ++ "run eeprom_dump; run eeprom_x15_c; reset; fi; \0 " + + #ifdef CONFIG_OMAP54XX + +@@ -127,20 +113,17 @@ + "echo WARNING: Could not determine device tree to use; fi; \0" + + #define CONFIG_BOOTCOMMAND \ +- "if test ${dofastboot} -eq 1; then " \ +- "echo Boot fastboot requested, resetting dofastboot ...;" \ +- "setenv dofastboot 0; saveenv;" \ +- "echo Booting into fastboot ...; " \ +- "fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \ +- "fi;" \ +- "if test ${boot_fit} -eq 1; then " \ +- "run update_to_fit;" \ +- "fi;" \ ++ "run read_board_eeprom; " \ + "run findfdt; " \ +- "run envboot; " \ +- "run mmcboot;" \ +- "run emmc_linux_boot; " \ +- "run emmc_android_boot; " \ ++ "setenv mmcdev 0; " \ ++ "setenv devtype usb; " \ ++ "echo usb_boot is currently disabled;" \ ++ "setenv devtype scsi; " \ ++ "echo scsi_boot is currently disabled;" \ ++ "setenv devtype mmc; " \ ++ "run mmc_boot;" \ ++ "setenv mmcdev 1; " \ ++ "run mmc_boot;" \ + "" + + #endif /* CONFIG_OMAP54XX */ +diff --git a/include/environment/ti/mmc.h b/include/environment/ti/mmc.h +index 785fc15345..6481682fc7 100644 +--- a/include/environment/ti/mmc.h ++++ b/include/environment/ti/mmc.h +@@ -11,11 +11,33 @@ + #define DEFAULT_MMC_TI_ARGS \ + "mmcdev=0\0" \ + "mmcrootfstype=ext4 rootwait\0" \ +- "finduuid=part uuid mmc ${bootpart} uuid\0" \ ++ "finduuid=part uuid ${devtype} ${bootpart} uuid\0" \ + "args_mmc=run finduuid;setenv bootargs console=${console} " \ + "${optargs} " \ +- "root=PARTUUID=${uuid} rw " \ +- "rootfstype=${mmcrootfstype}\0" \ ++ "root=PARTUUID=${uuid} ro " \ ++ "rootfstype=${mmcrootfstype} " \ ++ "${cmdline}\0" \ ++ "args_mmc_old=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=${oldroot} ro " \ ++ "rootfstype=${mmcrootfstype} " \ ++ "${cmdline}\0" \ ++ "args_mmc_uuid=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=UUID=${uuid} ro " \ ++ "rootfstype=${mmcrootfstype} " \ ++ "${cmdline}\0" \ ++ "args_uenv_root=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=${uenv_root} ro " \ ++ "rootfstype=${mmcrootfstype} " \ ++ "${musb} ${cmdline}\0" \ ++ "args_netinstall=setenv bootargs ${netinstall_bootargs} " \ ++ "${optargs} " \ ++ "${cape_disable} " \ ++ "${cape_enable} " \ ++ "root=/dev/ram rw " \ ++ "${cmdline}\0" \ + "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" \ +@@ -24,7 +46,22 @@ + "env import -t ${loadaddr} ${filesize}\0" \ + "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}\0" \ + "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ +- "loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ ++ "loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}; setenv rdsize ${filesize}\0" \ ++ "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \ ++ "loadoverlay=echo uboot_overlays: loading ${uboot_overlay} ...; " \ ++ "load ${devtype} ${bootpart} ${rdaddr} ${uboot_overlay}; " \ ++ "fdt addr ${fdtaddr}; fdt resize ${fdt_buffer}; " \ ++ "fdt apply ${rdaddr}; fdt resize ${fdt_buffer};\0" \ ++ "virtualloadoverlay=if test -e ${devtype} ${bootpart} ${uboot_overlay}; then " \ ++ "run loadoverlay;" \ ++ "else " \ ++ "echo uboot_overlays: unable to find [${devtype} ${bootpart} ${uboot_overlay}]...;" \ ++ "fi;\0" \ ++ "capeloadoverlay=if test -e ${devtype} ${bootpart} ${uboot_overlay}; then " \ ++ "run loadoverlay;" \ ++ "else " \ ++ "echo uboot_overlays: unable to find [${devtype} ${bootpart} ${uboot_overlay}]...;" \ ++ "fi;\0" \ + "envboot=mmc dev ${mmcdev}; " \ + "if mmc rescan; then " \ + "echo SD/MMC found on device ${mmcdev};" \ +-- +2.17.1 + diff --git a/buildroot/board/beagleboneai/post-build.sh b/buildroot/board/beagleboneai/post-build.sh new file mode 100755 index 000000000..34a86cc74 --- /dev/null +++ b/buildroot/board/beagleboneai/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +cp board/beagleboneai/uEnv.txt $BINARIES_DIR/uEnv.txt diff --git a/buildroot/board/beagleboneai/readme.txt b/buildroot/board/beagleboneai/readme.txt new file mode 100644 index 000000000..f4c798f55 --- /dev/null +++ b/buildroot/board/beagleboneai/readme.txt @@ -0,0 +1,28 @@ +Intro +===== + +This configuration will build a basic image for the BeagleBoard.org +BeagleBone AI. For more details about the board, visit: + +https://beagleboard.org/ai + +How to build it +=============== + +Configure Buildroot: + + $ make beagleboneai_defconfig + +Compile everything and build the USB flash drive image: + + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/buildroot/board/beagleboneai/uEnv.txt b/buildroot/board/beagleboneai/uEnv.txt new file mode 100644 index 000000000..d38df7727 --- /dev/null +++ b/buildroot/board/beagleboneai/uEnv.txt @@ -0,0 +1,6 @@ +bootpart=0:1 +bootdir=/ +bootargs=console=ttyS0,115200n8 root=/dev/mmcblk0p2 ro rootwait +devtype=mmc +fdtfile=am5729-beagleboneai.dtb +uenvcmd=run loadimage; run loadfdt; printenv bootargs; bootz ${loadaddr} - ${fdtaddr} diff --git a/buildroot/board/beelink/gs1/extlinux.conf b/buildroot/board/beelink/gs1/extlinux.conf new file mode 100644 index 000000000..046681f71 --- /dev/null +++ b/buildroot/board/beelink/gs1/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /Image + devicetree /sun50i-h6-beelink-gs1.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait diff --git a/buildroot/board/beelink/gs1/genimage.cfg b/buildroot/board/beelink/gs1/genimage.cfg new file mode 100644 index 000000000..88bbd2659 --- /dev/null +++ b/buildroot/board/beelink/gs1/genimage.cfg @@ -0,0 +1,33 @@ +image boot.vfat { + vfat { + files = { + "Image", + "sun50i-h6-beelink-gs1.dtb", + "extlinux" + } + } + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 1040384 # 1MB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch b/buildroot/board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch new file mode 100644 index 000000000..9443fdd56 --- /dev/null +++ b/buildroot/board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch @@ -0,0 +1,39 @@ +From 523ab5be1a84e9aa15fb62c3a15a6338b01d3961 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= +Date: Tue, 9 Apr 2019 00:15:06 +0200 +Subject: [PATCH] plat: allwinner: common: use r_wdog instead of wdog +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some Allwinner H6 has a broken watchdog that doesn't +make the soc reboot. + +Use the R_WATCHDOG instead. + +Signed-off-by: Clément Péron +Change-Id: Ie95cc30a80ed517b60b30d6bc2e655a1b53f18ba +--- + plat/allwinner/common/sunxi_pm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plat/allwinner/common/sunxi_pm.c b/plat/allwinner/common/sunxi_pm.c +index 1d2dc938..13e13532 100644 +--- a/plat/allwinner/common/sunxi_pm.c ++++ b/plat/allwinner/common/sunxi_pm.c +@@ -20,9 +20,9 @@ + #include + #include + +-#define SUNXI_WDOG0_CTRL_REG (SUNXI_WDOG_BASE + 0x0010) +-#define SUNXI_WDOG0_CFG_REG (SUNXI_WDOG_BASE + 0x0014) +-#define SUNXI_WDOG0_MODE_REG (SUNXI_WDOG_BASE + 0x0018) ++#define SUNXI_WDOG0_CTRL_REG (SUNXI_R_WDOG_BASE + 0x0010) ++#define SUNXI_WDOG0_CFG_REG (SUNXI_R_WDOG_BASE + 0x0014) ++#define SUNXI_WDOG0_MODE_REG (SUNXI_R_WDOG_BASE + 0x0018) + + #define mpidr_is_valid(mpidr) ( \ + MPIDR_AFFLVL3_VAL(mpidr) == 0 && \ +-- +2.20.1 + diff --git a/buildroot/board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch b/buildroot/board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch new file mode 100644 index 000000000..8e695f641 --- /dev/null +++ b/buildroot/board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch @@ -0,0 +1,279 @@ +From 99cade8743158889b3e8db93c003b3318ebd4bda Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= +Date: Sun, 11 Aug 2019 22:38:57 +0200 +Subject: [PATCH] arm: dts: sync dts for Allwinner H6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Sync Kernel DTS for Allwinner H6 boards. + +Drop /omit-if-no-ref/ keyword as it's not supported by U-boot. + +commit Linux 5.3-rc4 + +Signed-off-by: Clément Péron +--- + arch/arm/dts/sun50i-h6-beelink-gs1.dts | 76 ++++++++++++++++++++++++++ + arch/arm/dts/sun50i-h6-pine-h64.dts | 12 ++++ + arch/arm/dts/sun50i-h6.dtsi | 46 +++++++++++++++- + 3 files changed, 131 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts +index 54b0882bed..0dc33c90dd 100644 +--- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts ++++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts +@@ -14,6 +14,7 @@ + compatible = "azw,beelink-gs1", "allwinner,sun50i-h6"; + + aliases { ++ ethernet0 = &emac; + serial0 = &uart0; + }; + +@@ -21,6 +22,17 @@ + stdout-path = "serial0:115200n8"; + }; + ++ connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_con_in: endpoint { ++ remote-endpoint = <&hdmi_out_con>; ++ }; ++ }; ++ }; ++ + leds { + compatible = "gpio-leds"; + +@@ -41,6 +53,40 @@ + }; + }; + ++&de { ++ status = "okay"; ++}; ++ ++&ehci0 { ++ status = "okay"; ++}; ++ ++&emac { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&ext_rgmii_pins>; ++ phy-mode = "rgmii"; ++ phy-handle = <&ext_rgmii_phy>; ++ phy-supply = <®_aldo2>; ++ status = "okay"; ++}; ++ ++&hdmi { ++ status = "okay"; ++}; ++ ++&hdmi_out { ++ hdmi_out_con: endpoint { ++ remote-endpoint = <&hdmi_con_in>; ++ }; ++}; ++ ++&mdio { ++ ext_rgmii_phy: ethernet-phy@1 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <1>; ++ }; ++}; ++ + &mmc0 { + vmmc-supply = <®_cldo1>; + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; +@@ -57,6 +103,15 @@ + status = "okay"; + }; + ++&ohci0 { ++ status = "okay"; ++}; ++ ++&pio { ++ vcc-pd-supply = <®_cldo1>; ++ vcc-pg-supply = <®_aldo1>; ++}; ++ + &r_i2c { + status = "okay"; + +@@ -177,8 +232,29 @@ + }; + }; + ++&r_pio { ++ /* ++ * PL0 and PL1 are used for PMIC I2C ++ * don't enable the pl-supply else ++ * it will fail at boot ++ * ++ * vcc-pl-supply = <®_aldo1>; ++ */ ++ vcc-pm-supply = <®_aldo1>; ++}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_ph_pins>; + status = "okay"; + }; ++ ++&usb2otg { ++ dr_mode = "host"; ++ status = "okay"; ++}; ++ ++&usb2phy { ++ usb0_vbus-supply = <®_vcc5v>; ++ status = "okay"; ++}; +diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts +index 4802902e12..1898345183 100644 +--- a/arch/arm/dts/sun50i-h6-pine-h64.dts ++++ b/arch/arm/dts/sun50i-h6-pine-h64.dts +@@ -127,6 +127,12 @@ + status = "okay"; + }; + ++&pio { ++ vcc-pc-supply = <®_bldo2>; ++ vcc-pd-supply = <®_cldo1>; ++ vcc-pg-supply = <®_aldo1>; ++}; ++ + &r_i2c { + status = "okay"; + +@@ -243,10 +249,16 @@ + pcf8563: rtc@51 { + compatible = "nxp,pcf8563"; + reg = <0x51>; ++ interrupt-parent = <&r_intc>; ++ interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + #clock-cells = <0>; + }; + }; + ++&r_pio { ++ vcc-pm-supply = <®_aldo1>; ++}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_ph_pins>; +diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi +index e0dc4a05c1..a117f479ae 100644 +--- a/arch/arm/dts/sun50i-h6.dtsi ++++ b/arch/arm/dts/sun50i-h6.dtsi +@@ -101,7 +101,7 @@ + #size-cells = <1>; + ranges; + +- display-engine@1000000 { ++ bus@1000000 { + compatible = "allwinner,sun50i-h6-de3", + "allwinner,sun50i-a64-de2"; + reg = <0x1000000 0x400000>; +@@ -203,11 +203,32 @@ + #reset-cells = <1>; + }; + ++ dma: dma-controller@3002000 { ++ compatible = "allwinner,sun50i-h6-dma"; ++ reg = <0x03002000 0x1000>; ++ interrupts = ; ++ clocks = <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>; ++ clock-names = "bus", "mbus"; ++ dma-channels = <16>; ++ dma-requests = <46>; ++ resets = <&ccu RST_BUS_DMA>; ++ #dma-cells = <1>; ++ }; ++ + sid: sid@3006000 { + compatible = "allwinner,sun50i-h6-sid"; + reg = <0x03006000 0x400>; + }; + ++ watchdog: watchdog@30090a0 { ++ compatible = "allwinner,sun50i-h6-wdt", ++ "allwinner,sun6i-a31-wdt"; ++ reg = <0x030090a0 0x20>; ++ interrupts = ; ++ /* Broken on some H6 boards */ ++ status = "disabled"; ++ }; ++ + pio: pinctrl@300b000 { + compatible = "allwinner,sun50i-h6-pinctrl"; + reg = <0x0300b000 0x400>; +@@ -243,6 +264,18 @@ + bias-pull-up; + }; + ++ /* ++ * /omit-if-no-ref/ isn't supported by U-boot ++ * keep this comment to avoid bad sync with Linux ++ */ ++ mmc1_pins: mmc1-pins { ++ pins = "PG0", "PG1", "PG2", "PG3", ++ "PG4", "PG5"; ++ function = "mmc1"; ++ drive-strength = <30>; ++ bias-pull-up; ++ }; ++ + mmc2_pins: mmc2-pins { + pins = "PC1", "PC4", "PC5", "PC6", + "PC7", "PC8", "PC9", "PC10", +@@ -294,6 +327,8 @@ + resets = <&ccu RST_BUS_MMC1>; + reset-names = "ahb"; + interrupts = ; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc1_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; +@@ -445,7 +480,6 @@ + resets = <&ccu RST_BUS_OHCI3>, + <&ccu RST_BUS_EHCI3>; + phys = <&usb2phy 3>; +- phy-names = "usb"; + status = "disabled"; + }; + +@@ -457,7 +491,6 @@ + <&ccu CLK_USB_OHCI3>; + resets = <&ccu RST_BUS_OHCI3>; + phys = <&usb2phy 3>; +- phy-names = "usb"; + status = "disabled"; + }; + +@@ -613,6 +646,13 @@ + #reset-cells = <1>; + }; + ++ r_watchdog: watchdog@7020400 { ++ compatible = "allwinner,sun50i-h6-wdt", ++ "allwinner,sun6i-a31-wdt"; ++ reg = <0x07020400 0x20>; ++ interrupts = ; ++ }; ++ + r_intc: interrupt-controller@7021000 { + compatible = "allwinner,sun50i-h6-r-intc", + "allwinner,sun6i-a31-r-intc"; +-- +2.20.1 + diff --git a/buildroot/board/beelink/gs1/post-build.sh b/buildroot/board/beelink/gs1/post-build.sh new file mode 100755 index 000000000..ec20fca7d --- /dev/null +++ b/buildroot/board/beelink/gs1/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/ci20/genimage.cfg b/buildroot/board/ci20/genimage.cfg index fa3e7368d..5f8a16c61 100644 --- a/buildroot/board/ci20/genimage.cfg +++ b/buildroot/board/ci20/genimage.cfg @@ -24,6 +24,5 @@ image sdcard.img { partition-type = 0x83 image = "rootfs.ext4" offset = 2M - size = 60M } } diff --git a/buildroot/board/csky/gx6605s/gx6605s.dts b/buildroot/board/csky/gx6605s/gx6605s.dts new file mode 100644 index 000000000..e4d46f59a --- /dev/null +++ b/buildroot/board/csky/gx6605s/gx6605s.dts @@ -0,0 +1,155 @@ +/dts-v1/; +#include +#include + +/ { + model = "C-SKY gx6605s"; + compatible = "csky,gx6605s"; + #address-cells = <1>; + #size-cells = <1>; + + memory { + device_type = "memory"; + reg = <0x10000000 0x04000000>; + }; + + soc { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + ranges; + + dummy_apb: apb-clock { + compatible = "fixed-clock"; + clock-frequency = <27000000>; + clock-output-names = "dummy_apb"; + #clock-cells = <0>; + }; + + intc: interrupt-controller@500000 { + compatible = "csky,gx6605s-intc"; + reg = <0x00500000 0x400>; + interrupt-controller; + #interrupt-cells = <1>; + }; + + timer@20a000 { + compatible = "csky,gx6605s-timer"; + reg = <0x0020a000 0x400>; + clocks = <&dummy_apb>; + interrupts = <10>; + interrupt-parent = <&intc>; + }; + + ehci-hcd@900000 { + compatible = "generic-ehci"; + reg = <0x00900000 0x400>; + interrupt-parent = <&intc>; + interrupts = <59>; + }; + + ohci-hcd0@a00000 { + compatible = "generic-ohci"; + reg = <0x00a00000 0x400>; + interrupt-parent = <&intc>; + interrupts = <58>; + }; + + ohci-hcd1@b00000 { + compatible = "generic-ohci"; + reg = <0x00b00000 0x400>; + interrupt-parent = <&intc>; + interrupts = <57>; + }; + + serial@403000 { + compatible = "ns16550a"; + reg = <0x00403000 0x400>; + interrupt-parent = <&intc>; + interrupts = <15>; + clock-frequency = <29491200>; + baud = <115200>; + reg-shift = <2>; + reg-io-width = <1>; + }; + + gpio0: gpio@305000 { + compatible = "wd,mbl-gpio"; + reg-names = "dirout", "dat", "set", "clr"; + reg = <0x305000 4>, <0x305004 4>, <0x305008 4>, <0x30500c 4>; + bgpio-base = <0>; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio_buttons { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <100>; + autorepeat; + + button0 { + label = "button8"; + linux,code = ; + gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + }; + + button1 { + label = "button6"; + linux,code = ; + gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; + }; + + button2 { + label = "button5"; + linux,code = ; + gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + }; + + button3 { + label = "button9"; + linux,code = ; + gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; + }; + + button4 { + label = "button7"; + linux,code = ; + gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + }; + }; + + gpio_leds { + compatible = "gpio-leds"; + + led0 { + label = "led10"; + gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + linux,default-trigger = "heartbeat"; + }; + + led1 { + label = "led11"; + gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + linux,default-trigger = "timer"; + }; + + led2 { + label = "led12"; + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; + linux,default-trigger = "default-on"; + }; + + led3 { + label = "led13"; + gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + linux,default-trigger = "default-on"; + }; + }; + }; + + chosen { + bootargs = "console=ttyS0,115200 init=/sbin/init root=/dev/sda2 rw rootwait"; + }; +}; diff --git a/buildroot/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch b/buildroot/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch deleted file mode 100644 index 1da1a7540..000000000 --- a/buildroot/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7e3f2c482bc16537a093e87a27f0d465804a88e4 Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Tue, 11 Dec 2018 23:04:46 +0100 -Subject: [PATCH] csky: update cmdline for serial console and rootfs on sda1 - -Signed-off-by: Julien Olivain ---- - arch/csky/boot/dts/gx6605s.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/csky/boot/dts/gx6605s.dts b/arch/csky/boot/dts/gx6605s.dts -index ce56106af967..f5d60b21e6f9 100644 ---- a/arch/csky/boot/dts/gx6605s.dts -+++ b/arch/csky/boot/dts/gx6605s.dts -@@ -155,6 +155,6 @@ - }; - - chosen { -- bootargs = "console=tty0 init=/sbin/init root=/dev/sda2 rw rootwait"; -+ bootargs = "console=ttyS0,115200 init=/sbin/init root=/dev/sda1 rw rootwait"; - }; - }; --- -2.19.2 - diff --git a/buildroot/board/csky/readme.txt b/buildroot/board/csky/readme.txt index b4605c541..dc82dcc1d 100644 --- a/buildroot/board/csky/readme.txt +++ b/buildroot/board/csky/readme.txt @@ -41,9 +41,9 @@ Result of the build After building, you should obtain this tree: output/images/ - ├── vmlinux - ├── rootfs.ext2 - └── .dtb + +-- vmlinux + +-- rootfs.ext2 + +-- .dtb How to run it ============= diff --git a/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap10.json b/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap10.json index 963c7c003..3bfe4a236 100644 --- a/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap10.json +++ b/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap10.json @@ -4,7 +4,7 @@ "pbuffers": true, "outputs": [ { - "name": "LVDS-1", + "name": "LVDS1", "mode": "1280x800" } ] diff --git a/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap12.json b/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap12.json index 36700affd..ea5ce6f97 100644 --- a/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap12.json +++ b/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap12.json @@ -4,7 +4,7 @@ "pbuffers": true, "outputs": [ { - "name": "LVDS-1", + "name": "LVDS1", "mode": "1280x480" } ] diff --git a/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore.json b/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore.json index ac139a3ea..b4fa359b6 100644 --- a/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore.json +++ b/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore.json @@ -4,7 +4,7 @@ "pbuffers": true, "outputs": [ { - "name": "LVDS-1", + "name": "LVDS1", "mode": "800x480" } ] diff --git a/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 b/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 index 2f8842f8e..bd5f6cdc7 100644 --- a/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 +++ b/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 @@ -23,7 +23,7 @@ image sdcard.img { partition imx-boot { in-partition-table = "no" image = "imx8-boot-sd.bin" - offset = 33K + offset = %IMXOFFSET% } partition boot { diff --git a/buildroot/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl b/buildroot/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl new file mode 100644 index 000000000..c29032572 --- /dev/null +++ b/buildroot/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl @@ -0,0 +1,30 @@ +# Minimal SD card image for the Freescale boards Template for SPL Boot +# +# We mimic the .sdcard Freescale's image format: +# * the SD card must have 1 kB free space at the beginning, +# * SPL is at the offset expected by ROM, +# * U-Boot is at the offset expected by SPL, +# * The first partition is expected to be an ext2 and have a /boot directory. +# + +image sdcard.img { + hdimage { + } + + partition spl { + in-partition-table = "no" + image = "SPL" + offset = 1024 + } + + partition u-boot { + in-partition-table = "no" + image = "%UBOOTBIN%" + offset = 69K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/buildroot/board/freescale/common/imx/genimage.cfg.template_spl b/buildroot/board/freescale/common/imx/genimage.cfg.template_spl index 0b6e22864..d2d810777 100644 --- a/buildroot/board/freescale/common/imx/genimage.cfg.template_spl +++ b/buildroot/board/freescale/common/imx/genimage.cfg.template_spl @@ -26,9 +26,9 @@ image sdcard.img { offset = 1024 } - partition u-boot-img { + partition u-boot { in-partition-table = "no" - image = "u-boot.img" + image = "%UBOOTBIN%" offset = 69K } diff --git a/buildroot/board/freescale/common/imx/imx8-bootloader-prepare.sh b/buildroot/board/freescale/common/imx/imx8-bootloader-prepare.sh index cc12666ae..45c648e36 100755 --- a/buildroot/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/buildroot/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -7,12 +7,32 @@ main () echo "ERROR: couldn't find dtb: $UBOOT_DTB" exit 1 fi - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin - BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its - ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb - rm -f ${BINARIES_DIR}/u-boot.its - ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + rm -f ${BINARIES_DIR}/u-boot.its + + ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + rm -f ${BINARIES_DIR}/u-boot.its + + ${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + else + ${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit + cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin + cp ${BINARIES_DIR}/bl31.bin ${BINARIES_DIR}/u-boot-atf.bin + dd if=${BINARIES_DIR}/u-boot-hash.bin of=${BINARIES_DIR}/u-boot-atf.bin bs=1K seek=128 + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then + ${HOST_DIR}/bin/mkimage_imx8 -soc QM -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qm-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a53 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + else + ${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + fi + fi exit $? } diff --git a/buildroot/board/freescale/common/imx/post-image.sh b/buildroot/board/freescale/common/imx/post-image.sh index 6590beda3..138ea7b12 100755 --- a/buildroot/board/freescale/common/imx/post-image.sh +++ b/buildroot/board/freescale/common/imx/post-image.sh @@ -32,8 +32,18 @@ linux_image() genimage_type() { - if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_no_boot_part_spl" + fi elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_spl" else @@ -41,23 +51,40 @@ genimage_type() fi } +imx_offset() +{ + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then + echo "33K" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then + echo "33K" + else + echo "32K" + fi +} + uboot_image() { if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" ${BR2_CONFIG}; then echo "u-boot-dtb.imx" elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" ${BR2_CONFIG}; then echo "u-boot.imx" + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" ${BR2_CONFIG}; then + echo "u-boot-dtb.img" + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMG=y$" ${BR2_CONFIG}; then + echo "u-boot.img" fi } main() { local FILES="$(dtb_list) $(linux_image)" + local IMXOFFSET="$(imx_offset)" local UBOOTBIN="$(uboot_image)" local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" sed -e "s/%FILES%/${FILES}/" \ + -e "s/%IMXOFFSET%/${IMXOFFSET}/" \ -e "s/%UBOOTBIN%/${UBOOTBIN}/" \ board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG} diff --git a/buildroot/board/freescale/imx6-sabresd/linux_qt5.fragment b/buildroot/board/freescale/imx6-sabresd/linux_qt5.fragment index d4f26b163..ffa5f63ea 100644 --- a/buildroot/board/freescale/imx6-sabresd/linux_qt5.fragment +++ b/buildroot/board/freescale/imx6-sabresd/linux_qt5.fragment @@ -2,4 +2,3 @@ # ondemand governor with a mainline kernel. # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -CONFIG_VIDEO_CODA=m diff --git a/buildroot/board/freescale/imx6-sabresd/readme.txt b/buildroot/board/freescale/imx6-sabresd/readme.txt index f09ff5caf..292dab72c 100644 --- a/buildroot/board/freescale/imx6-sabresd/readme.txt +++ b/buildroot/board/freescale/imx6-sabresd/readme.txt @@ -80,6 +80,7 @@ Running kmscube application: Running Qt5 Cinematic Demo: # export QT_QPA_EGLFS_KMS_CONFIG=/root/sabresd.json +# export QT_QPA_EGLFS_ALWAYS_SET_MODE=1 # /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience Running gl2mark benchmark: diff --git a/buildroot/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json b/buildroot/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json index d5d063af8..fe92ce5b2 100644 --- a/buildroot/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json +++ b/buildroot/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json @@ -4,11 +4,11 @@ "pbuffers": true, "outputs": [ { - "name": "HDMI-1", + "name": "HDMI1", "mode": "off" }, { - "name": "LVDS-1", + "name": "LVDS1", "mode": "1024x768" } ] diff --git a/buildroot/board/freescale/imx8mmevk/readme.txt b/buildroot/board/freescale/imx8mmevk/readme.txt new file mode 100644 index 000000000..7b69405d3 --- /dev/null +++ b/buildroot/board/freescale/imx8mmevk/readme.txt @@ -0,0 +1,71 @@ +*************************** +Freescale i.MX8MM EVK board +*************************** + +This file documents the Buildroot support for the Freescale i.MX8MM +EVK board. + +Build +===== + +First, configure Buildroot for the i.MX8MM EVK board: + + make freescale_imx8mmevk_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - bl31.bin + - boot.vfat + - fsl-imx8mm-evk.dtb + - Image + - imx8-boot-sd.bin + - lpddr4_pmu_train_fw.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot.bin + - u-boot.imx + - u-boot-nodtb.bin + - u-boot-spl-ddr.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx8. + +Boot the i.MX8MM EVK board +========================== + +To boot your newly created system (refer to the i.MX8MMini EVK Quick Start Guide +[1] for guidance): +- insert the SD card in the SD slot of the board; +- Configure the switches as follows: +SW1101: 0110110010 [D1-D10] +SW1102: 0001101000 [D1-D10] +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Enjoy! + +References +========== +[1] https://www.nxp.com/document/guide/Get-Started-with-the-i.MX-8M-Mini-EVK:GS-iMX-8M-Mini-EVK diff --git a/buildroot/board/freescale/imx8qxpmek/readme.txt b/buildroot/board/freescale/imx8qxpmek/readme.txt new file mode 100644 index 000000000..45f7915fe --- /dev/null +++ b/buildroot/board/freescale/imx8qxpmek/readme.txt @@ -0,0 +1,67 @@ +*************************** +Freescale i.MX8QXP MEK board +*************************** + +This file documents the Buildroot support for the Freescale i.MX8QXP +MEK board. + +Build +===== + +First, configure Buildroot for the i.MX8QXP MEK board: + + make freescale_imx8qxpmek_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - ahab-container.img + - bl31.bin + - boot.vfat + - fsl-imx8qxp-mek.dtb + - Image + - imx8-boot-sd.bin + - mkimg.commit + - mx8qx-mek-scfw-tcm.bin + - mx8qx-val-scfw-tcm.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot-atf.bin + - u-boot.bin + - u-boot-hash.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx8. + +Boot the i.MX8QXP MEK board +========================== + +To boot your newly created system: +- insert the SD card in the SD slot of the board; +- Configure the boot switch as follows: +SW2: ON ON OFF OFF +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Enjoy! diff --git a/buildroot/board/freescale/t1040_t2080/readme.txt b/buildroot/board/freescale/t1040_t2080/readme.txt new file mode 100644 index 000000000..65695295f --- /dev/null +++ b/buildroot/board/freescale/t1040_t2080/readme.txt @@ -0,0 +1,51 @@ +For the bootloader, NXP has stablized at SDK2.0 (final release). It is +suggested to download the prebuilt from NXP downloads and follow the +release notes for reflashing. + +To program the kernel and rootfs created by buildroot into the flash. The +fast way is to tftp transfer the files via one of the network interfaces. +Make sure your devkit has ipaddr, netmask, and serverip defined to reach your +tftp server. Verify bootargs are reasonable (console=ttyS0,115200). + +------------------------------------------------------------------------------ + +Devkit: T1040RDB + +(Assuming the default u-boot env from NXP) +1. Program the DTB to NOR flash + + => tftpboot $loadaddr t1040d4rdb.dtb; protect off 0xe8800000 +$filesize; erase 0xe8800000 +$filesize; cp.b $loadaddr 0xe8800000 $filesize; protect on 0xe8800000 +$filesize; cmp.b $loadaddr 0xe8800000 $filesize + +2. Program the kernel and rootfs to NOR flash + + => tftpboot $loadaddr uImage; protect off 0xe8020000 +$filesize; erase 0xe8020000 +$filesize; cp.b $loadaddr 0xe8020000 $filesize; protect on 0xe8020000 +$filesize; cmp.b $loadaddr 0xe8020000 $filesize + => tftpboot $loadaddr rootfs.cpio.uboot; protect off 0xe9300000 +$filesize; erase 0xe9300000 +$filesize; cp.b $loadaddr 0xe9300000 $filesize; protect on 0xe9300000 +$filesize; cmp.b $loadaddr 0xe9300000 $filesize + +3. Booting your new system + + => boot + + You can login with user "root". +------------------------------------------------------------------------------ + +Devkit: T2080 QDS or RDB + +(Assuming the default u-boot env from NXP) +1. Netboot the kernel/rootfs/dtb + + => tftp 0x1000000 uImage && tftp 0x2000000 rootfs.cpio.uboot + + RDB => tftp 0x3000000 t2080rdb.dtb + or + QDS => tftp 0x3000000 t2080qds.dtb + +2. Booting your new system + + => bootm 0x1000000 0x2000000 0x3000000 + + You can login with user "root". + +3. If flashing is desired, a similar approach to the T1040 can be followed + with updated addresses for the flash layout. Example is in the NXP default + env. +------------------------------------------------------------------------------ diff --git a/buildroot/board/freescale/t1040d4rdb/readme.txt b/buildroot/board/freescale/t1040d4rdb/readme.txt deleted file mode 100644 index 04d6b0153..000000000 --- a/buildroot/board/freescale/t1040d4rdb/readme.txt +++ /dev/null @@ -1,24 +0,0 @@ -For the bootloader, NXP has stablized at SDK2.0 (final release). It is -suggested to download the prebuilt from NXP downloads and follow the -release notes for reflashing. - -To program the kernel and rootfs created by buildroot into the flash. The -fast way is to tftp transfer the files via one of the network interfaces. -Make sure your devkit has ipaddr and serverip defined to reach your tftp -server. - -(Assuming the default u-boot env from NXP) -1. Program the DTB to NOR flash - - => tftpboot $loadaddr t1040d4rdb.dtb; protect off 0xe8800000 +$filesize; erase 0xe8800000 +$filesize; cp.b $loadaddr 0xe8800000 $filesize; protect on 0xe8800000 +$filesize; cmp.b $loadaddr 0xe8800000 $filesize - -2. Program the kernel and rootfs to NOR flash - - => tftpboot $loadaddr uImage; protect off 0xe8020000 +$filesize; erase 0xe8020000 +$filesize; cp.b $loadaddr 0xe8020000 $filesize; protect on 0xe8020000 +$filesize; cmp.b $loadaddr 0xe8020000 $filesize - => tftpboot $loadaddr rootfs.cpio.uboot; protect off 0xe9300000 +$filesize; erase 0xe9300000 +$filesize; cp.b $loadaddr 0xe9300000 $filesize; protect on 0xe9300000 +$filesize; cmp.b $loadaddr 0xe9300000 $filesize - -3. Booting your new system - - => boot - - You can login with user "root". diff --git a/buildroot/board/friendlyarm/nanopi-m1-plus/patches/linux/0001-ARM-dts-nanopi-m1-plus-add-dts-to-linux-4.11.5.patch b/buildroot/board/friendlyarm/nanopi-m1-plus/patches/linux/0001-ARM-dts-nanopi-m1-plus-add-dts-to-linux-4.11.5.patch deleted file mode 100644 index c05273261..000000000 --- a/buildroot/board/friendlyarm/nanopi-m1-plus/patches/linux/0001-ARM-dts-nanopi-m1-plus-add-dts-to-linux-4.11.5.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 4ec28d4e1040b94c66e97aa77071c9ef3478f022 Mon Sep 17 00:00:00 2001 -From: Chakra Divi -Date: Thu, 6 Jul 2017 18:22:35 +0530 -Subject: [PATCH] ARM: dts: nanopi-m1-plus : add dts to linux 4.11.5 - -This patch is used to add nanopi-m1-plus dts -file in linux source code helps to add nanopi-m1-plus -board support in buildroot and is part of the linux -main-line ; refer to the below link for info -[https://patchwork.kernel.org/patch/9755033] - -Signed-off-by: Chakra Divi ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 64 +++++++++++++++++++++++++ - 2 files changed, 65 insertions(+) - create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 0118084..928e5d3 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -867,6 +867,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ - sun8i-h3-bananapi-m2-plus.dtb \ - sun8i-h3-beelink-x2.dtb \ - sun8i-h3-nanopi-m1.dtb \ -+ sun8i-h3-nanopi-m1-plus.dtb \ - sun8i-h3-nanopi-neo.dtb \ - sun8i-h3-orangepi-2.dtb \ - sun8i-h3-orangepi-lite.dtb \ -diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts -new file mode 100644 -index 0000000..8ddd1b2 ---- /dev/null -+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts -@@ -0,0 +1,64 @@ -+/* -+ * Copyright (C) 2017 Jagan Teki -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+#include "sun8i-h3-nanopi.dtsi" -+ -+/ { -+ model = "FriendlyArm NanoPi M1 Plus"; -+ compatible = "friendlyarm,nanopi-m1-plus", "allwinner,sun8i-h3"; -+}; -+ -+&ehci1 { -+ status = "okay"; -+}; -+ -+&ehci2 { -+ status = "okay"; -+}; -+ -+&ohci1 { -+ status = "okay"; -+}; -+ -+&ohci2 { -+ status = "okay"; -+}; --- -1.7.9.5 - diff --git a/buildroot/board/friendlyarm/nanopi-neo-plus2/extlinux.conf b/buildroot/board/friendlyarm/nanopi-neo-plus2/extlinux.conf new file mode 100644 index 000000000..fcb6f632c --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo-plus2/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /Image + devicetree /sun50i-h5-nanopi-neo-plus2.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait diff --git a/buildroot/board/friendlyarm/nanopi-neo-plus2/genimage.cfg b/buildroot/board/friendlyarm/nanopi-neo-plus2/genimage.cfg new file mode 100644 index 000000000..fb871abd4 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo-plus2/genimage.cfg @@ -0,0 +1,39 @@ +image boot.vfat { + vfat { + files = { + "Image", + "sun50i-h5-nanopi-neo-plus2.dtb", + "extlinux" + } + } + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition spl { + in-partition-table = "no" + image = "sunxi-spl.bin" + offset = 8192 + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot.itb" + offset = 40K + size = 1M # 1MB - 40K + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/friendlyarm/nanopi-neo-plus2/linux-extras.config b/buildroot/board/friendlyarm/nanopi-neo-plus2/linux-extras.config new file mode 100644 index 000000000..52b4b4b29 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo-plus2/linux-extras.config @@ -0,0 +1,10 @@ +# wireless core +CONFIG_WIRELESS=y +CONFIG_CFG80211=y +CONFIG_MAC80211=y +CONFIG_CFG80211_WEXT=y + +# wireless drivers +CONFIG_WLAN=y +CONFIG_WLAN_VENDOR_BROADCOM=y +CONFIG_BRCMFMAC=m diff --git a/buildroot/board/friendlyarm/nanopi-neo-plus2/post-build.sh b/buildroot/board/friendlyarm/nanopi-neo-plus2/post-build.sh new file mode 100755 index 000000000..ec20fca7d --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo-plus2/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/buildroot/board/friendlyarm/nanopi-neo-plus2/readme.txt b/buildroot/board/friendlyarm/nanopi-neo-plus2/readme.txt new file mode 100644 index 000000000..ae5995202 --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo-plus2/readme.txt @@ -0,0 +1,37 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the Nanopi NEO Plus2. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Nanopi NEO2 link: +http://nanopi.io/nanopi-neo-plus2.html + +Wiki link: +http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO_Plus2 + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_neo_plus2_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sudo sync + +Insert the micro SDcard in your Nanopi NEO Plus2 and power it up. The console +is on the serial line, 115200 8N1. diff --git a/buildroot/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt b/buildroot/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt new file mode 100644 index 000000000..740d172eb --- /dev/null +++ b/buildroot/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt @@ -0,0 +1,53 @@ +#AP6212_NVRAM_V1.0.1_20160606 +# 2.4 GHz, 20 MHz BW mode +# The following parameter values are just placeholders, need to be updated. +manfid=0x2d0 +prodid=0x0726 +vendid=0x14e4 +devid=0x43e2 +boardtype=0x0726 +boardrev=0x1101 +boardnum=22 +macaddr=00:90:4c:c5:12:38 +sromrev=11 +boardflags=0x00404201 +xtalfreq=26000 +nocrc=1 +ag0=255 +aa2g=1 +ccode=ALL + +pa0itssit=0x20 +extpagain2g=0 + +#PA parameters for 2.4GHz, measured at CHIP OUTPUT +pa2ga0=-168,7161,-820 +AvVmid_c0=0x0,0xc8 +cckpwroffset0=5 + +# PPR params +maxp2ga0=90 +txpwrbckof=6 +cckbw202gpo=0x5555 +legofdmbw202gpo=0x77777777 +mcsbw202gpo=0xaaaaaaaa + +# OFDM IIR : +ofdmdigfilttype=7 +# PAPD mode: +papdmode=2 + +il0macaddr=00:90:4c:c5:12:38 +wl0id=0x431b + +#OOB parameters +hostwake=0x40 +hostrdy=0x41 +usbrdy=0x03 +usbrdydelay=100 +deadman_to=0xffffffff +# muxenab: 0x1 for UART enable, 0x10 for Host awake +muxenab=0x10 +# CLDO PWM voltage settings - 0x4 - 1.1 volt +#cldo_pwm=0x4 +glitch_based_crsmin=1 diff --git a/buildroot/board/friendlyarm/nanopi-neo/genimage.cfg b/buildroot/board/friendlyarm/nanopi-neo/genimage.cfg index ad43d3104..f6adc4af3 100644 --- a/buildroot/board/friendlyarm/nanopi-neo/genimage.cfg +++ b/buildroot/board/friendlyarm/nanopi-neo/genimage.cfg @@ -29,6 +29,5 @@ image sdcard.img { partition rootfs { partition-type = 0x83 image = "rootfs.ext4" - size = 32M } } diff --git a/buildroot/board/friendlyarm/nanopi-neo/post-build.sh b/buildroot/board/friendlyarm/nanopi-neo/post-build.sh deleted file mode 100755 index 9759efb56..000000000 --- a/buildroot/board/friendlyarm/nanopi-neo/post-build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# post-build.sh for Nanopi NEO, based on the Orange Pi PC -# 2013, Carlo Caione -# 2016, "Yann E. MORIN" - -BOARD_DIR="$( dirname "${0}" )" -MKIMAGE="${HOST_DIR}/bin/mkimage" -BOOT_CMD="${BOARD_DIR}/boot.cmd" -BOOT_CMD_H="${BINARIES_DIR}/boot.scr" - -# U-Boot script -"${MKIMAGE}" -C none -A arm -T script -d "${BOOT_CMD}" "${BOOT_CMD_H}" diff --git a/buildroot/board/friendlyarm/nanopi-neo/post-image.sh b/buildroot/board/friendlyarm/nanopi-neo/post-image.sh deleted file mode 100755 index 740386ef8..000000000 --- a/buildroot/board/friendlyarm/nanopi-neo/post-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# post-image.sh for Nanopi NEO, based on the Orange Pi PC - -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/buildroot/board/lemaker/bananapro/linux-wifi.fragment b/buildroot/board/lemaker/bananapro/linux-wifi.fragment index 8e4bd5cc7..f4ede39fa 100644 --- a/buildroot/board/lemaker/bananapro/linux-wifi.fragment +++ b/buildroot/board/lemaker/bananapro/linux-wifi.fragment @@ -2,6 +2,7 @@ CONFIG_WIRELESS=y CONFIG_CFG80211=y CONFIG_CFG80211_WEXT=y +CONFIG_RFKILL=y # Network device support CONFIG_WLAN=y diff --git a/buildroot/board/lemaker/bananapro/patches/linux/0001-arch-arm-boot-dts-sun7i-a20-bananapro.dts-disable-00.patch b/buildroot/board/lemaker/bananapro/patches/linux/0001-arch-arm-boot-dts-sun7i-a20-bananapro.dts-disable-00.patch new file mode 100644 index 000000000..c8e8c0375 --- /dev/null +++ b/buildroot/board/lemaker/bananapro/patches/linux/0001-arch-arm-boot-dts-sun7i-a20-bananapro.dts-disable-00.patch @@ -0,0 +1,44 @@ +From 896e82ab14e7e4e361ffa7c81def787907c1bf4c Mon Sep 17 00:00:00 2001 +From: Bartosz Bilas +Date: Sun, 19 May 2019 21:04:35 +0200 +Subject: [PATCH] arch/arm/boot/dts/sun7i-a20-bananapro.dts: disable 00B + IRQ for brcm wifi module + + BugLink: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908438 + +Signed-off-by: Hans de Goede +Signed-off-by: Bartosz Bilas +--- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts +index 0176e9de0..93b3340f5 100644 +--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts ++++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts +@@ -160,9 +160,19 @@ + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; +- interrupt-parent = <&pio>; +- interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; +- interrupt-names = "host-wake"; ++ /* ++ * OOB interrupt support is broken ATM, often the first irq ++ * does not get seen resulting in the drv probe failing with: ++ * ++ * brcmfmac: brcmf_sdio_bus_rxctl: resumed on timeout ++ * brcmfmac: brcmf_bus_started: failed: -110 ++ * brcmfmac: brcmf_attach: dongle is not responding: err=-110 ++ * brcmfmac: brcmf_sdio_firmware_callback: brcmf_attach failed ++ * ++ * interrupt-parent = <&pio>; ++ * interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; ++ * interrupt-names = "host-wake"; ++ */ + }; + }; + +-- +2.21.0 + diff --git a/buildroot/board/lemaker/bananapro/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.lemaker,bananapro.txt b/buildroot/board/lemaker/bananapro/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.lemaker,bananapro.txt new file mode 120000 index 000000000..93947975e --- /dev/null +++ b/buildroot/board/lemaker/bananapro/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.lemaker,bananapro.txt @@ -0,0 +1 @@ +brcmfmac43362-sdio.txt \ No newline at end of file diff --git a/buildroot/board/librecomputer/lafrite/genimage.cfg b/buildroot/board/librecomputer/lafrite/genimage.cfg new file mode 100644 index 000000000..212f82952 --- /dev/null +++ b/buildroot/board/librecomputer/lafrite/genimage.cfg @@ -0,0 +1,10 @@ +image usb.img { + hdimage { + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/buildroot/board/librecomputer/lafrite/overlay/extlinux/extlinux.conf b/buildroot/board/librecomputer/lafrite/overlay/extlinux/extlinux.conf new file mode 100644 index 000000000..60aa9d6e7 --- /dev/null +++ b/buildroot/board/librecomputer/lafrite/overlay/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + devicetree /boot/meson-gxl-s805x-libretech-ac.dtb + append console=ttyAML0,115200 earlyprintk root=/dev/sda1 rootwait diff --git a/buildroot/board/librecomputer/lafrite/readme.txt b/buildroot/board/librecomputer/lafrite/readme.txt new file mode 100644 index 000000000..c439c5e91 --- /dev/null +++ b/buildroot/board/librecomputer/lafrite/readme.txt @@ -0,0 +1,34 @@ +Intro +===== + +Libre Computer "La Frite" is a low cost SBC based around an Amlogic +s805x SoC (quad A53), 512MB/1GB DDR4 and a 16MB SPI NOR flash: + +https://libre.computer/products/boards/aml-s805x-ac/ + +How to build it +=============== + +Configure Buildroot: + + $ make lafrite_defconfig + +Compile everything and build the USB flash drive image: + + $ make + +How to write the USB flash drive image +====================================== + +Once the build process is finished you will have an image called "usb.img" +in the output/images/ directory. + +Copy the bootable "usb.img" onto a USB flash drive with "dd": + + $ sudo dd if=output/images/usb.img of=/dev/sdX + +How to boot +=========== + +Insert flash drive to the USB connector furthest away from the IR +receiver and power up board. The system will boot automatically. diff --git a/buildroot/board/licheepi/boot.cmd b/buildroot/board/licheepi/boot.cmd new file mode 100644 index 000000000..383b3473e --- /dev/null +++ b/buildroot/board/licheepi/boot.cmd @@ -0,0 +1,4 @@ +setenv bootargs console=ttyS0,115200 panic=5 console=tty0 rootwait root=/dev/mmcblk0p2 earlyprintk rw +load mmc 0:1 0x41000000 zImage +load mmc 0:1 0x41800000 sun8i-v3s-licheepi-zero-dock.dtb +bootz 0x41000000 - 0x41800000 diff --git a/buildroot/board/licheepi/genimage.cfg b/buildroot/board/licheepi/genimage.cfg new file mode 100644 index 000000000..0d8540f2a --- /dev/null +++ b/buildroot/board/licheepi/genimage.cfg @@ -0,0 +1,35 @@ +image boot.vfat { + vfat { + files = { + "zImage", + "sun8i-v3s-licheepi-zero-dock.dtb", + "sun8i-v3s-licheepi-zero.dtb", + "boot.scr" + } + } + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 516096 # 512KB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 0 + } +} diff --git a/buildroot/board/licheepi/readme.txt b/buildroot/board/licheepi/readme.txt new file mode 100644 index 000000000..6b8bf94b4 --- /dev/null +++ b/buildroot/board/licheepi/readme.txt @@ -0,0 +1,62 @@ +Intro +===== + +This directory contains a buildroot configuration for building a +LicheePi Zero. + +How to build it +=============== + +Configure Buildroot +------------------- + + $ make licheepi_zero_defconfig + +Build the rootfs +---------------- + +Note: you will need to have access to the network, since Buildroot +will download the packages' sources. + +You may now build your rootfs with: + + $ make + +(This may take a while, consider getting yourself a coffee ;-) ) + +Result of the build +------------------- + +After building, you should obtain this tree: + + output/images/ + +-- boot.scr + +-- boot.vfat + +-- rootfs.ext2 + +-- rootfs.ext4 -> rootfs.ext2 + +-- rootfs.tar + +-- sdcard.img + +-- sun8i-v3s-licheepi-zero-dock.dtb + +-- sun8i-v3s-licheepi-zero.dtb + +-- u-boot.bin + +-- u-boot-sunxi-with-spl.bin + `-- zImage + +How to write the SD card +======================== + +Once the build process is finished you will have an image called +"sdcard.img" in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Alternatively, you can use the Etcher graphical tool to burn the image +to the SD card safely and on any platform: + +https://etcher.io/ + +Once the SD card is burned, insert it into your LicheePi Zero board, +and power it up. Your new system should come up now and start a +console on the UART0 serial port. diff --git a/buildroot/board/minnowboard/post-image.sh b/buildroot/board/minnowboard/post-image.sh deleted file mode 100755 index 428baa5e5..000000000 --- a/buildroot/board/minnowboard/post-image.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -e - -GENIMAGE_CFG="board/minnowboard/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/buildroot/board/olimex/a20_olinuxino/boot-legacy.cmd b/buildroot/board/olimex/a20_olinuxino/boot-legacy.cmd deleted file mode 100644 index 9fa5d6541..000000000 --- a/buildroot/board/olimex/a20_olinuxino/boot-legacy.cmd +++ /dev/null @@ -1,5 +0,0 @@ -setenv bootm_boot_mode sec -setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 consoleblank=0 ${extra} -ext4load mmc 0 0x43000000 /boot/script.bin -ext4load mmc 0 0x48000000 /boot/zImage -bootz 0x48000000 diff --git a/buildroot/board/olimex/a20_olinuxino/post-build.sh b/buildroot/board/olimex/a20_olinuxino/post-build.sh index 7a8a42746..d3f612f81 100755 --- a/buildroot/board/olimex/a20_olinuxino/post-build.sh +++ b/buildroot/board/olimex/a20_olinuxino/post-build.sh @@ -1,8 +1,3 @@ #!/bin/sh cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr - -if [ -e $BINARIES_DIR/script.bin ]; then - # mali requires a legacy kernel - cp $BINARIES_DIR/script.bin $TARGET_DIR/boot/script.bin -fi diff --git a/buildroot/board/olimex/a20_olinuxino/readme.txt b/buildroot/board/olimex/a20_olinuxino/readme.txt index 57ee23d14..504483b51 100644 --- a/buildroot/board/olimex/a20_olinuxino/readme.txt +++ b/buildroot/board/olimex/a20_olinuxino/readme.txt @@ -16,15 +16,9 @@ The following defconfigs are available: for the A20-OLinuXino-MICRO board using mainline kernel - olimex_a20_olinuxino_lime_defconfig for the A20-OLinuXino-LIME board using mainline kernel - - olimex_a20_olinuxino_lime_legacy_defconfig - for the A20-OLinuXino-LIME board using legacy linux-sunxi kernel - olimex_a20_olinuxino_lime2_defconfig for the A20-OLinuXino-LIME2 board using mainline kernel -The legacy linux-sunxi kernels are based on the vendor code drops. -They are only useful when accelerated 3D graphics and multimedia support -is strictly necessary. - The Mainline Kernel is already a much better choice for a headless server. And also the mainline kernel works fine even for a basic Linux desktop system running on top of a simple framebuffer, which may be good enough for @@ -51,7 +45,6 @@ After building, you should get a tree like this: output/images/ +-- rootfs.ext2 +-- rootfs.ext4 -> rootfs.ext2 - +-- script.bin (lime_legacy) +-- sdcard.img +-- sun7i-a20-olinuxino-lime.dtb (lime, mainline) +-- sun7i-a20-olinuxino-lime2.dtb (lime2, mainline) diff --git a/buildroot/board/olimex/a33_olinuxino/boot.cmd b/buildroot/board/olimex/a33_olinuxino/boot.cmd new file mode 100644 index 000000000..44d9239a9 --- /dev/null +++ b/buildroot/board/olimex/a33_olinuxino/boot.cmd @@ -0,0 +1,5 @@ +setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} +ext4load mmc 0 0x49000000 /boot/${fdtfile} +ext4load mmc 0 0x46000000 /boot/zImage +env set fdt_high ffffffff +bootz 0x46000000 - 0x49000000 diff --git a/buildroot/board/olimex/a33_olinuxino/genimage.cfg b/buildroot/board/olimex/a33_olinuxino/genimage.cfg new file mode 100644 index 000000000..fc2f7f8d7 --- /dev/null +++ b/buildroot/board/olimex/a33_olinuxino/genimage.cfg @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 1040384 # 1MB - 8192 + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/buildroot/board/olimex/a33_olinuxino/post-build.sh b/buildroot/board/olimex/a33_olinuxino/post-build.sh new file mode 100755 index 000000000..b41812065 --- /dev/null +++ b/buildroot/board/olimex/a33_olinuxino/post-build.sh @@ -0,0 +1,2 @@ +#!/bin/sh +cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/buildroot/board/olimex/a33_olinuxino/readme.txt b/buildroot/board/olimex/a33_olinuxino/readme.txt new file mode 100644 index 000000000..b19060200 --- /dev/null +++ b/buildroot/board/olimex/a33_olinuxino/readme.txt @@ -0,0 +1,50 @@ +A33-OLinuXino + +Intro +===== + +This board is based on Allwinner A33 SoC. + +Home Page: https://www.olimex.com/Products/OLinuXino/A33/A33-OLinuXino/open-source-hardware +Wiki: https://wiki.amarulasolutions.com/bsp/sunxi/a33/Olimex-A33-Olinuxino.html + +How to build it +=============== + +Configure Buildroot: + + $ make olimex_a33_olinuxino_defconfig + +Build everything by running: + + $ make + +Result of the build +------------------- + +After building, you should get a tree like this: + +output/images/ +├── boot.scr +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── sun8i-a33-olinuxino.dtb +├── u-boot.bin +├── u-boot-sunxi-with-spl.bin +└── zImage + + +How to write the SD card +======================== + +The sdcard.img file is a complete bootable image ready to be written +on the boot medium. To install it, simply copy the image to a uSD +card: + + # dd if=output/images/sdcard.img of=/dev/sdX + +Where 'sdX' is the device node of the uSD. + +Eject the SD card, insert it in the A33-OLinuXino board, and power it up. diff --git a/buildroot/board/orangepi/orangepi-r1/boot.cmd b/buildroot/board/orangepi/orangepi-r1/boot.cmd new file mode 100644 index 000000000..e927b01e8 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-r1/boot.cmd @@ -0,0 +1,8 @@ +setenv fdt_high ffffffff + +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + +fatload mmc 0 $kernel_addr_r zImage +fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-r1.dtb + +bootz $kernel_addr_r - $fdt_addr_r diff --git a/buildroot/board/orangepi/orangepi-r1/genimage.cfg b/buildroot/board/orangepi/orangepi-r1/genimage.cfg new file mode 100644 index 000000000..01e2c0adc --- /dev/null +++ b/buildroot/board/orangepi/orangepi-r1/genimage.cfg @@ -0,0 +1,36 @@ +# Minimal SD card image for the OrangePi R1 +# +image boot.vfat { + vfat { + files = { + "zImage", + "sun8i-h2-plus-orangepi-r1.dtb", + "boot.scr" + } + } + size = 10M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 1040384 # 1MB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/buildroot/board/orangepi/orangepi-r1/linux-extras.config b/buildroot/board/orangepi/orangepi-r1/linux-extras.config new file mode 100644 index 000000000..47ba88f67 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-r1/linux-extras.config @@ -0,0 +1,11 @@ +# spi nor +CONFIG_MTD=y +CONFIG_MTD_OF_PARTS=y +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_M25P80=y + +# ondemand cpufreq governor +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y + +# USB ethernet +CONFIG_USB_RTL8152=y diff --git a/buildroot/board/orangepi/orangepi-r1/readme.txt b/buildroot/board/orangepi/orangepi-r1/readme.txt new file mode 100644 index 000000000..826649936 --- /dev/null +++ b/buildroot/board/orangepi/orangepi-r1/readme.txt @@ -0,0 +1,29 @@ +OrangePi R1 + +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the OrangePi R1. With the current configuration +it will bring-up the board, and allow access through the serial console. + +How to build it +=============== + +Configure Buildroot: + + $ make orangepi_r1_defconfig + +Compile everything and build the SD card image: + + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/buildroot/board/pandaboard/post-image.sh b/buildroot/board/pandaboard/post-image.sh deleted file mode 100755 index 9cca1b178..000000000 --- a/buildroot/board/pandaboard/post-image.sh +++ /dev/null @@ -1,16 +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}" - -exit $? diff --git a/buildroot/board/pandaboard/readme.txt b/buildroot/board/pandaboard/readme.txt index 1e4820b82..80a20c274 100644 --- a/buildroot/board/pandaboard/readme.txt +++ b/buildroot/board/pandaboard/readme.txt @@ -23,14 +23,14 @@ When you are happy with the setup, run: The result of the build with the default settings should be these files: output/images - ├── MLO - ├── omap4-panda-a4.dtb - ├── omap4-panda.dtb - ├── omap4-panda-es.dtb - ├── rootfs.ext4 - ├── sdcard.img - ├── u-boot.img - └── zImage + +-- MLO + +-- omap4-panda-a4.dtb + +-- omap4-panda.dtb + +-- omap4-panda-es.dtb + +-- rootfs.ext4 + +-- sdcard.img + +-- u-boot.img + +-- zImage How to write the SD card ------------------------ diff --git a/buildroot/board/pc/genimage-efi.cfg b/buildroot/board/pc/genimage-efi.cfg new file mode 100644 index 000000000..ea15ae5cf --- /dev/null +++ b/buildroot/board/pc/genimage-efi.cfg @@ -0,0 +1,35 @@ +image efi-part.vfat { + vfat { + file startup.nsh { + image = "efi-part/startup.nsh" + } + file EFI { + image = "efi-part/EFI" + } + file bzImage { + image = "bzImage" + } + } + size = 16777216 +} + +image disk.img { + hdimage { + gpt = true + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + offset = 32768 + size = 16777216 + bootable = true + } + + partition root { + partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a + partition-uuid = UUID_TMP + image = "rootfs.ext2" + offset = 16809984 + } +} diff --git a/buildroot/board/pc/grub-efi.cfg b/buildroot/board/pc/grub-efi.cfg new file mode 100644 index 000000000..bd4466640 --- /dev/null +++ b/buildroot/board/pc/grub-efi.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /bzImage root=PARTUUID=UUID_TMP rootwait console=tty1 +} diff --git a/buildroot/board/pc/post-build.sh b/buildroot/board/pc/post-build.sh index b245cc00c..ed37b3b87 100755 --- a/buildroot/board/pc/post-build.sh +++ b/buildroot/board/pc/post-build.sh @@ -4,7 +4,12 @@ set -e BOARD_DIR=$(dirname "$0") -cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg" +# Detect boot strategy, EFI or BIOS +if [ -f "$BINARIES_DIR/efi-part/startup.nsh" ]; then + cp -f "$BOARD_DIR/grub-efi.cfg" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg" +else + cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg" -# Copy grub 1st stage to binaries, required for genimage -cp -f "$HOST_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR" + # Copy grub 1st stage to binaries, required for genimage + cp -f "$HOST_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR" +fi diff --git a/buildroot/board/pc/post-image-efi-gpt.sh b/buildroot/board/pc/post-image-efi-gpt.sh deleted file mode 100755 index d2acd8f85..000000000 --- a/buildroot/board/pc/post-image-efi-gpt.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -set -e - -cd ${BINARIES_DIR} - -# GPT partition type UUIDs -esp_type=c12a7328-f81f-11d2-ba4b-00a0c93ec93b -linux_type=44479540-f297-41b2-9af7-d131d5f0458a - -# Partition UUIDs -efi_part_uuid=$(uuidgen) -root_part_uuid=$(uuidgen) - -# Boot partition offset and size, in 512-byte sectors -efi_part_start=64 -efi_part_size=32768 - -# Rootfs partition offset and size, in 512-byte sectors -root_part_start=$(( efi_part_start + efi_part_size )) -root_part_size=$(( $(stat -c %s rootfs.ext2) / 512 )) - -first_lba=34 -last_lba=$(( root_part_start + root_part_size )) - -# Disk image size in 512-byte sectors -image_size=$(( last_lba + first_lba )) - -cat > efi-part/EFI/BOOT/grub.cfg </dev/null | sed -n 's/^Filesystem UUID: *\(.*\)/\1/p') +sed -i "s/UUID_TMP/$UUID/g" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg" +sed "s/UUID_TMP/$UUID/g" board/pc/genimage-efi.cfg > "$BINARIES_DIR/genimage-efi.cfg" +support/scripts/genimage.sh -c "$BINARIES_DIR/genimage-efi.cfg" diff --git a/buildroot/board/qemu/arm-vexpress-tz/linux.fragment b/buildroot/board/qemu/arm-vexpress-tz/linux.fragment new file mode 100644 index 000000000..1537d938f --- /dev/null +++ b/buildroot/board/qemu/arm-vexpress-tz/linux.fragment @@ -0,0 +1,3 @@ +### Enable OP-TEE +CONFIG_TEE=y +CONFIG_OPTEE=y diff --git a/buildroot/board/qemu/arm-vexpress-tz/post-build.sh b/buildroot/board/qemu/arm-vexpress-tz/post-build.sh new file mode 100755 index 000000000..7ead69a99 --- /dev/null +++ b/buildroot/board/qemu/arm-vexpress-tz/post-build.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -u +set -e + +# Rename boot images for the dear TF-A +ln -sf u-boot.bin ${BINARIES_DIR}/bl33.bin +ln -sf tee-header_v2.bin ${BINARIES_DIR}/bl32.bin +ln -sf tee-pager_v2.bin ${BINARIES_DIR}/bl32_extra1.bin +ln -sf tee-pageable_v2.bin ${BINARIES_DIR}/bl32_extra2.bin diff --git a/buildroot/board/qemu/arm-vexpress-tz/readme.txt b/buildroot/board/qemu/arm-vexpress-tz/readme.txt new file mode 100644 index 000000000..35ff018ae --- /dev/null +++ b/buildroot/board/qemu/arm-vexpress-tz/readme.txt @@ -0,0 +1,138 @@ +Board qemu_arm_vexpress_tz builds a QEMU ARMv7-A target system with +OP-TEE running in the TrustZone secure world and a Linux based +OS running in the non-secure world. The board configuration enables +builds of the QEMU host ARM target emulator. + + make qemu_arm_vexpress_tz_defconfig + make + +The BIOS used in the QEMU host is the ARM Trusted Firmware-A (TF-A). TF-A +uses QEMU semihosting file access to access boot image files. The +QEMU platform is quite specific for that in TF-A and one needs to +run the emulation from the image directory for TF-A to boot the +secure and non-secure worlds. + + cd output/images && ../host/bin/qemu-system-arm \ + -machine virt -machine secure=on -cpu cortex-a15 \ + -smp 1 -s -m 1024 -d unimp \ + -serial stdio \ + -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ + -semihosting-config enable,target=native \ + -bios bl1.bin + +The boot stage traces (if any) followed by the login prompt will appear +in the terminal that started QEMU. + +If you want to emulate more cores, use "-smp {1|2|3|4}" to select the +number of cores. + +Note: "-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic" +brings network support that is used i.e. in OP-TEE regression tests. + +Tested with QEMU 2.12.0, and 3.1.0. + + +-- Boot Details -- + +TF-A is used as QEMU BIOS. Its BL1 image boots and load its BL2 image. In turn, +this image loads the OP-TEE secure world (ARMv7-A BL32 stage) and the U-boot as +non-secure bootloader (BL33 stage). + +QEMU natively hosts and loads in RAM the QEMU ARM target device tree. OP-TEE +reads and modifies its content according to OP-TEE configuration. + +Enable TF-A traces from LOG_LEVEL (I.e LOG_LEVEL=40) from +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES. + + +-- OP-TEE Traces -- + +Secure boot stages and/or secure runtime services may use a serial link for +their traces. + +The ARM Trusted Firmware outputs its traces on the QEMU standard (first) +serial interface. + +The OP-TEE OS uses the QEMU second serial interface. + +To get the OP-TEE OS traces, append a second -serial argument after +-serial stdio in the QEMU command line. I.e, the following enables 2 serial +consoles over telnet connections: + + cd output/images && ../host/bin/qemu-system-arm \ + -machine virt -machine secure=on -cpu cortex-a15 \ + -smp 1 -s -m 1024 -d unimp \ + -serial telnet:127.0.0.1:1235,server \ + -serial telnet:127.0.0.1:1236,server \ + -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ + -semihosting-config enable,target=native \ + -bios bl1.bin + +QEMU is now waiting for the telnet connection. From another shell, open a +telnet connection on the port for the U-boot and Linux consoles: + + telnet 127.0.0.1 1235 + +and again for the secure console + + telnet 127.0.0.1 1236 + + +-- Using gdb -- + +One can debug the OP-TEE secure world using GDB through the QEMU host. +To do so, simply run the qemu-system-arm emulation, then run a GDB client +and connect the QEMU internal GDB server. + +The example below assumes we run QEMU and the GDB client from the same +host computer. We use option -S of qemu-system-arm to make QEMU +waiting for the GDB continue instruction before booting the images. + +From a first shell: + cd output/images && ../host/bin/qemu-system-arm \ + -machine virt -machine secure=on -cpu cortex-a15 \ + -smp 1 -s -m 1024 -d unimp \ + -serial stdio \ + -netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \ + -semihosting-config enable,target=native \ + -bios bl1.bin \ + -S + +From a second shell: + ./output/host/bin/arm-linux-gdb + GNU gdb (GNU Toolchain for the A-profile Architecture 8.2-2018-08 (arm-rel-8.23)) 8.1.1.20180704-git + Copyright (C) 2018 Free Software Foundation, Inc. + ... + For help, type "help". + Type "apropos word" to search for commands related to "word". + (gdb) + +From this GDB console, connect to the target, load the OP-TEE core symbols, +set a breakpoint to its entry point (__text_start) and start emulation: + + (gdb) target remote 127.0.0.1:1234 + (gdb) symbol-file ./output/build/optee-os-/out/arm/core/tee.elf + (gdb) hbreak __text_start + Hardware assisted breakpoint 1 at 0xe100000: file core/arch/arm/kernel/generic_entry_a32.S, line 246. + (gdb) cont + Continuing. + + Thread 1 hit Breakpoint 1, _start () at core/arch/arm/kernel/generic_entry_a32.S:246 + 246 bootargs_entry + (gdb) + + +Emulation has started, TF-A has loaded OP-TEE and U-boot images in memory and +has booted OP-TEE. Emulation stopped at OP-TEE core entry. + +Note: QEMU hosts a GDB service listening to TCP port 1234, as set through +qemu-system-arm command line option -s. + +Note: To build the GDB server, the following extra options have to be added to +the Buildroot configuration: + + BR2_ENABLE_DEBUG=y + BR2_PACKAGE_GDB=y + BR2_PACKAGE_HOST_GDB=y + BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_TOOLCHAIN_BUILDROOT_GLIBC=y diff --git a/buildroot/board/qemu/arm-vexpress-tz/u-boot.config b/buildroot/board/qemu/arm-vexpress-tz/u-boot.config new file mode 100644 index 000000000..fd74bf1fe --- /dev/null +++ b/buildroot/board/qemu/arm-vexpress-tz/u-boot.config @@ -0,0 +1,7 @@ +CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_BOOTCOMMAND="fdt addr ${fdt_addr} && fdt resize 1000 && smhload zImage ${kernel_addr_r} && smhload rootfs.cpio.gz ${ramdisk_addr_r} ramdisk_addr_end && setenv bootargs console=ttyAMA0,115200 earlyprintk=serial,ttyAMA0,115200 && fdt chosen ${ramdisk_addr_r} ${ramdisk_addr_end} && bootz ${kernel_addr_r} - ${fdt_addr}" +CONFIG_SEMIHOSTING=y +# Drop flash accesses +CONFIG_ENV_IS_IN_FLASH=n +CONFIG_MTD=n +CONFIG_MTD_NOR_FLASH=n diff --git a/buildroot/board/qemu/csky/linux-ck610.config.fragment b/buildroot/board/qemu/csky/linux-ck610.config.fragment new file mode 100644 index 000000000..b690c7d6e --- /dev/null +++ b/buildroot/board/qemu/csky/linux-ck610.config.fragment @@ -0,0 +1,6 @@ +CONFIG_COMPILE_TEST=y +CONFIG_CPU_CK610=y +CONFIG_CPU_PM_WAIT=y +CONFIG_RAM_BASE=0x10000000 +CONFIG_CSKY_APB_INTC=y +CONFIG_GX6605S_TIMER=y diff --git a/buildroot/board/qemu/csky/linux-ck807.config.fragment b/buildroot/board/qemu/csky/linux-ck807.config.fragment new file mode 100644 index 000000000..b6974f015 --- /dev/null +++ b/buildroot/board/qemu/csky/linux-ck807.config.fragment @@ -0,0 +1,5 @@ +CONFIG_COMPILE_TEST=y +CONFIG_CPU_CK807=y +# CONFIG_CPU_HAS_FPU is not set +CONFIG_CPU_PM_WAIT=y +CONFIG_CSKY_APB_INTC=y diff --git a/buildroot/board/qemu/csky/linux-ck810.config.fragment b/buildroot/board/qemu/csky/linux-ck810.config.fragment new file mode 100644 index 000000000..50fa1f4f7 --- /dev/null +++ b/buildroot/board/qemu/csky/linux-ck810.config.fragment @@ -0,0 +1,5 @@ +CONFIG_COMPILE_TEST=y +CONFIG_CPU_CK810=y +# CONFIG_CPU_HAS_FPU is not set +CONFIG_CPU_PM_WAIT=y +CONFIG_CSKY_APB_INTC=y diff --git a/buildroot/board/qemu/csky/linux-ck860.config.fragment b/buildroot/board/qemu/csky/linux-ck860.config.fragment new file mode 100644 index 000000000..e8f6af10b --- /dev/null +++ b/buildroot/board/qemu/csky/linux-ck860.config.fragment @@ -0,0 +1,9 @@ +CONFIG_COMPILE_TEST=y +CONFIG_CPU_CK860=y +# CONFIG_CPU_HAS_FPU is not set +CONFIG_CPU_PM_WAIT=y +CONFIG_SMP=y +CONFIG_HOTPLUG_CPU=y +CONFIG_CSKY_APB_INTC=y +CONFIG_CSKY_MPINTC=y +CONFIG_CSKY_MP_TIMER=y diff --git a/buildroot/board/qemu/csky/readme.txt b/buildroot/board/qemu/csky/readme.txt new file mode 100644 index 000000000..89d68aafb --- /dev/null +++ b/buildroot/board/qemu/csky/readme.txt @@ -0,0 +1,12 @@ +Run with qemu: + +For ck860 smp: + qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux + +For ck810/ck807: + qemu-system-cskyv2 -M virt -nographic -kernel vmlinux + +For ck610: + qemu-system-cskyv1 -M virt -nographic -kernel vmlinux + +The login prompt will appear in the terminal that started Qemu. Username is root and no password. diff --git a/buildroot/board/qemu/ppc-mac99/linux.fragment b/buildroot/board/qemu/ppc-mac99/linux.fragment new file mode 100644 index 000000000..b1975f825 --- /dev/null +++ b/buildroot/board/qemu/ppc-mac99/linux.fragment @@ -0,0 +1,3 @@ +CONFIG_SERIAL_PMACZILOG=y +CONFIG_SERIAL_PMACZILOG_TTYS=y +CONFIG_SERIAL_PMACZILOG_CONSOLE=y diff --git a/buildroot/board/qemu/ppc-mac99/readme.txt b/buildroot/board/qemu/ppc-mac99/readme.txt new file mode 100644 index 000000000..a8a18db5b --- /dev/null +++ b/buildroot/board/qemu/ppc-mac99/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + + qemu-system-ppc -nographic -vga none -M mac99 -cpu g4 -m 1G -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -net nic,model=sungem -net user -append "root=/dev/sda" + +Tested with QEMU 3.1.0 diff --git a/buildroot/board/qemu/riscv32-virt/linux.config b/buildroot/board/qemu/riscv32-virt/linux.config deleted file mode 100644 index c25583f76..000000000 --- a/buildroot/board/qemu/riscv32-virt/linux.config +++ /dev/null @@ -1,23 +0,0 @@ -CONFIG_ARCH_RV32I=y -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_PCI=y -CONFIG_SYSVIPC=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_WIRELESS is not set -CONFIG_VIRTIO_BLK=y -CONFIG_NETDEVICES=y -CONFIG_VIRTIO_NET=y -# CONFIG_ETHERNET is not set -# CONFIG_WLAN is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_VIRT_DRIVERS=y -CONFIG_VIRTIO_MMIO=y -CONFIG_EXT2_FS=y -CONFIG_EXT4_FS=y -CONFIG_TMPFS=y diff --git a/buildroot/board/qemu/riscv32-virt/patches/linux/0001-Revert-riscv-Use-latest-system-call-ABI.patch b/buildroot/board/qemu/riscv32-virt/patches/linux/0001-Revert-riscv-Use-latest-system-call-ABI.patch new file mode 100644 index 000000000..e0dfaa150 --- /dev/null +++ b/buildroot/board/qemu/riscv32-virt/patches/linux/0001-Revert-riscv-Use-latest-system-call-ABI.patch @@ -0,0 +1,66 @@ +From 15f62343916fcb3cae82e618da28eaa82bc8c007 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Tue, 16 Apr 2019 09:03:41 -0700 +Subject: [PATCH] Revert "riscv: Use latest system call ABI" + +This reverts commit d4c08b9776b392e20efc6198ebe1bc8ec1911d9b. + +The latest RISC-V 32bit glibc submission doesn't work with this patch, +so let's revert it. This revert can be reverted when the glibc +submission is updated to work on the 5.1 kernel. + +Signed-off-by: Alistair Francis +--- + arch/riscv/Kconfig | 1 + + arch/riscv/include/uapi/asm/unistd.h | 5 ++++- + arch/riscv/kernel/vdso/Makefile | 2 -- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig +index eb56c82d8aa1..43dd2680c696 100644 +--- a/arch/riscv/Kconfig ++++ b/arch/riscv/Kconfig +@@ -11,6 +11,7 @@ config 32BIT + + config RISCV + def_bool y ++ select ARCH_32BIT_OFF_T if !64BIT + # even on 32-bit, physical (and DMA) addresses are > 32-bits + select PHYS_ADDR_T_64BIT + select OF +diff --git a/arch/riscv/include/uapi/asm/unistd.h b/arch/riscv/include/uapi/asm/unistd.h +index 0e2eeeb1fd27..486a288b454c 100644 +--- a/arch/riscv/include/uapi/asm/unistd.h ++++ b/arch/riscv/include/uapi/asm/unistd.h +@@ -17,8 +17,11 @@ + + #ifdef __LP64__ + #define __ARCH_WANT_NEW_STAT +-#define __ARCH_WANT_SET_GET_RLIMIT + #endif /* __LP64__ */ ++#define __ARCH_WANT_SET_GET_RLIMIT ++#ifndef __LP64__ ++#define __ARCH_WANT_TIME32_SYSCALLS ++#endif + + #include + +diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile +index fec62b24df89..eed1c137f618 100644 +--- a/arch/riscv/kernel/vdso/Makefile ++++ b/arch/riscv/kernel/vdso/Makefile +@@ -2,11 +2,9 @@ + + # Symbols present in the vdso + vdso-syms = rt_sigreturn +-ifdef CONFIG_64BIT + vdso-syms += gettimeofday + vdso-syms += clock_gettime + vdso-syms += clock_getres +-endif + vdso-syms += getcpu + vdso-syms += flush_icache + +-- +2.21.0 + diff --git a/buildroot/board/qemu/riscv32-virt/readme.txt b/buildroot/board/qemu/riscv32-virt/readme.txt index 24d44f0a9..5d7c1988d 100644 --- a/buildroot/board/qemu/riscv32-virt/readme.txt +++ b/buildroot/board/qemu/riscv32-virt/readme.txt @@ -1,7 +1,7 @@ -Run the emulation with: +Run Linux in emulation with: - qemu-system-riscv32 -M virt -kernel output/images/bbl -append "rootwait root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic + qemu-system-riscv32 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80400000 -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.12.1 +Tested with QEMU 3.1 diff --git a/buildroot/board/qemu/riscv64-virt/readme.txt b/buildroot/board/qemu/riscv64-virt/readme.txt index e878330de..c075cc464 100644 --- a/buildroot/board/qemu/riscv64-virt/readme.txt +++ b/buildroot/board/qemu/riscv64-virt/readme.txt @@ -1,7 +1,7 @@ -Run the emulation with: +Run Linux in emulation with: - qemu-system-riscv64 -M virt -kernel output/images/bbl -append "rootwait root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic + qemu-system-riscv64 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80200000 -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.12.1 +Tested with QEMU 3.1 diff --git a/buildroot/board/qemu/x86/post-build.sh b/buildroot/board/qemu/x86/post-build.sh new file mode 100755 index 000000000..bf83a002c --- /dev/null +++ b/buildroot/board/qemu/x86/post-build.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +set -u +set -e + +# Add a console on tty1 +if [ -e ${TARGET_DIR}/etc/inittab ]; then + grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ + sed -i '/GENERIC_SERIAL/a\ +tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab +fi diff --git a/buildroot/board/qemu/x86/readme.txt b/buildroot/board/qemu/x86/readme.txt index 42fc2439d..3bbafecf9 100644 --- a/buildroot/board/qemu/x86/readme.txt +++ b/buildroot/board/qemu/x86/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda" -net nic,model=virtio -net user + qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user Optionally add -smp N to emulate a SMP system with N CPUs. diff --git a/buildroot/board/qemu/x86_64/post-build.sh b/buildroot/board/qemu/x86_64/post-build.sh new file mode 100755 index 000000000..bf83a002c --- /dev/null +++ b/buildroot/board/qemu/x86_64/post-build.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +set -u +set -e + +# Add a console on tty1 +if [ -e ${TARGET_DIR}/etc/inittab ]; then + grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ + sed -i '/GENERIC_SERIAL/a\ +tty1::respawn:/sbin/getty -L tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab +fi diff --git a/buildroot/board/qemu/x86_64/readme.txt b/buildroot/board/qemu/x86_64/readme.txt index 4a1c0c0ff..93ac22a94 100644 --- a/buildroot/board/qemu/x86_64/readme.txt +++ b/buildroot/board/qemu/x86_64/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda" -net nic,model=virtio -net user + qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user Optionally add -smp N to emulate a SMP system with N CPUs. diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi0.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi0.cfg index a9d4c4501..f21a52f31 100644 --- a/buildroot/board/raspberrypi/genimage-raspberrypi0.cfg +++ b/buildroot/board/raspberrypi/genimage-raspberrypi0.cfg @@ -1,7 +1,7 @@ image boot.vfat { vfat { files = { - "bcm2708-rpi-b-plus.dtb", + "bcm2708-rpi-zero.dtb", "rpi-firmware/bootcode.bin", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi0w.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi0w.cfg index 3aafd9b6f..f76256ef8 100644 --- a/buildroot/board/raspberrypi/genimage-raspberrypi0w.cfg +++ b/buildroot/board/raspberrypi/genimage-raspberrypi0w.cfg @@ -1,7 +1,7 @@ image boot.vfat { vfat { files = { - "bcm2708-rpi-0-w.dtb", + "bcm2708-rpi-zero-w.dtb", "rpi-firmware/bootcode.bin", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg new file mode 100644 index 000000000..3c480e98f --- /dev/null +++ b/buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + files = { + "bcm2711-rpi-4-b.dtb", + "rpi-firmware/cmdline.txt", + "rpi-firmware/config.txt", + "rpi-firmware/fixup4.dat", + "rpi-firmware/start4.elf", + "rpi-firmware/overlays", + "Image" + } + } + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi4.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi4.cfg new file mode 100644 index 000000000..4e4742f3e --- /dev/null +++ b/buildroot/board/raspberrypi/genimage-raspberrypi4.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + files = { + "bcm2711-rpi-4-b.dtb", + "rpi-firmware/cmdline.txt", + "rpi-firmware/config.txt", + "rpi-firmware/fixup4.dat", + "rpi-firmware/start4.elf", + "rpi-firmware/overlays", + "zImage" + } + } + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot/board/raspberrypi/post-image.sh b/buildroot/board/raspberrypi/post-image.sh index 70447cd48..9dbd98ef9 100755 --- a/buildroot/board/raspberrypi/post-image.sh +++ b/buildroot/board/raspberrypi/post-image.sh @@ -10,13 +10,13 @@ GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" for arg in "$@" do case "${arg}" in - --add-pi3-miniuart-bt-overlay) + --add-miniuart-bt-overlay) if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then - echo "Adding 'dtoverlay=pi3-miniuart-bt' to config.txt (fixes ttyAMA0 serial console)." + echo "Adding 'dtoverlay=miniuart-bt' to config.txt (fixes ttyAMA0 serial console)." cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt" -# fixes rpi3 ttyAMA0 serial console -dtoverlay=pi3-miniuart-bt +# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +dtoverlay=miniuart-bt __EOF__ fi ;; @@ -28,15 +28,6 @@ __EOF__ # enable 64bits support arm_64bit=1 -__EOF__ - fi - - # Enable uart console - if ! grep -qE '^enable_uart=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then - cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt" - -# enable rpi3 ttyS0 serial console -enable_uart=1 __EOF__ fi ;; @@ -49,10 +40,18 @@ __EOF__ done +# Pass an empty rootpath. genimage makes a full copy of the given rootpath to +# ${GENIMAGE_TMP}/root so passing TARGET_DIR would be a waste of time and disk +# space. We don't rely on genimage to build the rootfs image, just to insert a +# pre-built one in the disk image. + +trap 'rm -rf "${ROOTPATH_TMP}"' EXIT +ROOTPATH_TMP="$(mktemp -d)" + rm -rf "${GENIMAGE_TMP}" -genimage \ - --rootpath "${TARGET_DIR}" \ +genimage \ + --rootpath "${ROOTPATH_TMP}" \ --tmppath "${GENIMAGE_TMP}" \ --inputpath "${BINARIES_DIR}" \ --outputpath "${BINARIES_DIR}" \ diff --git a/buildroot/board/raspberrypi/readme.txt b/buildroot/board/raspberrypi/readme.txt index 9f9158105..8b3de6d25 100644 --- a/buildroot/board/raspberrypi/readme.txt +++ b/buildroot/board/raspberrypi/readme.txt @@ -8,6 +8,7 @@ These instructions apply to all models of the Raspberry Pi: - the "enhanced" models A+ and B+, - the model B2 (aka Raspberry Pi 2) - the model B3 (aka Raspberry Pi 3). + - the model B4 (aka Raspberry Pi 4). How to build it =============== @@ -34,6 +35,10 @@ For model 3 B and B+: $ make raspberrypi3_defconfig +For model 4 B: + + $ make raspberrypi4_defconfig + Build the rootfs ---------------- @@ -57,6 +62,7 @@ After building, you should obtain this tree: +-- bcm2709-rpi-2-b.dtb [1] +-- bcm2710-rpi-3-b.dtb [1] +-- bcm2710-rpi-3-b-plus.dtb [1] + +-- bcm2711-rpi-4-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 +-- rpi-firmware/ @@ -72,7 +78,7 @@ After building, you should obtain this tree: [1] Not all of them will be present, depending on the RaspberryPi model you are using. -[2] Only for the Raspberry Pi 3 Model (overlay pi3-miniuart-bt is needed +[2] Only for the Raspberry Pi 3/4 Models (overlay miniuart-bt is needed to enable the RPi3 serial console otherwise occupied by the bluetooth chip). Alternative would be to disable the serial console in cmdline.txt and /etc/inittab. diff --git a/buildroot/board/raspberrypi4 b/buildroot/board/raspberrypi4 new file mode 120000 index 000000000..fcdafc81e --- /dev/null +++ b/buildroot/board/raspberrypi4 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/buildroot/board/raspberrypi4-64 b/buildroot/board/raspberrypi4-64 new file mode 120000 index 000000000..fcdafc81e --- /dev/null +++ b/buildroot/board/raspberrypi4-64 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/buildroot/board/roseapplepi/post-build.sh b/buildroot/board/roseapplepi/post-build.sh new file mode 100755 index 000000000..ffdd19138 --- /dev/null +++ b/buildroot/board/roseapplepi/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt diff --git a/buildroot/board/roseapplepi/post-image.sh b/buildroot/board/roseapplepi/post-image.sh deleted file mode 100755 index e8f2df23f..000000000 --- a/buildroot/board/roseapplepi/post-image.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -cp "${BOARD_DIR}/uEnv.txt" "${BINARIES_DIR}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/buildroot/board/sifive/hifive-unleashed/genimage.cfg b/buildroot/board/sifive/hifive-unleashed/genimage.cfg new file mode 100644 index 000000000..8eebc5235 --- /dev/null +++ b/buildroot/board/sifive/hifive-unleashed/genimage.cfg @@ -0,0 +1,17 @@ +image sdcard.img { + hdimage { + gpt = true + } + + partition bootloader { + image = "fw_payload.bin" + offset = 1M + size = 32M + partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 + } + + partition rootfs { + image = "rootfs.ext4" + partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + } +} diff --git a/buildroot/board/sifive/hifive-unleashed/linux.config.fragment b/buildroot/board/sifive/hifive-unleashed/linux.config.fragment new file mode 100644 index 000000000..f4f384088 --- /dev/null +++ b/buildroot/board/sifive/hifive-unleashed/linux.config.fragment @@ -0,0 +1,16 @@ +CONFIG_HZ_100=y +CONFIG_CMDLINE="earlycon=sbi root=/dev/mmcblk0p2 rootwait" +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_SERIAL_SIFIVE=y +CONFIG_SERIAL_SIFIVE_CONSOLE=y +CONFIG_SPI=y +CONFIG_SPI_SIFIVE=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_SIFIVE=y +CONFIG_MMC=y +CONFIG_MMC_SPI=y +CONFIG_CLK_U54_PRCI=y +CONFIG_CLK_GEMGXL_MGMT=y +CONFIG_PWM=y +CONFIG_PWM_SIFIVE=y diff --git a/buildroot/board/sifive/hifive-unleashed/readme.txt b/buildroot/board/sifive/hifive-unleashed/readme.txt new file mode 100644 index 000000000..8d3fa6357 --- /dev/null +++ b/buildroot/board/sifive/hifive-unleashed/readme.txt @@ -0,0 +1,75 @@ +SiFive HiFive Unleashed +======================= + +This file describes how to use the pre-defined Buildroot +configuration for the SiFive HiFive Unleashed board. + +Further information about the HiFive Unleashed board can be found +at https://www.sifive.com/boards/hifive-unleashed + +Building +======== + +Configure Buildroot using the default board configuration: + + $ make hifive_unleashed_defconfig + +Customise the build as necessary: + + $ make menuconfig + +Start the build: + + $ make + +Result of the build +=================== + +Once the build has finished you will have the following files: + + output/images/ + +-- fw_jump.bin + +-- fw_jump.elf + +-- fw_payload.bin + +-- fw_payload.elf + +-- Image + +-- rootfs.ext2 + +-- rootfs.ext4 + +-- rootfs.tar + +-- sdcard.img + + +Creating a bootable SD card with genimage +========================================= + +Buildroot builds a SD card image for you. All you need to do is dd the +image to your SD card, which can be done with the following command: + + $ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 bs=4096 + +Booting the SD card on the board +================================ + +Make sure that the all DIP switches are set to the off position for +default boot mode (MSEL mode = 1111), insert the SD card and power +up the board. + +Connect the USB cable and open minicom (/dev/ttyUSB1, 115200, 8N1). + +See the 'SiFive HiFive Unleashed Getting Started Guide' for +more details (https://www.sifive.com/documentation). + +You will get a warning reported by fdisk when you examine the SD card. +This is because the genimage.cfg file doesn't specify the SD card size +(as people will naturally have different sized cards), so the +secondary GPT header is placed after the rootfs rather than at the end +of the disk where it is expected to be. + +You will see something like this at boot time: + +[ 2.318722] GPT:Primary header thinks Alt. header is not at the end of the disk. +[ 2.325390] GPT:190496 != 122142719 +[ 2.328843] GPT:Alternate GPT header not at the end of the disk. +[ 2.334824] GPT:190496 != 122142719 +[ 2.338302] GPT: Use GNU Parted to correct GPT errors. +[ 2.343456] mmcblk0: p1 p2 diff --git a/buildroot/board/solidrun/clearfog_gt_8k/extlinux.conf b/buildroot/board/solidrun/clearfog_gt_8k/extlinux.conf new file mode 100644 index 000000000..aae0c0d5f --- /dev/null +++ b/buildroot/board/solidrun/clearfog_gt_8k/extlinux.conf @@ -0,0 +1,4 @@ +label Clearfog GT-8K Linux + kernel /boot/Image + devicetree /boot/armada-8040-clearfog-gt-8k.dtb + append console=ttyS0,115200n8 root=/dev/mmcblk1p1 rootwait diff --git a/buildroot/board/solidrun/clearfog_gt_8k/genimage.cfg b/buildroot/board/solidrun/clearfog_gt_8k/genimage.cfg new file mode 120000 index 000000000..0cc2754ff --- /dev/null +++ b/buildroot/board/solidrun/clearfog_gt_8k/genimage.cfg @@ -0,0 +1 @@ +../macchiatobin/genimage.cfg \ No newline at end of file diff --git a/buildroot/board/solidrun/clearfog_gt_8k/linux-extras.config b/buildroot/board/solidrun/clearfog_gt_8k/linux-extras.config new file mode 100644 index 000000000..24f4f5542 --- /dev/null +++ b/buildroot/board/solidrun/clearfog_gt_8k/linux-extras.config @@ -0,0 +1,6 @@ +CONFIG_MARVELL_PHY=y +CONFIG_SFP=y +CONFIG_IPV6=y +CONFIG_BRIDGE=y +CONFIG_NET_DSA=y +CONFIG_NET_DSA_MV88E6XXX=y diff --git a/buildroot/board/solidrun/clearfog_gt_8k/post-build-mainline.sh b/buildroot/board/solidrun/clearfog_gt_8k/post-build-mainline.sh new file mode 120000 index 000000000..a8c9a5243 --- /dev/null +++ b/buildroot/board/solidrun/clearfog_gt_8k/post-build-mainline.sh @@ -0,0 +1 @@ +../macchiatobin/post-build-mainline.sh \ No newline at end of file diff --git a/buildroot/board/solidrun/clearfog_gt_8k/readme.txt b/buildroot/board/solidrun/clearfog_gt_8k/readme.txt new file mode 100644 index 000000000..1648ffa38 --- /dev/null +++ b/buildroot/board/solidrun/clearfog_gt_8k/readme.txt @@ -0,0 +1,61 @@ +Intro +===== + +The default configuration described below will allow you to start +experimenting with the buildroot environment for the SolidRun Clearfog GT-8K +based on the Marvell Armada 8040 SoC. + +This default configuration will bring up the board and allow shell command +line access through the serial console. + +How to build +============ + + $ make solidrun_clearfog_gt_8k_defconfig + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image file named +"sdcard.img" in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M conv=fsync + +How to boot the board +===================== + +The Clearfog GT-8K can be setup to load the bootloader from different sources +including eMMC, SPI flash, and SD-card. + +To select boot from SD-card the DIP switches in SW6 (at the bottom of the +board) should be configured as follows: + + SW6: 11010 + +Insert the micro SDcard in the Cleargfog GT-8K and power it up. + +Serial console +============== + +The serial console is accessible at the J27 pins header (TTL UART) with the +following pinout (pin #1 is marked with triangle on the PCB): + + pin #1: Ground + pin #2: Armada 8040 Rx + pin #3: Armada 8040 Tx + +Enable the switch (yellow) Ethernet ports +========================================= + +To enable the Clearfog GT-8K internal switch port make sure to load the +'mv88e6xxx' kernel module, and up the switch up-link port (eth2 by default): + + modprobe mv88e6xxx + ifconfig eth2 up + +Then you can configure each switch port separately. These port are named +'lan1' to 'lan4' by default. 'lan1' is closest to the USB port, while 'lan4' +is closest to the blue Ethernet port. diff --git a/buildroot/board/solidrun/clearfog_gt_8k/uboot-fragment.config b/buildroot/board/solidrun/clearfog_gt_8k/uboot-fragment.config new file mode 120000 index 000000000..996c4aa6b --- /dev/null +++ b/buildroot/board/solidrun/clearfog_gt_8k/uboot-fragment.config @@ -0,0 +1 @@ +../macchiatobin/uboot-fragment.config \ No newline at end of file diff --git a/buildroot/board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg b/buildroot/board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg new file mode 100644 index 000000000..2b9e832dc --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg @@ -0,0 +1,24 @@ +image sdcard.img { + hdimage { + gpt = "true" + } + + partition fsbl1 { + image = "u-boot-spl.stm32" + } + + partition fsbl2 { + image = "u-boot-spl.stm32" + } + + partition ssbl { + image = "u-boot.img" + } + + partition rootfs { + image = "rootfs.ext4" + partition-type = 0x83 + bootable = "yes" + size = 256M + } +} diff --git a/buildroot/board/stmicroelectronics/stm32mp157c-dk2/linux.config b/buildroot/board/stmicroelectronics/stm32mp157c-dk2/linux.config new file mode 100644 index 000000000..878a0c39f --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32mp157c-dk2/linux.config @@ -0,0 +1,182 @@ +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_USELIB=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_BLK_DEV_INITRD=y +CONFIG_ARCH_STM32=y +CONFIG_ARM_THUMBEE=y +# CONFIG_CACHE_L2X0 is not set +CONFIG_ARM_ERRATA_430973=y +CONFIG_ARM_ERRATA_720789=y +CONFIG_ARM_ERRATA_754322=y +CONFIG_ARM_ERRATA_754327=y +CONFIG_ARM_ERRATA_764369=y +CONFIG_ARM_ERRATA_775420=y +CONFIG_ARM_ERRATA_798181=y +CONFIG_SMP=y +CONFIG_MCPM=y +CONFIG_HIGHMEM=y +CONFIG_FORCE_MAX_ZONEORDER=12 +CONFIG_SECCOMP=y +# CONFIG_ATAGS is not set +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_KERNEL_MODE_NEON=y +CONFIG_ARM_CRYPTO=y +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_CMDLINE_PARTITION=y +CONFIG_CMA=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_CAN=y +CONFIG_CAN_M_CAN=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=128 +CONFIG_SIMPLE_PM_BUS=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_STM32_FMC2=y +CONFIG_MTD_SPI_NOR=y +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_UBI=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_SRAM=y +CONFIG_EEPROM_AT24=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_KS8851=y +CONFIG_SMSC911X=y +CONFIG_STMMAC_ETH=y +CONFIG_DWMAC_DWC_QOS_ETH=y +CONFIG_MDIO_BITBANG=y +CONFIG_INPUT_JOYDEV=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_EDT_FT5X06=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_STPMIC1_ONKEY=y +CONFIG_SERIAL_STM32=y +CONFIG_SERIAL_STM32_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_HW_RANDOM=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y +CONFIG_I2C_STM32F7=y +CONFIG_SPI=y +CONFIG_SPI_STM32=y +CONFIG_SPI_STM32_QSPI=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_PINCTRL_STMFX=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y +CONFIG_SYSCON_REBOOT_MODE=y +CONFIG_WATCHDOG=y +CONFIG_STPMIC1_WATCHDOG=y +CONFIG_MFD_STM32_LPTIMER=y +CONFIG_MFD_STPMIC1=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_STM32_VREFBUF=y +CONFIG_REGULATOR_STM32_PWR=y +CONFIG_REGULATOR_STPMIC1=y +CONFIG_DRM=y +CONFIG_DRM_STM=y +CONFIG_DRM_STM_DSI=y +CONFIG_DRM_PANEL_ORISETECH_OTM8009A=y +CONFIG_DRM_SII902X=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_USB=y +CONFIG_USB_OTG=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PLATFORM=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_DWC2=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_ISP1760=y +CONFIG_USB_HSIC_USB3503=y +CONFIG_USB_GPIO_VBUS=y +CONFIG_USB_ISP1301=y +CONFIG_USB_ULPI=y +CONFIG_TYPEC=y +CONFIG_TYPEC_STUSB=y +CONFIG_MMC=y +CONFIG_MMC_BLOCK_MINORS=16 +CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_DW=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_PWM=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_STM32=y +CONFIG_DMADEVICES=y +CONFIG_STM32_DMA=y +CONFIG_STM32_DMAMUX=y +CONFIG_STM32_MDMA=y +CONFIG_HWSPINLOCK=y +CONFIG_HWSPINLOCK_STM32=y +CONFIG_STM32_IPCC=y +CONFIG_REMOTEPROC=y +CONFIG_STM32_RPROC=y +CONFIG_RPMSG_VIRTIO=y +CONFIG_RPMSG_TTY=y +CONFIG_IIO=y +CONFIG_IIO_SW_TRIGGER=y +CONFIG_SD_ADC_MODULATOR=y +CONFIG_STM32_ADC_CORE=y +CONFIG_STM32_ADC=y +CONFIG_STM32_ADC_TEMP=y +CONFIG_STM32_DFSDM_ADC=y +CONFIG_STM32_LPTIMER_CNT=y +CONFIG_STM32_DAC=y +CONFIG_IIO_HRTIMER_TRIGGER=y +CONFIG_IIO_STM32_LPTIMER_TRIGGER=y +CONFIG_PWM=y +CONFIG_PWM_STM32=y +CONFIG_PWM_STM32_LP=y +CONFIG_PHY_STM32_USBPHYC=y +CONFIG_NVMEM_STM32_ROMEM=y +CONFIG_EXT4_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_PRINTK_TIME=y diff --git a/buildroot/board/stmicroelectronics/stm32mp157c-dk2/overlay/boot/extlinux/extlinux.conf b/buildroot/board/stmicroelectronics/stm32mp157c-dk2/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 000000000..5b7f56ee7 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32mp157c-dk2/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label stm32mp157c-dk2-buildroot + kernel /boot/zImage + devicetree /boot/stm32mp157c-dk2.dtb + append root=/dev/mmcblk0p4 rootwait diff --git a/buildroot/board/stmicroelectronics/stm32mp157c-dk2/readme.txt b/buildroot/board/stmicroelectronics/stm32mp157c-dk2/readme.txt new file mode 100644 index 000000000..8edc3e8bb --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32mp157c-dk2/readme.txt @@ -0,0 +1,38 @@ +STM32MP157C Discovery Kit v2 + +Intro +===== + +This configuration supports the STM32MP157C Discovery Kit 2 (DK2) +platform: + + https://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html + +How to build +============ + + $ make stm32mp157c_dk2_defconfig + $ make + +How to write the microSD card +============================= + +Once the build process is finished you will have an image called +"sdcard.img" in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an microSD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Boot the board +============== + + (1) Insert the microSD card in connector CN15 + + (2) Plug a micro-USB cable in connector CN11 and run your serial + communication program on /dev/ttyACM0. + + (3) Plug a USB-C cable in CN6 to power-up the board. + + (4) The system will start, with the console on UART, but also visible + on the screen. diff --git a/buildroot/board/stmicroelectronics/stm32mp157c-dk2/uboot-fragment.config b/buildroot/board/stmicroelectronics/stm32mp157c-dk2/uboot-fragment.config new file mode 100644 index 000000000..a278ce9e2 --- /dev/null +++ b/buildroot/board/stmicroelectronics/stm32mp157c-dk2/uboot-fragment.config @@ -0,0 +1 @@ +# CONFIG_STM32MP_WATCHDOG is not set diff --git a/buildroot/board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch b/buildroot/board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch deleted file mode 100644 index 59408bcd7..000000000 --- a/buildroot/board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6d298b0fcacfc555f93864fa45fb612140902388 Mon Sep 17 00:00:00 2001 -From: Fabio Estevam -Date: Tue, 5 Jun 2018 22:12:48 -0300 -Subject: [PATCH] pico-imx7d: Adjust the dtb name - -Since kernel commit 41bbeadceb03 ("ARM: dts: imx7d-pico-pi: Separate -into cpu and baseboard dts") the dtb name has changed. - -Fix it accordingly. - -Signed-off-by: Fabio Estevam ---- - include/configs/pico-imx7d.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h -index b208d7f..d2ffa70 100644 ---- a/include/configs/pico-imx7d.h -+++ b/include/configs/pico-imx7d.h -@@ -41,7 +41,7 @@ - "console=ttymxc4\0" \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ -- "fdt_file=imx7d-pico.dtb\0" \ -+ "fdt_file=imx7d-pico-pi.dtb\0" \ - "fdt_addr=0x83000000\0" \ - "ip_dyn=yes\0" \ - "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ --- -2.7.4 - diff --git a/buildroot/board/technexion/imx7dpico/readme.txt b/buildroot/board/technexion/imx7dpico/readme.txt index cda3f285e..53197d458 100644 --- a/buildroot/board/technexion/imx7dpico/readme.txt +++ b/buildroot/board/technexion/imx7dpico/readme.txt @@ -20,9 +20,63 @@ You will find in output/images/ the following files: - rootfs.ext4 - rootfs.tar - sdcard.img - - u-boot.imx + - u-boot-dtb.img + - SPL - zImage +Flash U-Boot and SPL +===== + +Note: This method is convenient for development purposes. +If the eMMC has already a U-Boot flashed with DFU support then +the user can go to step 2 below in order to update U-Boot. + +Put pico board in USB download mode (refer to the PICO-iMX7D Quick Start Guide +page 3) + +Connect a USB to serial adapter between the host PC and pico. + +Connect a USB cable between the OTG pico port and the host PC. + +Note: Some computers may be a bit strict with USB current draw and will +shut down their ports if the draw is too high. The solution for that is +to use an externally powered USB hub between the board and the host computer. + +Open a terminal program such as minicom. + +Copy SPL and u-boot-dtb.img to the imx_usb_loader folder. + +Load the SPL binary via USB: + +$ sudo ./imx_usb SPL + +Load the u-boot-dtb.img binary via USB: + +$ sudo ./imx_usb u-boot-dtb.img + +Then U-Boot starts and its messages appear in the console program. + +Use the default environment variables: + +=> env default -f -a +=> saveenv + +Run the DFU agent so we can flash the new images using dfu-util tool: + +=> dfu 0 mmc 0 + +Flash SPL and u-boot-dtb.img into the eMMC running the following commands on a PC: + +$ sudo dfu-util -D SPL -a spl + +$ sudo dfu-util -D u-boot-dtb.img -a u-boot + +Remove power from the pico board. + +Put pico board into normal boot mode. + +Power up the board and the new updated U-Boot should boot from eMMC. + Flash the eMMC ============== @@ -56,4 +110,15 @@ To boot your newly created system: emulator at 115200 bps, 8n1; - power on the board. +Using Wifi +========== + +# modprobe brcmfmac +# iwconfig wlan0 essid ACCESSPOINTNAME +# wpa_passphrase ACCESSPOINTNAME > /etc/wpa.conf +(enter the wifi password and press enter) +# wpa_supplicant -Dwext -iwlan0 -c /etc/wpa.conf & +# udhcpc -i wlan0 +# ping buildroot.org + Enjoy! diff --git a/buildroot/board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf b/buildroot/board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 000000000..4824aff07 --- /dev/null +++ b/buildroot/board/technexion/imx7dpico/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +Label imx7d-pico-buildroot + kernel /boot/zImage + devicetree /boot/imx7d-pico-pi.dtb + append root=PARTUUID=${uuid} rootwait rw console=${console},${baudrate} \ No newline at end of file diff --git a/buildroot/board/technexion/imx7dpico/rootfs_overlay/lib/firmware/brcm/brcmfmac4339-sdio.txt b/buildroot/board/technexion/imx7dpico/rootfs_overlay/lib/firmware/brcm/brcmfmac4339-sdio.txt new file mode 100644 index 000000000..1ddd92950 --- /dev/null +++ b/buildroot/board/technexion/imx7dpico/rootfs_overlay/lib/firmware/brcm/brcmfmac4339-sdio.txt @@ -0,0 +1,99 @@ +#AP6335_NVRAM_V1.5_03112014 +NVRAMRev=$Rev: 410316 $ +sromrev=11 +boardrev=0x1203 +boardtype=0x06c5 +boardflags=0x00000c01 +boardflags2=0x00002000 +boardflags3=0x101188 +macaddr=00:90:4c:c5:12:38 +ccode=0 +regrev=0 +antswitch=0 +pdgain2g=7 +pdgain5g=7 +tworangetssi2g=0 +tworangetssi5g=0 +femctrl=7 +pcieingress_war=15 +vendid=0x14e4 +devid=0x43ae +manfid=0x2d0 +nocrc=1 +otpimagesize=502 +xtalfreq=37400 +extpagain2g=2 +pdetrange2g=2 +extpagain5g=2 +pdetrange5g=2 +rxgains2gelnagaina0=0 +rxgains2gtrisoa0=7 +rxgains2gtrelnabypa0=0 +rxgains5gelnagaina0=0 +rxgains5gtrisoa0=11 +rxgains5gtrelnabypa0=0 +rxchain=1 +txchain=1 +aa2g=1 +aa5g=1 +tssipos5g=0 +tssipos2g=0 +pa2ga0=-161,6269,-723 +pa2gccka0=-116,7568,-852 +pa5ga0=0xFF61,0x163C,0xFD55,0xFF5D,0x1671,0xFD4F,0xFF5F,0x16CA,0xFD45,0xFF60,0x1676,0xFD4D +pa5gbw40a0=0xFF61,0x163C,0xFD55,0xFF5D,0x1671,0xFD4F,0xFF5F,0x16CA,0xFD45,0xFF60,0x1676,0xFD4D +pa5gbw80a0=0xFF61,0x163C,0xFD55,0xFF5D,0x1671,0xFD4F,0xFF5F,0x16CA,0xFD45,0xFF60,0x1676,0xFD4D +pdoffset40ma0=0 +pdoffset80ma0=0 +pdoffsetcckma0=0 +maxp2ga0=75 +maxp5ga0=64,64,72,72 +cckbw202gpo=0x0000 +cckbw20ul2gpo=0x0 +mcsbw202gpo=0x99445533 +mcsbw402gpo=0x99775533 +dot11agofdmhrbw202gpo=0x2233 +ofdmlrbw202gpo=0x0000 +tssifloor2g=500 +mcsbw205glpo=0x66333330 +mcsbw405glpo=0x66665530 +mcsbw805glpo=0xAA555530 +mcsbw1605glpo=0x99555530 +mcsbw205gmpo=0x99BB5530 +mcsbw405gmpo=0x99BB5530 +mcsbw805gmpo=0xEE555530 +mcsbw1605gmpo=0x99555530 +mcsbw205ghpo=0x99995530 +mcsbw405ghpo=0x99BB5530 +mcsbw805ghpo=0xEE555530 +mcsbw1605ghpo=0x99555530 +mcslr5glpo=0x0000 +mcslr5gmpo=0x0000 +mcslr5ghpo=0x0000 +sb20in40hrrpo=0x0 +sb20in80and160hr5glpo=0x0 +sb40and80hr5glpo=0x0 +sb20in80and160hr5gmpo=0x0 +sb40and80hr5gmpo=0x0 +sb20in80and160hr5ghpo=0x0 +sb40and80hr5ghpo=0x0 +sb20in40lrpo=0x0 +sb20in80and160lr5glpo=0x0 +sb40and80lr5glpo=0x0 +sb20in80and160lr5gmpo=0x0 +sb40and80lr5gmpo=0x0 +sb20in80and160lr5ghpo=0x0 +sb40and80lr5ghpo=0x0 +dot11agduphrpo=0x0 +dot11agduplrpo=0x0 +phycal_tempdelta=25 +cckdigfilttype=2 +pacalidx2g=65 +dacrate2g=160 +swctrlmap_5g=0x00000008,0x00000010,0x00000008,0x000000,0x038 +swctrlmap_2g=0x00000001,0x00000002,0x00000001,0x040002,0x0ff +swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x000 +swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x000 +rssicorrnorm_c0=3,3 +rssicorrnorm5g_c0=2,3,4,2,3,3,0,1,2,0,1,2 +muxenab=0x10 diff --git a/buildroot/board/technexion/imx8mmpico/readme.txt b/buildroot/board/technexion/imx8mmpico/readme.txt new file mode 100644 index 000000000..3095d67b2 --- /dev/null +++ b/buildroot/board/technexion/imx8mmpico/readme.txt @@ -0,0 +1,96 @@ +********************************* +Technexion i.MX8M Mini Pico board +********************************* + +This file documents the Buildroot support for the Technexion i.MX8M +Mini Pico board. The Pico i.MX8M Mini system-on-module [1] is present +in development kits like the Pico Pi i.MX8M Mini [2]. + +Build +===== + +First, configure Buildroot for the i.MX8M Mini Pico board: + + make imx8mmpico_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - bl31.bin + - boot.vfat + - Image + - imx8-boot-sd.bin + - imx8mm-pico-pi.dtb + - imx8mm-pico-pi-ili9881c.dtb + - imx8mm-pico-pi-sn65dsi84-hj070na.dtb + - lpddr4_pmu_train_fw.bin + - rootfs.ext2 + - rootfs.ext4 + - sdcard.img + - u-boot.imx + +Flashing sdcard.img on the eMMC +=============================== + +i.MX8M Mini Pico board does not have a SD card slot. The storage is an +eMMC. An easy way to flash the eMMC is to use the u-boot ums +command. The boards are sold pre-flashed with such a u-boot. It is +assumed here that the board has already a working u-boot on eMMC and +jumpers are set to boot on eMMC. See [3]. + +Jumper configuration for eMMC boot: +J1: jumper on pins 4 and 6. +J2: jumper on pins 2 and 4. + +In case the board was flashed with a wrong u-boot, or the eMMC is +erased, u-boot can be loaded by USB Serial Download boot mode, using +imx-usb-loader. See [3] and [4]. + +For flashing: +- Plug the micro USB cable from the Debug USB Port, to your computer +- Plug the USB Type C to your computer, this will power up the board + +In the U-Boot prompt launch: + +=> ums 0 mmc 1 + +This will mount the eMMC content in the host PC as a mass storage device. + +To determine the device associated to the eMMC card have a look in the +/proc/partitions file: + + cat /proc/partitions + +If your system automatically mount some device partitions, make sure +to unmount them. + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on the eMMC. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the eMMC content. Use with care! *** + +This operation can take several minutes, depending on the image +size. When tested, a 2MB/s transfer rate was observed. + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template. + +Boot the i.MX8M Mini Pico board +=============================== + +To boot your newly created system: +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board, with USB Type C connector. + +Enjoy! + +[1]. https://www.technexion.com/products/system-on-modules/pico/pico-compute-modules/detail/PICO-IMX8M-MINI +[2]. https://www.technexion.com/products/pico-evaluation-kits/detail/PICOPIIMX8MM1GDEV +[3]. https://www.technexion.com/support/knowledgebase/boot-configuration-settings-for-pico-baseboards/ +[4]. https://www.technexion.com/support/knowledgebase/loading-bootable-software-images-onto-the-emmc-of-picosom-on-pico-pi/ diff --git a/buildroot/board/technexion/imx8mpico/readme.txt b/buildroot/board/technexion/imx8mpico/readme.txt new file mode 100644 index 000000000..1a04e4457 --- /dev/null +++ b/buildroot/board/technexion/imx8mpico/readme.txt @@ -0,0 +1,95 @@ +**************************** +Technexion i.MX8M Pico board +**************************** + +This file documents the Buildroot support for the Technexion i.MX8M +Pico board. The Pico i.MX8M system-on-module [1] is present in +development kits like the Pico Pi i.MX8M [2]. + +Build +===== + +First, configure Buildroot for the i.MX8M Pico board: + + make imx8mpico_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - bl31.bin + - boot.vfat + - Image + - imx8-boot-sd.bin + - lpddr4_pmu_train_fw.bin + - pico-8m-dcss-ili9881c.dtb + - pico-8m.dtb + - rootfs.ext4 + - sdcard.img + - signed_hdmi_imx8m.bin + - u-boot.imx + +Flashing sdcard.img on the eMMC +=============================== + +i.MX8M Pico board does not have a SD card slot. The storage is an +eMMC. An easy way to flash the eMMC is to use the u-boot ums +command. The boards are sold pre-flashed with such a u-boot. It is +assumed here that the board has already a working u-boot on eMMC and +jumpers are set to boot on eMMC. See [3]. + +Jumper configuration for eMMC boot: +J1: jumper on pins 4 and 6. +J2: jumper on pins 2 and 4. + +In case the board was flashed with a wrong u-boot, or the eMMC is +erased, u-boot can be loaded by USB Serial Download boot mode, using +imx-usb-loader. See [3] and [4]. + +For flashing: +- Plug the micro USB cable from the Debug USB Port, to your computer +- Plug the USB Type C to your computer, this will power up the board + +In the U-Boot prompt launch: + +=> ums 0 mmc 0 + +This will mount the eMMC content in the host PC as a mass storage device. + +To determine the device associated to the eMMC card have a look in the +/proc/partitions file: + + cat /proc/partitions + +If your system automatically mount some device partitions, make sure +to unmount them. + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on the eMMC. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the eMMC content. Use with care! *** + +This operation can take several minutes, depending on the image +size. When tested, a 2MB/s transfer rate was observed. + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template. + +Boot the i.MX8M Pico board +========================== + +To boot your newly created system: +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board, with USB Type C connector. + +Enjoy! + +[1]. https://www.technexion.com/products/system-on-modules/pico/pico-compute-modules/detail/PICO-IMX8M +[2]. https://www.technexion.com/products/system-on-modules/pico-evaluation-kits/detail/PICO-PI-IMX8M-BASIC +[3]. https://www.technexion.com/support/knowledgebase/boot-configuration-settings-for-pico-baseboards/ +[4]. https://www.technexion.com/support/knowledgebase/loading-bootable-software-images-onto-the-emmc-of-picosom-on-pico-pi/ diff --git a/buildroot/board/technologic/ts4800/genimage.cfg b/buildroot/board/technologic/ts4800/genimage.cfg deleted file mode 100644 index 2070cc504..000000000 --- a/buildroot/board/technologic/ts4800/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "imx51-ts4800.dtb" - } - } - size = 8M -} - -image sdcard.img { - hdimage { - } - - partition mbrboot { - in-partition-table = "no" - image = "mbrboot.bin" - offset = 0 - } - - partition uboot { - partition-type = 0xda - image = "u-boot.bin" - size = 256k - } - - partition kernel { - partition-type = 0xC - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 256M - } -} diff --git a/buildroot/board/technologic/ts4800/linux.fragment b/buildroot/board/technologic/ts4800/linux.fragment deleted file mode 100644 index 0451c8636..000000000 --- a/buildroot/board/technologic/ts4800/linux.fragment +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_TOUCHSCREEN_TS4800=y -CONFIG_TS4800_WATCHDOG=y -CONFIG_TS4800_IRQ=y diff --git a/buildroot/board/technologic/ts4800/post-image.sh b/buildroot/board/technologic/ts4800/post-image.sh deleted file mode 100755 index cc8e5da35..000000000 --- a/buildroot/board/technologic/ts4800/post-image.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2015 Savoir-faire Linux -# Post image generation script. - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP=${BUILD_DIR}/.genimage_tmp - -rm -rf ${GENIMAGE_TMP} - -${HOST_DIR}/bin/genimage \ - --config ${GENIMAGE_CFG} \ - --rootpath ${TARGET_DIR} \ - --tmppath ${GENIMAGE_TMP} \ - --inputpath $BINARIES_DIR \ - --outputpath $BINARIES_DIR - -exit $? diff --git a/buildroot/board/technologic/ts4800/readme.txt b/buildroot/board/technologic/ts4800/readme.txt deleted file mode 100644 index 20b50e9de..000000000 --- a/buildroot/board/technologic/ts4800/readme.txt +++ /dev/null @@ -1,50 +0,0 @@ -Technologic Systems TS-4800 -=========================== - -This document explains how to set up a basic Buildroot system for the -Technologic Systems TS-4800 System on Module. - -The TS-4800 is a TS-SOCKET macrocontroller board based on the Freescale -i.MX515 ARM Cortex-A8 CPU running at 800MHz. The TS-4800 features 10/100 -Ethernet, high speed USB host and device (OTG), microSD card, and 256MB -XNAND drive. More details on the board here: - http://wiki.embeddedarm.com/wiki/TS-4800 - -The TS-4800 is supported by mainline Linux as of 4.5 and by U-boot as of -v2016-07. The defconfig includes a custom 1st level bootloader located -in boot/ts4800-mbrboot. This one scans the SD card's partition table to -find partition having the 0xDA type, corresponding to U-boot. - -To build the default configuration you only have to: - - $ make ts4800_defconfig - $ make - -The ouput looks like: - output/images/ - ├── boot.vfat - ├── imx51-ts4800.dtb - ├── mbrboot.bin - ├── rootfs.ext2 - ├── rootfs.ext4 -> rootfs.ext2 - ├── rootfs.tar - ├── sdcard.img - ├── u-boot.bin - └── zImage - -The provided post-image script generates an image file containing 3 -partitions for U-boot, Linux kernel + device tree and rootfs -respectively: - $ fdisk output/images/sdcard.img - Device Boot Start End Blocks Id System - output/images/sdcard.img1 1 512 256 da Non-FS data - output/images/sdcard.img2 513 16896 8192 c W95 FAT32 (LBA) - output/images/sdcard.img3 16897 541184 262144 83 Linux - -This image can be directly written to an SD card. - - $ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 - -In order to test the image on TS-4800 board, a TS baseboard, such as -TS-8xxx the serie, is needed to provide power, console header, RJ45 -connector etc. diff --git a/buildroot/board/technologic/ts7680/readme.txt b/buildroot/board/technologic/ts7680/readme.txt index 4ddd4915b..43d5d135e 100644 --- a/buildroot/board/technologic/ts7680/readme.txt +++ b/buildroot/board/technologic/ts7680/readme.txt @@ -10,8 +10,7 @@ Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, relays and ADC/DAC. More details on the board here: https://wiki.embeddedarm.com/wiki/TS-7680 -The TS-7680 uses a 3.14.28 Linux kernel provided by -Technologic Systems. +The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. To build the default configuration you only have to run: diff --git a/buildroot/board/wandboard/post-image.sh b/buildroot/board/wandboard/post-image.sh deleted file mode 100755 index 18e76aa40..000000000 --- a/buildroot/board/wandboard/post-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -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/buildroot/board/warp7/readme.txt b/buildroot/board/warp7/readme.txt index 47458e9b5..aff7a601e 100644 --- a/buildroot/board/warp7/readme.txt +++ b/buildroot/board/warp7/readme.txt @@ -20,7 +20,7 @@ You will find in output/images/ the following files: - rootfs.ext4 - rootfs.tar - sdcard.img - - u-boot.imx + - u-boot-dtb.imx - zImage Flash the eMMC image @@ -61,11 +61,11 @@ Connect a USB to serial adapter between the host PC and warp7 serial USB port, and also a USB cable between the OTG warp7 port and the host PC. -Copy u-boot.imx to the imx_usb_loader folder. +Copy u-boot-dtb.imx to the imx_usb_loader folder. -Load u-boot.imx via USB: +Load u-boot-dtb.imx via USB: -$ sudo ./imx_usb u-boot.imx +$ sudo ./imx_usb u-boot-dtb.imx Then U-Boot should start and its messages will appear in the console program. @@ -75,6 +75,20 @@ Use the default environment variables: => env default -f -a => saveenv + +Run the DFU command: +=> dfu 0 mmc 0 + +Transfer u-boot-dtb.imx that will be flashed into the eMMC: + +$ sudo dfu-util -D u-boot-dtb.imx -a boot + +Then on the U-Boot prompt the following message should be seen after a +successful upgrade: + +#DOWNLOAD ... OK +Ctrl+C to exit ... + => ums 0 mmc 0 sudo dd if=output/images/sdcard.img of=/dev/ diff --git a/buildroot/boot/Config.in b/buildroot/boot/Config.in index 11856fd9c..b3adbfc8b 100644 --- a/buildroot/boot/Config.in +++ b/buildroot/boot/Config.in @@ -13,11 +13,11 @@ source "boot/gummiboot/Config.in" source "boot/lpc32xxcdl/Config.in" source "boot/mv-ddr-marvell/Config.in" source "boot/mxs-bootlets/Config.in" -source "boot/riscv-pk/Config.in" +source "boot/optee-os/Config.in" +source "boot/opensbi/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" -source "boot/ts4800-mbrboot/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/buildroot/boot/afboot-stm32/0001-Use-ld-instead-of-gcc-for-linking.patch b/buildroot/boot/afboot-stm32/0001-Use-ld-instead-of-gcc-for-linking.patch deleted file mode 100644 index 3f359dc31..000000000 --- a/buildroot/boot/afboot-stm32/0001-Use-ld-instead-of-gcc-for-linking.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0d581abe6620ac69adec321b94390e009802f36a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 13 Mar 2016 14:32:33 +0100 -Subject: [PATCH] Use ld instead of gcc for linking - -Signed-off-by: Thomas Petazzoni ---- - Makefile | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index ce40314..271bb4f 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,7 @@ - CROSS_COMPILE ?= arm-none-eabi- - - CC = $(CROSS_COMPILE)gcc -+LD = $(CROSS_COMPILE)ld - OBJCOPY = $(CROSS_COMPILE)objcopy - OBJDUMP = $(CROSS_COMPILE)objdump - SIZE = $(CROSS_COMPILE)size -@@ -10,7 +11,7 @@ OPENOCD = openocd - CFLAGS := -mthumb -mcpu=cortex-m4 - CFLAGS += -ffunction-sections -fdata-sections - CFLAGS += -Os -std=gnu99 -Wall --LDFLAGS := -nostartfiles -Wl,--gc-sections -+LINKERFLAGS := -nostartfiles --gc-sections - - obj-y += gpio.o mpu.o - obj-f4 += $(obj-y) usart-f4.o -@@ -22,22 +23,22 @@ all: stm32f429i-disco stm32429i-eval stm32f469i-disco stm32746g-eval - $(CC) -c $(CFLAGS) $< -o $@ - - stm32f429i-disco: stm32f429i-disco.o $(obj-f4) -- $(CC) -T stm32f429.lds $(LDFLAGS) -o stm32f429i-disco.elf stm32f429i-disco.o $(obj-f4) -+ $(LD) -T stm32f429.lds $(LINKERFLAGS) -o stm32f429i-disco.elf stm32f429i-disco.o $(obj-f4) - $(OBJCOPY) -Obinary stm32f429i-disco.elf stm32f429i-disco.bin - $(SIZE) stm32f429i-disco.elf - - stm32429i-eval: stm32429i-eval.o $(obj-f4) -- $(CC) -T stm32f429.lds $(LDFLAGS) -o stm32429i-eval.elf stm32429i-eval.o $(obj-f4) -+ $(LD) -T stm32f429.lds $(LINKERFLAGS) -o stm32429i-eval.elf stm32429i-eval.o $(obj-f4) - $(OBJCOPY) -Obinary stm32429i-eval.elf stm32429i-eval.bin - $(SIZE) stm32429i-eval.elf - - stm32f469i-disco: stm32f469i-disco.o $(obj-f4) -- $(CC) -T stm32f429.lds $(LDFLAGS) -o stm32f469i-disco.elf stm32f469i-disco.o $(obj-f4) -+ $(LD) -T stm32f429.lds $(LINKERFLAGS) -o stm32f469i-disco.elf stm32f469i-disco.o $(obj-f4) - $(OBJCOPY) -Obinary stm32f469i-disco.elf stm32f469i-disco.bin - $(SIZE) stm32f469i-disco.elf - - stm32746g-eval: stm32746g-eval.o $(obj-f7) -- $(CC) -T stm32f429.lds $(LDFLAGS) -o stm32746g-eval.elf stm32746g-eval.o $(obj-f7) -+ $(LD) -T stm32f429.lds $(LINKERFLAGS) -o stm32746g-eval.elf stm32746g-eval.o $(obj-f7) - $(OBJCOPY) -Obinary stm32746g-eval.elf stm32746g-eval.bin - $(SIZE) stm32746g-eval.elf - --- -2.6.4 - diff --git a/buildroot/boot/afboot-stm32/afboot-stm32.hash b/buildroot/boot/afboot-stm32/afboot-stm32.hash index d23b74ad2..75f47295f 100644 --- a/buildroot/boot/afboot-stm32/afboot-stm32.hash +++ b/buildroot/boot/afboot-stm32/afboot-stm32.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 dbd715c8b99f7d266f74a04707a4dac76b75b31321f24dee5256a6348260530c afboot-stm32-v0.1.tar.gz +sha256 9b37b661bd3091ceb5d8dc5a56a2dfc02ae9ebc0c63dad3c4289c9d6b3d3ec89 afboot-stm32-0.2.tar.gz diff --git a/buildroot/boot/afboot-stm32/afboot-stm32.mk b/buildroot/boot/afboot-stm32/afboot-stm32.mk index 5e221cf36..0fb473528 100644 --- a/buildroot/boot/afboot-stm32/afboot-stm32.mk +++ b/buildroot/boot/afboot-stm32/afboot-stm32.mk @@ -4,8 +4,8 @@ # ################################################################################ -AFBOOT_STM32_VERSION = v0.1 -AFBOOT_STM32_SITE = $(call github,mcoquelin-stm32,afboot-stm32,$(AFBOOT_STM32_VERSION)) +AFBOOT_STM32_VERSION = 0.2 +AFBOOT_STM32_SITE = $(call github,mcoquelin-stm32,afboot-stm32,v$(AFBOOT_STM32_VERSION)) AFBOOT_STM32_INSTALL_IMAGES = YES AFBOOT_STM32_INSTALL_TARGET = NO diff --git a/buildroot/boot/arm-trusted-firmware/Config.in b/buildroot/boot/arm-trusted-firmware/Config.in index 823a3510b..737dc587e 100644 --- a/buildroot/boot/arm-trusted-firmware/Config.in +++ b/buildroot/boot/arm-trusted-firmware/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE bool "ARM Trusted Firmware (ATF)" - depends on BR2_aarch64 && BR2_TARGET_UBOOT + depends on (BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A) && \ + BR2_TARGET_UBOOT help Enable this option if you want to build the ATF for your ARM based embedded device. @@ -90,6 +91,30 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT bl31.bin. This is used for example by the Xilinx version of U-Boot SPL to load ATF on the ZynqMP SoC. +choice + prompt "BL32" + default BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_DEFAULT + help + Select BL32 stage for the trusted firmware + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_DEFAULT + bool "Default" + help + With this option selected, ATF will not use any BL32 stage, + unless if one is explicitly chosen using the SPD (for + AArch64) or AARCH32_SP (for AArch32) variables, which can be + passed through + BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE + bool "OP-TEE OS" + depends on BR2_TARGET_OPTEE_OS + help + This option allows to embed OP-TEE OS as the BL32 part of + the ARM Trusted Firmware boot sequence. + +endchoice + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 bool "Use U-Boot as BL33" depends on BR2_TARGET_UBOOT @@ -99,10 +124,47 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 gets built before ATF, and that the appropriate BL33 variable pointing to u-boot.bin is passed when building ATF. +if BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE + string "U-Boot BL33 image name" + default "u-boot.bin" + help + Name of the U-Boot BL33 image to include in ATF, it must + have been installed to BINARIES_DIR by the U-Boot package. + +endif + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS + string "Additional ATF make targets" + help + Additional targets for the ATF build + E.G. When using the QorIQ custom ATF repository from NXP, + the target 'pbl' can be used to build the pbl binary. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES string "Additional ATF build variables" help Additional parameters for the ATF build E.G. 'DEBUG=1 LOG_LEVEL=20' +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG + bool "Build in debug mode" + help + Enable this option to build ATF with DEBUG=1. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES + string "Binary boot images" + default "*.bin" + help + Names of generated image files that are installed in the + output images/ directory. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC + bool "Needs dtc" + select BR2_PACKAGE_HOST_DTC + help + Select this option if your ATF board configuration + requires the Device Tree compiler to be available. + endif diff --git a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 464e4d95e..27f63a87f 100644 --- a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -29,16 +29,53 @@ endif ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC),y) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-dtc +endif + ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) + +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += DEBUG=1 +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/debug +else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release +endif ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) +ifeq ($(BR2_ARM_CPU_ARMV7A),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARM_ARCH_MAJOR=7 +else ifeq ($(BR2_ARM_CPU_ARMV8A),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARM_ARCH_MAJOR=8 +endif + +ifeq ($(BR2_arm),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARCH=aarch32 +else ifeq ($(BR2_aarch64),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARCH=aarch64 +endif + +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE),y) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += optee-os +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ + BL32=$(BINARIES_DIR)/tee-header_v2.bin \ + BL32_EXTRA1=$(BINARIES_DIR)/tee-pager_v2.bin \ + BL32_EXTRA2=$(BINARIES_DIR)/tee-pageable_v2.bin +ifeq ($(BR2_aarch64),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += SPD=opteed +endif +ifeq ($(BR2_arm),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee +endif +endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y) -ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/u-boot.bin +ARM_TRUSTED_FIRMWARE_UBOOT_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE)) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_UBOOT_BIN) ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot endif @@ -106,6 +143,9 @@ define ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF endef endif +ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += \ + $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS)) + define ARM_TRUSTED_FIRMWARE_BUILD_CMDS $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ @@ -114,7 +154,9 @@ define ARM_TRUSTED_FIRMWARE_BUILD_CMDS endef define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS - cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/*.bin $(BINARIES_DIR)/ + $(foreach f,$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES)), \ + cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/$(f) $(BINARIES_DIR)/ + ) $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL) $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF) endef diff --git a/buildroot/boot/at91bootstrap3/Config.in b/buildroot/boot/at91bootstrap3/Config.in index f6c310af2..faab7635d 100644 --- a/buildroot/boot/at91bootstrap3/Config.in +++ b/buildroot/boot/at91bootstrap3/Config.in @@ -19,7 +19,7 @@ choice prompt "AT91 Bootstrap 3 version" config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION - bool "3.8.6" + bool "3.9.0" config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT bool "Custom Git repository" @@ -27,8 +27,15 @@ config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT This option allows Buildroot to get the AT91 Bootstrap 3 source code from a Git repository. +config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL + bool "Custom tarball" + endchoice +config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION + string "URL of custom AT91Bootstrap tarball" + depends on BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL + if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL @@ -44,9 +51,10 @@ endif config BR2_TARGET_AT91BOOTSTRAP3_VERSION string - default "v3.8.6" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + default "v3.9.0" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \ if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT + default "custom" if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR string "custom patch dir" diff --git a/buildroot/boot/at91bootstrap3/at91bootstrap3.hash b/buildroot/boot/at91bootstrap3/at91bootstrap3.hash index e904a46e5..9f6c95ab0 100644 --- a/buildroot/boot/at91bootstrap3/at91bootstrap3.hash +++ b/buildroot/boot/at91bootstrap3/at91bootstrap3.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 a2e9ec6f42ee3b5a805fe215257b63070b6c498d57c568c46fcb18fd1b38ea7e at91bootstrap3-v3.8.6.tar.gz +sha256 e23e6df23b79ca81e412cb73a1f48bd95df8d46c7d52a1d073c2ed9d4f3a1a71 at91bootstrap3-v3.9.0.tar.gz +sha256 732b2a55b5905031d8ae420136ffb5f8889214865784386bf754cffab8d2bc6e main.c diff --git a/buildroot/boot/at91bootstrap3/at91bootstrap3.mk b/buildroot/boot/at91bootstrap3/at91bootstrap3.mk index 685be5bbd..5cf865c68 100644 --- a/buildroot/boot/at91bootstrap3/at91bootstrap3.mk +++ b/buildroot/boot/at91bootstrap3/at91bootstrap3.mk @@ -6,7 +6,12 @@ AT91BOOTSTRAP3_VERSION = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_VERSION)) -ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT),y) +ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL),y) +AT91BOOTSTRAP3_TARBALL = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION)) +AT91BOOTSTRAP3_SITE = $(patsubst %/,%,$(dir $(AT91BOOTSTRAP3_TARBALL))) +AT91BOOTSTRAP3_SOURCE = $(notdir $(AT91BOOTSTRAP3_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(AT91BOOTSTRAP3_SOURCE) +else ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT),y) AT91BOOTSTRAP3_SITE = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL)) AT91BOOTSTRAP3_SITE_METHOD = git BR_NO_CHECK_HASH_FOR += $(AT91BOOTSTRAP3_SOURCE) @@ -15,7 +20,9 @@ AT91BOOTSTRAP3_SITE = $(call github,linux4sam,at91bootstrap,$(AT91BOOTSTRAP3_VER endif AT91BOOTSTRAP3_LICENSE = Atmel License +ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION),y) AT91BOOTSTRAP3_LICENSE_FILES = main.c +endif AT91BOOTSTRAP3_INSTALL_IMAGES = YES AT91BOOTSTRAP3_INSTALL_TARGET = NO @@ -78,6 +85,12 @@ $(error No custom at91bootstrap3 repository version specified. Check your BR2_TA endif endif +ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL),y) +ifeq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION)),) +$(error No custom AT91Bootstrap3 tarball specified. Check your BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION setting) +endif # qstrip BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION +endif # BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL + endif # BR_BUILDING $(eval $(kconfig-package)) diff --git a/buildroot/boot/barebox/Config.in b/buildroot/boot/barebox/Config.in index 6a8d25154..687bac182 100644 --- a/buildroot/boot/barebox/Config.in +++ b/buildroot/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2018.12.0" + bool "2020.01.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2018.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2020.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/buildroot/boot/barebox/barebox.hash b/buildroot/boot/barebox/barebox.hash index ec4e404b1..5ade20e18 100644 --- a/buildroot/boot/barebox/barebox.hash +++ b/buildroot/boot/barebox/barebox.hash @@ -1,5 +1,8 @@ -# From https://www.barebox.org/download/barebox-2018.12.0.tar.bz2.md5 -md5 f84d7d3562055c80c3eedce0b14d4a0d barebox-2018.12.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2020.01.0.tar.bz2.md5 +md5 05038e0b61b68ce40e038295b809c548 barebox-2020.01.0.tar.bz2 # Locally calculated -sha256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 barebox-2018.12.0.tar.bz2 +sha256 8968e6b0d72d79eba636917b067b925e3bbb54d38c6c2acfc4e1e49909b42f33 barebox-2020.01.0.tar.bz2 + +# License files, locally computed +sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING diff --git a/buildroot/boot/barebox/barebox.mk b/buildroot/boot/barebox/barebox.mk index 52178d89c..1efe5665d 100644 --- a/buildroot/boot/barebox/barebox.mk +++ b/buildroot/boot/barebox/barebox.mk @@ -25,15 +25,23 @@ $(1)_SOURCE = $$(notdir $$($(1)_TARBALL)) else ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_GIT),y) $(1)_SITE = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL)) $(1)_SITE_METHOD = git +# Override the default value of _SOURCE to 'barebox-*' so that it is not +# downloaded a second time for barebox-aux; also alows avoiding the hash +# check: +$(1)_SOURCE = barebox-$$($(1)_VERSION).tar.gz else # Handle stable official Barebox versions $(1)_SOURCE = barebox-$$($(1)_VERSION).tar.bz2 $(1)_SITE = https://www.barebox.org/download endif +$(1)_DL_SUBDIR = barebox + $(1)_DEPENDENCIES = host-lzop $(1)_LICENSE = GPL-2.0 with exceptions +ifeq ($(BR2_TARGET_BAREBOX_LATEST_VERSION),y) $(1)_LICENSE_FILES = COPYING +endif $(1)_CUSTOM_EMBEDDED_ENV_PATH = $$(call qstrip,$$(BR2_TARGET_$(1)_CUSTOM_EMBEDDED_ENV_PATH)) diff --git a/buildroot/boot/binaries-marvell/Config.in b/buildroot/boot/binaries-marvell/Config.in index 63052070b..80fbecb27 100644 --- a/buildroot/boot/binaries-marvell/Config.in +++ b/buildroot/boot/binaries-marvell/Config.in @@ -7,26 +7,6 @@ config BR2_TARGET_BINARIES_MARVELL reset and system control. ATF Boot Loader stage 2 (BL2) loads optional SCP_BL2 image into a platform-specific region of secure memory. This package downloads and installs such - firmwares, which are needed to build ATF. + firmware, which is needed to build ATF. https://github.com/MarvellEmbeddedProcessors/binaries-marvell/ - -if BR2_TARGET_BINARIES_MARVELL - -choice - prompt "Marvell Armada platform" - -config BR2_TARGET_BINARIES_MARVELL_7040 - bool "7040" - -config BR2_TARGET_BINARIES_MARVELL_8040 - bool "8040" - -endchoice - -config BR2_TARGET_BINARIES_MARVELL_IMAGE - string - default "mrvl_scp_bl2_mss_ap_cp1_a8040.img" if BR2_TARGET_BINARIES_MARVELL_8040 - default "mrvl_scp_bl2_mss_ap_cp1_a7040.img" if BR2_TARGET_BINARIES_MARVELL_7040 - -endif diff --git a/buildroot/boot/binaries-marvell/binaries-marvell.hash b/buildroot/boot/binaries-marvell/binaries-marvell.hash index 0d214502a..a7d5928a5 100644 --- a/buildroot/boot/binaries-marvell/binaries-marvell.hash +++ b/buildroot/boot/binaries-marvell/binaries-marvell.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 45c348d7a62fd147e7c6a59211a77876ce5dd26de690bd45ab79c8ff891acedf binaries-marvell-14481806e699dcc6f7025dbe3e46cf26bb787791.tar.gz -sha256 509a36bb6faa106bbc9730c23038a361ee0c860e53a4cdf9e8605c0174fe45f7 README.md +sha256 d818c95bcd4d5c026238d6e554151184ed7fea15bce1f861f9068b97b4cd320a binaries-marvell-c5d3ef2b63ba66d8717ecbe679fd2e639cde88ee.tar.gz +sha256 e6d08ef60068ee72c68835001a24eb832dcba27cac0dde0f179dfb428be050ca README.md diff --git a/buildroot/boot/binaries-marvell/binaries-marvell.mk b/buildroot/boot/binaries-marvell/binaries-marvell.mk index 6c7014854..1a27fa987 100644 --- a/buildroot/boot/binaries-marvell/binaries-marvell.mk +++ b/buildroot/boot/binaries-marvell/binaries-marvell.mk @@ -4,18 +4,17 @@ # ################################################################################ -# This is version binaries-marvell-armada-18.06 -BINARIES_MARVELL_VERSION = 14481806e699dcc6f7025dbe3e46cf26bb787791 +# This is version binaries-marvell-armada-18.12 +BINARIES_MARVELL_VERSION = c5d3ef2b63ba66d8717ecbe679fd2e639cde88ee BINARIES_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,binaries-marvell,$(BINARIES_MARVELL_VERSION)) BINARIES_MARVELL_LICENSE = GPL-2.0 with freertos-exception-2.0 BINARIES_MARVELL_LICENSE_FILES = README.md -BINARIES_MARVELL_IMAGE = $(call qstrip,$(BR2_TARGET_BINARIES_MARVELL_IMAGE)) BINARIES_MARVELL_INSTALL_IMAGES = YES define BINARIES_MARVELL_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/$(BINARIES_MARVELL_IMAGE) $(BINARIES_DIR)/scp-fw.bin + $(INSTALL) -D -m 0644 $(@D)/mrvl_scp_bl2.img $(BINARIES_DIR)/scp-fw.bin endef $(eval $(generic-package)) diff --git a/buildroot/boot/boot-wrapper-aarch64/Config.in b/buildroot/boot/boot-wrapper-aarch64/Config.in index efb70dcdf..cf7389282 100644 --- a/buildroot/boot/boot-wrapper-aarch64/Config.in +++ b/buildroot/boot/boot-wrapper-aarch64/Config.in @@ -38,4 +38,9 @@ config BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI Boot secondary SMP cores using PSCI firmware calls. If disabled, the spin-table method is used instead. +config BR2_TARGET_BOOT_WRAPPER_AARCH64_GICV3 + bool "Enable GICv3 instead of GICv2" + help + Boot using GICv3 instead of GICv2. + endif diff --git a/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index cd6e1b7b7..117e11398 100644 --- a/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694 +BOOT_WRAPPER_AARCH64_VERSION = fd74c8cbd0e17483d2299208cad9742bee605ca7 BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt @@ -15,19 +15,11 @@ BOOT_WRAPPER_AARCH64_INSTALL_IMAGES = YES # Makefile. BOOT_WRAPPER_AARCH64_AUTORECONF = YES -BOOT_WRAPPER_AARCH64_DTB = /arch/arm64/boot/dts/$(basename $(call qstrip,$(BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS))).dtb - -# Fixup the path to the DTB in configure.ac. In the future, this -# should hopefully be made more configurable by the -# boot-wrapper-aarch64 developers. -define BOOT_WRAPPER_AARCH64_FIX_DTB_NAME - $(SED) 's%^KERN_DTB=.*%KERN_DTB=$(BOOT_WRAPPER_AARCH64_DTB)%' $(@D)/configure.ac -endef - -BOOT_WRAPPER_AARCH64_PRE_PATCH_HOOKS += BOOT_WRAPPER_AARCH64_FIX_DTB_NAME +BOOT_WRAPPER_AARCH64_DTB = $(LINUX_DIR)/arch/arm64/boot/dts/$(basename $(call qstrip,$(BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS))).dtb BOOT_WRAPPER_AARCH64_CONF_OPTS = \ --with-kernel-dir=$(LINUX_DIR) \ + --with-dtb=$(BOOT_WRAPPER_AARCH64_DTB) \ --with-cmdline=$(BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS) ifeq ($(BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI),y) @@ -36,6 +28,10 @@ else BOOT_WRAPPER_AARCH64_CONF_OPTS += --disable-psci endif +ifeq ($(BR2_TARGET_BOOT_WRAPPER_AARCH64_GICV3),y) +BOOT_WRAPPER_AARCH64_CONF_OPTS += --enable-gicv3 +endif + # We need to convince the configure script that the Linux kernel tree # exists, as well as the DTB and the kernel Image. Even though those # are available on the build machine, the configure script uses diff --git a/buildroot/boot/grub2/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch b/buildroot/boot/grub2/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch deleted file mode 100644 index cd8b5e73c..000000000 --- a/buildroot/boot/grub2/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 842c390469e2c2e10b5aa36700324cd3bde25875 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Sat, 17 Feb 2018 06:47:28 -0800 -Subject: [PATCH] x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32 - -Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a: - -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a - -x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for -32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as -R_X86_64_PC32. - -Signed-off-by: H.J. Lu -Reviewed-by: Daniel Kiper -Signed-off-by: Romain Naour ---- - grub-core/efiemu/i386/loadcore64.c | 1 + - grub-core/kern/x86_64/dl.c | 1 + - util/grub-mkimagexx.c | 1 + - util/grub-module-verifier.c | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c -index e49d0b6..18facf4 100644 ---- a/grub-core/efiemu/i386/loadcore64.c -+++ b/grub-core/efiemu/i386/loadcore64.c -@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - err = grub_efiemu_write_value (addr, - *addr32 + rel->r_addend - + sym.off -diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c -index 4406906..3a73e6e 100644 ---- a/grub-core/kern/x86_64/dl.c -+++ b/grub-core/kern/x86_64/dl.c -@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - { - grub_int64_t value; - value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value - -diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c -index a2bb054..39d7efb 100644 ---- a/util/grub-mkimagexx.c -+++ b/util/grub-mkimagexx.c -@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, - break; - - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - { - grub_uint32_t *t32 = (grub_uint32_t *) target; - *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) -diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c -index 9179285..a79271f 100644 ---- a/util/grub-module-verifier.c -+++ b/util/grub-module-verifier.c -@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = { - -1 - }, (int[]){ - R_X86_64_PC32, -+ R_X86_64_PLT32, - -1 - } - }, --- -2.7.4 - diff --git a/buildroot/boot/grub2/grub2.hash b/buildroot/boot/grub2/grub2.hash index 7f0679fe3..338fe5972 100644 --- a/buildroot/boot/grub2/grub2.hash +++ b/buildroot/boot/grub2/grub2.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f grub-2.02.tar.xz +sha256 e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d grub-2.04.tar.xz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/boot/grub2/grub2.mk b/buildroot/boot/grub2/grub2.mk index 65371f017..a202525d7 100644 --- a/buildroot/boot/grub2/grub2.mk +++ b/buildroot/boot/grub2/grub2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRUB2_VERSION = 2.02 +GRUB2_VERSION = 2.04 GRUB2_SITE = http://ftp.gnu.org/gnu/grub GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz GRUB2_LICENSE = GPL-3.0+ diff --git a/buildroot/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch b/buildroot/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch new file mode 100644 index 000000000..b35cd499b --- /dev/null +++ b/buildroot/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch @@ -0,0 +1,31 @@ +From 40ab4167b5a45c772304a879c71b47d54de3b0e3 Mon Sep 17 00:00:00 2001 +From: Esben Haabendal +Date: Wed, 20 Mar 2019 14:19:40 +0100 +Subject: [PATCH] Allow building with newer glibc versions + +Newer glibc versions does not include sys/sysmacros.h from sys/types.h +anymore. Including it unconditionally should be safe. + +See https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html for why +this was done. + +Signed-off-by: Esben Haabendal +--- + src/setup/setup.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/setup/setup.c b/src/setup/setup.c +index 6a4275a2ae36..53429375a146 100644 +--- a/src/setup/setup.c ++++ b/src/setup/setup.c +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #include "efivars.h" + +-- +2.21.0 + diff --git a/buildroot/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch b/buildroot/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch new file mode 100644 index 000000000..7104a581e --- /dev/null +++ b/buildroot/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch @@ -0,0 +1,54 @@ +From fc05ced797b87286b8ec7303fe32bf200a072972 Mon Sep 17 00:00:00 2001 +From: Esben Haabendal +Date: Mon, 18 Mar 2019 11:14:31 +0100 +Subject: [PATCH] Fix linking for non-host compatible targets + +Without this, gummiboot build system will use host 'ld' when linking +target binary, which is obviously not a good idea. + +Signed-off-by: Esben Haabendal +--- + Makefile.am | 4 ++-- + configure.ac | 4 ++++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 6568a355ed74..9051dd44edd9 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -142,7 +142,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) + $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ + + $(gummiboot_solib): $(gummiboot_objects) +- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(gummiboot_objects) \ ++ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(gummiboot_objects) \ + -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ + nm -D -u $@ | grep ' U ' && exit 1 || : + .DELETE_ON_ERROR: $(gummboot_solib) +@@ -177,7 +177,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) + $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ + + $(stub_solib): $(stub_objects) +- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(stub_objects) \ ++ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(stub_objects) \ + -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ + nm -D -u $@ | grep ' U ' && exit 1 || : + .DELETE_ON_ERROR: $(gummboot_solib) +diff --git a/configure.ac b/configure.ac +index 27bbe1d73396..b948696c220b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -40,6 +40,10 @@ dnl Don't try to use things like -std=c99 for efi compilation + EFI_CC=$CC + AC_SUBST([EFI_CC]) + ++dnl Allow specifying linker compatible with the compiler ++EFI_LD=$LD ++AC_SUBST([EFI_LD]) ++ + AC_PROG_CC_C99 + AM_PROG_CC_C_O + AC_PROG_GCC_TRADITIONAL +-- +2.21.0 + diff --git a/buildroot/boot/gummiboot/gummiboot.mk b/buildroot/boot/gummiboot/gummiboot.mk index 85a5daaea..748e87030 100644 --- a/buildroot/boot/gummiboot/gummiboot.mk +++ b/buildroot/boot/gummiboot/gummiboot.mk @@ -4,9 +4,9 @@ # ################################################################################ -GUMMIBOOT_SITE = http://cgit.freedesktop.org/gummiboot +GUMMIBOOT_SITE = https://gitlab.freedesktop.org/archived-projects/gummiboot.git GUMMIBOOT_SITE_METHOD = git -GUMMIBOOT_VERSION = 43 +GUMMIBOOT_VERSION = 2bcd919c681c952eb867ef1bdb458f1bc49c2d55 GUMMIBOOT_LICENSE = LGPL-2.1+ GUMMIBOOT_LICENSE_FILES = LICENSE diff --git a/buildroot/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch b/buildroot/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch new file mode 100644 index 000000000..eada18b47 --- /dev/null +++ b/buildroot/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch @@ -0,0 +1,31 @@ +From 5867fcad6e88af3d843bfa831648d84a53732d57 Mon Sep 17 00:00:00 2001 +From: Heinrich Schuchardt +Date: Wed, 19 Dec 2018 17:17:13 +0100 +Subject: [PATCH] mv_ddr: mv_ddr4_training_leveling.c: uninitialized variable + +With GCC 8.2 uninitialized variables lead to a build error. + +Signed-off-by: Heinrich Schuchardt +Signed-off-by: Baruch Siach +--- +Upstream status: commit 5867fcad6e8 + + mv_ddr4_training_leveling.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mv_ddr4_training_leveling.c b/mv_ddr4_training_leveling.c +index 144e21a03c01..cb95389f5466 100644 +--- a/mv_ddr4_training_leveling.c ++++ b/mv_ddr4_training_leveling.c +@@ -368,7 +368,7 @@ static int mv_ddr4_dynamic_pb_wl_supp(u32 dev_num, enum mv_wl_supp_mode ecc_mode + u32 subphy_num = ddr3_tip_dev_attr_get(dev_num, MV_ATTR_OCTET_PER_INTERFACE); + u8 compare_result = 0; + u32 orig_phase; +- u32 rd_data, wr_data; ++ u32 rd_data, wr_data = 0; + u32 flag, step; + struct mv_ddr_topology_map *tm = mv_ddr_topology_map_get(); + u32 ecc_phy_access_id; +-- +2.20.1 + diff --git a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash index 90fab71d6..ec2fe6ed3 100644 --- a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash +++ b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 9aaea1f5e8bf3c9d7e735f569d130b5c2ec773c43e0cfabc9b8dee32adbf7e4e mv-ddr-marvell-99d772547314f84921268d57e53d8769197d3e21.tar.gz +sha256 39dcc8baccb82cbc746d8f82ce7f673e1b1236e8aee0d09e7ab12c27eeb6ecda mv-ddr-marvell-618dadd1491eb2f7b2fd74313c04f7accddae475.tar.gz +sha256 69208236fc322026920b92d1d839ebdc521ca65379bfdb3368a24945e794fc78 ddr3_init.c diff --git a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk index 8d508215f..a4e0c0467 100644 --- a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk +++ b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk @@ -4,8 +4,8 @@ # ################################################################################ -# This is the commit for mv_ddr-armada-18.09.2 -MV_DDR_MARVELL_VERSION = 99d772547314f84921268d57e53d8769197d3e21 +# This is the commit for mv_ddr-armada-18.12.0 +MV_DDR_MARVELL_VERSION = 618dadd1491eb2f7b2fd74313c04f7accddae475 MV_DDR_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,mv-ddr-marvell,$(MV_DDR_MARVELL_VERSION)) MV_DDR_MARVELL_LICENSE = GPL-2.0+ or LGPL-2.1 with freertos-exception-2.0, BSD-3-Clause, Marvell Commercial MV_DDR_MARVELL_LICENSE_FILES = ddr3_init.c diff --git a/buildroot/boot/opensbi/0001-Makefile-Don-t-specify-mabi-or-march.patch b/buildroot/boot/opensbi/0001-Makefile-Don-t-specify-mabi-or-march.patch new file mode 100644 index 000000000..5f554a6c2 --- /dev/null +++ b/buildroot/boot/opensbi/0001-Makefile-Don-t-specify-mabi-or-march.patch @@ -0,0 +1,37 @@ +From f5871e1f3650d6c8a032928cb5d8ca00c275c377 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Fri, 15 Feb 2019 14:57:41 -0800 +Subject: [PATCH] Makefile: Don't specify mabi or march + +To avoid + can't link double-float modules with soft-float modules +errors when building 32-bit openSBI don't specify mabi or march. + +Signed-off-by: Alistair Francis +--- + Makefile | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile b/Makefile +index ae68f55..10851fc 100644 +--- a/Makefile ++++ b/Makefile +@@ -145,7 +145,6 @@ GENFLAGS += $(firmware-genflags-y) + CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 + CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls + CFLAGS += -mno-save-restore -mstrict-align +-CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) + CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) + CFLAGS += $(GENFLAGS) + CFLAGS += $(platform-cflags-y) +@@ -158,7 +157,6 @@ CPPFLAGS += $(firmware-cppflags-y) + ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ + ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls + ASFLAGS += -mno-save-restore -mstrict-align +-ASFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) + ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) + ASFLAGS += $(GENFLAGS) + ASFLAGS += $(platform-asflags-y) +-- +2.20.1 + diff --git a/buildroot/boot/opensbi/Config.in b/buildroot/boot/opensbi/Config.in new file mode 100644 index 000000000..b9b0ace8a --- /dev/null +++ b/buildroot/boot/opensbi/Config.in @@ -0,0 +1,34 @@ +config BR2_TARGET_OPENSBI + bool "opensbi" + depends on BR2_riscv + help + OpenSBI aims to provide an open-source and extensible + implementation of the RISC-V SBI specification for a platform + specific firmware (M-mode) and a general purpose OS, + hypervisor or bootloader (S-mode or HS-mode). OpenSBI + implementation can be easily extended by RISC-V platform or + System-on-Chip vendors to fit a particular hadware + configuration. + + https://github.com/riscv/opensbi.git + +if BR2_TARGET_OPENSBI +config BR2_TARGET_OPENSBI_PLAT + string "OpenSBI Platform" + default "" + help + Specifies the OpenSBI platform to build. If no platform is + specified only the OpenSBI platform independent static + library libsbi.a is built. If a platform is specified then + the platform specific static library libplatsbi.a and firmware + examples are built. + +config BR2_TARGET_OPENSBI_LINUX_PAYLOAD + bool "Include Linux as OpenSBI Payload" + depends on BR2_TARGET_OPENSBI_PLAT != "" + depends on BR2_LINUX_KERNEL + depends on BR2_LINUX_KERNEL_IMAGE + help + Build OpenSBI with the Linux kernel as a Payload. + +endif diff --git a/buildroot/boot/opensbi/opensbi.hash b/buildroot/boot/opensbi/opensbi.hash new file mode 100644 index 000000000..47d5930ac --- /dev/null +++ b/buildroot/boot/opensbi/opensbi.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 bc82f1e63663cafb7976b324d8a01263510cfd816063dc89e0ccffb9763fb1dd opensbi-0.5.tar.gz +sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD diff --git a/buildroot/boot/opensbi/opensbi.mk b/buildroot/boot/opensbi/opensbi.mk new file mode 100644 index 000000000..2df746ab0 --- /dev/null +++ b/buildroot/boot/opensbi/opensbi.mk @@ -0,0 +1,55 @@ +################################################################################ +# +# opensbi +# +################################################################################ + +OPENSBI_VERSION = 0.5 +OPENSBI_SITE = $(call github,riscv,opensbi,v$(OPENSBI_VERSION)) +OPENSBI_LICENSE = BSD-2-Clause +OPENSBI_LICENSE_FILES = COPYING.BSD +OPENSBI_INSTALL_TARGET = NO +OPENSBI_INSTALL_STAGING = YES + +OPENSBI_MAKE_ENV = \ + CROSS_COMPILE=$(TARGET_CROSS) + +OPENSBI_PLAT = $(call qstrip,$(BR2_TARGET_OPENSBI_PLAT)) +ifneq ($(OPENSBI_PLAT),) +OPENSBI_MAKE_ENV += PLATFORM=$(OPENSBI_PLAT) +endif + +ifeq ($(BR2_TARGET_OPENSBI_LINUX_PAYLOAD),y) +OPENSBI_DEPENDENCIES += linux +OPENSBI_MAKE_ENV += FW_PAYLOAD_PATH="$(BINARIES_DIR)/Image" +endif + +define OPENSBI_BUILD_CMDS + $(TARGET_MAKE_ENV) $(OPENSBI_MAKE_ENV) $(MAKE) -C $(@D) +endef + +ifneq ($(OPENSBI_PLAT),) +OPENSBI_INSTALL_IMAGES = YES +OPENSBI_FW_IMAGES += jump dynamic +ifeq ($(BR2_TARGET_OPENSBI_LINUX_PAYLOAD),y) +OPENSBI_FW_IMAGES += payload +endif +endif + +define OPENSBI_INSTALL_IMAGES_CMDS + $(foreach f,$(OPENSBI_FW_IMAGES),\ + $(INSTALL) -m 0644 -D $(@D)/build/platform/$(OPENSBI_PLAT)/firmware/fw_$(f).bin \ + $(BINARIES_DIR)/fw_$(f).bin + $(INSTALL) -m 0644 -D $(@D)/build/platform/$(OPENSBI_PLAT)/firmware/fw_$(f).elf \ + $(BINARIES_DIR)/fw_$(f).elf + ) +endef + +# libsbi.a is not a library meant to be linked in user-space code, but +# with bare metal code, which is why we don't install it in +# $(STAGING_DIR)/usr/lib +define OPENSBI_INSTALL_STAGING_CMDS + $(INSTALL) -m 0644 -D $(@D)/build/lib/libsbi.a $(STAGING_DIR)/usr/share/opensbi/libsbi.a +endef + +$(eval $(generic-package)) diff --git a/buildroot/boot/optee-os/Config.in b/buildroot/boot/optee-os/Config.in new file mode 100644 index 000000000..669bbda92 --- /dev/null +++ b/buildroot/boot/optee-os/Config.in @@ -0,0 +1,109 @@ +config BR2_TARGET_OPTEE_OS + bool "optee_os" + depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A + help + OP-TEE OS provides the secure world boot image and the trust + application development kit of the OP-TEE project. OP-TEE OS + also provides generic trusted application one can embedded + into its system. + + http://github.com/OP-TEE/optee_os + +if BR2_TARGET_OPTEE_OS + +choice + prompt "OP-TEE OS version" + default BR2_TARGET_OPTEE_OS_LATEST + help + Select the version of OP-TEE OS you want to use + +config BR2_TARGET_OPTEE_OS_LATEST + bool "3.7.0" + help + Use the latest release tag from the OP-TEE OS official Git + repository. + +config BR2_TARGET_OPTEE_OS_CUSTOM_GIT + bool "Custom Git repository" + help + Use a custom version fetched from a Git repository. + +endchoice + +if BR2_TARGET_OPTEE_OS_CUSTOM_GIT + +config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL + string "URL of custom repository" + depends on BR2_TARGET_OPTEE_OS_CUSTOM_GIT + help + Specific location of the reference source tree Git + repository. + +config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION + string "Custom repository version" + depends on BR2_TARGET_OPTEE_OS_CUSTOM_GIT + help + Revision to use in the typical format used by Git, i.e a + SHA1 or a tag. + +endif + +config BR2_TARGET_OPTEE_OS_VERSION + string + default "3.7.0" if BR2_TARGET_OPTEE_OS_LATEST + default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ + if BR2_TARGET_OPTEE_OS_CUSTOM_GIT + +config BR2_TARGET_OPTEE_OS_CORE + bool "Build core" + default y + help + This option will build and install the OP-TEE core + boot images. + +config BR2_TARGET_OPTEE_OS_SDK + bool "Build TA devkit" + default y + help + This option will build and install the OP-TEE development + kit for building OP-TEE trusted application images. It is + installed in the staging directory /lib/optee. + +config BR2_TARGET_OPTEE_OS_SERVICES + bool "Build service TAs and libs" + default y + select BR2_TARGET_OPTEE_OS_CORE + help + This option installs the service trusted applications and + trusted shared libraries built from OP-TEE OS source tree. + These are installed in target /lib/optee_armtz directory + as other trusted applications. At runtime OP-TEE OS can + load these from this non-secure filesystem/directory into + the secure world for execution. + +config BR2_TARGET_OPTEE_OS_PLATFORM + string "Target platform (mandatory)" + help + Value for the mandated PLATFORM build directive provided to + OP-TEE OS. + +config BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR + string "Target platform flavor (optional)" + help + Value for the optional PLATFORM_FLAVOR build directive + provided to OP-TEE OS. + +config BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES + string "Additional build variables" + help + Additional parameters for the OP-TEE OS build + E.g. 'CFG_TEE_CORE_LOG_LEVEL=3 CFG_UNWIND=y' + +config BR2_TARGET_OPTEE_OS_CORE_IMAGES + string "Binary boot images" + default "tee.bin tee-*_v2.bin" + help + Names of generated image files that are installed in the + output images/ directory. + +endif # BR2_TARGET_OPTEE_OS diff --git a/buildroot/boot/optee-os/optee-os.hash b/buildroot/boot/optee-os/optee-os.hash new file mode 100644 index 000000000..dc0fbecce --- /dev/null +++ b/buildroot/boot/optee-os/optee-os.hash @@ -0,0 +1,4 @@ +# From https://github.com/OP-TEE/optee_os/archive/3.7.0.tar.gz +sha256 ff378f22b8e7dacf933a2d34eb5c1bdcafe74bdda692e4dbc2969301f6a81d43 optee-os-3.7.0.tar.gz +# Locally computed +sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE diff --git a/buildroot/boot/optee-os/optee-os.mk b/buildroot/boot/optee-os/optee-os.mk new file mode 100644 index 000000000..acdb25b47 --- /dev/null +++ b/buildroot/boot/optee-os/optee-os.mk @@ -0,0 +1,120 @@ +################################################################################ +# +# optee-os +# +################################################################################ + +OPTEE_OS_VERSION = $(call qstrip,$(BR2_TARGET_OPTEE_OS_VERSION)) +OPTEE_OS_LICENSE = BSD-2-Clause +ifeq ($(BR2_TARGET_OPTEE_OS_LATEST),y) +OPTEE_OS_LICENSE_FILES = LICENSE +endif + +OPTEE_OS_INSTALL_STAGING = YES +OPTEE_OS_INSTALL_IMAGES = YES + +ifeq ($(BR2_TARGET_OPTEE_OS_CUSTOM_GIT),y) +OPTEE_OS_SITE = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL)) +OPTEE_OS_SITE_METHOD = git +BR_NO_CHECK_HASH_FOR += $(OPTEE_OS_SOURCE) +else +OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) +endif + +OPTEE_OS_DEPENDENCIES = host-openssl host-python-pycrypto host-python-pyelftools + +# On 64bit targets, OP-TEE OS can be built in 32bit mode, or +# can be built in 64bit mode and support 32bit and 64bit +# trusted applications. Since buildroot currently references +# a single cross compiler, build exclusively in 32bit +# or 64bit mode. +OPTEE_OS_MAKE_OPTS = \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + CROSS_COMPILE_core="$(TARGET_CROSS)" \ + CROSS_COMPILE_ta_arm64="$(TARGET_CROSS)" \ + CROSS_COMPILE_ta_arm32="$(TARGET_CROSS)" + +ifeq ($(BR2_aarch64),y) +OPTEE_OS_MAKE_OPTS += \ + CFG_ARM64_core=y \ + CFG_USER_TA_TARGETS=ta_arm64 +else +OPTEE_OS_MAKE_OPTS += \ + CFG_ARM32_core=y +endif + +# Get mandatory PLAFORM and optional PLATFORM_FLAVOR and additional +# variables +OPTEE_OS_MAKE_OPTS += PLATFORM=$(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM)) +ifneq ($(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR)),) +OPTEE_OS_MAKE_OPTS += PLATFORM_FLAVOR=$(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR)) +endif +OPTEE_OS_MAKE_OPTS += $(call qstrip,$(BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES)) + +# Requests OP-TEE OS to build from subdirectory out/ of its sourcetree +# root path otherwise the output directory path depends on the target +# platform name. +OPTEE_OS_BUILDDIR_OUT = out +ifeq ($(BR2_aarch64),y) +OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_arm64 +OPTEE_OS_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm64 +endif +ifeq ($(BR2_arm),y) +OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_arm32 +OPTEE_OS_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm32 +endif + +OPTEE_OS_IMAGE_FILES = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CORE_IMAGES)) + +ifeq ($(BR2_TARGET_OPTEE_OS_CORE),y) +define OPTEE_OS_BUILD_CORE + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) O=$(OPTEE_OS_BUILDDIR_OUT) \ + $(TARGET_CONFIGURE_OPTS) $(OPTEE_OS_MAKE_OPTS) all +endef +define OPTEE_OS_INSTALL_IMAGES_CORE + mkdir -p $(BINARIES_DIR) + $(foreach f,$(OPTEE_OS_IMAGE_FILES), \ + cp -dpf $(wildcard $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/core/$(f)) $(BINARIES_DIR)/ + ) +endef +endif # BR2_TARGET_OPTEE_OS_CORE + +ifeq ($(BR2_TARGET_OPTEE_OS_SERVICES),y) +define OPTEE_OS_INSTALL_TARGET_CMDS + $(if $(wildcard $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta), + $(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \ + $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta) + $(if $(wildcard $(@D)/$(OPTEE_OS_LOCAL_SDK)/lib/*.ta), + $(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \ + $(@D)/$(OPTEE_OS_LOCAL_SDK)/lib/*.ta) +endef +endif # BR2_TARGET_OPTEE_OS_SERVICES + +ifeq ($(BR2_TARGET_OPTEE_OS_SDK),y) +define OPTEE_OS_BUILD_SDK + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) O=$(OPTEE_OS_BUILDDIR_OUT) \ + $(TARGET_CONFIGURE_OPTS) $(OPTEE_OS_MAKE_OPTS) ta_dev_kit +endef +define OPTEE_OS_INSTALL_STAGING_CMDS + mkdir -p $(OPTEE_OS_SDK) + cp -ardpf $(@D)/$(OPTEE_OS_LOCAL_SDK)/* $(OPTEE_OS_SDK) +endef +endif # BR2_TARGET_OPTEE_OS_SDK + +define OPTEE_OS_BUILD_CMDS + $(OPTEE_OS_BUILD_CORE) + $(OPTEE_OS_BUILD_SDK) +endef + +define OPTEE_OS_INSTALL_IMAGES_CMDS + $(OPTEE_OS_INSTALL_IMAGES_CORE) + $(OPTEE_OS_INSTALL_IMAGES_SERVICES) +endef + +ifeq ($(BR2_TARGET_OPTEE_OS)$(BR_BUILDING),yy) +ifeq ($(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM)),) +$(error No OP-TEE OS platform set. Check your BR2_TARGET_OPTEE_OS_PLATFORM setting) +endif +endif # BR2_TARGET_OPTEE_OS && BR2_BUILDING + +$(eval $(generic-package)) diff --git a/buildroot/boot/riscv-pk/Config.in b/buildroot/boot/riscv-pk/Config.in deleted file mode 100644 index b4fe36590..000000000 --- a/buildroot/boot/riscv-pk/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -comment "riscv-pk needs a Linux kernel to be built" - depends on BR2_riscv - depends on !BR2_LINUX_KERNEL - -config BR2_TARGET_RISCV_PK - bool "riscv-pk" - depends on BR2_riscv - depends on BR2_LINUX_KERNEL - help - The RISC-V Proxy Kernel (pk) package contains the Berkeley - Boot Loader (BBL) which has been designed to boot a Linux - kernel on a RISC-V processor. - - https://github.com/riscv/riscv-pk.git diff --git a/buildroot/boot/riscv-pk/riscv-pk.mk b/buildroot/boot/riscv-pk/riscv-pk.mk deleted file mode 100644 index 0ab5879ee..000000000 --- a/buildroot/boot/riscv-pk/riscv-pk.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# riscv-pk -# -################################################################################ - -RISCV_PK_VERSION = 706cc77c369fd3e4734b5a6aa813d421347f1814 -RISCV_PK_SITE = git://github.com/riscv/riscv-pk.git -RISCV_PK_LICENSE = BSD-3-Clause -RISCV_PK_LICENSE_FILES = LICENSE -RISCV_PK_DEPENDENCIES = linux -RISCV_PK_SUBDIR = build -RISCV_PK_INSTALL_IMAGES = YES - -define RISCV_PK_CONFIGURE_CMDS - mkdir -p $(@D)/build - (cd $(@D)/build; \ - $(TARGET_CONFIGURE_OPTS) ../configure \ - --host=$(GNU_TARGET_NAME) \ - --with-payload=$(BINARIES_DIR)/vmlinux \ - ) -endef - -define RISCV_PK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build bbl -endef - -define RISCV_PK_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0755 $(@D)/build/bbl $(BINARIES_DIR)/bbl -endef - -$(eval $(generic-package)) diff --git a/buildroot/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch b/buildroot/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch new file mode 100644 index 000000000..2fd61ecbc --- /dev/null +++ b/buildroot/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch @@ -0,0 +1,60 @@ +From 7d68fa68cd9f2987bd85339f3391913a8b0e58c7 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 24 Mar 2020 10:21:27 +0100 +Subject: [PATCH] efi/main.c: include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Building syslinux against gnu-efi 3.0.10 currently fails with: + +syslinux/efi/main.c:33:8: error: unknown type name ‘jmp_buf’ + 33 | static jmp_buf load_error_buf; + | ^~~~~~~ +syslinux/efi/main.c: In function ‘local_boot’: +syslinux/efi/main.c:189:5: warning: implicit declaration of function ‘longjmp’ [-Wimplicit-function-declaration] + 189 | longjmp(&load_error_buf, 1); + | ^~~~~~~ +syslinux/efi/main.c: In function ‘build_gdt’: +syslinux/efi/main.c:907:75: warning: taking address of packed member of ‘struct dt_desc’ may result in an unaligned pointer value [-Waddress-of-packed-member] + 907 | status = emalloc(gdt.limit, __SIZEOF_POINTER__ , (EFI_PHYSICAL_ADDRESS *)&gdt.base); + | ^~~~~~~~~ +syslinux/efi/main.c: In function ‘efi_main’: +syslinux/efi/main.c:1390:7: warning: implicit declaration of function ‘setjmp’ [-Wimplicit-function-declaration] + 1390 | if (!setjmp(&load_error_buf)) + | ^~~~~~ +make[3]: *** [syslinux/mk/efi.mk:63: main.o] Error 1 + +This is due to gnu-efi commit 486ba3c3bdd147b7d98159b9e650be60bce0f027 +("Do not include efisetjmp.h on efi.h"), in which they state: + + Do not include efisetjmp.h on efi.h + + People than really want to use efisetjmp implementation can include + the header on their own. + + Signed-off-by: leo + +So we act as specified, and include from efi/main.c. + +Signed-off-by: Thomas Petazzoni +Upstream: https://www.syslinux.org/archives/2020-March/026621.html +--- + efi/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/efi/main.c b/efi/main.c +index 6a748412..e924cfb1 100644 +--- a/efi/main.c ++++ b/efi/main.c +@@ -12,6 +12,7 @@ + #include + + #include "efi.h" ++#include + #include "fio.h" + #include "version.h" + #include "efi_pxe.h" +-- +2.25.1 + diff --git a/buildroot/boot/syslinux/syslinux.hash b/buildroot/boot/syslinux/syslinux.hash index 5303f4df0..9bec3a20e 100644 --- a/buildroot/boot/syslinux/syslinux.hash +++ b/buildroot/boot/syslinux/syslinux.hash @@ -1,2 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/boot/syslinux/sha256sums.asc -sha256 26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e syslinux-6.03.tar.xz +sha256 26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e syslinux-6.03.tar.xz +# Locally computed +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/buildroot/boot/ts4800-mbrboot/Config.in b/buildroot/boot/ts4800-mbrboot/Config.in deleted file mode 100644 index 7ed0b2138..000000000 --- a/buildroot/boot/ts4800-mbrboot/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_TARGET_TS4800_MBRBOOT - bool "ts4800-mbrboot" - depends on BR2_ARM_CPU_ARMV7A - help - First level bootloader for TS4800 board - - https://github.com/embeddedarm/ts4800-mbrboot diff --git a/buildroot/boot/ts4800-mbrboot/ts4800-mbrboot.hash b/buildroot/boot/ts4800-mbrboot/ts4800-mbrboot.hash deleted file mode 100644 index 04e707281..000000000 --- a/buildroot/boot/ts4800-mbrboot/ts4800-mbrboot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 617c70dcf50b7ad35ed3f40666ff2a9a654a5440b522ad73662abdf9f843cee9 ts4800-mbrboot-cf8f7072ed5a4a4e48fcb9841b2e31e519ec5dca.tar.gz diff --git a/buildroot/boot/ts4800-mbrboot/ts4800-mbrboot.mk b/buildroot/boot/ts4800-mbrboot/ts4800-mbrboot.mk deleted file mode 100644 index 3dde6c6ab..000000000 --- a/buildroot/boot/ts4800-mbrboot/ts4800-mbrboot.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# ts4800-mbrboot -# -################################################################################ - -TS4800_MBRBOOT_VERSION = cf8f7072ed5a4a4e48fcb9841b2e31e519ec5dca -TS4800_MBRBOOT_SITE = $(call github,embeddedarm,ts4800-mbrboot,$(TS4800_MBRBOOT_VERSION)) -TS4800_MBRBOOT_LICENSE = BSD-2-Clause -TS4800_MBRBOOT_LICENSE_FILES = LICENSE -TS4800_MBRBOOT_INSTALL_IMAGES = YES - -define TS4800_MBRBOOT_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define TS4800_MBRBOOT_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/mbrboot.bin $(BINARIES_DIR)/mbrboot.bin -endef - -$(eval $(generic-package)) diff --git a/buildroot/boot/uboot/Config.in b/buildroot/boot/uboot/Config.in index bd1b248e9..ffc441d67 100644 --- a/buildroot/boot/uboot/Config.in +++ b/buildroot/boot/uboot/Config.in @@ -3,6 +3,8 @@ config BR2_TARGET_UBOOT help Build "Das U-Boot" Boot Monitor + https://www.denx.de/wiki/U-Boot + if BR2_TARGET_UBOOT choice prompt "Build system" @@ -39,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2018.09" + bool "2020.01" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -87,7 +89,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2018.09" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2020.01" 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 @@ -151,6 +153,14 @@ config BR2_TARGET_UBOOT_NEEDS_PYLIBFDT Select this option if your U-Boot board configuration requires the Python libfdt library to be available. +config BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS + bool "U-Boot needs pyelftools" + help + Select this option if your U-Boot board configuration + requires the Python pyelftools library to be available. + This is used by some rockchip SOCs for elf parsing. + For example: rk3399 soc boards. + config BR2_TARGET_UBOOT_NEEDS_OPENSSL bool "U-Boot needs OpenSSL" help @@ -217,6 +227,9 @@ config BR2_TARGET_UBOOT_FORMAT_DTB_IMX config BR2_TARGET_UBOOT_FORMAT_IMG bool "u-boot.img" +config BR2_TARGET_UBOOT_FORMAT_ITB + bool "u-boot.itb" + config BR2_TARGET_UBOOT_FORMAT_IMX bool "u-boot.imx" @@ -241,7 +254,7 @@ config BR2_TARGET_UBOOT_FORMAT_SD This is Freescale i.MX28 SB format, with a header for booting from an SD card. - U-boot includes an mxsboot tool to generate this format, + U-Boot includes an mxsboot tool to generate this format, starting from 2011.12. See doc/README.mxs (or doc/README.mx28_common before 2013.07) @@ -253,7 +266,7 @@ config BR2_TARGET_UBOOT_FORMAT_NAND This is Freescale i.MX28 BootStream format (.sb), with a header for booting from a NAND flash. - U-boot includes an mxsboot tool to generate this format, + U-Boot includes an mxsboot tool to generate this format, starting from 2011.12. There are two possibilities when preparing an image writable @@ -490,6 +503,8 @@ config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE Multiple source files are concatenated in the order listed. + Leave empty to generate image from compiled-in env. + config BR2_TARGET_UBOOT_ENVIMAGE_SIZE string "Size of environment" help @@ -542,4 +557,10 @@ config BR2_TARGET_UBOOT_CUSTOM_DTS_PATH endif +config BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS + string "Custom make options" + help + List of custom make options passed at build time. Can be + used for example to pass a DEVICE_TREE= value. + endif # BR2_TARGET_UBOOT diff --git a/buildroot/boot/uboot/uboot.hash b/buildroot/boot/uboot/uboot.hash index ea07fb584..6c17ef02b 100644 --- a/buildroot/boot/uboot/uboot.hash +++ b/buildroot/boot/uboot/uboot.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268 u-boot-2018.09.tar.bz2 +sha256 aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1 u-boot-2020.01.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/buildroot/boot/uboot/uboot.mk b/buildroot/boot/uboot/uboot.mk index 3c070b41b..2bfa50779 100644 --- a/buildroot/boot/uboot/uboot.mk +++ b/buildroot/boot/uboot/uboot.mk @@ -8,10 +8,15 @@ UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION)) UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME)) UBOOT_LICENSE = GPL-2.0+ +ifeq ($(BR2_TARGET_UBOOT_LATEST_VERSION),y) UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt +endif UBOOT_INSTALL_IMAGES = YES +# u-boot 2020.01+ needs make 4.0+ +UBOOT_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) + ifeq ($(UBOOT_VERSION),custom) # Handle custom U-Boot tarballs as specified by the configuration UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION)) @@ -85,6 +90,11 @@ UBOOT_BINS += u-boot.img UBOOT_MAKE_TARGET += u-boot.img endif +ifeq ($(BR2_TARGET_UBOOT_FORMAT_ITB),y) +UBOOT_BINS += u-boot.itb +UBOOT_MAKE_TARGET += u-boot.itb +endif + ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y) UBOOT_BINS += u-boot.imx UBOOT_MAKE_TARGET += u-boot.imx @@ -133,7 +143,8 @@ UBOOT_MAKE_OPTS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH=$(UBOOT_ARCH) \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ - HOSTLDFLAGS="$(HOST_LDFLAGS)" + HOSTLDFLAGS="$(HOST_LDFLAGS)" \ + $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS)) ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31),y) UBOOT_DEPENDENCIES += arm-trusted-firmware @@ -152,6 +163,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) UBOOT_DEPENDENCIES += host-python host-swig endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) +UBOOT_DEPENDENCIES += host-python-pyelftools +endif + ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) UBOOT_DEPENDENCIES += host-openssl endif @@ -197,22 +212,42 @@ define UBOOT_APPLY_LOCAL_PATCHES endef UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_LOCAL_PATCHES -# This is equivalent to upstream commit -# http://git.denx.de/?p=u-boot.git;a=commitdiff;h=e0d20dc1521e74b82dbd69be53a048847798a90a. It -# fixes a build failure when libfdt-devel is installed system-wide. -# This only works when scripts/dtc/libfdt exists (E.G. versions containing -# http://git.denx.de/?p=u-boot.git;a=commitdiff;h=c0e032e0090d6541549b19cc47e06ccd1f302893) +# Fixup inclusion of libfdt headers, which can fail in older u-boot versions +# when libfdt-devel is installed system-wide. +# The core change is equivalent to upstream commit +# e0d20dc1521e74b82dbd69be53a048847798a90a (first in v2018.03). However, the fixup +# is complicated by the fact that the underlying u-boot code changed multiple +# times in history: +# - The directory scripts/dtc/libfdt only exists since upstream commit +# c0e032e0090d6541549b19cc47e06ccd1f302893 (first in v2017.11). For earlier +# versions, create a dummy scripts/dtc/libfdt directory with symlinks for the +# fdt-related files. This allows to use the same -I option for both +# cases. +# - The variable 'srctree' used to be called 'SRCTREE' before upstream commit +# 01286329b27b27eaeda045b469d41b1d9fce545a (first in v2014.04). +# - The original location for libfdt, 'lib/libfdt/', used to be simply +# 'libfdt' before upstream commit 0de71d507157c4bd4fddcd3a419140d2b986eed2 +# (first in v2010.06). Make the 'lib' part optional in the substitution to +# handle this. define UBOOT_FIXUP_LIBFDT_INCLUDE - if [ -d $(@D)/scripts/dtc/libfdt ]; then \ - $(SED) 's%-I$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%' $(@D)/tools/Makefile; \ + $(Q)if [ ! -d $(@D)/scripts/dtc/libfdt ]; then \ + mkdir -p $(@D)/scripts/dtc/libfdt; \ + cd $(@D)/scripts/dtc/libfdt; \ + ln -s ../../../include/fdt.h .; \ + ln -s ../../../include/libfdt*.h .; \ + ln -s ../../../lib/libfdt/libfdt_internal.h .; \ fi + $(Q)$(SED) \ + 's%-I\ *\$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%; \ + s%-I\ *\$$(SRCTREE)\(/lib\)\?/libfdt%-I$$(SRCTREE)/scripts/dtc/libfdt%' \ + $(@D)/tools/Makefile endef UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y) define UBOOT_CONFIGURE_CMDS $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ + $(BR2_MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ $(UBOOT_BOARD_NAME)_config endef else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y) @@ -249,7 +284,7 @@ define UBOOT_BUILD_CMDS cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/ ) $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ + $(BR2_MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \ $(UBOOT_MAKE_TARGET) $(if $(BR2_TARGET_UBOOT_FORMAT_SD), $(@D)/tools/mxsboot sd $(@D)/u-boot.sb $(@D)/u-boot.sd) @@ -267,8 +302,11 @@ define UBOOT_BUILD_OMAP_IFT endef ifneq ($(BR2_TARGET_UBOOT_ENVIMAGE),) +UBOOT_GENERATE_ENV_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) define UBOOT_GENERATE_ENV_IMAGE - cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) \ + $(if $(UBOOT_GENERATE_ENV_FILE), \ + cat $(UBOOT_GENERATE_ENV_FILE), \ + CROSS_COMPILE="$(TARGET_CROSS)" $(@D)/scripts/get_default_envs.sh $(@D)) \ >$(@D)/buildroot-env.txt $(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \ $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ @@ -381,11 +419,8 @@ endef ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y) ifeq ($(BR_BUILDING),y) -ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)),) -$(error Please define a source file for Uboot environment (BR2_TARGET_UBOOT_ENVIMAGE_SOURCE setting)) -endif ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SIZE)),) -$(error Please provide Uboot environment size (BR2_TARGET_UBOOT_ENVIMAGE_SIZE setting)) +$(error Please provide U-Boot environment size (BR2_TARGET_UBOOT_ENVIMAGE_SIZE setting)) endif endif UBOOT_DEPENDENCIES += host-uboot-tools @@ -394,7 +429,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_BOOT_SCRIPT),y) ifeq ($(BR_BUILDING),y) ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)),) -$(error Please define a source file for Uboot boot script (BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE setting)) +$(error Please define a source file for U-Boot boot script (BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE setting)) endif endif UBOOT_DEPENDENCIES += host-uboot-tools diff --git a/buildroot/configs/acmesystems_aria_g25_128mb_defconfig b/buildroot/configs/acmesystems_aria_g25_128mb_defconfig index 0ec210f33..4f8f4d540 100644 --- a/buildroot/configs/acmesystems_aria_g25_128mb_defconfig +++ b/buildroot/configs/acmesystems_aria_g25_128mb_defconfig @@ -1,22 +1,25 @@ # Architecture BR2_arm=y +BR2_arm926t=y # Kernel headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System configuration BR2_TARGET_GENERIC_ISSUE="Welcome to Aria-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/acmesystems/aria-g25/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/aria-g25/genimage.cfg" # Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariag25" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Root filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -27,7 +30,7 @@ BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.6" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-128m" # Tools to build sdcard.img diff --git a/buildroot/configs/acmesystems_aria_g25_256mb_defconfig b/buildroot/configs/acmesystems_aria_g25_256mb_defconfig index a480287ce..4569a7b7a 100644 --- a/buildroot/configs/acmesystems_aria_g25_256mb_defconfig +++ b/buildroot/configs/acmesystems_aria_g25_256mb_defconfig @@ -1,22 +1,25 @@ # Architecture BR2_arm=y +BR2_arm926t=y # Kernel headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System configuration BR2_TARGET_GENERIC_ISSUE="Welcome to Aria-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/acmesystems/aria-g25/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/aria-g25/genimage.cfg" # Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariag25" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Root filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -27,7 +30,7 @@ BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.6" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-256m" # Tools to build sdcard.img diff --git a/buildroot/configs/acmesystems_arietta_g25_128mb_defconfig b/buildroot/configs/acmesystems_arietta_g25_128mb_defconfig index a68ac57ff..0174f356d 100644 --- a/buildroot/configs/acmesystems_arietta_g25_128mb_defconfig +++ b/buildroot/configs/acmesystems_arietta_g25_128mb_defconfig @@ -1,22 +1,25 @@ # Architecture BR2_arm=y +BR2_arm926t=y # Kernel headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System configuration BR2_TARGET_GENERIC_ISSUE="Welcome to Arietta-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/acmesystems/arietta-g25/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/arietta-g25/genimage.cfg" # Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariettag25" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Root filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -27,7 +30,7 @@ BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.6" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="arietta-128m" # Tools to build sdcard.img diff --git a/buildroot/configs/acmesystems_arietta_g25_256mb_defconfig b/buildroot/configs/acmesystems_arietta_g25_256mb_defconfig index ce9ebacb8..14e4dd00b 100644 --- a/buildroot/configs/acmesystems_arietta_g25_256mb_defconfig +++ b/buildroot/configs/acmesystems_arietta_g25_256mb_defconfig @@ -1,22 +1,25 @@ # Architecture BR2_arm=y +BR2_arm926t=y # Kernel headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System configuration BR2_TARGET_GENERIC_ISSUE="Welcome to Arietta-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/acmesystems/arietta-g25/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/arietta-g25/genimage.cfg" # Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariettag25" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Root filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -27,7 +30,7 @@ BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.6" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="arietta-256m" # Tools to build sdcard.img diff --git a/buildroot/configs/amarula_vyasa_rk3288_defconfig b/buildroot/configs/amarula_vyasa_rk3288_defconfig index b1267f857..760ad3f9f 100644 --- a/buildroot/configs/amarula_vyasa_rk3288_defconfig +++ b/buildroot/configs/amarula_vyasa_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_KERNEL_HEADERS_4_14=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y @@ -21,8 +21,8 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,openedev,linux-openedev,d127129e85a020879f334154300ddd3f7ec21c1e)/linux-d127129e85a020879f334154300ddd3f7ec21c1e.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" diff --git a/buildroot/configs/andes_ae3xx_defconfig b/buildroot/configs/andes_ae3xx_defconfig new file mode 100644 index 000000000..52634caa5 --- /dev/null +++ b/buildroot/configs/andes_ae3xx_defconfig @@ -0,0 +1,10 @@ +BR2_nds32=y +BR2_GLOBAL_PATCH_DIR="board/andes/patches/" +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae3xx/ae3xx.fragment" +BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/buildroot/configs/arcturus_ucls1012a_defconfig b/buildroot/configs/arcturus_ucls1012a_defconfig index 7fb980479..fceaed0db 100644 --- a/buildroot/configs/arcturus_ucls1012a_defconfig +++ b/buildroot/configs/arcturus_ucls1012a_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v0.2.1811)/linux-v0.2.1811.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v0.2.1935)/linux-v0.2.1935.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -26,9 +26,8 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y # U-boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/ArcturusNetworks/uCLS1012A-uboot.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v0.2.1823" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v0.2.1935)/uboot-v0.2.1935.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools diff --git a/buildroot/configs/arcturus_ucp1020_defconfig b/buildroot/configs/arcturus_ucp1020_defconfig index cc1297ce1..8b90f4475 100644 --- a/buildroot/configs/arcturus_ucp1020_defconfig +++ b/buildroot/configs/arcturus_ucp1020_defconfig @@ -2,8 +2,8 @@ BR2_powerpc=y BR2_powerpc_8548=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.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y # System settings BR2_TARGET_GENERIC_HOSTNAME="UCP1020" @@ -13,11 +13,9 @@ BR2_SYSTEM_DHCP="eth0" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.1.27" -BR2_LINUX_KERNEL_PATCH="board/arcturus/ppc-ucp1020/patches/linux" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/arcturus/ppc-ucp1020/configs/linux-4.1.x.config" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCP1020-kernel,v20190618)/linux-v20190618.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="ucp1020" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ucp1020" @@ -26,6 +24,7 @@ BR2_TARGET_ROOTFS_JFFS2=y # U-boot BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="UCP1020" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.07" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCP1020-uboot,v20190618)/uboot-v20190618.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCP1020" diff --git a/buildroot/configs/armadeus_apf28_defconfig b/buildroot/configs/armadeus_apf28_defconfig index 51e05f59f..56351ebde 100644 --- a/buildroot/configs/armadeus_apf28_defconfig +++ b/buildroot/configs/armadeus_apf28_defconfig @@ -13,7 +13,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.64" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.172" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/buildroot/configs/armadeus_apf51_defconfig b/buildroot/configs/armadeus_apf51_defconfig index e83462671..26b6a447d 100644 --- a/buildroot/configs/armadeus_apf51_defconfig +++ b/buildroot/configs/armadeus_apf51_defconfig @@ -13,7 +13,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.186" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf51/linux-4.4.config" BR2_LINUX_KERNEL_UIMAGE=y diff --git a/buildroot/configs/asus_tinker_rk3288_defconfig b/buildroot/configs/asus_tinker_rk3288_defconfig index b14cb0a2c..e95a19a75 100644 --- a/buildroot/configs/asus_tinker_rk3288_defconfig +++ b/buildroot/configs/asus_tinker_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -22,7 +22,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" diff --git a/buildroot/configs/at91sam9x5ek_defconfig b/buildroot/configs/at91sam9x5ek_defconfig index 9dd8fbb36..d544e277a 100644 --- a/buildroot/configs/at91sam9x5ek_defconfig +++ b/buildroot/configs/at91sam9x5ek_defconfig @@ -1,13 +1,14 @@ BR2_arm=y BR2_arm926t=y # Linux headers same as kernel, a 4.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.1)/linux-linux4sam_6.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_UBIFS=y BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y @@ -15,13 +16,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_SAM_BA=y diff --git a/buildroot/configs/at91sam9x5ek_dev_defconfig b/buildroot/configs/at91sam9x5ek_dev_defconfig index 505be8d04..5f777fbc7 100644 --- a/buildroot/configs/at91sam9x5ek_dev_defconfig +++ b/buildroot/configs/at91sam9x5ek_dev_defconfig @@ -3,7 +3,7 @@ BR2_arm=y BR2_arm926t=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Needed for some packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Needed for gdb @@ -18,10 +18,11 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.1)/linux-linux4sam_6.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y @@ -46,7 +47,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y -BR2_PACKAGE_DEVMEM2=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -56,7 +56,7 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_BLUEZ_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y BR2_PACKAGE_ETHTOOL=y @@ -84,13 +84,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/at91sam9x5ek_mmc_defconfig b/buildroot/configs/at91sam9x5ek_mmc_defconfig index 8777606fe..633ca8e1c 100644 --- a/buildroot/configs/at91sam9x5ek_mmc_defconfig +++ b/buildroot/configs/at91sam9x5ek_mmc_defconfig @@ -3,7 +3,7 @@ BR2_arm=y BR2_arm926t=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Creation of the SD card image BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -12,10 +12,11 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.1)/linux-linux4sam_6.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -25,13 +26,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_ENVIMAGE=y diff --git a/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig b/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig index cd6591288..e8246c8d5 100644 --- a/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig @@ -3,7 +3,7 @@ BR2_arm=y BR2_arm926t=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Needed for some packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Needed for gdb @@ -21,10 +21,11 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.1)/linux-linux4sam_6.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y @@ -49,7 +50,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y -BR2_PACKAGE_DEVMEM2=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -59,7 +59,7 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_BLUEZ_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y BR2_PACKAGE_ETHTOOL=y @@ -86,13 +86,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_ENVIMAGE=y diff --git a/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index 1ae4b853d..6b5def3c6 100644 --- a/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a5=y 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_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -12,10 +12,11 @@ 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_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d27_som1_ek at91-sama5d27_som1_ek_pda4 at91-sama5d27_som1_ek_pda7 at91-sama5d27_som1_ek_pda7b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d27_som1_ek" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -38,9 +39,9 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y -BR2_PACKAGE_DEVMEM2=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y +BR2_PACKAGE_RNG_TOOLS=y BR2_PACKAGE_SETSERIAL=y BR2_PACKAGE_SPI_TOOLS=y BR2_PACKAGE_USBUTILS=y @@ -48,7 +49,7 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_BLUEZ_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y BR2_PACKAGE_ETHTOOL=y @@ -69,15 +70,13 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_som1_eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d27_som1_ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/atmel_sama5d2_xplained_mmc_defconfig b/buildroot/configs/atmel_sama5d2_xplained_mmc_defconfig index 57ced6940..2c73cc4c2 100644 --- a/buildroot/configs/atmel_sama5d2_xplained_mmc_defconfig +++ b/buildroot/configs/atmel_sama5d2_xplained_mmc_defconfig @@ -3,27 +3,26 @@ BR2_cortex_a5=y 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_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained at91-sama5d2_xplained_pda4 at91-sama5d2_xplained_pda7 at91-sama5d2_xplained_pda7b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index e140a44e4..6f641280c 100644 --- a/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -6,7 +6,7 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Needed for some packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Needed for gdb @@ -24,10 +24,11 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained at91-sama5d2_xplained_pda4 at91-sama5d2_xplained_pda7 at91-sama5d2_xplained_pda7b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y @@ -52,7 +53,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y -BR2_PACKAGE_DEVMEM2=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -62,7 +62,7 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_BLUEZ_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y BR2_PACKAGE_ETHTOOL=y @@ -87,15 +87,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/atmel_sama5d3_xplained_defconfig b/buildroot/configs/atmel_sama5d3_xplained_defconfig index b8b33c5e7..65304a2e4 100644 --- a/buildroot/configs/atmel_sama5d3_xplained_defconfig +++ b/buildroot/configs/atmel_sama5d3_xplained_defconfig @@ -2,27 +2,26 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_UBIFS=y BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_SAM_BA=y diff --git a/buildroot/configs/atmel_sama5d3_xplained_dev_defconfig b/buildroot/configs/atmel_sama5d3_xplained_dev_defconfig index 520cbc833..28efe4cc8 100644 --- a/buildroot/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/buildroot/configs/atmel_sama5d3_xplained_dev_defconfig @@ -5,7 +5,7 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Needed for some packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Needed for gdb @@ -20,10 +20,11 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y @@ -48,7 +49,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y -BR2_PACKAGE_DEVMEM2=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -58,7 +58,7 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_BLUEZ_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y BR2_PACKAGE_ETHTOOL=y @@ -84,15 +84,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/atmel_sama5d3_xplained_mmc_defconfig b/buildroot/configs/atmel_sama5d3_xplained_mmc_defconfig index 8fd9a7c2f..3fd5f1dde 100644 --- a/buildroot/configs/atmel_sama5d3_xplained_mmc_defconfig +++ b/buildroot/configs/atmel_sama5d3_xplained_mmc_defconfig @@ -2,27 +2,26 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index da1c4eb73..1f1881f8b 100644 --- a/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -5,7 +5,7 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Needed for some packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Needed for gdb @@ -23,10 +23,11 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y @@ -51,7 +52,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y -BR2_PACKAGE_DEVMEM2=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -61,7 +61,7 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_BLUEZ_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y BR2_PACKAGE_ETHTOOL=y @@ -86,15 +86,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/atmel_sama5d3xek_defconfig b/buildroot/configs/atmel_sama5d3xek_defconfig index 95deb6f23..63417eae7 100644 --- a/buildroot/configs/atmel_sama5d3xek_defconfig +++ b/buildroot/configs/atmel_sama5d3xek_defconfig @@ -23,15 +23,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.8.10)/at91bootstrap3-v3.8.10.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3xeknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_5.8)/u-boot-at91-linux4sam_5.8.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3xek_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y diff --git a/buildroot/configs/atmel_sama5d4_xplained_defconfig b/buildroot/configs/atmel_sama5d4_xplained_defconfig index 522f7fc9d..319f31956 100644 --- a/buildroot/configs/atmel_sama5d4_xplained_defconfig +++ b/buildroot/configs/atmel_sama5d4_xplained_defconfig @@ -3,13 +3,14 @@ BR2_cortex_a5=y 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_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_UBIFS=y BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3e000 BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1000 @@ -18,15 +19,13 @@ BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000 BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_SAM_BA=y diff --git a/buildroot/configs/atmel_sama5d4_xplained_dev_defconfig b/buildroot/configs/atmel_sama5d4_xplained_dev_defconfig index 9197564c2..71568f749 100644 --- a/buildroot/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/buildroot/configs/atmel_sama5d4_xplained_dev_defconfig @@ -6,7 +6,7 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Needed for some packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Needed for gdb @@ -21,10 +21,11 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y @@ -49,7 +50,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y -BR2_PACKAGE_DEVMEM2=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -59,7 +59,7 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_BLUEZ_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y BR2_PACKAGE_ETHTOOL=y @@ -88,15 +88,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/atmel_sama5d4_xplained_mmc_defconfig b/buildroot/configs/atmel_sama5d4_xplained_mmc_defconfig index f69acb288..ed294c35a 100644 --- a/buildroot/configs/atmel_sama5d4_xplained_mmc_defconfig +++ b/buildroot/configs/atmel_sama5d4_xplained_mmc_defconfig @@ -3,27 +3,26 @@ BR2_cortex_a5=y 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_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index cfac503fa..93a5bd929 100644 --- a/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -6,7 +6,7 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Needed for some packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Needed for gdb @@ -24,10 +24,11 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y @@ -52,7 +53,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y -BR2_PACKAGE_DEVMEM2=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -62,7 +62,7 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_BLUEZ_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y BR2_PACKAGE_ETHTOOL=y @@ -87,15 +87,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.8" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/bananapi_m2_plus_defconfig b/buildroot/configs/bananapi_m2_plus_defconfig index bbc3eb0eb..0e2d91d21 100644 --- a/buildroot/configs/bananapi_m2_plus_defconfig +++ b/buildroot/configs/bananapi_m2_plus_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Plus" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m2-plus/genimage.cfg" 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="5.0" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-bananapi-m2-plus" @@ -16,7 +16,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.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Sinovoip_BPI_M2_Plus" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/bananapi_m64_defconfig b/buildroot/configs/bananapi_m64_defconfig index 7d1ed18fb..5e56eaed8 100644 --- a/buildroot/configs/bananapi_m64_defconfig +++ b/buildroot/configs/bananapi_m64_defconfig @@ -2,8 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -17,9 +17,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" @@ -31,10 +32,11 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m64/boot.cmd" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-bananapi-m64" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M64" diff --git a/buildroot/configs/bananapro_defconfig b/buildroot/configs/bananapro_defconfig index 136a166d7..e87d9ba63 100644 --- a/buildroot/configs/bananapro_defconfig +++ b/buildroot/configs/bananapro_defconfig @@ -1,11 +1,12 @@ # Architecture BR2_arm=y BR2_cortex_a7=y +BR2_GLOBAL_PATCH_DIR="board/lemaker/bananapro/patches" BR2_ARM_EABIHF=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 +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Toolchain BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -22,13 +23,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lemaker/bananapro/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.91" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.7" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lemaker/bananapro/linux-wifi.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapro" BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -39,7 +41,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapro" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/beagleboardx15_defconfig b/buildroot/configs/beagleboardx15_defconfig index 393b29eef..039a07b11 100644 --- a/buildroot/configs/beagleboardx15_defconfig +++ b/buildroot/configs/beagleboardx15_defconfig @@ -1,7 +1,8 @@ BR2_arm=y BR2_cortex_a15=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboardx15/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboardx15/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" diff --git a/buildroot/configs/beaglebone_defconfig b/buildroot/configs/beaglebone_defconfig index fbb259f57..5d6b680d2 100644 --- a/buildroot/configs/beaglebone_defconfig +++ b/buildroot/configs/beaglebone_defconfig @@ -1,21 +1,23 @@ BR2_arm=y BR2_cortex_a8=y BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglebone/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/processor-sdk/processor-sdk-linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4796173fc58688055a99a1cef19a839174067220" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set diff --git a/buildroot/configs/beaglebone_qt5_defconfig b/buildroot/configs/beaglebone_qt5_defconfig index fb61bf54d..6e07bc9ac 100644 --- a/buildroot/configs/beaglebone_qt5_defconfig +++ b/buildroot/configs/beaglebone_qt5_defconfig @@ -1,36 +1,40 @@ BR2_arm=y BR2_cortex_a8=y BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_GCC_VERSION_5_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyO0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglebone/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/processor-sdk/processor-sdk-linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52c4aa7cdb93d61f8008f380135beaf7b8fa6593" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-4.1-sgx.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-evmsk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_EXAMPLES=y BR2_PACKAGE_QT5BASE_EGLFS=y +BR2_PACKAGE_QT5BASE_DEFAULT_QPA="wayland" BR2_PACKAGE_QT5QUICKCONTROLS=y +BR2_PACKAGE_QT5WAYLAND=y +BR2_PACKAGE_QT5WAYLAND_COMPOSITOR=y +BR2_PACKAGE_WESTON=y BR2_PACKAGE_TI_SGX_DEMOS=y BR2_PACKAGE_TI_SGX_KM=y BR2_PACKAGE_TI_SGX_UM=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="124M" +BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set @@ -42,3 +46,5 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/beagleboneai_defconfig b/buildroot/configs/beagleboneai_defconfig new file mode 100644 index 000000000..eb23cdf69 --- /dev/null +++ b/buildroot/configs/beagleboneai_defconfig @@ -0,0 +1,29 @@ +BR2_arm=y +BR2_cortex_a15=y +BR2_GLOBAL_PATCH_DIR="board/beagleboneai/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboneai/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboneai/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.14.108-ti-r117)/linux-4.14.108-ti-r117.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bb.org" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am5729-beagleboneai" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="MLO" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/beelink_gs1_defconfig b/buildroot/configs/beelink_gs1_defconfig new file mode 100644 index 000000000..80b111aee --- /dev/null +++ b/buildroot/configs/beelink_gs1_defconfig @@ -0,0 +1,44 @@ +# Architecture +BR2_aarch64=y +BR2_ARM_FPU_VFPV4=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Beelink GS1" +# MDEV is required to autoload the ethernet driver module +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" +BR2_GLOBAL_PATCH_DIR="board/beelink/gs1/patches/" + +# Kernel Linux headers same as kernel, a 5.3 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.12" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beelink_gs1" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/csky_gx6605s_defconfig b/buildroot/configs/csky_gx6605s_defconfig index d0a2aadc6..f1f9579dc 100644 --- a/buildroot/configs/csky_gx6605s_defconfig +++ b/buildroot/configs/csky_gx6605s_defconfig @@ -1,18 +1,19 @@ +# Architecture BR2_csky=y -BR2_GLOBAL_PATCH_DIR="board/csky/gx6605s/patches" -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/c-sky/tools/raw/master/csky-linux-tools-x86_64-glibc-linux-4.9.56-20180128.tar.gz" -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="csky-linux" -BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y -BR2_TOOLCHAIN_EXTERNAL_CXX=y -BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/c-sky/linux-4.9.y/archive/6064a9bdf48cefbccc4f6472dd04251f0dec1931.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="gx66xx" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="gx6605s" +BR2_ck610=y + +# System BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/csky/gx6605s/gx6605s.dts" diff --git a/buildroot/configs/engicam_imx6qdl_icore_defconfig b/buildroot/configs/engicam_imx6qdl_icore_defconfig index 609036087..d8a51c7ab 100644 --- a/buildroot/configs/engicam_imx6qdl_icore_defconfig +++ b/buildroot/configs/engicam_imx6qdl_icore_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 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -14,7 +14,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -25,7 +25,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" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" diff --git a/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig b/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig index 2da0a65c8..4d3d4e3a2 100644 --- a/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig +++ b/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig @@ -61,7 +61,7 @@ BR2_PACKAGE_QT5BASE_JPEG=y # mesa3d BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y -BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y +BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y BR2_PACKAGE_MESA3D_OPENGL_ES=y # qt5 demo packages diff --git a/buildroot/configs/engicam_imx6qdl_icore_rqs_defconfig b/buildroot/configs/engicam_imx6qdl_icore_rqs_defconfig index 4cea880b5..45ed67be0 100644 --- a/buildroot/configs/engicam_imx6qdl_icore_rqs_defconfig +++ b/buildroot/configs/engicam_imx6qdl_icore_rqs_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.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -14,8 +14,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07-rc1" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_rqs_mmc" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_rqs" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y @@ -25,7 +25,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.11.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" diff --git a/buildroot/configs/engicam_imx6ul_isiot_defconfig b/buildroot/configs/engicam_imx6ul_isiot_defconfig index 78a5cae3e..57a66dea3 100644 --- a/buildroot/configs/engicam_imx6ul_isiot_defconfig +++ b/buildroot/configs/engicam_imx6ul_isiot_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.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -14,8 +14,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07-rc1" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ul_isiot_mmc" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ul_isiot_emmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y @@ -25,7 +25,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.11.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000" diff --git a/buildroot/configs/freescale_imx28evk_defconfig b/buildroot/configs/freescale_imx28evk_defconfig index ba17ed217..b0a0c15ef 100644 --- a/buildroot/configs/freescale_imx28evk_defconfig +++ b/buildroot/configs/freescale_imx28evk_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +# Linux headers same as kernel, a 5.3 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -11,7 +11,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx28evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" BR2_TARGET_UBOOT_FORMAT_SD=y # Filesystem diff --git a/buildroot/configs/freescale_imx8mmevk_defconfig b/buildroot/configs/freescale_imx8mmevk_defconfig new file mode 100644 index 000000000..5472ed36b --- /dev/null +++ b/buildroot/configs/freescale_imx8mmevk_defconfig @@ -0,0 +1,42 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8mm-evk.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8mm-evk" +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/freescale_imx8mqevk_defconfig b/buildroot/configs/freescale_imx8mqevk_defconfig index 895713b1c..7989b6057 100644 --- a/buildroot/configs/freescale_imx8mqevk_defconfig +++ b/buildroot/configs/freescale_imx8mqevk_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8mq-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.62_1.0.0_beta" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8mq-evk" @@ -20,14 +20,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.62_1.0.0_beta" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.62_1.0.0_beta" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/buildroot/configs/freescale_imx8qxpmek_defconfig b/buildroot/configs/freescale_imx8qxpmek_defconfig new file mode 100644 index 000000000..82f433f6c --- /dev/null +++ b/buildroot/configs/freescale_imx8qxpmek_defconfig @@ -0,0 +1,40 @@ +BR2_aarch64=y +BR2_cortex_a35=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8qxp-mek" +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_IMX_SC_FIRMWARE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/freescale_t2080_qds_rdb_defconfig b/buildroot/configs/freescale_t2080_qds_rdb_defconfig new file mode 100644 index 000000000..3d03c32f7 --- /dev/null +++ b/buildroot/configs/freescale_t2080_qds_rdb_defconfig @@ -0,0 +1,25 @@ +# Architecture +BR2_powerpc64=y +BR2_powerpc_e6500=y + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.14" +BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/t2080qds fsl/t2080rdb" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y +# BR2_TARGET_ROOTFS_TAR is not set + diff --git a/buildroot/configs/friendlyarm_nanopi_a64_defconfig b/buildroot/configs/friendlyarm_nanopi_a64_defconfig index 1b668be2e..7d9535e6a 100644 --- a/buildroot/configs/friendlyarm_nanopi_a64_defconfig +++ b/buildroot/configs/friendlyarm_nanopi_a64_defconfig @@ -2,8 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -17,9 +17,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_a64" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" @@ -31,10 +32,11 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-a64/boot.cmd" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-nanopi-a64" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi A64" diff --git a/buildroot/configs/friendlyarm_nanopi_neo2_defconfig b/buildroot/configs/friendlyarm_nanopi_neo2_defconfig index f133e8091..e932ae3bb 100644 --- a/buildroot/configs/friendlyarm_nanopi_neo2_defconfig +++ b/buildroot/configs/friendlyarm_nanopi_neo2_defconfig @@ -2,8 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -17,9 +17,10 @@ R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" @@ -31,10 +32,11 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO2" diff --git a/buildroot/configs/friendlyarm_nanopi_neo_plus2_defconfig b/buildroot/configs/friendlyarm_nanopi_neo_plus2_defconfig new file mode 100644 index 000000000..461e468cb --- /dev/null +++ b/buildroot/configs/friendlyarm_nanopi_neo_plus2_defconfig @@ -0,0 +1,62 @@ +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_OVERLAY="board/friendlyarm/nanopi-neo-plus2/rootfs_overlay" + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" +R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo_plus2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo-plus2" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo-plus2/linux-extras.config" + +# Filesystem +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO Plus2" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo-plus2/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo-plus2/post-build.sh" + +# wireless firmware +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y + +# wireless tools +BR2_PACKAGE_IW=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WIRELESS_TOOLS_LIB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y diff --git a/buildroot/configs/grinn_chiliboard_defconfig b/buildroot/configs/grinn_chiliboard_defconfig index 84f24e1cc..ab89bbf8f 100644 --- a/buildroot/configs/grinn_chiliboard_defconfig +++ b/buildroot/configs/grinn_chiliboard_defconfig @@ -1,11 +1,11 @@ BR2_arm=y BR2_cortex_a8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/chiliboard/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.1" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-chiliboard" @@ -15,7 +15,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/buildroot/configs/grinn_liteboard_defconfig b/buildroot/configs/grinn_liteboard_defconfig index 84f1735e2..f2c1da33e 100644 --- a/buildroot/configs/grinn_liteboard_defconfig +++ b/buildroot/configs/grinn_liteboard_defconfig @@ -1,11 +1,11 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/liteboard/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.1" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard" @@ -15,7 +15,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y diff --git a/buildroot/configs/hifive_unleashed_defconfig b/buildroot/configs/hifive_unleashed_defconfig new file mode 100644 index 000000000..24576570d --- /dev/null +++ b/buildroot/configs/hifive_unleashed_defconfig @@ -0,0 +1,40 @@ +# Architecture +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +BR2_RISCV_64=y +BR2_RISCV_ABI_LP64D=y + +# System +BR2_SYSTEM_DHCP="eth0" +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttySIF0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sifive/hifive-unleashed/genimage.cfg" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Linux headers same as kernel, a 5.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/alistair23/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="hifive-unleashed-5.1" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sifive/hifive-unleashed/linux.config.fragment" +BR2_LINUX_KERNEL_IMAGE=y + +# Bootloader +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_PLAT="sifive/fu540" +BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y + +# Host tools +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/imx6-sabreauto_defconfig b/buildroot/configs/imx6-sabreauto_defconfig index d9a08bbe7..a77b57e4f 100644 --- a/buildroot/configs/imx6-sabreauto_defconfig +++ b/buildroot/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.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.3 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -24,7 +24,8 @@ 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.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_NEEDS_LZOP=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -32,7 +33,8 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4" 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" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/imx6-sabresd_defconfig b/buildroot/configs/imx6-sabresd_defconfig index c2924b2e3..d244c5961 100644 --- a/buildroot/configs/imx6-sabresd_defconfig +++ b/buildroot/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.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" 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.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/buildroot/configs/imx6-sabresd_qt5_defconfig b/buildroot/configs/imx6-sabresd_qt5_defconfig index 4616f57ea..47c00284d 100644 --- a/buildroot/configs/imx6-sabresd_qt5_defconfig +++ b/buildroot/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.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y @@ -30,7 +30,7 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -38,7 +38,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" 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" @@ -48,7 +48,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # GL driver BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y -BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y +BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y BR2_PACKAGE_MESA3D_OPENGL_ES=y # Fonts @@ -93,6 +93,7 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y BR2_PACKAGE_GST1_PLUGINS_BAD=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y +BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y # For automatic kernel module loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y diff --git a/buildroot/configs/imx6ulevk_defconfig b/buildroot/configs/imx6ulevk_defconfig index 9e30d2c3c..53381d71a 100644 --- a/buildroot/configs/imx6ulevk_defconfig +++ b/buildroot/configs/imx6ulevk_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-14x14-evk" diff --git a/buildroot/configs/imx7d-sdb_defconfig b/buildroot/configs/imx7d-sdb_defconfig index b1cc5f852..1a3494b4a 100644 --- a/buildroot/configs/imx7d-sdb_defconfig +++ b/buildroot/configs/imx7d-sdb_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" @@ -22,7 +22,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y # Filesystem diff --git a/buildroot/configs/imx7dpico_defconfig b/buildroot/configs/imx7dpico_defconfig index 93e3fd741..190e77fbf 100644 --- a/buildroot/configs/imx7dpico_defconfig +++ b/buildroot/configs/imx7dpico_defconfig @@ -3,11 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# patches -BR2_GLOBAL_PATCH_DIR="board/technexion/imx7dpico/patches" - -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +# Linux headers same as kernel, a 5.3 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4" @@ -15,25 +12,39 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico-pi" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # bootloader BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="pico-imx7d" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx7d" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" -BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y + +# wifi firmware for brcm43439 +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y + +# For automatic firmware loading +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + +# wireless packages +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y # required tools to create the eMMC image -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y # filesystem / image +BR2_ROOTFS_OVERLAY="board/technexion/imx7dpico/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/buildroot/configs/imx8mmpico_defconfig b/buildroot/configs/imx8mmpico_defconfig new file mode 100644 index 000000000..f04946a8d --- /dev/null +++ b/buildroot/configs/imx8mmpico_defconfig @@ -0,0 +1,38 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-pico-pi.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux,9146d4dcb2dda0c7614f74f824cfb20d29bd85f8)/linux-9146d4dcb2dda0c7614f74f824cfb20d29bd85f8.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="tn_imx8" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-pico-pi freescale/imx8mm-pico-pi-ili9881c freescale/imx8mm-pico-pi-sn65dsi84-hj070na" +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-edm,9a070a5b4460124054bc459edfc9d1b43e5403bb)/u-boot-edm-9a070a5b4460124054bc459edfc9d1b43e5403bb.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/imx8mpico_defconfig b/buildroot/configs/imx8mpico_defconfig new file mode 100644 index 000000000..5478f267f --- /dev/null +++ b/buildroot/configs/imx8mpico_defconfig @@ -0,0 +1,38 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-pico-pi.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux,9146d4dcb2dda0c7614f74f824cfb20d29bd85f8)/linux-9146d4dcb2dda0c7614f74f824cfb20d29bd85f8.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="tn_imx8" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-pico-pi freescale/imx8mq-pico-pi-dcss-ili9881c" +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-edm,9a070a5b4460124054bc459edfc9d1b43e5403bb)/u-boot-edm-9a070a5b4460124054bc459edfc9d1b43e5403bb.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mq" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/buildroot/configs/lafrite_defconfig b/buildroot/configs/lafrite_defconfig new file mode 100644 index 000000000..63370928e --- /dev/null +++ b/buildroot/configs/lafrite_defconfig @@ -0,0 +1,20 @@ +BR2_aarch64=y +BR2_cortex_a53=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/librecomputer/lafrite/overlay/" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/librecomputer/lafrite/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.14" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxl-s805x-libretech-ac" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/lego_ev3_defconfig b/buildroot/configs/lego_ev3_defconfig index cf2809059..b4a100003 100644 --- a/buildroot/configs/lego_ev3_defconfig +++ b/buildroot/configs/lego_ev3_defconfig @@ -8,6 +8,7 @@ BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # system BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lego/ev3/post-image.sh" # Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y @@ -27,6 +28,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="da850-lego-ev3" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/lego/ev3/busybox.fragment" BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y +BR2_PACKAGE_BRICKD=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560=y diff --git a/buildroot/configs/licheepi_zero_defconfig b/buildroot/configs/licheepi_zero_defconfig new file mode 100644 index 000000000..fd875d5f4 --- /dev/null +++ b/buildroot/configs/licheepi_zero_defconfig @@ -0,0 +1,51 @@ +# Target options +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4=y + +# Toolchain +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y + +# System configuration +BR2_TARGET_GENERIC_HOSTNAME="licheepi-zero" +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the LicheePi Zero" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/licheepi/genimage.cfg" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.5" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v3s-licheepi-zero sun8i-v3s-licheepi-zero-dock" + +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y + +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y + +# Filesystem images +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloaders +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="LicheePi_Zero" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_BOOT_SCRIPT=y +BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/licheepi/boot.cmd" + +# Required host utilities for building an SDCard image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/linksprite_pcduino_defconfig b/buildroot/configs/linksprite_pcduino_defconfig index dd9bcdc1f..5a00e5728 100644 --- a/buildroot/configs/linksprite_pcduino_defconfig +++ b/buildroot/configs/linksprite_pcduino_defconfig @@ -17,17 +17,18 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" # For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=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 5.3 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -37,7 +38,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="2019.10" BR2_TARGET_UBOOT_USE_DEFCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot/configs/minnowboard_max-graphical_defconfig b/buildroot/configs/minnowboard_max-graphical_defconfig index 921dae310..33630c6b0 100644 --- a/buildroot/configs/minnowboard_max-graphical_defconfig +++ b/buildroot/configs/minnowboard_max-graphical_defconfig @@ -13,7 +13,8 @@ BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/minnowboard/fs-overlay-graphical" BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/minnowboard/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg" # Host packages BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/minnowboard_max_defconfig b/buildroot/configs/minnowboard_max_defconfig index 523ddffd5..fef597c35 100644 --- a/buildroot/configs/minnowboard_max_defconfig +++ b/buildroot/configs/minnowboard_max_defconfig @@ -5,7 +5,8 @@ BR2_x86_silvermont=y # Misc BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/minnowboard/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg" # Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y diff --git a/buildroot/configs/mx51evk_defconfig b/buildroot/configs/mx51evk_defconfig index 3c2d56132..0cb8f476c 100644 --- a/buildroot/configs/mx51evk_defconfig +++ b/buildroot/configs/mx51evk_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +# Linux headers same as kernel, a 5.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -28,7 +28,7 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.10" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-babbage" diff --git a/buildroot/configs/mx53loco_defconfig b/buildroot/configs/mx53loco_defconfig index ca6ec446f..8b78f6586 100644 --- a/buildroot/configs/mx53loco_defconfig +++ b/buildroot/configs/mx53loco_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +# Linux headers same as kernel, a 5.2 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=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="2018.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb" diff --git a/buildroot/configs/mx6cubox_defconfig b/buildroot/configs/mx6cubox_defconfig index 2996c375f..7e9b16bd2 100644 --- a/buildroot/configs/mx6cubox_defconfig +++ b/buildroot/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.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=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" @@ -19,7 +19,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" 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" diff --git a/buildroot/configs/nanopi_m1_defconfig b/buildroot/configs/nanopi_m1_defconfig index 323015ee6..cf9521a3a 100644 --- a/buildroot/configs/nanopi_m1_defconfig +++ b/buildroot/configs/nanopi_m1_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=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 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1" @@ -14,7 +14,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y @@ -24,7 +24,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1" diff --git a/buildroot/configs/nanopi_m1_plus_defconfig b/buildroot/configs/nanopi_m1_plus_defconfig index da707fd5f..2f9d14f10 100644 --- a/buildroot/configs/nanopi_m1_plus_defconfig +++ b/buildroot/configs/nanopi_m1_plus_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=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 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1-plus" @@ -14,7 +14,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1 Plus" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y @@ -24,8 +24,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5" -BR2_GLOBAL_PATCH_DIR="board/friendlyarm/nanopi-m1-plus/patches/" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1-plus" diff --git a/buildroot/configs/nanopi_neo_defconfig b/buildroot/configs/nanopi_neo_defconfig index aa464917b..be98918c6 100644 --- a/buildroot/configs/nanopi_neo_defconfig +++ b/buildroot/configs/nanopi_neo_defconfig @@ -4,16 +4,14 @@ BR2_ARM_FPU_VFPV4=y BR2_TARGET_GENERIC_HOSTNAME="nanopi-neo" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi NEO" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/friendlyarm/nanopi-neo/post-image.sh" -# Linux headers same as kernel, a 4.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10=y +# Linux headers same as kernel, a 5.3 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y # Use a -rc kernel to get the DTS BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.13" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-neo" @@ -22,19 +20,23 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-neo" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" # Build an sdcard image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="32M" -BR2_TARGET_ROOTFS_EXT2_INODES=8192 +BR2_TARGET_UBOOT_BOOT_SCRIPT=y +BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo/boot.cmd" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo/genimage.cfg" # BR2_TARGET_ROOTFS_TAR is not set + +# Additional tools BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/buildroot/configs/nitrogen6sx_defconfig b/buildroot/configs/nitrogen6sx_defconfig index b29adf299..29fa4dff6 100644 --- a/buildroot/configs/nitrogen6sx_defconfig +++ b/buildroot/configs/nitrogen6sx_defconfig @@ -17,8 +17,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # bootloader BR2_TARGET_UBOOT=y @@ -34,8 +34,8 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Last version of branch boundary-imx_4.9.x_1.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/2aef1ef6.tar.gz" +# Last version of branch boundary-imx_4.14.x_2.0.0_ga +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/nitrogen6x_defconfig b/buildroot/configs/nitrogen6x_defconfig index 5905a40e3..5a53caed9 100644 --- a/buildroot/configs/nitrogen6x_defconfig +++ b/buildroot/configs/nitrogen6x_defconfig @@ -17,8 +17,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # bootloader BR2_TARGET_UBOOT=y @@ -34,8 +34,8 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Last version of branch boundary-imx_4.9.x_1.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/2aef1ef6.tar.gz" +# Last version of branch boundary-imx_4.14.x_2.0.0_ga +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/nitrogen7_defconfig b/buildroot/configs/nitrogen7_defconfig index fa8f36c63..a7cd8a10e 100644 --- a/buildroot/configs/nitrogen7_defconfig +++ b/buildroot/configs/nitrogen7_defconfig @@ -16,8 +16,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # bootloader BR2_TARGET_UBOOT=y @@ -33,8 +33,8 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Last version of branch boundary-imx_4.9.x_1.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/2aef1ef6.tar.gz" +# Last version of branch boundary-imx_4.14.x_2.0.0_ga +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/nitrogen8m_defconfig b/buildroot/configs/nitrogen8m_defconfig index 9b758f0b9..21402162f 100644 --- a/buildroot/configs/nitrogen8m_defconfig +++ b/buildroot/configs/nitrogen8m_defconfig @@ -17,8 +17,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -40,15 +40,17 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y # Latest revision of branch boundary-imx_v2017.03_4.9.51_imx8m_ga BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/b661d854.tar.gz" +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_4.9.x_2.0.0_ga -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/7777e14d.tar.gz" +# Latest revision of branch boundary-imx_4.14.x_2.0.0_ga +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/208127fd.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-nitrogen8m freescale/imx8mq-nitrogen8m-m4" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-nitrogen8m freescale/imx8mq-nitrogen8m-m4 freescale/imx8mq-nitrogen8m_som freescale/imx8mq-nitrogen8m_som-m4" diff --git a/buildroot/configs/odroidc2_defconfig b/buildroot/configs/odroidc2_defconfig deleted file mode 100644 index 63c5d2edc..000000000 --- a/buildroot/configs/odroidc2_defconfig +++ /dev/null @@ -1,36 +0,0 @@ -# Architecture -BR2_aarch64=y - -# System -BR2_TARGET_GENERIC_HOSTNAME="odroidc2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/hardkernel/odroidc2/post-image.sh" -BR2_PACKAGE_ODROID_SCRIPTS=y -BR2_GCC_VERSION_4_9_X=y - -# Kernel -BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.14.79" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,hardkernel,linux,f966ebfc0e8dc88c7931b4640b8a1b4bc2e13faa)/linux-f966ebfc0e8dc88c7931b4640b8a1b4bc2e13faa.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="odroidc2" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_BUILD_DEFAULT_DTS=y -BR2_LINUX_KERNEL_USE_INTREE_DTS=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="meson64_odroidc2" -BR2_LINUX_KERNEL_IMAGE=y - -# U-Boot -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/hardkernel/u-boot.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="cff3edb675933ea2e2ecd659eab127a42f3777df" -BR2_TARGET_UBOOT_BOARDNAME="odroidc2" - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig b/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig index b61d56f42..21b681a1f 100644 --- a/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/buildroot/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.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=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.19.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -39,7 +39,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/olimex_a20_olinuxino_lime_defconfig b/buildroot/configs/olimex_a20_olinuxino_lime_defconfig index 5677b0312..029f9ebad 100644 --- a/buildroot/configs/olimex_a20_olinuxino_lime_defconfig +++ b/buildroot/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.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=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.19.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -39,7 +39,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/olimex_a20_olinuxino_lime_legacy_defconfig b/buildroot/configs/olimex_a20_olinuxino_lime_legacy_defconfig deleted file mode 100644 index 2c33f05e5..000000000 --- a/buildroot/configs/olimex_a20_olinuxino_lime_legacy_defconfig +++ /dev/null @@ -1,56 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_EABIHF=y - -# The old 3.4 kernel doesn't build with gcc >= 7.x -BR2_GCC_VERSION_6_X=y - -# Linux headers same as kernel, a 3.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y - -# 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, based on Linux version 3.4.113 -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,dan-and,linux-sunxi,fc385cc6dfa350382ecc94a520a716b57e654410)/linux-fc385cc6dfa350382ecc94a520a716b57e654410.tar.gz" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y -BR2_LINUX_KERNEL_DEFCONFIG="sun7i" -BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# sunxi packages -BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_BOARDS=y -BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/a20-olinuxino_lime.fex" -BR2_PACKAGE_SUNXI_MALI=y -BR2_PACKAGE_SUNXI_MALI_DBG=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_BIN=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot-legacy.cmd" - -# Additional tools -BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/olimex_a33_olinuxino_defconfig b/buildroot/configs/olimex_a33_olinuxino_defconfig new file mode 100644 index 000000000..71b1669b2 --- /dev/null +++ b/buildroot/configs/olimex_a33_olinuxino_defconfig @@ -0,0 +1,49 @@ +# Architecture +BR2_arm=y +BR2_cortex_a7=y + +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y + +# System configuration +BR2_TARGET_GENERIC_HOSTNAME="A33-olinuxino" +BR2_TARGET_GENERIC_ISSUE="Welcome to A33 OLinuXino!" +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Bootloaders +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A33-OLinuXino" +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/a33_olinuxino/boot.cmd" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" +BR2_LINUX_KERNEL_USE_DEFCONFIG=y +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-a33-olinuxino" +BR2_LINUX_KERNEL_INSTALL_TARGET=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a33_olinuxino/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a33_olinuxino/genimage.cfg" + +# Additional tools +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/olimex_a64_olinuxino_defconfig b/buildroot/configs/olimex_a64_olinuxino_defconfig index b12229fcd..d5b2d3530 100644 --- a/buildroot/configs/olimex_a64_olinuxino_defconfig +++ b/buildroot/configs/olimex_a64_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -17,9 +17,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="a64-olinuxino" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" @@ -31,10 +32,11 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot.cmd" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to Olimex A64-OLinuXino" diff --git a/buildroot/configs/olimex_imx233_olinuxino_defconfig b/buildroot/configs/olimex_imx233_olinuxino_defconfig index 232d9d0dc..26e5ad139 100644 --- a/buildroot/configs/olimex_imx233_olinuxino_defconfig +++ b/buildroot/configs/olimex_imx233_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=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.19.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/orangepi_lite_defconfig b/buildroot/configs/orangepi_lite_defconfig index 1c3b99cf1..249224ed3 100644 --- a/buildroot/configs/orangepi_lite_defconfig +++ b/buildroot/configs/orangepi_lite_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Lite" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Lite" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-lite/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,7 +22,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_lite" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/orangepi_one_defconfig b/buildroot/configs/orangepi_one_defconfig index 3715f1ddb..4863eebff 100644 --- a/buildroot/configs/orangepi_one_defconfig +++ b/buildroot/configs/orangepi_one_defconfig @@ -1,13 +1,13 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/orangepi_pc2_defconfig b/buildroot/configs/orangepi_pc2_defconfig index 83be93686..864f8bb8a 100644 --- a/buildroot/configs/orangepi_pc2_defconfig +++ b/buildroot/configs/orangepi_pc2_defconfig @@ -2,8 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -17,9 +17,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" @@ -31,10 +32,11 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-pc2" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi PC2" diff --git a/buildroot/configs/orangepi_pc_defconfig b/buildroot/configs/orangepi_pc_defconfig index 130a4e708..fcb6bdc9e 100644 --- a/buildroot/configs/orangepi_pc_defconfig +++ b/buildroot/configs/orangepi_pc_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_SYSTEM_DHCP="eth0" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.13" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/orangepi_pc_plus_defconfig b/buildroot/configs/orangepi_pc_plus_defconfig index edc3909ae..4d22e7840 100644 --- a/buildroot/configs/orangepi_pc_plus_defconfig +++ b/buildroot/configs/orangepi_pc_plus_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC_Plus" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC Plus" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/orangepi_plus_defconfig b/buildroot/configs/orangepi_plus_defconfig index cf725ef28..be3eba51f 100644 --- a/buildroot/configs/orangepi_plus_defconfig +++ b/buildroot/configs/orangepi_plus_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=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 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Plus" @@ -14,16 +14,17 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Plus" 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="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-plus" diff --git a/buildroot/configs/orangepi_prime_defconfig b/buildroot/configs/orangepi_prime_defconfig index 861fc2163..f78711ce4 100644 --- a/buildroot/configs/orangepi_prime_defconfig +++ b/buildroot/configs/orangepi_prime_defconfig @@ -2,8 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -17,9 +17,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_prime" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" @@ -31,10 +32,11 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-prime/boot.cmd" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-prime" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Prime" diff --git a/buildroot/configs/orangepi_r1_defconfig b/buildroot/configs/orangepi_r1_defconfig new file mode 100644 index 000000000..b1d35f299 --- /dev/null +++ b/buildroot/configs/orangepi_r1_defconfig @@ -0,0 +1,38 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_R1" +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi R1" +BR2_SYSTEM_DHCP="eth0" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.12" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-r1" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-r1/linux-extras.config" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_r1" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_BOOT_SCRIPT=y +BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-r1/genimage.cfg" + +# spi flash support +BR2_PACKAGE_MTD=y diff --git a/buildroot/configs/orangepi_zero_defconfig b/buildroot/configs/orangepi_zero_defconfig index 3c65665cd..354e3bfdb 100644 --- a/buildroot/configs/orangepi_zero_defconfig +++ b/buildroot/configs/orangepi_zero_defconfig @@ -3,13 +3,13 @@ BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" @@ -21,7 +21,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot/configs/orangepi_zero_plus2_defconfig b/buildroot/configs/orangepi_zero_plus2_defconfig index 917aa851d..a0183714a 100644 --- a/buildroot/configs/orangepi_zero_plus2_defconfig +++ b/buildroot/configs/orangepi_zero_plus2_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" @@ -18,7 +18,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y @@ -33,7 +33,7 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" diff --git a/buildroot/configs/pandaboard_defconfig b/buildroot/configs/pandaboard_defconfig index 9b7c962de..408bced9c 100644 --- a/buildroot/configs/pandaboard_defconfig +++ b/buildroot/configs/pandaboard_defconfig @@ -2,18 +2,20 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_5=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyO2" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pandaboard/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pandaboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.62" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="omap4-panda-es omap4-panda omap4-panda-a4" BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/buildroot/configs/pc_x86_64_efi_defconfig b/buildroot/configs/pc_x86_64_efi_defconfig index 324de35df..984fc8f92 100644 --- a/buildroot/configs/pc_x86_64_efi_defconfig +++ b/buildroot/configs/pc_x86_64_efi_defconfig @@ -10,6 +10,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Required tools to create bootable media BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y # Bootloader @@ -21,7 +22,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi-gpt.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh" # Linux headers same as kernel, a 4.18 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y diff --git a/buildroot/configs/pine64_defconfig b/buildroot/configs/pine64_defconfig index 6e8eb15d7..d2e3a360f 100644 --- a/buildroot/configs/pine64_defconfig +++ b/buildroot/configs/pine64_defconfig @@ -2,8 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -17,9 +17,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" @@ -31,10 +32,11 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64" diff --git a/buildroot/configs/pine64_sopine_defconfig b/buildroot/configs/pine64_sopine_defconfig index b076681a9..3007d5a64 100644 --- a/buildroot/configs/pine64_sopine_defconfig +++ b/buildroot/configs/pine64_sopine_defconfig @@ -2,8 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.0 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -17,9 +17,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sopine_baseboard" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" @@ -31,10 +32,11 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/pine64/sopine/boot.cmd" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-sopine-baseboard" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64 SOPINE" diff --git a/buildroot/configs/qemu_aarch64_virt_defconfig b/buildroot/configs/qemu_aarch64_virt_defconfig index 638e18beb..6a9bc25be 100644 --- a/buildroot/configs/qemu_aarch64_virt_defconfig +++ b/buildroot/configs/qemu_aarch64_virt_defconfig @@ -17,7 +17,11 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_arm_versatile_defconfig b/buildroot/configs/qemu_arm_versatile_defconfig index ce7cb5efe..42d29e3bf 100644 --- a/buildroot/configs/qemu_arm_versatile_defconfig +++ b/buildroot/configs/qemu_arm_versatile_defconfig @@ -16,8 +16,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_arm_versatile_nommu_defconfig b/buildroot/configs/qemu_arm_versatile_nommu_defconfig index 81fb5b6ca..6e4de0a0d 100644 --- a/buildroot/configs/qemu_arm_versatile_nommu_defconfig +++ b/buildroot/configs/qemu_arm_versatile_nommu_defconfig @@ -27,8 +27,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-nommu.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_arm_vexpress_defconfig b/buildroot/configs/qemu_arm_vexpress_defconfig index 66f198ac5..188fd7201 100644 --- a/buildroot/configs/qemu_arm_vexpress_defconfig +++ b/buildroot/configs/qemu_arm_vexpress_defconfig @@ -19,7 +19,11 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_arm_vexpress_tz_defconfig b/buildroot/configs/qemu_arm_vexpress_tz_defconfig new file mode 100644 index 000000000..eff3f52d1 --- /dev/null +++ b/buildroot/configs/qemu_arm_vexpress_tz_defconfig @@ -0,0 +1,58 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15=y +BR2_ARM_FPU_VFPV3D16=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/arm-vexpress-tz/post-build.sh" + +# Filesystem +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Linux 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" +BR2_LINUX_KERNEL_DEFCONFIG="vexpress" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca15_a7" + +# TF-A for booting OP-TEE secure and uboot/linux non secure +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram" + +# OP-TEE components +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" +BR2_PACKAGE_OPTEE_BENCHMARK=y +BR2_PACKAGE_OPTEE_EXAMPLES=y +BR2_PACKAGE_OPTEE_TEST=y + +# OP-TEE components needs host-python3 interpreter and its modules +BR2_PACKAGE_HOST_PYTHON3=y +# Select python3 on the target to make sure Buildroot builds host-python using +# python3 and builds all host-python modules for python3. +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_PACKAGE_PYTHON3=y + +# U-boot for booting the dear Linux kernel +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/u-boot.config" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_csky610_virt_defconfig b/buildroot/configs/qemu_csky610_virt_defconfig new file mode 100644 index 000000000..f337bd7eb --- /dev/null +++ b/buildroot/configs/qemu_csky610_virt_defconfig @@ -0,0 +1,16 @@ +# Architecture +BR2_csky=y +BR2_ck610=y + +# System +BR2_TARGET_ROOTFS_INITRAMFS=y + +# linux kernel header, the same version with linux kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config.fragment" diff --git a/buildroot/configs/qemu_csky807_virt_defconfig b/buildroot/configs/qemu_csky807_virt_defconfig new file mode 100644 index 000000000..c4a10b8ad --- /dev/null +++ b/buildroot/configs/qemu_csky807_virt_defconfig @@ -0,0 +1,16 @@ +# Architecture +BR2_csky=y +BR2_ck807=y + +# System +BR2_TARGET_ROOTFS_INITRAMFS=y + +# linux kernel header, the same version with linux kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck807.config.fragment" diff --git a/buildroot/configs/qemu_csky810_virt_defconfig b/buildroot/configs/qemu_csky810_virt_defconfig new file mode 100644 index 000000000..56efe8a6a --- /dev/null +++ b/buildroot/configs/qemu_csky810_virt_defconfig @@ -0,0 +1,16 @@ +# Architecture +BR2_csky=y +BR2_ck810=y + +# System +BR2_TARGET_ROOTFS_INITRAMFS=y + +# linux kernel header, the same version with linux kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck810.config.fragment" diff --git a/buildroot/configs/qemu_csky860_virt_defconfig b/buildroot/configs/qemu_csky860_virt_defconfig new file mode 100644 index 000000000..9ec8f633a --- /dev/null +++ b/buildroot/configs/qemu_csky860_virt_defconfig @@ -0,0 +1,16 @@ +# Architecture +BR2_csky=y +BR2_ck860=y + +# System +BR2_TARGET_ROOTFS_INITRAMFS=y + +# linux kernel header, the same version with linux kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck860.config.fragment" diff --git a/buildroot/configs/qemu_m68k_mcf5208_defconfig b/buildroot/configs/qemu_m68k_mcf5208_defconfig index 44fd918ec..a2cadffa9 100644 --- a/buildroot/configs/qemu_m68k_mcf5208_defconfig +++ b/buildroot/configs/qemu_m68k_mcf5208_defconfig @@ -15,7 +15,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" BR2_LINUX_KERNEL_VMLINUX=y @@ -26,3 +26,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # use minimal busybox with hush and networking tools BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_m68k_q800_defconfig b/buildroot/configs/qemu_m68k_q800_defconfig index 0dd90a97b..2ef73d1dd 100644 --- a/buildroot/configs/qemu_m68k_q800_defconfig +++ b/buildroot/configs/qemu_m68k_q800_defconfig @@ -15,7 +15,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" BR2_LINUX_KERNEL_VMLINUX=y @@ -23,3 +23,7 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_microblazebe_mmu_defconfig b/buildroot/configs/qemu_microblazebe_mmu_defconfig index 95fdfeda6..2bcf13e08 100644 --- a/buildroot/configs/qemu_microblazebe_mmu_defconfig +++ b/buildroot/configs/qemu_microblazebe_mmu_defconfig @@ -16,8 +16,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/xilinx-xemaclite.patch" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_microblazeel_mmu_defconfig b/buildroot/configs/qemu_microblazeel_mmu_defconfig index 7400dafa5..4352ad687 100644 --- a/buildroot/configs/qemu_microblazeel_mmu_defconfig +++ b/buildroot/configs/qemu_microblazeel_mmu_defconfig @@ -16,8 +16,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/xilinx-xemaclite.patch" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips32r2_malta_defconfig b/buildroot/configs/qemu_mips32r2_malta_defconfig index 0ee7a5888..baacc3cc8 100644 --- a/buildroot/configs/qemu_mips32r2_malta_defconfig +++ b/buildroot/configs/qemu_mips32r2_malta_defconfig @@ -15,7 +15,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y @@ -23,3 +23,7 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips32r2el_malta_defconfig b/buildroot/configs/qemu_mips32r2el_malta_defconfig index 075088df8..35ad64368 100644 --- a/buildroot/configs/qemu_mips32r2el_malta_defconfig +++ b/buildroot/configs/qemu_mips32r2el_malta_defconfig @@ -15,7 +15,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y @@ -23,3 +23,7 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips32r6_malta_defconfig b/buildroot/configs/qemu_mips32r6_malta_defconfig index b0bf94ce7..a0553ed96 100644 --- a/buildroot/configs/qemu_mips32r6_malta_defconfig +++ b/buildroot/configs/qemu_mips32r6_malta_defconfig @@ -15,15 +15,15 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y -# Compiler -# linux >= 4.4 uses -mcompact-branches which is only available since gcc-6 -BR2_GCC_VERSION_6_X=y - # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips32r6el_malta_defconfig b/buildroot/configs/qemu_mips32r6el_malta_defconfig index 077d836da..aaace9540 100644 --- a/buildroot/configs/qemu_mips32r6el_malta_defconfig +++ b/buildroot/configs/qemu_mips32r6el_malta_defconfig @@ -15,15 +15,15 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y -# Compiler -# linux >= 4.4 uses -mcompact-branches which is only available since GCC 6.x -BR2_GCC_VERSION_6_X=y - # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips64_malta_defconfig b/buildroot/configs/qemu_mips64_malta_defconfig index 12502eac6..2a8b50a18 100644 --- a/buildroot/configs/qemu_mips64_malta_defconfig +++ b/buildroot/configs/qemu_mips64_malta_defconfig @@ -15,7 +15,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y @@ -23,3 +23,7 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips64el_malta_defconfig b/buildroot/configs/qemu_mips64el_malta_defconfig index 5ddb759bb..1d9d0807d 100644 --- a/buildroot/configs/qemu_mips64el_malta_defconfig +++ b/buildroot/configs/qemu_mips64el_malta_defconfig @@ -15,7 +15,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y @@ -23,3 +23,7 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips64r6_malta_defconfig b/buildroot/configs/qemu_mips64r6_malta_defconfig index bfa32f657..ed4204229 100644 --- a/buildroot/configs/qemu_mips64r6_malta_defconfig +++ b/buildroot/configs/qemu_mips64r6_malta_defconfig @@ -16,15 +16,15 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y -# Compiler -# linux >= 4.4 uses -mcompact-branches which is only available since gcc-6 -BR2_GCC_VERSION_6_X=y - # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_mips64r6el_malta_defconfig b/buildroot/configs/qemu_mips64r6el_malta_defconfig index 2fd855d79..7f4f28a70 100644 --- a/buildroot/configs/qemu_mips64r6el_malta_defconfig +++ b/buildroot/configs/qemu_mips64r6el_malta_defconfig @@ -16,15 +16,15 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y -# Compiler -# linux >= 4.4 uses -mcompact-branches which is only available since gcc-6 -BR2_GCC_VERSION_6_X=y - # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_nios2_10m50_defconfig b/buildroot/configs/qemu_nios2_10m50_defconfig index c07abc371..48d151384 100644 --- a/buildroot/configs/qemu_nios2_10m50_defconfig +++ b/buildroot/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y @@ -11,3 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_or1k_defconfig b/buildroot/configs/qemu_or1k_defconfig index 3fc53f418..60147acd4 100644 --- a/buildroot/configs/qemu_or1k_defconfig +++ b/buildroot/configs/qemu_or1k_defconfig @@ -11,6 +11,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc64_e5500_defconfig b/buildroot/configs/qemu_ppc64_e5500_defconfig index 59b863691..3c71c17e0 100644 --- a/buildroot/configs/qemu_ppc64_e5500_defconfig +++ b/buildroot/configs/qemu_ppc64_e5500_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -19,3 +19,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc64_pseries_defconfig b/buildroot/configs/qemu_ppc64_pseries_defconfig index 5f55b246f..42856a52b 100644 --- a/buildroot/configs/qemu_ppc64_pseries_defconfig +++ b/buildroot/configs/qemu_ppc64_pseries_defconfig @@ -16,6 +16,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc64le_pseries_defconfig b/buildroot/configs/qemu_ppc64le_pseries_defconfig index 8356e4e25..653d11195 100644 --- a/buildroot/configs/qemu_ppc64le_pseries_defconfig +++ b/buildroot/configs/qemu_ppc64le_pseries_defconfig @@ -16,6 +16,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc_g3beige_defconfig b/buildroot/configs/qemu_ppc_g3beige_defconfig index 4b2f3ed2f..acb9d86fb 100644 --- a/buildroot/configs/qemu_ppc_g3beige_defconfig +++ b/buildroot/configs/qemu_ppc_g3beige_defconfig @@ -15,7 +15,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y @@ -23,3 +23,7 @@ BR2_LINUX_KERNEL_VMLINUX=y # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc_mac99_defconfig b/buildroot/configs/qemu_ppc_mac99_defconfig new file mode 100644 index 000000000..496b0fb2a --- /dev/null +++ b/buildroot/configs/qemu_ppc_mac99_defconfig @@ -0,0 +1,30 @@ +# Architecture +BR2_powerpc=y +BR2_powerpc_7400=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 5.2 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.4" +BR2_LINUX_KERNEL_DEFCONFIG="pmac32" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" +BR2_LINUX_KERNEL_VMLINUX=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Filesystem +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc_mpc8544ds_defconfig b/buildroot/configs/qemu_ppc_mpc8544ds_defconfig index 98985b7b7..66bc1d208 100644 --- a/buildroot/configs/qemu_ppc_mpc8544ds_defconfig +++ b/buildroot/configs/qemu_ppc_mpc8544ds_defconfig @@ -15,7 +15,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y @@ -26,3 +26,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_ppc_virtex_ml507_defconfig b/buildroot/configs/qemu_ppc_virtex_ml507_defconfig index eddaf3558..c7c324d5e 100644 --- a/buildroot/configs/qemu_ppc_virtex_ml507_defconfig +++ b/buildroot/configs/qemu_ppc_virtex_ml507_defconfig @@ -15,7 +15,7 @@ BR2_SOFT_FLOAT=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-virtex-ml507/linux.config" BR2_LINUX_KERNEL_VMLINUX=y @@ -24,3 +24,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="virtex440-ml507" # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_riscv32_virt_defconfig b/buildroot/configs/qemu_riscv32_virt_defconfig index fb37da6a8..914eada00 100644 --- a/buildroot/configs/qemu_riscv32_virt_defconfig +++ b/buildroot/configs/qemu_riscv32_virt_defconfig @@ -6,20 +6,26 @@ BR2_RISCV_32=y BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_GLOBAL_PATCH_DIR="board/qemu/riscv32-virt/patches/" # Filesystem BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +# Linux headers same as kernel, a 5.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fe92d7905c6ea0ebeabeb725b8040754ede7c220" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux.config" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.12" +BR2_LINUX_KERNEL_DEFCONFIG="rv32" +BR2_LINUX_KERNEL_IMAGE=y # Bootloader -BR2_TARGET_RISCV_PK=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_USE_PLAT=y +BR2_TARGET_OPENSBI_PLAT="qemu/virt" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_riscv64_virt_defconfig b/buildroot/configs/qemu_riscv64_virt_defconfig index 65dbef413..5c52f7a0f 100644 --- a/buildroot/configs/qemu_riscv64_virt_defconfig +++ b/buildroot/configs/qemu_riscv64_virt_defconfig @@ -4,21 +4,27 @@ BR2_RISCV_64=y # System BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -# Linux headers same as kernel, a 4.20 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y + +# Linux headers same as kernel, a 5.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_IMAGE=y # Bootloader -BR2_TARGET_RISCV_PK=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_USE_PLAT=y +BR2_TARGET_OPENSBI_PLAT="qemu/virt" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_sh4_r2d_defconfig b/buildroot/configs/qemu_sh4_r2d_defconfig index e194d7ecf..c7c5126bf 100644 --- a/buildroot/configs/qemu_sh4_r2d_defconfig +++ b/buildroot/configs/qemu_sh4_r2d_defconfig @@ -17,7 +17,11 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_sh4eb_r2d_defconfig b/buildroot/configs/qemu_sh4eb_r2d_defconfig index f1aad8b64..4d9559a38 100644 --- a/buildroot/configs/qemu_sh4eb_r2d_defconfig +++ b/buildroot/configs/qemu_sh4eb_r2d_defconfig @@ -16,7 +16,11 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_sparc64_sun4u_defconfig b/buildroot/configs/qemu_sparc64_sun4u_defconfig index f4da2bc08..d7be664cb 100644 --- a/buildroot/configs/qemu_sparc64_sun4u_defconfig +++ b/buildroot/configs/qemu_sparc64_sun4u_defconfig @@ -15,6 +15,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_sparc_ss10_defconfig b/buildroot/configs/qemu_sparc_ss10_defconfig index e027b73eb..dada40d46 100644 --- a/buildroot/configs/qemu_sparc_ss10_defconfig +++ b/buildroot/configs/qemu_sparc_ss10_defconfig @@ -15,6 +15,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_x86_64_defconfig b/buildroot/configs/qemu_x86_64_defconfig index afa239693..b561e42e5 100644 --- a/buildroot/configs/qemu_x86_64_defconfig +++ b/buildroot/configs/qemu_x86_64_defconfig @@ -3,18 +3,24 @@ BR2_x86_64=y # System BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY_PORT="tty1" # Filesystem BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" + # Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_x86_defconfig b/buildroot/configs/qemu_x86_defconfig index 3441ad5cb..52f174434 100644 --- a/buildroot/configs/qemu_x86_defconfig +++ b/buildroot/configs/qemu_x86_defconfig @@ -4,18 +4,24 @@ BR2_x86_pentiumpro=y # System BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY_PORT="tty1" # Filesystem BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86/post-build.sh" + # Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_xtensa_lx60_defconfig b/buildroot/configs/qemu_xtensa_lx60_defconfig index 4287e6abe..7cf8c41fd 100644 --- a/buildroot/configs/qemu_xtensa_lx60_defconfig +++ b/buildroot/configs/qemu_xtensa_lx60_defconfig @@ -17,7 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y @@ -26,3 +26,7 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig b/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig index 37b674358..8cb93f2d3 100644 --- a/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig @@ -21,7 +21,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.91" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y @@ -30,3 +30,7 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/buildroot/configs/raspberrypi0_defconfig b/buildroot/configs/raspberrypi0_defconfig index 2c8030d03..38576dd65 100644 --- a/buildroot/configs/raspberrypi0_defconfig +++ b/buildroot/configs/raspberrypi0_defconfig @@ -2,20 +2,22 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same # as the A+ model, just in a different form-factor BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b-plus" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero" + +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set @@ -28,6 +30,7 @@ BR2_PACKAGE_HOST_MTOOLS=y # Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0/post-image.sh" diff --git a/buildroot/configs/raspberrypi0w_defconfig b/buildroot/configs/raspberrypi0w_defconfig index 7149d91ba..f096f2bba 100644 --- a/buildroot/configs/raspberrypi0w_defconfig +++ b/buildroot/configs/raspberrypi0w_defconfig @@ -2,17 +2,18 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y @@ -24,7 +25,8 @@ BR2_PACKAGE_HOST_MTOOLS=y # Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay" diff --git a/buildroot/configs/raspberrypi2_defconfig b/buildroot/configs/raspberrypi2_defconfig index 343ae7b2f..a91683292 100644 --- a/buildroot/configs/raspberrypi2_defconfig +++ b/buildroot/configs/raspberrypi2_defconfig @@ -7,18 +7,20 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_RPI_FIRMWARE=y # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set diff --git a/buildroot/configs/raspberrypi3_64_defconfig b/buildroot/configs/raspberrypi3_64_defconfig index 43687d29f..148769e9d 100644 --- a/buildroot/configs/raspberrypi3_64_defconfig +++ b/buildroot/configs/raspberrypi3_64_defconfig @@ -6,20 +6,22 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b" +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y + +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y -# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -33,4 +35,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--aarch64" +BR2_ROOTFS_POST_SCRIPT_ARGS="--aarch64 --add-miniuart-bt-overlay" diff --git a/buildroot/configs/raspberrypi3_defconfig b/buildroot/configs/raspberrypi3_defconfig index 9ad5b54b7..6441fe57a 100644 --- a/buildroot/configs/raspberrypi3_defconfig +++ b/buildroot/configs/raspberrypi3_defconfig @@ -6,18 +6,20 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_RPI_FIRMWARE=y # Required tools to create the SD image @@ -32,4 +34,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay" diff --git a/buildroot/configs/raspberrypi3_qt5we_defconfig b/buildroot/configs/raspberrypi3_qt5we_defconfig index 276c7cd55..1e954011d 100644 --- a/buildroot/configs/raspberrypi3_qt5we_defconfig +++ b/buildroot/configs/raspberrypi3_qt5we_defconfig @@ -7,18 +7,20 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + # Build Qt5 WebEngine BR2_PACKAGE_LIBERATION=y BR2_PACKAGE_QT5=y @@ -41,9 +43,9 @@ BR2_PACKAGE_HOST_MTOOLS=y # Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="360M" +BR2_TARGET_ROOTFS_EXT2_SIZE="400M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay --gpu_mem_1024=200" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --gpu_mem_1024=200" diff --git a/buildroot/configs/raspberrypi4_64_defconfig b/buildroot/configs/raspberrypi4_64_defconfig new file mode 100644 index 000000000..056b89cec --- /dev/null +++ b/buildroot/configs/raspberrypi4_64_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_ARM_FPU_VFPV4=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" + +# Build the DTB from the kernel sources +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b" +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y + +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64" diff --git a/buildroot/configs/raspberrypi4_defconfig b/buildroot/configs/raspberrypi4_defconfig new file mode 100644 index 000000000..70d6c4573 --- /dev/null +++ b/buildroot/configs/raspberrypi4_defconfig @@ -0,0 +1,38 @@ +BR2_arm=y +BR2_cortex_a72=y +BR2_ARM_FPU_NEON_VFPV4=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" + +# Build the DTB from the kernel sources +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b" + +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay" diff --git a/buildroot/configs/raspberrypi_defconfig b/buildroot/configs/raspberrypi_defconfig index 97573acaf..2d662875d 100644 --- a/buildroot/configs/raspberrypi_defconfig +++ b/buildroot/configs/raspberrypi_defconfig @@ -4,20 +4,22 @@ BR2_ARM_EABIHF=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c)/linux-83b36f98e1a48d143f0b466fcf9f8c4e382c9a1c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_RPI_FIRMWARE=y # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set @@ -29,6 +31,7 @@ BR2_PACKAGE_HOST_MTOOLS=y # Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" diff --git a/buildroot/configs/roseapplepi_defconfig b/buildroot/configs/roseapplepi_defconfig index 327176254..d315a02e1 100644 --- a/buildroot/configs/roseapplepi_defconfig +++ b/buildroot/configs/roseapplepi_defconfig @@ -6,7 +6,11 @@ BR2_ARM_ENABLE_VFP=y BR2_GLOBAL_PATCH_DIR="board/roseapplepi/patches" # Linux headers same as kernel, a 3.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/roseapplepi/post-image.sh" +# kernel does not build with gcc 8.x +BR2_GCC_VERSION_7_X=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/roseapplepi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y diff --git a/buildroot/configs/snps_arc700_axs101_defconfig b/buildroot/configs/snps_arc700_axs101_defconfig index 4f796b438..5d9b5a513 100644 --- a/buildroot/configs/snps_arc700_axs101_defconfig +++ b/buildroot/configs/snps_arc700_axs101_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" BR2_LINUX_KERNEL_DEFCONFIG="axs101" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/snps_archs38_axs103_defconfig b/buildroot/configs/snps_archs38_axs103_defconfig index 456d4cba2..c6e2b10f0 100644 --- a/buildroot/configs/snps_archs38_axs103_defconfig +++ b/buildroot/configs/snps_archs38_axs103_defconfig @@ -9,13 +9,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/snps_archs38_haps_defconfig b/buildroot/configs/snps_archs38_haps_defconfig index 2ef49b4d4..cb5edea2c 100644 --- a/buildroot/configs/snps_archs38_haps_defconfig +++ b/buildroot/configs/snps_archs38_haps_defconfig @@ -7,12 +7,12 @@ BR2_TARGET_GENERIC_HOSTNAME="zebu_hs" BR2_TARGET_GENERIC_ISSUE="Welcome to the HAPS Development Platform" BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" BR2_LINUX_KERNEL_DEFCONFIG="haps_hs_smp" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/buildroot/configs/snps_archs38_hsdk_defconfig b/buildroot/configs/snps_archs38_hsdk_defconfig index 4c337e5ce..646cd99d9 100644 --- a/buildroot/configs/snps_archs38_hsdk_defconfig +++ b/buildroot/configs/snps_archs38_hsdk_defconfig @@ -1,9 +1,9 @@ # Architecture BR2_arcle=y -BR2_archs38=y +BR2_archs38_full=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System BR2_TARGET_GENERIC_HOSTNAME="hsdk" @@ -13,7 +13,7 @@ BR2_SYSTEM_DHCP="eth0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" BR2_LINUX_KERNEL_DEFCONFIG="hsdk" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/synopsys/hsdk/linux.fragment" diff --git a/buildroot/configs/snps_archs38_vdk_defconfig b/buildroot/configs/snps_archs38_vdk_defconfig index f8766cff8..7c7834f9b 100644 --- a/buildroot/configs/snps_archs38_vdk_defconfig +++ b/buildroot/configs/snps_archs38_vdk_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.31" BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/solidrun_clearfog_defconfig b/buildroot/configs/solidrun_clearfog_defconfig index fd6f278aa..b73b9e8ec 100644 --- a/buildroot/configs/solidrun_clearfog_defconfig +++ b/buildroot/configs/solidrun_clearfog_defconfig @@ -33,7 +33,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="clearfog" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/buildroot/configs/solidrun_clearfog_gt_8k_defconfig b/buildroot/configs/solidrun_clearfog_gt_8k_defconfig new file mode 100644 index 000000000..8804ce047 --- /dev/null +++ b/buildroot/configs/solidrun_clearfog_gt_8k_defconfig @@ -0,0 +1,45 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y +BR2_TARGET_GENERIC_HOSTNAME="clearfog-gt-8k" +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for SolidRun Clearfog GT-8K" + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git" +# This commit corresponds to release armada-18.12.2 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="9484123bfe29011ed44b717a23eb53a70b97ce3d" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" +BR2_TARGET_BINARIES_MARVELL=y +BR2_TARGET_MV_DDR_MARVELL=y + +# U-Boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="clearfog_gt_8k" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/uboot-fragment.config" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.14" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/linux-extras.config" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-clearfog-gt-8k" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# rootfs +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/clearfog_gt_8k/post-build-mainline.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/clearfog_gt_8k/genimage.cfg" diff --git a/buildroot/configs/solidrun_macchiatobin_mainline_defconfig b/buildroot/configs/solidrun_macchiatobin_mainline_defconfig index 8e5fbfa4e..e601092d6 100644 --- a/buildroot/configs/solidrun_macchiatobin_mainline_defconfig +++ b/buildroot/configs/solidrun_macchiatobin_mainline_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2=y BR2_TARGET_GENERIC_HOSTNAME="mcbin" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin" @@ -7,20 +7,19 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git" -# This commit corresponds to release armada-18.09.4 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="711ecd32afe465b38052b5ba374c825b158eea18" +# This commit corresponds to release armada-18.12.2 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="9484123bfe29011ed44b717a23eb53a70b97ce3d" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" BR2_TARGET_BINARIES_MARVELL=y -BR2_TARGET_BINARIES_MARVELL_8040=y BR2_TARGET_MV_DDR_MARVELL=y # U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_USE_DEFCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mvebu_mcbin-88f8040" @@ -29,7 +28,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/macchiatobin/uboot-fragme # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.14" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin" diff --git a/buildroot/configs/solidrun_macchiatobin_marvell_defconfig b/buildroot/configs/solidrun_macchiatobin_marvell_defconfig index 4b52e4794..4d269b9f7 100644 --- a/buildroot/configs/solidrun_macchiatobin_marvell_defconfig +++ b/buildroot/configs/solidrun_macchiatobin_marvell_defconfig @@ -14,7 +14,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" BR2_TARGET_BINARIES_MARVELL=y -BR2_TARGET_BINARIES_MARVELL_8040=y BR2_TARGET_MV_DDR_MARVELL=y # U-Boot diff --git a/buildroot/configs/stm32mp157c_dk2_defconfig b/buildroot/configs/stm32mp157c_dk2_defconfig new file mode 100644 index 000000000..273eda46a --- /dev/null +++ b/buildroot/configs/stm32mp157c_dk2_defconfig @@ -0,0 +1,31 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.7" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/linux.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157c-dk2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^metadata_csum" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_basic" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/stm32mp157c-dk2/uboot-fragment.config" +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.stm32" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-dk2" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/toradex_apalis_imx6_defconfig b/buildroot/configs/toradex_apalis_imx6_defconfig index b7ef98049..40a2d2d52 100644 --- a/buildroot/configs/toradex_apalis_imx6_defconfig +++ b/buildroot/configs/toradex_apalis_imx6_defconfig @@ -1,15 +1,15 @@ BR2_arm=y BR2_cortex_a9=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/toradex/apalis-imx6/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.toradex.com/linux-toradex.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="18717e2b1ca9b0fbf8bafa2717719e1f2c8f1114" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="d899927728beca8357a5b4120b690cb3c1d80844" BR2_LINUX_KERNEL_DEFCONFIG="apalis_imx6" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apalis-eval imx6q-apalis-ixora imx6q-apalis_v1_0-eval imx6q-apalis_v1_0-ixora" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apalis-eval imx6q-apalis-ixora imx6q-apalis-ixora-v1.1" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/buildroot/configs/ts4800_defconfig b/buildroot/configs/ts4800_defconfig deleted file mode 100644 index 0999ebcad..000000000 --- a/buildroot/configs/ts4800_defconfig +++ /dev/null @@ -1,22 +0,0 @@ -BR2_arm=y -BR2_cortex_a8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/technologic/ts4800/post-image.sh" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6.3" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/technologic/ts4800/linux.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-ts4800" -BR2_PACKAGE_BUSYBOX_WATCHDOG=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_TS4800_MBRBOOT=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="ts4800" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.07" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/buildroot/configs/ts7680_defconfig b/buildroot/configs/ts7680_defconfig index 829af057a..7eb57ab1c 100644 --- a/buildroot/configs/ts7680_defconfig +++ b/buildroot/configs/ts7680_defconfig @@ -1,11 +1,11 @@ BR2_arm=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-3.14.28-imx28,ff01621df09b97d9fd546d1b49f4013060142892)/linux-ff01621df09b97d9fd546d1b49f4013060142892.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="ts76xx" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/configs/wandboard_defconfig b/buildroot/configs/wandboard_defconfig index d2f72f734..1f42707ef 100644 --- a/buildroot/configs/wandboard_defconfig +++ b/buildroot/configs/wandboard_defconfig @@ -3,11 +3,12 @@ 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.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/wandboard/genimage.cfg" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y @@ -19,7 +20,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.1" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1 imx6qp-wandboard-revd1" diff --git a/buildroot/configs/warp7_defconfig b/buildroot/configs/warp7_defconfig index 95e538fb7..8ee56b8f2 100644 --- a/buildroot/configs/warp7_defconfig +++ b/buildroot/configs/warp7_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" @@ -25,8 +25,8 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="warp7" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03" -BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" +BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y # wifi firmware for brcm43430 BR2_PACKAGE_LINUX_FIRMWARE=y diff --git a/buildroot/docs/manual/adding-packages-asciidoc.txt b/buildroot/docs/manual/adding-packages-asciidoc.txt index d870c5108..f9688b36c 100644 --- a/buildroot/docs/manual/adding-packages-asciidoc.txt +++ b/buildroot/docs/manual/adding-packages-asciidoc.txt @@ -65,8 +65,6 @@ information is (assuming the document name is +foo+) : * +FOO_DEPENDENCIES+, optional, the list of packages (most probably, host-packages) that must be built before building this document. - If a hook of your document needs to access the _Kconfig_ structure, - you may add +prepare-kconfig+ to the list of dependencies. There are also additional hooks (see xref:hooks[] for general information on hooks), that a document may set to define extra actions to be done at diff --git a/buildroot/docs/manual/adding-packages-directory.txt b/buildroot/docs/manual/adding-packages-directory.txt index e6201bb86..4ceb3fd77 100644 --- a/buildroot/docs/manual/adding-packages-directory.txt +++ b/buildroot/docs/manual/adding-packages-directory.txt @@ -322,6 +322,10 @@ use in the comment. ** Dependency symbol: +BR2_INSTALL_LIBSTDCPP+ ** Comment string: `C++` +* D support +** Dependency symbol: +BR2_TOOLCHAIN_HAS_DLANG+ +** Comment string: `Dlang` + * Fortran support ** Dependency symbol: +BR2_TOOLCHAIN_HAS_FORTRAN+ ** Comment string: `fortran` @@ -457,7 +461,7 @@ The hashes stored in that file are used to validate the integrity of the downloaded files and of the license files. The format of this file is one line for each file for which to check the -hash, each line being space-separated, with these three fields: +hash, each line with the following three fields separated by two spaces: * the type of hash, one of: ** +md5+, +sha1+, +sha224+, +sha256+, +sha384+, +sha512+, +none+ @@ -496,10 +500,6 @@ target run. For a package with multiple versions (like Qt5), create the hash file in a subdirectory ++ of that package (see also xref:patch-apply-order[]). -.Note -The number of spaces does not matter, so one can use spaces (or tabs) to -properly align the different fields. - The +none+ hash type is reserved to those archives downloaded from a repository, like a 'git clone', a 'subversion checkout'... @@ -510,22 +510,22 @@ downloaded patch, and an archive with no hash: ---- # Hashes from: http://www.foosoftware.org/download/libfoo-1.2.3.tar.bz2.{sha1,sha256}: -sha1 486fb55c3efa71148fe07895fd713ea3a5ae343a libfoo-1.2.3.tar.bz2 -sha256 efc8103cc3bcb06bda6a781532d12701eb081ad83e8f90004b39ab81b65d4369 libfoo-1.2.3.tar.bz2 +sha1 486fb55c3efa71148fe07895fd713ea3a5ae343a libfoo-1.2.3.tar.bz2 +sha256 efc8103cc3bcb06bda6a781532d12701eb081ad83e8f90004b39ab81b65d4369 libfoo-1.2.3.tar.bz2 # md5 from: http://www.foosoftware.org/download/libfoo-1.2.3.tar.bz2.md5, sha256 locally computed: -md5 2d608f3c318c6b7557d551a5a09314f03452f1a1 libfoo-data.bin -sha256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b libfoo-data.bin +md5 2d608f3c318c6b7557d551a5a09314f03452f1a1 libfoo-data.bin +sha256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b libfoo-data.bin # Locally computed: -sha256 ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9 libfoo-fix-blabla.patch +sha256 ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9 libfoo-fix-blabla.patch # No hash for 1234: -none xxx libfoo-1234.tar.gz +none xxx libfoo-1234.tar.gz # Hash for license files: -sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 COPYING -sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55 doc/COPYING.LGPL +sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 COPYING +sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55 doc/COPYING.LGPL ---- If the +.hash+ file is present, and it contains one or more hashes for a diff --git a/buildroot/docs/manual/adding-packages-generic.txt b/buildroot/docs/manual/adding-packages-generic.txt index 1e2f08cec..ed1e6acf5 100644 --- a/buildroot/docs/manual/adding-packages-generic.txt +++ b/buildroot/docs/manual/adding-packages-generic.txt @@ -142,7 +142,7 @@ All these steps rely on the +$(@D)+ variable, which contains the directory where the source code of the package has been extracted. -On lines 31..43, we define a user that is used by this package (e.g. +On lines 31..33, we define a user that is used by this package (e.g. to run a daemon as non-root) (+LIBFOO_USERS+). On line 35..37, we define a device-node file used by this package @@ -374,9 +374,9 @@ not and can not work as people would expect it should: * +LIBFOO_PATCH_DEPENDENCIES+ lists the dependencies (in terms of package name) that are required for the current package to be patched. These dependencies are guaranteed to be extracted and - patched before the current package is patched. In a similar way, - +HOST_LIBFOO_PATCH_DEPENDENCIES+ lists the dependencies for the - current host package. + patched (but not necessarily built) before the current package is + patched. In a similar way, +HOST_LIBFOO_PATCH_DEPENDENCIES+ lists + the dependencies for the current host package. This is seldom used; usually, +LIBFOO_DEPENDENCIES+ is what you really want to use. @@ -431,13 +431,17 @@ not and can not work as people would expect it should: the +license+ field of the manifest file for this package. + The expected format for this variable must comply with the following rules: ** If different parts of the package are released under different - licenses, then +comma+ separate licenses (e.g. +`LIBFOO_LICENSE = - GPL-2.0+, LGPL-2.1+`+). If there is clear distinction between which - component is licensed under what license, then annotate the license - with that component, between parenthesis (e.g. +`LIBFOO_LICENSE = - GPL-2.0+ (programs), LGPL-2.1+ (libraries)`+). + licenses, then +comma+ separate licenses (e.g. +`LIBFOO_LICENSE = + GPL-2.0+, LGPL-2.1+`+). If there is clear distinction between which + component is licensed under what license, then annotate the license + with that component, between parenthesis (e.g. +`LIBFOO_LICENSE = + GPL-2.0+ (programs), LGPL-2.1+ (libraries)`+). + ** If some licenses are conditioned on a sub-option being enabled, append + the conditional licenses with a comma (e.g.: `FOO_LICENSE += , GPL-2.0+ + (programs)`); the infrastructure will internally remove the space before + the comma. ** If the package is dual licensed, then separate licenses with the - +or+ keyword (e.g. +`LIBFOO_LICENSE = AFL-2.1 or GPL-2.0+`+). + +or+ keyword (e.g. +`LIBFOO_LICENSE = AFL-2.1 or GPL-2.0+`+). * +LIBFOO_LICENSE_FILES+ is a space-separated list of files in the package tarball that contain the license(s) under which the package is released. @@ -484,6 +488,20 @@ not and can not work as people would expect it should: locations, `/lib/firmware`, `/usr/lib/firmware`, `/lib/modules`, `/usr/lib/modules`, and `/usr/share`, which are automatically excluded. +* +LIBFOO_IGNORE_CVES+ is a space-separated list of CVEs that tells + Buildroot CVE tracking tools which CVEs should be ignored for this + package. This is typically used when the CVE is fixed by a patch in + the package, or when the CVE for some reason does not affect the + Buildroot package. A Makefile comment must always precede the + addition of a CVE to this variable. Example: + +---------------------- +# 0001-fix-cve-2020-12345.patch +LIBFOO_IGNORE_CVES += CVE-2020-12345 +# only when built with libbaz, which Buildroot doesn't support +LIBFOO_IGNORE_CVES += CVE-2020-54321 +---------------------- + The recommended way to define these variables is to use the following syntax: @@ -538,12 +556,20 @@ different steps of the build process. should utilize this step if it has binaries which would be similar to the kernel image, bootloader or root filesystem images. -* +LIBFOO_INSTALL_INIT_SYSV+ and +LIBFOO_INSTALL_INIT_SYSTEMD+ list the - actions to install init scripts either for the systemV-like init systems - (busybox, sysvinit, etc.) or for the systemd units. These commands - will be run only when the relevant init system is installed (i.e. if - systemd is selected as the init system in the configuration, only - +LIBFOO_INSTALL_INIT_SYSTEMD+ will be run). +* +LIBFOO_INSTALL_INIT_SYSV+, +LIBFOO_INSTALL_INIT_OPENRC+ and + +LIBFOO_INSTALL_INIT_SYSTEMD+ list the actions to install init + scripts either for the systemV-like init systems (busybox, + sysvinit, etc.), openrc or for the systemd units. These commands + will be run only when the relevant init system is installed (i.e. + if systemd is selected as the init system in the configuration, + only +LIBFOO_INSTALL_INIT_SYSTEMD+ will be run). The only exception + is when openrc is chosen as init system and +LIBFOO_INSTALL_INIT_OPENRC+ + has not been set, in such situation +LIBFOO_INSTALL_INIT_SYSV+ will + be called, since openrc supports sysv init scripts. + When systemd is used as the init system, buildroot will automatically enable + all services using the +systemctl preset-all+ command in the final phase of + image building. You can add preset files to prevent a particular unit from + being automatically enabled by buildroot. * +LIBFOO_HELP_CMDS+ lists the actions to print the package help, which is included to the main +make help+ output. These commands can print @@ -580,6 +606,13 @@ In the action definitions, you can use the following variables: * +$(TARGET_CROSS)+ to get the cross-compilation toolchain prefix * Of course the +$(HOST_DIR)+, +$(STAGING_DIR)+ and +$(TARGET_DIR)+ - variables to install the packages properly. + variables to install the packages properly. Those variables point to + the global _host_, _staging_ and _target_ directories, unless + _per-package directory_ support is used, in which case they point to + the current package _host_, _staging_ and _target_ directories. In + both cases, it doesn't make any difference from the package point of + view: it should simply use +HOST_DIR+, +STAGING_DIR+ and + +TARGET_DIR+. See xref:top-level-parallel-build[] for more details + about _per-package directory_ support. Finally, you can also use hooks. See xref:hooks[] for more information. diff --git a/buildroot/docs/manual/adding-packages-golang.txt b/buildroot/docs/manual/adding-packages-golang.txt index efcf69686..8c467689b 100644 --- a/buildroot/docs/manual/adding-packages-golang.txt +++ b/buildroot/docs/manual/adding-packages-golang.txt @@ -45,13 +45,18 @@ built. ==== +golang-package+ reference In their +Config.in+ file, packages using the +golang-package+ -infrastructure should depend on +BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS+ -and +BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS+ because Buildroot will -automatically add a dependency on +host-go+ to such packages. +infrastructure should depend on +BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS+ +because Buildroot will automatically add a dependency on +host-go+ +to such packages. +If you need CGO support in your package, you must add a dependency on ++BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS+. The main macro of the Go package infrastructure is -+golang-package+. It is similar to the +generic-package+ macro. Only -target packages are supported with +golang-package+. ++golang-package+. It is similar to the +generic-package+ macro. The +ability to build host packages is also available, with the ++host-golang-package+ macro. +Host packages built by +host-golang-package+ macro should depend on +BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS. Just like the generic infrastructure, the Go infrastructure works by defining a number of variables before calling the +golang-package+. diff --git a/buildroot/docs/manual/adding-packages-kconfig.txt b/buildroot/docs/manual/adding-packages-kconfig.txt index 982c1229e..8f40ea609 100644 --- a/buildroot/docs/manual/adding-packages-kconfig.txt +++ b/buildroot/docs/manual/adding-packages-kconfig.txt @@ -43,6 +43,12 @@ This snippet creates the following make targets: options that differ from the default values. It is not possible to use this target when fragment files are set. +* +foo-diff-config+, which outputs the differences between the current + configuration and the one defined in the Buildroot configuration for + this kconfig package. The output is useful to identify the + configuration changes that may have to be propagated to + configuration fragments for example. + and ensures that the source configuration file is copied to the build directory at the right moment. diff --git a/buildroot/docs/manual/adding-packages-meson.txt b/buildroot/docs/manual/adding-packages-meson.txt index 30c338f48..e84bf7f60 100644 --- a/buildroot/docs/manual/adding-packages-meson.txt +++ b/buildroot/docs/manual/adding-packages-meson.txt @@ -97,6 +97,25 @@ will therefore only use a few of them. * +FOO_CONF_OPTS+, to specify additional options to pass to +meson+ for the configuration step. By default, empty. +* +FOO_CFLAGS+, to specify compiler arguments added to the package specific + +cross-compile.conf+ file +c_args+ property. By default, the value of + +TARGET_CFLAGS+. + +* +FOO_CXXFLAGS+, to specify compiler arguments added to the package specific + +cross-compile.conf+ file +cpp_args+ property. By default, the value of + +TARGET_CXXFLAGS+. + +* +FOO_LDFLAGS+, to specify compiler arguments added to the package specific + +cross-compile.conf+ file +c_link_args+ and +cpp_link_args+ properties. By + default, the value of +TARGET_LDFLAGS+. + +* +FOO_MESON_EXTRA_BINARIES+, to specify a space-separated list of programs + to add to the `[binaries]` section of the meson `cross-compilation.conf` + configuration file. The format is `program-name='/path/to/program'`, with + no space around the +=+ sign, and with the path of the program between + single quotes. By default, empty. Note that Buildroot already sets the + correct values for +c+, +cpp+, +ar+, +strip+, and +pkgconfig+. + * +FOO_NINJA_ENV+, to specify additional environment variables to pass to +ninja+, meson companion tool in charge of the build operations. By default, empty. diff --git a/buildroot/docs/manual/adding-packages-tips.txt b/buildroot/docs/manual/adding-packages-tips.txt index d10f276e8..95a1d599e 100644 --- a/buildroot/docs/manual/adding-packages-tips.txt +++ b/buildroot/docs/manual/adding-packages-tips.txt @@ -98,7 +98,7 @@ config snippet. For example, here's how you would test +libcurl+ with ---- $ cat libcurl.config BR2_PACKAGE_LIBCURL=y -BR2_PACKAGE_CURL=y +BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_OPENSSL=y ---- diff --git a/buildroot/docs/manual/common-usage.txt b/buildroot/docs/manual/common-usage.txt index a36301afd..7cfda1036 100644 --- a/buildroot/docs/manual/common-usage.txt +++ b/buildroot/docs/manual/common-usage.txt @@ -88,7 +88,7 @@ to +make+ or set in the environment: Buildroot stores the cached files when using ccache. + * +BR2_DL_DIR+ to override the directory in which - Buildroot stores/retrieves downloaded files + Buildroot stores/retrieves downloaded files. + Note that the Buildroot download directory can also be set from the configuration interface, so through the Buildroot +.config+ file. See @@ -102,6 +102,8 @@ to +make+ or set in the environment: xref:graph-depends[] for the accepted options * +BR2_GRAPH_DOT_OPTS+ is passed verbatim as options to the +dot+ utility to draw the dependency graph. +* +BR2_GRAPH_SIZE_OPTS+ to pass extra options to the size graph; see + xref:graph-size[] for the acepted options An example that uses config files located in the toplevel directory and in your $HOME: @@ -278,6 +280,7 @@ only other format supported is PNG: BR2_GRAPH_OUT=png make graph-build ---------------- +[[graph-size]] === Graphing the filesystem size contribution of packages When your target system grows, it is sometimes useful to understand @@ -314,6 +317,21 @@ Just like for the duration graph, a +BR2_GRAPH_OUT+ environment variable is supported to adjust the output file format. See xref:graph-depends[] for details about this environment variable. +Additionally, one may set the environment variable +BR2_GRAPH_SIZE_OPTS+ +to further control the generated graph. Accepted options are: + +* `--size-limit X`, `-l X`, will group all packages which individual + contribution is below `X` percent, to a single entry labelled _Others_ + in the graph. By default, `X=0.01`, which means packages each + contributing less than 1% are grouped under _Others_. Accepted values + are in the range `[0.0..1.0]`. + +* `--iec`, `--binary`, `--si`, `--decimal`, to use IEC (binary, powers + of 1024) or SI (decimal, powers of 1000; the default) prefixes. + +* `--biggest-first`, to sort packages in decreasing size order, rather + than in increasing size order. + .Note The collected filesystem size data is only meaningful after a complete clean rebuild. Be sure to run +make clean all+ before using +make @@ -329,6 +347,53 @@ Refer to the help text of this script for more details: utils/size-stats-compare -h ---------------- +[[top-level-parallel-build]] +=== Top-level parallel build + +.Note +This section deals with a very experimental feature, which is known to +break even in some non-unusual situations. Use at your own risk. + +Buildroot has always been capable of using parallel build on a per +package basis: each package is built by Buildroot using +make -jN+ (or +the equivalent invocation for non-make-based build systems). The level +of parallelism is by default number of CPUs + 1, but it can be +adjusted using the +BR2_JLEVEL+ configuration option. + +Until 2020.02, Buildroot was however building packages in a serial +fashion: each package was built one after the other, without +parallelization of the build between packages. As of 2020.02, +Buildroot has experimental support for *top-level parallel build*, +which allows some signicant build time savings by building packages +that have no dependency relationship in parallel. This feature is +however marked as experimental and is known not to work in some cases. + +In order to use top-level parallel build, one must: + +. Enable the option +BR2_PER_PACKAGE_DIRECTORIES+ in the Buildroot +configuration + +. Use +make -jN+ when starting the Buildroot build + +Internally, the +BR2_PER_PACKAGE_DIRECTORIES+ will enable a mechanism +called *per-package directories*, which will have the following +effects: + +* Instead of a global _target_ directory and a global _host_ directory + common to all packages, per-package _target_ and _host_ directories + will be used, in +$(O)/per-package//target/+ and + +$(O)/per-package//host/+ respectively. Those folders will be + populated from the corresponding folders of the package dependencies + at the beginning of ++ build. The compiler and all other tools + will therefore only be able to see and access files installed by + dependencies explicitly listed by ++. + +* At the end of the build, the global _target_ and _host_ directories + will be populated, located in +$(O)/target+ and +$(O)/host+ + respectively. This means that during the build, those folders will + be empty and it's only at the very end of the build that they will + be populated. + include::eclipse-integration.txt[] include::advanced.txt[] diff --git a/buildroot/docs/manual/contribute.txt b/buildroot/docs/manual/contribute.txt index f339ca50b..bde7543c2 100644 --- a/buildroot/docs/manual/contribute.txt +++ b/buildroot/docs/manual/contribute.txt @@ -487,3 +487,171 @@ preserve Unix-style line terminators when downloading raw pastes. Following pastebin services are known to work correctly: - https://gist.github.com/ - http://code.bulix.org/ + +=== Using the run-tests framework + +Buildroot includes a run-time testing framework called run-tests built +upon Python scripting and QEMU runtime execution. There are two types of +test cases within the framework, one for build time tests and another for +run-time tests that have a QEMU dependency. The goals of the framework are +the following: + +* build a well defined configuration +* optionally, verify some properties of the build output +* if it is a run-time test: +** boot it under QEMU +** run some test condition to verify that a given feature is working + +The run-tests tool has a series of options documented in the tool's help '-h' +description. Some common options include setting the download folder, the +output folder, keeping build output, and for multiple test cases, you can set +the JLEVEL for each. + +Here is an example walk through of running a test case. + +* For a first step, let us see what all the test case options are. The test +cases can be listed by executing +support/testing/run-tests -l+. These tests +can all be run individually during test development from the console. Both +one at a time and selectively as a group of a subset of tests. + +--------------------- +$ support/testing/run-tests -l +List of tests +test_run (tests.utils.test_check_package.TestCheckPackage) +Test the various ways the script can be called in a simple top to ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainBuildrootMusl) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainCCache) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainCtngMusl) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainLinaroArm) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainSourceryArmv4) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainSourceryArmv5) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainSourceryArmv7) ... ok +[snip] +test_run (tests.init.test_systemd.TestInitSystemSystemdRoFull) ... ok +test_run (tests.init.test_systemd.TestInitSystemSystemdRoIfupdown) ... ok +test_run (tests.init.test_systemd.TestInitSystemSystemdRoNetworkd) ... ok +test_run (tests.init.test_systemd.TestInitSystemSystemdRwFull) ... ok +test_run (tests.init.test_systemd.TestInitSystemSystemdRwIfupdown) ... ok +test_run (tests.init.test_systemd.TestInitSystemSystemdRwNetworkd) ... ok +test_run (tests.init.test_busybox.TestInitSystemBusyboxRo) ... ok +test_run (tests.init.test_busybox.TestInitSystemBusyboxRoNet) ... ok +test_run (tests.init.test_busybox.TestInitSystemBusyboxRw) ... ok +test_run (tests.init.test_busybox.TestInitSystemBusyboxRwNet) ... ok + +Ran 157 tests in 0.021s + +OK +--------------------- + +Those runtime tests are regularly executed by Buildroot Gitlab CI +infrastructure, see .gitlab.yml and https://gitlab.com/buildroot.org/buildroot/-/jobs. + +==== Creating a test case + +The best way to get familiar with how to create a test case is to look at a +few of the basic file system +support/testing/tests/fs/+ and init ++support/testing/tests/init/+ test scripts. Those tests give good examples +of a basic build and build with run type of tests. There are other more +advanced cases that use things like nested +br2-external+ folders to provide +skeletons and additional packages. + +The test cases by default use a br-arm-full-* uClibc-ng toolchain and the +prebuild kernel for a armv5/7 cpu. It is recommended to use the default +defconfig test configuration except when Glibc/musl or a newer kernel are +necessary. By using the default it saves build time and the test would +automatically inherit a kernel/std library upgrade when the default is +updated. + +The basic test case definition involves + +* Creation of a new test file +* Defining a unique test class +* Determining if the default defconfig plus test options can be used +* Implementing a +def test_run(self):+ function to optionally startup the +emulator and provide test case conditions. + +Beyond creating the test script, there are a couple of additional steps that +should be taken once you have your initial test case script. The first is +to add yourself to the +DEVELOPERS+ file to be the maintainer of that test +case. The second is to update the Gitlab CI yml by executing ++make .gitlab-ci.yml+. + +==== Debugging a test case + +Within the Buildroot repository, the testing framework is organized at the +top level in +support/testing/+ by folders of +conf+, +infra+ and +tests+. +All the test cases live under the +test+ folder and are organized in various +folders representing the catagory of test. + +Lets walk through an example. + +* Using the Busybox Init system test case with a read/write rootfs ++tests.init.test_busybox.TestInitSystemBusyboxRw+ +* A minimal set of command line arguments when debugging a test case would +include '-d' which points to your dl folder, '-o' to an output folder, and +'-k' to keep any output on both pass/fail. With those options, the test will +retain logging and build artifacts providing status of the build and +execution of the test case. + +--------------------- +$ support/testing/run-tests -d dl -o output_folder -k tests.init.test_busybox.TestInitSystemBusyboxRw +15:03:26 TestInitSystemBusyboxRw Starting +15:03:28 TestInitSystemBusyboxRw Building +15:08:18 TestInitSystemBusyboxRw Building done +15:08:27 TestInitSystemBusyboxRw Cleaning up +. +Ran 1 test in 301.140s + +OK +--------------------- + +* For the case of a successful build, the +output_folder+ would contain a + folder with the Buildroot build, build log and run-time log. If +the build failed, the console output would show the stage at which it failed +(setup / build / run). Depending on the failure stage, the build/run logs +and/or Buildroot build artifacts can be inspected and instrumented. If the +QEMU instance needs to be launched for additional testing, the first few +lines of the run-time log capture it and it would allow some incremental +testing without re-running +support/testing/run-tests+. + +* You can also make modifications to the current sources inside the ++output_folder+ (e.g. for debug purposes) and rerun the standard +Buildroot make targets (in order to regenerate the complete image with +the new modifications) and then rerun the test. Modifying the sources +directly can speed up debugging compared to adding patch files, wiping the +output directoy, and starting the test again. + +--------------------- +$ ls output_folder/ +TestInitSystemBusyboxRw/ +TestInitSystemBusyboxRw-build.log +TestInitSystemBusyboxRw-run.log +--------------------- + +* The source file used to implement this example test is found under ++support/testing/tests/init/test_busybox.py+. This file outlines the +minimal defconfig that creates the build, QEMU configuration to launch +the built images and the test case assertions. + +To test an existing or new test case within Gitlab CI, there is a method of +invoking a specific test by creating a Buildroot fork in Gitlab under your +account. This can be handy when adding/changing a run-time test or fixing a +bug on a use case tested by a run-time test case. + + +In the examples below, the component of the branch name is a unique +string you choose to identify this specific job being created. + +* to trigger all run-test test case jobs: + +--------------------- + $ git push gitlab HEAD:-runtime-tests +--------------------- + +* to trigger one test case job, a specific branch naming string is used that +includes the full test case name. + +--------------------- + $ git push gitlab HEAD:- +--------------------- diff --git a/buildroot/docs/manual/customize-outside-br.txt b/buildroot/docs/manual/customize-outside-br.txt index b1eed326a..5f7d623ae 100644 --- a/buildroot/docs/manual/customize-outside-br.txt +++ b/buildroot/docs/manual/customize-outside-br.txt @@ -22,7 +22,7 @@ place project-specific customizations in two locations: One can tell Buildroot to use one or more br2-external trees by setting the +BR2_EXTERNAL+ make variable set to the path(s) of the br2-external tree(s) to use. It can be passed to any Buildroot +make+ invocation. It -is automatically saved in the hidden +.br-external.mk+ file in the output +is automatically saved in the hidden +.br2-external.mk+ file in the output directory. Thanks to this, there is no need to pass +BR2_EXTERNAL+ at every +make+ invocation. It can however be changed at any time by passing a new value, and can be removed by passing an empty value. @@ -81,7 +81,8 @@ in the following chapters: Apart from those mandatory files, there may be additional and optional content that may be present in a br2-external tree, like the +configs/+ -directory. They are described in the following chapters as well. +or +provides/+ directories. They are described in the following chapters +as well. A complete example br2-external tree layout is also described later. @@ -186,6 +187,22 @@ the one from the last br2-external tree is used. It is thus possible to override a defconfig bundled in Buildroot or another br2-external tree. +===== The +provides/+ directory + +For some packages, Buildroot provides a choice between two (or more) +implementations of API-compatible such packages. For example, there is +a choice to choose either libjpeg ot jpeg-turbo, and another choice +between openssl or libressl. Finally, there is a choice to select one +of the known, pre-configured toolchains. + +It is possible for a br2-external to extend those choices, by providing +a set of files that define those alternatives: + +* +provides/toolchains.in+ defines the pre-configured toolchains, which + will then be listed in the toolchain selection; +* +provides/jpeg.in+ defines the alternative libjpeg implementations; +* +provides/openssl.in+ defines the alternative openssl implementations. + ===== Free-form content One can store all the board-specific configuration files there, such @@ -202,6 +219,12 @@ BR2_ROOTFS_OVERLAY=$(BR2_EXTERNAL_BAR_42_PATH)/board//overlay/ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_PATH)/board//kernel.config ---- +===== Additional Linux kernel extensions + +Additional Linux kernel extensions (see xref:linux-kernel-ext[]) can +be added by storing them in the `linux/` directory at the root of a +br2-external tree. + ===== Example layout Here is an example layout using all features of br2-external (the sample @@ -217,8 +240,10 @@ illustration, of course): | `---- | |- Config.in + | |source "$BR2_EXTERNAL_BAR_42_PATH/toolchain/toolchain-external-mine/Config.in.options" | |source "$BR2_EXTERNAL_BAR_42_PATH/package/pkg-1/Config.in" | |source "$BR2_EXTERNAL_BAR_42_PATH/package/pkg-2/Config.in" + | |source "$BR2_EXTERNAL_BAR_42_PATH/package/my-jpeg/Config.in" | | | |config BAR_42_FLASH_ADDR | | hex "my-board flash address" @@ -227,6 +252,7 @@ illustration, of course): | |- external.mk | |include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk)) + | |include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/toolchain/*/*.mk)) | | | |flash-my-board: | | $(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/flash-image \ @@ -259,6 +285,50 @@ illustration, of course): |- package/pkg-2/pkg-2.hash |- package/pkg-2/pkg-2.mk | + |- provides/jpeg.in + | |config BR2_PACKAGE_MY_JPEG + | | bool "my-jpeg" + | `---- + |- package/my-jpeg/Config.in + | |config BR2_PACKAGE_PROVIDES_JPEG + | | default "my-jpeg" if BR2_PACKAGE_MY_JPEG + | `---- + |- package/my-jpeg/my-jpeg.mk + | |# This is a normal package .mk file + | |MY_JPEG_VERSION = 1.2.3 + | |MY_JPEG_SITE = https://example.net/some/place + | |MY_JPEG_PROVIDES = jpeg + | |$(eval $(autotools-package)) + | `---- + | + |- provides/toolchains.in + | |config BR2_TOOLCHAIN_EXTERNAL_MINE + | | bool "my custom toolchain" + | | depends on BR2_some_arch + | | select BR2_INSTALL_LIBSTDCPP + | `---- + |- toolchain/toolchain-external-mine/Config.in.options + | |if BR2_TOOLCHAIN_EXTERNAL_MINE + | |config BR2_TOOLCHAIN_EXTERNAL_PREFIX + | | default "arch-mine-linux-gnu" + | |config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + | | default "toolchain-external-mine" + | |endif + | `---- + |- toolchain/toolchain-external-mine/toolchain-external-mine.mk + | |TOOLCHAIN_EXTERNAL_MINE_SITE = https://example.net/some/place + | |TOOLCHAIN_EXTERNAL_MINE_SOURCE = my-toolchain.tar.gz + | |$(eval $(toolchain-external-package)) + | `---- + | + |- linux/Config.ext.in + | |config BR2_LINUX_KERNEL_EXT_EXAMPLE_DRIVER + | | bool "example-external-driver" + | | help + | | Example external driver + | |--- + |- linux/linux-ext-example-driver.mk + | |- configs/my-board_defconfig | |BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BAR_42_PATH)/patches/" | |BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/overlay/" @@ -311,3 +381,35 @@ External options ---> [ ] foo [ ] bar ---- + +Additionally, the jpeg provider will be visible in the jpeg choice: + +---- +Target packages ---> + Libraries ---> + Graphics ---> + [*] jpeg support + jpeg variant () ---> + ( ) jpeg + ( ) jpeg-turbo + *** jpeg from: Example br2-external tree *** + (X) my-jpeg + *** jpeg from: FOO_27 *** + ( ) another-jpeg +---- + +And similarly for the toolchains: + +---- +Toolchain ---> + Toolchain () ---> + ( ) Custom toolchain + *** Toolchains from: Example br2-external tree *** + (X) my custom toolchain +---- + +.Note +The toolchain options in +toolchain/toolchain-external-mine/Config.in.options+ +will not appear in the `Toolchain` menu. They must be explicitly included +from within the br2-external's top-level +Config.in+ and will thus appear +in the `External options` menu. diff --git a/buildroot/docs/manual/customize-patches.txt b/buildroot/docs/manual/customize-patches.txt index fa6354111..eb98d1bea 100644 --- a/buildroot/docs/manual/customize-patches.txt +++ b/buildroot/docs/manual/customize-patches.txt @@ -53,7 +53,7 @@ directory. The exception to +BR2_GLOBAL_PATCH_DIR+ being the preferred method for specifying custom patches is +BR2_LINUX_KERNEL_PATCH+. +BR2_LINUX_KERNEL_PATCH+ should be used to specify kernel patches that -are available at an URL. *Note:* +BR2_LINUX_KERNEL_PATCH+ specifies kernel +are available at a URL. *Note:* +BR2_LINUX_KERNEL_PATCH+ specifies kernel patches that are applied after patches available in +BR2_GLOBAL_PATCH_DIR+, as it is done from a post-patch hook of the Linux package. diff --git a/buildroot/docs/manual/customize-rootfs.txt b/buildroot/docs/manual/customize-rootfs.txt index 6b72a37b3..e1dbadda5 100644 --- a/buildroot/docs/manual/customize-rootfs.txt +++ b/buildroot/docs/manual/customize-rootfs.txt @@ -145,7 +145,7 @@ It is recommended to use the existing mechanisms to set file permissions The difference between post-build scripts (above) and fakeroot scripts, is that post-build scripts are not called in the fakeroot context. + -.Note; +.Note: Using `fakeroot` is not an absolute substitute for actually being root. `fakeroot` only ever fakes the file access rights and types (regular, block-or-char device...) and uid/gid; these are emulated in-memory. diff --git a/buildroot/docs/manual/faq-troubleshooting.txt b/buildroot/docs/manual/faq-troubleshooting.txt index b144c9e7f..5adf3fa6c 100644 --- a/buildroot/docs/manual/faq-troubleshooting.txt +++ b/buildroot/docs/manual/faq-troubleshooting.txt @@ -239,3 +239,6 @@ help reduce the build time: * Buy new hardware. SSDs and lots of RAM are key to speeding up the builds. + + * Experiment with top-level parallel build, see + xref:top-level-parallel-build[]. diff --git a/buildroot/docs/manual/legal-notice.txt b/buildroot/docs/manual/legal-notice.txt index 69753282e..179aa6b17 100644 --- a/buildroot/docs/manual/legal-notice.txt +++ b/buildroot/docs/manual/legal-notice.txt @@ -67,9 +67,8 @@ for packages released under BSD-like licenses, that you are not required to redistribute in source form. Moreover, due to technical limitations, Buildroot does not produce some -material that you will or may need, such as the toolchain source code and the -Buildroot source code itself (including patches to packages for which source -distribution is required). +material that you will or may need, such as the toolchain source code for +some of the external toolchains and the Buildroot source code itself. When you run +make legal-info+, Buildroot produces warnings in the +README+ file to inform you of relevant material that could not be saved. diff --git a/buildroot/docs/manual/make-tips.txt b/buildroot/docs/manual/make-tips.txt index ea1d825be..869b6807d 100644 --- a/buildroot/docs/manual/make-tips.txt +++ b/buildroot/docs/manual/make-tips.txt @@ -80,18 +80,18 @@ to xref:ccache[]. .Dumping the internal make variables: -One can dump all the variables known to make, along with their values: +One can dump the variables known to make, along with their values: ---- - $ make -s printvars - VARIABLE=value_of_variable - ... + $ make -s printvars VARS='VARIABLE1 VARIABLE2' + VARIABLE1=value_of_variable + VARIABLE2=value_of_variable ---- It is possible to tweak the output using some variables: - +VARS+ will limit the listing to variables which names match the - specified make-pattern + specified make-patterns - this must be set else nothing is printed - +QUOTED_VARS+, if set to +YES+, will single-quote the value - +RAW_VARS+, if set to +YES+, will print the unexpanded value diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index 48f7cb006..3977e9f33 100644 --- a/buildroot/docs/manual/manual.html +++ b/buildroot/docs/manual/manual.html @@ -1,9 +1,9 @@ -The Buildroot user manual

The Buildroot user manual


Table of Contents

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

Buildroot 2019.02.9 manual generated on 2020-01-12 -15:28:43 UTC from git revision 24f25c8d23

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

The Buildroot user manual


Table of Contents

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

Buildroot 2020.02.1 manual generated on 2020-04-10 +20:44:54 UTC from git revision 80e565bbeb

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

Copyright © 2004-2019 The Buildroot developers

logo.png

Part I. Getting started

Chapter 1. About Buildroot

Buildroot is a tool that simplifies and automates the process of +COPYING +file in the Buildroot sources for the full text of this license.

Copyright © 2004-2020 The Buildroot developers

logo.png

Part I. Getting started

Chapter 1. About Buildroot

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

In order to achieve this, Buildroot is able to generate a cross-compilation toolchain, a root filesystem, a Linux kernel image @@ -16,8 +16,8 @@ processors everyone is used to having in his PC. They can be PowerPC processors, MIPS processors, ARM processors, etc.

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



[1] BSP: Board Support Package

[2] SDK: Software Development Kit

Chapter 2. System requirements

Buildroot is designed to run on Linux systems.

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



[1] BSP: Board Support Package

[2] SDK: Software Development Kit

Chapter 2. System requirements

Buildroot is designed to run on Linux systems.

While Buildroot itself will build most host packages it needs for the compilation, certain standard Linux utilities are expected to be already installed on the host system. Below you will find an overview of the mandatory and optional packages (note that package names may vary @@ -34,9 +34,9 @@ Build tools:

  • build-essential (only for Debian based systems)
  • -gcc (version 4.4 or any later) +gcc (version 4.8 or any later)
  • -g++ (version 4.4 or any later) +g++ (version 4.8 or any later)
  • bash
  • @@ -52,8 +52,6 @@ Build tools:
  • cpio
  • -python (version 2.7 or any later) -
  • unzip
  • rsync @@ -66,13 +64,19 @@ Source fetching tools:

    • wget
  • 2.2. Optional packages

    • +Recommended dependencies: +

      Some features or utilities in Buildroot, like the legal-info, or the +graph generation tools, have additional dependencies. Although they +are not mandatory for a simple build, they are still highly recommended:

      • +python (version 2.7 or any later) +
    • Configuration interface dependencies:

      For these libraries, you need to install both runtime and development data, which in many distributions are packaged separately. The development packages typically have a -dev or -devel suffix.

      • ncurses5 to use the menuconfig interface
      • -qt4 to use the xconfig interface +qt5 to use the xconfig interface
      • glib2, gtk2 and glade2 to use the gconfig interface
    • @@ -146,10 +150,10 @@ to get the dependencies of your favorite interface.

      For each menu entry in help that describes the purpose of the entry. Refer to Chapter 6, Buildroot configuration for details on some specific configuration aspects.

      Once everything is configured, the configuration tool generates a .config file that contains the entire configuration. This file will be -read by the top-level Makefile.

      To start the build process, simply run:

       $ make

      You should never use make -jN with Buildroot: top-level parallel -make is currently not supported. Instead, use the BR2_JLEVEL option -to tell Buildroot to run the compilation of each individual package -with make -jN.

      The make command will generally perform the following steps:

      • +read by the top-level Makefile.

        To start the build process, simply run:

         $ make

        By default, Buildroot does not support top-level parallel build, so +running make -jN is not necessary. There is however experimental +support for top-level parallel build, see +Section 8.11, “Top-level parallel build”.

        The make command will generally perform the following steps:

        • download source files (as required);
        • configure, build and install the cross-compilation toolchain, or @@ -273,7 +277,7 @@ processor. Under most Linux systems, the compilation toolchain uses the GNU libc (glibc) as the C standard library. This compilation toolchain is called the "host compilation toolchain". The machine on which it is running, and on which you’re working, is called the "host -system" [3].

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

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

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

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



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



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

      Chapter 7. Configuration of other components

      Before attempting to modify any of the components below, make sure you have already configured Buildroot itself, and have enabled the @@ -645,11 +649,11 @@ A few tools are required to build the documentation (see: Section 2.2, “Optional packages”).

    Resetting Buildroot for a new target: To delete all build products as well as the configuration:

     $ make distclean

    Notes. If ccache is enabled, running make clean or distclean does not empty the compiler cache used by Buildroot. To delete it, refer -to Section 8.12.3, “Using ccache in Buildroot”.

    Dumping the internal make variables: One can dump all the variables known to make, along with their values:

     $ make -s printvars
    - VARIABLE=value_of_variable
    - ...

    It is possible to tweak the output using some variables:

    • +to Section 8.13.3, “Using ccache in Buildroot”.

      Dumping the internal make variables: One can dump the variables known to make, along with their values:

       $ make -s printvars VARS='VARIABLE1 VARIABLE2'
      + VARIABLE1=value_of_variable
      + VARIABLE2=value_of_variable

      It is possible to tweak the output using some variables:

      • VARS will limit the listing to variables which names match the - specified make-pattern + specified make-patterns - this must be set else nothing is printed
      • QUOTED_VARS, if set to YES, will single-quote the value
      • @@ -771,7 +775,7 @@ stored in the package build directory, .stamp_<step-name>. The commands detailed above simply manipulate these stamp files to force Buildroot to restart a specific set of steps of a package build process.

        Further details about package special make targets are explained in -Section 8.12.5, “Package-specific make targets”.

      8.4. Offline builds

      If you intend to do an offline build and just want to download +Section 8.13.5, “Package-specific make targets”.

      8.4. Offline builds

      If you intend to do an offline build and just want to download all sources that you previously selected in the configurator (menuconfig, nconfig, xconfig or gconfig), then issue:

       $ make source

      You can now disconnect or copy the content of your dl directory to the build-host.

      8.5. Building out-of-tree

      As default, everything built by Buildroot is stored in the directory @@ -814,11 +818,11 @@ to make or set in the environment:

      BR2_DL_DIR to override the directory in which - Buildroot stores/retrieves downloaded files + Buildroot stores/retrieves downloaded files. Note that the Buildroot download directory can also be set from the configuration interface, so through the Buildroot .config file. See - Section 8.12.4, “Location of downloaded packages” for more details on how you can set the download + Section 8.13.4, “Location of downloaded packages” for more details on how you can set the download directory.
    • BR2_GRAPH_ALT, if set and non-empty, to use an alternate color-scheme in @@ -832,6 +836,9 @@ to make or set in the environment:

      BR2_GRAPH_DOT_OPTS is passed verbatim as options to the dot utility to draw the dependency graph. +
    • +BR2_GRAPH_SIZE_OPTS to pass extra options to the size graph; see + Section 8.10, “Graphing the filesystem size contribution of packages” for the acepted options

    An example that uses config files located in the toplevel directory and in your $HOME:

     $ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config

    If you want to use a compiler other than the default gcc or g++ for building helper-binaries on your host, then do

     $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD

    8.7. Dealing efficiently with filesystem images

    Filesystem images can get pretty big, depending on the filesystem you choose, @@ -924,7 +931,7 @@ most distributions), and also the argparse module i Python version older than 2.7 (python-argparse on most distributions).

    By default, the output format for the graph is PDF, but a different format can be selected using the BR2_GRAPH_OUT environment variable. The -only other format supported is PNG:

    BR2_GRAPH_OUT=png make graph-build

    8.10. Graphing the filesystem size contribution of packages

    When your target system grows, it is sometimes useful to understand +only other format supported is PNG:

    BR2_GRAPH_OUT=png make graph-build

    8.10. Graphing the filesystem size contribution of packages

    When your target system grows, it is sometimes useful to understand how much each Buildroot package is contributing to the overall root filesystem size. To help with such an analysis, Buildroot collects data about files installed by each package and using this data, @@ -944,13 +951,59 @@ installed (python-matplotlib on most distributions) argparse module if you’re using a Python version older than 2.7 (python-argparse on most distributions).

    Just like for the duration graph, a BR2_GRAPH_OUT environment variable is supported to adjust the output file format. See Section 8.8, “Graphing the dependencies between packages” -for details about this environment variable.

    Note. The collected filesystem size data is only meaningful after a complete +for details about this environment variable.

    Additionally, one may set the environment variable BR2_GRAPH_SIZE_OPTS +to further control the generated graph. Accepted options are:

    • +--size-limit X, -l X, will group all packages which individual + contribution is below X percent, to a single entry labelled Others + in the graph. By default, X=0.01, which means packages each + contributing less than 1% are grouped under Others. Accepted values + are in the range [0.0..1.0]. +
    • +--iec, --binary, --si, --decimal, to use IEC (binary, powers + of 1024) or SI (decimal, powers of 1000; the default) prefixes. +
    • +--biggest-first, to sort packages in decreasing size order, rather + than in increasing size order. +

    Note. The collected filesystem size data is only meaningful after a complete clean rebuild. Be sure to run make clean all before using make graph-size.

    To compare the root filesystem size of two different Buildroot compilations, for example after adjusting the configuration or when switching to another Buildroot release, use the size-stats-compare script. It takes two file-size-stats.csv files (produced by make graph-size) as input. -Refer to the help text of this script for more details:

    utils/size-stats-compare -h

    8.11. Integration with Eclipse

    While a part of the embedded Linux developers like classical text +Refer to the help text of this script for more details:

    utils/size-stats-compare -h

    8.11. Top-level parallel build

    Note. This section deals with a very experimental feature, which is known to +break even in some non-unusual situations. Use at your own risk.

    Buildroot has always been capable of using parallel build on a per +package basis: each package is built by Buildroot using make -jN (or +the equivalent invocation for non-make-based build systems). The level +of parallelism is by default number of CPUs + 1, but it can be +adjusted using the BR2_JLEVEL configuration option.

    Until 2020.02, Buildroot was however building packages in a serial +fashion: each package was built one after the other, without +parallelization of the build between packages. As of 2020.02, +Buildroot has experimental support for top-level parallel build, +which allows some signicant build time savings by building packages +that have no dependency relationship in parallel. This feature is +however marked as experimental and is known not to work in some cases.

    In order to use top-level parallel build, one must:

    1. +Enable the option BR2_PER_PACKAGE_DIRECTORIES in the Buildroot +configuration +
    2. +Use make -jN when starting the Buildroot build +

    Internally, the BR2_PER_PACKAGE_DIRECTORIES will enable a mechanism +called per-package directories, which will have the following +effects:

    • +Instead of a global target directory and a global host directory + common to all packages, per-package target and host directories + will be used, in $(O)/per-package/<pkg>/target/ and + $(O)/per-package/<pkg>/host/ respectively. Those folders will be + populated from the corresponding folders of the package dependencies + at the beginning of <pkg> build. The compiler and all other tools + will therefore only be able to see and access files installed by + dependencies explicitly listed by <pkg>. +
    • +At the end of the build, the global target and host directories + will be populated, located in $(O)/target and $(O)/host + respectively. This means that during the build, those folders will + be empty and it’s only at the very end of the build that they will + be populated. +

    8.12. Integration with Eclipse

    While a part of the embedded Linux developers like classical text editors like Vim or Emacs, and command-line based interfaces, a number of other embedded Linux developers like richer graphical interfaces to do their development work. Eclipse being one of the most popular @@ -972,7 +1025,7 @@ Start Eclipse to develop, execute and debug your own custom and installed by Buildroot.

    The Buildroot Eclipse integration installation process and usage is described in detail at -https://github.com/mbats/eclipse-buildroot-bundle/wiki.

    8.12. Advanced usage

    8.12.1. Using the generated toolchain outside Buildroot

    You may want to compile, for your target, your own programs or other +https://github.com/mbats/eclipse-buildroot-bundle/wiki.

    8.13. Advanced usage

    8.13.1. Using the generated toolchain outside Buildroot

    You may want to compile, for your target, your own programs or other software that are not packaged in Buildroot. In order to do this you can use the toolchain that was generated by Buildroot.

    The toolchain generated by Buildroot is located by default in output/host/. The simplest way to use it is to add @@ -990,7 +1043,7 @@ sure all paths are updated with the new location.

    Alternatively, if you ju the tarball (e.g. because you will just be moving the host directory, or will be generating the tarball on your own), Buildroot also allows you to just prepare the SDK with make prepare-sdk without actually -generating a tarball.

    8.12.2. Using gdb in Buildroot

    Buildroot allows to do cross-debugging, where the debugger runs on the +generating a tarball.

    8.13.2. Using gdb in Buildroot

    Buildroot allows to do cross-debugging, where the debugger runs on the build machine and communicates with gdbserver on the target to control the execution of the program.

    To achieve this:

    • If you are using an internal toolchain (built by Buildroot), you @@ -1011,7 +1064,7 @@ command line:

      <buildroot>/output/host/bin/<tuple
       with debugging symbols. Typically you start this command from the
       directory where foo is built (and not from output/target/ as the
       binaries in that directory are stripped).

      The <buildroot>/output/staging/usr/share/buildroot/gdbinit file will tell the -cross gdb where to find the libraries of the target.

      Finally, to connect to the target from the cross gdb:

      (gdb) target remote <target ip address>:2345

    8.12.3. Using ccache in Buildroot

    ccache is a compiler cache. It stores the +cross gdb where to find the libraries of the target.

    Finally, to connect to the target from the cross gdb:

    (gdb) target remote <target ip address>:2345

    8.13.3. Using ccache in Buildroot

    ccache is a compiler cache. It stores the object files resulting from each compilation process, and is able to skip future compilation of the same source file (with same compiler and same arguments) by using the pre-existing object files. When doing @@ -1039,7 +1092,7 @@ relative paths in the object file. Therefore, for example, the debugger will no longer find the file, unless you cd to the output directory first.

    See the ccache manual’s section on "Compiling in different directories" for -more details about this rewriting of absolute paths.

    8.12.4. Location of downloaded packages

    The various tarballs that are downloaded by Buildroot are all stored +more details about this rewriting of absolute paths.

    8.13.4. Location of downloaded packages

    The various tarballs that are downloaded by Buildroot are all stored in BR2_DL_DIR, which by default is the dl directory. If you want to keep a complete version of Buildroot which is known to be working with the associated tarballs, you can make a copy of this directory. @@ -1050,7 +1103,7 @@ shared download location. This can be achieved by pointing the set, then the value of BR2_DL_DIR in the Buildroot configuration is overridden. The following line should be added to <~/.bashrc>.

     export BR2_DL_DIR=<shared download location>

    The download location can also be set in the .config file, with the BR2_DL_DIR option. Unlike most options in the .config file, this value -is overridden by the BR2_DL_DIR environment variable.

    8.12.5. Package-specific make targets

    Running make <package> builds and installs that particular package +is overridden by the BR2_DL_DIR environment variable.

    8.13.5. Package-specific make targets

    Running make <package> builds and installs that particular package and its dependencies.

    For packages relying on the Buildroot infrastructure, there are numerous special make targets that can be called independently like this:

    make <package>-<target>

    The package build targets are (in the order they are executed):

    command/target Description

    source

    Fetch the source (download the tarball, clone @@ -1074,7 +1127,7 @@ graphs.

    OVERRIDE_SRCDIR feature or when you modified a file directly in the build directory

    reconfigure

    Re-run the configure commands, then rebuild - this only makes sense when using the OVERRIDE_SRCDIR feature or when you modified a -file directly in the build directory

    8.12.6. Using Buildroot during development

    The normal operation of Buildroot is to download a tarball, extract +file directly in the build directory

    8.13.6. Using Buildroot during development

    The normal operation of Buildroot is to download a tarball, extract it, configure, compile and install the software component found inside this tarball. The source code is extracted in output/build/<package>-<version>, which is a temporary directory: @@ -1270,7 +1323,7 @@ outside of the Buildroot tree, using the br2-external

    One can tell Buildroot to use one or more br2-external trees by setting the BR2_EXTERNAL make variable set to the path(s) of the br2-external tree(s) to use. It can be passed to any Buildroot make invocation. It -is automatically saved in the hidden .br-external.mk file in the output +is automatically saved in the hidden .br2-external.mk file in the output directory. Thanks to this, there is no need to pass BR2_EXTERNAL at every make invocation. It can however be changed at any time by passing a new value, and can be removed by passing an empty value.

    Note. The path to a br2-external tree can be either absolute or relative. @@ -1289,7 +1342,8 @@ in the following chapters:

      Config.in

    Apart from those mandatory files, there may be additional and optional content that may be present in a br2-external tree, like the configs/ -directory. They are described in the following chapters as well.

    A complete example br2-external tree layout is also described later.

    The external.desc file

    That file describes the br2-external tree: the name and description +or provides/ directories. They are described in the following chapters +as well.

    A complete example br2-external tree layout is also described later.

    The external.desc file

    That file describes the br2-external tree: the name and description for that br2-external tree.

    The format for this file is line based, with each line starting by a keyword, followed by a colon and one or more spaces, followed by the value assigned to that keyword. There are two keywords currently @@ -1346,7 +1400,19 @@ normal make <name>_defconfig command. They wi contains the name of the br2-external tree they are defined in.

    Note: If a defconfig file is present in more than one br2-external tree, then the one from the last br2-external tree is used. It is thus possible to override a defconfig bundled in Buildroot or another br2-external -tree.

    Free-form content

    One can store all the board-specific configuration files there, such +tree.

    The provides/ directory

    For some packages, Buildroot provides a choice between two (or more) +implementations of API-compatible such packages. For example, there is +a choice to choose either libjpeg ot jpeg-turbo, and another choice +between openssl or libressl. Finally, there is a choice to select one +of the known, pre-configured toolchains.

    It is possible for a br2-external to extend those choices, by providing +a set of files that define those alternatives:

    • +provides/toolchains.in defines the pre-configured toolchains, which + will then be listed in the toolchain selection; +
    • +provides/jpeg.in defines the alternative libjpeg implementations; +
    • +provides/openssl.in defines the alternative openssl implementations. +

    Free-form content

    One can store all the board-specific configuration files there, such as the kernel configuration, the root filesystem overlay, or any other configuration file for which Buildroot allows to set the location (by using the BR2_EXTERNAL_$(NAME)_PATH variable). For example, you @@ -1354,7 +1420,9 @@ could set the paths to a global patch directory, to a rootfs overlay and to the kernel configuration file as follows (e.g. by running make menuconfig and filling in these options):

    BR2_GLOBAL_PATCH_DIR=$(BR2_EXTERNAL_BAR_42_PATH)/patches/
     BR2_ROOTFS_OVERLAY=$(BR2_EXTERNAL_BAR_42_PATH)/board/<boardname>/overlay/
    -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_PATH)/board/<boardname>/kernel.config

    Example layout

    Here is an example layout using all features of br2-external (the sample +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_PATH)/board/<boardname>/kernel.config

    Additional Linux kernel extensions

    Additional Linux kernel extensions (see Section 17.20.2, “linux-kernel-extensions”) can +be added by storing them in the linux/ directory at the root of a +br2-external tree.

    Example layout

    Here is an example layout using all features of br2-external (the sample content is shown for the file above it, when it is relevant to explain the br2-external tree; this is all entirely made up just for the sake of illustration, of course):

    /path/to/br2-ext-tree/
    @@ -1364,8 +1432,10 @@ illustration, of course):

    /path/to/br2-ext-tree/
       |     `----
       |
       |- Config.in
    +  |     |source "$BR2_EXTERNAL_BAR_42_PATH/toolchain/toolchain-external-mine/Config.in.options"
       |     |source "$BR2_EXTERNAL_BAR_42_PATH/package/pkg-1/Config.in"
       |     |source "$BR2_EXTERNAL_BAR_42_PATH/package/pkg-2/Config.in"
    +  |     |source "$BR2_EXTERNAL_BAR_42_PATH/package/my-jpeg/Config.in"
       |     |
       |     |config BAR_42_FLASH_ADDR
       |     |    hex "my-board flash address"
    @@ -1374,6 +1444,7 @@ illustration, of course):

    /path/to/br2-ext-tree/
       |
       |- external.mk
       |     |include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk))
    +  |     |include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/toolchain/*/*.mk))
       |     |
       |     |flash-my-board:
       |     |    $(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/flash-image \
    @@ -1406,6 +1477,50 @@ illustration, of course):

    /path/to/br2-ext-tree/
       |- package/pkg-2/pkg-2.hash
       |- package/pkg-2/pkg-2.mk
       |
    +  |- provides/jpeg.in
    +  |     |config BR2_PACKAGE_MY_JPEG
    +  |     |    bool "my-jpeg"
    +  |     `----
    +  |- package/my-jpeg/Config.in
    +  |     |config BR2_PACKAGE_PROVIDES_JPEG
    +  |     |    default "my-jpeg" if BR2_PACKAGE_MY_JPEG
    +  |     `----
    +  |- package/my-jpeg/my-jpeg.mk
    +  |     |# This is a normal package .mk file
    +  |     |MY_JPEG_VERSION = 1.2.3
    +  |     |MY_JPEG_SITE = https://example.net/some/place
    +  |     |MY_JPEG_PROVIDES = jpeg
    +  |     |$(eval $(autotools-package))
    +  |     `----
    +  |
    +  |- provides/toolchains.in
    +  |     |config BR2_TOOLCHAIN_EXTERNAL_MINE
    +  |     |    bool "my custom toolchain"
    +  |     |    depends on BR2_some_arch
    +  |     |    select BR2_INSTALL_LIBSTDCPP
    +  |     `----
    +  |- toolchain/toolchain-external-mine/Config.in.options
    +  |     |if BR2_TOOLCHAIN_EXTERNAL_MINE
    +  |     |config BR2_TOOLCHAIN_EXTERNAL_PREFIX
    +  |     |    default "arch-mine-linux-gnu"
    +  |     |config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL
    +  |     |    default "toolchain-external-mine"
    +  |     |endif
    +  |     `----
    +  |- toolchain/toolchain-external-mine/toolchain-external-mine.mk
    +  |     |TOOLCHAIN_EXTERNAL_MINE_SITE = https://example.net/some/place
    +  |     |TOOLCHAIN_EXTERNAL_MINE_SOURCE = my-toolchain.tar.gz
    +  |     |$(eval $(toolchain-external-package))
    +  |     `----
    +  |
    +  |- linux/Config.ext.in
    +  |     |config BR2_LINUX_KERNEL_EXT_EXAMPLE_DRIVER
    +  |     |    bool "example-external-driver"
    +  |     |    help
    +  |     |      Example external driver
    +  |     |---
    +  |- linux/linux-ext-example-driver.mk
    +  |
       |- configs/my-board_defconfig
       |     |BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BAR_42_PATH)/patches/"
       |     |BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/overlay/"
    @@ -1444,7 +1559,24 @@ the layout expanded):

    External options  --->
         FOO_27  --->
             *** FOO_27 (in /path/to/another-br2-ext)
             [ ] foo
    -        [ ] bar

    9.3. Storing the Buildroot configuration

    The Buildroot configuration can be stored using the command + [ ] bar

    Additionally, the jpeg provider will be visible in the jpeg choice:

    Target packages  --->
    +    Libraries  --->
    +        Graphics  --->
    +            [*] jpeg support
    +                jpeg variant ()  --->
    +                    ( ) jpeg
    +                    ( ) jpeg-turbo
    +                        *** jpeg from: Example br2-external tree ***
    +                    (X) my-jpeg
    +                        *** jpeg from: FOO_27 ***
    +                    ( ) another-jpeg

    And similarly for the toolchains:

    Toolchain  --->
    +    Toolchain ()  --->
    +        ( ) Custom toolchain
    +            *** Toolchains from: Example br2-external tree ***
    +        (X) my custom toolchain

    Note. The toolchain options in toolchain/toolchain-external-mine/Config.in.options +will not appear in the Toolchain menu. They must be explicitly included +from within the br2-external’s top-level Config.in and will thus appear +in the External options menu.

    9.3. Storing the Buildroot configuration

    The Buildroot configuration can be stored using the command make savedefconfig.

    This strips the Buildroot configuration down by removing configuration options that are at their default value. The result is stored in a file called defconfig. If you want to save it in another place, change the @@ -1584,7 +1716,7 @@ Post-fakeroot scripts (BR2_ROOTFS_POST_FAKEROOT_SCRIPT

    Note: It is recommended to use the existing mechanisms to set file permissions or create entries in /dev (see Section 9.5.1, “Setting file permissions and ownership and adding custom devices nodes”) or to create users (see Section 9.6, “Adding custom user accounts”)

    Note: The difference between post-build scripts (above) and fakeroot scripts, - is that post-build scripts are not called in the fakeroot context.

    Note;. Using fakeroot is not an absolute substitute for actually being root. + is that post-build scripts are not called in the fakeroot context.

    Note: Using fakeroot is not an absolute substitute for actually being root. fakeroot only ever fakes the file access rights and types (regular, block-or-char device…) and uid/gid; these are emulated in-memory.

    9.5.1. Setting file permissions and ownership and adding custom devices nodes

    Sometimes it is needed to set specific permissions or ownership on files or device nodes. For example, certain files may need to be owned by @@ -1668,7 +1800,7 @@ will allow a user to manage their patches from one top-level directory.

    The exception to BR2_GLOBAL_PATCH_DIR being the preferred method for specifying custom patches is BR2_LINUX_KERNEL_PATCH. BR2_LINUX_KERNEL_PATCH should be used to specify kernel patches that -are available at an URL. Note: BR2_LINUX_KERNEL_PATCH specifies kernel +are available at a URL. Note: BR2_LINUX_KERNEL_PATCH specifies kernel patches that are applied after patches available in BR2_GLOBAL_PATCH_DIR, as it is done from a post-patch hook of the Linux package.

    9.9. Adding project-specific packages

    In general, any new package should be added directly in the package directory and submitted to the Buildroot upstream project. How to add @@ -1946,7 +2078,7 @@ Use a pre-built external toolchain instead of the default Buildroot switch back to an internal toolchain (that may provide a higher level of customization) once the rest of your system is working;

  • -Use the ccache compiler cache (see: Section 8.12.3, “Using ccache in Buildroot”); +Use the ccache compiler cache (see: Section 8.13.3, “Using ccache in Buildroot”);
  • Learn about rebuilding only the few packages you actually care about (see Section 8.3, “Understanding how to rebuild packages”), but beware that sometimes full @@ -1963,6 +2095,9 @@ Make sure that you’re using only local files: do not attempt to do
  • Buy new hardware. SSDs and lots of RAM are key to speeding up the builds. +
  • +Experiment with top-level parallel build, see + Section 8.11, “Top-level parallel build”.
  • Chapter 11. Known issues

    • It is not possible to pass extra linker options via BR2_TARGET_LDFLAGS if such options contain a $ sign. For example, the following is known @@ -2023,9 +2158,8 @@ you must somehow make public. Certainly, more material is produced than is needed for a strict legal compliance. For example, it produces the source code for packages released under BSD-like licenses, that you are not required to redistribute in source form.

      Moreover, due to technical limitations, Buildroot does not produce some -material that you will or may need, such as the toolchain source code and the -Buildroot source code itself (including patches to packages for which source -distribution is required). +material that you will or may need, such as the toolchain source code for +some of the external toolchains and the Buildroot source code itself. When you run make legal-info, Buildroot produces warnings in the README file to inform you of relevant material that could not be saved.

      Finally, keep in mind that the output of make legal-info is based on declarative statements in each of the packages recipes. The Buildroot @@ -2205,8 +2339,8 @@ endef ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA endif

    15.3. The documentation

    The documentation uses the -asciidoc format.

    For further details about the asciidoc -syntax, refer to http://www.methods.co.nz/asciidoc/userguide.html.

    15.4. Support scripts

    Some scripts in the support/ and utils/ directories are written in +asciidoc format.

    For further details about the asciidoc syntax, refer to +http://www.methods.co.nz/asciidoc/userguide.html.

    15.4. Support scripts

    Some scripts in the support/ and utils/ directories are written in Python and should follow the PEP8 Style Guide for Python Code.

    Chapter 16. Adding support for a particular board

    Buildroot contains basic configurations for several publicly available hardware boards, so that users of such a board can easily build a system @@ -2470,6 +2604,12 @@ Dependency symbol: BR2_INSTALL_LIBSTDCPP

  • Comment string: C++
  • +D support +

    • +Dependency symbol: BR2_TOOLCHAIN_HAS_DLANG +
    • +Comment string: Dlang +
  • Fortran support

    • Dependency symbol: BR2_TOOLCHAIN_HAS_FORTRAN @@ -2563,7 +2703,7 @@ different versions have different licensing terms, but they are stored in the same file. Otherwise, the hash file should stay in the package’s directory.

      The hashes stored in that file are used to validate the integrity of the downloaded files and of the license files.

      The format of this file is one line for each file for which to check the -hash, each line being space-separated, with these three fields:

      • +hash, each line with the following three fields separated by two spaces:

        • the type of hash, one of:

          • md5, sha1, sha224, sha256, sha384, sha512, none @@ -2602,28 +2742,27 @@ this in a comment line above the hashes.

            Note. The hashe package version is bumped. The hashes are checked during the make legal-info target run. For a package with multiple versions (like Qt5), create the hash file in a subdirectory <packageversion> of that package -(see also Section 18.2, “How patches are applied”).

            Note. The number of spaces does not matter, so one can use spaces (or tabs) to -properly align the different fields.

            The none hash type is reserved to those archives downloaded from a +(see also Section 18.2, “How patches are applied”).

            The none hash type is reserved to those archives downloaded from a repository, like a git clone, a subversion checkout

            The example below defines a sha1 and a sha256 published by upstream for the main libfoo-1.2.3.tar.bz2 tarball, an md5 from upstream and a locally-computed sha256 hashes for a binary blob, a sha256 for a downloaded patch, and an archive with no hash:

            # Hashes from: http://www.foosoftware.org/download/libfoo-1.2.3.tar.bz2.{sha1,sha256}:
            -sha1   486fb55c3efa71148fe07895fd713ea3a5ae343a                         libfoo-1.2.3.tar.bz2
            -sha256 efc8103cc3bcb06bda6a781532d12701eb081ad83e8f90004b39ab81b65d4369 libfoo-1.2.3.tar.bz2
            +sha1  486fb55c3efa71148fe07895fd713ea3a5ae343a  libfoo-1.2.3.tar.bz2
            +sha256  efc8103cc3bcb06bda6a781532d12701eb081ad83e8f90004b39ab81b65d4369  libfoo-1.2.3.tar.bz2
             
             # md5 from: http://www.foosoftware.org/download/libfoo-1.2.3.tar.bz2.md5, sha256 locally computed:
            -md5    2d608f3c318c6b7557d551a5a09314f03452f1a1                         libfoo-data.bin
            -sha256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b libfoo-data.bin
            +md5  2d608f3c318c6b7557d551a5a09314f03452f1a1  libfoo-data.bin
            +sha256  01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b  libfoo-data.bin
             
             # Locally computed:
            -sha256 ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9 libfoo-fix-blabla.patch
            +sha256  ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9  libfoo-fix-blabla.patch
             
             # No hash for 1234:
            -none   xxx                                                              libfoo-1234.tar.gz
            +none  xxx  libfoo-1234.tar.gz
             
             # Hash for license files:
            -sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8  COPYING
            -sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55  doc/COPYING.LGPL

            If the .hash file is present, and it contains one or more hashes for a +sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 COPYING +sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55 doc/COPYING.LGPL

            If the .hash file is present, and it contains one or more hashes for a downloaded file, the hash(es) computed by Buildroot (after download) must match the hash(es) stored in the .hash file. If one or more hashes do not match, Buildroot considers this an error, deletes the downloaded file, @@ -2710,7 +2849,7 @@ flags. The argument to be given to LIBFOO_CONFIG_SCRIPTS is the file name(s) of the shell script(s) needing fixing. All these names are relative to $(STAGING_DIR)/usr/bin and if needed multiple names can be given.

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

            Example 17.1. Config script: divine package

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

            So its fixup would be:

            DIVINE_CONFIG_SCRIPTS = divine-config

            Example 17.2. Config script: imagemagick package:

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

            Example 17.1. Config script: divine package

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

            So its fixup would be:

            DIVINE_CONFIG_SCRIPTS = divine-config

            Example 17.2. Config script: imagemagick package:

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

            So it’s fixup would be:

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

            On line 14, we specify the list of dependencies this package relies @@ -2727,7 +2866,7 @@ steps should be performed to install the package in the staging space. LIBFOO_INSTALL_TARGET_CMDS tells what steps should be performed to install the package in the target space.

            All these steps rely on the $(@D) variable, which contains the directory where the source code of the package has been -extracted.

            On lines 31..43, we define a user that is used by this package (e.g. +extracted.

            On lines 31..33, we define a user that is used by this package (e.g. to run a daemon as non-root) (LIBFOO_USERS).

            On line 35..37, we define a device-node file used by this package (LIBFOO_DEVICES).

            On line 39..41, we define the permissions to set to specific files installed by this package (LIBFOO_PERMISSIONS).

            Finally, on line 43, we call the generic-package function, which @@ -2944,9 +3083,9 @@ because two builds can never be perfectly simultaneous, and because LIBFOO_PATCH_DEPENDENCIES lists the dependencies (in terms of package name) that are required for the current package to be patched. These dependencies are guaranteed to be extracted and - patched before the current package is patched. In a similar way, - HOST_LIBFOO_PATCH_DEPENDENCIES lists the dependencies for the - current host package. + patched (but not necessarily built) before the current package is + patched. In a similar way, HOST_LIBFOO_PATCH_DEPENDENCIES lists + the dependencies for the current host package. This is seldom used; usually, LIBFOO_DEPENDENCIES is what you really want to use.

          • @@ -3002,14 +3141,19 @@ because two builds can never be perfectly simultaneous, and because The expected format for this variable must comply with the following rules:

            • If different parts of the package are released under different - licenses, then comma separate licenses (e.g. LIBFOO_LICENSE = - GPL-2.0+, LGPL-2.1+). If there is clear distinction between which - component is licensed under what license, then annotate the license - with that component, between parenthesis (e.g. LIBFOO_LICENSE = - GPL-2.0+ (programs), LGPL-2.1+ (libraries)). + licenses, then comma separate licenses (e.g. LIBFOO_LICENSE = + GPL-2.0+, LGPL-2.1+). If there is clear distinction between which + component is licensed under what license, then annotate the license + with that component, between parenthesis (e.g. LIBFOO_LICENSE = + GPL-2.0+ (programs), LGPL-2.1+ (libraries)). +
            • +If some licenses are conditioned on a sub-option being enabled, append + the conditional licenses with a comma (e.g.: FOO_LICENSE += , GPL-2.0+ + (programs)); the infrastructure will internally remove the space before + the comma.
            • If the package is dual licensed, then separate licenses with the - or keyword (e.g. LIBFOO_LICENSE = AFL-2.1 or GPL-2.0+). + or keyword (e.g. LIBFOO_LICENSE = AFL-2.1 or GPL-2.0+).
          • LIBFOO_LICENSE_FILES is a space-separated list of files in the package tarball that contain the license(s) under which the package is released. @@ -3055,7 +3199,17 @@ If the package is dual licensed, then separate licenses with the variable, unless the package installs binary blobs outside the default locations, /lib/firmware, /usr/lib/firmware, /lib/modules, /usr/lib/modules, and /usr/share, which are automatically excluded. -

          The recommended way to define these variables is to use the following +

        • +LIBFOO_IGNORE_CVES is a space-separated list of CVEs that tells + Buildroot CVE tracking tools which CVEs should be ignored for this + package. This is typically used when the CVE is fixed by a patch in + the package, or when the CVE for some reason does not affect the + Buildroot package. A Makefile comment must always precede the + addition of a CVE to this variable. Example: +
        # 0001-fix-cve-2020-12345.patch
        +LIBFOO_IGNORE_CVES += CVE-2020-12345
        +# only when built with libbaz, which Buildroot doesn't support
        +LIBFOO_IGNORE_CVES += CVE-2020-54321

        The recommended way to define these variables is to use the following syntax:

        LIBFOO_VERSION = 2.32

        Now, the variables that define what should be performed at the different steps of the build process.

        • LIBFOO_EXTRACT_CMDS lists the actions to be performed to extract @@ -3102,12 +3256,20 @@ different steps of the build process.

            -LIBFOO_INSTALL_INIT_SYSV and LIBFOO_INSTALL_INIT_SYSTEMD list the - actions to install init scripts either for the systemV-like init systems - (busybox, sysvinit, etc.) or for the systemd units. These commands - will be run only when the relevant init system is installed (i.e. if - systemd is selected as the init system in the configuration, only - LIBFOO_INSTALL_INIT_SYSTEMD will be run). +LIBFOO_INSTALL_INIT_SYSV, LIBFOO_INSTALL_INIT_OPENRC and + LIBFOO_INSTALL_INIT_SYSTEMD list the actions to install init + scripts either for the systemV-like init systems (busybox, + sysvinit, etc.), openrc or for the systemd units. These commands + will be run only when the relevant init system is installed (i.e. + if systemd is selected as the init system in the configuration, + only LIBFOO_INSTALL_INIT_SYSTEMD will be run). The only exception + is when openrc is chosen as init system and LIBFOO_INSTALL_INIT_OPENRC + has not been set, in such situation LIBFOO_INSTALL_INIT_SYSV will + be called, since openrc supports sysv init scripts. + When systemd is used as the init system, buildroot will automatically enable + all services using the systemctl preset-all command in the final phase of + image building. You can add preset files to prevent a particular unit from + being automatically enabled by buildroot.
          • LIBFOO_HELP_CMDS lists the actions to print the package help, which is included to the main make help output. These commands can print @@ -3136,7 +3298,14 @@ endef

            In the action definitions, you can use the following variables:

            $(TARGET_CROSS) to get the cross-compilation toolchain prefix
          • Of course the $(HOST_DIR), $(STAGING_DIR) and $(TARGET_DIR) - variables to install the packages properly. + variables to install the packages properly. Those variables point to + the global host, staging and target directories, unless + per-package directory support is used, in which case they point to + the current package host, staging and target directories. In + both cases, it doesn’t make any difference from the package point of + view: it should simply use HOST_DIR, STAGING_DIR and + TARGET_DIR. See Section 8.11, “Top-level parallel build” for more details + about per-package directory support.

          Finally, you can also use hooks. See Section 17.21, “Hooks available in the various build steps” for more information.

      17.6. Infrastructure for autotools-based packages

      17.6.1. autotools-package tutorial

      First, let’s see how to write a .mk file for an autotools-based package, with an example :

      01: ################################################################################
       02: #
      @@ -3781,6 +3950,12 @@ $(eval $(kconfig-package))

      This snippet creates the following make targe source configuration file. The configuration file will only list the options that differ from the default values. It is not possible to use this target when fragment files are set. +

    • +foo-diff-config, which outputs the differences between the current + configuration and the one defined in the Buildroot configuration for + this kconfig package. The output is useful to identify the + configuration changes that may have to be propagated to + configuration fragments for example.

    and ensures that the source configuration file is copied to the build directory at the right moment.

    There are two options to specify a configuration file to use, either FOO_KCONFIG_FILE (as in the example, above) or FOO_KCONFIG_DEFCONFIG. @@ -3998,6 +4173,25 @@ will therefore only use a few of them.

      FOO_CONF_OPTS, to specify additional options to pass to meson for the configuration step. By default, empty.
    • +FOO_CFLAGS, to specify compiler arguments added to the package specific + cross-compile.conf file c_args property. By default, the value of + TARGET_CFLAGS. +
    • +FOO_CXXFLAGS, to specify compiler arguments added to the package specific + cross-compile.conf file cpp_args property. By default, the value of + TARGET_CXXFLAGS. +
    • +FOO_LDFLAGS, to specify compiler arguments added to the package specific + cross-compile.conf file c_link_args and cpp_link_args properties. By + default, the value of TARGET_LDFLAGS. +
    • +FOO_MESON_EXTRA_BINARIES, to specify a space-separated list of programs + to add to the [binaries] section of the meson cross-compilation.conf + configuration file. The format is program-name='/path/to/program', with + no space around the = sign, and with the path of the program between + single quotes. By default, empty. Note that Buildroot already sets the + correct values for c, cpp, ar, strip, and pkgconfig. +
    • FOO_NINJA_ENV, to specify additional environment variables to pass to ninja, meson companion tool in charge of the build operations. By default, empty. @@ -4092,11 +4286,16 @@ fetched from Github, since a large number of Go packages are hosted on Github.

      On line 9 and 10, we give licensing details about the package.

      Finally, on line 12, we invoke the golang-package macro that generates all the Makefile rules that actually allow the package to be built.

    17.17.2. golang-package reference

    In their Config.in file, packages using the golang-package -infrastructure should depend on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS -and BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS because Buildroot will -automatically add a dependency on host-go to such packages.

    The main macro of the Go package infrastructure is -golang-package. It is similar to the generic-package macro. Only -target packages are supported with golang-package.

    Just like the generic infrastructure, the Go infrastructure works +infrastructure should depend on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +because Buildroot will automatically add a dependency on host-go +to such packages. +If you need CGO support in your package, you must add a dependency on +BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS.

    The main macro of the Go package infrastructure is +golang-package. It is similar to the generic-package macro. The +ability to build host packages is also available, with the +host-golang-package macro. +Host packages built by host-golang-package macro should depend on +BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS.

    Just like the generic infrastructure, the Go infrastructure works by defining a number of variables before calling the golang-package.

    All the package metadata information variables that exist in the generic package infrastructure also exist in the Go infrastructure: FOO_VERSION, FOO_SOURCE, @@ -4283,8 +4482,6 @@ information is (assuming the document name is foo)

  • FOO_DEPENDENCIES, optional, the list of packages (most probably, host-packages) that must be built before building this document. - If a hook of your document needs to access the Kconfig structure, - you may add prepare-kconfig to the list of dependencies.
  • There are also additional hooks (see Section 17.21, “Hooks available in the various build steps” for general information on hooks), that a document may set to define extra actions to be done at various steps:

    • @@ -4586,7 +4783,7 @@ BR2_PACKAGE_LIBCURL=y

      If your package needs more configuration options, config snippet. For example, here’s how you would test libcurl with openssl as a TLS backend and the curl program:

      $ cat libcurl.config
       BR2_PACKAGE_LIBCURL=y
      -BR2_PACKAGE_CURL=y
      +BR2_PACKAGE_LIBCURL_CURL=y
       BR2_PACKAGE_OPENSSL=y

      Then run the test-pkg script, by telling it what config snippet to use and what package to test:

      $ ./utils/test-pkg -c libcurl.config -p libcurl

      By default, test-pkg will build your package against a subset of the toolchains used by the autobuilders, which has been selected by the @@ -5016,7 +5213,7 @@ large number of commits in the series;

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



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

    Chapter 22. DEVELOPERS file and get-developers

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

    21.7. Using the run-tests framework

    Buildroot includes a run-time testing framework called run-tests built +upon Python scripting and QEMU runtime execution. There are two types of +test cases within the framework, one for build time tests and another for +run-time tests that have a QEMU dependency. The goals of the framework are +the following:

    • +build a well defined configuration +
    • +optionally, verify some properties of the build output +
    • +if it is a run-time test: +

      • +boot it under QEMU +
      • +run some test condition to verify that a given feature is working +

    The run-tests tool has a series of options documented in the tool’s help -h +description. Some common options include setting the download folder, the +output folder, keeping build output, and for multiple test cases, you can set +the JLEVEL for each.

    Here is an example walk through of running a test case.

    • +For a first step, let us see what all the test case options are. The test +cases can be listed by executing support/testing/run-tests -l. These tests +can all be run individually during test development from the console. Both +one at a time and selectively as a group of a subset of tests. +
    $ support/testing/run-tests -l
    +List of tests
    +test_run (tests.utils.test_check_package.TestCheckPackage)
    +Test the various ways the script can be called in a simple top to ... ok
    +test_run (tests.toolchain.test_external.TestExternalToolchainBuildrootMusl) ... ok
    +test_run (tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc) ... ok
    +test_run (tests.toolchain.test_external.TestExternalToolchainCCache) ... ok
    +test_run (tests.toolchain.test_external.TestExternalToolchainCtngMusl) ... ok
    +test_run (tests.toolchain.test_external.TestExternalToolchainLinaroArm) ... ok
    +test_run (tests.toolchain.test_external.TestExternalToolchainSourceryArmv4) ... ok
    +test_run (tests.toolchain.test_external.TestExternalToolchainSourceryArmv5) ... ok
    +test_run (tests.toolchain.test_external.TestExternalToolchainSourceryArmv7) ... ok
    +[snip]
    +test_run (tests.init.test_systemd.TestInitSystemSystemdRoFull) ... ok
    +test_run (tests.init.test_systemd.TestInitSystemSystemdRoIfupdown) ... ok
    +test_run (tests.init.test_systemd.TestInitSystemSystemdRoNetworkd) ... ok
    +test_run (tests.init.test_systemd.TestInitSystemSystemdRwFull) ... ok
    +test_run (tests.init.test_systemd.TestInitSystemSystemdRwIfupdown) ... ok
    +test_run (tests.init.test_systemd.TestInitSystemSystemdRwNetworkd) ... ok
    +test_run (tests.init.test_busybox.TestInitSystemBusyboxRo) ... ok
    +test_run (tests.init.test_busybox.TestInitSystemBusyboxRoNet) ... ok
    +test_run (tests.init.test_busybox.TestInitSystemBusyboxRw) ... ok
    +test_run (tests.init.test_busybox.TestInitSystemBusyboxRwNet) ... ok
    +
    +Ran 157 tests in 0.021s
    +
    +OK

    Those runtime tests are regularly executed by Buildroot Gitlab CI +infrastructure, see .gitlab.yml and https://gitlab.com/buildroot.org/buildroot/-/jobs.

    21.7.1. Creating a test case

    The best way to get familiar with how to create a test case is to look at a +few of the basic file system support/testing/tests/fs/ and init +support/testing/tests/init/ test scripts. Those tests give good examples +of a basic build and build with run type of tests. There are other more +advanced cases that use things like nested br2-external folders to provide +skeletons and additional packages.

    The test cases by default use a br-arm-full-* uClibc-ng toolchain and the +prebuild kernel for a armv5/7 cpu. It is recommended to use the default +defconfig test configuration except when Glibc/musl or a newer kernel are +necessary. By using the default it saves build time and the test would +automatically inherit a kernel/std library upgrade when the default is +updated.

    The basic test case definition involves

    • +Creation of a new test file +
    • +Defining a unique test class +
    • +Determining if the default defconfig plus test options can be used +
    • +Implementing a def test_run(self): function to optionally startup the +emulator and provide test case conditions. +

    Beyond creating the test script, there are a couple of additional steps that +should be taken once you have your initial test case script. The first is +to add yourself to the DEVELOPERS file to be the maintainer of that test +case. The second is to update the Gitlab CI yml by executing +make .gitlab-ci.yml.

    21.7.2. Debugging a test case

    Within the Buildroot repository, the testing framework is organized at the +top level in support/testing/ by folders of conf, infra and tests. +All the test cases live under the test folder and are organized in various +folders representing the catagory of test.

    Lets walk through an example.

    • +Using the Busybox Init system test case with a read/write rootfs +tests.init.test_busybox.TestInitSystemBusyboxRw +
    • +A minimal set of command line arguments when debugging a test case would +include -d which points to your dl folder, -o to an output folder, and +-k to keep any output on both pass/fail. With those options, the test will +retain logging and build artifacts providing status of the build and +execution of the test case. +
    $ support/testing/run-tests -d dl -o output_folder -k tests.init.test_busybox.TestInitSystemBusyboxRw
    +15:03:26 TestInitSystemBusyboxRw                  Starting
    +15:03:28 TestInitSystemBusyboxRw                  Building
    +15:08:18 TestInitSystemBusyboxRw                  Building done
    +15:08:27 TestInitSystemBusyboxRw                  Cleaning up
    +.
    +Ran 1 test in 301.140s
    +
    +OK
    • +For the case of a successful build, the output_folder would contain a +<test name> folder with the Buildroot build, build log and run-time log. If +the build failed, the console output would show the stage at which it failed +(setup / build / run). Depending on the failure stage, the build/run logs +and/or Buildroot build artifacts can be inspected and instrumented. If the +QEMU instance needs to be launched for additional testing, the first few +lines of the run-time log capture it and it would allow some incremental +testing without re-running support/testing/run-tests. +
    • +You can also make modifications to the current sources inside the +output_folder (e.g. for debug purposes) and rerun the standard +Buildroot make targets (in order to regenerate the complete image with +the new modifications) and then rerun the test. Modifying the sources +directly can speed up debugging compared to adding patch files, wiping the +output directoy, and starting the test again. +
    $ ls output_folder/
    +TestInitSystemBusyboxRw/
    +TestInitSystemBusyboxRw-build.log
    +TestInitSystemBusyboxRw-run.log
    • +The source file used to implement this example test is found under +support/testing/tests/init/test_busybox.py. This file outlines the +minimal defconfig that creates the build, QEMU configuration to launch +the built images and the test case assertions. +

    To test an existing or new test case within Gitlab CI, there is a method of +invoking a specific test by creating a Buildroot fork in Gitlab under your +account. This can be handy when adding/changing a run-time test or fixing a +bug on a use case tested by a run-time test case.

    In the examples below, the <name> component of the branch name is a unique +string you choose to identify this specific job being created.

    • +to trigger all run-test test case jobs: +
     $ git push gitlab HEAD:<name>-runtime-tests
    • +to trigger one test case job, a specific branch naming string is used that +includes the full test case name. +
     $ git push gitlab HEAD:<name>-<test case name>


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

    Chapter 22. DEVELOPERS file and get-developers

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

    • Calculate the list of developers to whom patches should be sent, by diff --git a/buildroot/docs/manual/manual.pdf b/buildroot/docs/manual/manual.pdf index f1729b909..6191b0db8 100644 Binary files a/buildroot/docs/manual/manual.pdf and b/buildroot/docs/manual/manual.pdf differ diff --git a/buildroot/docs/manual/manual.text b/buildroot/docs/manual/manual.text index 0ec6817fc..e9c3af74d 100644 --- a/buildroot/docs/manual/manual.text +++ b/buildroot/docs/manual/manual.text @@ -42,8 +42,9 @@ II. User guide 8.8. Graphing the dependencies between packages 8.9. Graphing the build duration 8.10. Graphing the filesystem size contribution of packages - 8.11. Integration with Eclipse - 8.12. Advanced usage + 8.11. Top-level parallel build + 8.12. Integration with Eclipse + 8.13. Advanced usage 9. Project-specific customization @@ -139,6 +140,7 @@ III. Developer guide 21.4. Work on items from the TODO list 21.5. Submitting patches 21.6. Reporting issues/bugs or getting help + 21.7. Using the run-tests framework 22. DEVELOPERS file and get-developers @@ -161,16 +163,16 @@ List of Examples --------------------------------------------------------------------- -Buildroot 2019.02.9 manual generated on 2020-01-12 15:28:51 UTC from -git revision 24f25c8d23 +Buildroot 2020.02.1 manual generated on 2020-04-10 20:45:00 UTC from +git revision 80e565bbeb The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id= -24f25c8d23bd85d57b6e9c776f2c7716f2ddd4af] file in the Buildroot +80e565bbebc61bf113bcd3b3475fa27a5127f466] file in the Buildroot sources for the full text of this license. -Copyright © 2004-2019 The Buildroot developers +Copyright © 2004-2020 The Buildroot developers Part I. Getting started @@ -235,8 +237,8 @@ vary between distributions). + make (version 3.81 or any later) + binutils + build-essential (only for Debian based systems) - + gcc (version 4.4 or any later) - + g++ (version 4.4 or any later) + + gcc (version 4.8 or any later) + + g++ (version 4.8 or any later) + bash + patch + gzip @@ -244,7 +246,6 @@ vary between distributions). + perl (version 5.8.7 or any later) + tar + cpio - + python (version 2.7 or any later) + unzip + rsync + file (must be in /usr/bin/file) @@ -255,6 +256,14 @@ vary between distributions). 2.2. Optional packages + * Recommended dependencies: + + Some features or utilities in Buildroot, like the legal-info, or + the graph generation tools, have additional dependencies. + Although they are not mandatory for a simple build, they are + still highly recommended: + + + python (version 2.7 or any later) * Configuration interface dependencies: For these libraries, you need to install both runtime and @@ -263,7 +272,7 @@ vary between distributions). -devel suffix. + ncurses5 to use the menuconfig interface - + qt4 to use the xconfig interface + + qt5 to use the xconfig interface + glib2, gtk2 and glade2 to use the gconfig interface * Source fetching tools: @@ -378,10 +387,10 @@ To start the build process, simply run: $ make -You should never use make -jN with Buildroot: top-level parallel make -is currently not supported. Instead, use the BR2_JLEVEL option to -tell Buildroot to run the compilation of each individual package with -make -jN. +By default, Buildroot does not support top-level parallel build, so +running make -jN is not necessary. There is however experimental +support for top-level parallel build, see Section 8.11, “Top-level +parallel build”. The make command will generally perform the following steps: @@ -534,8 +543,9 @@ Table of Contents 8.8. Graphing the dependencies between packages 8.9. Graphing the build duration 8.10. Graphing the filesystem size contribution of packages - 8.11. Integration with Eclipse - 8.12. Advanced usage + 8.11. Top-level parallel build + 8.12. Integration with Eclipse + 8.13. Advanced usage 9. Project-specific customization @@ -1092,19 +1102,20 @@ well as the configuration: Notes. If ccache is enabled, running make clean or distclean does not empty the compiler cache used by Buildroot. To delete it, refer to -Section 8.12.3, “Using ccache in Buildroot”. +Section 8.13.3, “Using ccache in Buildroot”. -Dumping the internal make variables: One can dump all the variables -known to make, along with their values: +Dumping the internal make variables: One can dump the variables known +to make, along with their values: - $ make -s printvars - VARIABLE=value_of_variable - ... + $ make -s printvars VARS='VARIABLE1 VARIABLE2' + VARIABLE1=value_of_variable + VARIABLE2=value_of_variable It is possible to tweak the output using some variables: * VARS will limit the listing to variables which names match the - specified make-pattern + specified make-patterns - this must be set else nothing is + printed * QUOTED_VARS, if set to YES, will single-quote the value * RAW_VARS, if set to YES, will print the unexpanded value @@ -1264,7 +1275,7 @@ above simply manipulate these stamp files to force Buildroot to restart a specific set of steps of a package build process. Further details about package special make targets are explained in -Section 8.12.5, “Package-specific make targets”. +Section 8.13.5, “Package-specific make targets”. 8.4. Offline builds @@ -1332,9 +1343,9 @@ passed to make or set in the environment: * BR2_CCACHE_DIR to override the directory where Buildroot stores the cached files when using ccache. * BR2_DL_DIR to override the directory in which Buildroot stores/ - retrieves downloaded files Note that the Buildroot download + retrieves downloaded files. Note that the Buildroot download directory can also be set from the configuration interface, so - through the Buildroot .config file. See Section 8.12.4, “Location + through the Buildroot .config file. See Section 8.13.4, “Location of downloaded packages” for more details on how you can set the download directory. * BR2_GRAPH_ALT, if set and non-empty, to use an alternate @@ -1346,6 +1357,9 @@ passed to make or set in the environment: packages” for the accepted options * BR2_GRAPH_DOT_OPTS is passed verbatim as options to the dot utility to draw the dependency graph. + * BR2_GRAPH_SIZE_OPTS to pass extra options to the size graph; see + Section 8.10, “Graphing the filesystem size contribution of + packages” for the acepted options An example that uses config files located in the toplevel directory and in your $HOME: @@ -1527,6 +1541,20 @@ variable is supported to adjust the output file format. See Section 8.8, “Graphing the dependencies between packages” for details about this environment variable. +Additionally, one may set the environment variable +BR2_GRAPH_SIZE_OPTS to further control the generated graph. Accepted +options are: + + * --size-limit X, -l X, will group all packages which individual + contribution is below X percent, to a single entry labelled + Others in the graph. By default, X=0.01, which means packages + each contributing less than 1% are grouped under Others. Accepted + values are in the range [0.0..1.0]. + * --iec, --binary, --si, --decimal, to use IEC (binary, powers of + 1024) or SI (decimal, powers of 1000; the default) prefixes. + * --biggest-first, to sort packages in decreasing size order, + rather than in increasing size order. + Note. The collected filesystem size data is only meaningful after a complete clean rebuild. Be sure to run make clean all before using make graph-size. @@ -1540,7 +1568,52 @@ details: utils/size-stats-compare -h -8.11. Integration with Eclipse +8.11. Top-level parallel build + +Note. This section deals with a very experimental feature, which is +known to break even in some non-unusual situations. Use at your own +risk. + +Buildroot has always been capable of using parallel build on a per +package basis: each package is built by Buildroot using make -jN (or +the equivalent invocation for non-make-based build systems). The +level of parallelism is by default number of CPUs + 1, but it can be +adjusted using the BR2_JLEVEL configuration option. + +Until 2020.02, Buildroot was however building packages in a serial +fashion: each package was built one after the other, without +parallelization of the build between packages. As of 2020.02, +Buildroot has experimental support for top-level parallel build, +which allows some signicant build time savings by building packages +that have no dependency relationship in parallel. This feature is +however marked as experimental and is known not to work in some +cases. + +In order to use top-level parallel build, one must: + + 1. Enable the option BR2_PER_PACKAGE_DIRECTORIES in the Buildroot + configuration + 2. Use make -jN when starting the Buildroot build + +Internally, the BR2_PER_PACKAGE_DIRECTORIES will enable a mechanism +called per-package directories, which will have the following +effects: + + * Instead of a global target directory and a global host directory + common to all packages, per-package target and host directories + will be used, in $(O)/per-package//target/ and $(O)/ + per-package//host/ respectively. Those folders will be + populated from the corresponding folders of the package + dependencies at the beginning of build. The compiler and + all other tools will therefore only be able to see and access + files installed by dependencies explicitly listed by . + * At the end of the build, the global target and host directories + will be populated, located in $(O)/target and $(O)/host + respectively. This means that during the build, those folders + will be empty and it’s only at the very end of the build that + they will be populated. + +8.12. Integration with Eclipse While a part of the embedded Linux developers like classical text editors like Vim or Emacs, and command-line based interfaces, a @@ -1568,9 +1641,9 @@ The Buildroot Eclipse integration installation process and usage is described in detail at https://github.com/mbats/ eclipse-buildroot-bundle/wiki. -8.12. Advanced usage +8.13. Advanced usage -8.12.1. Using the generated toolchain outside Buildroot +8.13.1. Using the generated toolchain outside Buildroot You may want to compile, for your target, your own programs or other software that are not packaged in Buildroot. In order to do this you @@ -1602,7 +1675,7 @@ or will be generating the tarball on your own), Buildroot also allows you to just prepare the SDK with make prepare-sdk without actually generating a tarball. -8.12.2. Using gdb in Buildroot +8.13.2. Using gdb in Buildroot Buildroot allows to do cross-debugging, where the debugger runs on the build machine and communicates with gdbserver on the target to @@ -1647,7 +1720,7 @@ Finally, to connect to the target from the cross gdb: (gdb) target remote :2345 -8.12.3. Using ccache in Buildroot +8.13.3. Using ccache in Buildroot ccache [http://ccache.samba.org] is a compiler cache. It stores the object files resulting from each compilation process, and is able to @@ -1698,7 +1771,7 @@ directories" [https://ccache.samba.org/manual.html# _compiling_in_different_directories] for more details about this rewriting of absolute paths. -8.12.4. Location of downloaded packages +8.13.4. Location of downloaded packages The various tarballs that are downloaded by Buildroot are all stored in BR2_DL_DIR, which by default is the dl directory. If you want to @@ -1719,7 +1792,7 @@ The download location can also be set in the .config file, with the BR2_DL_DIR option. Unlike most options in the .config file, this value is overridden by the BR2_DL_DIR environment variable. -8.12.5. Package-specific make targets +8.13.5. Package-specific make targets Running make builds and installs that particular package and its dependencies. @@ -1817,7 +1890,7 @@ Additionally, there are some other useful make targets: | |the build directory | +------------------------------------------------------------+ -8.12.6. Using Buildroot during development +8.13.6. Using Buildroot during development The normal operation of Buildroot is to download a tarball, extract it, configure, compile and install the software component found @@ -2087,7 +2160,7 @@ locations: One can tell Buildroot to use one or more br2-external trees by setting the BR2_EXTERNAL make variable set to the path(s) of the br2-external tree(s) to use. It can be passed to any Buildroot make -invocation. It is automatically saved in the hidden .br-external.mk +invocation. It is automatically saved in the hidden .br2-external.mk file in the output directory. Thanks to this, there is no need to pass BR2_EXTERNAL at every make invocation. It can however be changed at any time by passing a new value, and can be removed by passing an @@ -2136,8 +2209,8 @@ described in the following chapters: Apart from those mandatory files, there may be additional and optional content that may be present in a br2-external tree, like the -configs/ directory. They are described in the following chapters as -well. +configs/ or provides/ directories. They are described in the +following chapters as well. A complete example br2-external tree layout is also described later. @@ -2241,7 +2314,24 @@ tree, then the one from the last br2-external tree is used. It is thus possible to override a defconfig bundled in Buildroot or another br2-external tree. -9.2.1.4. Free-form content +9.2.1.4. The provides/ directory + +For some packages, Buildroot provides a choice between two (or more) +implementations of API-compatible such packages. For example, there +is a choice to choose either libjpeg ot jpeg-turbo, and another +choice between openssl or libressl. Finally, there is a choice to +select one of the known, pre-configured toolchains. + +It is possible for a br2-external to extend those choices, by +providing a set of files that define those alternatives: + + * provides/toolchains.in defines the pre-configured toolchains, + which will then be listed in the toolchain selection; + * provides/jpeg.in defines the alternative libjpeg implementations; + * provides/openssl.in defines the alternative openssl + implementations. + +9.2.1.5. Free-form content One can store all the board-specific configuration files there, such as the kernel configuration, the root filesystem overlay, or any @@ -2255,7 +2345,13 @@ BR2_GLOBAL_PATCH_DIR=$(BR2_EXTERNAL_BAR_42_PATH)/patches/ BR2_ROOTFS_OVERLAY=$(BR2_EXTERNAL_BAR_42_PATH)/board//overlay/ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_PATH)/board//kernel.config -9.2.1.5. Example layout +9.2.1.6. Additional Linux kernel extensions + +Additional Linux kernel extensions (see Section 17.20.2, +“linux-kernel-extensions”) can be added by storing them in the linux/ +directory at the root of a br2-external tree. + +9.2.1.7. Example layout Here is an example layout using all features of br2-external (the sample content is shown for the file above it, when it is relevant to @@ -2269,8 +2365,10 @@ the sake of illustration, of course): | `---- | |- Config.in + | |source "$BR2_EXTERNAL_BAR_42_PATH/toolchain/toolchain-external-mine/Config.in.options" | |source "$BR2_EXTERNAL_BAR_42_PATH/package/pkg-1/Config.in" | |source "$BR2_EXTERNAL_BAR_42_PATH/package/pkg-2/Config.in" + | |source "$BR2_EXTERNAL_BAR_42_PATH/package/my-jpeg/Config.in" | | | |config BAR_42_FLASH_ADDR | | hex "my-board flash address" @@ -2279,6 +2377,7 @@ the sake of illustration, of course): | |- external.mk | |include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk)) + | |include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/toolchain/*/*.mk)) | | | |flash-my-board: | | $(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/flash-image \ @@ -2311,6 +2410,50 @@ the sake of illustration, of course): |- package/pkg-2/pkg-2.hash |- package/pkg-2/pkg-2.mk | + |- provides/jpeg.in + | |config BR2_PACKAGE_MY_JPEG + | | bool "my-jpeg" + | `---- + |- package/my-jpeg/Config.in + | |config BR2_PACKAGE_PROVIDES_JPEG + | | default "my-jpeg" if BR2_PACKAGE_MY_JPEG + | `---- + |- package/my-jpeg/my-jpeg.mk + | |# This is a normal package .mk file + | |MY_JPEG_VERSION = 1.2.3 + | |MY_JPEG_SITE = https://example.net/some/place + | |MY_JPEG_PROVIDES = jpeg + | |$(eval $(autotools-package)) + | `---- + | + |- provides/toolchains.in + | |config BR2_TOOLCHAIN_EXTERNAL_MINE + | | bool "my custom toolchain" + | | depends on BR2_some_arch + | | select BR2_INSTALL_LIBSTDCPP + | `---- + |- toolchain/toolchain-external-mine/Config.in.options + | |if BR2_TOOLCHAIN_EXTERNAL_MINE + | |config BR2_TOOLCHAIN_EXTERNAL_PREFIX + | | default "arch-mine-linux-gnu" + | |config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + | | default "toolchain-external-mine" + | |endif + | `---- + |- toolchain/toolchain-external-mine/toolchain-external-mine.mk + | |TOOLCHAIN_EXTERNAL_MINE_SITE = https://example.net/some/place + | |TOOLCHAIN_EXTERNAL_MINE_SOURCE = my-toolchain.tar.gz + | |$(eval $(toolchain-external-package)) + | `---- + | + |- linux/Config.ext.in + | |config BR2_LINUX_KERNEL_EXT_EXAMPLE_DRIVER + | | bool "example-external-driver" + | | help + | | Example external driver + | |--- + |- linux/linux-ext-example-driver.mk + | |- configs/my-board_defconfig | |BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BAR_42_PATH)/patches/" | |BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/overlay/" @@ -2359,6 +2502,33 @@ External options ---> [ ] foo [ ] bar +Additionally, the jpeg provider will be visible in the jpeg choice: + +Target packages ---> + Libraries ---> + Graphics ---> + [*] jpeg support + jpeg variant () ---> + ( ) jpeg + ( ) jpeg-turbo + *** jpeg from: Example br2-external tree *** + (X) my-jpeg + *** jpeg from: FOO_27 *** + ( ) another-jpeg + +And similarly for the toolchains: + +Toolchain ---> + Toolchain () ---> + ( ) Custom toolchain + *** Toolchains from: Example br2-external tree *** + (X) my custom toolchain + +Note. The toolchain options in toolchain/toolchain-external-mine/ +Config.in.options will not appear in the Toolchain menu. They must be +explicitly included from within the br2-external’s top-level +Config.in and will thus appear in the External options menu. + 9.3. Storing the Buildroot configuration The Buildroot configuration can be stored using the command make @@ -2574,7 +2744,7 @@ Post-fakeroot scripts (BR2_ROOTFS_POST_FAKEROOT_SCRIPT) fakeroot scripts, is that post-build scripts are not called in the fakeroot context. - Note;. Using fakeroot is not an absolute substitute for actually + Note: Using fakeroot is not an absolute substitute for actually being root. fakeroot only ever fakes the file access rights and types (regular, block-or-char device…) and uid/gid; these are emulated in-memory. @@ -2706,8 +2876,8 @@ directory. The exception to BR2_GLOBAL_PATCH_DIR being the preferred method for specifying custom patches is BR2_LINUX_KERNEL_PATCH. BR2_LINUX_KERNEL_PATCH should be used to specify kernel patches that -are available at an URL. Note: BR2_LINUX_KERNEL_PATCH specifies -kernel patches that are applied after patches available in +are available at a URL. Note: BR2_LINUX_KERNEL_PATCH specifies kernel +patches that are applied after patches available in BR2_GLOBAL_PATCH_DIR, as it is done from a post-patch hook of the Linux package. @@ -3037,7 +3207,7 @@ help reduce the build time: not prevent you to switch back to an internal toolchain (that may provide a higher level of customization) once the rest of your system is working; - * Use the ccache compiler cache (see: Section 8.12.3, “Using ccache + * Use the ccache compiler cache (see: Section 8.13.3, “Using ccache in Buildroot”); * Learn about rebuilding only the few packages you actually care about (see Section 8.3, “Understanding how to rebuild packages”), @@ -3053,6 +3223,8 @@ help reduce the build time: a bit. * Buy new hardware. SSDs and lots of RAM are key to speeding up the builds. + * Experiment with top-level parallel build, see Section 8.11, + “Top-level parallel build”. Chapter 11. Known issues @@ -3129,10 +3301,10 @@ to redistribute in source form. Moreover, due to technical limitations, Buildroot does not produce some material that you will or may need, such as the toolchain source -code and the Buildroot source code itself (including patches to -packages for which source distribution is required). When you run -make legal-info, Buildroot produces warnings in the README file to -inform you of relevant material that could not be saved. +code for some of the external toolchains and the Buildroot source +code itself. When you run make legal-info, Buildroot produces +warnings in the README file to inform you of relevant material that +could not be saved. Finally, keep in mind that the output of make legal-info is based on declarative statements in each of the packages recipes. The Buildroot @@ -3295,6 +3467,7 @@ Table of Contents 21.4. Work on items from the TODO list 21.5. Submitting patches 21.6. Reporting issues/bugs or getting help + 21.7. Using the run-tests framework 22. DEVELOPERS file and get-developers @@ -3472,9 +3645,8 @@ kbuild/kconfig-language.txt. The documentation uses the asciidoc [http://www.methods.co.nz/ asciidoc/] format. -For further details about the asciidoc [http://www.methods.co.nz/ -asciidoc/] syntax, refer to http://www.methods.co.nz/asciidoc/ -userguide.html. +For further details about the asciidoc syntax, refer to http:// +www.methods.co.nz/asciidoc/userguide.html. 15.4. Support scripts @@ -3828,6 +4000,10 @@ the text to use in the comment. + Dependency symbol: BR2_INSTALL_LIBSTDCPP + Comment string: C++ + * D support + + + Dependency symbol: BR2_TOOLCHAIN_HAS_DLANG + + Comment string: Dlang * Fortran support + Dependency symbol: BR2_TOOLCHAIN_HAS_FORTRAN @@ -3946,7 +4122,8 @@ The hashes stored in that file are used to validate the integrity of the downloaded files and of the license files. The format of this file is one line for each file for which to check -the hash, each line being space-separated, with these three fields: +the hash, each line with the following three fields separated by two +spaces: * the type of hash, one of: @@ -3990,9 +4167,6 @@ versions (like Qt5), create the hash file in a subdirectory of that package (see also Section 18.2, “How patches are applied”). -Note. The number of spaces does not matter, so one can use spaces (or -tabs) to properly align the different fields. - The none hash type is reserved to those archives downloaded from a repository, like a git clone, a subversion checkout… @@ -4002,22 +4176,22 @@ locally-computed sha256 hashes for a binary blob, a sha256 for a downloaded patch, and an archive with no hash: # Hashes from: http://www.foosoftware.org/download/libfoo-1.2.3.tar.bz2.{sha1,sha256}: -sha1 486fb55c3efa71148fe07895fd713ea3a5ae343a libfoo-1.2.3.tar.bz2 -sha256 efc8103cc3bcb06bda6a781532d12701eb081ad83e8f90004b39ab81b65d4369 libfoo-1.2.3.tar.bz2 +sha1 486fb55c3efa71148fe07895fd713ea3a5ae343a libfoo-1.2.3.tar.bz2 +sha256 efc8103cc3bcb06bda6a781532d12701eb081ad83e8f90004b39ab81b65d4369 libfoo-1.2.3.tar.bz2 # md5 from: http://www.foosoftware.org/download/libfoo-1.2.3.tar.bz2.md5, sha256 locally computed: -md5 2d608f3c318c6b7557d551a5a09314f03452f1a1 libfoo-data.bin -sha256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b libfoo-data.bin +md5 2d608f3c318c6b7557d551a5a09314f03452f1a1 libfoo-data.bin +sha256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b libfoo-data.bin # Locally computed: -sha256 ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9 libfoo-fix-blabla.patch +sha256 ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9 libfoo-fix-blabla.patch # No hash for 1234: -none xxx libfoo-1234.tar.gz +none xxx libfoo-1234.tar.gz # Hash for license files: -sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 COPYING -sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55 doc/COPYING.LGPL +sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 COPYING +sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55 doc/COPYING.LGPL If the .hash file is present, and it contains one or more hashes for a downloaded file, the hash(es) computed by Buildroot (after @@ -4177,7 +4351,7 @@ install the package in the target space. All these steps rely on the $(@D) variable, which contains the directory where the source code of the package has been extracted. -On lines 31..43, we define a user that is used by this package (e.g. +On lines 31..33, we define a user that is used by this package (e.g. to run a daemon as non-root) (LIBFOO_USERS). On line 35..37, we define a device-node file used by this package @@ -4392,10 +4566,11 @@ information is (assuming the package name is libfoo) : * LIBFOO_PATCH_DEPENDENCIES lists the dependencies (in terms of package name) that are required for the current package to be patched. These dependencies are guaranteed to be extracted and - patched before the current package is patched. In a similar way, - HOST_LIBFOO_PATCH_DEPENDENCIES lists the dependencies for the - current host package. This is seldom used; usually, - LIBFOO_DEPENDENCIES is what you really want to use. + patched (but not necessarily built) before the current package is + patched. In a similar way, HOST_LIBFOO_PATCH_DEPENDENCIES lists + the dependencies for the current host package. This is seldom + used; usually, LIBFOO_DEPENDENCIES is what you really want to + use. * LIBFOO_PROVIDES lists all the virtual packages libfoo is an implementation of. See Section 17.11, “Infrastructure for virtual packages”. @@ -4451,6 +4626,10 @@ information is (assuming the package name is libfoo) : license, then annotate the license with that component, between parenthesis (e.g. LIBFOO_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)). + + If some licenses are conditioned on a sub-option being + enabled, append the conditional licenses with a comma (e.g.: + FOO_LICENSE += , GPL-2.0+ (programs)); the infrastructure + will internally remove the space before the comma. + If the package is dual licensed, then separate licenses with the or keyword (e.g. LIBFOO_LICENSE = AFL-2.1 or GPL-2.0+). * LIBFOO_LICENSE_FILES is a space-separated list of files in the @@ -4496,6 +4675,17 @@ information is (assuming the package name is libfoo) : binary blobs outside the default locations, /lib/firmware, /usr/ lib/firmware, /lib/modules, /usr/lib/modules, and /usr/share, which are automatically excluded. + * LIBFOO_IGNORE_CVES is a space-separated list of CVEs that tells + Buildroot CVE tracking tools which CVEs should be ignored for + this package. This is typically used when the CVE is fixed by a + patch in the package, or when the CVE for some reason does not + affect the Buildroot package. A Makefile comment must always + precede the addition of a CVE to this variable. Example: + +# 0001-fix-cve-2020-12345.patch +LIBFOO_IGNORE_CVES += CVE-2020-12345 +# only when built with libbaz, which Buildroot doesn't support +LIBFOO_IGNORE_CVES += CVE-2020-54321 The recommended way to define these variables is to use the following syntax: @@ -4543,12 +4733,21 @@ different steps of the build process. example, a package should utilize this step if it has binaries which would be similar to the kernel image, bootloader or root filesystem images. - * LIBFOO_INSTALL_INIT_SYSV and LIBFOO_INSTALL_INIT_SYSTEMD list the - actions to install init scripts either for the systemV-like init - systems (busybox, sysvinit, etc.) or for the systemd units. These - commands will be run only when the relevant init system is - installed (i.e. if systemd is selected as the init system in the - configuration, only LIBFOO_INSTALL_INIT_SYSTEMD will be run). + * LIBFOO_INSTALL_INIT_SYSV, LIBFOO_INSTALL_INIT_OPENRC and + LIBFOO_INSTALL_INIT_SYSTEMD list the actions to install init + scripts either for the systemV-like init systems (busybox, + sysvinit, etc.), openrc or for the systemd units. These commands + will be run only when the relevant init system is installed (i.e. + if systemd is selected as the init system in the configuration, + only LIBFOO_INSTALL_INIT_SYSTEMD will be run). The only exception + is when openrc is chosen as init system and + LIBFOO_INSTALL_INIT_OPENRC has not been set, in such situation + LIBFOO_INSTALL_INIT_SYSV will be called, since openrc supports + sysv init scripts. When systemd is used as the init system, + buildroot will automatically enable all services using the + systemctl preset-all command in the final phase of image + building. You can add preset files to prevent a particular unit + from being automatically enabled by buildroot. * LIBFOO_HELP_CMDS lists the actions to print the package help, which is included to the main make help output. These commands can print anything in any format. This is seldom used, as @@ -4577,7 +4776,14 @@ In the action definitions, you can use the following variables: cross-compilation utilities * $(TARGET_CROSS) to get the cross-compilation toolchain prefix * Of course the $(HOST_DIR), $(STAGING_DIR) and $(TARGET_DIR) - variables to install the packages properly. + variables to install the packages properly. Those variables point + to the global host, staging and target directories, unless + per-package directory support is used, in which case they point + to the current package host, staging and target directories. In + both cases, it doesn’t make any difference from the package point + of view: it should simply use HOST_DIR, STAGING_DIR and + TARGET_DIR. See Section 8.11, “Top-level parallel build” for more + details about per-package directory support. Finally, you can also use hooks. See Section 17.21, “Hooks available in the various build steps” for more information. @@ -5495,6 +5701,11 @@ This snippet creates the following make targets: source configuration file. The configuration file will only list the options that differ from the default values. It is not possible to use this target when fragment files are set. + * foo-diff-config, which outputs the differences between the + current configuration and the one defined in the Buildroot + configuration for this kconfig package. The output is useful to + identify the configuration changes that may have to be propagated + to configuration fragments for example. and ensures that the source configuration file is copied to the build directory at the right moment. @@ -5799,6 +6010,22 @@ typical packages will therefore only use a few of them. to meson for the configuration step. By default, empty. * FOO_CONF_OPTS, to specify additional options to pass to meson for the configuration step. By default, empty. + * FOO_CFLAGS, to specify compiler arguments added to the package + specific cross-compile.conf file c_args property. By default, the + value of TARGET_CFLAGS. + * FOO_CXXFLAGS, to specify compiler arguments added to the package + specific cross-compile.conf file cpp_args property. By default, + the value of TARGET_CXXFLAGS. + * FOO_LDFLAGS, to specify compiler arguments added to the package + specific cross-compile.conf file c_link_args and cpp_link_args + properties. By default, the value of TARGET_LDFLAGS. + * FOO_MESON_EXTRA_BINARIES, to specify a space-separated list of + programs to add to the [binaries] section of the meson + cross-compilation.conf configuration file. The format is + program-name='/path/to/program', with no space around the = sign, + and with the path of the program between single quotes. By + default, empty. Note that Buildroot already sets the correct + values for c, cpp, ar, strip, and pkgconfig. * FOO_NINJA_ENV, to specify additional environment variables to pass to ninja, meson companion tool in charge of the build operations. By default, empty. @@ -5943,13 +6170,17 @@ be built. 17.17.2. golang-package reference In their Config.in file, packages using the golang-package -infrastructure should depend on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS and -BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS because Buildroot will -automatically add a dependency on host-go to such packages. +infrastructure should depend on +BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS because Buildroot will +automatically add a dependency on host-go to such packages. If you +need CGO support in your package, you must add a dependency on +BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS. The main macro of the Go package infrastructure is golang-package. It -is similar to the generic-package macro. Only target packages are -supported with golang-package. +is similar to the generic-package macro. The ability to build host +packages is also available, with the host-golang-package macro. Host +packages built by host-golang-package macro should depend on +BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS. Just like the generic infrastructure, the Go infrastructure works by defining a number of variables before calling the golang-package. @@ -6202,8 +6433,6 @@ information is (assuming the document name is foo) : (like CSS or images). By default, empty. * FOO_DEPENDENCIES, optional, the list of packages (most probably, host-packages) that must be built before building this document. - If a hook of your document needs to access the Kconfig structure, - you may add prepare-kconfig to the list of dependencies. There are also additional hooks (see Section 17.21, “Hooks available in the various build steps” for general information on hooks), that a @@ -6608,7 +6837,7 @@ with openssl as a TLS backend and the curl program: $ cat libcurl.config BR2_PACKAGE_LIBCURL=y -BR2_PACKAGE_CURL=y +BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_OPENSSL=y Then run the test-pkg script, by telling it what config snippet to @@ -7370,6 +7599,172 @@ preserve Unix-style line terminators when downloading raw pastes. Following pastebin services are known to work correctly: - https:// gist.github.com/ - http://code.bulix.org/ +21.7. Using the run-tests framework + +Buildroot includes a run-time testing framework called run-tests +built upon Python scripting and QEMU runtime execution. There are two +types of test cases within the framework, one for build time tests +and another for run-time tests that have a QEMU dependency. The goals +of the framework are the following: + + * build a well defined configuration + * optionally, verify some properties of the build output + * if it is a run-time test: + + + boot it under QEMU + + run some test condition to verify that a given feature is + working + +The run-tests tool has a series of options documented in the tool’s +help -h description. Some common options include setting the download +folder, the output folder, keeping build output, and for multiple +test cases, you can set the JLEVEL for each. + +Here is an example walk through of running a test case. + + * For a first step, let us see what all the test case options are. + The test cases can be listed by executing support/testing/ + run-tests -l. These tests can all be run individually during test + development from the console. Both one at a time and selectively + as a group of a subset of tests. + +$ support/testing/run-tests -l +List of tests +test_run (tests.utils.test_check_package.TestCheckPackage) +Test the various ways the script can be called in a simple top to ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainBuildrootMusl) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainCCache) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainCtngMusl) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainLinaroArm) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainSourceryArmv4) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainSourceryArmv5) ... ok +test_run (tests.toolchain.test_external.TestExternalToolchainSourceryArmv7) ... ok +[snip] +test_run (tests.init.test_systemd.TestInitSystemSystemdRoFull) ... ok +test_run (tests.init.test_systemd.TestInitSystemSystemdRoIfupdown) ... ok +test_run (tests.init.test_systemd.TestInitSystemSystemdRoNetworkd) ... ok +test_run (tests.init.test_systemd.TestInitSystemSystemdRwFull) ... ok +test_run (tests.init.test_systemd.TestInitSystemSystemdRwIfupdown) ... ok +test_run (tests.init.test_systemd.TestInitSystemSystemdRwNetworkd) ... ok +test_run (tests.init.test_busybox.TestInitSystemBusyboxRo) ... ok +test_run (tests.init.test_busybox.TestInitSystemBusyboxRoNet) ... ok +test_run (tests.init.test_busybox.TestInitSystemBusyboxRw) ... ok +test_run (tests.init.test_busybox.TestInitSystemBusyboxRwNet) ... ok + +Ran 157 tests in 0.021s + +OK + +Those runtime tests are regularly executed by Buildroot Gitlab CI +infrastructure, see .gitlab.yml and https://gitlab.com/buildroot.org/ +buildroot/-/jobs. + +21.7.1. Creating a test case + +The best way to get familiar with how to create a test case is to +look at a few of the basic file system support/testing/tests/fs/ and +init support/testing/tests/init/ test scripts. Those tests give good +examples of a basic build and build with run type of tests. There are +other more advanced cases that use things like nested br2-external +folders to provide skeletons and additional packages. + +The test cases by default use a br-arm-full-* uClibc-ng toolchain and +the prebuild kernel for a armv5/7 cpu. It is recommended to use the +default defconfig test configuration except when Glibc/musl or a +newer kernel are necessary. By using the default it saves build time +and the test would automatically inherit a kernel/std library upgrade +when the default is updated. + +The basic test case definition involves + + * Creation of a new test file + * Defining a unique test class + * Determining if the default defconfig plus test options can be + used + * Implementing a def test_run(self): function to optionally startup + the emulator and provide test case conditions. + +Beyond creating the test script, there are a couple of additional +steps that should be taken once you have your initial test case +script. The first is to add yourself to the DEVELOPERS file to be the +maintainer of that test case. The second is to update the Gitlab CI +yml by executing make .gitlab-ci.yml. + +21.7.2. Debugging a test case + +Within the Buildroot repository, the testing framework is organized +at the top level in support/testing/ by folders of conf, infra and +tests. All the test cases live under the test folder and are +organized in various folders representing the catagory of test. + +Lets walk through an example. + + * Using the Busybox Init system test case with a read/write rootfs + tests.init.test_busybox.TestInitSystemBusyboxRw + * A minimal set of command line arguments when debugging a test + case would include -d which points to your dl folder, -o to an + output folder, and -k to keep any output on both pass/fail. With + those options, the test will retain logging and build artifacts + providing status of the build and execution of the test case. + +$ support/testing/run-tests -d dl -o output_folder -k tests.init.test_busybox.TestInitSystemBusyboxRw +15:03:26 TestInitSystemBusyboxRw Starting +15:03:28 TestInitSystemBusyboxRw Building +15:08:18 TestInitSystemBusyboxRw Building done +15:08:27 TestInitSystemBusyboxRw Cleaning up +. +Ran 1 test in 301.140s + +OK + + * For the case of a successful build, the output_folder would + contain a folder with the Buildroot build, build log + and run-time log. If the build failed, the console output would + show the stage at which it failed (setup / build / run). + Depending on the failure stage, the build/run logs and/or + Buildroot build artifacts can be inspected and instrumented. If + the QEMU instance needs to be launched for additional testing, + the first few lines of the run-time log capture it and it would + allow some incremental testing without re-running support/testing + /run-tests. + * You can also make modifications to the current sources inside the + output_folder (e.g. for debug purposes) and rerun the standard + Buildroot make targets (in order to regenerate the complete image + with the new modifications) and then rerun the test. Modifying + the sources directly can speed up debugging compared to adding + patch files, wiping the output directoy, and starting the test + again. + +$ ls output_folder/ +TestInitSystemBusyboxRw/ +TestInitSystemBusyboxRw-build.log +TestInitSystemBusyboxRw-run.log + + * The source file used to implement this example test is found + under support/testing/tests/init/test_busybox.py. This file + outlines the minimal defconfig that creates the build, QEMU + configuration to launch the built images and the test case + assertions. + +To test an existing or new test case within Gitlab CI, there is a +method of invoking a specific test by creating a Buildroot fork in +Gitlab under your account. This can be handy when adding/changing a +run-time test or fixing a bug on a use case tested by a run-time test +case. + +In the examples below, the component of the branch name is a +unique string you choose to identify this specific job being created. + + * to trigger all run-test test case jobs: + + $ git push gitlab HEAD:-runtime-tests + + * to trigger one test case job, a specific branch naming string is + used that includes the full test case name. + + $ git push gitlab HEAD:- + --------------------------------------------------------------------- diff --git a/buildroot/docs/manual/manual.txt b/buildroot/docs/manual/manual.txt index 4eb4ba9bf..b76ab40d4 100644 --- a/buildroot/docs/manual/manual.txt +++ b/buildroot/docs/manual/manual.txt @@ -12,7 +12,7 @@ It is licensed under the GNU General Public License, version 2. Refer to the http://git.buildroot.org/buildroot/tree/COPYING?id={sys:git rev-parse HEAD}[COPYING] file in the Buildroot sources for the full text of this license. -Copyright (C) 2004-2019 The Buildroot developers +Copyright (C) 2004-2020 The Buildroot developers image::logo.png[] diff --git a/buildroot/docs/manual/prerequisite.txt b/buildroot/docs/manual/prerequisite.txt index dcd3fd255..4e614cfa1 100644 --- a/buildroot/docs/manual/prerequisite.txt +++ b/buildroot/docs/manual/prerequisite.txt @@ -23,8 +23,8 @@ between distributions). ** +make+ (version 3.81 or any later) ** +binutils+ ** +build-essential+ (only for Debian based systems) -** +gcc+ (version 4.4 or any later) -** `g++` (version 4.4 or any later) +** +gcc+ (version 4.8 or any later) +** `g++` (version 4.8 or any later) ** +bash+ ** +patch+ ** +gzip+ @@ -32,7 +32,6 @@ between distributions). ** +perl+ (version 5.8.7 or any later) ** +tar+ ** +cpio+ -** +python+ (version 2.7 or any later) ** +unzip+ ** +rsync+ ** +file+ (must be in +/usr/bin/file+) @@ -45,6 +44,14 @@ between distributions). === Optional packages +* Recommended dependencies: ++ +Some features or utilities in Buildroot, like the legal-info, or the +graph generation tools, have additional dependencies. Although they +are not mandatory for a simple build, they are still highly recommended: ++ +** +python+ (version 2.7 or any later) + * Configuration interface dependencies: + For these libraries, you need to install both runtime and development @@ -52,7 +59,7 @@ data, which in many distributions are packaged separately. The development packages typically have a _-dev_ or _-devel_ suffix. + ** +ncurses5+ to use the 'menuconfig' interface -** +qt4+ to use the 'xconfig' interface +** +qt5+ to use the 'xconfig' interface ** +glib2+, +gtk2+ and +glade2+ to use the 'gconfig' interface * Source fetching tools: diff --git a/buildroot/docs/manual/quickstart.txt b/buildroot/docs/manual/quickstart.txt index 542b27860..80569e85f 100644 --- a/buildroot/docs/manual/quickstart.txt +++ b/buildroot/docs/manual/quickstart.txt @@ -60,10 +60,10 @@ To start the build process, simply run: $ make -------------------- -You *should never* use +make -jN+ with Buildroot: top-level parallel -make is currently not supported. Instead, use the +BR2_JLEVEL+ option -to tell Buildroot to run the compilation of each individual package -with +make -jN+. +By default, Buildroot does not support top-level parallel build, so +running +make -jN+ is not necessary. There is however experimental +support for top-level parallel build, see +xref:top-level-parallel-build[]. The `make` command will generally perform the following steps: diff --git a/buildroot/docs/manual/writing-rules.txt b/buildroot/docs/manual/writing-rules.txt index ca4327228..3b809d5c4 100644 --- a/buildroot/docs/manual/writing-rules.txt +++ b/buildroot/docs/manual/writing-rules.txt @@ -141,8 +141,8 @@ endif The documentation uses the http://www.methods.co.nz/asciidoc/[asciidoc] format. -For further details about the http://www.methods.co.nz/asciidoc/[asciidoc] -syntax, refer to http://www.methods.co.nz/asciidoc/userguide.html[]. +For further details about the asciidoc syntax, refer to +http://www.methods.co.nz/asciidoc/userguide.html[]. === Support scripts diff --git a/buildroot/docs/website/copyright.txt b/buildroot/docs/website/copyright.txt index 600bf7df7..b15ac5f91 100644 --- a/buildroot/docs/website/copyright.txt +++ b/buildroot/docs/website/copyright.txt @@ -1,6 +1,6 @@ The code and graphics on this website (and it's mirror sites, if any) are -Copyright (c) 1999-2005 by Erik Andersen, 2006-2019 The Buildroot +Copyright (c) 1999-2005 by Erik Andersen, 2006-2020 The Buildroot developers. All rights reserved. Documents on this Web site including their graphical elements, design, and diff --git a/buildroot/docs/website/download.html b/buildroot/docs/website/download.html index a3d69cdcd..bc759ae3d 100644 --- a/buildroot/docs/website/download.html +++ b/buildroot/docs/website/download.html @@ -8,105 +8,105 @@
      Download
      -

      Latest stable / long term support release: 2019.02

      +

      Latest stable / long term support release: 2020.02

      diff --git a/buildroot/docs/website/images/smile-logo.png b/buildroot/docs/website/images/smile-logo.png index 7bcea3334..046c999a2 100644 Binary files a/buildroot/docs/website/images/smile-logo.png and b/buildroot/docs/website/images/smile-logo.png differ diff --git a/buildroot/docs/website/js/buildroot.js b/buildroot/docs/website/js/buildroot.js index 48fafa67a..bf80f11d7 100644 --- a/buildroot/docs/website/js/buildroot.js +++ b/buildroot/docs/website/js/buildroot.js @@ -1,11 +1,11 @@ function load_activity(feedurl, divid) { let container = document.getElementById(divid); $.ajax({ - url: "https://cors.io/?" + feedurl + url: "https://cors-anywhere.herokuapp.com/" + feedurl }) .done(function(data){ let x2js = new X2JS(); - let result = x2js.xml_str2json(data); + let result = x2js.xml_str2json(data.documentElement.outerHTML); let loaded = 0; let nb_display = 8; if (result==null) return; diff --git a/buildroot/docs/website/news.html b/buildroot/docs/website/news.html index 6fe12c708..29dcdb3ac 100644 --- a/buildroot/docs/website/news.html +++ b/buildroot/docs/website/news.html @@ -9,6 +9,699 @@

      News

        +
      • +
        +
        +
        +

        2020.02 released

        +

        8 March 2020

        +
        +
        +

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

        + +

        Notice that this is a long term support release which will be + supported with security and other important fixes until March 2021.

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2020.02-rc3 released

        +

        2 March 2020

        +
        +
        +

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

        + +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2020.02-rc2 released

        +

        26 February 2020

        +
        +
        +

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

        + +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2020.02-rc1 released

        +

        18 February 2020

        +
        +
        +

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

        + +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.02.9 released

        +

        12 January 2020

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.11.1 released

        +

        12 January 2020

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.02.8 released

        +

        7 December 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.08.3 released

        +

        7 December 2019

        +
        +
        +

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

        + +

        Notice that the 2019.08.x series is now end of life. Please migrate to + the 2019.02 or 2019.11 series instead.

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.11 released

        +

        1 December 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.11-rc3 released

        +

        24 November 2019

        +
        +
        +

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

        + +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.11-rc2 released

        +

        16 November 2019

        +
        +
        +

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

        + +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.02.7 released

        +

        10 November 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.08.2 released

        +

        9 November 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.11-rc1 released

        +

        5 November 2019

        +
        +
        +

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

        + +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.02.6 released

        +

        4 October 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.05.3 released

        +

        4 October 2019

        +
        +
        +

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

        + +

        Notice that the 2019.05.x series is now end of life. Please migrate to + the 2019.02 or 2019.08 series instead.

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.08.1 released

        +

        4 October 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.05.2 released

        +

        3 September 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.02.5 released

        +

        2 September 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.08 released

        +

        1 September 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.08-rc3 released

        +

        28 August 2019

        +
        +
        +

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

        + +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.08-rc2 released

        +

        20 August 2019

        +
        +
        +

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

        + +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.08-rc1 released

        +

        9 August 2019

        +
        +
        +

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

        + +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.02.4 released

        +

        7 June 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.05.1 released

        +

        7 July 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.02.3 released

        +

        7 June 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.05 released

        +

        2 June 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.05-rc3 released

        +

        25 May 2019

        +
        +
        +

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

        + +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.05-rc2 released

        +

        15 May 2019

        +
        +
        +

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

        + +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.05-rc1 released

        +

        8 May 2019

        +
        +
        +

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

        + +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.02.2 released

        +

        29 April 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2019.02.1 released

        +

        29 March 2019

        +
        +
        +

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

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2018.02.12 released, 2018.02.x series EOL

        +

        29 March 2019

        +
        +
        +

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

        + +

        Notice that the 2018.02.x series is now end of life. Please migrate to + the 2019.02 series instead which will be supported until March 2020.

        +
        +
        +
      • + +
      • +
        +
        +
        +

        2018.11.4 released

        +

        28 March 2019

        +
        +
        +

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

        + +

        Notice that the 2018.11.x series is now end of life. Please migrate to + the 2019.02 series instead which will be supported until March 2020.

        +
        +
        +
      • +
      • @@ -20,7 +713,8 @@

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

        diff --git a/buildroot/docs/website/sponsors.html b/buildroot/docs/website/sponsors.html index 7370ecb01..4cbfc5a34 100644 --- a/buildroot/docs/website/sponsors.html +++ b/buildroot/docs/website/sponsors.html @@ -22,30 +22,28 @@
        -
        Sponsors of the Buildroot Developers Meeting @ ELCE 2018
        +
        Past sponsors
        - -

        The Buildroot community would like to thank the following - companies for sponsoring - the Buildroot - Developers Meeting organized on October 20/21 before the - Embedded - Linux Conference Europe in Edinburgh.

        +

        Throughout its history, the Buildroot project has been sponsored by + various companies, that we would like to thank below.

        -
        -
        - - + -
        - Mind sponsored the - event by contributing financially to the Buildroot - Association. +
        + Smile provided the meeting location for the + ELCE 2019 + meeting and sponsored the Buildroot Summer Camp that took place on July 1-5 2016 + in Toulouse, France. Smile sponsored the participation of Romain Naour and paid + the food expenses for the meeting participants. + In 2018, Smile sponsored of LLVM/Clang integration into Buildroot, see the final + report.
        @@ -53,6 +51,48 @@
        +
        +
        + + + +
        +
        + Mind sponsored + financially the Buildroot Association for the ELCE + 2018 meeting, sponsored the dinner of the FOSDEM 2014, + 2015, 2016, 2017 and 2018 Developers Meeting + (Brussels) and ELCE 2016 (Berlin) and 2017 (Prague), + and the meeting room and the dinner for the ELCE 2014 + Developers Meeting (Düsseldorf). +
        +
        +
        +
        + +
        +
        +
        +
        +

        +

        +
        +
        +

        Google provided + the logistics for the FOSDEM 2013, FOSDEM 2014, + FOSDEM 2015, FOSDEM 2016, FOSDEM 2017, FOSDEM 2018, + FOSDEM 2019 and FOSDEM 2020 Developer Days in Brussels, + Belgium.

        +
        +
        +
        +
        +
        + +
        + +
        +
        -
        +
        +
        - Bootlin - sponsored the event by contributing financially to - the Buildroot Association. +

        Bootlin + sponsored financially the Buildroot Association for + the ELCE 2018 meeting, sponsored the meeting + location for the ELCE 2016 Developer Days in Berlin, + Germany, and the lunch for the ELCE 2009 Developer + Days in Grenoble, France.

        -
        - -
        -
        +
        - Logilin sponsored the - event by contributing financially to the Buildroot - Association. + Logilin sponsored + the ELCE 2018 Buildroot Developers meeting by + contributing financially to the Buildroot + Association.
        +
        + +
        +
        @@ -113,8 +159,9 @@
        Tk Open Systems - sponsored the event by contributing financially to - the Buildroot Association. + sponsored the ELCE 2018 Buildroot Developers meeting + by contributing financially to the Buildroot + Association.
        @@ -123,101 +170,34 @@
        -
        +
        Rockwell - Collins sponsored the event by funding the social - Saturday dinner for the participants. + Collins sponsored the ELCE 2018 Buildroot + Developers meeting by funding the social Saturday + dinner for the participants.
        -
        - -
        - -
        - -
        -
        Sponsor of the Buildroot Hackathon, March 2018
        -
        -
        -

        The Buildroot community would like to - thank Scaleway, who - provided the complete logistics to organize our Buildroot - Hackathon in Paris in March 2018: meeting room, Internet - connectivity and accommodation.

        -
        -
        - - - -
        -
        -
        - -
        -
        Past sponsors
        -
        -

        Throughout its history, the Buildroot project has been sponsored by - various companies, that we would like to thank below.

        - -
        -
        - - +
        - OpenWide/Smile sponsored - the Buildroot Summer Camp that took place on July 1-5 2016 in Toulouse, France. OpenWide/Smile is - sponsoring the participation of Romain Naour and paid the food expenses for the meeting participants. - In 2018, Smile sponsored of LLVM/Clang integration into Buildroot, see the final - report. -
        -
        -
        -
        - -
        -
        -
        -
        - - - -
        -
        - Mind sponsored the - dinner of the FOSDEM 2014, 2015, 2016, 2017 and 2018 - Developers Meeting (Brussels) and ELCE 2016 (Berlin) - and 2017 (Prague), and the meeting room and the dinner for - the ELCE 2014 Developers Meeting (Düsseldorf). -
        -
        -
        -
        - -
        -
        -
        -
        -

        -

        -
        -
        -

        Google provided - the logistics for the FOSDEM 2013, FOSDEM 2014, - FOSDEM 2015, FOSDEM 2016, FOSDEM 2017 and FOSDEM - 2018 Developer Days in Brussels, Belgium.

        + Scaleway + sponsored the complete logistics to organize our Buildroot + Hackathon in Paris in March 2018: meeting room, Internet + connectivity and accommodation.
        @@ -323,26 +303,6 @@
        -
        -
        -
        -
        -
        -

        -

        -
        -
        -

        Free - Electrons sponsored the meeting location for the - ELCE 2016 Developer Days in Berlin, Germany, and the - lunch for the ELCE 2009 Developer Days in Grenoble, - France.

        -
        -
        -
        -
        -
        -
        diff --git a/buildroot/docs/website/support.html b/buildroot/docs/website/support.html index 1a5ce9e22..6c602b42d 100644 --- a/buildroot/docs/website/support.html +++ b/buildroot/docs/website/support.html @@ -92,6 +92,31 @@
        +
        +
        Commercial support
        +
        +

        In addition, the following companies are able to provide commercial + support. Only companies heavily involved in Buildroot maintenance and + community are listed here.

        + +
        +
        +
        + + + + + + + + + +
        +
        +
        +
        +
        +
        diff --git a/buildroot/fs/btrfs/btrfs.mk b/buildroot/fs/btrfs/btrfs.mk index 388516389..70e3ead97 100644 --- a/buildroot/fs/btrfs/btrfs.mk +++ b/buildroot/fs/btrfs/btrfs.mk @@ -14,7 +14,7 @@ BTRFS_SIZE_SECTOR = $(call qstrip,$(BR2_TARGET_ROOTFS_BTRFS_SIZE_SECTOR)) BTRFS_FEATURES = $(call qstrip,$(BR2_TARGET_ROOTFS_BTRFS_FEATURES)) # qstrip results in stripping consecutive spaces into a single one. So the # variable is not qstrip-ed to preserve the integrity of the string value. -BTRFS_LABEL := $(subst ",,$(BR2_TARGET_ROOTFS_BTRFS_LABEL)) +BTRFS_LABEL = $(subst ",,$(BR2_TARGET_ROOTFS_BTRFS_LABEL)) # ") BTRFS_OPTS = \ diff --git a/buildroot/fs/common.mk b/buildroot/fs/common.mk index 34849e698..842ea924a 100644 --- a/buildroot/fs/common.mk +++ b/buildroot/fs/common.mk @@ -42,11 +42,25 @@ define ROOTFS_REPRODUCIBLE endef endif +ROOTFS_COMMON_NAME = rootfs-common +ROOTFS_COMMON_TYPE = rootfs ROOTFS_COMMON_DEPENDENCIES = \ host-fakeroot host-makedevs \ $(BR2_TAR_HOST_DEPENDENCY) \ $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd) +ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES = $(sort \ + $(if $(filter undefined,$(origin ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES__X)), \ + $(eval ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES__X := \ + $(foreach p, \ + $(ROOTFS_COMMON_DEPENDENCIES), \ + $(p) \ + $($(call UPPERCASE,$(p))_FINAL_RECURSIVE_DEPENDENCIES) \ + ) \ + ) \ + ) \ + $(ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES__X)) + .PHONY: rootfs-common rootfs-common: $(ROOTFS_COMMON_DEPENDENCIES) target-finalize @$(call MESSAGE,"Generating root filesystems common tables") @@ -69,10 +83,17 @@ endif rootfs-common-show-depends: @echo $(ROOTFS_COMMON_DEPENDENCIES) +.PHONY: rootfs-common-show-info +rootfs-common-show-info: + @: + $(info $(call clean-json,{ $(call json-info,ROOTFS_COMMON) })) + # Since this function will be called from within an $(eval ...) # all variable references except the arguments must be $$-quoted. define inner-rootfs +ROOTFS_$(2)_NAME = rootfs-$(1) +ROOTFS_$(2)_TYPE = rootfs ROOTFS_$(2)_IMAGE_NAME ?= rootfs.$(1) ROOTFS_$(2)_FINAL_IMAGE_NAME = $$(strip $$(ROOTFS_$(2)_IMAGE_NAME)) ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1) @@ -80,6 +101,18 @@ ROOTFS_$(2)_TARGET_DIR = $$(ROOTFS_$(2)_DIR)/target ROOTFS_$(2)_DEPENDENCIES += rootfs-common +ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES = $$(sort \ + $$(if $$(filter undefined,$$(origin ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES__X)), \ + $$(eval ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES__X := \ + $$(foreach p, \ + $$(ROOTFS_$(2)_DEPENDENCIES), \ + $$(p) \ + $$($$(call UPPERCASE,$$(p))_FINAL_RECURSIVE_DEPENDENCIES) \ + ) \ + ) \ + ) \ + $$(ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES__X)) + ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y) ROOTFS_$(2)_COMPRESS_EXT = .gz ROOTFS_$(2)_COMPRESS_CMD = gzip -9 -c -n @@ -107,6 +140,9 @@ ifeq ($$(BR2_TARGET_ROOTFS_$(2)_XZ),y) ROOTFS_$(2)_DEPENDENCIES += host-xz ROOTFS_$(2)_COMPRESS_EXT = .xz ROOTFS_$(2)_COMPRESS_CMD = xz -9 -C crc32 -c +ifeq ($(BR2_REPRODUCIBLE),) +ROOTFS_$(2)_COMPRESS_CMD += -T $(PARALLEL_JOBS) +endif endif $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): ROOTFS=$(2) @@ -148,13 +184,17 @@ endif rootfs-$(1)-show-depends: @echo $$(ROOTFS_$(2)_DEPENDENCIES) +rootfs-$(1)-show-info: + @: + $$(info $$(call clean-json,{ $$(call json-info,ROOTFS_$(2)) })) + rootfs-$(1): $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME) -.PHONY: rootfs-$(1) rootfs-$(1)-show-depends +.PHONY: rootfs-$(1) rootfs-$(1)-show-depends rootfs-$(1)-show-info ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y) TARGETS_ROOTFS += rootfs-$(1) -PACKAGES += $$(filter-out rootfs-%,$$(ROOTFS_$(2)_DEPENDENCIES) $$(ROOTFS_COMMON_DEPENDENCIES)) +PACKAGES += $$(filter-out rootfs-%,$$(ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES)) endif # Check for legacy POST_TARGETS rules diff --git a/buildroot/fs/cpio/cpio.mk b/buildroot/fs/cpio/cpio.mk index 1f0cafe62..28a435dd5 100644 --- a/buildroot/fs/cpio/cpio.mk +++ b/buildroot/fs/cpio/cpio.mk @@ -29,8 +29,15 @@ endif # BR2_ROOTFS_DEVICE_CREATION_STATIC ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT +# --reproducible option was introduced in cpio v2.12, which may not be +# available in some old distributions, so we build host-cpio +ifeq ($(BR2_REPRODUCIBLE),y) +ROOTFS_CPIO_DEPENDENCIES += host-cpio +ROOTFS_CPIO_OPTS += --reproducible +endif + define ROOTFS_CPIO_CMD - cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $@ + cd $(TARGET_DIR) && find . | cpio $(ROOTFS_CPIO_OPTS) --quiet -o -H newc > $@ endef ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y) diff --git a/buildroot/fs/ext2/ext2.mk b/buildroot/fs/ext2/ext2.mk index 6bb4b1c7f..74c99bd7b 100644 --- a/buildroot/fs/ext2/ext2.mk +++ b/buildroot/fs/ext2/ext2.mk @@ -13,7 +13,7 @@ EXT2_MKFS_OPTS = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS)) # qstrip results in stripping consecutive spaces into a single one. So the # variable is not qstrip-ed to preserve the integrity of the string value. -EXT2_LABEL := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL)) +EXT2_LABEL = $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL)) #" Syntax highlighting... :-/ ) EXT2_OPTS = \ diff --git a/buildroot/fs/f2fs/f2fs.mk b/buildroot/fs/f2fs/f2fs.mk index f35bb60ad..21a2879c1 100644 --- a/buildroot/fs/f2fs/f2fs.mk +++ b/buildroot/fs/f2fs/f2fs.mk @@ -11,7 +11,7 @@ endif # qstrip results in stripping consecutive spaces into a single one. So the # variable is not qstrip-ed to preserve the integrity of the string value. -F2FS_LABEL := $(subst ",,$(BR2_TARGET_ROOTFS_F2FS_LABEL)) +F2FS_LABEL = $(subst ",,$(BR2_TARGET_ROOTFS_F2FS_LABEL)) # ") F2FS_COLD_FILES = $(call qstrip,$(BR2_TARGET_ROOTFS_F2FS_COLD_FILES)) F2FS_HOT_FILES = $(call qstrip,$(BR2_TARGET_ROOTFS_F2FS_HOT_FILES)) diff --git a/buildroot/fs/initramfs/initramfs.mk b/buildroot/fs/initramfs/initramfs.mk index c75109321..3b3d4ed8b 100644 --- a/buildroot/fs/initramfs/initramfs.mk +++ b/buildroot/fs/initramfs/initramfs.mk @@ -29,3 +29,8 @@ rootfs-initramfs-show-depends: ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) TARGETS_ROOTFS += rootfs-initramfs endif + +# Not using the rootfs infra, so fake the variables +ROOTFS_INITRAMFS_NAME = rootfs-initramfs +ROOTFS_INITRAMFS_TYPE = rootfs +ROOTFS_INITRAMFS_DEPENDENCIES = rootfs-cpio linux diff --git a/buildroot/fs/jffs2/jffs2.mk b/buildroot/fs/jffs2/jffs2.mk index 740ab3e03..2adbc2320 100644 --- a/buildroot/fs/jffs2/jffs2.mk +++ b/buildroot/fs/jffs2/jffs2.mk @@ -4,8 +4,8 @@ # ################################################################################ -JFFS2_OPTS := -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) -SUMTOOL_OPTS := $(JFFS2_OPTS) +JFFS2_OPTS = -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) +SUMTOOL_OPTS = -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) ifeq ($(BR2_TARGET_ROOTFS_JFFS2_PAD),y) ifneq ($(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE)),0x0) diff --git a/buildroot/fs/tar/tar.mk b/buildroot/fs/tar/tar.mk index 393d01bfe..841af1470 100644 --- a/buildroot/fs/tar/tar.mk +++ b/buildroot/fs/tar/tar.mk @@ -4,7 +4,7 @@ # ################################################################################ -TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS)) +TAR_OPTS = $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS)) ROOTFS_TAR_DEPENDENCIES = $(BR2_TAR_HOST_DEPENDENCY) diff --git a/buildroot/fs/ubi/ubi.mk b/buildroot/fs/ubi/ubi.mk index 9874e73ff..d848f8b23 100644 --- a/buildroot/fs/ubi/ubi.mk +++ b/buildroot/fs/ubi/ubi.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBI_UBINIZE_OPTS := -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE) +UBI_UBINIZE_OPTS = -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE) UBI_UBINIZE_OPTS += -p $(BR2_TARGET_ROOTFS_UBI_PEBSIZE) ifneq ($(BR2_TARGET_ROOTFS_UBI_SUBSIZE),0) UBI_UBINIZE_OPTS += -s $(BR2_TARGET_ROOTFS_UBI_SUBSIZE) diff --git a/buildroot/linux/Config.ext.in b/buildroot/linux/Config.ext.in index 32dacbdf0..734a52a53 100644 --- a/buildroot/linux/Config.ext.in +++ b/buildroot/linux/Config.ext.in @@ -22,18 +22,21 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI However, it is recommended to use the latest version of the Adeos/Ipipe patch available at - http://download.gna.org/adeos/patches + https://xenomai.org/downloads/ipipe/ Xenomai is know to support Blackfin, SH4, x86, ARM, NIOS2 and PowerPC architectures. config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH - string "Path for Adeos patch file" + string "Path/URL for Adeos patch file" depends on BR2_LINUX_KERNEL_EXT_XENOMAI help - Optionally, explicitly specify the Adeos patch to use. - Download it at http://download.gna.org/adeos/patches - and verify that your kernel version in buildroot matches. + Optionally, explicitly specify where to find the Adeos + patch to use. + Examples: + https://xenomai.org/downloads/ipipe/v4.x/arm/ipipe-core-4.19.33-arm-2.patch + or /home/foo/ipipe-core-4.19.33-arm-2.patch + Please verify that your kernel version in Buildroot matches. comment "xenomai needs a uClibc or glibc toolchain w/ threads" depends on BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS @@ -99,7 +102,8 @@ choice help Select the major series of this version. This must match the major version of your kernel (e.g. for kernels 3.x, select - aufs3.x; for kernels 4.x, select aufs4.x). + aufs3.x; for kernels 4.x, select aufs4.x; for kernels 5.x, + select aufs5.x ). Note: neither aufs1.x nor aufs2.x (both for kernels older than 3.x) are supported. @@ -110,12 +114,16 @@ config BR2_LINUX_KERNEL_EXT_AUFS_SERIES_3 config BR2_LINUX_KERNEL_EXT_AUFS_SERIES_4 bool "aufs4.x" +config BR2_LINUX_KERNEL_EXT_AUFS_SERIES_5 + bool "aufs5.x" + endchoice config BR2_LINUX_KERNEL_EXT_AUFS_SERIES int default 3 if BR2_LINUX_KERNEL_EXT_AUFS_SERIES_3 default 4 if BR2_LINUX_KERNEL_EXT_AUFS_SERIES_4 + default 5 if BR2_LINUX_KERNEL_EXT_AUFS_SERIES_5 config BR2_LINUX_KERNEL_EXT_AUFS_VERSION string "aufs-standalone version" @@ -132,6 +140,8 @@ config BR2_LINUX_KERNEL_EXT_AUFS_VERSION https://sourceforge.net/p/aufs/aufs3-standalone/ref/master/branches/ For aufs4.x: https://github.com/sfjro/aufs4-standalone/branches/all + For aufs5.x: + https://github.com/sfjro/aufs5-standalone/branches/all endif # aufs diff --git a/buildroot/linux/Config.in b/buildroot/linux/Config.in index 6c1d172be..c367b3337 100644 --- a/buildroot/linux/Config.in +++ b/buildroot/linux/Config.in @@ -2,16 +2,13 @@ menu "Kernel" config BR2_LINUX_KERNEL bool "Linux Kernel" + select BR2_PACKAGE_HOST_IMAGEMAGICK if BR2_LINUX_KERNEL_CUSTOM_LOGO_PATH != "" help Enable this option if you want to build a Linux kernel for your embedded device if BR2_LINUX_KERNEL -comment "Linux kernel in thumb mode may be broken with binutils >= 2.29" - depends on BR2_arm || BR2_armeb - depends on !BR2_BINUTILS_VERSION_2_28_X - # Packages that need to have a kernel with support for loadable modules, # but do not use the kernel-modules infrastructure, should select that # option. @@ -29,13 +26,11 @@ config BR2_LINUX_NEEDS_MODULES choice prompt "Kernel version" -# We are intentionally staying at 4.19 for the next Buildroot LTS -# release (2019.02) config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.19)" + bool "Latest version (5.4)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (v4.4.176-cip31)" + bool "Latest CIP SLTS version (4.19.98-cip19)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -53,6 +48,17 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org +config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + bool "Latest CIP RT SLTS version (4.19.98-cip19-rt7)" + help + Same as the CIP version, but this is the PREEMPT_RT realtime + variant. + + The CIP community plans to maintain 4.19 for security and + bug fixes for more than 10 years. + + https://www.cip-project.org + config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" help @@ -122,8 +128,9 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.19.94" if BR2_LINUX_KERNEL_LATEST_VERSION - default "v4.4.176-cip31" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "5.4.31" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.19.98-cip19" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "4.19.98-cip19-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL @@ -331,10 +338,10 @@ config BR2_LINUX_KERNEL_IMAGE_NAME string "Kernel image name" depends on BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM help - The filename of the kernel image, if it is different from the - make target (above). Only Xtensa uses a filename different - from the make target. Defaults to - BR2_LINUX_KERNEL_IMAGE_TARGET_NAME. + The filename of the kernel image, if it is different from + the make target (above). Defaults to + BR2_LINUX_KERNEL_IMAGE_TARGET_NAME. If specified, the + filename is relative to arch/ARCH/boot/. If unsure, leave it empty. @@ -375,7 +382,13 @@ if BR2_LINUX_KERNEL_DTS_SUPPORT # The variable below address the second case, were you only want # limited actions from buildroot. config BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT - bool + bool "DTB is built by kernel itself" + help + Normally, the device tree(s) to be built have to be passed + explicitly to the kernel build system. For some binary + formats, however, the kernel build system links in the + device tree directly in the kernel binary. Select this option + if you have such a kernel binary format. config BR2_LINUX_KERNEL_APPENDED_DTB bool diff --git a/buildroot/linux/linux-ext-xenomai.mk b/buildroot/linux/linux-ext-xenomai.mk index d066bb32a..5ec6891bb 100644 --- a/buildroot/linux/linux-ext-xenomai.mk +++ b/buildroot/linux/linux-ext-xenomai.mk @@ -8,10 +8,21 @@ LINUX_EXTENSIONS += xenomai # Adeos patch version XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH)) + +ifneq ($(filter ftp://% http://% https://%,$(XENOMAI_ADEOS_PATCH)),) +XENOMAI_ADEOS_PATCH_NAME = $(notdir $(XENOMAI_ADEOS_PATCH)) +XENOMAI_ADEOS_PATCH_PATH = $(LINUX_DL_DIR)/$(XENOMAI_ADEOS_PATCH_NAME) +# check-package TypoInPackageVariable +LINUX_EXTRA_DOWNLOADS += $(XENOMAI_ADEOS_PATCH) +BR_NO_CHECK_HASH_FOR += $(XENOMAI_ADEOS_PATCH_NAME) +else +XENOMAI_ADEOS_PATCH_PATH = $(XENOMAI_ADEOS_PATCH) +endif + ifeq ($(XENOMAI_ADEOS_PATCH),) XENOMAI_ADEOS_OPTS = --default else -XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH) +XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH_PATH) endif # Prepare kernel patch diff --git a/buildroot/linux/linux.hash b/buildroot/linux/linux.hash index 7d72e4357..f6bad5c8e 100644 --- a/buildroot/linux/linux.hash +++ b/buildroot/linux/linux.hash @@ -1,6 +1,15 @@ +# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256 a11083f8f809887f6a0f8d4467532385b99418f17998fe6e837807491c276eeb linux-5.4.31.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 d011245629b980d4c15febf080b54804aaf215167b514a3577feddb2495f8a3e linux-4.20.17.tar.xz -sha256 5899ff2a85e2b84607148349fd8e646f94399655caf0e4e55d1eb0567e48520e linux-4.4.208.tar.xz -sha256 b7ad1c9841d671d026c55a4c91c77205f8b488ca5f980f838591c68662e0525a linux-4.9.208.tar.xz -sha256 eb29cc9cfd54158789064b3d6e5b3eab108facec048b8d405a63e9863329b049 linux-4.14.163.tar.xz -sha256 c62a10a75a7c4213e41287040e7c7509b7d42117d6830feb7dfe505949fa7467 linux-4.19.94.tar.xz +sha256 ea68cb8e9fa255bb1d0402c5aa8f26984f9b1c8607ff3bed5d3284109167f063 linux-4.4.218.tar.xz +sha256 df3a6e615ec4c57b04775e9c018c67045223ac662e696d28fd37baa5114349cd linux-4.9.218.tar.xz +sha256 cb440ac5d20071dcb482e5062958514064b0c5a8375c92653062ea201ae0222c linux-4.14.175.tar.xz +sha256 1e40a0dc6afc95a259f97b80d5f5ef8f89e2ee49e993ba6844e2bc55de361f0e linux-4.19.114.tar.xz +# Locally computed +sha256 18f9ddba0b777d1942d6c81877ba97c4bcd08488e2c409e57dcce866b9de5fc2 linux-cip-4.19.98-cip19.tar.gz +sha256 7d5aeb67da41dc66ef28621ef994ef4403e8b1f5c3df38b1843da20972444280 linux-cip-4.19.98-cip19-rt7.tar.gz + +# Licenses hashes +sha256 ee5808b032a67f587d3541099d46de34f5bec8cd5976114ba07f1299ee6001ff COPYING +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/preferred/GPL-2.0 +sha256 8e378ab93586eb55135d3bc119cce787f7324f48394777d00c34fa3d0be3303f LICENSES/exceptions/Linux-syscall-note diff --git a/buildroot/linux/linux.mk b/buildroot/linux/linux.mk index a1378345c..ae1edbeb5 100644 --- a/buildroot/linux/linux.mk +++ b/buildroot/linux/linux.mk @@ -6,7 +6,12 @@ LINUX_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION)) LINUX_LICENSE = GPL-2.0 -LINUX_LICENSE_FILES = COPYING +ifeq ($(BR2_LINUX_KERNEL_LATEST_VERSION),y) +LINUX_LICENSE_FILES = \ + COPYING \ + LICENSES/preferred/GPL-2.0 \ + LICENSES/exceptions/Linux-syscall-note +endif define LINUX_HELP_CMDS @echo ' linux-menuconfig - Run Linux kernel menuconfig' @@ -29,8 +34,9 @@ LINUX_SITE_METHOD = hg else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_SVN),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = svn -else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION),y) -LINUX_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git +else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y) +LINUX_SOURCE = linux-cip-$(LINUX_VERSION).tar.gz +LINUX_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot else ifneq ($(findstring -rc,$(LINUX_VERSION)),) # Since 4.12-rc1, -rc kernels are generated from cgit. This also works for # older -rc kernels. @@ -59,8 +65,12 @@ BR_NO_CHECK_HASH_FOR += $(notdir $(LINUX_PATCHES)) # be directories in the patch list (unlike for other packages). LINUX_PATCH = $(filter ftp://% http://% https://%,$(LINUX_PATCHES)) +# while the kernel is built for the target, the build may need various +# host libraries depending on config (and version), so use +# HOST_MAKE_ENV here. In particular, this ensures that our +# host-pkgconf will look for host libraries and not target ones. LINUX_MAKE_ENV = \ - $(TARGET_MAKE_ENV) \ + $(HOST_MAKE_ENV) \ BR_BINARIES_DIR=$(BINARIES_DIR) LINUX_INSTALL_IMAGES = YES @@ -101,12 +111,6 @@ endif ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF),y) LINUX_DEPENDENCIES += host-elfutils host-pkgconf -LINUX_MAKE_ENV += \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_SYSROOT_DIR="/" \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ - PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig" endif # If host-uboot-tools is selected by the user, assume it is needed to @@ -123,6 +127,8 @@ LINUX_POST_EXTRACT_HOOKS += LINUX_XTENSA_OVERLAY_EXTRACT LINUX_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL) endif +# We don't want to run depmod after installing the kernel. It's done in a +# target-finalize hook, to encompass modules installed by packages. LINUX_MAKE_FLAGS = \ HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ ARCH=$(KERNEL_ARCH) \ @@ -318,6 +324,18 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config)) $(if $(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le), $(call KCONFIG_ENABLE_OPT,CONFIG_PPC_DISABLE_WERROR,$(@D)/.config)) + $(if $(BR2_ARC_PAGE_SIZE_4K), + $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K,$(@D)/.config)) + $(if $(BR2_ARC_PAGE_SIZE_8K), + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K,$(@D)/.config)) + $(if $(BR2_ARC_PAGE_SIZE_16K), + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K,$(@D)/.config)) $(if $(BR2_TARGET_ROOTFS_CPIO), $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)) # As the kernel gets compiled before root filesystems are @@ -335,6 +353,8 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config)) $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV), $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)) + $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV), + $(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config)) $(if $(BR2_PACKAGE_AUDIT), $(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT,$(@D)/.config)) @@ -372,8 +392,9 @@ define LINUX_KCONFIG_FIXUP_CMDS $(if $(BR2_PACKAGE_XTABLES_ADDONS), $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK,$(@D)/.config)) - $(if $(BR2_PACKAGE_WIREGUARD), + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_NAT,$(@D)/.config)) + $(if $(BR2_PACKAGE_WIREGUARD_LINUX_COMPAT), $(call KCONFIG_ENABLE_OPT,CONFIG_INET,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_FOU,$(@D)/.config) @@ -467,7 +488,7 @@ else # Otherwise, just install the unique image generated by the kernel # build process. define LINUX_INSTALL_IMAGE - $(INSTALL) -m 0644 -D $(LINUX_IMAGE_PATH) $(1)/$(LINUX_IMAGE_NAME) + $(INSTALL) -m 0644 -D $(LINUX_IMAGE_PATH) $(1)/$(notdir $(LINUX_IMAGE_NAME)) endef endif @@ -507,16 +528,35 @@ define LINUX_INSTALL_TARGET_CMDS $(LINUX_INSTALL_HOST_TOOLS) endef +# Run depmod in a target-finalize hook, to encompass modules installed by +# packages. +define LINUX_RUN_DEPMOD + if grep -q "CONFIG_MODULES=y" $(LINUX_DIR)/.config; then \ + $(HOST_DIR)/sbin/depmod -a -b $(TARGET_DIR) $(LINUX_VERSION_PROBED); \ + fi +endef +LINUX_TARGET_FINALIZE_HOOKS += LINUX_RUN_DEPMOD + # Include all our extensions. # # Note: our package infrastructure uses the full-path of the last-scanned # Makefile to determine what package we're currently defining, using the -# last directory component in the path. As such, including other Makefile, -# like below, before we call one of the *-package macro is usally not -# working. -# However, since the files we include here are in the same directory as -# the current Makefile, we are OK. But this is a hard requirement: files -# included here *must* be in the same directory! +# last directory component in the path. Additionally, the full path of +# the package directory is also stored in _PKGDIR (e.g. to find patches) +# +# As such, including other Makefiles, like below, before we call one of +# the *-package macros usually doesn't work. +# +# However, by including the in-tree extensions after the ones from the +# br2-external trees, we're back to the situation where the last Makefile +# scanned *is* included from the correct directory. +# +# NOTE: this is very fragile, and extra care must be taken to ensure that +# we always end up with an in-tree included file. That's mostly OK, because +# we do have in-tree linux-extensions. +# +include $(sort $(wildcard $(foreach ext,$(BR2_EXTERNAL_DIRS), \ + $(ext)/linux/linux-ext-*.mk))) include $(sort $(wildcard linux/linux-ext-*.mk)) LINUX_PATCH_DEPENDENCIES += $(foreach ext,$(LINUX_EXTENSIONS),\ diff --git a/buildroot/package/4th/4th.hash b/buildroot/package/4th/4th.hash index 97083da8f..36d294105 100644 --- a/buildroot/package/4th/4th.hash +++ b/buildroot/package/4th/4th.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 1c7adbb1a56dad4c4c781e6e023d77ac862842560c05246b691d07e9a4460ab2 4th-3.62.4-unix.tar.gz +sha256 f822f7dd8cfb0b1744a62d653c6efe933578ae1789ec60a088509a38bca4b4fc 4th-3.62.5-unix.tar.gz +sha256 8c6111b645a02219579ea66e84aa8e78a0ed4f4dd80857ffb91bcda5528717d4 COPYING diff --git a/buildroot/package/4th/4th.mk b/buildroot/package/4th/4th.mk index f272e0280..aee59c463 100644 --- a/buildroot/package/4th/4th.mk +++ b/buildroot/package/4th/4th.mk @@ -4,7 +4,7 @@ # ################################################################################ -4TH_VERSION = 3.62.4 +4TH_VERSION = 3.62.5 4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz 4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION) 4TH_LICENSE = GPL-3.0+, LGPL-3.0+ diff --git a/buildroot/package/Config.in b/buildroot/package/Config.in index ce6745348..edf7687ab 100644 --- a/buildroot/package/Config.in +++ b/buildroot/package/Config.in @@ -5,6 +5,7 @@ menu "Target packages" source "package/skeleton-custom/Config.in" source "package/skeleton-init-common/Config.in" source "package/skeleton-init-none/Config.in" + source "package/skeleton-init-openrc/Config.in" source "package/skeleton-init-systemd/Config.in" source "package/skeleton-init-sysv/Config.in" @@ -22,14 +23,17 @@ menu "Audio and video applications" source "package/ffmpeg/Config.in" source "package/flac/Config.in" source "package/flite/Config.in" + source "package/fluid-soundfont/Config.in" + source "package/fluidsynth/Config.in" source "package/gmrender-resurrect/Config.in" - source "package/gstreamer/Config.in" source "package/gstreamer1/Config.in" + source "package/jack1/Config.in" source "package/jack2/Config.in" source "package/kodi/Config.in" source "package/lame/Config.in" source "package/madplay/Config.in" source "package/mimic/Config.in" + source "package/minimodem/Config.in" source "package/miraclecast/Config.in" source "package/mjpegtools/Config.in" source "package/modplugtools/Config.in" @@ -65,6 +69,7 @@ menu "Compressors and decompressors" source "package/brotli/Config.in" source "package/bzip2/Config.in" source "package/gzip/Config.in" + source "package/lrzip/Config.in" source "package/lz4/Config.in" source "package/lzip/Config.in" source "package/lzop/Config.in" @@ -83,6 +88,7 @@ menu "Debugging, profiling and benchmark" source "package/bonnie/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" + source "package/dacapo/Config.in" source "package/dhrystone/Config.in" source "package/dieharder/Config.in" source "package/dmalloc/Config.in" @@ -116,6 +122,8 @@ menu "Debugging, profiling and benchmark" source "package/oprofile/Config.in" source "package/pax-utils/Config.in" source "package/pcm-tools/Config.in" + source "package/piglit/Config.in" + source "package/ptm2human/Config.in" source "package/pv/Config.in" source "package/racehound/Config.in" source "package/ramsmp/Config.in" @@ -138,6 +146,7 @@ menu "Debugging, profiling and benchmark" endmenu menu "Development tools" + source "package/bats-core/Config.in" source "package/binutils/Config.in" source "package/bsdiff/Config.in" source "package/bustle/Config.in" @@ -153,6 +162,8 @@ menu "Development tools" source "package/flex/Config.in" source "package/gawk/Config.in" source "package/gettext/Config.in" + source "package/gettext-gnu/Config.in" + source "package/gettext-tiny/Config.in" source "package/git/Config.in" source "package/git-crypt/Config.in" source "package/gperf/Config.in" @@ -163,6 +174,7 @@ menu "Development tools" source "package/make/Config.in" source "package/patch/Config.in" source "package/pkgconf/Config.in" + source "package/ripgrep/Config.in" source "package/sed/Config.in" source "package/subversion/Config.in" source "package/tree/Config.in" @@ -239,6 +251,7 @@ comment "Themes" endmenu menu "Games" + source "package/ascii-invaders/Config.in" source "package/chocolate-doom/Config.in" source "package/doom-wad/Config.in" source "package/flare-engine/Config.in" @@ -263,9 +276,11 @@ endmenu menu "Graphic libraries and applications (graphic/text)" comment "Graphic applications" + source "package/cog/Config.in" source "package/fswebcam/Config.in" source "package/ghostscript/Config.in" source "package/glmark2/Config.in" + source "package/glslsandbox-player/Config.in" source "package/gnuplot/Config.in" source "package/jhead/Config.in" source "package/kmscube/Config.in" @@ -275,6 +290,7 @@ comment "Graphic applications" source "package/pngquant/Config.in" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" + source "package/stellarium/Config.in" source "package/tesseract-ocr/Config.in" comment "Graphic libraries" @@ -282,10 +298,10 @@ comment "Graphic libraries" source "package/directfb/Config.in" source "package/directfb-examples/Config.in" source "package/efl/Config.in" + source "package/fb-test-app/Config.in" source "package/fbdump/Config.in" source "package/fbgrab/Config.in" source "package/fbset/Config.in" - source "package/fb-test-app/Config.in" source "package/fbterm/Config.in" source "package/fbv/Config.in" source "package/freerdp/Config.in" @@ -295,6 +311,7 @@ comment "Graphic libraries" source "package/mesa3d/Config.in" source "package/mesa3d-headers/Config.in" source "package/ocrad/Config.in" + source "package/ogre/Config.in" source "package/psplash/Config.in" source "package/sdl/Config.in" source "package/sdl_gfx/Config.in" @@ -313,11 +330,11 @@ comment "Graphic libraries" comment "Other GUIs" source "package/qt5/Config.in" - source "package/kf5/Config.in" if BR2_PACKAGE_QT5 comment "QT libraries and helper libraries" source "package/cutelyst/Config.in" source "package/grantlee/Config.in" + source "package/kf5/Config.in" source "package/qextserialport/Config.in" source "package/qjson/Config.in" source "package/quazip/Config.in" @@ -325,6 +342,7 @@ comment "QT libraries and helper libraries" endif source "package/tekui/Config.in" source "package/weston/Config.in" + source "package/weston-imx/Config.in" source "package/x11r7/Config.in" comment "X applications" @@ -377,6 +395,7 @@ menu "Firmware" source "package/armbian-firmware/Config.in" source "package/b43-firmware/Config.in" source "package/linux-firmware/Config.in" + source "package/murata-cyw-fw/Config.in" source "package/rpi-bt-firmware/Config.in" source "package/rpi-firmware/Config.in" source "package/rpi-wifi-firmware/Config.in" @@ -398,10 +417,12 @@ endmenu source "package/avrdude/Config.in" source "package/bcache-tools/Config.in" source "package/biosdevname/Config.in" + source "package/brickd/Config.in" source "package/brltty/Config.in" source "package/cbootimage/Config.in" source "package/cc-tool/Config.in" source "package/cdrkit/Config.in" + source "package/cpuburn-arm/Config.in" source "package/cryptsetup/Config.in" source "package/cwiid/Config.in" source "package/dahdi-linux/Config.in" @@ -411,7 +432,6 @@ endmenu source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in" source "package/dbus-triggerd/Config.in" - source "package/devmem2/Config.in" source "package/dfu-util/Config.in" source "package/dmidecode/Config.in" source "package/dmraid/Config.in" @@ -428,12 +448,11 @@ endmenu source "package/fan-ctrl/Config.in" source "package/fbtft/Config.in" source "package/fconfig/Config.in" - source "package/fis/Config.in" source "package/flashrom/Config.in" source "package/fmtools/Config.in" source "package/freescale-imx/Config.in" source "package/fxload/Config.in" - source "package/gadgetfs-test/Config.in" + source "package/gcnano-binaries/Config.in" source "package/gpm/Config.in" source "package/gpsd/Config.in" source "package/gptfdisk/Config.in" @@ -452,10 +471,11 @@ endmenu source "package/iucode-tool/Config.in" source "package/kbd/Config.in" source "package/lcdproc/Config.in" + source "package/libubootenv/Config.in" source "package/libuio/Config.in" - source "package/libump/Config.in" - source "package/linuxconsoletools/Config.in" source "package/linux-backports/Config.in" + source "package/linux-serial-test/Config.in" + source "package/linuxconsoletools/Config.in" source "package/lirc-tools/Config.in" source "package/lm-sensors/Config.in" source "package/lshw/Config.in" @@ -465,6 +485,7 @@ endmenu source "package/lvm2/Config.in" source "package/mali-t76x/Config.in" source "package/mdadm/Config.in" + source "package/mdevd/Config.in" source "package/memtest86/Config.in" source "package/memtester/Config.in" source "package/memtool/Config.in" @@ -475,8 +496,6 @@ endmenu source "package/nvidia-driver/Config.in" source "package/nvidia-tegra23/Config.in" source "package/nvme/Config.in" - source "package/odroid-mali/Config.in" - source "package/odroid-scripts/Config.in" source "package/ofono/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in" @@ -494,6 +513,7 @@ endmenu source "package/pps-tools/Config.in" source "package/pru-software-support/Config.in" source "package/pulseview/Config.in" + source "package/raspi-gpio/Config.in" source "package/read-edid/Config.in" source "package/rng-tools/Config.in" source "package/rpi-userland/Config.in" @@ -518,7 +538,6 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali/Config.in" source "package/sunxi-mali-mainline/Config.in" source "package/sunxi-mali-mainline-driver/Config.in" source "package/sysstat/Config.in" @@ -526,9 +545,11 @@ endmenu source "package/ti-gfx/Config.in" source "package/ti-sgx-demos/Config.in" source "package/ti-sgx-km/Config.in" + source "package/ti-sgx-libgbm/Config.in" source "package/ti-sgx-um/Config.in" source "package/ti-uim/Config.in" source "package/ti-utils/Config.in" + source "package/tio/Config.in" source "package/triggerhappy/Config.in" source "package/uboot-tools/Config.in" source "package/ubus/Config.in" @@ -536,6 +557,7 @@ endmenu source "package/udev/Config.in" source "package/udisks/Config.in" source "package/uhubctl/Config.in" + source "package/umtprd/Config.in" source "package/upower/Config.in" source "package/usb_modeswitch/Config.in" source "package/usb_modeswitch_data/Config.in" @@ -554,13 +576,18 @@ menu "Interpreter languages and scripting" source "package/erlang/Config.in" if BR2_PACKAGE_ERLANG menu "Erlang libraries/modules" + source "package/erlang-base64url/Config.in" source "package/erlang-eimp/Config.in" source "package/erlang-goldrush/Config.in" + source "package/erlang-idna/Config.in" source "package/erlang-jiffy/Config.in" + source "package/erlang-jose/Config.in" source "package/erlang-lager/Config.in" + source "package/erlang-p1-acme/Config.in" source "package/erlang-p1-cache-tab/Config.in" - source "package/erlang-p1-iconv/Config.in" + source "package/erlang-p1-mqtree/Config.in" source "package/erlang-p1-oauth2/Config.in" + source "package/erlang-p1-pkix/Config.in" source "package/erlang-p1-sip/Config.in" source "package/erlang-p1-stringprep/Config.in" source "package/erlang-p1-stun/Config.in" @@ -569,6 +596,7 @@ menu "Erlang libraries/modules" source "package/erlang-p1-xml/Config.in" source "package/erlang-p1-xmpp/Config.in" source "package/erlang-p1-yaml/Config.in" + source "package/erlang-p1-yconf/Config.in" source "package/erlang-p1-zlib/Config.in" endmenu endif @@ -577,7 +605,6 @@ endif source "package/gauche/Config.in" source "package/guile/Config.in" source "package/haserl/Config.in" - source "package/jamvm/Config.in" source "package/jimtcl/Config.in" source "package/lua/Config.in" source "package/luainterpreter/Config.in" @@ -603,10 +630,12 @@ menu "Lua libraries/modules" source "package/lrandom/Config.in" source "package/lsqlite3/Config.in" source "package/lua-basexx/Config.in" + source "package/lua-binaryheap/Config.in" source "package/lua-bit32/Config.in" source "package/lua-cjson/Config.in" source "package/lua-coat/Config.in" source "package/lua-coatpersistent/Config.in" + source "package/lua-codegen/Config.in" source "package/lua-compat53/Config.in" source "package/lua-cqueues/Config.in" source "package/lua-csnappy/Config.in" @@ -615,19 +644,28 @@ menu "Lua libraries/modules" source "package/lua-ev/Config.in" source "package/lua-fifo/Config.in" source "package/lua-flu/Config.in" + source "package/lua-gd/Config.in" source "package/lua-http/Config.in" source "package/lua-iconv/Config.in" + source "package/lua-livr/Config.in" + source "package/lua-livr-extra/Config.in" source "package/lua-lpeg-patterns/Config.in" + source "package/lua-lunitx/Config.in" source "package/lua-markdown/Config.in" source "package/lua-messagepack/Config.in" source "package/lua-msgpack-native/Config.in" source "package/lua-periphery/Config.in" + source "package/lua-resty-http/Config.in" + source "package/lua-rotas/Config.in" + source "package/lua-sailor/Config.in" source "package/lua-sdl2/Config.in" + source "package/lua-silva/Config.in" source "package/lua-std-debug/Config.in" source "package/lua-std-normalize/Config.in" source "package/lua-stdlib/Config.in" source "package/lua-testmore/Config.in" source "package/lua-utf8/Config.in" + source "package/lua-valua/Config.in" source "package/luabitop/Config.in" source "package/luadbi/Config.in" source "package/luadbi-sqlite3/Config.in" @@ -638,13 +676,10 @@ menu "Lua libraries/modules" source "package/lualogging/Config.in" source "package/luaossl/Config.in" source "package/luaposix/Config.in" - source "package/lua-resty-http/Config.in" - source "package/lua-sailor/Config.in" source "package/luasec/Config.in" source "package/luasocket/Config.in" source "package/luasql-sqlite3/Config.in" - source "package/lua-valua/Config.in" - source "package/lunit/Config.in" + source "package/luasyslog/Config.in" source "package/lutok/Config.in" source "package/luv/Config.in" source "package/luvi/Config.in" @@ -668,6 +703,7 @@ menu "Mono libraries/modules" endmenu endif source "package/nodejs/Config.in" + source "package/openjdk/Config.in" source "package/perl/Config.in" if BR2_PACKAGE_PERL menu "Perl libraries/modules" @@ -683,6 +719,7 @@ menu "Perl libraries/modules" source "package/perl-cookie-baker/Config.in" source "package/perl-crypt-blowfish/Config.in" source "package/perl-crypt-cbc/Config.in" + source "package/perl-crypt-openssl-aes/Config.in" source "package/perl-crypt-openssl-random/Config.in" source "package/perl-crypt-openssl-rsa/Config.in" source "package/perl-data-dump/Config.in" @@ -697,7 +734,6 @@ menu "Perl libraries/modules" source "package/perl-devel-stacktrace-ashtml/Config.in" source "package/perl-device-serialport/Config.in" source "package/perl-digest-hmac/Config.in" - source "package/perl-digest-md5/Config.in" source "package/perl-digest-sha1/Config.in" source "package/perl-dist-checkconflicts/Config.in" source "package/perl-encode-detect/Config.in" @@ -732,17 +768,16 @@ menu "Perl libraries/modules" source "package/perl-lwp-mediatypes/Config.in" source "package/perl-mail-dkim/Config.in" source "package/perl-mailtools/Config.in" + source "package/perl-math-prime-util/Config.in" source "package/perl-mime-base64-urlsafe/Config.in" - source "package/perl-mime-base64/Config.in" source "package/perl-mime-tools/Config.in" source "package/perl-module-implementation/Config.in" source "package/perl-module-runtime/Config.in" - source "package/perl-mojolicious-plugin-authentication/Config.in" source "package/perl-mojolicious/Config.in" + source "package/perl-mojolicious-plugin-authentication/Config.in" source "package/perl-moo/Config.in" source "package/perl-net-dns/Config.in" source "package/perl-net-http/Config.in" - source "package/perl-net-ping/Config.in" source "package/perl-net-snmp/Config.in" source "package/perl-net-ssh2/Config.in" source "package/perl-net-ssleay/Config.in" @@ -757,8 +792,8 @@ menu "Perl libraries/modules" source "package/perl-role-tiny/Config.in" source "package/perl-stream-buffered/Config.in" source "package/perl-sub-exporter-progressive/Config.in" - source "package/perl-sub-quote/Config.in" source "package/perl-sub-install/Config.in" + source "package/perl-sub-quote/Config.in" source "package/perl-sys-cpu/Config.in" source "package/perl-sys-meminfo/Config.in" source "package/perl-sys-mmap/Config.in" @@ -798,38 +833,59 @@ endif source "package/python3/Config.in" if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 menu "External python modules" + source "package/python-aenum/Config.in" + source "package/python-aioblescan/Config.in" source "package/python-aiocoap/Config.in" + source "package/python-aioconsole/Config.in" source "package/python-aiodns/Config.in" source "package/python-aiohttp/Config.in" + source "package/python-aiohttp-cors/Config.in" + source "package/python-aiohttp-debugtoolbar/Config.in" source "package/python-aiohttp-jinja2/Config.in" + source "package/python-aiohttp-mako/Config.in" source "package/python-aiohttp-remotes/Config.in" source "package/python-aiohttp-security/Config.in" source "package/python-aiohttp-session/Config.in" source "package/python-aiohttp-sse/Config.in" - source "package/python-aiorwlock/Config.in" source "package/python-aiojobs/Config.in" + source "package/python-aiologstash/Config.in" + source "package/python-aiomonitor/Config.in" + source "package/python-aioredis/Config.in" + source "package/python-aiorwlock/Config.in" + source "package/python-aiosignal/Config.in" + source "package/python-aiozipkin/Config.in" source "package/python-alsaaudio/Config.in" source "package/python-argh/Config.in" source "package/python-arrow/Config.in" + source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" + source "package/python-async-lru/Config.in" source "package/python-async-timeout/Config.in" source "package/python-attrs/Config.in" source "package/python-autobahn/Config.in" source "package/python-automat/Config.in" + source "package/python-avro/Config.in" source "package/python-babel/Config.in" + source "package/python-backcall/Config.in" source "package/python-backports-abc/Config.in" + source "package/python-backports-functools-lru-cache/Config.in" source "package/python-backports-shutil-get-terminal-size/Config.in" source "package/python-backports-ssl-match-hostname/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bitstring/Config.in" + source "package/python-bluezero/Config.in" source "package/python-bottle/Config.in" + source "package/python-brotli/Config.in" + source "package/python-bunch/Config.in" source "package/python-cached-property/Config.in" source "package/python-can/Config.in" source "package/python-cbor/Config.in" source "package/python-cchardet/Config.in" source "package/python-certifi/Config.in" source "package/python-cffi/Config.in" + source "package/python-channels/Config.in" + source "package/python-channels-redis/Config.in" source "package/python-characteristic/Config.in" source "package/python-chardet/Config.in" source "package/python-cheetah/Config.in" @@ -837,18 +893,23 @@ menu "External python modules" source "package/python-cherrypy/Config.in" source "package/python-click/Config.in" source "package/python-coherence/Config.in" + source "package/python-colorama/Config.in" + source "package/python-colorlog/Config.in" source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" source "package/python-constantly/Config.in" source "package/python-couchdb/Config.in" source "package/python-crc16/Config.in" source "package/python-crcmod/Config.in" + source "package/python-crontab/Config.in" source "package/python-crossbar/Config.in" source "package/python-cryptography/Config.in" source "package/python-cssselect/Config.in" source "package/python-cssutils/Config.in" + source "package/python-cycler/Config.in" source "package/python-daemon/Config.in" source "package/python-daemonize/Config.in" + source "package/python-daphne/Config.in" source "package/python-dataproperty/Config.in" source "package/python-dateutil/Config.in" source "package/python-decorator/Config.in" @@ -856,61 +917,79 @@ menu "External python modules" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" source "package/python-django/Config.in" + source "package/python-django-enumfields/Config.in" + source "package/python-dnspython/Config.in" source "package/python-docker/Config.in" - source "package/python-dockerpty/Config.in" source "package/python-docker-pycreds/Config.in" + source "package/python-dockerpty/Config.in" source "package/python-docopt/Config.in" source "package/python-docutils/Config.in" source "package/python-dominate/Config.in" source "package/python-dpkt/Config.in" source "package/python-ecdsa/Config.in" source "package/python-engineio/Config.in" + source "package/python-entrypoints/Config.in" source "package/python-enum/Config.in" source "package/python-enum34/Config.in" + source "package/python-esptool/Config.in" source "package/python-falcon/Config.in" source "package/python-fire/Config.in" source "package/python-flask/Config.in" - source "package/python-flask-cors/Config.in" source "package/python-flask-babel/Config.in" + source "package/python-flask-cors/Config.in" source "package/python-flask-jsonrpc/Config.in" source "package/python-flask-login/Config.in" source "package/python-flask-sqlalchemy/Config.in" source "package/python-flup/Config.in" + source "package/python-frozenlist/Config.in" source "package/python-functools32/Config.in" + source "package/python-future/Config.in" source "package/python-futures/Config.in" + source "package/python-gitdb2/Config.in" source "package/python-gobject/Config.in" source "package/python-gunicorn/Config.in" source "package/python-h2/Config.in" + source "package/python-hiredis/Config.in" source "package/python-hpack/Config.in" source "package/python-html5lib/Config.in" source "package/python-httplib2/Config.in" + source "package/python-huepy/Config.in" source "package/python-humanize/Config.in" source "package/python-hyperframe/Config.in" source "package/python-hyperlink/Config.in" source "package/python-ibmiotf/Config.in" source "package/python-id3/Config.in" source "package/python-idna/Config.in" + source "package/python-ifaddr/Config.in" source "package/python-incremental/Config.in" + source "package/python-inflection/Config.in" source "package/python-influxdb/Config.in" source "package/python-iniparse/Config.in" source "package/python-iowait/Config.in" source "package/python-ipaddr/Config.in" source "package/python-ipaddress/Config.in" + source "package/python-iptables/Config.in" source "package/python-ipy/Config.in" source "package/python-ipython/Config.in" source "package/python-ipython-genutils/Config.in" source "package/python-iso8601/Config.in" source "package/python-itsdangerous/Config.in" + source "package/python-janus/Config.in" source "package/python-jaraco-classes/Config.in" + source "package/python-jaraco-functools/Config.in" + source "package/python-jedi/Config.in" source "package/python-jinja2/Config.in" + source "package/python-json-schema-validator/Config.in" source "package/python-jsonmodels/Config.in" source "package/python-jsonschema/Config.in" - source "package/python-json-schema-validator/Config.in" source "package/python-keyring/Config.in" + source "package/python-kiwisolver/Config.in" source "package/python-libconfig/Config.in" source "package/python-libusb1/Config.in" source "package/python-lmdb/Config.in" + source "package/python-lockfile/Config.in" source "package/python-logbook/Config.in" + source "package/python-logstash/Config.in" source "package/python-lxml/Config.in" source "package/python-m2r/Config.in" source "package/python-mad/Config.in" @@ -918,17 +997,20 @@ menu "External python modules" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" source "package/python-markupsafe/Config.in" + source "package/python-matplotlib/Config.in" source "package/python-mbstrdecoder/Config.in" source "package/python-meld3/Config.in" source "package/python-mimeparse/Config.in" source "package/python-mistune/Config.in" source "package/python-more-itertools/Config.in" + source "package/python-msgfy/Config.in" source "package/python-msgpack/Config.in" source "package/python-multidict/Config.in" source "package/python-mutagen/Config.in" source "package/python-mwclient/Config.in" source "package/python-mwscrape/Config.in" source "package/python-mwscrape2slob/Config.in" + source "package/python-nested-dict/Config.in" source "package/python-netaddr/Config.in" source "package/python-netifaces/Config.in" source "package/python-networkmanager/Config.in" @@ -939,11 +1021,13 @@ menu "External python modules" source "package/python-paho-mqtt/Config.in" source "package/python-pam/Config.in" source "package/python-paramiko/Config.in" + source "package/python-parso/Config.in" source "package/python-passlib/Config.in" source "package/python-pathlib2/Config.in" source "package/python-pathpy/Config.in" source "package/python-pathtools/Config.in" source "package/python-pathvalidate/Config.in" + source "package/python-periphery/Config.in" source "package/python-pexpect/Config.in" source "package/python-pickleshare/Config.in" source "package/python-pigpio/Config.in" @@ -960,16 +1044,19 @@ menu "External python modules" source "package/python-ptyprocess/Config.in" source "package/python-pudb/Config.in" source "package/python-py/Config.in" + source "package/python-pyaes/Config.in" source "package/python-pyasn/Config.in" source "package/python-pyasn-modules/Config.in" source "package/python-pyasn1/Config.in" source "package/python-pyasn1-modules/Config.in" + source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" source "package/python-pycli/Config.in" source "package/python-pycparser/Config.in" source "package/python-pycrypto/Config.in" source "package/python-pycryptodomex/Config.in" source "package/python-pydal/Config.in" + source "package/python-pydantic/Config.in" source "package/python-pyelftools/Config.in" source "package/python-pyftpdlib/Config.in" source "package/python-pygame/Config.in" @@ -977,6 +1064,7 @@ menu "External python modules" source "package/python-pyhamcrest/Config.in" source "package/python-pyicu/Config.in" source "package/python-pyinotify/Config.in" + source "package/python-pyjwt/Config.in" source "package/python-pylibftdi/Config.in" source "package/python-pylru/Config.in" source "package/python-pymodbus/Config.in" @@ -995,7 +1083,6 @@ menu "External python modules" source "package/python-pysmb/Config.in" source "package/python-pysmi/Config.in" source "package/python-pysnmp/Config.in" - source "package/python-pysnmp-apps/Config.in" source "package/python-pysnmp-mibs/Config.in" source "package/python-pysocks/Config.in" source "package/python-pytablereader/Config.in" @@ -1008,6 +1095,7 @@ menu "External python modules" source "package/python-pyyaml/Config.in" source "package/python-pyzmq/Config.in" source "package/python-raven/Config.in" + source "package/python-redis/Config.in" source "package/python-reentry/Config.in" source "package/python-remi/Config.in" source "package/python-request-id/Config.in" @@ -1015,10 +1103,10 @@ menu "External python modules" source "package/python-requests-oauthlib/Config.in" source "package/python-requests-toolbelt/Config.in" source "package/python-rpi-gpio/Config.in" + source "package/python-rpi-ws281x/Config.in" source "package/python-rtslib-fb/Config.in" source "package/python-scandir/Config.in" source "package/python-scapy/Config.in" - source "package/python-scapy3k/Config.in" source "package/python-schedule/Config.in" source "package/python-sdnotify/Config.in" source "package/python-secretstorage/Config.in" @@ -1035,29 +1123,40 @@ menu "External python modules" source "package/python-simpleaudio/Config.in" source "package/python-simplegeneric/Config.in" source "package/python-simplejson/Config.in" + source "package/python-simplelogging/Config.in" source "package/python-simplesqlite/Config.in" source "package/python-singledispatch/Config.in" source "package/python-sip/Config.in" source "package/python-six/Config.in" source "package/python-slob/Config.in" source "package/python-smbus-cffi/Config.in" + source "package/python-smmap2/Config.in" source "package/python-socketio/Config.in" + source "package/python-sockjs/Config.in" source "package/python-sortedcontainers/Config.in" + source "package/python-soupsieve/Config.in" source "package/python-spidev/Config.in" source "package/python-sqlalchemy/Config.in" + source "package/python-sqliteschema/Config.in" + source "package/python-sqlparse/Config.in" source "package/python-subprocess32/Config.in" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tempora/Config.in" + source "package/python-termcolor/Config.in" + source "package/python-terminaltables/Config.in" source "package/python-texttable/Config.in" source "package/python-thrift/Config.in" + source "package/python-tinyrpc/Config.in" source "package/python-tomako/Config.in" source "package/python-toml/Config.in" source "package/python-tornado/Config.in" + source "package/python-tqdm/Config.in" source "package/python-traitlets/Config.in" source "package/python-treq/Config.in" source "package/python-twisted/Config.in" source "package/python-txaio/Config.in" + source "package/python-txdbus/Config.in" source "package/python-txtorcon/Config.in" source "package/python-typepy/Config.in" source "package/python-typing/Config.in" @@ -1073,6 +1172,7 @@ menu "External python modules" source "package/python-watchdog/Config.in" source "package/python-wcwidth/Config.in" source "package/python-web2py/Config.in" + source "package/python-webencodings/Config.in" source "package/python-webob/Config.in" source "package/python-webpy/Config.in" source "package/python-websocket-client/Config.in" @@ -1091,6 +1191,7 @@ menu "External python modules" source "package/python-xmltodict/Config.in" source "package/python-yarl/Config.in" source "package/python-yieldfrom/Config.in" + source "package/python-zc-lockfile/Config.in" source "package/python-zeroconf/Config.in" source "package/python-zope-interface/Config.in" endmenu @@ -1109,10 +1210,11 @@ menu "Libraries" menu "Audio/Sound" source "package/alsa-lib/Config.in" + source "package/alure/Config.in" source "package/aubio/Config.in" source "package/audiofile/Config.in" source "package/bcg729/Config.in" - source "package/celt051/Config.in" + source "package/caps/Config.in" source "package/fdk-aac/Config.in" source "package/libao/Config.in" source "package/libasplib/Config.in" @@ -1169,6 +1271,7 @@ menu "Compression and decompression" source "package/snappy/Config.in" source "package/szip/Config.in" source "package/zlib/Config.in" + source "package/zziplib/Config.in" endmenu menu "Crypto" @@ -1178,6 +1281,7 @@ menu "Crypto" source "package/cryptodev/Config.in" source "package/gcr/Config.in" source "package/gnutls/Config.in" + source "package/libargon2/Config.in" source "package/libassuan/Config.in" source "package/libgcrypt/Config.in" source "package/libgpg-error/Config.in" @@ -1187,6 +1291,8 @@ menu "Crypto" source "package/libmcrypt/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" + source "package/libolm/Config.in" + source "package/libp11/Config.in" source "package/libscrypt/Config.in" source "package/libsecret/Config.in" source "package/libsha1/Config.in" @@ -1219,6 +1325,7 @@ menu "Database" source "package/mysql/Config.in" source "package/postgresql/Config.in" source "package/redis/Config.in" + source "package/rocksdb/Config.in" source "package/sqlcipher/Config.in" source "package/sqlite/Config.in" source "package/unixodbc/Config.in" @@ -1242,12 +1349,13 @@ menu "Graphics" source "package/at-spi2-core/Config.in" source "package/atk/Config.in" source "package/atkmm/Config.in" + source "package/bayer2rgb-neon/Config.in" source "package/bullet/Config.in" source "package/cairo/Config.in" source "package/cairomm/Config.in" source "package/chipmunk/Config.in" - source "package/exiv2/Config.in" source "package/exempi/Config.in" + source "package/exiv2/Config.in" source "package/fltk/Config.in" source "package/fontconfig/Config.in" source "package/freetype/Config.in" @@ -1263,6 +1371,8 @@ menu "Graphics" source "package/ijs/Config.in" source "package/imlib2/Config.in" source "package/intel-gmmlib/Config.in" + source "package/intel-mediadriver/Config.in" + source "package/intel-mediasdk/Config.in" source "package/irrlicht/Config.in" source "package/jasper/Config.in" source "package/jpeg/Config.in" @@ -1304,6 +1414,7 @@ menu "Graphics" source "package/libva-intel-driver/Config.in" source "package/libvdpau/Config.in" source "package/libvips/Config.in" + source "package/libwpe/Config.in" source "package/menu-cache/Config.in" source "package/opencv/Config.in" source "package/opencv3/Config.in" @@ -1311,6 +1422,7 @@ menu "Graphics" source "package/openjpeg/Config.in" source "package/pango/Config.in" source "package/pangomm/Config.in" + source "package/pipewire/Config.in" source "package/pixman/Config.in" source "package/poppler/Config.in" source "package/powervr/Config.in" @@ -1322,6 +1434,8 @@ menu "Graphics" source "package/webkitgtk/Config.in" source "package/webp/Config.in" source "package/woff2/Config.in" + source "package/wpebackend-fdo/Config.in" + source "package/wpewebkit/Config.in" source "package/zbar/Config.in" source "package/zxing-cpp/Config.in" endmenu @@ -1335,6 +1449,7 @@ menu "Hardware handling" source "package/gnu-efi/Config.in" source "package/hackrf/Config.in" source "package/hidapi/Config.in" + source "package/jitterentropy-library/Config.in" source "package/lcdapi/Config.in" source "package/let-me-create/Config.in" source "package/libaio/Config.in" @@ -1408,6 +1523,8 @@ endmenu endif source "package/jsmin/Config.in" source "package/json-javascript/Config.in" + source "package/openlayers/Config.in" + source "package/spidermonkey/Config.in" endmenu menu "JSON/XML" @@ -1446,7 +1563,6 @@ menu "JSON/XML" endmenu menu "Logging" - source "package/eventlog/Config.in" source "package/glog/Config.in" source "package/liblog4c-localtime/Config.in" source "package/liblogging/Config.in" @@ -1454,17 +1570,19 @@ menu "Logging" source "package/log4cpp/Config.in" source "package/log4cxx/Config.in" source "package/opentracing-cpp/Config.in" + source "package/spdlog/Config.in" source "package/zlog/Config.in" endmenu menu "Multimedia" source "package/bitstream/Config.in" + source "package/dav1d/Config.in" source "package/kvazaar/Config.in" source "package/libaacs/Config.in" - source "package/libamcodec/Config.in" source "package/libass/Config.in" source "package/libbdplus/Config.in" source "package/libbluray/Config.in" + source "package/libcamera/Config.in" source "package/libdcadec/Config.in" source "package/libdvbcsa/Config.in" source "package/libdvbpsi/Config.in" @@ -1481,7 +1599,6 @@ menu "Multimedia" source "package/libogg/Config.in" source "package/libopenh264/Config.in" source "package/libopusenc/Config.in" - source "package/libplayer/Config.in" source "package/libtheora/Config.in" source "package/libvpx/Config.in" source "package/libyuv/Config.in" @@ -1493,10 +1610,6 @@ endmenu menu "Networking" source "package/agentpp/Config.in" - source "package/alljoyn/Config.in" - source "package/alljoyn-base/Config.in" - source "package/alljoyn-tcl/Config.in" - source "package/alljoyn-tcl-base/Config.in" source "package/azmq/Config.in" source "package/azure-iot-sdk-c/Config.in" source "package/batman-adv/Config.in" @@ -1509,10 +1622,12 @@ menu "Networking" source "package/czmq/Config.in" source "package/daq/Config.in" source "package/davici/Config.in" + source "package/enet/Config.in" source "package/filemq/Config.in" source "package/flickcurl/Config.in" source "package/fmlib/Config.in" source "package/freeradius-client/Config.in" + source "package/gensio/Config.in" source "package/geoip/Config.in" source "package/glib-networking/Config.in" source "package/grpc/Config.in" @@ -1531,7 +1646,9 @@ menu "Networking" source "package/libeXosip2/Config.in" source "package/libfcgi/Config.in" source "package/libgsasl/Config.in" + source "package/libhtp/Config.in" source "package/libhttpparser/Config.in" + source "package/libhttpserver/Config.in" source "package/libidn/Config.in" source "package/libidn2/Config.in" source "package/libiscsi/Config.in" @@ -1544,9 +1661,11 @@ menu "Networking" source "package/libminiupnpc/Config.in" source "package/libmnl/Config.in" source "package/libmodbus/Config.in" + source "package/libmodsecurity/Config.in" source "package/libnatpmp/Config.in" source "package/libndp/Config.in" source "package/libnet/Config.in" + source "package/libnetconf2/Config.in" source "package/libnetfilter_acct/Config.in" source "package/libnetfilter_conntrack/Config.in" source "package/libnetfilter_cthelper/Config.in" @@ -1570,6 +1689,7 @@ menu "Networking" source "package/libsoup/Config.in" source "package/libsrtp/Config.in" source "package/libstrophe/Config.in" + source "package/libtelnet/Config.in" source "package/libtirpc/Config.in" source "package/libtorrent/Config.in" source "package/libtorrent-rasterbar/Config.in" @@ -1580,6 +1700,7 @@ menu "Networking" source "package/libvncserver/Config.in" source "package/libwebsock/Config.in" source "package/libwebsockets/Config.in" + source "package/libyang/Config.in" source "package/lksctp-tools/Config.in" source "package/mongoose/Config.in" source "package/nanomsg/Config.in" @@ -1596,13 +1717,16 @@ menu "Networking" source "package/openzwave/Config.in" source "package/ortp/Config.in" source "package/paho-mqtt-c/Config.in" + source "package/paho-mqtt-cpp/Config.in" source "package/qdecoder/Config.in" source "package/qpid-proton/Config.in" source "package/rabbitmq-c/Config.in" + source "package/restclient-cpp/Config.in" source "package/rtmpdump/Config.in" source "package/slirp/Config.in" source "package/snmppp/Config.in" source "package/sofia-sip/Config.in" + source "package/sysrepo/Config.in" source "package/thrift/Config.in" source "package/usbredir/Config.in" source "package/wampcc/Config.in" @@ -1618,13 +1742,16 @@ menu "Other" source "package/argp-standalone/Config.in" source "package/armadillo/Config.in" source "package/atf/Config.in" + source "package/avro-c/Config.in" source "package/bctoolbox/Config.in" source "package/bdwgc/Config.in" source "package/boost/Config.in" + source "package/c-capnproto/Config.in" source "package/capnproto/Config.in" + source "package/cctz/Config.in" + source "package/cereal/Config.in" source "package/clang/Config.in" source "package/clapack/Config.in" - source "package/classpath/Config.in" source "package/cmocka/Config.in" source "package/cppcms/Config.in" source "package/cracklib/Config.in" @@ -1639,6 +1766,7 @@ menu "Other" source "package/flatcc/Config.in" source "package/gconf/Config.in" source "package/gflags/Config.in" + source "package/gli/Config.in" source "package/glibmm/Config.in" source "package/glm/Config.in" source "package/gmp/Config.in" @@ -1648,6 +1776,7 @@ menu "Other" source "package/lapack/Config.in" source "package/libargtable2/Config.in" source "package/libatomic_ops/Config.in" + source "package/libavl/Config.in" source "package/libb64/Config.in" source "package/libbsd/Config.in" source "package/libcap/Config.in" @@ -1697,6 +1826,7 @@ menu "Other" source "package/linux-pam/Config.in" if BR2_PACKAGE_LINUX_PAM comment "linux-pam plugins" + source "package/libpam-nfc/Config.in" source "package/libpam-radius-auth/Config.in" source "package/libpam-tacplus/Config.in" endif @@ -1710,6 +1840,7 @@ endif source "package/msgpack/Config.in" source "package/mtdev2tuio/Config.in" source "package/musl-compat-headers/Config.in" + source "package/musl-fts/Config.in" source "package/openblas/Config.in" source "package/orc/Config.in" source "package/p11-kit/Config.in" @@ -1726,6 +1857,7 @@ endif source "package/tinycbor/Config.in" source "package/tz/Config.in" source "package/tzdata/Config.in" + source "package/uvw/Config.in" source "package/xapian/Config.in" endmenu @@ -1740,6 +1872,7 @@ menu "Text and terminal handling" source "package/augeas/Config.in" source "package/enchant/Config.in" source "package/fmt/Config.in" + source "package/fstrcmp/Config.in" source "package/icu/Config.in" source "package/libcli/Config.in" source "package/libedit/Config.in" @@ -1751,13 +1884,14 @@ menu "Text and terminal handling" source "package/linenoise/Config.in" source "package/ncurses/Config.in" source "package/newt/Config.in" + source "package/oniguruma/Config.in" source "package/pcre/Config.in" source "package/pcre2/Config.in" source "package/popt/Config.in" source "package/readline/Config.in" source "package/slang/Config.in" source "package/tclap/Config.in" - source "package/ustr/Config.in" + source "package/utf8proc/Config.in" endmenu endmenu @@ -1776,8 +1910,10 @@ endmenu menu "Miscellaneous" source "package/aespipe/Config.in" source "package/bc/Config.in" + source "package/bitcoin/Config.in" source "package/clamav/Config.in" source "package/collectd/Config.in" + source "package/collectl/Config.in" source "package/domoticz/Config.in" source "package/empty/Config.in" source "package/gnuradio/Config.in" @@ -1793,6 +1929,7 @@ menu "Miscellaneous" source "package/qemu/Config.in" source "package/qpdf/Config.in" source "package/shared-mime-info/Config.in" + source "package/sunwait/Config.in" source "package/taskd/Config.in" source "package/wine/Config.in" source "package/xutil_util-macros/Config.in" @@ -1817,7 +1954,6 @@ menu "Networking applications" source "package/bind/Config.in" source "package/bird/Config.in" source "package/bluez-tools/Config.in" - source "package/bluez_utils/Config.in" source "package/bluez5_utils/Config.in" source "package/bmon/Config.in" source "package/boa/Config.in" @@ -1875,6 +2011,7 @@ menu "Networking applications" source "package/ibrdtn-tools/Config.in" source "package/ibrdtnd/Config.in" source "package/ifenslave/Config.in" + source "package/ifmetric/Config.in" source "package/ifplugd/Config.in" source "package/iftop/Config.in" source "package/ifupdown/Config.in" @@ -1928,20 +2065,22 @@ menu "Networking applications" source "package/nbd/Config.in" source "package/ncftp/Config.in" source "package/ndisc6/Config.in" + source "package/net-tools/Config.in" source "package/netatalk/Config.in" source "package/netcat/Config.in" source "package/netcat-openbsd/Config.in" source "package/netplug/Config.in" source "package/netsnmp/Config.in" source "package/netstat-nat/Config.in" - source "package/net-tools/Config.in" source "package/network-manager/Config.in" + source "package/network-manager-openvpn/Config.in" source "package/nfacct/Config.in" source "package/nftables/Config.in" source "package/nginx/Config.in" if BR2_PACKAGE_NGINX menu "External nginx modules" source "package/nginx-dav-ext/Config.in" + source "package/nginx-modsecurity/Config.in" source "package/nginx-naxsi/Config.in" source "package/nginx-upload/Config.in" endmenu @@ -2001,6 +2140,7 @@ endif source "package/shellinabox/Config.in" source "package/smcroute/Config.in" source "package/sngrep/Config.in" + source "package/snmpclitools/Config.in" source "package/snort/Config.in" source "package/socat/Config.in" source "package/socketcand/Config.in" @@ -2009,10 +2149,12 @@ endif source "package/spice/Config.in" source "package/spice-protocol/Config.in" source "package/squid/Config.in" + source "package/sshguard/Config.in" source "package/sshpass/Config.in" source "package/sslh/Config.in" source "package/strongswan/Config.in" source "package/stunnel/Config.in" + source "package/suricata/Config.in" source "package/tcpdump/Config.in" source "package/tcping/Config.in" source "package/tcpreplay/Config.in" @@ -2020,12 +2162,15 @@ endif source "package/thttpd/Config.in" source "package/tinc/Config.in" source "package/tinyhttpd/Config.in" + source "package/tinyssh/Config.in" source "package/tor/Config.in" source "package/traceroute/Config.in" source "package/transmission/Config.in" source "package/tunctl/Config.in" source "package/tvheadend/Config.in" + source "package/uacme/Config.in" source "package/udpcast/Config.in" + source "package/uftp/Config.in" source "package/uhttpd/Config.in" source "package/ulogd/Config.in" source "package/ushare/Config.in" @@ -2040,7 +2185,8 @@ endif source "package/wavemon/Config.in" source "package/wget/Config.in" source "package/whois/Config.in" - source "package/wireguard/Config.in" + source "package/wireguard-linux-compat/Config.in" + source "package/wireguard-tools/Config.in" source "package/wireless-regdb/Config.in" source "package/wireless_tools/Config.in" source "package/wireshark/Config.in" @@ -2076,6 +2222,11 @@ endmenu menu "Security" source "package/checkpolicy/Config.in" + source "package/ima-evm-utils/Config.in" + source "package/optee-benchmark/Config.in" + source "package/optee-client/Config.in" + source "package/optee-examples/Config.in" + source "package/optee-test/Config.in" source "package/paxtest/Config.in" source "package/policycoreutils/Config.in" source "package/refpolicy/Config.in" @@ -2118,6 +2269,7 @@ comment "Utilities" source "package/which/Config.in" source "package/xmlstarlet/Config.in" source "package/xxhash/Config.in" + source "package/ytree/Config.in" endmenu menu "System tools" @@ -2126,6 +2278,7 @@ menu "System tools" source "package/atop/Config.in" source "package/attr/Config.in" source "package/audit/Config.in" + source "package/bubblewrap/Config.in" source "package/cgroupfs-mount/Config.in" source "package/circus/Config.in" source "package/coreutils/Config.in" @@ -2150,16 +2303,21 @@ menu "System tools" source "package/iotop/Config.in" source "package/iprutils/Config.in" source "package/irqbalance/Config.in" + source "package/jailhouse/Config.in" 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/mender/Config.in" + source "package/mender-grubenv/Config.in" + source "package/mfoc/Config.in" source "package/monit/Config.in" source "package/ncdu/Config.in" + source "package/netifrc/Config.in" source "package/numactl/Config.in" source "package/nut/Config.in" + source "package/openrc/Config.in" source "package/openvmtools/Config.in" source "package/pamtester/Config.in" source "package/polkit/Config.in" @@ -2180,6 +2338,7 @@ menu "System tools" source "package/s6-rc/Config.in" source "package/scrub/Config.in" source "package/scrypt/Config.in" + source "package/sdbusplus/Config.in" source "package/smack/Config.in" source "package/start-stop-daemon/Config.in" source "package/supervisor/Config.in" @@ -2190,11 +2349,14 @@ menu "System tools" source "package/systemd-bootchart/Config.in" source "package/sysvinit/Config.in" source "package/tar/Config.in" + source "package/thermald/Config.in" source "package/tpm-tools/Config.in" source "package/tpm2-abrmd/Config.in" source "package/tpm2-tools/Config.in" + source "package/tpm2-totp/Config.in" source "package/unscd/Config.in" source "package/util-linux/Config.in" + source "package/xdg-dbus-proxy/Config.in" source "package/xen/Config.in" source "package/xvisor/Config.in" endmenu @@ -2204,6 +2366,7 @@ menu "Text editors and viewers" source "package/joe/Config.in" source "package/less/Config.in" source "package/mc/Config.in" + source "package/most/Config.in" source "package/nano/Config.in" source "package/uemacs/Config.in" source "package/vim/Config.in" diff --git a/buildroot/package/Config.in.host b/buildroot/package/Config.in.host index 2c68fb7e3..dfea47886 100644 --- a/buildroot/package/Config.in.host +++ b/buildroot/package/Config.in.host @@ -10,15 +10,18 @@ menu "Host utilities" source "package/cmake/Config.in.host" source "package/cramfs/Config.in.host" source "package/cryptsetup/Config.in.host" + source "package/dbus-python/Config.in.host" source "package/dfu-util/Config.in.host" source "package/dos2unix/Config.in.host" source "package/dosfstools/Config.in.host" + source "package/doxygen/Config.in.host" source "package/dtc/Config.in.host" source "package/e2fsprogs/Config.in.host" source "package/e2tools/Config.in.host" source "package/eudev/Config.in.host" source "package/f2fs-tools/Config.in.host" source "package/faketime/Config.in.host" + source "package/fatcat/Config.in.host" source "package/fwup/Config.in.host" source "package/genext2fs/Config.in.host" source "package/genimage/Config.in.host" @@ -28,12 +31,16 @@ menu "Host utilities" source "package/go-bootstrap/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" + source "package/imagemagick/Config.in.host" source "package/imx-mkimage/Config.in.host" source "package/imx-usb-loader/Config.in.host" source "package/jq/Config.in.host" source "package/jsmin/Config.in.host" + source "package/libp11/Config.in.host" + source "package/lld/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" + source "package/mender-artifact/Config.in.host" source "package/mfgtools/Config.in.host" source "package/mkpasswd/Config.in.host" source "package/mtd/Config.in.host" @@ -47,10 +54,12 @@ menu "Host utilities" source "package/pkgconf/Config.in.host" source "package/pru-software-support/Config.in.host" source "package/pwgen/Config.in.host" + source "package/python/Config.in.host" source "package/python-cython/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-six/Config.in.host" source "package/python-xlrd/Config.in.host" + source "package/python3/Config.in.host" source "package/qemu/Config.in.host" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" @@ -58,9 +67,11 @@ menu "Host utilities" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" + source "package/sdbusplus/Config.in.host" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" source "package/swig/Config.in.host" + source "package/systemd/Config.in.host" source "package/tegrarcm/Config.in.host" source "package/ti-cgt-pru/Config.in.host" source "package/uboot-tools/Config.in.host" diff --git a/buildroot/package/Makefile.in b/buildroot/package/Makefile.in index dc818a2c1..285e2837e 100644 --- a/buildroot/package/Makefile.in +++ b/buildroot/package/Makefile.in @@ -70,6 +70,15 @@ ABI := $(ABI)hf endif endif +# For C-SKY abiv1 & abiv2 +ifeq ($(BR2_csky),y) +ifeq ($(BR2_ck610),y) +ABI = abiv1 +else +ABI = abiv2 +endif +endif + # For FSL PowerPC there's SPE ifeq ($(BR2_powerpc_SPE),y) ABI = spe @@ -103,10 +112,6 @@ ifeq ($(BR2_xtensa),y) TARGET_ABI += -mlongcalls -mauto-litpools endif -ifeq ($(BR2_arc)$(BR2_ARC_ATOMIC_EXT),yy) -TARGET_ABI += -matomic -endif - STAGING_SUBDIR = $(GNU_TARGET_NAME)/sysroot STAGING_DIR = $(HOST_DIR)/$(STAGING_SUBDIR) @@ -225,27 +230,6 @@ HOST_CFLAGS += $(HOST_CPPFLAGS) HOST_CXXFLAGS += $(HOST_CFLAGS) HOST_LDFLAGS += -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib -# The macros below are taken from linux 4.11 and adapted slightly. -# Copy more when needed. - -# try-run -# Usage: option = $(call try-run, $(CC)...-o "$$TMP",option-ok,otherwise) -# Exit code chooses option. "$$TMP" is can be used as temporary file and -# is automatically cleaned up. -try-run = $(shell set -e; \ - TMP="$$(mktemp)"; \ - if ($(1)) >/dev/null 2>&1; \ - then echo "$(2)"; \ - else echo "$(3)"; \ - fi; \ - rm -f "$$TMP") - -# host-cc-option -# Usage: HOST_FOO_CFLAGS += $(call host-cc-option,-no-pie,) -host-cc-option = $(call try-run,\ - $(HOSTCC) $(HOST_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2)) - - # host-intltool should be executed with the system perl, so we save # the path to the system perl, before a host-perl built by Buildroot # might get installed into $(HOST_DIR)/bin and therefore appears diff --git a/buildroot/package/a10disp/a10disp.hash b/buildroot/package/a10disp/a10disp.hash index a1ec11c75..f1bddec5d 100644 --- a/buildroot/package/a10disp/a10disp.hash +++ b/buildroot/package/a10disp/a10disp.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5077405030e8f97a1edd4b86d469466abbc4d32b4a4609e58459347fcd1ba35b a10disp-v0.6.1.tar.gz +sha256 5077405030e8f97a1edd4b86d469466abbc4d32b4a4609e58459347fcd1ba35b a10disp-0.6.1.tar.gz diff --git a/buildroot/package/a10disp/a10disp.mk b/buildroot/package/a10disp/a10disp.mk index 7353edea6..4c2ee14e2 100644 --- a/buildroot/package/a10disp/a10disp.mk +++ b/buildroot/package/a10disp/a10disp.mk @@ -4,8 +4,8 @@ # ################################################################################ -A10DISP_VERSION = v0.6.1 -A10DISP_SITE = $(call github,hglm,a10disp,$(A10DISP_VERSION)) +A10DISP_VERSION = 0.6.1 +A10DISP_SITE = $(call github,hglm,a10disp,v$(A10DISP_VERSION)) A10DISP_LICENSE = MIT A10DISP_DEPENDENCIES = linux diff --git a/buildroot/package/acl/acl.hash b/buildroot/package/acl/acl.hash index 091092a1c..50c32d773 100644 --- a/buildroot/package/acl/acl.hash +++ b/buildroot/package/acl/acl.hash @@ -1,2 +1,6 @@ # Locally calculated after checking pgp signature sha256 06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7 acl-2.2.53.tar.gz + +# Locally calculated +sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 doc/COPYING +sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55 doc/COPYING.LGPL diff --git a/buildroot/package/acl/acl.mk b/buildroot/package/acl/acl.mk index 038bc7a05..8dce27415 100644 --- a/buildroot/package/acl/acl.mk +++ b/buildroot/package/acl/acl.mk @@ -15,7 +15,6 @@ HOST_ACL_DEPENDENCIES = host-attr ACL_INSTALL_STAGING = YES ACL_CONF_OPTS = --disable-nls -HOST_ACL_CONF_OPTS = --disable-nls $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/acpica/0001-build-do-not-use-Werror.patch b/buildroot/package/acpica/0001-build-do-not-use-Werror.patch index e7449e982..f905e552b 100644 --- a/buildroot/package/acpica/0001-build-do-not-use-Werror.patch +++ b/buildroot/package/acpica/0001-build-do-not-use-Werror.patch @@ -10,19 +10,21 @@ newer versions that introduce new warnings. Remove use of -Werror. [Vincent: tweak patch for 20170531 release] +[Bernd: tweak patch for 20191018 release] Signed-off-by: "Yann E. MORIN" Signed-off-by: "Vicente Olivert Riera" +Signed-off-by: Bernd Kuhls --- generate/unix/Makefile.config | 1 - - generate/unix/iasl/Makefile | 12 ++++++------ - 2 files changed, 6 insertions(+), 7 deletions(-) + generate/unix/iasl/Makefile | 16 ++++++++-------- + 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config -index 4d4f182..a7120e3 100644 +index c28e8a9b1..7064bed97 100644 --- a/generate/unix/Makefile.config +++ b/generate/unix/Makefile.config -@@ -194,7 +194,6 @@ CWARNINGFLAGS = \ +@@ -204,7 +204,6 @@ CWARNINGFLAGS = \ -Wall\ -Wbad-function-cast\ -Wdeclaration-after-statement\ @@ -31,10 +33,10 @@ index 4d4f182..a7120e3 100644 -Wmissing-declarations\ -Wmissing-prototypes\ diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile -index 156c23a..28ffc06 100644 +index 47ea73cab..2c756af79 100644 --- a/generate/unix/iasl/Makefile +++ b/generate/unix/iasl/Makefile -@@ -335,24 +335,24 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparse +@@ -360,32 +360,32 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparse # $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c @echo "- " "Intermediate" $< @@ -44,6 +46,16 @@ index 156c23a..28ffc06 100644 $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c @echo "- " "Intermediate" $< - @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< ++ @$(CC) -c $(CFLAGS) -Wall -o$@ $< + + $(OBJDIR)/dtcompilerparserlex.o : $(OBJDIR)/dtcompilerparserlex.c + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< ++ @$(CC) -c $(CFLAGS) -Wall -o$@ $< + + $(OBJDIR)/dtcompilerparserparse.o : $(OBJDIR)/dtcompilerparserparse.c + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @$(CC) -c $(CFLAGS) -Wall -o$@ $< $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c @@ -65,3 +77,6 @@ index 156c23a..28ffc06 100644 @echo "- " "Intermediate" $< - @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @$(CC) -c $(CFLAGS) -Wall -o$@ $< +-- +2.20.1 + diff --git a/buildroot/package/acpica/acpica.hash b/buildroot/package/acpica/acpica.hash index 4942fe454..ac2201d57 100644 --- a/buildroot/package/acpica/acpica.hash +++ b/buildroot/package/acpica/acpica.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 0b979b778bcf711a2b8702b1831affd7dac4a776235d7877fd185651b6a390a3 acpica-unix2-20170531.tar.gz +sha256 edb9a886455d22955c93753e2de61b780bed94fb434079e844dc5e4376cadd4c acpica-unix2-20191018.tar.gz +sha256 65464cea6ee2f7a5d38e2b5f1050a4b39a15358a09b8e36119416d4e2c5031b8 source/include/acpi.h diff --git a/buildroot/package/acpica/acpica.mk b/buildroot/package/acpica/acpica.mk index c54006192..68b948c86 100644 --- a/buildroot/package/acpica/acpica.mk +++ b/buildroot/package/acpica/acpica.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACPICA_VERSION = 20170531 +ACPICA_VERSION = 20191018 ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz ACPICA_SITE = https://acpica.org/sites/acpica/files ACPICA_LICENSE = BSD-3-Clause or GPL-2.0 diff --git a/buildroot/package/acpid/S02acpid b/buildroot/package/acpid/S02acpid index e8d366167..9017d508f 100644 --- a/buildroot/package/acpid/S02acpid +++ b/buildroot/package/acpid/S02acpid @@ -1,22 +1,53 @@ #!/bin/sh -case "$1" in - start) - printf "Starting acpid: " - start-stop-daemon -S -q -m -b -p /var/run/acpid.pid --exec /usr/sbin/acpid -- -n - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping acpid: " - start-stop-daemon -K -q -p /var/run/acpid.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart) - "$0" stop +DAEMON="acpid" +EXEC="/usr/sbin/$DAEMON" +PIDFILE="/var/run/$DAEMON.pid" + +ACPID_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "$EXEC" \ + -- -n $ACPID_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" -x "$EXEC" + status=$? + if [ "$status" -eq 0 ]; then + # Give acpid time to send dying gasp to syslog sleep 1 - "$0" start - ;; + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + restart;; *) - echo "Usage: $0 {start|stop|restart}" - ;; + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac diff --git a/buildroot/package/acpid/acpid.hash b/buildroot/package/acpid/acpid.hash index 028621962..f325325b9 100644 --- a/buildroot/package/acpid/acpid.hash +++ b/buildroot/package/acpid/acpid.hash @@ -1,3 +1,7 @@ # From https://sourceforge.net/projects/acpid2/files/ -md5 1528040b5d34f8c24ebabd97befbf913 acpid-2.0.30.tar.xz -sha1 680bbb3fa9cdabb78fb19c6d24bb57224fbbbaed acpid-2.0.30.tar.xz +md5 248995264b9d1cd8bdb923d5b190fd44 acpid-2.0.32.tar.xz +sha1 a194e99c5b596186c7865e7ddfec55dea6d7fc73 acpid-2.0.32.tar.xz + +# Locally computed +sha256 f2d2d30b3edc3234bd82f6f7186699a6aa3c85c8d20bc4e30e9b3c68a1ed157e acpid-2.0.32.tar.xz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/acpid/acpid.mk b/buildroot/package/acpid/acpid.mk index adcc1757a..ff6e62b5c 100644 --- a/buildroot/package/acpid/acpid.mk +++ b/buildroot/package/acpid/acpid.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACPID_VERSION = 2.0.30 +ACPID_VERSION = 2.0.32 ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz ACPID_SITE = http://downloads.sourceforge.net/project/acpid2 ACPID_LICENSE = GPL-2.0+ @@ -13,9 +13,6 @@ ACPID_LICENSE_FILES = COPYING define ACPID_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/acpid/acpid.service \ $(TARGET_DIR)/usr/lib/systemd/system/acpid.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/acpid.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/acpid.service endef define ACPID_INSTALL_INIT_SYSV diff --git a/buildroot/package/acpitool/acpitool.hash b/buildroot/package/acpitool/acpitool.hash index e25dc546f..b43bc374c 100644 --- a/buildroot/package/acpitool/acpitool.hash +++ b/buildroot/package/acpitool/acpitool.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f acpitool-0.5.1.tar.bz2 +sha256 004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f acpitool-0.5.1.tar.bz2 +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/acsccid/Config.in b/buildroot/package/acsccid/Config.in index 90624ee79..74dd6de29 100644 --- a/buildroot/package/acsccid/Config.in +++ b/buildroot/package/acsccid/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_ACSCCID depends on BR2_TOOLCHAIN_HAS_THREADS # pcsc-lite, libusb depends on BR2_USE_MMU # pcsc-lite depends on !BR2_STATIC_LIBS # pcsc-lite + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_PCSC_LITE # Even though there is a --disable-libusb option, it has in # fact no effect, and acsccid really requires libusb. diff --git a/buildroot/package/acsccid/acsccid.hash b/buildroot/package/acsccid/acsccid.hash index 24d2fa735..2d61ad664 100644 --- a/buildroot/package/acsccid/acsccid.hash +++ b/buildroot/package/acsccid/acsccid.hash @@ -1,3 +1,6 @@ -# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.4/ -sha1 8c0b42ff79032289731916d18a2698b258dfd6a2 acsccid-1.1.4.tar.bz2 -md5 ac77b3aeae0a11723c96c7f98769490e acsccid-1.1.4.tar.bz2 +# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.7/ +sha1 f4db3c2393f392191291df128008832e245d821b acsccid-1.1.7.tar.bz2 +md5 0b34146571d9492ecfff066582dd9356 acsccid-1.1.7.tar.bz2 +# Locally computed +sha256 3778548ff9b639dd46d1570922e425698e16c5a0a0840ed1fad235052e291ee3 acsccid-1.1.7.tar.bz2 +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/buildroot/package/acsccid/acsccid.mk b/buildroot/package/acsccid/acsccid.mk index a59a16d76..28a31b95a 100644 --- a/buildroot/package/acsccid/acsccid.mk +++ b/buildroot/package/acsccid/acsccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACSCCID_VERSION = 1.1.4 +ACSCCID_VERSION = 1.1.7 ACSCCID_SOURCE = acsccid-$(ACSCCID_VERSION).tar.bz2 ACSCCID_SITE = http://downloads.sourceforge.net/acsccid ACSCCID_LICENSE = LGPL-2.1+ @@ -13,4 +13,8 @@ ACSCCID_INSTALL_STAGING = YES ACSCCID_DEPENDENCIES = pcsc-lite host-flex host-pkgconf libusb ACSCCID_CONF_OPTS = --enable-usbdropdir=/usr/lib/pcsc/drivers +ifeq ($(BR2_PACKAGE_LIBICONV),y) +ACSCCID_DEPENDENCIES += libiconv +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.hash b/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.hash index 61b5f14d2..0daef24db 100644 --- a/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.hash +++ b/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.hash @@ -1,2 +1,6 @@ # From http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.sha256sum -sha256 c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7 adwaita-icon-theme-3.22.0.tar.xz +sha256 c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7 adwaita-icon-theme-3.22.0.tar.xz +# locally computed +sha256 51f83b2b4e9ed2beebc9b8eed2ecad29314a58ed8c5184b22ad8f9df703d3ce5 COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING_LGPL +sha256 207fe75c396c0ae197c57d42c727163428b6667d98cef3644e41c6f1afe1895f COPYING_CCBYSA3 diff --git a/buildroot/package/aer-inject/aer-inject.hash b/buildroot/package/aer-inject/aer-inject.hash index 6329de6df..ee097c873 100644 --- a/buildroot/package/aer-inject/aer-inject.hash +++ b/buildroot/package/aer-inject/aer-inject.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 49a44b7a9e3983dc15fdc5bacd0e095df650296024f43f9d6c080ad54de0b07f aer-inject-9bd5e2c7886fca72f139cd8402488a2235957d41.tar.gz +sha256 49a44b7a9e3983dc15fdc5bacd0e095df650296024f43f9d6c080ad54de0b07f aer-inject-9bd5e2c7886fca72f139cd8402488a2235957d41.tar.gz +sha256 659a191d8775e05c6c6a9a4ba66b3577c577342bb83f20d393135eb6633c8973 README diff --git a/buildroot/package/aespipe/Config.in b/buildroot/package/aespipe/Config.in index 2c2ff5cd8..e1683a0aa 100644 --- a/buildroot/package/aespipe/Config.in +++ b/buildroot/package/aespipe/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_AESPIPE It can be used to encrypt and decrypt loop-AES compatible encrypted disk images. - http://koti.tnnet.fi/jari.ruusu/linux/ + http://loop-aes.sourceforge.net/ diff --git a/buildroot/package/aespipe/Config.in.host b/buildroot/package/aespipe/Config.in.host index b64868ce7..1e98c21c9 100644 --- a/buildroot/package/aespipe/Config.in.host +++ b/buildroot/package/aespipe/Config.in.host @@ -7,4 +7,4 @@ config BR2_PACKAGE_HOST_AESPIPE archives. It can be used to encrypt and decrypt loop-AES compatible encrypted disk images. - http://koti.tnnet.fi/jari.ruusu/linux/ + http://loop-aes.sourceforge.net/ diff --git a/buildroot/package/aespipe/aespipe.hash b/buildroot/package/aespipe/aespipe.hash index cc7640a0d..134a16df4 100644 --- a/buildroot/package/aespipe/aespipe.hash +++ b/buildroot/package/aespipe/aespipe.hash @@ -1,2 +1,5 @@ +# From https://sourceforge.net/projects/loop-aes/files/aespipe/v2.4f/ +sha1 2c23e1a6be298cf4f173f06b1123e4ecd5e9a202 aespipe-v2.4f.tar.bz2 +md5 ed05c62c1954110f009bedda4bc1562f aespipe-v2.4f.tar.bz2 # Locally computed: -sha256 c5ce656e0ade49b93e1163ec7b35450721d5743d8d804ad3a9e39add0389e50f aespipe-v2.4d.tar.bz2 +sha256 b135e1659f58dc9be5e3c88923cd03d2a936096ab8cd7f2b3af4cb7a844cef96 aespipe-v2.4f.tar.bz2 diff --git a/buildroot/package/aespipe/aespipe.mk b/buildroot/package/aespipe/aespipe.mk index 5ef95d520..fd4f776dd 100644 --- a/buildroot/package/aespipe/aespipe.mk +++ b/buildroot/package/aespipe/aespipe.mk @@ -4,20 +4,10 @@ # ################################################################################ -AESPIPE_VERSION = 2.4d +AESPIPE_VERSION = 2.4f AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2 AESPIPE_SITE = http://loop-aes.sourceforge.net/aespipe AESPIPE_LICENSE = GPL -# Recent Debian, Gentoo and Ubuntu enable -fPIE by default, breaking the build: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837393 -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835148 -# Older gcc versions however don't support the -no-pie flag, so we have to -# check its availability. -HOST_AESPIPE_NO_PIE_FLAG = $(call host-cc-option,-no-pie) -HOST_AESPIPE_CONF_ENV = \ - CFLAGS="$(HOST_CFLAGS) $(HOST_AESPIPE_NO_PIE_FLAG)" \ - LDFLAGS="$(HOST_LDFLAGS) $(HOST_AESPIPE_NO_PIE_FLAG)" - $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/agentpp/agentpp.hash b/buildroot/package/agentpp/agentpp.hash index 131edc4a1..f45819072 100644 --- a/buildroot/package/agentpp/agentpp.hash +++ b/buildroot/package/agentpp/agentpp.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 6775fa2a038801edddedc148d7846427ddc4d438e3bb33362d9eec6074918a88 agent++-4.0.7.tar.gz +sha256 ffbd06e6582978b6ea7344ae0ccfe58e634b84d31496bb6eb77f0a9e8f1e1df1 agent++-4.1.2.tar.gz +sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt diff --git a/buildroot/package/agentpp/agentpp.mk b/buildroot/package/agentpp/agentpp.mk index 12cf2089e..0b6ef0a2a 100644 --- a/buildroot/package/agentpp/agentpp.mk +++ b/buildroot/package/agentpp/agentpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -AGENTPP_VERSION = 4.0.7 +AGENTPP_VERSION = 4.1.2 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 diff --git a/buildroot/package/aircrack-ng/aircrack-ng.hash b/buildroot/package/aircrack-ng/aircrack-ng.hash index d8a171dc0..990c3ef56 100644 --- a/buildroot/package/aircrack-ng/aircrack-ng.hash +++ b/buildroot/package/aircrack-ng/aircrack-ng.hash @@ -1,6 +1,6 @@ # From http://www.aircrack-ng.org/downloads.html -sha1 7b63c7ce01cb65a4775833c6cadf7ddd82bf46d5 aircrack-ng-1.5.2.tar.gz -md5 2648c192d206e953c67dca64967d2982 aircrack-ng-1.5.2.tar.gz +sha1 ffeb4816476e7b329dc0c154f1aa4a30ad171beb aircrack-ng-1.6.tar.gz +md5 22ddc85549b51ed0da0931d01ef215e5 aircrack-ng-1.6.tar.gz # Hash for license file: sha256 fc51fd3a97223f2fd47b057202d4a6b0daaedf23b5a1f5ff8723c192fc1e021d LICENSE diff --git a/buildroot/package/aircrack-ng/aircrack-ng.mk b/buildroot/package/aircrack-ng/aircrack-ng.mk index a6db384b8..baa1fad9e 100644 --- a/buildroot/package/aircrack-ng/aircrack-ng.mk +++ b/buildroot/package/aircrack-ng/aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -AIRCRACK_NG_VERSION = 1.5.2 +AIRCRACK_NG_VERSION = 1.6 AIRCRACK_NG_SITE = http://download.aircrack-ng.org AIRCRACK_NG_LICENSE = GPL-2.0+ AIRCRACK_NG_LICENSE_FILES = LICENSE diff --git a/buildroot/package/alljoyn-base/Config.in b/buildroot/package/alljoyn-base/Config.in deleted file mode 100644 index 8556d66c6..000000000 --- a/buildroot/package/alljoyn-base/Config.in +++ /dev/null @@ -1,51 +0,0 @@ -config BR2_PACKAGE_ALLJOYN_BASE - bool "alljoyn-base" - depends on BR2_USE_MMU # alljoyn - depends on !BR2_STATIC_LIBS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR # alljoyn - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # alljoyn - select BR2_PACKAGE_ALLJOYN - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL if \ - !BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION && \ - !BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING - help - - AllJoyn Base Services are common services used by many - devices, providing a set of interfaces for different devices - to interact and interoperate with one another. - - https://allseenalliance.org - -if BR2_PACKAGE_ALLJOYN_BASE - -config BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL - bool "controlpanel" - help - Enable AllJoyn Control Panel base service which allows - devices to advertise a virtual control panel to be - controlled remotely. - -config BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION - bool "notification" - help - Enable AllJoyn Notification base service which allows - text-based notifications to be sent and received by devices - on the AllJoyn network. Also supports audio and images via - URLs. - -config BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING - bool "onboarding" - help - Enable AllJoyn Onboarding base service which provides a - consistent way to bring a new device onto the Wi-Fi network. - -endif # BR2_PACKAGE_ALLJOYN_BASE - -comment "alljoyn-base needs a toolchain w/ C++, threads, wchar, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/buildroot/package/alljoyn-base/alljoyn-base.hash b/buildroot/package/alljoyn-base/alljoyn-base.hash deleted file mode 100644 index dbec3a353..000000000 --- a/buildroot/package/alljoyn-base/alljoyn-base.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 742f724b3a06c8fc4039591dba24871755728221ca5dc4afb78ebd9a7e3beb44 alljoyn-base-16.04.00.tar.gz diff --git a/buildroot/package/alljoyn-base/alljoyn-base.mk b/buildroot/package/alljoyn-base/alljoyn-base.mk deleted file mode 100644 index ad1980282..000000000 --- a/buildroot/package/alljoyn-base/alljoyn-base.mk +++ /dev/null @@ -1,91 +0,0 @@ -################################################################################ -# -# alljoyn-base -# -################################################################################ - -ALLJOYN_BASE_REV = 16.04 -ALLJOYN_BASE_VERSION = $(ALLJOYN_BASE_REV).00 -ALLJOYN_BASE_SITE = \ - https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_BASE_REV) -# See https://allseenalliance.org/alliance/ip-policy -ALLJOYN_BASE_LICENSE = ISC - -ALLJOYN_BASE_DEPENDENCIES = host-scons alljoyn openssl -ALLJOYN_BASE_INSTALL_STAGING = YES - -ALLJOYN_BASE_CRYPTO = openssl - -# AllJoyn can be compiled in debug or release mode. By default, -# AllJoyn is built in debug mode. -ALLJOYN_BASE_VARIANT = release - -ALLJOYN_BASE_BINDINGS = c,cpp - -# By setting openwrt for OS and CPU, AllJoyn cross-compilation can be finely -# tuned through TARGET_xxx options. All TARGET_xxx variables must be defined -# otherwise compilation will fail. -# CROSS_COMPILE option should not be used as it works only for linux/ARM. -ALLJOYN_BASE_OS = openwrt -ALLJOYN_BASE_CPU = openwrt - -# AllJoyn install everything in this relative path -ALLJOYN_BASE_DISTDIR = \ - build/$(ALLJOYN_OS)/$(ALLJOYN_CPU)/$(ALLJOYN_VARIANT)/dist - -ALLJOYN_BASE_SCONS_OPTS = \ - -j$(PARALLEL_JOBS) \ - V=1 \ - OS=$(ALLJOYN_BASE_OS) \ - CPU=$(ALLJOYN_BASE_CPU) \ - VARIANT=$(ALLJOYN_BASE_VARIANT) \ - BR=off \ - CRYPTO=$(ALLJOYN_BASE_CRYPTO) \ - BINDINGS=$(ALLJOYN_BASE_BINDINGS) \ - ALLJOYN_DISTDIR="$(STAGING_DIR)"\ - TARGET_CFLAGS="$(TARGET_CFLAGS)" \ - TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \ - TARGET_LINKFLAGS="$(TARGET_LINKFLAGS)" \ - TARGET_CC="$(TARGET_CC)" \ - TARGET_CXX="$(TARGET_CXX)" \ - TARGET_LD="$(TARGET_LD)" \ - TARGET_LINK="$(TARGET_CXX)" \ - TARGET_AR="$(TARGET_AR)" \ - TARGET_RANLIB="$(TARGET_RANLIB)" \ - TARGET_PATH="$(BR_PATH)" - -ifeq ($(BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL), y) -ALLJOYN_BASE_TARGETS += controlpanel -endif - -ifeq ($(BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION), y) -ALLJOYN_BASE_TARGETS += notification -endif - -ifeq ($(BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING), y) -ALLJOYN_BASE_TARGETS += onboarding -endif - -define ALLJOYN_BASE_BUILD_CMDS - $(foreach target,$(ALLJOYN_BASE_TARGETS),\ - cd $(@D)/$(target); $(SCONS) $(ALLJOYN_BASE_SCONS_OPTS) - ) -endef - -define ALLJOYN_BASE_INSTALL_STAGING_CMDS - $(foreach target,$(ALLJOYN_BASE_TARGETS),\ - cp -a $(@D)/$(target)/$(ALLJOYN_BASE_DISTDIR)/*/lib/lib* \ - $(STAGING_DIR)/usr/lib/ - cp -a $(@D)/$(target)/$(ALLJOYN_BASE_DISTDIR)/*/inc/* \ - $(STAGING_DIR)/usr/include/ - ) -endef - -define ALLJOYN_BASE_INSTALL_TARGET_CMDS - $(foreach target,$(ALLJOYN_BASE_TARGETS),\ - cp -a $(@D)/$(target)/$(ALLJOYN_BASE_DISTDIR)/*/lib/lib* \ - $(TARGET_DIR)/usr/lib/ - ) -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/alljoyn-tcl-base/Config.in b/buildroot/package/alljoyn-tcl-base/Config.in deleted file mode 100644 index ebc3370af..000000000 --- a/buildroot/package/alljoyn-tcl-base/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_ALLJOYN_TCL_BASE - bool "alljoyn-tcl-base" - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS # alljoyn-tcl - select BR2_PACKAGE_ALLJOYN_TCL - help - AllJoyn Base Services are common services used by many - devices, providing a set of interfaces for different devices - to interact and interoperate with one another. - - Thin Client Library is designed to bring the benefits of the - AllJoyn distributed programming environment to embedded - systems. - - https://allseenalliance.org - -comment "alljoyn-tcl-base needs a toolchain w/ threads and dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/alljoyn-tcl-base/alljoyn-tcl-base.hash b/buildroot/package/alljoyn-tcl-base/alljoyn-tcl-base.hash deleted file mode 100644 index 882839d7d..000000000 --- a/buildroot/package/alljoyn-tcl-base/alljoyn-tcl-base.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 741f7a71929ccd6a66bf75d2b03affc62411e229b70bb89399be9b1b2ce40629 alljoyn-base_tcl-16.04.00.tar.gz diff --git a/buildroot/package/alljoyn-tcl-base/alljoyn-tcl-base.mk b/buildroot/package/alljoyn-tcl-base/alljoyn-tcl-base.mk deleted file mode 100644 index 461cd097d..000000000 --- a/buildroot/package/alljoyn-tcl-base/alljoyn-tcl-base.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# alljoyn-tcl-base -# -################################################################################ - -ALLJOYN_TCL_BASE_REV = 16.04 -ALLJOYN_TCL_BASE_VERSION = $(ALLJOYN_TCL_BASE_REV).00 -ALLJOYN_TCL_BASE_SOURCE = alljoyn-base_tcl-$(ALLJOYN_TCL_BASE_VERSION).tar.gz -ALLJOYN_TCL_BASE_SITE = \ - https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_TCL_BASE_REV) -# See https://allseenalliance.org/alliance/ip-policy -ALLJOYN_TCL_BASE_LICENSE = ISC - -ALLJOYN_TCL_BASE_DEPENDENCIES = host-scons alljoyn-tcl -ALLJOYN_TCL_BASE_INSTALL_STAGING = YES - -# AllJoyn Base Thin Core can be compiled in debug or release mode. By default, -# AllJoyn Base Thin Core is built in debug mode. -ALLJOYN_TCL_BASE_VARIANT = release - -ALLJOYN_TCL_BASE_SCONS_OPTS = \ - -j$(PARALLEL_JOBS) \ - V=1 \ - VARIANT=$(ALLJOYN_TCL_BASE_VARIANT) \ - CC="$(TARGET_CC)" \ - CXX="$(TARGET_CXX)" \ - AJTCL_DIST=$(STAGING_DIR) \ - WS=off - -define ALLJOYN_TCL_BASE_BUILD_CMDS - cd $(@D); $(SCONS) $(ALLJOYN_TCL_BASE_SCONS_OPTS) -endef - -define ALLJOYN_TCL_BASE_INSTALL_STAGING_CMDS - cp -a $(@D)/dist/lib/lib* $(STAGING_DIR)/usr/lib/ - cp -a $(@D)/dist/include/* $(STAGING_DIR)/usr/include/ -endef - -# Only install AllJoyn Base Thin Core dynamic libraries into target directory -define ALLJOYN_TCL_BASE_INSTALL_TARGET_CMDS - cp -a $(@D)/dist/lib/lib*.so* $(TARGET_DIR)/usr/lib/ -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/alljoyn-tcl/Config.in b/buildroot/package/alljoyn-tcl/Config.in deleted file mode 100644 index fe54af08d..000000000 --- a/buildroot/package/alljoyn-tcl/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_ALLJOYN_TCL - bool "alljoyn-tcl" - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - help - The AllJoyn framework defines a common way for devices and - apps to communicate with one another regardless of brands, - categories, transports, and OSes. Developers write - applications that discover nearby devices, and communicate - with each other directly and through the cloud, unleashing - new possibilities in the Internet of Things. - - AllJoyn Thin Core Library (AJTCL) is designed to bring the - benefits of the AllJoyn distributed programming environment - to embedded systems. - - https://allseenalliance.org - -comment "alljoyn-tcl needs a toolchain w/ threads and dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/alljoyn-tcl/alljoyn-tcl.hash b/buildroot/package/alljoyn-tcl/alljoyn-tcl.hash deleted file mode 100644 index 208d676c8..000000000 --- a/buildroot/package/alljoyn-tcl/alljoyn-tcl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 da13614a9db79067937b744a87328fed84d99ba62e3de19b0ddc4a83e4b2447e ajtcl-16.04.00a-src.tar.gz diff --git a/buildroot/package/alljoyn-tcl/alljoyn-tcl.mk b/buildroot/package/alljoyn-tcl/alljoyn-tcl.mk deleted file mode 100644 index cabdf8992..000000000 --- a/buildroot/package/alljoyn-tcl/alljoyn-tcl.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# alljoyn-tcl -# -################################################################################ - -ALLJOYN_TCL_REV = 16.04 -ALLJOYN_TCL_VERSION = $(ALLJOYN_TCL_REV).00a -ALLJOYN_TCL_SOURCE = ajtcl-$(ALLJOYN_TCL_VERSION)-src.tar.gz -ALLJOYN_TCL_SITE = \ - https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_TCL_REV) -# See https://allseenalliance.org/alliance/ip-policy -ALLJOYN_TCL_LICENSE = ISC - -ALLJOYN_TCL_DEPENDENCIES = host-scons -ALLJOYN_TCL_INSTALL_STAGING = YES - -# AllJoyn Thin Core can be compiled in debug or release mode. By default, -# AllJoyn Thin Core is built in debug mode. -ALLJOYN_TCL_VARIANT = release - -ALLJOYN_TCL_SCONS_OPTS = \ - -j$(PARALLEL_JOBS) \ - V=1 \ - VARIANT=$(ALLJOYN_TCL_VARIANT) \ - CC="$(TARGET_CC)" \ - CXX="$(TARGET_CXX)" - -define ALLJOYN_TCL_BUILD_CMDS - cd $(@D); $(SCONS) $(ALLJOYN_TCL_SCONS_OPTS) -endef - -define ALLJOYN_TCL_INSTALL_STAGING_CMDS - cp -a $(@D)/dist/lib/lib* $(STAGING_DIR)/usr/lib/ - cp -a $(@D)/dist/include/* $(STAGING_DIR)/usr/include/ -endef - -# Only install AllJoyn Thin Core dynamic libraries into target directory -define ALLJOYN_TCL_INSTALL_TARGET_CMDS - cp -a $(@D)/dist/lib/lib*.so* $(TARGET_DIR)/usr/lib/ -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/alljoyn/0001-UARTStreamLinux-fix-build-on-sparc.patch b/buildroot/package/alljoyn/0001-UARTStreamLinux-fix-build-on-sparc.patch deleted file mode 100644 index efca67fea..000000000 --- a/buildroot/package/alljoyn/0001-UARTStreamLinux-fix-build-on-sparc.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b8e35cf95184ff18bcf923f900439f56c93609db Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 16 Jul 2016 15:23:41 +0200 -Subject: [PATCH] UARTStreamLinux: fix build on sparc - -Some of the serial port highest speed are not defined on SPARC, so -alljoyn should not use them, so we add a patch to fix that. - -From: -https://git.buildroot.org/buildroot/commit/?id=c5e96d8935016456bea342db170ae6a139a8470f - -Fixes: -http://autobuild.buildroot.net/results/e5b/e5b30b5e0d86b44b97410d434b771e1fb7b18de0 - -Signed-off-by: Romain Naour ---- - common/os/posix/UARTStreamLinux.cc | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/common/os/posix/UARTStreamLinux.cc b/common/os/posix/UARTStreamLinux.cc -index c193b70..ae81d9d 100644 ---- a/common/os/posix/UARTStreamLinux.cc -+++ b/common/os/posix/UARTStreamLinux.cc -@@ -111,21 +111,29 @@ QStatus UART(const qcc::String& devName, uint32_t baud, uint8_t databits, const - speed = B2000000; - break; - -+#ifdef B2500000 - case 2500000: - speed = B2500000; - break; -+#endif - -+#ifdef B3000000 - case 3000000: - speed = B3000000; - break; -+#endif - -+#ifdef B3500000 - case 3500000: - speed = B3500000; - break; -+#endif - -+#ifdef B4000000 - case 4000000: - speed = B4000000; - break; -+#endif - - default: - QCC_LogError(ER_BAD_ARG_2, ("Invalid baud %d", baud)); --- -2.5.5 - diff --git a/buildroot/package/alljoyn/Config.in b/buildroot/package/alljoyn/Config.in deleted file mode 100644 index 781d91bbe..000000000 --- a/buildroot/package/alljoyn/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_ALLJOYN - bool "alljoyn" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR - select BR2_PACKAGE_LIBCAP - help - The AllJoyn framework defines a common way for devices and - apps to communicate with one another regardless of brands, - categories, transports, and OSes. Developers write - applications that discover nearby devices, and communicate - with each other directly and through the cloud, unleashing - new possibilities in the Internet of Things. - - https://allseenalliance.org - -comment "alljoyn needs a toolchain w/ C++, threads, wchar and dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/buildroot/package/alljoyn/alljoyn.hash b/buildroot/package/alljoyn/alljoyn.hash deleted file mode 100644 index 47dd0d4de..000000000 --- a/buildroot/package/alljoyn/alljoyn.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 fc437d96cf1213f18048240b5d12a374b31894d21830a0a6ccf562ffa13425d5 alljoyn-16.04.00a-src.tar.gz diff --git a/buildroot/package/alljoyn/alljoyn.mk b/buildroot/package/alljoyn/alljoyn.mk deleted file mode 100644 index 1281674e3..000000000 --- a/buildroot/package/alljoyn/alljoyn.mk +++ /dev/null @@ -1,67 +0,0 @@ -################################################################################ -# -# alljoyn -# -################################################################################ - -ALLJOYN_REV = 16.04 -ALLJOYN_VERSION = $(ALLJOYN_REV).00a -ALLJOYN_SOURCE = alljoyn-$(ALLJOYN_VERSION)-src.tar.gz -ALLJOYN_SITE = https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_REV) -# See https://allseenalliance.org/alliance/ip-policy -ALLJOYN_LICENSE = ISC - -ALLJOYN_DEPENDENCIES = host-scons libcap -ALLJOYN_INSTALL_STAGING = YES - -# AllJoyn can be compiled in debug or release mode. By default, AllJoyn is built -# in debug mode. -ALLJOYN_VARIANT = release - -ALLJOYN_BINDINGS = c,cpp - -# By setting openwrt for OS and CPU, AllJoyn cross-compilation can be finely -# tuned through TARGET_xxx options. All TARGET_xxx variables must be defined -# otherwise compilation will fail. -# CROSS_COMPILE option should not be used as it works only for linux/ARM. -ALLJOYN_OS = openwrt -ALLJOYN_CPU = openwrt - -# AllJoyn installs everything in this relative path -ALLJOYN_DISTDIR = build/$(ALLJOYN_OS)/$(ALLJOYN_CPU)/$(ALLJOYN_VARIANT)/dist/ - -ALLJOYN_SCONS_OPTS = \ - -j$(PARALLEL_JOBS) \ - V=1 \ - OS=$(ALLJOYN_OS) \ - CPU=$(ALLJOYN_CPU) \ - VARIANT=$(ALLJOYN_VARIANT) \ - BR=off \ - CRYPTO=builtin \ - BINDINGS=$(ALLJOYN_BINDINGS) \ - TARGET_CFLAGS="$(TARGET_CFLAGS)" \ - TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \ - TARGET_LINKFLAGS="$(TARGET_LINKFLAGS)" \ - TARGET_CC="$(TARGET_CC)" \ - TARGET_CXX="$(TARGET_CXX)" \ - TARGET_LD="$(TARGET_LD)" \ - TARGET_LINK="$(TARGET_CXX)" \ - TARGET_AR="$(TARGET_AR)" \ - TARGET_RANLIB="$(TARGET_RANLIB)" \ - TARGET_PATH="$(BR_PATH)" - -define ALLJOYN_BUILD_CMDS - cd $(@D); $(SCONS) $(ALLJOYN_SCONS_OPTS) -endef - -define ALLJOYN_INSTALL_STAGING_CMDS - cp -a $(@D)/$(ALLJOYN_DISTDIR)/*/lib/lib* $(STAGING_DIR)/usr/lib/ - cp -a $(@D)/$(ALLJOYN_DISTDIR)/*/inc/* $(STAGING_DIR)/usr/include/ -endef - -# Only install alljoyn dynamic libraries into target directory -define ALLJOYN_INSTALL_TARGET_CMDS - cp -a $(@D)/$(ALLJOYN_DISTDIR)/*/lib/lib*.so* $(TARGET_DIR)/usr/lib/ -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/alsa-lib/0002-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch b/buildroot/package/alsa-lib/0002-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch deleted file mode 100644 index 3aab64e5e..000000000 --- a/buildroot/package/alsa-lib/0002-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 2aba563bd077fda94fb9c2c33002ee0ac119b345 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Fri, 13 Apr 2018 09:13:46 +0200 -Subject: [PATCH] alsa-lib: conditionally enable libdl in AM_PATH_ALSA m4 macro -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The AM_PATH_ALSA macro in utils/alsa.m4 unconditionally uses -ldl. This -breaks compilation of alsa-utils (and probably other packages using this -macro) for targets that do not support dynamic loading, such as for -Blackfin FLAT binaries. - -This patch updates the macro to check if dlopen is available, and use that -result to conditionally add -ldl to the list of libraries. - -Signed-off-by: Thomas De Schampheleire -[Jörg: update for 1.1.6] -Signed-off-by: Jörg Krause -Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141377.html ---- - utils/alsa.m4 | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/utils/alsa.m4 b/utils/alsa.m4 -index e12310df..a5c5a292 100644 ---- a/utils/alsa.m4 -+++ b/utils/alsa.m4 -@@ -44,6 +44,8 @@ if test "$alsa_inc_prefix" != "" ; then - fi - AC_MSG_RESULT($ALSA_CFLAGS) - -+AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")]) -+ - dnl add any special lib dirs - AC_MSG_CHECKING(for ALSA LDFLAGS) - if test "$alsa_prefix" != "" ; then -@@ -52,7 +54,7 @@ if test "$alsa_prefix" != "" ; then - fi - - dnl add the alsa library --ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" -+ALSA_LIBS="$ALSA_LIBS -lasound -lm $LIBDL -lpthread" - LIBS="$ALSA_LIBS $LIBS" - AC_MSG_RESULT($ALSA_LIBS) - --- -2.14.3 - diff --git a/buildroot/package/alsa-lib/0002-src-ucm-main.c-fix-build-without-mixer.patch b/buildroot/package/alsa-lib/0002-src-ucm-main.c-fix-build-without-mixer.patch new file mode 100644 index 000000000..4d3ad1117 --- /dev/null +++ b/buildroot/package/alsa-lib/0002-src-ucm-main.c-fix-build-without-mixer.patch @@ -0,0 +1,39 @@ +From 65eb51668f87668d994f260f36a6325f248cdff3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 3 Dec 2019 18:56:40 +0100 +Subject: [PATCH] src/ucm/main.c: fix build without mixer + +Commit 4ce38a5ff466d18039b2606938f866ea3a6c9f3c breaks the build without +mixer on: + + CCLD libasound.la +/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/8.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: ucm/.libs/libucm.a(main.o): in function `snd_use_case_set': +main.c:(.text+0x185c): undefined reference to `snd_mixer_selem_id_parse' + +Fixes: + - http://autobuild.buildroot.org/results/4d91c9f82a2a61c50c457a851073b85cc09ea345 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/alsa-project/alsa-lib/pull/15] +--- + src/ucm/main.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/ucm/main.c b/src/ucm/main.c +index d2078a23..61922f10 100644 +--- a/src/ucm/main.c ++++ b/src/ucm/main.c +@@ -2115,8 +2115,10 @@ int snd_use_case_parse_selem_id(snd_mixer_selem_id_t *dst, + const char *ucm_id, + const char *value) + { ++#ifdef BUILD_MIXER + if (strcmp(ucm_id, "PlaybackMixerId") == 0 || + strcmp(ucm_id, "CaptureMixerId") == 0) + return snd_mixer_selem_id_parse(dst, value); ++#endif + return -EINVAL; + } +-- +2.24.0 + diff --git a/buildroot/package/alsa-lib/Config.in b/buildroot/package/alsa-lib/Config.in index 995d37916..f334b66bf 100644 --- a/buildroot/package/alsa-lib/Config.in +++ b/buildroot/package/alsa-lib/Config.in @@ -66,6 +66,11 @@ config BR2_PACKAGE_ALSA_LIB_SEQ bool "seq" default y +config BR2_PACKAGE_ALSA_LIB_UCM + bool "ucm" + default y + select BR2_PACKAGE_ALSA_LIB_MIXER + config BR2_PACKAGE_ALSA_LIB_ALISP bool "alisp" default y diff --git a/buildroot/package/alsa-lib/alsa-lib.hash b/buildroot/package/alsa-lib/alsa-lib.hash index 4373a2a59..2f34a12fb 100644 --- a/buildroot/package/alsa-lib/alsa-lib.hash +++ b/buildroot/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 9d6000b882a3b2df56300521225d69717be6741b71269e488bb20a20783bdc09 alsa-lib-1.1.7.tar.bz2 +sha256 958e260e3673f1f6ff6b2d2c0df3fc2e469bea5b2957163ce96ce17f23e87943 alsa-lib-1.2.1.2.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/buildroot/package/alsa-lib/alsa-lib.mk b/buildroot/package/alsa-lib/alsa-lib.mk index 9de45d208..38bd0fb70 100644 --- a/buildroot/package/alsa-lib/alsa-lib.mk +++ b/buildroot/package/alsa-lib/alsa-lib.mk @@ -4,9 +4,9 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.1.7 +ALSA_LIB_VERSION = 1.2.1.2 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 -ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib +ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) ALSA_LIB_LICENSE_FILES = COPYING aserver/COPYING ALSA_LIB_INSTALL_STAGING = YES @@ -45,6 +45,9 @@ endif ifneq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y) ALSA_LIB_CONF_OPTS += --disable-seq endif +ifneq ($(BR2_PACKAGE_ALSA_LIB_UCM),y) +ALSA_LIB_CONF_OPTS += --disable-ucm +endif ifneq ($(BR2_PACKAGE_ALSA_LIB_ALISP),y) ALSA_LIB_CONF_OPTS += --disable-alisp endif diff --git a/buildroot/package/alsa-utils/0001-topology-topology.c-drop-unneeded-dlfcn.h-include.patch b/buildroot/package/alsa-utils/0001-topology-topology.c-drop-unneeded-dlfcn.h-include.patch deleted file mode 100644 index 2a8be0b0b..000000000 --- a/buildroot/package/alsa-utils/0001-topology-topology.c-drop-unneeded-dlfcn.h-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4c9462a5ef2f680b24ddf6bae7ac7c693fa6a136 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 1 Nov 2018 15:15:31 +0100 -Subject: [PATCH] topology/topology.c: drop unneeded include - -This include is not used/needed and prevents building on systems that -don't provide . - -Signed-off-by: Thomas Petazzoni -Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141375.html ---- - topology/topology.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/topology/topology.c b/topology/topology.c -index 097c255..b72e341 100644 ---- a/topology/topology.c -+++ b/topology/topology.c -@@ -27,7 +27,6 @@ - #include - #include - #include --#include - #include - #include - --- -2.14.4 - diff --git a/buildroot/package/alsa-utils/Config.in b/buildroot/package/alsa-utils/Config.in index 012f28aef..2d7062b0c 100644 --- a/buildroot/package/alsa-utils/Config.in +++ b/buildroot/package/alsa-utils/Config.in @@ -41,6 +41,7 @@ comment "alsamixer needs a toolchain w/ wchar" config BR2_PACKAGE_ALSA_UTILS_ALSAUCM bool "alsaucm" + select BR2_PACKAGE_ALSA_LIB_UCM config BR2_PACKAGE_ALSA_UTILS_ALSATPLG bool "alsatplg" diff --git a/buildroot/package/alsa-utils/alsa-utils.hash b/buildroot/package/alsa-utils/alsa-utils.hash index f0468fb88..2c55ce621 100644 --- a/buildroot/package/alsa-utils/alsa-utils.hash +++ b/buildroot/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1db27fb54ab7fdeb54b00d68b8a174808ffea198cfbd67e3c959482194e1540a alsa-utils-1.1.7.tar.bz2 +sha256 0b110ba71ef41d3009db1bc4dcae0cf79efb99cb5426fa19d0312470560a2c0d alsa-utils-1.2.1.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/alsa-utils/alsa-utils.mk b/buildroot/package/alsa-utils/alsa-utils.mk index b5c36e0a4..2cd3c4a33 100644 --- a/buildroot/package/alsa-utils/alsa-utils.mk +++ b/buildroot/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.1.7 +ALSA_UTILS_VERSION = 1.2.1 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 @@ -35,7 +35,7 @@ ALSA_UTILS_CONF_OPTS += --disable-alsaloop endif ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y) -ALSA_UTILS_CONF_OPTS += --disable-alsamixer --disable-alsatest +ALSA_UTILS_CONF_OPTS += --disable-alsamixer endif ifeq ($(BR2_PACKAGE_ALSA_UTILS_BAT),y) @@ -90,11 +90,12 @@ define ALSA_UTILS_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service $(INSTALL) -D -m 0644 $(@D)/alsactl/alsa-state.service \ $(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/sound.target.wants - ln -sf ../../../../lib/systemd/system/alsa-restore.service \ - $(TARGET_DIR)/etc/systemd/system/sound.target.wants/alsa-restore.service - ln -sf ../../../../lib/systemd/system/alsa-state.service \ - $(TARGET_DIR)/etc/systemd/system/sound.target.wants/alsa-state.service + mkdir $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service.d + printf '[Install]\nWantedBy=multi-user.target\n' \ + >$(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service.d/buildroot-enable.conf + mkdir $(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service.d + printf '[Install]\nWantedBy=multi-user.target\n' \ + >$(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service.d/buildroot-enable.conf; endef endif diff --git a/buildroot/package/alsamixergui/0002-configure-fix-detection-of-fltk-libs.patch b/buildroot/package/alsamixergui/0002-configure-fix-detection-of-fltk-libs.patch new file mode 100644 index 000000000..cc72d33be --- /dev/null +++ b/buildroot/package/alsamixergui/0002-configure-fix-detection-of-fltk-libs.patch @@ -0,0 +1,53 @@ +From c154195fa161575363280aac9e928b7225f0de9e Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 29 Dec 2019 17:42:13 +0100 +Subject: [PATCH] configure: fix detection of fltk libs + +Chaining calls to AC_CHECK_LIB one in the other, breaks the configure +script, because some internal functions (e.g. ac_fn_c_try_link) would +not be defined before they are needed, leading the build to fail as +thus: + + checking for snd_tplg_new in -latopology... ./configure: line 4630: + ac_fn_c_try_link: command not found + no + configure: error: No linkable libatopology was found. + +Using AC_CHECK_LIB() in sequence (i.e. one after the other) and +memorising the result is not trivial: AC_CHECK_LIB() implements a +ddefault action-if-found that append to LIBS, but not if the user +ptrovides their own action-if-found. + +Instead, AC_SEARH_LIBS() always append to LIBS, *and* run the +user-provided action. + +So, we switch to AC_SEARCH_LIBS() and memorise the result for each +test, to eventually test if ether worked. + +Signed-off-by: Yann E. MORIN +--- + configure.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index 9307cc2..55f6864 100644 +--- a/configure.in ++++ b/configure.in +@@ -11,10 +11,10 @@ AC_PROG_INSTALL + AC_PROG_LN_S + + dnl Checks for libraries. +-AC_CHECK_LIB(fltk,numericsort,, +-AC_CHECK_LIB(fltk,fl_numericsort,, +-AC_MSG_ERROR("missing fltk")) +-) ++has_fltk=false ++AC_SEARCH_LIBS(numericsort,fltk,has_fltk=true) ++AC_SEARCH_LIBS(fl_numericsort,fltk,has_fltk=true) ++AS_IF(test "${has_fltk}" = "false", AC_MSG_ERROR("missing fltk")) + AM_PATH_ALSA(0.9.0) + + dnl Checks for header files. +-- +2.20.1 + diff --git a/buildroot/package/alsamixergui/alsamixergui.hash b/buildroot/package/alsamixergui/alsamixergui.hash index 5cea490a4..85c9ffe75 100644 --- a/buildroot/package/alsamixergui/alsamixergui.hash +++ b/buildroot/package/alsamixergui/alsamixergui.hash @@ -1,2 +1,4 @@ # From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/alsamixergui/alsamixergui_0.9.0rc2-1-9.dsc md5 af942a41b81ba27e2e4d0a1e1ab0decb alsamixergui_0.9.0rc2-1.orig.tar.gz +# locally computed +sha256 ea617b76dcd0df74576686ca34c281f43bb9d844015cea91e3debc91538d2b1d debian/copyright diff --git a/buildroot/package/alsamixergui/alsamixergui.mk b/buildroot/package/alsamixergui/alsamixergui.mk index 24e2497f3..8bf3f8e07 100644 --- a/buildroot/package/alsamixergui/alsamixergui.mk +++ b/buildroot/package/alsamixergui/alsamixergui.mk @@ -11,11 +11,6 @@ ALSAMIXERGUI_LICENSE = GPL-2.0+ ALSAMIXERGUI_LICENSE_FILES = debian/copyright ALSAMIXERGUI_AUTORECONF = YES -ALSAMIXERGUI_CONF_ENV = \ - ac_cv_lib_fltk_numericsort=yes \ - ac_cv_lib_fltk_fl_numericsort=yes \ - ac_cv_lib_asound_snd_ctl_open=yes - ALSAMIXERGUI_DEPENDENCIES = fltk alsa-lib $(eval $(autotools-package)) diff --git a/buildroot/package/alure/Config.in b/buildroot/package/alure/Config.in new file mode 100644 index 000000000..e0064accb --- /dev/null +++ b/buildroot/package/alure/Config.in @@ -0,0 +1,61 @@ +config BR2_PACKAGE_ALURE + bool "alure" + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal + depends on BR2_USE_WCHAR # use wchar_t + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future + select BR2_PACKAGE_OPENAL + help + Alure is a C++ 3D audio API. It uses OpenAL for audio + rendering, and provides common higher-level features such as + file loading and decoding, buffer caching, background + streaming, and source management for virtually unlimited + sound source handles. + + https://kcat.strangesoft.net/alure.html + +if BR2_PACKAGE_ALURE + +config BR2_PACKAGE_ALURE_FLAC_DECODER + bool "flac decoder" + help + Enables the built-in FLAC decoder. + +config BR2_PACKAGE_ALURE_MINIMP3_DECODER + bool "minimp3 decoder" + help + Enables the built-in minimp3 decoder. + +config BR2_PACKAGE_ALURE_OPUS_DECODER + bool "opus decoder" + select BR2_PACKAGE_LIBOGG + select BR2_PACKAGE_OPUS + help + Enables the built-in libopusfile decoder. + +config BR2_PACKAGE_ALURE_SNDFILE_DECODER + bool "sndfile decoder" + select BR2_PACKAGE_LIBSNDFILE + help + Enables the built-in libsndfile decoder. + +config BR2_PACKAGE_ALURE_VORBIS_DECODER + bool "vorbis decoder" + select BR2_PACKAGE_LIBOGG + select BR2_PACKAGE_LIBVORBIS + help + Enables the built-in libvorbis decoder. + +endif + +comment "alure needs a toolchain w/ C++, gcc >= 4.9, NPTL, wchar" + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR + +comment "alure needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/alure/alure.hash b/buildroot/package/alure/alure.hash new file mode 100644 index 000000000..d84af0a35 --- /dev/null +++ b/buildroot/package/alure/alure.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9b808e5b5a54d156348221dc86704c7831115047d5238691e6088f8c4814b2ca alure-14beed2a86d5a36030e907b21c46614d505f07cd.tar.gz +sha256 7331ddc67daaf1a283c81e8dc17bac8dc40f54ed3fab3d3964616f4bd502a0a3 LICENSE diff --git a/buildroot/package/alure/alure.mk b/buildroot/package/alure/alure.mk new file mode 100644 index 000000000..f0eca8a2e --- /dev/null +++ b/buildroot/package/alure/alure.mk @@ -0,0 +1,65 @@ +################################################################################ +# +# alure +# +################################################################################ + +ALURE_VERSION = 14beed2a86d5a36030e907b21c46614d505f07cd +ALURE_SITE = $(call github,kcat,alure,$(ALURE_VERSION)) +ALURE_LICENSE = Zlib, Public Domain (src/decoders/dr_flac.h) +ALURE_LICENSE_FILES = LICENSE +ALURE_INSTALL_STAGING = YES + +ALURE_DEPENDENCIES = openal + +# Disabling alure examples remove the dependecies on physfs and dump libraries. +# Enable at least one built-in decoder (wave). +ALURE_CONF_OPTS = -DALURE_INSTALL=ON \ + -DALURE_BUILD_EXAMPLES=OFF \ + -DALURE_ENABLE_WAVE=ON + +ifeq ($(BR2_PACKAGE_ALURE_FLAC_DECODER),y) +ALURE_CONF_OPTS += -DALURE_ENABLE_FLAC=ON +else +ALURE_CONF_OPTS += -DALURE_ENABLE_FLAC=OFF +endif + +ifeq ($(BR2_PACKAGE_ALURE_MINIMP3_DECODER),y) +ALURE_CONF_OPTS += -DALURE_ENABLE_MINIMP3=ON +else +ALURE_CONF_OPTS += -DALURE_ENABLE_MINIMP3=OFF +endif + +ifeq ($(BR2_PACKAGE_ALURE_OPUS_DECODER),y) +ALURE_CONF_OPTS += -DALURE_ENABLE_OPUS=ON +ALURE_DEPENDENCIES += libogg opus +else +ALURE_CONF_OPTS += -DALURE_ENABLE_OPUS=OFF +endif + +ifeq ($(BR2_PACKAGE_ALURE_SNDFILE_DECODER),y) +ALURE_CONF_OPTS += -DALURE_ENABLE_SNDFILE=ON +ALURE_DEPENDENCIES += libsndfile +else +ALURE_CONF_OPTS += -DALURE_ENABLE_SNDFILE=OFF +endif + +ifeq ($(BR2_PACKAGE_ALURE_VORBIS_DECODER),y) +ALURE_CONF_OPTS += -DALURE_ENABLE_VORBIS=ON +ALURE_DEPENDENCIES += libogg libvorbis +else +ALURE_CONF_OPTS += -DALURE_ENABLE_VORBIS=OFF +endif + +ifeq ($(BR2_STATIC_LIBS),y) +ALURE_CONF_OPTS += -DALURE_BUILD_SHARED=OFF \ + -DALURE_BUILD_STATIC=ON +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ALURE_CONF_OPTS += -DALURE_BUILD_SHARED=ON \ + -DALURE_BUILD_STATIC=ON +else +ALURE_CONF_OPTS += -DALURE_BUILD_SHARED=ON \ + -DALURE_BUILD_STATIC=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/am335x-pru-package/am335x-pru-package.hash b/buildroot/package/am335x-pru-package/am335x-pru-package.hash index 36671b488..ad386fe04 100644 --- a/buildroot/package/am335x-pru-package/am335x-pru-package.hash +++ b/buildroot/package/am335x-pru-package/am335x-pru-package.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 2a902f825ccc1885c5dccd83e1ccee104aa30e601c9964a24f49459f76f674b9 am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096.tar.gz +sha256 2a902f825ccc1885c5dccd83e1ccee104aa30e601c9964a24f49459f76f674b9 am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096.tar.gz +sha256 f0fcdf9b2090896389eb4b784f23be96d5544c5ce5282d84f82ae9a8e8331beb pru_sw/utils/LICENCE.txt diff --git a/buildroot/package/am33x-cm3/am33x-cm3.hash b/buildroot/package/am33x-cm3/am33x-cm3.hash index bb8c2f665..a63ba64a3 100644 --- a/buildroot/package/am33x-cm3/am33x-cm3.hash +++ b/buildroot/package/am33x-cm3/am33x-cm3.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 a722098b362f58f4dfb2a7c30afd604424d435b3d5ebe6ebf5d76ad942f796d0 am33x-cm3-11107db2f1e9e58ee75d4fe9cc38423c9a6e4365.tar.gz +sha256 a722098b362f58f4dfb2a7c30afd604424d435b3d5ebe6ebf5d76ad942f796d0 am33x-cm3-11107db2f1e9e58ee75d4fe9cc38423c9a6e4365.tar.gz +sha256 e136e6949a1d3ca144374375af8b9387faa11d2eee7debff8cf22ca8fe7bf7e9 License.txt diff --git a/buildroot/package/android-tools/Config.in b/buildroot/package/android-tools/Config.in index 478f1392d..a36c4db18 100644 --- a/buildroot/package/android-tools/Config.in +++ b/buildroot/package/android-tools/Config.in @@ -38,8 +38,6 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT bool "fastboot" depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux depends on !BR2_STATIC_LIBS # libselinux - depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux - depends on !BR2_arc # libselinux depends on BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_ZLIB @@ -48,10 +46,8 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT the target, which can be used to reflash other target devices implementing the fastboot protocol. -comment "fastboot needs a glibc toolchain w/ threads, dynamic library" - depends on !BR2_arc - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_USES_GLIBC +comment "fastboot needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS comment "fastboot needs headers >= 3.10 (PowerPC64), headers >= 3.16 (MIPS64)" depends on !BR2_arc diff --git a/buildroot/package/android-tools/android-tools.hash b/buildroot/package/android-tools/android-tools.hash index 7afa04430..27602fb2f 100644 --- a/buildroot/package/android-tools/android-tools.hash +++ b/buildroot/package/android-tools/android-tools.hash @@ -1,3 +1,4 @@ # locally computed sha256 9bfba987e1351b12aa983787b9ae4424ab752e9e646d8e93771538dc1e5d932f android-tools_4.2.2+git20130218.orig.tar.xz sha256 73c3078de3e44d8a3cadf7a360863c63155d9d558c2f0933cf38ad901a3f5998 android-tools_4.2.2+git20130218-3ubuntu41.debian.tar.gz +sha256 170c5939bf8c8eed1db8f66f2d6155e8c1a3e799e390b55e7aad253195b1ebf5 debian/copyright diff --git a/buildroot/package/angular-websocket/angular-websocket.hash b/buildroot/package/angular-websocket/angular-websocket.hash index 36700684b..f589abe5e 100644 --- a/buildroot/package/angular-websocket/angular-websocket.hash +++ b/buildroot/package/angular-websocket/angular-websocket.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 69d752896bc17c08750a2fda24b5eb3c6d653afc6f406dd90a6b7c920b22a14a angular-websocket-v2.0.0.tar.gz +sha256 69d752896bc17c08750a2fda24b5eb3c6d653afc6f406dd90a6b7c920b22a14a angular-websocket-2.0.0.tar.gz +sha256 3013a57f2c8df37775804b8be5b107665a2ca209607bb92c618bcc084feb00a7 LICENSE diff --git a/buildroot/package/angular-websocket/angular-websocket.mk b/buildroot/package/angular-websocket/angular-websocket.mk index b422847e2..d45bfdf91 100644 --- a/buildroot/package/angular-websocket/angular-websocket.mk +++ b/buildroot/package/angular-websocket/angular-websocket.mk @@ -4,8 +4,8 @@ # ################################################################################ -ANGULAR_WEBSOCKET_VERSION = v2.0.0 -ANGULAR_WEBSOCKET_SITE = $(call github,AngularClass,angular-websocket,$(ANGULAR_WEBSOCKET_VERSION)) +ANGULAR_WEBSOCKET_VERSION = 2.0.0 +ANGULAR_WEBSOCKET_SITE = $(call github,AngularClass,angular-websocket,v$(ANGULAR_WEBSOCKET_VERSION)) ANGULAR_WEBSOCKET_LICENSE = MIT ANGULAR_WEBSOCKET_LICENSE_FILES = LICENSE diff --git a/buildroot/package/angularjs/angularjs.hash b/buildroot/package/angularjs/angularjs.hash index 918c049c7..4f0f36b2a 100644 --- a/buildroot/package/angularjs/angularjs.hash +++ b/buildroot/package/angularjs/angularjs.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 4d4e87d24c7d522f4ee765e4f7d454b9cf2a0f6407248545528064e66ad7b085 angular-1.6.7.zip -sha256 cec36623ceba33c503784164917c206047079159bf88f51a695a4dfb9d9b7ede angular.js +sha256 7182e7f39b921469157971d9e0783745758df4b625322d606ec7d9abf2b28af2 angular-1.7.9.zip +sha256 2420c59374dcdc1ca9721c334a32afee92f0610280cae0d1b3952b1279bc2b24 angular.js diff --git a/buildroot/package/angularjs/angularjs.mk b/buildroot/package/angularjs/angularjs.mk index a941bc382..295be5400 100644 --- a/buildroot/package/angularjs/angularjs.mk +++ b/buildroot/package/angularjs/angularjs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ANGULARJS_VERSION = 1.6.7 +ANGULARJS_VERSION = 1.7.9 ANGULARJS_SOURCE = angular-$(ANGULARJS_VERSION).zip ANGULARJS_SITE = https://code.angularjs.org/$(ANGULARJS_VERSION) ANGULARJS_LICENSE = MIT diff --git a/buildroot/package/apache/0003-server-Makefile.in-handle-separate-APR_INCLUDE_DIR-A.patch b/buildroot/package/apache/0003-server-Makefile.in-handle-separate-APR_INCLUDE_DIR-A.patch new file mode 100644 index 000000000..b4ad12867 --- /dev/null +++ b/buildroot/package/apache/0003-server-Makefile.in-handle-separate-APR_INCLUDE_DIR-A.patch @@ -0,0 +1,48 @@ +From 00281390e82db18fe0de4033be4045f9391a8ee5 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 15 Nov 2018 14:04:29 +0100 +Subject: [PATCH] server/Makefile.in: handle separate + APR_INCLUDE_DIR/APU_INCLUDE_DIR + +If APR_INCLUDEDIR and APU_INCLUDEDIR point to different directories, +but for example APU_INCLUDEDIR contains both the apr headers and apu +headers, the "export_files" file will contain duplicate header files, +causing the exports.c file to contain duplicate definitions, making +the build fail. + +This commit fixes that by making sure we only use the apr headers from +APR_INCLUDEDIR and the apu headers from the APU_INCLUDEDIR. + +Signed-off-by: Thomas Petazzoni +Upstream: https://bz.apache.org/bugzilla/show_bug.cgi?id=62930 +--- + server/Makefile.in | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/server/Makefile.in b/server/Makefile.in +index 1fa334467d..2258f0bdf2 100644 +--- a/server/Makefile.in ++++ b/server/Makefile.in +@@ -34,7 +34,6 @@ test_char.h: gen_test_char + util.lo: test_char.h + + EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) +-EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) + + # If export_files is a dependency here, but we remove it during this stage, + # when exports.c is generated, make will not detect that export_files is no +@@ -60,9 +59,8 @@ export_files: + ls $$dir/*.h ; \ + done; \ + echo "$(top_srcdir)/server/mpm_fdqueue.h"; \ +- for dir in $(EXPORT_DIRS_APR); do \ +- ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \ +- done; \ ++ ls $(APR_INCLUDE_DIR)/{apr.h,apr_*.h} 2>/dev/null; \ ++ ls $(APU_INCLUDE_DIR)/{apu.h,apu_*.h} 2>/dev/null; \ + ) | sed -e s,//,/,g | sort -u > $@ + + exports.c: export_files +-- +2.19.1 + diff --git a/buildroot/package/apache/apache.mk b/buildroot/package/apache/apache.mk index 1d62538b1..5fcb9e537 100644 --- a/buildroot/package/apache/apache.mk +++ b/buildroot/package/apache/apache.mk @@ -16,6 +16,14 @@ APACHE_INSTALL_STAGING = YES APACHE_AUTORECONF = YES APACHE_DEPENDENCIES = apr apr-util pcre +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define APACHE_FIXUP_APR_LIBTOOL + $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \ + $(STAGING_DIR)/usr/build-1/libtool +endef +APACHE_POST_CONFIGURE_HOOKS += APACHE_FIXUP_APR_LIBTOOL +endif + APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config @@ -109,9 +117,6 @@ endef define APACHE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/apache/apache.service \ $(TARGET_DIR)/usr/lib/systemd/system/apache.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/apache.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/apache.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/apitrace/0001-dlsym-Fix-build-under-uClibc.patch b/buildroot/package/apitrace/0001-dlsym-Fix-build-under-uClibc.patch new file mode 100644 index 000000000..bf47bba93 --- /dev/null +++ b/buildroot/package/apitrace/0001-dlsym-Fix-build-under-uClibc.patch @@ -0,0 +1,31 @@ +From 189a3b8397c61ba262a2221885e38dc514c59d94 Mon Sep 17 00:00:00 2001 +From: Paul Cercueil +Date: Sat, 7 Dec 2019 00:00:57 +0100 +Subject: [PATCH] dlsym: Fix build under uClibc + +uClibc defines the __GLIBC__ macro too (I know, right?), so verify that +__UCLIBC__ is not defined before we can use glibc-specific internal +functions. + +Signed-off-by: Paul Cercueil +Upstream: https://github.com/apitrace/apitrace/commit/189a3b8397c61ba262a2221885e38dc514c59d94 +--- + wrappers/dlsym.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp +index 2eda082a..5ab8465b 100644 +--- a/wrappers/dlsym.cpp ++++ b/wrappers/dlsym.cpp +@@ -34,7 +34,7 @@ + #include "os.hpp" + + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + + + #include +-- +2.24.0 + diff --git a/buildroot/package/apitrace/0002-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch b/buildroot/package/apitrace/0002-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch new file mode 100644 index 000000000..e34357428 --- /dev/null +++ b/buildroot/package/apitrace/0002-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch @@ -0,0 +1,25 @@ +From d495d15e20bf655afa3be62ada792e8dfc8d29b6 Mon Sep 17 00:00:00 2001 +From: Gleb Mazovetskiy +Date: Fri, 13 Dec 2019 13:39:19 +0000 +Subject: [PATCH] Support libc that don't have RTLD_DEEPBIND + +[Retrieved from: https://github.com/apitrace/apitrace/pull/646] +Signed-off-by: Fabrice Fontaine +--- + dispatch/glproc_gl.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/dispatch/glproc_gl.cpp b/dispatch/glproc_gl.cpp +index 5d7903a0c..456fcc42e 100644 +--- a/dispatch/glproc_gl.cpp ++++ b/dispatch/glproc_gl.cpp +@@ -148,6 +148,9 @@ _getPrivateProcAddress(const char *procName) + + #else + ++#ifndef RTLD_DEEPBIND ++#define RTLD_DEEPBIND 0 ++#endif + + static inline void + logSymbol(const char *name, void *ptr) { diff --git a/buildroot/package/apitrace/Config.in b/buildroot/package/apitrace/Config.in index b622823c2..263eec5e7 100644 --- a/buildroot/package/apitrace/Config.in +++ b/buildroot/package/apitrace/Config.in @@ -1,15 +1,18 @@ -comment "apitrace needs a glibc toolchain w/ C++, gcc >= 4.9" - depends on BR2_PACKAGE_XORG7 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +comment "apitrace needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_APITRACE bool "apitrace" + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_USES_GLIBC # uses glibc specific __libc_dlsym + depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBPNG help Trace and replay OpenGL and OpenGL ES APIs calls to/from a diff --git a/buildroot/package/apitrace/apitrace.hash b/buildroot/package/apitrace/apitrace.hash index 1daaa46e8..9479f0642 100644 --- a/buildroot/package/apitrace/apitrace.hash +++ b/buildroot/package/apitrace/apitrace.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 0aae8902696ad23ba91d61c57007861a3f6e3c2d4f0f43b783b4b7a58e3f9172 apitrace-15d7f975f9688372467ebd63d2a57d3957823f93.tar.gz +sha256 0eec81ba7d3799622336319785465a2982a0621898842517a07894d7e2aa18eb apitrace-9.0.tar.gz +sha256 7066bb1b787519c42f8278b77757c21de522cd97755cb30a22759ac401c62260 LICENSE diff --git a/buildroot/package/apitrace/apitrace.mk b/buildroot/package/apitrace/apitrace.mk index c66f6b3e3..e4e6c41fe 100644 --- a/buildroot/package/apitrace/apitrace.mk +++ b/buildroot/package/apitrace/apitrace.mk @@ -4,14 +4,38 @@ # ################################################################################ -APITRACE_VERSION = 15d7f975f9688372467ebd63d2a57d3957823f93 +APITRACE_VERSION = 9.0 APITRACE_SITE = $(call github,apitrace,apitrace,$(APITRACE_VERSION)) APITRACE_LICENSE = MIT APITRACE_LICENSE_FILES = LICENSE -APITRACE_DEPENDENCIES = xlib_libX11 host-python libpng +APITRACE_DEPENDENCIES = host-python3 libpng + +ifeq ($(BR2_PACKAGE_XORG7),y) +APITRACE_DEPENDENCIES += xlib_libX11 +APITRACE_CONF_OPTS += -DENABLE_X11=ON +else +APITRACE_CONF_OPTS += -DENABLE_X11=OFF +endif # Gui was never tested, so we prefer to explicitly disable it APITRACE_CONF_OPTS += -DENABLE_GUI=false +APITRACE_CFLAGS = $(TARGET_CFLAGS) +APITRACE_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +# This works around embedded Brotli build failure +APITRACE_CFLAGS += -O0 +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +# This works around Apitrace itself build failure +APITRACE_CXXFLAGS += -O0 +endif + +APITRACE_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(APITRACE_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(APITRACE_CXXFLAGS)" + $(eval $(cmake-package)) diff --git a/buildroot/package/apr-util/apr-util.mk b/buildroot/package/apr-util/apr-util.mk index b006964cc..53b633b15 100644 --- a/buildroot/package/apr-util/apr-util.mk +++ b/buildroot/package/apr-util/apr-util.mk @@ -15,6 +15,16 @@ APR_UTIL_CONF_OPTS = \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config APR_UTIL_CONFIG_SCRIPTS = apu-1-config +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define APR_UTIL_FIX_RULES_MK_LIBTOOL + $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ + $(@D)/build/rules.mk + $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ + $(STAGING_DIR)/usr/build-1/libtool +endef +APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK_LIBTOOL +endif + # When iconv is available, then use it to provide charset conversion # features. APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) diff --git a/buildroot/package/apr/0002-sys-param-h.patch b/buildroot/package/apr/0002-sys-param-h.patch new file mode 100644 index 000000000..49f963c4d --- /dev/null +++ b/buildroot/package/apr/0002-sys-param-h.patch @@ -0,0 +1,39 @@ +Fix PATH_MAX detection by including sys/param.h if available + +Patch sent upstream: +https://bz.apache.org/bugzilla/show_bug.cgi?id=63782 + +Signed-off-by: Bernd Kuhls + +diff -uNr apr-1.7.0.orig/configure.in apr-1.7.0/configure.in +--- apr-1.7.0.orig/configure.in 2019-04-01 19:40:46.000000000 +0200 ++++ apr-1.7.0/configure.in 2019-09-29 17:03:41.803326791 +0200 +@@ -1586,6 +1586,7 @@ + AC_SUBST(stringh) + AC_SUBST(stringsh) + AC_SUBST(sys_ioctlh) ++AC_SUBST(sys_paramh) + AC_SUBST(sys_sendfileh) + AC_SUBST(sys_signalh) + AC_SUBST(sys_socketh) +diff -uNr apr-1.7.0.orig/include/apr.h.in apr-1.7.0/include/apr.h.in +--- apr-1.7.0.orig/include/apr.h.in 2019-03-22 14:30:31.000000000 +0100 ++++ apr-1.7.0/include/apr.h.in 2019-09-29 17:04:54.203815469 +0200 +@@ -95,6 +95,7 @@ + #define APR_HAVE_STRINGS_H @stringsh@ + #define APR_HAVE_INTTYPES_H @inttypesh@ + #define APR_HAVE_SYS_IOCTL_H @sys_ioctlh@ ++#define APR_HAVE_SYS_PARAM_H @sys_paramh@ + #define APR_HAVE_SYS_SENDFILE_H @sys_sendfileh@ + #define APR_HAVE_SYS_SIGNAL_H @sys_signalh@ + #define APR_HAVE_SYS_SOCKET_H @sys_socketh@ +@@ -206,6 +207,9 @@ + #include + #endif + #endif ++#if APR_HAVE_SYS_PARAM_H ++#include ++#endif + + /* __APPLE__ is now the official pre-defined macro for macOS */ + #ifdef __APPLE__ diff --git a/buildroot/package/apr/apr.hash b/buildroot/package/apr/apr.hash index be130a5d7..0a3f5c852 100644 --- a/buildroot/package/apr/apr.hash +++ b/buildroot/package/apr/apr.hash @@ -1,4 +1,4 @@ -# From http://www.apache.org/dist/apr/apr-1.6.3.tar.bz2.sha256 -sha256 131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172 apr-1.6.3.tar.bz2 +# From http://archive.apache.org/dist/apr/apr-1.7.0.tar.bz2.sha256 +sha256 e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea apr-1.7.0.tar.bz2 # Locally calculated sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE diff --git a/buildroot/package/apr/apr.mk b/buildroot/package/apr/apr.mk index 8f29e57c5..466222586 100644 --- a/buildroot/package/apr/apr.mk +++ b/buildroot/package/apr/apr.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_VERSION = 1.6.3 +APR_VERSION = 1.7.0 APR_SOURCE = apr-$(APR_VERSION).tar.bz2 APR_SITE = http://archive.apache.org/dist/apr APR_LICENSE = Apache-2.0 @@ -14,9 +14,18 @@ APR_INSTALL_STAGING = YES # so we need to autoreconf: APR_AUTORECONF = YES +# avoid apr_hints.m4 by setting apr_preload_done=yes and set +# the needed CFLAGS on our own (avoids '-D_REENTRANT' in case +# not supported by toolchain and subsequent configure failure) +APR_CFLAGS = $(TARGET_CFLAGS) -DLINUX -D_GNU_SOURCE +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +APR_CFLAGS += -D_REENTRANT +endif + APR_CONF_ENV = \ CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ + CFLAGS="$(APR_CFLAGS)" \ ac_cv_file__dev_zero=yes \ ac_cv_func_setpgrp_void=yes \ apr_cv_process_shared_works=yes \ @@ -31,7 +40,8 @@ APR_CONF_ENV = \ apr_cv_epoll_create1=yes \ apr_cv_dup3=yes \ apr_cv_sock_cloexec=yes \ - apr_cv_accept4=yes + apr_cv_accept4=yes \ + apr_preload_done=yes APR_CONFIG_SCRIPTS = apr-1-config # Doesn't even try to guess when cross compiling @@ -42,15 +52,10 @@ endif # Fix lfs detection when cross compiling APR_CONF_ENV += apr_cv_use_lfs64=yes -# Use non-portable atomics when available: 8 bytes atomics are used on -# 64-bits architectures, 4 bytes atomics on 32-bits architectures. We -# have to override ap_cv_atomic_builtins because the test used to -# check for atomic builtins uses AC_TRY_RUN, which doesn't work when -# cross-compiling. -ifeq ($(BR2_ARCH_IS_64):$(BR2_TOOLCHAIN_HAS_SYNC_8),y:y) -APR_CONF_OPTS += --enable-nonportable-atomics -APR_CONF_ENV += ap_cv_atomic_builtins=yes -else ifeq ($(BR2_ARCH_IS_64):$(BR2_TOOLCHAIN_HAS_SYNC_4),:y) +# Use non-portable atomics when available. We have to override +# ap_cv_atomic_builtins because the test used to check for atomic +# builtins uses AC_TRY_RUN, which doesn't work when cross-compiling. +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8),y) APR_CONF_OPTS += --enable-nonportable-atomics APR_CONF_ENV += ap_cv_atomic_builtins=yes else diff --git a/buildroot/package/argparse/Config.in b/buildroot/package/argparse/Config.in index d207b0482..d02b19125 100644 --- a/buildroot/package/argparse/Config.in +++ b/buildroot/package/argparse/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_ARGPARSE subcommands and more. Argparse automatically generates usage, help and error messages. - https://github.com/mpeterv/argparse + https://github.com/luarocks/argparse diff --git a/buildroot/package/argparse/argparse.hash b/buildroot/package/argparse/argparse.hash index fa99609cc..1b01e4b6f 100644 --- a/buildroot/package/argparse/argparse.hash +++ b/buildroot/package/argparse/argparse.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 e4029f42d61cbdde1540e0a098a24b1fed0bc8a2803efe2a0d0d3e7f2f2f2c82 argparse-0.6.0-1.src.rock -sha256 c9b9a9667934d50f028a99b2617469db66663dc3b09d289b82e73e950b2b85eb argparse/LICENSE +sha256 47b3ca9e734971ba24ef26b0beff692ce6008f53aaf78c303f3d883648c96acb argparse-0.7.0-1.src.rock +sha256 9a918f21485b2a4529c901491d9101392f03586d65ad5b024a4445ebc1dc37b4 argparse-0.7.0/LICENSE diff --git a/buildroot/package/argparse/argparse.mk b/buildroot/package/argparse/argparse.mk index 04c46b527..a9b7a2f71 100644 --- a/buildroot/package/argparse/argparse.mk +++ b/buildroot/package/argparse/argparse.mk @@ -4,8 +4,7 @@ # ################################################################################ -ARGPARSE_VERSION = 0.6.0-1 -ARGPARSE_SUBDIR = argparse +ARGPARSE_VERSION = 0.7.0-1 ARGPARSE_LICENSE = MIT ARGPARSE_LICENSE_FILES = $(ARGPARSE_SUBDIR)/LICENSE diff --git a/buildroot/package/argus/argus.hash b/buildroot/package/argus/argus.hash index 84edce61e..b3196cce7 100644 --- a/buildroot/package/argus/argus.hash +++ b/buildroot/package/argus/argus.hash @@ -1,2 +1,6 @@ -# From http://qosient.com/argus/src/argus-3.0.8.tar.gz.md5 -md5 84daae71a502e4f6d088c279de3aa36b argus-3.0.8.tar.gz +# From http://qosient.com/argus/src/argus-3.0.8.2.tar.gz.md5 +md5 eaf5f5ec66569e556392802a70ef9ca5 argus-3.0.8.2.tar.gz + +# Locally computed +sha256 ca4e3bd5b9d4a8ff7c01cc96d1bffd46dbd6321237ec94c52f8badd51032eeff argus-3.0.8.2.tar.gz +sha256 c68221f7207486bfce863fada4ba9b2aaf4adc9e1c672f965ae98e88143e5f16 README diff --git a/buildroot/package/argus/argus.mk b/buildroot/package/argus/argus.mk index 941f439fc..0441df49e 100644 --- a/buildroot/package/argus/argus.mk +++ b/buildroot/package/argus/argus.mk @@ -4,7 +4,7 @@ # ################################################################################ -ARGUS_VERSION = 3.0.8 +ARGUS_VERSION = 3.0.8.2 ARGUS_SITE = http://qosient.com/argus/src ARGUS_DEPENDENCIES = libpcap ARGUS_CONF_ENV = arg_cv_sys_errlist=yes diff --git a/buildroot/package/armadillo/armadillo.mk b/buildroot/package/armadillo/armadillo.mk index b5fe403a7..5d9e3eda5 100644 --- a/buildroot/package/armadillo/armadillo.mk +++ b/buildroot/package/armadillo/armadillo.mk @@ -9,7 +9,7 @@ ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz ARMADILLO_SITE = https://downloads.sourceforge.net/project/arma ARMADILLO_DEPENDENCIES = clapack ARMADILLO_INSTALL_STAGING = YES -ARMADILLO_LICENSE = MPL-2.0 +ARMADILLO_LICENSE = Apache-2.0 ARMADILLO_LICENSE_FILES = LICENSE.txt $(eval $(cmake-package)) diff --git a/buildroot/package/arp-scan/0001-configure-try-linking-to-detect-stack-protector-supp.patch b/buildroot/package/arp-scan/0001-configure-try-linking-to-detect-stack-protector-supp.patch deleted file mode 100644 index 8eb9d6eff..000000000 --- a/buildroot/package/arp-scan/0001-configure-try-linking-to-detect-stack-protector-supp.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f406041b58eadc716d6227408d3af553d566ffeb Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Tue, 4 Apr 2017 17:31:29 +0200 -Subject: [PATCH] configure: try linking to detect stack-protector support - -Even if gcc accepts the -fstack-protector argument, it is possible that -the libssp support library is missing. Detect this by linking instead -of just compiling. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - acinclude.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 3c84118..4725154 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -243,7 +243,7 @@ AC_DEFUN([GCC_STACK_PROTECT_CC],[ - AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector]) - ssp_old_cflags="$CFLAGS" - CFLAGS="$CFLAGS -fstack-protector" -- AC_TRY_COMPILE(,,, ssp_cc=no) -+ AC_TRY_LINK(,,, ssp_cc=no) - echo $ssp_cc - if test "X$ssp_cc" = "Xno"; then - CFLAGS="$ssp_old_cflags" -@@ -259,7 +259,7 @@ AC_DEFUN([GCC_STACK_PROTECT_CXX],[ - AC_MSG_CHECKING([whether ${CXX} accepts -fstack-protector]) - ssp_old_cxxflags="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -fstack-protector" -- AC_TRY_COMPILE(,,, ssp_cxx=no) -+ AC_TRY_LINK(,,, ssp_cxx=no) - echo $ssp_cxx - if test "X$ssp_cxx" = "Xno"; then - CXXFLAGS="$ssp_old_cxxflags" --- -2.11.0 - diff --git a/buildroot/package/arp-scan/arp-scan.hash b/buildroot/package/arp-scan/arp-scan.hash index 4b2ddf181..562deb8ff 100644 --- a/buildroot/package/arp-scan/arp-scan.hash +++ b/buildroot/package/arp-scan/arp-scan.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 ce908ac71c48e85dddf6dd4fe5151d13c7528b1f49717a98b2a2535bd797d892 arp-scan-1.9.tar.gz +sha256 e03c36e4933c655bd0e4a841272554a347cd0136faf42c4a6564059e0761c039 arp-scan-1.9.7.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/arp-scan/arp-scan.mk b/buildroot/package/arp-scan/arp-scan.mk index b46e941d1..cc1efe84a 100644 --- a/buildroot/package/arp-scan/arp-scan.mk +++ b/buildroot/package/arp-scan/arp-scan.mk @@ -4,13 +4,11 @@ # ################################################################################ -ARP_SCAN_VERSION = 1.9 -ARP_SCAN_SITE = https://github.com/royhills/arp-scan/releases/download/$(ARP_SCAN_VERSION) +ARP_SCAN_VERSION = 1.9.7 +ARP_SCAN_SITE = $(call github,royhills,arp-scan,$(ARP_SCAN_VERSION)) ARP_SCAN_LICENSE = GPL-3.0+ ARP_SCAN_LICENSE_FILES = COPYING ARP_SCAN_DEPENDENCIES = libpcap - -# 0001-configure-try-linking-to-detect-stack-protector-supp.patch touches acinclude.m4 ARP_SCAN_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) diff --git a/buildroot/package/arptables/0004-Fix-musl-build-issue.patch b/buildroot/package/arptables/0001-Fix-musl-build-issue.patch similarity index 100% rename from buildroot/package/arptables/0004-Fix-musl-build-issue.patch rename to buildroot/package/arptables/0001-Fix-musl-build-issue.patch diff --git a/buildroot/package/arptables/0001-arptables-disable-dlfcn.h-include.patch b/buildroot/package/arptables/0001-arptables-disable-dlfcn.h-include.patch deleted file mode 100644 index a5d56d22a..000000000 --- a/buildroot/package/arptables/0001-arptables-disable-dlfcn.h-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 948a96d710f377fb0ed8d78c7fb85b299c80ef13 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sat, 8 Nov 2014 10:12:54 -0300 -Subject: [PATCH] arptables: disable dlfcn.h include - -The relevant code is disabled in libarptc_incl.c so it's not required -and breaks the ability to build it in a pure-static toolchain. - -Status: sent upstream. - -Signed-off-by: Gustavo Zacarias ---- - arptables.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arptables.c b/arptables.c -index 64ac3aa..fe270bc 100644 ---- a/arptables.c -+++ b/arptables.c -@@ -35,7 +35,9 @@ - #include - #include - #include -+#if 0 - #include -+#endif - #include - #include - #include --- -2.0.4 - diff --git a/buildroot/package/arptables/0002-src-Use-stdint-types.patch b/buildroot/package/arptables/0002-src-Use-stdint-types.patch deleted file mode 100644 index 8a85e705d..000000000 --- a/buildroot/package/arptables/0002-src-Use-stdint-types.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 24957c135eaacd718f3c788285de33d64316b32e Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 10:31:24 +0200 -Subject: [PATCH 1/2] src: Use stdint types - -Backport of upstream commit 047f37b1d5d865084a435fd7594b8c5c332ccb8d - -Please note that the backported patch does not include two changes -to arptables.h from the upstream - these modified lines added in commit -dbbe9f7de36aa3c7dd61dc89092c03f7902e474e which was committed after -the 0.0.4 release. - -Upstream-status: backport -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Brendan Heading ---- - arptables.c | 8 ++++---- - include/arptables.h | 3 ++- - include/libarptc/libarptc.h | 7 ++++--- - libarptc/libarptc.c | 4 ++-- - libarptc/libarptc_incl.c | 2 +- - 5 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/arptables.c b/arptables.c -index 5535ab2..6d1377f 100644 ---- a/arptables.c -+++ b/arptables.c -@@ -230,7 +230,7 @@ extern void dump_entries(const arptc_handle_t handle); - /etc/protocols */ - struct pprot { - char *name; -- u_int8_t num; -+ uint8_t num; - }; - - /* Primitive headers... */ -@@ -925,7 +925,7 @@ mask_to_dotted(const struct in_addr *mask) - { - int i; - static char buf[20]; -- u_int32_t maskaddr, bits; -+ uint32_t maskaddr, bits; - - maskaddr = ntohl(mask->s_addr); - -@@ -967,7 +967,7 @@ string_to_number(const char *s, unsigned int min, unsigned int max, - } - - static void --set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, -+set_option(unsigned int *options, unsigned int option, uint16_t *invflg, - int invert) - { - if (*options & option) -@@ -1107,7 +1107,7 @@ register_target(struct arptables_target *me) - } - - static void --print_num(u_int64_t number, unsigned int format) -+print_num(uint64_t number, unsigned int format) - { - if (format & FMT_KILOMEGAGIGA) { - if (number > 99999) { -diff --git a/include/arptables.h b/include/arptables.h -index 820b664..e6a6ba6 100644 ---- a/include/arptables.h -+++ b/include/arptables.h -@@ -1,6 +1,7 @@ - #ifndef _ARPTABLES_USER_H - #define _ARPTABLES_USER_H - -+#include - #include "arptables_common.h" - #include "libarptc/libarptc.h" - -@@ -126,7 +127,7 @@ extern char *mask_to_dotted(const struct in_addr *mask); - - extern void parse_hostnetworkmask(const char *name, struct in_addr **addrpp, - struct in_addr *maskp, unsigned int *naddrs); --extern u_int16_t parse_protocol(const char *s); -+extern uint16_t parse_protocol(const char *s); - - extern int do_command(int argc, char *argv[], char **table, - arptc_handle_t *handle); -diff --git a/include/libarptc/libarptc.h b/include/libarptc/libarptc.h -index e4f1175..76fbfab 100644 ---- a/include/libarptc/libarptc.h -+++ b/include/libarptc/libarptc.h -@@ -6,9 +6,10 @@ - #include - - #ifndef ARPT_MIN_ALIGN --/* arpt_entry has pointers and u_int64_t's in it, so if you align to -- it, you'll also align to any crazy matches and targets someone -- might write */ -+/* arpt_entry has pointers and uint64_t's in it, so if you align to -+ * it, you'll also align to any crazy matches and targets someone -+ * might write. -+ */ - #define ARPT_MIN_ALIGN (__alignof__(struct arpt_entry)) - #endif - -diff --git a/libarptc/libarptc.c b/libarptc/libarptc.c -index 2dcaaef..701bae0 100644 ---- a/libarptc/libarptc.c -+++ b/libarptc/libarptc.c -@@ -256,8 +256,8 @@ unconditional(const struct arpt_arp *arp) - { - unsigned int i; - -- for (i = 0; i < sizeof(*arp)/sizeof(u_int32_t); i++) -- if (((u_int32_t *)arp)[i]) -+ for (i = 0; i < sizeof(*arp) / sizeof(uint32_t); i++) -+ if (((uint32_t *)arp)[i]) - return 0; - - return 1; -diff --git a/libarptc/libarptc_incl.c b/libarptc/libarptc_incl.c -index 2fa3d43..b41fcb2 100644 ---- a/libarptc/libarptc_incl.c -+++ b/libarptc/libarptc_incl.c -@@ -1706,7 +1706,7 @@ TC_COMMIT(TC_HANDLE_T *handle) - /* Kernel will think that pointer should be 64-bits, and get - padding. So we accomodate here (assumption: alignment of - `counters' is on 64-bit boundary). */ -- u_int64_t *kernptr = (u_int64_t *)&newcounters->counters; -+ uint64_t *kernptr = (uint64_t *)&newcounters->counters; - if ((unsigned long)&newcounters->counters % 8 != 0) { - fprintf(stderr, - "counters alignment incorrect! Mail rusty!\n"); --- -2.4.3 - diff --git a/buildroot/package/arptables/0003-src-Remove-support-for-libc5.patch b/buildroot/package/arptables/0003-src-Remove-support-for-libc5.patch deleted file mode 100644 index 15e893dd0..000000000 --- a/buildroot/package/arptables/0003-src-Remove-support-for-libc5.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5f1379ff68bfedb56309527bee266a591b27a19e Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 10:31:41 +0200 -Subject: [PATCH 2/2] src: Remove support for libc5 - -Fixes compilation with musl libc - -Backport of upstream commit f4ab8f63f11a72f14687a6646d04ae1bae3fa45f -Upstream status: backport -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Brendan Heading ---- - include/libarptc/arpt_kernel_headers.h | 12 ------------ - libarptc/libarptc.c | 4 ---- - 2 files changed, 16 deletions(-) - -diff --git a/include/libarptc/arpt_kernel_headers.h b/include/libarptc/arpt_kernel_headers.h -index 442cc54..140e999 100644 ---- a/include/libarptc/arpt_kernel_headers.h -+++ b/include/libarptc/arpt_kernel_headers.h -@@ -5,7 +5,6 @@ - - #include - --#if defined(__GLIBC__) && __GLIBC__ == 2 - #include - #include - #include -@@ -14,16 +13,5 @@ - #include - #include - #include --#else --#include --#include --#include --#include --#include --#include --#include --#include --#include --#endif - - #endif -diff --git a/libarptc/libarptc.c b/libarptc/libarptc.c -index 701bae0..9c5a5b0 100644 ---- a/libarptc/libarptc.c -+++ b/libarptc/libarptc.c -@@ -23,10 +23,6 @@ - #define inline - #endif - --#if !defined(__GLIBC__) || (__GLIBC__ < 2) --typedef unsigned int socklen_t; --#endif -- - #include "libarptc/libarptc.h" - - #define IP_VERSION 4 --- -2.4.3 - diff --git a/buildroot/package/arptables/Config.in b/buildroot/package/arptables/Config.in index 873e791e8..aeb7250a7 100644 --- a/buildroot/package/arptables/Config.in +++ b/buildroot/package/arptables/Config.in @@ -1,7 +1,12 @@ config BR2_PACKAGE_ARPTABLES - bool "arptables" + bool "arptables-legacy" depends on BR2_USE_MMU # needs fork() help - Tool to set up, maintain, and inspect the tables of ARP rules. + Legacy tool to set up, maintain, and inspect the tables of ARP + rules. - http://ebtables.sourceforge.net + A more uptodate client of the arptables tool is provided in + the iptables package. The new tool was formerly known as + arptables-compat. + + http://git.netfilter.org/arptables diff --git a/buildroot/package/arptables/arptables.hash b/buildroot/package/arptables/arptables.hash index 95b999756..8366cea41 100644 --- a/buildroot/package/arptables/arptables.hash +++ b/buildroot/package/arptables/arptables.hash @@ -1,2 +1,5 @@ -# Locally calculated -sha256 277985e29ecd93bd759a58242cad0e02ba9d4a6e1b7795235e3b507661bc0049 arptables-v0.0.4.tar.gz +# From http://ftp.netfilter.org/pub/arptables/arptables-0.0.5.tar.gz.sha256sum +sha256 4f9a0656ce5c90868f551cd4deeb2d04f33899667e1fb2818b64e432fe8f629c arptables-0.0.5.tar.gz + +# Hash for license file +sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING diff --git a/buildroot/package/arptables/arptables.mk b/buildroot/package/arptables/arptables.mk index 257b636d6..320a33bb3 100644 --- a/buildroot/package/arptables/arptables.mk +++ b/buildroot/package/arptables/arptables.mk @@ -4,10 +4,10 @@ # ################################################################################ -ARPTABLES_VERSION = 0.0.4 -ARPTABLES_SOURCE = arptables-v$(ARPTABLES_VERSION).tar.gz -ARPTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/arptables/arptables-v$(ARPTABLES_VERSION) +ARPTABLES_VERSION = 0.0.5 +ARPTABLES_SITE = http://ftp.netfilter.org/pub/arptables ARPTABLES_LICENSE = GPL-2.0+ +ARPTABLES_LICENSE_FILES = COPYING define ARPTABLES_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ @@ -15,7 +15,8 @@ define ARPTABLES_BUILD_CMDS endef define ARPTABLES_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/arptables $(TARGET_DIR)/usr/sbin/arptables + $(INSTALL) -m 755 -D $(@D)/arptables-legacy \ + $(TARGET_DIR)/usr/sbin/arptables-legacy endef $(eval $(generic-package)) diff --git a/buildroot/package/ascii-invaders/Config.in b/buildroot/package/ascii-invaders/Config.in new file mode 100644 index 000000000..f02ab7499 --- /dev/null +++ b/buildroot/package/ascii-invaders/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_ASCII_INVADERS + bool "ascii_invaders" + select BR2_PACKAGE_NCURSES + help + An ASCII-art game like Space Invaders using ncurses. + + https://github.com/macdice/ascii-invaders diff --git a/buildroot/package/ascii-invaders/ascii-invaders.hash b/buildroot/package/ascii-invaders/ascii-invaders.hash new file mode 100644 index 000000000..f08fc2a7d --- /dev/null +++ b/buildroot/package/ascii-invaders/ascii-invaders.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha512 326708ffc2c277e04575920c58f6a267e0bf46f8d2a3dbca9b5c317fb01006d4f673ab35f92f292549cc52dbee4400a84c85478eb81b9bd7703689a705547bc7 ascii-invaders-1.0.1.tar.gz + +# Hash for license file +sha512 1e455684996d7733b2f1ccd4606d034694d16ceff6ede6125d7f1537d20dabe05976cca4cef5cbf6c31352cbd62a515fd8e34a2ffb54dae1181c1116b24c6cf7 LICENSE diff --git a/buildroot/package/ascii-invaders/ascii-invaders.mk b/buildroot/package/ascii-invaders/ascii-invaders.mk new file mode 100644 index 000000000..a5a25d7ab --- /dev/null +++ b/buildroot/package/ascii-invaders/ascii-invaders.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# ASCII-Invaders +# +################################################################################ + +ASCII_INVADERS_VERSION = 1.0.1 +ASCII_INVADERS_SITE = $(call github,macdice,ascii-invaders,v$(ASCII_INVADERS_VERSION)) +ASCII_INVADERS_DEPENDENCIES = ncurses +ASCII_INVADERS_LICENSE = GPL-2.0+ +ASCII_INVADERS_LICENSE_FILES = LICENSE + +# For compiling statically, libraries must be specified after the object file +define ASCII_INVADERS_POST_EXTRACT_FIXUP + sed -i 's/\$$(LIBS) invaders.o/invaders.o \$$(LIBS)/' $(@D)/Makefile +endef +ASCII_INVADERS_POST_EXTRACT_HOOKS += ASCII_INVADERS_POST_EXTRACT_FIXUP + +define ASCII_INVADERS_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +define ASCII_INVADERS_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/ascii_invaders $(TARGET_DIR)/usr/bin/ascii_invaders +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/assimp/0002-fix-compilation-on-BigEndian.patch b/buildroot/package/assimp/0002-fix-compilation-on-BigEndian.patch deleted file mode 100644 index 93cba5d12..000000000 --- a/buildroot/package/assimp/0002-fix-compilation-on-BigEndian.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8457f3eff89dae35d43f679a66842ceedfd08808 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= - -Date: Fri, 13 Nov 2015 22:33:20 +0100 -Subject: [PATCH] fix compilation on BigEndian - -cannot pass a function by reference where an lvalue is expected -(only applies to bigendian, where a macro expands to a byteswap function) - -Closes https://github.com/assimp/assimp/issues/613 - -Taken from [1] for buildroot assimp package compile fix. - -[1] https://github.com/assimp/assimp/commit/756cfd4f74b866e3183caede69daa8c105b73bab.patch - -Signed-off-by: Peter Seiderer ---- - code/Bitmap.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/code/Bitmap.cpp b/code/Bitmap.cpp -index 13ec372..829fd02 100644 ---- a/code/Bitmap.cpp -+++ b/code/Bitmap.cpp -@@ -84,7 +84,12 @@ namespace Assimp { - - template - inline std::size_t Copy(uint8_t* data, T& field) { -+#ifdef AI_BUILD_BIG_ENDIAN -+ T field_swapped=AI_BE(field); -+ std::memcpy(data, &field_swapped, sizeof(field)); return sizeof(field); -+#else - std::memcpy(data, &AI_BE(field), sizeof(field)); return sizeof(field); -+#endif - } - - void Bitmap::WriteHeader(Header& header, IOStream* file) { --- -2.1.4 - diff --git a/buildroot/package/assimp/Config.in b/buildroot/package/assimp/Config.in index 630758f3e..42bfee945 100644 --- a/buildroot/package/assimp/Config.in +++ b/buildroot/package/assimp/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_ASSIMP bool "assimp" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR select BR2_PACKAGE_ZLIB help Open Asset Import Library (assimp) is a portable Open Source @@ -11,5 +12,5 @@ config BR2_PACKAGE_ASSIMP http://www.assimp.org -comment "assimp needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "assimp needs a toolchain w/ C++, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/buildroot/package/assimp/assimp.hash b/buildroot/package/assimp/assimp.hash index bee26fb4f..72d367ac4 100644 --- a/buildroot/package/assimp/assimp.hash +++ b/buildroot/package/assimp/assimp.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 187f825c563e84b1b17527a4da0351aa3d575dfd696a9d204ae4bb19ee7df94a assimp-v3.2.tar.gz +sha256 3520b1e9793b93a2ca3b797199e16f40d61762617e072f2d525fad70f9678a71 assimp-4.1.0.tar.gz +sha256 a26ccc3dbf2f58ea99c100945a8a126fa0f9f4d7fd2b49aa8bdb8e09355864d8 LICENSE diff --git a/buildroot/package/assimp/assimp.mk b/buildroot/package/assimp/assimp.mk index 5720f9793..ce02ef300 100644 --- a/buildroot/package/assimp/assimp.mk +++ b/buildroot/package/assimp/assimp.mk @@ -4,8 +4,8 @@ # ################################################################################ -ASSIMP_VERSION = v3.2 -ASSIMP_SITE = $(call github,assimp,assimp,$(ASSIMP_VERSION)) +ASSIMP_VERSION = 4.1.0 +ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE ASSIMP_DEPENDENCIES = zlib diff --git a/buildroot/package/asterisk/asterisk.mk b/buildroot/package/asterisk/asterisk.mk index 00070aadb..cea287f0d 100644 --- a/buildroot/package/asterisk/asterisk.mk +++ b/buildroot/package/asterisk/asterisk.mk @@ -136,8 +136,8 @@ else ASTERISK_CONF_OPTS += --without-asound endif -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -ASTERISK_DEPENDENCIES += bluez_utils +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) +ASTERISK_DEPENDENCIES += bluez5_utils ASTERISK_CONF_OPTS += --with-bluetooth else ASTERISK_CONF_OPTS += --without-bluetooth diff --git a/buildroot/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch b/buildroot/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch new file mode 100644 index 000000000..154d7010d --- /dev/null +++ b/buildroot/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch @@ -0,0 +1,35 @@ +From 3b154996a27ede1c94cbc590e2db3858389d18c2 Mon Sep 17 00:00:00 2001 +From: Tobias Stoeckmann +Date: Tue, 12 Mar 2019 11:46:24 +0100 +Subject: [PATCH] Fix meson.build for meson 0.50.0. + +Since meson 0.50.0 it is not possible anymore to specify an +absolute directory for subdir. To keep current functionality, +use install_dir instead. + +atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path. + +Signed-off-by: Tobias Stoeckmann + +Upstream: https://github.com/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch +Signed-off-by: Peter Seiderer +--- + atspi/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/atspi/meson.build b/atspi/meson.build +index 17bfc45..2e44ffd 100644 +--- a/atspi/meson.build ++++ b/atspi/meson.build +@@ -57,7 +57,7 @@ atspi_headers = [ + + atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi') + +-install_headers(atspi_headers, subdir: atspi_includedir) ++install_headers(atspi_headers, install_dir: atspi_includedir) + + atspi_enums = gnome.mkenums('atspi-enum-types', + sources: [ 'atspi-constants.h', 'atspi-types.h' ], +-- +2.21.0 + diff --git a/buildroot/package/at-spi2-core/at-spi2-core.mk b/buildroot/package/at-spi2-core/at-spi2-core.mk index 40b29bdb3..3a5197eb0 100644 --- a/buildroot/package/at-spi2-core/at-spi2-core.mk +++ b/buildroot/package/at-spi2-core/at-spi2-core.mk @@ -11,7 +11,10 @@ AT_SPI2_CORE_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/$(AT_SPI AT_SPI2_CORE_LICENSE = LGPL-2.0+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES -AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst +AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \ + $(TARGET_NLS_DEPENDENCIES) AT_SPI2_CORE_CONF_OPTS = -Ddbus_daemon=/usr/bin/dbus-daemon +AT_SPI2_CORE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) + $(eval $(meson-package)) diff --git a/buildroot/package/at/0002-Makefile.in-replace-IROOT-by-DESTDIR.patch b/buildroot/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch similarity index 100% rename from buildroot/package/at/0002-Makefile.in-replace-IROOT-by-DESTDIR.patch rename to buildroot/package/at/0001-Makefile.in-replace-IROOT-by-DESTDIR.patch diff --git a/buildroot/package/at/0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch b/buildroot/package/at/0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch deleted file mode 100644 index e4276ac20..000000000 --- a/buildroot/package/at/0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e12c96cccab550eda31cf7bb1dedddd3670ffe69 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Tue, 1 Dec 2009 17:22:22 +0100 -Subject: [PATCH 2/5] configure.ac: convert AC_TRY_COMPILE -> AC_COMPILE_IFELSE - -Signed-off-by: Marc Kleine-Budde ---- - configure.ac | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 997a37f..cab80ed 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,11 +40,11 @@ case "$host" in - esac - - AC_MSG_CHECKING(__attribute__((noreturn))) --AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);], -- AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1, -- [Define to 1 if compiler supports __attribute__((noreturn))]), -- AC_MSG_RESULT(no) -+AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[]], [[void __attribute__((noreturn)) panic(void);]])], -+ [AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1, Define to 1 if compiler supports __attribute__((noreturn)))], -+ [AC_MSG_RESULT(no)] - ) - dnl Checks for libraries. - --- -1.6.5.3 - diff --git a/buildroot/package/at/0003-Makefile.in-make-install-fix.patch b/buildroot/package/at/0002-Makefile.in-make-install-fix.patch similarity index 100% rename from buildroot/package/at/0003-Makefile.in-make-install-fix.patch rename to buildroot/package/at/0002-Makefile.in-make-install-fix.patch diff --git a/buildroot/package/at/0004-getloadavg.c-fix.patch b/buildroot/package/at/0003-getloadavg.c-fix.patch similarity index 100% rename from buildroot/package/at/0004-getloadavg.c-fix.patch rename to buildroot/package/at/0003-getloadavg.c-fix.patch diff --git a/buildroot/package/at/0004-Makefile-fix-parallel-build-failure.patch b/buildroot/package/at/0004-Makefile-fix-parallel-build-failure.patch new file mode 100644 index 000000000..6e3dc24ca --- /dev/null +++ b/buildroot/package/at/0004-Makefile-fix-parallel-build-failure.patch @@ -0,0 +1,41 @@ +From 3ace0b57e2aacb784c01a3c7694c6c92461937ff Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Thu, 20 Feb 2020 22:00:11 +0100 +Subject: [PATCH] Makefile: fix parallel build failure + +At the moment parallel build fails due to 2 causes: +1) parsetime.l tries to include incomplete y.tab.h, since y.tab.h is the +result of yacc -d parsetime.y +2) when compiling y.tab.c, y.tab.c itself is not complete, since it is +the result of yacc -d parsetime.y + +So fix it by: +1) making parsetime.l to wait for y.tab.h to be created by yacc +2) waiting for y.tab.c and y.tab.h to be created before compile them + +Signed-off-by: Giulio Benetti +--- + Makefile.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Makefile.in b/Makefile.in +index 4c11913..57c3a0c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y + lex.yy.c: parsetime.l + $(LEX) -i parsetime.l + ++parsetime.l: y.tab.h ++ + atd.service: atd.service.in + cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ + +@@ -173,3 +175,4 @@ perm.o: perm.c config.h privs.h at.h + posixtm.o: posixtm.c posixtm.h + daemon.o: daemon.c config.h daemon.h privs.h + getloadavg.o: getloadavg.c config.h getloadavg.h ++y.tab.o: y.tab.c y.tab.h +-- +2.20.1 + diff --git a/buildroot/package/at/0005-parsetime.l-include-config-h.patch b/buildroot/package/at/0005-parsetime.l-include-config-h.patch deleted file mode 100644 index f4111ebf6..000000000 --- a/buildroot/package/at/0005-parsetime.l-include-config-h.patch +++ /dev/null @@ -1,16 +0,0 @@ -Make sure to include config.h so that NEEDS_* macros are properly -taken into account. This was a problem for NEEDS_YYWRAP, which was set -to 1 in config.h, but the corresponding code wasn't compiled in. - -Index: at-3.1.13/parsetime.l -=================================================================== ---- at-3.1.13.orig/parsetime.l -+++ at-3.1.13/parsetime.l -@@ -4,6 +4,7 @@ - #include - #include "y.tab.h" - #include "parsetime.h" -+#include "config.h" - - char *last_token = NULL; - char **my_argv; diff --git a/buildroot/package/at/0006-remove-glibc-__isleap-assumption.patch b/buildroot/package/at/0006-remove-glibc-__isleap-assumption.patch deleted file mode 100644 index 21522492c..000000000 --- a/buildroot/package/at/0006-remove-glibc-__isleap-assumption.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7f811d9c4ebc9444e613e251c31d6bf537a24dc1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Apr 2015 16:35:30 -0700 -Subject: [PATCH] remove glibc assumption - -glibc time.h header has an undocumented __isleap macro -that we are using anf musl is missing it. -Since it is undocumented & does not appear -on any other libc, stop using it and just define the macro in -locally instead. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -[patch from: http://patchwork.openembedded.org/patch/91893/ ] -Signed-off-by: "Yann E. MORIN" - ---- - parsetime.y | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/parsetime.y b/parsetime.y -index 7005e88..324e6d3 100644 ---- a/parsetime.y -+++ b/parsetime.y -@@ -8,6 +8,9 @@ - - #define YYDEBUG 1 - -+#define is_leap_year(y) \ -+ ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) -+ - struct tm exectm; - static int isgmt; - static int yearspec; -@@ -217,8 +220,8 @@ date : month_name day_number - mnum == 12) && dnum > 31) - || ((mnum == 4 || mnum == 6 || mnum == 9 || - mnum == 11) && dnum > 30) -- || (mnum == 2 && dnum > 29 && __isleap(ynum+1900)) -- || (mnum == 2 && dnum > 28 && !__isleap(ynum+1900)) -+ || (mnum == 2 && dnum > 29 && is_leap_year(ynum+1900)) -+ || (mnum == 2 && dnum > 28 && !is_leap_year(ynum+1900)) - ) - { - yyerror("Error in day of month"); -@@ -261,8 +264,8 @@ date : month_name day_number - mnum == 12) && dnum > 31) - || ((mnum == 4 || mnum == 6 || mnum == 9 || - mnum == 11) && dnum > 30) -- || (mnum == 2 && dnum > 29 && __isleap(ynum+1900)) -- || (mnum == 2 && dnum > 28 && !__isleap(ynum+1900)) -+ || (mnum == 2 && dnum > 29 && is_leap_year(ynum+1900)) -+ || (mnum == 2 && dnum > 28 && !is_leap_year(ynum+1900)) - ) - { - yyerror("Error in day of month"); --- -2.1.4 diff --git a/buildroot/package/at/at.hash b/buildroot/package/at/at.hash index 530b1257c..e20c00b3c 100644 --- a/buildroot/package/at/at.hash +++ b/buildroot/package/at/at.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 f5c7c8226fab0bc4e2d16a55e04d4026f3452db51fc5cbcc4bb5a3c79a79f7ef at-release_3.1.23.tar.gz +sha256 9ae5761a1fb897cda3a6f14439bed33cda33c0eedfcee6866e3d2ebad67fbd2f at-7c74fa1aece6bc6db351763dc012193d5d634b7e.tar.gz sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/buildroot/package/at/at.mk b/buildroot/package/at/at.mk index 36aa8c7a4..dbf649c0b 100644 --- a/buildroot/package/at/at.mk +++ b/buildroot/package/at/at.mk @@ -4,12 +4,9 @@ # ################################################################################ -AT_VERSION = release/3.1.23 +AT_VERSION = 7c74fa1aece6bc6db351763dc012193d5d634b7e AT_SITE = https://salsa.debian.org/debian/at.git AT_SITE_METHOD = git -# Tried to add missing deps for parsetime.l but still parallel build fails -# in some case, so at the moment let's keep MAKE1 -AT_MAKE = $(MAKE1) AT_AUTORECONF = YES AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex AT_LICENSE = GPL-2.0+, GPL-3.0+, ISC diff --git a/buildroot/package/atest/atest.hash b/buildroot/package/atest/atest.hash index 78e3ff8ed..8384f3179 100644 --- a/buildroot/package/atest/atest.hash +++ b/buildroot/package/atest/atest.hash @@ -1,2 +1,3 @@ # Locally computed sha256 91da5a6d4d0b0a8d4bae156a40e91a6dccf62863bfa7acae948efbbd2b4154ca atest-895b0183a89c15f5e2305a6795bb1667753cd3f0.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/atest/atest.mk b/buildroot/package/atest/atest.mk index 2effda571..68def46cf 100644 --- a/buildroot/package/atest/atest.mk +++ b/buildroot/package/atest/atest.mk @@ -12,10 +12,4 @@ ATEST_DEPENDENCIES = host-pkgconf libev alsa-lib # Fetched from Github, with no configure script ATEST_AUTORECONF = YES -# Autoreconf requires an existing m4 directory -define ATEST_PATCH_M4 - mkdir -p $(@D)/m4 -endef -ATEST_POST_PATCH_HOOKS += ATEST_PATCH_M4 - $(eval $(autotools-package)) diff --git a/buildroot/package/atf/atf.hash b/buildroot/package/atf/atf.hash index 78cd3c682..49c235a63 100644 --- a/buildroot/package/atf/atf.hash +++ b/buildroot/package/atf/atf.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 92bc64180135eea8fe84c91c9f894e678767764f6dbc8482021d4dde09857505 atf-0.21.tar.gz +sha256 92bc64180135eea8fe84c91c9f894e678767764f6dbc8482021d4dde09857505 atf-0.21.tar.gz +sha256 2a15172ddf6386297734c9800c899e6e8dc16c5a03931dcf95a9ab321a24cfe4 COPYING diff --git a/buildroot/package/atk/0001-atk-meson.build-replace-shared_library-by-library.patch b/buildroot/package/atk/0001-atk-meson.build-replace-shared_library-by-library.patch deleted file mode 100644 index 6260cca89..000000000 --- a/buildroot/package/atk/0001-atk-meson.build-replace-shared_library-by-library.patch +++ /dev/null @@ -1,33 +0,0 @@ -From da08587d9a57b45cc8a76cb31390c79c1199959b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 10 Jan 2019 10:13:03 +0100 -Subject: [PATCH] atk/meson.build: replace shared_library by library - -Use library instead of shared_library to allow the user to build a -static libatk library - -Fixes: - - http://autobuild.buildroot.org/results/347a37dd2585974bdbf3bf99158e8ee9127d1202 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://gitlab.gnome.org/GNOME/atk/merge_requests/11] ---- - atk/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atk/meson.build b/atk/meson.build -index 69ba6c5..0ad67e5 100644 ---- a/atk/meson.build -+++ b/atk/meson.build -@@ -122,7 +122,7 @@ endif - - atk_inc = include_directories('.') - --libatk = shared_library('atk-@0@'.format(atk_api_version), -+libatk = library('atk-@0@'.format(atk_api_version), - sources: atk_sources + atk_enums + atk_marshals, - soversion: atk_soversion, - version: atk_libversion, --- -2.14.1 - diff --git a/buildroot/package/atk/atk.hash b/buildroot/package/atk/atk.hash index 911e65fcc..8c1bad5b1 100644 --- a/buildroot/package/atk/atk.hash +++ b/buildroot/package/atk/atk.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.30/atk-2.30.0.sha256sum -sha256 dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b atk-2.30.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.33/atk-2.33.3.sha256sum +sha256 532d1081e87b9f0a8d71733101e791818442fa1896531621d1aecc189e1a4ffe atk-2.33.3.tar.xz # Hash for license file sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/atk/atk.mk b/buildroot/package/atk/atk.mk index 6a0cb370d..703966605 100644 --- a/buildroot/package/atk/atk.mk +++ b/buildroot/package/atk/atk.mk @@ -4,8 +4,8 @@ # ################################################################################ -ATK_VERSION_MAJOR = 2.30 -ATK_VERSION = $(ATK_VERSION_MAJOR).0 +ATK_VERSION_MAJOR = 2.33 +ATK_VERSION = $(ATK_VERSION_MAJOR).3 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) ATK_LICENSE = LGPL-2.0+ @@ -13,6 +13,7 @@ ATK_LICENSE_FILES = COPYING ATK_INSTALL_STAGING = YES ATK_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) +ATK_CONF_OPTS = -Dintrospection=false ATK_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) diff --git a/buildroot/package/atkmm/atkmm.hash b/buildroot/package/atkmm/atkmm.hash index 4b3577c88..42cc2d722 100644 --- a/buildroot/package/atkmm/atkmm.hash +++ b/buildroot/package/atkmm/atkmm.hash @@ -1,2 +1,5 @@ # From http://ftp.gnome.org/pub/gnome/sources/atkmm/2.24/atkmm-2.24.2.sha256sum -sha256 ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd atkmm-2.24.2.tar.xz +sha256 ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd atkmm-2.24.2.tar.xz +# locally computed +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/buildroot/package/atop/atop.hash b/buildroot/package/atop/atop.hash index 80082d022..f404ed5d1 100644 --- a/buildroot/package/atop/atop.hash +++ b/buildroot/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69 atop-2.4.0.tar.gz +sha256 4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33 atop-2.5.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/atop/atop.mk b/buildroot/package/atop/atop.mk index 4ea1ccf26..46baff8f7 100644 --- a/buildroot/package/atop/atop.mk +++ b/buildroot/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.4.0 +ATOP_VERSION = 2.5.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING diff --git a/buildroot/package/attr/attr.hash b/buildroot/package/attr/attr.hash index 88adf44e6..ba9f45669 100644 --- a/buildroot/package/attr/attr.hash +++ b/buildroot/package/attr/attr.hash @@ -1,2 +1,6 @@ # Locally calculated after checking pgp signature sha256 5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7 attr-2.4.48.tar.gz + +# Locally calculated +sha256 98f318493be6b08bff3cd295791cde06c54e17882a3c74a1ed245eaa02533d52 doc/COPYING +sha256 5decad7e58d90d44335bf2f45ce27563bd911065c6a1a02dfa7647c4efee75c8 doc/COPYING.LGPL diff --git a/buildroot/package/attr/attr.mk b/buildroot/package/attr/attr.mk index 348dcd2f8..ba77e802d 100644 --- a/buildroot/package/attr/attr.mk +++ b/buildroot/package/attr/attr.mk @@ -12,7 +12,6 @@ ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ATTR_INSTALL_STAGING = YES ATTR_CONF_OPTS = --disable-nls -HOST_ATTR_CONF_OPTS = --disable-nls $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/aubio/0001-Fix-build-with-FFmpeg-4.0.patch b/buildroot/package/aubio/0001-Fix-build-with-FFmpeg-4.0.patch deleted file mode 100644 index 40ff2dfb8..000000000 --- a/buildroot/package/aubio/0001-Fix-build-with-FFmpeg-4.0.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5690daf759b473b9d13b4547ef37adc2695cf524 Mon Sep 17 00:00:00 2001 -From: James Cowgill -Date: Sun, 25 Feb 2018 14:23:25 +0000 -Subject: [PATCH] Fix build with FFmpeg 4.0 - -Downloaded from upstream commit -https://git.aubio.org/?p=aubio.git;a=commitdiff;h=5690daf759b473b9d13b4547ef37adc2695cf524 - -Signed-off-by: Bernd Kuhls ---- - src/io/source_avcodec.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c -index ccdce807..8197445c 100644 ---- a/src/io/source_avcodec.c -+++ b/src/io/source_avcodec.c -@@ -58,7 +58,11 @@ - #include "fmat.h" - #include "source_avcodec.h" - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0) - #define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE -+#else -+#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE -+#endif - - struct _aubio_source_avcodec_t { - uint_t hop_size; --- -2.14.4 - diff --git a/buildroot/package/aubio/aubio.hash b/buildroot/package/aubio/aubio.hash index edb63f076..f484776c1 100644 --- a/buildroot/package/aubio/aubio.hash +++ b/buildroot/package/aubio/aubio.hash @@ -1,5 +1,5 @@ -# From https://aubio.org/pub/aubio-0.4.6.tar.bz2.sha256 -sha256 bdc73be1f007218d3ea6d2a503b38a217815a0e2ccc4ed441f6e850ed5d47cfb aubio-0.4.6.tar.bz2 +# From https://aubio.org/pub/aubio-0.4.9.tar.bz2.sha256 +sha256 d48282ae4dab83b3dc94c16cf011bcb63835c1c02b515490e1883049c3d1f3da aubio-0.4.9.tar.bz2 # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/aubio/aubio.mk b/buildroot/package/aubio/aubio.mk index ba182d9bd..b79beccd9 100644 --- a/buildroot/package/aubio/aubio.mk +++ b/buildroot/package/aubio/aubio.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUBIO_VERSION = 0.4.6 +AUBIO_VERSION = 0.4.9 AUBIO_SITE = https://aubio.org/pub AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2 AUBIO_LICENSE = GPL-3.0+ diff --git a/buildroot/package/audiofile/audiofile.hash b/buildroot/package/audiofile/audiofile.hash index 3b9cba64f..f4028f9a6 100644 --- a/buildroot/package/audiofile/audiofile.hash +++ b/buildroot/package/audiofile/audiofile.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 cdc60df19ab08bfe55344395739bb08f50fc15c92da3962fac334d3bff116965 audiofile-0.3.6.tar.gz +sha256 cdc60df19ab08bfe55344395739bb08f50fc15c92da3962fac334d3bff116965 audiofile-0.3.6.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL diff --git a/buildroot/package/audiofile/audiofile.mk b/buildroot/package/audiofile/audiofile.mk index 2f2e8902e..bb46436d8 100644 --- a/buildroot/package/audiofile/audiofile.mk +++ b/buildroot/package/audiofile/audiofile.mk @@ -15,6 +15,22 @@ AUDIOFILE_AUTORECONF = YES AUDIOFILE_LICENSE = GPL-2.0+, LGPL-2.1+ AUDIOFILE_LICENSE_FILES = COPYING COPYING.GPL +# 0003-Always-check-the-number-of-coefficients.patch +AUDIOFILE_IGNORE_CVES += \ + CVE-2017-6827 CVE-2017-6828 CVE-2017-6832 \ + CVE-2017-6833 CVE-2017-6835 CVE-2017-6837 +# 0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch +AUDIOFILE_IGNORE_CVES += CVE-2017-6829 +# 0005-Check-for-multiplication-overflow-in-sfconvert.patch +AUDIOFILE_IGNORE_CVES += \ + CVE-2017-6830 CVE-2017-6834 CVE-2017-6836 CVE-2017-6838 +# 0006-Actually-fail-when-error-occurs-in-parseFormat.patch +AUDIOFILE_IGNORE_CVES += CVE-2017-6831 +# 0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch +AUDIOFILE_IGNORE_CVES += CVE-2017-6839 +# 0008-CVE-2015-7747.patch +AUDIOFILE_IGNORE_CVES += CVE-2015-7747 + ifeq ($(BR2_PACKAGE_FLAC),y) AUDIOFILE_DEPENDENCIES += flac AUDIOFILE_CONF_OPTS += --enable-flac diff --git a/buildroot/package/audit/0002-Add-substitue-functions-for-strndupa-rawmemchr.patch b/buildroot/package/audit/0002-Add-substitue-functions-for-strndupa-rawmemchr.patch new file mode 100644 index 000000000..ac292c57d --- /dev/null +++ b/buildroot/package/audit/0002-Add-substitue-functions-for-strndupa-rawmemchr.patch @@ -0,0 +1,133 @@ +From c39a071e7c021f6ff3554aca2758e97b47a9777c Mon Sep 17 00:00:00 2001 +From: Steve Grubb +Date: Tue, 26 Feb 2019 18:33:33 -0500 +Subject: [PATCH] Add substitue functions for strndupa & rawmemchr + +(cherry picked from commit d579a08bb1cde71f939c13ac6b2261052ae9f77e) +Signed-off-by: Thomas Petazzoni +--- + auparse/auparse.c | 12 +++++++++++- + auparse/interpret.c | 9 ++++++++- + configure.ac | 14 +++++++++++++- + src/ausearch-lol.c | 12 +++++++++++- + 4 files changed, 43 insertions(+), 4 deletions(-) + +diff --git a/auparse/auparse.c b/auparse/auparse.c +index 650db02..2e1c737 100644 +--- a/auparse/auparse.c ++++ b/auparse/auparse.c +@@ -1,5 +1,5 @@ + /* auparse.c -- +- * Copyright 2006-08,2012-17 Red Hat Inc., Durham, North Carolina. ++ * Copyright 2006-08,2012-19 Red Hat Inc., Durham, North Carolina. + * All Rights Reserved. + * + * This library is free software; you can redistribute it and/or +@@ -1118,6 +1118,16 @@ static int str2event(char *s, au_event_t *e) + return 0; + } + ++#ifndef HAVE_STRNDUPA ++static inline char *strndupa(const char *old, size_t n) ++{ ++ size_t len = strnlen(old, n); ++ char *tmp = alloca(len + 1); ++ tmp[len] = 0; ++ return memcpy(tmp, old, len); ++} ++#endif ++ + /* Returns 0 on success and 1 on error */ + static int extract_timestamp(const char *b, au_event_t *e) + { +diff --git a/auparse/interpret.c b/auparse/interpret.c +index 51c4a5e..67b7b77 100644 +--- a/auparse/interpret.c ++++ b/auparse/interpret.c +@@ -853,6 +853,13 @@ err_out: + return print_escaped(id->val); + } + ++// rawmemchr is faster. Let's use it if we have it. ++#ifdef HAVE_RAWMEMCHR ++#define STRCHR rawmemchr ++#else ++#define STRCHR strchr ++#endif ++ + static const char *print_proctitle(const char *val) + { + char *out = (char *)print_escaped(val); +@@ -863,7 +870,7 @@ static const char *print_proctitle(const char *val) + // Proctitle has arguments separated by NUL bytes + // We need to write over the NUL bytes with a space + // so that we can see the arguments +- while ((ptr = rawmemchr(ptr, '\0'))) { ++ while ((ptr = STRCHR(ptr, '\0'))) { + if (ptr >= end) + break; + *ptr = ' '; +diff --git a/configure.ac b/configure.ac +index 6e345f1..6f3007e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,7 +1,7 @@ + dnl + define([AC_INIT_NOTICE], + [### Generated automatically using autoconf version] AC_ACVERSION [ +-### Copyright 2005-18 Steve Grubb ++### Copyright 2005-19 Steve Grubb + ### + ### Permission is hereby granted, free of charge, to any person obtaining a + ### copy of this software and associated documentation files (the "Software"), +@@ -72,6 +72,18 @@ dnl; posix_fallocate is used in audisp-remote + AC_CHECK_FUNCS([posix_fallocate]) + dnl; signalfd is needed for libev + AC_CHECK_FUNC([signalfd], [], [ AC_MSG_ERROR([The signalfd system call is necessary for auditd]) ]) ++dnl; check if rawmemchr is available ++AC_CHECK_FUNCS([rawmemchr]) ++dnl; check if strndupa is available ++AC_LINK_IFELSE( ++ [AC_LANG_SOURCE( ++ [[ ++ #define _GNU_SOURCE ++ #include ++ int main() { (void) strndupa("test", 10); return 0; }]])], ++ [AC_DEFINE(HAVE_STRNDUPA, 1, [Let us know if we have it or not])], ++ [] ++) + + ALLWARNS="" + ALLDEBUG="-g" +diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c +index 5d17a72..758c33e 100644 +--- a/src/ausearch-lol.c ++++ b/src/ausearch-lol.c +@@ -1,6 +1,6 @@ + /* + * ausearch-lol.c - linked list of linked lists library +-* Copyright (c) 2008,2010,2014,2016 Red Hat Inc., Durham, North Carolina. ++* Copyright (c) 2008,2010,2014,2016,2019 Red Hat Inc., Durham, North Carolina. + * All Rights Reserved. + * + * This software may be freely redistributed and/or modified under the +@@ -152,6 +152,16 @@ static int compare_event_time(event *e1, event *e2) + return 0; + } + ++#ifndef HAVE_STRNDUPA ++static inline char *strndupa(const char *old, size_t n) ++{ ++ size_t len = strnlen(old, n); ++ char *tmp = alloca(len + 1); ++ tmp[len] = 0; ++ return memcpy(tmp, old, len); ++} ++#endif ++ + /* + * This function will look at the line and pick out pieces of it. + */ +-- +2.21.0 + diff --git a/buildroot/package/audit/Config.in b/buildroot/package/audit/Config.in index 023ac79d3..6e5761533 100644 --- a/buildroot/package/audit/Config.in +++ b/buildroot/package/audit/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_AUDIT depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # strndupa() help The audit package contains the user space utilities for storing and searching the audit records generated by @@ -20,7 +19,6 @@ config BR2_PACKAGE_AUDIT http://people.redhat.com/sgrubb/audit/ -comment "audit needs a uClibc or glibc toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || BR2_TOOLCHAIN_USES_MUSL +comment "audit needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS diff --git a/buildroot/package/audit/audit.hash b/buildroot/package/audit/audit.hash index d8c11a3d1..71e7df7db 100644 --- a/buildroot/package/audit/audit.hash +++ b/buildroot/package/audit/audit.hash @@ -1,4 +1,4 @@ #Locally computed -sha256 a410694d09fc5708d980a61a5abcb9633a591364f1ecc7e97ad5daef9c898c38 audit-2.8.4.tar.gz +sha256 0e5d4103646e00f8d1981e1cd2faea7a2ae28e854c31a803e907a383c5e2ecb7 audit-2.8.5.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/buildroot/package/audit/audit.mk b/buildroot/package/audit/audit.mk index 0988f88d8..03967ee65 100644 --- a/buildroot/package/audit/audit.mk +++ b/buildroot/package/audit/audit.mk @@ -4,10 +4,12 @@ # ################################################################################ -AUDIT_VERSION = 2.8.4 +AUDIT_VERSION = 2.8.5 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) AUDIT_LICENSE_FILES = COPYING COPYING.LIB +# 0002-Add-substitue-functions-for-strndupa-rawmemchr.patch +AUDIT_AUTORECONF = YES AUDIT_INSTALL_STAGING = YES @@ -42,10 +44,6 @@ define AUDIT_INSTALL_INIT_SYSV endef define AUDIT_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/auditd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/auditd.service - $(INSTALL) -D -m 644 package/audit/audit_tmpfiles.conf \ $(TARGET_DIR)/usr/lib/tmpfiles.d/audit.conf endef diff --git a/buildroot/package/aufs/aufs.mk b/buildroot/package/aufs/aufs.mk index 55dbf942d..4e95a350a 100644 --- a/buildroot/package/aufs/aufs.mk +++ b/buildroot/package/aufs/aufs.mk @@ -13,6 +13,8 @@ AUFS_SITE = http://git.code.sf.net/p/aufs/aufs3-standalone AUFS_SITE_METHOD = git else ifeq ($(BR2_PACKAGE_AUFS_SERIES),4) AUFS_SITE = $(call github,sfjro,aufs4-standalone,$(AUFS_VERSION)) +else ifeq ($(BR2_PACKAGE_AUFS_SERIES),5) +AUFS_SITE = $(call github,sfjro,aufs5-standalone,$(AUFS_VERSION)) endif ifeq ($(BR_BUILDING):$(BR2_PACKAGE_AUFS):$(AUFS_VERSION),y:y:) diff --git a/buildroot/package/augeas/augeas.hash b/buildroot/package/augeas/augeas.hash index d69ef8577..03b71349a 100644 --- a/buildroot/package/augeas/augeas.hash +++ b/buildroot/package/augeas/augeas.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# http://download.augeas.net/augeas-1.11.0.tar.gz.sig -sha256 393ce8f4055af89cd4c20bf903eacbbd909cf427891f41b56dc2ba66243ea0b0 augeas-1.11.0.tar.gz +# http://download.augeas.net/augeas-1.12.0.tar.gz.sig +sha256 321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87 augeas-1.12.0.tar.gz sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING diff --git a/buildroot/package/augeas/augeas.mk b/buildroot/package/augeas/augeas.mk index 7897d8f49..cf369d691 100644 --- a/buildroot/package/augeas/augeas.mk +++ b/buildroot/package/augeas/augeas.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUGEAS_VERSION = 1.11.0 +AUGEAS_VERSION = 1.12.0 AUGEAS_SITE = http://download.augeas.net AUGEAS_INSTALL_STAGING = YES AUGEAS_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/aumix/aumix.hash b/buildroot/package/aumix/aumix.hash index 0463ea01a..2fbab4bda 100644 --- a/buildroot/package/aumix/aumix.hash +++ b/buildroot/package/aumix/aumix.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 d2ce43d532ef75072c8d4e7922e3bc06be6d97765a508d9ceb0d1766bbe70e29 aumix-2.9.1.tar.bz2 +sha256 d2ce43d532ef75072c8d4e7922e3bc06be6d97765a508d9ceb0d1766bbe70e29 aumix-2.9.1.tar.bz2 +sha256 1ca3e8f71b7de618968e7ea9fe47822d9e704dc476aef8544033abedec355225 COPYING diff --git a/buildroot/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch b/buildroot/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch deleted file mode 100644 index c0efeb335..000000000 --- a/buildroot/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1870301013d79be781ead2b0e62fc08f91715ca9 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 3 May 2015 23:02:34 +0200 -Subject: [PATCH] AX_TLS: fix syntax error - -The commit e012eb17b3d67f31dee477592328207437206c33 introduce -a syntax error due to an empty "else" statement. - -confifure: -if test "$ac_cv_tls" != "none"; then : -cat >>confdefs.h <<_ACEOF -_ACEOF -else - -fi - -Remove the [] on the third part of AS_IF. - -Signed-off-by: Romain Naour -(rebased against version 2017.03.21) -Signed-off-by: Bernd Kuhls ---- - m4/ax_tls.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/m4/ax_tls.m4 b/m4/ax_tls.m4 -index 809b761..2135dd2 100644 ---- a/m4/ax_tls.m4 -+++ b/m4/ax_tls.m4 -@@ -44,7 +44,7 @@ - # modified version of the Autoconf Macro, you may extend this special - # exception to the GPL to apply to your modified version as well. - --#serial 13 -+#serial 14 - - AC_DEFUN([AX_TLS], [ - AC_MSG_CHECKING([for thread local storage (TLS) class]) -@@ -70,5 +70,5 @@ AC_DEFUN([AX_TLS], [ - AS_IF([test "$ac_cv_tls" != "none"], - [AC_DEFINE_UNQUOTED([TLS],[$ac_cv_tls],[If the compiler supports a TLS storage class define it to that here]) - m4_ifnblank([$1],[$1])], -- [m4_ifnblank([$2],[$2])]) -+ m4_ifnblank([$2],[$2])) - ]) --- -1.9.3 - diff --git a/buildroot/package/autoconf-archive/autoconf-archive.hash b/buildroot/package/autoconf-archive/autoconf-archive.hash index 2c537b33a..3ef98f2f1 100644 --- a/buildroot/package/autoconf-archive/autoconf-archive.hash +++ b/buildroot/package/autoconf-archive/autoconf-archive.hash @@ -1,2 +1,4 @@ # Computed locally -sha256 386ad455f12bdeb3a7d19280441a5ab77355142349200ff11040a8d9d455d765 autoconf-archive-2017.03.21.tar.xz +sha256 17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f autoconf-archive-2019.01.06.tar.xz +sha256 e6037104443f9a7829b2aa7c5370d0789a7bda3ca65a0b904cdc0c2e285d9195 COPYING +sha256 23ed0b84fa023bfa33433b498192cd08a3bfb1f4864a8ed791a84f3eb48b2dd2 COPYING.EXCEPTION diff --git a/buildroot/package/autoconf-archive/autoconf-archive.mk b/buildroot/package/autoconf-archive/autoconf-archive.mk index 8a6d59578..3f1f0a5b3 100644 --- a/buildroot/package/autoconf-archive/autoconf-archive.mk +++ b/buildroot/package/autoconf-archive/autoconf-archive.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOCONF_ARCHIVE_VERSION = 2017.03.21 +AUTOCONF_ARCHIVE_VERSION = 2019.01.06 AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive AUTOCONF_ARCHIVE_LICENSE = GPL-3.0+ with exception diff --git a/buildroot/package/autoconf/autoconf.hash b/buildroot/package/autoconf/autoconf.hash index f35f6f8d0..f53e8979c 100644 --- a/buildroot/package/autoconf/autoconf.hash +++ b/buildroot/package/autoconf/autoconf.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature sha256 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 autoconf-2.69.tar.xz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYINGv3 +sha256 23ed0b84fa023bfa33433b498192cd08a3bfb1f4864a8ed791a84f3eb48b2dd2 COPYING.EXCEPTION diff --git a/buildroot/package/autoconf/autoconf.mk b/buildroot/package/autoconf/autoconf.mk index e5f474c72..336ac59b4 100644 --- a/buildroot/package/autoconf/autoconf.mk +++ b/buildroot/package/autoconf/autoconf.mk @@ -21,6 +21,6 @@ HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool $(eval $(host-autotools-package)) # variables used by other packages -AUTOCONF = $(HOST_DIR)/bin/autoconf -AUTOHEADER = $(HOST_DIR)/bin/autoheader -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTOCONF = $(HOST_DIR)/bin/autoconf -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTOHEADER = $(HOST_DIR)/bin/autoheader -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i diff --git a/buildroot/package/autofs/autofs.hash b/buildroot/package/autofs/autofs.hash index 1f2060bde..07432bf76 100644 --- a/buildroot/package/autofs/autofs.hash +++ b/buildroot/package/autofs/autofs.hash @@ -1,2 +1,6 @@ # From https://www.kernel.org/pub/linux/daemons/autofs/v5/sha256sums.asc -sha256 8fce30ee51ffd528fe1a4e8374ef57f43367e1f123030e175fb1b1cf15bc1722 autofs-5.1.4.tar.xz +sha256 dddee3d9b7388ce6cb7432832dfade25b07ef68ad48dcce01cf247b26a10caef autofs-5.1.6.tar.xz + +# Hash for license files +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +sha256 2ac2e352a92629e3abcdddbd3eeec64e7c2f5b58b6e819ff2c1444fb6e249fa3 COPYRIGHT diff --git a/buildroot/package/autofs/autofs.mk b/buildroot/package/autofs/autofs.mk index 0af00fa93..e9b374ec0 100644 --- a/buildroot/package/autofs/autofs.mk +++ b/buildroot/package/autofs/autofs.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOFS_VERSION = 5.1.4 +AUTOFS_VERSION = 5.1.6 AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz AUTOFS_SITE = $(BR2_KERNEL_MIRROR)/linux/daemons/autofs/v5 AUTOFS_LICENSE = GPL-2.0+ @@ -15,9 +15,9 @@ AUTOFS_DEPENDENCIES = host-flex host-bison host-pkgconf host-nfs-utils # umount and fsck programs so tell it explicitly where they will be # located on the target. AUTOFS_CONF_ENV = \ - ac_cv_path_E2FSCK=/usr/sbin/fsck.ext2 \ - ac_cv_path_E3FSCK=/usr/sbin/fsck.ext3 \ - ac_cv_path_E4FSCK=/usr/sbin/fsck.ext4 \ + ac_cv_path_E2FSCK=/sbin/fsck \ + ac_cv_path_E3FSCK=no \ + ac_cv_path_E4FSCK=no \ ac_cv_path_KRB5_CONFIG=no \ ac_cv_path_MODPROBE=/sbin/modprobe \ ac_cv_path_MOUNT=/bin/mount \ diff --git a/buildroot/package/automake/automake.mk b/buildroot/package/automake/automake.mk index 270337712..89dcaa129 100644 --- a/buildroot/package/automake/automake.mk +++ b/buildroot/package/automake/automake.mk @@ -32,4 +32,6 @@ $(eval $(host-autotools-package)) # variables used by other packages AUTOMAKE = $(HOST_DIR)/bin/automake ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal -ACLOCAL = $(HOST_DIR)/bin/aclocal -I $(ACLOCAL_DIR) +ACLOCAL = $(HOST_DIR)/bin/aclocal +ACLOCAL_PATH = $(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR) +export ACLOCAL_PATH diff --git a/buildroot/package/autossh/autossh.hash b/buildroot/package/autossh/autossh.hash index 5c6cfbc98..226003f89 100644 --- a/buildroot/package/autossh/autossh.hash +++ b/buildroot/package/autossh/autossh.hash @@ -1,6 +1,6 @@ -# From http://www.harding.motd.ca/autossh/autossh-1.4f.cksums -sha256 0172e5e1bea40c642e0ef025334be3aadd4ff3b4d62c0b177ed88a8384e2f8f2 autossh-1.4f.tgz -sha1 28189c42ab2e05448596a44adc9d62071172fe9b autossh-1.4f.tgz -md5 432ed721a71b8af4b5763b5c484f80df autossh-1.4f.tgz +# From http://www.harding.motd.ca/autossh/autossh-1.4g.cksums +sha256 5fc3cee3361ca1615af862364c480593171d0c54ec156de79fc421e31ae21277 autossh-1.4g.tgz +sha1 bd88da0e296b8d85722ee9e7c314e9319e5b2db8 autossh-1.4g.tgz +md5 2b804bc1bf6d2f2afaa526d02df7c0a2 autossh-1.4g.tgz # Locally computed -sha256 b6938db718166520533b1d56b01e1eb5f0ad508624478e674938b8f507b66d98 autossh.c +sha256 014ec5a85a8899d4ea0e0a886bb3fc4c72b4bbec6414093ba1fdac5b178c25b4 autossh.c diff --git a/buildroot/package/autossh/autossh.mk b/buildroot/package/autossh/autossh.mk index 5af8b735c..899e5cdb5 100644 --- a/buildroot/package/autossh/autossh.mk +++ b/buildroot/package/autossh/autossh.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOSSH_VERSION = 1.4f +AUTOSSH_VERSION = 1.4g AUTOSSH_SITE = http://www.harding.motd.ca/autossh AUTOSSH_SOURCE = autossh-$(AUTOSSH_VERSION).tgz AUTOSSH_LICENSE = Modified BSD diff --git a/buildroot/package/avahi/avahi.mk b/buildroot/package/avahi/avahi.mk index baffe3cb6..53021f6b6 100644 --- a/buildroot/package/avahi/avahi.mk +++ b/buildroot/package/avahi/avahi.mk @@ -198,14 +198,6 @@ endef endif define AVAHI_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/avahi-daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-daemon.service - - ln -fs ../../../../usr/lib/systemd/system/avahi-dnsconfd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-dnsconfd.service - $(INSTALL) -D -m 644 package/avahi/avahi_tmpfiles.conf \ $(TARGET_DIR)/usr/lib/tmpfiles.d/avahi.conf diff --git a/buildroot/package/avrdude/avrdude.hash b/buildroot/package/avrdude/avrdude.hash index b203d4d10..888668ae4 100644 --- a/buildroot/package/avrdude/avrdude.hash +++ b/buildroot/package/avrdude/avrdude.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 cfa97af7badc713c62306ab85d0e7a288b064bf72e698494f73cb16c5b2c659e avrdude-f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa.tar.gz +sha256 cfa97af7badc713c62306ab85d0e7a288b064bf72e698494f73cb16c5b2c659e avrdude-f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa.tar.gz +sha256 201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2 avrdude/COPYING diff --git a/buildroot/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch b/buildroot/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch new file mode 100644 index 000000000..bfa7e8a60 --- /dev/null +++ b/buildroot/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch @@ -0,0 +1,45 @@ +From 9b39a985bcd6cd34f0820f3680f145d46c0e56bd Mon Sep 17 00:00:00 2001 +From: Titouan Christophe +Date: Sun, 8 Dec 2019 01:55:59 +0100 +Subject: [PATCH] Allow avro C to be built on musl based systems. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The type `ssize_t` is defined in sys/types.h, and nowhere else +in the musl standard C library, so it should be included for the +compilation to succeed. + +This fixes several errors like: + + In file included from src/generic.c:29:0: + src/generic.c: In function ‘avro_generic_value_new’: + src/avro_generic_internal.h:63:39: + error: ‘ssize_t’ undeclared (first use in this function); + did you mean ‘size_t’? + +Signed-off-by: Titouan Christophe +[yann.morin.1998@free.fr: + - backported from upstream 9b39a98, adapted to the release tarball +] +Signed-off-by: Yann E. MORIN +--- + src/avro_generic_internal.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/avro_generic_internal.h b/src/avro_generic_internal.h +index 709403c0..9843ed65 100644 +--- a/src/avro_generic_internal.h ++++ b/src/avro_generic_internal.h +@@ -24,6 +24,8 @@ extern "C" { + #define CLOSE_EXTERN + #endif + ++#include ++ + #include "avro/generic.h" + #include "avro/schema.h" + #include "avro/value.h" +-- +2.20.1 + diff --git a/buildroot/package/avro-c/0002-CMakeLists.txt-fix-build-without-C.patch b/buildroot/package/avro-c/0002-CMakeLists.txt-fix-build-without-C.patch new file mode 100644 index 000000000..89a500c58 --- /dev/null +++ b/buildroot/package/avro-c/0002-CMakeLists.txt-fix-build-without-C.patch @@ -0,0 +1,92 @@ +From cdab7db8ad81884cfb21cc1cf94c981c59d17ef4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 30 Dec 2019 12:32:20 +0100 +Subject: [PATCH] CMakeLists.txt: fix build without C++ + +Specify that AvroC is a C project and remove tests_cpp.cpp to avoid the +following build failure if a C++ compiler is not found: + +CMake Error at CMakeLists.txt:20 (project): + The CMAKE_CXX_COMPILER: + + /home/naourr/work/instance-2/output-1/host/bin/microblazeel-buildroot-linux-uclibc-g++ + + is not a full path to an existing compiler tool. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Fixes: + - http://autobuild.buildroot.org/results/135e246aa70f28c6b9aea5fd6b0eb9c7b45ebfe7 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/apache/avro/pull/754] +--- + CMakeLists.txt | 2 +- + tests/CMakeLists.txt | 1 - + tests/test_cpp.cpp | 27 --------------------------- + 3 files changed, 1 insertion(+), 29 deletions(-) + delete mode 100644 lang/c/tests/test_cpp.cpp + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 11cbf018..b75418c3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,7 +17,7 @@ + # under the License. + # + cmake_minimum_required(VERSION 2.4) +-project(AvroC) ++project(AvroC C) + enable_testing() + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index b9e8fe1d..2e84a06a 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -81,7 +81,6 @@ add_avro_test_checkmem(test_avro_1405) + add_avro_test_checkmem(test_avro_1572) + add_avro_test(test_avro_data) # Skip memory check for datum. Deprecated and has a lot of memory issues + add_avro_test_checkmem(test_refcount) +-add_avro_test_checkmem(test_cpp test_cpp.cpp) + add_avro_test_checkmem(test_avro_1379) + add_avro_test_checkmem(test_avro_1691) + add_avro_test_checkmem(test_avro_1906) +diff --git a/lang/c/tests/test_cpp.cpp b/lang/c/tests/test_cpp.cpp +deleted file mode 100644 +index 13f98a9b..00000000 +--- a/tests/test_cpp.cpp ++++ /dev/null +@@ -1,27 +0,0 @@ +-/* +- * Licensed to the Apache Software Foundation (ASF) under one or more +- * contributor license agreements. See the NOTICE file distributed with +- * this work for additional information regarding copyright ownership. +- * The ASF licenses this file to you under the Apache License, Version 2.0 +- * (the "License"); you may not use this file except in compliance with +- * the License. You may obtain a copy of the License at +- * +- * https://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +- * implied. See the License for the specific language governing +- * permissions and limitations under the License. +- */ +- +-#include "avro.h" +- +-int main(int argc, char **argv) +-{ +- (void)argc; +- (void)argv; +- +- return 0; +-} +- +-- +2.24.0 + diff --git a/buildroot/package/avro-c/Config.in b/buildroot/package/avro-c/Config.in new file mode 100644 index 000000000..76d9123a4 --- /dev/null +++ b/buildroot/package/avro-c/Config.in @@ -0,0 +1,27 @@ +comment "avro-c needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + +config BR2_PACKAGE_AVRO_C + bool "avro-c" + depends on !BR2_STATIC_LIBS # Avro unconditionally compiles shared libs + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + select BR2_PACKAGE_JANSSON + help + Select this option to install the Avro C language bindings, + and the command line tools avroappend, avrocat, avromod and + avropipe. + + Apache Avro is a data serialization system. + Avro provides: + - Rich data structures. + - A compact, fast, binary data format. + - A container file, to store persistent data. + - Remote procedure call (RPC). + - Simple integration with dynamic languages. + - Code generation is not required to read or write data + files nor to use or implement RPC protocols. + - Code generation as an optional optimization, + only worth implementing for statically typed languages. + + http://avro.apache.org/ diff --git a/buildroot/package/avro-c/avro-c.hash b/buildroot/package/avro-c/avro-c.hash new file mode 100644 index 000000000..da74f3c05 --- /dev/null +++ b/buildroot/package/avro-c/avro-c.hash @@ -0,0 +1,5 @@ +# From https://www-eu.apache.org/dist/avro/avro-1.9.1/c/avro-c-1.9.1.tar.gz.sha512 +sha512 68b1f44f870c9b6f0b2380da9e34d91148ff4398cb300f4bdd4e3e1ad00820acd9084b73232b00d4cd4935fb992b41dc65afdafcbea14a3d87259608688df904 avro-c-1.9.1.tar.gz + +# License files +sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE diff --git a/buildroot/package/avro-c/avro-c.mk b/buildroot/package/avro-c/avro-c.mk new file mode 100644 index 000000000..a1b1931bf --- /dev/null +++ b/buildroot/package/avro-c/avro-c.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# avro-c +# +################################################################################ + +AVRO_C_VERSION = 1.9.1 +AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c +AVRO_C_LICENSE = Apache-2.0 +AVRO_C_LICENSE_FILES = LICENSE +AVRO_C_INSTALL_STAGING = YES +AVRO_C_DEPENDENCIES = host-pkgconf jansson + +ifeq ($(BR2_PACKAGE_SNAPPY),y) +AVRO_C_DEPENDENCIES += snappy +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +AVRO_C_DEPENDENCIES += zlib +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +AVRO_C_DEPENDENCIES += xz +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/axel/axel.hash b/buildroot/package/axel/axel.hash index c317fb886..9d1aecc4d 100644 --- a/buildroot/package/axel/axel.hash +++ b/buildroot/package/axel/axel.hash @@ -1 +1,2 @@ -sha256 d34094eb63eaebc989f96eabdda091dcfb28e840bb8d274a5f216775941f59e4 axel-2.16.1.tar.xz +sha256 b700b299fc8a369352a4672560ba833335142a6bfd280d5ccdc66dc2fa6bff86 axel-2.17.7.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/axel/axel.mk b/buildroot/package/axel/axel.mk index 129ea2952..b7ec2efb6 100644 --- a/buildroot/package/axel/axel.mk +++ b/buildroot/package/axel/axel.mk @@ -4,7 +4,7 @@ # ################################################################################ -AXEL_VERSION = 2.16.1 +AXEL_VERSION = 2.17.7 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+ diff --git a/buildroot/package/axfsutils/axfsutils.hash b/buildroot/package/axfsutils/axfsutils.hash index 3ef5c5876..b7a5943dd 100644 --- a/buildroot/package/axfsutils/axfsutils.hash +++ b/buildroot/package/axfsutils/axfsutils.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 7d8c0febaf6f104c2b179475ea1ee6d361688ad7fa4c98dfdf7395fcff2be685 axfsutils-384a1ea214c8cf8359faba00a12513ee7ae1a9f5.tar.gz +sha256 7d8c0febaf6f104c2b179475ea1ee6d361688ad7fa4c98dfdf7395fcff2be685 axfsutils-384a1ea214c8cf8359faba00a12513ee7ae1a9f5.tar.gz +sha256 1929a1e67d189aa3a24de76255841b33818f7f65944b6e73a1568ba575ab54d5 mkfs.axfs-legacy/COPYING diff --git a/buildroot/package/azmq/azmq.hash b/buildroot/package/azmq/azmq.hash index 35139cfae..f5d24e79c 100644 --- a/buildroot/package/azmq/azmq.hash +++ b/buildroot/package/azmq/azmq.hash @@ -1,4 +1,4 @@ # Locally calculated # https://github.com/zeromq/azmq/archive/v1.0.2.tar.gz -sha256 25fa8b07756cffae95e25a55c7ea42efe02e8cd797552201aa771dd69cfc8fbf azmq-v1.0.2.tar.gz +sha256 25fa8b07756cffae95e25a55c7ea42efe02e8cd797552201aa771dd69cfc8fbf azmq-1.0.2.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE-BOOST_1_0 diff --git a/buildroot/package/azmq/azmq.mk b/buildroot/package/azmq/azmq.mk index 9ccb407a6..918c6e1a3 100644 --- a/buildroot/package/azmq/azmq.mk +++ b/buildroot/package/azmq/azmq.mk @@ -4,8 +4,8 @@ # ################################################################################ -AZMQ_VERSION = v1.0.2 -AZMQ_SITE = $(call github,zeromq,azmq,$(AZMQ_VERSION)) +AZMQ_VERSION = 1.0.2 +AZMQ_SITE = $(call github,zeromq,azmq,v$(AZMQ_VERSION)) AZMQ_DEPENDENCIES = boost zeromq AZMQ_LICENSE = BSL-1.0 AZMQ_LICENSE_FILES = LICENSE-BOOST_1_0 diff --git a/buildroot/package/b43-fwcutter/b43-fwcutter.hash b/buildroot/package/b43-fwcutter/b43-fwcutter.hash index 3181c7696..e83a49711 100644 --- a/buildroot/package/b43-fwcutter/b43-fwcutter.hash +++ b/buildroot/package/b43-fwcutter/b43-fwcutter.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 4c6a53d1f5d76b8aa224d294bee47726b1477f35327f4e23e8cb799865e0f6eb b43-fwcutter-015.tar.bz2 +sha256 d6ea85310df6ae08e7f7e46d8b975e17fc867145ee249307413cfbe15d7121ce b43-fwcutter-019.tar.bz2 + +# Hash for license file +sha256 6af9fc424d57f29b7e59b35e52d4a91aca80304506275f2c0c076317fc6eb583 COPYING diff --git a/buildroot/package/b43-fwcutter/b43-fwcutter.mk b/buildroot/package/b43-fwcutter/b43-fwcutter.mk index 91ba3dc75..9c1e11102 100644 --- a/buildroot/package/b43-fwcutter/b43-fwcutter.mk +++ b/buildroot/package/b43-fwcutter/b43-fwcutter.mk @@ -4,7 +4,7 @@ # ################################################################################ -B43_FWCUTTER_VERSION = 015 +B43_FWCUTTER_VERSION = 019 B43_FWCUTTER_SITE = http://bues.ch/b43/fwcutter B43_FWCUTTER_SOURCE = b43-fwcutter-$(B43_FWCUTTER_VERSION).tar.bz2 B43_FWCUTTER_LICENSE = BSD-2-Clause diff --git a/buildroot/package/babeld/0001-kernel_netlink.c-don-t-include-linux-if_bridge.h.patch b/buildroot/package/babeld/0001-kernel_netlink.c-don-t-include-linux-if_bridge.h.patch deleted file mode 100644 index efadd2038..000000000 --- a/buildroot/package/babeld/0001-kernel_netlink.c-don-t-include-linux-if_bridge.h.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 723bbfd8bdb76012a3da937c7499cf3c0b111dd5 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 20 Aug 2016 11:13:56 +0200 -Subject: [PATCH] kernel_netlink.c: don't include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Including causes the inclusion of , -which defines 'struct in6_addr', also defined in , causing -a build failure with the musl C library: - -In file included from /home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/if_bridge.h:18:0, - from kernel_netlink.c:42, - from kernel.c:31: -/home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/in6.h:32:8: error: redefinition of ‘struct in6_addr’ - struct in6_addr { - ^ -In file included from kernel_netlink.c:33:0, - from kernel.c:31: -/home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:23:8: note: originally defined here - struct in6_addr { - ^ -In file included from /home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/if_bridge.h:18:0, - from kernel_netlink.c:42, - from kernel.c:31: -/home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/in6.h:49:8: error: redefinition of ‘struct sockaddr_in6’ - struct sockaddr_in6 { - ^ -In file included from kernel_netlink.c:33:0, - from kernel.c:31: -/home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:34:8: note: originally defined here - struct sockaddr_in6 { - ^ -In file included from /home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/if_bridge.h:18:0, - from kernel_netlink.c:42, - from kernel.c:31: -/home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/in6.h:59:8: error: redefinition of ‘struct ipv6_mreq’ - struct ipv6_mreq { - ^ -In file included from kernel_netlink.c:33:0, - from kernel.c:31: -/home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:42:8: note: originally defined here - struct ipv6_mreq { - ^ - -In order to address this, this patch removes the -inclusion, and instead defines BRCTL_GET_BRIDGES to the appropriate -value if it's not provided by the C library. - -Signed-off-by: Thomas Petazzoni ---- - kernel_netlink.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/kernel_netlink.c b/kernel_netlink.c -index 4eadc39..1a5b3dd 100644 ---- a/kernel_netlink.c -+++ b/kernel_netlink.c -@@ -39,10 +39,14 @@ THE SOFTWARE. - #include - #include - #include --#include - #include - #include - -+/* From */ -+#ifndef BRCTL_GET_BRIDGES -+#define BRCTL_GET_BRIDGES 1 -+#endif -+ - #if(__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 5) - #define RTA_TABLE 15 - #endif --- -2.7.4 - diff --git a/buildroot/package/babeld/babeld.hash b/buildroot/package/babeld/babeld.hash index 0ee64c4f9..510fe2bc9 100644 --- a/buildroot/package/babeld/babeld.hash +++ b/buildroot/package/babeld/babeld.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 2c955e7d4ad971da1e860e5cedbaf1dd79903468ff6488b3f67102b2a8d087b6 babeld-1.7.1.tar.gz +sha256 98070dc418c190f047b8d69eb47987df30ded8f0fca353c49427d3137ad08b87 babeld-1.8.4.tar.gz +sha256 b415c41292cedef6c97b243609e50552887c29343566c639f23282d31efd2afd LICENCE diff --git a/buildroot/package/babeld/babeld.mk b/buildroot/package/babeld/babeld.mk index d718237d9..f864b5db2 100644 --- a/buildroot/package/babeld/babeld.mk +++ b/buildroot/package/babeld/babeld.mk @@ -4,7 +4,7 @@ # ################################################################################ -BABELD_VERSION = 1.7.1 +BABELD_VERSION = 1.8.4 BABELD_SITE = http://www.pps.univ-paris-diderot.fr/~jch/software/files BABELD_LICENSE = MIT BABELD_LICENSE_FILES = LICENCE @@ -25,11 +25,6 @@ endef define BABELD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/babeld/babeld.service \ $(TARGET_DIR)/usr/lib/systemd/system/babeld.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/babeld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/babeld.service endef $(eval $(generic-package)) diff --git a/buildroot/package/bandwidthd/bandwidthd.hash b/buildroot/package/bandwidthd/bandwidthd.hash index 248f9ff96..c73584de2 100644 --- a/buildroot/package/bandwidthd/bandwidthd.hash +++ b/buildroot/package/bandwidthd/bandwidthd.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0270d0def6cc53c8d47d59a9dd093d51fbca1620adeef85c15e35a32010e26ab bandwidthd-v2.0.1-auto-r11.tar.gz +sha256 0270d0def6cc53c8d47d59a9dd093d51fbca1620adeef85c15e35a32010e26ab bandwidthd-2.0.1-auto-r11.tar.gz diff --git a/buildroot/package/bandwidthd/bandwidthd.mk b/buildroot/package/bandwidthd/bandwidthd.mk index 277349042..990d8c5d8 100644 --- a/buildroot/package/bandwidthd/bandwidthd.mk +++ b/buildroot/package/bandwidthd/bandwidthd.mk @@ -4,8 +4,8 @@ # ################################################################################ -BANDWIDTHD_VERSION = v2.0.1-auto-r11 -BANDWIDTHD_SITE = $(call github,nroach44,bandwidthd,$(BANDWIDTHD_VERSION)) +BANDWIDTHD_VERSION = 2.0.1-auto-r11 +BANDWIDTHD_SITE = $(call github,nroach44,bandwidthd,v$(BANDWIDTHD_VERSION)) # Specified as "any version of the GPL that is current as of your # download" by upstream. @@ -34,11 +34,6 @@ endif define BANDWIDTHD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/bandwidthd/bandwidthd.service \ $(TARGET_DIR)/usr/lib/systemd/system/bandwidthd.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf /usr/lib/systemd/system/bandwidthd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/bandwidthd.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/bash-completion/0001-completions-Makefile.am-Use-install-data-hook-not-in.patch b/buildroot/package/bash-completion/0001-completions-Makefile.am-Use-install-data-hook-not-in.patch deleted file mode 100644 index 4d01eb6ee..000000000 --- a/buildroot/package/bash-completion/0001-completions-Makefile.am-Use-install-data-hook-not-in.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f9a1dfe7a3d0f35474b3f4ded05e3d97be5017bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Fri, 25 May 2018 17:38:59 +0200 -Subject: [PATCH] completions/Makefile.am: Use install-data-hook, not - install-data-local - --hook is run after the main rule, while -local might end up before. -https://www.gnu.org/software/automake/manual/html_node/Extending.html#index-hook-targets - -Closes #212 - -[backported from ee6b37ad7ff5b309cbb9b886a871252abd9398fa] -Signed-off-by: Romain Naour ---- - completions/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/completions/Makefile.am b/completions/Makefile.am -index e442a9e..5c49796 100644 ---- a/completions/Makefile.am -+++ b/completions/Makefile.am -@@ -993,8 +993,8 @@ symlinks: $(targetdir) $(DATA) - all-local: targetdir = . - all-local: symlinks - --install-data-local: targetdir = $(DESTDIR)$(bashcompdir) --install-data-local: symlinks -+install-data-hook: targetdir = $(DESTDIR)$(bashcompdir) -+install-data-hook: symlinks - - check-local: - ret=0 --- -2.7.4 - diff --git a/buildroot/package/bash-completion/bash-completion.hash b/buildroot/package/bash-completion/bash-completion.hash index 2c4cf6757..fa98272be 100644 --- a/buildroot/package/bash-completion/bash-completion.hash +++ b/buildroot/package/bash-completion/bash-completion.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c01f5570f5698a0dda8dc9cfb2a83744daa1ec54758373a6e349bd903375f54d bash-completion-2.8.tar.xz +sha256 123c17998e34b937ce57bb1b111cd817bc369309e9a8047c0bcf06ead4a3ec92 bash-completion-2.10.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/bash-completion/bash-completion.mk b/buildroot/package/bash-completion/bash-completion.mk index c43fb15cd..4b86e9f11 100644 --- a/buildroot/package/bash-completion/bash-completion.mk +++ b/buildroot/package/bash-completion/bash-completion.mk @@ -4,15 +4,12 @@ # ################################################################################ -BASH_COMPLETION_VERSION = 2.8 +BASH_COMPLETION_VERSION = 2.10 BASH_COMPLETION_SITE = https://github.com/scop/bash-completion/releases/download/$(BASH_COMPLETION_VERSION) BASH_COMPLETION_SOURCE = bash-completion-$(BASH_COMPLETION_VERSION).tar.xz BASH_COMPLETION_LICENSE = GPL-2.0 BASH_COMPLETION_LICENSE_FILES = COPYING -# 0001-completions-Makefile.am-Use-install-data-hook-not-in.patch -BASH_COMPLETION_AUTORECONF = YES - # Install bash-completion.pc file BASH_COMPLETION_INSTALL_STAGING = YES diff --git a/buildroot/package/bash/0001-bash44-019.patch b/buildroot/package/bash/0001-bash44-019.patch deleted file mode 100644 index b3d2f331b..000000000 --- a/buildroot/package/bash/0001-bash44-019.patch +++ /dev/null @@ -1,54 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-019 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-019 - -Bug-Reported-by: Kieran Grant -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2018-02/msg00002.html - -Bug-Description: - -With certain values for PS1, especially those that wrap onto three or more -lines, readline will miscalculate the number of invisible characters, -leading to crashes and core dumps. - -Patch (apply with `patch -p0'): - -*** bash-4.4.18/lib/readline/display.c 2016-07-28 14:49:33.000000000 -0400 ---- b/lib/readline/display.c 2018-02-03 19:19:35.000000000 -0500 -*************** -*** 772,776 **** - wadjust = (newlines == 0) - ? prompt_invis_chars_first_line -! : ((newlines == prompt_lines_estimate) ? wrap_offset : prompt_invis_chars_first_line); - - /* fix from Darin Johnson for prompt string with ---- b/788,794 ---- - wadjust = (newlines == 0) - ? prompt_invis_chars_first_line -! : ((newlines == prompt_lines_estimate) -! ? (wrap_offset - prompt_invis_chars_first_line) -! : 0); - - /* fix from Darin Johnson for prompt string with -*** 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 18 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 19 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0001-bash50-001.patch b/buildroot/package/bash/0001-bash50-001.patch new file mode 100644 index 000000000..90e89ce56 --- /dev/null +++ b/buildroot/package/bash/0001-bash50-001.patch @@ -0,0 +1,170 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-001 + +Signed-off-by: Pascal de Bruijn + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-001 + +Bug-Reported-by: axel@freakout.de +Bug-Reference-ID: <201901082050.x08KoShS006731@bongo.freakout.de> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2019-01/msg00079.html + +Bug-Description: + +Under certain circumstances, the glob expansion code did not remove +backslashes escaping characters in directory names (or portions of a +pattern preceding a slash). + +Patch (apply with `patch -p0'): + +*** ../bash-5.0/bashline.c 2018-11-27 13:20:16.000000000 -0500 +--- b/bashline.c 2019-01-16 16:06:03.000000000 -0500 +*************** +*** 232,235 **** +--- 232,236 ---- + static int bash_possible_command_completions __P((int, int)); + ++ static int completion_glob_pattern __P((char *)); + static char *glob_complete_word __P((const char *, int)); + static int bash_glob_completion_internal __P((int)); +*************** +*** 1742,1746 **** + /* This could be a globbing pattern, so try to expand it using pathname + expansion. */ +! if (!matches && glob_pattern_p (text)) + { + matches = rl_completion_matches (text, glob_complete_word); +--- 1743,1747 ---- + /* This could be a globbing pattern, so try to expand it using pathname + expansion. */ +! if (!matches && completion_glob_pattern ((char *)text)) + { + matches = rl_completion_matches (text, glob_complete_word); +*************** +*** 1851,1855 **** + } + +! globpat = glob_pattern_p (hint_text); + + /* If this is an absolute program name, do not check it against +--- 1852,1856 ---- + } + +! globpat = completion_glob_pattern ((char *)hint_text); + + /* If this is an absolute program name, do not check it against +*************** +*** 3714,3717 **** +--- 3715,3773 ---- + } + ++ static int ++ completion_glob_pattern (string) ++ char *string; ++ { ++ register int c; ++ char *send; ++ int open; ++ ++ DECLARE_MBSTATE; ++ ++ open = 0; ++ send = string + strlen (string); ++ ++ while (c = *string++) ++ { ++ switch (c) ++ { ++ case '?': ++ case '*': ++ return (1); ++ ++ case '[': ++ open++; ++ continue; ++ ++ case ']': ++ if (open) ++ return (1); ++ continue; ++ ++ case '+': ++ case '@': ++ case '!': ++ if (*string == '(') /*)*/ ++ return (1); ++ continue; ++ ++ case '\\': ++ if (*string == 0) ++ return (0); ++ } ++ ++ /* Advance one fewer byte than an entire multibyte character to ++ account for the auto-increment in the loop above. */ ++ #ifdef HANDLE_MULTIBYTE ++ string--; ++ ADVANCE_CHAR_P (string, send - string); ++ string++; ++ #else ++ ADVANCE_CHAR_P (string, send - string); ++ #endif ++ } ++ return (0); ++ } ++ + static char *globtext; + static char *globorig; +*************** +*** 3878,3882 **** + } + +! if (t && glob_pattern_p (t) == 0) + rl_explicit_arg = 1; /* XXX - force glob_complete_word to append `*' */ + FREE (t); +--- 3934,3938 ---- + } + +! if (t && completion_glob_pattern (t) == 0) + rl_explicit_arg = 1; /* XXX - force glob_complete_word to append `*' */ + FREE (t); +*** ../bash-5.0/lib/glob/glob_loop.c 2018-12-31 13:35:15.000000000 -0500 +--- b/lib/glob/glob_loop.c 2019-01-09 09:44:36.000000000 -0500 +*************** +*** 55,59 **** + + case L('\\'): +- #if 0 + /* Don't let the pattern end in a backslash (GMATCH returns no match + if the pattern ends in a backslash anyway), but otherwise return 1, +--- 55,58 ---- +*************** +*** 61,69 **** + and it can be removed. */ + return (*p != L('\0')); +- #else +- /* The pattern may not end with a backslash. */ +- if (*p++ == L('\0')) +- return 0; +- #endif + } + +--- 60,63 ---- +*** ../bash-5.0/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/buildroot/package/bash/0002-bash44-020.patch b/buildroot/package/bash/0002-bash44-020.patch deleted file mode 100644 index 20f3abb58..000000000 --- a/buildroot/package/bash/0002-bash44-020.patch +++ /dev/null @@ -1,181 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-020 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-020 - -Bug-Reported-by: Graham Northup -Bug-Reference-ID: <537530c3-61f0-349b-9de6-fa4e2487f428@clarkson.edu> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2017-02/msg00025.html - -Bug-Description: - -In circumstances involving long-running scripts that create and reap many -processes, it is possible for the hash table bash uses to store exit -statuses from asynchronous processes to develop loops. This patch fixes -the loop causes and adds code to detect any future loops. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/jobs.c 2016-11-11 13:42:55.000000000 -0500 ---- b/jobs.c 2017-02-22 15:16:28.000000000 -0500 -*************** -*** 813,818 **** - struct pidstat *ps; - -! bucket = pshash_getbucket (pid); -! psi = bgp_getindex (); - ps = &bgpids.storage[psi]; - ---- b/796,815 ---- - struct pidstat *ps; - -! /* bucket == existing chain of pids hashing to same value -! psi = where were going to put this pid/status */ -! -! bucket = pshash_getbucket (pid); /* index into pidstat_table */ -! psi = bgp_getindex (); /* bgpids.head, index into storage */ -! -! /* XXX - what if psi == *bucket? */ -! if (psi == *bucket) -! { -! #ifdef DEBUG -! internal_warning ("hashed pid %d (pid %d) collides with bgpids.head, skipping", psi, pid); -! #endif -! bgpids.storage[psi].pid = NO_PID; /* make sure */ -! psi = bgp_getindex (); /* skip to next one */ -! } -! - ps = &bgpids.storage[psi]; - -*************** -*** 842,845 **** ---- b/839,843 ---- - { - struct pidstat *ps; -+ ps_index_t *bucket; - - ps = &bgpids.storage[psi]; -*************** -*** 847,856 **** - return; - -! if (ps->bucket_next != NO_PID) - bgpids.storage[ps->bucket_next].bucket_prev = ps->bucket_prev; -! if (ps->bucket_prev != NO_PID) - bgpids.storage[ps->bucket_prev].bucket_next = ps->bucket_next; - else -! *(pshash_getbucket (ps->pid)) = ps->bucket_next; - } - ---- b/845,861 ---- - return; - -! if (ps->bucket_next != NO_PIDSTAT) - bgpids.storage[ps->bucket_next].bucket_prev = ps->bucket_prev; -! if (ps->bucket_prev != NO_PIDSTAT) - bgpids.storage[ps->bucket_prev].bucket_next = ps->bucket_next; - else -! { -! bucket = pshash_getbucket (ps->pid); -! *bucket = ps->bucket_next; /* deleting chain head in hash table */ -! } -! -! /* clear out this cell, just in case */ -! ps->pid = NO_PID; -! ps->bucket_next = ps->bucket_prev = NO_PIDSTAT; - } - -*************** -*** 859,863 **** - pid_t pid; - { -! ps_index_t psi; - - if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) ---- b/864,868 ---- - pid_t pid; - { -! ps_index_t psi, orig_psi; - - if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) -*************** -*** 865,871 **** - - /* Search chain using hash to find bucket in pidstat_table */ -! for (psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) -! if (bgpids.storage[psi].pid == pid) -! break; - - if (psi == NO_PIDSTAT) ---- b/870,883 ---- - - /* Search chain using hash to find bucket in pidstat_table */ -! for (orig_psi = psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) -! { -! if (bgpids.storage[psi].pid == pid) -! break; -! if (orig_psi == bgpids.storage[psi].bucket_next) /* catch reported bug */ -! { -! internal_warning ("bgp_delete: LOOP: psi (%d) == storage[psi].bucket_next", psi); -! return 0; -! } -! } - - if (psi == NO_PIDSTAT) -*************** -*** 905,909 **** - pid_t pid; - { -! ps_index_t psi; - - if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) ---- b/917,921 ---- - pid_t pid; - { -! ps_index_t psi, orig_psi; - - if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) -*************** -*** 911,917 **** - - /* Search chain using hash to find bucket in pidstat_table */ -! for (psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) -! if (bgpids.storage[psi].pid == pid) -! return (bgpids.storage[psi].status); - - return -1; ---- b/923,936 ---- - - /* Search chain using hash to find bucket in pidstat_table */ -! for (orig_psi = psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) -! { -! if (bgpids.storage[psi].pid == pid) -! return (bgpids.storage[psi].status); -! if (orig_psi == bgpids.storage[psi].bucket_next) /* catch reported bug */ -! { -! internal_warning ("bgp_search: LOOP: psi (%d) == storage[psi].bucket_next", psi); -! return -1; -! } -! } - - return -1; -*** 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 19 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 20 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0002-bash50-002.patch b/buildroot/package/bash/0002-bash50-002.patch new file mode 100644 index 000000000..60d0a76f9 --- /dev/null +++ b/buildroot/package/bash/0002-bash50-002.patch @@ -0,0 +1,117 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-002 + +Signed-off-by: Pascal de Bruijn + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-002 + +Bug-Reported-by: Ante Peric +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2019-01/msg00095.html + +Bug-Description: + +When an alias value ends with an unquoted literal tab (not part of a quoted +string or comment), alias expansion cannot correctly detect the end of the +alias value after expanding it. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0/parser.h 2018-12-28 19:11:18.000000000 -0500 +--- b/parser.h 2019-01-11 15:13:03.000000000 -0500 +*************** +*** 48,51 **** +--- 48,52 ---- + #define PST_REDIRLIST 0x080000 /* parsing a list of redirections preceding a simple command name */ + #define PST_COMMENT 0x100000 /* parsing a shell comment; used by aliases */ ++ #define PST_ENDALIAS 0x200000 /* just finished expanding and consuming an alias */ + + /* Definition of the delimiter stack. Needed by parse.y and bashhist.c. */ +*** ../bash-5.0/parse.y 2019-01-02 13:57:34.000000000 -0500 +--- b/parse.y 2019-01-14 08:23:31.000000000 -0500 +*************** +*** 2558,2567 **** + pushed_string_list->flags != PSH_DPAREN && + (parser_state & PST_COMMENT) == 0 && + shell_input_line_index > 0 && +! shell_input_line[shell_input_line_index-1] != ' ' && + shell_input_line[shell_input_line_index-1] != '\n' && + shellmeta (shell_input_line[shell_input_line_index-1]) == 0 && + (current_delimiter (dstack) != '\'' && current_delimiter (dstack) != '"')) + { + return ' '; /* END_ALIAS */ + } +--- 2558,2569 ---- + pushed_string_list->flags != PSH_DPAREN && + (parser_state & PST_COMMENT) == 0 && ++ (parser_state & PST_ENDALIAS) == 0 && /* only once */ + shell_input_line_index > 0 && +! shellblank (shell_input_line[shell_input_line_index-1]) == 0 && + shell_input_line[shell_input_line_index-1] != '\n' && + shellmeta (shell_input_line[shell_input_line_index-1]) == 0 && + (current_delimiter (dstack) != '\'' && current_delimiter (dstack) != '"')) + { ++ parser_state |= PST_ENDALIAS; + return ' '; /* END_ALIAS */ + } +*************** +*** 2572,2575 **** +--- 2574,2578 ---- + if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE) + { ++ parser_state &= ~PST_ENDALIAS; + pop_string (); + uc = shell_input_line[shell_input_line_index]; +*** ../bash-5.0/y.tab.c 2019-01-02 13:57:43.000000000 -0500 +--- b/y.tab.c 2019-01-14 08:39:23.000000000 -0500 +*************** +*** 4874,4883 **** + pushed_string_list->flags != PSH_DPAREN && + (parser_state & PST_COMMENT) == 0 && + shell_input_line_index > 0 && +! shell_input_line[shell_input_line_index-1] != ' ' && + shell_input_line[shell_input_line_index-1] != '\n' && + shellmeta (shell_input_line[shell_input_line_index-1]) == 0 && + (current_delimiter (dstack) != '\'' && current_delimiter (dstack) != '"')) + { + return ' '; /* END_ALIAS */ + } +--- 4874,4885 ---- + pushed_string_list->flags != PSH_DPAREN && + (parser_state & PST_COMMENT) == 0 && ++ (parser_state & PST_ENDALIAS) == 0 && /* only once */ + shell_input_line_index > 0 && +! shellblank (shell_input_line[shell_input_line_index-1]) == 0 && + shell_input_line[shell_input_line_index-1] != '\n' && + shellmeta (shell_input_line[shell_input_line_index-1]) == 0 && + (current_delimiter (dstack) != '\'' && current_delimiter (dstack) != '"')) + { ++ parser_state |= PST_ENDALIAS; + return ' '; /* END_ALIAS */ + } +*************** +*** 4888,4891 **** +--- 4890,4894 ---- + if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE) + { ++ parser_state &= ~PST_ENDALIAS; + pop_string (); + uc = shell_input_line[shell_input_line_index]; +*** ../bash-5.0/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/buildroot/package/bash/0003-bash44-021.patch b/buildroot/package/bash/0003-bash44-021.patch deleted file mode 100644 index 52f3b75ea..000000000 --- a/buildroot/package/bash/0003-bash44-021.patch +++ /dev/null @@ -1,61 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-021 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-021 - -Bug-Reported-by: werner@suse.de -Bug-Reference-ID: <201803281402.w2SE2VOa000476@noether.suse.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2018-03/msg00196.html - -Bug-Description: - -A SIGINT received inside a SIGINT trap handler can possibly cause the -shell to loop. - -Patch (apply with `patch -p0'): - -*** bash-20180329/jobs.c 2018-02-11 18:07:22.000000000 -0500 ---- b/jobs.c 2018-04-02 14:24:21.000000000 -0400 -*************** -*** 2690,2694 **** - if (job_control == 0 || (subshell_environment&SUBSHELL_COMSUB)) - { -! old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler); - waiting_for_child = 0; - if (old_sigint_handler == SIG_IGN) ---- b/2690,2704 ---- - if (job_control == 0 || (subshell_environment&SUBSHELL_COMSUB)) - { -! SigHandler *temp_sigint_handler; -! -! temp_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler); -! if (temp_sigint_handler == wait_sigint_handler) -! { -! #if defined (DEBUG) -! internal_warning ("wait_for: recursively setting old_sigint_handler to wait_sigint_handler: running_trap = %d", running_trap); -! #endif -! } -! else -! old_sigint_handler = temp_sigint_handler; - waiting_for_child = 0; - if (old_sigint_handler == SIG_IGN) -*** 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 20 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 21 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0003-bash50-003.patch b/buildroot/package/bash/0003-bash50-003.patch new file mode 100644 index 000000000..12edb16a2 --- /dev/null +++ b/buildroot/package/bash/0003-bash50-003.patch @@ -0,0 +1,243 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-003 + +Signed-off-by: Pascal de Bruijn + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-003 + +Bug-Reported-by: Andrew Church +Bug-Reference-ID: <5c534aa2.04371@msgid.achurch.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2019-01/msg00276.html + +Bug-Description: + +There are several incompatibilities in how bash-5.0 processes pathname +expansion (globbing) of filename arguments that have backslashes in the +directory portion. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/lib/glob/glob_loop.c 2019-01-16 16:13:21.000000000 -0500 +--- b/lib/glob/glob_loop.c 2019-02-01 09:45:11.000000000 -0500 +*************** +*** 27,34 **** + register const GCHAR *p; + register GCHAR c; +! int bopen; + + p = pattern; +! bopen = 0; + + while ((c = *p++) != L('\0')) +--- 27,34 ---- + register const GCHAR *p; + register GCHAR c; +! int bopen, bsquote; + + p = pattern; +! bopen = bsquote = 0; + + while ((c = *p++) != L('\0')) +*************** +*** 56,66 **** + case L('\\'): + /* Don't let the pattern end in a backslash (GMATCH returns no match +! if the pattern ends in a backslash anyway), but otherwise return 1, +! since the matching engine uses backslash as an escape character +! and it can be removed. */ +! return (*p != L('\0')); + } + +! return 0; + } + +--- 56,75 ---- + case L('\\'): + /* Don't let the pattern end in a backslash (GMATCH returns no match +! if the pattern ends in a backslash anyway), but otherwise note that +! we have seen this, since the matching engine uses backslash as an +! escape character and it can be removed. We return 2 later if we +! have seen only backslash-escaped characters, so interested callers +! know they can shortcut and just dequote the pathname. */ +! if (*p != L('\0')) +! { +! p++; +! bsquote = 1; +! continue; +! } +! else /* (*p == L('\0')) */ +! return 0; + } + +! return bsquote ? 2 : 0; + } + +*** ../bash-5.0-patched/lib/glob/glob.h 2013-10-28 14:46:12.000000000 -0400 +--- b/lib/glob/glob.h 2019-03-07 11:06:47.000000000 -0500 +*************** +*** 31,34 **** +--- 31,35 ---- + #define GX_ADDCURDIR 0x200 /* internal -- add passed directory name */ + #define GX_GLOBSTAR 0x400 /* turn on special handling of ** */ ++ #define GX_RECURSE 0x800 /* internal -- glob_filename called recursively */ + + extern int glob_pattern_p __P((const char *)); +*** ../bash-5.0-patched/lib/glob/glob.c 2018-09-20 10:53:23.000000000 -0400 +--- b/lib/glob/glob.c 2019-03-07 14:23:43.000000000 -0500 +*************** +*** 1062,1066 **** + unsigned int directory_len; + int free_dirname; /* flag */ +! int dflags; + + result = (char **) malloc (sizeof (char *)); +--- 1078,1082 ---- + unsigned int directory_len; + int free_dirname; /* flag */ +! int dflags, hasglob; + + result = (char **) malloc (sizeof (char *)); +*************** +*** 1111,1117 **** + } + + /* If directory_name contains globbing characters, then we +! have to expand the previous levels. Just recurse. */ +! if (directory_len > 0 && glob_pattern_p (directory_name)) + { + char **directories, *d, *p; +--- 1127,1136 ---- + } + ++ hasglob = 0; + /* If directory_name contains globbing characters, then we +! have to expand the previous levels. Just recurse. +! If glob_pattern_p returns != [0,1] we have a pattern that has backslash +! quotes but no unquoted glob pattern characters. We dequote it below. */ +! if (directory_len > 0 && (hasglob = glob_pattern_p (directory_name)) == 1) + { + char **directories, *d, *p; +*************** +*** 1176,1180 **** + d[directory_len - 1] = '\0'; + +! directories = glob_filename (d, dflags); + + if (free_dirname) +--- 1195,1199 ---- + d[directory_len - 1] = '\0'; + +! directories = glob_filename (d, dflags|GX_RECURSE); + + if (free_dirname) +*************** +*** 1333,1336 **** +--- 1352,1369 ---- + return (NULL); + } ++ /* If we have a directory name with quoted characters, and we are ++ being called recursively to glob the directory portion of a pathname, ++ we need to dequote the directory name before returning it so the ++ caller can read the directory */ ++ if (directory_len > 0 && hasglob == 2 && (flags & GX_RECURSE) != 0) ++ { ++ dequote_pathname (directory_name); ++ directory_len = strlen (directory_name); ++ } ++ ++ /* We could check whether or not the dequoted directory_name is a ++ directory and return it here, returning the original directory_name ++ if not, but we don't do that yet. I'm not sure it matters. */ ++ + /* Handle GX_MARKDIRS here. */ + result[0] = (char *) malloc (directory_len + 1); +*** ../bash-5.0-patched/pathexp.c 2018-04-29 17:44:48.000000000 -0400 +--- b/pathexp.c 2019-01-31 20:19:41.000000000 -0500 +*************** +*** 66,74 **** + register int c; + char *send; +! int open; + + DECLARE_MBSTATE; + +! open = 0; + send = string + strlen (string); + +--- 66,74 ---- + register int c; + char *send; +! int open, bsquote; + + DECLARE_MBSTATE; + +! open = bsquote = 0; + send = string + strlen (string); + +*************** +*** 101,105 **** + globbing. */ + case '\\': +! return (*string != 0); + + case CTLESC: +--- 101,112 ---- + globbing. */ + case '\\': +! if (*string != '\0' && *string != '/') +! { +! bsquote = 1; +! string++; +! continue; +! } +! else if (*string == 0) +! return (0); + + case CTLESC: +*************** +*** 118,122 **** + #endif + } +! return (0); + } + +--- 125,130 ---- + #endif + } +! +! return (bsquote ? 2 : 0); + } + +*** ../bash-5.0-patched/bashline.c 2019-01-16 16:13:21.000000000 -0500 +--- b/bashline.c 2019-02-22 09:29:08.000000000 -0500 +*************** +*** 3753,3757 **** + + case '\\': +! if (*string == 0) + return (0); + } +--- 3766,3770 ---- + + case '\\': +! if (*string++ == 0) + return (0); + } +*** ../bash-5.0/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/buildroot/package/bash/0004-bash44-022.patch b/buildroot/package/bash/0004-bash44-022.patch deleted file mode 100644 index 0db270a17..000000000 --- a/buildroot/package/bash/0004-bash44-022.patch +++ /dev/null @@ -1,65 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-022 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-022 - -Bug-Reported-by: Nuzhna Pomoshch -Bug-Reference-ID: <1317167476.1492079.1495999776464@mail.yahoo.com> -Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2017-05/msg00005.html - -Bug-Description: - -There are cases where a failing readline command (e.g., delete-char at the end -of a line) can cause a multi-character key sequence to `back up' and attempt -to re-read some of the characters in the sequence. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/lib/readline/readline.c 2016-04-20 15:53:52.000000000 -0400 ---- b/lib/readline/readline.c 2018-05-26 17:19:00.000000000 -0400 -*************** -*** 1058,1062 **** - r = _rl_dispatch (ANYOTHERKEY, m); - } -! else if (r && map[ANYOTHERKEY].function) - { - /* We didn't match (r is probably -1), so return something to ---- b/1056,1060 ---- - r = _rl_dispatch (ANYOTHERKEY, m); - } -! else if (r < 0 && map[ANYOTHERKEY].function) - { - /* We didn't match (r is probably -1), so return something to -*************** -*** 1070,1074 **** - return -2; - } -! else if (r && got_subseq) - { - /* OK, back up the chain. */ ---- b/1068,1072 ---- - return -2; - } -! else if (r < 0 && got_subseq) /* XXX */ - { - /* OK, back up the chain. */ -*** 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 21 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 22 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0004-bash50-004.patch b/buildroot/package/bash/0004-bash50-004.patch new file mode 100644 index 000000000..b27358609 --- /dev/null +++ b/buildroot/package/bash/0004-bash50-004.patch @@ -0,0 +1,57 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-004 + +Signed-off-by: Pascal de Bruijn + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-004 + +Bug-Reported-by: Daniel Kahn Gillmor +Bug-Reference-ID: <87lg0g8aiw.fsf@fifthhorseman.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2019-04/msg00076.html + +Bug-Description: + +In bash-5.0, the `wait' builtin without arguments waits for all children of the +shell. This includes children it `inherited' at shell invocation time. This +patch modifies the behavior to not wait for these inherited children, some +of which might be long-lived. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/jobs.c 2018-12-06 11:44:34.000000000 -0500 +--- b/jobs.c 2019-04-12 15:15:10.000000000 -0400 +*************** +*** 2489,2496 **** + wait_procsubs (); + reap_procsubs (); +! #if 1 + /* We don't want to wait indefinitely if we have stopped children. */ +- /* XXX - should add a loop that goes through the list of process +- substitutions and waits for each proc in turn before this code. */ + if (any_stopped == 0) + { +--- 2490,2495 ---- + wait_procsubs (); + reap_procsubs (); +! #if 0 + /* We don't want to wait indefinitely if we have stopped children. */ + if (any_stopped == 0) + { +*** ../bash-5.0/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/buildroot/package/bash/0005-bash44-023.patch b/buildroot/package/bash/0005-bash44-023.patch deleted file mode 100644 index 05b18902a..000000000 --- a/buildroot/package/bash/0005-bash44-023.patch +++ /dev/null @@ -1,56 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-023 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-023 - -Bug-Reported-by: Martijn Dekker -Bug-Reference-ID: <5326d6b9-2625-1d32-3e6e-ad1d15462c09@inlv.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00041.html - -Bug-Description: - -When sourcing a file from an interactive shell, setting the SIGINT handler -to the default and typing ^C will cause the shell to exit. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/builtins/trap.def 2016-01-25 13:32:38.000000000 -0500 ---- b/builtins/trap.def 2016-11-06 12:04:35.000000000 -0500 -*************** -*** 99,102 **** ---- b/99,103 ---- - - extern int posixly_correct, subshell_environment; -+ extern int sourcelevel, running_trap; - - int -*************** -*** 213,216 **** ---- b/214,220 ---- - if (interactive) - set_signal_handler (SIGINT, sigint_sighandler); -+ /* special cases for interactive == 0 */ -+ else if (interactive_shell && (sourcelevel||running_trap)) -+ set_signal_handler (SIGINT, sigint_sighandler); - else - set_signal_handler (SIGINT, termsig_sighandler); -*** 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 22 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 23 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0005-bash50-005.patch b/buildroot/package/bash/0005-bash50-005.patch new file mode 100644 index 000000000..df1772f9b --- /dev/null +++ b/buildroot/package/bash/0005-bash50-005.patch @@ -0,0 +1,114 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-005 + +Signed-off-by: Pascal de Bruijn + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-005 + +Bug-Reported-by: Brad Spencer +Bug-Reference-ID: <1b993ff2-ce4f-662a-6be4-393457362e47@blackberry.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2019-01/msg00250.html + +Bug-Description: + +In certain cases, bash optimizes out a fork() call too early and prevents +traps from running. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/command.h 2018-07-20 21:16:31.000000000 -0400 +--- b/command.h 2019-02-20 11:09:36.000000000 -0500 +*************** +*** 187,190 **** +--- 188,192 ---- + #define CMD_LASTPIPE 0x2000 + #define CMD_STDPATH 0x4000 /* use standard path for command lookup */ ++ #define CMD_TRY_OPTIMIZING 0x8000 /* try to optimize this simple command */ + + /* What a command looks like. */ +*** ../bash-5.0-patched/builtins/evalstring.c 2018-12-26 11:19:21.000000000 -0500 +--- b/builtins/evalstring.c 2019-01-29 14:15:19.000000000 -0500 +*************** +*** 101,104 **** +--- 101,113 ---- + } + ++ int ++ can_optimize_connection (command) ++ COMMAND *command; ++ { ++ return (*bash_input.location.string == '\0' && ++ (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') && ++ command->value.Connection->second->type == cm_simple); ++ } ++ + void + optimize_fork (command) +*************** +*** 106,110 **** + { + if (command->type == cm_connection && +! (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR) && + should_suppress_fork (command->value.Connection->second)) + { +--- 115,120 ---- + { + if (command->type == cm_connection && +! (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') && +! (command->value.Connection->second->flags & CMD_TRY_OPTIMIZING) && + should_suppress_fork (command->value.Connection->second)) + { +*************** +*** 413,418 **** + command->value.Simple->flags |= CMD_NO_FORK; + } +! else if (command->type == cm_connection) +! optimize_fork (command); + #endif /* ONESHOT */ + +--- 423,438 ---- + command->value.Simple->flags |= CMD_NO_FORK; + } +! +! /* Can't optimize forks out here execept for simple commands. +! This knows that the parser sets up commands as left-side heavy +! (&& and || are left-associative) and after the single parse, +! if we are at the end of the command string, the last in a +! series of connection commands is +! command->value.Connection->second. */ +! else if (command->type == cm_connection && can_optimize_connection (command)) +! { +! command->value.Connection->second->flags |= CMD_TRY_OPTIMIZING; +! command->value.Connection->second->value.Simple->flags |= CMD_TRY_OPTIMIZING; +! } + #endif /* ONESHOT */ + +*** ../bash-5.0-patched/execute_cmd.c 2018-12-05 09:05:14.000000000 -0500 +--- b/execute_cmd.c 2019-01-25 15:59:00.000000000 -0500 +*************** +*** 2768,2771 **** +--- 2768,2773 ---- + (exec_result != EXECUTION_SUCCESS))) + { ++ optimize_fork (command); ++ + second = command->value.Connection->second; + if (ignore_return && second) +*** ../bash-5.0/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/buildroot/package/bash/0006-bash50-006.patch b/buildroot/package/bash/0006-bash50-006.patch new file mode 100644 index 000000000..e447989d0 --- /dev/null +++ b/buildroot/package/bash/0006-bash50-006.patch @@ -0,0 +1,51 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-006 + +Signed-off-by: Pascal de Bruijn + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-006 + +Bug-Reported-by: Tomas Mozes +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2019-03/msg00037.html + +Bug-Description: + +Bash-5.0 did not build successfully if SYSLOG_HISTORY was defined without +also defining SYSLOG_SHOPT. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/builtins/shopt.def 2018-10-05 14:49:02.000000000 -0400 +--- b/builtins/shopt.def 2019-01-23 09:55:22.000000000 -0500 +*************** +*** 123,127 **** + #endif + +! #if defined (SYSLOG_HISTORY) && defined (SYSLOG_SHOPT) + extern int syslog_history; + #endif +--- 123,127 ---- + #endif + +! #if defined (SYSLOG_HISTORY) + extern int syslog_history; + #endif +*** ../bash-5.0/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_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0007-bash50-007.patch b/buildroot/package/bash/0007-bash50-007.patch new file mode 100644 index 000000000..164dfcc9e --- /dev/null +++ b/buildroot/package/bash/0007-bash50-007.patch @@ -0,0 +1,66 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-007 + +Signed-off-by: Pascal de Bruijn + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-007 + +Bug-Reported-by: Grisha Levit +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2019-02/msg00067.html + +Bug-Description: + +Running `exec' when job control was disabled, even temporarily, but after it +had been initialized, could leave the terminal in the wrong process group for +the executed process. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/jobs.c 2018-12-06 11:44:34.000000000 -0500 +--- b/jobs.c 2019-04-12 15:15:10.000000000 -0400 +*************** +*** 4838,4850 **** + { + if (job_control) +! { +! terminate_stopped_jobs (); + +! if (original_pgrp >= 0) +! give_terminal_to (original_pgrp, 1); +! } + +! if (original_pgrp >= 0) +! setpgid (0, original_pgrp); + } + +--- 4838,4848 ---- + { + if (job_control) +! terminate_stopped_jobs (); + +! if (original_pgrp >= 0 && terminal_pgrp != original_pgrp) +! give_terminal_to (original_pgrp, 1); + +! if (original_pgrp >= 0 && setpgid (0, original_pgrp) == 0) +! shell_pgrp = original_pgrp; + } + +*** ../bash-5.0/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_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0008-bash50-008.patch b/buildroot/package/bash/0008-bash50-008.patch new file mode 100644 index 000000000..b571c9233 --- /dev/null +++ b/buildroot/package/bash/0008-bash50-008.patch @@ -0,0 +1,72 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-008 + +Signed-off-by: Pascal de Bruijn + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-008 + +Bug-Reported-by: Michael Albinus +Bug-Reference-ID: <87bm36k3kz.fsf@gmx.de> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-02/msg00111.html + +Bug-Description: + +When HISTSIZE is set to 0, history expansion can leave the history length +set to an incorrect value, leading to subsequent attempts to access invalid +memory. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/bashhist.c 2018-07-05 22:41:14.000000000 -0400 +--- b/bashhist.c 2019-02-20 16:20:04.000000000 -0500 +*************** +*** 561,573 **** + if (!history_expansion_inhibited && history_expansion && history_expansion_p (line)) + { + /* If we are expanding the second or later line of a multi-line + command, decrease history_length so references to history expansions + in these lines refer to the previous history entry and not the + current command. */ + if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1) + history_length--; + expanded = history_expand (line, &history_value); + if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1) +! history_length++; + + if (expanded) +--- 561,576 ---- + if (!history_expansion_inhibited && history_expansion && history_expansion_p (line)) + { ++ int old_len; ++ + /* If we are expanding the second or later line of a multi-line + command, decrease history_length so references to history expansions + in these lines refer to the previous history entry and not the + current command. */ ++ old_len = history_length; + if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1) + history_length--; + expanded = history_expand (line, &history_value); + if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1) +! history_length = old_len; + + if (expanded) + +*** ../bash-5.0/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_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0009-bash50-009.patch b/buildroot/package/bash/0009-bash50-009.patch new file mode 100644 index 000000000..c53f464ae --- /dev/null +++ b/buildroot/package/bash/0009-bash50-009.patch @@ -0,0 +1,46 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-009 + +Signed-off-by: Pascal de Bruijn + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-009 + +Bug-Reported-by: chet.ramey@case.edu +Bug-Reference-ID: +Bug-Reference-URL: + +Bug-Description: + +The history file reading code doesn't close the file descriptor open to +the history file when it encounters a zero-length file. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/lib/readline/histfile.c 2018-06-11 09:14:52.000000000 -0400 +--- b/lib/readline/histfile.c 2019-05-16 15:55:57.000000000 -0400 +*************** +*** 306,309 **** +--- 312,316 ---- + { + free (input); ++ close (file); + return 0; /* don't waste time if we don't have to */ + } +*** ../bash-5.0/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_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0010-bash50-010.patch b/buildroot/package/bash/0010-bash50-010.patch new file mode 100644 index 000000000..ebc06a667 --- /dev/null +++ b/buildroot/package/bash/0010-bash50-010.patch @@ -0,0 +1,176 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-010 + +Signed-off-by: Pascal de Bruijn + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-010 + +Bug-Reported-by: Thorsten Glaser +Bug-Reference-ID: <156622962831.19438.16374961114836556294.reportbug@tglase.lan.tarent.de> +Bug-Reference-URL: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935115 + +Bug-Description: + +Bash-5.0 changed the way assignment statements preceding special builtins +and shell functions were handled in posix mode. They automatically created +or modified global variables instead of modifying existing local variables +as in bash-4.4. + +The bash-4.4 posix-mode semantics were buggy, and resulted in creating +local variables where they were not intended and modifying global variables +and local variables simultaneously. + +The bash-5.0 changes were intended to fix this issue, but did not preserve +enough backwards compatibility. The posix standard also changed what it +required in these cases, so bash-5.0 is not bound by the strict conformance +requirements that existed in previous issues of the standard. + +This patch modifies the bash-5.0 posix mode behavior in an effort to restore +some backwards compatibility and rationalize the behavior in the presence of +local variables. It + +1. Changes the assignment semantics to be more similar to standalone assignment + statements: assignments preceding a function call or special builtin while + executing in a shell function will modify the value of a local variable + with the same name for the duration of the function's execution; + +2. Changes assignments preceding shell function calls or special builtins + from within a shell function to no longer create or modify global variables + in the presence of a local variable with the same name; + +3. Assignment statements preceding a shell function call or special builtin + at the global scope continue to modify the (global) calling environment, + but are unaffected by assignments preceding function calls or special + builtins within a function, as described in item 2. This is also similar + to the behavior of a standalone assignment statement. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/variables.c 2018-12-18 11:07:21.000000000 -0500 +--- b/variables.c 2019-08-22 10:53:44.000000000 -0400 +*************** +*** 4461,4467 **** + + /* Take a variable from an assignment statement preceding a posix special +! builtin (including `return') and create a global variable from it. This +! is called from merge_temporary_env, which is only called when in posix +! mode. */ + static void + push_posix_temp_var (data) +--- 4461,4467 ---- + + /* Take a variable from an assignment statement preceding a posix special +! builtin (including `return') and create a variable from it as if a +! standalone assignment statement had been performed. This is called from +! merge_temporary_env, which is only called when in posix mode. */ + static void + push_posix_temp_var (data) +*************** +*** 4473,4486 **** + var = (SHELL_VAR *)data; + +! binding_table = global_variables->table; +! if (binding_table == 0) +! binding_table = global_variables->table = hash_create (VARIABLES_HASH_BUCKETS); +! +! v = bind_variable_internal (var->name, value_cell (var), binding_table, 0, ASS_FORCE|ASS_NOLONGJMP); + + /* global variables are no longer temporary and don't need propagating. */ +! var->attributes &= ~(att_tempvar|att_propagate); + if (v) +! v->attributes |= var->attributes; + + if (find_special_var (var->name) >= 0) +--- 4473,4497 ---- + var = (SHELL_VAR *)data; + +! /* Just like do_assignment_internal(). This makes assignments preceding +! special builtins act like standalone assignment statements when in +! posix mode, satisfying the posix requirement that this affect the +! "current execution environment." */ +! v = bind_variable (var->name, value_cell (var), ASS_FORCE|ASS_NOLONGJMP); +! +! /* If this modifies an existing local variable, v->context will be non-zero. +! If it comes back with v->context == 0, we bound at the global context. +! Set binding_table appropriately. It doesn't matter whether it's correct +! if the variable is local, only that it's not global_variables->table */ +! binding_table = v->context ? shell_variables->table : global_variables->table; + + /* global variables are no longer temporary and don't need propagating. */ +! if (binding_table == global_variables->table) +! var->attributes &= ~(att_tempvar|att_propagate); +! + if (v) +! { +! v->attributes |= var->attributes; +! v->attributes &= ~att_tempvar; /* not a temp var now */ +! } + + if (find_special_var (var->name) >= 0) +*************** +*** 4576,4587 **** + { + int i; + + tempvar_list = strvec_create (HASH_ENTRIES (temporary_env) + 1); + tempvar_list[tvlist_ind = 0] = 0; +! +! hash_flush (temporary_env, pushf); +! hash_dispose (temporary_env); + temporary_env = (HASH_TABLE *)NULL; + + tempvar_list[tvlist_ind] = 0; + +--- 4587,4601 ---- + { + int i; ++ HASH_TABLE *disposer; + + tempvar_list = strvec_create (HASH_ENTRIES (temporary_env) + 1); + tempvar_list[tvlist_ind = 0] = 0; +! +! disposer = temporary_env; + temporary_env = (HASH_TABLE *)NULL; + ++ hash_flush (disposer, pushf); ++ hash_dispose (disposer); ++ + tempvar_list[tvlist_ind] = 0; + +*** ../bash-5.0-patched/tests/varenv.right 2018-12-17 15:39:48.000000000 -0500 +--- b/tests/varenv.right 2019-08-22 16:05:25.000000000 -0400 +*************** +*** 147,153 **** + outside: declare -- var="one" + inside: declare -x var="value" +! outside: declare -x var="value" +! inside: declare -- var="local" +! outside: declare -x var="global" + foo= environment foo= + foo=foo environment foo=foo +--- 147,153 ---- + outside: declare -- var="one" + inside: declare -x var="value" +! outside: declare -- var="outside" +! inside: declare -x var="global" +! outside: declare -- var="outside" + foo= environment foo= + foo=foo environment foo=foo +*** ../bash-5.0/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_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 10 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0011-bash50-011.patch b/buildroot/package/bash/0011-bash50-011.patch new file mode 100644 index 000000000..555d0f8f8 --- /dev/null +++ b/buildroot/package/bash/0011-bash50-011.patch @@ -0,0 +1,63 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-011 + +Signed-off-by: Pascal de Bruijn + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-011 + +Bug-Reported-by: Matt Whitlock +Bug-Reference-ID: +Bug-Reference-URL: https://savannah.gnu.org/support/?109671 + +Bug-Description: + +The conditional command did not perform appropriate quoted null character +removal on its arguments, causing syntax errors and attempts to stat +invalid pathnames. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/subst.c 2018-12-22 17:43:37.000000000 -0500 +--- b/subst.c 2019-04-14 13:25:41.000000000 -0400 +*************** +*** 3626,3630 **** + SPECIAL is 2, this is an rhs argument for the =~ operator, and should + be quoted appropriately for regcomp/regexec. The caller is responsible +! for removing the backslashes if the unquoted word is needed later. */ + char * + cond_expand_word (w, special) +--- 3642,3648 ---- + SPECIAL is 2, this is an rhs argument for the =~ operator, and should + be quoted appropriately for regcomp/regexec. The caller is responsible +! for removing the backslashes if the unquoted word is needed later. In +! any case, since we don't perform word splitting, we need to do quoted +! null character removal. */ + char * + cond_expand_word (w, special) +*************** +*** 3647,3650 **** +--- 3665,3670 ---- + if (special == 0) /* LHS */ + { ++ if (l->word) ++ word_list_remove_quoted_nulls (l); + dequote_list (l); + r = string_list (l); +*** ../bash-5.0/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_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 11 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0012-bash50-012.patch b/buildroot/package/bash/0012-bash50-012.patch new file mode 100644 index 000000000..d634932ee --- /dev/null +++ b/buildroot/package/bash/0012-bash50-012.patch @@ -0,0 +1,68 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-012 + +Signed-off-by: Fabrice Fontaine + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-012 + +Bug-Reported-by: lessbug@qq.com +Bug-Reference-ID: +Bug-Reference-URL: + +Bug-Description: + +When using previous-history to go back beyond the beginning of the history list, +it's possible to move to an incorrect partial line. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/lib/readline/misc.c 2017-07-07 17:30:12.000000000 -0400 +--- b/lib/readline/misc.c 2019-05-16 11:43:46.000000000 -0400 +*************** +*** 577,580 **** +--- 590,594 ---- + { + HIST_ENTRY *old_temp, *temp; ++ int had_saved_line; + + if (count < 0) +*************** +*** 589,592 **** +--- 603,607 ---- + + /* If we don't have a line saved, then save this one. */ ++ had_saved_line = _rl_saved_line_for_history != 0; + rl_maybe_save_line (); + +*************** +*** 612,616 **** + if (temp == 0) + { +! rl_maybe_unsave_line (); + rl_ding (); + } +--- 627,632 ---- + if (temp == 0) + { +! if (had_saved_line == 0) +! _rl_free_saved_history_line (); + rl_ding (); + } +*** ../bash-5.0/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_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 12 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0013-bash50-013.patch b/buildroot/package/bash/0013-bash50-013.patch new file mode 100644 index 000000000..1c99f5c8c --- /dev/null +++ b/buildroot/package/bash/0013-bash50-013.patch @@ -0,0 +1,77 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-013 + +Signed-off-by: Fabrice Fontaine + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-013 + +Bug-Reported-by: HIROSE Masaaki +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00038.html + +Bug-Description: + +Reading history entries with timestamps can result in history entries joined +by linefeeds. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/lib/readline/histfile.c 2018-06-11 09:14:52.000000000 -0400 +--- b/lib/readline/histfile.c 2019-05-16 15:55:57.000000000 -0400 +*************** +*** 370,376 **** + + has_timestamps = HIST_TIMESTAMP_START (buffer); +! history_multiline_entries += has_timestamps && history_write_timestamps; + + /* Skip lines until we are at FROM. */ + for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++) + if (*line_end == '\n') +--- 370,378 ---- + + has_timestamps = HIST_TIMESTAMP_START (buffer); +! history_multiline_entries += has_timestamps && history_write_timestamps; + + /* Skip lines until we are at FROM. */ ++ if (has_timestamps) ++ last_ts = buffer; + for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++) + if (*line_end == '\n') +*************** +*** 381,385 **** +--- 383,398 ---- + if (HIST_TIMESTAMP_START(p) == 0) + current_line++; ++ else ++ last_ts = p; + line_start = p; ++ /* If we are at the last line (current_line == from) but we have ++ timestamps (has_timestamps), then line_start points to the ++ text of the last command, and we need to skip to its end. */ ++ if (current_line >= from && has_timestamps) ++ { ++ for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++) ++ ; ++ line_start = (*line_end == '\n') ? line_end + 1 : line_end; ++ } + } + + +*** ../bash-5.0/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 12 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 13 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0014-bash50-014.patch b/buildroot/package/bash/0014-bash50-014.patch new file mode 100644 index 000000000..2aadbda88 --- /dev/null +++ b/buildroot/package/bash/0014-bash50-014.patch @@ -0,0 +1,56 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-014 + +Signed-off-by: Fabrice Fontaine + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-014 + +Bug-Reported-by: Johannes Hielscher +Bug-Reference-ID: <20190208205048.77c25a83@hordevm> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-02/msg00032.html + +Bug-Description: + +If the current line is empty, using the emacs C-xC-e binding to enter the +editor will edit the previous command instead of the current (empty) one. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/bashline.c 2019-01-16 16:13:21.000000000 -0500 +--- b/bashline.c 2019-02-11 11:18:57.000000000 -0500 +*************** +*** 962,970 **** + finished with the command, so we should not ignore the last command */ + using_history (); +! if (rl_line_buffer[0]) +! { +! current_command_line_count++; /* for rl_newline above */ +! bash_add_history (rl_line_buffer); +! } + current_command_line_count = 0; /* for dummy history entry */ + bash_add_history (""); +--- 965,970 ---- + finished with the command, so we should not ignore the last command */ + using_history (); +! current_command_line_count++; /* for rl_newline above */ +! bash_add_history (rl_line_buffer); + current_command_line_count = 0; /* for dummy history entry */ + bash_add_history (""); +*** ../bash-5.0/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 13 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 14 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0015-bash50-015.patch b/buildroot/package/bash/0015-bash50-015.patch new file mode 100644 index 000000000..d927f41af --- /dev/null +++ b/buildroot/package/bash/0015-bash50-015.patch @@ -0,0 +1,82 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-015 + +Signed-off-by: Fabrice Fontaine + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-015 + +Bug-Reported-by: Yu Kou +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00032.html + +Bug-Description: + +If alias expansion is enabled when processing the command argument to the +`-c' option, an alias is defined in that command, and the command ends with +the invocation of that alias, the shell's command parser can prematurely +terminate before the entire command is executed. + +Patch (apply with `patch -p0'): + +*** ../bash-20190426/builtins/evalstring.c 2019-01-29 14:15:19.000000000 -0500 +--- b/builtins/evalstring.c 2019-05-15 14:19:36.000000000 -0400 +*************** +*** 92,95 **** +--- 92,96 ---- + running_trap == 0 && + *bash_input.location.string == '\0' && ++ parser_expanding_alias () == 0 && + command->type == cm_simple && + signal_is_trapped (EXIT_TRAP) == 0 && +*************** +*** 106,109 **** +--- 107,111 ---- + { + return (*bash_input.location.string == '\0' && ++ parser_expanding_alias () == 0 && + (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') && + command->value.Connection->second->type == cm_simple); +*************** +*** 291,295 **** + with_input_from_string (string, from_file); + clear_shell_input_line (); +! while (*(bash_input.location.string)) + { + command = (COMMAND *)NULL; +--- 293,297 ---- + with_input_from_string (string, from_file); + clear_shell_input_line (); +! while (*(bash_input.location.string) || parser_expanding_alias ()) + { + command = (COMMAND *)NULL; +*************** +*** 546,550 **** + + with_input_from_string (string, from_file); +! while (*(bash_input.location.string)) + { + command = (COMMAND *)NULL; +--- 548,552 ---- + + with_input_from_string (string, from_file); +! while (*(bash_input.location.string)) /* XXX - parser_expanding_alias () ? */ + { + command = (COMMAND *)NULL; +*** ../bash-5.0/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 14 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 15 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0016-bash50-016.patch b/buildroot/package/bash/0016-bash50-016.patch new file mode 100644 index 000000000..8dec1fb34 --- /dev/null +++ b/buildroot/package/bash/0016-bash50-016.patch @@ -0,0 +1,62 @@ +From https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-016 + +Signed-off-by: Fabrice Fontaine + + BASH PATCH REPORT + ================= + +Bash-Release: 5.0 +Patch-ID: bash50-016 + +Bug-Reported-by: sunnycemetery@gmail.com +Bug-Reference-ID: <20190316041534.GB22884@midnight> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-03/msg00070.html + +Bug-Description: + +Bash waits too long to reap /dev/fd process substitutions used as redirections +with loops and group commands, which can lead to file descriptor exhaustion. + +Patch (apply with `patch -p0'): + +*** ../bash-5.0-patched/execute_cmd.c 2019-04-19 15:46:36.000000000 -0400 +--- b/execute_cmd.c 2019-07-01 16:45:49.000000000 -0400 +*************** +*** 1104,1107 **** +--- 1085,1104 ---- + discard_unwind_frame ("internal_fifos"); + } ++ # if defined (HAVE_DEV_FD) ++ /* Reap process substitutions at the end of loops */ ++ switch (command->type) ++ { ++ case cm_while: ++ case cm_until: ++ case cm_for: ++ case cm_group: ++ # if defined (ARITH_FOR_COMMAND) ++ case cm_arith_for: ++ # endif ++ reap_procsubs (); ++ default: ++ break; ++ } ++ # endif /* HAVE_DEV_FD */ + #endif + + +*** ../bash-5.0/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 15 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 16 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/buildroot/package/bash/0017-input.h-add-missing-include-on-stdio.h.patch b/buildroot/package/bash/0017-input.h-add-missing-include-on-stdio.h.patch new file mode 100644 index 000000000..fd008e947 --- /dev/null +++ b/buildroot/package/bash/0017-input.h-add-missing-include-on-stdio.h.patch @@ -0,0 +1,38 @@ +From 4fa85c85b9a76afd3b19ed75bf17ccd2940f1f55 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 16 Feb 2020 16:18:48 +0100 +Subject: [PATCH] input.h: add missing include on stdio.h + +This will fix the following build failure on uclibc: + +test -n "/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-2/output/host/bin/arm-linux-ranlib" && /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-2/output/host/bin/arm-linux-ranlib libsh.a +In file included from ./exec.def:71: +../input.h:76:3: error: unknown type name 'FILE' + FILE *file; + ^~~~ + +Fixes: + - http://autobuild.buildroot.org/results/bfca306868df54c567215c45c8cdac838d02f567 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://savannah.gnu.org/support/?110196] +--- + input.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/input.h b/input.h +index 6aef1269..08b0fdea 100644 +--- a/input.h ++++ b/input.h +@@ -21,6 +21,8 @@ + #if !defined (_INPUT_H_) + #define _INPUT_H_ + ++#include ++ + #include "stdc.h" + + /* Function pointers can be declared as (Function *)foo. */ +-- +2.24.1 + diff --git a/buildroot/package/bash/0018-locale.c-fix-build-without-wchar.patch b/buildroot/package/bash/0018-locale.c-fix-build-without-wchar.patch new file mode 100644 index 000000000..15c5f2e40 --- /dev/null +++ b/buildroot/package/bash/0018-locale.c-fix-build-without-wchar.patch @@ -0,0 +1,84 @@ +From 73ca494c60d46103f806325e6ccbe9e400238008 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 23 Feb 2020 11:41:09 +0100 +Subject: [PATCH] locale.c: fix build without wchar + +bash unconditionally builds locale.c which depends on mblen since +version 5.0 and +https://github.com/bminor/bash/commit/d233b485e83c3a784b803fb894280773f16f2deb + +This results in the following build failure if wchar is not available: + +/home/buildroot/autobuild/run/instance-0/output-1/host/bin/microblazeel-buildroot-linux-uclibc-gcc -L./builtins -L/home/buildroot/autobuild/run/instance-0/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/lib -L/home/buildroot/autobuild/run/instance-0/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/lib -L./lib/glob -L./lib/tilde -L./lib/sh -rdynamic -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -Wno-parentheses -Wno-format-security -o bash shell.o eval.o y.tab.o general.o make_cmd.o print_cmd.o dispose_cmd.o execute_cmd.o variables.o copy_cmd.o error.o expr.o flags.o jobs.o subst.o hashcmd.o hashlib.o mailcheck.o trap.o input.o unwind_prot.o pathexp.o sig.o test.o version.o alias.o array.o arrayfunc.o assoc.o braces.o bracecomp.o bashhist.o bashline.o list.o stringlib.o locale.o findcmd.o redir.o pcomplete.o pcomplib.o syntax.o xmalloc.o signames.o -lbuiltins -lglob -lsh -lreadline -lhistory -lcurses -ltilde -ldl +/home/buildroot/autobuild/run/instance-0/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/8.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: locale.o: in function `set_default_locale': +(.text+0x260): undefined reference to `mblen' + +To fix this issue, don't use mblen if HANDLE_MULTIBYTE is not defined, +an other possibility would be to use MBLEN wrapper defined in shmbutil.h + +Fixes: + - http://autobuild.buildroot.org/results/298fb9c785e137bff432dd304eb56986e54ce3ed + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://savannah.gnu.org/support/index.php?110200] +--- + locale.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/locale.c b/locale.c +index d62547f6..a64c5b4b 100644 +--- a/locale.c ++++ b/locale.c +@@ -86,7 +86,9 @@ set_default_locale () + + locale_mb_cur_max = MB_CUR_MAX; + locale_utf8locale = locale_isutf8 (default_locale); ++#if defined (HANDLE_MULTIBYTE) + locale_shiftstates = mblen ((char *)NULL, 0); ++#endif + } + + /* Set default values for LC_CTYPE, LC_COLLATE, LC_MESSAGES, LC_NUMERIC and +@@ -107,7 +109,9 @@ set_default_locale_vars () + locale_setblanks (); + locale_mb_cur_max = MB_CUR_MAX; + locale_utf8locale = locale_isutf8 (lc_all); ++# if defined (HANDLE_MULTIBYTE) + locale_shiftstates = mblen ((char *)NULL, 0); ++# endif + u32reset (); + } + # endif +@@ -211,7 +215,9 @@ set_locale_var (var, value) + /* if LC_ALL == "", reset_locale_vars has already called this */ + if (*lc_all && x) + locale_utf8locale = locale_isutf8 (lc_all); ++# if defined (HANDLE_MULTIBYTE) + locale_shiftstates = mblen ((char *)NULL, 0); ++# endif + u32reset (); + return r; + #else +@@ -231,7 +237,9 @@ set_locale_var (var, value) + /* if setlocale() returns NULL, the locale is not changed */ + if (x) + locale_utf8locale = locale_isutf8 (x); ++# if defined (HANDLE_MULTIBYTE) + locale_shiftstates = mblen ((char *)NULL, 0); ++# endif + u32reset (); + } + # endif +@@ -368,7 +376,9 @@ reset_locale_vars () + locale_mb_cur_max = MB_CUR_MAX; + if (x) + locale_utf8locale = locale_isutf8 (x); ++# if defined (HANDLE_MULTIBYTE) + locale_shiftstates = mblen ((char *)NULL, 0); ++# endif + u32reset (); + #endif + return 1; +-- +2.25.0 + diff --git a/buildroot/package/bash/bash.hash b/buildroot/package/bash/bash.hash index 951bcf585..9113b1653 100644 --- a/buildroot/package/bash/bash.hash +++ b/buildroot/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from # http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz.sig -sha256 604d9eec5e4ed5fd2180ee44dd756ddca92e0b6aa4217bbab2b6227380317f23 bash-4.4.18.tar.gz +sha256 b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d bash-5.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/bash/bash.mk b/buildroot/package/bash/bash.mk index 7fb7192e2..1843862e4 100644 --- a/buildroot/package/bash/bash.mk +++ b/buildroot/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 4.4.18 +BASH_VERSION = 5.0 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_CONF_OPTS = --with-installed-readline --without-bash-malloc diff --git a/buildroot/package/batctl/batctl.hash b/buildroot/package/batctl/batctl.hash index 257e1ff20..94f3de023 100644 --- a/buildroot/package/batctl/batctl.hash +++ b/buildroot/package/batctl/batctl.hash @@ -1,4 +1,6 @@ -# From https://downloads.open-mesh.org/batman/releases/batman-adv-2017.0/batctl-2017.0.tar.gz.sha1 -sha1 0fbc329b56b465fa4f674cfecd7348144609f8e5 batctl-2017.0.tar.gz +# From https://downloads.open-mesh.org/batman/releases/batman-adv-2019.3/batctl-2019.3.tar.gz.sha1 +sha1 3a1357d51e9338e79e9953b7d8b33ace9f904b30 batctl-2019.3.tar.gz # Locally calculated -sha256 c0bb1127d6070b46abeb8d6a63d1150d71fa85f87f9a846873b649a21934c686 batctl-2017.0.tar.gz +sha256 2bd93fa14925a8dc63a67e64266c8ccd2fa3ac44b10253d93e6f8a630350070c batctl-2019.3.tar.gz +sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/buildroot/package/batctl/batctl.mk b/buildroot/package/batctl/batctl.mk index 824d2e15f..17ed15e36 100644 --- a/buildroot/package/batctl/batctl.mk +++ b/buildroot/package/batctl/batctl.mk @@ -4,9 +4,10 @@ # ################################################################################ -BATCTL_VERSION = 2017.0 +BATCTL_VERSION = 2019.3 BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION) BATCTL_LICENSE = GPL-2.0, MIT (batman_adv.h, list.h) +BATCTL_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT BATCTL_DEPENDENCIES = libnl host-pkgconf define BATCTL_BUILD_CMDS diff --git a/buildroot/package/batman-adv/batman-adv.hash b/buildroot/package/batman-adv/batman-adv.hash index 0599b919b..dabbec812 100644 --- a/buildroot/package/batman-adv/batman-adv.hash +++ b/buildroot/package/batman-adv/batman-adv.hash @@ -1,3 +1,7 @@ -# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2017.0.1.tar.gz.{md5,sha1} -md5 ce14f7f1bbc037691bbbc611e16f0360 batman-adv-2017.0.1.tar.gz -sha1 593cecc015b876caa5b21fbb4d0f6186742a1abb batman-adv-2017.0.1.tar.gz +# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2019.3.tar.gz.{md5,sha1} +md5 39345688ddf12a542853b2318325f07b batman-adv-2019.3.tar.gz +sha1 202539c0cbf4604f6c8e9d427b338d4e807bd220 batman-adv-2019.3.tar.gz + +# Hash for license files +sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/buildroot/package/batman-adv/batman-adv.mk b/buildroot/package/batman-adv/batman-adv.mk index 2cebe1356..3f48e6205 100644 --- a/buildroot/package/batman-adv/batman-adv.mk +++ b/buildroot/package/batman-adv/batman-adv.mk @@ -4,13 +4,15 @@ # ################################################################################ -BATMAN_ADV_VERSION = 2017.0.1 +BATMAN_ADV_VERSION = 2019.3 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h) +BATMAN_ADV_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT # Bridge Loop Avoidance, Distributed Arp Table are always enabled BATMAN_ADV_CFLAGS = \ -I$(@D)/compat-include/ \ + -I$(@D)/include/ \ -include $(@D)/compat.h \ -DBATADV_SOURCE_VERSION=\"\\\"$(BATMAN_ADV_VERSION)\\\"\" BATMAN_ADV_MODULE_MAKE_OPTS = \ diff --git a/buildroot/package/bats-core/Config.in b/buildroot/package/bats-core/Config.in new file mode 100644 index 000000000..73c38e5a0 --- /dev/null +++ b/buildroot/package/bats-core/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_BATS_CORE + bool "bats" + depends on BR2_PACKAGE_BASH # runtime + help + Bats: Bash Automated Testing System + + Bats is a TAP-compliant testing framework for Bash. It + provides a simple way to verify that the UNIX programs you + write behave as expected. + + https://github.com/bats-core/bats-core diff --git a/buildroot/package/bats-core/bats-core.hash b/buildroot/package/bats-core/bats-core.hash new file mode 100644 index 000000000..4d10d785d --- /dev/null +++ b/buildroot/package/bats-core/bats-core.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 855d8b8bed466bc505e61123d12885500ef6fcdb317ace1b668087364717ea82 bats-core-1.1.0.tar.gz + +# License files +sha256 55074b2b3b87809105034e1468e59076554d76a80c67bcc592000cc3d929852d LICENSE.md diff --git a/buildroot/package/bats-core/bats-core.mk b/buildroot/package/bats-core/bats-core.mk new file mode 100644 index 000000000..eee38056f --- /dev/null +++ b/buildroot/package/bats-core/bats-core.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# bats-core +# +################################################################################ + +BATS_CORE_VERSION = 1.1.0 +BATS_CORE_SITE = $(call github,bats-core,bats-core,v$(BATS_CORE_VERSION)) +BATS_CORE_LICENSE = MIT +BATS_CORE_LICENSE_FILES = LICENSE.md + +define BATS_CORE_INSTALL_TARGET_CMDS + $(@D)/install.sh $(TARGET_DIR)/usr +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/bayer2rgb-neon/Config.in b/buildroot/package/bayer2rgb-neon/Config.in new file mode 100644 index 000000000..ed065c1ed --- /dev/null +++ b/buildroot/package/bayer2rgb-neon/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_BAYER2RGB_NEON + bool "bayer2rgb-neon" + depends on BR2_arm && BR2_ARM_CPU_HAS_NEON + depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + help + bayer2rgb-neon is a library which allows + to decode raw camera bayer to RGB using + NEON hardware acceleration. + + https://git.phytec.de/bayer2rgb-neon/ + +comment "bayer2rgb-neon needs a toolchain w/ C++, dynamic library, gcc >= 4.9" + depends on BR2_arm && BR2_ARM_CPU_HAS_NEON + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/bayer2rgb-neon/bayer2rgb-neon.hash b/buildroot/package/bayer2rgb-neon/bayer2rgb-neon.hash new file mode 100644 index 000000000..1f4f5f33b --- /dev/null +++ b/buildroot/package/bayer2rgb-neon/bayer2rgb-neon.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 1a84dcf6557c2017ebe258502f60575e0971511c548fc88aee5ab68ca0bb268a bayer2rgb-neon-bef3ecafe290d61a50fd27da3e5d0df6f4b88045.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/bayer2rgb-neon/bayer2rgb-neon.mk b/buildroot/package/bayer2rgb-neon/bayer2rgb-neon.mk new file mode 100644 index 000000000..34510e761 --- /dev/null +++ b/buildroot/package/bayer2rgb-neon/bayer2rgb-neon.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# bayer2rgb-neon +# +################################################################################ + +BAYER2RGB_NEON_VERSION = bef3ecafe290d61a50fd27da3e5d0df6f4b88045 +BAYER2RGB_NEON_SITE = https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb.git +BAYER2RGB_NEON_SITE_METHOD = git +BAYER2RGB_NEON_LICENSE = GPL-3.0 +BAYER2RGB_NEON_LICENSE_FILES = COPYING +BAYER2RGB_NEON_INSTALL_STAGING = YES +BAYER2RGB_NEON_DEPENDENCIES = host-pkgconf host-gengetopt +BAYER2RGB_NEON_AUTORECONF = YES + +BAYER2RGB_NEON_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -mfpu=neon" + +$(eval $(autotools-package)) diff --git a/buildroot/package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch b/buildroot/package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch new file mode 100644 index 000000000..03d15f552 --- /dev/null +++ b/buildroot/package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch @@ -0,0 +1,35 @@ +From 7dc22308b2974fd093b6a564b7b28ddc20ddf4a6 Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Fri, 13 Sep 2019 13:45:02 -0500 +Subject: [PATCH] bc: use MAKEINFO variable for docs + +Use the appropiate MAKEINFO variable rather than the hardcoded makeinfo +command directly, otherwise missing logic never works. + +Fixes: +http://autobuild.buildroot.net/results/b0b/b0b9dced0014a5a8026fa972f95085e8bd16a07b/ + +[Recreated for 1.0.7.1 by Matt W and applied to Makefile.am instead of + Makefile.in] +Signed-off-by: Gustavo Zacarias +Signed-off-by: Matthew Weber +--- + doc/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 1bdc478..f873b6a 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + + info_TEXINFOS = bc.texi dc.texi +-MAKEINFO = makeinfo --no-split ++MAKEINFO = @MAKEINFO@ --no-split + + MAINTAINERCLEANFILES = Makefile.in + +-- +2.17.1 + diff --git a/buildroot/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch b/buildroot/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch new file mode 100644 index 000000000..cc72e5cd6 --- /dev/null +++ b/buildroot/package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch @@ -0,0 +1,754 @@ +From af96fb92052c307818eefa4b687f964f1e3f542e Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Thu, 12 Sep 2019 15:04:35 -0500 +Subject: [PATCH] notice read and write errors on input and output + +Quoting from the bug report: + bc (1.06-19ubuntu1) dapper; urgency=low + * Make dc notice read and write errors on its input and output. + I grepped for mentions of the strings `putc', `print', `getc', + `FILE', `stdin', `stdout' and `stderr' and added calls to new + error-checking functions unless it was clear from the + immediately-surrounding code that the program was exiting + nonzero, or would exit nonzero if the call failed. I ignored + hits in lib/getopt*, which seems to pervasively ignore write + errors when printing usage messages, in the hope that these + were correct. I _think_ I got them all. -iwj. + -- Ian Jackson Tue, 4 Apr 2006 17:21:02 +0100 + +Upsteam: +https://sources.debian.org/patches/bc/1.07.1-2/05_notice_read_write_errors.diff/ + +[Reformatted to GIT for 1.0.7.1 by Matt W] +Updated by Ryan Kavanagh for 1.0.7.1 on 26 July 2017. +Author: Ian Jackson +Origin: other +Bug-Debian: http://bugs.debian.org/488735 + +Signed-off-by: Matthew Weber +--- + bc/execute.c | 10 +++++++++- + bc/main.c | 3 +++ + bc/sbc.y | 2 ++ + bc/scan.c | 2 ++ + bc/scan.l | 3 +++ + bc/util.c | 15 ++++++++++++-- + dc/dc.c | 3 +++ + dc/eval.c | 55 +++++++++++++++++++++++++++++++++++++++------------- + dc/misc.c | 1 + + dc/numeric.c | 9 +++++++++ + dc/stack.c | 11 ++++++++++- + dc/string.c | 2 ++ + h/number.h | 11 +++++++---- + lib/number.c | 24 +++++++++++++++++++++++ + 14 files changed, 129 insertions(+), 22 deletions(-) + +diff --git a/bc/execute.c b/bc/execute.c +index 256e4b7..50eac49 100644 +--- a/bc/execute.c ++++ b/bc/execute.c +@@ -104,6 +104,7 @@ execute (void) + } + out_char ('\n'); + } ++ checkferror_output(stdout); + } + #endif + +@@ -224,6 +225,7 @@ execute (void) + } + } + fflush (stdout); ++ checkferror_output(stdout); + break; + + case 'R' : /* Return from function */ +@@ -259,6 +261,7 @@ execute (void) + if (inst == 'W') out_char ('\n'); + store_var (4); /* Special variable "last". */ + fflush (stdout); ++ checkferror_output(stdout); + pop (); + break; + +@@ -342,6 +345,7 @@ execute (void) + case 'w' : /* Write a string to the output. */ + while ((ch = byte(&pc)) != '"') out_schar (ch); + fflush (stdout); ++ checkferror_output(stdout); + break; + + case 'x' : /* Exchange Top of Stack with the one under the tos. */ +@@ -549,7 +553,10 @@ execute (void) + { + signal (SIGINT, use_quit); + if (had_sigint) +- printf ("\ninterrupted execution.\n"); ++ { ++ printf ("\ninterrupted execution.\n"); ++ checkferror_output(stdout); ++ } + } + } + +@@ -584,6 +591,7 @@ input_char (void) + out_col = 0; /* Saw a new line */ + } + } ++ checkferror_input(stdin); + + /* Classify and preprocess the input character. */ + if (isdigit(in_ch)) +diff --git a/bc/main.c b/bc/main.c +index 012075c..c96207b 100644 +--- a/bc/main.c ++++ b/bc/main.c +@@ -353,6 +353,9 @@ use_quit (int sig) + errno = save; + #else + write (1, "\n(interrupt) Exiting bc.\n", 26); ++#ifdef READLINE ++ rl_initialize (); /* Clear readline buffer */ ++#endif + bc_exit(0); + #endif + } +diff --git a/bc/sbc.y b/bc/sbc.y +index 586686b..921ab1e 100644 +--- a/bc/sbc.y ++++ b/bc/sbc.y +@@ -86,7 +86,9 @@ program : /* empty */ + if (interactive && !quiet) + { + show_bc_version (); ++ checkferror_output(stdout); + welcome (); ++ checkferror_output(stdout); + } + } + | program input_item +diff --git a/bc/scan.c b/bc/scan.c +index b237f55..8dee4e9 100644 +--- a/bc/scan.c ++++ b/bc/scan.c +@@ -791,6 +791,7 @@ bcel_input (char *buf, yy_size_t *result, int max) + if (bcel_len != 0) + history (hist, &histev, H_ENTER, bcel_line); + fflush (stdout); ++ checkferror_output(stdout); + } + + if (bcel_len <= max) +@@ -863,6 +864,7 @@ rl_input (char *buf, int *result, int max) + add_history (rl_line); + rl_line[rl_len-1] = '\n'; + fflush (stdout); ++ checkferror_output(stdout); + } + + if (rl_len <= max) +diff --git a/bc/scan.l b/bc/scan.l +index eb2e2dd..79186bb 100644 +--- a/bc/scan.l ++++ b/bc/scan.l +@@ -99,6 +99,7 @@ bcel_input (char *buf, yy_size_t *result, int max) + if (bcel_len != 0) + history (hist, &histev, H_ENTER, bcel_line); + fflush (stdout); ++ checkferror_output(stdout); + } + + if (bcel_len <= max) +@@ -171,6 +172,7 @@ rl_input (char *buf, int *result, int max) + add_history (rl_line); + rl_line[rl_len-1] = '\n'; + fflush (stdout); ++ checkferror_output(stdout); + } + + if (rl_len <= max) +@@ -295,6 +297,7 @@ limits return(Limits); + if (c == EOF) + { + fprintf (stderr,"EOF encountered in a comment.\n"); ++ checkferror_output(stderr); + break; + } + } +diff --git a/bc/util.c b/bc/util.c +index 8eba093..cacd796 100644 +--- a/bc/util.c ++++ b/bc/util.c +@@ -247,9 +247,10 @@ init_gen (void) + continue_label = 0; + next_label = 1; + out_count = 2; +- if (compile_only) ++ if (compile_only) { + printf ("@i"); +- else ++ checkferror_output(stdout); ++ } else + init_load (); + had_error = FALSE; + did_gen = FALSE; +@@ -272,6 +273,7 @@ generate (const char *str) + printf ("\n"); + out_count = 0; + } ++ checkferror_output(stdout); + } + else + load_code (str); +@@ -289,6 +291,7 @@ run_code(void) + if (compile_only) + { + printf ("@r\n"); ++ checkferror_output(stdout); + out_count = 0; + } + else +@@ -326,6 +329,7 @@ out_char (int ch) + } + putchar (ch); + } ++ checkferror_output(stdout); + } + + /* Output routines: Write a character CH to the standard output. +@@ -355,6 +359,7 @@ out_schar (int ch) + } + putchar (ch); + } ++ checkferror_output(stdout); + } + + +@@ -639,6 +644,7 @@ limits(void) + #ifdef OLD_EQ_OP + printf ("Old assignment operatiors are valid. (=-, =+, ...)\n"); + #endif ++ checkferror_output(stdout); + } + + /* bc_malloc will check the return value so all other places do not +@@ -703,6 +709,7 @@ yyerror (str, va_alist) + fprintf (stderr,"%s %d: ",name,line_no); + vfprintf (stderr, str, args); + fprintf (stderr, "\n"); ++ checkferror_output(stderr); + had_error = TRUE; + va_end (args); + } +@@ -743,6 +750,7 @@ ct_warn (mesg, va_alist) + fprintf (stderr,"%s %d: Error: ",name,line_no); + vfprintf (stderr, mesg, args); + fprintf (stderr, "\n"); ++ checkferror_output(stderr); + had_error = TRUE; + } + else +@@ -755,6 +763,7 @@ ct_warn (mesg, va_alist) + fprintf (stderr,"%s %d: (Warning) ",name,line_no); + vfprintf (stderr, mesg, args); + fprintf (stderr, "\n"); ++ checkferror_output(stderr); + } + va_end (args); + } +@@ -789,6 +798,7 @@ rt_error (mesg, va_alist) + va_end (args); + + fprintf (stderr, "\n"); ++ checkferror_output(stderr); + runtime_error = TRUE; + } + +@@ -823,6 +833,7 @@ rt_warn (const char *mesg) + va_end (args); + + fprintf (stderr, "\n"); ++ checkferror_output(stderr); + } + + /* bc_exit: Make sure to reset the edit state. */ +diff --git a/dc/dc.c b/dc/dc.c +index 6a2bb26..ccdb1c2 100644 +--- a/dc/dc.c ++++ b/dc/dc.c +@@ -59,6 +59,7 @@ static void + bug_report_info DC_DECLVOID() + { + printf("Email bug reports to: bug-dc@gnu.org .\n"); ++ checkferror_output(stdout); + } + + static void +@@ -69,6 +70,7 @@ show_version DC_DECLVOID() + This is free software; see the source for copying conditions. There is NO\n\ + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n\ + to the extent permitted by law.\n", DC_COPYRIGHT); ++ checkferror_output(stdout); + } + + /* your generic usage function */ +@@ -85,6 +87,7 @@ Usage: %s [OPTION] [file ...]\n\ + \n\ + ", progname); + bug_report_info(); ++ checkferror_output(f); + } + + /* returns a pointer to one past the last occurance of c in s, +diff --git a/dc/eval.c b/dc/eval.c +index 05a3d9e..6c54e61 100644 +--- a/dc/eval.c ++++ b/dc/eval.c +@@ -97,12 +97,15 @@ static int input_pushback; + static int + input_fil DC_DECLVOID() + { ++ int c; + if (input_pushback != EOF){ +- int c = input_pushback; ++ c = input_pushback; + input_pushback = EOF; + return c; + } +- return getc(input_fil_fp); ++ c = getc(input_fil_fp); ++ checkferror_input(input_fil_fp); ++ return c; + } + + /* passed as an argument to dc_getnum */ +@@ -301,11 +304,13 @@ dc_func DC_DECLARG((c, peekc, negcmp)) + tmpint = dc_num2int(datum.v.number, DC_TOSS); + if (2 <= tmpint && tmpint <= DC_IBASE_MAX) + dc_ibase = tmpint; +- else ++ else { + fprintf(stderr, + "%s: input base must be a number \ + between 2 and %d (inclusive)\n", + progname, DC_IBASE_MAX); ++ checkferror_output(stderr); ++ } + } + break; + case 'k': /* set scale to value on top of stack */ +@@ -313,11 +318,12 @@ between 2 and %d (inclusive)\n", + tmpint = -1; + if (datum.dc_type == DC_NUMBER) + tmpint = dc_num2int(datum.v.number, DC_TOSS); +- if ( ! (tmpint >= 0) ) ++ if ( ! (tmpint >= 0) ) { + fprintf(stderr, + "%s: scale must be a nonnegative number\n", + progname); +- else ++ checkferror_output(stderr); ++ } else + dc_scale = tmpint; + } + break; +@@ -341,11 +347,12 @@ between 2 and %d (inclusive)\n", + tmpint = 0; + if (datum.dc_type == DC_NUMBER) + tmpint = dc_num2int(datum.v.number, DC_TOSS); +- if ( ! (tmpint > 1) ) ++ if ( ! (tmpint > 1) ) { + fprintf(stderr, + "%s: output base must be a number greater than 1\n", + progname); +- else ++ checkferror_output(stderr); ++ } else + dc_obase = tmpint; + } + break; +@@ -378,6 +385,7 @@ between 2 and %d (inclusive)\n", + fprintf(stderr, + "%s: square root of nonnumeric attempted\n", + progname); ++ checkferror_output(stderr); + }else if (dc_sqrt(datum.v.number, dc_scale, &tmpnum) == DC_SUCCESS){ + dc_free_num(&datum.v.number); + datum.v.number = tmpnum; +@@ -424,6 +432,7 @@ between 2 and %d (inclusive)\n", + dc_garbage("at top of stack", -1); + } + fflush(stdout); ++ checkferror_output(stdout); + break; + case 'Q': /* quit out of top-of-stack nested evals; + * pops value from stack; +@@ -440,6 +449,7 @@ between 2 and %d (inclusive)\n", + fprintf(stderr, + "%s: Q command requires a number >= 1\n", + progname); ++ checkferror_output(stderr); + } + break; + case 'R': /* pop a value off of the evaluation stack,; +@@ -483,11 +493,12 @@ between 2 and %d (inclusive)\n", + if (datum.dc_type == DC_NUMBER) + tmpint = dc_num2int(datum.v.number, DC_TOSS); + if (dc_pop(&datum) == DC_SUCCESS){ +- if (tmpint < 0) ++ if (tmpint < 0) { + fprintf(stderr, + "%s: array index must be a nonnegative integer\n", + progname); +- else ++ checkferror_output(stderr); ++ } else + dc_array_set(peekc, tmpint, datum); + } + } +@@ -499,18 +510,21 @@ between 2 and %d (inclusive)\n", + tmpint = -1; + if (datum.dc_type == DC_NUMBER) + tmpint = dc_num2int(datum.v.number, DC_TOSS); +- if (tmpint < 0) ++ if (tmpint < 0) { + fprintf(stderr, + "%s: array index must be a nonnegative integer\n", + progname); +- else ++ checkferror_output(stderr); ++ } else + dc_push(dc_array_get(peekc, tmpint)); + } + return DC_EATONE; + + default: /* What did that user mean? */ + fprintf(stderr, "%s: ", progname); ++ checkferror_output(stderr); + dc_show_id(stdout, c, " unimplemented\n"); ++ checkferror_output(stdout); + break; + } + return DC_OKAY; +@@ -538,6 +552,7 @@ evalstr DC_DECLARG((string)) + fprintf(stderr, + "%s: eval called with non-string argument\n", + progname); ++ checkferror_output(stderr); + return DC_OKAY; + } + interrupt_seen = 0; +@@ -635,6 +650,7 @@ evalstr DC_DECLARG((string)) + return DC_FAIL; + } + fprintf(stderr, "%s: unexpected EOS\n", progname); ++ checkferror_output(stderr); + return DC_OKAY; + } + } +@@ -692,6 +708,7 @@ dc_evalfile DC_DECLARG((fp)) + stdin_lookahead = EOF; + for (c=getc(fp); c!=EOF; c=peekc){ + peekc = getc(fp); ++ checkferror_input(stdin); + /* + * The following if() is the only place where ``stdin_lookahead'' + * might be set to other than EOF: +@@ -717,24 +734,30 @@ dc_evalfile DC_DECLARG((fp)) + signal(SIGINT, sigint_handler); + switch (dc_func(c, peekc, negcmp)){ + case DC_OKAY: +- if (stdin_lookahead != peekc && fp == stdin) ++ if (stdin_lookahead != peekc && fp == stdin) { + peekc = getc(fp); ++ checkferror_input(stdin); ++ } + break; + case DC_EATONE: + peekc = getc(fp); ++ checkferror_input(fp); + break; + case DC_EVALREG: + /*commands which send us here shall guarantee that peekc!=EOF*/ + c = peekc; + peekc = getc(fp); ++ checkferror_input(fp); + stdin_lookahead = peekc; + if (dc_register_get(c, &datum) != DC_SUCCESS) + break; + dc_push(datum); + /*@fallthrough@*/ + case DC_EVALTOS: +- if (stdin_lookahead != peekc && fp == stdin) ++ if (stdin_lookahead != peekc && fp == stdin) { + peekc = getc(fp); ++ checkferror_input(stdin); ++ } + if (dc_pop(&datum) == DC_SUCCESS){ + if (datum.dc_type == DC_NUMBER){ + dc_push(datum); +@@ -744,6 +767,7 @@ dc_evalfile DC_DECLARG((fp)) + goto reset_and_exit_quit; + fprintf(stderr, "%s: Q command argument exceeded \ + string execution depth\n", progname); ++ checkferror_output(stderr); + } + }else{ + dc_garbage("at top of stack", -1); +@@ -756,8 +780,11 @@ string execution depth\n", progname); + fprintf(stderr, + "%s: Q command argument exceeded string execution depth\n", + progname); +- if (stdin_lookahead != peekc && fp == stdin) ++ checkferror_output(stderr); ++ if (stdin_lookahead != peekc && fp == stdin) { + peekc = getc(fp); ++ checkferror_input(stdin); ++ } + break; + + case DC_INT: +diff --git a/dc/misc.c b/dc/misc.c +index cd23602..cd910b8 100644 +--- a/dc/misc.c ++++ b/dc/misc.c +@@ -89,6 +89,7 @@ dc_show_id DC_DECLARG((fp, id, suffix)) + fprintf(fp, "'%c' (%#o)%s", (unsigned int) id, id, suffix); + else + fprintf(fp, "%#o%s", (unsigned int) id, suffix); ++ checkferror_output(fp); + } + + +diff --git a/dc/numeric.c b/dc/numeric.c +index 37759de..60cfb85 100644 +--- a/dc/numeric.c ++++ b/dc/numeric.c +@@ -133,6 +133,7 @@ dc_div DC_DECLARG((a, b, kscale, result)) + bc_init_num(CastNumPtr(result)); + if (bc_divide(CastNum(a), CastNum(b), CastNumPtr(result), kscale)){ + fprintf(stderr, "%s: divide by zero\n", progname); ++ checkferror_output(stderr); + return DC_DOMAIN_ERROR; + } + return DC_SUCCESS; +@@ -155,6 +156,7 @@ dc_divrem DC_DECLARG((a, b, kscale, quotient, remainder)) + if (bc_divmod(CastNum(a), CastNum(b), + CastNumPtr(quotient), CastNumPtr(remainder), kscale)){ + fprintf(stderr, "%s: divide by zero\n", progname); ++ checkferror_output(stderr); + return DC_DOMAIN_ERROR; + } + return DC_SUCCESS; +@@ -173,6 +175,7 @@ dc_rem DC_DECLARG((a, b, kscale, result)) + bc_init_num(CastNumPtr(result)); + if (bc_modulo(CastNum(a), CastNum(b), CastNumPtr(result), kscale)){ + fprintf(stderr, "%s: remainder by zero\n", progname); ++ checkferror_output(stderr); + return DC_DOMAIN_ERROR; + } + return DC_SUCCESS; +@@ -225,6 +228,7 @@ dc_sqrt DC_DECLARG((value, kscale, result)) + tmp = bc_copy_num(CastNum(value)); + if (!bc_sqrt(&tmp, kscale)){ + fprintf(stderr, "%s: square root of negative number\n", progname); ++ checkferror_output(stderr); + bc_free_num(&tmp); + return DC_DOMAIN_ERROR; + } +@@ -470,6 +474,7 @@ dc_dump_num DC_DECLARG((dcvalue, discard_p)) + + for (cur=top_of_stack; cur; cur=next) { + putchar(cur->digit); ++ checkferror_output(stdout); + next = cur->link; + free(cur); + } +@@ -587,6 +592,8 @@ out_char (ch) + out_col = 1; + } + putchar(ch); ++ checkferror_output(stdout); ++ checkferror_output(stderr); + } + } + +@@ -626,6 +633,7 @@ rt_error (mesg, va_alist) + vfprintf (stderr, mesg, args); + va_end (args); + fprintf (stderr, "\n"); ++ checkferror_output(stderr); + } + + +@@ -659,6 +667,7 @@ rt_warn (mesg, va_alist) + vfprintf (stderr, mesg, args); + va_end (args); + fprintf (stderr, "\n"); ++ checkferror_output(stderr); + } + + +diff --git a/dc/stack.c b/dc/stack.c +index 49422df..174411d 100644 +--- a/dc/stack.c ++++ b/dc/stack.c +@@ -35,7 +35,10 @@ + #include "dc-regdef.h" + + /* an oft-used error message: */ +-#define Empty_Stack fprintf(stderr, "%s: stack empty\n", progname) ++#define Empty_Stack do{ \ ++ fprintf(stderr, "%s: stack empty\n", progname); \ ++ checkferror_output(stderr); \ ++ }while(0) + + + /* simple linked-list implementation suffices: */ +@@ -91,6 +94,7 @@ dc_binop DC_DECLARG((op, kscale)) + if (dc_stack->value.dc_type!=DC_NUMBER + || dc_stack->link->value.dc_type!=DC_NUMBER){ + fprintf(stderr, "%s: non-numeric value\n", progname); ++ checkferror_output(stderr); + return; + } + (void)dc_pop(&b); +@@ -131,6 +135,7 @@ dc_binop2 DC_DECLARG((op, kscale)) + if (dc_stack->value.dc_type!=DC_NUMBER + || dc_stack->link->value.dc_type!=DC_NUMBER){ + fprintf(stderr, "%s: non-numeric value\n", progname); ++ checkferror_output(stderr); + return; + } + (void)dc_pop(&b); +@@ -169,6 +174,7 @@ dc_cmpop DC_DECLVOID() + if (dc_stack->value.dc_type!=DC_NUMBER + || dc_stack->link->value.dc_type!=DC_NUMBER){ + fprintf(stderr, "%s: non-numeric value\n", progname); ++ checkferror_output(stderr); + return 0; + } + (void)dc_pop(&b); +@@ -206,6 +212,7 @@ dc_triop DC_DECLARG((op, kscale)) + || dc_stack->link->value.dc_type!=DC_NUMBER + || dc_stack->link->link->value.dc_type!=DC_NUMBER){ + fprintf(stderr, "%s: non-numeric value\n", progname); ++ checkferror_output(stderr); + return; + } + (void)dc_pop(&c); +@@ -327,6 +334,7 @@ dc_register_get DC_DECLARG((regid, result)) + *result = dc_int2data(0); + }else if (r->value.dc_type==DC_UNINITIALIZED){ + fprintf(stderr, "%s: BUG: register ", progname); ++ checkferror_output(stderr); + dc_show_id(stderr, regid, " exists but is uninitialized?\n"); + return DC_FAIL; + }else{ +@@ -402,6 +410,7 @@ dc_register_pop DC_DECLARG((stackid, result)) + r = dc_register[stackid]; + if (r==NULL || r->value.dc_type==DC_UNINITIALIZED){ + fprintf(stderr, "%s: stack register ", progname); ++ checkferror_output(stderr); + dc_show_id(stderr, stackid, " is empty\n"); + return DC_FAIL; + } +diff --git a/dc/string.c b/dc/string.c +index dee9169..389d899 100644 +--- a/dc/string.c ++++ b/dc/string.c +@@ -94,6 +94,7 @@ dc_out_str DC_DECLARG((value, discard_flag)) + dc_discard discard_flag DC_DECLEND + { + fwrite(value->s_ptr, value->s_len, sizeof *value->s_ptr, stdout); ++ checkferror_output(stdout); + if (discard_flag == DC_TOSS) + dc_free_str(&value); + } +@@ -169,6 +170,7 @@ dc_readstring DC_DECLARG((fp, ldelim, rdelim)) + } + *p++ = c; + } ++ checkferror_input(fp); + return dc_makestring(line_buf, (size_t)(p-line_buf)); + } + +diff --git a/h/number.h b/h/number.h +index abf6332..1983ab4 100644 +--- a/h/number.h ++++ b/h/number.h +@@ -23,10 +23,10 @@ + You may contact the author by: + e-mail: philnelson@acm.org + us-mail: Philip A. Nelson +- Computer Science Department, 9062 +- Western Washington University +- Bellingham, WA 98226-9062 +- ++ Computer Science Department, 9062 ++ Western Washington University ++ Bellingham, WA 98226-9062 ++ + *************************************************************************/ + + #ifndef _NUMBER_H_ +@@ -140,4 +140,7 @@ void bc_out_num (bc_num num, int o_base, void (* out_char)(int), + int leading_zero); + + void bc_out_long (long val, int size, int space, void (*out_char)(int)); ++ ++void checkferror_input (FILE*); ++void checkferror_output (FILE*); + #endif +diff --git a/lib/number.c b/lib/number.c +index f394e92..80b33e3 100644 +--- a/lib/number.c ++++ b/lib/number.c +@@ -1713,6 +1713,7 @@ static void + out_char (int c) + { + putchar(c); ++ checkferror_output(stdout); + } + + +@@ -1721,6 +1722,7 @@ pn (bc_num num) + { + bc_out_num (num, 10, out_char, 0); + out_char ('\n'); ++ checkferror_output(stdout); + } + + +@@ -1732,6 +1734,28 @@ pv (char *name, unsigned char *num, int len) + printf ("%s=", name); + for (i=0; i +Date: Thu, 27 Jun 2019 13:10:47 +0800 +Subject: [PATCH] dc: fix exit code of q command + +The exit code for "echo q | dc" is 1 for dc-1.4.1; +while the exit code for "echo q | dc" is 0 for dc-1.4. + +Here is the answer from ken@gnu.org: +dc-1.4 was right. There was a rewrite of a chunk of code for 1.4.1 to +fix a corner case in the Q command, and somehow the placement of the +clean-up label for the 'q' command got misplaced on the error-handling +branch instead of the clean-exit branch. The patch below fixes this +(it is committed for whenever the next bc/dc release gets made). + +Thanks for the report, + --Ken Pizzini + +Upstream: +https://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-extended/bc/bc/0001-dc-fix-exit-code-of-q-command.patch + +Signed-off-by: Li Zhou +Signed-off-by: Matthew Weber +--- + dc/eval.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dc/eval.c b/dc/eval.c +index 6c54e61..9c28f18 100644 +--- a/dc/eval.c ++++ b/dc/eval.c +@@ -841,10 +841,10 @@ error_fail: + fprintf(stderr, "%s: ", progname); + perror("error reading input"); + return DC_FAIL; +-reset_and_exit_quit: + reset_and_exit_fail: + signal(SIGINT, sigint_default); + return DC_FAIL; ++reset_and_exit_quit: + reset_and_exit_success: + signal(SIGINT, sigint_default); + return DC_SUCCESS; +-- +2.17.1 + diff --git a/buildroot/package/bc/0004-no-gen-libmath.patch b/buildroot/package/bc/0004-no-gen-libmath.patch new file mode 100644 index 000000000..7cd506be2 --- /dev/null +++ b/buildroot/package/bc/0004-no-gen-libmath.patch @@ -0,0 +1,97 @@ +From a543af443c5f86b24ca89a994b75b6ef4751ac66 Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Thu, 12 Sep 2019 15:12:40 -0500 +Subject: [PATCH] no gen libmath + +These rules are not cross-friendly so delete them. libmath has been +generated offline and included as part of this patch as the fbc tool +used to generate that header is assuming the cross archtecture and +can't execute. + +Upstream: +https://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-extended/bc/bc/no-gen-libmath.patch +https://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-extended/bc/bc/libmath.h + +[Reformatted to GIT for 1.0.7.1 by Matt W] +Signed-off-by: Ross Burton +Signed-off-by: Matthew Weber +--- + bc/Makefile.am | 8 -------- + bc/libmath.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 46 insertions(+), 8 deletions(-) + create mode 100644 bc/libmath.h + +diff --git a/bc/Makefile.am b/bc/Makefile.am +index d9d412e..f244241 100644 +--- a/bc/Makefile.am ++++ b/bc/Makefile.am +@@ -31,14 +31,6 @@ global.o: libmath.h + + fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o + +-libmath.h: libmath.b $(fbcOBJ) $(LIBBC) +- echo '{0}' > libmath.h +- $(MAKE) global.o +- $(LINK) -o fbc $(fbcOBJ) global.o $(LIBBC) $(LIBL) $(READLINELIB) $(LIBS) +- ./fbc -c $(srcdir)/libmath.b libmath.h +- $(srcdir)/fix-libmath_h +- rm -f ./fbc ./global.o +- + sbcOBJ = main.o sbc.o scan.o execute.o global.o load.o storage.o util.o \ + warranty.o + sbc.o: sbc.c +diff --git a/bc/libmath.h b/bc/libmath.h +new file mode 100644 +index 0000000..63e1acb +--- /dev/null ++++ b/bc/libmath.h +@@ -0,0 +1,46 @@ ++{"@iK20:s2:p@r", ++"@iF1,5.6,7,8,9,10,11,12,13,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C1,0:", ++"s14:pl7:s0:pl14:RN1:l5:0Z4:l10:1+s10:pl5:K2:/s5:pl2:", ++"1+s2:pJ3:N4:l13:s2:p1l5:+s14:pl5:s6:p1s8:pK2:s11:pN6:1B7:J5:N8:", ++"l11:i11:pJ6:N7:l6:l5:*s6:l8:l11:*s8:/s9:pl9:0=Z9:l10:0>Z10:N11:", ++"l10:d10:Z12:l14:l14:*s14:pJ11:N12:N10:l15:s2:pl12:Z13:1l14:/R", ++"N13:l14:1/RN9:l14:l9:+s14:pJ8:N5:0R]@r", ++"@iF2,5.7,9,10,11,12,13,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C2,0:", ++"s14:pl7:s0:pl14:RN1:l5:0{Z2:1K10:l2:^-1/RN2:l2:s15:pK6:l2:+s2:", ++"pK2:s10:p0s11:pN3:l5:K2:}Z4:l10:K2:*s10:pl5:cRs5:pJ3:N4:N5:l5:", ++"K.5:{Z6:l10:K2:*s10:pl5:cRs5:pJ5:N6:l5:1-l5:1+/s13:s14:pl13:l13:", ++"*s12:pK3:s11:pN8:1B9:J7:N10:l11:K2:+s11:pJ8:N9:l13:l12:*s13:l11:", ++"/s9:pl9:0=Z11:l10:l14:*s14:pl15:s2:pl14:1/RN11:l14:l9:+s14:pJ10:N7:", ++"0R]@r", ++"@iF3,5.7,9,11,12,13,16,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C3,0:", ++"s14:pl7:s0:pl14:RN1:l2:s15:pK1.1:l15:*K2:+s2:p1C4,0:s14:pl5:0", ++"Z11:l15:K5:+s2:pK.2:C4,0:s6:pN11:", ++"l15:K3:+s2:pN12:l5:K.2:>Z13:l10:1+s10:pl5:K.2:-1l5:K.2:*+/s5:", ++"pJ12:N13:l5:s13:s14:pl5:nl5:*s16:pK3:s11:pN15:1B16:J14:N17:l11:", ++"K2:+s11:pJ15:N16:l13:l16:*s13:l11:/s9:pl9:0=Z18:l15:s2:pl10:l6:", ++"*l14:+l12:/RN18:l14:l9:+s14:pJ17:N14:0R]@r", ++"@iF6,13,5.6,7,8,9,10,11,12,16,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl13:", ++"l5:C6,00:s14:pl7:s0:pl14:RN1:l2:s15:p0s2:pl13:1/s13:pl13:0 Tue, 4 Apr 2006 17:21:02 +0100 -Author: Ian Jackson -Origin: other -Bug-Debian: http://bugs.debian.org/488735 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -diff --git a/bc/execute.c b/bc/execute.c -index e4e8ef7..8787048 100644 ---- a/bc/execute.c -+++ b/bc/execute.c -@@ -108,6 +108,7 @@ execute () - } - out_char ('\n'); - } -+ checkferror_output(stdout); - } - #endif - -@@ -222,6 +223,7 @@ execute () - } - } - fflush (stdout); -+ checkferror_output(stdout); - break; - - case 'R' : /* Return from function */ -@@ -257,6 +259,7 @@ execute () - if (inst == 'W') out_char ('\n'); - store_var (4); /* Special variable "last". */ - fflush (stdout); -+ checkferror_output(stdout); - pop (); - break; - -@@ -338,6 +341,7 @@ execute () - case 'w' : /* Write a string to the output. */ - while ((ch = byte(&pc)) != '"') out_schar (ch); - fflush (stdout); -+ checkferror_output(stdout); - break; - - case 'x' : /* Exchange Top of Stack with the one under the tos. */ -@@ -545,7 +549,10 @@ execute () - { - signal (SIGINT, use_quit); - if (had_sigint) -- printf ("\ninterrupted execution.\n"); -+ { -+ printf ("\ninterrupted execution.\n"); -+ checkferror_output(stdout); -+ } - } - } - -@@ -580,6 +587,7 @@ input_char () - out_col = 0; /* Saw a new line */ - } - } -+ checkferror_input(stdin); - - /* Classify and preprocess the input character. */ - if (isdigit(in_ch)) -diff --git a/bc/load.c b/bc/load.c -index 1035198..4039e86 100644 ---- a/bc/load.c -+++ b/bc/load.c -@@ -217,6 +217,7 @@ load_code (code) - if (label_no > 65535L) - { /* Better message? */ - fprintf (stderr,"Program too big.\n"); -+ checkferror_output(stderr); - exit(1); - } - addbyte ( (char) (label_no & 0xFF)); -diff --git a/bc/main.c b/bc/main.c -index 9a2461e..3ae427d 100644 ---- a/bc/main.c -+++ b/bc/main.c -@@ -358,6 +358,9 @@ use_quit (sig) - errno = save; - #else - write (1, "\n(interrupt) Exiting bc.\n", 26); -+#ifdef READLINE -+ rl_initialize (); /* Clear readline buffer */ -+#endif - #if defined(LIBEDIT) - if (edit != NULL) - el_end(edit); -diff --git a/bc/sbc.y b/bc/sbc.y -index 0ded29e..6fcc1fa 100644 ---- a/bc/sbc.y -+++ b/bc/sbc.y -@@ -86,7 +86,9 @@ program : /* empty */ - if (interactive && !quiet) - { - show_bc_version (); -+ checkferror_output(stdout); - welcome (); -+ checkferror_output(stdout); - } - } - | program input_item -diff --git a/bc/scan.c b/bc/scan.c -index 1f78ec2..2b5eeb4 100644 ---- a/bc/scan.c -+++ b/bc/scan.c -@@ -799,6 +799,7 @@ bcel_input (buf, result, max) - if (bcel_len != 0) - history (hist, &histev, H_ENTER, bcel_line); - fflush (stdout); -+ checkferror_output(stdout); - } - - if (bcel_len <= max) -@@ -874,6 +875,7 @@ rl_input (buf, result, max) - add_history (rl_line); - rl_line[rl_len-1] = '\n'; - fflush (stdout); -+ checkferror_output(stdout); - } - - if (rl_len <= max) -diff --git a/bc/scan.l b/bc/scan.l -index 841c3df..16cd62e 100644 ---- a/bc/scan.l -+++ b/bc/scan.l -@@ -111,6 +111,7 @@ bcel_input (buf, result, max) - if (bcel_len != 0) - history (hist, &histev, H_ENTER, bcel_line); - fflush (stdout); -+ checkferror_output(stdout); - } - - if (bcel_len <= max) -@@ -186,6 +187,7 @@ rl_input (buf, result, max) - add_history (rl_line); - rl_line[rl_len-1] = '\n'; - fflush (stdout); -+ checkferror_output(stdout); - } - - if (rl_len <= max) -@@ -310,6 +312,7 @@ limits return(Limits); - if (c == EOF) - { - fprintf (stderr,"EOF encountered in a comment.\n"); -+ checkferror_output(stderr); - break; - } - } -diff --git a/bc/storage.c b/bc/storage.c -index 699729a..37b4c6c 100644 ---- a/bc/storage.c -+++ b/bc/storage.c -@@ -99,6 +99,7 @@ more_functions (VOID) - { - f = &functions[indx]; - f->f_defined = FALSE; -+ f->f_void = FALSE; - f->f_body = (char *) bc_malloc (BC_START_SIZE); - f->f_body_size = BC_START_SIZE; - f->f_code_size = 0; -diff --git a/bc/util.c b/bc/util.c -index 30beaf9..669235f 100644 ---- a/bc/util.c -+++ b/bc/util.c -@@ -260,9 +260,10 @@ init_gen () - continue_label = 0; - next_label = 1; - out_count = 2; -- if (compile_only) -+ if (compile_only) { - printf ("@i"); -- else -+ checkferror_output(stdout); -+ } else - init_load (); - had_error = FALSE; - did_gen = FALSE; -@@ -286,6 +287,7 @@ generate (str) - printf ("\n"); - out_count = 0; - } -+ checkferror_output(stdout); - } - else - load_code (str); -@@ -303,6 +305,7 @@ run_code() - if (compile_only) - { - printf ("@r\n"); -+ checkferror_output(stdout); - out_count = 0; - } - else -@@ -341,6 +344,7 @@ out_char (ch) - } - putchar (ch); - } -+ checkferror_output(stdout); - } - - /* Output routines: Write a character CH to the standard output. -@@ -371,6 +375,7 @@ out_schar (ch) - } - putchar (ch); - } -+ checkferror_output(stdout); - } - - -@@ -657,6 +662,7 @@ limits() - #ifdef OLD_EQ_OP - printf ("Old assignment operatiors are valid. (=-, =+, ...)\n"); - #endif -+ checkferror_output(stdout); - } - - /* bc_malloc will check the return value so all other places do not -@@ -721,6 +727,7 @@ yyerror (str, va_alist) - fprintf (stderr,"%s %d: ",name,line_no); - vfprintf (stderr, str, args); - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - had_error = TRUE; - va_end (args); - } -@@ -761,6 +768,7 @@ warn (mesg, va_alist) - fprintf (stderr,"%s %d: Error: ",name,line_no); - vfprintf (stderr, mesg, args); - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - had_error = TRUE; - } - else -@@ -773,6 +781,7 @@ warn (mesg, va_alist) - fprintf (stderr,"%s %d: (Warning) ",name,line_no); - vfprintf (stderr, mesg, args); - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - } - va_end (args); - } -@@ -807,6 +816,7 @@ rt_error (mesg, va_alist) - va_end (args); - - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - runtime_error = TRUE; - } - -@@ -843,4 +853,5 @@ rt_warn (mesg, va_alist) - va_end (args); - - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - } -diff --git a/dc/dc.c b/dc/dc.c -index e03f094..0faf03a 100644 ---- a/dc/dc.c -+++ b/dc/dc.c -@@ -61,6 +61,7 @@ static void - bug_report_info DC_DECLVOID() - { - printf("Email bug reports to: bug-dc@gnu.org .\n"); -+ checkferror_output(stdout); - } - - static void -@@ -71,6 +72,7 @@ show_version DC_DECLVOID() - This is free software; see the source for copying conditions. There is NO\n\ - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n\ - to the extent permitted by law.\n", DC_COPYRIGHT); -+ checkferror_output(stdout); - } - - /* your generic usage function */ -@@ -87,6 +89,7 @@ Usage: %s [OPTION] [file ...]\n\ - \n\ - ", progname); - bug_report_info(); -+ checkferror_output(f); - } - - /* returns a pointer to one past the last occurance of c in s, -diff --git a/dc/eval.c b/dc/eval.c -index 4af7200..153d331 100644 ---- a/dc/eval.c -+++ b/dc/eval.c -@@ -94,12 +94,15 @@ static int input_pushback; - static int - input_fil DC_DECLVOID() - { -+ int c; - if (input_pushback != EOF){ -- int c = input_pushback; -+ c = input_pushback; - input_pushback = EOF; - return c; - } -- return getc(input_fil_fp); -+ c = getc(input_fil_fp); -+ checkferror_input(input_fil_fp); -+ return c; - } - - /* passed as an argument to dc_getnum */ -@@ -298,11 +301,13 @@ dc_func DC_DECLARG((c, peekc, negcmp)) - tmpint = dc_num2int(datum.v.number, DC_TOSS); - if (2 <= tmpint && tmpint <= DC_IBASE_MAX) - dc_ibase = tmpint; -- else -+ else { - fprintf(stderr, - "%s: input base must be a number \ - between 2 and %d (inclusive)\n", - progname, DC_IBASE_MAX); -+ checkferror_output(stderr); -+ } - } - break; - case 'k': /* set scale to value on top of stack */ -@@ -310,11 +315,12 @@ between 2 and %d (inclusive)\n", - tmpint = -1; - if (datum.dc_type == DC_NUMBER) - tmpint = dc_num2int(datum.v.number, DC_TOSS); -- if ( ! (tmpint >= 0) ) -+ if ( ! (tmpint >= 0) ) { - fprintf(stderr, - "%s: scale must be a nonnegative number\n", - progname); -- else -+ checkferror_output(stderr); -+ } else - dc_scale = tmpint; - } - break; -@@ -338,11 +344,12 @@ between 2 and %d (inclusive)\n", - tmpint = 0; - if (datum.dc_type == DC_NUMBER) - tmpint = dc_num2int(datum.v.number, DC_TOSS); -- if ( ! (tmpint > 1) ) -+ if ( ! (tmpint > 1) ) { - fprintf(stderr, - "%s: output base must be a number greater than 1\n", - progname); -- else -+ checkferror_output(stderr); -+ } else - dc_obase = tmpint; - } - break; -@@ -383,6 +390,7 @@ between 2 and %d (inclusive)\n", - fprintf(stderr, - "%s: square root of nonnumeric attempted\n", - progname); -+ checkferror_output(stderr); - }else if (dc_sqrt(datum.v.number, dc_scale, &tmpnum) == DC_SUCCESS){ - dc_free_num(&datum.v.number); - datum.v.number = tmpnum; -@@ -444,6 +452,7 @@ between 2 and %d (inclusive)\n", - fprintf(stderr, - "%s: Q command requires a number >= 1\n", - progname); -+ checkferror_output(stderr); - } - break; - #if 0 -@@ -489,11 +498,12 @@ between 2 and %d (inclusive)\n", - if (datum.dc_type == DC_NUMBER) - tmpint = dc_num2int(datum.v.number, DC_TOSS); - if (dc_pop(&datum) == DC_SUCCESS){ -- if (tmpint < 0) -+ if (tmpint < 0) { - fprintf(stderr, - "%s: array index must be a nonnegative integer\n", - progname); -- else -+ checkferror_output(stderr); -+ } else - dc_array_set(peekc, tmpint, datum); - } - } -@@ -505,17 +515,19 @@ between 2 and %d (inclusive)\n", - tmpint = -1; - if (datum.dc_type == DC_NUMBER) - tmpint = dc_num2int(datum.v.number, DC_TOSS); -- if (tmpint < 0) -+ if (tmpint < 0) { - fprintf(stderr, - "%s: array index must be a nonnegative integer\n", - progname); -- else -+ checkferror_output(stderr); -+ } else - dc_push(dc_array_get(peekc, tmpint)); - } - return DC_EATONE; - - default: /* What did that user mean? */ - fprintf(stderr, "%s: ", progname); -+ checkferror_output(stderr); - dc_show_id(stdout, c, " unimplemented\n"); - break; - } -@@ -544,6 +556,7 @@ dc_evalstr DC_DECLARG((string)) - fprintf(stderr, - "%s: eval called with non-string argument\n", - progname); -+ checkferror_output(stderr); - return DC_OKAY; - } - interrupt_seen = 0; -@@ -640,6 +653,7 @@ dc_evalstr DC_DECLARG((string)) - return DC_FAIL; - } - fprintf(stderr, "%s: unexpected EOS\n", progname); -+ checkferror_output(stderr); - return DC_OKAY; - } - } -@@ -665,6 +679,7 @@ dc_evalfile DC_DECLARG((fp)) - stdin_lookahead = EOF; - for (c=getc(fp); c!=EOF; c=peekc){ - peekc = getc(fp); -+ checkferror_input(stdin); - /* - * The following if() is the only place where ``stdin_lookahead'' - * might be set to other than EOF: -@@ -716,6 +731,7 @@ dc_evalfile DC_DECLARG((fp)) - return DC_SUCCESS; - fprintf(stderr, "%s: Q command argument exceeded \ - string execution depth\n", progname); -+ checkferror_output(stderr); - } - }else{ - dc_garbage("at top of stack", -1); -@@ -728,8 +744,11 @@ string execution depth\n", progname); - fprintf(stderr, - "%s: Q command argument exceeded string execution depth\n", - progname); -- if (stdin_lookahead != peekc && fp == stdin) -+ checkferror_output(stderr); -+ if (stdin_lookahead != peekc && fp == stdin) { - peekc = getc(fp); -+ checkferror_input(stdin); -+ } - break; - - case DC_INT: -@@ -771,6 +790,7 @@ string execution depth\n", progname); - if (ferror(fp)) - goto error_fail; - fprintf(stderr, "%s: unexpected EOF\n", progname); -+ checkferror_output(stderr); - return DC_FAIL; - } - } -diff --git a/dc/misc.c b/dc/misc.c -index f2388b0..1be56fe 100644 ---- a/dc/misc.c -+++ b/dc/misc.c -@@ -91,6 +91,7 @@ dc_show_id DC_DECLARG((fp, id, suffix)) - fprintf(fp, "'%c' (%#o)%s", (unsigned int) id, id, suffix); - else - fprintf(fp, "%#o%s", (unsigned int) id, suffix); -+ checkferror_output(fp); - } - - -diff --git a/dc/numeric.c b/dc/numeric.c -index 8e5e70f..c875eba 100644 ---- a/dc/numeric.c -+++ b/dc/numeric.c -@@ -134,6 +134,7 @@ dc_div DC_DECLARG((a, b, kscale, result)) - bc_init_num(CastNumPtr(result)); - if (bc_divide(CastNum(a), CastNum(b), CastNumPtr(result), kscale)){ - fprintf(stderr, "%s: divide by zero\n", progname); -+ checkferror_output(stderr); - return DC_DOMAIN_ERROR; - } - return DC_SUCCESS; -@@ -156,6 +157,7 @@ dc_divrem DC_DECLARG((a, b, kscale, quotient, remainder)) - if (bc_divmod(CastNum(a), CastNum(b), - CastNumPtr(quotient), CastNumPtr(remainder), kscale)){ - fprintf(stderr, "%s: divide by zero\n", progname); -+ checkferror_output(stderr); - return DC_DOMAIN_ERROR; - } - return DC_SUCCESS; -@@ -174,6 +176,7 @@ dc_rem DC_DECLARG((a, b, kscale, result)) - bc_init_num(CastNumPtr(result)); - if (bc_modulo(CastNum(a), CastNum(b), CastNumPtr(result), kscale)){ - fprintf(stderr, "%s: remainder by zero\n", progname); -+ checkferror_output(stderr); - return DC_DOMAIN_ERROR; - } - return DC_SUCCESS; -@@ -226,6 +229,7 @@ dc_sqrt DC_DECLARG((value, kscale, result)) - tmp = bc_copy_num(CastNum(value)); - if (!bc_sqrt(&tmp, kscale)){ - fprintf(stderr, "%s: square root of negative number\n", progname); -+ checkferror_output(stderr); - bc_free_num(&tmp); - return DC_DOMAIN_ERROR; - } -@@ -429,8 +433,10 @@ dc_out_num DC_DECLARG((value, obase, newline_p, discard_p)) - { - out_char('\0'); /* clear the column counter */ - bc_out_num(CastNum(value), obase, out_char, 0); -- if (newline_p == DC_WITHNL) -+ if (newline_p == DC_WITHNL) { - putchar ('\n'); -+ checkferror_output(stdout); -+ } - if (discard_p == DC_TOSS) - dc_free_num(&value); - } -@@ -475,6 +481,7 @@ dc_dump_num DC_DECLARG((dcvalue, discard_p)) - - for (cur=top_of_stack; cur; cur=next) { - putchar(cur->digit); -+ checkferror_output(stdout); - next = cur->link; - free(cur); - } -@@ -592,6 +599,7 @@ out_char (ch) - out_col = 1; - } - putchar(ch); -+ checkferror_output(stderr); - } - } - -@@ -631,6 +639,7 @@ rt_error (mesg, va_alist) - vfprintf (stderr, mesg, args); - va_end (args); - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - } - - -@@ -664,6 +673,7 @@ rt_warn (mesg, va_alist) - vfprintf (stderr, mesg, args); - va_end (args); - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - } - - -diff --git a/dc/stack.c b/dc/stack.c -index 0730e9c..5db3975 100644 ---- a/dc/stack.c -+++ b/dc/stack.c -@@ -38,7 +38,10 @@ - #include "dc-regdef.h" - - /* an oft-used error message: */ --#define Empty_Stack fprintf(stderr, "%s: stack empty\n", progname) -+#define Empty_Stack do{ \ -+ fprintf(stderr, "%s: stack empty\n", progname); \ -+ checkferror_output(stderr); \ -+ }while(0) - - - /* simple linked-list implementation suffices: */ -@@ -94,6 +97,7 @@ dc_binop DC_DECLARG((op, kscale)) - if (dc_stack->value.dc_type!=DC_NUMBER - || dc_stack->link->value.dc_type!=DC_NUMBER){ - fprintf(stderr, "%s: non-numeric value\n", progname); -+ checkferror_output(stderr); - return; - } - (void)dc_pop(&b); -@@ -134,6 +138,7 @@ dc_binop2 DC_DECLARG((op, kscale)) - if (dc_stack->value.dc_type!=DC_NUMBER - || dc_stack->link->value.dc_type!=DC_NUMBER){ - fprintf(stderr, "%s: non-numeric value\n", progname); -+ checkferror_output(stderr); - return; - } - (void)dc_pop(&b); -@@ -172,6 +177,7 @@ dc_cmpop DC_DECLVOID() - if (dc_stack->value.dc_type!=DC_NUMBER - || dc_stack->link->value.dc_type!=DC_NUMBER){ - fprintf(stderr, "%s: non-numeric value\n", progname); -+ checkferror_output(stderr); - return 0; - } - (void)dc_pop(&b); -@@ -209,6 +215,7 @@ dc_triop DC_DECLARG((op, kscale)) - || dc_stack->link->value.dc_type!=DC_NUMBER - || dc_stack->link->link->value.dc_type!=DC_NUMBER){ - fprintf(stderr, "%s: non-numeric value\n", progname); -+ checkferror_output(stderr); - return; - } - (void)dc_pop(&c); -@@ -327,6 +334,7 @@ dc_register_get DC_DECLARG((regid, result)) - r = dc_register[regid]; - if (r==NULL || r->value.dc_type==DC_UNINITIALIZED){ - fprintf(stderr, "%s: register ", progname); -+ checkferror_output(stderr); - dc_show_id(stderr, regid, " is empty\n"); - return DC_FAIL; - } -@@ -401,6 +409,7 @@ dc_register_pop DC_DECLARG((stackid, result)) - r = dc_register[stackid]; - if (r == NULL){ - fprintf(stderr, "%s: stack register ", progname); -+ checkferror_output(stderr); - dc_show_id(stderr, stackid, " is empty\n"); - return DC_FAIL; - } -diff --git a/dc/string.c b/dc/string.c -index ff1e7f1..e24092d 100644 ---- a/dc/string.c -+++ b/dc/string.c -@@ -101,6 +101,7 @@ dc_out_str DC_DECLARG((value, newline, discard_flag)) - fwrite(value->s_ptr, value->s_len, sizeof *value->s_ptr, stdout); - if (newline == DC_WITHNL) - putchar('\n'); -+ checkferror_output(stdout); - if (discard_flag == DC_TOSS) - dc_free_str(&value); - } -@@ -176,6 +177,7 @@ dc_readstring DC_DECLARG((fp, ldelim, rdelim)) - } - *p++ = c; - } -+ checkferror_input(fp); - return dc_makestring(line_buf, (size_t)(p-line_buf)); - } - -diff --git a/h/number.h b/h/number.h -index 9b034b6..3a00a92 100644 ---- a/h/number.h -+++ b/h/number.h -@@ -150,4 +150,7 @@ _PROTOTYPE(int bc_sqrt, (bc_num *num, int scale)); - _PROTOTYPE(void bc_out_num, (bc_num num, int o_base, void (* out_char)(int), - int leading_zero)); - -+_PROTOTYPE(void checkferror_input, (FILE*)); -+_PROTOTYPE(void checkferror_output, (FILE*)); -+ - #endif -diff --git a/lib/number.c b/lib/number.c -index e211840..4d3ce46 100644 ---- a/lib/number.c -+++ b/lib/number.c -@@ -1776,6 +1776,7 @@ static void - out_char (int c) - { - putchar(c); -+ checkferror_output(stdout); - } - - -@@ -1785,6 +1786,7 @@ pn (num) - { - bc_out_num (num, 10, out_char, 0); - out_char ('\n'); -+ checkferror_output(stdout); - } - - -@@ -1799,6 +1801,28 @@ pv (name, num, len) - printf ("%s=", name); - for (i=0; i - -diff -Nura bc-1.06.95.orig/doc/Makefile.in bc-1.06.95/doc/Makefile.in ---- bc-1.06.95.orig/doc/Makefile.in 2015-06-13 09:39:46.946620294 -0300 -+++ bc-1.06.95/doc/Makefile.in 2015-06-13 09:40:10.019407630 -0300 -@@ -96,7 +96,7 @@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = makeinfo --no-split -+MAKEINFO = @MAKEINFO@ --no-split - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/buildroot/package/bc/bc.hash b/buildroot/package/bc/bc.hash index 5f1ed6353..6feca831d 100644 --- a/buildroot/package/bc/bc.hash +++ b/buildroot/package/bc/bc.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc bc-1.06.95.tar.bz2 +sha256 62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a bc-1.07.1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB diff --git a/buildroot/package/bc/bc.mk b/buildroot/package/bc/bc.mk index ee0e43848..fdfacb6c8 100644 --- a/buildroot/package/bc/bc.mk +++ b/buildroot/package/bc/bc.mk @@ -4,11 +4,15 @@ # ################################################################################ -BC_VERSION = 1.06.95 -BC_SOURCE = bc-$(BC_VERSION).tar.bz2 -BC_SITE = http://alpha.gnu.org/gnu/bc +BC_VERSION = 1.07.1 +BC_SITE = http://ftp.gnu.org/gnu/bc BC_DEPENDENCIES = host-flex BC_LICENSE = GPL-2.0+, LGPL-2.1+ BC_LICENSE_FILES = COPYING COPYING.LIB +BC_CONF_ENV = MAKEINFO=true + +# 0001-bc-use-MAKEINFO-variable-for-docs.patch and 0004-no-gen-libmath.patch +# are patching doc/Makefile.am and Makefile.am respectively +BC_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/bcache-tools/bcache-tools.hash b/buildroot/package/bcache-tools/bcache-tools.hash index 6d3502fc2..d80ec44a7 100644 --- a/buildroot/package/bcache-tools/bcache-tools.hash +++ b/buildroot/package/bcache-tools/bcache-tools.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c bcache-tools-v1.0.8.tar.gz +sha256 d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c bcache-tools-1.0.8.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/bcache-tools/bcache-tools.mk b/buildroot/package/bcache-tools/bcache-tools.mk index 0e7a2821c..4ff10cc4e 100644 --- a/buildroot/package/bcache-tools/bcache-tools.mk +++ b/buildroot/package/bcache-tools/bcache-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -BCACHE_TOOLS_VERSION = v1.0.8 -BCACHE_TOOLS_SITE = $(call github,g2p,bcache-tools,$(BCACHE_TOOLS_VERSION)) +BCACHE_TOOLS_VERSION = 1.0.8 +BCACHE_TOOLS_SITE = $(call github,g2p,bcache-tools,v$(BCACHE_TOOLS_VERSION)) BCACHE_TOOLS_LICENSE = GPL-2.0 BCACHE_TOOLS_LICENSE_FILES = COPYING BCACHE_TOOLS_DEPENDENCIES = host-pkgconf util-linux diff --git a/buildroot/package/bcm2835/bcm2835.hash b/buildroot/package/bcm2835/bcm2835.hash index 1aea3ae3d..025ef8be4 100644 --- a/buildroot/package/bcm2835/bcm2835.hash +++ b/buildroot/package/bcm2835/bcm2835.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 295f66dab533592ce41db8e07befe985645a2e661bbf75dce9c383e61e24cb5f bcm2835-1.48.tar.gz +sha256 7beacda787d6073d0982bfe576c318bb2730700f7d0f7950c6e763dfcb06e0e5 bcm2835-1.62.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/bcm2835/bcm2835.mk b/buildroot/package/bcm2835/bcm2835.mk index e24c819ca..2435a42c9 100644 --- a/buildroot/package/bcm2835/bcm2835.mk +++ b/buildroot/package/bcm2835/bcm2835.mk @@ -4,7 +4,7 @@ # ################################################################################ -BCM2835_VERSION = 1.48 +BCM2835_VERSION = 1.62 BCM2835_SITE = http://www.airspayce.com/mikem/bcm2835 BCM2835_LICENSE = GPL-2.0 BCM2835_LICENSE_FILES = COPYING diff --git a/buildroot/package/bctoolbox/bctoolbox.hash b/buildroot/package/bctoolbox/bctoolbox.hash index 70be55c3d..6242355ee 100644 --- a/buildroot/package/bctoolbox/bctoolbox.hash +++ b/buildroot/package/bctoolbox/bctoolbox.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 da7df7ff359a9829e9e6ef98dfe9fead0cf735b8a4a5da1b1047f467dee1b2a9 bctoolbox-0.4.0.tar.gz +sha256 849dd903d98f12a964466ccfbaf3a1de1f94ad0ebd49a59d12f8ce4506f9f647 COPYING diff --git a/buildroot/package/bcusdk/bcusdk.hash b/buildroot/package/bcusdk/bcusdk.hash index 219498bcb..a97062143 100644 --- a/buildroot/package/bcusdk/bcusdk.hash +++ b/buildroot/package/bcusdk/bcusdk.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 014cdaafc36f223c584b39ae5d698dd037a8e15aba4e78a2e531b51ff1331304 bcusdk_0.0.5.tar.gz +sha256 014cdaafc36f223c584b39ae5d698dd037a8e15aba4e78a2e531b51ff1331304 bcusdk_0.0.5.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/bdwgc/0001-fix-link-with-of-bdw-gc-with-a-system-atomic_ops.patch b/buildroot/package/bdwgc/0001-fix-link-with-of-bdw-gc-with-a-system-atomic_ops.patch deleted file mode 100644 index 0d5e6b090..000000000 --- a/buildroot/package/bdwgc/0001-fix-link-with-of-bdw-gc-with-a-system-atomic_ops.patch +++ /dev/null @@ -1,57 +0,0 @@ -From b549c7faa9903340b09ef2592a2c7c213a110220 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 5 Nov 2018 22:50:40 +0100 -Subject: [PATCH] fix link with of bdw-gc with a system atomic_ops - -When bdw-gc is linked with libatomic_ops, bdw-gc.pc must contain the -needed libraries (such as -latomic_ops) otherwise build of applications -such as guile will fail on link stage: - -.libs/libguile_2.0_la-posix.o: In function `scm_tmpnam': -posix.c:(.text+0x2080): warning: the use of `tmpnam' is dangerous, better use `mkstemp' - CCLD guile -/home/buildroot/autobuild/run/instance-2/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgc.so: undefined reference to `AO_fetch_compare_and_swap_emulation' -/home/buildroot/autobuild/run/instance-2/output/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgc.so: undefined reference to `AO_store_full_emulation' - -So set ATOMIC_OPS_LIBS to -latomic_ops when a system atomic_ops library -is used and use ATOMIC_OPS_LIBS in bdw-gc.pc.in - -Fixes: - - http://autobuild.buildroot.org/results/2b23d445e57a5e0f417f5cb9417b0a668bb7bf1c - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/ivmai/bdwgc/pull/247] ---- - bdw-gc.pc.in | 2 +- - configure.ac | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/bdw-gc.pc.in b/bdw-gc.pc.in -index ef4c2341..9fc42465 100644 ---- a/bdw-gc.pc.in -+++ b/bdw-gc.pc.in -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: Boehm-Demers-Weiser Conservative Garbage Collector - Description: A garbage collector for C and C++ - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lgc -+Libs: -L${libdir} -lgc @ATOMIC_OPS_LIBS@ - Cflags: -I${includedir} -diff --git a/configure.ac b/configure.ac -index 21abe8fa..9ffe81de 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1081,7 +1081,9 @@ AS_IF([test x"$with_libatomic_ops" = xno \ - AC_MSG_CHECKING([which libatomic_ops to use]) - AS_IF([test x"$with_libatomic_ops" != xno], - [ AS_IF([test x"$with_libatomic_ops" != xnone -a x"$THREADS" != xnone], -- [ AC_MSG_RESULT([external]) ], -+ [ AC_MSG_RESULT([external]) -+ ATOMIC_OPS_LIBS="-latomic_ops" -+ AC_SUBST([ATOMIC_OPS_LIBS]) ], - [ AC_MSG_RESULT([none]) - AS_IF([test x"$THREADS" != xnone], - [ AC_DEFINE([GC_BUILTIN_ATOMIC], [1], --- -2.17.1 - diff --git a/buildroot/package/bdwgc/bdwgc.hash b/buildroot/package/bdwgc/bdwgc.hash index 6cc4674e6..4d2213196 100644 --- a/buildroot/package/bdwgc/bdwgc.hash +++ b/buildroot/package/bdwgc/bdwgc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8f23f9a20883d00af2bff122249807e645bdf386de0de8cbd6cce3e0c6968f04 gc-8.0.0.tar.gz +sha256 436a0ddc67b1ac0b0405b61a9675bca9e075c8156f4debd1d06f3a56c7cd289d gc-8.0.4.tar.gz sha256 aeeaabbf44e67d413e18719f0c6ac9c23387ab0b33e7a15ee46cf59ddef12cc7 README.QUICK diff --git a/buildroot/package/bdwgc/bdwgc.mk b/buildroot/package/bdwgc/bdwgc.mk index 3979cd88c..6ae9627a6 100644 --- a/buildroot/package/bdwgc/bdwgc.mk +++ b/buildroot/package/bdwgc/bdwgc.mk @@ -4,7 +4,7 @@ # ################################################################################ -BDWGC_VERSION = 8.0.0 +BDWGC_VERSION = 8.0.4 BDWGC_SOURCE = gc-$(BDWGC_VERSION).tar.gz BDWGC_SITE = http://www.hboehm.info/gc/gc_source BDWGC_INSTALL_STAGING = YES @@ -12,8 +12,6 @@ BDWGC_LICENSE = bdwgc license BDWGC_LICENSE_FILES = README.QUICK BDWGC_DEPENDENCIES = libatomic_ops host-pkgconf HOST_BDWGC_DEPENDENCIES = host-libatomic_ops host-pkgconf -# We're patching configure.ac -BDWGC_AUTORECONF = YES BDWGC_CONF_OPTS = CFLAGS_EXTRA="$(BDWGC_CFLAGS_EXTRA)" ifeq ($(BR2_sparc),y) diff --git a/buildroot/package/beecrypt/beecrypt.hash b/buildroot/package/beecrypt/beecrypt.hash index e697c26f0..2f84007b4 100644 --- a/buildroot/package/beecrypt/beecrypt.hash +++ b/buildroot/package/beecrypt/beecrypt.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d beecrypt-4.2.1.tar.gz +sha256 512d2d21b6b3384ba64781abb0208a1b87740bc31e2df48e2b206ddb7e4d5779 COPYING.LIB diff --git a/buildroot/package/bellagio/bellagio.hash b/buildroot/package/bellagio/bellagio.hash index 914dd7c36..bd95df0f1 100644 --- a/buildroot/package/bellagio/bellagio.hash +++ b/buildroot/package/bellagio/bellagio.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 593c0729c8ef8c1467b3bfefcf355ec19a46dd92e31bfc280e17d96b0934d74c libomxil-bellagio-0.9.3.tar.gz +sha256 a3d4e451d72288a4f8819b734ef610926213c2ba97e512add8de2f30843505a6 COPYING diff --git a/buildroot/package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch b/buildroot/package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch new file mode 100644 index 000000000..287d7bf03 --- /dev/null +++ b/buildroot/package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch @@ -0,0 +1,31 @@ +Use print as a function in SConstruct build file for Py3 compatibility. +This allow to run SCons on Python 3 + +[Upstream status: https://github.com/codehero/benejson/pull/12] + +Signed-off-by: Titouan Christophe +--- + benejson/SConscript | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/benejson/SConscript b/benejson/SConscript +index b7c5d10..80b4875 100644 +--- a/benejson/SConscript ++++ b/benejson/SConscript +@@ -9,11 +9,11 @@ lib_env = lib_env.Clone() + conf = Configure(lib_env) + + if not conf.CheckFunc("stpcpy"): +- print "Did not find stpcpy(), using bnj local version" ++ print("Did not find stpcpy(), using bnj local version") + conf.env.Append(CPPDEFINES = ["-Dstpcpy=bnj_local_stpcpy"]) + + if not conf.CheckFunc("stpncpy"): +- print "Did not find stpncpy(), using bnj local version" ++ print("Did not find stpncpy(), using bnj local version") + conf.env.Append(CPPDEFINES = ["-Dstpncpy=bnj_local_stpncpy"]) + lib_env = conf.Finish() + +-- +2.21.0 + diff --git a/buildroot/package/benejson/benejson.hash b/buildroot/package/benejson/benejson.hash index 696dc4f3f..437e1d9dd 100644 --- a/buildroot/package/benejson/benejson.hash +++ b/buildroot/package/benejson/benejson.hash @@ -1,2 +1,3 @@ # Locally computed sha256 2ce5f3c2323500bdf651e7fcaecbd1011997141e6067567b8d2caa4cf7182f4a benejson-0.9.7.tar.gz +sha256 d0b7dae881fcb18c4dddfd8b0c1643ae671d5f356d14ba5b4e95ca889cc9ec32 LICENSE diff --git a/buildroot/package/benejson/benejson.mk b/buildroot/package/benejson/benejson.mk index 680e5b5bd..5bb57d028 100644 --- a/buildroot/package/benejson/benejson.mk +++ b/buildroot/package/benejson/benejson.mk @@ -9,7 +9,7 @@ BENEJSON_SITE = $(call github,codehero,benejson,$(BENEJSON_VERSION)) BENEJSON_LICENSE = MIT BENEJSON_LICENSE_FILES = LICENSE BENEJSON_INSTALL_STAGING = YES -BENEJSON_DEPENDENCIES = host-scons +BENEJSON_DEPENDENCIES = host-python3 host-scons # wchar support needs to be manually disabled ifeq ($(BR2_USE_WCHAR),) @@ -41,7 +41,7 @@ endif # Shared enabled define BENEJSON_BUILD_CMDS (cd $(@D); \ $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ - $(SCONS) $(BENEJSON_SCONS_TARGETS)) + $(HOST_DIR)/bin/python3 $(SCONS) $(BENEJSON_SCONS_TARGETS)) endef define BENEJSON_INSTALL_STAGING_CMDS diff --git a/buildroot/package/bind/Config.in b/buildroot/package/bind/Config.in index 951dd2356..db10ceb30 100644 --- a/buildroot/package/bind/Config.in +++ b/buildroot/package/bind/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_BIND bool "bind" depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS help BIND (Berkeley Internet Name Domain) is an implementation of the Domain Name System (DNS) protocols @@ -30,7 +28,6 @@ if BR2_PACKAGE_BIND config BR2_PACKAGE_BIND_SERVER bool "Install server components" - default y help Install server components (named, lwresd) @@ -40,7 +37,3 @@ config BR2_PACKAGE_BIND_TOOLS Install tools (dig, host, nslookup, nsupdate) endif - -comment "bind needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/bind/bind.mk b/buildroot/package/bind/bind.mk index efe4abde9..89d83d4d5 100644 --- a/buildroot/package/bind/bind.mk +++ b/buildroot/package/bind/bind.mk @@ -18,17 +18,17 @@ BIND_TARGET_SERVER_SBIN += dnssec-settime dnssec-verify genrandom BIND_TARGET_SERVER_SBIN += isc-hmac-fixup named-journalprint nsec3hash BIND_TARGET_SERVER_SBIN += lwresd named named-checkconf named-checkzone BIND_TARGET_SERVER_SBIN += named-compilezone rndc rndc-confgen dnssec-dsfromkey -BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone +BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate BIND_CONF_ENV = \ BUILD_CC="$(TARGET_CC)" \ BUILD_CFLAGS="$(TARGET_CFLAGS)" BIND_CONF_OPTS = \ + $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ --without-lmdb \ --with-libjson=no \ --with-randomdev=/dev/urandom \ --enable-epoll \ - --with-libtool \ --with-gssapi=no \ --enable-filter-aaaa @@ -54,16 +54,13 @@ BIND_CONF_OPTS += --with-libxml2=no endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -BIND_DEPENDENCIES += openssl -BIND_CONF_ENV += \ - ac_cv_func_EVP_sha256=yes \ - ac_cv_func_EVP_sha384=yes \ - ac_cv_func_EVP_sha512=yes +BIND_DEPENDENCIES += host-pkgconf openssl BIND_CONF_OPTS += \ - --with-openssl=$(STAGING_DIR)/usr LIBS="-lz" \ + --with-openssl=$(STAGING_DIR)/usr \ --with-ecdsa=yes \ --with-eddsa=no \ --with-aes=yes +BIND_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` # GOST cipher support requires openssl extra engines ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) BIND_CONF_OPTS += --with-gost=yes @@ -88,6 +85,16 @@ else BIND_CONF_OPTS += --with-readline=no endif +ifeq ($(BR2_STATIC_LIBS),y) +BIND_CONF_OPTS += \ + --without-dlopen \ + --without-libtool +else +BIND_CONF_OPTS += \ + --with-dlopen \ + --with-libtool +endif + define BIND_TARGET_REMOVE_SERVER rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/, $(BIND_TARGET_SERVER_SBIN)) endef @@ -104,11 +111,6 @@ endef define BIND_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(BIND_PKGDIR)/named.service \ $(TARGET_DIR)/usr/lib/systemd/system/named.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf /usr/lib/systemd/system/named.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/named.service endef else BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_REMOVE_SERVER diff --git a/buildroot/package/binutils/2.28.1/0120-sh-conf.patch b/buildroot/package/binutils/2.28.1/0120-sh-conf.patch deleted file mode 100644 index f77599835..000000000 --- a/buildroot/package/binutils/2.28.1/0120-sh-conf.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ceee199e9a32034c6def7700fdbb26335ca76a3 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 34b66f7..905bc7b 100755 ---- a/configure -+++ b/configure -@@ -3943,7 +3943,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index 4977d97..1e69ee2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1279,7 +1279,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.4.3 - diff --git a/buildroot/package/binutils/2.28.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch b/buildroot/package/binutils/2.28.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch deleted file mode 100644 index 30103ee05..000000000 --- a/buildroot/package/binutils/2.28.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3c8788dbb70b40e737d4b8e30cab81406e5c5091 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 2 Aug 2017 00:36:05 -0700 -Subject: [PATCH] xtensa: fix memory corruption by broken sysregs - -In some xtensa configurations there may be system/user registers in -xtensa-modules with negative index. ISA initialization for such config -may clobber heap and result in program termination. -Don't update lookup table entries for register with negative indices. -They are not directly accessible via RSR/WSR/XSR or RUR/WUR, so this -change should not affect processing of valid assembly/binary code. - -bfd/ -2017-08-02 Max Filippov - - * xtensa-isa.c (xtensa_isa_init): Don't update lookup table - entries for sysregs with negative indices. - -Signed-off-by: Max Filippov ---- -Backported from: d84ed528d4817b0ff854006b65a9f6ec75f0407a - - bfd/xtensa-isa.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c -index 8da75bea8109..8c6ee88fdeae 100644 ---- a/bfd/xtensa-isa.c -+++ b/bfd/xtensa-isa.c -@@ -292,7 +292,8 @@ xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p) - xtensa_sysreg_internal *sreg = &isa->sysregs[n]; - is_user = sreg->is_user; - -- isa->sysreg_table[is_user][sreg->number] = n; -+ if (sreg->number >= 0) -+ isa->sysreg_table[is_user][sreg->number] = n; - } - - /* Set up the interface lookup table. */ --- -2.1.4 - diff --git a/buildroot/package/binutils/2.28.1/0300-ld-makefile.patch b/buildroot/package/binutils/2.28.1/0300-ld-makefile.patch deleted file mode 100644 index 671019579..000000000 --- a/buildroot/package/binutils/2.28.1/0300-ld-makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d76a7549b43974fe8564971a3f40459bc495a8a7 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:40:53 +0100 -Subject: [PATCH] ld-makefile - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/Makefile.am | 2 +- - ld/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ld/Makefile.am b/ld/Makefile.am -index 0b3b049..3871c74 100644 ---- a/ld/Makefile.am -+++ b/ld/Makefile.am -@@ -57,7 +57,7 @@ endif - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff --git a/ld/Makefile.in b/ld/Makefile.in -index ed98f87..530e4c9 100644 ---- a/ld/Makefile.in -+++ b/ld/Makefile.in -@@ -452,7 +452,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include --- -2.4.3 - diff --git a/buildroot/package/binutils/2.28.1/0301-check-ldrunpath-length.patch b/buildroot/package/binutils/2.28.1/0301-check-ldrunpath-length.patch deleted file mode 100644 index 8d673dcfc..000000000 --- a/buildroot/package/binutils/2.28.1/0301-check-ldrunpath-length.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ebe1cba46df52d7bf86def3d681271fd05fb453b Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:41:47 +0100 -Subject: [PATCH] check-ldrunpath-length - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/emultempl/elf32.em | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index 0405d4f..efd3300 100644 ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1411,6 +1411,8 @@ fragment <link.next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) --- -2.4.3 - diff --git a/buildroot/package/binutils/2.28.1/0500-add-sysroot-fix-from-bug-3049.patch b/buildroot/package/binutils/2.28.1/0500-add-sysroot-fix-from-bug-3049.patch deleted file mode 100644 index 033108866..000000000 --- a/buildroot/package/binutils/2.28.1/0500-add-sysroot-fix-from-bug-3049.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 30628870e583375f8927c04398c7219c6e9f703c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:42:48 +0100 -Subject: [PATCH] add sysroot fix from bug #3049 - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - -Signed-off-by: Sven Rebhan -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/ldfile.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/ld/ldfile.c diff --git b/ld/ldfile.c ---- a/ld/ldfile.c 2017-03-02 03:23:54.000000000 -0500 -+++ b/ld/ldfile.c 2017-03-20 09:52:27.687415942 -0400 -@@ -336,18 +336,24 @@ - directory first. */ - if (!entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = TRUE; - return TRUE; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return TRUE; - - if (IS_ABSOLUTE_PATH (entry->filename)) - diff --git a/buildroot/package/binutils/2.28.1/0600-poison-system-directories.patch b/buildroot/package/binutils/2.28.1/0600-poison-system-directories.patch deleted file mode 100644 index bb1a7b438..000000000 --- a/buildroot/package/binutils/2.28.1/0600-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From be366461dd49e760440fb28eaee5164eb281adcc Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texinfo | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 276fb77..35c58eb 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -17,6 +17,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index a446283..d1f9504 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -789,6 +789,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1446,6 +1447,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15499,7 +15502,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 188172d..2cd8443 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index d84ec4e..3476b26 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -172,6 +172,14 @@ typedef struct { - /* If set, display the target memory usage (per memory region). */ - bfd_boolean print_memory_usage; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index 1dd7492..fb1438e 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -2403,6 +2403,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 1439309..086b354 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 6f11e7b..0ca3110 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -146,6 +146,8 @@ enum option_values - OPTION_PRINT_MEMORY_USAGE, - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index bb0b9cc..a23c56c 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 4cad209..be7d584 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -535,6 +535,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -547,6 +555,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1528,6 +1537,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1571,6 +1588,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - lang_leave_group (); --- -2.4.3 - diff --git a/buildroot/package/binutils/2.28.1/0906-microblaze-pr21180.patch b/buildroot/package/binutils/2.28.1/0906-microblaze-pr21180.patch deleted file mode 100644 index 52ac4fdd1..000000000 --- a/buildroot/package/binutils/2.28.1/0906-microblaze-pr21180.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix ld segfault for microblaze when --gc-sections is used -Upstream: pending -https://sourceware.org/bugzilla/show_bug.cgi?id=21180 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c ---- a/bfd/elf32-microblaze.c 2016-08-03 09:36:50.000000000 +0200 -+++ b/bfd/elf32-microblaze.c 2017-02-23 19:43:12.612313590 +0100 -@@ -3233,13 +3233,20 @@ - || h->dynindx == -1)) - { - asection *sec = h->root.u.def.section; -+ bfd_vma value; -+ -+ value = h->root.u.def.value; -+ if (sec->output_section != NULL) -+ /* PR 21180: If the output section is NULL, then the symbol is no -+ longer needed, and in theory the GOT entry is redundant. But -+ it is too late to change our minds now... */ -+ value += sec->output_section->vma + sec->output_offset; -+ - microblaze_elf_output_dynamic_relocation (output_bfd, - srela, srela->reloc_count++, - /* symindex= */ 0, - R_MICROBLAZE_REL, offset, -- h->root.u.def.value -- + sec->output_section->vma -- + sec->output_offset); -+ value); - } - else - { diff --git a/buildroot/package/binutils/2.29.1/0001-sh-conf.patch b/buildroot/package/binutils/2.29.1/0001-sh-conf.patch deleted file mode 100644 index 3c9ef62e2..000000000 --- a/buildroot/package/binutils/2.29.1/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From fdb0d1d63d8dc30b319db174f2a90e681d8cd2ed Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Thomas: rebase on top of 2.29, in which sh64 support was removed.] -Signed-off-by: Thomas Petazzoni ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index be9dd89..3c0f4c6 100755 ---- a/configure -+++ b/configure -@@ -3844,7 +3844,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index 532c5c2..4f40318 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1178,7 +1178,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.9.4 - diff --git a/buildroot/package/binutils/2.29.1/0002-ld-makefile.patch b/buildroot/package/binutils/2.29.1/0002-ld-makefile.patch deleted file mode 100644 index a7cd71e63..000000000 --- a/buildroot/package/binutils/2.29.1/0002-ld-makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d4e18ebc6ad810167a2de84b185a5f0d65b9ec2d Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:40:53 +0100 -Subject: [PATCH] ld-makefile - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/Makefile.am | 2 +- - ld/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ld/Makefile.am b/ld/Makefile.am -index 625347f..d5334d2 100644 ---- a/ld/Makefile.am -+++ b/ld/Makefile.am -@@ -57,7 +57,7 @@ endif - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff --git a/ld/Makefile.in b/ld/Makefile.in -index ba25177..a2cf228 100644 ---- a/ld/Makefile.in -+++ b/ld/Makefile.in -@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include --- -2.9.4 - diff --git a/buildroot/package/binutils/2.29.1/0003-check-ldrunpath-length.patch b/buildroot/package/binutils/2.29.1/0003-check-ldrunpath-length.patch deleted file mode 100644 index 3fbc5031d..000000000 --- a/buildroot/package/binutils/2.29.1/0003-check-ldrunpath-length.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3bd211025c890ef2971958915d500a9bb2913a2a Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:41:47 +0100 -Subject: [PATCH] check-ldrunpath-length - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/emultempl/elf32.em | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index d2551b6..70fcb56 100644 ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1463,6 +1463,8 @@ fragment <link.next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) --- -2.9.4 - diff --git a/buildroot/package/binutils/2.29.1/0004-add-sysroot-fix-from-bug-3049.patch b/buildroot/package/binutils/2.29.1/0004-add-sysroot-fix-from-bug-3049.patch deleted file mode 100644 index 9e11840ce..000000000 --- a/buildroot/package/binutils/2.29.1/0004-add-sysroot-fix-from-bug-3049.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 378bda0e19d279535b3f4a0e448a658a534a5d67 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:42:48 +0100 -Subject: [PATCH] add sysroot fix from bug #3049 - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - -Signed-off-by: Sven Rebhan -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/ldfile.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 3b37a0a..f7e5473 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -338,18 +338,24 @@ ldfile_open_file_search (const char *arch, - directory first. */ - if (!entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = TRUE; - return TRUE; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return TRUE; - - if (IS_ABSOLUTE_PATH (entry->filename)) --- -2.9.4 - diff --git a/buildroot/package/binutils/2.29.1/0005-poison-system-directories.patch b/buildroot/package/binutils/2.29.1/0005-poison-system-directories.patch deleted file mode 100644 index a7c2761a9..000000000 --- a/buildroot/package/binutils/2.29.1/0005-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From b100e9d16bfe6725b2624902af457ecfa490b150 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texinfo | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 5d91380..ffe84a7 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -21,6 +21,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index da20ab5..63e3da7 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -785,6 +785,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1443,6 +1444,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15497,7 +15500,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 34315e6..5ade9a0 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index 162e156..7d6d7ef 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -177,6 +177,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index bb5f719..78501e4 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -2480,6 +2480,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index f7e5473..2cd84d3 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 5aa7f6b..cb655e0 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -147,6 +147,8 @@ enum option_values - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, - OPTION_FORCE_GROUP_ALLOCATION, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index ee5ab11..5f6effd 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 08106bc..d619d50 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -538,6 +538,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -550,6 +558,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1534,6 +1543,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1577,6 +1594,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - lang_leave_group (); --- -2.9.4 - diff --git a/buildroot/package/binutils/2.30/0001-sh-conf.patch b/buildroot/package/binutils/2.30/0001-sh-conf.patch deleted file mode 100644 index 80cf35b11..000000000 --- a/buildroot/package/binutils/2.30/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b30ec72417164a2e990bc986eb0da05b7ef054fa Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Thomas: rebase on top of 2.29, in which sh64 support was removed.] -Signed-off-by: Thomas Petazzoni ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 2d615a9996..18d74ab96e 100755 ---- a/configure -+++ b/configure -@@ -3835,7 +3835,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index aae94501e4..b530e54926 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1166,7 +1166,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.14.3 - diff --git a/buildroot/package/binutils/2.30/0002-ld-makefile.patch b/buildroot/package/binutils/2.30/0002-ld-makefile.patch deleted file mode 100644 index 992ffaee6..000000000 --- a/buildroot/package/binutils/2.30/0002-ld-makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ -From bf6f72c4e3c57864417ac1f917404cc83af8ec14 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:40:53 +0100 -Subject: [PATCH] ld-makefile - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/Makefile.am | 2 +- - ld/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ld/Makefile.am b/ld/Makefile.am -index 6243c12528..3c5d6c8202 100644 ---- a/ld/Makefile.am -+++ b/ld/Makefile.am -@@ -57,7 +57,7 @@ endif - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff --git a/ld/Makefile.in b/ld/Makefile.in -index 760c037f9d..6dea692869 100644 ---- a/ld/Makefile.in -+++ b/ld/Makefile.in -@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include --- -2.14.3 - diff --git a/buildroot/package/binutils/2.30/0003-check-ldrunpath-length.patch b/buildroot/package/binutils/2.30/0003-check-ldrunpath-length.patch deleted file mode 100644 index 7af98749d..000000000 --- a/buildroot/package/binutils/2.30/0003-check-ldrunpath-length.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c18554e56d2534cbb37d2d065d3782ce4ef2533c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:41:47 +0100 -Subject: [PATCH] check-ldrunpath-length - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/emultempl/elf32.em | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index c0925fc9b9..0ce16d73a5 100644 ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1470,6 +1470,8 @@ fragment <link.next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) --- -2.14.3 - diff --git a/buildroot/package/binutils/2.30/0004-add-sysroot-fix-from-bug-3049.patch b/buildroot/package/binutils/2.30/0004-add-sysroot-fix-from-bug-3049.patch deleted file mode 100644 index a110cf194..000000000 --- a/buildroot/package/binutils/2.30/0004-add-sysroot-fix-from-bug-3049.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 20fff697c52e24700e76d64d202ad7a9228b630e Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:42:48 +0100 -Subject: [PATCH] add sysroot fix from bug #3049 - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - -Signed-off-by: Sven Rebhan -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/ldfile.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 6532a57d96..eefc2ebefb 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -338,18 +338,24 @@ ldfile_open_file_search (const char *arch, - directory first. */ - if (!entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = TRUE; - return TRUE; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return TRUE; - - if (IS_ABSOLUTE_PATH (entry->filename)) --- -2.14.3 - diff --git a/buildroot/package/binutils/2.30/0005-poison-system-directories.patch b/buildroot/package/binutils/2.30/0005-poison-system-directories.patch deleted file mode 100644 index 4007be96c..000000000 --- a/buildroot/package/binutils/2.30/0005-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From 28e0da3dede55d02eb64e015d363747772694566 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texinfo | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index a846743da6..df3cd5fb60 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -27,6 +27,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index 066b5146c6..11e7402909 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -785,6 +785,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1444,6 +1445,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15500,7 +15503,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index bada1b50b0..d074a3820b 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index ba914b921e..9df17dab6c 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index c89915f1aa..df430837e2 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -2498,6 +2498,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index eefc2ebefb..bf7063ae8c 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 140ed1d9da..9965cbc04f 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -147,6 +147,8 @@ enum option_values - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, - OPTION_FORCE_GROUP_ALLOCATION, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index e02fd3f1ff..5dfe9ba7e8 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -261,6 +261,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index f2191602d4..037a27a24a 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -538,6 +538,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -550,6 +558,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1534,6 +1543,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1577,6 +1594,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - lang_leave_group (); --- -2.14.3 - diff --git a/buildroot/package/binutils/2.30/0006-ARC-Refactored-location-where-GOT-information-is-col.patch b/buildroot/package/binutils/2.30/0006-ARC-Refactored-location-where-GOT-information-is-col.patch deleted file mode 100644 index 396f2f14f..000000000 --- a/buildroot/package/binutils/2.30/0006-ARC-Refactored-location-where-GOT-information-is-col.patch +++ /dev/null @@ -1,197 +0,0 @@ -From 141346d3968bdc82d3e487f3effdc3f835a09403 Mon Sep 17 00:00:00 2001 -From: Cupertino Miranda -Date: Fri, 2 Mar 2018 17:16:21 +0100 -Subject: [PATCH] [ARC] Refactored location where GOT information is - collected. - -Change location where GOT information is collected for ARC target, avoiding -posible use conflicts of the previous .got field in the symbols hash_entry. - -bfd/ -2018-03-01 Cupertino Miranda - - * arc-got.h (get_got_entry_list_for_symbol): Changed. - * ef32-arc.c (struct elf_arc_link_hash_entry): Moved and changed. - (elf_arc_link_hash_newfunc): Changed. - (arc_elf_link_hash_table_create): Removed old initializations. - (elf_arc_relocate_section, elf_arc_finish_dynamic_symbol): Changed. - -Signed-off-by: Alexey Brodkin ---- - bfd/arc-got.h | 6 ++-- - bfd/elf32-arc.c | 77 +++++++++++++++++++++++++++---------------------- - 2 files changed, 46 insertions(+), 37 deletions(-) - -diff --git a/bfd/arc-got.h b/bfd/arc-got.h -index a86061bcb38f..81ce88fe21a0 100644 ---- a/bfd/arc-got.h -+++ b/bfd/arc-got.h -@@ -156,9 +156,11 @@ get_got_entry_list_for_symbol (bfd *abfd, - unsigned long r_symndx, - struct elf_link_hash_entry *h) - { -- if (h != NULL) -+ struct elf_arc_link_hash_entry *h1 = -+ ((struct elf_arc_link_hash_entry *) h); -+ if (h1 != NULL) - { -- return &h->got.glist; -+ return &h1->got_ents; - } - else - { -diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c -index 5921cc25259e..166a5ef604ff 100644 ---- a/bfd/elf32-arc.c -+++ b/bfd/elf32-arc.c -@@ -159,6 +159,18 @@ struct arc_relocation_data - const char * symbol_name; - }; - -+/* ARC ELF linker hash entry. */ -+struct elf_arc_link_hash_entry -+{ -+ struct elf_link_hash_entry root; -+ -+ /* Track dynamic relocs copied for this symbol. */ -+ struct elf_dyn_relocs *dyn_relocs; -+ -+ struct got_entry *got_ents; -+}; -+ -+ - /* Should be included at this location due to static declarations - * defined before this point. */ - #include "arc-got.h" -@@ -275,15 +287,6 @@ struct arc_reloc_map - unsigned char elf_reloc_val; - }; - --/* ARC ELF linker hash entry. */ --struct elf_arc_link_hash_entry --{ -- struct elf_link_hash_entry root; -- -- /* Track dynamic relocs copied for this symbol. */ -- struct elf_dyn_relocs *dyn_relocs; --}; -- - /* ARC ELF linker hash table. */ - struct elf_arc_link_hash_table - { -@@ -295,28 +298,28 @@ elf_arc_link_hash_newfunc (struct bfd_hash_entry *entry, - struct bfd_hash_table *table, - const char *string) - { -+ struct elf_arc_link_hash_entry * ret = -+ (struct elf_arc_link_hash_entry *) entry; -+ - /* Allocate the structure if it has not already been allocated by a - subclass. */ -- if (entry == NULL) -- { -- entry = (struct bfd_hash_entry *) -- bfd_hash_allocate (table, -- sizeof (struct elf_arc_link_hash_entry)); -- if (entry == NULL) -- return entry; -- } -+ if (ret == NULL) -+ ret = (struct elf_arc_link_hash_entry *) -+ bfd_hash_allocate (table, sizeof (struct elf_arc_link_hash_entry)); -+ if (ret == NULL) -+ return (struct bfd_hash_entry *) ret; - - /* Call the allocation method of the superclass. */ -- entry = _bfd_elf_link_hash_newfunc (entry, table, string); -- if (entry != NULL) -+ ret = ((struct elf_arc_link_hash_entry *) -+ _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret, -+ table, string)); -+ if (ret != NULL) - { -- struct elf_arc_link_hash_entry *eh; -- -- eh = (struct elf_arc_link_hash_entry *) entry; -- eh->dyn_relocs = NULL; -+ ret->dyn_relocs = NULL; -+ ret->got_ents = NULL; - } - -- return entry; -+ return (struct bfd_hash_entry *) ret; - } - - /* Destroy an ARC ELF linker hash table. */ -@@ -346,11 +349,6 @@ arc_elf_link_hash_table_create (bfd *abfd) - return NULL; - } - -- ret->elf.init_got_refcount.refcount = 0; -- ret->elf.init_got_refcount.glist = NULL; -- ret->elf.init_got_offset.offset = 0; -- ret->elf.init_got_offset.glist = NULL; -- - ret->elf.root.hash_table_free = elf_arc_link_hash_table_free; - - return &ret->elf.root; -@@ -1598,10 +1596,14 @@ elf_arc_relocate_section (bfd * output_bfd, - while (h->root.type == bfd_link_hash_indirect - || h->root.type == bfd_link_hash_warning) - { -- struct elf_link_hash_entry *h_old = h; -+ struct elf_arc_link_hash_entry *ah_old = -+ (struct elf_arc_link_hash_entry *) h; - h = (struct elf_link_hash_entry *) h->root.u.i.link; -- if (h->got.glist == 0 && h_old->got.glist != h->got.glist) -- h->got.glist = h_old->got.glist; -+ struct elf_arc_link_hash_entry *ah = -+ (struct elf_arc_link_hash_entry *) h; -+ -+ if (ah->got_ents == 0 && ah_old->got_ents != ah->got_ents) -+ ah->got_ents = ah_old->got_ents; - } - - /* TODO: Need to validate what was the intention. */ -@@ -1619,6 +1621,8 @@ elf_arc_relocate_section (bfd * output_bfd, - - if (is_reloc_for_GOT (howto) && !bfd_link_pic (info)) - { -+ struct elf_arc_link_hash_entry *ah = -+ (struct elf_arc_link_hash_entry *) h; - /* TODO: Change it to use arc_do_relocation with - ARC_32 reloc. Try to use ADD_RELA macro. */ - bfd_vma relocation = -@@ -1628,8 +1632,8 @@ elf_arc_relocate_section (bfd * output_bfd, - + reloc_data.sym_section->output_section->vma) - : 0); - -- BFD_ASSERT (h->got.glist); -- bfd_vma got_offset = h->got.glist->offset; -+ BFD_ASSERT (ah->got_ents); -+ bfd_vma got_offset = ah->got_ents->offset; - bfd_put_32 (output_bfd, relocation, - htab->sgot->contents + got_offset); - } -@@ -1941,6 +1945,7 @@ elf_arc_check_relocs (bfd * abfd, - else /* Global one. */ - h = sym_hashes[r_symndx - symtab_hdr->sh_info]; - -+ - switch (r_type) - { - case R_ARC_32: -@@ -2387,7 +2392,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd, - create respective dynamic relocs. */ - /* TODO: Make function to get list and not access the list directly. */ - /* TODO: Move function to relocate_section create this relocs eagerly. */ -- create_got_dynrelocs_for_got_info (&h->got.glist, -+ struct elf_arc_link_hash_entry *ah = -+ (struct elf_arc_link_hash_entry *) h; -+ create_got_dynrelocs_for_got_info (&ah->got_ents, - output_bfd, - info, - h); --- -2.17.1 - diff --git a/buildroot/package/binutils/2.30/0007-ARC-Improved-robustness.-Return-FALSE-in-case-of-NUL.patch b/buildroot/package/binutils/2.30/0007-ARC-Improved-robustness.-Return-FALSE-in-case-of-NUL.patch deleted file mode 100644 index 0633692ca..000000000 --- a/buildroot/package/binutils/2.30/0007-ARC-Improved-robustness.-Return-FALSE-in-case-of-NUL.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4bac50c2c94023cb1b5bf947abfb1c72eeeb12d5 Mon Sep 17 00:00:00 2001 -From: Cupertino Miranda -Date: Fri, 2 Mar 2018 17:33:48 +0100 -Subject: [PATCH] [ARC] Improved robustness. Return FALSE in case of NULL - pointer. - -bfd/ -2018-03-01 Cupertino Miranda - - * elf32-arc.c (elf_arc_finish_dynamic_symbol) Return FALSE in case - arc_htab is NULL. - -Signed-off-by: Alexey Brodkin ---- - bfd/elf32-arc.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c -index 166a5ef604ff..72b808b99127 100644 ---- a/bfd/elf32-arc.c -+++ b/bfd/elf32-arc.c -@@ -2403,6 +2403,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd, - { - struct elf_arc_link_hash_table *arc_htab = elf_arc_hash_table (info); - -+ if(arc_htab == NULL) -+ return FALSE; -+ - if (h->dynindx == -1 - || (h->root.type != bfd_link_hash_defined - && h->root.type != bfd_link_hash_defweak) --- -2.17.1 - diff --git a/buildroot/package/binutils/2.30/0008-ARC-Make-sure-global-symbol-is-not-an-indirect-or-wa.patch b/buildroot/package/binutils/2.30/0008-ARC-Make-sure-global-symbol-is-not-an-indirect-or-wa.patch deleted file mode 100644 index 2ffe9c973..000000000 --- a/buildroot/package/binutils/2.30/0008-ARC-Make-sure-global-symbol-is-not-an-indirect-or-wa.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b182c9f81daa08cf18cd78af3e7aca74640e8551 Mon Sep 17 00:00:00 2001 -From: Cupertino Miranda -Date: Fri, 2 Mar 2018 17:38:14 +0100 -Subject: [PATCH] [ARC] Make sure global symbol is not an indirect or - warning. - -Problem identified in the context of glibc with latest upstream binutils. -Dynamic symbol space was being reserved but, no actual information for the -symbol was being set. Data for the symbol was kept initialized with -1. -No easy test case was possible to be created. - -bfd/ -2018-03-01 Cupertino Miranda - - * elf32-arc.c (elf_arc_check_relocs): Changed. - -Signed-off-by: Alexey Brodkin ---- - bfd/elf32-arc.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c -index 72b808b99127..6f6470f6f202 100644 ---- a/bfd/elf32-arc.c -+++ b/bfd/elf32-arc.c -@@ -1943,7 +1943,12 @@ elf_arc_check_relocs (bfd * abfd, - if (r_symndx < symtab_hdr->sh_info) /* Is a local symbol. */ - h = NULL; - else /* Global one. */ -- h = sym_hashes[r_symndx - symtab_hdr->sh_info]; -+ { -+ h = sym_hashes[r_symndx - symtab_hdr->sh_info]; -+ while (h->root.type == bfd_link_hash_indirect -+ || h->root.type == bfd_link_hash_warning) -+ h = (struct elf_link_hash_entry *) h->root.u.i.link; -+ } - - - switch (r_type) --- -2.17.1 - diff --git a/buildroot/package/binutils/2.30/0009-ARC-PLT-information-was-still-being-generated-when-s.patch b/buildroot/package/binutils/2.30/0009-ARC-PLT-information-was-still-being-generated-when-s.patch deleted file mode 100644 index a5bcb94d1..000000000 --- a/buildroot/package/binutils/2.30/0009-ARC-PLT-information-was-still-being-generated-when-s.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e2f2d7f939435280003983ef822acd0844648643 Mon Sep 17 00:00:00 2001 -From: Cupertino Miranda -Date: Fri, 2 Mar 2018 17:44:29 +0100 -Subject: [PATCH] [ARC] PLT information was still being generated when - symbol was forced_local. - -A change upstream reveiled this issue, triggering an assert when linking glibc. - -bfd/ -2018-03-01 Cupertino Miranda - - * elf32-arc.c (elf_arc_check_relocs): Changed. - -Signed-off-by: Alexey Brodkin ---- - bfd/elf32-arc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c -index 6f6470f6f202..184957c7d750 100644 ---- a/bfd/elf32-arc.c -+++ b/bfd/elf32-arc.c -@@ -2024,7 +2024,8 @@ elf_arc_check_relocs (bfd * abfd, - if (h == NULL) - continue; - else -- h->needs_plt = 1; -+ if(h->forced_local == 0) -+ h->needs_plt = 1; - } - - /* Add info to the symbol got_entry_list. */ --- -2.17.1 - diff --git a/buildroot/package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch b/buildroot/package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch new file mode 100644 index 000000000..f499426b7 --- /dev/null +++ b/buildroot/package/binutils/2.31.1/0018-bfd-xtensa-fix-PR-ld-25630.patch @@ -0,0 +1,37 @@ +From 85dcca5997cf3822d6456a5c9c59c46b56adfbb8 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Wed, 4 Mar 2020 14:54:27 -0800 +Subject: [PATCH] bfd: xtensa: fix PR ld/25630 + +bfd/ +2020-03-05 Max Filippov + + * elf32-xtensa.c (shrink_dynamic_reloc_sections): Shrink dynamic + relocation sections for any removed reference to a dynamic symbol. + +Signed-off-by: Max Filippov +--- + bfd/elf32-xtensa.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c +index 12ff9f772aaf..65e14d87940c 100644 +--- a/bfd/elf32-xtensa.c ++++ b/bfd/elf32-xtensa.c +@@ -10148,10 +10148,9 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info, + + if ((r_type == R_XTENSA_32 || r_type == R_XTENSA_PLT) + && (input_section->flags & SEC_ALLOC) != 0 +- && (dynamic_symbol || bfd_link_pic (info)) +- && (!h || h->root.type != bfd_link_hash_undefweak +- || (dynamic_symbol +- && (bfd_link_dll (info) || info->export_dynamic)))) ++ && (dynamic_symbol ++ || (bfd_link_pic (info) ++ && (!h || h->root.type != bfd_link_hash_undefweak)))) + { + asection *srel; + bfd_boolean is_plt = FALSE; +-- +2.20.1 + diff --git a/buildroot/package/binutils/2.32/0001-sh-conf.patch b/buildroot/package/binutils/2.32/0001-sh-conf.patch new file mode 100644 index 000000000..fff91ae35 --- /dev/null +++ b/buildroot/package/binutils/2.32/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From 98b2acf2bd3a527d114a9f8931083c2617a2daa9 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 37476459612..66fbc19f9ff 100755 +--- a/configure ++++ b/configure +@@ -3861,7 +3861,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 46501c28826..6c731930884 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1158,7 +1158,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.14.5 + diff --git a/buildroot/package/binutils/2.32/0002-poison-system-directories.patch b/buildroot/package/binutils/2.32/0002-poison-system-directories.patch new file mode 100644 index 000000000..98f41e87f --- /dev/null +++ b/buildroot/package/binutils/2.32/0002-poison-system-directories.patch @@ -0,0 +1,306 @@ +From f559402ea868d370ddf25089c68cda2600db3bfa Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index d93c9b08300..5da2742beac 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -31,6 +31,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index 18ada7808f5..7e7d2f97809 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -822,6 +822,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1486,6 +1487,8 @@ Optional Features: + --disable-largefile omit support for large files + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15803,7 +15806,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index d335f210917..7f692d93873 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index b97d977f37b..f3bbd2d55d4 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -180,6 +180,14 @@ typedef struct + in the linker script. */ + bfd_boolean force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bfd_boolean poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bfd_boolean error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index 5179af3e0e1..f78bf746822 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2524,6 +2524,18 @@ string identifying the original linked file does not change. + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index fcadc08c73f..63e295ce8ae 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 32853debe45..8135361c498 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -148,6 +148,8 @@ enum option_values + OPTION_REQUIRE_DEFINED_SYMBOL, + OPTION_ORPHAN_HANDLING, + OPTION_FORCE_GROUP_ALLOCATION, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 77cdbd0dd29..725512f1260 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -269,6 +269,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = TRUE; + command_line.warn_search_mismatch = TRUE; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = TRUE; ++ command_line.error_poison_system_directories = FALSE; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 88e85c73f49..be4cd492d14 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -543,6 +543,14 @@ static const struct ld_option ld_options[] = + { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, + '\0', N_("=MODE"), N_("Control how orphan sections are handled."), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -555,6 +563,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1543,6 +1552,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = FALSE; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = TRUE; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1586,6 +1603,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = TRUE; ++ + while (ingroup) + { + lang_leave_group (); +-- +2.14.5 + diff --git a/buildroot/package/binutils/2.32/0003-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch b/buildroot/package/binutils/2.32/0003-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch new file mode 100644 index 000000000..b80e1fa7c --- /dev/null +++ b/buildroot/package/binutils/2.32/0003-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch @@ -0,0 +1,41 @@ +From 278989f23735aa501be1052e085540c75c126dbb Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Thu, 28 Mar 2019 17:03:57 -0700 +Subject: [PATCH] bfd: xtensa: fix shrink_dynamic_reloc_sections for + export-dynamic + +shrink_dynamic_reloc_sections must remove PLT entry that was created for +an undefined weak symbol in the presence of --export-dynamic option when +relaxation coalesces literals pointing to that symbol. This fixes the +following assertion: + + ld: BFD (GNU Binutils) 2.31.1 internal error, aborting at + elf32-xtensa.c:3292 in elf_xtensa_finish_dynamic_sections + +2019-03-28 Max Filippov +bfd/ + * elf32-xtensa.c (shrink_dynamic_reloc_sections): Add + info->export_dynamic to the conditional. + +Signed-off-by: Max Filippov +--- + bfd/elf32-xtensa.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c +index c3df3d6db756..37ea200eea74 100644 +--- a/bfd/elf32-xtensa.c ++++ b/bfd/elf32-xtensa.c +@@ -10083,7 +10083,8 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info, + && (input_section->flags & SEC_ALLOC) != 0 + && (dynamic_symbol || bfd_link_pic (info)) + && (!h || h->root.type != bfd_link_hash_undefweak +- || (dynamic_symbol && bfd_link_dll (info)))) ++ || (dynamic_symbol ++ && (bfd_link_dll (info) || info->export_dynamic)))) + { + asection *srel; + bfd_boolean is_plt = FALSE; +-- +2.11.0 + diff --git a/buildroot/package/binutils/2.30/0010-gas-use-literals-const16-for-xtensa-loop-relaxation.patch b/buildroot/package/binutils/2.32/0004-gas-use-literals-const16-for-xtensa-loop-relaxation.patch similarity index 100% rename from buildroot/package/binutils/2.30/0010-gas-use-literals-const16-for-xtensa-loop-relaxation.patch rename to buildroot/package/binutils/2.32/0004-gas-use-literals-const16-for-xtensa-loop-relaxation.patch diff --git a/buildroot/package/binutils/2.32/0005-xtensa-gas-put-.literal_position-at-section-start.patch b/buildroot/package/binutils/2.32/0005-xtensa-gas-put-.literal_position-at-section-start.patch new file mode 100644 index 000000000..b4bbc27b3 --- /dev/null +++ b/buildroot/package/binutils/2.32/0005-xtensa-gas-put-.literal_position-at-section-start.patch @@ -0,0 +1,96 @@ +From 471702ac4a57878a06e8167f063274cf413e548d Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Mon, 8 Apr 2019 13:47:18 -0700 +Subject: [PATCH] xtensa: gas: put .literal_position at section start + +Provide literal position at the beginning of each section for literal +space reserved by relaxations when text-section-literals or +auto-litpools options are used. Remove code that adds fill frag to the +literal section for every .literal_position directive to avoid creation +of empty literal sections. + +Fix auto-litpools tests that got literal pool address changes. + +gas/ +2019-04-11 Max Filippov + + * config/tc-xtensa.c (xtensa_is_init_fini): Add declaration. + (xtensa_mark_literal_pool_location): Don't add fill frag to literal + section that records literal pool location. + (md_begin): Call xtensa_mark_literal_pool_location when text + section literals or auto litpools are used. + (xtensa_elf_section_change_hook): Call + xtensa_mark_literal_pool_location when text section literals or + auto litpools are used, there's no literal pool location defined + for the current section and it's not .init or .fini. + +Signed-off-by: Max Filippov +--- + gas/config/tc-xtensa.c | 22 +++++++++------------- + 1 file changed, 9 insertions(+), 13 deletions(-) + +diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c +index 0cc06361cf6f..6a80e76fed8c 100644 +--- a/gas/config/tc-xtensa.c ++++ b/gas/config/tc-xtensa.c +@@ -497,6 +497,7 @@ static fixS *xg_append_jump (fragS *fragP, symbolS *sym, offsetT offset); + static void xtensa_maybe_create_literal_pool_frag (bfd_boolean, bfd_boolean); + static bfd_boolean auto_litpools = FALSE; + static int auto_litpool_limit = 0; ++static bfd_boolean xtensa_is_init_fini (segT seg); + + /* Alignment Functions. */ + +@@ -4797,7 +4798,6 @@ xtensa_mark_literal_pool_location (void) + { + /* Any labels pointing to the current location need + to be adjusted to after the literal pool. */ +- emit_state s; + fragS *pool_location; + + if (use_literal_section) +@@ -4818,19 +4818,7 @@ xtensa_mark_literal_pool_location (void) + RELAX_LITERAL_POOL_END, NULL, 0, NULL); + xtensa_set_frag_assembly_state (frag_now); + +- /* Now put a frag into the literal pool that points to this location. */ + set_literal_pool_location (now_seg, pool_location); +- xtensa_switch_to_non_abs_literal_fragment (&s); +- frag_align (2, 0, 0); +- record_alignment (now_seg, 2); +- +- /* Close whatever frag is there. */ +- frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL); +- xtensa_set_frag_assembly_state (frag_now); +- frag_now->tc_frag_data.literal_frag = pool_location; +- frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL); +- xtensa_restore_emit_state (&s); +- xtensa_set_frag_assembly_state (frag_now); + } + + +@@ -5334,6 +5322,9 @@ md_begin (void) + /* Set up the assembly state. */ + if (!frag_now->tc_frag_data.is_assembly_state_set) + xtensa_set_frag_assembly_state (frag_now); ++ ++ if (!use_literal_section) ++ xtensa_mark_literal_pool_location (); + } + + +@@ -5933,6 +5924,11 @@ xtensa_elf_section_change_hook (void) + /* Set up the assembly state. */ + if (!frag_now->tc_frag_data.is_assembly_state_set) + xtensa_set_frag_assembly_state (frag_now); ++ ++ if (!use_literal_section ++ && seg_info (now_seg)->tc_segment_info_data.literal_pool_loc == NULL ++ && !xtensa_is_init_fini (now_seg)) ++ xtensa_mark_literal_pool_location (); + } + + +-- +2.11.0 + diff --git a/buildroot/package/binutils/2.32/0006-or1k-Fix-incorrect-value-in-PLT-GOT-entries-causing-.patch b/buildroot/package/binutils/2.32/0006-or1k-Fix-incorrect-value-in-PLT-GOT-entries-causing-.patch new file mode 100644 index 000000000..8527b6673 --- /dev/null +++ b/buildroot/package/binutils/2.32/0006-or1k-Fix-incorrect-value-in-PLT-GOT-entries-causing-.patch @@ -0,0 +1,46 @@ +From b17678f639f953d687d96cd52690e7cbfae50f91 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Fri, 23 Aug 2019 22:25:55 +0900 +Subject: [PATCH] or1k: Fix incorrect value in PLT GOT entries, causing + infinite loop + +The PLT GOT entry should point to the first PLT entry which contains the +runtime linker function. It was pointing back to the symbol PLT entry +causing an infinite loop. + +I found this when testing the OpenRISC glibc port which uses the runtime +dynamic linker. It seems other libc's we use so far have not been +making use of the initial PLT GOT entries. + +bfd/ChangeLog: + + * elf32-or1k.c (or1k_elf_finish_dynamic_symbol): Use correct value for + PLT GOT entries. + +(cherry picked from commit 09f7b0de537d465fc8ed9f9433e348c1bc78aab2) +Signed-off-by: Romain Naour +--- + bfd/elf32-or1k.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 2f200b197b8..32839cfa7b6 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -2379,8 +2379,11 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, + or1k_write_plt_entry (output_bfd, splt->contents + h->plt.offset, + plt0, plt1, plt2, OR1K_JR(12)); + +- /* Fill in the entry in the global offset table. */ +- bfd_put_32 (output_bfd, plt_addr, sgot->contents + got_offset); ++ /* Fill in the entry in the global offset table. We initialize it to ++ point to the top of the plt. This is done to lazy lookup the actual ++ symbol as the first plt entry will be setup by libc to call the ++ runtime dynamic linker. */ ++ bfd_put_32 (output_bfd, plt_base_addr, sgot->contents + got_offset); + + /* Fill in the entry in the .rela.plt section. */ + rela.r_offset = got_addr; +-- +2.23.0 + diff --git a/buildroot/package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch b/buildroot/package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch new file mode 100644 index 000000000..f499426b7 --- /dev/null +++ b/buildroot/package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch @@ -0,0 +1,37 @@ +From 85dcca5997cf3822d6456a5c9c59c46b56adfbb8 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Wed, 4 Mar 2020 14:54:27 -0800 +Subject: [PATCH] bfd: xtensa: fix PR ld/25630 + +bfd/ +2020-03-05 Max Filippov + + * elf32-xtensa.c (shrink_dynamic_reloc_sections): Shrink dynamic + relocation sections for any removed reference to a dynamic symbol. + +Signed-off-by: Max Filippov +--- + bfd/elf32-xtensa.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c +index 12ff9f772aaf..65e14d87940c 100644 +--- a/bfd/elf32-xtensa.c ++++ b/bfd/elf32-xtensa.c +@@ -10148,10 +10148,9 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info, + + if ((r_type == R_XTENSA_32 || r_type == R_XTENSA_PLT) + && (input_section->flags & SEC_ALLOC) != 0 +- && (dynamic_symbol || bfd_link_pic (info)) +- && (!h || h->root.type != bfd_link_hash_undefweak +- || (dynamic_symbol +- && (bfd_link_dll (info) || info->export_dynamic)))) ++ && (dynamic_symbol ++ || (bfd_link_pic (info) ++ && (!h || h->root.type != bfd_link_hash_undefweak)))) + { + asection *srel; + bfd_boolean is_plt = FALSE; +-- +2.20.1 + diff --git a/buildroot/package/binutils/2.33.1/0001-sh-conf.patch b/buildroot/package/binutils/2.33.1/0001-sh-conf.patch new file mode 100644 index 000000000..035100db8 --- /dev/null +++ b/buildroot/package/binutils/2.33.1/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From 3220c7e65ccfe41eceaaa6f1707f7f5775d9a4b0 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 6a9719f6091..796641b6aa3 100755 +--- a/configure ++++ b/configure +@@ -3865,7 +3865,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 7433badc217..dce082fb58e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1158,7 +1158,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.23.0 + diff --git a/buildroot/package/binutils/2.33.1/0002-poison-system-directories.patch b/buildroot/package/binutils/2.33.1/0002-poison-system-directories.patch new file mode 100644 index 000000000..9eafcbe18 --- /dev/null +++ b/buildroot/package/binutils/2.33.1/0002-poison-system-directories.patch @@ -0,0 +1,306 @@ +From 276cba370773e8f12dc8b186b71827a01d5c9097 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index d93c9b08300..5da2742beac 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -31,6 +31,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index b532ef94fa2..65d12cbf883 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -823,6 +823,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1487,6 +1488,8 @@ Optional Features: + --disable-largefile omit support for large files + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15804,7 +15807,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index ee62d10ac58..bc3e14e729d 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 55078a9637b..511e9bc34b7 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -180,6 +180,14 @@ typedef struct + in the linker script. */ + bfd_boolean force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bfd_boolean poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bfd_boolean error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index b3447050ed2..efd50edd85c 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2557,6 +2557,18 @@ string identifying the original linked file does not change. + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 7f60319390e..0bcc06db964 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 32a7a6409e8..c02b64bf92f 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -150,6 +150,8 @@ enum option_values + OPTION_FORCE_GROUP_ALLOCATION, + OPTION_PRINT_MAP_DISCARDED, + OPTION_NO_PRINT_MAP_DISCARDED, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index e24194ef87d..2d683cb6c5a 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -270,6 +270,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = TRUE; + command_line.warn_search_mismatch = TRUE; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = TRUE; ++ command_line.error_poison_system_directories = FALSE; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 1c15ac29c0c..8b714e10a40 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -549,6 +549,14 @@ static const struct ld_option ld_options[] = + { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, + '\0', NULL, N_("Do not show discarded sections in map file output"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -561,6 +569,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1549,6 +1558,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = FALSE; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = TRUE; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1600,6 +1617,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = TRUE; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.23.0 + diff --git a/buildroot/package/binutils/2.33.1/0003-Revert-PR24311-FAIL-S-records-with-constructors.patch b/buildroot/package/binutils/2.33.1/0003-Revert-PR24311-FAIL-S-records-with-constructors.patch new file mode 100644 index 000000000..046d0d6f3 --- /dev/null +++ b/buildroot/package/binutils/2.33.1/0003-Revert-PR24311-FAIL-S-records-with-constructors.patch @@ -0,0 +1,148 @@ +From 7a8213503e25998e2610d5a8c0b19eefb5e41596 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 30 Nov 2019 03:12:37 +0100 +Subject: [PATCH] Revert "PR24311, FAIL: S-records with constructors" + +This reverts commit ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e. + +Revert this patch since it prevent booting a sh4 system under +Qemu as reported on the Binutils mailing list [1]. +This commit is not related to sh4, it's weird that it is the +only affected architecture. + +[1] https://sourceware.org/ml/binutils/2019-10/msg00105.html +[2] https://sourceware.org/ml/binutils/2019-11/msg00407.html + +Signed-off-by: Romain Naour +--- + bfd/merge.c | 52 ++++++++++++++++++++++------------------------------ + 1 file changed, 22 insertions(+), 30 deletions(-) + +diff --git a/bfd/merge.c b/bfd/merge.c +index 632c8523903..fb7c0858beb 100644 +--- a/bfd/merge.c ++++ b/bfd/merge.c +@@ -621,7 +621,7 @@ is_suffix (const struct sec_merge_hash_entry *A, + + /* This is a helper function for _bfd_merge_sections. It attempts to + merge strings matching suffixes of longer strings. */ +-static struct sec_merge_sec_info * ++static bfd_boolean + merge_strings (struct sec_merge_info *sinfo) + { + struct sec_merge_hash_entry **array, **a, *e; +@@ -633,7 +633,7 @@ merge_strings (struct sec_merge_info *sinfo) + amt = sinfo->htab->size * sizeof (struct sec_merge_hash_entry *); + array = (struct sec_merge_hash_entry **) bfd_malloc (amt); + if (array == NULL) +- return NULL; ++ return FALSE; + + for (e = sinfo->htab->first, a = array; e; e = e->next) + if (e->alignment) +@@ -703,6 +703,11 @@ merge_strings (struct sec_merge_info *sinfo) + } + } + secinfo->sec->size = size; ++ if (secinfo->sec->alignment_power != 0) ++ { ++ bfd_size_type align = (bfd_size_type) 1 << secinfo->sec->alignment_power; ++ secinfo->sec->size = (secinfo->sec->size + align - 1) & -align; ++ } + + /* And now adjust the rest, removing them from the chain (but not hashtable) + at the same time. */ +@@ -719,7 +724,7 @@ merge_strings (struct sec_merge_info *sinfo) + e->u.index = e->u.suffix->u.index + (e->u.suffix->len - e->len); + } + } +- return secinfo; ++ return TRUE; + } + + /* This function is called once after all SEC_MERGE sections are registered +@@ -735,8 +740,7 @@ _bfd_merge_sections (bfd *abfd, + + for (sinfo = (struct sec_merge_info *) xsinfo; sinfo; sinfo = sinfo->next) + { +- struct sec_merge_sec_info *secinfo; +- bfd_size_type align; ++ struct sec_merge_sec_info * secinfo; + + if (! sinfo->chain) + continue; +@@ -747,7 +751,6 @@ _bfd_merge_sections (bfd *abfd, + secinfo->next = NULL; + + /* Record the sections into the hash table. */ +- align = 1; + for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next) + if (secinfo->sec->flags & SEC_EXCLUDE) + { +@@ -755,25 +758,18 @@ _bfd_merge_sections (bfd *abfd, + if (remove_hook) + (*remove_hook) (abfd, secinfo->sec); + } +- else +- { +- if (!record_section (sinfo, secinfo)) +- return FALSE; +- if (align) +- { +- align = (bfd_size_type) 1 << secinfo->sec->alignment_power; +- if ((secinfo->sec->size & (align - 1)) != 0) +- align = 0; +- } +- } ++ else if (! record_section (sinfo, secinfo)) ++ return FALSE; ++ ++ if (secinfo) ++ continue; + + if (sinfo->htab->first == NULL) + continue; + + if (sinfo->htab->strings) + { +- secinfo = merge_strings (sinfo); +- if (!secinfo) ++ if (!merge_strings (sinfo)) + return FALSE; + } + else +@@ -793,7 +789,8 @@ _bfd_merge_sections (bfd *abfd, + e->secinfo->first_str = e; + size = 0; + } +- size = (size + e->alignment - 1) & ~((bfd_vma) e->alignment - 1); ++ size = (size + e->alignment - 1) ++ & ~((bfd_vma) e->alignment - 1); + e->u.index = size; + size += e->len; + secinfo = e->secinfo; +@@ -801,16 +798,11 @@ _bfd_merge_sections (bfd *abfd, + secinfo->sec->size = size; + } + +- /* If the input sections were padded according to their alignments, +- then pad the output too. */ +- if (align) +- secinfo->sec->size = (secinfo->sec->size + align - 1) & -align; +- +- /* Finally remove all input sections which have not made it into +- the hash table at all. */ +- for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next) +- if (secinfo->first_str == NULL) +- secinfo->sec->flags |= SEC_EXCLUDE | SEC_KEEP; ++ /* Finally remove all input sections which have not made it into ++ the hash table at all. */ ++ for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next) ++ if (secinfo->first_str == NULL) ++ secinfo->sec->flags |= SEC_EXCLUDE | SEC_KEEP; + } + + return TRUE; +-- +2.23.0 + diff --git a/buildroot/package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch b/buildroot/package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch new file mode 100644 index 000000000..f499426b7 --- /dev/null +++ b/buildroot/package/binutils/2.33.1/0004-bfd-xtensa-fix-PR-ld-25630.patch @@ -0,0 +1,37 @@ +From 85dcca5997cf3822d6456a5c9c59c46b56adfbb8 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Wed, 4 Mar 2020 14:54:27 -0800 +Subject: [PATCH] bfd: xtensa: fix PR ld/25630 + +bfd/ +2020-03-05 Max Filippov + + * elf32-xtensa.c (shrink_dynamic_reloc_sections): Shrink dynamic + relocation sections for any removed reference to a dynamic symbol. + +Signed-off-by: Max Filippov +--- + bfd/elf32-xtensa.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c +index 12ff9f772aaf..65e14d87940c 100644 +--- a/bfd/elf32-xtensa.c ++++ b/bfd/elf32-xtensa.c +@@ -10148,10 +10148,9 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info, + + if ((r_type == R_XTENSA_32 || r_type == R_XTENSA_PLT) + && (input_section->flags & SEC_ALLOC) != 0 +- && (dynamic_symbol || bfd_link_pic (info)) +- && (!h || h->root.type != bfd_link_hash_undefweak +- || (dynamic_symbol +- && (bfd_link_dll (info) || info->export_dynamic)))) ++ && (dynamic_symbol ++ || (bfd_link_pic (info) ++ && (!h || h->root.type != bfd_link_hash_undefweak)))) + { + asection *srel; + bfd_boolean is_plt = FALSE; +-- +2.20.1 + diff --git a/buildroot/package/binutils/Config.in.host b/buildroot/package/binutils/Config.in.host index 924d1749c..9beabe357 100644 --- a/buildroot/package/binutils/Config.in.host +++ b/buildroot/package/binutils/Config.in.host @@ -4,44 +4,47 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI bool default y depends on !BR2_microblaze - depends on !(BR2_nios2 && (BR2_BINUTILS_VERSION_2_28_X || BR2_BINUTILS_VERSION_2_29_X)) choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_INSTRUCTIONS_THUMB - default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_INSTRUCTIONS_THUMB2 - default BR2_BINUTILS_VERSION_2_29_X if !BR2_arc + default BR2_BINUTILS_VERSION_2_32_X if !BR2_arc && !BR2_csky default BR2_BINUTILS_VERSION_ARC if BR2_arc + default BR2_BINUTILS_VERSION_CSKY if BR2_csky help Select the version of binutils you wish to use. -config BR2_BINUTILS_VERSION_2_28_X - bool "binutils 2.28.1" - depends on !BR2_arc - depends on !BR2_riscv - -config BR2_BINUTILS_VERSION_2_29_X - bool "binutils 2.29.1" - depends on !BR2_riscv - -config BR2_BINUTILS_VERSION_2_30_X - bool "binutils 2.30" - config BR2_BINUTILS_VERSION_2_31_X bool "binutils 2.31.1" + depends on !BR2_csky + +config BR2_BINUTILS_VERSION_2_32_X + bool "binutils 2.32" + depends on !BR2_csky + +config BR2_BINUTILS_VERSION_2_33_X + bool "binutils 2.33.1" + depends on !BR2_csky + # https://github.com/uclinux-dev/elf2flt/pull/16 + # https://github.com/uclinux-dev/elf2flt/issues/12 + depends on !BR2_BINFMT_FLAT config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.31)" depends on BR2_arc + +config BR2_BINUTILS_VERSION_CSKY + bool "binutils csky" + depends on BR2_csky + endchoice config BR2_BINUTILS_VERSION string - default "arc-2018.09-release" if BR2_BINUTILS_VERSION_ARC - default "2.28.1" if BR2_BINUTILS_VERSION_2_28_X - default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X - default "2.30" if BR2_BINUTILS_VERSION_2_30_X + default "arc-2019.09-release" if BR2_BINUTILS_VERSION_ARC + default "c66d8bbcebfddf713b2b436e1b135e6b125a55a5" if BR2_BINUTILS_VERSION_CSKY default "2.31.1" if BR2_BINUTILS_VERSION_2_31_X + default "2.32" if BR2_BINUTILS_VERSION_2_32_X + default "2.33.1" if BR2_BINUTILS_VERSION_2_33_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/buildroot/package/binutils/arc-2018.09-release/0005-poison-system-directories.patch b/buildroot/package/binutils/arc-2018.09-release/0005-poison-system-directories.patch deleted file mode 100644 index 90c7ac760..000000000 --- a/buildroot/package/binutils/arc-2018.09-release/0005-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From 7d1e6ed1d57e839207e0ece7561bd4709032de9f Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texi | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index d93c9b0..5da2742 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -31,6 +31,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index 300a272..d68890f 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -822,6 +822,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1486,6 +1487,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15803,7 +15806,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index d10c553..9f1b57b 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index ba914b9..9df17da 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texi b/ld/ld.texi -index 40d79dd..137d46c 100644 ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2479,6 +2479,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index b3d166c..3dcbf66 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 04d6fd5..d7df005 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -148,6 +148,8 @@ enum option_values - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, - OPTION_FORCE_GROUP_ALLOCATION, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index f31eeb2..25f8497 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -268,6 +268,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 86a033a..f07f095 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -543,6 +543,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -555,6 +563,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1543,6 +1552,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1586,6 +1603,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - lang_leave_group (); --- -2.7.4 - diff --git a/buildroot/package/binutils/arc-2019.09-release/0001-poison-system-directories.patch b/buildroot/package/binutils/arc-2019.09-release/0001-poison-system-directories.patch new file mode 100644 index 000000000..f6a78c7cd --- /dev/null +++ b/buildroot/package/binutils/arc-2019.09-release/0001-poison-system-directories.patch @@ -0,0 +1,309 @@ +From 5f62ad7ce534e3384d6ed8892614979da297bd70 Mon Sep 17 00:00:00 2001 +From: Evgeniy Didin +Date: Mon, 14 Oct 2019 16:45:15 +0300 +Subject: [PATCH] [PATCH] poison-system-directories + +Patch adapted to arc-binutils-gdb-2019.09 +Signed-off-by: Evgeniy Didin + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.26] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index d93c9b08300..5da2742beac 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -31,6 +31,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index 2d6ca5c0445..563f9921f7f 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -823,6 +823,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1487,6 +1488,8 @@ Optional Features: + --disable-largefile omit support for large files + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15804,7 +15807,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 41a51bbb7e9..dbaa98a9e17 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 55078a9637b..511e9bc34b7 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -180,6 +180,14 @@ typedef struct + in the linker script. */ + bfd_boolean force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bfd_boolean poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bfd_boolean error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index fcbc335c95e..6ba7ebdb32a 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2557,6 +2557,18 @@ string identifying the original linked file does not change. + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 7f60319390e..0bcc06db964 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 32a7a6409e8..c02b64bf92f 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -150,6 +150,8 @@ enum option_values + OPTION_FORCE_GROUP_ALLOCATION, + OPTION_PRINT_MAP_DISCARDED, + OPTION_NO_PRINT_MAP_DISCARDED, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 34c19223137..66d2c3f4bcf 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -270,6 +270,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = TRUE; + command_line.warn_search_mismatch = TRUE; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = TRUE; ++ command_line.error_poison_system_directories = FALSE; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 1c15ac29c0c..8b714e10a40 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -549,6 +549,14 @@ static const struct ld_option ld_options[] = + { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, + '\0', NULL, N_("Do not show discarded sections in map file output"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -561,6 +569,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1549,6 +1558,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = FALSE; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = TRUE; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1600,6 +1617,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = TRUE; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.16.2 + diff --git a/buildroot/package/binutils/binutils.hash b/buildroot/package/binutils/binutils.hash index ac0831ca2..797dd5b92 100644 --- a/buildroot/package/binutils/binutils.hash +++ b/buildroot/package/binutils/binutils.hash @@ -1,8 +1,14 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 dc5b6872ae01c07c12d38f3bb7ead06effc6da3265ac872e2d9c6104304f89f85f2645b029a43f308a7938a7299b1928d385205d0a2245674a621649032a138d binutils-2.28.1.tar.xz -sha512 d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e82624ae37fb0bbd03af3b17088a94f60dfe1a86a7ff82e18ece3c24f0fd0 binutils-2.29.1.tar.xz -sha512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 binutils-2.30.tar.xz sha512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 binutils-2.31.1.tar.xz +sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz +sha512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac binutils-2.33.1.tar.xz # Locally calculated (fetched from Github) -sha512 a96dfcea6064fcd1aac1333ac0d631491bed8b0be9bdcf62f1447909c8f30d2cb8d9323ffeb7c9ad6b326ecddb72e3d28281684e73343189d0a4a37a11aef62f binutils-gdb-arc-2018.09-release.tar.gz +sha512 33ac5ad662db551870193f5c76c35a18de465adfa1c7f4bf5c1bb4145805a47507bf11ec21eb446b52f91f70cfe392252dd2b02724dc9dad3505258e3f6f4d45 binutils-gdb-arc-2019.09-release.tar.gz + +# Locally calculated (fetched from https://github.com/c-sky/binutils-gdb) +sha512 979552d4b3a4f31e9f3b9a7027321bd4eb3ac6c2d8deac1720e94e54f81d736db09c53c5d87c301010e307b64127e14400a036c7a35e5d63a954a4edd9cc8e2c binutils-c66d8bbcebfddf713b2b436e1b135e6b125a55a5.tar.gz + +# locally computed +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3 +sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/buildroot/package/binutils/binutils.mk b/buildroot/package/binutils/binutils.mk index 4531b8d9c..876c9c59f 100644 --- a/buildroot/package/binutils/binutils.mk +++ b/buildroot/package/binutils/binutils.mk @@ -9,17 +9,24 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2018.09-release +BINUTILS_VERSION = arc-2019.09-release else -BINUTILS_VERSION = 2.29.1 +BINUTILS_VERSION = 2.32 endif endif # BINUTILS_VERSION -ifeq ($(BINUTILS_VERSION),arc-2018.09-release) +ifeq ($(BINUTILS_VERSION),arc-2019.09-release) BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION)) BINUTILS_SOURCE = binutils-gdb-$(BINUTILS_VERSION).tar.gz BINUTILS_FROM_GIT = y endif + +ifeq ($(BR2_csky),y) +BINUTILS_SITE = $(call github,c-sky,binutils-gdb,$(BINUTILS_VERSION)) +BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz +BINUTILS_FROM_GIT = y +endif + BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.xz BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS)) @@ -91,9 +98,7 @@ HOST_BINUTILS_CONF_OPTS = \ # binutils run configure script of subdirs at make time, so ensure # our TARGET_CONFIGURE_ARGS are taken into consideration for those -define BINUTILS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) $(BINUTILS_MAKE_OPTS) -C $(@D) -endef +BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) # We just want libbfd, libiberty and libopcodes, # not the full-blown binutils in staging diff --git a/buildroot/package/biosdevname/Config.in b/buildroot/package/biosdevname/Config.in index 704716791..5cdf54268 100644 --- a/buildroot/package/biosdevname/Config.in +++ b/buildroot/package/biosdevname/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_BIOSDEVNAME system or hardware changes that might otherwise alter the typical ethX naming. - http://linux.dell.com/biosdevname/ + https://github.com/dell/biosdevname/ diff --git a/buildroot/package/biosdevname/biosdevname.hash b/buildroot/package/biosdevname/biosdevname.hash index 57946ea08..f4470c32d 100644 --- a/buildroot/package/biosdevname/biosdevname.hash +++ b/buildroot/package/biosdevname/biosdevname.hash @@ -1,2 +1,3 @@ # Locally computed hashes, not provided by upstream -sha256 954575f482ff5de2d49c335b563990859a3eb3506e8fa976f6915eba870d71f6 biosdevname-0.7.2.tar.gz +sha256 3a67fee0c315996bbba586c1c077e57625382d38dc48fb3c9e84d56a7a5effad biosdevname-0.7.3.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/biosdevname/biosdevname.mk b/buildroot/package/biosdevname/biosdevname.mk index e0de8ef62..574608c50 100644 --- a/buildroot/package/biosdevname/biosdevname.mk +++ b/buildroot/package/biosdevname/biosdevname.mk @@ -4,11 +4,12 @@ # ################################################################################ -BIOSDEVNAME_VERSION = 0.7.2 -BIOSDEVNAME_SITE = http://linux.dell.com/biosdevname/biosdevname-$(BIOSDEVNAME_VERSION) +BIOSDEVNAME_VERSION = 0.7.3 +BIOSDEVNAME_SITE = $(call github,dell,biosdevname,v$(BIOSDEVNAME_VERSION)) BIOSDEVNAME_LICENSE = GPL BIOSDEVNAME_LICENSE_FILES = COPYING BIOSDEVNAME_CONF_OPTS = --exec-prefix=/ BIOSDEVNAME_DEPENDENCIES = pciutils udev zlib +BIOSDEVNAME_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/bird/0001-Nest-Fix-build-without-protocols.patch b/buildroot/package/bird/0001-Nest-Fix-build-without-protocols.patch new file mode 100644 index 000000000..48d21441c --- /dev/null +++ b/buildroot/package/bird/0001-Nest-Fix-build-without-protocols.patch @@ -0,0 +1,28 @@ +From f9eb9b4cab65b850c61738dd56632bae0e7329ca Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Oct 2019 12:50:27 +0200 +Subject: [PATCH] Nest: Fix build without protocols + +(CHECK keyword added by commiter) +[Retrieved from: +https://gitlab.labs.nic.cz/labs/bird/commit/f9eb9b4cab65b850c61738dd56632bae0e7329ca] +Signed-off-by: Fabrice Fontaine +--- + nest/config.Y | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/nest/config.Y b/nest/config.Y +index c62501a3..1bc203dd 100644 +--- a/nest/config.Y ++++ b/nest/config.Y +@@ -75,6 +75,7 @@ CF_KEYWORDS(BGP, PASSWORDS, DESCRIPTION, SORTED) + CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, IGP_METRIC, CLASS, DSCP) + CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US) + CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, FLUSH, AS) ++CF_KEYWORDS(CHECK, LINK) + + /* For r_args_channel */ + CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4, VPN4_MC, VPN4_MPLS, VPN6, VPN6_MC, VPN6_MPLS, ROA4, ROA6, FLOW4, FLOW6, MPLS, PRI, SEC) +-- +2.21.0 + diff --git a/buildroot/package/bird/Config.in b/buildroot/package/bird/Config.in index a69551f94..e78dfdf90 100644 --- a/buildroot/package/bird/Config.in +++ b/buildroot/package/bird/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_BIRD bool "bird" + depends on !BR2_nios2 # relocations don't fit depends on BR2_USE_MMU # fork() help BIRD Internet Routing Daemon @@ -20,4 +21,61 @@ config BR2_PACKAGE_BIRD_CLIENT help Enable the BIRD client +comment "protocol support" + +config BR2_PACKAGE_BIRD_BABEL + bool "babel" + help + Enable Babel protocol. + +config BR2_PACKAGE_BIRD_BFD + bool "bfd" + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + help + Enable BFD protocol. + +comment "BFD protocol needs a toolchain w/ NPTL" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + +config BR2_PACKAGE_BIRD_BGP + bool "bgp" + default y + help + Enable BGP protocol. + +config BR2_PACKAGE_BIRD_MRT + bool "mrt" + help + Enable MRT protocol. + +config BR2_PACKAGE_BIRD_OSPF + bool "ospf" + help + Enable OSPFv2 and OSPFv3 protocol. + +config BR2_PACKAGE_BIRD_PERF + bool "perf" + help + Enable Perf protocol. + +config BR2_PACKAGE_BIRD_PIPE + bool "pipe" + help + Enable Pipe protocol. + +config BR2_PACKAGE_BIRD_RADV + bool "radv" + help + Enable RAdv protocol. + +config BR2_PACKAGE_BIRD_RIP + bool "rip" + help + Enable RIP protocol. + +config BR2_PACKAGE_BIRD_STATIC + bool "static" + help + Enable Static protocol. + endif diff --git a/buildroot/package/bird/bird.hash b/buildroot/package/bird/bird.hash index 3f3a93b96..303fc2120 100644 --- a/buildroot/package/bird/bird.hash +++ b/buildroot/package/bird/bird.hash @@ -1,2 +1,2 @@ -sha256 0f49b38327d3109553acfa662ac0cf0377719226a03c124cd2e0ea2265ecb1de bird-2.0.3.tar.gz +sha256 631d2b58aebdbd651aaa3c68c3756c02ebfe5b1e60d307771ea909eeaa5b1066 bird-2.0.7.tar.gz sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README diff --git a/buildroot/package/bird/bird.mk b/buildroot/package/bird/bird.mk index da2f86807..6b2810275 100644 --- a/buildroot/package/bird/bird.mk +++ b/buildroot/package/bird/bird.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIRD_VERSION = 2.0.3 +BIRD_VERSION = 2.0.7 BIRD_SITE = ftp://bird.network.cz/pub/bird BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README @@ -17,4 +17,18 @@ else BIRD_CONF_OPTS += --disable-client endif +BIRD_PROTOCOLS = \ + $(if $(BR2_PACKAGE_BIRD_BFD),bfd) \ + $(if $(BR2_PACKAGE_BIRD_BABEL),babel) \ + $(if $(BR2_PACKAGE_BIRD_BGP),bgp) \ + $(if $(BR2_PACKAGE_BIRD_MRT),mrt) \ + $(if $(BR2_PACKAGE_BIRD_OSPF),ospf) \ + $(if $(BR2_PACKAGE_BIRD_PERF),perf) \ + $(if $(BR2_PACKAGE_BIRD_PIPE),pipe) \ + $(if $(BR2_PACKAGE_BIRD_RADV),radv) \ + $(if $(BR2_PACKAGE_BIRD_RIP),rip) \ + $(if $(BR2_PACKAGE_BIRD_STATIC),static) + +BIRD_CONF_OPTS += --with-protocols=$(subst $(space),$(comma),$(strip $(BIRD_PROTOCOLS))) + $(eval $(autotools-package)) diff --git a/buildroot/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/buildroot/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch deleted file mode 100644 index e9dee48af..000000000 --- a/buildroot/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 5 Mar 2018 10:56:29 -0800 -Subject: [PATCH 1/1] fflush: adjust to glibc 2.28 libio.h removal -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Daniel P. Berrangé in: -https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html -* lib/fbufmode.c (fbufmode): -* lib/fflush.c (clear_ungetc_buffer_preserving_position) -(disable_seek_optimization, rpl_fflush): -* lib/fpending.c (__fpending): -* lib/fpurge.c (fpurge): -* lib/freadable.c (freadable): -* lib/freadahead.c (freadahead): -* lib/freading.c (freading): -* lib/freadptr.c (freadptr): -* lib/freadseek.c (freadptrinc): -* lib/fseeko.c (fseeko): -* lib/fseterr.c (fseterr): -* lib/fwritable.c (fwritable): -* lib/fwriting.c (fwriting): -Check _IO_EOF_SEEN instead of _IO_ftrylockfile. -* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: -Define if not already defined. ---- - lib/fseterr.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -[yann.morin.1998@free.fr: partially backport from upstream gnulib] -Signed-off-by: "Yann E. MORIN" - -diff --git a/lib/fseterr.c b/lib/fseterr.c -index 82649c3ac..adb637256 100644 ---- a/lib/fseterr.c -+++ b/lib/fseterr.c -@@ -29,7 +29,7 @@ fseterr (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags |= _IO_ERR_SEEN; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ --- -2.14.1 - diff --git a/buildroot/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch b/buildroot/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch deleted file mode 100644 index 035f8282c..000000000 --- a/buildroot/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Thu, 8 Mar 2018 16:42:45 -0800 -Subject: [PATCH 2/2] fflush: be more paranoid about libio.h change - -Suggested by Eli Zaretskii in: -https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html -* lib/fbufmode.c (fbufmode): -* lib/fflush.c (clear_ungetc_buffer_preserving_position) -(disable_seek_optimization, rpl_fflush): -* lib/fpending.c (__fpending): -* lib/fpurge.c (fpurge): -* lib/freadable.c (freadable): -* lib/freadahead.c (freadahead): -* lib/freading.c (freading): -* lib/freadptr.c (freadptr): -* lib/freadseek.c (freadptrinc): -* lib/fseeko.c (fseeko): -* lib/fseterr.c (fseterr): -* lib/fwritable.c (fwritable): -* lib/fwriting.c (fwriting): -Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN. ---- - lib/fseterr.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -[yann.morin.1998@free.fr: partially backport from upstream gnulib] -Signed-off-by: "Yann E. MORIN" - -diff --git a/lib/fseterr.c b/lib/fseterr.c -index adb637256..fd9da6338 100644 ---- a/lib/fseterr.c -+++ b/lib/fseterr.c -@@ -29,7 +29,8 @@ fseterr (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 -+ /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags |= _IO_ERR_SEEN; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ --- -2.14.1 - diff --git a/buildroot/package/bison/bison.hash b/buildroot/package/bison/bison.hash index 2c3320852..01ee17d76 100644 --- a/buildroot/package/bison/bison.hash +++ b/buildroot/package/bison/bison.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1 bison-3.0.4.tar.xz +sha256 27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0 bison-3.4.2.tar.xz # License files, locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/bison/bison.mk b/buildroot/package/bison/bison.mk index e4fc50410..2174a9061 100644 --- a/buildroot/package/bison/bison.mk +++ b/buildroot/package/bison/bison.mk @@ -4,11 +4,13 @@ # ################################################################################ -BISON_VERSION = 3.0.4 +BISON_VERSION = 3.4.2 BISON_SOURCE = bison-$(BISON_VERSION).tar.xz BISON_SITE = $(BR2_GNU_MIRROR)/bison BISON_LICENSE = GPL-3.0+ BISON_LICENSE_FILES = COPYING +# parallel build issue in examples/c/reccalc/ +BISON_MAKE = $(MAKE1) HOST_BISON_DEPENDENCIES = host-m4 $(eval $(host-autotools-package)) diff --git a/buildroot/package/bitcoin/Config.in b/buildroot/package/bitcoin/Config.in new file mode 100644 index 000000000..1f08f9f26 --- /dev/null +++ b/buildroot/package/bitcoin/Config.in @@ -0,0 +1,48 @@ +config BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS + bool + default y if BR2_TOOLCHAIN_HAS_ATOMIC + # bitcoin uses 8-byte __atomic intrinsics, which are not + # available on ARM noMMU platforms that we + # support. BR2_TOOLCHAIN_HAS_ATOMIC does not provide a + # size-level granularity to express this dependency. + depends on !(BR2_arm || BR2_armeb) || BR2_USE_MMU + +config BR2_PACKAGE_BITCOIN + bool "bitcoin" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future + depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS # boost + depends on BR2_USE_WCHAR + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_BOOST_FILESYSTEM + select BR2_PACKAGE_BOOST_THREAD + select BR2_PACKAGE_BOOST_CHRONO + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBEVENT + help + Bitcoin Core is an open source project which maintains and + releases Bitcoin client software called “Bitcoin Core”. + + It is a direct descendant of the original Bitcoin software + client released by Satoshi Nakamoto after he published the + famous Bitcoin whitepaper. + + Bitcoin Core consists of both "full-node" software for fully + validating the blockchain as well as a bitcoin wallet. The + project also currently maintains related software such as + the cryptography library libsecp256k1 and others located at + GitHub. + + https://bitcoincore.org + +comment "bitcoin needs a toolchain w/ C++, threads, wchar" + depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + +comment "bitcoin needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/bitcoin/bitcoin.hash b/buildroot/package/bitcoin/bitcoin.hash new file mode 100644 index 000000000..fe7c1562a --- /dev/null +++ b/buildroot/package/bitcoin/bitcoin.hash @@ -0,0 +1,5 @@ +# From https://bitcoincore.org/bin/bitcoin-core-0.19.0.1/SHA256SUMS.asc +sha256 7ac9f972249a0a16ed01352ca2a199a5448fe87a4ea74923404a40b4086de284 bitcoin-0.19.0.1.tar.gz + +# Hash for license file +sha256 9a0f75d688e9cf5c69d3efdaa2a83af496700d252b212ec6a72f7784b47fed0c COPYING diff --git a/buildroot/package/bitcoin/bitcoin.mk b/buildroot/package/bitcoin/bitcoin.mk new file mode 100644 index 000000000..040c55b8a --- /dev/null +++ b/buildroot/package/bitcoin/bitcoin.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# bitcoin +# +################################################################################ + +BITCOIN_VERSION = 0.19.0.1 +BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION) +BITCOIN_AUTORECONF = YES +BITCOIN_LICENSE = MIT +BITCOIN_LICENSE_FILES = COPYING +BITCOIN_DEPENDENCIES = host-pkgconf boost openssl libevent +BITCOIN_CONF_OPTS = \ + --disable-bench \ + --disable-wallet \ + --disable-tests \ + --with-boost-libdir=$(STAGING_DIR)/usr/lib/ \ + --disable-hardening \ + --without-gui + +ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y) +BITCOIN_DEPENDENCIES += libminiupnpc +BITCOIN_CONF_OPTS += --with-miniupnpc +else +BITCOIN_CONF_OPTS += --without-miniupnpc +endif + +ifeq ($(BR2_PACKAGE_ZEROMQ),y) +BITCOIN_DEPENDENCIES += zeromq +BITCOIN_CONF_OPTS += --with-zmq +else +BITCOIN_CONF_OPTS += --without-zmq +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/bitstream-vera/bitstream-vera.hash b/buildroot/package/bitstream-vera/bitstream-vera.hash index e18b38bb6..bb31b17a4 100644 --- a/buildroot/package/bitstream-vera/bitstream-vera.hash +++ b/buildroot/package/bitstream-vera/bitstream-vera.hash @@ -1,2 +1,4 @@ # From http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2.sha256sum -sha256 db5b27df7bbb318036ebdb75acd3e98f1bd6eb6608fb70a67d478cd243d178dc ttf-bitstream-vera-1.10.tar.bz2 +sha256 db5b27df7bbb318036ebdb75acd3e98f1bd6eb6608fb70a67d478cd243d178dc ttf-bitstream-vera-1.10.tar.bz2 +# locally computed +sha256 3361d054759a2fc686a2c058be82deaf9c2e6fe549be9004d7935a6c1736315d COPYRIGHT.TXT diff --git a/buildroot/package/blktrace/0001-btt-make-device-devno-use-PATH_MAX-to-avoid-overflow.patch b/buildroot/package/blktrace/0001-btt-make-device-devno-use-PATH_MAX-to-avoid-overflow.patch new file mode 100644 index 000000000..764410d47 --- /dev/null +++ b/buildroot/package/blktrace/0001-btt-make-device-devno-use-PATH_MAX-to-avoid-overflow.patch @@ -0,0 +1,146 @@ +From d61ff409cb4dda31386373d706ea0cfb1aaac5b7 Mon Sep 17 00:00:00 2001 +From: Jens Axboe +Date: Wed, 2 May 2018 10:24:17 -0600 +Subject: btt: make device/devno use PATH_MAX to avoid overflow + +Herbo Zhang reports: + +I found a bug in blktrace/btt/devmap.c. The code is just as follows: + +https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git/tree/btt/devmap.c?id=8349ad2f2d19422a6241f94ea84d696b21de4757 + + struct devmap { + +struct list_head head; +char device[32], devno[32]; // #1 +}; + +LIST_HEAD(all_devmaps); + +static int dev_map_add(char *line) +{ +struct devmap *dmp; + +if (strstr(line, "Device") != NULL) +return 1; + +dmp = malloc(sizeof(struct devmap)); +if (sscanf(line, "%s %s", dmp->device, dmp->devno) != 2) { //#2 +free(dmp); +return 1; +} + +list_add_tail(&dmp->head, &all_devmaps); +return 0; +} + +int dev_map_read(char *fname) +{ +char line[256]; // #3 +FILE *fp = my_fopen(fname, "r"); + +if (!fp) { +perror(fname); +return 1; +} + +while (fscanf(fp, "%255[a-zA-Z0-9 :.,/_-]\n", line) == 1) { +if (dev_map_add(line)) +break; +} + +fclose(fp); +return 0; +} + + The line length is 256, but the dmp->device, dmp->devno max length +is only 32. We can put strings longer than 32 into dmp->device and +dmp->devno , and then they will be overflowed. + + we can trigger this bug just as follows: + + $ python -c "print 'A'*256" > ./test + $ btt -M ./test + + *** Error in btt': free(): invalid next size (fast): 0x000055ad7349b250 *** + ======= Backtrace: ========= + /lib/x86_64-linux-gnu/libc.so.6(+0x777e5)[0x7f7f158ce7e5] + /lib/x86_64-linux-gnu/libc.so.6(+0x7fe0a)[0x7f7f158d6e0a] + /lib/x86_64-linux-gnu/libc.so.6(cfree+0x4c)[0x7f7f158da98c] + btt(+0x32e0)[0x55ad7306f2e0] + btt(+0x2c5f)[0x55ad7306ec5f] + btt(+0x251f)[0x55ad7306e51f] + /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xf0)[0x7f7f15877830] + btt(+0x26b9)[0x55ad7306e6b9] + ======= Memory map: ======== + 55ad7306c000-55ad7307f000 r-xp 00000000 08:14 3698139 + /usr/bin/btt + 55ad7327e000-55ad7327f000 r--p 00012000 08:14 3698139 + /usr/bin/btt + 55ad7327f000-55ad73280000 rw-p 00013000 08:14 3698139 + /usr/bin/btt + 55ad73280000-55ad73285000 rw-p 00000000 00:00 0 + 55ad7349a000-55ad734bb000 rw-p 00000000 00:00 0 + [heap] + 7f7f10000000-7f7f10021000 rw-p 00000000 00:00 0 + 7f7f10021000-7f7f14000000 ---p 00000000 00:00 0 + 7f7f15640000-7f7f15656000 r-xp 00000000 08:14 14942237 + /lib/x86_64-linux-gnu/libgcc_s.so.1 + 7f7f15656000-7f7f15855000 ---p 00016000 08:14 14942237 + /lib/x86_64-linux-gnu/libgcc_s.so.1 + 7f7f15855000-7f7f15856000 r--p 00015000 08:14 14942237 + /lib/x86_64-linux-gnu/libgcc_s.so.1 + 7f7f15856000-7f7f15857000 rw-p 00016000 08:14 14942237 + /lib/x86_64-linux-gnu/libgcc_s.so.1 + 7f7f15857000-7f7f15a16000 r-xp 00000000 08:14 14948477 + /lib/x86_64-linux-gnu/libc-2.23.so + 7f7f15a16000-7f7f15c16000 ---p 001bf000 08:14 14948477 + /lib/x86_64-linux-gnu/libc-2.23.so + 7f7f15c16000-7f7f15c1a000 r--p 001bf000 08:14 14948477 + /lib/x86_64-linux-gnu/libc-2.23.so + 7f7f15c1a000-7f7f15c1c000 rw-p 001c3000 08:14 14948477 + /lib/x86_64-linux-gnu/libc-2.23.so + 7f7f15c1c000-7f7f15c20000 rw-p 00000000 00:00 0 + 7f7f15c20000-7f7f15c46000 r-xp 00000000 08:14 14948478 + /lib/x86_64-linux-gnu/ld-2.23.so + 7f7f15e16000-7f7f15e19000 rw-p 00000000 00:00 0 + 7f7f15e42000-7f7f15e45000 rw-p 00000000 00:00 0 + 7f7f15e45000-7f7f15e46000 r--p 00025000 08:14 14948478 + /lib/x86_64-linux-gnu/ld-2.23.so + 7f7f15e46000-7f7f15e47000 rw-p 00026000 08:14 14948478 + /lib/x86_64-linux-gnu/ld-2.23.so + 7f7f15e47000-7f7f15e48000 rw-p 00000000 00:00 0 + 7ffdebe5c000-7ffdebe7d000 rw-p 00000000 00:00 0 + [stack] + 7ffdebebc000-7ffdebebe000 r--p 00000000 00:00 0 + [vvar] + 7ffdebebe000-7ffdebec0000 r-xp 00000000 00:00 0 + [vdso] + ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 + [vsyscall] + [1] 6272 abort btt -M test + +Signed-off-by: Jens Axboe +[Retrieved from: +https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git/commit/?id=d61ff409cb4dda31386373d706ea0cfb1aaac5b7] +Signed-off-by: Fabrice Fontaine +--- + btt/devmap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/btt/devmap.c b/btt/devmap.c +index 0553a9e..5fc1cb2 100644 +--- a/btt/devmap.c ++++ b/btt/devmap.c +@@ -23,7 +23,7 @@ + + struct devmap { + struct list_head head; +- char device[32], devno[32]; ++ char device[PATH_MAX], devno[PATH_MAX]; + }; + + LIST_HEAD(all_devmaps); +-- +cgit 1.2-0.3.lf.el7 + diff --git a/buildroot/package/blktrace/blktrace.mk b/buildroot/package/blktrace/blktrace.mk index 6d1c8e3b9..4ada2e8e4 100644 --- a/buildroot/package/blktrace/blktrace.mk +++ b/buildroot/package/blktrace/blktrace.mk @@ -10,6 +10,9 @@ BLKTRACE_DEPENDENCIES = libaio BLKTRACE_LICENSE = GPL-2.0+ BLKTRACE_LICENSE_FILES = COPYING +# 0001-btt-make-device-devno-use-PATH_MAX-to-avoid-overflow.patch +BLKTRACE_IGNORE_CVES += CVE-2018-10689 + define BLKTRACE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) endef diff --git a/buildroot/package/bluez-alsa/Config.in b/buildroot/package/bluez-alsa/Config.in index e52933f07..2f103f409 100644 --- a/buildroot/package/bluez-alsa/Config.in +++ b/buildroot/package/bluez-alsa/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_BLUEZ_ALSA bool "bluez-alsa" depends on !BR2_STATIC_LIBS # bluez5 - depends on !BR2_PACKAGE_BLUEZ_UTILS # bluez5 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5 @@ -39,4 +38,3 @@ comment "bluez-alsa needs a toolchain w/ wchar, NPTL, headers >= 3.4, dynamic li !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU - depends on !BR2_PACKAGE_BLUEZ_UTILS diff --git a/buildroot/package/bluez-alsa/bluez-alsa.hash b/buildroot/package/bluez-alsa/bluez-alsa.hash index ba81eadf3..603a501d4 100644 --- a/buildroot/package/bluez-alsa/bluez-alsa.hash +++ b/buildroot/package/bluez-alsa/bluez-alsa.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 29dad23877d0cf46a16e2f8d3746219e89068c33d052059caf1caaacd8b40cac bluez-alsa-v1.3.1.tar.gz -sha256 9a18d8b11802d0cec100839a0676a6fc48a4179f8f70b8e12a7f3d6b7a8fd70a LICENSE.txt +sha256 6459f70e47e70b4c04a85acf148381e6c8a2e86bd638aff21870afc6c14b85b0 bluez-alsa-2.1.0.tar.gz +sha256 60253922a459245128c34eb379cbda7c76936636d4c10edc576663a0f560dd4d LICENSE diff --git a/buildroot/package/bluez-alsa/bluez-alsa.mk b/buildroot/package/bluez-alsa/bluez-alsa.mk index 5c0bb4f12..d5cb3ed67 100644 --- a/buildroot/package/bluez-alsa/bluez-alsa.mk +++ b/buildroot/package/bluez-alsa/bluez-alsa.mk @@ -4,27 +4,20 @@ # ################################################################################ -BLUEZ_ALSA_VERSION = v1.3.1 -BLUEZ_ALSA_SITE = $(call github,Arkq,bluez-alsa,$(BLUEZ_ALSA_VERSION)) +BLUEZ_ALSA_VERSION = 2.1.0 +BLUEZ_ALSA_SITE = $(call github,Arkq,bluez-alsa,v$(BLUEZ_ALSA_VERSION)) BLUEZ_ALSA_LICENSE = MIT -BLUEZ_ALSA_LICENSE_FILES = LICENSE.txt +BLUEZ_ALSA_LICENSE_FILES = LICENSE BLUEZ_ALSA_DEPENDENCIES = alsa-lib bluez5_utils libglib2 sbc host-pkgconf # git repo, no configure BLUEZ_ALSA_AUTORECONF = YES -# Autoreconf requires an existing m4 directory -define BLUEZ_ALSA_MKDIR_M4 - mkdir -p $(@D)/m4 -endef -BLUEZ_ALSA_POST_PATCH_HOOKS += BLUEZ_ALSA_MKDIR_M4 - BLUEZ_ALSA_CONF_OPTS = \ --enable-aplay \ --disable-debug-time \ - --disable-pcm-test \ --with-alsaplugindir=/usr/lib/alsa-lib \ - --with-alsadatadir=/usr/share/alsa + --with-alsaconfdir=/etc/alsa/conf.d ifeq ($(BR2_PACKAGE_FDK_AAC),y) BLUEZ_ALSA_DEPENDENCIES += fdk-aac @@ -33,6 +26,34 @@ else BLUEZ_ALSA_CONF_OPTS += --disable-aac endif +ifeq ($(BR2_PACKAGE_LAME),y) +BLUEZ_ALSA_DEPENDENCIES += lame +BLUEZ_ALSA_CONF_OPTS += --enable-mp3lame +else +BLUEZ_ALSA_CONF_OPTS += --disable-mp3lame +endif + +ifeq ($(BR2_PACKAGE_MPG123),y) +BLUEZ_ALSA_DEPENDENCIES += mpg123 +BLUEZ_ALSA_CONF_OPTS += --enable-mpg123 +else +BLUEZ_ALSA_CONF_OPTS += --disable-mpg123 +endif + +# no build dependency, disables internal HFP in favor of oFonos HFP profile +ifeq ($(BR2_PACKAGE_OFONO),y) +BLUEZ_ALSA_CONF_OPTS += --enable-ofono +else +BLUEZ_ALSA_CONF_OPTS += --disable-ofono +endif + +# no build dependency, enables integration with UPower D-Bus service +ifeq ($(BR2_PACKAGE_UPOWER),y) +BLUEZ_ALSA_CONF_OPTS += --enable-upower +else +BLUEZ_ALSA_CONF_OPTS += --disable-upower +endif + ifeq ($(BR2_PACKAGE_BLUEZ_ALSA_HCITOP),y) BLUEZ_ALSA_DEPENDENCIES += libbsd ncurses BLUEZ_ALSA_CONF_OPTS += --enable-hcitop diff --git a/buildroot/package/bluez-tools/Config.in b/buildroot/package/bluez-tools/Config.in index 5a1b7d041..6db874b23 100644 --- a/buildroot/package/bluez-tools/Config.in +++ b/buildroot/package/bluez-tools/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_BLUEZ_TOOLS bool "bluez-tools" - depends on BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS + depends on BR2_PACKAGE_BLUEZ5_UTILS depends on BR2_USE_MMU # dbus, libglib2 depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 @@ -14,6 +14,6 @@ config BR2_PACKAGE_BLUEZ_TOOLS https://github.com/khvzak/bluez-tools comment "bluez-tools needs a toolchain w/ wchar, threads" - depends on BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS + depends on BR2_PACKAGE_BLUEZ5_UTILS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/bluez-tools/bluez-tools.hash b/buildroot/package/bluez-tools/bluez-tools.hash index 214fa5bdf..808e5c606 100644 --- a/buildroot/package/bluez-tools/bluez-tools.hash +++ b/buildroot/package/bluez-tools/bluez-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 56204ddd1cc7890d60f6a47507755f786fa3ee28f1da370a32ca7d7e0795a953 bluez-tools-171181b6ef6c94aefc828dc7fd8de136b9f97532.tar.gz -sha256 62ca98af63d2ae142dbc77995c6bd4c259eaba4a5832daa33ae9e3d585b9205f bluez-tools-97efd293491ad7ec96a655665339908f2478b3d1.tar.gz +sha256 62ca98af63d2ae142dbc77995c6bd4c259eaba4a5832daa33ae9e3d585b9205f bluez-tools-97efd293491ad7ec96a655665339908f2478b3d1.tar.gz +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/buildroot/package/bluez-tools/bluez-tools.mk b/buildroot/package/bluez-tools/bluez-tools.mk index 49891bd2d..c58701981 100644 --- a/buildroot/package/bluez-tools/bluez-tools.mk +++ b/buildroot/package/bluez-tools/bluez-tools.mk @@ -4,33 +4,13 @@ # ################################################################################ -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -# this is the last version compatible with BlueZ 4 API -BLUEZ_TOOLS_VERSION = 171181b6ef6c94aefc828dc7fd8de136b9f97532 -else BLUEZ_TOOLS_VERSION = 97efd293491ad7ec96a655665339908f2478b3d1 -endif BLUEZ_TOOLS_SITE = $(call github,khvzak,bluez-tools,$(BLUEZ_TOOLS_VERSION)) # sources fetched from github, no configure script) BLUEZ_TOOLS_AUTORECONF = YES -BLUEZ_TOOLS_DEPENDENCIES = host-pkgconf dbus dbus-glib +BLUEZ_TOOLS_DEPENDENCIES = host-pkgconf dbus dbus-glib bluez5_utils readline BLUEZ_TOOLS_LICENSE = GPL-2.0+ BLUEZ_TOOLS_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -BLUEZ_TOOLS_DEPENDENCIES += bluez_utils -# readline is an optional dependency when used with bluez_utils -# obex support depends on readline so enable it optionally -ifeq ($(BR2_PACKAGE_READLINE),y) -BLUEZ_TOOLS_CONF_OPTS += --enable-obex -BLUEZ_TOOLS_DEPENDENCIES += readline -else -BLUEZ_TOOLS_CONF_OPTS += --disable-obex -endif -else -# readline is a hard dependency when used with bluez5_utils -BLUEZ_TOOLS_DEPENDENCIES += bluez5_utils readline -endif - $(eval $(autotools-package)) diff --git a/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk b/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk index c61f93a23..871986c81 100644 --- a/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/buildroot/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.52 +BLUEZ5_UTILS_HEADERS_VERSION = 5.54 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/buildroot/package/bluez5_utils/Config.in b/buildroot/package/bluez5_utils/Config.in index c5e8dfbcf..488a2f79c 100644 --- a/buildroot/package/bluez5_utils/Config.in +++ b/buildroot/package/bluez5_utils/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_BLUEZ5_UTILS depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus depends on !BR2_STATIC_LIBS # uses dlfcn - depends on !BR2_PACKAGE_BLUEZ_UTILS # conflicts with 4.x version depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 depends on BR2_TOOLCHAIN_HAS_SYNC_4 select BR2_PACKAGE_DBUS @@ -100,6 +99,3 @@ comment "bluez5-utils needs a toolchain w/ wchar, threads, headers >= 3.4, dynam !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU - -comment "bluez5-utils conflicts with older bluez-utils version" - depends on BR2_PACKAGE_BLUEZ_UTILS diff --git a/buildroot/package/bluez5_utils/bluez5_utils.hash b/buildroot/package/bluez5_utils/bluez5_utils.hash index 00112bc0b..3eb6912fb 100644 --- a/buildroot/package/bluez5_utils/bluez5_utils.hash +++ b/buildroot/package/bluez5_utils/bluez5_utils.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 f7144ce2039202cfac18ccb52426efea11c98e4f6e1bb8041bcb994b8378560a bluez-5.52.tar.xz +sha256 68cdab9e63e8832b130d5979dc8c96fdb087b31278f342874d992af3e56656dc bluez-5.54.tar.xz sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/buildroot/package/bluez5_utils/bluez5_utils.mk b/buildroot/package/bluez5_utils/bluez5_utils.mk index 7c5202b71..e328f52ea 100644 --- a/buildroot/package/bluez5_utils/bluez5_utils.mk +++ b/buildroot/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.52 +BLUEZ5_UTILS_VERSION = 5.54 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES @@ -118,12 +118,4 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-systemd endif -define BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants - ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \ - $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants/bluetooth.service - ln -fs ../../../usr/lib/systemd/system/bluetooth.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.bluez.service -endef - $(eval $(autotools-package)) diff --git a/buildroot/package/bluez_utils/0001-enable_cg2900_on_upstream_4.91.patch b/buildroot/package/bluez_utils/0001-enable_cg2900_on_upstream_4.91.patch deleted file mode 100644 index e80af5fd9..000000000 --- a/buildroot/package/bluez_utils/0001-enable_cg2900_on_upstream_4.91.patch +++ /dev/null @@ -1,106 +0,0 @@ -From ac7992081abba87627c9e91735b3309584b48585 Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Wed, 14 Nov 2012 14:27:02 +0100 -Subject: [PATCH] add support for the ST-Ericsson CG2900 GPS FM Bluetooth - combo controller - - -Signed-off-by: Gregory Hermant ---- - tools/hciattach.c | 22 +++++++++++++++------- - tools/hciattach.h | 1 + - 2 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/tools/hciattach.c b/tools/hciattach.c -index e4d5aa1..7f08243 100644 ---- a/tools/hciattach.c -+++ b/tools/hciattach.c -@@ -1066,6 +1066,11 @@ struct uart_t uart[] = { - { "texasalt", 0x0000, 0x0000, HCI_UART_LL, 115200, 115200, - FLOW_CTL, DISABLE_PM, NULL, texasalt, NULL }, - -+ /* ST-Ericsson CG2900 GPS FM Bluetooth combo controller */ -+ { "cg2900", 0x0000, 0x0000, HCI_UART_STE, 115200, 115200, -+ FLOW_CTL, DISABLE_PM, NULL, NULL }, -+ -+ - /* ST Microelectronics minikits based on STLC2410/STLC2415 */ - { "st", 0x0000, 0x0000, HCI_UART_H4, 57600, 115200, - FLOW_CTL, DISABLE_PM, NULL, st }, -@@ -1157,10 +1162,10 @@ static struct uart_t * get_by_type(char *type) - } - - /* Initialize UART driver */ --static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) -+static int init_uart(char *dev, struct uart_t *u, int send_break, int raw, int line_disc) - { - struct termios ti; -- int fd, i; -+ int fd; - unsigned long flags = 0; - - if (raw) -@@ -1217,8 +1222,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) - } - - /* Set TTY to N_HCI line discipline */ -- i = N_HCI; -- if (ioctl(fd, TIOCSETD, &i) < 0) { -+ if (ioctl(fd, TIOCSETD, &line_disc) < 0) { - perror("Can't set line discipline"); - return -1; - } -@@ -1243,7 +1247,7 @@ static void usage(void) - { - printf("hciattach - HCI UART driver initialization utility\n"); - printf("Usage:\n"); -- printf("\thciattach [-n] [-p] [-b] [-r] [-t timeout] [-s initial_speed] [speed] [flow|noflow] [bdaddr]\n"); -+ printf("\thciattach [-n] [-p] [-a line_disc_nr] [-b] [-r] [-t timeout] [-s initial_speed] [speed] [flow|noflow] [bdaddr]\n"); - printf("\thciattach -l\n"); - } - -@@ -1252,6 +1256,7 @@ int main(int argc, char *argv[]) - struct uart_t *u = NULL; - int detach, printpid, raw, opt, i, n, ld, err; - int to = 10; -+ int line_disc = N_HCI; - int init_speed = 0; - int send_break = 0; - pid_t pid; -@@ -1264,8 +1269,11 @@ int main(int argc, char *argv[]) - printpid = 0; - raw = 0; - -- while ((opt=getopt(argc, argv, "bnpt:s:lr")) != EOF) { -+ while ((opt=getopt(argc, argv, "bnpt:s:lra:")) != EOF) { - switch(opt) { -+ case 'a': -+ line_disc = atoi(optarg); -+ break; - case 'b': - send_break = 1; - break; -@@ -1381,7 +1389,7 @@ int main(int argc, char *argv[]) - alarm(to); - bcsp_max_retries = to; - -- n = init_uart(dev, u, send_break, raw); -+ n = init_uart(dev, u, send_break, raw, line_disc); - if (n < 0) { - perror("Can't initialize device"); - exit(1); -diff --git a/tools/hciattach.h b/tools/hciattach.h -index fed0d11..09b534d 100644 ---- a/tools/hciattach.h -+++ b/tools/hciattach.h -@@ -39,6 +39,7 @@ - #define HCI_UART_H4DS 3 - #define HCI_UART_LL 4 - #define HCI_UART_ATH3K 5 -+#define HCI_UART_STE 6 - - #define HCI_UART_RAW_DEVICE 0 - --- -1.7.9.5 - diff --git a/buildroot/package/bluez_utils/0002-tools-hciconfig-include-fcntl.h.patch b/buildroot/package/bluez_utils/0002-tools-hciconfig-include-fcntl.h.patch deleted file mode 100644 index 7d0763ff0..000000000 --- a/buildroot/package/bluez_utils/0002-tools-hciconfig-include-fcntl.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ae607756a5f2a09bce1fc3a52e74b5f471245e33 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 6 Apr 2015 23:54:19 +0200 -Subject: [PATCH] tools/hciconfig: include - -Needed to get the definition of mode_t in musl. - -Signed-off-by: Thomas Petazzoni ---- - tools/hciconfig.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/hciconfig.c b/tools/hciconfig.c -index f1458b9..6776d62 100644 ---- a/tools/hciconfig.c -+++ b/tools/hciconfig.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.1.0 - diff --git a/buildroot/package/bluez_utils/0003-fix-compilation-issues-with-musl.patch b/buildroot/package/bluez_utils/0003-fix-compilation-issues-with-musl.patch deleted file mode 100644 index d8b48eaad..000000000 --- a/buildroot/package/bluez_utils/0003-fix-compilation-issues-with-musl.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 8aa6aa4ba2d9d00c91e36e146895af20cbc00d17 Mon Sep 17 00:00:00 2001 -From: Brendan Heading -Date: Wed, 2 Sep 2015 12:10:58 +0100 -Subject: [PATCH 1/1] fix compilation issues with musl. - -- sys/time.h needed for struct timeval -- unistd.h should not be included due to clash with encrypt(3) -- sys/types.h needed for mode_t - -Note that this version of bluez is 3 years old. Recent fixes have gone -into the upstream to address musl compatibility issues, but the upstream -has changed so much that it makes little sense to try to backport these. -This patch is really a stopgap until we move to the latest upstream. - -Upstream-Status: not needed -Signed-off-by: Brendan Heading ---- - compat/bnep.c | 1 + - compat/dund.c | 1 - - src/textfile.h | 1 + - 3 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/compat/bnep.c b/compat/bnep.c -index 281350b..49226c1 100644 ---- a/compat/bnep.c -+++ b/compat/bnep.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/compat/dund.c b/compat/dund.c -index af1b536..c2f085f 100644 ---- a/compat/dund.c -+++ b/compat/dund.c -@@ -29,7 +29,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/src/textfile.h b/src/textfile.h -index dc5fc2b..0148b30 100644 ---- a/src/textfile.h -+++ b/src/textfile.h -@@ -24,6 +24,7 @@ - #ifndef __TEXTFILE_H - #define __TEXTFILE_H - -+#include - int create_dirs(const char *filename, const mode_t mode); - int create_file(const char *filename, const mode_t mode); - int create_name(char *buf, size_t size, const char *path, --- -2.4.3 - diff --git a/buildroot/package/bluez_utils/0004-test-add-missing-header.patch b/buildroot/package/bluez_utils/0004-test-add-missing-header.patch deleted file mode 100644 index c74afb830..000000000 --- a/buildroot/package/bluez_utils/0004-test-add-missing-header.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d3c098c2fde55ddf0c7d56eae56925103d35da73 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 13 May 2017 18:56:51 +0200 -Subject: [PATCH] test: add missing header - -test/attest.c: In function 'at_command': -test/attest.c:43:2: error: unknown type name 'fd_set' - fd_set rfds; - ^ - -Fixes: -http://autobuild.buildroot.net/results/06c/06c930d9c5299b79500d018ac3fb2861ce834c7c/ - -Signed-off-by: Romain Naour ---- - test/attest.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/test/attest.c b/test/attest.c -index 12ba682..2626cf1 100644 ---- a/test/attest.c -+++ b/test/attest.c -@@ -35,6 +35,8 @@ - #include - #include - -+#include -+ - #include - #include - --- -2.9.3 - diff --git a/buildroot/package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch b/buildroot/package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch deleted file mode 100644 index 438da97cb..000000000 --- a/buildroot/package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch +++ /dev/null @@ -1,107 +0,0 @@ -From d8056252d0c99bfb2482f0a420dcf9a36019ddf8 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 13 May 2017 18:58:51 +0200 -Subject: [PATCH] test: avoid conflict with encrypt function -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With a musl based toolchain: - -test/l2test.c:110:12: error: ‘encrypt’ redeclared as different kind of symbol - static int encrypt = 0; - ^ -In file included from test/l2test.c:34:0: -[...]/sysroot/usr/include/unistd.h:145:6: note: previous declaration of ‘encrypt’ was here - void encrypt(char *, int); - ^ - -Signed-off-by: Romain Naour ---- - test/l2test.c | 8 ++++---- - test/rctest.c | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/test/l2test.c b/test/l2test.c -index f66486d..9ef6faf 100644 ---- a/test/l2test.c -+++ b/test/l2test.c -@@ -107,7 +107,7 @@ static char *filename = NULL; - static int rfcmode = 0; - static int master = 0; - static int auth = 0; --static int encrypt = 0; -+static int _encrypt = 0; - static int secure = 0; - static int socktype = SOCK_SEQPACKET; - static int linger = 0; -@@ -340,7 +340,7 @@ static int do_connect(char *svr) - opt |= L2CAP_LM_MASTER; - if (auth) - opt |= L2CAP_LM_AUTH; -- if (encrypt) -+ if (_encrypt) - opt |= L2CAP_LM_ENCRYPT; - if (secure) - opt |= L2CAP_LM_SECURE; -@@ -475,7 +475,7 @@ static void do_listen(void (*handler)(int sk)) - opt |= L2CAP_LM_MASTER; - if (auth) - opt |= L2CAP_LM_AUTH; -- if (encrypt) -+ if (_encrypt) - opt |= L2CAP_LM_ENCRYPT; - if (secure) - opt |= L2CAP_LM_SECURE; -@@ -1407,7 +1407,7 @@ int main(int argc, char *argv[]) - break; - - case 'E': -- encrypt = 1; -+ _encrypt = 1; - break; - - case 'S': -diff --git a/test/rctest.c b/test/rctest.c -index 4d7c90a..7ad5a0b 100644 ---- a/test/rctest.c -+++ b/test/rctest.c -@@ -79,7 +79,7 @@ static char *filename = NULL; - - static int master = 0; - static int auth = 0; --static int encrypt = 0; -+static int _encrypt = 0; - static int secure = 0; - static int socktype = SOCK_STREAM; - static int linger = 0; -@@ -200,7 +200,7 @@ static int do_connect(const char *svr) - opt |= RFCOMM_LM_MASTER; - if (auth) - opt |= RFCOMM_LM_AUTH; -- if (encrypt) -+ if (_encrypt) - opt |= RFCOMM_LM_ENCRYPT; - if (secure) - opt |= RFCOMM_LM_SECURE; -@@ -291,7 +291,7 @@ static void do_listen(void (*handler)(int sk)) - opt |= RFCOMM_LM_MASTER; - if (auth) - opt |= RFCOMM_LM_AUTH; -- if (encrypt) -+ if (_encrypt) - opt |= RFCOMM_LM_ENCRYPT; - if (secure) - opt |= RFCOMM_LM_SECURE; -@@ -701,7 +701,7 @@ int main(int argc, char *argv[]) - break; - - case 'E': -- encrypt = 1; -+ _encrypt = 1; - break; - - case 'S': --- -2.9.3 - diff --git a/buildroot/package/bluez_utils/Config.in b/buildroot/package/bluez_utils/Config.in deleted file mode 100644 index 327d26bce..000000000 --- a/buildroot/package/bluez_utils/Config.in +++ /dev/null @@ -1,48 +0,0 @@ -config BR2_PACKAGE_BLUEZ_UTILS - bool "bluez-utils" - depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 - depends on BR2_USE_MMU # dbus, libglib2 - select BR2_PACKAGE_CHECK - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_LIBGLIB2 - help - bluez utils - - http://www.kernel.org/pub/linux/bluetooth - -if BR2_PACKAGE_BLUEZ_UTILS - -config BR2_PACKAGE_BLUEZ_UTILS_COMPAT - bool "BlueZ 3.x compatibility binaries" - help - BlueZ 3.x compatibility binaries like pand, hidd, sdp - -config BR2_PACKAGE_BLUEZ_UTILS_AUDIO - bool "audio support" - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_LIBSNDFILE - help - Audio support - -config BR2_PACKAGE_BLUEZ_UTILS_USB - bool "USB support" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB - help - USB support - -config BR2_PACKAGE_BLUEZ_UTILS_GATT - bool "GATT support" - select BR2_PACKAGE_READLINE - help - Generic Attribute Profile (GATT) support. This provides - profile discovery and description services for Bluetooth Low - Energy. - This will install the gatttool utility. -endif - -comment "bluez-utils needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/bluez_utils/bluez_utils.hash b/buildroot/package/bluez_utils/bluez_utils.hash deleted file mode 100644 index 39e750eac..000000000 --- a/buildroot/package/bluez_utils/bluez_utils.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d bluez-4.101.tar.xz -# License files, locally calculated -sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING -sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/buildroot/package/bluez_utils/bluez_utils.mk b/buildroot/package/bluez_utils/bluez_utils.mk deleted file mode 100644 index 256f012df..000000000 --- a/buildroot/package/bluez_utils/bluez_utils.mk +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# -# bluez_utils -# -################################################################################ - -BLUEZ_UTILS_VERSION = 4.101 -BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.xz -BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth -BLUEZ_UTILS_INSTALL_STAGING = YES -BLUEZ_UTILS_DEPENDENCIES = host-pkgconf check dbus libglib2 -BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools -BLUEZ_UTILS_AUTORECONF = YES -BLUEZ_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ -BLUEZ_UTILS_LICENSE_FILES = COPYING COPYING.LIB - -# BlueZ 3.x compatibility -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y) -BLUEZ_UTILS_CONF_OPTS += \ - --enable-hidd \ - --enable-pand \ - --enable-sdp \ - --enable-dund -endif - -# audio support -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_AUDIO),y) -BLUEZ_UTILS_DEPENDENCIES += \ - alsa-lib \ - libsndfile -BLUEZ_UTILS_CONF_OPTS += \ - --enable-alsa \ - --enable-audio -else -BLUEZ_UTILS_CONF_OPTS += \ - --disable-alsa \ - --disable-audio -endif - -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_GATT),y) -BLUEZ_UTILS_DEPENDENCIES += readline -BLUEZ_UTILS_CONF_OPTS += --enable-gatt -else -BLUEZ_UTILS_CONF_OPTS += --disable-gatt -endif - -# USB support -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y) -BLUEZ_UTILS_DEPENDENCIES += libusb -BLUEZ_UTILS_CONF_OPTS += \ - --enable-usb -else -BLUEZ_UTILS_CONF_OPTS += \ - --disable-usb -endif - -ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) -BLUEZ_UTILS_CONF_OPTS += --disable-pie -endif - -$(eval $(autotools-package)) diff --git a/buildroot/package/bmon/bmon.hash b/buildroot/package/bmon/bmon.hash index dec0c7d81..2cdf315a7 100644 --- a/buildroot/package/bmon/bmon.hash +++ b/buildroot/package/bmon/bmon.hash @@ -1,2 +1,4 @@ # Locally calculated sha256 02fdc312b8ceeb5786b28bf905f54328f414040ff42f45c83007f24b76cc9f7a bmon-4.0.tar.gz +sha256 59ae3d59c672bfb955917a8e32f5cacba7f8ce716c499a4c63dc8cd8cb5c4991 LICENSE.BSD +sha256 a2a6760c2c6fa779a635e4a7ad00f668862ebcadb2a8a57d16662543e103e08c LICENSE.MIT diff --git a/buildroot/package/boa/boa.hash b/buildroot/package/boa/boa.hash index 37760fd51..4efe3aec4 100644 --- a/buildroot/package/boa/boa.hash +++ b/buildroot/package/boa/boa.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 02c51bf25f29d56e641b662f0767759654c28d88ec31f55c5a73d57edfe13cf6 boa-0.94.14rc21.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/boinc/boinc.hash b/buildroot/package/boinc/boinc.hash index eeaaf68ed..48d61dc91 100644 --- a/buildroot/package/boinc/boinc.hash +++ b/buildroot/package/boinc/boinc.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 970aedb9e25afa20be67f125ab05435df8eb2e66a3ac30ad316c54085e397c88 boinc-7.14.2.tar.gz +sha256 622ce3335a01ef30add4813c0cc7b65cffcaa5500a7f58f77748d0dbc80e6b06 boinc-7.16.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/buildroot/package/boinc/boinc.mk b/buildroot/package/boinc/boinc.mk index dd468c767..827eaa0c8 100644 --- a/buildroot/package/boinc/boinc.mk +++ b/buildroot/package/boinc/boinc.mk @@ -4,8 +4,8 @@ # ################################################################################ -BOINC_VERSION_MAJOR = 7.14 -BOINC_VERSION = $(BOINC_VERSION_MAJOR).2 +BOINC_VERSION_MAJOR = 7.16 +BOINC_VERSION = $(BOINC_VERSION_MAJOR).3 # client_release can be used to build the Client and Manager but not the Server # part. The Server currently has no versioning (see # https://github.com/BOINC/boinc/pull/1798). @@ -53,10 +53,4 @@ define BOINC_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S99boinc-client endef -define BOINC_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/boinc-client.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/boinc-client.service -endef - $(eval $(autotools-package)) diff --git a/buildroot/package/bonnie/bonnie.hash b/buildroot/package/bonnie/bonnie.hash index acf00fdbe..c8118e9d6 100644 --- a/buildroot/package/bonnie/bonnie.hash +++ b/buildroot/package/bonnie/bonnie.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb bonnie++-1.03e.tgz +sha256 bdfeef85436885bc317fdbae3732b17a39e7910eb855553a83b4d2cf9032e773 copyright.txt diff --git a/buildroot/package/boost/0004-add-riscv-endian-detection.patch b/buildroot/package/boost/0004-add-riscv-endian-detection.patch new file mode 100644 index 000000000..879838df3 --- /dev/null +++ b/buildroot/package/boost/0004-add-riscv-endian-detection.patch @@ -0,0 +1,36 @@ +Add RISC-V endian detection + +boost/predef/other/endian.h has two ways of detecting the endianess: + + (1) It includes if BOOST_LIB_C_GNU is defined, and then + use __BYTE_ORDER to decide the endianness. + + (2) Otherwise, if (1) was not possible for some reason, it uses + architecture defines to decide the endianness. + +(1) works perfectly fine with glibc toolchains, because +BOOST_LIB_C_GNU is defined, but it doesn't work with musl. Due to +this, is not included, __BYTE_ORDER is not defined, and +method (1) does not work, causing build failures on musl toolchains +that don't have explicit handling by architecture name (method 2). + +So this commit fixes RISC-V musl build by adding support for the +__riscv architecture define, to determine that the endianness is +little endian. + +Signed-off-by: Thomas Petazzoni + +Index: b/boost/predef/other/endian.h +=================================================================== +--- a/boost/predef/other/endian.h ++++ b/boost/predef/other/endian.h +@@ -127,7 +127,8 @@ + defined(__AARCH64EL__) || \ + defined(_MIPSEL) || \ + defined(__MIPSEL) || \ +- defined(__MIPSEL__) ++ defined(__MIPSEL__) || \ ++ defined(__riscv) + # undef BOOST_ENDIAN_LITTLE_BYTE + # define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE + # endif diff --git a/buildroot/package/boost/0004-workaround-musl-bug.patch b/buildroot/package/boost/0004-workaround-musl-bug.patch deleted file mode 100644 index 8613f2fec..000000000 --- a/buildroot/package/boost/0004-workaround-musl-bug.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0506e46640989e1f919388ad36890bd6063cd43a Mon Sep 17 00:00:00 2001 -From: Zach van Rijn -Date: Sat, 26 Aug 2017 01:32:56 -0400 -Subject: [PATCH] explicitly include for memset() - -[Thomas: taken from -https://github.com/boostorg/fiber/pull/142/commits/0506e46640989e1f919388ad36890bd6063cd43a. It -is not going to be applied upstream because the actual bug is in musl, -but it's a good enough workaround for now.] -Signed-off-by: Thomas Petazzoni ---- - libs/fiber/src/numa/linux/pin_thread.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libs/fiber/src/numa/linux/pin_thread.cpp b/libs/fiber/src/numa/linux/pin_thread.cpp -index ae696be3..e9b3c423 100644 ---- a/libs/fiber/src/numa/linux/pin_thread.cpp -+++ b/libs/fiber/src/numa/linux/pin_thread.cpp -@@ -9,6 +9,7 @@ - extern "C" { - #include - #include -+#include - } - - #include diff --git a/buildroot/package/boost/Config.in b/buildroot/package/boost/Config.in index 4e6bbff6d..121650b8b 100644 --- a/buildroot/package/boost/Config.in +++ b/buildroot/package/boost/Config.in @@ -101,7 +101,7 @@ comment "boost-contract needs a toolchain w/ NPTL" config BR2_PACKAGE_BOOST_COROUTINE bool "boost-coroutine" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context, boost-thread select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_CONTEXT select BR2_PACKAGE_BOOST_SYSTEM @@ -136,7 +136,6 @@ config BR2_PACKAGE_BOOST_FIBER # since mips32r2/mips64r2. depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85180 select BR2_PACKAGE_BOOST_CONTEXT select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_SYSTEM @@ -147,9 +146,9 @@ comment "boost-fiber needs a toolchain w/ NPTL" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL -comment "boost-fiber needs a toolchain not affected by GCC bug 64735, 85180" +comment "boost-fiber needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || BR2_TOOLCHAIN_HAS_GCC_BUG_85180 + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 config BR2_PACKAGE_BOOST_FILESYSTEM bool "boost-filesystem" @@ -190,6 +189,7 @@ config BR2_PACKAGE_BOOST_LOCALE # https://svn.boost.org/trac/boost/ticket/9685 for more # details. depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_ICU) + depends on !(BR2_TOOLCHAIN_HAS_GCC_BUG_64735 && BR2_PACKAGE_ICU) # boost-thread select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD if BR2_PACKAGE_ICU select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE @@ -200,9 +200,14 @@ comment "boost-locale needs a toolchain w/ dynamic library" depends on BR2_PACKAGE_ICU depends on BR2_STATIC_LIBS +comment "boost-locale needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_ICU + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + config BR2_PACKAGE_BOOST_LOG bool "boost-log" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME select BR2_PACKAGE_BOOST_FILESYSTEM @@ -215,6 +220,9 @@ config BR2_PACKAGE_BOOST_LOG comment "boost-log needs a toolchain w/ NPTL" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL +comment "boost-log needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + config BR2_PACKAGE_BOOST_MATH bool "boost-math" help @@ -305,12 +313,16 @@ config BR2_PACKAGE_BOOST_TEST config BR2_PACKAGE_BOOST_THREAD bool "boost-thread" + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception select BR2_PACKAGE_BOOST_ATOMIC if !BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_SYSTEM help Portable C++ multi-threading. C++11, C++14. +comment "boost-thread needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + config BR2_PACKAGE_BOOST_TIMER bool "boost-timer" select BR2_PACKAGE_BOOST_CHRONO @@ -320,16 +332,21 @@ config BR2_PACKAGE_BOOST_TIMER config BR2_PACKAGE_BOOST_TYPE_ERASURE bool "boost-type_erasure" + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD help Runtime polymorphism based on concepts. +comment "boost-type_erasure needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + config BR2_PACKAGE_BOOST_WAVE bool "boost-wave" # limitation of assembler for coldfire # error: Tried to convert PC relative branch to absolute jump depends on !BR2_m68k_cf + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread select BR2_PACKAGE_BOOST_DATE_TIME select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_SYSTEM @@ -340,4 +357,7 @@ config BR2_PACKAGE_BOOST_WAVE preprocessor functionality packed behind an easy to use iterator interface. +comment "boost-wave needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + endif diff --git a/buildroot/package/boost/boost.hash b/buildroot/package/boost/boost.hash index c67c3f4a5..0348f4046 100644 --- a/buildroot/package/boost/boost.hash +++ b/buildroot/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From http://www.boost.org/users/history/version_1_69_0.html -sha256 8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406 boost_1_69_0.tar.bz2 +# From http://www.boost.org/users/history/version_1_72_0.html +sha256 59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 boost_1_72_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/buildroot/package/boost/boost.mk b/buildroot/package/boost/boost.mk index 432730901..2daf7f5a9 100644 --- a/buildroot/package/boost/boost.mk +++ b/buildroot/package/boost/boost.mk @@ -4,13 +4,17 @@ # ################################################################################ -BOOST_VERSION = 1.69.0 +BOOST_VERSION = 1.72.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 -BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION) +BOOST_SITE = https://dl.bintray.com/boostorg/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES BOOST_LICENSE = BSL-1.0 BOOST_LICENSE_FILES = LICENSE_1_0.txt +# CVE-2009-3654 is misclassified (by our CVE tracker) as affecting to boost, +# while in fact it affects Drupal (a module called boost in there). +BOOST_IGNORE_CVES += CVE-2009-3654 + # keep host variant as minimal as possible HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ --without-libraries=$(subst $(space),$(comma),atomic chrono context \ @@ -67,7 +71,7 @@ ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y) BOOST_FLAGS += --with-python-root=$(HOST_DIR) ifeq ($(BR2_PACKAGE_PYTHON3),y) BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) -BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m +BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) BOOST_DEPENDENCIES += python3 else BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) @@ -76,8 +80,8 @@ BOOST_DEPENDENCIES += python endif endif -HOST_BOOST_OPTS += toolset=gcc threading=multi variant=release link=shared \ - runtime-link=shared +HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \ + variant=release link=shared runtime-link=shared ifeq ($(BR2_MIPS_OABI32),y) BOOST_ABI = o32 @@ -87,7 +91,8 @@ else BOOST_ABI = sysv endif -BOOST_OPTS += toolset=gcc \ +BOOST_OPTS += --no-cmake-config \ + toolset=gcc \ threading=multi \ abi=$(BOOST_ABI) \ variant=$(if $(BR2_ENABLE_DEBUG),debug,release) @@ -132,7 +137,7 @@ define BOOST_CONFIGURE_CMDS endef define BOOST_BUILD_CMDS - (cd $(@D) && $(TARGET_MAKE_ENV) ./bjam -j$(PARALLEL_JOBS) -q \ + (cd $(@D) && $(TARGET_MAKE_ENV) ./tools/build/src/engine/bjam -j$(PARALLEL_JOBS) -q \ --user-config=$(@D)/user-config.jam \ $(BOOST_OPTS) \ --ignore-site-config \ @@ -149,7 +154,7 @@ define BOOST_INSTALL_TARGET_CMDS endef define BOOST_INSTALL_STAGING_CMDS - (cd $(@D) && $(TARGET_MAKE_ENV) ./bjam -j$(PARALLEL_JOBS) -q \ + (cd $(@D) && $(TARGET_MAKE_ENV) ./tools/build/src/engine/bjam -j$(PARALLEL_JOBS) -q \ --user-config=$(@D)/user-config.jam \ $(BOOST_OPTS) \ --prefix=$(STAGING_DIR)/usr \ diff --git a/buildroot/package/bootstrap/bootstrap.hash b/buildroot/package/bootstrap/bootstrap.hash index ed29f9c52..a9602f7e4 100644 --- a/buildroot/package/bootstrap/bootstrap.hash +++ b/buildroot/package/bootstrap/bootstrap.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 75c0325fd82e29cf524e28d8be7716c216cc507ba85b087ab36868209236aa01 bootstrap-4.1.0-dist.zip -sha256 0ce7fbe215cdf921ed87d00a374404681d5d24898589a7fe60e068d09289b4ba css/bootstrap.css +sha256 888ffd30b7e192381e2f6a948ca04669fdcc2ccc2ba016de00d38c8e30793323 bootstrap-4.3.1-dist.zip +sha256 35fbb6dc3891aacaf1ffa07abec2344fdbc454aab533a2a03bcf93577eb7837b css/bootstrap.css diff --git a/buildroot/package/bootstrap/bootstrap.mk b/buildroot/package/bootstrap/bootstrap.mk index 0699485f5..c9f6003b5 100644 --- a/buildroot/package/bootstrap/bootstrap.mk +++ b/buildroot/package/bootstrap/bootstrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOTSTRAP_VERSION = 4.1.0 +BOOTSTRAP_VERSION = 4.3.1 BOOTSTRAP_SITE = https://github.com/twbs/bootstrap/releases/download/v$(BOOTSTRAP_VERSION) BOOTSTRAP_SOURCE = bootstrap-$(BOOTSTRAP_VERSION)-dist.zip BOOTSTRAP_LICENSE = MIT @@ -12,6 +12,7 @@ BOOTSTRAP_LICENSE_FILES = css/bootstrap.css define BOOTSTRAP_EXTRACT_CMDS $(UNZIP) $(BOOTSTRAP_DL_DIR)/$(BOOTSTRAP_SOURCE) -d $(@D) + mv $(@D)/bootstrap-$(BOOTSTRAP_VERSION)-dist/* $(@D) endef define BOOTSTRAP_INSTALL_TARGET_CMDS diff --git a/buildroot/package/botan/0001-remove-mips64-explicit-mabi.patch b/buildroot/package/botan/0001-remove-mips64-explicit-mabi.patch deleted file mode 100644 index 9c9317755..000000000 --- a/buildroot/package/botan/0001-remove-mips64-explicit-mabi.patch +++ /dev/null @@ -1,20 +0,0 @@ -Remove explicit mips64 -mabi parameter - -This breaks when building for n32 ABI on mips64. - -Signed-off-by: Baruch Siach -[Bernd: rebased for botan-2.7.0] -Signed-off-by: Bernd Kuhls ---- - -diff -Nuar Botan-1.10.8-orig/src/build-data/cc/gcc.txt Botan-1.10.8/src/build-data/cc/gcc.txt ---- Botan-1.10.8-orig/src/build-data/cc/gcc.txt 2014-04-10 17:11:44.000000000 +0300 -+++ Botan-1.10.8/src/build-data/cc/gcc.txt 2014-10-23 09:20:34.506722323 +0300 -@@ -83,7 +83,6 @@ - - openmp -> "-fopenmp" - --mips64 -> "-mabi=64" - s390 -> "-m31" - s390x -> "-m64" - sparc32 -> "-m32 -mno-app-regs" diff --git a/buildroot/package/botan/0003-makefile.in-move-LDFLAGS-after-EXE_LINKS_TO.patch b/buildroot/package/botan/0003-makefile.in-move-LDFLAGS-after-EXE_LINKS_TO.patch deleted file mode 100644 index 82186419d..000000000 --- a/buildroot/package/botan/0003-makefile.in-move-LDFLAGS-after-EXE_LINKS_TO.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a837dd63f3ac5a9c206863c82b57c679cb72b8b7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 28 Apr 2019 10:21:06 +0200 -Subject: [PATCH] makefile.in: move LDFLAGS after EXE_LINKS_TO - -Move LDFLAGS after EXE_LINKS_TO to allow the user to give additional -libraries such as -latomic otherwise static build will fail: - -cli/tls_server.o build/obj/cli/tls_utils.o build/obj/cli/utils.o build/obj/cli/x509.o -L. -lbotan-2 -lboost_filesystem -lboost_system -lbz2 -lcrypto -llzma -lsqlite3 -lz -o botan -/home/buildroot/autobuild/instance-1/output/host/bin/sparc-linux-g++ -Wl,-rpath=\$ORIGIN -pthread -static -latomic build/obj/test/main.o build/obj/test/test_aead.o build/obj/test/test_asn1.o build/obj/test/test_bigint.o build/obj/test/test_block.o build/obj/test/test_blowfish.o build/obj/test/test_c25519.o build/obj/test/test_certstor.o build/obj/test/test_compression.o build/obj/test/test_cryptobox.o build/obj/test/test_datastore.o build/obj/test/test_dh.o build/obj/test/test_dl_group.o build/obj/test/test_dlies.o build/obj/test/test_dsa.o build/obj/test/test_ecc_pointmul.o build/obj/test/test_ecdh.o build/obj/test/test_ecdsa.o build/obj/test/test_ecgdsa.o build/obj/test/test_ecies.o build/obj/test/test_eckcdsa.o build/obj/test/test_ed25519.o build/obj/test/test_elg.o build/obj/test/test_entropy.o build/obj/test/test_ffi.o build/obj/test/test_filters.o build/obj/test/test_fpe.o build/obj/test/test_gf2m.o build/obj/test/test_gost_3410.o build/obj/test/test_hash.o build/obj/test/test_hash_id.o build/obj/test/test_kdf.o build/obj/test/test_keywrap.o build/obj/test/test_mac.o build/obj/test/test_mceliece.o build/obj/test/test_modes.o build/obj/test/test_mp.o build/obj/test/test_name_constraint.o build/obj/test/test_newhope.o build/obj/test/test_ocb.o build/obj/test/test_ocsp.o build/obj/test/test_octetstring.o build/obj/test/test_oid.o build/obj/test/test_os_utils.o build/obj/test/test_otp.o build/obj/test/test_package_transform.o build/obj/test/test_pad.o build/obj/test/test_passhash.o build/obj/test/test_pbkdf.o build/obj/test/test_pem.o build/obj/test/test_pk_pad.o build/obj/test/test_pkcs11.o build/obj/test/test_pkcs11_high_level.o build/obj/test/test_pkcs11_low_level.o build/obj/test/test_psk_db.o build/obj/test/test_pubkey.o build/obj/test/test_rfc6979.o build/obj/test/test_rng.o build/obj/test/test_rng_kat.o build/obj/test/test_rsa.o build/obj/test/test_runner.o build/obj/test/test_simd.o build/obj/test/test_siv.o build/obj/test/test_sm2.o build/obj/test/test_srp6.o build/obj/test/test_stream.o build/obj/test/test_tests.o build/obj/test/test_tls.o build/obj/test/test_tls_messages.o build/obj/test/test_tpm.o build/obj/test/test_tss.o build/obj/test/test_utils.o build/obj/test/test_workfactor.o build/obj/test/test_x509_dn.o build/obj/test/test_x509_path.o build/obj/test/test_xmss.o build/obj/test/tests.o build/obj/test/unit_ecc.o build/obj/test/unit_ecdh.o build/obj/test/unit_ecdsa.o build/obj/test/unit_tls.o build/obj/test/unit_tls_policy.o build/obj/test/unit_x509.o -L. -lbotan-2 -lboost_filesystem -lboost_system -lbz2 -lcrypto -llzma -lsqlite3 -lz -o botan-test -./libbotan-2.a(utils_filesystem.o): In function `Botan::get_files_recursive(std::__cxx11::basic_string, std::allocator > const&)': -filesystem.cpp:(.text+0x758): undefined reference to `__atomic_fetch_sub_4' - -Fixes: - - http://autobuild.buildroot.org/results/9db39b209a0f4be1e09b7e4ddb5e9a63da4fbbfa - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/randombit/botan/pull/1916] ---- - src/build-data/makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in -index 08c9c5421..7111c7b19 100644 ---- a/src/build-data/makefile.in -+++ b/src/build-data/makefile.in -@@ -71,7 +71,7 @@ $(CLI): $(LIBRARIES) $(CLIOBJS) - $(POST_LINK_CMD) - - $(TEST): $(LIBRARIES) $(TESTOBJS) -- $(EXE_LINK_CMD) $(ABI_FLAGS) $(LDFLAGS) $(TESTOBJS) $(EXE_LINKS_TO) %{output_to_exe}$@ -+ $(EXE_LINK_CMD) $(ABI_FLAGS) $(TESTOBJS) $(EXE_LINKS_TO) $(LDFLAGS) %{output_to_exe}$@ - $(POST_LINK_CMD) - - %{if build_fuzzers} --- -2.20.1 - diff --git a/buildroot/package/botan/botan.hash b/buildroot/package/botan/botan.hash index faa467ec2..a04825a75 100644 --- a/buildroot/package/botan/botan.hash +++ b/buildroot/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 e7159b127e91e0c158245d61c638c50d443ec7b440b6b0161328c47b3aba3960 Botan-2.8.0.tgz +sha256 f7874da2aeb8c018fd77df40b2137879bf90b66f5589490c991e83fb3e8094be Botan-2.11.0.tar.xz # Locally computed -sha256 40cfd35a9e34d18463806f57553c968fdbaf254a2e2a636d1d8e32ff6b698495 license.txt +sha256 161011a9be56a6e825c06257005055a148056b5c756f75a0b99dae0883fcab7a license.txt diff --git a/buildroot/package/botan/botan.mk b/buildroot/package/botan/botan.mk index a96a12178..62027280d 100644 --- a/buildroot/package/botan/botan.mk +++ b/buildroot/package/botan/botan.mk @@ -4,8 +4,8 @@ # ################################################################################ -BOTAN_VERSION = 2.8.0 -BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tgz +BOTAN_VERSION = 2.11.0 +BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause BOTAN_LICENSE_FILES = license.txt diff --git a/buildroot/package/brickd/Config.in b/buildroot/package/brickd/Config.in new file mode 100644 index 000000000..7c5b8eb4b --- /dev/null +++ b/buildroot/package/brickd/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_BRICKD + bool "brickd" + depends on BR2_PACKAGE_HAS_UDEV # gudev + depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_WCHAR # glib2 + depends on BR2_USE_MMU # glib2, gudev + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBGUDEV + help + Brick daemon for LEGO MINDSTORMS EV3 (and other LEGO- + compatible devices). This performs tasks like battery + management and controls device-specific hardware. + + https://github.com/ev3dev/brickd + +comment "brickd needs udev /dev management, a toolchain w/ threads, wchar" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR diff --git a/buildroot/package/brickd/S70brickd b/buildroot/package/brickd/S70brickd new file mode 100644 index 000000000..063ad875a --- /dev/null +++ b/buildroot/package/brickd/S70brickd @@ -0,0 +1,37 @@ +#!/bin/sh + +NAME=brickd +PIDFILE=/var/run/$NAME.pid +DAEMON=/usr/sbin/$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/buildroot/package/brickd/brickd.hash b/buildroot/package/brickd/brickd.hash new file mode 100644 index 000000000..8de57a9b8 --- /dev/null +++ b/buildroot/package/brickd/brickd.hash @@ -0,0 +1,5 @@ +# Locally computed hash +sha256 0b79f1ccd6fa644d7ecb2e17b19f9ffbf6374702ae9ac536b2c4a0b8b2cfe160 brickd-ev3dev-stretch_1.2.1.tar.gz + +# Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.txt diff --git a/buildroot/package/brickd/brickd.mk b/buildroot/package/brickd/brickd.mk new file mode 100644 index 000000000..7fe28daf7 --- /dev/null +++ b/buildroot/package/brickd/brickd.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# brickd +# +################################################################################ + +BRICKD_VERSION = ev3dev-stretch/1.2.1 +BRICKD_SITE = https://github.com/ev3dev/brickd +BRICKD_SITE_METHOD = git +BRICKD_GIT_SUBMODULES = YES + +BRICKD_LICENSE = GPL-2.0 +BRICKD_LICENSE_FILES = LICENSE.txt + +BRICKD_INSTALL_STAGING = YES +BRICKD_DEPENDENCIES = host-pkgconf host-vala libglib2 libgudev + +define BRICKD_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/brickd/S70brickd $(TARGET_DIR)/etc/init.d/S70brickd +endef + +$(eval $(cmake-package)) diff --git a/buildroot/package/bridge-utils/bridge-utils.hash b/buildroot/package/bridge-utils/bridge-utils.hash index e699b24a6..5658116f8 100644 --- a/buildroot/package/bridge-utils/bridge-utils.hash +++ b/buildroot/package/bridge-utils/bridge-utils.hash @@ -1,2 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/net/bridge-utils/sha256sums.asc sha256 cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8 bridge-utils-1.6.tar.xz + +# locally computed +sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 COPYING diff --git a/buildroot/package/brltty/0002-Fix-linking-error-on-mips64el.patch b/buildroot/package/brltty/0001-Fix-linking-error-on-mips64el.patch similarity index 100% rename from buildroot/package/brltty/0002-Fix-linking-error-on-mips64el.patch rename to buildroot/package/brltty/0001-Fix-linking-error-on-mips64el.patch diff --git a/buildroot/package/brltty/0001-buildsys-fix-cross-compilation.patch b/buildroot/package/brltty/0001-buildsys-fix-cross-compilation.patch deleted file mode 100644 index 9a10d4641..000000000 --- a/buildroot/package/brltty/0001-buildsys-fix-cross-compilation.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 088666535a045dae71bd2fcc6b3a1553023106ce Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Wed, 22 Aug 2018 10:10:19 +0200 -Subject: [PATCH] buildsys: fix cross-compilation - -Some identifiers for includes and libs paths may contain digit, e.g. -X11_PACKAGE or ATSPI2_PACKAGE or GLIB2_PACKAGE... - -Also detect those identifiers when doing cros-compilation, so that the -_FOR_BUILD variants are really created and do not clash with the target -variants. - -Fixes: - http://autobuild.buildroot.org/results/a37/a37782b3cfc1a96cc129db8fade20a36a7b2d470/build-end.log - http://autobuild.buildroot.org/results/97e/97edc6a47d2140968e84b409cdc960604e5896f2/build-end.log - [...] - -Signed-off-by: "Yann E. MORIN" ---- -Upstram status: submitted -https://github.com/brltty/brltty/pull/142 ---- - mk4build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mk4build b/mk4build -index db90c86a9..551283825 100755 ---- a/mk4build -+++ b/mk4build -@@ -112,7 +112,7 @@ fi - - sedScript="${outputName}.${sedExtension}" - sed -n -e ' --s/^ *\([A-Za-z][A-Za-z_]*\) *=.*$/\1/ -+s/^ *\([A-Za-z][A-Za-z0-9_]*\) *=.*$/\1/ - t found - d - :found --- -2.14.1 - diff --git a/buildroot/package/brltty/0002-mk4build-change-how-the-_FOR_BUILD-variables-are-pas.patch b/buildroot/package/brltty/0002-mk4build-change-how-the-_FOR_BUILD-variables-are-pas.patch new file mode 100644 index 000000000..ddcc5ba9e --- /dev/null +++ b/buildroot/package/brltty/0002-mk4build-change-how-the-_FOR_BUILD-variables-are-pas.patch @@ -0,0 +1,53 @@ +From 0414ad2b4e8978a14343d920a5a1f11da892eaf3 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 26 Oct 2019 14:28:51 +0200 +Subject: [PATCH] mk4build: change how the _FOR_BUILD variables are passed to + sub-configure + +The logic that eval's for *_FOR_BUILD variables to set them to their +equivalent without _FOR_BUILD before calling the sub-configure for the +host machine doesn't work: the variables are not exported, and +therefore they are not seen by the ./configure script, which runs as a +separate process. + +So instead, keep things simple and pass them explicitly in the +environment of the ./configure script. + +This patch was written in the context of the Buildroot build system, +which does cross-compilation, through which we discovered that the +*_FOR_BUILD variables are not properly passed down to the +sub-configure. + +Upstream: https://github.com/brltty/brltty/pull/183 +Signed-off-by: Thomas Petazzoni +--- + mk4build | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +diff --git a/mk4build b/mk4build +index 3fb9d8917..3c64963b7 100755 +--- a/mk4build ++++ b/mk4build +@@ -67,13 +67,12 @@ then + + needTemporaryDirectory + +- for variable in CC CFLAGS CXX CXXFLAGS LDFLAGS LDLIBS +- do +- unset "${variable}" +- variableForBuild="${variable}_FOR_BUILD" +- eval test '"${'"${variableForBuild}"'+set}"' != "set" || eval "${variable}"'="${'"${variableForBuild}"'}"' +- done +- ++ CC=${CC_FOR_BUILD} \ ++ CFLAGS=${CFLAGS_FOR_BUILD} \ ++ CXX=${CXX_FOR_BUILD} \ ++ CXXFLAGS=${CXXFLAGS_FOR_BUILD} \ ++ LDFLAGS=${LDFLAGS_FOR_BUILD} \ ++ LDLIBS=${LDLIBS_FOR_BUILD} \ + "${sourceRoot}/configure" \ + --disable-api \ + --disable-gpm \ +-- +2.21.0 + diff --git a/buildroot/package/brltty/0003-mk4build-also-pass-PKG_CONFIG_FOR_BUILD-to-the-nativ.patch b/buildroot/package/brltty/0003-mk4build-also-pass-PKG_CONFIG_FOR_BUILD-to-the-nativ.patch new file mode 100644 index 000000000..5839f78f3 --- /dev/null +++ b/buildroot/package/brltty/0003-mk4build-also-pass-PKG_CONFIG_FOR_BUILD-to-the-nativ.patch @@ -0,0 +1,38 @@ +From 568e0d6070021a9b805ba1fe1543e4b43a073413 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 20 Feb 2020 00:23:35 +0100 +Subject: [PATCH] mk4build: also pass PKG_CONFIG_FOR_BUILD to the native + configure + +In commit 0414ad2b4e8978a14343d920a5a1f11da892eaf3, mk4build was +modified to pass a number of *_FOR_BUILD variables down to the +configure script called for building the native tools. + +However, this configure script also uses the pkg-config tool, and the +pkg-config to use for the native build and the cross build may be +different, so let's also pass PKG_CONFIG_FOR_BUILD down to the +sub-configure, as PKG_CONFIG, following the same logic as the other +variables. + +Signed-off-by: Thomas Petazzoni +Upstream: https://github.com/brltty/brltty/pull/248 +[Upstream patch is different, due to other upstream changes.] +--- + mk4build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mk4build b/mk4build +index 3c64963b7..ad88ee69c 100755 +--- a/mk4build ++++ b/mk4build +@@ -73,6 +73,7 @@ then + CXXFLAGS=${CXXFLAGS_FOR_BUILD} \ + LDFLAGS=${LDFLAGS_FOR_BUILD} \ + LDLIBS=${LDLIBS_FOR_BUILD} \ ++ PKG_CONFIG=${PKG_CONFIG_FOR_BUILD} \ + "${sourceRoot}/configure" \ + --disable-api \ + --disable-gpm \ +-- +2.24.1 + diff --git a/buildroot/package/brltty/brltty.hash b/buildroot/package/brltty/brltty.hash index 6b9470c82..4373d7da9 100644 --- a/buildroot/package/brltty/brltty.hash +++ b/buildroot/package/brltty/brltty.hash @@ -1,3 +1,3 @@ -sha256 6171258aca833bb2012afd9c63928573a48c3daab7b149a3e90001ba53beb80f brltty-5.6.tar.xz +sha256 cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7 brltty-6.0.tar.xz sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL -sha256 42685d8fa420f618e325d423be110c69abd976afdef183dfac385ccd44cb12e9 README +sha256 69d7cbb371bcb165ccde6c496f61481a557d17f0afa0aaa86ece214c4bd698cb README diff --git a/buildroot/package/brltty/brltty.mk b/buildroot/package/brltty/brltty.mk index 21f6877bb..acc172fab 100644 --- a/buildroot/package/brltty/brltty.mk +++ b/buildroot/package/brltty/brltty.mk @@ -4,7 +4,7 @@ # ################################################################################ -BRLTTY_VERSION = 5.6 +BRLTTY_VERSION = 6.0 BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz BRLTTY_SITE = http://brltty.com/archive BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install @@ -15,6 +15,9 @@ BRLTTY_LICENSE_FILES = LICENSE-LGPL README BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf host-pkgconf \ $(if $(BR2_PACKAGE_AT_SPI2_CORE),at-spi2-core) +BRLTTY_CONF_ENV = \ + PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf + BRLTTY_CONF_OPTS = \ --disable-java-bindings \ --disable-lisp-bindings \ @@ -22,14 +25,14 @@ BRLTTY_CONF_OPTS = \ --disable-python-bindings \ --disable-tcl-bindings \ --disable-x \ + --without-espeak-ng \ --without-midi-package \ --without-mikropuhe --without-speechd --without-swift \ - --without-theta --without-viavoice + --without-theta # Autoreconf is needed because we're patching configure.ac in -# 0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch. However, -# a plain autoreconf doesn't work, because this package is only -# autoconf-based. +# 0001-Fix-linking-error-on-mips64el. However, a plain autoreconf doesn't work, +# because this package is only autoconf-based. define BRLTTY_AUTOCONF cd $(BRLTTY_SRCDIR) && $(AUTOCONF) endef @@ -50,6 +53,14 @@ else BRLTTY_CONF_OPTS += --without-espeak endif +ifeq ($(BR2_PACKAGE_EXPAT),y) +# host-expat is needed by tbl2hex's host program +BRLTTY_DEPENDENCIES += host-expat expat +BRLTTY_CONF_OPTS += --enable-expat +else +BRLTTY_CONF_OPTS += --disable-expat +endif + ifeq ($(BR2_PACKAGE_FLITE),y) BRLTTY_DEPENDENCIES += flite BRLTTY_CONF_OPTS += --with-flite=$(STAGING_DIR)/usr @@ -71,6 +82,16 @@ else BRLTTY_CONF_OPTS += --without-curses endif +ifeq ($(BR2_PACKAGE_PCRE2_32),y) +BRLTTY_DEPENDENCIES += pcre2 +BRLTTY_CONF_OPTS += --with-rgx-package +else ifeq ($(BR2_PACKAGE_PCRE_32),y) +BRLTTY_DEPENDENCIES += pcre +BRLTTY_CONF_OPTS += --with-rgx-package +else +BRLTTY_CONF_OPTS += --without-rgx-package +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) BRLTTY_DEPENDENCIES += systemd BRLTTY_CONF_OPTS += --with-service-package @@ -103,10 +124,6 @@ endef define BRLTTY_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/brltty/brltty.service \ $(TARGET_DIR)/usr/lib/systemd/system/brltty.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -fs ../../../../usr/lib/systemd/system/brltty.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/brltty.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/bsdiff/bsdiff.hash b/buildroot/package/bsdiff/bsdiff.hash index 989fcf1f1..2c6d02f4e 100644 --- a/buildroot/package/bsdiff/bsdiff.hash +++ b/buildroot/package/bsdiff/bsdiff.hash @@ -1,2 +1,4 @@ # From http://www.daemonology.net/bsdiff/: md5 e6d812394f0e0ecc8d5df255aa1db22a bsdiff-4.3.tar.gz +# locally computed +sha256 fc0a6e634ef77dcf14bf36c7b6d1e57ba1ac5c4809073dfaacb3b5f7ab277eb7 bsdiff.c diff --git a/buildroot/package/btrfs-progs/btrfs-progs.hash b/buildroot/package/btrfs-progs/btrfs-progs.hash index 07d55ec33..b8e6a07fd 100644 --- a/buildroot/package/btrfs-progs/btrfs-progs.hash +++ b/buildroot/package/btrfs-progs/btrfs-progs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 bf0b34f1538c0b6e88f959937b0419678cadbf2ba7044336dcbfb2bcdc28cd74 btrfs-progs-v4.17.1.tar.xz +sha256 36ac4a0198ffff79d5800c537ea4b19769a8fd3ad870f75413d25b20e2d83233 btrfs-progs-v5.2.1.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING diff --git a/buildroot/package/btrfs-progs/btrfs-progs.mk b/buildroot/package/btrfs-progs/btrfs-progs.mk index 585dcf364..11a284499 100644 --- a/buildroot/package/btrfs-progs/btrfs-progs.mk +++ b/buildroot/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.17.1 +BTRFS_PROGS_VERSION = 5.2.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib diff --git a/buildroot/package/bubblewrap/Config.in b/buildroot/package/bubblewrap/Config.in new file mode 100644 index 000000000..2492cee0e --- /dev/null +++ b/buildroot/package/bubblewrap/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_BUBBLEWRAP + bool "bubblewrap" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBCAP + help + Unprivileged sandbox tool based on Linux namespaces. + + https://github.com/projectatomic/bubblewrap diff --git a/buildroot/package/bubblewrap/bubblewrap.hash b/buildroot/package/bubblewrap/bubblewrap.hash new file mode 100644 index 000000000..d3ccb4cb1 --- /dev/null +++ b/buildroot/package/bubblewrap/bubblewrap.hash @@ -0,0 +1,5 @@ +# Locally computed: +sha256 b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03 bubblewrap-0.4.1.tar.xz + +# Hash for license files: +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/buildroot/package/bubblewrap/bubblewrap.mk b/buildroot/package/bubblewrap/bubblewrap.mk new file mode 100644 index 000000000..388f64880 --- /dev/null +++ b/buildroot/package/bubblewrap/bubblewrap.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# bubblewrap +# +################################################################################ + +BUBBLEWRAP_VERSION = 0.4.1 +BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION) +BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz +BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap + +BUBBLEWRAP_LICENSE = LGPL-2.0+ +BUBBLEWRAP_LICENSE_FILES = COPYING + +BUBBLEWRAP_CONF_OPTS = \ + --enable-require-userns=no \ + --disable-man \ + --disable-sudo \ + --with-priv-mode=none + +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +BUBBLEWRAP_CONF_OPTS += --with-bash-completion-dir=/usr/share/bash-completion/completions +else +BUBBLEWRAP_CONF_OPTS += --without-bash-completion-dir +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +BUBBLEWRAP_CONF_OPTS += --enable-selinux +BUBBLEWRAP_DEPENDENCIES += libselinux +else +BUBBLEWRAP_CONF_OPTS += --disable-selinux +endif + +# We need to mark bwrap as setuid, in case the kernel +# has user namespaces disabled for non-root users. +define BUBBLEWRAP_PERMISSIONS + /usr/bin/bwrap f 1755 0 0 - - - - - +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/bullet/Config.in b/buildroot/package/bullet/Config.in index d4d69d2c9..fc285ab33 100644 --- a/buildroot/package/bullet/Config.in +++ b/buildroot/package/bullet/Config.in @@ -1,9 +1,6 @@ config BR2_PACKAGE_BULLET bool "bullet" depends on BR2_INSTALL_LIBSTDCPP - # Affected by - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68476 - depends on !BR2_microblaze help Bullet is a Collision Detection and Rigid Body Dynamics Library. @@ -12,4 +9,3 @@ config BR2_PACKAGE_BULLET comment "bullet needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP - depends on !BR2_microblaze diff --git a/buildroot/package/bullet/bullet.hash b/buildroot/package/bullet/bullet.hash index c6a45c2ac..9da8c733d 100644 --- a/buildroot/package/bullet/bullet.hash +++ b/buildroot/package/bullet/bullet.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c058b2e4321ba6adaa656976c1a138c07b18fc03b29f5b82880d5d8228fbf059 bullet-2.86.1.tar.gz +sha256 621b36e91c0371933f3c2156db22c083383164881d2a6b84636759dc4cbb0bb8 bullet-2.89.tar.gz +sha256 885cd516a8420acb7c3e0b1a7119913b686495001ae564e3229740460e8cff59 LICENSE.txt diff --git a/buildroot/package/bullet/bullet.mk b/buildroot/package/bullet/bullet.mk index 3e8fae3a0..b25fc5d21 100644 --- a/buildroot/package/bullet/bullet.mk +++ b/buildroot/package/bullet/bullet.mk @@ -4,7 +4,7 @@ # ################################################################################ -BULLET_VERSION = 2.86.1 +BULLET_VERSION = 2.89 BULLET_SITE = $(call github,bulletphysics,bullet3,$(BULLET_VERSION)) BULLET_INSTALL_STAGING = YES BULLET_LICENSE = Zlib @@ -16,4 +16,19 @@ BULLET_CONF_OPTS = -DBUILD_UNIT_TESTS=OFF \ -DBUILD_BULLET2_DEMOS=OFF \ -DBUILD_BULLET3=OFF +# extras needs dlfcn.h and NPTL (pthread_barrier_init) +ifeq ($(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_HAS_THREADS_NPTL),:y) +BULLET_CONF_OPTS += -DBUILD_EXTRAS=ON +else +BULLET_CONF_OPTS += -DBUILD_EXTRAS=OFF +endif + +BULLET_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +BULLET_CXXFLAGS += -O0 +endif + +BULLET_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(BULLET_CXXFLAGS)" + $(eval $(cmake-package)) diff --git a/buildroot/package/bustle/Config.in b/buildroot/package/bustle/Config.in index 109ebdeed..c9d38d0d3 100644 --- a/buildroot/package/bustle/Config.in +++ b/buildroot/package/bustle/Config.in @@ -18,7 +18,7 @@ config BR2_PACKAGE_BUSTLE This only installs the command line bustle-pcap tool, not the graphical viewer. - http://www.willthompson.co.uk/bustle/ + https://gitlab.freedesktop.org/bustle/bustle/ comment "bustle needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU diff --git a/buildroot/package/bustle/bustle.hash b/buildroot/package/bustle/bustle.hash index 49890f74f..05281c4f1 100644 --- a/buildroot/package/bustle/bustle.hash +++ b/buildroot/package/bustle/bustle.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 921c2cbbb957dcb02c3aa8fd1eeff3534cb437fa9eeca1c25206ad1e741a3f14 bustle-0.5.4.tar.gz +sha256 7760a695b25cb264e7342f353dcdc6d2b7faeacdcd85dd14e03c61b18e791664 bustle-0.7.5.tar.gz +sha256 a6d6109e5b086de8e852e451b91b08b323302f55b6975d506c64c43bb094be38 LICENSE diff --git a/buildroot/package/bustle/bustle.mk b/buildroot/package/bustle/bustle.mk index ffbfbe40f..675ffb052 100644 --- a/buildroot/package/bustle/bustle.mk +++ b/buildroot/package/bustle/bustle.mk @@ -4,8 +4,8 @@ # ################################################################################ -BUSTLE_VERSION = 0.5.4 -BUSTLE_SITE = http://www.willthompson.co.uk/bustle/releases/$(BUSTLE_VERSION) +BUSTLE_VERSION = 0.7.5 +BUSTLE_SITE = https://www.freedesktop.org/software/bustle/$(BUSTLE_VERSION) BUSTLE_LICENSE = LGPL-2.1+ BUSTLE_LICENSE_FILES = LICENSE BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf diff --git a/buildroot/package/busybox/0003-install.sh-don-t-clobber-dangling-symlinks.patch b/buildroot/package/busybox/0003-install.sh-don-t-clobber-dangling-symlinks.patch deleted file mode 100644 index b6fb5b923..000000000 --- a/buildroot/package/busybox/0003-install.sh-don-t-clobber-dangling-symlinks.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c9f1a877f1b9e2602913600d769edb17ee41d15d Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 17 Jul 2018 13:18:09 +0300 -Subject: [PATCH] install.sh: don't clobber dangling symlinks - -Symlinks in a subdirectory that is to become target rootfs are sometimes -dangling because they link to canonical file names that are not present -on the host, but are present relative to the target rootfs root. Don't -copy over dangling symlinks when noclobber is enabled - -The -e test treats dangling symlinks as non-existent files. Add -h test -that returns true for all symlinks. - -Cc: Yann E. MORIN -Signed-off-by: Baruch Siach ---- -Upstream status: -http://lists.busybox.net/pipermail/busybox/2018-July/086555.html - - applets/install.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/applets/install.sh b/applets/install.sh -index 9aede0f530e2..415896893e86 100755 ---- a/applets/install.sh -+++ b/applets/install.sh -@@ -83,7 +83,7 @@ install -m 755 busybox "$prefix/bin/busybox" || exit 1 - for i in $h; do - appdir=`dirname "$i"` - app=`basename "$i"` -- if [ x"$noclobber" = x"1" ] && [ -e "$prefix/$i" ]; then -+ if [ x"$noclobber" = x"1" ] && ([ -e "$prefix/$i" ] || [ -h "$prefix/$i" ]); then - echo " $prefix/$i already exists" - continue - fi --- -2.18.0 - diff --git a/buildroot/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch b/buildroot/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch deleted file mode 100644 index b40979e35..000000000 --- a/buildroot/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 6d3b4bb24da9a07c263f3c1acf8df85382ff562c Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Mon, 17 Dec 2018 18:07:18 +0100 -Subject: udhcpc: check that 4-byte options are indeed 4-byte, closes 11506 - -function old new delta -udhcp_get_option32 - 27 +27 -udhcp_get_option 231 248 +17 ------------------------------------------------------------------------------- -(add/remove: 1/0 grow/shrink: 1/0 up/down: 44/0) Total: 44 bytes - -Signed-off-by: Denys Vlasenko -Signed-off-by: Jared Bents ---- - networking/udhcp/common.c | 19 +++++++++++++++++++ - networking/udhcp/common.h | 4 ++++ - networking/udhcp/dhcpc.c | 6 +++--- - networking/udhcp/dhcpd.c | 6 +++--- - 4 files changed, 29 insertions(+), 6 deletions(-) - -diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c -index e5fd74f91..41b05b855 100644 ---- a/networking/udhcp/common.c -+++ b/networking/udhcp/common.c -@@ -272,6 +272,15 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code) - goto complain; /* complain and return NULL */ - - if (optionptr[OPT_CODE] == code) { -+ if (optionptr[OPT_LEN] == 0) { -+ /* So far no valid option with length 0 known. -+ * Having this check means that searching -+ * for DHCP_MESSAGE_TYPE need not worry -+ * that returned pointer might be unsafe -+ * to dereference. -+ */ -+ goto complain; /* complain and return NULL */ -+ } - log_option("option found", optionptr); - return optionptr + OPT_DATA; - } -@@ -289,6 +298,16 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code) - return NULL; - } - -+uint8_t* FAST_FUNC udhcp_get_option32(struct dhcp_packet *packet, int code) -+{ -+ uint8_t *r = udhcp_get_option(packet, code); -+ if (r) { -+ if (r[-1] != 4) -+ r = NULL; -+ } -+ return r; -+} -+ - /* Return the position of the 'end' option (no bounds checking) */ - int FAST_FUNC udhcp_end_option(uint8_t *optionptr) - { -diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h -index 7ad603d33..9511152ff 100644 ---- a/networking/udhcp/common.h -+++ b/networking/udhcp/common.h -@@ -205,6 +205,10 @@ extern const uint8_t dhcp_option_lengths[] ALIGN1; - unsigned FAST_FUNC udhcp_option_idx(const char *name, const char *option_strings); - - uint8_t *udhcp_get_option(struct dhcp_packet *packet, int code) FAST_FUNC; -+/* Same as above + ensures that option length is 4 bytes -+ * (returns NULL if size is different) -+ */ -+uint8_t *udhcp_get_option32(struct dhcp_packet *packet, int code) FAST_FUNC; - int udhcp_end_option(uint8_t *optionptr) FAST_FUNC; - void udhcp_add_binary_option(struct dhcp_packet *packet, uint8_t *addopt) FAST_FUNC; - #if ENABLE_UDHCPC || ENABLE_UDHCPD -diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c -index 4b23e4d39..5b3fd531c 100644 ---- a/networking/udhcp/dhcpc.c -+++ b/networking/udhcp/dhcpc.c -@@ -1691,7 +1691,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - * They say ISC DHCP client supports this case. - */ - server_addr = 0; -- temp = udhcp_get_option(&packet, DHCP_SERVER_ID); -+ temp = udhcp_get_option32(&packet, DHCP_SERVER_ID); - if (!temp) { - bb_error_msg("no server ID, using 0.0.0.0"); - } else { -@@ -1718,7 +1718,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - struct in_addr temp_addr; - uint8_t *temp; - -- temp = udhcp_get_option(&packet, DHCP_LEASE_TIME); -+ temp = udhcp_get_option32(&packet, DHCP_LEASE_TIME); - if (!temp) { - bb_error_msg("no lease time with ACK, using 1 hour lease"); - lease_seconds = 60 * 60; -@@ -1813,7 +1813,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - uint32_t svid; - uint8_t *temp; - -- temp = udhcp_get_option(&packet, DHCP_SERVER_ID); -+ temp = udhcp_get_option32(&packet, DHCP_SERVER_ID); - if (!temp) { - non_matching_svid: - log1("received DHCP NAK with wrong" -diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c -index a8cd3f03b..477856d11 100644 ---- a/networking/udhcp/dhcpd.c -+++ b/networking/udhcp/dhcpd.c -@@ -640,7 +640,7 @@ static void add_server_options(struct dhcp_packet *packet) - static uint32_t select_lease_time(struct dhcp_packet *packet) - { - uint32_t lease_time_sec = server_config.max_lease_sec; -- uint8_t *lease_time_opt = udhcp_get_option(packet, DHCP_LEASE_TIME); -+ uint8_t *lease_time_opt = udhcp_get_option32(packet, DHCP_LEASE_TIME); - if (lease_time_opt) { - move_from_unaligned32(lease_time_sec, lease_time_opt); - lease_time_sec = ntohl(lease_time_sec); -@@ -987,7 +987,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) - } - - /* Get SERVER_ID if present */ -- server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID); -+ server_id_opt = udhcp_get_option32(&packet, DHCP_SERVER_ID); - if (server_id_opt) { - uint32_t server_id_network_order; - move_from_unaligned32(server_id_network_order, server_id_opt); -@@ -1011,7 +1011,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) - } - - /* Get REQUESTED_IP if present */ -- requested_ip_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP); -+ requested_ip_opt = udhcp_get_option32(&packet, DHCP_REQUESTED_IP); - if (requested_ip_opt) { - move_from_unaligned32(requested_nip, requested_ip_opt); - } --- -cgit v1.2.1 - diff --git a/buildroot/package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch b/buildroot/package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch deleted file mode 100644 index 05939db4a..000000000 --- a/buildroot/package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 74d9f1ba37010face4bd1449df4d60dd84450b06 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Mon, 7 Jan 2019 15:33:42 +0100 -Subject: udhcpc: when decoding DHCP_SUBNET, ensure it is 4 bytes long - -function old new delta -udhcp_run_script 795 801 +6 - -Signed-off-by: Denys Vlasenko -Signed-off-by: Jared Bents ---- - networking/udhcp/common.c | 2 +- - networking/udhcp/common.h | 2 +- - networking/udhcp/dhcpc.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c -index 4c2221b77..fc4de5716 100644 ---- a/networking/udhcp/common.c -+++ b/networking/udhcp/common.c -@@ -302,7 +302,7 @@ uint8_t* FAST_FUNC udhcp_get_option32(struct dhcp_packet *packet, int code) - { - uint8_t *r = udhcp_get_option(packet, code); - if (r) { -- if (r[-1] != 4) -+ if (r[-OPT_DATA + OPT_LEN] != 4) - r = NULL; - } - return r; -diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h -index 9511152ff..62f9a2a4a 100644 ---- a/networking/udhcp/common.h -+++ b/networking/udhcp/common.h -@@ -119,7 +119,7 @@ enum { - //#define DHCP_TIME_SERVER 0x04 /* RFC 868 time server (32-bit, 0 = 1.1.1900) */ - //#define DHCP_NAME_SERVER 0x05 /* IEN 116 _really_ ancient kind of NS */ - //#define DHCP_DNS_SERVER 0x06 --//#define DHCP_LOG_SERVER 0x07 /* port 704 UDP log (not syslog) -+//#define DHCP_LOG_SERVER 0x07 /* port 704 UDP log (not syslog) */ - //#define DHCP_COOKIE_SERVER 0x08 /* "quote of the day" server */ - //#define DHCP_LPR_SERVER 0x09 - #define DHCP_HOST_NAME 0x0c /* 12: either client informs server or server gives name to client */ -diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c -index 5b3fd531c..dcec8cdfd 100644 ---- a/networking/udhcp/dhcpc.c -+++ b/networking/udhcp/dhcpc.c -@@ -531,7 +531,7 @@ static char **fill_envp(struct dhcp_packet *packet) - temp = udhcp_get_option(packet, code); - *curr = xmalloc_optname_optval(temp, &dhcp_optflags[i], opt_name); - putenv(*curr++); -- if (code == DHCP_SUBNET) { -+ if (code == DHCP_SUBNET && temp[-OPT_DATA + OPT_LEN] == 4) { - /* Subnet option: make things like "$ip/$mask" possible */ - uint32_t subnet; - move_from_unaligned32(subnet, temp); --- -cgit v1.2.1 - diff --git a/buildroot/package/busybox/Config.in b/buildroot/package/busybox/Config.in index e5c5f89a4..5e5c58676 100644 --- a/buildroot/package/busybox/Config.in +++ b/buildroot/package/busybox/Config.in @@ -38,11 +38,9 @@ config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS config BR2_PACKAGE_BUSYBOX_SELINUX bool "Enable SELinux support" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on !BR2_arc - select BR2_PACKAGE_LIBSELINUX + default y + depends on BR2_PACKAGE_LIBSELINUX + select BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES help Enable SELinux support in BusyBox. Please note that depending on your BusyBox configuration and the SELinux diff --git a/buildroot/package/busybox/S02sysctl b/buildroot/package/busybox/S02sysctl new file mode 100644 index 000000000..6bb2fa165 --- /dev/null +++ b/buildroot/package/busybox/S02sysctl @@ -0,0 +1,66 @@ +#!/bin/sh + +PROGRAM="sysctl" + +SYSCTL_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$PROGRAM" ] && . "/etc/default/$PROGRAM" + +# Files are read from directories in the SYSCTL_SOURCES list, in the given +# order. A file may be used more than once, since there can be multiple +# symlinks to it. No attempt is made to prevent this. +SYSCTL_SOURCES="/etc/sysctl.d/ /usr/local/lib/sysctl.d/ /usr/lib/sysctl.d/ /lib/sysctl.d/ /etc/sysctl.conf" + +# Use some scripting to mimic the --system option of the sysctl provided by +# procps-ng but still reporting errors. Users not interested on error report +# can put "-e" in SYSCTL_ARGS. +# +# The file redirections do the following: +# +# - stdout is redirected to syslog with facility.level "kern.info" +# - stderr is redirected to syslog with facility.level "kern.err" +# - file dscriptor 4 is used to pass the result to the "start" function. +# +# Testing the sysctl exit code is fruitless, as at the moment, since it ends +# with status zero even if errors happen. Hopefully this will be fixed in a +# future version of Busybox. +# +run_program() { + # shellcheck disable=SC2086 # we need the word splitting + find $SYSCTL_SOURCES -maxdepth 1 -name '*.conf' -print0 2> /dev/null | \ + xargs -0 -r -n 1 readlink -f | { + prog_status="OK" + while :; do + read -r file + if [ -z "$file" ]; then + echo "$prog_status" >&4 + break + fi + echo "* Applying $file ..." + /sbin/sysctl -p "$file" $SYSCTL_ARGS || prog_status="FAIL" + done 2>&1 >&3 | /usr/bin/logger -t sysctl -p kern.err + } 3>&1 | /usr/bin/logger -t sysctl -p kern.info +} + +start() { + printf '%s %s: ' "$1" "$PROGRAM" + status=$(run_program 4>&1) + echo "$status" + if [ "$status" = "OK" ]; then + return 0 + fi + return 1 +} + +case "$1" in + start) + start "Running";; + restart|reload) + start "Rerunning";; + stop) + :;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/busybox/S10mdev b/buildroot/package/busybox/S10mdev index 7075b7701..3c6f47c18 100644 --- a/buildroot/package/busybox/S10mdev +++ b/buildroot/package/busybox/S10mdev @@ -1,20 +1,38 @@ #!/bin/sh # -# Start mdev.... +# Run the mdev daemon # -case "$1" in - start) - echo "Starting mdev..." - echo /sbin/mdev >/proc/sys/kernel/hotplug - /sbin/mdev -s +DAEMON="mdev" +PIDFILE="/var/run/$DAEMON.pid" + + +start() { + echo -n "Starting $DAEMON... " + start-stop-daemon -S -b -m -p $PIDFILE -x /sbin/mdev -- -df + [ $? -eq 0 ] && echo "OK" || echo "ERROR" + # coldplug modules - find /sys/ -name modalias -print0 | xargs -0 sort -u | tr '\n' '\0' | \ - xargs -0 modprobe -abq - ;; - stop) - ;; - restart|reload) + find /sys/ -name modalias -print0 | \ + xargs -0 sort -u | \ + tr '\n' '\0' | \ + xargs -0 modprobe -abq +} + +stop() { + echo -n "Stopping $DAEMON... " + start-stop-daemon -K -p $PIDFILE + [ $? -eq 0 ] && echo "OK" || echo "ERROR" +} + +restart() { + stop + start +} + +case "$1" in + start|stop|restart) + "$1" ;; *) echo "Usage: $0 {start|stop|restart}" diff --git a/buildroot/package/busybox/busybox.config b/buildroot/package/busybox/busybox.config index ab04854c8..1ea810e5b 100644 --- a/buildroot/package/busybox/busybox.config +++ b/buildroot/package/busybox/busybox.config @@ -628,6 +628,7 @@ CONFIG_FEATURE_MDEV_RENAME=y # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set CONFIG_FEATURE_MDEV_EXEC=y # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +CONFIG_FEATURE_MDEV_DAEMON=y CONFIG_MESG=y CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y CONFIG_MKE2FS=y diff --git a/buildroot/package/busybox/busybox.hash b/buildroot/package/busybox/busybox.hash index b12bc2129..e5b05ae73 100644 --- a/buildroot/package/busybox/busybox.hash +++ b/buildroot/package/busybox/busybox.hash @@ -1,3 +1,4 @@ -# From https://busybox.net/downloads/busybox-1.29.3.tar.bz2.sha256 -sha256 97648636e579462296478e0218e65e4bc1e9cd69089a3b1aeb810bff7621efb7 busybox-1.29.3.tar.bz2 +# From https://busybox.net/downloads/busybox-1.31.1.tar.bz2.sha256 +sha256 d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998 busybox-1.31.1.tar.bz2 +# Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE diff --git a/buildroot/package/busybox/busybox.mk b/buildroot/package/busybox/busybox.mk index 565488ce1..b9d82ed71 100644 --- a/buildroot/package/busybox/busybox.mk +++ b/buildroot/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.29.3 +BUSYBOX_VERSION = 1.31.1 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0 @@ -218,8 +218,12 @@ define BUSYBOX_SET_GETTY $(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(SYSTEM_GETTY_PORT)::respawn:/sbin/getty -L $(SYSTEM_GETTY_OPTIONS) $(SYSTEM_GETTY_PORT) $(SYSTEM_GETTY_BAUDRATE) $(SYSTEM_GETTY_TERM) #~' \ $(TARGET_DIR)/etc/inittab endef -BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_SET_GETTY +else +define BUSYBOX_SET_GETTY + $(SED) '/# GENERIC_SERIAL$$/s~^.*#~#ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 #~' $(TARGET_DIR)/etc/inittab +endef endif # BR2_TARGET_GENERIC_GETTY +BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_SET_GETTY BUSYBOX_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB @@ -260,6 +264,17 @@ define BUSYBOX_INSTALL_LOGGING_SCRIPT endef endif +# Only install our sysctl scripts if no other package does it. +ifeq ($(BR2_PACKAGE_PROCPS_NG),) +define BUSYBOX_INSTALL_SYSCTL_SCRIPT + if grep -q CONFIG_BB_SYSCTL=y $(@D)/.config; \ + then \ + $(INSTALL) -m 0755 -D package/busybox/S02sysctl \ + $(TARGET_DIR)/etc/init.d/S02sysctl ; \ + fi +endef +endif + ifeq ($(BR2_INIT_BUSYBOX),y) define BUSYBOX_INSTALL_INITTAB if test ! -e $(TARGET_DIR)/etc/inittab; then \ @@ -303,11 +318,11 @@ endef # Add /bin/{a,hu}sh to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define BUSYBOX_INSTALL_ADD_TO_SHELLS - if grep -q CONFIG_ASH=y $(@D)/.config; then \ + if grep -q CONFIG_ASH=y $(BUSYBOX_DIR)/.config; then \ grep -qsE '^/bin/ash$$' $(TARGET_DIR)/etc/shells \ || echo "/bin/ash" >> $(TARGET_DIR)/etc/shells; \ fi - if grep -q CONFIG_HUSH=y $(@D)/.config; then \ + if grep -q CONFIG_HUSH=y $(BUSYBOX_DIR)/.config; then \ grep -qsE '^/bin/hush$$' $(TARGET_DIR)/etc/shells \ || echo "/bin/hush" >> $(TARGET_DIR)/etc/shells; \ fi @@ -334,6 +349,7 @@ define BUSYBOX_INSTALL_TARGET_CMDS # Use the 'noclobber' install rule, to prevent BusyBox from overwriting # any full-blown versions of apps installed by other packages. $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install-noclobber + $(BUSYBOX_INSTALL_INDIVIDUAL_BINARIES) $(BUSYBOX_INSTALL_INITTAB) $(BUSYBOX_INSTALL_UDHCPC_SCRIPT) $(BUSYBOX_INSTALL_MDEV_CONF) @@ -343,8 +359,8 @@ define BUSYBOX_INSTALL_INIT_SYSV $(BUSYBOX_INSTALL_MDEV_SCRIPT) $(BUSYBOX_INSTALL_LOGGING_SCRIPT) $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) + $(BUSYBOX_INSTALL_SYSCTL_SCRIPT) $(BUSYBOX_INSTALL_TELNET_SCRIPT) - $(BUSYBOX_INSTALL_INDIVIDUAL_BINARIES) endef # Checks to give errors that the user can understand diff --git a/buildroot/package/busybox/udhcpc.script b/buildroot/package/busybox/udhcpc.script index 131c138b1..711963f97 100755 --- a/buildroot/package/busybox/udhcpc.script +++ b/buildroot/package/busybox/udhcpc.script @@ -8,6 +8,26 @@ RESOLV_CONF="/etc/resolv.conf" [ -e $RESOLV_CONF ] || touch $RESOLV_CONF [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" [ -n "$subnet" ] && NETMASK="netmask $subnet" +# Handle stateful DHCPv6 like DHCPv4 +[ -n "$ipv6" ] && ip="$ipv6/128" + +if [ -z "${IF_WAIT_DELAY}" ]; then + IF_WAIT_DELAY=10 +fi + +wait_for_ipv6_default_route() { + printf "Waiting for IPv6 default route to appear" + while [ $IF_WAIT_DELAY -gt 0 ]; do + if [ -z "$(ip -6 route list | grep default)" ]; then + printf "\n" + return + fi + sleep 1 + printf "." + : $((IF_WAIT_DELAY -= 1)) + done + printf " timeout!\n" +} case "$1" in deconfig) @@ -37,6 +57,9 @@ case "$1" in /usr/sbin/avahi-autoipd -k $interface fi /sbin/ifconfig $interface $ip $BROADCAST $NETMASK + if [ -n "$ipv6" ] ; then + wait_for_ipv6_default_route + fi if [ -n "$router" ] ; then echo "deleting routers" diff --git a/buildroot/package/bwm-ng/bwm-ng.hash b/buildroot/package/bwm-ng/bwm-ng.hash index 4c12b0d81..4b6622767 100644 --- a/buildroot/package/bwm-ng/bwm-ng.hash +++ b/buildroot/package/bwm-ng/bwm-ng.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 4b34a8ac2eae2d204d6dea8258c5e34b37094259086f8c9169391409a9311fb5 bwm-ng-f54b3fad2c80bfe63f920c9b5e7c1d80389c57ef.tar.gz +sha256 906a2d561f2ec9e0dd68b7f51b302908e99515ea1216d0ecaf14d873ef54ae70 bwm-ng-0.6.2.tar.gz +sha256 8556cc15ba3c0a411bf7d94bac5870829fb725f294b450c724c1e0856a601556 COPYING diff --git a/buildroot/package/bwm-ng/bwm-ng.mk b/buildroot/package/bwm-ng/bwm-ng.mk index 32e097e23..4a34559e3 100644 --- a/buildroot/package/bwm-ng/bwm-ng.mk +++ b/buildroot/package/bwm-ng/bwm-ng.mk @@ -4,8 +4,8 @@ # ################################################################################ -BWM_NG_VERSION = f54b3fad2c80bfe63f920c9b5e7c1d80389c57ef -BWM_NG_SITE = $(call github,vgropp,bwm-ng,$(BWM_NG_VERSION)) +BWM_NG_VERSION = 0.6.2 +BWM_NG_SITE = $(call github,vgropp,bwm-ng,v$(BWM_NG_VERSION)) BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats BWM_NG_LICENSE = GPL-2.0+ BWM_NG_LICENSE_FILES = COPYING diff --git a/buildroot/package/c-capnproto/Config.in b/buildroot/package/c-capnproto/Config.in new file mode 100644 index 000000000..d1f3236af --- /dev/null +++ b/buildroot/package/c-capnproto/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_C_CAPNPROTO + bool "c-capnproto" + depends on BR2_USE_MMU # capnproto + depends on BR2_HOST_GCC_AT_LEAST_5 # capnproto + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # capnproto + depends on BR2_INSTALL_LIBSTDCPP # capnproto + depends on BR2_TOOLCHAIN_HAS_THREADS # capnproto + depends on BR2_TOOLCHAIN_HAS_ATOMIC # capnproto + select BR2_PACKAGE_CAPNPROTO + help + A C plugin for Cap'n Proto. Generates the code generator + plugin for C. Requires regular Cap'n Proto and only + provides serialization (no RPC). + + https://github.com/opensourcerouting/c-capnproto + +comment "c-capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic" + depends on BR2_USE_MMU + depends on!BR2_HOST_GCC_AT_LEAST_5 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_ATOMIC diff --git a/buildroot/package/c-capnproto/c-capnproto.hash b/buildroot/package/c-capnproto/c-capnproto.hash new file mode 100644 index 000000000..75edaebf9 --- /dev/null +++ b/buildroot/package/c-capnproto/c-capnproto.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 88c454f4f4bad87c9b60cd739c7da5605c1085c0e92b317dd72d547bbb804279 c-capnproto-9053ebe6eeb2ae762655b982e27c341cb568366d.tar.gz +sha256 27797e6c7dce96675d79ed250584d157b7a86405db6eb6fba9644e6d96d42c57 COPYING diff --git a/buildroot/package/c-capnproto/c-capnproto.mk b/buildroot/package/c-capnproto/c-capnproto.mk new file mode 100644 index 000000000..c144a4bec --- /dev/null +++ b/buildroot/package/c-capnproto/c-capnproto.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# c-capnproto +# +################################################################################ + +C_CAPNPROTO_VERSION = 9053ebe6eeb2ae762655b982e27c341cb568366d +C_CAPNPROTO_SITE = https://github.com/opensourcerouting/c-capnproto.git +C_CAPNPROTO_SITE_METHOD = git +C_CAPNPROTO_GIT_SUBMODULES = YES +C_CAPNPROTO_LICENSE = MIT +C_CAPNPROTO_LICENSE_FILES = COPYING +C_CAPNPROTO_INSTALL_STAGING = YES + +# Fetched from git with no configure script +C_CAPNPROTO_AUTORECONF = YES + +# As a plugin for capnproto's capnpc, requires capnproto. Needs to be on the +# host to generate C code from message definitions. +C_CAPNPROTO_DEPENDENCIES = host-c-capnproto capnproto +HOST_C_CAPNPROTO_DEPENDENCIES = host-capnproto + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/c-icap-modules/c-icap-modules.hash b/buildroot/package/c-icap-modules/c-icap-modules.hash index a9fee87e4..fa0eb0898 100644 --- a/buildroot/package/c-icap-modules/c-icap-modules.hash +++ b/buildroot/package/c-icap-modules/c-icap-modules.hash @@ -1,3 +1,7 @@ -# From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.4.x/ -md5 1a7eaa7a34ff35c2440cf303f7b45f22 c_icap_modules-0.4.5.tar.gz -sha1 515145e6d29413aff8543937504dc5c419043fd5 c_icap_modules-0.4.5.tar.gz +# From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.5.x/ +md5 d5f1e553cfe60180f9fa22c9a13005be c_icap_modules-0.5.3.tar.gz +sha1 df76f30b2cc29aeef700f477693e7017eaa847f4 c_icap_modules-0.5.3.tar.gz + +# Locally calculated +sha256 6e2f87a60379ffde26947c6e82ff0c7f614bc005588bf1efb40c74f69c82f925 c_icap_modules-0.5.3.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/c-icap-modules/c-icap-modules.mk b/buildroot/package/c-icap-modules/c-icap-modules.mk index d75437898..b5356b1db 100644 --- a/buildroot/package/c-icap-modules/c-icap-modules.mk +++ b/buildroot/package/c-icap-modules/c-icap-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ICAP_MODULES_VERSION = 0.4.5 +C_ICAP_MODULES_VERSION = 0.5.3 C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_MODULES_LICENSE = GPL-2.0+ @@ -15,13 +15,6 @@ C_ICAP_MODULES_CONF_OPTS = \ --with-c-icap=$(STAGING_DIR)/usr/ \ --without-clamav -ifeq ($(BR2_PACKAGE_ZLIB),y) -C_ICAP_MODULES_CONF_OPTS += --with-zlib -C_ICAP_MODULES_DEPENDENCIES += zlib -else -C_ICAP_MODULES_CONF_OPTS += --without-zlib -endif - ifeq ($(BR2_PACKAGE_BERKELEYDB),y) C_ICAP_MODULES_CONF_OPTS += --with-bdb C_ICAP_MODULES_DEPENDENCIES += berkeleydb diff --git a/buildroot/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch b/buildroot/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch new file mode 100644 index 000000000..452223c67 --- /dev/null +++ b/buildroot/package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch @@ -0,0 +1,391 @@ +From 1631a6c1f50e152b8a45d8279c96086e5636795b Mon Sep 17 00:00:00 2001 +From: Christos Tsantilas +Date: Fri, 25 Jan 2019 06:42:22 -0800 +Subject: [PATCH] Required fixes to compile and run under cygwin + +[Retrieved from: +https://github.com/c-icap/c-icap-server/commit/1631a6c1f50e152b8a45d8279c96086e5636795b, +which has the side effect of fixing the build with the musl C library] +Signed-off-by: Fabrice Fontaine +--- + Makefile.am | 2 +- + configure.ac | 10 +++++++--- + header.c | 34 ---------------------------------- + include/header.h | 8 -------- + modules/Makefile.am | 34 ++++++++++++++++++++-------------- + modules/bdb_tables.c | 17 +++++++++++++++-- + modules/shared_cache.c | 12 ++++++++++++ + modules/sys_logger.c | 13 +++++++++++++ + services/echo/Makefile.am | 10 ++++++++-- + services/ex-206/Makefile.am | 10 ++++++++-- + utils/c-icap-mkbdb.c | 8 ++++---- + 11 files changed, 88 insertions(+), 70 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 4c34033..ab80f4f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -53,7 +53,7 @@ c_icap_SOURCES = aserver.c request.c cfg_param.c \ + libicapapi_la_CFLAGS= $(INVISIBILITY_CFLAG) -I$(srcdir)/include/ -Iinclude/ @ZLIB_ADD_FLAG@ @OPENSSL_ADD_FLAG@ @BZLIB_ADD_FLAG@ @BROTLI_ADD_FLAG@ @PCRE_ADD_FLAG@ -DCI_BUILD_LIB + + libicapapi_la_LIBADD = @ZLIB_ADD_LDADD@ @BZLIB_ADD_LDADD@ @BROTLI_ADD_LDADD@ @PCRE_ADD_LDADD@ @DL_ADD_FLAG@ @THREADS_LDADD@ @OPENSSL_ADD_LDADD@ +-libicapapi_la_LDFLAGS= -shared -version-info @CICAPLIB_VERSION@ @THREADS_LDFLAGS@ ++libicapapi_la_LDFLAGS= -shared -version-info @CICAPLIB_VERSION@ @LIBS_LDFLAGS@ @THREADS_LDFLAGS@ + + export EXT_PROGRAMS_MKLIB = @ZLIB_LNDIR_LDADD@ @BZLIB_LNDIR_LDADD@ @BROTLI_LNDIR_LDADD@ @PCRE_LNDIR_LDADD@ @OPENSSL_LNDIR_LDADD@ + +diff --git a/configure.ac b/configure.ac +index 405571b..8059cb7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -45,12 +45,14 @@ case "$host_os" in + CFLAGS="-D_REENTRANT $CFLAGS" + THREADS_LDADD="-lpthread" + THREADS_LDFLAGS="" ++ LIBS_LDFLAGS="" + ;; + solaris2.*) + CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $CFLAGS" + LIBS="-lsocket -lnsl -lrt $LIBS" + THREADS_LDADD="-lpthread" + THREADS_LDFLAGS="" ++ LIBS_LDFLAGS="" + ;; + freebsd5*) + ## If I understand how all those threading models works correctly +@@ -69,6 +71,7 @@ case "$host_os" in + CFLAGS="-pthread -D_THREAD_SAFE $CFLAGS" + THREADS_LDADD="-XCClinker -lc_r" + THREADS_LDFLAGS="" ++ LIBS_LDFLAGS="" + ## FreeBSD has pthreads rwlocks from version 3 (I think) + # AC_DEFINE(HAVE_PTHREADS_RWLOCK,1,[Define HAVE_PTHREADS_RWLOCK if pthreads library supports rwlocks]) + ## 1:1 threads +@@ -82,24 +85,28 @@ case "$host_os" in + CFLAGS="-D_THREAD_SAFE $CFLAGS" + THREADS_LDADD="-XCClinker -lthr" + THREADS_LDFLAGS="" ++ LIBS_LDFLAGS="" + ;; + + cygwin*) + CFLAGS="-D_REENTRANT $CFLAGS" + THREADS_LDADD="-lpthread" + THREADS_LDFLAGS=""; ++ LIBS_LDFLAGS="-no-undefined" + iscygwin="yes" + ;; + *) + CFLAGS="-D_REENTRANT $CFLAGS" + THREADS_LDADD="-lpthread" + THREADS_LDFLAGS="" ++ LIBS_LDFLAGS="" + ;; + esac + + TEST_LIBS="$TEST_LIBS $THREADS_LDADD" + AC_SUBST(THREADS_LDADD) + AC_SUBST(THREADS_LDFLAGS) ++AC_SUBST(LIBS_LDFLAGS) + + AC_DEFINE_UNQUOTED(C_ICAP_CONFIGURE_OPTIONS, "$ac_configure_args", + [configure command line used to configure c-icap]) +@@ -984,9 +991,6 @@ LIBS="$LIBS $EXTRALIBS" + + #Configure common flags + MODULES_LIBADD="" +-if test a"$iscygwin" != a; then +- MODULES_LIBADD="-L../../ -licapapi" +-fi + MODULES_CFLAGS="$INVISIBILITY_CFLAG -DCI_BUILD_MODULE" + AC_SUBST(MODULES_LIBADD) + AC_SUBST(MODULES_CFLAGS) +diff --git a/header.c b/header.c +index 807a2e0..266b958 100644 +--- a/header.c ++++ b/header.c +@@ -110,21 +110,6 @@ const struct ci_error_code ci_error_codes[] = { + {505, "Unsupported version"} /*ICAP version not supported by server. */ + }; + +-/* +-#ifdef __CYGWIN__ +-int ci_error_code(int ec){ +- return (ec >= EC_100 && ec < EC_MAX ? ci_error_codes[ec].code:1000); +-} +- +-const char *unknownerrorcode = "UNKNOWN ERROR CODE"; +- +-const char *ci_error_code_string(int ec){ +- return (ec >= EC_100 && ec < EC_MAX?ci_error_codes[ec].str:unknownerrorcode); +-} +-#endif +-*/ +- +- + const char *ci_encaps_entities[] = { + "req-hdr", + "res-hdr", +@@ -134,25 +119,6 @@ const char *ci_encaps_entities[] = { + "opt-body" + }; + +-#ifdef __CYGWIN__ +- +-const char *unknownentity = "UNKNOWN"; +-const char *unknownmethod = "UNKNOWN"; +- +-const char *ci_method_string(int method) +-{ +- return (method <= ICAP_RESPMOD +- && method >= ICAP_OPTIONS ? CI_Methods[method] : unknownmethod); +-} +- +- +-const char *ci_encaps_entity_string(int e) +-{ +- return (e <= ICAP_OPT_BODY +- && e >= ICAP_REQ_HDR ? CI_EncapsEntities[e] : unknownentity); +-} +-#endif +- + ci_headers_list_t *ci_headers_create() + { + ci_headers_list_t *h; +diff --git a/include/header.h b/include/header.h +index 4cab365..ed2de88 100644 +--- a/include/header.h ++++ b/include/header.h +@@ -52,16 +52,8 @@ enum ci_encapsulated_entities {ICAP_REQ_HDR, ICAP_RES_HDR, + }; + CI_DECLARE_DATA extern const char *ci_encaps_entities[]; + +-#ifdef __CYGWIN__ +- +-const char *ci_encaps_entity_string(int e); +- +-#else +- + #define ci_encaps_entity_string(e) (e <= ICAP_OPT_BODY && e >= ICAP_REQ_HDR?ci_encaps_entities[e]:"UNKNOWN") + +-#endif +- + /** + \typedef ci_headers_list_t + \ingroup HEADERS +diff --git a/modules/Makefile.am b/modules/Makefile.am +index e6e9270..2d43a60 100644 +--- a/modules/Makefile.am ++++ b/modules/Makefile.am +@@ -21,38 +21,44 @@ endif + + AM_CPPFLAGS=-I$(top_srcdir)/ -I$(top_srcdir)/include/ -I$(top_builddir)/include/ + +-sys_logger_la_LIBADD = @MODULES_LIBADD@ ++if ISCYGWIN ++MODS_LIB_ADD=$(top_builddir)/libicapapi.la ++else ++MODS_LIB_ADD= ++endif ++ ++sys_logger_la_LIBADD = $(MODS_LIB_ADD) + sys_logger_la_CFLAGS= @MODULES_CFLAGS@ +-sys_logger_la_LDFLAGS= -module -avoid-version ++sys_logger_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ + sys_logger_la_SOURCES = sys_logger.c + +-dnsbl_tables_la_LIBADD = @MODULES_LIBADD@ ++dnsbl_tables_la_LIBADD = $(MODS_LIB_ADD) + dnsbl_tables_la_CFLAGS= @MODULES_CFLAGS@ +-dnsbl_tables_la_LDFLAGS= -module -avoid-version ++dnsbl_tables_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ + dnsbl_tables_la_SOURCES = dnsbl_tables.c + +-perl_handler_la_LIBADD = @MODULES_LIBADD@ @perllib@ -L@perlcore@ -lperl ++perl_handler_la_LIBADD = $(MODS_LIB_ADD) @perllib@ -L@perlcore@ -lperl + perl_handler_la_CFLAGS= @MODULES_CFLAGS@ @perlccflags@ -I@perlcore@ +-perl_handler_la_LDFLAGS= -module -avoid-version @perlldflags@ ++perl_handler_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ @perlldflags@ + perl_handler_la_SOURCES = perl_handler.c + + +-bdb_tables_la_LIBADD = @MODULES_LIBADD@ @BDB_ADD_LDADD@ ++bdb_tables_la_LIBADD = $(MODS_LIB_ADD) @BDB_ADD_LDADD@ + bdb_tables_la_CFLAGS= @MODULES_CFLAGS@ @BDB_ADD_FLAG@ +-bdb_tables_la_LDFLAGS= -module -avoid-version ++bdb_tables_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ + bdb_tables_la_SOURCES = bdb_tables.c + +-ldap_module_la_LIBADD = @MODULES_LIBADD@ @LDAP_ADD_LDADD@ $(top_builddir)/libicapapi.la ++ldap_module_la_LIBADD = $(MODS_LIB_ADD) @LDAP_ADD_LDADD@ + ldap_module_la_CFLAGS= @MODULES_CFLAGS@ @LDAP_ADD_FLAG@ +-ldap_module_la_LDFLAGS= -module -avoid-version ++ldap_module_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ + ldap_module_la_SOURCES = ldap_module.c + +-memcached_cache_la_LIBADD= @MODULES_LIBADD@ @MEMCACHED_ADD_LDADD@ ++memcached_cache_la_LIBADD= $(MODS_LIB_ADD) @MEMCACHED_ADD_LDADD@ + memcached_cache_la_CFLAGS= @MODULES_CFLAGS@ @MEMCACHED_ADD_FLAG@ +-memcached_cache_la_LDFLAGS= -module -avoid-version ++memcached_cache_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ + memcached_cache_la_SOURCES= memcached.c + +-shared_cache_la_LIBADD= @MODULES_LIBADD@ ++shared_cache_la_LIBADD= $(MODS_LIB_ADD) + shared_cache_la_CFLAGS= +-shared_cache_la_LDFLAGS= -module -avoid-version ++shared_cache_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ + shared_cache_la_SOURCES= shared_cache.c +diff --git a/modules/bdb_tables.c b/modules/bdb_tables.c +index b8459be..1e908a9 100644 +--- a/modules/bdb_tables.c ++++ b/modules/bdb_tables.c +@@ -176,8 +176,8 @@ void *bdb_table_open(struct ci_lookup_table *table) + + /*We can not fork a Berkeley DB table, so we have to + open bdb tables for every child, on childs start-up procedure*/ +- register_command_extend("openBDBtable", CHILD_START_CMD, table, +- command_real_open_table); ++ ci_command_register_action("openBDBtable", CHILD_START_CMD, table, ++ command_real_open_table); + + return table->data; + } +@@ -257,3 +257,16 @@ void bdb_table_release_result(struct ci_lookup_table *table,void **val) + { + ci_buffer_free(val); + } ++ ++ #ifdef __CYGWIN__ ++#include ++void ci_command_register_action(const char *name, int type, void *data, ++ void (*command_action) (const char *name, int type, void *data)) ++ { ++ typedef void (*RA)(const char *, int, void *, void(*)(const char *, int, void *)); ++ RA fn; ++ fn = (RA)GetProcAddress(GetModuleHandle(NULL), "ci_command_register_action"); ++ if (fn) ++ (*fn)(name, type, data, command_action); ++ } ++#endif +diff --git a/modules/shared_cache.c b/modules/shared_cache.c +index 103b760..a79d51a 100644 +--- a/modules/shared_cache.c ++++ b/modules/shared_cache.c +@@ -345,3 +345,15 @@ void ci_shared_cache_destroy(struct ci_cache *cache) + ci_shared_mem_detach(&data->id); + } + ++#ifdef __CYGWIN__ ++#include ++void ci_command_register_action(const char *name, int type, void *data, ++ void (*command_action) (const char *name, int type, void *data)) ++ { ++ typedef void (*RA)(const char *, int, void *, void(*)(const char *, int, void *)); ++ RA fn; ++ fn = (RA)GetProcAddress(GetModuleHandle(NULL), "ci_command_register_action"); ++ if (fn) ++ (*fn)(name, type, data, command_action); ++ } ++#endif +diff --git a/modules/sys_logger.c b/modules/sys_logger.c +index 1c47753..1764b0d 100644 +--- a/modules/sys_logger.c ++++ b/modules/sys_logger.c +@@ -60,7 +60,20 @@ int cfg_syslog_access(const char *directive, const char **argv, void *setdata); + functions declared in log.c. This file is not included in c-icap library + but defined in primary c-icap binary. + */ ++#ifdef __CYGWIN__ ++#include ++char *logformat_fmt(const char *name) ++{ ++ typedef char* (*LF_FMT)(const char *); ++ LF_FMT fn; ++ fn = (LF_FMT)GetProcAddress(GetModuleHandle(NULL), "logformat_fmt"); ++ if (fn) ++ return (*fn)(name); ++ return NULL; ++} ++#else + extern char *logformat_fmt(const char *name); ++#endif + + /*Configuration Table .....*/ + static struct ci_conf_entry conf_variables[] = { +diff --git a/services/echo/Makefile.am b/services/echo/Makefile.am +index 402c8f9..7d701b1 100644 +--- a/services/echo/Makefile.am ++++ b/services/echo/Makefile.am +@@ -3,9 +3,15 @@ pkglib_LTLIBRARIES=srv_echo.la + + AM_CPPFLAGS=-I$(top_srcdir)/ -I$(top_srcdir)/include/ -I$(top_builddir)/include/ + +-srv_echo_la_LIBADD = @MODULES_LIBADD@ ++if ISCYGWIN ++MODS_LIB_ADD=$(top_builddir)/libicapapi.la ++else ++MODS_LIB_ADD= ++endif ++ ++srv_echo_la_LIBADD = $(MODS_LIB_ADD) + srv_echo_la_CFLAGS= @MODULES_CFLAGS@ +-srv_echo_la_LDFLAGS= -module -avoid-version ++srv_echo_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ + srv_echo_la_SOURCES = srv_echo.c + + +diff --git a/services/ex-206/Makefile.am b/services/ex-206/Makefile.am +index 44bbf21..ff73399 100644 +--- a/services/ex-206/Makefile.am ++++ b/services/ex-206/Makefile.am +@@ -3,8 +3,14 @@ pkglib_LTLIBRARIES=srv_ex206.la + + AM_CPPFLAGS=-I$(top_srcdir)/ -I$(top_srcdir)/include/ -I$(top_builddir)/include/ + +-srv_ex206_la_LIBADD = @MODULES_LIBADD@ ++if ISCYGWIN ++MODS_LIB_ADD=$(top_builddir)/libicapapi.la ++else ++MODS_LIB_ADD= ++endif ++ ++srv_ex206_la_LIBADD = $(MODS_LIB_ADD) + srv_ex206_la_CFLAGS= @MODULES_CFLAGS@ +-srv_ex206_la_LDFLAGS= -module -avoid-version ++srv_ex206_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ + srv_ex206_la_SOURCES = srv_ex206.c + +diff --git a/utils/c-icap-mkbdb.c b/utils/c-icap-mkbdb.c +index c29a46f..326ee1c 100644 +--- a/utils/c-icap-mkbdb.c ++++ b/utils/c-icap-mkbdb.c +@@ -23,7 +23,7 @@ char *dbfile = NULL; + int DUMP_MODE = 0; + int VERSION_MODE = 0; + int USE_DBTREE = 0; +-long int PAGE_SIZE; ++long int DB_PAGE_SIZE; + + ci_mem_allocator_t *allocator = NULL; + int cfg_set_type(const char *directive, const char **argv, void *setdata); +@@ -52,7 +52,7 @@ static struct ci_options_entry options[] = { + "The type of values" + }, + { +- "-p", "page_size", &PAGE_SIZE, ci_cfg_size_long, ++ "-p", "page_size", &DB_PAGE_SIZE, ci_cfg_size_long, + "The page size to use for the database" + }, + { +@@ -107,8 +107,8 @@ int open_db(char *path) + return 0; + } + +- if (PAGE_SIZE > 512 && PAGE_SIZE <= 64*1024) +- db->set_pagesize(db, (uint32_t)PAGE_SIZE); ++ if (DB_PAGE_SIZE > 512 && DB_PAGE_SIZE <= 64*1024) ++ db->set_pagesize(db, (uint32_t)DB_PAGE_SIZE); + + if ((ret = db->open(db, NULL, path, NULL, + (USE_DBTREE ? DB_BTREE : DB_HASH), diff --git a/buildroot/package/c-icap/c-icap.hash b/buildroot/package/c-icap/c-icap.hash index 2b083ef65..9a761175c 100644 --- a/buildroot/package/c-icap/c-icap.hash +++ b/buildroot/package/c-icap/c-icap.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 b138c7d7d9828d54c3307bcfe7b4917911266593832ffc26a60df9a0dfd2511e c_icap-0.4.2.tar.gz +sha256 5eafc7775ecb3fe49545451eaa31f045716d0242977588c0ba27c2c1b4683d8a c_icap-0.5.5.tar.gz +sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/buildroot/package/c-icap/c-icap.mk b/buildroot/package/c-icap/c-icap.mk index c722098c5..8720cb16c 100644 --- a/buildroot/package/c-icap/c-icap.mk +++ b/buildroot/package/c-icap/c-icap.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ICAP_VERSION = 0.4.2 +C_ICAP_VERSION = 0.5.5 C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz C_ICAP_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/c-periphery/Config.in b/buildroot/package/c-periphery/Config.in index 0bfb4b1f1..cf8675801 100644 --- a/buildroot/package/c-periphery/Config.in +++ b/buildroot/package/c-periphery/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_C_PERIPHERY bool "c-periphery" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 help c-periphery is a set of C wrapper functions for GPIO, SPI, I2C, MMIO, and Serial peripheral I/O interface access in @@ -14,3 +15,6 @@ config BR2_PACKAGE_C_PERIPHERY integration with other projects, and is MIT licensed. https://github.com/vsergeev/c-periphery + +comment "c-periphery needs a toolchain w/ kernel headers >= 4.8" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 diff --git a/buildroot/package/c-periphery/c-periphery.hash b/buildroot/package/c-periphery/c-periphery.hash index 745e44a71..244f8f60f 100644 --- a/buildroot/package/c-periphery/c-periphery.hash +++ b/buildroot/package/c-periphery/c-periphery.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 50665a4f298b30e4cc8f7dbd38362fd860cc3746803d00325cb04806674e3166 c-periphery-v1.1.3.tar.gz -sha256 6b5669a90260126f0600aae98cb10fb5e219269dc9cbd0137f63927b96d5c31d LICENSE +sha256 1c455c42b26818d199ac227cd19714f265623e15d363fdfdf47a2416a4165654 c-periphery-2.1.0.tar.gz +sha256 e7b9464cb8511f19ddb40f9cf52fe86b3dfe38b2faed9d7bbc3d5707677ffbe3 LICENSE diff --git a/buildroot/package/c-periphery/c-periphery.mk b/buildroot/package/c-periphery/c-periphery.mk index df2610554..bb50434ef 100644 --- a/buildroot/package/c-periphery/c-periphery.mk +++ b/buildroot/package/c-periphery/c-periphery.mk @@ -4,8 +4,8 @@ # ################################################################################ -C_PERIPHERY_VERSION = v1.1.3 -C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,$(C_PERIPHERY_VERSION)) +C_PERIPHERY_VERSION = 2.1.0 +C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,v$(C_PERIPHERY_VERSION)) C_PERIPHERY_INSTALL_STAGING = YES # only a static library C_PERIPHERY_INSTALL_TARGET = NO diff --git a/buildroot/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch b/buildroot/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch new file mode 100644 index 000000000..10e000d16 --- /dev/null +++ b/buildroot/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch @@ -0,0 +1,33 @@ +From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos +Date: Mon, 19 Nov 2018 12:33:07 +0100 +Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in + cairo_ft_apply_variations + +Fixes a crash when using freetype >= 2.9 +[Retrieved from: +https://gitlab.freedesktop.org/cairo/cairo/-/commit/90e85c2493fdfa3551f202ff10282463f1e36645] +Signed-off-by: Fabrice Fontaine +--- + src/cairo-ft-font.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c +index 325dd61b4..981973f78 100644 +--- a/src/cairo-ft-font.c ++++ b/src/cairo-ft-font.c +@@ -2393,7 +2393,11 @@ skip: + done: + free (coords); + free (current_coords); ++#if HAVE_FT_DONE_MM_VAR ++ FT_Done_MM_Var (face->glyph->library, ft_mm_var); ++#else + free (ft_mm_var); ++#endif + } + } + +-- +2.24.1 + diff --git a/buildroot/package/cairo/cairo.hash b/buildroot/package/cairo/cairo.hash index 795a2eeea..949ed3ffe 100644 --- a/buildroot/package/cairo/cairo.hash +++ b/buildroot/package/cairo/cairo.hash @@ -1,7 +1,7 @@ -# From https://www.cairographics.org/snapshots/cairo-1.15.12.tar.xz.sha1 -sha1 4e64c6a48789edb4c60bc3fa95bd3992cc388b88 cairo-1.15.12.tar.xz +# From https://www.cairographics.org/releases/cairo-1.16.0.tar.xz.sha1 +sha1 00e81842ae5e81bb0343108884eb5205be0eac14 cairo-1.16.0.tar.xz # Calculated based on the hash above -sha256 7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9 cairo-1.15.12.tar.xz +sha256 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 cairo-1.16.0.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/buildroot/package/cairo/cairo.mk b/buildroot/package/cairo/cairo.mk index 6dffff4b8..c6a3dad93 100644 --- a/buildroot/package/cairo/cairo.mk +++ b/buildroot/package/cairo/cairo.mk @@ -4,13 +4,16 @@ # ################################################################################ -CAIRO_VERSION = 1.15.12 +CAIRO_VERSION = 1.16.0 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 -CAIRO_SITE = http://cairographics.org/snapshots +CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES +# 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch +CAIRO_IGNORE_CVES += CVE-2018-19876 + # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" diff --git a/buildroot/package/cairomm/cairomm.hash b/buildroot/package/cairomm/cairomm.hash index bebd474b1..573104ec9 100644 --- a/buildroot/package/cairomm/cairomm.hash +++ b/buildroot/package/cairomm/cairomm.hash @@ -1,2 +1,4 @@ # From http://ftp.gnome.org/pub/gnome/sources/cairomm/1.12/cairomm-1.12.0.sha256sum sha256 a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6 cairomm-1.12.0.tar.xz +# Locally computed +sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/buildroot/package/can-utils/can-utils.hash b/buildroot/package/can-utils/can-utils.hash index 2034c35a8..adbf5b0bc 100644 --- a/buildroot/package/can-utils/can-utils.hash +++ b/buildroot/package/can-utils/can-utils.hash @@ -1,3 +1,4 @@ # Locally computed -sha256 370ad4b19447c29099f7300548f1a3362d6e123c4a6a827dbbd3110bc2c26839 can-utils-v2018.02.0.tar.gz -sha256 c258939ebb09c3857f5fc7704a449e5077cc881090c87b38f9a81332b96fa075 Makefile +sha256 ea0f96a02af37f16713284c7bdccdbae716d9bcb979ccfb51185d696c31f9ecf can-utils-2020.02.0.tar.gz +sha256 c3dc748f5e725cf5ed89784fe78e4ff1b05d309bf1e7ade4c572e8fde1b8406c LICENSES/BSD-3-Clause +sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 LICENSES/GPL-2.0-only.txt diff --git a/buildroot/package/can-utils/can-utils.mk b/buildroot/package/can-utils/can-utils.mk index bff4d21fe..cd4dba561 100644 --- a/buildroot/package/can-utils/can-utils.mk +++ b/buildroot/package/can-utils/can-utils.mk @@ -4,10 +4,10 @@ # ################################################################################ -CAN_UTILS_VERSION = v2018.02.0 -CAN_UTILS_SITE = $(call github,linux-can,can-utils,$(CAN_UTILS_VERSION)) -CAN_UTILS_LICENSE = BSD-3-Clause or GPL-2.0, GPL-2.0+ -CAN_UTILS_LICENSE_FILES = Makefile +CAN_UTILS_VERSION = 2020.02.0 +CAN_UTILS_SITE = $(call github,linux-can,can-utils,v$(CAN_UTILS_VERSION)) +CAN_UTILS_LICENSE = BSD-3-Clause or GPL-2.0 +CAN_UTILS_LICENSE_FILES = LICENSES/BSD-3-Clause LICENSES/GPL-2.0-only.txt CAN_UTILS_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/cannelloni/cannelloni.hash b/buildroot/package/cannelloni/cannelloni.hash index c14dceb79..41cb72816 100644 --- a/buildroot/package/cannelloni/cannelloni.hash +++ b/buildroot/package/cannelloni/cannelloni.hash @@ -1,2 +1,3 @@ # Locally computed sha256 fe5abb1c9e523049c48dd906603bc762cc55ccd20c16dbec7dc64163b9eefccf cannelloni-20160414.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt diff --git a/buildroot/package/cantarell/cantarell.hash b/buildroot/package/cantarell/cantarell.hash index 330e7869d..49b463406 100644 --- a/buildroot/package/cantarell/cantarell.hash +++ b/buildroot/package/cantarell/cantarell.hash @@ -1,2 +1,4 @@ # From http://ftp.acc.umu.se/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.25.sha256sum -sha256 14a228aa0b516dfc367b434a850f955a00c57fc549cbb05348e2b150196a737f cantarell-fonts-0.0.25.tar.xz +sha256 14a228aa0b516dfc367b434a850f955a00c57fc549cbb05348e2b150196a737f cantarell-fonts-0.0.25.tar.xz +# locally computed +sha256 79a9d6198c0d9192c1b0bf55bcbc404a39390bd0d8c650cf20d652c2eaa284d8 COPYING diff --git a/buildroot/package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch b/buildroot/package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch deleted file mode 100644 index 6bb7702a5..000000000 --- a/buildroot/package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e651ac5febc59e3e2b5d3365ededbe5362756da2 Mon Sep 17 00:00:00 2001 -From: Koen Martens -Date: Wed, 12 Jul 2017 18:49:32 +0200 -Subject: [PATCH] Do not use execinfo.h with uclibc (#511) - -Upstream commit: https://github.com/capnproto/capnproto/commit/e651ac5febc59e3e2b5d3365ededbe5362756da2 - -Signed-off-by: Koen Martens -Signed-off-by: Joel Carlson - ---- - c++/src/kj/exception.c++ | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/c++/src/kj/exception.c++ b/c++/src/kj/exception.c++ -index 218f1db..339601a 100644 ---- a/c++/src/kj/exception.c++ -+++ b/c++/src/kj/exception.c++ -@@ -33,7 +33,7 @@ - #endif - #include "io.h" - --#if (__linux__ && __GLIBC__) || __APPLE__ -+#if (__linux__ && __GLIBC__ && !__UCLIBC__) || __APPLE__ - #define KJ_HAS_BACKTRACE 1 - #include - #endif --- -2.7.4 - diff --git a/buildroot/package/capnproto/Config.in b/buildroot/package/capnproto/Config.in index a979a334f..cd9cb647a 100644 --- a/buildroot/package/capnproto/Config.in +++ b/buildroot/package/capnproto/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_CAPNPROTO bool "capnproto" depends on BR2_USE_MMU - depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_HOST_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_ATOMIC @@ -15,10 +15,10 @@ config BR2_PACKAGE_CAPNPROTO https://capnproto.org/index.html -comment "capnproto needs host and target gcc >= 4.8 w/ C++, threads, atomic" +comment "capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic" depends on BR2_USE_MMU - depends on !BR2_HOST_GCC_AT_LEAST_4_8 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + depends on !BR2_HOST_GCC_AT_LEAST_5 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HAS_ATOMIC diff --git a/buildroot/package/capnproto/capnproto.hash b/buildroot/package/capnproto/capnproto.hash index 1a65cdd40..98467f863 100644 --- a/buildroot/package/capnproto/capnproto.hash +++ b/buildroot/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 85210424c09693d8fe158c1970a2bca37af3a0424f02b263f566a1b8a5451a2d capnproto-v0.6.1.tar.gz -sha256 16194222e9412c3aa14d2287953f7fc89a1dcbcdd266d1534ba35060d4cde5b6 LICENSE +sha256 76c7114a3d142ad08b7208b3964a26e72a6320ee81331d3f0b87569fc9c47a28 capnproto-0.7.0.tar.gz +sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/buildroot/package/capnproto/capnproto.mk b/buildroot/package/capnproto/capnproto.mk index ff7a5bc15..34fb88591 100644 --- a/buildroot/package/capnproto/capnproto.mk +++ b/buildroot/package/capnproto/capnproto.mk @@ -4,8 +4,8 @@ # ################################################################################ -CAPNPROTO_VERSION = v0.6.1 -CAPNPROTO_SITE = $(call github,capnproto,capnproto,$(CAPNPROTO_VERSION)) +CAPNPROTO_VERSION = 0.7.0 +CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE CAPNPROTO_INSTALL_STAGING = YES diff --git a/buildroot/package/caps/0001-Fix-stdint-types-with-musl.patch b/buildroot/package/caps/0001-Fix-stdint-types-with-musl.patch new file mode 100644 index 000000000..23002c072 --- /dev/null +++ b/buildroot/package/caps/0001-Fix-stdint-types-with-musl.patch @@ -0,0 +1,54 @@ +From 626e60a82120961ccee117dfcb5c28f72f8a26e5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Wed, 28 Aug 2019 11:25:49 +0200 +Subject: [PATCH] Fix stdint types with musl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fetched from: +https://github.com/dsacre/meta-lad/blob/master/recipes-multimedia/lv2/caps-lv2/fix-stdint-types-with-musl.patch + +Signed-off-by: Jörg Krause +--- + basics.h | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/basics.h b/basics.h +index 643d96e..34e5f63 100644 +--- a/basics.h ++++ b/basics.h +@@ -39,6 +39,7 @@ + #define _ISOC9X_SOURCE 1 + + #include ++#include + #include + + #include +@@ -49,14 +50,14 @@ + + #include "ladspa.h" + +-typedef __int8_t int8; +-typedef __uint8_t uint8; +-typedef __int16_t int16; +-typedef __uint16_t uint16; +-typedef __int32_t int32; +-typedef __uint32_t uint32; +-typedef __int64_t int64; +-typedef __uint64_t uint64; ++typedef int8_t int8; ++typedef uint8_t uint8; ++typedef int16_t int16; ++typedef uint16_t uint16; ++typedef int32_t int32; ++typedef uint32_t uint32; ++typedef int64_t int64; ++typedef uint64_t uint64; + + #define MIN_GAIN 1e-6 /* -120 dB */ + /* smallest non-denormal 32 bit IEEE float is 1.18e-38 */ +-- +2.22.0 + diff --git a/buildroot/package/caps/Config.in b/buildroot/package/caps/Config.in new file mode 100644 index 000000000..f48e176de --- /dev/null +++ b/buildroot/package/caps/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_CAPS + bool "caps" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + help + CAPS is a collection of audio plugins comprising virtual + guitar amplification and a small range of basic classic + effects, signal processors and generators of often + elementary and occasionally exotic nature. + + The plugins aim to satisfy the highest demands in sound + quality with maximal computational efficiency and zero + latency. + + http://quitte.de/dsp/caps.html + +comment "caps needs a toolchain w/ C++, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/buildroot/package/caps/caps.hash b/buildroot/package/caps/caps.hash new file mode 100644 index 000000000..958f4b68b --- /dev/null +++ b/buildroot/package/caps/caps.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 e7496c5bce05abebe3dcb635926153bbb58a9337a6e423f048d3b61d8a4f98c9 caps_0.9.26.tar.bz2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/caps/caps.mk b/buildroot/package/caps/caps.mk new file mode 100644 index 000000000..e307a689e --- /dev/null +++ b/buildroot/package/caps/caps.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# caps +# +################################################################################ + +CAPS_VERSION = 0.9.26 +CAPS_SOURCE = caps_$(CAPS_VERSION).tar.bz2 +CAPS_SITE = http://quitte.de/dsp +CAPS_LICENSE = GPL-3.0+ +CAPS_LICENSE_FILES = COPYING + +# Need to pass TARGET_CONFIGURE_OPTS in the environment to not +# override the LDFLAGS definition of the Makefile. +CAPS_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CXXFLAGS)" + +# caps Makefile uses CC and CFLAGS, but for C++ +CAPS_MAKE_OPTS = \ + CC="$(TARGET_CXX)" \ + STRIP=/bin/true + +define CAPS_BUILD_CMDS + $(CAPS_MAKE_ENV) $(MAKE) $(CAPS_MAKE_OPTS) all -C $(@D) +endef + +define CAPS_INSTALL_TARGET_CMDS + $(CAPS_MAKE_ENV) $(MAKE) $(CAPS_MAKE_OPTS) \ + DESTDIR=$(TARGET_DIR) install -C $(@D) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/cargo-bin/cargo-bin.hash b/buildroot/package/cargo-bin/cargo-bin.hash index 2673e157a..0e9e9c5c6 100644 --- a/buildroot/package/cargo-bin/cargo-bin.hash +++ b/buildroot/package/cargo-bin/cargo-bin.hash @@ -1,12 +1,12 @@ -# From https://static.rust-lang.org/dist/cargo-0.30.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.30.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 43a5754d13fa0436b33c48b1f562b4198d6930efad3dc36284b88289ff20d74d cargo-0.30.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 f8d7c27a40bba6343ee7dd39a324fe772b77824921adf3e9514a44d4e49059c8 cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 cb7c63c166baa42ab0be08429e29fa59fc7108efd17ca512462b2645b1655a7f cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.33.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 13acdb3c9f2505805ceed8a696f5f62ab8cd73e443cd43d6edd588aad88e1c32 cargo-0.33.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 6628db22370f397676195555d768f0449a60f0a694bcac24611f4cd1cfc97cdc cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 c2c31db68c4dcb50ad856a19e6f11489a0d4df1212f31bd068dfbb73c5425761 cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz # Locally generated sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/buildroot/package/cargo-bin/cargo-bin.mk b/buildroot/package/cargo-bin/cargo-bin.mk index 7fb4508a5..3614f7a53 100644 --- a/buildroot/package/cargo-bin/cargo-bin.mk +++ b/buildroot/package/cargo-bin/cargo-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -CARGO_BIN_VERSION = 0.30.0 +CARGO_BIN_VERSION = 0.33.0 CARGO_BIN_SITE = https://static.rust-lang.org/dist CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz CARGO_BIN_LICENSE = Apache-2.0 or MIT diff --git a/buildroot/package/cbootimage/0001-bct_dump-don-t-crash-on-devices-without-RSA-support.patch b/buildroot/package/cbootimage/0001-bct_dump-don-t-crash-on-devices-without-RSA-support.patch deleted file mode 100644 index 587d67fc4..000000000 --- a/buildroot/package/cbootimage/0001-bct_dump-don-t-crash-on-devices-without-RSA-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 64045f993c2cd8989838aeaad3d22107d96d5596 Mon Sep 17 00:00:00 2001 -From: Stephen Warren -Date: Thu, 28 Jul 2016 11:37:45 -0600 -Subject: [PATCH] bct_dump: don't crash on devices without RSA support - -format_rsa_param() currently crashes on chips that don't implement -soc_config->get_value_size(); that is, on all chips before T124. Fix the -function not to crash. Better might be to avoid even dumping RSA -parameters on chips which don't support RSA, but that's a larger change -that needs much more work. - -Fixes: 3c3b992a6814 ("Add support to dump rsa related fields for t210") -Cc: Jimmy Zhang -Signed-off-by: Stephen Warren -Signed-off-by: Misha Komarovskiy ---- - src/bct_dump.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/bct_dump.c b/src/bct_dump.c -index 4f50fa2..b4ca9fc 100644 ---- a/src/bct_dump.c -+++ b/src/bct_dump.c -@@ -133,10 +133,14 @@ static void format_rsa_param(parse_token id, char const * message, void * data) - { - #define MAX_BYTE_NUMBER_PER_LINE 16 - u_int8_t *rsa = (u_int8_t *)data; -- int size = g_soc_config->get_value_size(id); -- int byte_index; -+ int size, byte_index; - - printf("%s", message); -+ -+ if (!g_soc_config->get_value_size) -+ return; -+ -+ size = g_soc_config->get_value_size(id); - for (byte_index = 0; byte_index < size; ++byte_index) { - printf(" %02x", *rsa++); - --- -2.1.4 - diff --git a/buildroot/package/cbootimage/Config.in b/buildroot/package/cbootimage/Config.in index b798e5d98..1a7fef0b3 100644 --- a/buildroot/package/cbootimage/Config.in +++ b/buildroot/package/cbootimage/Config.in @@ -1,16 +1,9 @@ config BR2_PACKAGE_CBOOTIMAGE bool "cbootimage" depends on BR2_arm || BR2_armeb - # uses non-standard u_intXX_t types - # https://github.com/NVIDIA/cbootimage/pull/7 - depends on !BR2_TOOLCHAIN_USES_MUSL help This project provides a tool which compiles BCT (Boot Configuration Table) images to place into the boot flash of a Tegra-based device. https://github.com/NVIDIA/cbootimage - -comment "cbootimage needs a glibc or uClibc toolchain" - depends on BR2_arm || BR2_armeb - depends on BR2_TOOLCHAIN_USES_MUSL diff --git a/buildroot/package/cbootimage/cbootimage.hash b/buildroot/package/cbootimage/cbootimage.hash index 96cf172e3..7113f84f1 100644 --- a/buildroot/package/cbootimage/cbootimage.hash +++ b/buildroot/package/cbootimage/cbootimage.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 373c108d7b6778c62a33e59ad0cd5ea9ebb379319a0c8b4cf469eaa8bec5521b cbootimage-v1.7.tar.gz +sha256 46cce01f07df977668de9e1d49884d8ed539169994215606a9719d17b9db8804 cbootimage-1.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/cbootimage/cbootimage.mk b/buildroot/package/cbootimage/cbootimage.mk index 40a248aed..19819e4b7 100644 --- a/buildroot/package/cbootimage/cbootimage.mk +++ b/buildroot/package/cbootimage/cbootimage.mk @@ -4,8 +4,8 @@ # ################################################################################ -CBOOTIMAGE_VERSION = v1.7 -CBOOTIMAGE_SITE = $(call github,NVIDIA,cbootimage,$(CBOOTIMAGE_VERSION)) +CBOOTIMAGE_VERSION = 1.8 +CBOOTIMAGE_SITE = $(call github,NVIDIA,cbootimage,v$(CBOOTIMAGE_VERSION)) CBOOTIMAGE_LICENSE = GPL-2.0 CBOOTIMAGE_LICENSE_FILES = COPYING CBOOTIMAGE_AUTORECONF = YES diff --git a/buildroot/package/ccache/ccache.hash b/buildroot/package/ccache/ccache.hash index 779a2abc7..83c172fea 100644 --- a/buildroot/package/ccache/ccache.hash +++ b/buildroot/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 a6b129576328fcefad00cb72035bc87bc98b6a76aec0f4b59bed76d67a399b1f ccache-3.6.tar.xz +sha256 b7c1d6d6fe42f18e424de92746af863e0bc85794da3d69e44300840c478c98cd ccache-3.7.7.tar.xz sha256 ec6b1a326ff93b2cc21df88a697ae470ff6927a55b8929e7e491b315e1563361 GPL-3.0.txt -sha256 2af7b3ec0ea737e1542e58db016122f6d75df9ea3b4f00c8151ecfef7040b39b LICENSE.adoc +sha256 4f63223bcdee822d55a6768cc8399ffe06401d7a03cfe79e1dc305f50dc22c59 LICENSE.adoc diff --git a/buildroot/package/ccache/ccache.mk b/buildroot/package/ccache/ccache.mk index 4d9de0a07..a441f7a10 100644 --- a/buildroot/package/ccache/ccache.mk +++ b/buildroot/package/ccache/ccache.mk @@ -4,8 +4,8 @@ # ################################################################################ -CCACHE_VERSION = 3.6 -CCACHE_SITE = https://www.samba.org/ftp/ccache +CCACHE_VERSION = 3.7.7 +CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others CCACHE_LICENSE_FILES = LICENSE.adoc GPL-3.0.txt diff --git a/buildroot/package/ccid/ccid.hash b/buildroot/package/ccid/ccid.hash index eb2219393..f29f5b3f9 100644 --- a/buildroot/package/ccid/ccid.hash +++ b/buildroot/package/ccid/ccid.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a5432ae845730493c04e59304b5c0c6103cd0e2c8827df57d69469a3eaaab84d ccid-1.4.29.tar.bz2 +sha256 6b48d7b6e4390e038d25630f8664fe81618ab00f232d6efbe0e3cc6df28ce8f7 ccid-1.4.31.tar.bz2 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/buildroot/package/ccid/ccid.mk b/buildroot/package/ccid/ccid.mk index 73da9c4b8..a5f9f0047 100644 --- a/buildroot/package/ccid/ccid.mk +++ b/buildroot/package/ccid/ccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCID_VERSION = 1.4.29 +CCID_VERSION = 1.4.31 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2 CCID_SITE = https://ccid.apdu.fr/files CCID_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/ccrypt/ccrypt.hash b/buildroot/package/ccrypt/ccrypt.hash index a93fcb9af..4f81c491e 100644 --- a/buildroot/package/ccrypt/ccrypt.hash +++ b/buildroot/package/ccrypt/ccrypt.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 87d66da2170facabf6f2fc073586ae2c7320d4689980cfca415c74688e499ba0 ccrypt-1.10.tar.gz +sha256 b19c47500a96ee5fbd820f704c912f6efcc42b638c0a6aa7a4e3dc0a6b51a44f ccrypt-1.11.tar.gz +sha256 d48d3af3cf27b32106ee3418c7c892cae745ece26cd909e72aa59b08e3f9c93d COPYING diff --git a/buildroot/package/ccrypt/ccrypt.mk b/buildroot/package/ccrypt/ccrypt.mk index 541a0e776..f8d632828 100644 --- a/buildroot/package/ccrypt/ccrypt.mk +++ b/buildroot/package/ccrypt/ccrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCRYPT_VERSION = 1.10 +CCRYPT_VERSION = 1.11 CCRYPT_SITE = http://ccrypt.sourceforge.net/download/$(CCRYPT_VERSION) CCRYPT_LICENSE = GPL-2.0+ diff --git a/buildroot/package/cctz/Config.in b/buildroot/package/cctz/Config.in new file mode 100644 index 000000000..73a0f9f7e --- /dev/null +++ b/buildroot/package/cctz/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_CCTZ + bool "cctz" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + select BR2_TARGET_TZ_INFO # runtime dependency + help + CCTZ is a C++ library for translating between absolute + and civil times using the rules of a time zone. + + https://github.com/google/cctz + +if BR2_PACKAGE_CCTZ + +config BR2_PACKAGE_CCTZ_INSTALL_TOOLS + bool "Install tools" + help + This option allows installing CCTZ tools. + +config BR2_PACKAGE_CCTZ_INSTALL_EXAMPLES + bool "Install example programs" + help + This option allows installing CCTZ example programs. + +endif + +comment "cctz needs a toolchain w/ C++, threads, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/cctz/cctz.hash b/buildroot/package/cctz/cctz.hash new file mode 100644 index 000000000..fe8897c50 --- /dev/null +++ b/buildroot/package/cctz/cctz.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 8615b20d4e33e02a271c3b93a3b208e3d7d5d66880f5f6208b03426e448f32db cctz-2.3.tar.gz +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE.txt diff --git a/buildroot/package/cctz/cctz.mk b/buildroot/package/cctz/cctz.mk new file mode 100644 index 000000000..bcc80bad4 --- /dev/null +++ b/buildroot/package/cctz/cctz.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# cctz +# +################################################################################ + +CCTZ_VERSION = 2.3 +CCTZ_SITE = $(call github,google,cctz,v$(CCTZ_VERSION)) +CCTZ_LICENSE = Apache-2.0 +CCTZ_LICENSE_FILES = LICENSE.txt +CCTZ_INSTALL_STAGING = YES + +CCTZ_CONF_OPTS = -DBUILD_TESTING=OFF + +ifeq ($(BR2_PACKAGE_CCTZ_INSTALL_TOOLS),y) +CCTZ_CONF_OPTS += -DBUILD_TOOLS=ON +else +CCTZ_CONF_OPTS += -DBUILD_TOOLS=OFF +endif + +ifeq ($(BR2_PACKAGE_CCTZ_INSTALL_EXAMPLES),y) +CCTZ_CONF_OPTS += -DBUILD_EXAMPLES=ON +else +CCTZ_CONF_OPTS += -DBUILD_EXAMPLES=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/cdrkit/cdrkit.hash b/buildroot/package/cdrkit/cdrkit.hash index 6ecb922df..8b574c707 100644 --- a/buildroot/package/cdrkit/cdrkit.hash +++ b/buildroot/package/cdrkit/cdrkit.hash @@ -1,2 +1,4 @@ # From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cdrkit/cdrkit_1.1.11-3.dsc -sha256 d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da cdrkit_1.1.11.orig.tar.gz +sha256 d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da cdrkit_1.1.11.orig.tar.gz +# locally computed +sha256 90daae00475a992a367da5b0658469a5d1c4449dbbe964c5b7246e1aec92f491 COPYING diff --git a/buildroot/package/cegui06/cegui06.hash b/buildroot/package/cegui06/cegui06.hash index 21df3ca09..f46bcee24 100644 --- a/buildroot/package/cegui06/cegui06.hash +++ b/buildroot/package/cegui06/cegui06.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 eb77741cd9fcc927a876e8116b98691212e973d2264e2071406423f6ca3e305f CEGUI-0.6.2b.tar.gz +sha256 da1c10009579e3eb8d3b3abc65d538a2890f70ff7fd1f05b73a4f9e3fff5c56e COPYING diff --git a/buildroot/package/celt051/0001-fix-gnuc-prereq.patch b/buildroot/package/celt051/0001-fix-gnuc-prereq.patch deleted file mode 100644 index 8efd518d9..000000000 --- a/buildroot/package/celt051/0001-fix-gnuc-prereq.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix musl build - -musl does not define __GNUC_PREREQ. Use patch from Alpine Linux -(http://git.alpinelinux.org/cgit/aports/plain/main/celt051/fix-gnuc-prereq.patch). - -Fixes http://autobuild.buildroot.net/results/223/223ba6003bdd7e0c896455c21fa8fee943b4e716/ - -Signed-off-by: Jörg Krause - ---- celt-0.5.1.3.orig/libcelt/ecintrin.h -+++ celt-0.5.1.3/libcelt/ecintrin.h -@@ -52,8 +52,7 @@ - /*Count leading zeros. - This macro should only be used for implementing ec_ilog(), if it is defined. - All other code should use EC_ILOG() instead.*/ --#ifdef __GNUC_PREREQ --#if __GNUC_PREREQ(3,4) -+#if defined(__GNUC__) && ((__GNUC__<<16)+__GNUC_MINOR__) >= 0x304 - # if INT_MAX>=2147483647 - # define EC_CLZ0 sizeof(unsigned)*CHAR_BIT - # define EC_CLZ(_x) (__builtin_clz(_x)) -@@ -61,7 +60,6 @@ - # define EC_CLZ0 sizeof(unsigned long)*CHAR_BIT - # define EC_CLZ(_x) (__builtin_clzl(_x)) - # endif --#endif - #endif - - #if defined(EC_CLZ) diff --git a/buildroot/package/celt051/Config.in b/buildroot/package/celt051/Config.in deleted file mode 100644 index e1513190d..000000000 --- a/buildroot/package/celt051/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_CELT051 - bool "celt051" - select BR2_PACKAGE_LIBOGG - help - The CELT ultra-low delay audio codec - - The CELT codec is a compression algorithm for audio. Like MP3, - Vorbis, and AAC it is suitable for transmitting music with - high quality. Unlike these formats CELT imposes very little - delay on the signal, even less than is typical for speech - centric formats like Speex, GSM, or G.729. - - Note: this is version 0.5.1.3 of celt. - - http://www.celt-codec.org/ diff --git a/buildroot/package/celt051/celt051.hash b/buildroot/package/celt051/celt051.hash deleted file mode 100644 index 4ad212b2d..000000000 --- a/buildroot/package/celt051/celt051.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.xiph.org/releases/celt/SHA1SUMS -sha1 eb05030108c36cb063c3f026c349f16d78e0a497 celt-0.5.1.3.tar.gz diff --git a/buildroot/package/celt051/celt051.mk b/buildroot/package/celt051/celt051.mk deleted file mode 100644 index 01da5c933..000000000 --- a/buildroot/package/celt051/celt051.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# celt -# -################################################################################ - -# Although version newer than 0.5.1.3 exists, we're -# stuck with 0.5.1.3 for use by Spice (coming later) -CELT051_VERSION = 0.5.1.3 -CELT051_SOURCE = celt-$(CELT051_VERSION).tar.gz -CELT051_SITE = http://downloads.xiph.org/releases/celt -CELT051_LICENSE = BSD-2-Clause -CELT051_LICENSE_FILES = COPYING -CELT051_INSTALL_STAGING = YES -CELT051_DEPENDENCIES = libogg - -# Need to specify --with-ogg, otherwise /usr/lib may be searched for -# if target is the same kind as host (ie. same arch, same bitness, -# same endianness, so that /usr/lib contains libraries linkable by -# our cross-compiler) -CELT051_CONF_OPTS = \ - --enable-fixed-point \ - --disable-fixed-point-debug \ - --disable-experimental-postfilter \ - --disable-static-modes \ - --disable-assertions \ - --disable-oggtest \ - --with-ogg=$(STAGING_DIR)/usr - -$(eval $(autotools-package)) diff --git a/buildroot/package/cereal/Config.in b/buildroot/package/cereal/Config.in new file mode 100644 index 000000000..3ac463c4f --- /dev/null +++ b/buildroot/package/cereal/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_CEREAL + bool "cereal" + depends on BR2_USE_WCHAR + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + help + cereal is a header-only C++11 serialization library. + cereal takes arbitrary data types and reversibly turns them + into different representations, such as compact binary + encodings, XML or JSON. cereal was designed to be fast, + light-weight, and easy to extend - it has no external + dependencies and can be easily bundled with other code or used + standalone. + + https://github.com/USCiLab/cereal + +comment "cereal needs a toolchain w/ C++, gcc >= 4.7, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/buildroot/package/cereal/cereal.hash b/buildroot/package/cereal/cereal.hash new file mode 100644 index 000000000..ddaf54e7b --- /dev/null +++ b/buildroot/package/cereal/cereal.hash @@ -0,0 +1,6 @@ +# Locally computed +sha256 329ea3e3130b026c03a4acc50e168e7daff4e6e661bc6a7dfec0d77b570851d5 cereal-1.3.0.tar.gz +sha256 18fd7618c44c9fe28b5f54cd19747df3c0472ed33e8507fea571e2acf6e72f34 LICENSE +sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp +sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h +sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 include/cereal/external/rapidxml/license.txt diff --git a/buildroot/package/cereal/cereal.mk b/buildroot/package/cereal/cereal.mk new file mode 100644 index 000000000..3811fdf32 --- /dev/null +++ b/buildroot/package/cereal/cereal.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# cereal +# +################################################################################ + +CEREAL_VERSION = 1.3.0 +CEREAL_SITE = $(call github,USCiLab,cereal,v$(CEREAL_VERSION)) +# For licensing, see also: https://github.com/USCiLab/cereal/issues/609 +CEREAL_LICENSE = BSD-3-Clause (cereal), Zlib (base64.hpp), MIT (rapidjson), BSL-1.0 or MIT (rapidxml) +CEREAL_LICENSE_FILES = LICENSE include/cereal/external/base64.hpp include/cereal/external/rapidjson/rapidjson.h include/cereal/external/rapidxml/license.txt +CEREAL_INSTALL_STAGING = YES +CEREAL_INSTALL_TARGET = NO +CEREAL_CONF_OPTS = \ + -DTHREAD_SAFE=ON \ + -DJUST_INSTALL_CEREAL=ON + +$(eval $(cmake-package)) diff --git a/buildroot/package/cgic/cgic.hash b/buildroot/package/cgic/cgic.hash index fa1d0bc95..d3f082e88 100644 --- a/buildroot/package/cgic/cgic.hash +++ b/buildroot/package/cgic/cgic.hash @@ -1,2 +1,3 @@ # Locally computed sha256 1e8834642a4b89528bb7bde2f287e133c6b07e210e68681a34137c436d59d320 cgic207.tar.gz +sha256 6a7de92593d64dbf7630d8f66f97e04a899769bef1e055f2434bc06b87b9de62 license.txt diff --git a/buildroot/package/cgilua/cgilua.hash b/buildroot/package/cgilua/cgilua.hash index ac977ec38..8bdb1d18f 100644 --- a/buildroot/package/cgilua/cgilua.hash +++ b/buildroot/package/cgilua/cgilua.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 8e9ef583f8e1c5b600ebc6bb04924a61f72320130410191a9c56d7295fb02be1 cgilua-5.1.4-2.src.rock -sha256 e612df003d24aeaf6d3cc09a1e9255493c691866158b5962dc4c68fff8a56a8b cgilua-5.1.4/doc/us/license.html +sha256 7d4883e6a89b3463a1d35b8084a6e2afbbb584af7aca1169380e92af0f848413 cgilua-5.2.1-1.src.rock +sha256 0cf6f0858b0fd90bb5705c8ace77a8afd11e8fce1427fe0a48156937222b8c28 cgilua-5.2.1/doc/us/license.html diff --git a/buildroot/package/cgilua/cgilua.mk b/buildroot/package/cgilua/cgilua.mk index 17b396425..cd78841fd 100644 --- a/buildroot/package/cgilua/cgilua.mk +++ b/buildroot/package/cgilua/cgilua.mk @@ -4,7 +4,7 @@ # ################################################################################ -CGILUA_VERSION = 5.1.4-2 +CGILUA_VERSION = 5.2.1-1 CGILUA_LICENSE = MIT CGILUA_LICENSE_FILES = $(CGILUA_SUBDIR)/doc/us/license.html diff --git a/buildroot/package/cgroupfs-mount/cgroupfs-mount.hash b/buildroot/package/cgroupfs-mount/cgroupfs-mount.hash index 926a031d7..dc103646a 100644 --- a/buildroot/package/cgroupfs-mount/cgroupfs-mount.hash +++ b/buildroot/package/cgroupfs-mount/cgroupfs-mount.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 d6c8aff7af59c7d0082ee3018c97f73b0421e81a49bb28ad9f66a36da5cd6ec7 cgroupfs-mount-1.4.tar.gz +sha256 d6c8aff7af59c7d0082ee3018c97f73b0421e81a49bb28ad9f66a36da5cd6ec7 cgroupfs-mount-1.4.tar.gz +sha256 e52f47a650734f70c40c8fd9318f85e42777bf3fba7ff1dfb72f845bb417f7e6 debian/copyright diff --git a/buildroot/package/check/check.hash b/buildroot/package/check/check.hash index 3c41a9614..291b5d095 100644 --- a/buildroot/package/check/check.hash +++ b/buildroot/package/check/check.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 24f7a48aae6b74755bcbe964ce8bc7240f6ced2141f8d9cf480bc3b3de0d5616 check-0.11.0.tar.gz +sha256 c4336b31447acc7e3266854f73ec188cdb15554d0edd44739631da174a569909 check-0.13.0.tar.gz # License files, locally calculated sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LESSER diff --git a/buildroot/package/check/check.mk b/buildroot/package/check/check.mk index 047beba63..b02136dcb 100644 --- a/buildroot/package/check/check.mk +++ b/buildroot/package/check/check.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECK_VERSION = 0.11.0 +CHECK_VERSION = 0.13.0 CHECK_SITE = https://github.com/libcheck/check/releases/download/$(CHECK_VERSION) CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/checkpolicy/Config.in b/buildroot/package/checkpolicy/Config.in index 97ad0b770..ad769d22b 100644 --- a/buildroot/package/checkpolicy/Config.in +++ b/buildroot/package/checkpolicy/Config.in @@ -2,8 +2,6 @@ config BR2_PACKAGE_CHECKPOLICY bool "checkpolicy" depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux depends on !BR2_STATIC_LIBS # libselinux - depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux - depends on !BR2_arc # libselinux select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_FLEX help @@ -15,7 +13,5 @@ config BR2_PACKAGE_CHECKPOLICY http://selinuxproject.org/page/Main_Page -comment "checkpolicy needs a glibc toolchain w/ threads, dynamic library" - depends on !BR2_arc - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_USES_GLIBC +comment "checkpolicy needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/checkpolicy/checkpolicy.hash b/buildroot/package/checkpolicy/checkpolicy.hash index cf38d6e2f..9e77b9b02 100644 --- a/buildroot/package/checkpolicy/checkpolicy.hash +++ b/buildroot/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 9dec811c24b88e58c3bf741365eacf1dbb945531a2fcb8f284aacf68098194c8 checkpolicy-2.8.tar.gz +sha256 a946c32b284532447857e4c48830f8816867c61220c8c08bdd32e6f691335f8e checkpolicy-2.9.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/checkpolicy/checkpolicy.mk b/buildroot/package/checkpolicy/checkpolicy.mk index 7143b2d7d..8f1ec7254 100644 --- a/buildroot/package/checkpolicy/checkpolicy.mk +++ b/buildroot/package/checkpolicy/checkpolicy.mk @@ -4,8 +4,8 @@ # ################################################################################ -CHECKPOLICY_VERSION = 2.8 -CHECKPOLICY_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524 +CHECKPOLICY_VERSION = 2.9 +CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = COPYING diff --git a/buildroot/package/checksec/0001-checksec-Fixed-issue-with-relative-path.patch b/buildroot/package/checksec/0001-checksec-Fixed-issue-with-relative-path.patch deleted file mode 100644 index 3ed75a3c3..000000000 --- a/buildroot/package/checksec/0001-checksec-Fixed-issue-with-relative-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b48a2dfae26fa3b4af8e65fb5953b3caf62c137b Mon Sep 17 00:00:00 2001 -From: Paresh Chaudhary -Date: Mon, 21 May 2018 14:34:23 -0500 -Subject: [PATCH] checksec: Fixed issue with relative path - -Before this patch, the checksec script was not able to find existing -directories when the user passed a relative path with --dir/-d, -the script aborted with a "No such file or directory". The same error -was reported when the script was executed through a relative path. - -https://github.com/slimm609/checksec.sh/issues/54 - -Signed-off-by: Paresh Chaudhary -Signed-off-by: Matt Weber ---- - checksec | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/checksec b/checksec -index 24b521f..baf8d63 100755 ---- a/checksec -+++ b/checksec -@@ -1193,7 +1193,7 @@ do - echo_message "RELRO STACK CANARY NX PIE RPATH RUNPATH FORTIFY Checked Total Filename\n" '' "\n" "{ \"dir\": { \"name\":\"$tempdir\" }," - fdircount=0 - fdirtotal=0 -- for N in $(find $tempdir -type f); do -+ for N in $(find . -type f); do - if [[ "$N" != "[A-Za-z1-0]*" ]]; then - out=$(file "$N") - if [[ $out =~ ELF ]] ; then -@@ -1201,7 +1201,7 @@ do - fi - fi - done -- for N in $(find $tempdir -type f); do -+ for N in $(find . -type f); do - if [[ "$N" != "[A-Za-z1-0]*" ]]; then - # read permissions? - if [[ ! -r "$N" ]]; then --- -1.9.1 - diff --git a/buildroot/package/checksec/checksec.hash b/buildroot/package/checksec/checksec.hash index e3d1ffd5d..4543f62a3 100644 --- a/buildroot/package/checksec/checksec.hash +++ b/buildroot/package/checksec/checksec.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 510b0b0528f15d0bf13fa1ae7140d2b9fc9261323c98ff76c011bef475a69c14 checksec-cdefe53eb72e6e8f23308417d2fc6b68cba9dbac.tar.gz +sha256 e50a92a2bb22d40d1aa297cd011209ab5ad0b620236dfb9a7afe4c29744260a9 checksec-2.1.0.tar.gz sha256 c5e2a8e188040fc34eb9362084778a2e25f8d1f888e47a2be09efa7cecd9c70d LICENSE.txt diff --git a/buildroot/package/checksec/checksec.mk b/buildroot/package/checksec/checksec.mk index bfe54c262..ffa249663 100644 --- a/buildroot/package/checksec/checksec.mk +++ b/buildroot/package/checksec/checksec.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKSEC_VERSION = cdefe53eb72e6e8f23308417d2fc6b68cba9dbac +CHECKSEC_VERSION = 2.1.0 CHECKSEC_SITE = $(call github,slimm609,checksec.sh,$(CHECKSEC_VERSION)) CHECKSEC_LICENSE = BSD-3-Clause CHECKSEC_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/chipmunk/chipmunk.hash b/buildroot/package/chipmunk/chipmunk.hash index 7bd9b1569..fc34639aa 100644 --- a/buildroot/package/chipmunk/chipmunk.hash +++ b/buildroot/package/chipmunk/chipmunk.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6b6d8d5d910c4442fb9c8c4c46a178126d8c21d075cdb3ce439a7f8d8757b0ca Chipmunk-7.0.2.tar.gz +sha256 1e6f093812d6130e45bdf4cb80280cb3c93d1e1833d8cf989d554d7963b7899a Chipmunk-7.0.3.tar.gz # Hash for license file: sha256 109cedb0301cba4e05fa99241f162bdad015c9541ae84b420b0148ac1ea588e2 LICENSE.txt diff --git a/buildroot/package/chipmunk/chipmunk.mk b/buildroot/package/chipmunk/chipmunk.mk index a84af2282..e85af5d12 100644 --- a/buildroot/package/chipmunk/chipmunk.mk +++ b/buildroot/package/chipmunk/chipmunk.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHIPMUNK_VERSION = 7.0.2 +CHIPMUNK_VERSION = 7.0.3 CHIPMUNK_SITE = https://github.com/slembcke/Chipmunk2D/archive CHIPMUNK_SOURCE = Chipmunk-$(CHIPMUNK_VERSION).tar.gz CHIPMUNK_INSTALL_STAGING = YES diff --git a/buildroot/package/chocolate-doom/0004-configure-Switch-to-pkg-config-macros.patch b/buildroot/package/chocolate-doom/0004-configure-Switch-to-pkg-config-macros.patch deleted file mode 100644 index 2618396b5..000000000 --- a/buildroot/package/chocolate-doom/0004-configure-Switch-to-pkg-config-macros.patch +++ /dev/null @@ -1,217 +0,0 @@ -From 3163bf87d7b955d08dedd5ebaccb1b2a86ffdcb9 Mon Sep 17 00:00:00 2001 -From: Simon Howard -Date: Thu, 25 Feb 2016 22:55:04 -0500 -Subject: [PATCH] configure: Switch to pkg-config macros. - -All dependency libraries install pkg-config .pc files nowadays, which -makes the process of looking them up a lot simpler. Get rid of the SDL -workaround macro as it's not needed. - -[Backported from upstream commit 3163bf87d7b955d08dedd5ebaccb1b2a86ffdcb9. -Fixes static linking issues with SDL_mixer.] - -Signed-off-by: Rodrigo Rebello ---- - configure.ac | 117 ++++++++++++++-------------------------- - opl/examples/Makefile.am | 2 +- - src/Makefile.am | 7 ++- - textscreen/Makefile.am | 2 +- - textscreen/examples/Makefile.am | 2 +- - 5 files changed, 49 insertions(+), 81 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7b03485..48f83ef 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,89 +33,54 @@ then - CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS" - fi - --dnl Search for SDL ... -- --AM_PATH_SDL(1.1.3) -- --# Add the SDL compiler flags to the default compiler flag variables. --# It is important to do this now, before checking for headers and --# library functions. The reason being that on Windows, sdl-config --# sets the -mno-cygwin compiler option in order to generate MinGW --# executables. If we don't do this now, we might end up discovering --# header files that are not actually available to us when we come --# to compile. -- --CFLAGS="$CFLAGS $SDL_CFLAGS" --LDFLAGS="$LDFLAGS $SDL_LIBS" -- --# On some platforms, SDL renames main() to SDL_main() using a #define, --# so that its own main, stored in the SDLmain library, can be run first. --# Unfortunately, this causes problems for autoconf, which builds --# test programs to probe the system. All library/header/symbol checks --# must be run in this block, that performs a workaround for the problem. -- --AC_SDL_MAIN_WORKAROUND([ -- -- # Check for SDL_mixer. -- -- AC_CHECK_LIB(SDL_mixer,Mix_LoadMUS,[ -- SDLMIXER_LIBS="$SDLMIXER_LIBS -lSDL_mixer" -- ],[ -- echo "*** Could not find SDL_mixer. Please install it." -- exit -1 -- ]) -- -- # Check for SDL_net. -- -- AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[ -- SDLNET_LIBS="$SDLNET_LIBS -lSDL_net" -- ],[ -- echo "*** Could not find SDL_net. Please install it." -- exit -1 -- ]) -- -- # Check for libsamplerate. -- AC_ARG_WITH([libsamplerate], -- AS_HELP_STRING([--without-libsamplerate], -- [Build without libsamplerate @<:@default=check@:>@]), -- [], -- [ -- [with_libsamplerate=check] -- ]) -- AS_IF([test "x$with_libsamplerate" != xno], [ -- AC_CHECK_LIB(samplerate, src_new, [], [ -- AS_IF([test "x$with_libsamplerate" != xcheck], [AC_MSG_FAILURE( -- [--with-libsamplerate was given, but test for libsamplerate failed]) -- ]) -+PKG_CHECK_MODULES([SDL], [sdl]) -+PKG_CHECK_MODULES([SDLMIXER], [SDL_mixer]) -+PKG_CHECK_MODULES([SDLNET], [SDL_net]) -+ -+# Check for libsamplerate. -+AC_ARG_WITH([libsamplerate], -+AS_HELP_STRING([--without-libsamplerate], -+ [Build without libsamplerate @<:@default=check@:>@]), -+[], -+[ -+ [with_libsamplerate=check] -+]) -+AS_IF([test "x$with_libsamplerate" != xno], [ -+ PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= 0.1.8], [ -+ AC_DEFINE([HAVE_LIBSAMPLERATE], [1], [libsamplerate installed]) -+ ], [ -+ AS_IF([test "x$with_libsamplerate" != xcheck], [AC_MSG_FAILURE( -+ [--with-libsamplerate was given, but test for libsamplerate failed]) - ]) - ]) -- # Check for libpng. -- AC_ARG_WITH([libpng], -- AS_HELP_STRING([--without-libpng], -- [Build without libpng @<:@default=check@:>@]), -- [], -- [ -- [with_libpng=check] -- ]) -- AS_IF([test "x$with_libpng" != xno], [ -- AC_CHECK_LIB(z, zlibVersion) -- AC_CHECK_LIB(png, png_get_io_ptr, [], [ -- AS_IF([test "x$with_libpng" != xcheck], [AC_MSG_FAILURE( -- [--with-libpng was given, but test for libpng failed]) -- ]) -+]) -+# Check for libpng. -+AC_ARG_WITH([libpng], -+AS_HELP_STRING([--without-libpng], -+ [Build without libpng @<:@default=check@:>@]), -+[], -+[ -+ [with_libpng=check] -+]) -+AS_IF([test "x$with_libpng" != xno], [ -+ PKG_CHECK_MODULES([PNG], [libpng >= 1.6.10], [ -+ AC_DEFINE([HAVE_LIBPNG], [1], [libpng installed]) -+ ], [ -+ AS_IF([test "x$with_libpng" != xcheck], [AC_MSG_FAILURE( -+ [--with-libpng was given, but test for libpng failed]) - ]) - ]) -- AC_CHECK_LIB(m, log) -+]) -+AC_CHECK_LIB(m, log) - -- AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h]) -- AC_CHECK_FUNCS(mmap ioperm) -+AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h]) -+AC_CHECK_FUNCS(mmap ioperm) - -- # OpenBSD I/O i386 library for I/O port access. -- # (64 bit has the same thing with a different name!) -+# OpenBSD I/O i386 library for I/O port access. -+# (64 bit has the same thing with a different name!) - -- AC_CHECK_LIB(i386, i386_iopl) -- AC_CHECK_LIB(amd64, amd64_iopl) --]) -+AC_CHECK_LIB(i386, i386_iopl) -+AC_CHECK_LIB(amd64, amd64_iopl) - - case $host in - *cygwin* | *mingw* ) -diff --git a/opl/examples/Makefile.am b/opl/examples/Makefile.am -index 9afcd51..54c37f8 100644 ---- a/opl/examples/Makefile.am -+++ b/opl/examples/Makefile.am -@@ -1,5 +1,5 @@ - --AM_CFLAGS = -I$(top_srcdir)/opl -+AM_CFLAGS = -I$(top_srcdir)/opl @SDL_CFLAGS@ - - noinst_PROGRAMS=droplay - -diff --git a/src/Makefile.am b/src/Makefile.am -index 78ee3ba..9624e01 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -21,7 +21,8 @@ execgames_SCRIPTS = $(SETUP_BINARIES) - AM_CFLAGS = -I$(top_srcdir)/textscreen \ - -I$(top_srcdir)/opl \ - -I$(top_srcdir)/pcsound \ -- @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ -+ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ \ -+ @SAMPLERATE_CFLAGS@ @PNG_CFLAGS@ - - # Common source files used by absolutely everything: - -@@ -150,7 +151,9 @@ EXTRA_LIBS = \ - @LDFLAGS@ \ - @SDL_LIBS@ \ - @SDLMIXER_LIBS@ \ -- @SDLNET_LIBS@ -+ @SDLNET_LIBS@ \ -+ @SAMPLERATE_LIBS@ \ -+ @PNG_LIBS@ - - if HAVE_WINDRES - @PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH) resource.rc -diff --git a/textscreen/Makefile.am b/textscreen/Makefile.am -index 628d4ff..427ed40 100644 ---- a/textscreen/Makefile.am -+++ b/textscreen/Makefile.am -@@ -1,5 +1,5 @@ - --AM_CFLAGS = -I$(top_srcdir)/src -+AM_CFLAGS = -I$(top_srcdir)/src @SDL_CFLAGS@ - - CTAGS_ARGS=-I TXT_UNCAST_ARG+ - -diff --git a/textscreen/examples/Makefile.am b/textscreen/examples/Makefile.am -index 4632d92..b857748 100644 ---- a/textscreen/examples/Makefile.am -+++ b/textscreen/examples/Makefile.am -@@ -1,5 +1,5 @@ - --AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/textscreen -+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/textscreen @SDL_CFLAGS@ - - noinst_PROGRAMS=guitest calculator - --- -2.1.4 - diff --git a/buildroot/package/chocolate-doom/Config.in b/buildroot/package/chocolate-doom/Config.in index 5e0d9c11e..406b04ecf 100644 --- a/buildroot/package/chocolate-doom/Config.in +++ b/buildroot/package/chocolate-doom/Config.in @@ -1,12 +1,17 @@ config BR2_PACKAGE_CHOCOLATE_DOOM bool "chocolate-doom" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_SDL - select BR2_PACKAGE_SDL_MIXER - select BR2_PACKAGE_SDL_NET + depends on !BR2_STATIC_LIBS # sdl2 + select BR2_PACKAGE_SDL2 + select BR2_PACKAGE_SDL2_MIXER + select BR2_PACKAGE_SDL2_NET help Chocolate Doom is a set of conservative source ports for Doom, Heretic, Hexen and Strife, with a philosophy of preserving the look, feel, and bugs of the vanilla versions of each. http://www.chocolate-doom.org + +comment "chocolate-doom needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/chocolate-doom/chocolate-doom.hash b/buildroot/package/chocolate-doom/chocolate-doom.hash index 6751c7d20..7f7fa27ab 100644 --- a/buildroot/package/chocolate-doom/chocolate-doom.hash +++ b/buildroot/package/chocolate-doom/chocolate-doom.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 3e6d1a82ac5c8b025a9695ce1e47d0dc6ed142ebb1129b1e4a70e2740f79150c chocolate-doom-2.3.0.tar.gz +sha256 73aea623930c7d18a7a778eea391e1ddfbe90ad1ac40a91b380afca4b0e1dab8 chocolate-doom-3.0.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/chocolate-doom/chocolate-doom.mk b/buildroot/package/chocolate-doom/chocolate-doom.mk index 8c16a7fa3..4e0a8fee1 100644 --- a/buildroot/package/chocolate-doom/chocolate-doom.mk +++ b/buildroot/package/chocolate-doom/chocolate-doom.mk @@ -4,23 +4,15 @@ # ################################################################################ -CHOCOLATE_DOOM_VERSION = 2.3.0 +CHOCOLATE_DOOM_VERSION = 3.0.0 CHOCOLATE_DOOM_SITE = http://www.chocolate-doom.org/downloads/$(CHOCOLATE_DOOM_VERSION) CHOCOLATE_DOOM_LICENSE = GPL-2.0+ CHOCOLATE_DOOM_LICENSE_FILES = COPYING -CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl sdl_mixer sdl_net - -# We're patching configure.ac, so we need to autoreconf -CHOCOLATE_DOOM_AUTORECONF = YES +CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl2 sdl2_mixer sdl2_net # Avoid installing desktop entries, icons, etc. CHOCOLATE_DOOM_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec -CHOCOLATE_DOOM_CONF_OPTS = \ - --disable-sdltest \ - --with-sdl-prefix=$(STAGING_DIR)/usr \ - --with-sdl-exec-prefix=$(STAGING_DIR)/usr - CHOCOLATE_DOOM_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) diff --git a/buildroot/package/chrony/0001-ntp-fix-build-with-musl-libc.patch b/buildroot/package/chrony/0001-ntp-fix-build-with-musl-libc.patch deleted file mode 100644 index c927b343f..000000000 --- a/buildroot/package/chrony/0001-ntp-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1e64bc4c4379ae3e55be3c518e0e3e22c8c4ae77 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 14 Nov 2017 13:23:57 +0200 -Subject: [PATCH] ntp: fix build with musl libc - -The configure script enables HAVE_LINUX_TIMESTAMPING_OPT_PKTINFO based -on the existence of struct scm_ts_pktinfo and -SOF_TIMESTAMPING_OPT_PKTINFO that were introduced in Linux kernel v4.13 -in the linux/net_tstamp.h kernel header. But this feature also requires -SCM_TIMESTAMPING_PKTINFO that is defined in the socket.h header. musl -libc provides its own version of socket.h, and as of musl version 1.1.16 -this macro is missing. Define this macro in the code as a temporary -measure until musl is updated to its latest version. - -Signed-off-by: Baruch Siach ---- -Upstream status: not upstreamable ---- - ntp_io_linux.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ntp_io_linux.c b/ntp_io_linux.c -index 00caed06f7ba..2214a6f6f6c5 100644 ---- a/ntp_io_linux.c -+++ b/ntp_io_linux.c -@@ -574,6 +574,10 @@ extract_udp_data(unsigned char *msg, NTP_Remote_Address *remote_addr, int len) - - /* ================================================== */ - -+#ifndef SCM_TIMESTAMPING_PKTINFO -+#define SCM_TIMESTAMPING_PKTINFO 58 -+#endif -+ - int - NIO_Linux_ProcessMessage(NTP_Remote_Address *remote_addr, NTP_Local_Address *local_addr, - NTP_Local_Timestamp *local_ts, struct msghdr *hdr, int length) --- -2.15.0 - diff --git a/buildroot/package/chrony/0002-hash-include-util.h-for-MIN-macro.patch b/buildroot/package/chrony/0002-hash-include-util.h-for-MIN-macro.patch deleted file mode 100644 index 1fd5bd998..000000000 --- a/buildroot/package/chrony/0002-hash-include-util.h-for-MIN-macro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 948ecf84314f78da82e0e2b07b6570ca9cff86c8 Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar -Date: Thu, 20 Sep 2018 15:01:16 +0200 -Subject: [PATCH] hash: include util.h for MIN macro - -The hash_intmd5.c file inadvertently relied on the system headers to -provide the MIN macro, but it is missing with some libc implementations. - -Signed-off-by: Giulio Benetti ---- - hash_intmd5.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hash_intmd5.c b/hash_intmd5.c -index 0b60f9b..49da1cf 100644 ---- a/hash_intmd5.c -+++ b/hash_intmd5.c -@@ -29,6 +29,7 @@ - #include "sysincl.h" - #include "hash.h" - #include "memory.h" -+#include "util.h" - - #include "md5.c" - --- -2.17.1 - diff --git a/buildroot/package/chrony/Config.in b/buildroot/package/chrony/Config.in index 05d6fc1a2..158dc2053 100644 --- a/buildroot/package/chrony/Config.in +++ b/buildroot/package/chrony/Config.in @@ -6,3 +6,11 @@ config BR2_PACKAGE_CHRONY accuracy of the system clock. http://chrony.tuxfamily.org/ + +config BR2_PACKAGE_CHRONY_DEBUG_LOGGING + bool "enable debug logging support" + depends on BR2_PACKAGE_CHRONY + help + Enable support for debug logging output from Chrony when + enabled at runtime. If disabled, code for debug logging will + not be compiled in. diff --git a/buildroot/package/chrony/chrony.hash b/buildroot/package/chrony/chrony.hash index 925240cf6..c31c6893a 100644 --- a/buildroot/package/chrony/chrony.hash +++ b/buildroot/package/chrony/chrony.hash @@ -1,5 +1,5 @@ -# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2018/09/msg00000.html -md5 7170e750469c198fc6784047d6f71144 chrony-3.4.tar.gz -sha1 fa41e595e7041a9deda76a69e970a023091474f6 chrony-3.4.tar.gz +# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2019/05/msg00001.html +md5 5f66338bc940a9b51eede8f391e7bed3 chrony-3.5.tar.gz +sha1 79e9aeace143550300387a99f17bff04b45673f7 chrony-3.5.tar.gz # Locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/chrony/chrony.mk b/buildroot/package/chrony/chrony.mk index 00709e6f8..d7f5c0518 100644 --- a/buildroot/package/chrony/chrony.mk +++ b/buildroot/package/chrony/chrony.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHRONY_VERSION = 3.4 +CHRONY_VERSION = 3.5 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING @@ -14,7 +14,8 @@ CHRONY_CONF_OPTS = \ --host-machine=$(BR2_ARCH) \ --prefix=/usr \ --without-readline \ - --without-tomcrypt + --without-tomcrypt \ + $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) ifeq ($(BR2_PACKAGE_LIBCAP),y) CHRONY_DEPENDENCIES += libcap @@ -66,9 +67,6 @@ endef define CHRONY_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/chrony/chrony.service \ $(TARGET_DIR)/usr/lib/systemd/system/chrony.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/chrony.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/chrony.service endef $(eval $(generic-package)) diff --git a/buildroot/package/cifs-utils/cifs-utils.hash b/buildroot/package/cifs-utils/cifs-utils.hash index fda1573ee..bbfbc1d8f 100644 --- a/buildroot/package/cifs-utils/cifs-utils.hash +++ b/buildroot/package/cifs-utils/cifs-utils.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 e7d1f6050c43f21f82cd77e288eb756755effd22f0c310fc2c525df9d41dff79 cifs-utils-6.8.tar.bz2 +sha256 18d8f1bf92c13c4d611502dbd6759e3a766ddc8467ec8a2eda3f589e40b9ac9c cifs-utils-6.9.tar.bz2 # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/cifs-utils/cifs-utils.mk b/buildroot/package/cifs-utils/cifs-utils.mk index 3456cd919..511e9ccc0 100644 --- a/buildroot/package/cifs-utils/cifs-utils.mk +++ b/buildroot/package/cifs-utils/cifs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -CIFS_UTILS_VERSION = 6.8 +CIFS_UTILS_VERSION = 6.9 CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2 CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils CIFS_UTILS_LICENSE = GPL-3.0+ diff --git a/buildroot/package/circus/Config.in b/buildroot/package/circus/Config.in index f1cd93c73..832b04dfa 100644 --- a/buildroot/package/circus/Config.in +++ b/buildroot/package/circus/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_CIRCUS bool "circus" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 # python-tornado depends on BR2_INSTALL_LIBSTDCPP # pyzmq -> zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # pyzmq -> zeromq select BR2_PACKAGE_PYTHON_IOWAIT # runtime @@ -14,6 +14,6 @@ config BR2_PACKAGE_CIRCUS https://circus.readthedocs.org/en/latest/ -comment "circus needs Python and a toolchain w/ C++, threads" +comment "circus needs Python 3 and a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) + !BR2_PACKAGE_PYTHON3 diff --git a/buildroot/package/circus/circus.hash b/buildroot/package/circus/circus.hash index 877ae21c0..6391f0b5f 100644 --- a/buildroot/package/circus/circus.hash +++ b/buildroot/package/circus/circus.hash @@ -1,4 +1,4 @@ -# md5 from https://pypi.python.org/pypi/circus/json, sha256 locally computed -md5 48e6b220fb0cafca46e3ae1f6ec4bce8 circus-0.14.0.tar.gz -sha256 b8ca91d8bd87b350fda199488ac9ddff91a546b0c6214a28a2f13393713cf062 circus-0.14.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/circus/json +md5 ed9082b5ac6ac5786721254b06315183 circus-0.15.0.tar.gz +sha256 d1603cf4c4f620ce6593d3d2a67fad25bf0242183ea24110d8bb1c8079c55d1b circus-0.15.0.tar.gz sha256 3df739c05a4eed7efdf4987142658d2a4f1243e5f08e72a5ecedac5749c92a49 LICENSE diff --git a/buildroot/package/circus/circus.mk b/buildroot/package/circus/circus.mk index 8b863aa65..d96265192 100644 --- a/buildroot/package/circus/circus.mk +++ b/buildroot/package/circus/circus.mk @@ -4,8 +4,8 @@ # ################################################################################ -CIRCUS_VERSION = 0.14.0 -CIRCUS_SITE = https://pypi.python.org/packages/68/41/02c6f5edea2df80b133a12753aee3e698e9130a5c878a9b0bffcf1e17e65 +CIRCUS_VERSION = 0.15.0 +CIRCUS_SITE = https://files.pythonhosted.org/packages/12/11/b72ee03c3d1fd09c39466954def2eae176d22a9fa5d9e6e8e6b90ee88f56 CIRCUS_SETUP_TYPE = setuptools CIRCUS_LICENSE = Apache-2.0 CIRCUS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/civetweb/civetweb.hash b/buildroot/package/civetweb/civetweb.hash index 23f7c4aca..e6f60ff1d 100644 --- a/buildroot/package/civetweb/civetweb.hash +++ b/buildroot/package/civetweb/civetweb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 de7d5e7a2d9551d325898c71e41d437d5f7b51e754b242af897f7be96e713a42 civetweb-v1.11.tar.gz +sha256 de7d5e7a2d9551d325898c71e41d437d5f7b51e754b242af897f7be96e713a42 civetweb-1.11.tar.gz sha256 1cd00da00b8649b4005757f4019acfd3102ecd407f47998081697e8e9086f706 LICENSE.md diff --git a/buildroot/package/civetweb/civetweb.mk b/buildroot/package/civetweb/civetweb.mk index 1652239eb..f05b29f3c 100644 --- a/buildroot/package/civetweb/civetweb.mk +++ b/buildroot/package/civetweb/civetweb.mk @@ -4,8 +4,8 @@ # ################################################################################ -CIVETWEB_VERSION = v1.11 -CIVETWEB_SITE = $(call github,civetweb,civetweb,$(CIVETWEB_VERSION)) +CIVETWEB_VERSION = 1.11 +CIVETWEB_SITE = $(call github,civetweb,civetweb,v$(CIVETWEB_VERSION)) CIVETWEB_LICENSE = MIT CIVETWEB_LICENSE_FILES = LICENSE.md @@ -38,6 +38,12 @@ else CIVETWEB_COPT += -DNO_SSL endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +CIVETWEB_CONF_OPTS += WITH_ZLIB=1 +CIVETWEB_LIBS += -lz +CIVETWEB_DEPENDENCIES += zlib +endif + ifeq ($(BR2_PACKAGE_CIVETWEB_SERVER),y) CIVETWEB_BUILD_TARGETS += build CIVETWEB_INSTALL_TARGETS += install diff --git a/buildroot/package/cjson/cjson.hash b/buildroot/package/cjson/cjson.hash index d980fc85a..a02158321 100644 --- a/buildroot/package/cjson/cjson.hash +++ b/buildroot/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 760687665ab41a5cff9c40b1053c19572bcdaadef1194e5cba1b5e6f824686e7 cjson-v1.7.12.tar.gz +sha256 760687665ab41a5cff9c40b1053c19572bcdaadef1194e5cba1b5e6f824686e7 cjson-1.7.12.tar.gz sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/buildroot/package/cjson/cjson.mk b/buildroot/package/cjson/cjson.mk index ae09ea95e..b61d1ceb1 100644 --- a/buildroot/package/cjson/cjson.mk +++ b/buildroot/package/cjson/cjson.mk @@ -4,8 +4,8 @@ # ################################################################################ -CJSON_VERSION = v1.7.12 -CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) +CJSON_VERSION = 1.7.12 +CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT CJSON_LICENSE_FILES = LICENSE diff --git a/buildroot/package/clamav/Config.in b/buildroot/package/clamav/Config.in index 57338e910..08f3e4746 100644 --- a/buildroot/package/clamav/Config.in +++ b/buildroot/package/clamav/Config.in @@ -4,8 +4,10 @@ config BR2_PACKAGE_CLAMAV depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR + select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBMSPACK select BR2_PACKAGE_LIBTOOL + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help diff --git a/buildroot/package/clamav/clamav.hash b/buildroot/package/clamav/clamav.hash index 84758c5cc..613d9b412 100644 --- a/buildroot/package/clamav/clamav.hash +++ b/buildroot/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 04bc4af7aa61cd4ce419a1cfbf77605ee40128455c7627fe2725dd157392d58c clamav-0.101.5.tar.gz +sha256 89fcdcc0eba329ca84d270df09d2bb89ae55f5024b0c3bddb817512fb2c907d3 clamav-0.102.2.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/buildroot/package/clamav/clamav.mk b/buildroot/package/clamav/clamav.mk index 5285c7afd..b8d7de52f 100644 --- a/buildroot/package/clamav/clamav.mk +++ b/buildroot/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.101.5 +CLAMAV_VERSION = 0.102.2 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ @@ -12,6 +12,7 @@ CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ COPYING.unrar COPYING.zlib CLAMAV_DEPENDENCIES = \ host-pkgconf \ + libcurl \ libmspack \ libtool \ openssl \ @@ -21,24 +22,31 @@ CLAMAV_DEPENDENCIES = \ # mmap cannot be detected when cross-compiling, needed for mempool support CLAMAV_CONF_ENV = \ ac_cv_c_mmap_private=yes \ - have_cv_ipv6=yes + have_cv_ipv6=yes \ + OBJC=$(TARGET_CC) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -CLAMAV_CONF_ENV += LIBS=-latomic +CLAMAV_LIBS += -latomic endif -# UCLIBC_HAS_FTS is disabled, therefore disable fanotify (missing fts.h) +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +CLAMAV_DEPENDENCIES += musl-fts +CLAMAV_LIBS += -lfts +endif + +CLAMAV_CONF_ENV += LIBS="$(CLAMAV_LIBS)" + CLAMAV_CONF_OPTS = \ --with-dbdir=/var/lib/clamav \ --with-ltdl-include=$(STAGING_DIR)/usr/include \ --with-ltdl-lib=$(STAGING_DIR)/usr/lib \ + --with-libcurl=$(STAGING_DIR)/usr \ --with-openssl=$(STAGING_DIR)/usr \ --with-system-libmspack=$(STAGING_DIR)/usr \ --with-zlib=$(STAGING_DIR)/usr \ --disable-zlib-vcheck \ --disable-rpath \ --disable-clamav \ - --disable-fanotify \ --disable-milter \ --disable-llvm \ --disable-clamdtop \ @@ -68,13 +76,6 @@ else CLAMAV_CONF_OPTS += --disable-xml endif -ifeq ($(BR2_PACKAGE_LIBCURL),y) -CLAMAV_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr -CLAMAV_DEPENDENCIES += libcurl -else -CLAMAV_CONF_OPTS += --without-libcurl -endif - ifeq ($(BR2_PACKAGE_LIBICONV),y) CLAMAV_CONF_OPTS += --with-iconv CLAMAV_DEPENDENCIES += libiconv diff --git a/buildroot/package/clang/Config.in b/buildroot/package/clang/Config.in index 80f03c80b..a67e7631a 100644 --- a/buildroot/package/clang/Config.in +++ b/buildroot/package/clang/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_CLANG bool "clang" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_HOST_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP @@ -15,10 +14,10 @@ config BR2_PACKAGE_CLANG http://clang.llvm.org -comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, host gcc >= 4.8, dynamic library" +comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "clang needs a toolchain not affected by GCC bug 64735" diff --git a/buildroot/package/clang/clang.hash b/buildroot/package/clang/clang.hash index fe868f587..067a2c047 100644 --- a/buildroot/package/clang/clang.hash +++ b/buildroot/package/clang/clang.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 a45b62dde5d7d5fdcdfa876b0af92f164d434b06e9e89b5d0b1cbc65dfe3f418 cfe-7.0.1.src.tar.xz -sha256 3f3f2e96e3b7319d2b4b49227d6da624a717340107ce2ca5342a25e0e57dfd35 LICENSE.TXT +sha256 5778512b2e065c204010f88777d44b95250671103e434f9dc7363ab2e3804253 clang-9.0.1.src.tar.xz +sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT diff --git a/buildroot/package/clang/clang.mk b/buildroot/package/clang/clang.mk index c15f2b0d2..d740af532 100644 --- a/buildroot/package/clang/clang.mk +++ b/buildroot/package/clang/clang.mk @@ -4,10 +4,11 @@ # ################################################################################ -CLANG_VERSION = 7.0.1 -CLANG_SITE = http://llvm.org/releases/$(CLANG_VERSION) -CLANG_SOURCE = cfe-$(CLANG_VERSION).src.tar.xz -CLANG_LICENSE = NCSA +# LLVM, Clang and lld should be version bumped together +CLANG_VERSION = 9.0.1 +CLANG_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(CLANG_VERSION) +CLANG_SOURCE = clang-$(CLANG_VERSION).src.tar.xz +CLANG_LICENSE = Apache-2.0 with exceptions CLANG_LICENSE_FILES = LICENSE.TXT CLANG_SUPPORTS_IN_SOURCE_BUILD = NO CLANG_INSTALL_STAGING = YES @@ -15,6 +16,13 @@ CLANG_INSTALL_STAGING = YES HOST_CLANG_DEPENDENCIES = host-llvm host-libxml2 CLANG_DEPENDENCIES = llvm host-clang +# LLVM >= 9.0 will soon require C++14 support, building llvm 8.x using a +# toolchain using gcc < 5.1 gives an error but actually still works. Setting +# this option makes it still build with gcc >= 4.8. +# https://reviews.llvm.org/D57264 +HOST_CLANG_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON +CLANG_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON + # This option is needed, otherwise multiple shared libs # (libclangAST.so, libclangBasic.so, libclangFrontend.so, etc.) will # be generated. As a final shared lib containing all these components @@ -49,9 +57,9 @@ CLANG_CONF_OPTS += \ -DCLANG_INCLUDE_DOCS=OFF \ -DCLANG_INCLUDE_TESTS=OFF -HOST_CLANG_CONF_OPTS += -DLLVM_CONFIG:FILEPATH=$(HOST_DIR)/bin/llvm-config \ +HOST_CLANG_CONF_OPTS += -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ -DCLANG_DEFAULT_LINKER=$(TARGET_LD) -CLANG_CONF_OPTS += -DLLVM_CONFIG:FILEPATH=$(STAGING_DIR)/usr/bin/llvm-config \ +CLANG_CONF_OPTS += -DLLVM_DIR=$(STAGING_DIR)/usr/lib/cmake/llvm \ -DCLANG_TABLEGEN:FILEPATH=$(HOST_DIR)/bin/clang-tblgen \ -DLLVM_TABLEGEN_EXE:FILEPATH=$(HOST_DIR)/bin/llvm-tblgen diff --git a/buildroot/package/classpath/Config.in b/buildroot/package/classpath/Config.in deleted file mode 100644 index 0385ccd43..000000000 --- a/buildroot/package/classpath/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS - bool - default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k \ - || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \ - || BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le \ - || BR2_sparc || BR2_sparc64 || BR2_sh || BR2_x86_64 - -config BR2_PACKAGE_CLASSPATH - bool "classpath" - depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS - select BR2_NEEDS_HOST_JAR - select BR2_NEEDS_HOST_JAVAC - help - GNU Classpath, Essential Libraries for Java, is a GNU - project to create free core class libraries for use with - virtual machines and compilers for the java programming - language. - - http://classpath.org diff --git a/buildroot/package/classpath/classpath.hash b/buildroot/package/classpath/classpath.hash deleted file mode 100644 index d1c5b5c1a..000000000 --- a/buildroot/package/classpath/classpath.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.gnu.org/software/classpath/announce/20120307.html -sha256 f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8 classpath-0.99.tar.gz diff --git a/buildroot/package/classpath/classpath.mk b/buildroot/package/classpath/classpath.mk deleted file mode 100644 index 6bba6948c..000000000 --- a/buildroot/package/classpath/classpath.mk +++ /dev/null @@ -1,62 +0,0 @@ -################################################################################ -# -# classpath -# -################################################################################ - -CLASSPATH_VERSION = 0.99 -CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath -CLASSPATH_CONF_OPTS = \ - --disable-examples \ - --disable-rpath \ - --disable-Werror \ - --disable-gconf-peer \ - --disable-gjdoc \ - --enable-tools - -# classpath assumes qt runs on top of X11, but we -# don't support qt4 on X11 -CLASSPATH_CONF_OPTS += --disable-qt-peer -CLASSPATH_DEPENDENCIES = host-pkgconf -CLASSPATH_LICENSE = GPL-2.0+ with exception -CLASSPATH_LICENSE_FILES = COPYING - -# Needs ALSA pcm and sequencer (midi) support -# pcm is always on for alsa-lib -ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y) -CLASSPATH_CONF_OPTS += --enable-alsa -CLASSPATH_DEPENDENCIES += alsa-lib -else -CLASSPATH_CONF_OPTS += --disable-alsa -endif - -ifeq ($(BR2_PACKAGE_GMP),y) -CLASSPATH_CONF_OPTS += --enable-gmp --with-gmp="$(STAGING_DIR)/usr" -CLASSPATH_DEPENDENCIES += gmp -else -CLASSPATH_CONF_OPTS += --disable-gmp -endif - -ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy) -CLASSPATH_CONF_OPTS += --enable-gtk-peer -CLASSPATH_DEPENDENCIES += libgtk2 - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y) -CLASSPATH_CONF_OPTS += --enable-gstreamer-peer -CLASSPATH_DEPENDENCIES += gst-plugins-base -else -CLASSPATH_CONF_OPTS += --disable-gstreamer-peer -endif - -else -CLASSPATH_CONF_OPTS += --disable-gtk-peer --disable-gstreamer-peer -endif - -ifeq ($(BR2_PACKAGE_LIBXML2)$(BR2_PACKAGE_LIBXSLT)$(BR2_TOOLCHAIN_HAS_THREADS),yyy) -CLASSPATH_CONF_OPTS += --enable-xmlj -CLASSPATH_DEPENDENCIES += libxml2 libxslt -else -CLASSPATH_CONF_OPTS += --disable-xmlj -endif - -$(eval $(autotools-package)) diff --git a/buildroot/package/cloop/0001-cflags.patch b/buildroot/package/cloop/0001-cflags.patch deleted file mode 100644 index c421dd7f8..000000000 --- a/buildroot/package/cloop/0001-cflags.patch +++ /dev/null @@ -1,30 +0,0 @@ -Take into account the CFLAGS/LDFLAGS passed in the environment. - -Signed-off-by: Thomas Petazzoni - -Index: host-cloop-2.634-1/Makefile -=================================================================== ---- host-cloop-2.634-1.orig/Makefile 2010-12-16 09:17:52.826555645 +0100 -+++ host-cloop-2.634-1/Makefile 2010-12-16 09:18:57.208713338 +0100 -@@ -15,7 +15,7 @@ - endif - - ifdef APPSONLY --CFLAGS:=-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -s -I. -fno-strict-aliasing -fno-common -fomit-frame-pointer -+CLOOP_CFLAGS:=-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -s -I. -fno-strict-aliasing -fno-common -fomit-frame-pointer - endif - - KERNOBJ:=compressed_loop.o -@@ -53,10 +53,10 @@ - ( cd advancecomp-1.15 ; ./configure && $(MAKE) advfs ) - - extract_compressed_fs: extract_compressed_fs.c -- $(CC) -Wall -O2 -s -o $@ $< -lz -+ $(CC) $(CFLAGS) $(CLOOP_CFLAGS) $(LDFLAGS) -Wall -O2 -s -o $@ $< -lz - - cloop_suspend: cloop_suspend.o -- $(CC) -o $@ $< -+ $(CC) $(CFLAGS) $(CLOOP_CFLAGS) $(LDFLAGS) -o $@ $< - - clean: - rm -rf create_compressed_fs extract_compressed_fs zoom *.o *.ko Module.symvers .cloop* .compressed_loop.* .tmp* diff --git a/buildroot/package/cloop/cloop.hash b/buildroot/package/cloop/cloop.hash index 9acbceb05..7af1a9594 100644 --- a/buildroot/package/cloop/cloop.hash +++ b/buildroot/package/cloop/cloop.hash @@ -1,2 +1,6 @@ -# From http://debian-knoppix.alioth.debian.org/packages/sources/cloop/cloop_2.634-1.dsc -sha256 d6d03e2368e19f9c6c3a313e9c34cf0620d129ce26132a8805580d953769dbbd cloop_2.634-1.tar.gz +# From http://snapshot.debian.org/archive/debian/20150503T155713Z/pool/main/c/cloop/cloop_3.14.1.2.dsc +sha256 ac344225b3a5c4ddbb0d4b20cd4874798b51427b707b53e2ee9fbdada7497c95 cloop_3.14.1.2.tar.xz + +# Hash for license files +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad advancecomp-1.15/COPYING +sha256 1b1f89e94e131e259b9e334565c5c3500d4b8aa755b75c3f145ddcdff3b89124 README diff --git a/buildroot/package/cloop/cloop.mk b/buildroot/package/cloop/cloop.mk index 585f422ce..046d98c86 100644 --- a/buildroot/package/cloop/cloop.mk +++ b/buildroot/package/cloop/cloop.mk @@ -4,9 +4,9 @@ # ################################################################################ -CLOOP_VERSION = 2.634-1 -CLOOP_SOURCE = cloop_$(CLOOP_VERSION).tar.gz -CLOOP_SITE = http://debian-knoppix.alioth.debian.org/packages/sources/cloop +CLOOP_VERSION = 3.14.1.2 +CLOOP_SOURCE = cloop_$(CLOOP_VERSION).tar.xz +CLOOP_SITE = http://snapshot.debian.org/archive/debian/20150503T155713Z/pool/main/c/cloop CLOOP_LICENSE = GPL-2.0 (module), GPL-2.0+ (advancecomp) CLOOP_LICENSE_FILES = README advancecomp-1.15/COPYING diff --git a/buildroot/package/cmake/0001-rename-cmake-rootfile.patch b/buildroot/package/cmake/0001-rename-cmake-rootfile.patch new file mode 100644 index 000000000..a8cd3ee82 --- /dev/null +++ b/buildroot/package/cmake/0001-rename-cmake-rootfile.patch @@ -0,0 +1,43 @@ +From 68d3b1dfbbd2f54bf81986d1d733deaf66658b15 Mon Sep 17 00:00:00 2001 +From: Davide Viti +Date: Thu, 14 Jul 2016 10:14:59 +0100 +Subject: [PATCH] rename cmake rootfile + +ctest fails on the target, because it cannot find CMake.cmake inside +CMAKE_DATA_DIR (typically set to "/usr/share/cmake-3.0"): all *.cmake +files are removed at build time via the target-finalize rule. + +This buildroot-specific patch makes sure ctest looks also for +"Modules/CMake.cmake.ctest" before complaining + +[Vincent: tweak patch for 3.6.3] +[James: tweak patch for 3.15.4] + +Signed-off-by: Davide Viti +Signed-off-by: Vicente Olivert Riera +Signed-off-by: James Hilliard +--- + Source/cmake.cxx | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Source/cmake.cxx b/Source/cmake.cxx +index 3772f09985..c317e4af38 100644 +--- a/Source/cmake.cxx ++++ b/Source/cmake.cxx +@@ -1009,7 +1009,12 @@ int cmake::AddCMakePaths() + "Path to cpack program executable.", cmStateEnums::INTERNAL); + #endif + if (!cmSystemTools::FileExists( +- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake"))) { ++ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake")) && ++ !cmSystemTools::FileExists( ++ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest") ++ ) ++ ) ++ { + // couldn't find modules + cmSystemTools::Error( + "Could not find CMAKE_ROOT !!!\n" +-- +2.20.1 + diff --git a/buildroot/package/cmake/0001-rename_cmake_rootfile.patch b/buildroot/package/cmake/0001-rename_cmake_rootfile.patch deleted file mode 100644 index 8c168c15a..000000000 --- a/buildroot/package/cmake/0001-rename_cmake_rootfile.patch +++ /dev/null @@ -1,29 +0,0 @@ -ctest fails on the target, because it cannot find CMake.cmake inside -CMAKE_DATA_DIR (typically set to "/usr/share/cmake-3.0"): all *.cmake -files are removed at build time via the target-finalize rule. - -This buildroot-specific patch makes sure ctest looks also for -"Modules/CMake.cmake.ctest" before complaining - -[Vincent: tweak patch for 3.6.3] - -Signed-off-by: Davide Viti -Signed-off-by: Vicente Olivert Riera - -diff -rup a/Source/cmake.cxx b/Source/cmake.cxx ---- a/Source/cmake.cxx 2016-07-07 15:47:27.000000000 +0100 -+++ b/Source/cmake.cxx 2016-07-14 10:14:59.914265515 +0100 -@@ -771,7 +771,12 @@ int cmake::AddCMakePaths() - "Path to cpack program executable.", cmState::INTERNAL); - #endif - if (!cmSystemTools::FileExists( -- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str())) { -+ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str()) && -+ !cmSystemTools::FileExists( -+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest").c_str() -+ ) -+ ) -+ { - // couldn't find modules - cmSystemTools::Error( - "Could not find CMAKE_ROOT !!!\n" diff --git a/buildroot/package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch b/buildroot/package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch deleted file mode 100644 index 9abf1a538..000000000 --- a/buildroot/package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 92c4b3d900a24512967a960f108d985c819fdf00 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Sat, 23 Jun 2018 20:30:07 +0200 -Subject: [PATCH] FindLibUV: Also check uv/version.h for version detection - -Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory. -Make FindLibUV aware of the file's new location for configuration to work. - -Upstream change: https://github.com/libuv/libuv/pull/1429 - -Signed-off-by: Fabrice Fontaine -[Retrieve from: https://gitlab.kitware.com/cmake/cmake/merge_requests/2169] ---- - Source/Modules/FindLibUV.cmake | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake -index ba13d75f8b..0554d62c23 100644 ---- a/Source/Modules/FindLibUV.cmake -+++ b/Source/Modules/FindLibUV.cmake -@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR) - set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+") - if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h") - file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") -+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h") -+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") - elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h") - file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") - else() --- -2.16.4 - diff --git a/buildroot/package/cmake/cmake.hash b/buildroot/package/cmake/cmake.hash index f138ac79a..983c29298 100644 --- a/buildroot/package/cmake/cmake.hash +++ b/buildroot/package/cmake/cmake.hash @@ -1,2 +1,5 @@ -# From http://www.cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt -sha256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d cmake-3.8.2.tar.gz +# From https://cmake.org/files/v3.15/cmake-3.15.5-SHA-256.txt +sha256 fbdd7cef15c0ced06bb13024bfda0ecc0dedbcaaaa6b8a5d368c75255243beb4 cmake-3.15.5.tar.gz + +# Locally calculated +sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt diff --git a/buildroot/package/cmake/cmake.mk b/buildroot/package/cmake/cmake.mk index a00691a12..1f3073602 100644 --- a/buildroot/package/cmake/cmake.mk +++ b/buildroot/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.8 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2 +CMAKE_VERSION_MAJOR = 3.15 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).5 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt diff --git a/buildroot/package/cmocka/0001-Don-t-redefine-uintptr_t.patch b/buildroot/package/cmocka/0001-Don-t-redefine-uintptr_t.patch new file mode 100644 index 000000000..4123d8db2 --- /dev/null +++ b/buildroot/package/cmocka/0001-Don-t-redefine-uintptr_t.patch @@ -0,0 +1,77 @@ +From 28ce16b29911e5adc60140b572dee177adc7a178 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 18 Nov 2019 18:56:46 +0100 +Subject: [PATCH] Don't redefine uintptr_t + +Add a call to check_type_size in ConfigureChecks.cmake and use it in +include/cmocka.h to avoid the following redefinition error on riscv64: + +In file included from /data/buildroot/buildroot-test/instance-0/output/build/cmocka-1.1.5/src/cmocka.c:62: +/data/buildroot/buildroot-test/instance-0/output/build/cmocka-1.1.5/include/cmocka.h:132:28: error: conflicting types for 'uintptr_t' + typedef unsigned int uintptr_t; + ^~~~~~~~~ +In file included from /data/buildroot/buildroot-test/instance-0/output/host/riscv64-buildroot-linux-musl/sysroot/usr/include/stdint.h:20, + from /data/buildroot/buildroot-test/instance-0/output/host/riscv64-buildroot-linux-musl/sysroot/usr/include/inttypes.h:9, + from /data/buildroot/buildroot-test/instance-0/output/build/cmocka-1.1.5/src/cmocka.c:27: +/data/buildroot/buildroot-test/instance-0/output/host/riscv64-buildroot-linux-musl/sysroot/usr/include/bits/alltypes.h:104:24: note: previous declaration of 'uintptr_t' was here + typedef unsigned _Addr uintptr_t; + ^~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/30922c18150ea62aefe123d1b7cd1444efab963f + +Signed-off-by: Fabrice Fontaine +Reviewed-by: Andreas Schneider +[Retrieved from: +https://gitlab.com/cmocka/cmocka/commit/28ce16b29911e5adc60140b572dee177adc7a178] +--- + ConfigureChecks.cmake | 3 +++ + config.h.cmake | 4 ++++ + include/cmocka.h | 2 +- + 3 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake +index fe8da35..028774f 100644 +--- a/ConfigureChecks.cmake ++++ b/ConfigureChecks.cmake +@@ -70,6 +70,9 @@ if (HAVE_TIME_H) + check_struct_has_member("struct timespec" tv_sec "time.h" HAVE_STRUCT_TIMESPEC) + endif (HAVE_TIME_H) + ++# TYPES ++check_type_size(uintptr_t UINTPTR_T) ++ + # FUNCTIONS + check_function_exists(calloc HAVE_CALLOC) + check_function_exists(exit HAVE_EXIT) +diff --git a/config.h.cmake b/config.h.cmake +index f8d79da..55fc69f 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -75,6 +75,10 @@ + + #cmakedefine HAVE_STRUCT_TIMESPEC 1 + ++/***************************** TYPES *****************************/ ++ ++#cmakedefine HAVE_UINTPTR_T 1 ++ + /*************************** FUNCTIONS ***************************/ + + /* Define to 1 if you have the `calloc' function. */ +diff --git a/include/cmocka.h b/include/cmocka.h +index 3e923dd..0aa557e 100644 +--- a/include/cmocka.h ++++ b/include/cmocka.h +@@ -120,7 +120,7 @@ typedef uintmax_t LargestIntegralType; + ((LargestIntegralType)(value)) + + /* Smallest integral type capable of holding a pointer. */ +-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) ++#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(HAVE_UINTPTR_T) + # if defined(_WIN32) + /* WIN32 is an ILP32 platform */ + typedef unsigned int uintptr_t; +-- +2.22.0 + diff --git a/buildroot/package/cmocka/0001-examples-uptime-include-stdint.h-before-cmocka.h.patch b/buildroot/package/cmocka/0001-examples-uptime-include-stdint.h-before-cmocka.h.patch deleted file mode 100644 index 68dbc11da..000000000 --- a/buildroot/package/cmocka/0001-examples-uptime-include-stdint.h-before-cmocka.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From dd8449ae3ba7fd05ac172f0227cd93af7f37005e Mon Sep 17 00:00:00 2001 -From: Joel Carlson -Date: Mon, 1 Oct 2018 15:01:56 -0600 -Subject: [PATCH] examples: uptime: include stdint.h before cmocka.h - -Fixes a build error encountered on one MIPS64 toolchain about uintptr_t -being declared twice, first by cmocka.h and then later by the toolchains -stdint.h. - -Fixes #7 - -Signed-off-by: Joel Carlson -Reviewed-by: Andreas Schneider ---- -Fixes build error with br-mips64-n64-full -Upstream commit: dd8449ae3ba7fd05ac172f0227cd93af7f37005e ---- - example/mock/uptime/test_uptime.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/example/mock/uptime/test_uptime.c b/example/mock/uptime/test_uptime.c -index badfac9..183c276 100644 ---- a/example/mock/uptime/test_uptime.c -+++ b/example/mock/uptime/test_uptime.c -@@ -16,6 +16,7 @@ - - #include - #include -+#include - #include - #include - --- -2.17.1 - diff --git a/buildroot/package/cmocka/cmocka.hash b/buildroot/package/cmocka/cmocka.hash index 1cbda2242..007dd7a7f 100644 --- a/buildroot/package/cmocka/cmocka.hash +++ b/buildroot/package/cmocka/cmocka.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 43eabcf72a9c80e3d03f7c8a1c04e408c18d2db5121eb058a3ef732a9dfabfaf cmocka-1.1.3.tar.xz +sha256 f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6 cmocka-1.1.5.tar.xz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/buildroot/package/cmocka/cmocka.mk b/buildroot/package/cmocka/cmocka.mk index 281410abb..eafb4898e 100644 --- a/buildroot/package/cmocka/cmocka.mk +++ b/buildroot/package/cmocka/cmocka.mk @@ -4,12 +4,13 @@ # ################################################################################ -CMOCKA_VERSION = 1.1.3 +CMOCKA_VERSION = 1.1.5 CMOCKA_SOURCE = cmocka-$(CMOCKA_VERSION).tar.xz CMOCKA_SITE = https://cmocka.org/files/1.1 CMOCKA_LICENSE = Apache-2.0 CMOCKA_LICENSE_FILES = COPYING CMOCKA_INSTALL_STAGING = YES +CMOCKA_CONF_OPTS = -DWITH_EXAMPLES=OFF # cmocka only supports out of source builds CMOCKA_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/buildroot/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch b/buildroot/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch new file mode 100644 index 000000000..4e8d4ad12 --- /dev/null +++ b/buildroot/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch @@ -0,0 +1,30 @@ +From 9f1f1e64b65e6680d5cdedf5a3b753ef85fc01f4 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 18 Feb 2020 01:20:50 -0700 +Subject: [PATCH] fdo: ensure xkb_data.state is not null before calling + xkb_state_update_mask (#180) + +[james.hilliard1@gmail.com: backport from upstream commit +9f1f1e64b65e6680d5cdedf5a3b753ef85fc01f4] +Signed-off-by: James Hilliard +--- + platform/cog-platform-fdo.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/platform/cog-platform-fdo.c b/platform/cog-platform-fdo.c +index 36177fc..e6f1cb5 100644 +--- a/platform/cog-platform-fdo.c ++++ b/platform/cog-platform-fdo.c +@@ -894,6 +894,9 @@ keyboard_on_modifiers (void *data, + uint32_t mods_locked, + uint32_t group) + { ++ if (xkb_data.state == NULL) ++ return; ++ + xkb_state_update_mask (xkb_data.state, + mods_depressed, + mods_latched, +-- +2.20.1 + diff --git a/buildroot/package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch b/buildroot/package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch new file mode 100644 index 000000000..48918001e --- /dev/null +++ b/buildroot/package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch @@ -0,0 +1,30 @@ +From 575ef199984ae4e8510ed36f8b1ae1babdff8ea9 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 26 Mar 2020 07:48:19 -0600 +Subject: [PATCH] fdo: ensure xkb_data.state is not null before calling + xkb_state_key_get_one_sym (#192) + +[james.hilliard1@gmail.com: backport from upstream commit +575ef199984ae4e8510ed36f8b1ae1babdff8ea9] +Signed-off-by: James Hilliard +--- + platform/cog-platform-fdo.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/platform/cog-platform-fdo.c b/platform/cog-platform-fdo.c +index 043f91d..93ff255 100644 +--- a/platform/cog-platform-fdo.c ++++ b/platform/cog-platform-fdo.c +@@ -919,6 +919,9 @@ capture_app_key_bindings (uint32_t keysym, + static void + handle_key_event (uint32_t key, uint32_t state, uint32_t time) + { ++ if (xkb_data.state == NULL) ++ return; ++ + uint32_t keysym = xkb_state_key_get_one_sym (xkb_data.state, key); + uint32_t unicode = xkb_state_key_get_utf32 (xkb_data.state, key); + +-- +2.20.1 + diff --git a/buildroot/package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch b/buildroot/package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch new file mode 100644 index 000000000..58842bb15 --- /dev/null +++ b/buildroot/package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch @@ -0,0 +1,30 @@ +From 817f6c9dafd5ad23722eae0a8f43ba9211f37c95 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 26 Mar 2020 07:49:05 -0600 +Subject: [PATCH] fdo: ensure xkb_data.keymap is not null before calling + xkb_keymap_key_repeats (#193) + +[james.hilliard1@gmail.com: backport from upstream commit +817f6c9dafd5ad23722eae0a8f43ba9211f37c95] +Signed-off-by: James Hilliard +--- + platform/cog-platform-fdo.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/platform/cog-platform-fdo.c b/platform/cog-platform-fdo.c +index 93ff255..ecc05e9 100644 +--- a/platform/cog-platform-fdo.c ++++ b/platform/cog-platform-fdo.c +@@ -990,7 +990,8 @@ keyboard_on_key (void *data, + memset (&wl_data.keyboard.repeat_data, + 0x00, + sizeof (wl_data.keyboard.repeat_data)); +- } else if (state == WL_KEYBOARD_KEY_STATE_PRESSED ++ } else if (xkb_data.keymap != NULL ++ && state == WL_KEYBOARD_KEY_STATE_PRESSED + && xkb_keymap_key_repeats (xkb_data.keymap, key)) { + if (wl_data.keyboard.repeat_data.event_source) + g_source_remove (wl_data.keyboard.repeat_data.event_source); +-- +2.20.1 + diff --git a/buildroot/package/cog/Config.in b/buildroot/package/cog/Config.in new file mode 100644 index 000000000..b25991d4a --- /dev/null +++ b/buildroot/package/cog/Config.in @@ -0,0 +1,29 @@ +comment "cog needs wpewebkit and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_WPEWEBKIT || !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_COG + bool "cog" + depends on BR2_PACKAGE_WPEWEBKIT + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus + depends on BR2_USE_MMU # dbus + select BR2_PACKAGE_DBUS + help + Single "window" launcher for the WebKit WPE port, and + helper library for implementing WPE launcher. It does + not provide any chrome, and is suitable to be used + as a Web application container. + + https://github.com/Igalia/cog + +if BR2_PACKAGE_COG + +config BR2_PACKAGE_COG_PROGRAMS_HOME_URI + string "home uri" + default "https://wpewebkit.org" + help + Default URI to open when "cog" is launched. If an empty + string is used, there is no default and the URI to open + must be always specified in the command line. + +endif diff --git a/buildroot/package/cog/cog.hash b/buildroot/package/cog/cog.hash new file mode 100644 index 000000000..2e37928fc --- /dev/null +++ b/buildroot/package/cog/cog.hash @@ -0,0 +1,7 @@ +# From https://wpewebkit.org/releases/cog-0.4.0.tar.xz.sums +md5 75a0838ee6c81bb8df1b254f525440a6 cog-0.4.0.tar.xz +sha1 284d2a641e6269b296057918602c8c94eb831527 cog-0.4.0.tar.xz +sha256 e9c13a51232434b7340a419b1e6f59c40c582cd80c8e60bd9ec7de16c904fc03 cog-0.4.0.tar.xz + +# Hashes for license files: +sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/buildroot/package/cog/cog.mk b/buildroot/package/cog/cog.mk new file mode 100644 index 000000000..d0e5b79c3 --- /dev/null +++ b/buildroot/package/cog/cog.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# cog +# +################################################################################ + +COG_VERSION = 0.4.0 +COG_SITE = https://wpewebkit.org/releases +COG_SOURCE = cog-$(COG_VERSION).tar.xz +COG_INSTALL_STAGING = YES +COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo +COG_LICENSE = MIT +COG_LICENSE_FILES = COPYING +COG_CONF_OPTS = \ + -DCOG_BUILD_PROGRAMS=ON \ + -DCOG_PLATFORM_FDO=ON \ + -DCOG_PLATFORM_DRM=OFF \ + -DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' + +$(eval $(cmake-package)) diff --git a/buildroot/package/collectd/0001-configure.ac-fix-protobuf-util-time_util.h-detection.patch b/buildroot/package/collectd/0001-configure.ac-fix-protobuf-util-time_util.h-detection.patch new file mode 100644 index 000000000..5eb22bef4 --- /dev/null +++ b/buildroot/package/collectd/0001-configure.ac-fix-protobuf-util-time_util.h-detection.patch @@ -0,0 +1,50 @@ +From a81fb110f7685b3268cd921ba72a00796f43d034 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 29 Oct 2019 10:25:07 +0100 +Subject: [PATCH] configure.ac: fix protobuf/util/time_util.h detection + +Add -std=c++11 when checking gor protobuf/util/time_util.h otherwise +test will fail on: + +configure:104495: checking google/protobuf/util/time_util.h usability +configure:104495: /home/br-user/autobuild/run/instance-2/output/host/bin/mips-linux-gnu-g++ -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -pthread conftest.cpp >&5 +In file included from /home/br-user/autobuild/run/instance-2/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/atomic:38:0, + from /home/br-user/autobuild/run/instance-2/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/google/protobuf/io/coded_stream.h:113, + from /home/br-user/autobuild/run/instance-2/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/google/protobuf/duration.pb.h:23, + from /home/br-user/autobuild/run/instance-2/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/google/protobuf/util/time_util.h:52, + from conftest.cpp:188: +/home/br-user/autobuild/run/instance-2/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options. + +Fixes: + - http://autobuild.buildroot.net/results/0d486edaf4c51b6438adeec61fe2c55099862acb + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/collectd/collectd/pull/3325] +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 34386d06..59a7f355 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2722,6 +2722,7 @@ if test "x$withval" != "xno"; then + else + AC_MSG_RESULT([no]) + with_libgrpcpp="no (requires C++11 support)" ++ with_libprotobuf="no ( requires C++11 support)" + fi + fi + +@@ -4568,7 +4569,7 @@ if test "x$withval" != "xno"; then + AC_CHECK_LIB([protobuf], [main], + [ + SAVE_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$with_libprotobuf_cppflags $PROTOBUF_CFLAGS" ++ CPPFLAGS="-std=c++11 $with_libprotobuf_cppflags $PROTOBUF_CFLAGS" + if test "x$PROTOBUF_LIBS" = "x" + then + PROTOBUF_LIBS="-lprotobuf" +-- +2.23.0 + diff --git a/buildroot/package/collectd/0001-libcollectdclient-increase-error-buffer.patch b/buildroot/package/collectd/0001-libcollectdclient-increase-error-buffer.patch deleted file mode 100644 index 247d32b59..000000000 --- a/buildroot/package/collectd/0001-libcollectdclient-increase-error-buffer.patch +++ /dev/null @@ -1,87 +0,0 @@ -From e170f3559fcda6d37a012aba187a96b1f42e8f9d Mon Sep 17 00:00:00 2001 -From: Ruben Kerkhof -Date: Sun, 2 Jul 2017 21:52:14 +0200 -Subject: [PATCH] libcollectdclient: increase error buffer -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -make[1]: Entering directory '/home/ruben/src/collectd' - CC src/libcollectdclient/libcollectdclient_la-client.lo -src/libcollectdclient/client.c: In function ‘lcc_getval’: -src/libcollectdclient/client.c:621:23: warning: ‘%s’ directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Wformat-truncation=] - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^ ~ -src/libcollectdclient/client.c:94:48: note: in definition of macro ‘LCC_SET_ERRSTR’ - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~ -src/libcollectdclient/client.c:94:5: note: ‘snprintf’ output between 15 and 1038 bytes into a destination of size 1024 - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -src/libcollectdclient/client.c:621:5: note: in expansion of macro ‘LCC_SET_ERRSTR’ - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^~~~~~~~~~~~~~ -src/libcollectdclient/client.c: In function ‘lcc_putval’: -src/libcollectdclient/client.c:754:23: warning: ‘%s’ directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Wformat-truncation=] - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^ ~ -src/libcollectdclient/client.c:94:48: note: in definition of macro ‘LCC_SET_ERRSTR’ - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~ -src/libcollectdclient/client.c:94:5: note: ‘snprintf’ output between 15 and 1038 bytes into a destination of size 1024 - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -src/libcollectdclient/client.c:754:5: note: in expansion of macro ‘LCC_SET_ERRSTR’ - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^~~~~~~~~~~~~~ -src/libcollectdclient/client.c: In function ‘lcc_flush’: -src/libcollectdclient/client.c:802:23: warning: ‘%s’ directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Wformat-truncation=] - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^ ~ -src/libcollectdclient/client.c:94:48: note: in definition of macro ‘LCC_SET_ERRSTR’ - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~ -src/libcollectdclient/client.c:94:5: note: ‘snprintf’ output between 15 and 1038 bytes into a destination of size 1024 - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -src/libcollectdclient/client.c:802:5: note: in expansion of macro ‘LCC_SET_ERRSTR’ - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^~~~~~~~~~~~~~ -src/libcollectdclient/client.c: In function ‘lcc_listval’: -src/libcollectdclient/client.c:834:23: warning: ‘%s’ directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Wformat-truncation=] - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^ ~ -src/libcollectdclient/client.c:94:48: note: in definition of macro ‘LCC_SET_ERRSTR’ - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~ -src/libcollectdclient/client.c:94:5: note: ‘snprintf’ output between 15 and 1038 bytes into a destination of size 1024 - snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -src/libcollectdclient/client.c:834:5: note: in expansion of macro ‘LCC_SET_ERRSTR’ - LCC_SET_ERRSTR(c, "Server error: %s", res.message); - ^~~~~~~~~~~~~~ - -Fixes #2200 - -[Upstream commit: https://git.octo.it/?p=collectd.git;a=commitdiff;h=e170f3559fcda6d37a012aba187a96b1f42e8f9d] -Signed-off-by: Thomas Petazzoni ---- - src/libcollectdclient/client.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libcollectdclient/client.c b/src/libcollectdclient/client.c -index 51a4ab2..3ae2e71 100644 ---- a/src/libcollectdclient/client.c -+++ b/src/libcollectdclient/client.c -@@ -99,7 +99,7 @@ - */ - struct lcc_connection_s { - FILE *fh; -- char errbuf[1024]; -+ char errbuf[2048]; - }; - - struct lcc_response_s { --- -1.7.10.4 - diff --git a/buildroot/package/collectd/0002-gps-plugin-fix-build-with-newer-gpsd.patch b/buildroot/package/collectd/0002-gps-plugin-fix-build-with-newer-gpsd.patch deleted file mode 100644 index b5abf8159..000000000 --- a/buildroot/package/collectd/0002-gps-plugin-fix-build-with-newer-gpsd.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 991a6d3fd38c2435d94de3853fda36b3330cf6ab Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 9 Oct 2018 19:57:21 +0300 -Subject: [PATCH] gps plugin: fix build with newer gpsd - -gpsd version 3.18 changed the prototype of gps_read(). Make the -gps_read() call depend on GPSD_API_MAJOR_VERSION to fix that. - -This fixes build failures like: - -gps.c: In function 'cgps_thread': -gps.c:144:11: error: too few arguments to function 'gps_read' - if (gps_read(&gpsd_conn) == -1) { - ^~~~~~~~ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/collectd/collectd/pull/2947 - - src/gps.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/gps.c b/src/gps.c -index 1d32d0492617..b22c3a2e5ecd 100644 ---- a/src/gps.c -+++ b/src/gps.c -@@ -141,7 +141,12 @@ static void *cgps_thread(void *pData) { - continue; - } - -- if (gps_read(&gpsd_conn) == -1) { -+#if GPSD_API_MAJOR_VERSION > 6 -+ if (gps_read(&gpsd_conn, NULL, 0) == -1) -+#else -+ if (gps_read(&gpsd_conn) == -1) -+#endif -+ { - WARNING("gps plugin: incorrect data! (err_count: %d)", err_count); - err_count++; - --- -2.19.1 - diff --git a/buildroot/package/collectd/0003-sensors-Removed-checks-for-upper-limit-of-SENSORS_AP.patch b/buildroot/package/collectd/0003-sensors-Removed-checks-for-upper-limit-of-SENSORS_AP.patch deleted file mode 100644 index 9270021dd..000000000 --- a/buildroot/package/collectd/0003-sensors-Removed-checks-for-upper-limit-of-SENSORS_AP.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 069796bd76dd1ab0089a64f7c9c2a3c9f1475414 Mon Sep 17 00:00:00 2001 -From: Pavel Rochnyack -Date: Mon, 3 Dec 2018 18:34:14 +0700 -Subject: [PATCH] sensors: Removed checks for upper limit of - SENSORS_API_VERSION - -That makes no more sense after lm-sensors got new maintainers. - -Issue: #3006 - -[Vadim Kochan: backported to support 5.7.1 version] -Signed-off-by: Vadim Kochan ---- - src/sensors.c | 17 ++++++----------- - 1 file changed, 6 insertions(+), 11 deletions(-) - -diff --git a/src/sensors.c b/src/sensors.c -index 8f1824d..409dc38 100644 ---- a/src/sensors.c -+++ b/src/sensors.c -@@ -149,7 +149,7 @@ typedef struct featurelist { - static char *conffile = SENSORS_CONF_PATH; - /* #endif SENSORS_API_VERSION < 0x400 */ - --#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) -+#elif (SENSORS_API_VERSION >= 0x400) - typedef struct featurelist { - const sensors_chip_name *chip; - const sensors_feature *feature; -@@ -159,11 +159,6 @@ typedef struct featurelist { - - static char *conffile = NULL; - static _Bool use_labels = 0; --/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ -- --#else /* if SENSORS_API_VERSION >= 0x500 */ --#error "This version of libsensors is not supported yet. Please report this " \ -- "as bug." - #endif - - static featurelist_t *first_feature = NULL; -@@ -223,7 +218,7 @@ static int sensors_config(const char *key, const char *value) { - if (IS_TRUE(value)) - ignorelist_set_invert(sensor_list, 0); - } --#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) -+#if (SENSORS_API_VERSION >= 0x400) - else if (strcasecmp(key, "UseLabels") == 0) { - use_labels = IS_TRUE(value) ? 1 : 0; - } -@@ -353,7 +348,7 @@ static int sensors_load_conf(void) { - } /* while sensors_get_detected_chips */ - /* #endif SENSORS_API_VERSION < 0x400 */ - --#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) -+#elif (SENSORS_API_VERSION >= 0x400) - chip_num = 0; - while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) { - const sensors_feature *feature; -@@ -404,7 +399,7 @@ static int sensors_load_conf(void) { - } /* while (subfeature) */ - } /* while (feature) */ - } /* while (chip) */ --#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ -+#endif /* (SENSORS_API_VERSION >= 0x400) */ - - if (first_feature == NULL) { - sensors_cleanup(); -@@ -479,7 +474,7 @@ static int sensors_read(void) { - } /* for fl = first_feature .. NULL */ - /* #endif SENSORS_API_VERSION < 0x400 */ - --#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) -+#elif (SENSORS_API_VERSION >= 0x400) - for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) { - double value; - int status; -@@ -518,7 +513,7 @@ static int sensors_read(void) { - - sensors_submit(plugin_instance, type, type_instance, value); - } /* for fl = first_feature .. NULL */ --#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ -+#endif /* (SENSORS_API_VERSION >= 0x400) */ - - return (0); - } /* int sensors_read */ --- -2.14.1 - diff --git a/buildroot/package/collectd/Config.in b/buildroot/package/collectd/Config.in index 0cf04b518..303b5dc01 100644 --- a/buildroot/package/collectd/Config.in +++ b/buildroot/package/collectd/Config.in @@ -63,6 +63,13 @@ config BR2_PACKAGE_COLLECTD_LOGSTASH help Writes log messages formatted as logstash JSON events. +config BR2_PACKAGE_COLLECTD_LUA + bool "lua" + select BR2_PACKAGE_LUA + help + Embeds a Lua interpreter into collectd and provides an + interface to collectd's plugin system. + config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL bool "notify_email" depends on !BR2_STATIC_LIBS # libesmtp @@ -289,6 +296,19 @@ config BR2_PACKAGE_COLLECTD_LOAD help Collects the system load. +config BR2_PACKAGE_COLLECTD_LVM + bool "lvm" + depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 app library + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_LVM2_APP_LIBRARY + help + Collects the size of logical volumes (LV) and free space + inside a volume group (VG) from Linux' Logical Volume Manager + (LVM). + +comment "lvm needs a glibc or uClibc toolchain" + depends on BR2_TOOLCHAIN_USES_MUSL + config BR2_PACKAGE_COLLECTD_MD bool "md" help @@ -359,6 +379,13 @@ config BR2_PACKAGE_COLLECTD_OLSRD help Reads information about meshed networks from olsrd. +config BR2_PACKAGE_COLLECTD_ONEWIRE + bool "onewire" + select BR2_PACKAGE_OWFS + help + Collects temperature information from sensors connected over + the OneWire bus. + config BR2_PACKAGE_COLLECTD_OPENLDAP bool "openldap" depends on BR2_USE_WCHAR @@ -404,6 +431,12 @@ config BR2_PACKAGE_COLLECTD_PROTOCOLS help Collects information about the network protocols. +config BR2_PACKAGE_COLLECTD_REDIS + bool "redis" + select BR2_PACKAGE_HIREDIS + help + Connects to one or more instances of Redis. + config BR2_PACKAGE_COLLECTD_SENSORS bool "sensors" select BR2_PACKAGE_LM_SENSORS @@ -524,6 +557,13 @@ menu "write plugins" comment "Select at least one for collectd to be useful" +config BR2_PACKAGE_COLLECTD_AMQP + bool "amqp" + select BR2_PACKAGE_RABBITMQ_C + help + Send/receive values via the Advanced Message Queuing Protocol + (AMQP). + config BR2_PACKAGE_COLLECTD_CSV bool "csv" help @@ -536,6 +576,21 @@ config BR2_PACKAGE_COLLECTD_GRAPHITE Writes data collected to Carbon (Graphite's) storage API. http://graphite.wikidot.com/start +config BR2_PACKAGE_COLLECTD_GRPC + bool "grpc" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc + depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # grpc -> protobuf + select BR2_PACKAGE_GRPC + help + Send/receive values using the gRPC protocol. + +comment "grpc needs a toolchain w/ C++, gcc >= 4.8" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + config BR2_PACKAGE_COLLECTD_MQTT bool "mqtt" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto @@ -563,7 +618,6 @@ config BR2_PACKAGE_COLLECTD_RIEMANN # riemann-c-client -> protobuf-c depends on BR2_INSTALL_LIBSTDCPP depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_HOST_GCC_AT_LEAST_4_8 select BR2_PACKAGE_RIEMANN_C_CLIENT select BR2_PACKAGE_LIBTOOL help @@ -592,17 +646,22 @@ config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS bool "write_prometheus" depends on BR2_INSTALL_LIBSTDCPP # protobuf-c depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c - depends on BR2_HOST_GCC_AT_LEAST_4_8 # protobuf-c select BR2_PACKAGE_LIBMICROHTTPD select BR2_PACKAGE_PROTOBUF_C help Publishes values using an embedded HTTP server, in a format compatible with Prometheus' collectd_exporter. -comment "write_prometheus needs a toolchain w/ C++, host gcc >= 4.8" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_8 +comment "write_prometheus needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" +config BR2_PACKAGE_COLLECTD_WRITEREDIS + bool "write_redis" + select BR2_PACKAGE_HIREDIS + help + Sends data to Redis. + config BR2_PACKAGE_COLLECTD_WRITESENSU bool "write_sensu" help diff --git a/buildroot/package/collectd/collectd.hash b/buildroot/package/collectd/collectd.hash index 08682b6bc..7f716b7a9 100644 --- a/buildroot/package/collectd/collectd.hash +++ b/buildroot/package/collectd/collectd.hash @@ -1,6 +1,5 @@ -# From https://collectd.org/files/SHA256SUM -sha256 9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592 collectd-5.7.2.tar.bz2 - -# Hash for license files +# Locally computed checksums +sha512 1296085fb19bba0c7b7d8684ec877851158b25c9f7b58fc3ae602fba7d7dc718876e730e1cdba96d39101cc5452705bb3445aaee717b219025ae816299b6a3c5 collectd-5.10.0.tar.bz2 +sha256 a03359f563023e744c2dc743008a00a848f4cd506e072621d86b6d8313c0375b collectd-5.10.0.tar.bz2 +sha1 9d64ec4e6e834b8e417e282390e2a9c57934d3bc collectd-5.10.0.tar.bz2 sha256 ed0409b2b1c30566dab5fcdaf46ee70e140c99788e22f0267645a9357b476ae4 COPYING -sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa libltdl/COPYING.LIB diff --git a/buildroot/package/collectd/collectd.mk b/buildroot/package/collectd/collectd.mk index 6cb040ab1..65307dce4 100644 --- a/buildroot/package/collectd/collectd.mk +++ b/buildroot/package/collectd/collectd.mk @@ -4,23 +4,26 @@ # ################################################################################ -COLLECTD_VERSION = 5.7.2 -COLLECTD_SITE = http://collectd.org/files +COLLECTD_VERSION = 5.10.0 +COLLECTD_SITE = \ + https://github.com/collectd/collectd/releases/download/$(COLLECTD_VERSION) COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes COLLECTD_INSTALL_STAGING = YES COLLECTD_LICENSE = MIT (daemon, plugins), GPL-2.0 (plugins), LGPL-2.1 (plugins) -COLLECTD_LICENSE_FILES = COPYING libltdl/COPYING.LIB +COLLECTD_LICENSE_FILES = COPYING +# We're patching configure.ac +COLLECTD_AUTORECONF = YES # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ - amqp apple_sensors aquaero ascent barometer dbi dpdkstat email \ - gmond grpc hddtemp intel_rdt ipmi java lpar lua lvm \ + apple_sensors aquaero ascent barometer dbi dpdkstat email \ + gmond hddtemp intel_rdt ipmi java lpar \ madwifi mbmon mic multimeter netapp notify_desktop numa \ - nut onewire oracle perl pf pinba powerdns python redis routeros \ + nut oracle perl pf pinba powerdns python routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish virt vserver write_kafka \ - write_mongodb write_redis xencpu xmms zfs_arc zone + write_mongodb xencpu xmms zfs_arc zone COLLECTD_CONF_ENV += LIBS="-lm" @@ -45,6 +48,7 @@ COLLECTD_CONF_OPTS += \ --disable-werror \ $(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \ $(if $(BR2_PACKAGE_COLLECTD_AGGREGATION),--enable-aggregation,--disable-aggregation) \ + $(if $(BR2_PACKAGE_COLLECTD_AMQP),--enable-amqp,--disable-amqp) \ $(if $(BR2_PACKAGE_COLLECTD_APACHE),--enable-apache,--disable-apache) \ $(if $(BR2_PACKAGE_COLLECTD_APCUPS),--enable-apcups,--disable-apcups) \ $(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \ @@ -74,6 +78,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_FSCACHE),--enable-fscache,--disable-fscache) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),--enable-gps,--disable-gps) \ $(if $(BR2_PACKAGE_COLLECTD_GRAPHITE),--enable-write_graphite,--disable-write_graphite) \ + $(if $(BR2_PACKAGE_COLLECTD_GRPC),--enable-grpc,--disable-grpc) \ $(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \ $(if $(BR2_PACKAGE_COLLECTD_HUGEPAGES),--enable-hugepages,--disable-hugepages) \ $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ @@ -84,6 +89,8 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_LOAD),--enable-load,--disable-load) \ $(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),--enable-log_logstash,--disable-log_logstash) \ + $(if $(BR2_PACKAGE_COLLECTD_LUA),--enable-lua,--disable-lua) \ + $(if $(BR2_PACKAGE_COLLECTD_LVM),--enable-lvm,--disable-lvm) \ $(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),--enable-memcachec,--disable-memcachec) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \ @@ -100,12 +107,14 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_NAGIOS),--enable-notify_nagios,--disable-notify_nagios) \ $(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \ $(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \ + $(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),--enable-onewire,--disable-onewire) \ $(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),--enable-openldap,--disable-openldap) \ $(if $(BR2_PACKAGE_COLLECTD_OPENVPN),--enable-openvpn,--disable-openvpn) \ $(if $(BR2_PACKAGE_COLLECTD_PING),--enable-ping,--disable-ping) \ $(if $(BR2_PACKAGE_COLLECTD_POSTGRESQL),--enable-postgresql,--disable-postgresql) \ $(if $(BR2_PACKAGE_COLLECTD_PROCESSES),--enable-processes,--disable-processes) \ $(if $(BR2_PACKAGE_COLLECTD_PROTOCOLS),--enable-protocols,--disable-protocols) \ + $(if $(BR2_PACKAGE_COLLECTD_REDIS),--enable-redis,--disable-redis) \ $(if $(BR2_PACKAGE_COLLECTD_REGEX),--enable-match_regex,--disable-match-regex) \ $(if $(BR2_PACKAGE_COLLECTD_REPLACE),--enable-target_replace,--disable-target_replace) \ $(if $(BR2_PACKAGE_COLLECTD_RIEMANN),--enable-write_riemann,--disable-write_riemann) \ @@ -135,12 +144,14 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) \ $(if $(BR2_PACKAGE_COLLECTD_WRITELOG),--enable-write_log,--disable-write_log) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),--enable-write_prometheus,--disable-write_prometheus) \ + $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),--enable-write_redis,--disable-write_redis) \ $(if $(BR2_PACKAGE_COLLECTD_WRITESENSU),--enable-write_sensu,--disable-write_sensu) \ $(if $(BR2_PACKAGE_COLLECTD_WRITETSDB),--enable-write_tsdb,--disable-write_tsdb) \ $(if $(BR2_PACKAGE_COLLECTD_ZOOKEEPER),--enable-zookeeper,--disable-zookeeper) COLLECTD_DEPENDENCIES = \ host-pkgconf \ + $(if $(BR2_PACKAGE_COLLECTD_AMQP),rabbitmq-c) \ $(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_BIND),libcurl libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_CEPH),yajl) \ @@ -149,8 +160,11 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ + $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ + $(if $(BR2_PACKAGE_COLLECTD_LUA),lua) \ + $(if $(BR2_PACKAGE_COLLECTD_LVM),lvm2) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \ $(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \ $(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \ @@ -158,18 +172,24 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \ $(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \ + $(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),owfs) \ $(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),openldap) \ $(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \ $(if $(BR2_PACKAGE_COLLECTD_POSTGRESQL),postgresql) \ + $(if $(BR2_PACKAGE_COLLECTD_REDIS),hiredis) \ $(if $(BR2_PACKAGE_COLLECTD_RIEMANN),libtool riemann-c-client) \ $(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),rrdtool) \ $(if $(BR2_PACKAGE_COLLECTD_SENSORS),lm-sensors) \ $(if $(BR2_PACKAGE_COLLECTD_SMART),libatasmart) \ $(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) \ - $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),libmicrohttpd protobuf-c) + $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),libmicrohttpd protobuf-c) \ + $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),hiredis) # include/library fixups +ifeq ($(BR2_PACKAGE_GRPC),y) +COLLECTD_CONF_OPTS += --with-libgrpc++=$(STAGING_DIR)/usr +endif ifeq ($(BR2_PACKAGE_LIBCURL),y) COLLECTD_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr endif @@ -198,15 +218,18 @@ endif define COLLECTD_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install rm -f $(TARGET_DIR)/usr/bin/collectd-nagios +endef + +ifeq ($(BR2_PACKAGE_COLLECTD_POSTGRESQL),) +define COLLECTD_REMOVE_UNNEEDED_POSTGRESQL_DEFAULT_CONF rm -f $(TARGET_DIR)/usr/share/collectd/postgresql_default.conf endef +COLLECTD_POST_INSTALL_TARGET_HOOKS += COLLECTD_REMOVE_UNNEEDED_POSTGRESQL_DEFAULT_CONF +endif define COLLECTD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/collectd/collectd.service \ $(TARGET_DIR)/usr/lib/systemd/system/collectd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/collectd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/collectd.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/collectl/Config.in b/buildroot/package/collectl/Config.in new file mode 100644 index 000000000..28379abe2 --- /dev/null +++ b/buildroot/package/collectl/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_COLLECTL + bool "collectl" + depends on BR2_USE_MMU # perl + select BR2_PACKAGE_PERL # runtime + help + Collectl is a performance monitoring and benchmark tool that + tries to do it all. You can choose to monitor any of a broad + set of subsystems which currently include buddyinfo, cpu, + disk, inodes, infiniband, lustre, memory, network, nfs, + processes, quadrics, slabs, sockets and tcp. + + http://collectl.sourceforge.net/ diff --git a/buildroot/package/collectl/collectl.hash b/buildroot/package/collectl/collectl.hash new file mode 100644 index 000000000..d866e0bec --- /dev/null +++ b/buildroot/package/collectl/collectl.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 2187264d974b36a653c8a4b028ac6eeab23e1885f8b2563a33f06358f39889f1 collectl-4.3.1.src.tar.gz +sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC +sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL diff --git a/buildroot/package/collectl/collectl.mk b/buildroot/package/collectl/collectl.mk new file mode 100644 index 000000000..c9fb59293 --- /dev/null +++ b/buildroot/package/collectl/collectl.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# collectl +# +################################################################################ + +COLLECTL_VERSION = 4.3.1 +COLLECTL_SOURCE = collectl-$(COLLECTL_VERSION).src.tar.gz +COLLECTL_SITE = http://downloads.sourceforge.net/collectl/collectl +COLLECTL_LICENSE = Artistic or GPL-2.0 +COLLECTL_LICENSE_FILES = COPYING ARTISTIC GPL + +define COLLECTL_INSTALL_TARGET_CMDS + (cd $(@D); \ + DESTDIR=$(TARGET_DIR) ./INSTALL) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/connman/Config.in b/buildroot/package/connman/Config.in index 5177c939a..30eae23c9 100644 --- a/buildroot/package/connman/Config.in +++ b/buildroot/package/connman/Config.in @@ -25,7 +25,7 @@ config BR2_PACKAGE_CONNMAN_ETHERNET config BR2_PACKAGE_CONNMAN_WIFI bool "enable WiFi support" select BR2_PACKAGE_WPA_SUPPLICANT # runtime - select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW # runtime + select BR2_PACKAGE_WPA_SUPPLICANT_DBUS # runtime help Enable WiFi support (scan and static/dhcp interface setup). ConnMan detects the start of wpa_supplicant diff --git a/buildroot/package/connman/connman.hash b/buildroot/package/connman/connman.hash index fad1c55d2..ff5b4d48f 100644 --- a/buildroot/package/connman/connman.hash +++ b/buildroot/package/connman/connman.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 c789db41cc443fa41e661217ea321492ad59a004bebcd1aa013f3bc10a6e0074 connman-1.36.tar.xz +sha256 6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16 connman-1.37.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/buildroot/package/connman/connman.mk b/buildroot/package/connman/connman.mk index 043175944..2cbf3fe75 100644 --- a/buildroot/package/connman/connman.mk +++ b/buildroot/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.36 +CONNMAN_VERSION = 1.37 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus iptables @@ -32,12 +32,6 @@ define CONNMAN_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman endef -define CONNMAN_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/connman.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/connman.service -endef - ifeq ($(BR2_PACKAGE_CONNMAN_CLIENT),y) CONNMAN_LICENSE += , GPL-2.0+ (client) CONNMAN_CONF_OPTS += --enable-client diff --git a/buildroot/package/coreutils/0001-fix-for-dummy-man-usage.patch b/buildroot/package/coreutils/0001-fix-for-dummy-man-usage.patch deleted file mode 100644 index 4c5a08825..000000000 --- a/buildroot/package/coreutils/0001-fix-for-dummy-man-usage.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Pending - -coreutils: fix for dummy-man usage - -The options should be before the final argument, otherwise, the following error -would appear when compiling. - -"dummy-man: too many non-option arguments" - -Signed-off-by: Chen Qi -[Gustavo: update for 8.24] - -diff -Nura coreutils-8.24.orig/man/local.mk coreutils-8.24/man/local.mk ---- coreutils-8.24.orig/man/local.mk 2015-07-04 11:23:47.190503631 -0300 -+++ coreutils-8.24/man/local.mk 2015-07-04 11:24:25.046741090 -0300 -@@ -186,8 +186,8 @@ - && $(run_help2man) \ - --source='$(PACKAGE_STRING)' \ - --include=$(srcdir)/man/$$name.x \ -- --output=$$t/$$name.1 \ - --info-page='\(aq(coreutils) '$$name' invocation\(aq' \ -+ --output=$$t/$$name.1 \ - $$t/$$argv$(EXEEXT) \ - && sed \ - -e 's|$*\.td/||g' \ diff --git a/buildroot/package/coreutils/0001-strtod_fix_clash_with_strtold.patch b/buildroot/package/coreutils/0001-strtod_fix_clash_with_strtold.patch new file mode 100644 index 000000000..7033d3b85 --- /dev/null +++ b/buildroot/package/coreutils/0001-strtod_fix_clash_with_strtold.patch @@ -0,0 +1,64 @@ +From 0562b040fa17f1722ba2b3096067b45d0582ca53 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 11 Mar 2019 16:40:29 -0700 +Subject: [PATCH] strtod: fix clash with strtold + +Problem reported for RHEL 5 by Jesse Caldwell (Bug#34817). +* lib/strtod.c (compute_minus_zero, minus_zero): +Simplify by remving the macro / external variable, +and having just a function. User changed. This avoids +the need for an external variable that might clash. + +Upstream-Status: Backport [rhel5] + +Signed-off-by: Oleksandr Kravchuk + +Downloaded from +http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch + +This patch was committed to gnulib: +http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=patch;h=3bd82a82cf4ba693d2c31c7b95aaec4e56dc92a4 +and will be included in the next release of coreutils. + +Signed-off-by: Bernd Kuhls +--- + ChangeLog | 9 +++++++++ + lib/strtod.c | 11 +++++------ + 2 files changed, 14 insertions(+), 6 deletions(-) + +diff --git a/lib/strtod.c b/lib/strtod.c +index b9eaa51b4..69b1564e1 100644 +--- a/lib/strtod.c ++++ b/lib/strtod.c +@@ -294,16 +294,15 @@ parse_number (const char *nptr, + ICC 10.0 has a bug when optimizing the expression -zero. + The expression -MIN * MIN does not work when cross-compiling + to PowerPC on Mac OS X 10.5. */ +-#if defined __hpux || defined __sgi || defined __ICC + static DOUBLE +-compute_minus_zero (void) ++minus_zero (void) + { ++#if defined __hpux || defined __sgi || defined __ICC + return -MIN * MIN; +-} +-# define minus_zero compute_minus_zero () + #else +-DOUBLE minus_zero = -0.0; ++ return -0.0; + #endif ++} + + /* Convert NPTR to a DOUBLE. If ENDPTR is not NULL, a pointer to the + character after the last one used in the number is put in *ENDPTR. */ +@@ -479,6 +478,6 @@ STRTOD (const char *nptr, char **endptr) + /* Special case -0.0, since at least ICC miscompiles negation. We + can't use copysign(), as that drags in -lm on some platforms. */ + if (!num && negative) +- return minus_zero; ++ return minus_zero (); + return negative ? -num : num; + } +-- +2.20.1 + diff --git a/buildroot/package/coreutils/Config.in b/buildroot/package/coreutils/Config.in index 11a6019e8..705013bae 100644 --- a/buildroot/package/coreutils/Config.in +++ b/buildroot/package/coreutils/Config.in @@ -15,6 +15,24 @@ config BR2_PACKAGE_COREUTILS http://www.gnu.org/software/coreutils/ +if BR2_PACKAGE_COREUTILS + +config BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES + bool "Individual binaries" + depends on !BR2_STATIC_LIBS + help + By default (i.e. with this option disabled), coreutils is + installed as a single binary (Busybox style) called + /usr/bin/coreutils, and all core utilities are symbolic + links to this binary. + + With this option enabled, each utility is a separate binary. + +comment "coreutils individual binaries need a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + +endif + comment "coreutils needs a toolchain w/ wchar" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR diff --git a/buildroot/package/coreutils/coreutils.hash b/buildroot/package/coreutils/coreutils.hash index d55e25a86..31dfbd73a 100644 --- a/buildroot/package/coreutils/coreutils.hash +++ b/buildroot/package/coreutils/coreutils.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057 coreutils-8.30.tar.xz +sha256 ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd coreutils-8.31.tar.xz +# Locally computed +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/coreutils/coreutils.mk b/buildroot/package/coreutils/coreutils.mk index 8e5518f63..c1420b260 100644 --- a/buildroot/package/coreutils/coreutils.mk +++ b/buildroot/package/coreutils/coreutils.mk @@ -4,18 +4,21 @@ # ################################################################################ -COREUTILS_VERSION = 8.30 +COREUTILS_VERSION = 8.31 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_LICENSE = GPL-3.0+ COREUTILS_LICENSE_FILES = COPYING -# coreutils-01-fix-for-dummy-man-usage.patch triggers autoreconf on build -COREUTILS_AUTORECONF = YES -COREUTILS_GETTEXTIZE = YES - -COREUTILS_CONF_OPTS = --disable-rpath --enable-single-binary=symlinks \ +COREUTILS_CONF_OPTS = --disable-rpath \ $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex) + +ifeq ($(BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES),y) +COREUTILS_CONF_OPTS += --disable-single-binary +else +COREUTILS_CONF_OPTS += --enable-single-binary=symlinks +endif + COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ ac_cv_func_chown_works=yes \ ac_cv_func_euidaccess=no \ @@ -96,28 +99,63 @@ COREUTILS_DEPENDENCIES += openssl endif ifeq ($(BR2_ROOTFS_MERGED_USR),) -define COREUTILS_CLEANUP_BIN +# We want to move a few binaries from /usr/bin to /bin. In the case of +# coreutils being built as multi-call binary, we do so by re-creating +# the corresponding symlinks. If coreutils is built with individual +# binaries, we actually move the binaries. +ifeq ($(BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES),y) +define COREUTILS_FIX_BIN_LOCATION + $(foreach f,$(COREUTILS_BIN_PROGS), \ + mv $(TARGET_DIR)/usr/bin/$(f) $(TARGET_DIR)/bin + ) +endef +else +define COREUTILS_FIX_BIN_LOCATION # some things go in /bin rather than /usr/bin $(foreach f,$(COREUTILS_BIN_PROGS), \ rm -f $(TARGET_DIR)/usr/bin/$(f) && \ ln -sf ../usr/bin/coreutils $(TARGET_DIR)/bin/$(f) ) endef -COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP_BIN +endif +COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_FIX_BIN_LOCATION endif ifeq ($(BR2_STATIC_LIBS),y) COREUTILS_CONF_OPTS += --enable-no-install-program=stdbuf endif -define COREUTILS_CLEANUP - # link for archaic shells - ln -fs coreutils $(TARGET_DIR)/usr/bin/[ - # gnu thinks chroot is in bin, debian thinks it's in sbin +# link for archaic shells +define COREUTILS_CREATE_TEST_SYMLINK + ln -fs test $(TARGET_DIR)/usr/bin/[ +endef +COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CREATE_TEST_SYMLINK + +# gnu thinks chroot is in bin, debian thinks it's in sbin +ifeq ($(BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES),y) +define COREUTILS_FIX_CHROOT_LOCATION + mv $(TARGET_DIR)/usr/bin/chroot $(TARGET_DIR)/usr/sbin +endef +else +define COREUTILS_FIX_CHROOT_LOCATION rm -f $(TARGET_DIR)/usr/bin/chroot ln -sf ../bin/coreutils $(TARGET_DIR)/usr/sbin/chroot endef +endif +COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_FIX_CHROOT_LOCATION -COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP +# Explicitly install ln and realpath, which we *are* insterested in. +# A lot of other programs still get installed, however, but disabling +# them does not gain much at build time, and is a loooong list that is +# difficult to maintain... +HOST_COREUTILS_CONF_OPTS = \ + --disable-acl \ + --disable-libcap \ + --disable-rpath \ + --disable-single-binary \ + --disable-xattr \ + --without-gmp \ + --enable-install-program=ln,realpath $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/corkscrew/corkscrew.hash b/buildroot/package/corkscrew/corkscrew.hash index 5a580d134..4006c6aba 100644 --- a/buildroot/package/corkscrew/corkscrew.hash +++ b/buildroot/package/corkscrew/corkscrew.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 ba28a7d123fe607b87ff9d399b33e7549d9ef1a13ae3b61e8f61982e8ae5571d corkscrew-a94f745b40077172b8fe7d77e2d583b9cf900281.tar.gz +sha256 09d70daaa3145070a1e463dbab6ae1cbc62449b1e09c94e158f6017e7c79c9f6 corkscrew-2.0.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/corkscrew/corkscrew.mk b/buildroot/package/corkscrew/corkscrew.mk index 13612d444..de696bad6 100644 --- a/buildroot/package/corkscrew/corkscrew.mk +++ b/buildroot/package/corkscrew/corkscrew.mk @@ -4,8 +4,8 @@ # ################################################################################ -CORKSCREW_VERSION = a94f745b40077172b8fe7d77e2d583b9cf900281 -CORKSCREW_SITE = $(call github,bryanpkc,corkscrew,$(CORKSCREW_VERSION)) +CORKSCREW_VERSION = 2.0 +CORKSCREW_SITE = $(call github,bryanpkc,corkscrew,v$(CORKSCREW_VERSION)) CORKSCREW_LICENSE = GPL-2.0 CORKSCREW_LICENSE_FILES = COPYING CORKSCREW_AUTORECONF = YES diff --git a/buildroot/package/cpio/cpio.mk b/buildroot/package/cpio/cpio.mk index 76cd8659a..1d9c54669 100644 --- a/buildroot/package/cpio/cpio.mk +++ b/buildroot/package/cpio/cpio.mk @@ -18,3 +18,4 @@ CPIO_DEPENDENCIES += argp-standalone endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/cppcms/Config.in b/buildroot/package/cppcms/Config.in index d7b7fa893..f02b28348 100644 --- a/buildroot/package/cppcms/Config.in +++ b/buildroot/package/cppcms/Config.in @@ -27,16 +27,15 @@ if BR2_PACKAGE_CPPCMS config BR2_PACKAGE_CPPCMS_ICU bool "enable icu support" depends on !BR2_BINFMT_FLAT # icu - depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu select BR2_PACKAGE_ICU help Using ICU allows advanced localization features into CppCMS, in another hand ICU is heavier than iconv. -comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8" +comment "icu support needs a toolchain w/ gcc >= 4.8" depends on !BR2_BINFMT_FLAT - depends on !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 endif diff --git a/buildroot/package/cppdb/cppdb.hash b/buildroot/package/cppdb/cppdb.hash index efc0eac0d..6423ef289 100644 --- a/buildroot/package/cppdb/cppdb.hash +++ b/buildroot/package/cppdb/cppdb.hash @@ -1,3 +1,6 @@ # From http://sourceforge.net/projects/cppcms/files/cppdb/0.3.1/ md5 129f1d75f46114b79160b93807d5223f cppdb-0.3.1.tar.bz2 sha1 c0410dcc482d71696ac9206044b3a3ac03d31f96 cppdb-0.3.1.tar.bz2 +# locally computed +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt +sha256 503ed52ef942d44bb26bd47dd5c6765927b198624e4f375e32cc660dfc2a0981 MIT.txt diff --git a/buildroot/package/cppunit/cppunit.hash b/buildroot/package/cppunit/cppunit.hash index a097e3256..47577f2a0 100644 --- a/buildroot/package/cppunit/cppunit.hash +++ b/buildroot/package/cppunit/cppunit.hash @@ -1,5 +1,6 @@ # hash from: http://www.freedesktop.org/wiki/Software/cppunit/: -md5 d1c6bdd5a76c66d2c38331e2d287bc01 cppunit-1.13.2.tar.gz +md5 9dc669e6145cadd9674873e24943e6dd cppunit-1.15.1.tar.gz +sha256 89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7 cppunit-1.15.1.tar.gz # Locally calculated: -sha512 8f4be569f321d577cec31931f49f4df143bc94e283605509b6ea50c60690aa91a2aed940e7eebd4b2413a4218f9a6c3978d312d8e587eab040283c6563846ecd cppunit-1.13.2.tar.gz +sha256 badf14d0aa3eaf1a7ae5f19a47a8ef2fc71a96802c4bc3d354535693c389f4e5 COPYING diff --git a/buildroot/package/cppunit/cppunit.mk b/buildroot/package/cppunit/cppunit.mk index db01b70be..3fe12b33b 100644 --- a/buildroot/package/cppunit/cppunit.mk +++ b/buildroot/package/cppunit/cppunit.mk @@ -4,7 +4,7 @@ # ################################################################################ -CPPUNIT_VERSION = 1.13.2 +CPPUNIT_VERSION = 1.15.1 CPPUNIT_SITE = http://dev-www.libreoffice.org/src CPPUNIT_INSTALL_STAGING = YES CPPUNIT_LICENSE = LGPL-2.1 diff --git a/buildroot/package/cppzmq/0001-fix-install-without-static-libzmq.patch b/buildroot/package/cppzmq/0001-fix-install-without-static-libzmq.patch deleted file mode 100644 index 15936f3f8..000000000 --- a/buildroot/package/cppzmq/0001-fix-install-without-static-libzmq.patch +++ /dev/null @@ -1,47 +0,0 @@ -From bffb0eda34195339f2af49f2879d9d0b9dee5c28 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 20 Sep 2018 19:37:26 +0200 -Subject: [PATCH] fix install without static libzmq - -If libzmq is only available as a shared library and not a static one -then cmake fails with: - --- CMake libzmq package not found, trying again with pkg-config (normal install of zeromq) --- Found PkgConfig: /home/fabrice/buildroot/output/host/bin/pkg-config (found version "0.28") -CMake Error at CMakeLists.txt:20 (message): - ZeroMQ was not found, neither as a CMake package nor via pkg-config - -This is due to the fact that ZeroMQ_FOUND is not set to ON even if -ZEROMQ_LIBRARY is TRUE: - -if(ZeroMQ_LIBRARY AND ZeroMQ_STATIC_LIBRARY) - set(ZeroMQ_FOUND ON) -endif() - -So change AND by OR as suggested in -https://github.com/zeromq/cppzmq/issues/266 - -Fix #266 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zeromq/cppzmq/pull/267] ---- - libzmq-pkg-config/FindZeroMQ.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libzmq-pkg-config/FindZeroMQ.cmake b/libzmq-pkg-config/FindZeroMQ.cmake -index 89d8236..1b84c95 100644 ---- a/libzmq-pkg-config/FindZeroMQ.cmake -+++ b/libzmq-pkg-config/FindZeroMQ.cmake -@@ -8,7 +8,7 @@ find_library(ZeroMQ_LIBRARY NAMES libzmq.so libzmq.dylib libzmq.dll - find_library(ZeroMQ_STATIC_LIBRARY NAMES libzmq-static.a libzmq.a libzmq.dll.a - PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS}) - --if(ZeroMQ_LIBRARY AND ZeroMQ_STATIC_LIBRARY) -+if(ZeroMQ_LIBRARY OR ZeroMQ_STATIC_LIBRARY) - set(ZeroMQ_FOUND ON) - endif() - --- -2.17.1 - diff --git a/buildroot/package/cppzmq/cppzmq.hash b/buildroot/package/cppzmq/cppzmq.hash index 52308d1ea..f0e256dc1 100644 --- a/buildroot/package/cppzmq/cppzmq.hash +++ b/buildroot/package/cppzmq/cppzmq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 27d1f56406ba94ee779e639203218820975cf68174f92fbeae0f645df0fcada4 cppzmq-v4.3.0.tar.gz +sha256 e9203391a0b913576153a2ad22a2dc1479b1ec325beb6c46a3237c669aef5a52 cppzmq-4.6.0.tar.gz sha256 7e6db90e2e805c72b3daa77849d1cb5f1f92da0e69750c8a4aa1d86d70704748 LICENSE diff --git a/buildroot/package/cppzmq/cppzmq.mk b/buildroot/package/cppzmq/cppzmq.mk index d23366e1d..c2994ecfc 100644 --- a/buildroot/package/cppzmq/cppzmq.mk +++ b/buildroot/package/cppzmq/cppzmq.mk @@ -4,8 +4,8 @@ # ################################################################################ -CPPZMQ_VERSION = v4.3.0 -CPPZMQ_SITE = $(call github,zeromq,cppzmq,$(CPPZMQ_VERSION)) +CPPZMQ_VERSION = 4.6.0 +CPPZMQ_SITE = $(call github,zeromq,cppzmq,v$(CPPZMQ_VERSION)) CPPZMQ_INSTALL_STAGING = YES CPPZMQ_DEPENDENCIES = host-pkgconf zeromq CPPZMQ_LICENSE = MIT diff --git a/buildroot/package/cpuburn-arm/Config.in b/buildroot/package/cpuburn-arm/Config.in new file mode 100644 index 000000000..141904791 --- /dev/null +++ b/buildroot/package/cpuburn-arm/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_CPUBURN_ARM_ARCH_SUPPORTS + bool + default y if BR2_cortex_a7 + default y if BR2_cortex_a8 + default y if BR2_cortex_a9 + default y if BR2_cortex_a53 + +config BR2_PACKAGE_CPUBURN_ARM + bool "cpuburn-arm" + depends on BR2_PACKAGE_CPUBURN_ARM_ARCH_SUPPORTS + help + Make ARM cores generate as much heat as possible. Supports + Cortex A7/A8/A9/A53. + + https://github.com/ssvb/cpuburn-arm diff --git a/buildroot/package/cpuburn-arm/cpuburn-arm.hash b/buildroot/package/cpuburn-arm/cpuburn-arm.hash new file mode 100644 index 000000000..55f34f87f --- /dev/null +++ b/buildroot/package/cpuburn-arm/cpuburn-arm.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 354381ec8c352e6c84875ac034004df44b0ed0ac097c400b8d2e47652815c3a2 cpuburn-arm-ad7e646700d14b81413297bda02fb7fe96613c3f.tar.gz +sha256 47f10095a04d16c8d8d52598371fa01b6a6e87134083b9ec3c43d83ff8576f55 cpuburn-a7.S diff --git a/buildroot/package/cpuburn-arm/cpuburn-arm.mk b/buildroot/package/cpuburn-arm/cpuburn-arm.mk new file mode 100644 index 000000000..649ffd224 --- /dev/null +++ b/buildroot/package/cpuburn-arm/cpuburn-arm.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# cpuburn-arm +# +################################################################################ + +CPUBURN_ARM_VERSION = ad7e646700d14b81413297bda02fb7fe96613c3f +CPUBURN_ARM_SITE = $(call github,ssvb,cpuburn-arm,$(CPUBURN_ARM_VERSION)) +CPUBURN_ARM_LICENSE = MIT +CPUBURN_ARM_LICENSE_FILES = cpuburn-a7.S + +ifeq ($(BR2_cortex_a7),y) +CPUBURN_ARM_SRC = cpuburn-a7.S +else ifeq ($(BR2_cortex_a8),y) +CPUBURN_ARM_SRC = cpuburn-a8.S +else ifeq ($(BR2_cortex_a9),y) +CPUBURN_ARM_SRC = cpuburn-a9.S +else ifeq ($(BR2_cortex_a53),y) +CPUBURN_ARM_SRC = cpuburn-a53.S +endif + +define CPUBURN_ARM_BUILD_CMDS + $(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/cpuburn \ + $(@D)/$(CPUBURN_ARM_SRC) +endef + +define CPUBURN_ARM_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 $(@D)/cpuburn $(TARGET_DIR)/usr/bin/cpuburn +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/cpuload/cpuload.hash b/buildroot/package/cpuload/cpuload.hash index 02861ffa9..b80879ca7 100644 --- a/buildroot/package/cpuload/cpuload.hash +++ b/buildroot/package/cpuload/cpuload.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1d61f4776dc3e2746343d68b2ea2faf138e54666b630a6060df4f3945badbcae cpuload-v0.3.tar.gz +sha256 1d61f4776dc3e2746343d68b2ea2faf138e54666b630a6060df4f3945badbcae cpuload-0.3.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/cpuload/cpuload.mk b/buildroot/package/cpuload/cpuload.mk index e792952a4..648b17e59 100644 --- a/buildroot/package/cpuload/cpuload.mk +++ b/buildroot/package/cpuload/cpuload.mk @@ -4,8 +4,8 @@ # ################################################################################ -CPULOAD_VERSION = v0.3 -CPULOAD_SITE = $(call github,kelvincheung,cpuload,$(CPULOAD_VERSION)) +CPULOAD_VERSION = 0.3 +CPULOAD_SITE = $(call github,kelvincheung,cpuload,v$(CPULOAD_VERSION)) CPULOAD_LICENSE = GPL-2.0 CPULOAD_LICENSE_FILES = COPYING diff --git a/buildroot/package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch b/buildroot/package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch deleted file mode 100644 index 6180c4ba5..000000000 --- a/buildroot/package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 47e5dec521ab6243c9b249dd65b93d232d90d6b1 Mon Sep 17 00:00:00 2001 -From: Jan Dittberner -Date: Thu, 25 Aug 2016 17:13:49 +0200 -Subject: [PATCH] Apply patch to fix CVE-2016-6318 - -This patch fixes an issue with a stack-based buffer overflow whne -parsing large GECOS field. See -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6318 and -https://security-tracker.debian.org/tracker/CVE-2016-6318 for more -information. - -Signed-off-by: Stefan Sørensen ---- - -Status: upstream, not yet released. - - lib/fascist.c | 57 ++++++++++++++++++++++++++++++++----------------------- - 2 files changed, 34 insertions(+), 24 deletions(-) - -diff --git a/lib/fascist.c b/lib/fascist.c -index a996509..d4deb15 100644 ---- a/lib/fascist.c -+++ b/lib/fascist.c -@@ -502,7 +502,7 @@ FascistGecosUser(char *password, const char *user, const char *gecos) - char gbuffer[STRINGSIZE]; - char tbuffer[STRINGSIZE]; - char *uwords[STRINGSIZE]; -- char longbuffer[STRINGSIZE * 2]; -+ char longbuffer[STRINGSIZE]; - - if (gecos == NULL) - gecos = ""; -@@ -583,38 +583,47 @@ FascistGecosUser(char *password, const char *user, const char *gecos) - { - for (i = 0; i < j; i++) - { -- strcpy(longbuffer, uwords[i]); -- strcat(longbuffer, uwords[j]); -- -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[i]) + strlen(uwords[j]) < STRINGSIZE) - { -- return _("it is derived from your password entry"); -- } -+ strcpy(longbuffer, uwords[i]); -+ strcat(longbuffer, uwords[j]); - -- strcpy(longbuffer, uwords[j]); -- strcat(longbuffer, uwords[i]); -+ if (GTry(longbuffer, password)) -+ { -+ return _("it is derived from your password entry"); -+ } - -- if (GTry(longbuffer, password)) -- { -- return _("it's derived from your password entry"); -- } -+ strcpy(longbuffer, uwords[j]); -+ strcat(longbuffer, uwords[i]); - -- longbuffer[0] = uwords[i][0]; -- longbuffer[1] = '\0'; -- strcat(longbuffer, uwords[j]); -+ if (GTry(longbuffer, password)) -+ { -+ return _("it's derived from your password entry"); -+ } -+ } - -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[j]) < STRINGSIZE - 1) - { -- return _("it is derivable from your password entry"); -+ longbuffer[0] = uwords[i][0]; -+ longbuffer[1] = '\0'; -+ strcat(longbuffer, uwords[j]); -+ -+ if (GTry(longbuffer, password)) -+ { -+ return _("it is derivable from your password entry"); -+ } - } - -- longbuffer[0] = uwords[j][0]; -- longbuffer[1] = '\0'; -- strcat(longbuffer, uwords[i]); -- -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[i]) < STRINGSIZE - 1) - { -- return _("it's derivable from your password entry"); -+ longbuffer[0] = uwords[j][0]; -+ longbuffer[1] = '\0'; -+ strcat(longbuffer, uwords[i]); -+ -+ if (GTry(longbuffer, password)) -+ { -+ return _("it's derivable from your password entry"); -+ } - } - } - } --- -2.9.3 - diff --git a/buildroot/package/cracklib/0003-Force-grep-to-treat-the-input-as-text-when-formattin.patch b/buildroot/package/cracklib/0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch similarity index 100% rename from buildroot/package/cracklib/0003-Force-grep-to-treat-the-input-as-text-when-formattin.patch rename to buildroot/package/cracklib/0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch diff --git a/buildroot/package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch b/buildroot/package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch deleted file mode 100644 index 63525cc73..000000000 --- a/buildroot/package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 33d7fa4585247cd2247a1ffa032ad245836c6edb Mon Sep 17 00:00:00 2001 -From: Jan Dittberner -Date: Thu, 25 Aug 2016 17:17:53 +0200 -Subject: [PATCH] Fix a buffer overflow processing long words - -A buffer overflow processing long words has been discovered. This commit -applies the patch from -https://build.opensuse.org/package/view_file/Base:System/cracklib/0004-overflow-processing-long-words.patch -by Howard Guo. - -See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835386 and -http://www.openwall.com/lists/oss-security/2016/08/23/8 - -Signed-off-by: Stefan Sørensen ---- - -Status: upstream, not yet released. - - lib/rules.c | 5 ++--- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/rules.c b/lib/rules.c -index d193cc0..3a2aa46 100644 ---- a/lib/rules.c -+++ b/lib/rules.c -@@ -434,9 +434,8 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - { - int limit; - register char *ptr; -- static char area[STRINGSIZE]; -- char area2[STRINGSIZE]; -- area[0] = '\0'; -+ static char area[STRINGSIZE * 2] = {0}; -+ char area2[STRINGSIZE * 2] = {0}; - strcpy(area, input); - - for (ptr = control; *ptr; ptr++) --- -2.9.3 - diff --git a/buildroot/package/cracklib/cracklib.hash b/buildroot/package/cracklib/cracklib.hash index 3038a47a3..9bc8e3d28 100644 --- a/buildroot/package/cracklib/cracklib.hash +++ b/buildroot/package/cracklib/cracklib.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 17cf76943de272fd579ed831a1fd85339b393f8d00bf9e0d17c91e972f583343 cracklib-2.9.6.tar.gz -sha256 27973245225eeb9d0090e97f3dea4197dec99b64d9d3a791a60298f3b021824c cracklib-words-2.9.6.gz +sha256 8b6fd202f3f1d8fa395d3b7a5d821227cfd8bb4a9a584a7ae30cf62cea6287dd cracklib-2.9.7.tar.gz +sha256 7f0c45faf84a2494f15d1e2720394aca4a379163a70c4acad948186c0047d389 cracklib-words-2.9.7.gz +sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/buildroot/package/cracklib/cracklib.mk b/buildroot/package/cracklib/cracklib.mk index 387fd8ba0..91d510ff3 100644 --- a/buildroot/package/cracklib/cracklib.mk +++ b/buildroot/package/cracklib/cracklib.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRACKLIB_VERSION = 2.9.6 -CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/cracklib-$(CRACKLIB_VERSION) +CRACKLIB_VERSION = 2.9.7 +CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/v$(CRACKLIB_VERSION) CRACKLIB_LICENSE = LGPL-2.1 CRACKLIB_LICENSE_FILES = COPYING.LIB CRACKLIB_INSTALL_STAGING = YES diff --git a/buildroot/package/cramfs/cramfs.hash b/buildroot/package/cramfs/cramfs.hash index c6c18b073..af7d2e1db 100644 --- a/buildroot/package/cramfs/cramfs.hash +++ b/buildroot/package/cramfs/cramfs.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 99d87aa5874f4a34c219275e0297b0f4c710895f9c87295267aeabe6a752add1 cramfs-1a1e65f2a049.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/crda/crda.hash b/buildroot/package/crda/crda.hash index edec55a01..2a263d172 100644 --- a/buildroot/package/crda/crda.hash +++ b/buildroot/package/crda/crda.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 5a8f35bb8b27474f466b0e75d451ba917433d8aab1889678a64d9c4e72a8b8c2 crda-4.14.tar.gz +sha256 5a8f35bb8b27474f466b0e75d451ba917433d8aab1889678a64d9c4e72a8b8c2 crda-4.14.tar.gz +sha256 c16224b376128b589eea69a8fdd1f09818b8cb995e10d1e37f72dff22233d7b0 LICENSE diff --git a/buildroot/package/crudini/Config.in b/buildroot/package/crudini/Config.in index e4e26e52d..240848dff 100644 --- a/buildroot/package/crudini/Config.in +++ b/buildroot/package/crudini/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_CRUDINI bool "crudini" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_INIPARSE # runtime help A utility for handling ini files from the command line and diff --git a/buildroot/package/crudini/crudini.hash b/buildroot/package/crudini/crudini.hash index 9279847be..6f2563dfd 100644 --- a/buildroot/package/crudini/crudini.hash +++ b/buildroot/package/crudini/crudini.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=9b8500c90467f0a61c714fbe852c2a66, sha256 locally computed -md5 9b8500c90467f0a61c714fbe852c2a66 crudini-0.9.tar.gz -sha256 10512a5a2f7b54b42e48a1d00f0c6398947c2ba6c264b9fdef86677f0e949fd3 crudini-0.9.tar.gz +# locally computed +sha256 e1b8125ac4373ece3bb0bb047ba9336e5bd55ed5d56b9729968058c9385ab546 crudini-0.9.3.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/crudini/crudini.mk b/buildroot/package/crudini/crudini.mk index c03f55c37..7141e2b2a 100644 --- a/buildroot/package/crudini/crudini.mk +++ b/buildroot/package/crudini/crudini.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRUDINI_VERSION = 0.9 -CRUDINI_SITE = https://pypi.python.org/packages/b5/65/5588903472f30fa01ca4951be00c03a317b27bac4cd1e945bd16b2c1b6d3 +CRUDINI_VERSION = 0.9.3 +CRUDINI_SITE = $(call github,pixelb,crudini,$(CRUDINI_VERSION)) CRUDINI_SETUP_TYPE = setuptools CRUDINI_LICENSE = GPL-2.0 CRUDINI_LICENSE_FILES = COPYING diff --git a/buildroot/package/cryptodev-linux/cryptodev-linux.hash b/buildroot/package/cryptodev-linux/cryptodev-linux.hash index eeb481d6a..4319fd313 100644 --- a/buildroot/package/cryptodev-linux/cryptodev-linux.hash +++ b/buildroot/package/cryptodev-linux/cryptodev-linux.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 994ed2f715dd3786f534d5215ae7ae4735b84cff28ea41080ff3501bf1503944 cryptodev-linux-f60aa08c63fc02780554a0a12180a478ca27d49f.tar.gz +sha256 50cf34ecedc897edb11d1a24076f0d4cfcb704dcd294273bc03e2f6c3632fe2c cryptodev-linux-a1e738aef6249ee3bddf997e91e59b1210553209.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/cryptodev-linux/cryptodev-linux.mk b/buildroot/package/cryptodev-linux/cryptodev-linux.mk index 028f7b1df..a02add631 100644 --- a/buildroot/package/cryptodev-linux/cryptodev-linux.mk +++ b/buildroot/package/cryptodev-linux/cryptodev-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRYPTODEV_LINUX_VERSION = f60aa08c63fc02780554a0a12180a478ca27d49f +CRYPTODEV_LINUX_VERSION = a1e738aef6249ee3bddf997e91e59b1210553209 CRYPTODEV_LINUX_SITE = $(call github,cryptodev-linux,cryptodev-linux,$(CRYPTODEV_LINUX_VERSION)) CRYPTODEV_LINUX_INSTALL_STAGING = YES CRYPTODEV_LINUX_LICENSE = GPL-2.0+ diff --git a/buildroot/package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch b/buildroot/package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch deleted file mode 100644 index 7f93bceac..000000000 --- a/buildroot/package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c484938fb4a57430a2e47334f753b1d771aa0f1b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 21 Feb 2019 20:26:24 +0100 -Subject: [PATCH] config.h: avx2 depends on gcc 4.9 - -Build of cryptopp on x86 with gcc 4.8 fails on: -chacha_avx.cpp: In function 'void CryptoPP::ChaCha_OperateKeystream_AVX2(const word32*, const byte*, CryptoPP::byte*, unsigned int)': -chacha_avx.cpp:98:85: error: '_mm256_broadcastsi128_si256' was not declared in this scope - -This is due to the fact that _mm256_broadcastsi128_si256 has been added -only in gcc 4.9: -https://github.com/gcc-mirror/gcc/commit/78e8d5ffbf0ba5031b736d2c6fc6a44605047cbc - -So bump CRYPTOPP_GCC_VERSION from 4.7 to 4.9 for AVX2 support - -Fixes: - - http://autobuild.buildroot.org/results/195e40b34344f773da51a3fbff9d8e76c517eed1 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/weidai11/cryptopp/pull/809] ---- - config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.h b/config.h -index eccba009..4516d2b3 100644 ---- a/config.h -+++ b/config.h -@@ -591,7 +591,7 @@ NAMESPACE_END - // Requires Binutils 2.24 - #if !defined(CRYPTOPP_DISABLE_AVX2) && defined(CRYPTOPP_AVX_AVAILABLE) && \ - (defined(__AVX2__) || (CRYPTOPP_MSC_VERSION >= 1800) || (__SUNPRO_CC >= 0x5130) || \ -- (CRYPTOPP_GCC_VERSION >= 40700) || (__INTEL_COMPILER >= 1400) || \ -+ (CRYPTOPP_GCC_VERSION >= 40900) || (__INTEL_COMPILER >= 1400) || \ - (CRYPTOPP_LLVM_CLANG_VERSION >= 30100) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40600)) - #define CRYPTOPP_AVX2_AVAILABLE 1 - #endif --- -2.14.1 - diff --git a/buildroot/package/cryptopp/cryptopp.hash b/buildroot/package/cryptopp/cryptopp.hash index 8d12a98da..c0d442a97 100644 --- a/buildroot/package/cryptopp/cryptopp.hash +++ b/buildroot/package/cryptopp/cryptopp.hash @@ -1,5 +1,5 @@ -# Hash from: https://www.cryptopp.com/release800.html: -sha256 bbfd89b348846b920d97a1d32b88c85caf0d7bb423d4fcfab7c44349aaceb82c cryptopp800.zip +# Hash from: https://www.cryptopp.com/release820.html: +sha256 03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058 cryptopp820.zip # Hash for license file: -sha256 fe5f5f187e6e38ac2f833956fc5c4cab2df08797cff07f540e4ee74f12f7ee5b License.txt +sha256 f29d65ae3f0c8e327284f193524643ffb4d682fcca3e1740a5c6cbab0e720583 License.txt diff --git a/buildroot/package/cryptopp/cryptopp.mk b/buildroot/package/cryptopp/cryptopp.mk index 4565785cf..f1d19386a 100644 --- a/buildroot/package/cryptopp/cryptopp.mk +++ b/buildroot/package/cryptopp/cryptopp.mk @@ -4,10 +4,10 @@ # ################################################################################ -CRYPTOPP_VERSION = 8.0.0 +CRYPTOPP_VERSION = 8.2.0 CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip CRYPTOPP_SITE = https://cryptopp.com -CRYPTOPP_LICENSE = BSL-1.0 +CRYPTOPP_LICENSE = BSL-1.0, BSD-3-Clause (CRYPTOGAMS), Public domain (ChaCha SSE2 and AVX) CRYPTOPP_LICENSE_FILES = License.txt CRYPTOPP_INSTALL_STAGING = YES diff --git a/buildroot/package/cryptsetup/Config.in b/buildroot/package/cryptsetup/Config.in index 14b897a8a..c4281f7e2 100644 --- a/buildroot/package/cryptsetup/Config.in +++ b/buildroot/package/cryptsetup/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_CRYPTSETUP bool "cryptsetup" depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 - depends on BR2_USE_MMU # lvm2 - depends on !BR2_STATIC_LIBS # lvm2 + depends on BR2_USE_MMU # lvm2, libargon2 + depends on !BR2_STATIC_LIBS # lvm2, libargon2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c select BR2_PACKAGE_POPT select BR2_PACKAGE_LVM2 @@ -10,6 +10,7 @@ config BR2_PACKAGE_CRYPTSETUP select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_LIBARGON2 help This tool helps manipulate dm-crypt and luks partitions for on-disk encryption. diff --git a/buildroot/package/cryptsetup/cryptsetup.hash b/buildroot/package/cryptsetup/cryptsetup.hash index 748ea0eaf..175ecf33c 100644 --- a/buildroot/package/cryptsetup/cryptsetup.hash +++ b/buildroot/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/sha256sums.asc -sha256 7c51fae0f0e7ea9af0f515b2ac77009fb2969a6619ebab47d097dca38b083d30 cryptsetup-2.0.6.tar.xz +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.2/sha256sums.asc +sha256 2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46 cryptsetup-2.2.2.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/buildroot/package/cryptsetup/cryptsetup.mk b/buildroot/package/cryptsetup/cryptsetup.mk index 7788bfb60..197f5f25b 100644 --- a/buildroot/package/cryptsetup/cryptsetup.mk +++ b/buildroot/package/cryptsetup/cryptsetup.mk @@ -4,17 +4,17 @@ # ################################################################################ -CRYPTSETUP_VERSION_MAJOR = 2.0 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).6 +CRYPTSETUP_VERSION_MAJOR = 2.2 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) -CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c \ +CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c libargon2 \ $(TARGET_NLS_DEPENDENCIES) CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" -CRYPTSETUP_CONF_OPTS += --enable-blkid +CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 # cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL # or kernel crypto modules instead diff --git a/buildroot/package/ctorrent/ctorrent.hash b/buildroot/package/ctorrent/ctorrent.hash index 6dcb590b9..3e8290262 100644 --- a/buildroot/package/ctorrent/ctorrent.hash +++ b/buildroot/package/ctorrent/ctorrent.hash @@ -1,2 +1,5 @@ # From http://sourceforge.net/projects/dtorrent/files/dtorrent/3.3.2/ sha1 d4e221f0292268f80e2430ce9d451dd64cf1ffaa ctorrent-dnh3.3.2.tar.gz + +# locally calculated +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/cups-filters/0001-install-support-old-ln-versions-without-the-r-option.patch b/buildroot/package/cups-filters/0001-install-support-old-ln-versions-without-the-r-option.patch deleted file mode 100644 index 1f155fcef..000000000 --- a/buildroot/package/cups-filters/0001-install-support-old-ln-versions-without-the-r-option.patch +++ /dev/null @@ -1,214 +0,0 @@ -From edd44df686b4ec983a327cabc5035106addb274f Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Mon, 16 Sep 2019 22:22:37 -0300 -Subject: [PATCH] install: support old ln versions without the -r option - -Oldish enterprise-class Linux distributions have outdated versions of -coreutils whose ln command do not support the -r option. Also non-Linux -systems like FreeBSD don't support that option. Use a shell script that -mimics the missing functionality. - -The script creates minimalist relative paths, like ln -r does, but in -order to simplify the logic, it requires that the arguments be absolute -paths and do not end with '/'. This is enough for our purposes. - -Add configuration logic to detect if ln supports the -r option, based on -the logic used by Autoconf to check if ln supports the -s option. - -Signed-off-by: Carlos Santos ---- - Makefile.am | 6 ++-- - configure.ac | 2 ++ - ln-srf | 49 ++++++++++++++++++++++++++ - m4/ac_ln_srf.m4 | 91 +++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 145 insertions(+), 3 deletions(-) - create mode 100755 ln-srf - create mode 100644 m4/ac_ln_srf.m4 - -diff --git a/Makefile.am b/Makefile.am -index 76b81de5..beb2882e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -988,11 +988,11 @@ install-exec-hook: - $(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir) - $(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir) - if ENABLE_FOOMATIC -- $(LN_S) -r -f $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir) -+ $(LN_SRF) $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir) - endif - if ENABLE_DRIVERLESS -- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir) -- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir) -+ $(LN_SRF) $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir) -+ $(LN_SRF) $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir) - endif - if ENABLE_BRAILLE - $(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl -diff --git a/configure.ac b/configure.ac -index d5a539b6..fbcf829a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,6 +58,8 @@ AM_ICONV - AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_LN_S -+AS_LN_SRF_PREPARE -+AC_PROG_LN_SRF - AC_PROG_MAKE_SET - AC_PROG_LIBTOOL - PKG_PROG_PKG_CONFIG([0.20]) -diff --git a/ln-srf b/ln-srf -new file mode 100755 -index 00000000..f395a760 ---- /dev/null -+++ b/ln-srf -@@ -0,0 +1,49 @@ -+#!/bin/sh -+# -+# Author: Carlos Santos -+# This file is in public domain. -+# -+ -+error() { -+ echo "$@" 1>&2 -+ exit 1 -+} -+ -+src="$1" -+dst="$2" -+ -+check_path() { -+ case "$2" in -+ */../*|*/./*|*/.|*/..) error "$1 path '$2' must be absolute";; -+ */) error "$1 path '$2' must not end with '/'";; -+ /?*) ;; -+ *) error "$1 path '$2' must start with '/'";; -+ esac -+} -+ -+check_path "source" "$src" -+check_path "destination" "$dst" -+ -+# strip leading '/' -+src=${src#/*} -+tmp=${dst#/*} -+ -+s_prefix=${src%%/*} -+d_prefix=${tmp%%/*} -+ -+# strip leading common -+while [ "$s_prefix" = "$d_prefix" ]; do -+ src="${src#$s_prefix/}" -+ tmp="${tmp#$d_prefix/}" -+ s_prefix=${src%%/*} -+ d_prefix=${tmp%%/*} -+done -+ -+s_prefix="../" -+while [ -n "$d_prefix" ] && [ "$tmp" != "$d_prefix" ]; do -+ s_prefix="../$s_prefix" -+ tmp="${tmp#$d_prefix/}" -+ d_prefix=${tmp%%/*} -+done -+ -+ln -s -f "$s_prefix$src" "$dst" -diff --git a/m4/ac_ln_srf.m4 b/m4/ac_ln_srf.m4 -new file mode 100644 -index 00000000..204b3439 ---- /dev/null -+++ b/m4/ac_ln_srf.m4 -@@ -0,0 +1,91 @@ -+# Adapted from Autoconf Version 2.63 (GPLv2). -+# -+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+# 02110-1301, USA. -+# -+# As a special exception, the Free Software Foundation gives unlimited -+# permission to copy, distribute and modify the configure scripts that -+# are the output of Autoconf. You need not follow the terms of the GNU -+# General Public License when using or distributing such scripts, even -+# though portions of the text of Autoconf appear in them. The GNU -+# General Public License (GPL) does govern all other use of the material -+# that constitutes the Autoconf program. -+# -+# Certain portions of the Autoconf source text are designed to be copied -+# (in certain cases, depending on the input) into the output of -+# Autoconf. We call these the "data" portions. The rest of the Autoconf -+# source text consists of comments plus executable code that decides which -+# of the data portions to output in any given case. We call these -+# comments and executable code the "non-data" portions. Autoconf never -+# copies any of the non-data portions into its output. -+# -+# This special exception to the GPL applies to versions of Autoconf -+# released by the Free Software Foundation. When you make and -+# distribute a modified version of Autoconf, you may extend this special -+# exception to the GPL to apply to your modified version as well, *unless* -+# your modified version has the potential to copy into its output some -+# of the text that was the non-data portion of the version that you started -+# with. (In other words, unless your change moves or copies text from -+# the non-data portions to the data portions.) If your modification has -+# such potential, you must delete any notice of this special exception -+# to the GPL from your modified version. -+ -+# AS_LN_SRF_PREPARE -+# ------------------------------------ -+m4_defun([AS_LN_SRF_PREPARE], -+[rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null -+fi -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s -r conf$$.file conf$$ 2>/dev/null; then -+ as_ln_srf='ln -s -r -f' -+ elif ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_srf='./ln-srf' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -pRf'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_srf='cp -pRf' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_srf=ln -+ else -+ as_ln_srf='cp -pRf' -+ fi -+else -+ as_ln_srf='cp -pRf' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+])# AS_LN_SRF_PREPARE -+ -+# AC_PROG_LN_SRF -+# -------------------------------- -+AC_DEFUN([AC_PROG_LN_SRF], -+[AC_MSG_CHECKING([whether ln -s -r -f works]) -+AC_SUBST([LN_SRF], [$as_ln_srf])dnl -+if test "$LN_SRF" = "ln -s -r -f"; then -+ AC_MSG_RESULT([yes]) -+else -+ AC_MSG_RESULT([no, using $LN_SRF]) -+fi -+])# AC_PROG_LN_SRF --- -2.18.1 - diff --git a/buildroot/package/cups-filters/0002-Poppler-removed-memCheck-and-gMemReport-functions.patch b/buildroot/package/cups-filters/0002-Poppler-removed-memCheck-and-gMemReport-functions.patch deleted file mode 100644 index 3eb2d35c3..000000000 --- a/buildroot/package/cups-filters/0002-Poppler-removed-memCheck-and-gMemReport-functions.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 6b0747c1630dd973acd138f927dbded4ea45e360 Mon Sep 17 00:00:00 2001 -From: Olivier Schonken -Date: Fri, 5 Oct 2018 12:05:31 +0200 -Subject: [PATCH] Poppler removed memCheck and gMemReport functions - -Only use gMemReport and memCheck functions if poppler version less -than 0.69.0 - -The poppler project removed the memCheck and gMemReport functions in -commits c362ab1b97f20c5b73b3bad8d52015f679178748 - Remove DEBUG_MEM -from Object since this uses RAII now and hence cannot leak. -(The existing tracking also is not thread-safe and hence unreliable.) - -and - -f89446f6917a869b0f1a80fcc8ce81a7213dade4 - Remove generic heap debugging -from gmem since external tools and compiler instrumentation achieve the -same effect. - -This commit solves https://github.com/OpenPrinting/cups-filters/issues/62 - -Signed-off-by: Olivier Schonken ---- - filter/pdftoijs.cxx | 2 ++ - filter/pdftoopvp/pdftoopvp.cxx | 2 ++ - filter/pdftoraster.cxx | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx -index 22bc33f4..dd6b6fa0 100644 ---- a/filter/pdftoijs.cxx -+++ b/filter/pdftoijs.cxx -@@ -503,9 +503,11 @@ err1: - ppdClose(ppd); - free(outputfile); - -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69 - // Check for memory leaks - Object::memCheck(stderr); - gMemReport(stderr); -+#endif - - return exitCode; - } -diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx -index 024941ab..bf25983b 100644 ---- a/filter/pdftoopvp/pdftoopvp.cxx -+++ b/filter/pdftoopvp/pdftoopvp.cxx -@@ -763,9 +763,11 @@ err2: - err0: - delete globalParams; - -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69 - // check for memory leaks - Object::memCheck(stderr); - gMemReport(stderr); -+#endif - - } - /* muntrace(); */ -diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx -index 0c63ab8d..4ebf02b0 100644 ---- a/filter/pdftoraster.cxx -+++ b/filter/pdftoraster.cxx -@@ -2162,9 +2162,11 @@ err1: - cmsDeleteTransform(colorTransform); - } - -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69 - // Check for memory leaks - Object::memCheck(stderr); - gMemReport(stderr); -+#endif - - return exitCode; - } --- -2.17.1 - diff --git a/buildroot/package/cups-filters/0002-filter-texttotext.c-link-with-libiconv-if-needed.patch b/buildroot/package/cups-filters/0002-filter-texttotext.c-link-with-libiconv-if-needed.patch deleted file mode 100644 index cace0773a..000000000 --- a/buildroot/package/cups-filters/0002-filter-texttotext.c-link-with-libiconv-if-needed.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 734ef160b428c545d8c6ae16c4bfe3c036173aa4 Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Sun, 21 Jul 2019 23:54:29 -0300 -Subject: [PATCH] filter/texttotext.c: link with libiconv if needed - -texttotext.c uses iconv so it should link with libiconv on platforms -where it is a separate library (e.g. uClibc-ng without built-in NLS) -otherwise texttotext fails to link: - - CCLD texttotext -[...]/ld: texttotext-texttotext.o: in function `main': -texttotext.c:(.text.startup+0xde0): undefined reference to `libiconv_open' -[...]/ld: texttotext.c:(.text.startup+0xf9d): undefined reference to `libiconv' -[...]/ld: texttotext.c:(.text.startup+0xfd6): undefined reference to `libiconv' -[...]/ld: texttotext.c:(.text.startup+0x16c3): undefined reference to `libiconv_close' - -Modify autogen.sh to call autopoint, which adds the libiconv discovery. -It also creates a "po" skeleton but we can discard it, since it is not -really necessary. - -Fixes: https://bugs.busybox.net/show_bug.cgi?id=12031 - -Signed-off-by: Carlos Santos ---- - Makefile.am | 4 +++- - autogen.sh | 17 +++++++++++++++++ - configure.ac | 6 +++++- - 3 files changed, 25 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 72e023ed..76b81de5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -778,7 +778,7 @@ texttotext_SOURCES = \ - filter/texttotext.c - EXTRA_texttotext_SOURCES = filter/strcasestr.c - texttotext_CFLAGS = $(CUPS_CFLAGS) --texttotext_LDADD = $(STRCASESTR) $(CUPS_LIBS) -+texttotext_LDADD = $(STRCASESTR) $(CUPS_LIBS) $(LIBICONV) - texttotext_DEPENDENCIES = $(STRCASESTR) - - pdftops_SOURCES = \ -@@ -1049,3 +1049,5 @@ if ENABLE_BRAILLE - $(RM) $(DESTDIR)$(pkgfilterdir)/vectortoubrl - $(RM) $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4 - endif -+ -+SUBDIRS = -diff --git a/autogen.sh b/autogen.sh -index 5462a323..cd7397a9 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -13,11 +13,22 @@ aclocal --version > /dev/null 2> /dev/null || { - echo "error: aclocal not found" - exit 1 - } -+ - automake --version > /dev/null 2> /dev/null || { - echo "error: automake not found" - exit 1 - } - -+autopoint --version > /dev/null 2> /dev/null || { -+ echo "error: autopoint not found" -+ exit 1 -+} -+ -+gettext --version > /dev/null 2> /dev/null || { -+ echo "error: gettext not found" -+ exit 1 -+} -+ - for i in $TESTLIBTOOLIZE; do - if which $i > /dev/null 2>&1; then - LIBTOOLIZE=$i -@@ -39,6 +50,12 @@ fi - - rm -rf autom4te*.cache - -+autopoint --force || { -+ echo "error: autopoint failed" -+ exit 1 -+} -+# autopoint is for libiconv discovery; we don't want the po directory -+rm -rf po - $LIBTOOLIZE --force --copy || { - echo "error: libtoolize failed" - exit 1 -diff --git a/configure.ac b/configure.ac -index 607dc17a..d5a539b6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4]) - m4_include([m4/ac_define_dir.m4]) - m4_include([m4/ax_compare_version.m4]) - m4_include([m4/basic-directories.m4]) --AM_INIT_AUTOMAKE([1.11 gnu dist-xz dist-bzip2]) -+AM_INIT_AUTOMAKE([1.11 gnu dist-xz dist-bzip2 subdir-objects]) - AM_SILENT_RULES([yes]) - AC_LANG([C++]) - AC_CONFIG_HEADERS([config.h]) -@@ -54,6 +54,7 @@ AC_PROG_CC - AC_PROG_CXX - AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory]) - AM_PROG_CC_C_O -+AM_ICONV - AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_LN_S -@@ -61,6 +62,9 @@ AC_PROG_MAKE_SET - AC_PROG_LIBTOOL - PKG_PROG_PKG_CONFIG([0.20]) - -+AM_GNU_GETTEXT_VERSION([0.18.3]) -+AM_GNU_GETTEXT([external]) -+ - # ======================================== - # Specify the fontdir patch if not default - # ======================================== --- -2.18.1 - diff --git a/buildroot/package/cups-filters/Config.in b/buildroot/package/cups-filters/Config.in index 5badf0e1f..9e4e37ca6 100644 --- a/buildroot/package/cups-filters/Config.in +++ b/buildroot/package/cups-filters/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_CUPS_FILTERS depends on BR2_USE_MMU depends on BR2_INSTALL_LIBSTDCPP # qpdf depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_WCHAR # libglib2, qpdf depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_PACKAGE_CUPS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 diff --git a/buildroot/package/cups-filters/cups-filters.hash b/buildroot/package/cups-filters/cups-filters.hash index e426ad8b8..9e24abe39 100644 --- a/buildroot/package/cups-filters/cups-filters.hash +++ b/buildroot/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 981b280bc5275a21c6f436aff6207e03cab36dc304c119bbac507db940e7421c cups-filters-1.21.3.tar.gz -sha256 8e697cf4681ebbca716bf8cc30dde51c264e32ceee41fa63ceb5213334204b83 COPYING +sha256 ff8679fcd0c31c25d229262c7ad100ba161ef6b2aa455a2df673dd74ef93f488 cups-filters-1.26.0.tar.gz +sha256 527463af65312372111804589a9624f4c52813e253062ae351e75af5003f317f COPYING diff --git a/buildroot/package/cups-filters/cups-filters.mk b/buildroot/package/cups-filters/cups-filters.mk index e5d731896..3bb33d963 100644 --- a/buildroot/package/cups-filters/cups-filters.mk +++ b/buildroot/package/cups-filters/cups-filters.mk @@ -4,12 +4,10 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.21.3 +CUPS_FILTERS_VERSION = 1.26.0 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING -# 0001-install-support-old-ln-versions-without-the-r-option.patch -CUPS_FILTERS_AUTORECONF = YES CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg @@ -22,24 +20,6 @@ CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \ --with-pdftops=pdftops \ --with-jpeg -# 0001-install-support-old-ln-versions-without-the-r-option.patch adds -# a ln-srf script for older distributions, but GNU patch < 2.7 does -# not handle the git patch permission extensions - So ensure it is -# executable -define CUPS_FILTERS_MAKE_LN_SRF_EXECUTABLE - chmod +x $(@D)/ln-srf -endef - -CUPS_FILTERS_POST_PATCH_HOOKS += CUPS_FILTERS_MAKE_LN_SRF_EXECUTABLE - -# After 0002-filter-texttotext.c-link-with-libiconv-if-needed.patch autoreconf -# needs config.rpath and ABOUT-NLS, which are not in v1.25.4 yet. Fake them. -define CUPS_FILTERS_ADD_MISSING_FILE - touch $(@D)/config.rpath $(@D)/ABOUT-NLS -endef - -CUPS_FILTERS_PRE_CONFIGURE_HOOKS = CUPS_FILTERS_ADD_MISSING_FILE - ifeq ($(BR2_PACKAGE_LIBPNG),y) CUPS_FILTERS_CONF_OPTS += --with-png CUPS_FILTERS_DEPENDENCIES += libpng diff --git a/buildroot/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch b/buildroot/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch index 30002d3c8..b1ab7cbac 100644 --- a/buildroot/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch +++ b/buildroot/package/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch @@ -4,6 +4,8 @@ Date: Sun, 29 May 2016 19:31:50 +0200 Subject: [PATCH] Remove man from BUILDDIRS in configure Signed-off-by: Bernd Kuhls +[Fabrice: updated for 2.3.0] +Signed-off-by: Fabrice Fontaine --- config-scripts/cups-common.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -16,8 +18,8 @@ index fbba715..77d0f5c 100644 case "$COMPONENTS" in all) -- BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" -+ BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale doc examples templates" +- BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" ++ BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale doc examples templates" ;; core) diff --git a/buildroot/package/cups/0002-Do-not-use-genstrings.patch b/buildroot/package/cups/0002-Do-not-use-genstrings.patch index 325483ea8..b3566b8b1 100644 --- a/buildroot/package/cups/0002-Do-not-use-genstrings.patch +++ b/buildroot/package/cups/0002-Do-not-use-genstrings.patch @@ -14,6 +14,8 @@ Signed-off-by: Olivier Schonken it, remove useless and potentially confusing 'echo' before the genstrings call.] Signed-off-by: Thomas Petazzoni +[Fabrice: updated for 2.3.0] +Signed-off-by: Fabrice Fontaine --- ppdc/Makefile | 2 -- 1 file changed, 2 deletions(-) @@ -23,9 +25,9 @@ index 68bf6b2..d57a0c9 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile @@ -242,8 +242,6 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ - libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ - $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) + $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \ + libcupsppdc.a $(LINKCUPSSTATIC) + $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ - echo Generating localization strings... - ./genstrings >sample.c diff --git a/buildroot/package/cups/0004-Remove-PIE-flags-from-the-build.patch b/buildroot/package/cups/0004-Remove-PIE-flags-from-the-build.patch index ea4f0b4a5..8401e133e 100644 --- a/buildroot/package/cups/0004-Remove-PIE-flags-from-the-build.patch +++ b/buildroot/package/cups/0004-Remove-PIE-flags-from-the-build.patch @@ -11,6 +11,8 @@ solve this, we simply disable the PIE flags. Signed-off-by: Thomas Petazzoni Signed-off-by: Olivier Schonken +[Fabrice: updated for 2.3.0] +Signed-off-by: Fabrice Fontaine --- Makedefs.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -20,14 +22,14 @@ index 3afef0a..299b297 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -148,7 +148,7 @@ IPPFIND_BIN = @IPPFIND_BIN@ - IPPFIND_MAN = @IPPFIND_MAN@ - LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ - -L../scheduler @LDARCHFLAGS@ \ -- @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) -+ @LDFLAGS@ @RELROFLAGS@ $(OPTIM) - LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ) - LINKCUPSIMAGE = @LINKCUPSIMAGE@ - LIBS = $(LINKCUPS) $(COMMONLIBS) + $(ONDEMANDFLAGS) $(OPTIONS) + ALL_DSOFLAGS = -L../cups @ARCHFLAGS@ @RELROFLAGS@ $(DSOFLAGS) $(OPTIM) + ALL_LDFLAGS = -L../cups @LDARCHFLAGS@ @RELROFLAGS@ $(LDFLAGS) \ +- @PIEFLAGS@ $(OPTIM) ++ $(OPTIM) + ARCHFLAGS = @ARCHFLAGS@ + ARFLAGS = @ARFLAGS@ + BACKLIBS = @BACKLIBS@ -- 2.7.4 diff --git a/buildroot/package/cups/cups.hash b/buildroot/package/cups/cups.hash index 676f664b7..8f037c642 100644 --- a/buildroot/package/cups/cups.hash +++ b/buildroot/package/cups/cups.hash @@ -1,3 +1,4 @@ # Locally calculated: -sha256 da375796e5e7ab6d31a853d0e5326486d41d10d42bbff9ec768b0cea85031b48 cups-2.2.13-source.tar.gz -sha256 6e0e0ffbde118aae709f7ef65590de9071e8b2cd322f84fd645c6b64f3cc452c LICENSE.txt +sha256 1bca9d89507e3f68cbc84482fe46ae8d5333af5bc2b9061347b2007182ac77ce cups-2.3.1-source.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 a5d616e6322a9cb1a971e18765025edfca4f3cd9c0eafc32d6d2eb4b8c8787b5 NOTICE diff --git a/buildroot/package/cups/cups.mk b/buildroot/package/cups/cups.mk index 904a55f1e..18f01d848 100644 --- a/buildroot/package/cups/cups.mk +++ b/buildroot/package/cups/cups.mk @@ -4,25 +4,21 @@ # ################################################################################ -CUPS_VERSION = 2.2.13 +CUPS_VERSION = 2.3.1 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION) -CUPS_LICENSE = GPL-2.0, LGPL-2.0 -CUPS_LICENSE_FILES = LICENSE.txt +CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception +CUPS_LICENSE_FILES = LICENSE NOTICE CUPS_INSTALL_STAGING = YES -CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install -CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install # Using autoconf, not autoheader, so we cannot use AUTORECONF = YES. define CUPS_RUN_AUTOCONF - cd $(@D); $(HOST_DIR)/bin/autoconf -f + cd $(@D); $(AUTOCONF) -f endef CUPS_PRE_CONFIGURE_HOOKS += CUPS_RUN_AUTOCONF CUPS_CONF_OPTS = \ - --without-perl \ - --without-java \ - --without-php \ + --with-docdir=/usr/share/cups/doc-root \ --disable-gssapi \ --disable-pam \ --libdir=/usr/lib @@ -54,13 +50,6 @@ else CUPS_CONF_OPTS += --disable-gnutls endif -ifeq ($(BR2_PACKAGE_PYTHON),y) -CUPS_CONF_OPTS += --with-python -CUPS_DEPENDENCIES += python -else -CUPS_CONF_OPTS += --without-python -endif - ifeq ($(BR2_PACKAGE_LIBUSB),y) CUPS_CONF_OPTS += --enable-libusb CUPS_DEPENDENCIES += libusb diff --git a/buildroot/package/curlftpfs/curlftpfs.hash b/buildroot/package/curlftpfs/curlftpfs.hash index a94fab123..8413c1e10 100644 --- a/buildroot/package/curlftpfs/curlftpfs.hash +++ b/buildroot/package/curlftpfs/curlftpfs.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958 curlftpfs-0.9.2.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/cutelyst/cutelyst.hash b/buildroot/package/cutelyst/cutelyst.hash index 87506ab90..e9c116196 100644 --- a/buildroot/package/cutelyst/cutelyst.hash +++ b/buildroot/package/cutelyst/cutelyst.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 f87c2f04b148a50f5df13aa5d75b45bf20e56be2e2cd6e17c2aef5231db4b467 cutelyst-2.7.0.tar.gz +sha256 5036378d0d8242da68f61bc2f51fc37b881b720311073b6f6cfb113cbae18a40 cutelyst-2.9.0.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/cutelyst/cutelyst.mk b/buildroot/package/cutelyst/cutelyst.mk index 42a317e76..709d9443c 100644 --- a/buildroot/package/cutelyst/cutelyst.mk +++ b/buildroot/package/cutelyst/cutelyst.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUTELYST_VERSION = 2.7.0 +CUTELYST_VERSION = 2.9.0 CUTELYST_SITE = https://github.com/cutelyst/cutelyst/archive/v$(CUTELYST_VERSION) CUTELYST_INSTALL_STAGING = YES CUTELYST_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/buildroot/package/cwiid/Config.in b/buildroot/package/cwiid/Config.in index 50c05ebd9..9dab5d107 100644 --- a/buildroot/package/cwiid/Config.in +++ b/buildroot/package/cwiid/Config.in @@ -1,10 +1,12 @@ config BR2_PACKAGE_CWIID bool "cwiid" - depends on !BR2_STATIC_LIBS # bluez_utils - depends on BR2_USE_WCHAR # bluez_utils -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> dbus, alsa-lib, libglib2 - depends on BR2_USE_MMU # bluez_utils -> dbus, libglib2 - select BR2_PACKAGE_BLUEZ_UTILS + depends on !BR2_STATIC_LIBS # bluez5_utils + depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, alsa-lib, libglib2 + depends on BR2_USE_MMU # bluez5_utils -> dbus, libglib2 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils + select BR2_PACKAGE_BLUEZ5_UTILS help A collection of Linux tools written in C for interfacing to the Nintendo Wiimote. @@ -14,7 +16,8 @@ config BR2_PACKAGE_CWIID if BR2_PACKAGE_CWIID config BR2_PACKAGE_CWIID_WMGUI bool "wmgui" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk3 -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz depends on BR2_PACKAGE_XORG7 # libgtk2 depends on BR2_USE_WCHAR # libgtk2 -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 @@ -24,6 +27,9 @@ config BR2_PACKAGE_CWIID_WMGUI select BR2_PACKAGE_LIBGTK2 endif -comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar" - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS +comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.4" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 depends on !BR2_USE_MMU diff --git a/buildroot/package/cwiid/cwiid.mk b/buildroot/package/cwiid/cwiid.mk index c092e401d..a11c56c0a 100644 --- a/buildroot/package/cwiid/cwiid.mk +++ b/buildroot/package/cwiid/cwiid.mk @@ -12,7 +12,7 @@ CWIID_LICENSE_FILES = COPYING CWIID_AUTORECONF = YES CWIID_INSTALL_STAGING = YES -CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex bluez_utils +CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex bluez5_utils # Disable python support. This disables the 2 following things: # - wminput Python plugin support diff --git a/buildroot/package/czmq/0001-configure.ac-remove-Werror.patch b/buildroot/package/czmq/0001-configure.ac-remove-Werror.patch deleted file mode 100644 index 7f2dae2c2..000000000 --- a/buildroot/package/czmq/0001-configure.ac-remove-Werror.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9a195dc573f4eed130773e6ef67efd5f71693e97 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 5 Nov 2016 15:33:57 +0100 -Subject: [PATCH] configure.ac: remove -Werror - --Werror shouldn't be used in releases, as it can break the build with -newer versions of the compiler or the C library, when new warnings -are introduced. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e92970a..2fd551a 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -344,7 +344,7 @@ AC_C_BIGENDIAN - - # These options are GNU compiler specific. - if test "x$GCC" = "xyes"; then -- CPPFLAGS="-pedantic -Werror -Wall -Wc++-compat ${CPPFLAGS}" -+ CPPFLAGS="-pedantic -Wall -Wc++-compat ${CPPFLAGS}" - fi - - AM_CONDITIONAL(ENABLE_SHARED, test "x$enable_shared" = "xyes") --- -2.7.4 - diff --git a/buildroot/package/czmq/czmq.hash b/buildroot/package/czmq/czmq.hash index c42525c78..4738c9c43 100644 --- a/buildroot/package/czmq/czmq.hash +++ b/buildroot/package/czmq/czmq.hash @@ -1,6 +1,6 @@ # From https://github.com/zeromq/czmq/releases -md5 6d3a6fdd25c2bb29897c53670dce97bf czmq-4.1.1.tar.gz -sha1 629d34e8b5c1f2dd88689350f71f9917a8d76f23 czmq-4.1.1.tar.gz +md5 7e09997db6ac3b25e8ed104053040722 czmq-4.2.0.tar.gz +sha1 42165b3eede517708814e5a1b6972d8bde417f7a czmq-4.2.0.tar.gz # Locally calculated -sha256 f00ff419881dc2a05d0686c8467cd89b4882677fc56f31c0e2cc81c134cbb0c0 czmq-4.1.1.tar.gz -sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 LICENCE +sha256 cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb czmq-4.2.0.tar.gz +sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 LICENSE diff --git a/buildroot/package/czmq/czmq.mk b/buildroot/package/czmq/czmq.mk index 6eb931420..1c9493cb7 100644 --- a/buildroot/package/czmq/czmq.mk +++ b/buildroot/package/czmq/czmq.mk @@ -4,18 +4,14 @@ # ################################################################################ -CZMQ_VERSION = 4.1.1 +CZMQ_VERSION = 4.2.0 CZMQ_SITE = https://github.com/zeromq/czmq/releases/download/v$(CZMQ_VERSION) -# 0001-configure.ac-remove-Werror.patch touches configure.ac -CZMQ_AUTORECONF = YES CZMQ_INSTALL_STAGING = YES CZMQ_DEPENDENCIES = zeromq host-pkgconf CZMQ_LICENSE = MPL-2.0 CZMQ_LICENSE_FILES = LICENSE -# asciidoc is a python script that imports unicodedata, which is not in -# host-python, so disable asciidoc entirely. -CZMQ_CONF_ENV = ac_cv_prog_czmq_have_asciidoc=no +CZMQ_CONF_OPTS = --disable-Werror --without-docs $(eval $(autotools-package)) diff --git a/buildroot/package/dacapo/Config.in b/buildroot/package/dacapo/Config.in new file mode 100644 index 000000000..02dcab9e7 --- /dev/null +++ b/buildroot/package/dacapo/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_DACAPO + bool "dacapo" + depends on BR2_PACKAGE_OPENJDK + help + The DaCapo benchmark suite is intended as a tool for Java + benchmarking by the programming language, memory + management and computer architecture communities. + + http://dacapobench.org/ + +comment "dacapo needs OpenJDK" + depends on !BR2_PACKAGE_OPENJDK diff --git a/buildroot/package/dacapo/dacapo.hash b/buildroot/package/dacapo/dacapo.hash new file mode 100644 index 000000000..ca7ad4638 --- /dev/null +++ b/buildroot/package/dacapo/dacapo.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 be3db084adcb2867760e1197b3ccf541c3213d918daa19386d8e236648d24be8 dacapo-9.12-MR1-bach.jar +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/dacapo/dacapo.mk b/buildroot/package/dacapo/dacapo.mk new file mode 100644 index 000000000..3c5df6d28 --- /dev/null +++ b/buildroot/package/dacapo/dacapo.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# dacapo +# +################################################################################ + +DACAPO_VERSION = 9.12-MR1-bach +DACAPO_SOURCE = dacapo-$(DACAPO_VERSION).jar +DACAPO_SITE = http://sourceforge.net/projects/dacapobench/files/9.12-bach-MR1 +DACAPO_LICENSE = Apache-2.0 +DACAPO_LICENSE_FILES = LICENSE + +define DACAPO_EXTRACT_CMDS + unzip $(DACAPO_DL_DIR)/$(DACAPO_SOURCE) LICENSE -d $(@D) +endef + +define DACAPO_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(DACAPO_DL_DIR)/$(DACAPO_SOURCE) $(TARGET_DIR)/usr/bin/$(DACAPO_SOURCE) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/daemon/daemon.hash b/buildroot/package/daemon/daemon.hash index 32308ea3f..ad8637ee8 100644 --- a/buildroot/package/daemon/daemon.hash +++ b/buildroot/package/daemon/daemon.hash @@ -1,3 +1,4 @@ # md5 from http://www.libslack.org/daemon/; sha256 locally calculated md5 6cd0a28630a29ac279bc501f39baec66 daemon-0.6.4.tar.gz sha256 c4b9ea4aa74d55ea618c34f1e02c080ddf368549037cb239ee60c83191035ca1 daemon-0.6.4.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/buildroot/package/dante/0002-compiler.m4-do-not-remove-g-flag.patch b/buildroot/package/dante/0002-compiler.m4-do-not-remove-g-flag.patch deleted file mode 100644 index 0b41de619..000000000 --- a/buildroot/package/dante/0002-compiler.m4-do-not-remove-g-flag.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c00e284dd2baa5ecdb0c9586044399cd7cacce3e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 8 Aug 2016 12:31:40 +0200 -Subject: [PATCH] compiler.m4: do not remove -g flag - -A sed expression such as 's/-g//' not only removes the -g -debugging-related flag, but also turns more specific flags such as --mfloat-gprs=double into -mfloatprs=double, which is no longer a valid -flag. - -However, it turns out that removing -g is not necessary: having -g0 -after -g negates the -g, and having -ggdb after -g is enough to produce -debugging information for GDB. - -Signed-off-by: Thomas Petazzoni ---- - compiler.m4 | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/compiler.m4 b/compiler.m4 -index 3a23406..621372c 100644 ---- a/compiler.m4 -+++ b/compiler.m4 -@@ -378,15 +378,9 @@ else - gcc) - if test x"$aixldbug" != x; then - #disable debug info -- if echo $CFLAGS | grep -- "-g" >/dev/null; then -- CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`" -- fi - CFLAGS="$CFLAGS${CFLAGS:+ }-g0" - else - #use -ggdb also when not debugging -- if echo $CFLAGS | grep -- "-g" >/dev/null; then -- CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`" -- fi - CFLAGS="$CFLAGS${CFLAGS:+ }-ggdb" - fi - ;; --- -2.7.4 - diff --git a/buildroot/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch b/buildroot/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch new file mode 100644 index 000000000..af23d46d1 --- /dev/null +++ b/buildroot/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch @@ -0,0 +1,35 @@ +osdep.m4: Remove getaddrinfo() too low checks + +dante runs AC_PREPROC_IFELSE then it fills $ERRVALFILE by running the +following command: + +cat conftest.i | grep gaierrval: >>$2 + +As a result, $ERRVALFILE does not contain the expected values because +the expected value is not on the same line than gaierrval: + + gaierrval: + # 130 "conftest.c" 3 4 + -3 + +So drop these checks + +Signed-off-by: Fabrice Fontaine + +diff -Nuar dante-1.4.2-orig/osdep.m4 dante-1.4.2/osdep.m4 +--- dante-1.4.2-orig/osdep.m4 2019-12-09 21:28:38.936003218 +0100 ++++ dante-1.4.2/osdep.m4 2019-12-09 21:49:48.764019371 +0100 +@@ -956,13 +956,7 @@ + unset UNIQUEVALS UNIQUESYMBOLS + if test -s $ERRVALFILE; then + UNIQUEVALS=`sort $ERRVALFILE | uniq | wc -l | awk '{ print $1 }'` +- if test $UNIQUEVALS -le 1; then +- AC_MSG_FAILURE([error: getaddrinfo() error value count too low]) +- fi + UNIQUESYMBOLS=`cat $ERRVALFILE | wc -l | awk '{ print $1 }'` +- if test $UNIQUESYMBOLS -le 1; then +- AC_MSG_FAILURE([error: getaddrinfo() error symbol count too low]) +- fi + + if test $ERRNOCNT -ne $UNIQUESYMBOLS; then + AC_MSG_FAILURE([internal error: errno symbol count mismatch]) diff --git a/buildroot/package/dante/dante.hash b/buildroot/package/dante/dante.hash index 38dea61b0..cb87cdc04 100644 --- a/buildroot/package/dante/dante.hash +++ b/buildroot/package/dante/dante.hash @@ -1,2 +1,5 @@ -# Locally computed -sha256 b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53 dante-1.4.1.tar.gz +# From https://www.inet.no/dante/download.html +sha256 4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7 dante-1.4.2.tar.gz + +# Hash for license file +sha256 954ab6dbcf994711e28e603d8657d6eceef333cd6f9ca6705f0e9d118ab7d69a LICENSE diff --git a/buildroot/package/dante/dante.mk b/buildroot/package/dante/dante.mk index 0668042bd..6e950b119 100644 --- a/buildroot/package/dante/dante.mk +++ b/buildroot/package/dante/dante.mk @@ -4,16 +4,23 @@ # ################################################################################ -DANTE_VERSION = 1.4.1 +DANTE_VERSION = 1.4.2 DANTE_SITE = http://www.inet.no/dante/files DANTE_LICENSE = BSD-3-Clause DANTE_LICENSE_FILES = LICENSE -# 0002-compiler.m4-do-not-remove-g-flag.patch touches a m4 file +# Needed so that our libtool patch applies properly DANTE_AUTORECONF = YES DANTE_CONF_OPTS += --disable-client --disable-preload +ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y) +DANTE_DEPENDENCIES += libminiupnpc +DANTE_CONF_OPTS += --with-upnp +else +DANTE_CONF_OPTS += --without-upnp +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) DANTE_DEPENDENCIES += linux-pam DANTE_CONF_OPTS += --with-pam diff --git a/buildroot/package/darkhttpd/darkhttpd.mk b/buildroot/package/darkhttpd/darkhttpd.mk index df8089937..f4831a942 100644 --- a/buildroot/package/darkhttpd/darkhttpd.mk +++ b/buildroot/package/darkhttpd/darkhttpd.mk @@ -21,9 +21,6 @@ endef define DARKHTTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/darkhttpd/darkhttpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/darkhttpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/darkhttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/darkhttpd.service endef define DARKHTTPD_INSTALL_INIT_SYSV diff --git a/buildroot/package/dav1d/Config.in b/buildroot/package/dav1d/Config.in new file mode 100644 index 000000000..00d2fd17f --- /dev/null +++ b/buildroot/package/dav1d/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_DAV1D + bool "dav1d" + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + help + dav1d is a new AV1 cross-platform decoder, open-source, and + focused on speed and correctness. + + https://code.videolan.org/videolan/dav1d + +comment "dav1d needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/dav1d/dav1d.hash b/buildroot/package/dav1d/dav1d.hash new file mode 100644 index 000000000..a2f2ea4df --- /dev/null +++ b/buildroot/package/dav1d/dav1d.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 1780199d71e62a82ca1bfca2d71da5c599c7e1edc68c72f6fc3c0c25ce1880b7 dav1d-0.5.2.tar.bz2 +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/buildroot/package/dav1d/dav1d.mk b/buildroot/package/dav1d/dav1d.mk new file mode 100644 index 000000000..150c40f09 --- /dev/null +++ b/buildroot/package/dav1d/dav1d.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# dav1d +# +################################################################################ + +DAV1D_VERSION = 0.5.2 +DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 +DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) +DAV1D_LICENSE = BSD-2-Clause +DAV1D_LICENSE_FILES = COPYING +DAV1D_INSTALL_STAGING = YES +DAV1D_CONF_OPTS = \ + -Denable_tests=false \ + -Denable_tools=false + +ifeq ($(BR2_i386)$(BR2_x86_64),y) +DAV1D_DEPENDENCIES += host-nasm +endif + +# ARM assembly requires v6+ ISA +ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV7M),y) +DAV1D_CONF_OPTS += -Denable_asm=false +endif + +# Uses __atomic_fetch_add_4 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +DAV1D_LDFLAGS += -latomic +endif + +$(eval $(meson-package)) diff --git a/buildroot/package/davici/davici.hash b/buildroot/package/davici/davici.hash index 257e902ce..178d87f2e 100644 --- a/buildroot/package/davici/davici.hash +++ b/buildroot/package/davici/davici.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d3e5e806ecca841d7e133a3df768062df59f4b4c76bf98e0f90aa8064721b3bd davici-v1.3.tar.gz +sha256 d3e5e806ecca841d7e133a3df768062df59f4b4c76bf98e0f90aa8064721b3bd davici-1.3.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/davici/davici.mk b/buildroot/package/davici/davici.mk index 5c4b9774e..5c08bbe0d 100644 --- a/buildroot/package/davici/davici.mk +++ b/buildroot/package/davici/davici.mk @@ -4,17 +4,12 @@ # ################################################################################ -DAVICI_VERSION = v1.3 -DAVICI_SITE = $(call github,strongswan,davici,$(DAVICI_VERSION)) +DAVICI_VERSION = 1.3 +DAVICI_SITE = $(call github,strongswan,davici,v$(DAVICI_VERSION)) DAVICI_LICENSE = LGPL-2.1+ DAVICI_LICENSE_FILES = COPYING DAVICI_DEPENDENCIES = strongswan DAVICI_INSTALL_STAGING = YES DAVICI_AUTORECONF = YES -define DAVICI_CREATE_M4 - mkdir -p $(@D)/m4 -endef -DAVICI_POST_PATCH_HOOKS += DAVICI_CREATE_M4 - $(eval $(autotools-package)) diff --git a/buildroot/package/dawgdic/dawgdic.hash b/buildroot/package/dawgdic/dawgdic.hash index da03f0b86..ecf3cf954 100644 --- a/buildroot/package/dawgdic/dawgdic.hash +++ b/buildroot/package/dawgdic/dawgdic.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 54622a3e79ff3ad2c01a830ec52b997b42ead468b18af5acebab3a4ff32a5ad6 dawgdic-16ac537ba9883ff01b63b6d1fdc3072150c68fee.tar.gz +sha256 54622a3e79ff3ad2c01a830ec52b997b42ead468b18af5acebab3a4ff32a5ad6 dawgdic-16ac537ba9883ff01b63b6d1fdc3072150c68fee.tar.gz +sha256 3059f68686f1c5bc6ed0e9db415fc257c4e7618b6ac58ecce83986eb8a7cf501 COPYING diff --git a/buildroot/package/dbus-cpp/dbus-cpp.hash b/buildroot/package/dbus-cpp/dbus-cpp.hash index b3fc3efd3..957698b48 100644 --- a/buildroot/package/dbus-cpp/dbus-cpp.hash +++ b/buildroot/package/dbus-cpp/dbus-cpp.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 bc11ac297b3cb010be904c72789695543ee3fdf3d75cdc8225fd371385af4e61 libdbus-c++-0.9.0.tar.gz +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/dbus-glib/dbus-glib.hash b/buildroot/package/dbus-glib/dbus-glib.hash index 8a80b71b4..098832431 100644 --- a/buildroot/package/dbus-glib/dbus-glib.hash +++ b/buildroot/package/dbus-glib/dbus-glib.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature sha256 7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825 dbus-glib-0.110.tar.gz + +# Locally calculated +sha256 ef1634fc21d9112dca08f2557313584719d534d05213cf14f3c77938506266b4 COPYING diff --git a/buildroot/package/dbus-python/Config.in b/buildroot/package/dbus-python/Config.in index 332726348..4bfb59ed9 100644 --- a/buildroot/package/dbus-python/Config.in +++ b/buildroot/package/dbus-python/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_DBUS_PYTHON depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_PACKAGE_DBUS depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_DBUS_GLIB + select BR2_PACKAGE_LIBGLIB2 # pyexpat: runtime dependency only select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 diff --git a/buildroot/package/dbus-python/Config.in.host b/buildroot/package/dbus-python/Config.in.host new file mode 100644 index 000000000..1e30e0a7f --- /dev/null +++ b/buildroot/package/dbus-python/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_DBUS_PYTHON + bool "host dbus-python" + help + Python bindings for D-Bus + + http://dbus.freedesktop.org/doc/dbus-python/ diff --git a/buildroot/package/dbus-python/dbus-python.hash b/buildroot/package/dbus-python/dbus-python.hash index 991bb4278..58b0a7590 100644 --- a/buildroot/package/dbus-python/dbus-python.hash +++ b/buildroot/package/dbus-python/dbus-python.hash @@ -1,2 +1,6 @@ # Locally calculated after checking pgp signature -sha256 abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f dbus-python-1.2.8.tar.gz +sha256 cdd4de2c4f5e58f287b12013ed7b41dee81d503c8d0d2397c5bd2fb01badf260 dbus-python-1.2.12.tar.gz + +# Locally calculated +sha256 1e4562245383fdb5203b1769789e5b28bba21af4923aea7e8b2614f7f93623c0 COPYING +sha256 064523e3ab64d6f03904132b2cc4a1bd8500586edb4cd050c2ff2b96aed4c33b dbus-gmain/COPYING diff --git a/buildroot/package/dbus-python/dbus-python.mk b/buildroot/package/dbus-python/dbus-python.mk index d6af7454a..cf4882d8e 100644 --- a/buildroot/package/dbus-python/dbus-python.mk +++ b/buildroot/package/dbus-python/dbus-python.mk @@ -4,13 +4,13 @@ # ################################################################################ -DBUS_PYTHON_VERSION = 1.2.8 +DBUS_PYTHON_VERSION = 1.2.12 DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python DBUS_PYTHON_INSTALL_STAGING = YES -DBUS_PYTHON_LICENSE = MIT -DBUS_PYTHON_LICENSE_FILES = COPYING -DBUS_PYTHON_DEPENDENCIES = dbus-glib -DBUS_PYTHON_CONF_OPTS = --disable-html-docs --disable-api-docs +DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain) +DBUS_PYTHON_LICENSE_FILES = COPYING dbus-gmain/COPYING +DBUS_PYTHON_DEPENDENCIES = dbus libglib2 +HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 ifeq ($(BR2_PACKAGE_PYTHON),y) DBUS_PYTHON_DEPENDENCIES += python host-python @@ -19,13 +19,30 @@ DBUS_PYTHON_CONF_ENV += \ PYTHON=$(HOST_DIR)/bin/python2 \ PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`" + +HOST_DBUS_PYTHON_DEPENDENCIES += host-python + +HOST_DBUS_PYTHON_CONF_ENV += \ + PYTHON=$(HOST_DIR)/bin/python2 \ + PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python2-config --includes`" \ + PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python2-config --ldflags`" else DBUS_PYTHON_DEPENDENCIES += python3 host-python3 DBUS_PYTHON_CONF_ENV += \ PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ - PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" + PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ + PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" + +HOST_DBUS_PYTHON_DEPENDENCIES += host-python3 + +HOST_DBUS_PYTHON_CONF_ENV += \ + PYTHON=$(HOST_DIR)/bin/python3 \ + PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python3-config --includes`" \ + PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" \ + PYTHON_EXTRA_LIBS="`$(HOST_DIR)/usr/bin/python3-config --libs --embed`" endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/dbus-triggerd/dbus-triggerd.hash b/buildroot/package/dbus-triggerd/dbus-triggerd.hash index aa4ad9791..b7ed89abf 100644 --- a/buildroot/package/dbus-triggerd/dbus-triggerd.hash +++ b/buildroot/package/dbus-triggerd/dbus-triggerd.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 3c6d865427bf1b93b16323c796ed6957ce6b2b6fd53f518b1b082d03b939102c dbus-triggerd-ba3dbec805cb707c94c54de21666bf18b79bcc09.tar.gz +sha256 3c6d865427bf1b93b16323c796ed6957ce6b2b6fd53f518b1b082d03b939102c dbus-triggerd-ba3dbec805cb707c94c54de21666bf18b79bcc09.tar.gz +sha256 30d135650639af9019633690fc1aecbfc150aeeef9446347d4286a58338d10b0 dbus-triggerd.c diff --git a/buildroot/package/dc3dd/dc3dd.hash b/buildroot/package/dc3dd/dc3dd.hash index 5490d8d3f..670bffa7a 100644 --- a/buildroot/package/dc3dd/dc3dd.hash +++ b/buildroot/package/dc3dd/dc3dd.hash @@ -1,4 +1,5 @@ # From https://sourceforge.net/projects/dc3dd/files/dc3dd/7.2/ sha1 1bfe81a921a8473a6ecb46f328ecaab761afb55d dc3dd-7.2.641.tar.xz # Locally computed -sha256 7f50aadc38649845ab11014d11013928411c9d2128c941e9630939d4c28cae6d dc3dd-7.2.641.tar.xz +sha256 7f50aadc38649845ab11014d11013928411c9d2128c941e9630939d4c28cae6d dc3dd-7.2.641.tar.xz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch b/buildroot/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch new file mode 100644 index 000000000..c838063e0 --- /dev/null +++ b/buildroot/package/dcron/0001-main.c-add-newline-to-logfile-openning-error-message.patch @@ -0,0 +1,26 @@ +From 2710bc67cd920323da9b23a3d60193577bd43d71 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sat, 20 Jul 2019 00:27:31 -0300 +Subject: [PATCH] main.c: add newline to logfile openning error message + +Signed-off-by: Carlos Santos +--- + main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main.c b/main.c +index 0eba280..2606db8 100644 +--- a/main.c ++++ b/main.c +@@ -261,7 +261,7 @@ main(int ac, char **av) + dup2(fd, 2); + } else { + int n = errno; +- fdprintf(2, "failed to open logfile '%s', reason: %s", LogFile, strerror(n)); ++ fdprintf(2, "failed to open logfile '%s', reason: %s\n", LogFile, strerror(n)); + exit(n); + } + } +-- +2.18.1 + diff --git a/buildroot/package/dcron/dcron.mk b/buildroot/package/dcron/dcron.mk index 2ee0709af..51ebb1874 100644 --- a/buildroot/package/dcron/dcron.mk +++ b/buildroot/package/dcron/dcron.mk @@ -31,9 +31,6 @@ endef define DCRON_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/dcron/dcron.service \ $(TARGET_DIR)/usr/lib/systemd/system/dcron.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/dcron.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dcron.service endef $(eval $(generic-package)) diff --git a/buildroot/package/ddrescue/0001-io.cc-add-stdio.h-include.patch b/buildroot/package/ddrescue/0001-io.cc-add-stdio.h-include.patch deleted file mode 100644 index e719c708e..000000000 --- a/buildroot/package/ddrescue/0001-io.cc-add-stdio.h-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0f72787b922c53c33d497b17300a959b911e621f Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Tue, 14 Feb 2017 20:12:05 +0100 -Subject: [PATCH] io.cc: add stdio.h include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes buildroot compile failure with uclibc [1]: - - In file included from io.cc:28:0: - block.h:219:22: error: ‘FILE’ has not been declared - int write_mapfile( FILE * f = 0, const bool timestamp = false, - -[1] http://autobuild.buildroot.net/results/4ac0754f1cc5ea934d6437e89d1f4906fb3fd0a8 - -Signed-off-by: Peter Seiderer ---- - io.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/io.cc b/io.cc -index 36b8341..2d6a76e 100644 ---- a/io.cc -+++ b/io.cc -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - - #include "block.h" --- -2.11.0 - diff --git a/buildroot/package/ddrescue/ddrescue.hash b/buildroot/package/ddrescue/ddrescue.hash index bffa6153f..ae370acbc 100644 --- a/buildroot/package/ddrescue/ddrescue.hash +++ b/buildroot/package/ddrescue/ddrescue.hash @@ -1,2 +1,4 @@ -# From http://lists.gnu.org/archive/html/info-gnu/2017-02/msg00003.html -sha1 df981672a612639ad0934e3fa6546a41d2feb99e ddrescue-1.22.tar.lz +# From https://lists.gnu.org/archive/html/info-gnu/2019-02/msg00012.html +sha256 4b5d3feede70e3657ca6b3c7844f23131851cbb6af0cecc9721500f7d7021087 ddrescue-1.24.tar.lz +# Locally computed +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/buildroot/package/ddrescue/ddrescue.mk b/buildroot/package/ddrescue/ddrescue.mk index b7564d597..4e0317913 100644 --- a/buildroot/package/ddrescue/ddrescue.mk +++ b/buildroot/package/ddrescue/ddrescue.mk @@ -4,7 +4,7 @@ # ################################################################################ -DDRESCUE_VERSION = 1.22 +DDRESCUE_VERSION = 1.24 DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue DDRESCUE_LICENSE = GPL-2.0+ diff --git a/buildroot/package/debianutils/debianutils.hash b/buildroot/package/debianutils/debianutils.hash index cd54e0b8b..e07f405ee 100644 --- a/buildroot/package/debianutils/debianutils.hash +++ b/buildroot/package/debianutils/debianutils.hash @@ -1,2 +1,4 @@ -# From http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_4.8.1.dsc -sha256 2c395c0bdcfe89de30828b1d25cc5549ded5225a6d3625fbcb2cc0881ef5f026 debianutils_4.8.1.tar.xz +# From http://snapshot.debian.org/archive/debian/20190828T161440Z/pool/main/d/debianutils/debianutils_4.8.6.3.dsc +sha256 2cc7de3afc6df1cf6d00af9938efac7ee8f739228e548e512ddc186b6a7be221 debianutils_4.8.6.3.tar.xz +# Locally calculated +sha256 a8698f078cd21fc501e66d070e12cf2f23ec1eaf5841bbc87629de76858ef7a7 debian/copyright diff --git a/buildroot/package/debianutils/debianutils.mk b/buildroot/package/debianutils/debianutils.mk index 189d98373..a91383c17 100644 --- a/buildroot/package/debianutils/debianutils.mk +++ b/buildroot/package/debianutils/debianutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -DEBIANUTILS_VERSION = 4.8.1 +DEBIANUTILS_VERSION = 4.8.6.3 DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.xz -DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20161118T033019Z/pool/main/d/debianutils +DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20190828T161440Z/pool/main/d/debianutils DEBIANUTILS_CONF_OPTS = --exec-prefix=/ DEBIANUTILS_LICENSE = GPL-2.0+, SMAIL (savelog) DEBIANUTILS_LICENSE_FILES = debian/copyright diff --git a/buildroot/package/dehydrated/Config.in b/buildroot/package/dehydrated/Config.in index f14ae0f61..979938d70 100644 --- a/buildroot/package/dehydrated/Config.in +++ b/buildroot/package/dehydrated/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_DEHYDRATED select BR2_PACKAGE_BASH select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_CURL + select BR2_PACKAGE_LIBCURL_CURL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBOPENSSL_BIN if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBRESSL_BIN if BR2_PACKAGE_LIBRESSL diff --git a/buildroot/package/dejavu/dejavu.hash b/buildroot/package/dejavu/dejavu.hash index db7365a1c..def64cbe8 100644 --- a/buildroot/package/dejavu/dejavu.hash +++ b/buildroot/package/dejavu/dejavu.hash @@ -1,2 +1,5 @@ # From https://dejavu-fonts.github.io/Download.html -sha256 fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7 dejavu-fonts-ttf-2.37.tar.bz2 +sha256 fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7 dejavu-fonts-ttf-2.37.tar.bz2 + +# locally computed +sha256 7a083b136e64d064794c3419751e5c7dd10d2f64c108fe5ba161eae5e5958a93 LICENSE diff --git a/buildroot/package/devmem2/0001-be-coherent-in-type-usage.patch b/buildroot/package/devmem2/0001-be-coherent-in-type-usage.patch deleted file mode 100644 index 177738773..000000000 --- a/buildroot/package/devmem2/0001-be-coherent-in-type-usage.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 6570e7afe1eebd64022b871b9ebd9a76be267f57 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 29 Jun 2014 16:27:49 +0200 -Subject: [PATCH] Be coherent in type usage - -- no need to use off_t because it is read from strtoul() -- print unsigned int type correctly - -When built with _FILE_OFFSET_BITS=64, off_t becomes an long long int -and was printed as an unsigned int which lead to a garbled output. - -Signed-off-by: Colin Didier -Signed-off-by: Thomas Petazzoni ---- - devmem2.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/devmem2.c b/devmem2.c -index 7732ecb..7aa5c79 100644 ---- a/devmem2.c -+++ b/devmem2.c -@@ -58,8 +58,7 @@ - int main(int argc, char **argv) { - int fd; - void *map_base, *virt_addr; -- unsigned long read_result, writeval; -- off_t target; -+ unsigned long target, read_result, writeval; - int access_type = 'w'; - - if(argc < 2) { -@@ -101,7 +100,7 @@ int main(int argc, char **argv) { - fprintf(stderr, "Illegal data type '%c'.\n", access_type); - exit(2); - } -- printf("Value at address 0x%X (%p): 0x%X\n", target, virt_addr, read_result); -+ printf("Value at address 0x%lX (%p): 0x%X\n", target, virt_addr, read_result); - fflush(stdout); - - if(argc > 3) { -@@ -120,7 +119,7 @@ int main(int argc, char **argv) { - read_result = *((unsigned long *) virt_addr); - break; - } -- printf("Written 0x%X; readback 0x%X\n", writeval, read_result); -+ printf("Written 0x%lX; readback 0x%X\n", writeval, read_result); - fflush(stdout); - } - --- -2.0.0 - diff --git a/buildroot/package/devmem2/Config.in b/buildroot/package/devmem2/Config.in deleted file mode 100644 index 1ccb0553b..000000000 --- a/buildroot/package/devmem2/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_DEVMEM2 - bool "devmem2" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Simple program to read/write from/to any location in memory. - - http://bootlin.com/pub/mirror/devmem2.c diff --git a/buildroot/package/devmem2/devmem2.hash b/buildroot/package/devmem2/devmem2.hash deleted file mode 100644 index aa638d631..000000000 --- a/buildroot/package/devmem2/devmem2.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639 devmem2.c -sha256 560913d09310d446920c16bd0aca1ff21d3b6fedd527195bacfc832ce343e0ae devmem2.c.license diff --git a/buildroot/package/devmem2/devmem2.mk b/buildroot/package/devmem2/devmem2.mk deleted file mode 100644 index e1bbee3b7..000000000 --- a/buildroot/package/devmem2/devmem2.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# devmem2 -# -################################################################################ - -DEVMEM2_SITE = http://bootlin.com/pub/mirror -DEVMEM2_SOURCE = devmem2.c -DEVMEM2_VERSION = 1 -DEVMEM2_LICENSE = GPL-2.0+ -DEVMEM2_LICENSE_FILES = devmem2.c.license - -define DEVMEM2_EXTRACT_CMDS - cp $(DEVMEM2_DL_DIR)/$($(PKG)_SOURCE) $(@D)/ -endef - -define DEVMEM2_EXTRACT_LICENSE - head -n 38 $(@D)/devmem2.c >$(@D)/devmem2.c.license -endef -DEVMEM2_PRE_PATCH_HOOKS += DEVMEM2_EXTRACT_LICENSE - -define DEVMEM2_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) devmem2 -endef - -define DEVMEM2_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/devmem2 $(TARGET_DIR)/sbin/devmem2 -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/dfu-util/dfu-util.hash b/buildroot/package/dfu-util/dfu-util.hash index bf618d1ae..7c66a9337 100644 --- a/buildroot/package/dfu-util/dfu-util.hash +++ b/buildroot/package/dfu-util/dfu-util.hash @@ -3,3 +3,4 @@ md5 233bb1e08ef4b405062445d84e28fde6 dfu-util-0.9.tar.gz # Locally computed sha256 36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833 dfu-util-0.9.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/dhcp/0001-bind-cross-compile.patch b/buildroot/package/dhcp/0001-bind-cross-compile.patch deleted file mode 100644 index f7c42c6ce..000000000 --- a/buildroot/package/dhcp/0001-bind-cross-compile.patch +++ /dev/null @@ -1,24 +0,0 @@ -bind cross compile support integration - -Pass system types from dhcp configure to bind configure. - -This patch is submitted upstream as part of a cross compiling enhancement -suggestion to dhcp-suggest@isc.org. Reference ISC-Bugs #41502. - -Signed-off-by: Doug Kehn - -Index: dhcp-4.3.3-P1/bind/Makefile.in -=================================================================== ---- dhcp-4.3.3-P1.orig/bind/Makefile.in -+++ dhcp-4.3.3-P1/bind/Makefile.in -@@ -30,7 +30,9 @@ bindconfig = --disable-kqueue --disable- - --without-openssl --without-libxml2 --enable-exportlib \ - --with-gssapi=no --enable-threads=no @BINDCONFIG@ \ - --with-export-includedir=${binddir}/include \ -- --with-export-libdir=${binddir}/lib -+ --with-export-libdir=${binddir}/lib \ -+ --target=@target_alias@ --host=@host_alias@ \ -+ --build=@build_alias@ - - @BIND_ATF_FALSE@cleandirs = ./lib ./include - @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf diff --git a/buildroot/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch b/buildroot/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch new file mode 100644 index 000000000..b8b187f17 --- /dev/null +++ b/buildroot/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch @@ -0,0 +1,87 @@ +From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001 +From: Thomas Markwalder +Date: Fri, 14 Sep 2018 13:41:41 -0400 +Subject: [PATCH] [master] Added includes of new BIND9 compatibility headers, + updated util/bind.sh + + Merges in rt48072. +Signed-off-by: Fabrice Fontaine +[Retrieved (and updated to remvove bind.sh update) from: +https://gitlab.isc.org/isc-projects/dhcp/commit/8194daabfd590f17825f0c61e9534bee5c99cc86] +--- + includes/omapip/isclib.h | 3 +++ + includes/omapip/result.h | 1 + + server/dhcpv6.c | 13 +++++++++---- + 3 files changed, 39 insertions(+), 12 deletions(-) + +diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h +index 75a87ff6..538b927f 100644 +--- a/includes/omapip/isclib.h ++++ b/includes/omapip/isclib.h +@@ -48,6 +48,9 @@ + #include + #include + ++#include ++#include ++ + #include + #include + #include +diff --git a/includes/omapip/result.h b/includes/omapip/result.h +index 91243e1b..860298f6 100644 +--- a/includes/omapip/result.h ++++ b/includes/omapip/result.h +@@ -26,6 +26,7 @@ + #ifndef DHCP_RESULT_H + #define DHCP_RESULT_H 1 + ++#include + #include + #include + #include +diff --git a/server/dhcpv6.c b/server/dhcpv6.c +index a7110f98..cde4f617 100644 +--- a/server/dhcpv6.c ++++ b/server/dhcpv6.c +@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply, + shared_name, + inet_ntop(AF_INET6, &lease->addr, + tmp_addr, sizeof(tmp_addr)), +- used, count); ++ (long long unsigned)(used), ++ (long long unsigned)(count)); + } + return; + } +@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply, + "address: %s; high threshold %d%% %llu/%llu.", + shared_name, + inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)), +- poolhigh, used, count); ++ poolhigh, (long long unsigned)(used), ++ (long long unsigned)(count)); + + /* handle the low threshold now, if we don't + * have one we default to 0. */ +@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply) + log_debug("Unable to pick client address: " + "no addresses available - shared network %s: " + " 2^64-1 < total, %llu active, %llu abandoned", +- shared_name, active - abandoned, abandoned); ++ shared_name, (long long unsigned)(active - abandoned), ++ (long long unsigned)(abandoned)); + } else { + log_debug("Unable to pick client address: " + "no addresses available - shared network %s: " + "%llu total, %llu active, %llu abandoned", +- shared_name, total, active - abandoned, abandoned); ++ shared_name, (long long unsigned)(total), ++ (long long unsigned)(active - abandoned), ++ (long long unsigned)(abandoned)); + } + + return ISC_R_NORESOURCES; +-- +2.18.1 + diff --git a/buildroot/package/dhcp/0002-v4_3-Plugs-a-socket-descriptor-leak-in-OMAPI.patch b/buildroot/package/dhcp/0002-v4_3-Plugs-a-socket-descriptor-leak-in-OMAPI.patch deleted file mode 100644 index df294651f..000000000 --- a/buildroot/package/dhcp/0002-v4_3-Plugs-a-socket-descriptor-leak-in-OMAPI.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 5097bc0559f592683faac1f67bf350e1bddf6ed4 Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Thu, 7 Dec 2017 11:39:30 -0500 -Subject: [PATCH] [v4_3] Plugs a socket descriptor leak in OMAPI - - Merges in rt46767. - -[baruch: drop RELNOTES hunk] -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit 5097bc0559f - - omapip/buffer.c | 9 +++++++++ - omapip/message.c | 2 +- - -diff --git a/omapip/buffer.c b/omapip/buffer.c -index f7fdc3250e82..809034d1317b 100644 ---- a/omapip/buffer.c -+++ b/omapip/buffer.c -@@ -566,6 +566,15 @@ isc_result_t omapi_connection_writer (omapi_object_t *h) - omapi_buffer_dereference (&buffer, MDL); - } - } -+ -+ /* If we had data left to write when we're told to disconnect, -+ * we need recall disconnect, now that we're done writing. -+ * See rt46767. */ -+ if (c->out_bytes == 0 && c->state == omapi_connection_disconnecting) { -+ omapi_disconnect (h, 1); -+ return ISC_R_SHUTTINGDOWN; -+ } -+ - return ISC_R_SUCCESS; - } - -diff --git a/omapip/message.c b/omapip/message.c -index 59ccdc2c05cf..21bcfc3822e7 100644 ---- a/omapip/message.c -+++ b/omapip/message.c -@@ -339,7 +339,7 @@ isc_result_t omapi_message_unregister (omapi_object_t *mo) - } - - #ifdef DEBUG_PROTOCOL --static const char *omapi_message_op_name(int op) { -+const char *omapi_message_op_name(int op) { - switch (op) { - case OMAPI_OP_OPEN: return "OMAPI_OP_OPEN"; - case OMAPI_OP_REFRESH: return "OMAPI_OP_REFRESH"; --- -2.15.1 - diff --git a/buildroot/package/dhcp/0003-Correct-buffer-overrun-in-pretty_print_option.patch b/buildroot/package/dhcp/0003-Correct-buffer-overrun-in-pretty_print_option.patch deleted file mode 100644 index aad20ff93..000000000 --- a/buildroot/package/dhcp/0003-Correct-buffer-overrun-in-pretty_print_option.patch +++ /dev/null @@ -1,59 +0,0 @@ -From b8c29336bd5401a5f962bc6ddfa4ebb6f0274f3c Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Sat, 10 Feb 2018 12:15:27 -0500 -Subject: [PATCH 1/2] Correct buffer overrun in pretty_print_option - - Merges in rt47139. - -[baruch: drop RELNOTES and test; address CVE-2018-5732] -Signed-off-by: Baruch Siach ---- -Upstream status: backported from commit c5931725b48 ---- - common/options.c | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/common/options.c b/common/options.c -index 5547287fb6e5..2ed6b16c6412 100644 ---- a/common/options.c -+++ b/common/options.c -@@ -1758,7 +1758,8 @@ format_min_length(format, oc) - - - /* Format the specified option so that a human can easily read it. */ -- -+/* Maximum pretty printed size */ -+#define MAX_OUTPUT_SIZE 32*1024 - const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) - struct option *option; - const unsigned char *data; -@@ -1766,8 +1767,9 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) - int emit_commas; - int emit_quotes; - { -- static char optbuf [32768]; /* XXX */ -- static char *endbuf = &optbuf[sizeof(optbuf)]; -+ /* We add 128 byte pad so we don't have to add checks everywhere. */ -+ static char optbuf [MAX_OUTPUT_SIZE + 128]; /* XXX */ -+ static char *endbuf = optbuf + MAX_OUTPUT_SIZE; - int hunksize = 0; - int opthunk = 0; - int hunkinc = 0; -@@ -2193,7 +2195,14 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) - log_error ("Unexpected format code %c", - fmtbuf [j]); - } -+ - op += strlen (op); -+ if (op >= endbuf) { -+ log_error ("Option data exceeds" -+ " maximum size %d", MAX_OUTPUT_SIZE); -+ return (""); -+ } -+ - if (dp == data + len) - break; - if (j + 1 < numelem && comma != ':') --- -2.16.1 - diff --git a/buildroot/package/dhcp/0004-Corrected-refcnt-loss-in-option-parsing.patch b/buildroot/package/dhcp/0004-Corrected-refcnt-loss-in-option-parsing.patch deleted file mode 100644 index c79bbc7f8..000000000 --- a/buildroot/package/dhcp/0004-Corrected-refcnt-loss-in-option-parsing.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 93b5b67dd31b9efcbfaabc2df1e1d9d164a5e04a Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Fri, 9 Feb 2018 14:46:08 -0500 -Subject: [PATCH 2/2] Corrected refcnt loss in option parsing - - Merges in 47140. - -[baruch: drop RELNOTES and tests; address CVE-2018-5733] -Signed-off-by: Baruch Siach ---- -Upstream status: backported from commit 197b26f25309 ---- - common/options.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/common/options.c b/common/options.c -index 2ed6b16c6412..25b29a6be7bb 100644 ---- a/common/options.c -+++ b/common/options.c -@@ -3,7 +3,7 @@ - DHCP options parsing and reassembly. */ - - /* -- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC") -+ * Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1995-2003 by Internet Software Consortium - * - * Permission to use, copy, modify, and distribute this software for any -@@ -177,6 +177,8 @@ int parse_option_buffer (options, buffer, length, universe) - - /* If the length is outrageous, the options are bad. */ - if (offset + len > length) { -+ /* Avoid reference count overflow */ -+ option_dereference(&option, MDL); - reason = "option length exceeds option buffer length"; - bogus: - log_error("parse_option_buffer: malformed option " --- -2.16.1 - diff --git a/buildroot/package/dhcp/Config.in b/buildroot/package/dhcp/Config.in index 01d144c53..e6e70908d 100644 --- a/buildroot/package/dhcp/Config.in +++ b/buildroot/package/dhcp/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_DHCP # fork() depends on BR2_USE_MMU depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + select BR2_PACKAGE_BIND help DHCP relay agent from the ISC DHCP distribution. @@ -16,6 +17,10 @@ config BR2_PACKAGE_DHCP_SERVER help DHCP server from the ISC DHCP distribution. + This also installs omshell, an interactive tool to connect to, + query, and possibly change, the server's state via the Object + Management API (OMAPI). + config BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK bool "Enable delayed ACK feature" depends on BR2_PACKAGE_DHCP_SERVER diff --git a/buildroot/package/dhcp/dhcp.hash b/buildroot/package/dhcp/dhcp.hash index ce5f995a5..df07a3255 100644 --- a/buildroot/package/dhcp/dhcp.hash +++ b/buildroot/package/dhcp/dhcp.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/dhcp/4.3.6/dhcp-4.3.6.tar.gz.sha256.asc -sha256 a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b dhcp-4.3.6.tar.gz +# Verified from https://ftp.isc.org/isc/dhcp/4.4.1/dhcp-4.4.1.tar.gz.sha256.asc +sha256 2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608 dhcp-4.4.1.tar.gz # Locally calculated -sha256 dd7ae2201c0c11c3c1e2510d731c67b2f4bc8ba735707d7348ddd65f7b598562 LICENSE +sha256 18add1790d1ed47d6ef6f3ed5945aa0cb2f7785fa8bc7fd859f8ae2f9f78567d LICENSE diff --git a/buildroot/package/dhcp/dhcp.mk b/buildroot/package/dhcp/dhcp.mk index 7ea7589a2..518e8a468 100644 --- a/buildroot/package/dhcp/dhcp.mk +++ b/buildroot/package/dhcp/dhcp.mk @@ -4,17 +4,25 @@ # ################################################################################ -DHCP_VERSION = 4.3.6 +DHCP_VERSION = 4.4.1 DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES -DHCP_LICENSE = ISC +DHCP_LICENSE = MPL-2.0 DHCP_LICENSE_FILES = LICENSE +DHCP_DEPENDENCIES = bind + +# use libtool-enabled configure.ac +define DHCP_LIBTOOL_AUTORECONF + cp $(@D)/configure.ac+lt $(@D)/configure.ac +endef + DHCP_CONF_ENV = \ CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \ -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \ CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1' DHCP_CONF_OPTS = \ + --with-libbind=$(STAGING_DIR)/usr \ --with-randomdev=/dev/random \ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ @@ -27,38 +35,32 @@ DHCP_CONF_OPTS = \ --with-relay-pid-file=/var/run/dhcrelay.pid \ --with-relay6-pid-file=/var/run/dhcrelay6.pid -# The source for the bind libraries used by dhcp are embedded in the dhcp source -# as a tar-ball. Extract the bind source to allow any patches to be applied -# during the patch phase. -define DHCP_EXTRACT_BIND - cd $(@D)/bind; tar -xvf bind.tar.gz -endef -DHCP_POST_EXTRACT_HOOKS += DHCP_EXTRACT_BIND - -# The patchset requires configure et.al. to be regenerated. +ifeq ($(BR2_STATIC_LIBS),y) +DHCP_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/bind9-config --libs bind9`" +DHCP_CONF_OPTS += --disable-libtool +else +DHCP_POST_EXTRACT_HOOKS += DHCP_LIBTOOL_AUTORECONF DHCP_AUTORECONF = YES - -# bind does not support parallel builds. -DHCP_MAKE = $(MAKE1) - -# bind configure is called via dhcp make instead of dhcp configure. The make env -# needs extra values for bind configure. -DHCP_MAKE_ENV = \ - $(TARGET_CONFIGURE_OPTS) \ - BUILD_CC="$(HOSTCC)" \ - BUILD_CFLAGS="$(HOST_CFLAGS)" \ - BUILD_CPPFLAGS="$(HOST_CPPFLAGS)" \ - BUILD_LDFLAGS="$(HOST_LDFLAGS)" +DHCP_CONF_OPTS += --enable-libtool +endif ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y) DHCP_CONF_OPTS += --enable-delayed-ack endif +define DHCP_INSTALL_LIBS + $(MAKE) -C $(@D)/common install-exec DESTDIR=$(TARGET_DIR) + $(MAKE) -C $(@D)/omapip install-exec DESTDIR=$(TARGET_DIR) +endef + ifeq ($(BR2_PACKAGE_DHCP_SERVER),y) +define DHCP_INSTALL_CTL_LIBS + $(MAKE) -C $(@D)/dhcpctl install-exec DESTDIR=$(TARGET_DIR) +endef define DHCP_INSTALL_SERVER mkdir -p $(TARGET_DIR)/var/lib (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) - $(INSTALL) -m 0755 -D $(@D)/server/dhcpd $(TARGET_DIR)/usr/sbin/dhcpd + $(MAKE) -C $(@D)/server DESTDIR=$(TARGET_DIR) install-sbinPROGRAMS $(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf \ $(TARGET_DIR)/etc/dhcp/dhcpd.conf endef @@ -68,16 +70,15 @@ ifeq ($(BR2_PACKAGE_DHCP_RELAY),y) define DHCP_INSTALL_RELAY mkdir -p $(TARGET_DIR)/var/lib (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) - $(INSTALL) -m 0755 -D $(DHCP_DIR)/relay/dhcrelay \ - $(TARGET_DIR)/usr/sbin/dhcrelay + $(MAKE) -C $(@D)/relay DESTDIR=$(TARGET_DIR) install-sbinPROGRAMS endef endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) define DHCP_INSTALL_CLIENT mkdir -p $(TARGET_DIR)/var/lib/dhcp - $(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \ - $(TARGET_DIR)/sbin/dhclient + $(MAKE) -C $(@D)/client DESTDIR=$(TARGET_DIR) sbindir=/sbin \ + install-sbinPROGRAMS $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ $(TARGET_DIR)/etc/dhcp/dhclient.conf $(INSTALL) -m 0755 -D package/dhcp/dhclient-script \ @@ -98,11 +99,6 @@ define DHCP_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/dhcp/dhcpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/dhcpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf ../../../../usr/lib/systemd/system/dhcpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dhcpd.service - mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d echo "d /var/lib/dhcp 0755 - - - -" > \ $(TARGET_DIR)/usr/lib/tmpfiles.d/dhcpd.conf @@ -112,6 +108,8 @@ endef endif define DHCP_INSTALL_TARGET_CMDS + $(DHCP_INSTALL_LIBS) + $(DHCP_INSTALL_CTL_LIBS) $(DHCP_INSTALL_RELAY) $(DHCP_INSTALL_SERVER) $(DHCP_INSTALL_CLIENT) diff --git a/buildroot/package/dhcpcd/dhcpcd.hash b/buildroot/package/dhcpcd/dhcpcd.hash index 605e87609..c0d68036f 100644 --- a/buildroot/package/dhcpcd/dhcpcd.hash +++ b/buildroot/package/dhcpcd/dhcpcd.hash @@ -1,4 +1,4 @@ -# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-7.0.3.tar.xz.distinfo.asc -sha256 a255d9aecceb1c77a9862f1c0d31a48ba37aab5ef2ca5ad76fc7a907b6ea292e dhcpcd-7.0.3.tar.xz +# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-8.0.3.tar.xz.distinfo +sha256 9674971fcd5acd5a3401a0ad8eba7f0b816fec9abb4a2520332b4d8dae068f1d dhcpcd-8.0.3.tar.xz # Locally calculated -sha256 b120a64b92cfb2453b61df4457a3c0eb163ef9c1c397822826756a31581f3947 LICENSE +sha256 213fc1a704cecdb322276fa7c95891fd1c23137d9ab572af1fc5e91b48762303 LICENSE diff --git a/buildroot/package/dhcpcd/dhcpcd.mk b/buildroot/package/dhcpcd/dhcpcd.mk index ae16c340d..63dbbee86 100644 --- a/buildroot/package/dhcpcd/dhcpcd.mk +++ b/buildroot/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 7.0.3 +DHCPCD_VERSION = 8.0.3 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd DHCPCD_DEPENDENCIES = host-pkgconf @@ -48,9 +48,6 @@ endef define DHCPCD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/dhcpcd/dhcpcd.service \ $(TARGET_DIR)/usr/lib/systemd/system/dhcpcd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/dhcpcd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dhcpcd.service endef endif diff --git a/buildroot/package/dhcpdump/dhcpdump.hash b/buildroot/package/dhcpdump/dhcpdump.hash index 36040c8a5..358a6f01d 100644 --- a/buildroot/package/dhcpdump/dhcpdump.hash +++ b/buildroot/package/dhcpdump/dhcpdump.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 dhcpdump-1.8.tar.gz +sha256 bab6ca76b7e93885396513689b1248dfb0e8fd662695b8bd1b26784ef71a0192 LICENSE diff --git a/buildroot/package/dialog/dialog.hash b/buildroot/package/dialog/dialog.hash index ac4278469..e1768588d 100644 --- a/buildroot/package/dialog/dialog.hash +++ b/buildroot/package/dialog/dialog.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 2ff1ba74c632b9d13a0d0d2c942295dd4e8909694eeeded7908a467d0bcd4756 dialog-1.3-20170509.tgz +sha256 10f7c02ee5dea311e61b0d3e29eb6e18bcedd6fb6672411484c1a37729cbd7a6 dialog-1.3-20191210.tgz +# Locally computed +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/dialog/dialog.mk b/buildroot/package/dialog/dialog.mk index b1933b883..f3b66bae0 100644 --- a/buildroot/package/dialog/dialog.mk +++ b/buildroot/package/dialog/dialog.mk @@ -4,9 +4,9 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20170509 +DIALOG_VERSION = 1.3-20191210 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz -DIALOG_SITE = ftp://ftp.invisible-island.net/dialog +DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ --disable-rpath-hack DIALOG_DEPENDENCIES = host-pkgconf ncurses $(TARGET_NLS_DEPENDENCIES) diff --git a/buildroot/package/dieharder/dieharder.hash b/buildroot/package/dieharder/dieharder.hash index eefe4b71d..55932ce6a 100644 --- a/buildroot/package/dieharder/dieharder.hash +++ b/buildroot/package/dieharder/dieharder.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 6cff0ff8394c553549ac7433359ccfc955fb26794260314620dfa5e4cd4b727f dieharder-3.31.1.tgz +sha256 6cff0ff8394c553549ac7433359ccfc955fb26794260314620dfa5e4cd4b727f dieharder-3.31.1.tgz +sha256 c475bcd1afa6fc15a65174e31c599c0d23706a34e4b9f2fcb03a4dad5438d53f COPYING diff --git a/buildroot/package/diffutils/diffutils.hash b/buildroot/package/diffutils/diffutils.hash index 5506ab275..aa91fd431 100644 --- a/buildroot/package/diffutils/diffutils.hash +++ b/buildroot/package/diffutils/diffutils.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6 diffutils-3.6.tar.xz +sha256 b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26 diffutils-3.7.tar.xz +# Locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/diffutils/diffutils.mk b/buildroot/package/diffutils/diffutils.mk index 9a41c985d..586b81ace 100644 --- a/buildroot/package/diffutils/diffutils.mk +++ b/buildroot/package/diffutils/diffutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIFFUTILS_VERSION = 3.6 +DIFFUTILS_VERSION = 3.7 DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils DIFFUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) diff --git a/buildroot/package/dillo/dillo.hash b/buildroot/package/dillo/dillo.hash index cab0b14ab..fa46702a6 100644 --- a/buildroot/package/dillo/dillo.hash +++ b/buildroot/package/dillo/dillo.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b dillo-3.0.5.tar.bz2 +sha256 db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b dillo-3.0.5.tar.bz2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/ding-libs/Config.in b/buildroot/package/ding-libs/Config.in index 6dc2a80f8..152dca042 100644 --- a/buildroot/package/ding-libs/Config.in +++ b/buildroot/package/ding-libs/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_DING_LIBS initialization format (INI) into a library collection data structure (libini_config). - https://git.fedorahosted.org/git/ding-libs.git + https://pagure.io/SSSD/ding-libs diff --git a/buildroot/package/ding-libs/ding-libs.hash b/buildroot/package/ding-libs/ding-libs.hash index 6e3569769..2ac5bd8ee 100644 --- a/buildroot/package/ding-libs/ding-libs.hash +++ b/buildroot/package/ding-libs/ding-libs.hash @@ -1,2 +1,4 @@ # Locally computed -sha256 639984a57d6f936a6551c842712619692febaebf4515033fc929620a241ffa6a ding_libs-0_4_0.tar.xz +sha256 ad3c573641701f67d4b6bd8a5a71f0b65d45fd39fe961495ef5f5d3c57fc0963 ding-libs-ding_libs-0_6_1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 6c57f43c939054fd4b831f271a14c97a488c38f98cdda5e887c5d396e3b3bc58 COPYING.LESSER diff --git a/buildroot/package/ding-libs/ding-libs.mk b/buildroot/package/ding-libs/ding-libs.mk index e9508ccf9..1e8fa59d6 100644 --- a/buildroot/package/ding-libs/ding-libs.mk +++ b/buildroot/package/ding-libs/ding-libs.mk @@ -4,9 +4,10 @@ # ################################################################################ -DING_LIBS_VERSION = 0_4_0 -DING_LIBS_SOURCE = ding_libs-$(DING_LIBS_VERSION).tar.xz -DING_LIBS_SITE = https://git.fedorahosted.org/cgit/ding-libs.git/snapshot +DING_LIBS_VERSION = 0.6.1 +DING_LIBS_SOURCE = ding-libs-ding_libs-$(subst .,_,$(DING_LIBS_VERSION)).tar.gz +DING_LIBS_SITE = \ + https://pagure.io/SSSD/ding-libs/archive/ding_libs-$(subst .,_,$(DING_LIBS_VERSION)) DING_LIBS_DEPENDENCIES = host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) diff --git a/buildroot/package/directfb-examples/directfb-examples.hash b/buildroot/package/directfb-examples/directfb-examples.hash index 9d59cfef7..9c7f7c25a 100644 --- a/buildroot/package/directfb-examples/directfb-examples.hash +++ b/buildroot/package/directfb-examples/directfb-examples.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a DirectFB-examples-1.7.0.tar.gz +sha256 9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a DirectFB-examples-1.7.0.tar.gz +sha256 f91483684678e8aa8ccc4ee0ede3140b0494f8305e162695c7e6e3f83e54f236 COPYING diff --git a/buildroot/package/directfb/directfb.hash b/buildroot/package/directfb/directfb.hash index 069d8c3f1..f8c4a8303 100644 --- a/buildroot/package/directfb/directfb.hash +++ b/buildroot/package/directfb/directfb.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3 DirectFB-1.7.7.tar.gz +sha256 b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3 DirectFB-1.7.7.tar.gz +sha256 512d2d21b6b3384ba64781abb0208a1b87740bc31e2df48e2b206ddb7e4d5779 COPYING diff --git a/buildroot/package/dmalloc/Config.in b/buildroot/package/dmalloc/Config.in index e5be10933..0c01970b0 100644 --- a/buildroot/package/dmalloc/Config.in +++ b/buildroot/package/dmalloc/Config.in @@ -1,9 +1,5 @@ config BR2_PACKAGE_DMALLOC bool "dmalloc" - # On some packages, Microblaze gcc has issues when debugging - # symbols are enabled: "Error: operation combines symbols in - # different segments". - depends on !(BR2_microblaze && BR2_ENABLE_DEBUG) help A debug memory allocation library which is a drop in replacement for the system's malloc, realloc, calloc, free and diff --git a/buildroot/package/dmalloc/dmalloc.hash b/buildroot/package/dmalloc/dmalloc.hash index e74ef741b..113751656 100644 --- a/buildroot/package/dmalloc/dmalloc.hash +++ b/buildroot/package/dmalloc/dmalloc.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a dmalloc-5.5.2.tgz +sha256 d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a dmalloc-5.5.2.tgz +sha256 8659d49ceeeb006288ad246164e504ccfe33f7a4c1680439fb6ff6a393b0722b dmalloc.h.1 diff --git a/buildroot/package/dmalloc/dmalloc.mk b/buildroot/package/dmalloc/dmalloc.mk index 6ebb44c5c..38b2c0202 100644 --- a/buildroot/package/dmalloc/dmalloc.mk +++ b/buildroot/package/dmalloc/dmalloc.mk @@ -35,6 +35,10 @@ ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) DMALLOC_CFLAGS += -marm endif +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y) +DMALLOC_CFLAGS += -O0 +endif + DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)" define DMALLOC_POST_PATCH diff --git a/buildroot/package/dmidecode/dmidecode.hash b/buildroot/package/dmidecode/dmidecode.hash index 1e8154b37..c6edf4bca 100644 --- a/buildroot/package/dmidecode/dmidecode.hash +++ b/buildroot/package/dmidecode/dmidecode.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 d766ce9b25548c59b1e7e930505b4cad9a7bb0b904a1a391fbb604d529781ac0 dmidecode-3.1.tar.xz +sha256 077006fa2da0d06d6383728112f2edef9684e9c8da56752e97cd45a11f838edd dmidecode-3.2.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/dmidecode/dmidecode.mk b/buildroot/package/dmidecode/dmidecode.mk index b6f96b6df..811565d8e 100644 --- a/buildroot/package/dmidecode/dmidecode.mk +++ b/buildroot/package/dmidecode/dmidecode.mk @@ -4,7 +4,7 @@ # ################################################################################ -DMIDECODE_VERSION = 3.1 +DMIDECODE_VERSION = 3.2 DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode DMIDECODE_LICENSE = GPL-2.0+ diff --git a/buildroot/package/dmraid/dmraid.hash b/buildroot/package/dmraid/dmraid.hash index 31669218e..af84732f9 100644 --- a/buildroot/package/dmraid/dmraid.hash +++ b/buildroot/package/dmraid/dmraid.hash @@ -1,2 +1,5 @@ # From http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2.md5.sum md5 819338fcef98e8e25819f0516722beeb dmraid-1.0.0.rc16-3.tar.bz2 +# locally computed +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 1.0.0.rc16-3/dmraid/LICENSE_GPL +sha256 4bc391fcf852e03c3a7564cb146af6e47717562eed296b28bce123ee1b0396b8 1.0.0.rc16-3/dmraid/LICENSE diff --git a/buildroot/package/dnsmasq/0001-Makefile-fix-i18n-build-with-ubus.patch b/buildroot/package/dnsmasq/0001-Makefile-fix-i18n-build-with-ubus.patch new file mode 100644 index 000000000..e42549bea --- /dev/null +++ b/buildroot/package/dnsmasq/0001-Makefile-fix-i18n-build-with-ubus.patch @@ -0,0 +1,33 @@ +From 08572cffb641004d86072f12aec4d6489454b897 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 21 Jun 2019 09:26:20 +0200 +Subject: [PATCH] Makefile: fix i18n build with ubus + +Commit caf4d571e6d86285a3690cfcc8de9c5f394320a8 forgot adding +ubus_libs to build_libs for all-i18n target + +Fixes: + - http://autobuild.buildroot.org/results/c0b27754b7ede024c095bdf0b3616e6f6be48c6d + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to simon@thekelleys.org.uk] +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 3fb7cbe..78e25f0 100644 +--- a/Makefile ++++ b/Makefile +@@ -111,7 +111,7 @@ all-i18n : $(BUILDDIR) + top="$(top)" \ + i18n=-DLOCALEDIR=\'\"$(LOCALEDIR)\"\' \ + build_cflags="$(version) $(dbus_cflags) $(idn2_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags) $(nettle_cflags)" \ +- build_libs="$(dbus_libs) $(idn2_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(nettle_libs) $(gmp_libs)" \ ++ build_libs="$(dbus_libs) $(idn2_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(nettle_libs) $(gmp_libs) $(ubus_libs)" \ + -f $(top)/Makefile dnsmasq + for f in `cd $(PO); echo *.po`; do \ + cd $(top) && cd $(BUILDDIR) && $(MAKE) top="$(top)" -f $(top)/Makefile $${f%.po}.mo; \ +-- +2.14.1 + diff --git a/buildroot/package/dnsmasq/0002-Fix-build-with-libnettle-3.5.patch b/buildroot/package/dnsmasq/0002-Fix-build-with-libnettle-3.5.patch new file mode 100644 index 000000000..a19a14945 --- /dev/null +++ b/buildroot/package/dnsmasq/0002-Fix-build-with-libnettle-3.5.patch @@ -0,0 +1,46 @@ +From 6fd9aba7abe1e084123bc5002959350897774ace Mon Sep 17 00:00:00 2001 +From: Vladislav Grishenko +Date: Wed, 26 Jun 2019 20:27:11 +0500 +Subject: [PATCH] Fix build with libnettle 3.5 + +Downloaded from +https://github.com/themiron/dnsmasq/commit/6fd9aba7abe1e084123bc5002959350897774ace + +Signed-off-by: Bernd Kuhls +--- + src/crypto.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/crypto.c b/src/crypto.c +index 1f1c12b..9cfe371 100644 +--- a/src/crypto.c ++++ b/src/crypto.c +@@ -296,6 +296,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len + static struct ecc_point *key_256 = NULL, *key_384 = NULL; + static mpz_t x, y; + static struct dsa_signature *sig_struct; ++#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4 ++#define nettle_get_secp_256r1() (&nettle_secp_256r1) ++#define nettle_get_secp_384r1() (&nettle_secp_384r1) ++#endif + + if (!sig_struct) + { +@@ -315,7 +319,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len + if (!(key_256 = whine_malloc(sizeof(struct ecc_point)))) + return 0; + +- nettle_ecc_point_init(key_256, &nettle_secp_256r1); ++ nettle_ecc_point_init(key_256, nettle_get_secp_256r1()); + } + + key = key_256; +@@ -328,7 +332,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len + if (!(key_384 = whine_malloc(sizeof(struct ecc_point)))) + return 0; + +- nettle_ecc_point_init(key_384, &nettle_secp_384r1); ++ nettle_ecc_point_init(key_384, nettle_get_secp_384r1()); + } + + key = key_384; diff --git a/buildroot/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch b/buildroot/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch new file mode 100644 index 000000000..fdde33a66 --- /dev/null +++ b/buildroot/package/dnsmasq/0003-Fix-build-after-y2038-changes-in-glib.patch @@ -0,0 +1,29 @@ +From 3052ce208acf602f0163166dcefb7330d537cedb Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +Date: Wed, 24 Jul 2019 17:34:48 +0100 +Subject: [PATCH] Fix build after y2038 changes in glib. + +SIOCGSTAMP is defined in linux/sockios.h, not asm/sockios.h now. + +[Retrieved from: +http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=3052ce208acf602f0163166dcefb7330d537cedb] +Signed-off-by: Fabrice Fontaine +--- + src/dnsmasq.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index ff3204a..3ef04ad 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -137,6 +137,7 @@ typedef unsigned long long u64; + #endif + + #if defined(HAVE_LINUX_NETWORK) ++#include + #include + /* There doesn't seem to be a universally-available + userspace header for these. */ +-- +1.7.10.4 + diff --git a/buildroot/package/dnsmasq/0004-Fix-memory-leak-in-helper-c.patch b/buildroot/package/dnsmasq/0004-Fix-memory-leak-in-helper-c.patch new file mode 100644 index 000000000..c00a9cc3e --- /dev/null +++ b/buildroot/package/dnsmasq/0004-Fix-memory-leak-in-helper-c.patch @@ -0,0 +1,49 @@ +From 69bc94779c2f035a9fffdb5327a54c3aeca73ed5 Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Wed, 14 Aug 2019 20:44:50 +0100 +Subject: [PATCH] Fix memory leak in helper.c + +Thanks to Xu Mingjie for spotting this. +[Retrieved from: +http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=69bc94779c2f035a9fffdb5327a54c3aeca73ed5] +Signed-off-by: Fabrice Fontaine +--- + src/helper.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/helper.c b/src/helper.c +index 33ba120..c392eec 100644 +--- a/src/helper.c ++++ b/src/helper.c +@@ -80,7 +80,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) + pid_t pid; + int i, pipefd[2]; + struct sigaction sigact; +- ++ unsigned char *alloc_buff = NULL; ++ + /* create the pipe through which the main program sends us commands, + then fork our process. */ + if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1) +@@ -186,11 +187,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) + struct script_data data; + char *p, *action_str, *hostname = NULL, *domain = NULL; + unsigned char *buf = (unsigned char *)daemon->namebuff; +- unsigned char *end, *extradata, *alloc_buff = NULL; ++ unsigned char *end, *extradata; + int is6, err = 0; + int pipeout[2]; + +- free(alloc_buff); ++ /* Free rarely-allocated memory from previous iteration. */ ++ if (alloc_buff) ++ { ++ free(alloc_buff); ++ alloc_buff = NULL; ++ } + + /* we read zero bytes when pipe closed: this is our signal to exit */ + if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1)) +-- +1.7.10.4 + diff --git a/buildroot/package/dnsmasq/Config.in b/buildroot/package/dnsmasq/Config.in index 262aca688..d7f3d74bd 100644 --- a/buildroot/package/dnsmasq/Config.in +++ b/buildroot/package/dnsmasq/Config.in @@ -29,8 +29,7 @@ config BR2_PACKAGE_DNSMASQ_DNSSEC config BR2_PACKAGE_DNSMASQ_IDN bool "IDN support" - depends on BR2_USE_WCHAR - select BR2_PACKAGE_LIBIDN + select BR2_PACKAGE_LIBIDN2 if !BR2_PACKAGE_LIBIDN help Enable IDN support in dnsmasq. This option is a big space taker since it pulls in many diff --git a/buildroot/package/dnsmasq/dnsmasq.hash b/buildroot/package/dnsmasq/dnsmasq.hash index 322f8df5c..18a539277 100644 --- a/buildroot/package/dnsmasq/dnsmasq.hash +++ b/buildroot/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,7 @@ # Locally calculated after checking pgp signature # http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.79.tar.xz.asc sha256 78ad74f5ca14fd85a8bac93f764cd9d60b27579e90eabd3687ca7b030e67861f dnsmasq-2.79.tar.xz +sha256 cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb dnsmasq-2.80.tar.xz # Locally calculated sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/buildroot/package/dnsmasq/dnsmasq.mk b/buildroot/package/dnsmasq/dnsmasq.mk index 79c561996..3f25ac088 100644 --- a/buildroot/package/dnsmasq/dnsmasq.mk +++ b/buildroot/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.79 +DNSMASQ_VERSION = 2.80 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" @@ -15,6 +15,9 @@ DNSMASQ_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 +# 0004-Fix-memory-leak-in-helper-c.patch +DNSMASQ_IGNORE_CVES += CVE-2019-14834 + DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y) @@ -34,9 +37,14 @@ DNSMASQ_COPTS += -DNO_TFTP endif ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +DNSMASQ_DEPENDENCIES += libidn2 +DNSMASQ_COPTS += -DHAVE_LIBIDN2 +else DNSMASQ_DEPENDENCIES += libidn DNSMASQ_COPTS += -DHAVE_IDN endif +endif ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y) DNSMASQ_DEPENDENCIES += libnetfilter_conntrack @@ -67,6 +75,11 @@ define DNSMASQ_INSTALL_DBUS endef endif +ifeq ($(BR2_PACKAGE_UBUS),y) +DNSMASQ_DEPENDENCIES += ubus +DNSMASQ_COPTS += -DHAVE_UBUS +endif + define DNSMASQ_FIX_PKGCONFIG $(SED) 's^PKG_CONFIG = pkg-config^PKG_CONFIG = $(PKG_CONFIG_HOST_BINARY)^' \ $(DNSMASQ_DIR)/Makefile diff --git a/buildroot/package/docker-cli/Config.in b/buildroot/package/docker-cli/Config.in index 82c35c453..6f187c9d2 100644 --- a/buildroot/package/docker-cli/Config.in +++ b/buildroot/package/docker-cli/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOCKER_CLI bool "docker-cli" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS help Docker is a platform to build, ship, @@ -20,6 +20,6 @@ config BR2_PACKAGE_DOCKER_CLI_STATIC endif comment "docker-cli needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch b/buildroot/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch new file mode 100644 index 000000000..536a9590d --- /dev/null +++ b/buildroot/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch @@ -0,0 +1,66 @@ +From 2bb1a267aba3ca5fe414d0f79192def668c18bab Mon Sep 17 00:00:00 2001 +From: Ulysses Souza +Date: Tue, 2 Jul 2019 15:49:07 +0200 +Subject: [PATCH] Strip up generic versions and bump requests + +Replaces generic limitations with a next major value +Bump the minimal `requests` to 2.20.0 + +Signed-off-by: Ulysses Souza +(cherry picked from commit ce5451c5b4a3b449ce703168d2a568b0a4d25ee6) +Signed-off-by: Peter Korsgaard +--- + setup.py | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/setup.py b/setup.py +index 8371cc75..61447801 100644 +--- a/setup.py ++++ b/setup.py +@@ -31,31 +31,31 @@ def find_version(*file_paths): + + install_requires = [ + 'cached-property >= 1.2.0, < 2', +- 'docopt >= 0.6.1, < 0.7', +- 'PyYAML >= 3.10, < 4.3', +- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21', +- 'texttable >= 0.9.0, < 0.10', +- 'websocket-client >= 0.32.0, < 1.0', +- 'docker[ssh] >= 3.7.0, < 4.0', +- 'dockerpty >= 0.4.1, < 0.5', ++ 'docopt >= 0.6.1, < 1', ++ 'PyYAML >= 3.10, < 5', ++ 'requests >= 2.20.0, < 3', ++ 'texttable >= 0.9.0, < 1', ++ 'websocket-client >= 0.32.0, < 1', ++ 'docker[ssh] >= 3.7.0, < 5', ++ 'dockerpty >= 0.4.1, < 1', + 'six >= 1.3.0, < 2', + 'jsonschema >= 2.5.1, < 3', + ] + + + tests_require = [ +- 'pytest', ++ 'pytest < 6', + ] + + + if sys.version_info[:2] < (3, 4): +- tests_require.append('mock >= 1.0.1') ++ tests_require.append('mock >= 1.0.1, < 2') + + extras_require = { + ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], +- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], +- ':python_version < "3.3"': ['ipaddress >= 1.0.16'], +- ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'], ++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], ++ ':python_version < "3.3"': ['ipaddress >= 1.0.16, < 2'], ++ ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], + 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], + } + +-- +2.20.1 + diff --git a/buildroot/package/docker-compose/0001-setup.py-allow-all-recent-2.x-requests-releases.patch b/buildroot/package/docker-compose/0001-setup.py-allow-all-recent-2.x-requests-releases.patch deleted file mode 100644 index 1378c3b81..000000000 --- a/buildroot/package/docker-compose/0001-setup.py-allow-all-recent-2.x-requests-releases.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a79152d1d621ea9d477ecc6862a03cae80b2425b Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sat, 15 Dec 2018 14:04:57 +0100 -Subject: [PATCH] setup.py: allow all recent 2.x requests releases - -Instead of having to update this for each new requests release. - -It it not quite clear why the restriction was added in the first place in -commit b0480b4d04e (Bump SDK version to latest), but change it to simply -disallow the upcoming 3.0 release to match what is done for the other -modules. - -Submitted upstream: https://github.com/docker/compose/pull/6415 -Signed-off-by: Peter Korsgaard ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 96530726..3c8c7d0e 100644 ---- a/setup.py -+++ b/setup.py -@@ -33,7 +33,7 @@ install_requires = [ - 'cached-property >= 1.2.0, < 2', - 'docopt >= 0.6.1, < 0.7', - 'PyYAML >= 3.10, < 4', -- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19', -+ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 3.0', - 'texttable >= 0.9.0, < 0.10', - 'websocket-client >= 0.32.0, < 1.0', - 'docker >= 3.1.4, < 4.0', --- -2.11.0 - diff --git a/buildroot/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch b/buildroot/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch new file mode 100644 index 000000000..92c2e1f13 --- /dev/null +++ b/buildroot/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch @@ -0,0 +1,41 @@ +From e55dd65ba42a17ba4b017b42f14f7ee647efe64f Mon Sep 17 00:00:00 2001 +From: Ulysses Souza +Date: Mon, 8 Jul 2019 14:52:30 +0200 +Subject: [PATCH] Bump texttable from 0.9.1 to 1.6.2 + +Signed-off-by: Ulysses Souza +(cherry picked from commit 0bfa1c34f054d86674434770d4d6340e02508e52) +Signed-off-by: Peter Korsgaard +--- + requirements.txt | 2 +- + setup.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/requirements.txt b/requirements.txt +index 6007ee3f..d868fdeb 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -19,6 +19,6 @@ PySocks==1.6.7 + PyYAML==4.2b1 + requests==2.20.0 + six==1.10.0 +-texttable==0.9.1 ++texttable==1.6.2 + urllib3==1.21.1; python_version == '3.3' + websocket-client==0.56.0 +diff --git a/setup.py b/setup.py +index 61447801..c9e4729d 100644 +--- a/setup.py ++++ b/setup.py +@@ -34,7 +34,7 @@ install_requires = [ + 'docopt >= 0.6.1, < 1', + 'PyYAML >= 3.10, < 5', + 'requests >= 2.20.0, < 3', +- 'texttable >= 0.9.0, < 1', ++ 'texttable >= 0.9.0, < 2', + 'websocket-client >= 0.32.0, < 1', + 'docker[ssh] >= 3.7.0, < 5', + 'dockerpty >= 0.4.1, < 1', +-- +2.20.1 + diff --git a/buildroot/package/docker-compose/0002-Upgrade-pyyaml-to-4.2b1.patch b/buildroot/package/docker-compose/0002-Upgrade-pyyaml-to-4.2b1.patch deleted file mode 100644 index a3b4bfb85..000000000 --- a/buildroot/package/docker-compose/0002-Upgrade-pyyaml-to-4.2b1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8419a670aed3364c39b86a0608782aaeae3ce5df Mon Sep 17 00:00:00 2001 -From: Quentin Brunet -Date: Tue, 8 Jan 2019 14:04:54 +0100 -Subject: [PATCH] Upgrade pyyaml to 4.2b1 - -Signed-off-by: Quentin Brunet -Signed-off-by: Peter Korsgaard ---- - setup.py | 2 +- - 1 file changed, 1 insertions(+), 1 deletions(-) - -diff --git a/setup.py b/setup.py -index 4c49bab7..8b5f9d99 100644 ---- a/setup.py -+++ b/setup.py -@@ -32,7 +32,7 @@ def find_version(*file_paths): - install_requires = [ - 'cached-property >= 1.2.0, < 2', - 'docopt >= 0.6.1, < 0.7', -- 'PyYAML >= 3.10, < 4', -+ 'PyYAML >= 3.10, < 4.3', - 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 3.0', - 'texttable >= 0.9.0, < 0.10', - 'websocket-client >= 0.32.0, < 1.0', --- -2.11.0 - diff --git a/buildroot/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch b/buildroot/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch new file mode 100644 index 000000000..ecbd197a5 --- /dev/null +++ b/buildroot/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch @@ -0,0 +1,44 @@ +From 3be619b814c16c02a02499e7a157dabd065926dd Mon Sep 17 00:00:00 2001 +From: Sergey Fursov +Date: Sun, 31 Mar 2019 12:45:50 +0700 +Subject: [PATCH] support PyYAML up to 5.1 version + +Signed-off-by: Sergey Fursov +[Upstream: https://github.com/docker/compose/pull/6623] +(cherry picked from commit d2ca096f46a56cd4db494c593ed84e5c255dc15d) +[Peter: allow all 5.x] +Signed-off-by: Peter Korsgaard +--- + requirements.txt | 2 +- + setup.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/requirements.txt b/requirements.txt +index d868fdeb..e3dbc807 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -16,7 +16,7 @@ paramiko==2.4.2 + pypiwin32==219; sys_platform == 'win32' and python_version < '3.6' + pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6' + PySocks==1.6.7 +-PyYAML==4.2b1 ++PyYAML==5.1 + requests==2.20.0 + six==1.10.0 + texttable==1.6.2 +diff --git a/setup.py b/setup.py +index c9e4729d..17ab678e 100644 +--- a/setup.py ++++ b/setup.py +@@ -32,7 +32,7 @@ def find_version(*file_paths): + install_requires = [ + 'cached-property >= 1.2.0, < 2', + 'docopt >= 0.6.1, < 1', +- 'PyYAML >= 3.10, < 5', ++ 'PyYAML >= 3.10, < 6', + 'requests >= 2.20.0, < 3', + 'texttable >= 0.9.0, < 2', + 'websocket-client >= 0.32.0, < 1', +-- +2.20.1 + diff --git a/buildroot/package/docker-compose/Config.in b/buildroot/package/docker-compose/Config.in index 393b5f1a0..74af8e03d 100644 --- a/buildroot/package/docker-compose/Config.in +++ b/buildroot/package/docker-compose/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_DOCKER_COMPOSE depends on BR2_USE_WCHAR # python depends on BR2_TOOLCHAIN_HAS_THREADS # python depends on !BR2_STATIC_LIBS # python + depends on BR2_INSTALL_LIBSTDCPP # python-paramiko -> python-cryptography select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME \ if BR2_PACKAGE_PYTHON # runtime @@ -11,6 +12,7 @@ config BR2_PACKAGE_DOCKER_COMPOSE select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_CACHED_PROPERTY # runtime select BR2_PACKAGE_PYTHON_DOCOPT # runtime + select BR2_PACKAGE_PYTHON_PARAMIKO # runtime select BR2_PACKAGE_PYTHON_PYYAML # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_TEXTTABLE # runtime @@ -24,6 +26,7 @@ config BR2_PACKAGE_DOCKER_COMPOSE https://www.docker.com/ -comment "docker-compose needs a toolchain w/ wchar, threads, dynamic library" +comment "docker-compose needs a toolchain w/ C++, wchar, threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/docker-compose/docker-compose.hash b/buildroot/package/docker-compose/docker-compose.hash index 5a5e86abe..aa29a6d6c 100644 --- a/buildroot/package/docker-compose/docker-compose.hash +++ b/buildroot/package/docker-compose/docker-compose.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/docker-compose/json, sha256 locally computed -md5 8f9f6d59cc8e65dbfad6fda26b96fde7 docker-compose-1.20.1.tar.gz -sha256 34c043ebd4c23e4b864812c16b41dad25cec6b675557b180ced52d372e1a9e66 docker-compose-1.20.1.tar.gz +# from https://pypi.python.org/pypi/docker-compose/json +sha256 a5d58e974fd717e24b0dda6669a46bc03548d9023ef38d965acdc32d4d5fa753 docker-compose-1.24.1.tar.gz + +# locally computed sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/buildroot/package/docker-compose/docker-compose.mk b/buildroot/package/docker-compose/docker-compose.mk index 52c16dbc7..ec24157c5 100644 --- a/buildroot/package/docker-compose/docker-compose.mk +++ b/buildroot/package/docker-compose/docker-compose.mk @@ -4,8 +4,8 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 1.20.1 -DOCKER_COMPOSE_SITE = https://pypi.python.org/packages/25/4f/4e2b8ff942c9b3d96a81082590617c5c5fa006b066a4181b8d985ea3ac79 +DOCKER_COMPOSE_VERSION = 1.24.1 +DOCKER_COMPOSE_SITE = https://files.pythonhosted.org/packages/b6/a4/59c39df6a23144a6252ad33170dfbf781af5953651e4587e8ea5f995f95e DOCKER_COMPOSE_SETUP_TYPE = setuptools DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/docker-containerd/Config.in b/buildroot/package/docker-containerd/Config.in index 72ca9313b..9568dd0a2 100644 --- a/buildroot/package/docker-containerd/Config.in +++ b/buildroot/package/docker-containerd/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOCKER_CONTAINERD bool "docker-containerd" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc depends on BR2_USE_MMU # util-linux @@ -29,7 +29,7 @@ config BR2_PACKAGE_DOCKER_CONTAINERD_DRIVER_BTRFS endif comment "docker-containerd needs a glibc or musl toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/buildroot/package/docker-containerd/docker-containerd.hash b/buildroot/package/docker-containerd/docker-containerd.hash index aad74089e..a4acc1771 100644 --- a/buildroot/package/docker-containerd/docker-containerd.hash +++ b/buildroot/package/docker-containerd/docker-containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 6a4192fced10c390373adfa9fa9a4f12fe9f38bde580d90468a79ed6c8af75ee docker-containerd-1.2.11.tar.gz -sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE +sha256 318886ea1efdec36f088fd6a0a0fe2b2f0ebdfd0066bdb4bd284bad12abc0a41 docker-containerd-1.2.12.tar.gz +sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/buildroot/package/docker-containerd/docker-containerd.mk b/buildroot/package/docker-containerd/docker-containerd.mk index 4dc0ef467..3fef99445 100644 --- a/buildroot/package/docker-containerd/docker-containerd.mk +++ b/buildroot/package/docker-containerd/docker-containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 1.2.11 +DOCKER_CONTAINERD_VERSION = 1.2.12 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE diff --git a/buildroot/package/docker-engine/Config.in b/buildroot/package/docker-engine/Config.in index 3c9731048..1fd229fcb 100644 --- a/buildroot/package/docker-engine/Config.in +++ b/buildroot/package/docker-engine/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOCKER_ENGINE bool "docker-engine" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # docker-containerd -> runc depends on BR2_USE_MMU # docker-containerd @@ -51,7 +51,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS endif comment "docker-engine needs a glibc or musl toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_USE_MMU diff --git a/buildroot/package/docker-engine/docker-engine.mk b/buildroot/package/docker-engine/docker-engine.mk index b0eaae958..3936f6449 100644 --- a/buildroot/package/docker-engine/docker-engine.mk +++ b/buildroot/package/docker-engine/docker-engine.mk @@ -68,9 +68,6 @@ define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/docker.service $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \ $(TARGET_DIR)/usr/lib/systemd/system/docker.socket - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ - ln -fs ../../../../usr/lib/systemd/system/docker.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/docker.service endef define DOCKER_ENGINE_INSTALL_INIT_SYSV @@ -82,10 +79,4 @@ define DOCKER_ENGINE_USERS - - docker -1 * - - - Docker Application Container Framework endef -define DOCKER_ENGINE_INSTALL_SYMLINKS - ln -fs tini $(TARGET_DIR)/usr/bin/docker-init -endef - -DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INSTALL_SYMLINKS - $(eval $(golang-package)) diff --git a/buildroot/package/docker-proxy/Config.in b/buildroot/package/docker-proxy/Config.in index 596e18a3f..7e4053653 100644 --- a/buildroot/package/docker-proxy/Config.in +++ b/buildroot/package/docker-proxy/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOCKER_PROXY bool "docker-proxy" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS help Libnetwork is a Container Network Model that provides a @@ -14,6 +14,6 @@ config BR2_PACKAGE_DOCKER_PROXY https://github.com/docker/libnetwork comment "docker-proxy needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/docker/docker.hash b/buildroot/package/docker/docker.hash index 710a0eb57..cf0f00e8d 100644 --- a/buildroot/package/docker/docker.hash +++ b/buildroot/package/docker/docker.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 47629578e89d96d1541c91d040aec4316f03ad6d01dc3eecb8f82a33445c1e4e docker-1.5.tar.gz +sha256 47629578e89d96d1541c91d040aec4316f03ad6d01dc3eecb8f82a33445c1e4e docker-1.5.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 fd82a1ac93bfe0a5afcf28cfb5342dd02015555fc23529a87bd77a7b271d3262 README diff --git a/buildroot/package/domoticz/0001-Bumped-version.patch b/buildroot/package/domoticz/0001-Bumped-version.patch deleted file mode 100644 index 70426ba1a..000000000 --- a/buildroot/package/domoticz/0001-Bumped-version.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 98723b7da9467a49222b8a7ffaae276c5bc075c1 Mon Sep 17 00:00:00 2001 -From: gizmocuz -Date: Thu, 28 Jun 2018 08:00:58 +0200 -Subject: [PATCH] Bumped version - -Signed-off-by: Fabrice Fontaine -[Retrieved from https://github.com/domoticz/domoticz/commit/98723b7da9467a49222b8a7ffaae276c5bc075c1] ---- - appversion.default | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/appversion.default b/appversion.default -index beaa069bb..7d3530590 100644 ---- a/appversion.default -+++ b/appversion.default -@@ -1,3 +1,3 @@ --#define APPVERSION 5876 -+#define APPVERSION 9700 - #define APPHASH "b97777b" - #define APPDATE 1478691222 diff --git a/buildroot/package/domoticz/0001-History.txt-use-10717-instead-of-xxxxx.patch b/buildroot/package/domoticz/0001-History.txt-use-10717-instead-of-xxxxx.patch new file mode 100644 index 000000000..c2b9cb0d2 --- /dev/null +++ b/buildroot/package/domoticz/0001-History.txt-use-10717-instead-of-xxxxx.patch @@ -0,0 +1,33 @@ +From bc34ba549d4366092a39a4d7bc4414f8cbd8bc6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 3 Aug 2019 09:13:54 +0200 +Subject: [PATCH] History.txt: use 10717 instead of xxxxx +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Set current development version to 4.10717 instead of 4.xxxxx to avoid +the following build failure when git is unavailable: + +/home/fabrice/buildroot/output/build/domoticz-0f411f781ae4fb4a82f592d38a3f40578c149533/main/domoticz.cpp: In function ‘void GetAppVersion()’: +/home/fabrice/buildroot/output/build/domoticz-0f411f781ae4fb4a82f592d38a3f40578c149533/main/../appversion.h:1:20: error: ‘xxxxx’ was not declared in this scope + #define APPVERSION xxxxx + +Signed-off-by: Fabrice Fontaine +--- + History.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/History.txt b/History.txt +index 4dc45e6b5..ad67976f3 100644 +--- a/History.txt ++++ b/History.txt +@@ -1,4 +1,4 @@ +-Version 4.xxxxx (xxx 2019) ++Version 4.10717 (xxx 2019) + - Implemented: DarkSky CloudCover sensor + - Implemented: EventSystem, option in Settings to enable/disable URL call logging containing full URL path + - Implemented: GUI, OpenZWave added Refresh Node Information button, styling +-- +2.20.1 + diff --git a/buildroot/package/domoticz/0002-CMakeLists.txt-fix-build-with-python-and-cmake-3.7.patch b/buildroot/package/domoticz/0002-CMakeLists.txt-fix-build-with-python-and-cmake-3.7.patch deleted file mode 100644 index a0adbdfed..000000000 --- a/buildroot/package/domoticz/0002-CMakeLists.txt-fix-build-with-python-and-cmake-3.7.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4b77662232c806b8aba7680405144ad51ac3671b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 29 Nov 2018 00:36:00 +0100 -Subject: [PATCH] CMakeLists.txt: fix build with python and cmake <= 3.7 - -domoticz will fail to build with python and older cmake -Indeed, find_package(PythonLibs 3.4) will not recognize python 3.7 until -cmake 3.7 and the following commit: -https://github.com/Kitware/CMake/commit/c31573b9641e0f1bc7a34149506db51f3494323b - -To fix this, add a call to find_package(PythonInterp 3.4). Indeed, if -FindPythonInterp has already found the major and minor version, that -version will be inserted between the user supplied versions and the -stock version list since cmake in version 3.1 and -https://github.com/Kitware/CMake/commit/3816cd2dc7a7cc220e4f1b1e87fee986545b9cb3 - -Fixes: - - http://autobuild.buildroot.org/results/8e82501a7b49da628ec026132ffca44c0c813040 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/domoticz/domoticz/pull/2889] ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f4e38b88..41003a0c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -125,6 +125,7 @@ ENDIF(USE_BUILTIN_SQLITE) - - option(USE_PYTHON "Use Python for Plugins and Event-Scripts" YES) - IF(USE_PYTHON) -+ find_package(PythonInterp 3.4) - find_package(PythonLibs 3.4) - IF(PYTHONLIBS_FOUND) - MESSAGE(STATUS "Python3 includes found at: ${PYTHON_INCLUDE_PATH}") --- -2.14.1 - diff --git a/buildroot/package/domoticz/0002-Revert-Updating-CMake-configuration-file-to-use-vers.patch b/buildroot/package/domoticz/0002-Revert-Updating-CMake-configuration-file-to-use-vers.patch new file mode 100644 index 000000000..8640b8354 --- /dev/null +++ b/buildroot/package/domoticz/0002-Revert-Updating-CMake-configuration-file-to-use-vers.patch @@ -0,0 +1,47 @@ +From 2cd95289939b4a7c2576176c7f6268028aa093b2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 May 2019 21:50:16 +0200 +Subject: [PATCH] Revert "Updating CMake configuration file to use + version 3.14 as minimum and added boost dependency targets" + +This reverts commit 4e4ee999c4b323514c0ba81ab1ff3afb10d2f1cd to avoid +bumping host-cmake requirement version from 3.8 to 3.14 in buildroot. + +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5b7832ff..a21f5b87b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ +-#set to minimum version that supports clean build +-cmake_minimum_required(VERSION 3.14.0) ++#set to minimum version that supports clean build on cygwin ++cmake_minimum_required(VERSION 2.8.4) + + project(domoticz) + +@@ -583,6 +583,7 @@ set(Boost_USE_STATIC_LIBS ${USE_STATIC_BOOST}) + set(Boost_USE_MULTITHREADED ON) + unset(Boost_INCLUDE_DIR CACHE) + unset(Boost_LIBRARY_DIRS CACHE) ++find_package(Boost REQUIRED COMPONENTS thread system) + + if(USE_STATIC_BOOST) + message(STATUS "Linking against boost static libraries") +@@ -590,9 +591,6 @@ else(USE_STATIC_BOOST) + message(STATUS "Linking against boost dynamic libraries") + endif(USE_STATIC_BOOST) + +-find_package(Boost REQUIRED COMPONENTS thread system) +-target_link_libraries(domoticz Boost::thread Boost::system) +- + # compare found vs required libBoost version + if(Boost_VERSION VERSION_LESS DOMO_MIN_LIBBOOST_VERSION) + message(FATAL_ERROR "Found libBoost version ${Boost_VERSION}, ${DOMO_MIN_LIBBOOST_VERSION} or newer required") +-- +2.20.1 + diff --git a/buildroot/package/domoticz/0004-DelayedLink.h-fix-build-with-python-3-8.patch b/buildroot/package/domoticz/0004-DelayedLink.h-fix-build-with-python-3-8.patch new file mode 100644 index 000000000..5b9abffab --- /dev/null +++ b/buildroot/package/domoticz/0004-DelayedLink.h-fix-build-with-python-3-8.patch @@ -0,0 +1,66 @@ +From e9bd383ceb63db7cfe8a284014f0cdf8c2bfe4f0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 1 Nov 2019 10:54:11 +0100 +Subject: [PATCH] DelayedLink.h: fix build with python 3.8 + +Fix build with python 3.8 by copy/pasting the vim workaround from +https://github.com/vim/vim/commit/13a1f3fb0c9d08bba6109fe2131c9524e6ba7e15 + +Fix 3703 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/domoticz/domoticz/commit/e9bd383ceb63db7cfe8a284014f0cdf8c2bfe4f0] +--- + hardware/plugins/DelayedLink.h | 38 ++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +diff --git a/hardware/plugins/DelayedLink.h b/hardware/plugins/DelayedLink.h +index 4bf1973281..c90a7d8e69 100644 +--- a/hardware/plugins/DelayedLink.h ++++ b/hardware/plugins/DelayedLink.h +@@ -14,6 +14,44 @@ + #include + #include "../../main/Helper.h" + ++#if PY_VERSION_HEX >= 0x030800f0 ++static inline void ++py3__Py_DECREF(const char *filename, int lineno, PyObject *op) ++{ ++ (void)filename; /* may be unused, shut up -Wunused-parameter */ ++ (void)lineno; /* may be unused, shut up -Wunused-parameter */ ++ _Py_DEC_REFTOTAL; ++ if (--op->ob_refcnt != 0) ++ { ++#ifdef Py_REF_DEBUG ++ if (op->ob_refcnt < 0) ++ { ++ _Py_NegativeRefcount(filename, lineno, op); ++ } ++#endif ++ } ++ else ++ { ++ _Py_Dealloc(op); ++ } ++} ++ ++#undef Py_DECREF ++#define Py_DECREF(op) py3__Py_DECREF(__FILE__, __LINE__, _PyObject_CAST(op)) ++ ++static inline void ++py3__Py_XDECREF(PyObject *op) ++{ ++ if (op != NULL) ++ { ++ Py_DECREF(op); ++ } ++} ++ ++#undef Py_XDECREF ++#define Py_XDECREF(op) py3__Py_XDECREF(_PyObject_CAST(op)) ++#endif ++ + namespace Plugins { + + #ifdef WIN32 diff --git a/buildroot/package/domoticz/0005-Fix-include-paths-to-not-confuse-local-files-with-system-files.patch b/buildroot/package/domoticz/0005-Fix-include-paths-to-not-confuse-local-files-with-system-files.patch new file mode 100644 index 000000000..63da572b6 --- /dev/null +++ b/buildroot/package/domoticz/0005-Fix-include-paths-to-not-confuse-local-files-with-system-files.patch @@ -0,0 +1,76 @@ +From 23f69284cb1ce1a98885b29a6126ebdbee735e7d Mon Sep 17 00:00:00 2001 +From: Daniel Wallner <14888585+danielwallner@users.noreply.github.com> +Date: Thu, 17 Oct 2019 07:31:43 +0200 +Subject: [PATCH] Fix include paths to not confuse local files with system + files (json/json.h) (#3669) + +[Retrieved from: +https://github.com/domoticz/domoticz/commit/23f69284cb1ce1a98885b29a6126ebdbee735e7d] +Signed-off-by: Fabrice Fontaine +--- + hardware/1Wire/1WireForWindows.cpp | 2 +- + hardware/plugins/PluginManager.cpp | 16 ++++++++-------- + hardware/plugins/PluginProtocols.cpp | 8 ++++---- + 3 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/hardware/1Wire/1WireForWindows.cpp b/hardware/1Wire/1WireForWindows.cpp +index cf0b42795d..2044882fb9 100644 +--- a/hardware/1Wire/1WireForWindows.cpp ++++ b/hardware/1Wire/1WireForWindows.cpp +@@ -4,7 +4,7 @@ + #include "1WireForWindows.h" + #include "../../main/Logger.h" + #include +-#include "../json/json.h" ++#include "../../json/json.h" + #include + + #define _1WIRE_SERVICE_PORT "1664" +diff --git a/hardware/plugins/PluginManager.cpp b/hardware/plugins/PluginManager.cpp +index 793934121e..4276fe2fbc 100644 +--- a/hardware/plugins/PluginManager.cpp ++++ b/hardware/plugins/PluginManager.cpp +@@ -14,14 +14,14 @@ + #include "PluginMessages.h" + #include "PluginTransports.h" + +-#include "../main/Helper.h" +-#include "../main/Logger.h" +-#include "../main/SQLHelper.h" +-#include "../main/WebServer.h" +-#include "../main/mainworker.h" +-#include "../main/EventSystem.h" +-#include "../json/json.h" +-#include "../main/localtime_r.h" ++#include "../../main/Helper.h" ++#include "../../main/Logger.h" ++#include "../../main/SQLHelper.h" ++#include "../../main/WebServer.h" ++#include "../../main/mainworker.h" ++#include "../../main/EventSystem.h" ++#include "../../json/json.h" ++#include "../../main/localtime_r.h" + #ifdef WIN32 + # include + #else +diff --git a/hardware/plugins/PluginProtocols.cpp b/hardware/plugins/PluginProtocols.cpp +index f19731e1a4..8b1ae4c3e7 100644 +--- a/hardware/plugins/PluginProtocols.cpp ++++ b/hardware/plugins/PluginProtocols.cpp +@@ -7,12 +7,12 @@ + + #include "PluginMessages.h" + #include "PluginProtocols.h" +-#include "../main/Helper.h" +-#include "../main/Logger.h" +-#include "../webserver/Base64.h" ++#include "../../main/Helper.h" ++#include "../../main/Logger.h" ++#include "../../webserver/Base64.h" + #include "icmp_header.hpp" + #include "ipv4_header.hpp" +-#include "../json/json.h" ++#include "../../json/json.h" + + namespace Plugins { + diff --git a/buildroot/package/domoticz/S99domoticz b/buildroot/package/domoticz/S99domoticz index a16cacadd..e773aceee 100644 --- a/buildroot/package/domoticz/S99domoticz +++ b/buildroot/package/domoticz/S99domoticz @@ -1,38 +1,51 @@ #!/bin/sh -NAME=domoticz -PIDFILE=/var/run/$NAME.pid -DAEMON=/opt/domoticz/$NAME -DAEMON_ARGS="-daemon -www 8080 -sslwww 443" +DAEMON="domoticz" +PIDFILE="/var/run/$DAEMON.pid" + +DOMOTICZ_ARGS="-daemon -www 8080 -sslwww 443" + +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" start() { - printf "Starting $NAME: " - start-stop-daemon -S -q -m -b -p $PIDFILE --exec $DAEMON -- $DAEMON_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/opt/domoticz/$DAEMON" \ + -- $DOMOTICZ_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" } + stop() { - printf "Stopping $NAME: " - start-stop-daemon -K -q -p $PIDFILE - [ $? = 0 ] && echo "OK" || echo "FAIL" + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" } + restart() { stop + sleep 1 start } case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac - -exit $? diff --git a/buildroot/package/domoticz/domoticz.hash b/buildroot/package/domoticz/domoticz.hash index 106d242d0..320028ac5 100644 --- a/buildroot/package/domoticz/domoticz.hash +++ b/buildroot/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c31f185a1ffac01b86a77bf33e059a4403d814e826c9d6639c63c2e9afa55a46 domoticz-4.9700.tar.gz +sha256 1903b830ed53aada66ae261d4f29a73d10c03cb5f117e4c6e7e1275620b11f4e domoticz-0f411f781ae4fb4a82f592d38a3f40578c149533.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/buildroot/package/domoticz/domoticz.mk b/buildroot/package/domoticz/domoticz.mk index 7f094d097..ab560ba05 100644 --- a/buildroot/package/domoticz/domoticz.mk +++ b/buildroot/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 4.9700 +DOMOTICZ_VERSION = 0f411f781ae4fb4a82f592d38a3f40578c149533 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt @@ -78,9 +78,6 @@ endef define DOMOTICZ_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/domoticz/domoticz.service \ $(TARGET_DIR)/usr/lib/systemd/system/domoticz.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/domoticz.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/domoticz.service endef $(eval $(cmake-package)) diff --git a/buildroot/package/dos2unix/dos2unix.hash b/buildroot/package/dos2unix/dos2unix.hash index 80b739495..41fb23429 100644 --- a/buildroot/package/dos2unix/dos2unix.hash +++ b/buildroot/package/dos2unix/dos2unix.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.4.0.tar.gz.asc -sha256 bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a dos2unix-7.4.0.tar.gz -sha256 49224e841621b52a72aa38d8ac895a396cd3fa1395190bdfc9252378001eb3c0 COPYING.txt +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.4.1.tar.gz.asc +sha256 1cd58a60b03ed28fa39046102a185c5e88c4f7665e1e0417c25de7f8b9f78623 dos2unix-7.4.1.tar.gz +sha256 af32dca9450e90b9a7a0f6408da1554466382cc81960108c59512f78a666a276 COPYING.txt diff --git a/buildroot/package/dos2unix/dos2unix.mk b/buildroot/package/dos2unix/dos2unix.mk index 0522ad167..5064b7e5b 100644 --- a/buildroot/package/dos2unix/dos2unix.mk +++ b/buildroot/package/dos2unix/dos2unix.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOS2UNIX_VERSION = 7.4.0 +DOS2UNIX_VERSION = 7.4.1 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt diff --git a/buildroot/package/dosfstools/dosfstools.hash b/buildroot/package/dosfstools/dosfstools.hash index 2515ea68c..d5f396f69 100644 --- a/buildroot/package/dosfstools/dosfstools.hash +++ b/buildroot/package/dosfstools/dosfstools.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature sha256 e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173 dosfstools-4.1.tar.xz + +# Locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index eac675505..28a49b13d 100644 --- a/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 d59d0c5c5225a126e5b98bf95d75e8dd368bdeeb3da2e9766dbe4fddaa9411b0 dovecot-2.3-pigeonhole-0.5.7.2.tar.gz +sha256 36da68aae5157b83e21383f711b8977e5b6f5477f369f71e7e22e76a738bbd05 dovecot-2.3-pigeonhole-0.5.9.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 43519499c..95bfa6fc4 100644 --- a/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.7.2 +DOVECOT_PIGEONHOLE_VERSION = 0.5.9 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 diff --git a/buildroot/package/dovecot/0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch b/buildroot/package/dovecot/0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch new file mode 100644 index 000000000..686ed7383 --- /dev/null +++ b/buildroot/package/dovecot/0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch @@ -0,0 +1,30 @@ +From 40851dc3471809cabe8cc3f9b71980f8d82344ae Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 4 Jan 2020 14:39:39 +0100 +Subject: [PATCH] lib-ssl-iostream: Do not build static test-iostream-ssl + +Fixes broken static build: +https://dovecot.org/pipermail/dovecot/2019-October/117326.html + +Patch sent upstream: https://github.com/dovecot/core/pull/111 + +Signed-off-by: Bernd Kuhls +--- + src/lib-ssl-iostream/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/lib-ssl-iostream/Makefile.am b/src/lib-ssl-iostream/Makefile.am +index 94ead5cec..5aaea5d51 100644 +--- a/src/lib-ssl-iostream/Makefile.am ++++ b/src/lib-ssl-iostream/Makefile.am +@@ -46,7 +46,6 @@ test_libs = \ + ../lib/liblib.la + + test_iostream_ssl_SOURCES = test-iostream-ssl.c +-test_iostream_ssl_LDFLAGS = -static + test_iostream_ssl_LDADD = $(test_libs) $(SSL_LIBS) $(DLLIB) + test_iostream_ssl_DEPENDENCIES = $(test_libs) + +-- +2.20.1 + diff --git a/buildroot/package/dovecot/dovecot.hash b/buildroot/package/dovecot/dovecot.hash index 3d78af009..e61937495 100644 --- a/buildroot/package/dovecot/dovecot.hash +++ b/buildroot/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 666ce084760a47e601d49a9be3c7993c48789d332631e8dfb45f443b367b1260 dovecot-2.3.7.2.tar.gz +sha256 f89fb69423fc5bdc05955c8fc0607eab9e33511f9a643b721763db6156c49651 dovecot-2.3.9.3.tar.gz sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/buildroot/package/dovecot/dovecot.mk b/buildroot/package/dovecot/dovecot.mk index 65c2bcef6..9f89ce635 100644 --- a/buildroot/package/dovecot/dovecot.mk +++ b/buildroot/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).7.2 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).9.3 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 @@ -14,6 +14,10 @@ DOVECOT_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ openssl +# 0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch +DOVECOT_AUTORECONF = YES +# add host-gettext for AM_ICONV macro +DOVECOT_DEPENDENCIES += host-gettext DOVECOT_CONF_ENV = \ RPCGEN=__disable_RPCGEN_rquota \ diff --git a/buildroot/package/doxygen/Config.in.host b/buildroot/package/doxygen/Config.in.host new file mode 100644 index 000000000..3a06199c9 --- /dev/null +++ b/buildroot/package/doxygen/Config.in.host @@ -0,0 +1,12 @@ +config BR2_PACKAGE_HOST_DOXYGEN + bool "host doxygen" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++14 + help + Doxygen is the de facto standard tool for generating + documentation from annotated C++ sources, but it also + supports other popular programming languages such as C, + Objective-C, C#, PHP, Java, Python, IDL (Corba, Microsoft, + and UNO/OpenOffice flavors), Fortran, VHDL, Tcl, and to some + extent D. + + http://www.doxygen.nl/ diff --git a/buildroot/package/doxygen/doxygen.hash b/buildroot/package/doxygen/doxygen.hash index db70b74d2..90d4e978b 100644 --- a/buildroot/package/doxygen/doxygen.hash +++ b/buildroot/package/doxygen/doxygen.hash @@ -1,2 +1,3 @@ # Computed locally -sha256 d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d doxygen-1.8.14.src.tar.gz +sha256 2cba988af2d495541cbbe5541b3bee0ee11144dcb23a81eada19f5501fd8b599 doxygen-1.8.17.src.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/doxygen/doxygen.mk b/buildroot/package/doxygen/doxygen.mk index 5e11a1d18..52e96f380 100644 --- a/buildroot/package/doxygen/doxygen.mk +++ b/buildroot/package/doxygen/doxygen.mk @@ -4,9 +4,9 @@ # ################################################################################ -DOXYGEN_VERSION = 1.8.14 +DOXYGEN_VERSION = 1.8.17 DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz -DOXYGEN_SITE = http://ftp.stack.nl/pub/users/dimitri +DOXYGEN_SITE = http://doxygen.nl/files DOXYGEN_LICENSE = GPL-2.0 DOXYGEN_LICENSE_FILES = LICENSE HOST_DOXYGEN_DEPENDENCIES = host-flex host-bison diff --git a/buildroot/package/drbd-utils/drbd-utils.hash b/buildroot/package/drbd-utils/drbd-utils.hash index bcbed1ee8..884d6790e 100644 --- a/buildroot/package/drbd-utils/drbd-utils.hash +++ b/buildroot/package/drbd-utils/drbd-utils.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 11299b555b703440ef0af2c74b69cf6dfb833e050b87cfdc3b93d0b71d8820a6 drbd-utils-9.2.0.tar.gz +sha256 e07d156ce6e3d93ac1b69fa9bf8695038e6e5edfb2c80c91a1098d1477478ecb drbd-utils-9.11.0.tar.gz +sha256 1ca3e8f71b7de618968e7ea9fe47822d9e704dc476aef8544033abedec355225 COPYING diff --git a/buildroot/package/drbd-utils/drbd-utils.mk b/buildroot/package/drbd-utils/drbd-utils.mk index bb28729b4..55ac9d9dc 100644 --- a/buildroot/package/drbd-utils/drbd-utils.mk +++ b/buildroot/package/drbd-utils/drbd-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DRBD_UTILS_VERSION = 9.2.0 +DRBD_UTILS_VERSION = 9.11.0 DRBD_UTILS_SITE = http://www.linbit.com/downloads/drbd/utils DRBD_UTILS_LICENSE = GPL-2.0+ DRBD_UTILS_LICENSE_FILES = COPYING diff --git a/buildroot/package/dropbear/0001-only-advertise-single-server-ecdsa-key-when-R-is-used.patch b/buildroot/package/dropbear/0001-only-advertise-single-server-ecdsa-key-when-R-is-used.patch deleted file mode 100644 index 1467e3bc2..000000000 --- a/buildroot/package/dropbear/0001-only-advertise-single-server-ecdsa-key-when-R-is-used.patch +++ /dev/null @@ -1,113 +0,0 @@ -# HG changeset patch -# User Matt Johnston -# Date 1520519133 -28800 -# Node ID 0dc3103a5900971d1d06d9101e062ddbd1112436 -# Parent 0f149d63068d90705db7fb52c8dea15ff32eedd7 -Only advertise a single server ecdsa key when -R (generate as required) is -specified. Fixes -R now that default ecdsa key size has changed. - -Upstream-URL: https://secure.ucc.asn.au/hg/dropbear/rev/0dc3103a5900 -Signed-off-by: Peter Korsgaard -diff -r 0f149d63068d -r 0dc3103a5900 svr-runopts.c ---- a/svr-runopts.c Thu Mar 08 22:22:11 2018 +0800 -+++ b/svr-runopts.c Thu Mar 08 22:25:33 2018 +0800 -@@ -526,8 +526,10 @@ - - void load_all_hostkeys() { - int i; -- int disable_unset_keys = 1; - int any_keys = 0; -+#ifdef DROPBEAR_ECDSA -+ int loaded_any_ecdsa = 0; -+#endif - - svr_opts.hostkey = new_sign_key(); - -@@ -552,14 +554,8 @@ - #endif - } - --#if DROPBEAR_DELAY_HOSTKEY -- if (svr_opts.delay_hostkey) { -- disable_unset_keys = 0; -- } --#endif -- - #if DROPBEAR_RSA -- if (disable_unset_keys && !svr_opts.hostkey->rsakey) { -+ if (!svr_opts.delay_hostkey && !svr_opts.hostkey->rsakey) { - disablekey(DROPBEAR_SIGNKEY_RSA); - } else { - any_keys = 1; -@@ -567,39 +563,54 @@ - #endif - - #if DROPBEAR_DSS -- if (disable_unset_keys && !svr_opts.hostkey->dsskey) { -+ if (!svr_opts.delay_hostkey && !svr_opts.hostkey->dsskey) { - disablekey(DROPBEAR_SIGNKEY_DSS); - } else { - any_keys = 1; - } - #endif - -+#if DROPBEAR_ECDSA -+ /* We want to advertise a single ecdsa algorithm size. -+ - If there is a ecdsa hostkey at startup we choose that that size. -+ - If we generate at runtime we choose the default ecdsa size. -+ - Otherwise no ecdsa keys will be advertised */ - --#if DROPBEAR_ECDSA -+ /* check if any keys were loaded at startup */ -+ loaded_any_ecdsa = -+ 0 - #if DROPBEAR_ECC_256 -- if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 256) -- && !svr_opts.hostkey->ecckey256) { -+ || svr_opts.hostkey->ecckey256 -+#endif -+#if DROPBEAR_ECC_384 -+ || svr_opts.hostkey->ecckey384 -+#endif -+#if DROPBEAR_ECC_521 -+ || svr_opts.hostkey->ecckey521 -+#endif -+ ; -+ any_keys |= loaded_any_ecdsa; -+ -+ /* Or an ecdsa key could be generated at runtime */ -+ any_keys |= svr_opts.delay_hostkey; -+ -+ /* At most one ecdsa key size will be left enabled */ -+#if DROPBEAR_ECC_256 -+ if (!svr_opts.hostkey->ecckey256 -+ && (!svr_opts.delay_hostkey || loaded_any_ecdsa || ECDSA_DEFAULT_SIZE != 256 )) { - disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP256); -- } else { -- any_keys = 1; - } - #endif -- - #if DROPBEAR_ECC_384 -- if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 384) -- && !svr_opts.hostkey->ecckey384) { -+ if (!svr_opts.hostkey->ecckey384 -+ && (!svr_opts.delay_hostkey || loaded_any_ecdsa || ECDSA_DEFAULT_SIZE != 384 )) { - disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP384); -- } else { -- any_keys = 1; - } - #endif -- - #if DROPBEAR_ECC_521 -- if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 521) -- && !svr_opts.hostkey->ecckey521) { -+ if (!svr_opts.hostkey->ecckey521 -+ && (!svr_opts.delay_hostkey || loaded_any_ecdsa || ECDSA_DEFAULT_SIZE != 521 )) { - disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP521); -- } else { -- any_keys = 1; - } - #endif - #endif /* DROPBEAR_ECDSA */ - diff --git a/buildroot/package/dropbear/0002-Wait-to-fail-invalid-usernames.patch b/buildroot/package/dropbear/0002-Wait-to-fail-invalid-usernames.patch deleted file mode 100644 index 958ac9921..000000000 --- a/buildroot/package/dropbear/0002-Wait-to-fail-invalid-usernames.patch +++ /dev/null @@ -1,236 +0,0 @@ -From 52adbb34c32d3e2e1bcdb941e20a6f81138b8248 Mon Sep 17 00:00:00 2001 -From: Matt Johnston -Date: Thu, 23 Aug 2018 23:43:12 +0800 -Subject: [PATCH] Wait to fail invalid usernames - -[hg: https://secure.ucc.asn.au/hg/dropbear/rev/5d2d1021ca00] -Signed-off-by: Peter Korsgaard ---- - auth.h | 6 +++--- - svr-auth.c | 19 +++++-------------- - svr-authpam.c | 26 ++++++++++++++++++++++---- - svr-authpasswd.c | 27 ++++++++++++++------------- - svr-authpubkey.c | 11 ++++++++++- - 5 files changed, 54 insertions(+), 35 deletions(-) - -diff --git a/auth.h b/auth.h -index da498f5..98f5468 100644 ---- a/auth.h -+++ b/auth.h -@@ -37,9 +37,9 @@ void recv_msg_userauth_request(void); - void send_msg_userauth_failure(int partial, int incrfail); - void send_msg_userauth_success(void); - void send_msg_userauth_banner(const buffer *msg); --void svr_auth_password(void); --void svr_auth_pubkey(void); --void svr_auth_pam(void); -+void svr_auth_password(int valid_user); -+void svr_auth_pubkey(int valid_user); -+void svr_auth_pam(int valid_user); - - #if DROPBEAR_SVR_PUBKEY_OPTIONS_BUILT - int svr_pubkey_allows_agentfwd(void); -diff --git a/svr-auth.c b/svr-auth.c -index c19c090..edde86b 100644 ---- a/svr-auth.c -+++ b/svr-auth.c -@@ -149,10 +149,8 @@ void recv_msg_userauth_request() { - if (methodlen == AUTH_METHOD_PASSWORD_LEN && - strncmp(methodname, AUTH_METHOD_PASSWORD, - AUTH_METHOD_PASSWORD_LEN) == 0) { -- if (valid_user) { -- svr_auth_password(); -- goto out; -- } -+ svr_auth_password(valid_user); -+ goto out; - } - } - #endif -@@ -164,10 +162,8 @@ void recv_msg_userauth_request() { - if (methodlen == AUTH_METHOD_PASSWORD_LEN && - strncmp(methodname, AUTH_METHOD_PASSWORD, - AUTH_METHOD_PASSWORD_LEN) == 0) { -- if (valid_user) { -- svr_auth_pam(); -- goto out; -- } -+ svr_auth_pam(valid_user); -+ goto out; - } - } - #endif -@@ -177,12 +173,7 @@ void recv_msg_userauth_request() { - if (methodlen == AUTH_METHOD_PUBKEY_LEN && - strncmp(methodname, AUTH_METHOD_PUBKEY, - AUTH_METHOD_PUBKEY_LEN) == 0) { -- if (valid_user) { -- svr_auth_pubkey(); -- } else { -- /* pubkey has no failure delay */ -- send_msg_userauth_failure(0, 0); -- } -+ svr_auth_pubkey(valid_user); - goto out; - } - #endif -diff --git a/svr-authpam.c b/svr-authpam.c -index 05e4f3e..d201bc9 100644 ---- a/svr-authpam.c -+++ b/svr-authpam.c -@@ -178,13 +178,14 @@ pamConvFunc(int num_msg, - * Keyboard interactive would be a lot nicer, but since PAM is synchronous, it - * gets very messy trying to send the interactive challenges, and read the - * interactive responses, over the network. */ --void svr_auth_pam() { -+void svr_auth_pam(int valid_user) { - - struct UserDataS userData = {NULL, NULL}; - struct pam_conv pamConv = { - pamConvFunc, - &userData /* submitted to pamvConvFunc as appdata_ptr */ - }; -+ const char* printable_user = NULL; - - pam_handle_t* pamHandlep = NULL; - -@@ -204,12 +205,23 @@ void svr_auth_pam() { - - password = buf_getstring(ses.payload, &passwordlen); - -+ /* We run the PAM conversation regardless of whether the username is valid -+ in case the conversation function has an inherent delay. -+ Use ses.authstate.username rather than ses.authstate.pw_name. -+ After PAM succeeds we then check the valid_user flag too */ -+ - /* used to pass data to the PAM conversation function - don't bother with - * strdup() etc since these are touched only by our own conversation - * function (above) which takes care of it */ -- userData.user = ses.authstate.pw_name; -+ userData.user = ses.authstate.username; - userData.passwd = password; - -+ if (ses.authstate.pw_name) { -+ printable_user = ses.authstate.pw_name; -+ } else { -+ printable_user = ""; -+ } -+ - /* Init pam */ - if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { - dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s", -@@ -242,7 +254,7 @@ void svr_auth_pam() { - rc, pam_strerror(pamHandlep, rc)); - dropbear_log(LOG_WARNING, - "Bad PAM password attempt for '%s' from %s", -- ses.authstate.pw_name, -+ printable_user, - svr_ses.addrstring); - send_msg_userauth_failure(0, 1); - goto cleanup; -@@ -253,12 +265,18 @@ void svr_auth_pam() { - rc, pam_strerror(pamHandlep, rc)); - dropbear_log(LOG_WARNING, - "Bad PAM password attempt for '%s' from %s", -- ses.authstate.pw_name, -+ printable_user, - svr_ses.addrstring); - send_msg_userauth_failure(0, 1); - goto cleanup; - } - -+ if (!valid_user) { -+ /* PAM auth succeeded but the username isn't allowed in for another reason -+ (checkusername() failed) */ -+ send_msg_userauth_failure(0, 1); -+ } -+ - /* successful authentication */ - dropbear_log(LOG_NOTICE, "PAM password auth succeeded for '%s' from %s", - ses.authstate.pw_name, -diff --git a/svr-authpasswd.c b/svr-authpasswd.c -index bdee2aa..69c7d8a 100644 ---- a/svr-authpasswd.c -+++ b/svr-authpasswd.c -@@ -48,22 +48,14 @@ static int constant_time_strcmp(const char* a, const char* b) { - - /* Process a password auth request, sending success or failure messages as - * appropriate */ --void svr_auth_password() { -+void svr_auth_password(int valid_user) { - - char * passwdcrypt = NULL; /* the crypt from /etc/passwd or /etc/shadow */ - char * testcrypt = NULL; /* crypt generated from the user's password sent */ -- char * password; -+ char * password = NULL; - unsigned int passwordlen; -- - unsigned int changepw; - -- passwdcrypt = ses.authstate.pw_passwd; -- --#ifdef DEBUG_HACKCRYPT -- /* debugging crypt for non-root testing with shadows */ -- passwdcrypt = DEBUG_HACKCRYPT; --#endif -- - /* check if client wants to change password */ - changepw = buf_getbool(ses.payload); - if (changepw) { -@@ -73,12 +65,21 @@ void svr_auth_password() { - } - - password = buf_getstring(ses.payload, &passwordlen); -- -- /* the first bytes of passwdcrypt are the salt */ -- testcrypt = crypt(password, passwdcrypt); -+ if (valid_user) { -+ /* the first bytes of passwdcrypt are the salt */ -+ passwdcrypt = ses.authstate.pw_passwd; -+ testcrypt = crypt(password, passwdcrypt); -+ } - m_burn(password, passwordlen); - m_free(password); - -+ /* After we have got the payload contents we can exit if the username -+ is invalid. Invalid users have already been logged. */ -+ if (!valid_user) { -+ send_msg_userauth_failure(0, 1); -+ return; -+ } -+ - if (testcrypt == NULL) { - /* crypt() with an invalid salt like "!!" */ - dropbear_log(LOG_WARNING, "User account '%s' is locked", -diff --git a/svr-authpubkey.c b/svr-authpubkey.c -index aa6087c..ff481c8 100644 ---- a/svr-authpubkey.c -+++ b/svr-authpubkey.c -@@ -79,7 +79,7 @@ static int checkfileperm(char * filename); - - /* process a pubkey auth request, sending success or failure message as - * appropriate */ --void svr_auth_pubkey() { -+void svr_auth_pubkey(int valid_user) { - - unsigned char testkey; /* whether we're just checking if a key is usable */ - char* algo = NULL; /* pubkey algo */ -@@ -102,6 +102,15 @@ void svr_auth_pubkey() { - keybloblen = buf_getint(ses.payload); - keyblob = buf_getptr(ses.payload, keybloblen); - -+ if (!valid_user) { -+ /* Return failure once we have read the contents of the packet -+ required to validate a public key. -+ Avoids blind user enumeration though it isn't possible to prevent -+ testing for user existence if the public key is known */ -+ send_msg_userauth_failure(0, 0); -+ goto out; -+ } -+ - /* check if the key is valid */ - if (checkpubkey(algo, algolen, keyblob, keybloblen) == DROPBEAR_FAILURE) { - send_msg_userauth_failure(0, 0); --- -2.11.0 - diff --git a/buildroot/package/dropbear/0003-Fix-for-issue-successfull-login-of-disabled-user-78.patch b/buildroot/package/dropbear/0003-Fix-for-issue-successfull-login-of-disabled-user-78.patch deleted file mode 100644 index b3cec4c08..000000000 --- a/buildroot/package/dropbear/0003-Fix-for-issue-successfull-login-of-disabled-user-78.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a0aa2749813331134452f80bb8a808bdc871ba41 Mon Sep 17 00:00:00 2001 -From: vincentto13 <33652988+vincentto13@users.noreply.github.com> -Date: Wed, 20 Mar 2019 15:03:40 +0100 -Subject: [PATCH] Fix for issue successfull login of disabled user (#78) - -This commit introduces fix for scenario: -1. Root login disabled on dropbear -2. PAM authentication model enabled - -While login as root user, after prompt for password -user is being notified about login failrue, but -after second attempt of prompt for password within -same session, login becames succesfull. - -Signed-off-by: Pawel Rapkiewicz -Signed-off-by: Peter Korsgaard ---- - svr-authpam.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/svr-authpam.c b/svr-authpam.c -index d201bc9..e236db4 100644 ---- a/svr-authpam.c -+++ b/svr-authpam.c -@@ -275,6 +275,7 @@ void svr_auth_pam(int valid_user) { - /* PAM auth succeeded but the username isn't allowed in for another reason - (checkusername() failed) */ - send_msg_userauth_failure(0, 1); -+ goto cleanup; - } - - /* successful authentication */ --- -2.11.0 - diff --git a/buildroot/package/dropbear/Config.in b/buildroot/package/dropbear/Config.in index 62f77bad9..e14a670c1 100644 --- a/buildroot/package/dropbear/Config.in +++ b/buildroot/package/dropbear/Config.in @@ -66,4 +66,11 @@ config BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO DSA public keys Diffie-Hellman Group1 key exchange +config BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE + string "path to custom localoptions.h definitions file" + help + Path to a file whose contents will be appended to Dropbear + localoptions.h. It can be used to tweak the Dropbear + configuration. + endif diff --git a/buildroot/package/dropbear/dropbear.hash b/buildroot/package/dropbear/dropbear.hash index ef2011d90..aa0e80a20 100644 --- a/buildroot/package/dropbear/dropbear.hash +++ b/buildroot/package/dropbear/dropbear.hash @@ -1,2 +1,5 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65 dropbear-2018.76.tar.bz2 +sha256 525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4 dropbear-2019.78.tar.bz2 + +# License file, locally computed +sha256 cfa32d49e9022265375e533a4a5ef9e37d4aaa604119d612c46816aa1e59fe52 LICENSE diff --git a/buildroot/package/dropbear/dropbear.mk b/buildroot/package/dropbear/dropbear.mk index 5f99a2208..1070a410b 100644 --- a/buildroot/package/dropbear/dropbear.mk +++ b/buildroot/package/dropbear/dropbear.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPBEAR_VERSION = 2018.76 +DROPBEAR_VERSION = 2019.78 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause, BSD-3-Clause @@ -56,6 +56,7 @@ endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_SVR_PASSWORD_AUTH endif +ifneq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y) define DROPBEAR_DISABLE_LEGACY_CRYPTO echo '#define DROPBEAR_3DES 0' >> $(@D)/localoptions.h echo '#define DROPBEAR_ENABLE_CBC_MODE 0' >> $(@D)/localoptions.h @@ -63,36 +64,37 @@ define DROPBEAR_DISABLE_LEGACY_CRYPTO echo '#define DROPBEAR_DSS 0' >> $(@D)/localoptions.h echo '#define DROPBEAR_DH_GROUP1 0' >> $(@D)/localoptions.h endef -ifneq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y) DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_LEGACY_CRYPTO endif +ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),) define DROPBEAR_ENABLE_REVERSE_DNS echo '#define DO_HOST_LOOKUP 1' >> $(@D)/localoptions.h endef +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS +endif +ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y) +DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom +else define DROPBEAR_BUILD_FEATURED echo '#define DROPBEAR_SMALL_CODE 0' >> $(@D)/localoptions.h echo '#define DROPBEAR_TWOFISH128 1' >> $(@D)/localoptions.h echo '#define DROPBEAR_TWOFISH256 1' >> $(@D)/localoptions.h endef - -define DROPBEAR_DISABLE_STANDALONE - echo '#define NON_INETD_MODE 0' >> $(@D)/localoptions.h -endef +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED +DROPBEAR_DEPENDENCIES += zlib libtomcrypt +DROPBEAR_CONF_OPTS += --disable-bundled-libtom +endif define DROPBEAR_CUSTOM_PATH echo '#define DEFAULT_PATH $(BR2_SYSTEM_DEFAULT_PATH)' >>$(@D)/localoptions.h endef - DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_CUSTOM_PATH define DROPBEAR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/dropbear/dropbear.service \ $(TARGET_DIR)/usr/lib/systemd/system/dropbear.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/dropbear.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dropbear.service endef ifeq ($(BR2_USE_MMU),y) @@ -101,21 +103,12 @@ define DROPBEAR_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50dropbear endef else +define DROPBEAR_DISABLE_STANDALONE + echo '#define NON_INETD_MODE 0' >> $(@D)/localoptions.h +endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_STANDALONE endif -ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),) -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS -endif - -ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y) -DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom -else -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED -DROPBEAR_DEPENDENCIES += zlib libtomcrypt -DROPBEAR_CONF_OPTS += --disable-bundled-libtom -endif - ifneq ($(BR2_PACKAGE_DROPBEAR_WTMP),y) DROPBEAR_CONF_OPTS += --disable-wtmp endif @@ -124,6 +117,14 @@ ifneq ($(BR2_PACKAGE_DROPBEAR_LASTLOG),y) DROPBEAR_CONF_OPTS += --disable-lastlog endif +DROPBEAR_LOCALOPTIONS_FILE = $(call qstrip,$(BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE)) +ifneq ($(DROPBEAR_LOCALOPTIONS_FILE),) +define DROPBEAR_APPEND_LOCALOPTIONS_FILE + cat $(DROPBEAR_LOCALOPTIONS_FILE) >> $(@D)/localoptions.h +endef +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_APPEND_LOCALOPTIONS_FILE +endif + define DROPBEAR_INSTALL_TARGET_CMDS $(INSTALL) -m 755 $(@D)/dropbearmulti $(TARGET_DIR)/usr/sbin/dropbear for f in $(DROPBEAR_TARGET_BINS); do \ diff --git a/buildroot/package/dropwatch/0001-binutils-2.23.1.patch b/buildroot/package/dropwatch/0001-binutils-2.23.1.patch index f9f090c05..86b1822bc 100644 --- a/buildroot/package/dropwatch/0001-binutils-2.23.1.patch +++ b/buildroot/package/dropwatch/0001-binutils-2.23.1.patch @@ -1,92 +1,60 @@ -From c89cc908ba7f9f41aba4f61f58103d0fc64fa19f Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Fri, 16 Jun 2017 08:50:03 +0200 +From 0ffad73a59d3c831dfab66d4d06f1ab25fce66f2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 18 Jul 2019 22:58:07 +0200 Subject: [PATCH] Fix for binutils 2.23.1 libbfd from binutils 2.23.1+ requires PACKAGE* definitions from autoconf. -Patch from https://fedorahosted.org/dropwatch/ticket/5 -Upstream status: new. +So include config.h now that dropwatch uses autoconf Signed-off-by: Gustavo Zacarias +[Retrieved (and slightly updated) from: +https://git.buildroot.net/buildroot/tree/package/dropwatch/0001-binutils-2.23.1.patch] +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/nhorman/dropwatch/commit/0ffad73a59d3c831dfab66d4d06f1ab25fce66f2] --- - src/lookup.c | 2 +- - src/lookup.h | 3 +++ - src/lookup_bfd.c | 2 +- - src/lookup_kas.c | 2 +- - 4 files changed, 6 insertions(+), 3 deletions(-) + src/lookup.c | 3 +++ + src/lookup_bfd.c | 2 ++ + src/lookup_kas.c | 2 ++ + 3 files changed, 7 insertions(+) diff --git a/src/lookup.c b/src/lookup.c -index ba54991..809981b 100644 +index ba54991..521e292 100644 --- a/src/lookup.c +++ b/src/lookup.c -@@ -27,13 +27,13 @@ +@@ -24,6 +24,9 @@ + * 1) /usr/lib/debug/ using libbfd + * 2) /proc/kallsyms + */ ++ ++#include "config.h" ++ #include #include #include --#include - #include - #include - #include - #include - - #include "lookup.h" -+#include - - extern struct lookup_methods bfd_methods; - extern struct lookup_methods kallsym_methods; -diff --git a/src/lookup.h b/src/lookup.h -index e6568d8..47a7b56 100644 ---- a/src/lookup.h -+++ b/src/lookup.h -@@ -28,6 +28,9 @@ - #include - #include - -+// satisfy PR 14072 in bfd.h -+#define PACKAGE 1 -+#define PACKAGE_VERSION 1 - - /* - * Initalization routine diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c -index cc7010b..271d426 100644 +index cc7010b..2c08e5e 100644 --- a/src/lookup_bfd.c +++ b/src/lookup_bfd.c -@@ -25,13 +25,13 @@ +@@ -22,6 +22,8 @@ + * symbollic name using the bfd library + */ + ++#include "config.h" ++ #include #include #include --#include - #include - #include - #include - #include - - #include "lookup.h" -+#include - - - static int lookup_bfd_init(void) diff --git a/src/lookup_kas.c b/src/lookup_kas.c -index 16e639f..556cb62 100644 +index 5e05630..2300220 100644 --- a/src/lookup_kas.c +++ b/src/lookup_kas.c -@@ -25,7 +25,6 @@ +@@ -22,6 +22,8 @@ + * symbolic name using /proc/kallsyms + */ + ++#include "config.h" ++ #include #include - #include --#include - #include - #include - #include -@@ -33,6 +32,7 @@ - #include - - #include "lookup.h" -+#include - - struct symbol_entry { - char *sym_name; --- -2.1.4 - + #include diff --git a/buildroot/package/dropwatch/0002-Make-binutils-optional.patch b/buildroot/package/dropwatch/0002-Make-binutils-optional.patch new file mode 100644 index 000000000..2694e99b6 --- /dev/null +++ b/buildroot/package/dropwatch/0002-Make-binutils-optional.patch @@ -0,0 +1,146 @@ +From a9d1b6adb4e47ae89d55274ff3f7121122e15975 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 1 Aug 2019 17:42:16 +0200 +Subject: [PATCH] Make binutils optional + +Add an option to enable or disable bfd support to allow the user to use +dropwatch without binutils + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/nhorman/dropwatch/pull/10] +--- + configure.ac | 10 ++++++++++ + src/Makefile.am | 9 +++++++-- + src/lookup.c | 8 ++++++++ + src/lookup.h | 4 ++++ + src/lookup_kas.c | 1 - + 5 files changed, 29 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 97e21fe..c01a9f4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,15 @@ PKG_CHECK_MODULES([LIBNL3], [libnl-3.0], [], [AC_MSG_ERROR([libnl-3.0 is require + # Fallback on using -lreadline as readline.pc is only available since version 8.0 + PKG_CHECK_MODULES([READLINE], [readline], [], [READLINE_LIBS=-lreadline]) + ++AC_ARG_WITH([bfd], ++ [AS_HELP_STRING([--without-bfd], [Build without bfd library (default: yes)])], ++ [with_bfd=$withval], ++ [with_bfd=yes]) ++AS_IF([test "x$with_bfd" != "xno"], [ ++ AC_CHECK_HEADERS([bfd.h], [], [AC_MSG_ERROR([Couldn't find or include bfd.h])]) ++]) ++AM_CONDITIONAL(USE_BFD, test "x$with_bfd" != "xno") ++ + AC_OUTPUT(Makefile src/Makefile doc/Makefile tests/Makefile) + + AC_MSG_NOTICE() +@@ -25,3 +34,4 @@ AC_MSG_NOTICE([Target: $target]) + AC_MSG_NOTICE([Installation prefix: $prefix]) + AC_MSG_NOTICE([Compiler: $CC]) + AC_MSG_NOTICE([Compiler flags: $CFLAGS]) ++AC_MSG_NOTICE([BFD library support: $with_bfd]) +diff --git a/src/Makefile.am b/src/Makefile.am +index 16db0b4..994fbd8 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,7 +2,12 @@ + bin_PROGRAMS = dropwatch + + AM_CFLAGS = -g -Wall -Werror $(LIBNL3_CFLAGS) $(READLINE_CFLAGS) +-AM_LDFLAGS = $(LIBNL3_LIBS) -lnl-genl-3 -lbfd $(READLINE_LIBS) ++AM_LDFLAGS = $(LIBNL3_LIBS) -lnl-genl-3 $(READLINE_LIBS) + AM_CPPFLAGS = -D_GNU_SOURCE + +-dropwatch_SOURCES = main.c lookup_bfd.c lookup.c lookup_kas.c ++dropwatch_SOURCES = main.c lookup.c lookup_kas.c ++ ++if USE_BFD ++dropwatch_SOURCES += lookup_bfd.c ++AM_LDFLAGS += -lbfd ++endif +diff --git a/src/lookup.c b/src/lookup.c +index 521e292..ec5e847 100644 +--- a/src/lookup.c ++++ b/src/lookup.c +@@ -30,7 +30,9 @@ + #include + #include + #include ++#ifdef HAVE_BFD_H + #include ++#endif + #include + #include + #include +@@ -38,7 +40,9 @@ + + #include "lookup.h" + ++#ifdef HAVE_BFD_H + extern struct lookup_methods bfd_methods; ++#endif + extern struct lookup_methods kallsym_methods; + + static int lookup_null_init(void) +@@ -75,17 +79,21 @@ int init_lookup(lookup_init_method_t method) + methods = &null_methods; + break; + case METHOD_AUTO: ++#ifdef HAVE_BFD_H + methods = &bfd_methods; + if (methods->lookup_init() == 0) + return 0; ++#endif + methods = &kallsym_methods; + if (methods->lookup_init() == 0) + return 0; + methods = NULL; + return -1; ++#ifdef HAVE_BFD_H + case METHOD_DEBUGINFO: + methods = &bfd_methods; + break; ++#endif + case METHOD_KALLSYMS: + methods = &kallsym_methods; + break; +diff --git a/src/lookup.h b/src/lookup.h +index e6568d8..2c56a92 100644 +--- a/src/lookup.h ++++ b/src/lookup.h +@@ -25,6 +25,8 @@ + * 2) /proc/kallsyms + */ + ++#include "config.h" ++ + #include + #include + +@@ -44,7 +46,9 @@ + typedef enum { + METHOD_NULL = 0, + METHOD_AUTO, ++#ifdef HAVE_BFD_H + METHOD_DEBUGINFO, ++#endif + METHOD_KALLSYMS + } lookup_init_method_t; + +diff --git a/src/lookup_kas.c b/src/lookup_kas.c +index 2300220..9a1a148 100644 +--- a/src/lookup_kas.c ++++ b/src/lookup_kas.c +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + #include + #include + #include +-- +2.20.1 + diff --git a/buildroot/package/dropwatch/0002-remove-werror.patch b/buildroot/package/dropwatch/0002-remove-werror.patch deleted file mode 100644 index 4b6c98936..000000000 --- a/buildroot/package/dropwatch/0002-remove-werror.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2462baf55939ee53bb28ff5f9474761f2a888add Mon Sep 17 00:00:00 2001 -From: Markos Chandras -Date: Fri, 16 Jun 2017 08:53:31 +0200 -Subject: [PATCH] remove werror - --Werror shouldn't be used in released code since it can -cause random build failures on moderate warnings. It also -depends on the used toolchain since different toolchains may -or may not print the same warnings. - -Signed-off-by: Markos Chandras ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 5bc6aaa..527c1da 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -1,7 +1,7 @@ - all: dropwatch - - CPPFLAGS += -D_GNU_SOURCE --CFLAGS += -g -Wall -Werror $(shell pkg-config --cflags libnl-3.0) -+CFLAGS += -g -Wall $(shell pkg-config --cflags libnl-3.0) - LDLIBS += -lbfd -lreadline -lnl-3 -lnl-genl-3 - - OBJFILES := main.o lookup.o\ --- -2.1.4 - diff --git a/buildroot/package/dropwatch/Config.in b/buildroot/package/dropwatch/Config.in index f470f1b56..cf11a03d4 100644 --- a/buildroot/package/dropwatch/Config.in +++ b/buildroot/package/dropwatch/Config.in @@ -1,17 +1,13 @@ config BR2_PACKAGE_DROPWATCH bool "dropwatch" - depends on !BR2_nios2 # binutils - depends on BR2_USE_WCHAR # binutils depends on BR2_TOOLCHAIN_HAS_THREADS # libnl - select BR2_PACKAGE_BINUTILS select BR2_PACKAGE_READLINE select BR2_PACKAGE_LIBNL help Dropwatch is an interactive utility for monitoring and recording packets that are dropped by the kernel - http://git.infradead.org/users/nhorman/dropwatch.git + https://github.com/nhorman/dropwatch -comment "dropwatch needs a toolchain w/ threads, wchar" - depends on !BR2_nios2 - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "dropwatch needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/dropwatch/dropwatch.hash b/buildroot/package/dropwatch/dropwatch.hash index 585b035d0..e0e03ad88 100644 --- a/buildroot/package/dropwatch/dropwatch.hash +++ b/buildroot/package/dropwatch/dropwatch.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 4937007da3d0071c9a37ee0360cfd1657b342fd2a327d83ba992fbf3e0ea51b5 dropwatch-7c33d8a8ed105b07a46b55d71d93b36ed34c16db.tar.gz +sha256 3a95b7ff0d609f581c120a4072e6a97d044f900824b4f4d3ac83fdcc5f3e96cf dropwatch-1.5.1.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/dropwatch/dropwatch.mk b/buildroot/package/dropwatch/dropwatch.mk index 692a6e8c4..c5873ccf7 100644 --- a/buildroot/package/dropwatch/dropwatch.mk +++ b/buildroot/package/dropwatch/dropwatch.mk @@ -4,27 +4,17 @@ # ################################################################################ -DROPWATCH_VERSION = 7c33d8a8ed105b07a46b55d71d93b36ed34c16db -DROPWATCH_SITE = git://git.infradead.org/users/nhorman/dropwatch.git -DROPWATCH_DEPENDENCIES = binutils libnl readline host-pkgconf \ - $(TARGET_NLS_DEPENDENCIES) -DROPWATCH_LICENSE = GPL-2.0 +DROPWATCH_VERSION = 1.5.1 +DROPWATCH_SITE = $(call github,nhorman,dropwatch,v$(DROPWATCH_VERSION)) +DROPWATCH_DEPENDENCIES = libnl readline host-pkgconf $(TARGET_NLS_DEPENDENCIES) +# Until upstream updates their tree with a proper license +# blurb: https://github.com/nhorman/dropwatch/issues/14 +DROPWATCH_LICENSE = GPL-2.0+ DROPWATCH_LICENSE_FILES = COPYING +# From git +DROPWATCH_AUTORECONF = YES -# libbfd may be linked to libintl -# Ugly... but LDLIBS are hardcoded anyway -DROPWATCH_LDLIBS = \ - -lbfd -lreadline -lnl-3 -lnl-genl-3 -lpthread -lncurses -lm \ - $(TARGET_NLS_LIBS) +DROPWATCH_CONF_OPTS = --without-bfd +DROPWATCH_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS) -define DROPWATCH_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - LDLIBS="$(DROPWATCH_LDLIBS)" build -endef - -define DROPWATCH_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/dropwatch \ - $(TARGET_DIR)/usr/bin/dropwatch -endef - -$(eval $(generic-package)) +$(eval $(autotools-package)) diff --git a/buildroot/package/dstat/Config.in b/buildroot/package/dstat/Config.in index 110aee844..647a7033c 100644 --- a/buildroot/package/dstat/Config.in +++ b/buildroot/package/dstat/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_DSTAT depends on BR2_USE_MMU # python depends on BR2_TOOLCHAIN_HAS_THREADS # python depends on !BR2_STATIC_LIBS # python - select BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON help Dstat, written in Python, is a versatile replacement for vmstat, iostat, netstat and ifstat. Dstat overcomes some of diff --git a/buildroot/package/dstat/dstat.hash b/buildroot/package/dstat/dstat.hash index a4dbcc981..603bd506f 100644 --- a/buildroot/package/dstat/dstat.hash +++ b/buildroot/package/dstat/dstat.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 46e63821857b69fbc60cb2c7d893ccdd6f31cd9ef24b8bb0b68951e1c7374898 dstat-0.7.3.tar.gz +sha256 4fbd58f3461c86d09a3ab97472aa204de37aa33d31a0493a3e5ed86a2045abea dstat-0.7.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/dstat/dstat.mk b/buildroot/package/dstat/dstat.mk index 9c4b44576..6f01a3713 100644 --- a/buildroot/package/dstat/dstat.mk +++ b/buildroot/package/dstat/dstat.mk @@ -4,8 +4,8 @@ # ################################################################################ -DSTAT_VERSION = 0.7.3 -DSTAT_SITE = $(call github,dagwieers,dstat,$(DSTAT_VERSION)) +DSTAT_VERSION = 0.7.4 +DSTAT_SITE = $(call github,dagwieers,dstat,v$(DSTAT_VERSION)) DSTAT_LICENSE = GPL-2.0 DSTAT_LICENSE_FILES = COPYING diff --git a/buildroot/package/dt-utils/0001-src-fix-compilation-for-glibc-version-2.27.9000-36.f.patch b/buildroot/package/dt-utils/0001-src-fix-compilation-for-glibc-version-2.27.9000-36.f.patch deleted file mode 100644 index 8c2f58594..000000000 --- a/buildroot/package/dt-utils/0001-src-fix-compilation-for-glibc-version-2.27.9000-36.f.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 1c80e31872aec9f2ef7eca6a52aa89c0ea759d8f Mon Sep 17 00:00:00 2001 -From: Enrico Joerns -Date: Wed, 5 Sep 2018 12:28:28 +0200 -Subject: [PATCH] src: fix compilation for glibc version 2.27.9000-36.fc29 and - newer - -As recent glibc versions (>= 2.27.9000-36.fc29) also define 'struct -statx' which is also defined in linux/stat.h, compilation fails with -error: - -| In file included from ../dt-utils-2018.05.0/src/crypto/digest.c:24: -| [..]/usr/include/linux/stat.h:56:8: error: redefinition of 'struct statx_timestamp' -| struct statx_timestamp { -| ^~~~~~~~~~~~~~~ -| In file included from [..]/usr/include/sys/stat.h:446, -| from ../dt-utils-2018.05.0/src/dt/common.h:15, -| from ../dt-utils-2018.05.0/src/crypto/digest.c:19: -| [..]/usr/include/bits/statx.h:25:8: note: originally defined here -| struct statx_timestamp -| ^~~~~~~~~~~~~~~ -| In file included from ../dt-utils-2018.05.0/src/crypto/digest.c:24: -| [..]/usr/include/linux/stat.h:99:8: error: redefinition of 'struct statx' -| struct statx { -| ^~~~~ -| In file included from [..]/usr/include/sys/stat.h:446, -| from ../dt-utils-2018.05.0/src/dt/common.h:15, -| from ../dt-utils-2018.05.0/src/crypto/digest.c:19: -| [..]/usr/include/bits/statx.h:36:8: note: originally defined here -| struct statx -| ^~~~~ - -The linux/stat.h originates from the code that was copied from barebox -but is not explicitly required to be linux/stat.h instead of sys/stat.h -and we do not actually use struct statx. - -Thus it is safe to simply replace occurrences of linux/stat.h by -sys/stat.h to fix compilation. - -Signed-off-by: Enrico Joerns -[Thomas: backport from upstream.] -Signed-off-by: Thomas Petazzoni ---- - src/barebox-state/backend_storage.c | 2 +- - src/crypto/digest.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/barebox-state/backend_storage.c b/src/barebox-state/backend_storage.c -index 53fe829..1052656 100644 ---- a/src/barebox-state/backend_storage.c -+++ b/src/barebox-state/backend_storage.c -@@ -19,7 +19,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/src/crypto/digest.c b/src/crypto/digest.c -index 7a8c3c0..8353412 100644 ---- a/src/crypto/digest.c -+++ b/src/crypto/digest.c -@@ -21,7 +21,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include --- -2.19.2 - diff --git a/buildroot/package/dt-utils/dt-utils.hash b/buildroot/package/dt-utils/dt-utils.hash index 5805adf36..3610fe164 100644 --- a/buildroot/package/dt-utils/dt-utils.hash +++ b/buildroot/package/dt-utils/dt-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d0f53c76bc9f821a6506c8db3b623922d82570a017a9a40ad118bd7c957672b6 dt-utils-v2018.05.0.tar.gz +sha256 61440ab222543268923175eb5c7425076d2b8bce4c1dfc177f2eb3873449af7c dt-utils-v2019.01.0.tar.gz sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING diff --git a/buildroot/package/dt-utils/dt-utils.mk b/buildroot/package/dt-utils/dt-utils.mk index 3dbadc7b9..25c287d43 100644 --- a/buildroot/package/dt-utils/dt-utils.mk +++ b/buildroot/package/dt-utils/dt-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DT_UTILS_VERSION = v2018.05.0 +DT_UTILS_VERSION = v2019.01.0 DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils DT_UTILS_SITE_METHOD = git DT_UTILS_LICENSE = GPL-2.0 diff --git a/buildroot/package/dt/dt.hash b/buildroot/package/dt/dt.hash index 7cd8c643e..9c1102579 100644 --- a/buildroot/package/dt/dt.hash +++ b/buildroot/package/dt/dt.hash @@ -1,5 +1,7 @@ # From http://pkgs.fedoraproject.org/repo/pkgs/dt/dt-source-v18.32.tar.gz # (directory name is md5 hash) md5 3054aeaaba047a1dbe90c2132a382ee2 dt-source-v18.32.tar.gz -# Calculated based on the hash above + +# Locally calculated sha256 10d164676e918a4d07f233bcd11e4cb6bfd1052c996182cd1827ccd0c063fcc6 dt-source-v18.32.tar.gz +sha256 49f47f20de4b44dc3505ed0cc55bfbfe0fc3e41956ab546f1eeedcf554def54c LICENSE diff --git a/buildroot/package/dt/dt.mk b/buildroot/package/dt/dt.mk index 8ec778888..1963a7ecc 100644 --- a/buildroot/package/dt/dt.mk +++ b/buildroot/package/dt/dt.mk @@ -4,9 +4,9 @@ # ################################################################################ -DT_VERSION = v18.32 +DT_VERSION = 18.32 DT_SITE = http://pkgs.fedoraproject.org/repo/pkgs/dt/$(DT_SOURCE)/3054aeaaba047a1dbe90c2132a382ee2 -DT_SOURCE = dt-source-$(DT_VERSION).tar.gz +DT_SOURCE = dt-source-v$(DT_VERSION).tar.gz DT_STRIP_COMPONENTS = 2 DT_LICENSE = ISC-like DT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/dtach/dtach.hash b/buildroot/package/dtach/dtach.hash index c643264f8..1a97aa35f 100644 --- a/buildroot/package/dtach/dtach.hash +++ b/buildroot/package/dtach/dtach.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 5f7e8c835ee49a9e6dcf89f4e8ccbe724b061c0fc8565b504dd8b3e67ab79f82 dtach-v0.9.tar.gz +sha256 5f7e8c835ee49a9e6dcf89f4e8ccbe724b061c0fc8565b504dd8b3e67ab79f82 dtach-0.9.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/dtach/dtach.mk b/buildroot/package/dtach/dtach.mk index 571481cdd..3cbf37e25 100644 --- a/buildroot/package/dtach/dtach.mk +++ b/buildroot/package/dtach/dtach.mk @@ -4,8 +4,8 @@ # ################################################################################ -DTACH_VERSION = v0.9 -DTACH_SITE = $(call github,crigler,dtach,$(DTACH_VERSION)) +DTACH_VERSION = 0.9 +DTACH_SITE = $(call github,crigler,dtach,v$(DTACH_VERSION)) DTACH_LICENSE = GPL-2.0+ DTACH_LICENSE_FILES = COPYING diff --git a/buildroot/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch b/buildroot/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch new file mode 100644 index 000000000..127114e86 --- /dev/null +++ b/buildroot/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch @@ -0,0 +1,67 @@ +From 086283ed7f1886de05407bc75dd4c070c78a6f50 Mon Sep 17 00:00:00 2001 +From: Lothar Felten +Date: Mon, 8 Oct 2018 13:29:44 +0200 +Subject: [PATCH] Fix include guards for older kernel/u-boot sources + +Linux kernels before 4.17 and U-Boot versions before 2018.07 use libfdt +include guards with leading underscores. + +Those have been removed in dtc-1.4.7. + +This patch handles both include guard types and allows the compilation +of older Linux kernel and u-boot sources. + +Signed-off-by: Lothar Felten +[ThomasDS: also update fdt.h which has the same issue, seen on U-Boot +2011.03] +Signed-off-by: Thomas De Schampheleire +[SB: Updated to match context change in v1.5.1] +Signed-off-by: Sam Bobroff +--- + libfdt/fdt.h | 4 ++++ + libfdt/libfdt.h | 4 ++++ + libfdt/libfdt_env.h | 4 ++++ + 3 files changed, 12 insertions(+) + +diff --git a/libfdt/fdt.h b/libfdt/fdt.h +index f2e6880..0f1dc4d 100644 +--- a/libfdt/fdt.h ++++ b/libfdt/fdt.h +@@ -1,4 +1,8 @@ + /* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) */ ++#ifdef _FDT_H ++#warning "Please consider updating your kernel and/or u-boot version" ++#define FDT_H ++#endif + #ifndef FDT_H + #define FDT_H + /* +diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h +index 8037f39..7668432 100644 +--- a/libfdt/libfdt.h ++++ b/libfdt/libfdt.h +@@ -1,4 +1,8 @@ + /* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) */ ++#ifdef _LIBFDT_H ++#warning "Please consider updating your kernel and/or u-boot version" ++#define LIBFDT_H ++#endif + #ifndef LIBFDT_H + #define LIBFDT_H + /* +diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h +index 73b6d40..b95a287 100644 +--- a/libfdt/libfdt_env.h ++++ b/libfdt/libfdt_env.h +@@ -1,4 +1,8 @@ + /* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) */ ++#ifdef _LIBFDT_ENV_H ++#warning "Please consider updating your kernel and/or u-boot version" ++#define LIBFDT_ENV_H ++#endif + #ifndef LIBFDT_ENV_H + #define LIBFDT_ENV_H + /* +-- +2.22.0.216.g00a2a96fc9 + diff --git a/buildroot/package/dtc/0001-Kill-bogus-TYPE_BLOB-marker-type.patch b/buildroot/package/dtc/0001-Kill-bogus-TYPE_BLOB-marker-type.patch deleted file mode 100644 index d9c660ef5..000000000 --- a/buildroot/package/dtc/0001-Kill-bogus-TYPE_BLOB-marker-type.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 9619c8619c37b9aea98100bcc15c51a5642e877e Mon Sep 17 00:00:00 2001 -From: Greg Kurz -Date: Thu, 30 Aug 2018 12:01:59 +0200 -Subject: [PATCH] Kill bogus TYPE_BLOB marker type - -Since commit 32b9c6130762 "Preserve datatype markers when emitting dts -format", we no longer try to guess the value type. Instead, we reuse -the type of the datatype markers when they are present, if the type -is either TYPE_UINT* or TYPE_STRING. - -This causes 'dtc -I fs' to crash: - -Starting program: /root/dtc -q -f -O dts -I fs /proc/device-tree -/dts-v1/; - -/ { - -Program received signal SIGSEGV, Segmentation fault. -__strlen_power8 () at ../sysdeps/powerpc/powerpc64/power8/strlen.S:47 -47 ld r12,0(r4) /* Load doubleword from memory. */ -(gdb) bt -#0 __strlen_power8 () at ../sysdeps/powerpc/powerpc64/power8/strlen.S:47 -#1 0x00007ffff7de3d10 in __GI__IO_fputs (str=, - fp=) at iofputs.c:33 -#2 0x000000001000c7a0 in write_propval (prop=0x100525e0, - f=0x7ffff7f718a0 <_IO_2_1_stdout_>) at treesource.c:245 - -The offending line is: - - fprintf(f, "%s", delim_start[emit_type]); - -where emit_type is TYPE_BLOB and: - -static const char *delim_start[] = { - [TYPE_UINT8] = "[", - [TYPE_UINT16] = "/bits/ 16 <", - [TYPE_UINT32] = "<", - [TYPE_UINT64] = "/bits/ 64 <", - [TYPE_STRING] = "", -}; - -/* Data blobs */ -enum markertype { - TYPE_NONE, - REF_PHANDLE, - REF_PATH, - LABEL, - TYPE_UINT8, - TYPE_UINT16, - TYPE_UINT32, - TYPE_UINT64, - TYPE_BLOB, - TYPE_STRING, -}; - -Because TYPE_BLOB < TYPE_STRING and delim_start[] is a static array, -delim_start[emit_type] is 0x0. The glibc usually prints out "(null)" -when one passes 0x0 to %s, but it seems to call fputs() internally if -the format is exactly "%s", hence the crash. - -TYPE_BLOB basically means the data comes from a file and we don't know -its type. We don't care for the former, and the latter is TYPE_NONE. - -So let's drop TYPE_BLOB completely and use TYPE_NONE instead when reading -the file. Then, try to guess the data type at emission time, like the -code already does for refs and labels. - -Instead of adding yet another check for TYPE_NONE, an helper is introduced -to check if the data marker has type information, ie, >= TYPE_UINT8. - -Fixes: 32b9c61307629ac76c6ac0bead6f926d579b3d2c -Suggested-by: David Gibson -Signed-off-by: Greg Kurz -Signed-off-by: David Gibson -Signed-off-by: Joel Stanley ---- - data.c | 2 +- - dtc.h | 1 - - treesource.c | 9 +++++++-- - 3 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/data.c b/data.c -index accdfaef6668..4a204145cc7b 100644 ---- a/data.c -+++ b/data.c -@@ -95,7 +95,7 @@ struct data data_copy_file(FILE *f, size_t maxlen) - { - struct data d = empty_data; - -- d = data_add_marker(d, TYPE_BLOB, NULL); -+ d = data_add_marker(d, TYPE_NONE, NULL); - while (!feof(f) && (d.len < maxlen)) { - size_t chunksize, ret; - -diff --git a/dtc.h b/dtc.h -index 303c2a6a73b7..51c03ef64dbe 100644 ---- a/dtc.h -+++ b/dtc.h -@@ -82,7 +82,6 @@ enum markertype { - TYPE_UINT16, - TYPE_UINT32, - TYPE_UINT64, -- TYPE_BLOB, - TYPE_STRING, - }; - extern const char *markername(enum markertype markertype); -diff --git a/treesource.c b/treesource.c -index f99544d72344..53e62036ad0e 100644 ---- a/treesource.c -+++ b/treesource.c -@@ -133,9 +133,14 @@ static void write_propval_int(FILE *f, const char *p, size_t len, size_t width) - } - } - -+static bool has_data_type_information(struct marker *m) -+{ -+ return m->type >= TYPE_UINT8; -+} -+ - static struct marker *next_type_marker(struct marker *m) - { -- while (m && (m->type == LABEL || m->type == REF_PHANDLE || m->type == REF_PATH)) -+ while (m && !has_data_type_information(m)) - m = m->next; - return m; - } -@@ -225,7 +230,7 @@ static void write_propval(FILE *f, struct property *prop) - size_t chunk_len; - const char *p = &prop->val.val[m->offset]; - -- if (m->type < TYPE_UINT8) -+ if (!has_data_type_information(m)) - continue; - - chunk_len = type_marker_length(m); --- -2.17.1 - diff --git a/buildroot/package/dtc/0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch b/buildroot/package/dtc/0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch deleted file mode 100644 index bff5f4c07..000000000 --- a/buildroot/package/dtc/0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 086283ed7f1886de05407bc75dd4c070c78a6f50 Mon Sep 17 00:00:00 2001 -From: Lothar Felten -Date: Mon, 8 Oct 2018 13:29:44 +0200 -Subject: [PATCH] Fix include guards for older kernel/u-boot sources - -Linux kernels before 4.17 and U-Boot versions before 2018.07 use libfdt -include guards with leading underscores. - -Those have been removed in dtc-1.4.7. - -This patch handles both include guard types and allows the compilation -of older Linux kernel and u-boot sources. - -Signed-off-by: Lothar Felten -[ThomasDS: also update fdt.h which has the same issue, seen on U-Boot -2011.03] -Signed-off-by: Thomas De Schampheleire ---- - libfdt/fdt.h | 4 ++++ - libfdt/libfdt.h | 4 ++++ - libfdt/libfdt_env.h | 4 ++++ - 3 files changed, 12 insertions(+) - -diff --git a/libfdt/fdt.h b/libfdt/fdt.h -index 74961f9..2904f48 100644 ---- a/libfdt/fdt.h -+++ b/libfdt/fdt.h -@@ -1,3 +1,7 @@ -+#ifdef _FDT_H -+#warning "Please consider updating your kernel and/or u-boot version" -+#define FDT_H -+#endif - #ifndef FDT_H - #define FDT_H - /* -diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h -index 830b77e..bef4566 100644 ---- a/libfdt/libfdt.h -+++ b/libfdt/libfdt.h -@@ -1,3 +1,7 @@ -+#ifdef _LIBFDT_H -+#warning "Please consider updating your kernel and/or u-boot version" -+#define LIBFDT_H -+#endif - #ifndef LIBFDT_H - #define LIBFDT_H - /* -diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h -index eb20538..6a61e6a 100644 ---- a/libfdt/libfdt_env.h -+++ b/libfdt/libfdt_env.h -@@ -1,3 +1,7 @@ -+#ifdef _LIBFDT_ENV_H -+#warning "Please consider updating your kernel and/or u-boot version" -+#define LIBFDT_ENV_H -+#endif - #ifndef LIBFDT_ENV_H - #define LIBFDT_ENV_H - /* --- -2.19.2 - diff --git a/buildroot/package/dtc/0003-checks-fix-simple-bus-compatible-matching.patch b/buildroot/package/dtc/0003-checks-fix-simple-bus-compatible-matching.patch deleted file mode 100644 index ab95214a5..000000000 --- a/buildroot/package/dtc/0003-checks-fix-simple-bus-compatible-matching.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 5277449e5fd13a2f3778ed3380ba157cb9d4ea55 Mon Sep 17 00:00:00 2001 -From: Rob Herring -Date: Thu, 20 Sep 2018 14:30:03 -0700 -Subject: [PATCH] checks: fix simple-bus compatible matching - -Since commit 7975f6422260 ("Fix widespread incorrect use of strneq(), -replace with new strprefixeq()") simple-bus checks have been silently -skipped. The problem was 'end - str' is one more than the string length -and the strnlen in strprefixeq fails. This can't be fixed simply by -subtracting one as it is possible to have multiple '\0' at the end of -the property. Fix this by making the 'compatible' property string list -check a dependency, and then we can assume the property is null -terminated and we can just use streq() for comparisons. - -Add some tests so the problem doesn't happen again. - -Fixes: 7975f6422260 ("Fix widespread incorrect use of strneq(), replace with new strprefixeq()") -Reported-by: Kumar Gala -Signed-off-by: Rob Herring -Signed-off-by: David Gibson -[Backport from upstream commit e84742aa7b934cd6603e3a64f8c0966f683c5711] -Signed-off-by: Thomas Petazzoni ---- - checks.c | 5 +++-- - tests/run_tests.sh | 4 ++++ - tests/unit-addr-simple-bus-compatible.dts | 18 ++++++++++++++++++ - tests/unit-addr-simple-bus-reg-mismatch.dts | 18 ++++++++++++++++++ - 4 files changed, 43 insertions(+), 2 deletions(-) - create mode 100644 tests/unit-addr-simple-bus-compatible.dts - create mode 100644 tests/unit-addr-simple-bus-reg-mismatch.dts - -diff --git a/checks.c b/checks.c -index a2cc103..acf91c3 100644 ---- a/checks.c -+++ b/checks.c -@@ -910,7 +910,7 @@ static bool node_is_compatible(struct node *node, const char *compat) - - for (str = prop->val.val, end = str + prop->val.len; str < end; - str += strnlen(str, end - str) + 1) { -- if (strprefixeq(str, end - str, compat)) -+ if (streq(str, compat)) - return true; - } - return false; -@@ -921,7 +921,8 @@ static void check_simple_bus_bridge(struct check *c, struct dt_info *dti, struct - if (node_is_compatible(node, "simple-bus")) - node->bus = &simple_bus; - } --WARNING(simple_bus_bridge, check_simple_bus_bridge, NULL, &addr_size_cells); -+WARNING(simple_bus_bridge, check_simple_bus_bridge, NULL, -+ &addr_size_cells, &compatible_is_string_list); - - static void check_simple_bus_reg(struct check *c, struct dt_info *dti, struct node *node) - { -diff --git a/tests/run_tests.sh b/tests/run_tests.sh -index 7348c9c..c4354d2 100755 ---- a/tests/run_tests.sh -+++ b/tests/run_tests.sh -@@ -652,6 +652,10 @@ dtc_tests () { - check_tests pci-bridge-bad1.dts pci_bridge - check_tests pci-bridge-bad2.dts pci_bridge - -+ check_tests unit-addr-simple-bus-reg-mismatch.dts simple_bus_reg -+ check_tests unit-addr-simple-bus-compatible.dts simple_bus_reg -+ -+ - # Check warning options - run_sh_test dtc-checkfails.sh address_cells_is_cell interrupt_cells_is_cell -n size_cells_is_cell -- -Wno_size_cells_is_cell -I dts -O dtb bad-ncells.dts - run_sh_test dtc-fails.sh -n test-warn-output.test.dtb -I dts -O dtb bad-ncells.dts -diff --git a/tests/unit-addr-simple-bus-compatible.dts b/tests/unit-addr-simple-bus-compatible.dts -new file mode 100644 -index 0000000..c8f9341 ---- /dev/null -+++ b/tests/unit-addr-simple-bus-compatible.dts -@@ -0,0 +1,18 @@ -+/dts-v1/; -+ -+/ { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ bus@10000000 { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ compatible = "foo-bus", "simple-bus"; -+ ranges = <0x0 0x10000000 0x10000>; -+ -+ node@100 { -+ reg = <0x1000 1>; -+ }; -+ }; -+ -+}; -diff --git a/tests/unit-addr-simple-bus-reg-mismatch.dts b/tests/unit-addr-simple-bus-reg-mismatch.dts -new file mode 100644 -index 0000000..2823377 ---- /dev/null -+++ b/tests/unit-addr-simple-bus-reg-mismatch.dts -@@ -0,0 +1,18 @@ -+/dts-v1/; -+ -+/ { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ bus@10000000 { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ compatible = "simple-bus"; -+ ranges = <0x0 0x10000000 0x10000>; -+ -+ node@100 { -+ reg = <0x1000 1>; -+ }; -+ }; -+ -+}; --- -2.19.1 - diff --git a/buildroot/package/dtc/dtc.hash b/buildroot/package/dtc/dtc.hash index b402c2249..e4d6c0254 100644 --- a/buildroot/package/dtc/dtc.hash +++ b/buildroot/package/dtc/dtc.hash @@ -1,2 +1,7 @@ # from https://www.kernel.org/pub/software/utils/dtc/sha256sums.asc -sha256 6643e8f00ff86350f465bb54b2185058b5b1b7bac01a0842c81a52b86589cde7 dtc-1.4.7.tar.xz +sha256 660b74039690fc37013660544d09191834efb58503c73c555c5513ba75ab031f dtc-1.5.1.tar.xz + +# Hash for license files +sha256 78e1e1ce5728a990d59c7de61d4741c49185d5129daf783b386380a214328d68 README.license +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 GPL +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd BSD-2-Clause diff --git a/buildroot/package/dtc/dtc.mk b/buildroot/package/dtc/dtc.mk index 7cb879bff..d532487dd 100644 --- a/buildroot/package/dtc/dtc.mk +++ b/buildroot/package/dtc/dtc.mk @@ -4,22 +4,34 @@ # ################################################################################ -DTC_VERSION = 1.4.7 +DTC_VERSION = 1.5.1 DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz DTC_SITE = https://www.kernel.org/pub/software/utils/dtc DTC_LICENSE = GPL-2.0+ or BSD-2-Clause (library) -DTC_LICENSE_FILES = README.license GPL +DTC_LICENSE_FILES = README.license GPL BSD-2-Clause DTC_INSTALL_STAGING = YES -DTC_DEPENDENCIES = host-bison host-flex -HOST_DTC_DEPENDENCIES = host-bison host-flex +DTC_DEPENDENCIES = host-bison host-flex host-pkgconf +HOST_DTC_DEPENDENCIES = host-bison host-flex host-pkgconf DTC_MAKE_OPTS = \ PREFIX=/usr \ - NO_PYTHON=1 + NO_PYTHON=1 \ + NO_VALGRIND=1 +# For the host, we install headers in a special subdirectory to avoid +# conflicts with the in-kernel libfdt copy. HOST_DTC_MAKE_OPTS = \ PREFIX=$(HOST_DIR) \ - NO_PYTHON=1 + INCLUDEDIR=$(HOST_DIR)/include/libfdt \ + NO_PYTHON=1 \ + NO_VALGRIND=1 \ + NO_YAML=1 + +ifeq ($(BR2_PACKAGE_LIBYAML),y) +DTC_DEPENDENCIES += libyaml +else +DTC_MAKE_OPTS += NO_YAML=1 +endif define DTC_POST_INSTALL_TARGET_RM_DTDIFF rm -f $(TARGET_DIR)/usr/bin/dtdiff @@ -27,7 +39,7 @@ endef ifeq ($(BR2_PACKAGE_DTC_PROGRAMS),y) -DTC_LICENSE := $(DTC_LICENSE), GPL-2.0+ (programs) +DTC_LICENSE += , GPL-2.0+ (programs) DTC_INSTALL_GOAL = install ifeq ($(BR2_PACKAGE_BASH),) DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF @@ -40,7 +52,7 @@ DTC_INSTALL_GOAL = install-lib endif # $(BR2_PACKAGE_DTC_PROGRAMS) != y define DTC_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) CFLAGS="$(TARGET_CFLAGS) -fPIC" -C $(@D) $(DTC_MAKE_OPTS) + $(TARGET_CONFIGURE_OPTS) $(MAKE) EXTRA_CFLAGS="$(TARGET_CFLAGS) -fPIC" -C $(@D) $(DTC_MAKE_OPTS) endef # For staging, only the library is needed @@ -55,7 +67,7 @@ endef # host build define HOST_DTC_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) CFLAGS="$(HOST_CFLAGS) -fPIC" -C $(@D) $(HOST_DTC_MAKE_OPTS) + $(HOST_CONFIGURE_OPTS) $(MAKE) EXTRA_CFLAGS="$(HOST_CFLAGS) -fPIC" -C $(@D) $(HOST_DTC_MAKE_OPTS) endef define HOST_DTC_INSTALL_CMDS diff --git a/buildroot/package/dtv-scan-tables/dtv-scan-tables.hash b/buildroot/package/dtv-scan-tables/dtv-scan-tables.hash index a4606bbe0..73e0e7d19 100644 --- a/buildroot/package/dtv-scan-tables/dtv-scan-tables.hash +++ b/buildroot/package/dtv-scan-tables/dtv-scan-tables.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 a9c9375a3d3087cf9ee47086c19fffe8e3bf52397928288d88cd7fa4d7f8944e dtv-scan-tables-59f4a9b1dfbd573bafe33d238a08da95e4f0263a.tar.gz +sha256 76cb6131df1b35ed71b0f6c87cfafc188d614cfbd9973e7832a65ba63e85c504 dtv-scan-tables-6d019038cd04e837d9dd58701202c15924c1c654.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 4fd46f32582c29007657e2daad8d0a6d954cf4e9d2e47bae8f8d8c32765fc987 COPYING.LGPL diff --git a/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk b/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk index 647798588..5933f1677 100644 --- a/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk +++ b/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk @@ -4,7 +4,7 @@ # ################################################################################ -DTV_SCAN_TABLES_VERSION = 59f4a9b1dfbd573bafe33d238a08da95e4f0263a +DTV_SCAN_TABLES_VERSION = 6d019038cd04e837d9dd58701202c15924c1c654 DTV_SCAN_TABLES_SITE = http://git.linuxtv.org/cgit.cgi/dtv-scan-tables.git DTV_SCAN_TABLES_SITE_METHOD = git diff --git a/buildroot/package/duktape/duktape.hash b/buildroot/package/duktape/duktape.hash index 100af58d6..b50ae7329 100644 --- a/buildroot/package/duktape/duktape.hash +++ b/buildroot/package/duktape/duktape.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0df1c0a9d40bfae31733e5c44f0eabaeae59e0a2ebf7693ff68bbabd49aae331 duktape-v2.3.0.tar.gz -sha256 9aabee442709a6e7652348b9617ae26d26da6b270c1f4b6fce4a1e746acb3df0 LICENSE.txt +sha256 810e1dab50dfd3040cac4bb18b96d749a5fdebfd898a7bfe74512044c1a89880 duktape-2.5.0.tar.gz +sha256 5b42d02dbd084fd6d7e61d93f52e02b596f25400e54e0f86d5780045e5b754c8 LICENSE.txt diff --git a/buildroot/package/duktape/duktape.mk b/buildroot/package/duktape/duktape.mk index 97b51f94b..004757188 100644 --- a/buildroot/package/duktape/duktape.mk +++ b/buildroot/package/duktape/duktape.mk @@ -4,8 +4,8 @@ # ################################################################################ -DUKTAPE_VERSION = v2.3.0 -DUKTAPE_SITE = $(call github,svaarala,duktape-releases,$(DUKTAPE_VERSION)) +DUKTAPE_VERSION = 2.5.0 +DUKTAPE_SITE = $(call github,svaarala,duktape-releases,v$(DUKTAPE_VERSION)) DUKTAPE_LICENSE = MIT DUKTAPE_LICENSE_FILES = LICENSE.txt DUKTAPE_INSTALL_STAGING = YES diff --git a/buildroot/package/duma/duma.hash b/buildroot/package/duma/duma.hash index f664d4033..ccf171a97 100644 --- a/buildroot/package/duma/duma.hash +++ b/buildroot/package/duma/duma.hash @@ -1,2 +1,4 @@ # Locally computed: sha256 baaf794854e3093ad1bddadbfb8ad4b220a7117d70359ee216bd59e353734e17 duma_2_5_15.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING-GPL +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING-LGPL diff --git a/buildroot/package/dvbsnoop/dvbsnoop.hash b/buildroot/package/dvbsnoop/dvbsnoop.hash index 05939f9e3..0d88afe15 100644 --- a/buildroot/package/dvbsnoop/dvbsnoop.hash +++ b/buildroot/package/dvbsnoop/dvbsnoop.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 7658498b26a5d2a0242e81f0cfafa0e43a2bec56f8674e7ac197dfc310866ec6 dvbsnoop-1.4.50.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/dvdauthor/dvdauthor.hash b/buildroot/package/dvdauthor/dvdauthor.hash index 36d5d0e68..833884aa9 100644 --- a/buildroot/package/dvdauthor/dvdauthor.hash +++ b/buildroot/package/dvdauthor/dvdauthor.hash @@ -2,4 +2,5 @@ md5 1173dcb8d40e74fc90c0f3a25dbd642d dvdauthor-0.7.2.tar.gz sha1 0e605642140576bfb3e963414d77630d1c073a51 dvdauthor-0.7.2.tar.gz # Locally computed -sha256 3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7 dvdauthor-0.7.2.tar.gz +sha256 3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7 dvdauthor-0.7.2.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/dvdrw-tools/dvdrw-tools.hash b/buildroot/package/dvdrw-tools/dvdrw-tools.hash index 17d48f1d1..a5ed6ad52 100644 --- a/buildroot/package/dvdrw-tools/dvdrw-tools.hash +++ b/buildroot/package/dvdrw-tools/dvdrw-tools.hash @@ -1,2 +1,3 @@ # Locally computed using sha256sum -sha256 f8d60f822e914128bcbc5f64fbe3ed131cbff9045dca7e12c5b77b26edde72ca dvd+rw-tools-7.1.tar.gz +sha256 f8d60f822e914128bcbc5f64fbe3ed131cbff9045dca7e12c5b77b26edde72ca dvd+rw-tools-7.1.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad LICENSE diff --git a/buildroot/package/e2fsprogs/e2fsprogs.hash b/buildroot/package/e2fsprogs/e2fsprogs.hash index c9018715c..3ecbe4eaa 100644 --- a/buildroot/package/e2fsprogs/e2fsprogs.hash +++ b/buildroot/package/e2fsprogs/e2fsprogs.hash @@ -1,6 +1,6 @@ -# https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.4/sha256sums.asc -sha256 65faf6b590ca1da97440d6446bd11de9e0914b42553740ba5d9d2a796fa0dc02 e2fsprogs-1.45.4.tar.xz +# https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.5/sha256sums.asc +sha256 f9faccc0d90f73556e797dc7cc5979b582bd50d3f8609c0f2ad48c736d44aede e2fsprogs-1.45.5.tar.xz # Locally calculated -sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE -sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h -sha256 47182fe6631a32f271a15bbe210751b3825b7199f588879aac7d4804fc8b4b8f lib/et/internal.h +sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE +sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h +sha256 47182fe6631a32f271a15bbe210751b3825b7199f588879aac7d4804fc8b4b8f lib/et/internal.h diff --git a/buildroot/package/e2fsprogs/e2fsprogs.mk b/buildroot/package/e2fsprogs/e2fsprogs.mk index 28fd78047..fd59f701d 100644 --- a/buildroot/package/e2fsprogs/e2fsprogs.mk +++ b/buildroot/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.45.4 +E2FSPROGS_VERSION = 1.45.5 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) diff --git a/buildroot/package/e2tools/e2tools.hash b/buildroot/package/e2tools/e2tools.hash index 4cec81e94..a109ff1bd 100644 --- a/buildroot/package/e2tools/e2tools.hash +++ b/buildroot/package/e2tools/e2tools.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 37bbd705170dff80720d68916f8d90803d71987e1b60f7149a285a7fcd539214 e2tools-3158ef18a903ca4a98b8fa220c9fc5c133d8bdf6.tar.gz +sha256 1d06ca71f01483ad6d9a514e31466e7d2357b3465de2813d667a8b2f9638544e e2tools-0.0.16.4.tar.gz +sha256 0e79fd282723e1eb3f7381d41233a83ed20cf3e8c83aa53e6847bf7ffe781583 COPYING diff --git a/buildroot/package/e2tools/e2tools.mk b/buildroot/package/e2tools/e2tools.mk index 266d90911..7c9ef0ffc 100644 --- a/buildroot/package/e2tools/e2tools.mk +++ b/buildroot/package/e2tools/e2tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -E2TOOLS_VERSION = 3158ef18a903ca4a98b8fa220c9fc5c133d8bdf6 -E2TOOLS_SITE = $(call github,ndim,e2tools,$(E2TOOLS_VERSION)) +E2TOOLS_VERSION = 0.0.16.4 +E2TOOLS_SITE = $(call github,ndim,e2tools,v$(E2TOOLS_VERSION)) # Source coming from GitHub, no configure included. E2TOOLS_AUTORECONF = YES diff --git a/buildroot/package/easy-rsa/easy-rsa.hash b/buildroot/package/easy-rsa/easy-rsa.hash index e2d658ac8..5f5a490cb 100644 --- a/buildroot/package/easy-rsa/easy-rsa.hash +++ b/buildroot/package/easy-rsa/easy-rsa.hash @@ -1,2 +1,6 @@ # Locally computed: (after verifying gpg sig) -sha512 d20f646e33ec803444dfcd446553f1d6001227fedec93280c212b34cccee11b184599f1b2ae6a3ce9cf6c9ac52f2b840ebb645536df6ddf55382fa25c22df81f EasyRSA-3.0.1.tgz +sha512 1e0eb08fb343345c2bc079d622474f1b34dda3a0517b119efc7cb09113ab467f1346a6678e67d65e535bd404c2abb350d47a00c8f24e4541d54dbeb5600fab72 EasyRSA-unix-v3.0.6.tgz + +# Hash for license files +sha256 7c4a4fc71745d93a87278801f1bca555562ca23f21e18293add64b9e6f6b7bf1 COPYING.md +sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 gpl-2.0.txt diff --git a/buildroot/package/easy-rsa/easy-rsa.mk b/buildroot/package/easy-rsa/easy-rsa.mk index 8ed5741c8..b3c57439a 100644 --- a/buildroot/package/easy-rsa/easy-rsa.mk +++ b/buildroot/package/easy-rsa/easy-rsa.mk @@ -4,11 +4,11 @@ # ################################################################################ -EASY_RSA_VERSION = 3.0.1 -EASY_RSA_SOURCE = EasyRSA-$(EASY_RSA_VERSION).tgz -EASY_RSA_SITE = https://github.com/OpenVPN/easy-rsa/releases/download/$(EASY_RSA_VERSION) +EASY_RSA_VERSION = 3.0.6 +EASY_RSA_SOURCE = EasyRSA-unix-v$(EASY_RSA_VERSION).tgz +EASY_RSA_SITE = https://github.com/OpenVPN/easy-rsa/releases/download/v$(EASY_RSA_VERSION) EASY_RSA_LICENSE = GPL-2.0 -EASY_RSA_LICENSE_FILES = COPYING gpl-2.0.txt +EASY_RSA_LICENSE_FILES = COPYING.md gpl-2.0.txt # shell script, so no build step @@ -16,7 +16,7 @@ define EASY_RSA_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/easyrsa $(TARGET_DIR)/usr/bin/easyrsa $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/easy-rsa/x509-types $(INSTALL) -m 0644 -t $(TARGET_DIR)/etc/easy-rsa/x509-types $(@D)/x509-types/* - $(INSTALL) -D -m 0644 $(@D)/openssl-1.0.cnf $(TARGET_DIR)/etc/easy-rsa/openssl-1.0.cnf + $(INSTALL) -D -m 0644 $(@D)/openssl-easyrsa.cnf $(TARGET_DIR)/etc/easy-rsa/openssl-easyrsa.cnf $(INSTALL) -D -m 0644 $(@D)/vars.example $(TARGET_DIR)/etc/easy-rsa/vars endef diff --git a/buildroot/package/easydbus/0001-easydbus-is-a-C-project-file.patch b/buildroot/package/easydbus/0001-easydbus-is-a-C-project-file.patch deleted file mode 100644 index 1c149c582..000000000 --- a/buildroot/package/easydbus/0001-easydbus-is-a-C-project-file.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a4bd47f593fbe55bd3ab17532e64be74aff5b29d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 17 Nov 2018 11:38:05 +0100 -Subject: [PATCH] easydbus is a C project file - -Specify that easydbus is a C project file otherwise build will fail if -no C++ compiler is found by cmake - -Fixes: - - http://autobuild.buildroot.org/results/486c3cd98124e7415dee2fd1463bd5e0fcc9ba91 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/mniestroj/easydbus/pull/2] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 58ccb2d..575eb24 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,7 +5,7 @@ - # - - cmake_minimum_required(VERSION 2.6) --project(easydbus) -+project(easydbus C) - - add_definitions("-Wall -Wextra -Wno-unused-parameter") - set(CMAKE_C_FLAGS_RELEASE "-O2") --- -2.17.1 - diff --git a/buildroot/package/easydbus/easydbus.hash b/buildroot/package/easydbus/easydbus.hash index 0ef73f23f..49245709f 100644 --- a/buildroot/package/easydbus/easydbus.hash +++ b/buildroot/package/easydbus/easydbus.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 3e5907664f5dfebbc0e652faf87564fd58dbd639742f442c100ef2db8be46e52 easydbus-59c340f2cd2c92ded82f9d4436866847f295faab.tar.gz +sha256 4626d6af3d9000d7e6ee9723abba7cd5f01d1c52420a80d8259dfa2d884faa11 easydbus-b86721147b265dfefc9a857669408cb6eb3d6560.tar.gz +sha256 dec3b3103cd6889045da86fc7da22bd25545966e5bd7c214791b922dec19588b LICENSE diff --git a/buildroot/package/easydbus/easydbus.mk b/buildroot/package/easydbus/easydbus.mk index 376b09bfc..5e6de73c3 100644 --- a/buildroot/package/easydbus/easydbus.mk +++ b/buildroot/package/easydbus/easydbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -EASYDBUS_VERSION = 59c340f2cd2c92ded82f9d4436866847f295faab +EASYDBUS_VERSION = b86721147b265dfefc9a857669408cb6eb3d6560 EASYDBUS_SITE = $(call github,mniestroj,easydbus,$(EASYDBUS_VERSION)) EASYDBUS_DEPENDENCIES = luainterpreter libglib2 EASYDBUS_LICENSE = MIT diff --git a/buildroot/package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch b/buildroot/package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch new file mode 100644 index 000000000..687eb6a37 --- /dev/null +++ b/buildroot/package/ebtables/0003-replace-ebtables-save-perl-script-with-bash.patch @@ -0,0 +1,75 @@ +From 73536d15c80be96049289d96fc32122467c56b1d Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Mon, 16 Dec 2019 13:27:30 -0600 +Subject: [PATCH] ebtables: replace ebtables-save perl script with bash rewrite + +Fedora provides a bash replacement for the default ebtables-save perl +script. Using it allows the ebtables run-time dependency on perl to +be replaced with a runtime dependency on bash - which is lower +overhead and more likely to be present on typical embedded systems +already. + + https://bugzilla.redhat.com/show_bug.cgi?id=746040 + http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save + +Upstream: +https://github.com/openembedded/meta-openembedded/commit/7f723007364ba79de05447671e83d4eefb3097dc + +Signed-off-by: Matthew Weber +--- + ebtables-save.sh | 43 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 43 insertions(+) + create mode 100644 ebtables-save.sh + +diff --git a/ebtables-save.sh b/ebtables-save.sh +new file mode 100644 +index 0000000..2d7fc4e +--- /dev/null ++++ b/ebtables-save.sh +@@ -0,0 +1,43 @@ ++#!/bin/bash ++ ++EBTABLES="/sbin/ebtables" ++ ++[ -x "$EBTABLES" ] || exit 1 ++ ++echo "# Generated by ebtables-save v1.0 on $(date)" ++ ++cnt="" ++[ "x$EBTABLES_SAVE_COUNTER" = "xyes" ] && cnt="--Lc" ++ ++for table_name in $(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//); do ++ table=$($EBTABLES -t $table_name -L $cnt) ++ [ $? -eq 0 ] || { echo "$table"; exit -1; } ++ ++ chain="" ++ rules="" ++ while read line; do ++ [ -z "$line" ] && continue ++ ++ case "$line" in ++ Bridge\ table:\ *) ++ echo "*${line:14}" ++ ;; ++ Bridge\ chain:\ *) ++ chain="${line:14}" ++ chain="${chain%%,*}" ++ policy="${line##*policy: }" ++ echo ":$chain $policy" ++ ;; ++ *) ++ if [ "$cnt" = "--Lc" ]; then ++ line=${line/, pcnt \=/ -c} ++ line=${line/-- bcnt \=/} ++ fi ++ rules="$rules-A $chain $line\n" ++ ;; ++ esac ++ done < libnspr depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr depends on !BR2_MIPS_NABI32 # libnss depends on !BR2_STATIC_LIBS # libnss, keyutils - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # microblaze specific & GCC < 7.x select BR2_PACKAGE_KEYUTILS select BR2_PACKAGE_LIBNSS # runtime dependency only, some scripts are using the @@ -31,11 +29,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS http://ecryptfs.org comment "ecryptfs-utils needs a toolchain w/ threads, wchar, dynamic library" - depends on !BR2_microblaze depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ BR2_STATIC_LIBS - -comment "ecryptfs needs a toolchain not affected by GCC bug 85862" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # libnss diff --git a/buildroot/package/ecryptfs-utils/ecryptfs-utils.hash b/buildroot/package/ecryptfs-utils/ecryptfs-utils.hash index 1e08661e2..8a0b111e5 100644 --- a/buildroot/package/ecryptfs-utils/ecryptfs-utils.hash +++ b/buildroot/package/ecryptfs-utils/ecryptfs-utils.hash @@ -2,3 +2,4 @@ md5 83513228984f671930752c3518cac6fd ecryptfs-utils_111.orig.tar.gz # Locally computed sha256 112cb3e37e81a1ecd8e39516725dec0ce55c5f3df6284e0f4cc0f118750a987f ecryptfs-utils_111.orig.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk b/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk index eb3194b6d..326ff4f2d 100644 --- a/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk +++ b/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk @@ -11,13 +11,20 @@ ECRYPTFS_UTILS_LICENSE = GPL-2.0+ ECRYPTFS_UTILS_LICENSE_FILES = COPYING ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool -ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap --disable-pam +ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap #Needed for build system to find pk11func.h and libnss3.so ECRYPTFS_UTILS_CONF_ENV = \ NSS_CFLAGS="-I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr" \ NSS_LIBS="-lnss3" +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +ECRYPTFS_UTILS_CONF_OPTS += --enable-pam +ECRYPTFS_UTILS_DEPENDENCIES += linux-pam +else +ECRYPTFS_UTILS_CONF_OPTS += --disable-pam +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) ECRYPTFS_UTILS_CONF_OPTS += --enable-openssl ECRYPTFS_UTILS_DEPENDENCIES += openssl diff --git a/buildroot/package/edid-decode/edid-decode.hash b/buildroot/package/edid-decode/edid-decode.hash index 437dcf4a6..e0a9c1852 100644 --- a/buildroot/package/edid-decode/edid-decode.hash +++ b/buildroot/package/edid-decode/edid-decode.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 94f43f93285eb5cf8133061295bcdf72b6897bf5372879c2e4032a08d359af12 edid-decode-f56f329ed23a25d002352dedba1e8f092a47286f.tar.gz +sha256 27fcf4c8693ec6fe020b18c78c70ddba9a8b3ea8c55fcfad2a38103128ec5e36 edid-decode-6def7bc83dfb0338632e06a8b14c93faa6af8879.tar.gz +sha256 4b4a7e6d7c358bb5b982eaa84d228cd9e99b75a5fefd3af01272957bf2016b5b edid-decode.c diff --git a/buildroot/package/edid-decode/edid-decode.mk b/buildroot/package/edid-decode/edid-decode.mk index b412a77a1..c43f1ae7d 100644 --- a/buildroot/package/edid-decode/edid-decode.mk +++ b/buildroot/package/edid-decode/edid-decode.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDID_DECODE_VERSION = f56f329ed23a25d002352dedba1e8f092a47286f +EDID_DECODE_VERSION = 6def7bc83dfb0338632e06a8b14c93faa6af8879 EDID_DECODE_SITE = git://linuxtv.org/edid-decode.git EDID_DECODE_LICENSE = MIT EDID_DECODE_LICENSE_FILES = edid-decode.c diff --git a/buildroot/package/efibootmgr/Config.in b/buildroot/package/efibootmgr/Config.in index 6644d26b6..d31f9b13e 100644 --- a/buildroot/package/efibootmgr/Config.in +++ b/buildroot/package/efibootmgr/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_EFIBOOTMGR depends on !BR2_STATIC_LIBS # efivar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar - depends on BR2_HOST_GCC_AT_LEAST_4_8 # efivar depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS select BR2_PACKAGE_EFIVAR select BR2_PACKAGE_POPT @@ -16,10 +15,9 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhboot/efibootmgr -comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9, host gcc >= 4.8" +comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_HOST_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/buildroot/package/efivar/0001-Allow-build-with-uClibc.patch b/buildroot/package/efivar/0001-Allow-build-with-uClibc.patch index 01fa9dee7..0db995576 100644 --- a/buildroot/package/efivar/0001-Allow-build-with-uClibc.patch +++ b/buildroot/package/efivar/0001-Allow-build-with-uClibc.patch @@ -1,4 +1,4 @@ -From 2255601757a8a58baddad2d37d0bcc6b003a3732 Mon Sep 17 00:00:00 2001 +From f1f24eb486c4376066884bae3c31f1c455a79836 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Fri, 25 Nov 2016 19:42:27 +0200 Subject: [PATCH] Allow build with uClibc @@ -11,17 +11,16 @@ Signed-off-by: Andy Shevchenko 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/export.c b/src/export.c -index 7f2d4dd..72c02d1 100644 +index 8321bd3..ef36add 100644 --- a/src/export.c +++ b/src/export.c -@@ -21,11 +21,17 @@ +@@ -23,10 +23,16 @@ #include #include #include -#include - #include - #include "lib.h" + #include "efivar.h" +#ifdef __UCLIBC__ +typedef int_least16_t char16_t; @@ -34,5 +33,5 @@ index 7f2d4dd..72c02d1 100644 #define ATTRS_UNSET 0xa5a5a5a5a5a5a5a5 -- -2.10.2 +2.20.1 diff --git a/buildroot/package/efivar/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch b/buildroot/package/efivar/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch new file mode 100644 index 000000000..37fd39a12 --- /dev/null +++ b/buildroot/package/efivar/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch @@ -0,0 +1,62 @@ +From b98ba8921010d03f46704a476c69861515deb1ca Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Mon, 7 Jan 2019 10:30:59 -0500 +Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers + safely. + +GCC 9 adds -Werror=address-of-packed-member, which causes us to see the +build error reported at + https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 . + +That bug report shows us the following: + +In file included from dp.c:26: +dp.h: In function 'format_vendor_helper': +dp.h:120:37: error: taking address of packed member of 'struct ' may result in an unaligned pointer value [-Werror=address-of-packed-member] + 120 | format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ +dp.h:74:25: note: in definition of macro 'format_guid' + 74 | _rc = efi_guid_to_str(guid, &_guidstr); \ + | ^~~~ +cc1: all warnings being treated as errors + +This patch makes format_guid() use a local variable as a bounce buffer +in the case that the guid we're passed is aligned as chaotic neutral. + +Note that this only fixes this instance and there may be others that bz +didn't show because it exited too soon, and I don't have a gcc 9 build +in front of me right now. + +Signed-off-by: Peter Jones +[james.hilliard1@gmail.com: backport from upstream commit +b98ba8921010d03f46704a476c69861515deb1ca] +Signed-off-by: James Hilliard +--- + src/dp.h | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/dp.h b/src/dp.h +index aa4e390..20cb608 100644 +--- a/src/dp.h ++++ b/src/dp.h +@@ -70,8 +70,15 @@ + #define format_guid(buf, size, off, dp_type, guid) ({ \ + int _rc; \ + char *_guidstr = NULL; \ +- \ +- _rc = efi_guid_to_str(guid, &_guidstr); \ ++ efi_guid_t _guid; \ ++ const efi_guid_t * const _guid_p = \ ++ likely(__alignof__(guid) == sizeof(guid)) \ ++ ? guid \ ++ : &_guid; \ ++ \ ++ if (unlikely(__alignof__(guid) == sizeof(guid))) \ ++ memmove(&_guid, guid, sizeof(_guid)); \ ++ _rc = efi_guid_to_str(_guid_p, &_guidstr); \ + if (_rc < 0) { \ + efi_error("could not build %s GUID DP string", \ + dp_type); \ +-- +2.20.1 + diff --git a/buildroot/package/efivar/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch b/buildroot/package/efivar/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch new file mode 100644 index 000000000..52db443b7 --- /dev/null +++ b/buildroot/package/efivar/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch @@ -0,0 +1,174 @@ +From c3c553db85ff10890209d0fe48fb4856ad68e4e0 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 21 Feb 2019 15:20:12 -0500 +Subject: [PATCH] Fix all the places -Werror=address-of-packed-member catches. + +This gets rid of all the places GCC 9's -Werror=address-of-packed-member +flags as problematic. + +Fixes github issue #123 + +Signed-off-by: Peter Jones +[james.hilliard1@gmail.com: backport from upstream commit +c3c553db85ff10890209d0fe48fb4856ad68e4e0] +Signed-off-by: James Hilliard +--- + src/dp-message.c | 6 ++++-- + src/dp.h | 12 ++++-------- + src/guid.c | 2 +- + src/include/efivar/efivar.h | 2 +- + src/ucs2.h | 27 +++++++++++++++++++-------- + 5 files changed, 29 insertions(+), 20 deletions(-) + +diff --git a/src/dp-message.c b/src/dp-message.c +index 3724e5f..9f96466 100644 +--- a/src/dp-message.c ++++ b/src/dp-message.c +@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp dp) + ) / sizeof(efi_ip_addr_t); + format(buf, size, off, "Dns", "Dns("); + for (int i=0; i < end; i++) { +- const efi_ip_addr_t *addr = &dp->dns.addrs[i]; ++ efi_ip_addr_t addr; ++ ++ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr)); + if (i != 0) + format(buf, size, off, "Dns", ","); + format_ip_addr(buf, size, off, "Dns", +- dp->dns.is_ipv6, addr); ++ dp->dns.is_ipv6, &addr); + } + format(buf, size, off, "Dns", ")"); + break; +diff --git a/src/dp.h b/src/dp.h +index 20cb608..1f921d5 100644 +--- a/src/dp.h ++++ b/src/dp.h +@@ -71,13 +71,9 @@ + int _rc; \ + char *_guidstr = NULL; \ + efi_guid_t _guid; \ +- const efi_guid_t * const _guid_p = \ +- likely(__alignof__(guid) == sizeof(guid)) \ +- ? guid \ +- : &_guid; \ +- \ +- if (unlikely(__alignof__(guid) == sizeof(guid))) \ +- memmove(&_guid, guid, sizeof(_guid)); \ ++ const efi_guid_t * const _guid_p = &_guid; \ ++ \ ++ memmove(&_guid, guid, sizeof(_guid)); \ + _rc = efi_guid_to_str(_guid_p, &_guidstr); \ + if (_rc < 0) { \ + efi_error("could not build %s GUID DP string", \ +@@ -86,7 +82,7 @@ + _guidstr = onstack(_guidstr, \ + strlen(_guidstr)+1); \ + _rc = format(buf, size, off, dp_type, "%s", \ +- _guidstr); \ ++ _guidstr); \ + } \ + _rc; \ + }) +diff --git a/src/guid.c b/src/guid.c +index 306c9ff..3156b3b 100644 +--- a/src/guid.c ++++ b/src/guid.c +@@ -31,7 +31,7 @@ + extern const efi_guid_t efi_guid_zero; + + int NONNULL(1, 2) PUBLIC +-efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b) ++efi_guid_cmp(const void * const a, const void * const b) + { + return memcmp(a, b, sizeof (efi_guid_t)); + } +diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h +index 316891c..ad6449d 100644 +--- a/src/include/efivar/efivar.h ++++ b/src/include/efivar/efivar.h +@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid) + + extern int efi_guid_is_zero(const efi_guid_t *guid); + extern int efi_guid_is_empty(const efi_guid_t *guid); +-extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b); ++extern int efi_guid_cmp(const void * const a, const void * const b); + + /* import / export functions */ + typedef struct efi_variable efi_variable_t; +diff --git a/src/ucs2.h b/src/ucs2.h +index dbb5900..edd8367 100644 +--- a/src/ucs2.h ++++ b/src/ucs2.h +@@ -23,16 +23,21 @@ + (((val) & ((mask) << (shift))) >> (shift)) + + static inline size_t UNUSED +-ucs2len(const uint16_t * const s, ssize_t limit) ++ucs2len(const void *vs, ssize_t limit) + { + ssize_t i; +- for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++) ++ const uint16_t *s = vs; ++ const uint8_t *s8 = vs; ++ ++ for (i = 0; ++ i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0; ++ i++, s8 += 2, s++) + ; + return i; + } + + static inline size_t UNUSED +-ucs2size(const uint16_t * const s, ssize_t limit) ++ucs2size(const void *s, ssize_t limit) + { + size_t rc = ucs2len(s, limit); + rc *= sizeof (uint16_t); +@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit) + } + + static inline unsigned char * UNUSED +-ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) ++ucs2_to_utf8(const void * const voidchars, ssize_t limit) + { + ssize_t i, j; + unsigned char *ret; ++ const uint16_t * const chars = voidchars; + + if (limit < 0) + limit = ucs2len(chars, -1); +@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) + } + + static inline ssize_t UNUSED NONNULL(4) +-utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) ++utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8) + { + ssize_t req; + ssize_t i, j; ++ uint16_t *ucs2 = ucs2void; ++ uint16_t val16; + + if (!ucs2 && size > 0) { + errno = EINVAL; +@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) + val = utf8[i] & 0x7f; + i += 1; + } +- ucs2[j] = val; ++ val16 = val; ++ ucs2[j] = val16; ++ } ++ if (terminate) { ++ val16 = 0; ++ ucs2[j++] = val16; + } +- if (terminate) +- ucs2[j++] = (uint16_t)0; + return j; + }; + +-- +2.20.1 + diff --git a/buildroot/package/efivar/0004-Fix-another-error-of-Werror-address-of-packed-member.patch b/buildroot/package/efivar/0004-Fix-another-error-of-Werror-address-of-packed-member.patch new file mode 100644 index 000000000..b103e975a --- /dev/null +++ b/buildroot/package/efivar/0004-Fix-another-error-of-Werror-address-of-packed-member.patch @@ -0,0 +1,57 @@ +From 0dad6d78a7fb5f6c5fb4a1d646040539db6cf865 Mon Sep 17 00:00:00 2001 +From: Chih-Wei Huang +Date: Tue, 26 Feb 2019 18:42:20 +0800 +Subject: [PATCH] Fix another error of -Werror=address-of-packed-member + +Android 9 clang complains: + +external/efivar/src/dp-message.c:367:24: error: taking address of packed member '' of class or structure 'efidp_infiniband' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member] + (efi_guid_t *)&dp->infiniband.ioc_guid); + ^~~~~~~~~~~~~~~~~~~~~~~ +external/efivar/src/dp.h:76:19: note: expanded from macro 'format_guid' + memmove(&_guid, guid, sizeof(_guid)); \ + ^~~~ +1 error generated. + +Since commit c3c553d the fifth parameter of format_guid() is treated as +a const void *. The casting is unnecessary. + +Signed-off-by: Chih-Wei Huang +[james.hilliard1@gmail.com: backport from upstream commit +0dad6d78a7fb5f6c5fb4a1d646040539db6cf865] +Signed-off-by: James Hilliard +--- + src/dp-media.c | 3 +-- + src/dp-message.c | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/dp-media.c b/src/dp-media.c +index 96a576f..be691c4 100644 +--- a/src/dp-media.c ++++ b/src/dp-media.c +@@ -46,8 +46,7 @@ _format_media_dn(char *buf, size_t size, const_efidp dp) + break; + case EFIDP_HD_SIGNATURE_GUID: + format(buf, size, off, "HD", "GPT,"); +- format_guid(buf, size, off, "HD", +- (efi_guid_t *)dp->hd.signature); ++ format_guid(buf, size, off, "HD", dp->hd.signature); + format(buf, size, off, "HD", + ",0x%"PRIx64",0x%"PRIx64")", + dp->hd.start, dp->hd.size); +diff --git a/src/dp-message.c b/src/dp-message.c +index 9f96466..6b8e907 100644 +--- a/src/dp-message.c ++++ b/src/dp-message.c +@@ -364,7 +364,7 @@ _format_message_dn(char *buf, size_t size, const_efidp dp) + dp->infiniband.port_gid[1], + dp->infiniband.port_gid[0]); + format_guid(buf, size, off, "Infiniband", +- (efi_guid_t *)&dp->infiniband.ioc_guid); ++ &dp->infiniband.ioc_guid); + format(buf, size, off, "Infiniband", + ",%"PRIu64",%"PRIu64")", + dp->infiniband.target_port_id, +-- +2.20.1 + diff --git a/buildroot/package/efivar/Config.in b/buildroot/package/efivar/Config.in index 545962ed7..74f2bb5ab 100644 --- a/buildroot/package/efivar/Config.in +++ b/buildroot/package/efivar/Config.in @@ -17,17 +17,14 @@ config BR2_PACKAGE_EFIVAR # toolchains. depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - # needs __builtin_bswap16 - depends on BR2_HOST_GCC_AT_LEAST_4_8 help Tools and libraries to manipulate EFI variables https://github.com/rhboot/efivar -comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9, host gcc >= 4.8" +comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_HOST_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/buildroot/package/efivar/efivar.hash b/buildroot/package/efivar/efivar.hash index 7feb5b753..b521e08a5 100644 --- a/buildroot/package/efivar/efivar.hash +++ b/buildroot/package/efivar/efivar.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 747bc4d97b4bd74979e5356c44a172534a8a07184f130349fd201742e683d292 efivar-35.tar.gz +sha256 74c52b4f479120fb6639e753e71163ba3f557a7a67c0be225593f9f05b253f36 efivar-37.tar.gz sha256 91df770634adc2755e78cae33a0d01e702ce2f69046408ae93d0d934ff29691b COPYING diff --git a/buildroot/package/efivar/efivar.mk b/buildroot/package/efivar/efivar.mk index d96bd98d0..8708057b1 100644 --- a/buildroot/package/efivar/efivar.mk +++ b/buildroot/package/efivar/efivar.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFIVAR_VERSION = 35 +EFIVAR_VERSION = 37 EFIVAR_SITE = $(call github,rhboot,efivar,$(EFIVAR_VERSION)) EFIVAR_LICENSE = LGPL-2.1 EFIVAR_LICENSE_FILES = COPYING diff --git a/buildroot/package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch b/buildroot/package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch new file mode 100644 index 000000000..bfc12fd5b --- /dev/null +++ b/buildroot/package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch @@ -0,0 +1,51 @@ +From b8458ed248cf49bfe9a263d708b5e34adf77e275 Mon Sep 17 00:00:00 2001 +From: Cedric BAIL +Date: Wed, 17 Jul 2019 11:12:18 -0700 +Subject: [PATCH] eina: set EINA_VALUE_EMPTY during library init. + +This is a work around compiler/linker limit on some system as reported +by Romain Naour. + +Reviewed-by: Mike Blumenkrantz +Differential Revision: https://phab.enlightenment.org/D9348 + +(cherry picked from commit c46a8143916f0d3f66bbdffc7107c97c88df212d) +[Romain: backport to 1.22.x] +Signed-off-by: Romain Naour +--- + src/lib/eina/eina_value.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c +index c75a5f1235..942a6d533e 100644 +--- a/src/lib/eina/eina_value.c ++++ b/src/lib/eina/eina_value.c +@@ -58,7 +58,7 @@ static Eina_Hash *_eina_value_inner_mps = NULL; + static Eina_Lock _eina_value_inner_mps_lock; + static char *_eina_value_mp_choice = NULL; + static int _eina_value_log_dom = -1; +-static const Eina_Value _eina_value_empty = EINA_VALUE_EMPTY; ++static Eina_Value _eina_value_empty; + + #ifdef ERR + #undef ERR +@@ -5404,6 +5404,7 @@ eina_value_inner_free(size_t size, void *mem) + Eina_Bool + eina_value_init(void) + { ++ const Eina_Value empty = EINA_VALUE_EMPTY; + const char *choice, *tmp; + + _eina_value_log_dom = eina_log_domain_register("eina_value", +@@ -5490,6 +5491,8 @@ eina_value_init(void) + + EINA_ERROR_VALUE_FAILED = eina_error_msg_static_register("Eina_Value failed to copy/convert."); + ++ memcpy(&_eina_value_empty, &empty, sizeof (empty)); ++ + return EINA_TRUE; + + on_init_fail_hash: +-- +2.21.0 + diff --git a/buildroot/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch b/buildroot/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch deleted file mode 100644 index b64a200ff..000000000 --- a/buildroot/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d045dd99acdd47be238642d4f9384dccacde2b42 Mon Sep 17 00:00:00 2001 -From: "Carsten Haitzler (Rasterman)" -Date: Sat, 15 Dec 2018 16:19:01 +0000 -Subject: [PATCH] evas gl - make GLintptr etc. also ndefed for GL_VERSION_1_5 - fix typedef - -It seems that GL_VERSION_1_5 define == these provided by gl already. At -least reading the mesa headers I do, so this should fix T7502 - -Signed-off-by: Vadim Kochan ---- - src/lib/evas/Evas_GL.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h -index fa3e6f4..5524d82 100644 ---- a/src/lib/evas/Evas_GL.h -+++ b/src/lib/evas/Evas_GL.h -@@ -4272,9 +4272,11 @@ typedef signed int GLfixed; // Changed khronos_int32_t - - #ifndef GL_ES_VERSION_2_0 - /* GL types for handling large vertex buffer objects */ --#include -+# ifndef GL_VERSION_1_5 -+# include - typedef ptrdiff_t GLintptr; // Changed khronos_intptr_t - typedef ptrdiff_t GLsizeiptr; // Changed khronos_ssize_t -+# endif - #endif - - /* Some definitions from GLES 3.0. --- -2.14.1 - diff --git a/buildroot/package/efl/Config.in b/buildroot/package/efl/Config.in index 2eb3a1073..ff4916116 100644 --- a/buildroot/package/efl/Config.in +++ b/buildroot/package/efl/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_EFL bool "efl" # g++ issue with 4.4.5, tested with g++ 4.7.2 - depends on BR2_HOST_GCC_AT_LEAST_4_7 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS # luajit @@ -144,15 +143,14 @@ comment "Warning: one of the recommended option for EFL is not enabled" config BR2_PACKAGE_EFL_EOLIAN_CPP bool "Enable Eolian C++ bindings" - depends on BR2_HOST_GCC_AT_LEAST_4_8 # Eolian (host) needs C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # Eolian needs C++11 help Eolian is an EO object parser and code generator. With this option enabled Eolian will handle automatic generation of EFL bindings for the C++11 language. -comment "Eolian needs host and target gcc >= 4.8" - depends on !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 +comment "Eolian needs gcc >= 4.8" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 comment "libecore video support" @@ -221,7 +219,6 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_ELPUT bool "Elput" - depends on BR2_ENABLE_LOCALE # libinput depends on BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBXKBCOMMON @@ -232,24 +229,23 @@ config BR2_PACKAGE_EFL_ELPUT libinput without having to duplicate the code in each subsystem. -comment "Elput support needs udev /dev management (eeze), locales" - depends on !BR2_PACKAGE_EFL_EEZE || !BR2_ENABLE_LOCALE +comment "Elput support needs udev /dev management (eeze)" + depends on !BR2_PACKAGE_EFL_EEZE config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" depends on BR2_PACKAGE_EFL_EEZE depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d - depends on BR2_ENABLE_LOCALE # efl-elput <- libinput select BR2_PACKAGE_EFL_ELPUT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. -comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads, locales" +comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_EEZE || !BR2_ENABLE_LOCALE + || !BR2_PACKAGE_EFL_EEZE comment "libevas loaders" @@ -294,16 +290,21 @@ config BR2_PACKAGE_EFL_LIBRAW config BR2_PACKAGE_EFL_SVG bool "SVG loader" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # librsvg -> pango -> harfbuzz select BR2_PACKAGE_LIBRSVG select BR2_PACKAGE_CAIRO help This option enables the Evas generic SVG loader +comment "SVG loader needs a toolchain w/ gcc >= 4.8" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + endif # BR2_PACKAGE_EFL comment "efl needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP \ - || !BR2_HOST_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on BR2_USE_MMU diff --git a/buildroot/package/efl/efl.hash b/buildroot/package/efl/efl.hash index bbefdeec6..c60495418 100644 --- a/buildroot/package/efl/efl.hash +++ b/buildroot/package/efl/efl.hash @@ -1,5 +1,5 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.21.1.tar.xz.sha256 -sha256 44774b42b3dbbbe4d124c8fddcd169c6ffab9d602d1a757abcfb9a84e001a928 efl-1.21.1.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.22.3.tar.xz.sha256 +sha256 7e7a4199b1e90d400dab2491db6032f8e0b26bab65ec19c9f8a97a82394331c8 efl-1.22.3.tar.xz sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341 COMPLIANCE sha256 1f0597d326e2fdb54aa2f0caec6d8bb0afb9941ef32475f017ed02ca214fcf37 COPYING diff --git a/buildroot/package/efl/efl.mk b/buildroot/package/efl/efl.mk index c4fd676be..f1e69f8a2 100644 --- a/buildroot/package/efl/efl.mk +++ b/buildroot/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.21.1 +EFL_VERSION = 1.22.3 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT diff --git a/buildroot/package/ejabberd/0002-fix-ejabberdctl.patch b/buildroot/package/ejabberd/0002-fix-ejabberdctl.patch index 090fcc52d..e7fc9315c 100644 --- a/buildroot/package/ejabberd/0002-fix-ejabberdctl.patch +++ b/buildroot/package/ejabberd/0002-fix-ejabberdctl.patch @@ -1,32 +1,28 @@ -From 168d5840dc2a541ec16385e666c1932cf02907e9 Mon Sep 17 00:00:00 2001 +From 4283f675f21d3923e200092cec6418014a03ad52 Mon Sep 17 00:00:00 2001 From: Johan Oudinet -Date: Wed, 10 Jan 2018 15:00:07 +0100 +Date: Thu, 26 Dec 2019 17:06:34 +0100 Subject: [PATCH] fix ejabberdctl Change default values so ejabberdctl run commands as ejabberd user. -Also add a way for the user to change default values. Signed-off-by: Johan Oudinet --- - ejabberdctl.template | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + ejabberdctl.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ejabberdctl.template b/ejabberdctl.template -index 83637766..5a8a8795 100755 +index a940c3df7..5166e5a27 100755 --- a/ejabberdctl.template +++ b/ejabberdctl.template -@@ -15,7 +15,10 @@ SCRIPT_DIR=$(cd "${0%/*}" && pwd) +@@ -15,7 +15,7 @@ SCRIPT_DIR=$(cd "${0%/*}" && pwd) ERL="{{erl}}" IEX="{{bindir}}/iex" EPMD="{{epmd}}" -INSTALLUSER="{{installuser}}" +INSTALLUSER=ejabberd -+ -+# Read default configuration file if present -+[ ! -r /etc/default/ejabberd ] || . /etc/default/ejabberd # check the proper system user is used case $(id -un) in -- -2.14.1 +2.20.1 diff --git a/buildroot/package/ejabberd/Config.in b/buildroot/package/ejabberd/Config.in index 7d51d1de9..e24c7fee6 100644 --- a/buildroot/package/ejabberd/Config.in +++ b/buildroot/package/ejabberd/Config.in @@ -3,11 +3,15 @@ config BR2_PACKAGE_EJABBERD depends on BR2_PACKAGE_ERLANG depends on BR2_INSTALL_LIBSTDCPP # jiffy, stringprep select BR2_PACKAGE_ERLANG_EIMP + select BR2_PACKAGE_ERLANG_IDNA # runtime select BR2_PACKAGE_ERLANG_JIFFY # runtime + select BR2_PACKAGE_ERLANG_JOSE # runtime select BR2_PACKAGE_ERLANG_LAGER + select BR2_PACKAGE_ERLANG_P1_ACME # runtime select BR2_PACKAGE_ERLANG_P1_CACHE_TAB - select BR2_PACKAGE_ERLANG_P1_ICONV + select BR2_PACKAGE_ERLANG_P1_MQTREE # runtime select BR2_PACKAGE_ERLANG_P1_OAUTH2 # runtime + select BR2_PACKAGE_ERLANG_P1_PKIX # runtime select BR2_PACKAGE_ERLANG_P1_SIP select BR2_PACKAGE_ERLANG_P1_STRINGPREP select BR2_PACKAGE_ERLANG_P1_STUN @@ -16,6 +20,7 @@ config BR2_PACKAGE_EJABBERD select BR2_PACKAGE_ERLANG_P1_XML select BR2_PACKAGE_ERLANG_P1_XMPP select BR2_PACKAGE_ERLANG_P1_YAML + select BR2_PACKAGE_ERLANG_P1_YCONF # runtime select BR2_PACKAGE_ERLANG_P1_ZLIB select BR2_PACKAGE_GETENT select BR2_PACKAGE_OPENSSL diff --git a/buildroot/package/ejabberd/S50ejabberd b/buildroot/package/ejabberd/S50ejabberd index 830fcb85a..83513bdc8 100644 --- a/buildroot/package/ejabberd/S50ejabberd +++ b/buildroot/package/ejabberd/S50ejabberd @@ -4,7 +4,7 @@ # CTL=/usr/sbin/ejabberdctl -DEFAULT=/etc/default/ejabberd +DEFAULT=/etc/ejabberd/ejabberdctl.cfg INSTALLUSER=ejabberd RUNDIR=/var/run/ejabberd diff --git a/buildroot/package/ejabberd/ejabberd.hash b/buildroot/package/ejabberd/ejabberd.hash index aed269cb8..145e7401a 100644 --- a/buildroot/package/ejabberd/ejabberd.hash +++ b/buildroot/package/ejabberd/ejabberd.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 781a68d2deefb4afae563c29a8955063c759c244d308251167d46185f145d4ff ejabberd-18.09.tgz +sha256 18ddf61af22fc9b59f8afc6835aae2aee9896eb91cc1030056d6bca6a1fa40d2 ejabberd-19.09.1.tgz +sha256 469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb COPYING diff --git a/buildroot/package/ejabberd/ejabberd.mk b/buildroot/package/ejabberd/ejabberd.mk index 6982375cf..3419c6e59 100644 --- a/buildroot/package/ejabberd/ejabberd.mk +++ b/buildroot/package/ejabberd/ejabberd.mk @@ -4,14 +4,13 @@ # ################################################################################ -EJABBERD_VERSION = 18.09 +EJABBERD_VERSION = 19.09.1 EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz EJABBERD_SITE = https://www.process-one.net/downloads/ejabberd/$(EJABBERD_VERSION) EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception EJABBERD_LICENSE_FILES = COPYING -EJABBERD_DEPENDENCIES = getent openssl erlang-eimp \ - host-erlang-lager erlang-lager \ - erlang-p1-cache-tab erlang-p1-iconv erlang-p1-sip \ +EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \ + erlang-lager erlang-p1-cache-tab erlang-p1-sip \ erlang-p1-stringprep erlang-p1-stun erlang-p1-tls \ erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \ erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp diff --git a/buildroot/package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch b/buildroot/package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch deleted file mode 100644 index 825582550..000000000 --- a/buildroot/package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch +++ /dev/null @@ -1,34 +0,0 @@ -From faf1a1646093fbc5ed279bae1c7250c7dfea56f8 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 17 Jul 2018 16:36:16 +0200 -Subject: [PATCH] Makefile: fix build with Binutils 2.31 - -Binutils added diagnostics.h to bfd.h [1], so elf2flt must create a symlink -for this header. - -Fixes: -https://gitlab.com/free-electrons/toolchains-builder/-/jobs/82284139 - -[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=95da9854466ada2572b42f5528711a06a2d42db1 - -Signed-off-by: Romain Naour ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index cfad06c..164e306 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -127,7 +127,7 @@ bfd-headers/.stamp: - rm -rf bfd-headers - mkdir bfd-headers - ln -sf $(BFD_INCLUDE_DIR)/bfd.h bfd-headers/bfd.h -- for f in ansidecl filenames hashtab libiberty symcat; do \ -+ for f in ansidecl diagnostics filenames hashtab libiberty symcat; do \ - ln -sf $(BINUTILS_INCLUDE_DIR)/$$f.h bfd-headers/$$f.h || exit 1; \ - done - ln -sf $(BINUTILS_INCLUDE_DIR)/elf bfd-headers/elf --- -2.7.4 - diff --git a/buildroot/package/elf2flt/0002-elf2flt-fix-relocations-for-read-only-data.patch b/buildroot/package/elf2flt/0002-elf2flt-fix-relocations-for-read-only-data.patch deleted file mode 100644 index 6cb3a5543..000000000 --- a/buildroot/package/elf2flt/0002-elf2flt-fix-relocations-for-read-only-data.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 6006e8d789f7a1129414fb3a8c930b094af0cafa Mon Sep 17 00:00:00 2001 -From: Greg Ungerer -Date: Wed, 6 Nov 2019 21:19:24 +0100 -Subject: [PATCH] elf2flt: fix relocations for read-only data - -Readonly data sections are mapped into the "text" section in the -elf2flt.ld linker script. The relocation generation code is not handling -that case properly though, and is actually mapping any data section type -into the "data" section of the target binary. - -This problem case has been detected with elf2flt core dumping when used -with binutils-2.33.1 (on ARM architecture targets). See thread at: - - https://sourceware.org/ml/binutils/2019-10/msg00132.html - -Tested by Christophe Priouzeau [1] - -* binutils 2.33.1 -* buildroot 2019.11-rc1 -* patch on top of elf2flt (patch available on this thread) -* configuration: stm32f469-disco with initramfs configuration on buildroot - -Result: -Build: OK, all the binaries are generated -Runtime test on stm32f469-disco: OK - -[1] https://github.com/uclinux-dev/elf2flt/issues/12 - -Signed-off-by: Greg Ungerer -Signed-off-by: Romain Naour -Cc: Christophe Priouzeau ---- - elf2flt.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/elf2flt.c b/elf2flt.c -index 67f720a..8973cef 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -418,10 +418,12 @@ output_relocs ( - // continue; - - /* -- * Only relocate things in the data sections if we are PIC/GOT. -- * otherwise do text as well -+ * Only relocate things in the writable data sections if we are PIC/GOT. -+ * Otherwise do text (and read only data) as well. - */ -- if ((!pic_with_got || ALWAYS_RELOC_TEXT) && (a->flags & SEC_CODE)) -+ if ((!pic_with_got || ALWAYS_RELOC_TEXT) && -+ ((a->flags & SEC_CODE) || -+ ((a->flags & (SEC_DATA | SEC_READONLY)) == (SEC_DATA | SEC_READONLY)))) - sectionp = text + (a->vma - text_vma); - else if (a->flags & SEC_DATA) - sectionp = data + (a->vma - data_vma); --- -2.21.0 - diff --git a/buildroot/package/elf2flt/elf2flt.hash b/buildroot/package/elf2flt/elf2flt.hash index 40df62c8c..c4b0697fc 100644 --- a/buildroot/package/elf2flt/elf2flt.hash +++ b/buildroot/package/elf2flt/elf2flt.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 7713bd1debd24a94b795b7fc698dc97e306e7cbcc1d0580856c79fe70aac9c45 elf2flt-6d80ab6c93409e796f85da404bde84b841231531.tar.gz +sha256 d63baae6fe0d7fcc50a635be151a6f9e1e83dba30568046a869a395c15bf6284 elf2flt-7e33f28df198c46764021ed14408bd262751e148.tar.gz +sha256 f20bc5007904094e3a4e9fbcc3526cdd40893f91d458c3139b308e5c4c0899c6 LICENSE.TXT diff --git a/buildroot/package/elf2flt/elf2flt.mk b/buildroot/package/elf2flt/elf2flt.mk index 557f94d33..e7edd8b9d 100644 --- a/buildroot/package/elf2flt/elf2flt.mk +++ b/buildroot/package/elf2flt/elf2flt.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELF2FLT_VERSION = 6d80ab6c93409e796f85da404bde84b841231531 +ELF2FLT_VERSION = 7e33f28df198c46764021ed14408bd262751e148 ELF2FLT_SITE = $(call github,uclinux-dev,elf2flt,$(ELF2FLT_VERSION)) ELF2FLT_LICENSE = GPL-2.0+ ELF2FLT_LICENSE_FILES = LICENSE.TXT diff --git a/buildroot/package/elftosb/elftosb.hash b/buildroot/package/elftosb/elftosb.hash index 2b9f02b14..83f5ce664 100644 --- a/buildroot/package/elftosb/elftosb.hash +++ b/buildroot/package/elftosb/elftosb.hash @@ -1,2 +1,4 @@ # From http://repository.timesys.com/buildsources/e/elftosb/elftosb-10.12.01/elftosb-10.12.01.tar.gz.md5sum md5 e8005d606c1e0bb3507c82f6eceb3056 elftosb-10.12.01.tar.gz +# locally computed +sha256 c861c25936b7bc0cf180023d540f2b0d0f5892edd27fd00efef4b6234c1df27a COPYING diff --git a/buildroot/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch b/buildroot/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch index 3f80fe60d..36bd46217 100644 --- a/buildroot/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch +++ b/buildroot/package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch @@ -13,9 +13,11 @@ obstack_printf() in uClibc for example). Based on the former patch by Thomas Petazzoni. [Vincent: tweak patch for 0.166] +[Bernd: rebased patch for 0.177] Signed-off-by: Thomas Petazzoni Signed-off-by: Vicente Olivert Riera +Signed-off-by: Bernd Kuhls --- Makefile.am | 6 +++++- configure.ac | 6 ++++++ @@ -44,7 +46,7 @@ diff --git a/configure.ac b/configure.ac index c2c1d90b2133..7b4c38381cca 100644 --- a/configure.ac +++ b/configure.ac -@@ -259,6 +259,12 @@ AC_SUBST([LIBEBL_SUBDIR]) +@@ -345,6 +345,12 @@ AC_SUBST([LIBEBL_SUBDIR]) AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR") AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.]) diff --git a/buildroot/package/elfutils/0002-Add-an-implementation-of-the-fts_-functions.patch b/buildroot/package/elfutils/0002-Add-an-implementation-of-the-fts_-functions.patch deleted file mode 100644 index cf5ba25c8..000000000 --- a/buildroot/package/elfutils/0002-Add-an-implementation-of-the-fts_-functions.patch +++ /dev/null @@ -1,1332 +0,0 @@ -From 098760f7eac1fb86b3f6871d5bb10f9f44468f2d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 29 May 2017 23:08:05 +0300 -Subject: [PATCH] Add an implementation of the fts_*() functions - -The fts_*() functions are optional in uClibc, and not compiled in our -default configuration. The best option would be to migrate this -elfutils code to the nftw family of functions, but it requires quite -some work. - -So we have several options here: - - *) Enable fts_*() functions in our default uClibc configuration. Not - nice since only one package needs them (the help text of uClibc - for fts_*() functions explicitly mention that they have been added - to be able to build elfutils). - - *) Use gnulib, but it is quite heavy to setup, requires modifications - to configure.ac, and other things. - - *) Copy the fts function from uClibc into elfutils source code. This - is the solution used below. uClibc is LGPL, and elfutils is - LGPL/GPL, so there should not be any licensing issue. - -Of course, the fts_*() functions are only built if they are not -already provided by the C library. - -Based on the former patch by Thomas Petazzoni. - -[Vincent: tweak patch for 0.166] - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vicente Olivert Riera ---- - configure.ac | 4 + - libdwfl/Makefile.am | 3 + - libdwfl/fts.c | 1095 ++++++++++++++++++++++++++++++++++++++++ - libdwfl/fts_.h | 131 +++++ - libdwfl/linux-kernel-modules.c | 4 + - 5 files changed, 1237 insertions(+) - create mode 100644 libdwfl/fts.c - create mode 100644 libdwfl/fts_.h - -diff --git a/configure.ac b/configure.ac -index 7b4c38381cca..bcebb05fa532 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -265,6 +265,10 @@ AC_ARG_ENABLE([progs], - enable_progs=yes) - AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes) - -+AC_CHECK_HEADER([fts.h], -+ AC_DEFINE([HAVE_FTS_H], [], [Define if is available in C library])) -+AM_CONDITIONAL(HAVE_FTS, test "$ac_cv_header_fts_h" = yes) -+ - dnl zlib is mandatory. - save_LIBS="$LIBS" - LIBS= -diff --git a/libdwfl/Makefile.am b/libdwfl/Makefile.am -index 89ca92ed8110..a5a5615c5f94 100644 ---- a/libdwfl/Makefile.am -+++ b/libdwfl/Makefile.am -@@ -77,6 +77,9 @@ endif - if LZMA - libdwfl_a_SOURCES += lzma.c - endif -+if !HAVE_FTS -+libdwfl_a_SOURCES += fts.c -+endif - - libdwfl = $(libdw) - libdw = ../libdw/libdw.so -diff --git a/libdwfl/fts.c b/libdwfl/fts.c -new file mode 100644 -index 000000000000..f34cc03bd963 ---- /dev/null -+++ b/libdwfl/fts.c -@@ -0,0 +1,1095 @@ -+/*- -+ * Copyright (c) 1990, 1993, 1994 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include "fts_.h" -+#include -+#include -+#include -+ -+/* Largest alignment size needed, minus one. -+ Usually long double is the worst case. */ -+#ifndef ALIGNBYTES -+#define ALIGNBYTES (__alignof__ (long double) - 1) -+#endif -+/* Align P to that size. */ -+#ifndef ALIGN -+#define ALIGN(p) (((unsigned long int) (p) + ALIGNBYTES) & ~ALIGNBYTES) -+#endif -+ -+ -+static FTSENT *fts_alloc (FTS *, const char *, size_t); -+static FTSENT *fts_build (FTS *, int); -+static void fts_lfree (FTSENT *); -+static void fts_load (FTS *, FTSENT *); -+static size_t fts_maxarglen (char * const *); -+static void fts_padjust (FTS *, FTSENT *); -+static int fts_palloc (FTS *, size_t); -+static FTSENT *fts_sort (FTS *, FTSENT *, int); -+static u_short fts_stat (FTS *, FTSENT *, int); -+static int fts_safe_changedir (FTS *, FTSENT *, int, const char *); -+ -+#ifndef MAX -+#define MAX(a, b) ({ __typeof__ (a) _a = (a); \ -+ __typeof__ (b) _b = (b); \ -+ _a > _b ? _a : _b; }) -+#endif -+ -+#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2]))) -+ -+#define CLR(opt) (sp->fts_options &= ~(opt)) -+#define ISSET(opt) (sp->fts_options & (opt)) -+#define SET(opt) (sp->fts_options |= (opt)) -+ -+#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd)) -+ -+/* fts_build flags */ -+#define BCHILD 1 /* fts_children */ -+#define BNAMES 2 /* fts_children, names only */ -+#define BREAD 3 /* fts_read */ -+ -+FTS * -+fts_open( char * const *argv, register int options, -+ int (*compar) (const FTSENT **, const FTSENT **)) -+{ -+ register FTS *sp; -+ register FTSENT *p, *root; -+ register int nitems; -+ FTSENT *parent = NULL; -+ FTSENT *tmp = NULL; -+ -+ /* Options check. */ -+ if (options & ~FTS_OPTIONMASK) { -+ errno = EINVAL; -+ return (NULL); -+ } -+ -+ /* Allocate/initialize the stream */ -+ if ((sp = malloc((u_int)sizeof(FTS))) == NULL) -+ return (NULL); -+ memset(sp, 0, sizeof(FTS)); -+ sp->fts_compar = (int (*) (const void *, const void *)) compar; -+ sp->fts_options = options; -+ -+ /* Logical walks turn on NOCHDIR; symbolic links are too hard. */ -+ if (ISSET(FTS_LOGICAL)) -+ SET(FTS_NOCHDIR); -+ -+ /* -+ * Start out with 1K of path space, and enough, in any case, -+ * to hold the user's paths. -+ */ -+#ifndef MAXPATHLEN -+#define MAXPATHLEN 1024 -+#endif -+ size_t maxarglen = fts_maxarglen(argv); -+ if (fts_palloc(sp, MAX(maxarglen, MAXPATHLEN))) -+ goto mem1; -+ -+ /* Allocate/initialize root's parent. */ -+ if (*argv != NULL) { -+ if ((parent = fts_alloc(sp, "", 0)) == NULL) -+ goto mem2; -+ parent->fts_level = FTS_ROOTPARENTLEVEL; -+ } -+ -+ /* Allocate/initialize root(s). */ -+ for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) { -+ /* Don't allow zero-length paths. */ -+ size_t len = strlen(*argv); -+ if (len == 0) { -+ errno = ENOENT; -+ goto mem3; -+ } -+ -+ p = fts_alloc(sp, *argv, len); -+ p->fts_level = FTS_ROOTLEVEL; -+ p->fts_parent = parent; -+ p->fts_accpath = p->fts_name; -+ p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW)); -+ -+ /* Command-line "." and ".." are real directories. */ -+ if (p->fts_info == FTS_DOT) -+ p->fts_info = FTS_D; -+ -+ /* -+ * If comparison routine supplied, traverse in sorted -+ * order; otherwise traverse in the order specified. -+ */ -+ if (compar) { -+ p->fts_link = root; -+ root = p; -+ } else { -+ p->fts_link = NULL; -+ if (root == NULL) -+ tmp = root = p; -+ else { -+ tmp->fts_link = p; -+ tmp = p; -+ } -+ } -+ } -+ if (compar && nitems > 1) -+ root = fts_sort(sp, root, nitems); -+ -+ /* -+ * Allocate a dummy pointer and make fts_read think that we've just -+ * finished the node before the root(s); set p->fts_info to FTS_INIT -+ * so that everything about the "current" node is ignored. -+ */ -+ if ((sp->fts_cur = fts_alloc(sp, "", 0)) == NULL) -+ goto mem3; -+ sp->fts_cur->fts_link = root; -+ sp->fts_cur->fts_info = FTS_INIT; -+ -+ /* -+ * If using chdir(2), grab a file descriptor pointing to dot to ensure -+ * that we can get back here; this could be avoided for some paths, -+ * but almost certainly not worth the effort. Slashes, symbolic links, -+ * and ".." are all fairly nasty problems. Note, if we can't get the -+ * descriptor we run anyway, just more slowly. -+ */ -+ if (!ISSET(FTS_NOCHDIR) -+ && (sp->fts_rfd = open(".", O_RDONLY, 0)) < 0) -+ SET(FTS_NOCHDIR); -+ -+ return (sp); -+ -+mem3: fts_lfree(root); -+ free(parent); -+mem2: free(sp->fts_path); -+mem1: free(sp); -+ return (NULL); -+} -+ -+static void -+fts_load(FTS *sp, register FTSENT *p) -+{ -+ register int len; -+ register char *cp; -+ -+ /* -+ * Load the stream structure for the next traversal. Since we don't -+ * actually enter the directory until after the preorder visit, set -+ * the fts_accpath field specially so the chdir gets done to the right -+ * place and the user can access the first node. From fts_open it's -+ * known that the path will fit. -+ */ -+ len = p->fts_pathlen = p->fts_namelen; -+ memmove(sp->fts_path, p->fts_name, len + 1); -+ if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) { -+ len = strlen(++cp); -+ memmove(p->fts_name, cp, len + 1); -+ p->fts_namelen = len; -+ } -+ p->fts_accpath = p->fts_path = sp->fts_path; -+ sp->fts_dev = p->fts_dev; -+} -+ -+int -+fts_close(FTS *sp) -+{ -+ register FTSENT *freep, *p; -+ int saved_errno; -+ -+ /* -+ * This still works if we haven't read anything -- the dummy structure -+ * points to the root list, so we step through to the end of the root -+ * list which has a valid parent pointer. -+ */ -+ if (sp->fts_cur) { -+ for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) { -+ freep = p; -+ p = p->fts_link != NULL ? p->fts_link : p->fts_parent; -+ free(freep); -+ } -+ free(p); -+ } -+ -+ /* Free up child linked list, sort array, path buffer. */ -+ if (sp->fts_child) -+ fts_lfree(sp->fts_child); -+ free(sp->fts_array); -+ free(sp->fts_path); -+ -+ /* Return to original directory, save errno if necessary. */ -+ if (!ISSET(FTS_NOCHDIR)) { -+ saved_errno = fchdir(sp->fts_rfd) ? errno : 0; -+ (void)close(sp->fts_rfd); -+ -+ /* Set errno and return. */ -+ if (saved_errno != 0) { -+ /* Free up the stream pointer. */ -+ free(sp); -+ errno = saved_errno; -+ return (-1); -+ } -+ } -+ -+ /* Free up the stream pointer. */ -+ free(sp); -+ return (0); -+} -+ -+/* -+ * Special case of "/" at the end of the path so that slashes aren't -+ * appended which would cause paths to be written as "....//foo". -+ */ -+#define NAPPEND(p) \ -+ (p->fts_path[p->fts_pathlen - 1] == '/' \ -+ ? p->fts_pathlen - 1 : p->fts_pathlen) -+ -+FTSENT * -+fts_read(register FTS *sp) -+{ -+ register FTSENT *p, *tmp; -+ register int instr; -+ register char *t; -+ int saved_errno; -+ -+ /* If finished or unrecoverable error, return NULL. */ -+ if (sp->fts_cur == NULL || ISSET(FTS_STOP)) -+ return (NULL); -+ -+ /* Set current node pointer. */ -+ p = sp->fts_cur; -+ -+ /* Save and zero out user instructions. */ -+ instr = p->fts_instr; -+ p->fts_instr = FTS_NOINSTR; -+ -+ /* Any type of file may be re-visited; re-stat and re-turn. */ -+ if (instr == FTS_AGAIN) { -+ p->fts_info = fts_stat(sp, p, 0); -+ return (p); -+ } -+ -+ /* -+ * Following a symlink -- SLNONE test allows application to see -+ * SLNONE and recover. If indirecting through a symlink, have -+ * keep a pointer to current location. If unable to get that -+ * pointer, follow fails. -+ */ -+ if (instr == FTS_FOLLOW && -+ (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) { -+ p->fts_info = fts_stat(sp, p, 1); -+ if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) { -+ if ((p->fts_symfd = open(".", O_RDONLY, 0)) < 0) { -+ p->fts_errno = errno; -+ p->fts_info = FTS_ERR; -+ } else -+ p->fts_flags |= FTS_SYMFOLLOW; -+ } -+ return (p); -+ } -+ -+ /* Directory in pre-order. */ -+ if (p->fts_info == FTS_D) { -+ /* If skipped or crossed mount point, do post-order visit. */ -+ if (instr == FTS_SKIP || -+ (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) { -+ if (p->fts_flags & FTS_SYMFOLLOW) -+ (void)close(p->fts_symfd); -+ if (sp->fts_child) { -+ fts_lfree(sp->fts_child); -+ sp->fts_child = NULL; -+ } -+ p->fts_info = FTS_DP; -+ return (p); -+ } -+ -+ /* Rebuild if only read the names and now traversing. */ -+ if (sp->fts_child != NULL && ISSET(FTS_NAMEONLY)) { -+ CLR(FTS_NAMEONLY); -+ fts_lfree(sp->fts_child); -+ sp->fts_child = NULL; -+ } -+ -+ /* -+ * Cd to the subdirectory. -+ * -+ * If have already read and now fail to chdir, whack the list -+ * to make the names come out right, and set the parent errno -+ * so the application will eventually get an error condition. -+ * Set the FTS_DONTCHDIR flag so that when we logically change -+ * directories back to the parent we don't do a chdir. -+ * -+ * If haven't read do so. If the read fails, fts_build sets -+ * FTS_STOP or the fts_info field of the node. -+ */ -+ if (sp->fts_child != NULL) { -+ if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) { -+ p->fts_errno = errno; -+ p->fts_flags |= FTS_DONTCHDIR; -+ for (p = sp->fts_child; p != NULL; -+ p = p->fts_link) -+ p->fts_accpath = -+ p->fts_parent->fts_accpath; -+ } -+ } else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) { -+ if (ISSET(FTS_STOP)) -+ return (NULL); -+ return (p); -+ } -+ p = sp->fts_child; -+ sp->fts_child = NULL; -+ sp->fts_cur = p; -+ goto name; -+ } -+ -+ /* Move to the next node on this level. */ -+next: tmp = p; -+ if ((p = p->fts_link) != NULL) { -+ sp->fts_cur = p; -+ free(tmp); -+ -+ /* -+ * If reached the top, return to the original directory (or -+ * the root of the tree), and load the paths for the next root. -+ */ -+ if (p->fts_level == FTS_ROOTLEVEL) { -+ if (FCHDIR(sp, sp->fts_rfd)) { -+ SET(FTS_STOP); -+ return (NULL); -+ } -+ fts_load(sp, p); -+ return p; -+ } -+ -+ /* -+ * User may have called fts_set on the node. If skipped, -+ * ignore. If followed, get a file descriptor so we can -+ * get back if necessary. -+ */ -+ if (p->fts_instr == FTS_SKIP) -+ goto next; -+ if (p->fts_instr == FTS_FOLLOW) { -+ p->fts_info = fts_stat(sp, p, 1); -+ if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) { -+ if ((p->fts_symfd = -+ open(".", O_RDONLY, 0)) < 0) { -+ p->fts_errno = errno; -+ p->fts_info = FTS_ERR; -+ } else -+ p->fts_flags |= FTS_SYMFOLLOW; -+ } -+ p->fts_instr = FTS_NOINSTR; -+ } -+ -+name: t = sp->fts_path + NAPPEND(p->fts_parent); -+ *t++ = '/'; -+ memmove(t, p->fts_name, p->fts_namelen + 1); -+ return p; -+ } -+ -+ /* Move up to the parent node. */ -+ p = tmp->fts_parent; -+ sp->fts_cur = p; -+ free(tmp); -+ -+ if (p->fts_level == FTS_ROOTPARENTLEVEL) { -+ /* -+ * Done; free everything up and set errno to 0 so the user -+ * can distinguish between error and EOF. -+ */ -+ free(p); -+ errno = 0; -+ return (sp->fts_cur = NULL); -+ } -+ -+ /* NUL terminate the pathname. */ -+ sp->fts_path[p->fts_pathlen] = '\0'; -+ -+ /* -+ * Return to the parent directory. If at a root node or came through -+ * a symlink, go back through the file descriptor. Otherwise, cd up -+ * one directory. -+ */ -+ if (p->fts_level == FTS_ROOTLEVEL) { -+ if (FCHDIR(sp, sp->fts_rfd)) { -+ SET(FTS_STOP); -+ return (NULL); -+ } -+ } else if (p->fts_flags & FTS_SYMFOLLOW) { -+ if (FCHDIR(sp, p->fts_symfd)) { -+ saved_errno = errno; -+ (void)close(p->fts_symfd); -+ errno = saved_errno; -+ SET(FTS_STOP); -+ return (NULL); -+ } -+ (void)close(p->fts_symfd); -+ } else if (!(p->fts_flags & FTS_DONTCHDIR) && -+ fts_safe_changedir(sp, p->fts_parent, -1, "..")) { -+ SET(FTS_STOP); -+ return (NULL); -+ } -+ p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP; -+ return p; -+} -+ -+/* -+ * Fts_set takes the stream as an argument although it's not used in this -+ * implementation; it would be necessary if anyone wanted to add global -+ * semantics to fts using fts_set. An error return is allowed for similar -+ * reasons. -+ */ -+/* ARGSUSED */ -+int -+fts_set(FTS *sp, FTSENT *p, int instr) -+{ -+ if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW && -+ instr != FTS_NOINSTR && instr != FTS_SKIP) { -+ errno = EINVAL; -+ return (1); -+ } -+ p->fts_instr = instr; -+ return (0); -+} -+ -+FTSENT * -+fts_children(register FTS *sp, int instr) -+{ -+ register FTSENT *p; -+ int fd; -+ -+ if (instr != 0 && instr != FTS_NAMEONLY) { -+ errno = EINVAL; -+ return (NULL); -+ } -+ -+ /* Set current node pointer. */ -+ p = sp->fts_cur; -+ -+ /* -+ * Errno set to 0 so user can distinguish empty directory from -+ * an error. -+ */ -+ errno = 0; -+ -+ /* Fatal errors stop here. */ -+ if (ISSET(FTS_STOP)) -+ return (NULL); -+ -+ /* Return logical hierarchy of user's arguments. */ -+ if (p->fts_info == FTS_INIT) -+ return (p->fts_link); -+ -+ /* -+ * If not a directory being visited in pre-order, stop here. Could -+ * allow FTS_DNR, assuming the user has fixed the problem, but the -+ * same effect is available with FTS_AGAIN. -+ */ -+ if (p->fts_info != FTS_D /* && p->fts_info != FTS_DNR */) -+ return (NULL); -+ -+ /* Free up any previous child list. */ -+ if (sp->fts_child != NULL) -+ fts_lfree(sp->fts_child); -+ -+ if (instr == FTS_NAMEONLY) { -+ SET(FTS_NAMEONLY); -+ instr = BNAMES; -+ } else -+ instr = BCHILD; -+ -+ /* -+ * If using chdir on a relative path and called BEFORE fts_read does -+ * its chdir to the root of a traversal, we can lose -- we need to -+ * chdir into the subdirectory, and we don't know where the current -+ * directory is, so we can't get back so that the upcoming chdir by -+ * fts_read will work. -+ */ -+ if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' || -+ ISSET(FTS_NOCHDIR)) -+ return (sp->fts_child = fts_build(sp, instr)); -+ -+ if ((fd = open(".", O_RDONLY, 0)) < 0) -+ return (NULL); -+ sp->fts_child = fts_build(sp, instr); -+ if (fchdir(fd)) -+ return (NULL); -+ (void)close(fd); -+ return (sp->fts_child); -+} -+ -+/* -+ * This is the tricky part -- do not casually change *anything* in here. The -+ * idea is to build the linked list of entries that are used by fts_children -+ * and fts_read. There are lots of special cases. -+ * -+ * The real slowdown in walking the tree is the stat calls. If FTS_NOSTAT is -+ * set and it's a physical walk (so that symbolic links can't be directories), -+ * we can do things quickly. First, if it's a 4.4BSD file system, the type -+ * of the file is in the directory entry. Otherwise, we assume that the number -+ * of subdirectories in a node is equal to the number of links to the parent. -+ * The former skips all stat calls. The latter skips stat calls in any leaf -+ * directories and for any files after the subdirectories in the directory have -+ * been found, cutting the stat calls by about 2/3. -+ */ -+static FTSENT * -+fts_build(register FTS *sp, int type) -+{ -+ register struct dirent *dp; -+ register FTSENT *p, *head; -+ register int nitems; -+ FTSENT *cur, *tail; -+ DIR *dirp; -+ void *oldaddr; -+ int cderrno, descend, len, level, nlinks, saved_errno, -+ nostat, doadjust; -+ size_t maxlen; -+ char *cp; -+ -+ /* Set current node pointer. */ -+ cur = sp->fts_cur; -+ -+ /* -+ * Open the directory for reading. If this fails, we're done. -+ * If being called from fts_read, set the fts_info field. -+ */ -+#if defined FTS_WHITEOUT && 0 -+ if (ISSET(FTS_WHITEOUT)) -+ oflag = DTF_NODUP|DTF_REWIND; -+ else -+ oflag = DTF_HIDEW|DTF_NODUP|DTF_REWIND; -+#else -+# define opendir2(path, flag) opendir(path) -+#endif -+ if ((dirp = opendir2(cur->fts_accpath, oflag)) == NULL) { -+ if (type == BREAD) { -+ cur->fts_info = FTS_DNR; -+ cur->fts_errno = errno; -+ } -+ return (NULL); -+ } -+ -+ /* -+ * Nlinks is the number of possible entries of type directory in the -+ * directory if we're cheating on stat calls, 0 if we're not doing -+ * any stat calls at all, -1 if we're doing stats on everything. -+ */ -+ if (type == BNAMES) { -+ nlinks = 0; -+ /* Be quiet about nostat, GCC. */ -+ nostat = 0; -+ } else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) { -+ nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2); -+ nostat = 1; -+ } else { -+ nlinks = -1; -+ nostat = 0; -+ } -+ -+#ifdef notdef -+ (void)printf("nlinks == %d (cur: %d)\n", nlinks, cur->fts_nlink); -+ (void)printf("NOSTAT %d PHYSICAL %d SEEDOT %d\n", -+ ISSET(FTS_NOSTAT), ISSET(FTS_PHYSICAL), ISSET(FTS_SEEDOT)); -+#endif -+ /* -+ * If we're going to need to stat anything or we want to descend -+ * and stay in the directory, chdir. If this fails we keep going, -+ * but set a flag so we don't chdir after the post-order visit. -+ * We won't be able to stat anything, but we can still return the -+ * names themselves. Note, that since fts_read won't be able to -+ * chdir into the directory, it will have to return different path -+ * names than before, i.e. "a/b" instead of "b". Since the node -+ * has already been visited in pre-order, have to wait until the -+ * post-order visit to return the error. There is a special case -+ * here, if there was nothing to stat then it's not an error to -+ * not be able to stat. This is all fairly nasty. If a program -+ * needed sorted entries or stat information, they had better be -+ * checking FTS_NS on the returned nodes. -+ */ -+ cderrno = 0; -+ if (nlinks || type == BREAD) { -+ if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) { -+ if (nlinks && type == BREAD) -+ cur->fts_errno = errno; -+ cur->fts_flags |= FTS_DONTCHDIR; -+ descend = 0; -+ cderrno = errno; -+ (void)closedir(dirp); -+ dirp = NULL; -+ } else -+ descend = 1; -+ } else -+ descend = 0; -+ -+ /* -+ * Figure out the max file name length that can be stored in the -+ * current path -- the inner loop allocates more path as necessary. -+ * We really wouldn't have to do the maxlen calculations here, we -+ * could do them in fts_read before returning the path, but it's a -+ * lot easier here since the length is part of the dirent structure. -+ * -+ * If not changing directories set a pointer so that can just append -+ * each new name into the path. -+ */ -+ len = NAPPEND(cur); -+ if (ISSET(FTS_NOCHDIR)) { -+ cp = sp->fts_path + len; -+ *cp++ = '/'; -+ } else { -+ /* GCC, you're too verbose. */ -+ cp = NULL; -+ } -+ len++; -+ maxlen = sp->fts_pathlen - len; -+ -+ level = cur->fts_level + 1; -+ -+ /* Read the directory, attaching each entry to the `link' pointer. */ -+ doadjust = 0; -+ for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) { -+ if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name)) -+ continue; -+ -+ if ((p = fts_alloc(sp, dp->d_name, _D_EXACT_NAMLEN (dp))) == NULL) -+ goto mem1; -+ if (_D_EXACT_NAMLEN (dp) >= maxlen) {/* include space for NUL */ -+ oldaddr = sp->fts_path; -+ if (fts_palloc(sp, _D_EXACT_NAMLEN (dp) + len + 1)) { -+ /* -+ * No more memory for path or structures. Save -+ * errno, free up the current structure and the -+ * structures already allocated. -+ */ -+mem1: saved_errno = errno; -+ free(p); -+ fts_lfree(head); -+ (void)closedir(dirp); -+ cur->fts_info = FTS_ERR; -+ SET(FTS_STOP); -+ errno = saved_errno; -+ return (NULL); -+ } -+ /* Did realloc() change the pointer? */ -+ if (oldaddr != sp->fts_path) { -+ doadjust = 1; -+ if (ISSET(FTS_NOCHDIR)) -+ cp = sp->fts_path + len; -+ } -+ maxlen = sp->fts_pathlen - len; -+ } -+ -+ if (len + _D_EXACT_NAMLEN (dp) >= USHRT_MAX) { -+ /* -+ * In an FTSENT, fts_pathlen is a u_short so it is -+ * possible to wraparound here. If we do, free up -+ * the current structure and the structures already -+ * allocated, then error out with ENAMETOOLONG. -+ */ -+ free(p); -+ fts_lfree(head); -+ (void)closedir(dirp); -+ cur->fts_info = FTS_ERR; -+ SET(FTS_STOP); -+ errno = ENAMETOOLONG; -+ return (NULL); -+ } -+ p->fts_level = level; -+ p->fts_parent = sp->fts_cur; -+ p->fts_pathlen = len + _D_EXACT_NAMLEN (dp); -+ -+#if defined FTS_WHITEOUT && 0 -+ if (dp->d_type == DT_WHT) -+ p->fts_flags |= FTS_ISW; -+#endif -+ -+#if 0 -+ /* Unreachable code. cderrno is only ever set to a nonnull -+ value if dirp is closed at the same time. But then we -+ cannot enter this loop. */ -+ if (cderrno) { -+ if (nlinks) { -+ p->fts_info = FTS_NS; -+ p->fts_errno = cderrno; -+ } else -+ p->fts_info = FTS_NSOK; -+ p->fts_accpath = cur->fts_accpath; -+ } else -+#endif -+ if (nlinks == 0 -+#if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE -+ || (nostat && -+ dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN) -+#endif -+ ) { -+ p->fts_accpath = -+ ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name; -+ p->fts_info = FTS_NSOK; -+ } else { -+ /* Build a file name for fts_stat to stat. */ -+ if (ISSET(FTS_NOCHDIR)) { -+ p->fts_accpath = p->fts_path; -+ memmove(cp, p->fts_name, p->fts_namelen + 1); -+ } else -+ p->fts_accpath = p->fts_name; -+ /* Stat it. */ -+ p->fts_info = fts_stat(sp, p, 0); -+ -+ /* Decrement link count if applicable. */ -+ if (nlinks > 0 && (p->fts_info == FTS_D || -+ p->fts_info == FTS_DC || p->fts_info == FTS_DOT)) -+ --nlinks; -+ } -+ -+ /* We walk in directory order so "ls -f" doesn't get upset. */ -+ p->fts_link = NULL; -+ if (head == NULL) -+ head = tail = p; -+ else { -+ tail->fts_link = p; -+ tail = p; -+ } -+ ++nitems; -+ } -+ if (dirp) -+ (void)closedir(dirp); -+ -+ /* -+ * If realloc() changed the address of the path, adjust the -+ * addresses for the rest of the tree and the dir list. -+ */ -+ if (doadjust) -+ fts_padjust(sp, head); -+ -+ /* -+ * If not changing directories, reset the path back to original -+ * state. -+ */ -+ if (ISSET(FTS_NOCHDIR)) { -+ if (len == sp->fts_pathlen || nitems == 0) -+ --cp; -+ *cp = '\0'; -+ } -+ -+ /* -+ * If descended after called from fts_children or after called from -+ * fts_read and nothing found, get back. At the root level we use -+ * the saved fd; if one of fts_open()'s arguments is a relative path -+ * to an empty directory, we wind up here with no other way back. If -+ * can't get back, we're done. -+ */ -+ if (descend && (type == BCHILD || !nitems) && -+ (cur->fts_level == FTS_ROOTLEVEL ? -+ FCHDIR(sp, sp->fts_rfd) : -+ fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) { -+ cur->fts_info = FTS_ERR; -+ SET(FTS_STOP); -+ fts_lfree(head); -+ return (NULL); -+ } -+ -+ /* If didn't find anything, return NULL. */ -+ if (!nitems) { -+ if (type == BREAD) -+ cur->fts_info = FTS_DP; -+ fts_lfree(head); -+ return (NULL); -+ } -+ -+ /* Sort the entries. */ -+ if (sp->fts_compar && nitems > 1) -+ head = fts_sort(sp, head, nitems); -+ return (head); -+} -+ -+static u_short -+fts_stat(FTS *sp, register FTSENT *p, int follow) -+{ -+ register FTSENT *t; -+ register dev_t dev; -+ register ino_t ino; -+ struct stat *sbp, sb; -+ int saved_errno; -+ -+ /* If user needs stat info, stat buffer already allocated. */ -+ sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp; -+ -+#if defined FTS_WHITEOUT && 0 -+ /* check for whiteout */ -+ if (p->fts_flags & FTS_ISW) { -+ if (sbp != &sb) { -+ memset(sbp, '\0', sizeof (*sbp)); -+ sbp->st_mode = S_IFWHT; -+ } -+ return (FTS_W); -+ } -+#endif -+ -+ /* -+ * If doing a logical walk, or application requested FTS_FOLLOW, do -+ * a stat(2). If that fails, check for a non-existent symlink. If -+ * fail, set the errno from the stat call. -+ */ -+ if (ISSET(FTS_LOGICAL) || follow) { -+ if (stat(p->fts_accpath, sbp)) { -+ saved_errno = errno; -+ if (!lstat(p->fts_accpath, sbp)) { -+ errno = 0; -+ return (FTS_SLNONE); -+ } -+ p->fts_errno = saved_errno; -+ goto err; -+ } -+ } else if (lstat(p->fts_accpath, sbp)) { -+ p->fts_errno = errno; -+err: memset(sbp, 0, sizeof(struct stat)); -+ return (FTS_NS); -+ } -+ -+ if (S_ISDIR(sbp->st_mode)) { -+ /* -+ * Set the device/inode. Used to find cycles and check for -+ * crossing mount points. Also remember the link count, used -+ * in fts_build to limit the number of stat calls. It is -+ * understood that these fields are only referenced if fts_info -+ * is set to FTS_D. -+ */ -+ dev = p->fts_dev = sbp->st_dev; -+ ino = p->fts_ino = sbp->st_ino; -+ p->fts_nlink = sbp->st_nlink; -+ -+ if (ISDOT(p->fts_name)) -+ return (FTS_DOT); -+ -+ /* -+ * Cycle detection is done by brute force when the directory -+ * is first encountered. If the tree gets deep enough or the -+ * number of symbolic links to directories is high enough, -+ * something faster might be worthwhile. -+ */ -+ for (t = p->fts_parent; -+ t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent) -+ if (ino == t->fts_ino && dev == t->fts_dev) { -+ p->fts_cycle = t; -+ return (FTS_DC); -+ } -+ return (FTS_D); -+ } -+ if (S_ISLNK(sbp->st_mode)) -+ return (FTS_SL); -+ if (S_ISREG(sbp->st_mode)) -+ return (FTS_F); -+ return (FTS_DEFAULT); -+} -+ -+static FTSENT * -+fts_sort(FTS *sp, FTSENT *head, register int nitems) -+{ -+ register FTSENT **ap, *p; -+ -+ /* -+ * Construct an array of pointers to the structures and call qsort(3). -+ * Reassemble the array in the order returned by qsort. If unable to -+ * sort for memory reasons, return the directory entries in their -+ * current order. Allocate enough space for the current needs plus -+ * 40 so don't realloc one entry at a time. -+ */ -+ if (nitems > sp->fts_nitems) { -+ struct _ftsent **a; -+ -+ sp->fts_nitems = nitems + 40; -+ if ((a = realloc(sp->fts_array, -+ (size_t)(sp->fts_nitems * sizeof(FTSENT *)))) == NULL) { -+ free(sp->fts_array); -+ sp->fts_array = NULL; -+ sp->fts_nitems = 0; -+ return (head); -+ } -+ sp->fts_array = a; -+ } -+ for (ap = sp->fts_array, p = head; p; p = p->fts_link) -+ *ap++ = p; -+ qsort((void *)sp->fts_array, nitems, sizeof(FTSENT *), sp->fts_compar); -+ for (head = *(ap = sp->fts_array); --nitems; ++ap) -+ ap[0]->fts_link = ap[1]; -+ ap[0]->fts_link = NULL; -+ return (head); -+} -+ -+static FTSENT * -+fts_alloc(FTS *sp, const char *name, size_t namelen) -+{ -+ register FTSENT *p; -+ size_t len; -+ -+ /* -+ * The file name is a variable length array and no stat structure is -+ * necessary if the user has set the nostat bit. Allocate the FTSENT -+ * structure, the file name and the stat structure in one chunk, but -+ * be careful that the stat structure is reasonably aligned. Since the -+ * fts_name field is declared to be of size 1, the fts_name pointer is -+ * namelen + 2 before the first possible address of the stat structure. -+ */ -+ len = sizeof(FTSENT) + namelen; -+ if (!ISSET(FTS_NOSTAT)) -+ len += sizeof(struct stat) + ALIGNBYTES; -+ if ((p = malloc(len)) == NULL) -+ return (NULL); -+ -+ /* Copy the name and guarantee NUL termination. */ -+ memmove(p->fts_name, name, namelen); -+ p->fts_name[namelen] = '\0'; -+ -+ if (!ISSET(FTS_NOSTAT)) -+ p->fts_statp = (struct stat *)ALIGN(p->fts_name + namelen + 2); -+ p->fts_namelen = namelen; -+ p->fts_path = sp->fts_path; -+ p->fts_errno = 0; -+ p->fts_flags = 0; -+ p->fts_instr = FTS_NOINSTR; -+ p->fts_number = 0; -+ p->fts_pointer = NULL; -+ return (p); -+} -+ -+static void -+fts_lfree(register FTSENT *head) -+{ -+ register FTSENT *p; -+ -+ /* Free a linked list of structures. */ -+ while ((p = head)) { -+ head = head->fts_link; -+ free(p); -+ } -+} -+ -+/* -+ * Allow essentially unlimited paths; find, rm, ls should all work on any tree. -+ * Most systems will allow creation of paths much longer than MAXPATHLEN, even -+ * though the kernel won't resolve them. Add the size (not just what's needed) -+ * plus 256 bytes so don't realloc the path 2 bytes at a time. -+ */ -+static int -+fts_palloc(FTS *sp, size_t more) -+{ -+ char *p; -+ -+ sp->fts_pathlen += more + 256; -+ /* -+ * Check for possible wraparound. In an FTS, fts_pathlen is -+ * a signed int but in an FTSENT it is an unsigned short. -+ * We limit fts_pathlen to USHRT_MAX to be safe in both cases. -+ */ -+ if (sp->fts_pathlen < 0 || sp->fts_pathlen >= USHRT_MAX) { -+ free(sp->fts_path); -+ sp->fts_path = NULL; -+ errno = ENAMETOOLONG; -+ return (1); -+ } -+ p = realloc(sp->fts_path, sp->fts_pathlen); -+ if (p == NULL) { -+ free(sp->fts_path); -+ sp->fts_path = NULL; -+ return 1; -+ } -+ sp->fts_path = p; -+ return 0; -+} -+ -+/* -+ * When the path is realloc'd, have to fix all of the pointers in structures -+ * already returned. -+ */ -+static void -+fts_padjust(FTS *sp, FTSENT *head) -+{ -+ FTSENT *p; -+ char *addr = sp->fts_path; -+ -+#define ADJUST(p) do { \ -+ if ((p)->fts_accpath != (p)->fts_name) { \ -+ (p)->fts_accpath = \ -+ (char *)addr + ((p)->fts_accpath - (p)->fts_path); \ -+ } \ -+ (p)->fts_path = addr; \ -+} while (0) -+ /* Adjust the current set of children. */ -+ for (p = sp->fts_child; p; p = p->fts_link) -+ ADJUST(p); -+ -+ /* Adjust the rest of the tree, including the current level. */ -+ for (p = head; p->fts_level >= FTS_ROOTLEVEL;) { -+ ADJUST(p); -+ p = p->fts_link ? p->fts_link : p->fts_parent; -+ } -+} -+ -+static size_t -+fts_maxarglen(char * const *argv) -+{ -+ size_t len, max; -+ -+ for (max = 0; *argv; ++argv) -+ if ((len = strlen(*argv)) > max) -+ max = len; -+ return (max + 1); -+} -+ -+/* -+ * Change to dir specified by fd or p->fts_accpath without getting -+ * tricked by someone changing the world out from underneath us. -+ * Assumes p->fts_dev and p->fts_ino are filled in. -+ */ -+static int -+fts_safe_changedir(FTS *sp, FTSENT *p, int fd, const char *path) -+{ -+ int ret, oerrno, newfd; -+ struct stat64 sb; -+ -+ newfd = fd; -+ if (ISSET(FTS_NOCHDIR)) -+ return (0); -+ if (fd < 0 && (newfd = open(path, O_RDONLY, 0)) < 0) -+ return (-1); -+ if (fstat64(newfd, &sb)) { -+ ret = -1; -+ goto bail; -+ } -+ if (p->fts_dev != sb.st_dev || p->fts_ino != sb.st_ino) { -+ errno = ENOENT; /* disinformation */ -+ ret = -1; -+ goto bail; -+ } -+ ret = fchdir(newfd); -+bail: -+ oerrno = errno; -+ if (fd < 0) -+ (void)close(newfd); -+ errno = oerrno; -+ return (ret); -+} -diff --git a/libdwfl/fts_.h b/libdwfl/fts_.h -new file mode 100644 -index 000000000000..0a070ba8dce5 ---- /dev/null -+++ b/libdwfl/fts_.h -@@ -0,0 +1,131 @@ -+/* -+ * Copyright (c) 1989, 1993 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * -+ * @(#)fts.h 8.3 (Berkeley) 8/14/94 -+ */ -+ -+#ifndef _FTS_H -+#define _FTS_H 1 -+ -+#include -+#include -+ -+/* The fts interface is incompatible with the LFS interface which -+ transparently uses the 64-bit file access functions. */ -+#ifdef __USE_FILE_OFFSET64 -+# error " cannot be used with -D_FILE_OFFSET_BITS==64" -+#endif -+ -+ -+typedef struct { -+ struct _ftsent *fts_cur; /* current node */ -+ struct _ftsent *fts_child; /* linked list of children */ -+ struct _ftsent **fts_array; /* sort array */ -+ dev_t fts_dev; /* starting device # */ -+ char *fts_path; /* path for this descent */ -+ int fts_rfd; /* fd for root */ -+ int fts_pathlen; /* sizeof(path) */ -+ int fts_nitems; /* elements in the sort array */ -+ int (*fts_compar) (const void *, const void *); /* compare fn */ -+ -+#define FTS_COMFOLLOW 0x0001 /* follow command line symlinks */ -+#define FTS_LOGICAL 0x0002 /* logical walk */ -+#define FTS_NOCHDIR 0x0004 /* don't change directories */ -+#define FTS_NOSTAT 0x0008 /* don't get stat info */ -+#define FTS_PHYSICAL 0x0010 /* physical walk */ -+#define FTS_SEEDOT 0x0020 /* return dot and dot-dot */ -+#define FTS_XDEV 0x0040 /* don't cross devices */ -+#define FTS_WHITEOUT 0x0080 /* return whiteout information */ -+#define FTS_OPTIONMASK 0x00ff /* valid user option mask */ -+ -+#define FTS_NAMEONLY 0x0100 /* (private) child names only */ -+#define FTS_STOP 0x0200 /* (private) unrecoverable error */ -+ int fts_options; /* fts_open options, global flags */ -+} FTS; -+ -+typedef struct _ftsent { -+ struct _ftsent *fts_cycle; /* cycle node */ -+ struct _ftsent *fts_parent; /* parent directory */ -+ struct _ftsent *fts_link; /* next file in directory */ -+ long fts_number; /* local numeric value */ -+ void *fts_pointer; /* local address value */ -+ char *fts_accpath; /* access path */ -+ char *fts_path; /* root path */ -+ int fts_errno; /* errno for this node */ -+ int fts_symfd; /* fd for symlink */ -+ u_short fts_pathlen; /* strlen(fts_path) */ -+ u_short fts_namelen; /* strlen(fts_name) */ -+ -+ ino_t fts_ino; /* inode */ -+ dev_t fts_dev; /* device */ -+ nlink_t fts_nlink; /* link count */ -+ -+#define FTS_ROOTPARENTLEVEL -1 -+#define FTS_ROOTLEVEL 0 -+ short fts_level; /* depth (-1 to N) */ -+ -+#define FTS_D 1 /* preorder directory */ -+#define FTS_DC 2 /* directory that causes cycles */ -+#define FTS_DEFAULT 3 /* none of the above */ -+#define FTS_DNR 4 /* unreadable directory */ -+#define FTS_DOT 5 /* dot or dot-dot */ -+#define FTS_DP 6 /* postorder directory */ -+#define FTS_ERR 7 /* error; errno is set */ -+#define FTS_F 8 /* regular file */ -+#define FTS_INIT 9 /* initialized only */ -+#define FTS_NS 10 /* stat(2) failed */ -+#define FTS_NSOK 11 /* no stat(2) requested */ -+#define FTS_SL 12 /* symbolic link */ -+#define FTS_SLNONE 13 /* symbolic link without target */ -+#define FTS_W 14 /* whiteout object */ -+ u_short fts_info; /* user flags for FTSENT structure */ -+ -+#define FTS_DONTCHDIR 0x01 /* don't chdir .. to the parent */ -+#define FTS_SYMFOLLOW 0x02 /* followed a symlink to get here */ -+ u_short fts_flags; /* private flags for FTSENT structure */ -+ -+#define FTS_AGAIN 1 /* read node again */ -+#define FTS_FOLLOW 2 /* follow symbolic link */ -+#define FTS_NOINSTR 3 /* no instructions */ -+#define FTS_SKIP 4 /* discard node */ -+ u_short fts_instr; /* fts_set() instructions */ -+ -+ struct stat *fts_statp; /* stat(2) information */ -+ char fts_name[1]; /* file name */ -+} FTSENT; -+ -+__BEGIN_DECLS -+FTSENT *fts_children (FTS *, int); -+int fts_close (FTS *); -+FTS *fts_open (char * const *, int, -+ int (*)(const FTSENT **, const FTSENT **)); -+FTSENT *fts_read (FTS *); -+int fts_set (FTS *, FTSENT *, int) __THROW; -+__END_DECLS -+ -+#endif /* fts.h */ -diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c -index 9d0fef2cf260..47f0e3892294 100644 ---- a/libdwfl/linux-kernel-modules.c -+++ b/libdwfl/linux-kernel-modules.c -@@ -31,10 +31,14 @@ - Everything we need here is fine if its declarations just come first. - Also, include sys/types.h before fts. On some systems fts.h is not self - contained. */ -+#ifdef HAVE_FTS_H - #ifdef BAD_FTS - #include - #include - #endif -+#else -+#include -+#endif - - #include - #include --- -2.11.0 - diff --git a/buildroot/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch b/buildroot/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch new file mode 100644 index 000000000..85ac1e4b6 --- /dev/null +++ b/buildroot/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch @@ -0,0 +1,38 @@ +From 2688a0238eaf825d6659c16c012db0c16f07e197 Mon Sep 17 00:00:00 2001 +From: Vicente Olivert Riera +Date: Mon, 29 May 2017 23:24:42 +0300 +Subject: [PATCH] Really make -Werror conditional to BUILD_WERROR + +Otherwise it will fail with an error message like this one: + +elf_getarsym.c:290:9: error: 'n' may be used uninitialized in this +function [-Werror=maybe-uninitialized] + arsym[n].as_name = NULL; + ^ +cc1: all warnings being treated as errors + +[Vincent: tweak patch for 0.166] +[Bernd: rebased patch for 0.177] + +Signed-off-by: "Yann E. MORIN" +Signed-off-by: Vicente Olivert Riera +Signed-off-by: Bernd Kuhls +--- + config/eu.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/config/eu.am b/config/eu.am +index c2cc349ce876..99b368e09060 100644 +--- a/config/eu.am ++++ b/config/eu.am +@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ + -Wold-style-definition -Wstrict-prototypes -Wtrampolines \ + $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ + $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ +- $(if $($(*F)_no_Werror),,-Werror) \ + $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ + $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ + $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \ +-- +2.17.1 + diff --git a/buildroot/package/elfutils/0003-Really-make-Werror-conditional-to-BUILD_WERROR.patch b/buildroot/package/elfutils/0003-Really-make-Werror-conditional-to-BUILD_WERROR.patch deleted file mode 100644 index 21ffa7f31..000000000 --- a/buildroot/package/elfutils/0003-Really-make-Werror-conditional-to-BUILD_WERROR.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2688a0238eaf825d6659c16c012db0c16f07e197 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Mon, 29 May 2017 23:24:42 +0300 -Subject: [PATCH] Really make -Werror conditional to BUILD_WERROR - -Otherwise it will fail with an error message like this one: - -elf_getarsym.c:290:9: error: 'n' may be used uninitialized in this -function [-Werror=maybe-uninitialized] - arsym[n].as_name = NULL; - ^ -cc1: all warnings being treated as errors - -[Vincent: tweak patch for 0.166] - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: Vicente Olivert Riera ---- - config/eu.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/config/eu.am b/config/eu.am -index c2cc349ce876..99b368e09060 100644 ---- a/config/eu.am -+++ b/config/eu.am -@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ - -Wold-style-definition -Wstrict-prototypes \ - $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ - $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ -- $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ - $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \ --- -2.17.1 - diff --git a/buildroot/package/elfutils/0004-libelf-Fix-possible-resource-leak-in-elf-32-64-_updatefile.patch b/buildroot/package/elfutils/0004-libelf-Fix-possible-resource-leak-in-elf-32-64-_updatefile.patch deleted file mode 100644 index ab76bd7a4..000000000 --- a/buildroot/package/elfutils/0004-libelf-Fix-possible-resource-leak-in-elf-32-64-_updatefile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 75e147d0ab85262d9bb2fff093db7ce67dbd4b62 Mon Sep 17 00:00:00 2001 -From: Mark Wielaard -Date: Wed, 6 Mar 2019 19:56:54 +0100 -Subject: [PATCH] libelf: Fix possible resource leak in elf[32|64]_updatefile. - -When we cannot allocate enough memory to convert the data in -updatemmap we should free the scns before returning an error. - -Signed-off-by: Mark Wielaard -[Retrieved (and slightly updated to remove ChangeLog update) from: -https://sourceware.org/git/?p=elfutils.git;a=patch;h=75e147d0ab85262d9bb2fff093db7ce67dbd4b62] -Signed-off-by: Fabrice Fontaine ---- - libelf/elf32_updatefile.c | 1 + - 2 files changed, 6 insertions(+) - - * gelf_xlate.c (__elf_xfctstof): Remove alias. -diff --git a/libelf/elf32_updatefile.c b/libelf/elf32_updatefile.c -index 2899c6f..457d18e 100644 ---- a/libelf/elf32_updatefile.c -+++ b/libelf/elf32_updatefile.c -@@ -365,6 +365,7 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum) - char *converted = aligned_alloc (align, size); - if (converted == NULL) - { -+ free (scns); - __libelf_seterrno (ELF_E_NOMEM); - return 1; - } --- -2.9.3 - diff --git a/buildroot/package/elfutils/0005-libelf-Use-posix_memalign-instead-of-aligned_alloc.patch b/buildroot/package/elfutils/0005-libelf-Use-posix_memalign-instead-of-aligned_alloc.patch deleted file mode 100644 index 70f1f9af2..000000000 --- a/buildroot/package/elfutils/0005-libelf-Use-posix_memalign-instead-of-aligned_alloc.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 6bd060a23f43a842fbc37dd1bb8d6d7964eda36e Mon Sep 17 00:00:00 2001 -From: Mark Wielaard -Date: Thu, 7 Mar 2019 17:31:53 +0100 -Subject: [PATCH] libelf: Use posix_memalign instead of aligned_alloc. - -Older glibc might not have aligned_alloc (it is C11). -Use posix_memalign instead. posix_memalign requires the alignment to -be a multiple of sizeof (void *). So use malloc for smaller alignments. - -Signed-off-by: Mark Wielaard -[Retrieved (and slighlty updated to remove ChangeLog update) from: -https://sourceware.org/git/?p=elfutils.git;a=patch;h=6bd060a23f43a842fbc37dd1bb8d6d7964eda36e] -Signed-off-by: Fabrice Fontaine ---- - libelf/elf32_updatefile.c | 20 +++++++++++++++++--- - 2 files changed, 22 insertions(+), 3 deletions(-) - -diff --git a/libelf/elf32_updatefile.c b/libelf/elf32_updatefile.c -index 457d18e..eea51a7 100644 ---- a/libelf/elf32_updatefile.c -+++ b/libelf/elf32_updatefile.c -@@ -360,16 +360,30 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum) - else - { - /* We have to do the conversion on properly -- aligned memory first. */ -+ aligned memory first. align is a power of 2, -+ but posix_memalign only works for alignments -+ which are a multiple of sizeof (void *). -+ So use normal malloc for smaller alignments. */ - size_t size = dl->data.d.d_size; -- char *converted = aligned_alloc (align, size); -+ void *converted; -+ if (align < sizeof (void *)) -+ converted = malloc (size); -+ else -+ { -+ int res; -+ res = posix_memalign (&converted, align, size); -+ if (res != 0) -+ converted = NULL; -+ } -+ - if (converted == NULL) - { - free (scns); - __libelf_seterrno (ELF_E_NOMEM); - return 1; - } -- (*fctp) (converted, dl->data.d.d_buf, size, 1); -+ -+ (*fctp) (converted, dl->data.d.d_buf, size, 1); - - /* And then write it to the mmapped file. */ - memcpy (last_position, converted, size); --- -2.9.3 - diff --git a/buildroot/package/elfutils/Config.in b/buildroot/package/elfutils/Config.in index 6c8bd0b05..f094e7b86 100644 --- a/buildroot/package/elfutils/Config.in +++ b/buildroot/package/elfutils/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_ELFUTILS depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC help Libraries/utilities to handle ELF objects (drop in replacement for libelf). diff --git a/buildroot/package/elfutils/elfutils.hash b/buildroot/package/elfutils/elfutils.hash index 15dddc2fd..d8a1ce391 100644 --- a/buildroot/package/elfutils/elfutils.hash +++ b/buildroot/package/elfutils/elfutils.hash @@ -1,5 +1,7 @@ -# From https://sourceware.org/elfutils/ftp/0.176/sha512.sum -sha512 7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b elfutils-0.176.tar.bz2 +# From https://sourceware.org/elfutils/ftp/0.177/md5.sum +md5 0b583722f911e1632544718d502aab87 elfutils-0.177.tar.bz2 +# From https://sourceware.org/elfutils/ftp/0.177/sha512.sum +sha512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f elfutils-0.177.tar.bz2 # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2 diff --git a/buildroot/package/elfutils/elfutils.mk b/buildroot/package/elfutils/elfutils.mk index ea5486287..c3df7303b 100644 --- a/buildroot/package/elfutils/elfutils.mk +++ b/buildroot/package/elfutils/elfutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELFUTILS_VERSION = 0.176 +ELFUTILS_VERSION = 0.177 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES @@ -43,6 +43,11 @@ ELFUTILS_CONF_ENV += \ ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) \ $(TARGET_NLS_LIBS) +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +ELFUTILS_DEPENDENCIES += musl-fts +ELFUTILS_LDFLAGS += -lfts +endif + ELFUTILS_CONF_ENV += \ LDFLAGS="$(ELFUTILS_LDFLAGS)" @@ -67,7 +72,7 @@ endif ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y) ELFUTILS_CONF_OPTS += --enable-progs -ELFUTILS_LICENSE := $(ELFUTILS_LICENSE), GPL-3.0+ (programs) +ELFUTILS_LICENSE += , GPL-3.0+ (programs) ELFUTILS_LICENSE_FILES += COPYING else ELFUTILS_CONF_OPTS += --disable-progs diff --git a/buildroot/package/elixir/elixir.hash b/buildroot/package/elixir/elixir.hash new file mode 100644 index 000000000..b4d2f8b6b --- /dev/null +++ b/buildroot/package/elixir/elixir.hash @@ -0,0 +1,3 @@ +# Computed locally +sha256 f3465d8a8e386f3e74831bf9594ee39e6dfde6aa430fe9260844cfe46aa10139 elixir-1.9.4.tar.gz +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE diff --git a/buildroot/package/elixir/elixir.mk b/buildroot/package/elixir/elixir.mk new file mode 100644 index 000000000..7a545d43b --- /dev/null +++ b/buildroot/package/elixir/elixir.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# elixir +# +################################################################################ + +ELIXIR_VERSION = 1.9.4 +ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION)) +ELIXIR_LICENSE = Apache-2.0 +ELIXIR_LICENSE_FILES = LICENSE +ELIXIR_DEPENDENCIES = host-erlang + +define HOST_ELIXIR_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) compile +endef + +define HOST_ELIXIR_INSTALL_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX="$(HOST_DIR)" -C $(@D) install +endef + +$(eval $(host-generic-package)) diff --git a/buildroot/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch b/buildroot/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch new file mode 100644 index 000000000..f64e3d9a8 --- /dev/null +++ b/buildroot/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch @@ -0,0 +1,31 @@ +From 3ca3044859f40d7c595daf0a93393352e4999fb7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 30 May 2019 23:46:27 +0200 +Subject: [PATCH] ell/ecc.h: fix build with uclibc + +ssize_t is defined in sys/types.h + +Fixes: + - http://autobuild.buildroot.org/results/444c9deb728fb041e560d940145f96cc4f455080 + +Signed-off-by: Fabrice Fontaine +--- + ell/ecc.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ell/ecc.h b/ell/ecc.h +index 26a5889..65c49e8 100644 +--- a/ell/ecc.h ++++ b/ell/ecc.h +@@ -27,6 +27,8 @@ + extern "C" { + #endif + ++#include // for ssize_t ++ + #define L_ECC_MAX_DIGITS 6 + #define L_ECC_SCALAR_MAX_BYTES L_ECC_MAX_DIGITS * 8 + #define L_ECC_POINT_MAX_BYTES L_ECC_SCALAR_MAX_BYTES * 2 +-- +2.20.1 + diff --git a/buildroot/package/ell/ell.hash b/buildroot/package/ell/ell.hash index dd6e90f3f..02e6e27b5 100644 --- a/buildroot/package/ell/ell.hash +++ b/buildroot/package/ell/ell.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 bb7038340bfa4eed57700a42da235ba2efce19fe7ab6b976af3e69ee9597a4dd ell-0.16.tar.gz +sha256 b6a4b46807391ea69f9271074cc778aa74263af2bea3f797ab0c092e8dedd21f ell-0.24.tar.gz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/buildroot/package/ell/ell.mk b/buildroot/package/ell/ell.mk index 9f610e7d2..6cafdd73d 100644 --- a/buildroot/package/ell/ell.mk +++ b/buildroot/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.16 +ELL_VERSION = 0.24 ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git ELL_SITE_METHOD = git ELL_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/emlog/emlog.hash b/buildroot/package/emlog/emlog.hash index 9d81d47ec..ddc61a88e 100644 --- a/buildroot/package/emlog/emlog.hash +++ b/buildroot/package/emlog/emlog.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 9f791a00c86215306597b761ef5c5ad267efee5f01efbe23cfcc04e583aa402d emlog-emlog-0.60.tar.gz +sha256 76082cf981b0865c8a1b300d4641c790a6556461901bbb63700df38300277271 emlog-0.70.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/emlog/emlog.mk b/buildroot/package/emlog/emlog.mk index e0926e6cb..7d63916ab 100644 --- a/buildroot/package/emlog/emlog.mk +++ b/buildroot/package/emlog/emlog.mk @@ -4,11 +4,15 @@ # ################################################################################ -EMLOG_VERSION = emlog-0.60 -EMLOG_SITE = $(call github,nicupavel,emlog,$(EMLOG_VERSION)) +EMLOG_VERSION = 0.70 +EMLOG_SITE = $(call github,nicupavel,emlog,emlog-$(EMLOG_VERSION)) EMLOG_LICENSE = GPL-2.0 EMLOG_LICENSE_FILES = COPYING +# CVE-2019-16868 and CVE-2019-17073 are misclassified (by our CVE tracker) as +# affecting emlog, while in fact it affects http://www.emlog.net. +EMLOG_IGNORE_CVES += CVE-2019-16868 CVE-2019-17073 + define EMLOG_BUILD_CMDS $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) nbcat endef diff --git a/buildroot/package/empty/empty.hash b/buildroot/package/empty/empty.hash index e62939687..47e957707 100644 --- a/buildroot/package/empty/empty.hash +++ b/buildroot/package/empty/empty.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 7e6636e400856984c4405ce7bd0843aaa3329fa3efd20c58df8400a9eaa35f09 empty-0.6.20b.tgz +sha256 f01dbe3c624084900b9df1393d9062518b2bc0487acd6a3300ebd6e71352d112 COPYRIGHT diff --git a/buildroot/package/enchant/enchant.hash b/buildroot/package/enchant/enchant.hash index 884a8b59f..f5709f08e 100644 --- a/buildroot/package/enchant/enchant.hash +++ b/buildroot/package/enchant/enchant.hash @@ -1,2 +1,4 @@ # From http://www.abisource.com/downloads/enchant/1.6.0/MD5SUM md5 de11011aff801dc61042828041fb59c7 enchant-1.6.0.tar.gz +# locally computed +sha256 d0db934167997c8b8c863af297b3653aa98500bca0a7c05e9c6ec0dabf4f67d4 COPYING.LIB diff --git a/buildroot/package/enet/Config.in b/buildroot/package/enet/Config.in new file mode 100644 index 000000000..ef3f1523d --- /dev/null +++ b/buildroot/package/enet/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_ENET + bool "enet" + help + ENet's purpose is to provide a relatively thin, simple + and robust network communication layer on top of UDP + (User Datagram Protocol).The primary feature it + provides is optional reliable, in-order delivery of + packets. + + ENet omits certain higher level networking features + such as authentication, lobbying, server discovery, + encryption, or other similar tasks that are + particularly application specific so that the library + remains flexible, portable, and easily embeddable. + + http://enet.bespin.org diff --git a/buildroot/package/enet/enet.hash b/buildroot/package/enet/enet.hash new file mode 100644 index 000000000..ed5231c77 --- /dev/null +++ b/buildroot/package/enet/enet.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 98f6f57aab0a424469619ed3047728f0d3901ce8f0dea919c11e7966d807e870 enet-1.3.14.tar.gz +sha256 eebe647a9ef7e596b0e8b9216c215f169d762af1a27904a87bc2e05b83735d35 LICENSE diff --git a/buildroot/package/enet/enet.mk b/buildroot/package/enet/enet.mk new file mode 100644 index 000000000..b12c1b60a --- /dev/null +++ b/buildroot/package/enet/enet.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# enet +# +################################################################################ + +ENET_VERSION = 1.3.14 +ENET_SITE = http://enet.bespin.org/download +ENET_LICENSE = MIT +ENET_LICENSE_FILES = LICENSE + +ENET_INSTALL_STAGING = YES + +$(eval $(autotools-package)) diff --git a/buildroot/package/enlightenment/Config.in b/buildroot/package/enlightenment/Config.in index d1dee25f8..2cd6512e1 100644 --- a/buildroot/package/enlightenment/Config.in +++ b/buildroot/package/enlightenment/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_ENLIGHTENMENT depends on BR2_PACKAGE_XORG7 # libevas-generic-loaders-svg -> librsvg -> pango -> harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 select BR2_PACKAGE_EFL_X_XLIB select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_EFL_JPEG # needed at runtime by enlightenment_start @@ -28,8 +29,9 @@ config BR2_PACKAGE_ENLIGHTENMENT http://www.enlightenment.org/ -comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads" +comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads, gcc >= 4.8" depends on BR2_PACKAGE_EFL && BR2_PACKAGE_XORG7 && BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/buildroot/package/enlightenment/enlightenment.hash b/buildroot/package/enlightenment/enlightenment.hash index 4872676be..f692a67aa 100644 --- a/buildroot/package/enlightenment/enlightenment.hash +++ b/buildroot/package/enlightenment/enlightenment.hash @@ -1,3 +1,3 @@ -# From https://www.enlightenment.org/news/e0.22.4_release -sha256 59f4997c8b59457142870e40f137bc08c9735c84368d32213dacf09c4342fe79 enlightenment-0.22.4.tar.xz +# From https://www.enlightenment.org/news/e23_release +sha256 b8c5d040875576d3d3ad8572644f92a65e21291bcee6b0d62f74fbfd482afdf8 enlightenment-0.23.0.tar.xz sha256 34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350 COPYING diff --git a/buildroot/package/enlightenment/enlightenment.mk b/buildroot/package/enlightenment/enlightenment.mk index f0f9834c8..43f79d59d 100644 --- a/buildroot/package/enlightenment/enlightenment.mk +++ b/buildroot/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.22.4 +ENLIGHTENMENT_VERSION = 0.23.0 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2-Clause diff --git a/buildroot/package/enscript/enscript.hash b/buildroot/package/enscript/enscript.hash index 8b7694d40..4c50a165a 100644 --- a/buildroot/package/enscript/enscript.hash +++ b/buildroot/package/enscript/enscript.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature sha256 6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb enscript-1.6.6.tar.gz +# Locally computed +sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/buildroot/package/erlang-base64url/Config.in b/buildroot/package/erlang-base64url/Config.in new file mode 100644 index 000000000..7883fa383 --- /dev/null +++ b/buildroot/package/erlang-base64url/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_ERLANG_BASE64URL + bool "erlang-base64url" + help + URL safe base64-compatible codec. + + https://github.com/dvv/base64url diff --git a/buildroot/package/erlang-base64url/erlang-base64url.hash b/buildroot/package/erlang-base64url/erlang-base64url.hash new file mode 100644 index 000000000..becbe5db6 --- /dev/null +++ b/buildroot/package/erlang-base64url/erlang-base64url.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7ef7210effd25ac1f82f190fcfaef53e49d7bc40bb94112c4aa07266c32a851b erlang-base64url-1.0.1.tar.gz +sha256 d59dff2fa4c39f05188ee533fbf06479eef1b47f8cad6353f8ab3726cc6923bc LICENSE.txt diff --git a/buildroot/package/erlang-base64url/erlang-base64url.mk b/buildroot/package/erlang-base64url/erlang-base64url.mk new file mode 100644 index 000000000..2d4963194 --- /dev/null +++ b/buildroot/package/erlang-base64url/erlang-base64url.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# erlang-base64url +# +################################################################################ + +ERLANG_BASE64URL_VERSION = 1.0.1 +ERLANG_BASE64URL_SITE = $(call github,dvv,base64url,$(ERLANG_BASE64URL_VERSION)) +ERLANG_BASE64URL_LICENSE = MIT +ERLANG_BASE64URL_LICENSE_FILES = LICENSE.txt + +$(eval $(rebar-package)) diff --git a/buildroot/package/erlang-eimp/erlang-eimp.hash b/buildroot/package/erlang-eimp/erlang-eimp.hash new file mode 100644 index 000000000..a0276bede --- /dev/null +++ b/buildroot/package/erlang-eimp/erlang-eimp.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 dfcdc211480f974175af615616c7f8c1e8f9dff5d6be5faa3f20c3eb4c60240e erlang-eimp-1.0.12.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-eimp/erlang-eimp.mk b/buildroot/package/erlang-eimp/erlang-eimp.mk index 83d34cd5e..c8cea0e42 100644 --- a/buildroot/package/erlang-eimp/erlang-eimp.mk +++ b/buildroot/package/erlang-eimp/erlang-eimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_EIMP_VERSION = 1.0.8 +ERLANG_EIMP_VERSION = 1.0.12 ERLANG_EIMP_SITE = $(call github,processone,eimp,$(ERLANG_EIMP_VERSION)) ERLANG_EIMP_LICENSE = Apache-2.0 ERLANG_EIMP_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-goldrush/erlang-goldrush.hash b/buildroot/package/erlang-goldrush/erlang-goldrush.hash index d575aa49b..1e2060733 100644 --- a/buildroot/package/erlang-goldrush/erlang-goldrush.hash +++ b/buildroot/package/erlang-goldrush/erlang-goldrush.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612 erlang-goldrush-0.1.9.tar.gz +sha256 335dd315c1bf12bd9bde777666c45e92652c9fe633101b12fc6f927b88433b6f LICENSE diff --git a/buildroot/package/erlang-idna/Config.in b/buildroot/package/erlang-idna/Config.in new file mode 100644 index 000000000..de7116689 --- /dev/null +++ b/buildroot/package/erlang-idna/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_ERLANG_IDNA + bool "erlang-idna" + help + A pure Erlang IDNA implementation that follows RFC5891. + + https://github.com/benoitc/erlang-idna diff --git a/buildroot/package/erlang-idna/erlang-idna.hash b/buildroot/package/erlang-idna/erlang-idna.hash new file mode 100644 index 000000000..2200bbad8 --- /dev/null +++ b/buildroot/package/erlang-idna/erlang-idna.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d57e20ee88018ff0431e0275e91ada5915782870c9981fc798bcd05589031d6f erlang-idna-6.0.0.tar.gz +sha256 95f5c9410a95332b0833c4606028ee00008cd8c497336e230df3144d1a720bda LICENSE diff --git a/buildroot/package/erlang-idna/erlang-idna.mk b/buildroot/package/erlang-idna/erlang-idna.mk new file mode 100644 index 000000000..27a32fb06 --- /dev/null +++ b/buildroot/package/erlang-idna/erlang-idna.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# erlang-idna +# +################################################################################ + +ERLANG_IDNA_VERSION = 6.0.0 +ERLANG_IDNA_SITE = $(call github,benoitc,erlang-idna,$(ERLANG_IDNA_VERSION)) +ERLANG_IDNA_LICENSE = MIT +ERLANG_IDNA_LICENSE_FILES = LICENSE + +$(eval $(rebar-package)) diff --git a/buildroot/package/erlang-jiffy/erlang-jiffy.hash b/buildroot/package/erlang-jiffy/erlang-jiffy.hash index 4a201fe5d..1c18142b6 100644 --- a/buildroot/package/erlang-jiffy/erlang-jiffy.hash +++ b/buildroot/package/erlang-jiffy/erlang-jiffy.hash @@ -1,2 +1,3 @@ # Locally computed sha256 c555726f592b79894c253ca1dc3c3aec6a5697271d29364d57f8175f387b86f3 erlang-jiffy-0.14.11.tar.gz +sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE diff --git a/buildroot/package/erlang-jose/Config.in b/buildroot/package/erlang-jose/Config.in new file mode 100644 index 000000000..8101ff410 --- /dev/null +++ b/buildroot/package/erlang-jose/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_ERLANG_JOSE + bool "erlang-jose" + select BR2_PACKAGE_ERLANG_BASE64URL + help + JSON Object Signing and Encryption (JOSE) for Erlang and + Elixir. + + https://github.com/potatosalad/erlang-jose diff --git a/buildroot/package/erlang-jose/erlang-jose.hash b/buildroot/package/erlang-jose/erlang-jose.hash new file mode 100644 index 000000000..71a1543d9 --- /dev/null +++ b/buildroot/package/erlang-jose/erlang-jose.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d55a9d3a1697833fed555a21f1aeb2727af88193995cb6ffa945d4b6749d0e8d erlang-jose-1.9.0.tar.gz +sha256 6397e2bd9a35a64c1bb798b937071fbe49d90667f717e65c74a0d0fe93d5c1be LICENSE.md diff --git a/buildroot/package/erlang-jose/erlang-jose.mk b/buildroot/package/erlang-jose/erlang-jose.mk new file mode 100644 index 000000000..43ed22a9f --- /dev/null +++ b/buildroot/package/erlang-jose/erlang-jose.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# erlang-jose +# +################################################################################ + +ERLANG_JOSE_VERSION = 1.9.0 +ERLANG_JOSE_SITE = $(call github,potatosalad,erlang-jose,$(ERLANG_JOSE_VERSION)) +ERLANG_JOSE_LICENSE = MIT +ERLANG_JOSE_LICENSE_FILES = LICENSE.md +ERLANG_JOSE_DEPENDENCIES = erlang-base64url + +$(eval $(rebar-package)) diff --git a/buildroot/package/erlang-lager/erlang-lager.hash b/buildroot/package/erlang-lager/erlang-lager.hash index 144cef6d3..40291af39 100644 --- a/buildroot/package/erlang-lager/erlang-lager.hash +++ b/buildroot/package/erlang-lager/erlang-lager.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c5f532dd236e07dad27976abcf12b9c90fcf33ffd6fe1b1d34639c06171c36ea erlang-lager-3.4.2.tar.gz +sha256 c5bb4ba6f918e90d2e6671c3996d72c61f2a589b65c151b3df8011d046362981 erlang-lager-3.6.10.tar.gz +sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE diff --git a/buildroot/package/erlang-lager/erlang-lager.mk b/buildroot/package/erlang-lager/erlang-lager.mk index 790288a46..a698bce8d 100644 --- a/buildroot/package/erlang-lager/erlang-lager.mk +++ b/buildroot/package/erlang-lager/erlang-lager.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_LAGER_VERSION = 3.4.2 +ERLANG_LAGER_VERSION = 3.6.10 ERLANG_LAGER_SITE = $(call github,erlang-lager,lager,$(ERLANG_LAGER_VERSION)) ERLANG_LAGER_LICENSE = Apache-2.0 ERLANG_LAGER_LICENSE_FILES = LICENSE diff --git a/buildroot/package/erlang-p1-acme/Config.in b/buildroot/package/erlang-p1-acme/Config.in new file mode 100644 index 000000000..2c0d1d033 --- /dev/null +++ b/buildroot/package/erlang-p1-acme/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_ERLANG_P1_ACME + bool "erlang-p1-acme" + depends on BR2_INSTALL_LIBSTDCPP # erlang-jiffy + select BR2_PACKAGE_ERLANG_IDNA + select BR2_PACKAGE_ERLANG_JIFFY + select BR2_PACKAGE_ERLANG_JOSE + select BR2_PACKAGE_ERLANG_P1_YCONF + help + ACME client library for Erlang. + + https://github.com/processone/p1_acme + +comment "erlang-p1-acme needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/erlang-p1-acme/erlang-p1-acme.hash b/buildroot/package/erlang-p1-acme/erlang-p1-acme.hash new file mode 100644 index 000000000..036cb923b --- /dev/null +++ b/buildroot/package/erlang-p1-acme/erlang-p1-acme.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 556a9628c323a5a83116ed78599c891f74447b0bac237c095e776c7009089656 erlang-p1-acme-1.0.1.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-acme/erlang-p1-acme.mk b/buildroot/package/erlang-p1-acme/erlang-p1-acme.mk new file mode 100644 index 000000000..ae77d4a58 --- /dev/null +++ b/buildroot/package/erlang-p1-acme/erlang-p1-acme.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# erlang-p1-acme +# +################################################################################ + +ERLANG_P1_ACME_VERSION = 1.0.1 +ERLANG_P1_ACME_SITE = $(call github,processone,p1_acme,$(ERLANG_P1_ACME_VERSION)) +ERLANG_P1_ACME_LICENSE = Apache-2.0 +ERLANG_P1_ACME_LICENSE_FILES = LICENSE.txt +ERLANG_P1_ACME_DEPENDENCIES = erlang-idna erlang-jiffy erlang-jose erlang-p1-yconf + +$(eval $(rebar-package)) diff --git a/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash index 841410292..605ced2ba 100644 --- a/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash +++ b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 169c3ca82b99c482e5914b616d594fed25cf34a4c995e37bfe1651d70bbaea55 erlang-p1-cache-tab-1.0.16.tar.gz +sha256 572b6532dca59c561d994bf2bf8eed3637118c64cdd3a9e51d81b506f5b09e2c erlang-p1-cache-tab-1.0.20.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk index a25f0a1e6..0d53358cf 100644 --- a/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk +++ b/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_CACHE_TAB_VERSION = 1.0.16 +ERLANG_P1_CACHE_TAB_VERSION = 1.0.20 ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION)) ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0 ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-iconv/Config.in b/buildroot/package/erlang-p1-iconv/Config.in deleted file mode 100644 index cec17d060..000000000 --- a/buildroot/package/erlang-p1-iconv/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_ERLANG_P1_ICONV - bool "erlang-p1-iconv" - select BR2_PACKAGE_ERLANG_P1_UTILS - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Erlang interface to libiconv - - https://github.com/processone/eiconv diff --git a/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.hash b/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.hash deleted file mode 100644 index 31bcf4073..000000000 --- a/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 8a9ff8a3dd983284caa964f118b5782ef1c0c662995608b2ca4f4a5f285605a9 erlang-p1-iconv-1.0.10.tar.gz diff --git a/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.mk b/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.mk deleted file mode 100644 index 79d8efe16..000000000 --- a/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# erlang-p1-iconv -# -################################################################################ - -ERLANG_P1_ICONV_VERSION = 1.0.10 -ERLANG_P1_ICONV_SITE = $(call github,processone,iconv,$(ERLANG_P1_ICONV_VERSION)) -ERLANG_P1_ICONV_LICENSE = Apache-2.0 -ERLANG_P1_ICONV_LICENSE_FILES = LICENSE.txt -ERLANG_P1_ICONV_DEPENDENCIES = erlang-p1-utils - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -ERLANG_P1_ICONV_DEPENDENCIES += libiconv -endif - -ERLANG_P1_ICONV_USE_AUTOCONF = YES - -$(eval $(rebar-package)) diff --git a/buildroot/package/erlang-p1-mqtree/Config.in b/buildroot/package/erlang-p1-mqtree/Config.in new file mode 100644 index 000000000..4e2d58c25 --- /dev/null +++ b/buildroot/package/erlang-p1-mqtree/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_ERLANG_P1_MQTREE + bool "erlang-p1-mqtree" + select BR2_PACKAGE_ERLANG_P1_UTILS + help + Index tree for MQTT topic filters. + + https://github.com/processone/mqtree diff --git a/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.hash b/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.hash new file mode 100644 index 000000000..43e98d069 --- /dev/null +++ b/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 034d564e92ca8e9d66668548ea510d2cf9fdbad40609622a87374aa907110884 erlang-p1-mqtree-1.0.5.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.mk b/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.mk new file mode 100644 index 000000000..bd5f28237 --- /dev/null +++ b/buildroot/package/erlang-p1-mqtree/erlang-p1-mqtree.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# erlang-p1-mqtree +# +################################################################################ + +ERLANG_P1_MQTREE_VERSION = 1.0.5 +ERLANG_P1_MQTREE_SITE = $(call github,processone,mqtree,$(ERLANG_P1_MQTREE_VERSION)) +ERLANG_P1_MQTREE_LICENSE = Apache-2.0 +ERLANG_P1_MQTREE_LICENSE_FILES = LICENSE +ERLANG_P1_MQTREE_DEPENDENCIES = erlang-p1-utils + +$(eval $(rebar-package)) diff --git a/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash index 58756c6fd..ed5ea5514 100644 --- a/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash +++ b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 d7d954376ae7c131a0884c7c80b0b9e8270b6f574182df59ce4f2fbbae322854 erlang-p1-oauth2-0.6.3.tar.gz +sha256 55bf54133ce0882fab59f813ddf9ed4dac1e051a53fb4bd1c0565136ebb4d6ac erlang-p1-oauth2-0.6.5.tar.gz +sha256 0ecddd0a5e35b7fcdab451f54c5bb688fac8365cdf6b0da0ac64b7895a0770f3 LICENSE diff --git a/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk index 444bc8971..ea7c23a51 100644 --- a/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk +++ b/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_OAUTH2_VERSION = 0.6.3 +ERLANG_P1_OAUTH2_VERSION = 0.6.5 ERLANG_P1_OAUTH2_SITE = $(call github,processone,p1_oauth2,$(ERLANG_P1_OAUTH2_VERSION)) ERLANG_P1_OAUTH2_LICENSE = MIT ERLANG_P1_OAUTH2_LICENSE_FILES = LICENSE diff --git a/buildroot/package/erlang-p1-pkix/Config.in b/buildroot/package/erlang-p1-pkix/Config.in new file mode 100644 index 000000000..dfd43f9de --- /dev/null +++ b/buildroot/package/erlang-p1-pkix/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_ERLANG_P1_PKIX + bool "erlang-p1-pkix" + help + PKIX certificates management library for Erlang. + + https://github.com/processone/pkix diff --git a/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.hash b/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.hash new file mode 100644 index 000000000..b11340b87 --- /dev/null +++ b/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 184069d9055991cb8b7bd07dde8737a0a793e66e1ec1020deb680f83260a3e82 erlang-p1-pkix-1.0.4.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.mk b/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.mk new file mode 100644 index 000000000..9f902d44b --- /dev/null +++ b/buildroot/package/erlang-p1-pkix/erlang-p1-pkix.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# erlang-p1-pkix +# +################################################################################ + +ERLANG_P1_PKIX_VERSION = 1.0.4 +ERLANG_P1_PKIX_SITE = $(call github,processone,pkix,$(ERLANG_P1_PKIX_VERSION)) +ERLANG_P1_PKIX_LICENSE = Apache-2.0 +ERLANG_P1_PKIX_LICENSE_FILES = LICENSE + +$(eval $(rebar-package)) diff --git a/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash b/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash index 2cd057b97..70b20f95d 100644 --- a/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash +++ b/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 be38cceff8e2207da24805b8e1c926cdf6d63ab116be12cd829f5a3a4e5e58ab erlang-p1-sip-1.0.26.tar.gz +sha256 4c8dbba1dfcbb16a300fea5fd75f5ab2a145f011fa1ebff37e31e1672a9bc285 erlang-p1-sip-1.0.30.tar.gz +sha256 6e68ca4488fcdacf80ea0a3f5a6a294d48c2d8dc9de520cc3d6b3f3c1bc12847 LICENSE.txt diff --git a/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk b/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk index 846633873..f7f10caf9 100644 --- a/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk +++ b/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_SIP_VERSION = 1.0.26 +ERLANG_P1_SIP_VERSION = 1.0.30 ERLANG_P1_SIP_SITE = $(call github,processone,esip,$(ERLANG_P1_SIP_VERSION)) ERLANG_P1_SIP_LICENSE = Apache-2.0 ERLANG_P1_SIP_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash index 5200d661a..bd1995cb7 100644 --- a/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash +++ b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash @@ -1,2 +1,5 @@ # Locally calculated -sha256 32245561f84b03b9024c8768ad2ac8d67f285a032a7f36ff35a74c77fc701f96 erlang-p1-stringprep-1.0.14.tar.gz +sha256 119b751f569baecc4d911ff3c2a6a33a042f8d0b2e64445072d1af14ed935fc0 erlang-p1-stringprep-1.0.17.tar.gz +sha256 f44415631770cb818de6d92f3961fdfe6e407a5154f84b87cc06ac27323e919c LICENSE.ALL +sha256 42aef2a1337ef1f45ae2832aa5aa268c79b2560fb1f3ebab519629372cb24ffe LICENSE.TCL +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk index a05752508..49ffb77cd 100644 --- a/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk +++ b/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STRINGPREP_VERSION = 1.0.14 +ERLANG_P1_STRINGPREP_VERSION = 1.0.17 ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION)) ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest) ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt diff --git a/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash b/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash index 7400a276a..bf569201b 100644 --- a/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash +++ b/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 a5a59ae3c75290029aa062ef19ecd52b8377959a8eb7352bd2a62c4ff1dd0613 erlang-p1-stun-1.0.25.tar.gz +sha256 87cfd9d75c7b956b4c26c9e94492737a4528abf4b09f4f7d89a40abaa0dc088a erlang-p1-stun-1.0.29.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk b/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk index 32bdd4f24..ff2899ffb 100644 --- a/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk +++ b/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STUN_VERSION = 1.0.25 +ERLANG_P1_STUN_VERSION = 1.0.29 ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION)) ERLANG_P1_STUN_LICENSE = Apache-2.0 ERLANG_P1_STUN_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash b/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash index af635e522..135a5368d 100644 --- a/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash +++ b/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 5bb883b03514999876c750cdb08a5e4cf80a9eb89319037b612e1265c43f6f6d erlang-p1-tls-1.0.25.tar.gz +sha256 6444e174650054a53624490155a914b8bea31cdefbcd5f87fc1862102dc1db6e erlang-p1-tls-1.1.2.tar.gz +sha256 6e68ca4488fcdacf80ea0a3f5a6a294d48c2d8dc9de520cc3d6b3f3c1bc12847 LICENSE.txt diff --git a/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk b/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk index b56966446..824fe41ec 100644 --- a/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk +++ b/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_TLS_VERSION = 1.0.25 +ERLANG_P1_TLS_VERSION = 1.1.2 ERLANG_P1_TLS_SITE = $(call github,processone,fast_tls,$(ERLANG_P1_TLS_VERSION)) ERLANG_P1_TLS_LICENSE = Apache-2.0 ERLANG_P1_TLS_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash b/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash index db925bddd..f749aabe3 100644 --- a/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash +++ b/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 8f21fc0472c314572ebb066d624cb5463cf5b016e18b7fd7dca9dca2a4589382 erlang-p1-utils-1.0.13.tar.gz +sha256 2559967770558dc003bcc3c7efc216f6c57c4f23830d5de33c6bf61d8a3f880c erlang-p1-utils-1.0.16.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk b/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk index 6025e3f56..5375971d3 100644 --- a/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk +++ b/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_UTILS_VERSION = 1.0.13 +ERLANG_P1_UTILS_VERSION = 1.0.16 ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION)) ERLANG_P1_UTILS_LICENSE = Apache-2.0 ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash b/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash index ac8042da6..07e640341 100644 --- a/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash +++ b/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 8615f77a1448e297af25f85261b6e4a84952af797da2e317c8ec71fe2fe779ac erlang-p1-xml-1.1.34.tar.gz +sha256 f3226683ec9c8406147a025beebb5b9ed0adcb28099b7c4bb9435a369e9ac3f9 erlang-p1-xml-1.1.37.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk b/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk index c8c65ff42..c66bd2577 100644 --- a/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk +++ b/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_XML_VERSION = 1.1.34 +ERLANG_P1_XML_VERSION = 1.1.37 ERLANG_P1_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_P1_XML_VERSION)) ERLANG_P1_XML_LICENSE = Apache-2.0 ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash index e1c63a606..05578f993 100644 --- a/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash +++ b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 699f50d50850272e67160b022fd27f3ccc46570e48968d8ee30d491bf926794d erlang-p1-xmpp-1.2.5.tar.gz +sha256 a192349e256c0c0af46e6d7f46c52e6345e61984a266696bb0346934c434f342 erlang-p1-xmpp-1.4.2.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk index e20a84f4a..2f74c60df 100644 --- a/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk +++ b/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk @@ -4,13 +4,14 @@ # ################################################################################ -ERLANG_P1_XMPP_VERSION = 1.2.5 +ERLANG_P1_XMPP_VERSION = 1.4.2 ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION)) ERLANG_P1_XMPP_LICENSE = Apache-2.0 ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt ERLANG_P1_XMPP_INSTALL_STAGING = YES ERLANG_P1_XMPP_DEPENDENCIES = erlang-p1-xml erlang-p1-stringprep \ erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-p1-xml +HOST_ERLANG_P1_XMPP_DEPENDENCIES = host-erlang-p1-xml $(eval $(rebar-package)) $(eval $(host-rebar-package)) diff --git a/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash index 2f3b181f6..116363203 100644 --- a/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash +++ b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 d2675ec9b2f64eba6c3437597e3abe3bfaae2172560784456a2763d1d1a50b08 erlang-p1-yaml-1.0.17.tar.gz +sha256 b915612c06ef190bfed6d0370906b071274ed4ce4143b668cdad66588a9484a0 erlang-p1-yaml-1.0.21.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk index d4173988f..6836c3f55 100644 --- a/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk +++ b/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_YAML_VERSION = 1.0.17 +ERLANG_P1_YAML_VERSION = 1.0.21 ERLANG_P1_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_P1_YAML_VERSION)) ERLANG_P1_YAML_LICENSE = Apache-2.0 ERLANG_P1_YAML_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-p1-yconf/Config.in b/buildroot/package/erlang-p1-yconf/Config.in new file mode 100644 index 000000000..3777ebbe1 --- /dev/null +++ b/buildroot/package/erlang-p1-yconf/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_ERLANG_P1_YCONF + bool "erlang-p1-yconf" + select BR2_PACKAGE_ERLANG_P1_YAML + help + YAML configuration processor. diff --git a/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.hash b/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.hash new file mode 100644 index 000000000..6d0a9f68a --- /dev/null +++ b/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 94724bde03c976cdf51d0d43eece73c70381ef60a9dd7e49292d194c0beaeb53 erlang-p1-yconf-1.0.1.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.mk b/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.mk new file mode 100644 index 000000000..5d44ec7ee --- /dev/null +++ b/buildroot/package/erlang-p1-yconf/erlang-p1-yconf.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# erlang-p1-yconf +# +################################################################################ + +ERLANG_P1_YCONF_VERSION = 1.0.1 +ERLANG_P1_YCONF_SITE = $(call github,processone,yconf,$(ERLANG_P1_YCONF_VERSION)) +ERLANG_P1_YCONF_LICENSE = Apache-2.0 +ERLANG_P1_YCONF_LICENSE_FILES = LICENSE +ERLANG_P1_YCONF_DEPENDENCIES = erlang-p1-yaml + +$(eval $(rebar-package)) diff --git a/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash index 6717abdde..ed803d98d 100644 --- a/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash +++ b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 3328661c512c28e68db69b82202b8d6c4127f31f2aefc5b0040ba9bce6abe9b3 erlang-p1-zlib-1.0.4.tar.gz +sha256 7d39a3cb92ed7781b6b6ba95704e2591c626d62eddb3c52dcaeac60c339084d7 erlang-p1-zlib-1.0.6.tar.gz +sha256 6e68ca4488fcdacf80ea0a3f5a6a294d48c2d8dc9de520cc3d6b3f3c1bc12847 LICENSE.txt diff --git a/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk index f62eff637..46a7d1286 100644 --- a/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk +++ b/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ZLIB_VERSION = 1.0.4 +ERLANG_P1_ZLIB_VERSION = 1.0.6 ERLANG_P1_ZLIB_SITE = $(call github,processone,ezlib,$(ERLANG_P1_ZLIB_VERSION)) ERLANG_P1_ZLIB_LICENSE = Apache-2.0 ERLANG_P1_ZLIB_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/erlang-rebar/erlang-rebar.hash b/buildroot/package/erlang-rebar/erlang-rebar.hash index 27cc91aff..b05298009 100644 --- a/buildroot/package/erlang-rebar/erlang-rebar.hash +++ b/buildroot/package/erlang-rebar/erlang-rebar.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 577246bafa2eb2b2c3f1d0c157408650446884555bf87901508ce71d5cc0bd07 erlang-rebar-2.6.4.tar.gz +sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE diff --git a/buildroot/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch b/buildroot/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch deleted file mode 100644 index ad0bb6b45..000000000 --- a/buildroot/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 011752ec7b31e3dde376270fc65c7ee70644f6e7 Mon Sep 17 00:00:00 2001 -From: Johan Oudinet -Date: Wed, 6 Dec 2017 15:01:17 +0100 -Subject: [PATCH] Link with LDLIBS instead of LIBS for DED - -Fix ERL-529 by avoiding to link with libz for no reason. - -Signed-off-by: Johan Oudinet ---- - lib/asn1/c_src/Makefile | 2 +- - lib/runtime_tools/c_src/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 1f714df357..f7c6b8b9bc 100644 ---- a/lib/asn1/c_src/Makefile -+++ b/lib/asn1/c_src/Makefile -@@ -126,7 +126,7 @@ $(NIF_LIB_FILE): $(NIF_STATIC_OBJ_FILES) - $(V_RANLIB) $@ - - $(NIF_SHARED_OBJ_FILE): $(NIF_OBJ_FILES) -- $(V_LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LIBS) -+ $(V_LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LDLIBS) - - # ---------------------------------------------------- - # Release Target -diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in -index 4530a83aee..4e13e0d789 100644 ---- a/lib/runtime_tools/c_src/Makefile.in -+++ b/lib/runtime_tools/c_src/Makefile.in -@@ -95,7 +95,7 @@ $(OBJDIR)/%$(TYPEMARKER).o: %.c dyntrace_lttng.h - $(V_CC) -c -o $@ $(ALL_CFLAGS) $< - - $(LIBDIR)/%$(TYPEMARKER).@DED_EXT@: $(OBJDIR)/%$(TYPEMARKER).o -- $(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS) -+ $(V_LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) - - clean: - rm -f $(TRACE_LIBS) --- -2.14.1 - diff --git a/buildroot/package/erlang/erlang.hash b/buildroot/package/erlang/erlang.hash index 616c85e9a..3c2f03949 100644 --- a/buildroot/package/erlang/erlang.hash +++ b/buildroot/package/erlang/erlang.hash @@ -1,4 +1,4 @@ # md5 from http://www.erlang.org/download/MD5, sha256 locally computed -md5 350988f024f88e9839c3715b35e7e27a otp_src_21.0.tar.gz -sha256 c7d247c0cad2d2e718eaca2e2dff051136a1347a92097abf19ebf65ea2870131 otp_src_21.0.tar.gz +md5 b2b48dad6e69c1e882843edbf2abcfd3 otp_src_22.2.tar.gz +sha256 89c2480cdac566065577c82704a48e10f89cf2e6ca5ab99e1cf80027784c678f otp_src_22.2.tar.gz sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt diff --git a/buildroot/package/erlang/erlang.mk b/buildroot/package/erlang/erlang.mk index ca0aa0b77..9cedb62e0 100644 --- a/buildroot/package/erlang/erlang.mk +++ b/buildroot/package/erlang/erlang.mk @@ -5,7 +5,7 @@ ################################################################################ # See note below when updating Erlang -ERLANG_VERSION = 21.0 +ERLANG_VERSION = 22.2 ERLANG_SITE = http://www.erlang.org/download ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz ERLANG_DEPENDENCIES = host-erlang @@ -14,12 +14,25 @@ ERLANG_LICENSE = Apache-2.0 ERLANG_LICENSE_FILES = LICENSE.txt ERLANG_INSTALL_STAGING = YES +# Remove the leftover deps directory from the ssl app +# See https://bugs.erlang.org/browse/ERL-1168 +define ERLANG_REMOVE_SSL_DEPS + rm -rf $(@D)/lib/ssl/src/deps +endef +ERLANG_POST_PATCH_HOOKS += ERLANG_REMOVE_SSL_DEPS + # Patched erts/aclocal.m4 -ERLANG_AUTORECONF = YES +define ERLANG_RUN_AUTOCONF + cd $(@D) && PATH=$(BR_PATH) ./otp_build autoconf +endef +ERLANG_DEPENDENCIES += host-autoconf +ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +HOST_ERLANG_DEPENDENCIES += host-autoconf +HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF # Whenever updating Erlang, this value should be updated as well, to the # value of EI_VSN in the file lib/erl_interface/vsn.mk -ERLANG_EI_VSN = 3.10.3 +ERLANG_EI_VSN = 3.13.1 # The configure checks for these functions fail incorrectly ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes @@ -38,7 +51,7 @@ HOST_ERLANG_CONF_ENV += ERL_TOP=$(@D) # erlang uses openssl for all things crypto. Since the host tools (such as # rebar) uses crypto, we need to build host-erlang with support for openssl. -HOST_ERLANG_DEPENDENCIES = host-openssl +HOST_ERLANG_DEPENDENCIES += host-openssl HOST_ERLANG_CONF_OPTS = --without-javac --with-ssl=$(HOST_DIR) HOST_ERLANG_CONF_OPTS += --without-termcap @@ -65,7 +78,7 @@ ERLANG_CONF_OPTS += --without-odbc endif # Always use Buildroot's zlib -ERLANG_CONF_OPTS += --enable-shared-zlib +ERLANG_CONF_OPTS += --disable-builtin-zlib ERLANG_DEPENDENCIES += zlib # Remove source, example, gs and wx files from staging and target. diff --git a/buildroot/package/espeak/espeak.hash b/buildroot/package/espeak/espeak.hash index 8f4a1ab95..91feda3ca 100644 --- a/buildroot/package/espeak/espeak.hash +++ b/buildroot/package/espeak/espeak.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659 espeak-1.48.04-source.zip +sha256 0bbca7a0ad5da4a6b0677f90d17817984edce7e42d300cae94ae93e4ccba9df7 License.txt diff --git a/buildroot/package/ethtool/ethtool.hash b/buildroot/package/ethtool/ethtool.hash index b918dca30..86c71d738 100644 --- a/buildroot/package/ethtool/ethtool.hash +++ b/buildroot/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 b18a6c364e42c29cdac057cf183c9674163db96b30848adfa8c2a90450f6d0c8 ethtool-4.19.tar.xz +sha256 22f81e4927d6eb6a13a259d705248a96005fce2005e15257f639f5a1c8c52b6b ethtool-5.4.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/buildroot/package/ethtool/ethtool.mk b/buildroot/package/ethtool/ethtool.mk index ae15800b1..ce4f2d862 100644 --- a/buildroot/package/ethtool/ethtool.mk +++ b/buildroot/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 4.19 +ETHTOOL_VERSION = 5.4 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 diff --git a/buildroot/package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch b/buildroot/package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch new file mode 100644 index 000000000..3027ad7f1 --- /dev/null +++ b/buildroot/package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch @@ -0,0 +1,33 @@ +From 799591c57368bbe47667f5b696050247a766b117 Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" +Date: Mon, 6 Jan 2020 11:14:47 -0500 +Subject: [PATCH] src/libudev/libudev-monitor.c: do not check if /dev is tmpfs + +This check fails for buildroot systems where /dev is not mounted +as a tmpfs filesystem. Dropping this check should be safe even +on regular systems. + +This solves issue #172. + +Signed-off-by: Anthony G. Basile +Signed-off-by: Joel Stanley +--- + src/libudev/libudev-monitor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c +index 614149c6243c..060ba733f33b 100644 +--- a/src/libudev/libudev-monitor.c ++++ b/src/libudev/libudev-monitor.c +@@ -186,7 +186,7 @@ struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c + * We do not set a netlink multicast group here, so the socket + * will not receive any messages. + */ +- if (access(UDEV_ROOT_RUN "/udev/control", F_OK) < 0 || !udev_has_devtmpfs(udev)) { ++ if (access(UDEV_ROOT_RUN "/udev/control", F_OK) < 0) { + log_debug("the udev service seems not to be active, disable the monitor"); + group = UDEV_MONITOR_NONE; + } else +-- +2.25.0 + diff --git a/buildroot/package/eudev/0002-missing.h-add-KEY_ALS_TOGGLE.patch b/buildroot/package/eudev/0002-missing.h-add-KEY_ALS_TOGGLE.patch deleted file mode 100644 index 97dac3fe8..000000000 --- a/buildroot/package/eudev/0002-missing.h-add-KEY_ALS_TOGGLE.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cad87bd3d8aa9046af0872e8c22f4a3c8fafdc78 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 4 Dec 2018 22:38:37 +0100 -Subject: [PATCH] missing.h: add KEY_ALS_TOGGLE - -KEY_ALS_TOGGLE has been added in kernel 4.8 with -https://github.com/torvalds/linux/commit/9ee27487127461b5cf71670b708ed5b2b8da568c - -So add it to missing.h to fix build with kernel older than 4.8 - -Fixes: - - http://autobuild.buildroot.org/results/0c0aff02df91cdb869efa01e397f7ccc0d9f69af - -Signed-off-by: Fabrice Fontaine -[Upstream: https://github.com/gentoo/eudev/commit/2cb6b734de901dda6e631de5dffbd4cb8e165cbb] ---- - src/shared/missing.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/shared/missing.h b/src/shared/missing.h -index bebbb42be..b5b2e1194 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -179,3 +179,7 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle - #ifndef INPUT_PROP_MAX - #define INPUT_PROP_MAX 0x1f - #endif -+ -+#ifndef KEY_ALS_TOGGLE -+#define KEY_ALS_TOGGLE 0x7a -+#endif --- -2.14.1 - diff --git a/buildroot/package/eudev/0003-missing.h-add-BTN_DPAD_UP.patch b/buildroot/package/eudev/0003-missing.h-add-BTN_DPAD_UP.patch deleted file mode 100644 index 08e5fd2b7..000000000 --- a/buildroot/package/eudev/0003-missing.h-add-BTN_DPAD_UP.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 981b8b997e119a117fada2731eeeb0475c511c8a Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Tue, 11 Dec 2018 07:56:20 +0100 -Subject: [PATCH] missing.h: add BTN_DPAD_UP - -As explained in issue 6267 of systemd [1], Linux < 3.11 does not -provide definitions for BTN_DPAD_{UP,RIGHT}, which were introduced in -[2]. - -This patch fixes this issue. - -[1] https://github.com/systemd/systemd/pull/6267 -[2] https://github.com/torvalds/linux/commit/9ee27487127461b5cf71670b708ed5b2b8da568c - -Signed-off-by: Eric Le Bihan ---- - src/shared/missing.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/shared/missing.h b/src/shared/missing.h -index b5b2e1194..3a83c91a6 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -183,3 +183,8 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle - #ifndef KEY_ALS_TOGGLE - #define KEY_ALS_TOGGLE 0x7a - #endif -+ -+#ifndef BTN_DPAD_UP -+#define BTN_DPAD_UP 0x220 -+#define BTN_DPAD_RIGHT 0x223 -+#endif --- -2.17.2 - diff --git a/buildroot/package/eudev/eudev.hash b/buildroot/package/eudev/eudev.hash index 33556a2d2..e6a319ac4 100644 --- a/buildroot/package/eudev/eudev.hash +++ b/buildroot/package/eudev/eudev.hash @@ -1,5 +1,5 @@ # From http://dev.gentoo.org/~blueness/eudev/ -md5 c75d99910c1791dd9430d26ab76059c0 eudev-3.2.7.tar.gz +md5 dedfb1964f6098fe9320de827957331f eudev-3.2.9.tar.gz # Locally calculated -sha256 3004614bd253c1f98558460215027aaf60d7592c70be27fd384ec01db87bf062 eudev-3.2.7.tar.gz +sha256 89618619084a19e1451d373c43f141b469c9fd09767973d73dd268b92074d4fc eudev-3.2.9.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/eudev/eudev.mk b/buildroot/package/eudev/eudev.mk index e41675d3e..99b5befd0 100644 --- a/buildroot/package/eudev/eudev.mk +++ b/buildroot/package/eudev/eudev.mk @@ -4,7 +4,7 @@ # ################################################################################ -EUDEV_VERSION = 3.2.7 +EUDEV_VERSION = 3.2.9 EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) EUDEV_LICENSE_FILES = COPYING diff --git a/buildroot/package/evemu/evemu.hash b/buildroot/package/evemu/evemu.hash index 7d45eb3e5..13dd40293 100644 --- a/buildroot/package/evemu/evemu.hash +++ b/buildroot/package/evemu/evemu.hash @@ -1,2 +1,4 @@ # From https://lists.freedesktop.org/archives/input-tools/2017-September/001416.html -sha256 78c9400d55eeeb5ab75161360543f9376438c4da4934cb34cdda5b46021ae379 evemu-2.7.0.tar.xz +sha256 78c9400d55eeeb5ab75161360543f9376438c4da4934cb34cdda5b46021ae379 evemu-2.7.0.tar.xz +# locally computed +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/buildroot/package/eventlog/Config.in b/buildroot/package/eventlog/Config.in deleted file mode 100644 index f9442f618..000000000 --- a/buildroot/package/eventlog/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_EVENTLOG - bool "eventlog" - help - eventlog is a library for creating structured events from - applications, and is the workhorse behind syslog-ng's own - messages. - - https://my.balabit.com/downloads/eventlog/ diff --git a/buildroot/package/eventlog/eventlog.hash b/buildroot/package/eventlog/eventlog.hash deleted file mode 100644 index b8f2ec614..000000000 --- a/buildroot/package/eventlog/eventlog.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://my.balabit.com/downloads/eventlog/0.2/eventlog_0.2.12.dsc -sha256 494dac8e01dc5ce323df2ad554d94874938dab51aa025987677b2bc6906a9c66 eventlog_0.2.12.tar.gz diff --git a/buildroot/package/eventlog/eventlog.mk b/buildroot/package/eventlog/eventlog.mk deleted file mode 100644 index 725365716..000000000 --- a/buildroot/package/eventlog/eventlog.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# eventlog -# -################################################################################ - -EVENTLOG_VERSION_MAJOR = 0.2 -EVENTLOG_VERSION = $(EVENTLOG_VERSION_MAJOR).12 -EVENTLOG_SOURCE = eventlog_$(EVENTLOG_VERSION).tar.gz -EVENTLOG_SITE = https://my.balabit.com/downloads/eventlog/$(EVENTLOG_VERSION_MAJOR) -EVENTLOG_LICENSE = BSD-3-Clause -EVENTLOG_LICENSE_FILES = COPYING -EVENTLOG_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/buildroot/package/evtest/evtest.hash b/buildroot/package/evtest/evtest.hash index e131318f4..566d423fc 100644 --- a/buildroot/package/evtest/evtest.hash +++ b/buildroot/package/evtest/evtest.hash @@ -1,2 +1,5 @@ # locally computed -sha256 9fb68236a6871c163e52433ba8f2cce142c0f4208163a2962768c13f262d549f evtest-1.33.tar.gz +sha256 73d5b604d57551418d282fedee3deae9f851afb3c355dccc87153364c046efd3 evtest-1.34.tar.gz + +# License files +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/evtest/evtest.mk b/buildroot/package/evtest/evtest.mk index d00d4cb62..d2fd01c2d 100644 --- a/buildroot/package/evtest/evtest.mk +++ b/buildroot/package/evtest/evtest.mk @@ -4,7 +4,7 @@ # ################################################################################ -EVTEST_VERSION = 1.33 +EVTEST_VERSION = 1.34 EVTEST_SITE = http://cgit.freedesktop.org/evtest/snapshot EVTEST_LICENSE = GPL-2.0+ EVTEST_LICENSE_FILES = COPYING diff --git a/buildroot/package/execline/execline.hash b/buildroot/package/execline/execline.hash index 6bf3ccff6..cef4959bd 100644 --- a/buildroot/package/execline/execline.hash +++ b/buildroot/package/execline/execline.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 f6993094766652041c21fde9c07ef53a3cd4b93a64123d9578fb4997a2cefca1 execline-2.5.0.0.tar.gz -sha256 3eadcf980c40da0f257b8292d805ff41e5e5a908c1942315d9a627732e1aa012 COPYING +sha256 05205c6869ae65a51c63d0e805572573806f6474aa21e12c49dd5654d3ceed33 execline-2.5.3.0.tar.gz +sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING diff --git a/buildroot/package/execline/execline.mk b/buildroot/package/execline/execline.mk index 83205e370..74ad91e4a 100644 --- a/buildroot/package/execline/execline.mk +++ b/buildroot/package/execline/execline.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXECLINE_VERSION = 2.5.0.0 +EXECLINE_VERSION = 2.5.3.0 EXECLINE_SITE = http://skarnet.org/software/execline EXECLINE_LICENSE = ISC EXECLINE_LICENSE_FILES = COPYING diff --git a/buildroot/package/exempi/Config.in b/buildroot/package/exempi/Config.in index c9af219a2..eba12a2a3 100644 --- a/buildroot/package/exempi/Config.in +++ b/buildroot/package/exempi/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_EXEMPI depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_ZLIB @@ -12,5 +13,6 @@ config BR2_PACKAGE_EXEMPI http://libopenraw.freedesktop.org/wiki/Exempi -comment "exempi needs a toolchain w/ C++, dynamic library, threads" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "exempi needs a toolchain w/ C++, dynamic library, threads, wchar" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/buildroot/package/exempi/exempi.hash b/buildroot/package/exempi/exempi.hash index 562a4d9b7..e8b71a483 100644 --- a/buildroot/package/exempi/exempi.hash +++ b/buildroot/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 406185feb88e84ea1d4b4251370be2991205790d7113a7e28e192ff46a4f221e exempi-2.4.5.tar.bz2 +sha256 100b3d5b1b3370bc2e31c0978991716c4a4478246a2ac2df6382054a0ae89bc8 exempi-2.5.1.tar.bz2 sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/buildroot/package/exempi/exempi.mk b/buildroot/package/exempi/exempi.mk index 91b1d5da1..2b6bd4fa8 100644 --- a/buildroot/package/exempi/exempi.mk +++ b/buildroot/package/exempi/exempi.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXEMPI_VERSION = 2.4.5 +EXEMPI_VERSION = 2.5.1 EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES diff --git a/buildroot/package/exim/0005-Fix-uClibc-build.patch b/buildroot/package/exim/0004-Fix-uClibc-build.patch similarity index 100% rename from buildroot/package/exim/0005-Fix-uClibc-build.patch rename to buildroot/package/exim/0004-Fix-uClibc-build.patch diff --git a/buildroot/package/exim/0004-remove-libnsl.patch b/buildroot/package/exim/0004-remove-libnsl.patch deleted file mode 100644 index 8ca53c9ac..000000000 --- a/buildroot/package/exim/0004-remove-libnsl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b722f8fc01f6b1d71c98c0c66f759935b0dac136 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 19 May 2018 20:36:41 +0200 -Subject: [PATCH] remove libnsl - -glibc now considers its built-in libnsl as being obsolete, and requires -passing --enable-obsolete-libnsl to have it built and installed. libnsl -is now provided as a separate project [1], but it isn't packaged yet in -Buildroot. - -Exim's nis.so and nisplus.so lookup modules require libnsl, -but they are not build by default. So we can safely remove -lnsl -from the Makefile-Linux. - -[1] https://github.com/thkukuk/libnsl.git - -Signed-off-by: Romain Naour ---- - OS/Makefile-Linux | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/OS/Makefile-Linux b/OS/Makefile-Linux -index 990f884..ea5644b 100644 ---- a/OS/Makefile-Linux -+++ b/OS/Makefile-Linux -@@ -19,7 +19,7 @@ CFLAGS_DYNAMIC ?= -shared -rdynamic - DBMLIB = -ldb - USE_DB = yes - --LIBS = -lnsl -lcrypt -lm -+LIBS = -lcrypt -lm - LIBRESOLV = -lresolv - - X11=/usr/X11R6 --- -2.14.3 - diff --git a/buildroot/package/exim/0005-exim_lock-fix-lstat-related-build-errors.patch b/buildroot/package/exim/0005-exim_lock-fix-lstat-related-build-errors.patch new file mode 100644 index 000000000..a0a279fc4 --- /dev/null +++ b/buildroot/package/exim/0005-exim_lock-fix-lstat-related-build-errors.patch @@ -0,0 +1,51 @@ +From bbcf4320134efd8a01ce5a02bb9af62019ca05f6 Mon Sep 17 00:00:00 2001 +From: Luca Ceresoli +Date: Tue, 4 Feb 2020 15:57:48 +0100 +Subject: [PATCH] exim_lock: fix lstat-related build errors + +exim_lock fails to cross-compile with the Sourcery CodeBench ARM 2014.05 +toolchain due the a missing include of sys/types.h, needed for the +constants used by fstat() and lstat(). + +Discovered when cross-compiling with the Buildroot embedded Linux +buildsystem. + +Fixes: + + exim_lock.c:427:30: error: 'S_IFMT' undeclared (first use in this function) + if ((statbuf.st_mode & S_IFMT) == S_IFLNK) + ^ + exim_lock.c:427:30: note: each undeclared identifier is reported only once for each function it appears in + exim_lock.c:427:41: error: 'S_IFLNK' undeclared (first use in this function) + if ((statbuf.st_mode & S_IFMT) == S_IFLNK) + ^ + +Signed-off-by: Luca Ceresoli +Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523 +--- + src/exim_lock.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/exim_lock.c b/src/exim_lock.c +index 068216816054..cb140aff6436 100644 +--- a/src/exim_lock.c ++++ b/src/exim_lock.c +@@ -13,6 +13,8 @@ Argument: the name of the lock file + Copyright (c) The Exim Maintainers 2016 + */ + ++#define _XOPEN_SOURCE ++ + #include "os.h" + + #include +@@ -26,6 +28,7 @@ Copyright (c) The Exim Maintainers 2016 + #include + #include + #include ++#include + #include + #include + #include +-- +2.25.0 diff --git a/buildroot/package/exim/0006-Fix-buffer-overflow-in-string_vformat.patch b/buildroot/package/exim/0006-Fix-buffer-overflow-in-string_vformat.patch deleted file mode 100644 index 5b022e2fc..000000000 --- a/buildroot/package/exim/0006-Fix-buffer-overflow-in-string_vformat.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 478effbfd9c3cc5a627fc671d4bf94d13670d65f Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Fri, 27 Sep 2019 12:21:49 +0100 -Subject: [PATCH] Fix buffer overflow in string_vformat. Bug 2449 - -Fixes CVE-2019-16928: -https://lists.exim.org/lurker/message/20190928.003428.2b4c81a7.en.html - -Downloaded from upstream commit -https://git.exim.org/exim.git/patch/478effbfd9c3cc5a627fc671d4bf94d13670d65f - -[adjusted patch of string.c and removed patches for test/] -Signed-off-by: Bernd Kuhls ---- - src/string.c | 4 ++-- - scripts/0000-Basic/0214 | 11 +++++++++++ - stdout/0214 | 7 +++++++ - 3 files changed, 20 insertions(+), 2 deletions(-) - -diff --git a/src/src/string.c b/src/src/string.c -index c6549bf..3445f8a 100644 ---- a/src/string.c -+++ b/src/string.c -@@ -1132,7 +1132,7 @@ store_reset(g->s + (g->size = g->ptr + 1)); - Arguments: - g the growable-string - p current end of data -- count amount to grow by -+ count amount to grow by, offset from p - */ - - static void -@@ -1590,7 +1590,7 @@ while (*fp) - } - else if (g->ptr >= lim - width) - { -- gstring_grow(g, g->ptr, width - (lim - g->ptr)); -+ gstring_grow(g, g->ptr, width); - lim = g->size - 1; - gp = CS g->s + g->ptr; - } --- -1.9.1 - diff --git a/buildroot/package/exim/0006-sieve-fix-build-errors.patch b/buildroot/package/exim/0006-sieve-fix-build-errors.patch new file mode 100644 index 000000000..f4b95d50b --- /dev/null +++ b/buildroot/package/exim/0006-sieve-fix-build-errors.patch @@ -0,0 +1,42 @@ +From e9d0b5b022df172d3615e9e2875506c74e6d7cd1 Mon Sep 17 00:00:00 2001 +From: Luca Ceresoli +Date: Wed, 5 Feb 2020 17:13:57 +0100 +Subject: [PATCH] sieve: fix build errors + +sieve fails to cross-compile with the Sourcery CodeBench ARM 2014.05 +toolchain with a huge number of errors, including: + + .../sysroot/usr/include/arpa/nameser.h:115:2: error: unknown type name 'u_char' + const u_char *_msg, *_eom; + ^ + .../sysroot/usr/include/arpa/nameser.h:474:1: error: unknown type name 'u_long' + u_long ns_get32 (const u_char *) __THROW; + ^ + .../sysroot/usr/include/arpa/nameser.h:475:31: error: expected ')' before '*' token + void ns_put16 (u_int, u_char *) __THROW; + ^ + +Discovered when cross-compiling with the Buildroot embedded Linux +buildsystem. + +Signed-off-by: Luca Ceresoli +Upstream-status: https://bugs.exim.org/show_bug.cgi?id=2523 +--- + src/sieve.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/sieve.c b/src/sieve.c +index 5e8d1e6f4776..9632f2d43810 100644 +--- a/src/sieve.c ++++ b/src/sieve.c +@@ -12,6 +12,8 @@ + + /* Sieve mail filter. */ + ++#define _BSD_SOURCE ++ + #include + #include + #include +-- +2.25.0 diff --git a/buildroot/package/exim/exim.hash b/buildroot/package/exim/exim.hash index 0d11683c0..7cedf1bc8 100644 --- a/buildroot/package/exim/exim.hash +++ b/buildroot/package/exim/exim.hash @@ -1,3 +1,6 @@ -# Locally calculated after checking pgp signature -sha256 01d7ae481d03ff408f8e54fd9b250324ea5ddabc83b1db32917c7f27a096a654 exim-4.92.2.tar.xz +# From https://ftp.exim.org/pub/exim/exim4/fixes/00-sha256sums.txt +sha256 537d366ee18ed357656f54f255f8f9e11bde9684fcaaecaaa56f84cdbcd3e405 exim-4.93.0.4.tar.xz +# From https://ftp.exim.org/pub/exim/exim4/fixes/00-sha512sums.txt +sha512 84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96 exim-4.93.0.4.tar.xz +# Locally calculated sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE diff --git a/buildroot/package/exim/exim.mk b/buildroot/package/exim/exim.mk index b6a8566ce..e4b0bfc1b 100644 --- a/buildroot/package/exim/exim.mk +++ b/buildroot/package/exim/exim.mk @@ -4,9 +4,9 @@ # ################################################################################ -EXIM_VERSION = 4.92.2 +EXIM_VERSION = 4.93.0.4 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz -EXIM_SITE = https://ftp.exim.org/pub/exim/exim4 +EXIM_SITE = https://ftp.exim.org/pub/exim/exim4/fixes EXIM_LICENSE = GPL-2.0+ EXIM_LICENSE_FILES = LICENCE EXIM_DEPENDENCIES = host-berkeleydb host-pcre pcre berkeleydb host-pkgconf @@ -48,6 +48,7 @@ define EXIM_USE_DEFAULT_CONFIG_FILE $(call exim-config-unset,EXIM_MONITOR) $(call exim-config-change,AUTH_PLAINTEXT,yes) $(call exim-config-change,AUTH_CRAM_MD5,yes) + $(call exim-config-unset,SUPPORT_DANE) endef ifeq ($(BR2_PACKAGE_DOVECOT),y) @@ -67,9 +68,13 @@ endif ifeq ($(BR2_PACKAGE_OPENSSL),y) EXIM_DEPENDENCIES += host-openssl openssl define EXIM_USE_DEFAULT_CONFIG_FILE_OPENSSL - $(call exim-config-change,SUPPORT_TLS,yes) + $(call exim-config-change,USE_OPENSSL,yes) $(call exim-config-change,USE_OPENSSL_PC,openssl) endef +else +define EXIM_USE_DEFAULT_CONFIG_FILE_OPENSSL + $(call exim-config-change,DISABLE_TLS,yes) +endef endif # musl does not provide struct ip_options nor struct ip_opts (but it is @@ -120,16 +125,19 @@ define EXIM_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE1) -C $(@D)/build-br macro_predef \ CC=$(HOSTCC) \ LNCC=$(HOSTCC) \ - CFLAGS="$(HOST_CFLAGS)" \ + CFLAGS="-std=c99 $(HOST_CFLAGS)" \ LFLAGS="-fPIC $(HOST_LDFLAGS)" - $(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) + $(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) \ + CFLAGS="-std=c99 $(TARGET_CFLAGS)" endef # Need to replicate the LFLAGS in install, as exim still wants to build # something when installing... define EXIM_INSTALL_TARGET_CMDS DESTDIR=$(TARGET_DIR) INSTALL_ARG="-no_chown -no_symlink" build=br \ - $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) install + $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) \ + CFLAGS="-std=c99 $(TARGET_CFLAGS)" \ + install chmod u+s $(TARGET_DIR)/usr/sbin/exim endef @@ -145,9 +153,6 @@ endef define EXIM_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/exim/exim.service \ $(TARGET_DIR)/usr/lib/systemd/system/exim.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/exim.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/exim.service endef $(eval $(generic-package)) diff --git a/buildroot/package/exim/exim.service b/buildroot/package/exim/exim.service index 26daabc4c..fe97727ab 100644 --- a/buildroot/package/exim/exim.service +++ b/buildroot/package/exim/exim.service @@ -3,7 +3,7 @@ Description=Exim MTA After=syslog.target network.target [Service] -ExecStart=/usr/bin/exim -bdf +ExecStart=/usr/sbin/exim -bdf Restart=always [Install] diff --git a/buildroot/package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch b/buildroot/package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch new file mode 100644 index 000000000..f26006e3a --- /dev/null +++ b/buildroot/package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch @@ -0,0 +1,32 @@ +From b7890776c62398ca1005e8edc32786859d60fcf7 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sun, 6 Oct 2019 15:05:20 +0200 +Subject: [PATCH] crwimage: Check offset and size against total size + +Corrupted or specially crafted CRW images might exceed the overall +buffersize. + +Fixes #1019 + +(cherry picked from commit 683451567284005cd24e1ccb0a76ca401000968b) +[Retrieved (and slightly updated to keep only the fix) from: +https://github.com/Exiv2/exiv2/commit/50e9dd964a439da357798344ed1dd86edcadf0ec] +Signed-off-by: Fabrice Fontaine +--- + src/crwimage_int.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp +index 29311fdb7..c0d955350 100644 +--- a/src/crwimage_int.cpp ++++ b/src/crwimage_int.cpp +@@ -268,6 +268,9 @@ namespace Exiv2 { + #ifdef EXIV2_DEBUG_MESSAGES + std::cout << "Reading directory 0x" << std::hex << tag() << "\n"; + #endif ++ if (this->offset() + this->size() > size) ++ throw Error(kerOffsetOutOfRange); ++ + readDirectory(pData + offset(), this->size(), byteOrder); + #ifdef EXIV2_DEBUG_MESSAGES + std::cout << "<---- 0x" << std::hex << tag() << "\n"; diff --git a/buildroot/package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch b/buildroot/package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch new file mode 100644 index 000000000..400bf342c --- /dev/null +++ b/buildroot/package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch @@ -0,0 +1,86 @@ +From 1b917c3f7dd86336a9f6fda4456422c419dfe88c Mon Sep 17 00:00:00 2001 +From: clanmills +Date: Tue, 1 Oct 2019 17:39:44 +0100 +Subject: [PATCH] Fix #1011 fix_1011_jp2_readmetadata_loop + +[Retrieved (and slighlty updated to keep only the fix) from: +https://github.com/Exiv2/exiv2/commit/a82098f4f90cd86297131b5663c3dec6a34470e8] +Signed-off-by: Fabrice Fontaine +--- + src/jp2image.cpp | 25 +++++++++++++++---- + test/data/Jp2Image_readMetadata_loop.poc | Bin 0 -> 738 bytes + tests/bugfixes/github/test_CVE_2017_17725.py | 4 +-- + tests/bugfixes/github/test_issue_1011.py | 13 ++++++++++ + 4 files changed, 35 insertions(+), 7 deletions(-) + create mode 100755 test/data/Jp2Image_readMetadata_loop.poc + create mode 100644 tests/bugfixes/github/test_issue_1011.py + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index d5cd1340a..0de088d62 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -18,10 +18,6 @@ + * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. + */ + +-/* +- File: jp2image.cpp +-*/ +- + // ***************************************************************************** + + // included header files +@@ -197,6 +193,16 @@ namespace Exiv2 + return result; + } + ++static void boxes_check(size_t b,size_t m) ++{ ++ if ( b > m ) { ++#ifdef EXIV2_DEBUG_MESSAGES ++ std::cout << "Exiv2::Jp2Image::readMetadata box maximum exceeded" << std::endl; ++#endif ++ throw Error(kerCorruptedMetadata); ++ } ++} ++ + void Jp2Image::readMetadata() + { + #ifdef EXIV2_DEBUG_MESSAGES +@@ -219,9 +225,12 @@ namespace Exiv2 + Jp2BoxHeader subBox = {0,0}; + Jp2ImageHeaderBox ihdr = {0,0,0,0,0,0,0,0}; + Jp2UuidBox uuid = {{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; ++ size_t boxes = 0 ; ++ size_t boxem = 1000 ; // boxes max + + while (io_->read((byte*)&box, sizeof(box)) == sizeof(box)) + { ++ boxes_check(boxes++,boxem ); + position = io_->tell(); + box.length = getLong((byte*)&box.length, bigEndian); + box.type = getLong((byte*)&box.type, bigEndian); +@@ -251,8 +260,12 @@ namespace Exiv2 + + while (io_->read((byte*)&subBox, sizeof(subBox)) == sizeof(subBox) && subBox.length ) + { ++ boxes_check(boxes++, boxem) ; + subBox.length = getLong((byte*)&subBox.length, bigEndian); + subBox.type = getLong((byte*)&subBox.type, bigEndian); ++ if (subBox.length > io_->size() ) { ++ throw Error(kerCorruptedMetadata); ++ } + #ifdef EXIV2_DEBUG_MESSAGES + std::cout << "Exiv2::Jp2Image::readMetadata: " + << "subBox = " << toAscii(subBox.type) << " length = " << subBox.length << std::endl; +@@ -308,7 +321,9 @@ namespace Exiv2 + } + + io_->seek(restore,BasicIo::beg); +- io_->seek(subBox.length, Exiv2::BasicIo::cur); ++ if ( io_->seek(subBox.length, Exiv2::BasicIo::cur) != 0 ) { ++ throw Error(kerCorruptedMetadata); ++ } + restore = io_->tell(); + } + break; diff --git a/buildroot/package/exiv2/Config.in b/buildroot/package/exiv2/Config.in index acce81c59..3e3e50275 100644 --- a/buildroot/package/exiv2/Config.in +++ b/buildroot/package/exiv2/Config.in @@ -16,24 +16,10 @@ config BR2_PACKAGE_EXIV2 access to the Exif, IPTC and XMP metadata of images in various formats. - Exiv2 is available under the GPLv2+ or under a commercial - license. - http://www.exiv2.org/ if BR2_PACKAGE_EXIV2 -config BR2_PACKAGE_EXIV2_COMMERCIAL - bool "Enable commercial" - help - Build the commercial version for closed source project. - - The Nikon lens name database and the NLS support is disabled - for copyright reasons. - - A commercial license request is needed. - http://www.exiv2.org/download.html#license - config BR2_PACKAGE_EXIV2_PNG bool "PNG image support" select BR2_PACKAGE_ZLIB @@ -48,11 +34,11 @@ config BR2_PACKAGE_EXIV2_XMP config BR2_PACKAGE_EXIV2_LENSDATA bool "Nikon lens name database" - depends on !BR2_PACKAGE_EXIV2_COMMERCIAL help Integrate Nikon lens name database. - This database is integrated but comes from a thirdparty: - http://www.rottmerhusen.com/objektives/lensid/thirdparty.html. + This database comes from a thirdparty and is free to use in + non-commercial, GPL or open source software only. + For more informations src/nikonmn_int.cpp. endif diff --git a/buildroot/package/exiv2/exiv2.hash b/buildroot/package/exiv2/exiv2.hash index e30cbfaa5..7937d3f57 100644 --- a/buildroot/package/exiv2/exiv2.hash +++ b/buildroot/package/exiv2/exiv2.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 290cb6208f143b9bd5074d790fc8924409f28e5813356c143d739a3311d8ad76 exiv2-910f3507795e1930ae216c9febee0bf9a88e99c0.tar.gz +sha256 3dbcaf01fbc5b98d42f091d1ff0d4b6cd9750dc724de3d9c0d113948570b2934 exiv2-0.27.2.tar.gz +sha256 a7ba75cb966aca374711e2af49e5f3aea6a4443a803440f5d93e73a5a1222f66 COPYING +sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS diff --git a/buildroot/package/exiv2/exiv2.mk b/buildroot/package/exiv2/exiv2.mk index 32029bab9..5ca16c474 100644 --- a/buildroot/package/exiv2/exiv2.mk +++ b/buildroot/package/exiv2/exiv2.mk @@ -4,9 +4,22 @@ # ################################################################################ -EXIV2_VERSION = 910f3507795e1930ae216c9febee0bf9a88e99c0 -EXIV2_SITE = $(call github,Exiv2,exiv2,$(EXIV2_VERSION)) +EXIV2_VERSION = 0.27.2 +EXIV2_SITE = $(call github,Exiv2,exiv2,v$(EXIV2_VERSION)) EXIV2_INSTALL_STAGING = YES +EXIV2_LICENSE = GPL-2.0+, BSD-3-Clause +EXIV2_LICENSE_FILES = COPYING COPYING-CMAKE-SCRIPTS + +# CVE-2019-13504 is misclassified (by our CVE tracker) as affecting version +# 0.27.2, while in fact both commits that fixed this issue are already in this +# version. +EXIV2_IGNORE_CVES += CVE-2019-13504 + +# 0001-crwimage-Check-offset-and-size-against-total-size.patch +EXIV2_IGNORE_CVES += CVE-2019-17402 + +# 0002-fix_1011_jp2_readmetadata_loop.patch +EXIV2_IGNORE_CVES += CVE-2019-20421 EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BUILD_SAMPLES=OFF @@ -14,18 +27,10 @@ EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BUILD_SAMPLES=OFF # test which is not allowed when cross-compiling. EXIV2_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF -ifeq ($(BR2_PACKAGE_EXIV2_LENSDATA),) -EXIV2_CONF_OPTS += -DEXIV2_ENABLE_LENSDATA=OFF -endif - -ifeq ($(BR2_PACKAGE_EXIV2_COMMERCIAL),y) -EXIV2_LICENSE = commercial -# NLS support is disabled in commercial version due to the copyright -# of the translated texts. -EXIV2_CONF_OPTS += -DEXIV2_ENABLE_COMMERCIAL=ON -DEXIV2_ENABLE_NLS=OFF +ifeq ($(BR2_PACKAGE_EXIV2_LENSDATA),y) +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_LENSDATA=ON else -EXIV2_LICENSE = GPL-2.0+ -EXIV2_LICENSE_FILES = COPYING +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_LENSDATA=OFF endif ifeq ($(BR2_PACKAGE_EXIV2_PNG),y) diff --git a/buildroot/package/expat/expat.hash b/buildroot/package/expat/expat.hash index 07faca5e6..588e881d0 100644 --- a/buildroot/package/expat/expat.hash +++ b/buildroot/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.2.8/ -md5 cdf54239f892fc7914957f10de1e1c70 expat-2.2.8.tar.xz -sha1 500a848d7085df06020a86bf64c5f71c0052a080 expat-2.2.8.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.2.9/ +md5 d2384fa607223447e713e1b9bd272376 expat-2.2.9.tar.xz +sha1 90a361e4c97f8c469479ffadc0de0b121a911fb5 expat-2.2.9.tar.xz # Locally calculated -sha256 61caa81a49d858afb2031c7b1a25c97174e7f2009aa1ec4e1ffad2316b91779b expat-2.2.8.tar.xz +sha256 1ea6965b15c2106b6bbe883397271c80dfa0331cdf821b2c319591b55eadc0a4 expat-2.2.9.tar.xz sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 COPYING diff --git a/buildroot/package/expat/expat.mk b/buildroot/package/expat/expat.mk index 20d0add83..38e5dee75 100644 --- a/buildroot/package/expat/expat.mk +++ b/buildroot/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.2.8 +EXPAT_VERSION = 2.2.9 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES diff --git a/buildroot/package/explorercanvas/explorercanvas.hash b/buildroot/package/explorercanvas/explorercanvas.hash index 59e8c7a0e..e47367a21 100644 --- a/buildroot/package/explorercanvas/explorercanvas.hash +++ b/buildroot/package/explorercanvas/explorercanvas.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 7b8f597b5d3a2f71e87aac413e12e03d852df3dd3ac39f70e1615c9c850217ec explorercanvas-aa989ea9d9bac748638f7c66b0fc88e619715da6.tar.gz +sha256 7b8f597b5d3a2f71e87aac413e12e03d852df3dd3ac39f70e1615c9c850217ec explorercanvas-aa989ea9d9bac748638f7c66b0fc88e619715da6.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/buildroot/package/ezxml/ezxml.hash b/buildroot/package/ezxml/ezxml.hash index 44d7bbdf9..bf04b0e00 100644 --- a/buildroot/package/ezxml/ezxml.hash +++ b/buildroot/package/ezxml/ezxml.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 a68d52257dcb0ff2ad3d71c8c64311edb8030254bb8b581e229aeaba6231cdf9 ezxml-0.8.6.tar.gz +sha256 e82e49402f6b21176c65eead46dbd39d8f7a3c28b052589d8b307dfc8f78a03f license.txt diff --git a/buildroot/package/f2fs-tools/0001-configure-uclinux-is-also-linux.patch b/buildroot/package/f2fs-tools/0001-configure-uclinux-is-also-linux.patch deleted file mode 100644 index dc91b22c8..000000000 --- a/buildroot/package/f2fs-tools/0001-configure-uclinux-is-also-linux.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 67629fd736a8a4295a9f2acb96563953be22a3ae Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Wed, 13 Jun 2018 20:39:04 +0300 -Subject: [PATCH] configure: uclinux is also linux - -Linux systems on no-MMU platforms identify as uclinux. They are -otherwise identical to plain Linux. - -Signed-off-by: Baruch Siach ---- -Upstream status: sent to linux-f2fs-devel@lists.sourceforge.net - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a3ff12bf3de9..2b13be5b09f9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -166,7 +166,7 @@ build_mac=no - - # Detect the target system - case "${host_os}" in --linux*) -+linux*|uclinux*) - build_linux=yes - ;; - cygwin*|mingw*) --- -2.17.1 - diff --git a/buildroot/package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch b/buildroot/package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch new file mode 100644 index 000000000..aac60e70b --- /dev/null +++ b/buildroot/package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch @@ -0,0 +1,30 @@ +From 7727b6fe0897849d4fc8f75a48326e902f0ab8b2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 22 Sep 2019 10:06:35 +0200 +Subject: [PATCH] mkfs/Makefile.am: fix build without blkid + +Commit d56232bc1640e2a3ffc412faff42cd8e77dbb8dd hardcoded -lblkid in +libf2fs_format_la_LDFLAGS which breaks the build with --without-blkid +option so use ${libblkid_LIBS} instead + +Signed-off-by: Fabrice Fontaine +--- + mkfs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am +index cae2f93..83e2389 100644 +--- a/mkfs/Makefile.am ++++ b/mkfs/Makefile.am +@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libf2fs_format.la + libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c + libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD + libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include +-libf2fs_format_la_LDFLAGS = -lblkid -luuid -L$(top_builddir)/lib -lf2fs \ ++libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} -luuid -L$(top_builddir)/lib -lf2fs \ + -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE) + + install-exec-hook: +-- +2.23.0 + diff --git a/buildroot/package/f2fs-tools/f2fs-tools.hash b/buildroot/package/f2fs-tools/f2fs-tools.hash index 9b72ca8fc..4eb4d1470 100644 --- a/buildroot/package/f2fs-tools/f2fs-tools.hash +++ b/buildroot/package/f2fs-tools/f2fs-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 25fb715be0b6a115cc6b7b0f6b8ad6c825a7b174f55c034b6f9da2df1c2c6d97 f2fs-tools-v1.11.0.tar.gz +sha256 b39d3ae9224267aab0070b5f17d91d0c5143f6d960166a27f6b11c8c87072c7d f2fs-tools-1.13.0.tar.gz sha256 662abb3a8a80b36ae7036c289dd1e03b361ee5dd2e6fd5211d0d8d029146449f COPYING diff --git a/buildroot/package/f2fs-tools/f2fs-tools.mk b/buildroot/package/f2fs-tools/f2fs-tools.mk index ba16218bd..a9536dc8e 100644 --- a/buildroot/package/f2fs-tools/f2fs-tools.mk +++ b/buildroot/package/f2fs-tools/f2fs-tools.mk @@ -4,9 +4,8 @@ # ################################################################################ -F2FS_TOOLS_VERSION = v1.11.0 -F2FS_TOOLS_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git -F2FS_TOOLS_SITE_METHOD = git +F2FS_TOOLS_VERSION = 1.13.0 +F2FS_TOOLS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no F2FS_TOOLS_DEPENDENCIES = host-pkgconf util-linux HOST_F2FS_TOOLS_DEPENDENCIES = host-pkgconf host-util-linux diff --git a/buildroot/package/faad2/0001-syntax.c-check-for-syntax-element-inconsistencies.patch b/buildroot/package/faad2/0001-syntax.c-check-for-syntax-element-inconsistencies.patch deleted file mode 100644 index de97dbbaf..000000000 --- a/buildroot/package/faad2/0001-syntax.c-check-for-syntax-element-inconsistencies.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 466b01d504d7e45f1e9169ac90b3e34ab94aed14 Mon Sep 17 00:00:00 2001 -From: Hugo Lefeuvre -Date: Mon, 25 Feb 2019 10:49:03 +0100 -Subject: [PATCH] syntax.c: check for syntax element inconsistencies - -Implicit channel mapping reconfiguration is explicitely forbidden by -ISO/IEC 13818-7:2006 (8.5.3.3). Decoders should be able to detect such -files and reject them. FAAD2 does not perform any kind of checks -regarding this. - -This leads to security vulnerabilities when processing crafted AAC -files performing such reconfigurations. - -Add checks to decode_sce_lfe and decode_cpe to make sure such -inconsistencies are detected as early as possible. - -These checks first read hDecoder->frame: if this is not the first -frame then we make sure that the syntax element at the same position -in the previous frame also had element_id id_syn_ele. If not, return -21 as this is a fatal file structure issue. - -This patch addresses CVE-2018-20362 (fixes #26) and possibly other -related issues. - -Signed-off-by: Baruch Siach ---- -Upstream status: commit 466b01d504d7 - - libfaad/syntax.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/libfaad/syntax.c b/libfaad/syntax.c -index f8e808c269c0..e7fb11381e46 100644 ---- a/libfaad/syntax.c -+++ b/libfaad/syntax.c -@@ -344,6 +344,12 @@ static void decode_sce_lfe(NeAACDecStruct *hDecoder, - can become 2 when some form of Parametric Stereo coding is used - */ - -+ if (hDecoder->frame && hDecoder->element_id[hDecoder->fr_ch_ele] != id_syn_ele) { -+ /* element inconsistency */ -+ hInfo->error = 21; -+ return; -+ } -+ - /* save the syntax element id */ - hDecoder->element_id[hDecoder->fr_ch_ele] = id_syn_ele; - -@@ -395,6 +401,12 @@ static void decode_cpe(NeAACDecStruct *hDecoder, NeAACDecFrameInfo *hInfo, bitfi - return; - } - -+ if (hDecoder->frame && hDecoder->element_id[hDecoder->fr_ch_ele] != id_syn_ele) { -+ /* element inconsistency */ -+ hInfo->error = 21; -+ return; -+ } -+ - /* save the syntax element id */ - hDecoder->element_id[hDecoder->fr_ch_ele] = id_syn_ele; - --- -2.20.1 - diff --git a/buildroot/package/faad2/0002-sbr_hfadj-sanitize-frequency-band-borders.patch b/buildroot/package/faad2/0002-sbr_hfadj-sanitize-frequency-band-borders.patch deleted file mode 100644 index 9c580f933..000000000 --- a/buildroot/package/faad2/0002-sbr_hfadj-sanitize-frequency-band-borders.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 6b4a7cde30f2e2cb03e78ef476cc73179cfffda3 Mon Sep 17 00:00:00 2001 -From: Hugo Lefeuvre -Date: Thu, 11 Apr 2019 09:34:07 +0200 -Subject: [PATCH] sbr_hfadj: sanitize frequency band borders - -user passed f_table_lim contains frequency band borders. Frequency -bands are groups of consecutive QMF channels. This means that their -bounds, as provided by f_table_lim, should never exceed MAX_M (maximum -number of QMF channels). c.f. ISO/IEC 14496-3:2001 - -FAAD2 does not verify this, leading to security issues when -processing files defining f_table_lim with values > MAX_M. - -This patch sanitizes the values of f_table_lim so that they can be safely -used as index for Q_M_lim and G_lim arrays. - -Fixes #21 (CVE-2018-20194). - -Signed-off-by: Baruch Siach ---- -Upstream status: commit 6b4a7cde30f2e - - libfaad/sbr_hfadj.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/libfaad/sbr_hfadj.c b/libfaad/sbr_hfadj.c -index 3f310b8190d7..dda1ce8e249b 100644 ---- a/libfaad/sbr_hfadj.c -+++ b/libfaad/sbr_hfadj.c -@@ -485,6 +485,12 @@ static void calculate_gain(sbr_info *sbr, sbr_hfadj_info *adj, uint8_t ch) - ml1 = sbr->f_table_lim[sbr->bs_limiter_bands][k]; - ml2 = sbr->f_table_lim[sbr->bs_limiter_bands][k+1]; - -+ if (ml1 > MAX_M) -+ ml1 = MAX_M; -+ -+ if (ml2 > MAX_M) -+ ml2 = MAX_M; -+ - - /* calculate the accumulated E_orig and E_curr over the limiter band */ - for (m = ml1; m < ml2; m++) -@@ -949,6 +955,12 @@ static void calculate_gain(sbr_info *sbr, sbr_hfadj_info *adj, uint8_t ch) - ml1 = sbr->f_table_lim[sbr->bs_limiter_bands][k]; - ml2 = sbr->f_table_lim[sbr->bs_limiter_bands][k+1]; - -+ if (ml1 > MAX_M) -+ ml1 = MAX_M; -+ -+ if (ml2 > MAX_M) -+ ml2 = MAX_M; -+ - - /* calculate the accumulated E_orig and E_curr over the limiter band */ - for (m = ml1; m < ml2; m++) -@@ -1193,6 +1205,12 @@ static void calculate_gain(sbr_info *sbr, sbr_hfadj_info *adj, uint8_t ch) - ml1 = sbr->f_table_lim[sbr->bs_limiter_bands][k]; - ml2 = sbr->f_table_lim[sbr->bs_limiter_bands][k+1]; - -+ if (ml1 > MAX_M) -+ ml1 = MAX_M; -+ -+ if (ml2 > MAX_M) -+ ml2 = MAX_M; -+ - - /* calculate the accumulated E_orig and E_curr over the limiter band */ - for (m = ml1; m < ml2; m++) --- -2.20.1 - diff --git a/buildroot/package/faad2/0003-Fix-a-couple-buffer-overflows.patch b/buildroot/package/faad2/0003-Fix-a-couple-buffer-overflows.patch deleted file mode 100644 index 6ae760877..000000000 --- a/buildroot/package/faad2/0003-Fix-a-couple-buffer-overflows.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 942c3e0aee748ea6fe97cb2c1aa5893225316174 Mon Sep 17 00:00:00 2001 -From: Fabian Greffrath -Date: Mon, 10 Jun 2019 13:58:40 +0200 -Subject: [PATCH] Fix a couple buffer overflows - -https://hackerone.com/reports/502816 -https://hackerone.com/reports/507858 - -https://github.com/videolan/vlc/blob/master/contrib/src/faad2/faad2-fix-overflows.patch - -Signed-off-by: Baruch Siach ---- -Upstream status: commit 942c3e0aee748ea6 - - libfaad/bits.c | 5 ++++- - libfaad/syntax.c | 2 ++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libfaad/bits.c b/libfaad/bits.c -index dc14d7a03952..4c0de24a5d9c 100644 ---- a/libfaad/bits.c -+++ b/libfaad/bits.c -@@ -167,7 +167,10 @@ void faad_resetbits(bitfile *ld, int bits) - int words = bits >> 5; - int remainder = bits & 0x1F; - -- ld->bytes_left = ld->buffer_size - words*4; -+ if (ld->buffer_size < words * 4) -+ ld->bytes_left = 0; -+ else -+ ld->bytes_left = ld->buffer_size - words*4; - - if (ld->bytes_left >= 4) - { -diff --git a/libfaad/syntax.c b/libfaad/syntax.c -index e7fb11381e46..c9925435dbd0 100644 ---- a/libfaad/syntax.c -+++ b/libfaad/syntax.c -@@ -2304,6 +2304,8 @@ static uint8_t excluded_channels(bitfile *ld, drc_info *drc) - while ((drc->additional_excluded_chns[n-1] = faad_get1bit(ld - DEBUGVAR(1,104,"excluded_channels(): additional_excluded_chns"))) == 1) - { -+ if (i >= MAX_CHANNELS - num_excl_chan - 7) -+ return n; - for (i = num_excl_chan; i < num_excl_chan+7; i++) - { - drc->exclude_mask[i] = faad_get1bit(ld --- -2.20.1 - diff --git a/buildroot/package/faad2/0004-add-patch-to-prevent-crash-on-SCE-followed-by-CPE.patch b/buildroot/package/faad2/0004-add-patch-to-prevent-crash-on-SCE-followed-by-CPE.patch deleted file mode 100644 index b759b037e..000000000 --- a/buildroot/package/faad2/0004-add-patch-to-prevent-crash-on-SCE-followed-by-CPE.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f1f8e002622196de3aa650163e5dc2888ebc7a63 Mon Sep 17 00:00:00 2001 -From: Fabian Greffrath -Date: Mon, 10 Jun 2019 13:59:49 +0200 -Subject: [PATCH] add patch to prevent crash on SCE followed by CPE - -hDecoder->element_alloced denotes whether or not we have allocated memory for -usage in terms of the specified channel element. Given that it previously only -had two states (1 meaning allocated, and 0 meaning not allocated), it would not -allocate enough memory for parsing a CPE it if is preceeded by a SCE (and -therefor crash). - -These changes fixes the issue by making sure that we allocate additional memory -if so is necessary, and the set of values for hDecoder->element_alloced[n] is -now: - - 0 = nothing allocated - 1 = allocated enough for SCE - 2 = allocated enough for CPE - -All branches that depend on hDecoder->element_alloced[n] prior to this patch -only checks if the value is, or is not, zero. The added state, 2, is therefor -correctly handled automatically. - -https://github.com/videolan/vlc/blob/master/contrib/src/faad2/faad2-fix-cpe-reconstruction.patch - -Signed-off-by: Baruch Siach ---- -Upstream status: commit f1f8e002622196d - libfaad/specrec.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libfaad/specrec.c b/libfaad/specrec.c -index 9797d6e79468..0e72207fc9c0 100644 ---- a/libfaad/specrec.c -+++ b/libfaad/specrec.c -@@ -1109,13 +1109,13 @@ uint8_t reconstruct_channel_pair(NeAACDecStruct *hDecoder, ic_stream *ics1, ic_s - #ifdef PROFILE - int64_t count = faad_get_ts(); - #endif -- if (hDecoder->element_alloced[hDecoder->fr_ch_ele] == 0) -+ if (hDecoder->element_alloced[hDecoder->fr_ch_ele] != 2) - { - retval = allocate_channel_pair(hDecoder, cpe->channel, (uint8_t)cpe->paired_channel); - if (retval > 0) - return retval; - -- hDecoder->element_alloced[hDecoder->fr_ch_ele] = 1; -+ hDecoder->element_alloced[hDecoder->fr_ch_ele] = 2; - } - - /* dequantisation and scaling */ --- -2.20.1 - diff --git a/buildroot/package/faad2/faad2.hash b/buildroot/package/faad2/faad2.hash index 2c6acee3d..1a03bc9b7 100644 --- a/buildroot/package/faad2/faad2.hash +++ b/buildroot/package/faad2/faad2.hash @@ -1,6 +1,3 @@ -# From http://sourceforge.net/projects/faac/files/faad2-src/faad2-2.8.0/ (used by upstream): -md5 28f6116efdbe9378269f8a6221767d1f faad2-2.8.8.tar.gz -sha1 0d49c516d4a83c39053a9bd214fddba72cbc34ad faad2-2.8.8.tar.gz # Locally computed -sha256 985c3fadb9789d2815e50f4ff714511c79c2710ac27a4aaaf5c0c2662141426d faad2-2.8.8.tar.gz +sha256 7fa33cff76abdda5a220ca5de0b2e05a77354f3b97f735193c2940224898aa9a faad2-2.9.1.tar.gz sha256 d3baf3a54943cf12a994c85867a18dec84f810901b2f2878ddfd77efcc3c150f COPYING diff --git a/buildroot/package/faad2/faad2.mk b/buildroot/package/faad2/faad2.mk index 27daadfc1..9ec9d8f52 100644 --- a/buildroot/package/faad2/faad2.mk +++ b/buildroot/package/faad2/faad2.mk @@ -4,13 +4,14 @@ # ################################################################################ -FAAD2_VERSION_MAJOR = 2.8 -FAAD2_VERSION = $(FAAD2_VERSION_MAJOR).8 -FAAD2_SITE = http://downloads.sourceforge.net/project/faac/faad2-src/faad2-$(FAAD2_VERSION_MAJOR).0 +FAAD2_VERSION = 2.9.1 +FAAD2_SITE = $(call github,knik0,faad2,$(subst .,_,$(FAAD2_VERSION))) FAAD2_LICENSE = GPL-2.0 FAAD2_LICENSE_FILES = COPYING # frontend/faad calls frexp() FAAD2_CONF_ENV = LIBS=-lm FAAD2_INSTALL_STAGING = YES +# From git +FAAD2_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/faifa/faifa.hash b/buildroot/package/faifa/faifa.hash index b4c27418f..658dae4a7 100644 --- a/buildroot/package/faifa/faifa.hash +++ b/buildroot/package/faifa/faifa.hash @@ -1,2 +1,3 @@ # locally computed -sha256 6eada81f3d21f80b5848338b627784981064d728f8e377e5cf973d31640d4489 faifa-v0.1.tar.gz +sha256 6eada81f3d21f80b5848338b627784981064d728f8e377e5cf973d31640d4489 faifa-0.1.tar.gz +sha256 9b62e4601b2b9cd5719a393e88ed71a8304048862502db765ed9d6ff8cf38c5e COPYING diff --git a/buildroot/package/faifa/faifa.mk b/buildroot/package/faifa/faifa.mk index af7a1741f..e5dc15748 100644 --- a/buildroot/package/faifa/faifa.mk +++ b/buildroot/package/faifa/faifa.mk @@ -4,8 +4,8 @@ # ################################################################################ -FAIFA_VERSION = v0.1 -FAIFA_SITE = $(call github,ffainelli,faifa,$(FAIFA_VERSION)) +FAIFA_VERSION = 0.1 +FAIFA_SITE = $(call github,ffainelli,faifa,v$(FAIFA_VERSION)) FAIFA_INSTALL_STAGING = YES FAIFA_DEPENDENCIES = libpcap host-autoconf FAIFA_LICENSE = BSD-3-Clause diff --git a/buildroot/package/fail2ban/Config.in b/buildroot/package/fail2ban/Config.in index 8fa63bfdc..86e623379 100644 --- a/buildroot/package/fail2ban/Config.in +++ b/buildroot/package/fail2ban/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_FAIL2BAN bool "fail2ban" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_SYSTEMD if BR2_PACKAGE_SYSTEMD help Fail2ban scans log files (e.g. /var/log/apache/error_log) and bans IPs that show the malicious signs -- too many password diff --git a/buildroot/package/fail2ban/fail2ban.hash b/buildroot/package/fail2ban/fail2ban.hash index 25d120c11..f807d5a82 100644 --- a/buildroot/package/fail2ban/fail2ban.hash +++ b/buildroot/package/fail2ban/fail2ban.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d6ca1bbc7e7944f7acb2ba7c1065953cd9837680bc4d175f30ed155c6a372449 fail2ban-0.10.4.tar.gz +sha256 71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d fail2ban-0.11.1.tar.gz sha256 a75fec0260742fe6275d63ff6a5d97b924b28766558306b3fa4069763096929b COPYING diff --git a/buildroot/package/fail2ban/fail2ban.mk b/buildroot/package/fail2ban/fail2ban.mk index b7e6bdc1a..a0a2dc704 100644 --- a/buildroot/package/fail2ban/fail2ban.mk +++ b/buildroot/package/fail2ban/fail2ban.mk @@ -4,12 +4,29 @@ # ################################################################################ -FAIL2BAN_VERSION = 0.10.4 +FAIL2BAN_VERSION = 0.11.1 FAIL2BAN_SITE = $(call github,fail2ban,fail2ban,$(FAIL2BAN_VERSION)) FAIL2BAN_LICENSE = GPL-2.0+ FAIL2BAN_LICENSE_FILES = COPYING FAIL2BAN_SETUP_TYPE = distutils +ifeq ($(BR2_PACKAGE_PYTHON3),y) +define FAIL2BAN_PYTHON_2TO3 + $(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban +endef +FAIL2BAN_DEPENDENCIES += host-python3 +# We can't use _POST_PATCH_HOOKS because dependencies are not guaranteed +# to build and install before _POST_PATCH_HOOKS run. +FAIL2BAN_PRE_CONFIGURE_HOOKS += FAIL2BAN_PYTHON_2TO3 +endif + +define FAIL2BAN_FIX_DEFAULT_CONFIG + $(SED) '/^socket/c\socket = /run/fail2ban.sock' $(TARGET_DIR)/etc/fail2ban/fail2ban.conf + $(SED) '/^pidfile/c\pidfile = /run/fail2ban.pid' $(TARGET_DIR)/etc/fail2ban/fail2ban.conf + $(SED) '/^dbfile/c\dbfile = None' $(TARGET_DIR)/etc/fail2ban/fail2ban.conf +endef +FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_DEFAULT_CONFIG + define FAIL2BAN_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/fail2ban/S60fail2ban \ $(TARGET_DIR)/etc/init.d/S60fail2ban @@ -18,10 +35,8 @@ endef define FAIL2BAN_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/files/fail2ban.service.in \ $(TARGET_DIR)/usr/lib/systemd/system/fail2ban.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib//systemd/system/fail2ban.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/fail2ban.service $(SED) 's,@BINDIR@,/usr/bin,g' $(TARGET_DIR)/usr/lib/systemd/system/fail2ban.service + $(SED) '/^PIDFile/c\PIDFile=/run/fail2ban.pid' $(TARGET_DIR)/usr/lib/systemd/system/fail2ban.service endef $(eval $(python-package)) diff --git a/buildroot/package/faketime/0001-Disable-the-non-null-compare-warning-error.patch b/buildroot/package/faketime/0001-Disable-the-non-null-compare-warning-error.patch deleted file mode 100644 index f8c748445..000000000 --- a/buildroot/package/faketime/0001-Disable-the-non-null-compare-warning-error.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e85a157b51b1276c91c736d8624d9f3e876e9189 Mon Sep 17 00:00:00 2001 -From: Andreas Rammhold -Date: Tue, 20 Dec 2016 19:25:32 +0100 -Subject: [PATCH] Disable the non-null compare warning/error. - -We rely on the provided local library definitions for the hooked -functions which in some cases (GCC >6) carry a non-null-attribute flag -which causes compile errors on `!= NULL` checks. - -[Romain: rebase on 0.9.6] -(cherry picked from commit 47e958b753fc15098a2b7d0e9ef26b83ee255874) -Signed-off-by: Romain Naour ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 51634b0..bbbd476 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -67,7 +67,7 @@ INSTALL ?= install - PREFIX ?= /usr/local - LIBDIRNAME ?= /lib/faketime - --CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' -+CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' - LIB_LDFLAGS += -shared - LDFLAGS += -Wl,--version-script=libfaketime.map -lpthread - LDADD += -ldl -lm -lrt --- -2.9.3 - diff --git a/buildroot/package/faketime/0002-src-Makefile-disable-Werror.patch b/buildroot/package/faketime/0002-src-Makefile-disable-Werror.patch deleted file mode 100644 index e1e3b321b..000000000 --- a/buildroot/package/faketime/0002-src-Makefile-disable-Werror.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bcde6e6f34c3cf78a254315c5caa530db91802fb Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 17 May 2018 23:41:03 +0200 -Subject: [PATCH] src/Makefile: disable -Werror - -gcc 8.x has enabled additional warnings that break the build due to --Werror, so let's drop -Werror for now. A set of patches has been -submitted upstream (https://github.com/wolfcw/libfaketime/pull/161) to -properly fix the gcc 8.x issues, but in the mean time, disabling --Werror is a simpler option. - -Signed-off-by: Thomas Petazzoni ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index bbbd476..6b0d2cd 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -67,7 +67,7 @@ INSTALL ?= install - PREFIX ?= /usr/local - LIBDIRNAME ?= /lib/faketime - --CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' -+CFLAGS += -std=gnu99 -Wall -Wextra -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' - LIB_LDFLAGS += -shared - LDFLAGS += -Wl,--version-script=libfaketime.map -lpthread - LDADD += -ldl -lm -lrt --- -2.14.3 - diff --git a/buildroot/package/faketime/faketime.hash b/buildroot/package/faketime/faketime.hash index a17ef8526..bdb003aa6 100644 --- a/buildroot/package/faketime/faketime.hash +++ b/buildroot/package/faketime/faketime.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 56bc32006f4c5b021ff648cc1fd458c5316f40aadfd2031879229a234189b031 faketime-v0.9.6.tar.gz +sha256 06288237cd5890eca148489e5b904ed852ed0ffa8424bfb479342f4daa8442a3 faketime-0.9.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/faketime/faketime.mk b/buildroot/package/faketime/faketime.mk index 6c88a71aa..85ce9a90d 100644 --- a/buildroot/package/faketime/faketime.mk +++ b/buildroot/package/faketime/faketime.mk @@ -4,8 +4,8 @@ # ################################################################################ -FAKETIME_VERSION = v0.9.6 -FAKETIME_SITE = $(call github,wolfcw,libfaketime,$(FAKETIME_VERSION)) +FAKETIME_VERSION = 0.9.8 +FAKETIME_SITE = $(call github,wolfcw,libfaketime,v$(FAKETIME_VERSION)) FAKETIME_LICENSE = GPL-2.0 FAKETIME_LICENSE_FILES = COPYING diff --git a/buildroot/package/fastd/Config.in b/buildroot/package/fastd/Config.in index 5ef6de8d7..c4f296dd6 100644 --- a/buildroot/package/fastd/Config.in +++ b/buildroot/package/fastd/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_FASTD depends on !BR2_STATIC_LIBS # libuecc select BR2_PACKAGE_LIBUECC select BR2_PACKAGE_LIBSODIUM + select BR2_PACKAGE_LIBSODIUM_FULL select BR2_PACKAGE_LIBCAP help Fast and Secure Tunneling Daemon diff --git a/buildroot/package/fastd/fastd.hash b/buildroot/package/fastd/fastd.hash index 3c6a99e98..accdf087e 100644 --- a/buildroot/package/fastd/fastd.hash +++ b/buildroot/package/fastd/fastd.hash @@ -2,3 +2,4 @@ md5 e53236d3049f64f7955ad9556da099eb fastd-18.tar.xz # computed locally sha256 714ff09d7bd75f79783f744f6f8c5af2fe456c8cf876feaa704c205a73e043c9 fastd-18.tar.xz +sha256 c3095dd0adffc03eaeba9c7cd81f06962ef4797a836e49468b3dccc2802ff904 COPYRIGHT diff --git a/buildroot/package/fatcat/Config.in.host b/buildroot/package/fatcat/Config.in.host new file mode 100644 index 000000000..2c5f66981 --- /dev/null +++ b/buildroot/package/fatcat/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_FATCAT + bool "host fatcat" + help + Fatcat is designed to manipulate FAT filesystems, in order + to explore, extract, repair, recover and forensic them. It + currently supports FAT12, FAT16 and FAT32. + + https://github.com/Gregwar/fatcat diff --git a/buildroot/package/fatcat/fatcat.hash b/buildroot/package/fatcat/fatcat.hash new file mode 100644 index 000000000..66823e2d9 --- /dev/null +++ b/buildroot/package/fatcat/fatcat.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 303efe2aa73cbfe6fbc5d8af346d0f2c70b3f996fc891e8859213a58b95ad88c fatcat-1.1.0.tar.gz +sha256 3ea03755e32cf7f5b12981de92a0fdad396448195fe0024990c9cbc388e9866c LICENSE diff --git a/buildroot/package/fatcat/fatcat.mk b/buildroot/package/fatcat/fatcat.mk new file mode 100644 index 000000000..1a2e5aaca --- /dev/null +++ b/buildroot/package/fatcat/fatcat.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# fatcat +# +################################################################################ + +FATCAT_VERSION = 1.1.0 +FATCAT_SITE = $(call github,Gregwar,fatcat,v$(FATCAT_VERSION)) +FATCAT_LICENSE = MIT +FATCAT_LICENSE_FILES = LICENSE + +$(eval $(host-cmake-package)) diff --git a/buildroot/package/fb-test-app/fb-test-app.hash b/buildroot/package/fb-test-app/fb-test-app.hash index 7f7375316..06611db79 100644 --- a/buildroot/package/fb-test-app/fb-test-app.hash +++ b/buildroot/package/fb-test-app/fb-test-app.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 6baf6b45968d0bb9a5527c6c4bf18661e9f9eb9be973a6d1952c38168c90d58f fb-test-app-rosetta-1.1.0.tar.gz +sha256 6baf6b45968d0bb9a5527c6c4bf18661e9f9eb9be973a6d1952c38168c90d58f fb-test-app-rosetta-1.1.0.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/fbdump/fbdump.hash b/buildroot/package/fbdump/fbdump.hash index 15cc8392d..8bc8b7c56 100644 --- a/buildroot/package/fbdump/fbdump.hash +++ b/buildroot/package/fbdump/fbdump.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 c4d521a86229b3106cf69786008ad94f899da5288a19a067deae84951880722d fbdump-0.4.2.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/fbgrab/Config.in b/buildroot/package/fbgrab/Config.in index d1e9e69b3..b1d8755f3 100644 --- a/buildroot/package/fbgrab/Config.in +++ b/buildroot/package/fbgrab/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_FBGRAB FBGrab is a framebuffer screenshot program, capturing the linux frambuffer and converting it to a png-picture. - http://fbgrab.monells.se/ + https://github.com/GunnarMonell/fbgrab diff --git a/buildroot/package/fbgrab/fbgrab.hash b/buildroot/package/fbgrab/fbgrab.hash index de3bc1ffd..6cd19dc1d 100644 --- a/buildroot/package/fbgrab/fbgrab.hash +++ b/buildroot/package/fbgrab/fbgrab.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 5fab478cbf8731fbacefaa76236a8f8b38ccff920c53b3a8253bc35509fba8ed fbgrab-1.3.tar.gz +sha256 3314a932f830e32feaf36914e1b43326529fe35b7eb7410ff55f16c930ddfbcb fbgrab-1.3.1.tar.gz +sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/buildroot/package/fbgrab/fbgrab.mk b/buildroot/package/fbgrab/fbgrab.mk index d81a5ee2a..43fd0ba94 100644 --- a/buildroot/package/fbgrab/fbgrab.mk +++ b/buildroot/package/fbgrab/fbgrab.mk @@ -4,8 +4,8 @@ # ################################################################################ -FBGRAB_VERSION = 1.3 -FBGRAB_SITE = http://fbgrab.monells.se +FBGRAB_VERSION = 1.3.1 +FBGRAB_SITE = $(call github,GunnarMonell,fbgrab,$(FBGRAB_VERSION)) FBGRAB_DEPENDENCIES = libpng FBGRAB_LICENSE = GPL-2.0 FBGRAB_LICENSE_FILES = COPYING diff --git a/buildroot/package/fbterm/Config.in b/buildroot/package/fbterm/Config.in index 3ab8bdb4d..083167088 100644 --- a/buildroot/package/fbterm/Config.in +++ b/buildroot/package/fbterm/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_FBTERM fbterm is a fast terminal emulator for Linux with frame buffer device or VESA video card. - http://code.google.com/p/fbterm/ + https://code.google.com/archive/p/fbterm/ comment "fbterm needs a toolchain w/ C++, wchar, locale" depends on BR2_USE_MMU diff --git a/buildroot/package/fbterm/fbterm.hash b/buildroot/package/fbterm/fbterm.hash index 20a3e8f08..37c32df7a 100644 --- a/buildroot/package/fbterm/fbterm.hash +++ b/buildroot/package/fbterm/fbterm.hash @@ -1,2 +1,4 @@ # From http://code.google.com/p/fbterm/downloads/detail?name=fbterm-1.7.0.tar.gz&can=2&q= sha1 dc7b7ff29212c1551f35bf7a50967454d3b8c67c fbterm-1.7.0.tar.gz +# locally computed +sha256 b2b961f07e97c4fb78074276da304ea36b85dc299aae5efb79080cedaea3d5ac COPYING diff --git a/buildroot/package/fbv/fbv.hash b/buildroot/package/fbv/fbv.hash index 892012b3d..3f25465ba 100644 --- a/buildroot/package/fbv/fbv.hash +++ b/buildroot/package/fbv/fbv.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c fbv-1.0b.tar.gz +sha256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c fbv-1.0b.tar.gz +sha256 bf21d97bafcaacb5d6bc3d5502030c340f0e0593614078ab017af91e950083af COPYING diff --git a/buildroot/package/fcgiwrap/fcgiwrap.hash b/buildroot/package/fcgiwrap/fcgiwrap.hash index 4ad8b0bb7..cf2c785c6 100644 --- a/buildroot/package/fcgiwrap/fcgiwrap.hash +++ b/buildroot/package/fcgiwrap/fcgiwrap.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c72f2933669ebd21605975c5a11f26b9739e32e4f9d324fb9e1a1925e9c2ae88 fcgiwrap-99c942c90063c73734e56bacaa65f947772d9186.tar.gz +sha256 c72f2933669ebd21605975c5a11f26b9739e32e4f9d324fb9e1a1925e9c2ae88 fcgiwrap-99c942c90063c73734e56bacaa65f947772d9186.tar.gz +sha256 1504c301f6d417f2626085337e5c3bb3dc0282265089396ab36bfe1942feef1c COPYING diff --git a/buildroot/package/fconfig/fconfig.hash b/buildroot/package/fconfig/fconfig.hash index eae26e2b1..98e7fbf12 100644 --- a/buildroot/package/fconfig/fconfig.hash +++ b/buildroot/package/fconfig/fconfig.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 4ff0e8f07e35e46b705c0dbe9d9544ede01ea092a69e3f7db03e55a3f2bb8eb7 fconfig-20080329.tar.gz +sha256 4ff0e8f07e35e46b705c0dbe9d9544ede01ea092a69e3f7db03e55a3f2bb8eb7 fconfig-20080329.tar.gz +sha256 e698a9ea4d6dab0a15d3d6fd354b97b820629244f946529cc7f42b2b8e8f16d0 fconfig.c diff --git a/buildroot/package/fdk-aac/fdk-aac.hash b/buildroot/package/fdk-aac/fdk-aac.hash index a8f380c93..6b41e66a6 100644 --- a/buildroot/package/fdk-aac/fdk-aac.hash +++ b/buildroot/package/fdk-aac/fdk-aac.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/opencore-amr/files/fdk-aac/ -sha1 30439757fe5bbc8bccedcc8e51668b74db7322c7 fdk-aac-2.0.0.tar.gz -md5 8ccebea4fc5c9d40fff8f72bf68a6e50 fdk-aac-2.0.0.tar.gz +sha1 575e90e85321c5be44dcf743a40ea57ab0835928 fdk-aac-2.0.1.tar.gz +md5 e8b0b38e837df455b8a1ba75417ff0ad fdk-aac-2.0.1.tar.gz # Locally computed: -sha256 f7d6e60f978ff1db952f7d5c3e96751816f5aef238ecf1d876972697b85fd96c fdk-aac-2.0.0.tar.gz +sha256 840133aa9412153894af03b27b03dde1188772442c316a4ce2a24ed70093f271 fdk-aac-2.0.1.tar.gz sha256 95ec80da40b4af12ad4c4f3158c9cfb80f2479f3246e4260cb600827cc8c7836 NOTICE diff --git a/buildroot/package/fdk-aac/fdk-aac.mk b/buildroot/package/fdk-aac/fdk-aac.mk index 3904a41b9..92753b5e0 100644 --- a/buildroot/package/fdk-aac/fdk-aac.mk +++ b/buildroot/package/fdk-aac/fdk-aac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FDK_AAC_VERSION = 2.0.0 +FDK_AAC_VERSION = 2.0.1 FDK_AAC_SITE = http://downloads.sourceforge.net/project/opencore-amr/fdk-aac FDK_AAC_LICENSE = fdk-aac license FDK_AAC_LICENSE_FILES = NOTICE diff --git a/buildroot/package/feh/feh.hash b/buildroot/package/feh/feh.hash index cb554858b..2bfe5e48a 100644 --- a/buildroot/package/feh/feh.hash +++ b/buildroot/package/feh/feh.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 6ec338f80c3f4c30d715f44780f1a09ebfbb99e92a1bb43316428744a839f383 feh-2.27.1.tar.bz2 +sha256 8f9741399b4b184ba28698c0fd7722638e79abac8e6c27eb526cc52b11ee0a1c feh-3.2.1.tar.bz2 sha256 a289176a74d8e5d071456df5d4ee629aeb86f8eeeb6570076fe126f182c6b91d COPYING diff --git a/buildroot/package/feh/feh.mk b/buildroot/package/feh/feh.mk index 3bfd427e7..973eed60b 100644 --- a/buildroot/package/feh/feh.mk +++ b/buildroot/package/feh/feh.mk @@ -4,7 +4,7 @@ # ################################################################################ -FEH_VERSION = 2.27.1 +FEH_VERSION = 3.2.1 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 FEH_SITE = http://feh.finalrewind.org FEH_DEPENDENCIES = imlib2 libpng xlib_libXt diff --git a/buildroot/package/fetchmail/0001-enable-libressl.patch b/buildroot/package/fetchmail/0001-enable-libressl.patch deleted file mode 100644 index a98e19dda..000000000 --- a/buildroot/package/fetchmail/0001-enable-libressl.patch +++ /dev/null @@ -1,67 +0,0 @@ -Fetched from upstream git and tweaked for the release: -https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc - -Signed-off-by: Gustavo Zacarias - -diff -Nura fetchmail-6.3.26.orig/config.h.in fetchmail-6.3.26/config.h.in ---- fetchmail-6.3.26.orig/config.h.in 2015-12-30 10:44:33.467746835 -0300 -+++ fetchmail-6.3.26/config.h.in 2015-12-30 10:45:50.271403589 -0300 -@@ -53,6 +53,10 @@ - if you don't. */ - #undef HAVE_DECL_SSLV2_CLIENT_METHOD - -+/* Define to 1 if you have the declaration of `SSLv3_client_method', and to 0 -+ if you don't. */ -+#undef HAVE_DECL_SSLV3_CLIENT_METHOD -+ - /* Define to 1 if you have the declaration of `strerror', and to 0 if you - don't. */ - #undef HAVE_DECL_STRERROR -diff -Nura fetchmail-6.3.26.orig/configure.ac fetchmail-6.3.26/configure.ac ---- fetchmail-6.3.26.orig/configure.ac 2015-12-30 10:44:33.465746766 -0300 -+++ fetchmail-6.3.26/configure.ac 2015-12-30 10:46:03.708868409 -0300 -@@ -803,6 +803,7 @@ - - case "$LIBS" in *-lssl*) - AC_CHECK_DECLS([SSLv2_client_method],,,[#include ]) -+ AC_CHECK_DECLS([SSLv3_client_method],,,[#include ]) - ;; - esac - -diff -Nura fetchmail-6.3.26.orig/fetchmail.c fetchmail-6.3.26/fetchmail.c ---- fetchmail-6.3.26.orig/fetchmail.c 2015-12-30 10:44:33.469746904 -0300 -+++ fetchmail-6.3.26/fetchmail.c 2015-12-30 10:46:03.708868409 -0300 -@@ -263,6 +263,12 @@ - #ifdef SSL_ENABLE - "+SSL" - #endif -+#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0 -+ "-SSLv2" -+#endif -+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0 -+ "-SSLv3" -+#endif - #ifdef OPIE_ENABLE - "+OPIE" - #endif /* OPIE_ENABLE */ -diff -Nura fetchmail-6.3.26.orig/socket.c fetchmail-6.3.26/socket.c ---- fetchmail-6.3.26.orig/socket.c 2015-12-30 10:44:33.464746731 -0300 -+++ fetchmail-6.3.26/socket.c 2015-12-30 10:46:03.709868443 -0300 -@@ -910,11 +910,16 @@ - #if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 - _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); - #else -- report(stderr, GT_("Your operating system does not support SSLv2.\n")); -+ report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n")); - return -1; - #endif - } else if(!strcasecmp("ssl3",myproto)) { -+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0 - _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); -+#else -+ report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n")); -+ return -1; -+#endif - } else if(!strcasecmp("tls1",myproto)) { - _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); - } else if (!strcasecmp("ssl23",myproto)) { diff --git a/buildroot/package/fetchmail/0002-configure.ac-use-pkg-config-to-find-openssl.patch b/buildroot/package/fetchmail/0002-configure.ac-use-pkg-config-to-find-openssl.patch deleted file mode 100644 index aefed7f2e..000000000 --- a/buildroot/package/fetchmail/0002-configure.ac-use-pkg-config-to-find-openssl.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 1ed0af7f1bbcaccbd7356bd90596f5c942b64720 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 22 Mar 2019 20:24:54 +0100 -Subject: [PATCH 1/1] configure.ac: use pkg-config to find openssl - -openssl can have multiples dependencies such as libatomic on sparcv8 -32 bits - -Fixes: - - http://autobuild.buildroot.org/results/58e5aa7c6ba8fe7474071d7a3cba6ed3a1b4cff4 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.com/fetchmail/fetchmail/merge_requests/14] ---- - configure.ac | 37 +++++++++++++++++++------------------ - 1 file changed, 19 insertions(+), 18 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 16b0fcba..3a75ec6e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -778,24 +778,25 @@ then - else - AC_MSG_ERROR([SSL support enabled, but OpenSSL not found]) - fi -- LDFLAGS="$LDFLAGS -L$with_ssl/lib" -- LIBS="$LIBS -lssl -lcrypto" -- dnl check if -ldl is needed -- AC_MSG_CHECKING([for additional library dependencies of SSL]) -- found=0 -- save_LIBS="$LIBS" -- for i in "" "-ldl" ; do -- LIBS="$LDFLAGS $save_LIBS $i" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ],[SSL_library_init()])],[found=1; break]) -- done -- if test $found = 0 ; then -- AC_MSG_RESULT([error]) -- AC_MSG_ERROR([cannot link with SSL - check config.log]) -- fi -- LIBS="$save_LIBS $i" -- if test "$i" = "" ; then i="(none)" ; fi -- AC_MSG_RESULT($i) -- dnl XXX FIXME: use pkg-config if available! -+ PKG_CHECK_MODULES([SSL],[libssl libcrypto],[LIBS="$LIBS $SSL_LIBS"],[ -+ LDFLAGS="$LDFLAGS -L$with_ssl/lib" -+ LIBS="$LIBS -lssl -lcrypto" -+ dnl check if -ldl is needed -+ AC_MSG_CHECKING([for additional library dependencies of SSL]) -+ found=0 -+ save_LIBS="$LIBS" -+ for i in "" "-ldl" ; do -+ LIBS="$LDFLAGS $save_LIBS $i" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ],[SSL_library_init()])],[found=1; break]) -+ done -+ if test $found = 0 ; then -+ AC_MSG_RESULT([error]) -+ AC_MSG_ERROR([cannot link with SSL - check config.log]) -+ fi -+ LIBS="$save_LIBS $i" -+ if test "$i" = "" ; then i="(none)" ; fi -+ AC_MSG_RESULT($i) -+ ]) - AC_DEFINE(SSL_ENABLE) - else - AC_MSG_WARN(Disabling SSL support.) --- -2.20.1 - diff --git a/buildroot/package/fetchmail/fetchmail.hash b/buildroot/package/fetchmail/fetchmail.hash index c67ee1a4e..08a7a0ef4 100644 --- a/buildroot/package/fetchmail/fetchmail.hash +++ b/buildroot/package/fetchmail/fetchmail.hash @@ -1,2 +1,6 @@ +# From https://sourceforge.net/p/fetchmail/mailman/message/36773211/ +sha1 1aadf078ed8fb1b6c93e9126cc0375b1f740301a fetchmail-6.4.1.tar.xz +sha256 3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0 fetchmail-6.4.1.tar.xz +sha512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0 fetchmail-6.4.1.tar.xz # Locally computed: -sha256 79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850 fetchmail-6.3.26.tar.xz +sha256 89d6efe79c78f965b256e007d6acc367fff982c59b6195fb6ec5895ea0fc9bd5 COPYING diff --git a/buildroot/package/fetchmail/fetchmail.mk b/buildroot/package/fetchmail/fetchmail.mk index 41505e863..b8e3c667e 100644 --- a/buildroot/package/fetchmail/fetchmail.mk +++ b/buildroot/package/fetchmail/fetchmail.mk @@ -4,14 +4,12 @@ # ################################################################################ -FETCHMAIL_VERSION_MAJOR = 6.3 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).26 +FETCHMAIL_VERSION_MAJOR = 6.4 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).1 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING FETCHMAIL_LICENSE_FILES = COPYING -FETCHMAIL_AUTORECONF = YES -FETCHMAIL_GETTEXTIZE = YES FETCHMAIL_CONF_OPTS = \ --with-ssl=$(STAGING_DIR)/usr @@ -22,14 +20,4 @@ FETCHMAIL_DEPENDENCIES = \ openssl \ $(TARGET_NLS_DEPENDENCIES) -# fetchmailconf.py script is not (yet) python3-compliant. -# Prevent the pyc-compilation with python-3 from failing by removing this -# non-critical script. -ifeq ($(BR2_PACKAGE_PYTHON3),y) -define FETCHMAIL_REMOVE_FETCHMAILCONF_PY - $(RM) -f $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/fetchmailconf.py -endef -FETCHMAIL_POST_INSTALL_TARGET_HOOKS += FETCHMAIL_REMOVE_FETCHMAILCONF_PY -endif - $(eval $(autotools-package)) diff --git a/buildroot/package/ffmpeg/0001-ffmpeg-pthreads.patch b/buildroot/package/ffmpeg/0001-ffmpeg-pthreads.patch deleted file mode 100644 index c6d75d229..000000000 --- a/buildroot/package/ffmpeg/0001-ffmpeg-pthreads.patch +++ /dev/null @@ -1,34 +0,0 @@ -From patchwork Wed Oct 25 13:32:36 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [FFmpeg-devel] configure: v4l2_m2m depends on pthreads -From: Mark Thompson -X-Patchwork-Id: 5688 -Message-Id: <27e5b360-1210-d550-c8de-a761f8e9f326@jkqxz.net> -To: FFmpeg development discussions and patches -Date: Wed, 25 Oct 2017 14:32:36 +0100 - -Fixes build with --disable-pthreads. - -Downloaded from upstream patchworks: -https://patchwork.ffmpeg.org/patch/5688/ - -Signed-off-by: Bernd Kuhls ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index c86e578..76523c8 100755 ---- a/configure -+++ b/configure -@@ -2780,7 +2780,7 @@ omx_rpi_select="omx" - qsvdec_select="qsv" - qsvenc_select="qsv" - vaapi_encode_deps="vaapi" --v4l2_m2m_deps_any="linux_videodev2_h" -+v4l2_m2m_deps="linux_videodev2_h pthreads" - - hwupload_cuda_filter_deps="cuda" - scale_npp_filter_deps="cuda libnpp" diff --git a/buildroot/package/ffmpeg/0002-libfdk-aacenc-Fix-building-with-libfdk-aac-v2.patch b/buildroot/package/ffmpeg/0002-libfdk-aacenc-Fix-building-with-libfdk-aac-v2.patch deleted file mode 100644 index 3f452242f..000000000 --- a/buildroot/package/ffmpeg/0002-libfdk-aacenc-Fix-building-with-libfdk-aac-v2.patch +++ /dev/null @@ -1,100 +0,0 @@ -From c60fb550302878aba7e86037451f7996e8069289 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -Date: Fri, 31 Aug 2018 14:25:30 +0300 -Subject: [PATCH] libfdk-aacenc: Fix building with libfdk-aac v2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When flushing the encoder, we now need to provide non-null buffer -parameters for everything, even if they are unused. - -The encoderDelay parameter has been replaced by two, nDelay and -nDelayCore. - -Downloaded from -http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=141c960e21d2860e354f9b90df136184dd00a9a8 - -Signed-off-by: Martin Storsjö -[Bernd: rebased for ffmpeg 3.4.5] -Signed-off-by: Bernd Kuhls ---- - libavcodec/libfdk-aacenc.c | 34 +++++++++++++++++++++++++--------- - 1 file changed, 25 insertions(+), 9 deletions(-) - -diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c -index 0e2051b468..f5adb407ed 100644 ---- a/libavcodec/libfdk-aacenc.c -+++ b/libavcodec/libfdk-aacenc.c -@@ -26,6 +26,11 @@ - #include "audio_frame_queue.h" - #include "internal.h" - -+#define FDKENC_VER_AT_LEAST(vl0, vl1) \ -+ (defined(AACENCODER_LIB_VL0) && \ -+ ((AACENCODER_LIB_VL0 > vl0) || \ -+ (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1))) -+ - typedef struct AACContext { - const AVClass *class; - HANDLE_AACENCODER handle; -@@ -286,7 +291,11 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) - } - - avctx->frame_size = info.frameLength; -+#if FDKENC_VER_AT_LEAST(4, 0) -+ avctx->initial_padding = info.nDelay; -+#else - avctx->initial_padding = info.encoderDelay; -+#endif - ff_af_queue_init(avctx, &s->afq); - - if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { -@@ -319,28 +328,35 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, - int out_buffer_size, out_buffer_element_size; - void *in_ptr, *out_ptr; - int ret; -+ uint8_t dummy_buf[1]; - AACENC_ERROR err; - - /* handle end-of-stream small frame and flushing */ - if (!frame) { -+ /* Must be a non-null pointer, even if it's a dummy. We could use -+ * the address of anything else on the stack as well. */ -+ in_ptr = dummy_buf; -+ in_buffer_size = 0; -+ - in_args.numInSamples = -1; - } else { -- in_ptr = frame->data[0]; -- in_buffer_size = 2 * avctx->channels * frame->nb_samples; -- in_buffer_element_size = 2; -+ in_ptr = frame->data[0]; -+ in_buffer_size = 2 * avctx->channels * frame->nb_samples; - -- in_args.numInSamples = avctx->channels * frame->nb_samples; -- in_buf.numBufs = 1; -- in_buf.bufs = &in_ptr; -- in_buf.bufferIdentifiers = &in_buffer_identifier; -- in_buf.bufSizes = &in_buffer_size; -- in_buf.bufElSizes = &in_buffer_element_size; -+ in_args.numInSamples = avctx->channels * frame->nb_samples; - - /* add current frame to the queue */ - if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) - return ret; - } - -+ in_buffer_element_size = 2; -+ in_buf.numBufs = 1; -+ in_buf.bufs = &in_ptr; -+ in_buf.bufferIdentifiers = &in_buffer_identifier; -+ in_buf.bufSizes = &in_buffer_size; -+ in_buf.bufElSizes = &in_buffer_element_size; -+ - /* The maximum packet size is 6144 bits aka 768 bytes per channel. */ - if ((ret = ff_alloc_packet2(avctx, avpkt, FFMAX(8192, 768 * avctx->channels), 0)) < 0) - return ret; --- -2.20.1 - diff --git a/buildroot/package/ffmpeg/0003-libfdk-aac-Consistently-use-a-proper-version-check-m.patch b/buildroot/package/ffmpeg/0003-libfdk-aac-Consistently-use-a-proper-version-check-m.patch deleted file mode 100644 index c358a045d..000000000 --- a/buildroot/package/ffmpeg/0003-libfdk-aac-Consistently-use-a-proper-version-check-m.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 48be4c81e0ad081edab65e133e6e1bdec7de3b55 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -Date: Tue, 4 Sep 2018 08:29:37 +0300 -Subject: [PATCH] libfdk-aac: Consistently use a proper version check macro for - detecting features -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libfdk-aac: Consistently use a proper version check macro for detecting features - -The previous version checks checked explicitly for the version -where the version define was added to the installed headers, -making an "#ifdef AACDECODER_LIB_VL0" enough. Now that we have -a need for more diverse version checks than this, convert all checks -to such checks. - -Downloaded from -http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=ffb9b7a6bab6c6bfd3dd9a7c32e3724209824999 - -Signed-off-by: Martin Storsjö -Signed-off-by: Bernd Kuhls ---- - libavcodec/libfdk-aacdec.c | 13 ++++++++----- - libavcodec/libfdk-aacenc.c | 6 +++--- - 2 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c -index 2857b9453f..ef51184ebd 100644 ---- a/libavcodec/libfdk-aacdec.c -+++ b/libavcodec/libfdk-aacdec.c -@@ -25,9 +25,12 @@ - #include "avcodec.h" - #include "internal.h" - --/* The version macro is introduced the same time as the setting enum was -- * changed, so this check should suffice. */ --#ifndef AACDECODER_LIB_VL0 -+#define FDKDEC_VER_AT_LEAST(vl0, vl1) \ -+ (defined(AACDECODER_LIB_VL0) && \ -+ ((AACDECODER_LIB_VL0 > vl0) || \ -+ (AACDECODER_LIB_VL0 == vl0 && AACDECODER_LIB_VL1 >= vl1))) -+ -+#if !FDKDEC_VER_AT_LEAST(2, 5) // < 2.5.10 - #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS - #endif - -@@ -72,7 +75,7 @@ static const AVOption fdk_aac_dec_options[] = { - OFFSET(drc_level), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 127, AD, NULL }, - { "drc_heavy", "Dynamic Range Control: heavy compression, where [1] is on (RF mode) and [0] is off", - OFFSET(drc_heavy), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 1, AD, NULL }, --#ifdef AACDECODER_LIB_VL0 -+#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10 - { "level_limit", "Signal level limiting", OFFSET(level_limit), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, 1, AD }, - #endif - { NULL } -@@ -293,7 +296,7 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx) - } - } - --#ifdef AACDECODER_LIB_VL0 -+#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10 - if (aacDecoder_SetParam(s->handle, AAC_PCM_LIMITER_ENABLE, s->level_limit) != AAC_DEC_OK) { - av_log(avctx, AV_LOG_ERROR, "Unable to set in signal level limiting in the decoder\n"); - return AVERROR_UNKNOWN; -diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c -index f5adb407ed..91dcb5a1b9 100644 ---- a/libavcodec/libfdk-aacenc.c -+++ b/libavcodec/libfdk-aacenc.c -@@ -156,7 +156,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) - case 6: mode = MODE_1_2_2_1; sce = 2; cpe = 2; break; - /* The version macro is introduced the same time as the 7.1 support, so this - should suffice. */ --#ifdef AACENCODER_LIB_VL0 -+#if FDKENC_VER_AT_LEAST(3, 4) // 3.4.12 - case 8: - sce = 2; - cpe = 3; -@@ -291,7 +291,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) - } - - avctx->frame_size = info.frameLength; --#if FDKENC_VER_AT_LEAST(4, 0) -+#if FDKENC_VER_AT_LEAST(4, 0) // 4.0.0 - avctx->initial_padding = info.nDelay; - #else - avctx->initial_padding = info.encoderDelay; -@@ -412,7 +412,7 @@ static const uint64_t aac_channel_layout[] = { - AV_CH_LAYOUT_4POINT0, - AV_CH_LAYOUT_5POINT0_BACK, - AV_CH_LAYOUT_5POINT1_BACK, --#ifdef AACENCODER_LIB_VL0 -+#if FDKENC_VER_AT_LEAST(3, 4) // 3.4.12 - AV_CH_LAYOUT_7POINT1_WIDE_BACK, - AV_CH_LAYOUT_7POINT1, - #endif --- -2.20.1 - diff --git a/buildroot/package/ffmpeg/0004-libfdk-aac-Don-t-use-defined-in-a-define.patch b/buildroot/package/ffmpeg/0004-libfdk-aac-Don-t-use-defined-in-a-define.patch deleted file mode 100644 index 30357b91e..000000000 --- a/buildroot/package/ffmpeg/0004-libfdk-aac-Don-t-use-defined-in-a-define.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 452746d80fdaaaf1b546860eb78449c6de3678d7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -Date: Wed, 12 Sep 2018 20:03:12 +0300 -Subject: [PATCH] libfdk-aac: Don't use defined() in a #define -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libfdk-aac: Don't use defined() in a #define - -MSVC expands the preprocessor directives differently, making the -version check fail in the previous form. - -Clang can warn about this with -Wexpansion-to-defined (not currently -enabled by default): -warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined] - -Downloaded from -http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=2a9e1c122eed66be1b26b747342b848300b226c7 - -Signed-off-by: Martin Storsjö -Signed-off-by: Bernd Kuhls ---- - libavcodec/libfdk-aacdec.c | 9 ++++++--- - libavcodec/libfdk-aacenc.c | 9 ++++++--- - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c -index ef51184ebd..0fbab36463 100644 ---- a/libavcodec/libfdk-aacdec.c -+++ b/libavcodec/libfdk-aacdec.c -@@ -25,10 +25,13 @@ - #include "avcodec.h" - #include "internal.h" - -+#ifdef AACDECODER_LIB_VL0 - #define FDKDEC_VER_AT_LEAST(vl0, vl1) \ -- (defined(AACDECODER_LIB_VL0) && \ -- ((AACDECODER_LIB_VL0 > vl0) || \ -- (AACDECODER_LIB_VL0 == vl0 && AACDECODER_LIB_VL1 >= vl1))) -+ ((AACDECODER_LIB_VL0 > vl0) || \ -+ (AACDECODER_LIB_VL0 == vl0 && AACDECODER_LIB_VL1 >= vl1)) -+#else -+#define FDKDEC_VER_AT_LEAST(vl0, vl1) 0 -+#endif - - #if !FDKDEC_VER_AT_LEAST(2, 5) // < 2.5.10 - #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS -diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c -index 91dcb5a1b9..8349e56dcb 100644 ---- a/libavcodec/libfdk-aacenc.c -+++ b/libavcodec/libfdk-aacenc.c -@@ -26,10 +26,13 @@ - #include "audio_frame_queue.h" - #include "internal.h" - -+#ifdef AACENCODER_LIB_VL0 - #define FDKENC_VER_AT_LEAST(vl0, vl1) \ -- (defined(AACENCODER_LIB_VL0) && \ -- ((AACENCODER_LIB_VL0 > vl0) || \ -- (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1))) -+ ((AACENCODER_LIB_VL0 > vl0) || \ -+ (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1)) -+#else -+#define FDKENC_VER_AT_LEAST(vl0, vl1) 0 -+#endif - - typedef struct AACContext { - const AVClass *class; --- -2.20.1 - diff --git a/buildroot/package/ffmpeg/Config.in b/buildroot/package/ffmpeg/Config.in index 4377a32c9..33baff262 100644 --- a/buildroot/package/ffmpeg/Config.in +++ b/buildroot/package/ffmpeg/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS bool default y - # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW - depends on !(BR2_archs38 && BR2_TOOLCHAIN_USES_GLIBC) # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 depends on !BR2_nios2 # No support for ARMv7-M in the ARM assembly logic @@ -14,6 +12,8 @@ config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 for more # details. depends on !BR2_m68k_cf + # assertion fail in binutils + depends on !(BR2_or1k && !BR2_TOOLCHAIN_GCC_AT_LEAST_9) menuconfig BR2_PACKAGE_FFMPEG bool "ffmpeg" @@ -61,12 +61,6 @@ config BR2_PACKAGE_FFMPEG_FFPLAY comment "ffplay needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS -config BR2_PACKAGE_FFMPEG_FFSERVER - bool "Build ffserver" - depends on BR2_USE_MMU # fork() - help - FFserver is a streaming server for both audio and video. - config BR2_PACKAGE_FFMPEG_FFPROBE bool "Build ffprobe" help diff --git a/buildroot/package/ffmpeg/ffmpeg.hash b/buildroot/package/ffmpeg/ffmpeg.hash index e945130d8..1f68943fc 100644 --- a/buildroot/package/ffmpeg/ffmpeg.hash +++ b/buildroot/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3572279cb139d9e39dcfbc23edf438ff5311ec3fc5d0dcb3558e49591e5cb83e ffmpeg-3.4.6.tar.xz +sha256 cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c ffmpeg-4.2.2.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 -sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff LICENSE.md +sha256 cad1218c22121b169fb1380178ab7a0b33cb38a3ff6d3915b8533d1d954f3ce7 LICENSE.md diff --git a/buildroot/package/ffmpeg/ffmpeg.mk b/buildroot/package/ffmpeg/ffmpeg.mk index d26555a50..b7148bbba 100644 --- a/buildroot/package/ffmpeg/ffmpeg.mk +++ b/buildroot/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.4.6 +FFMPEG_VERSION = 4.2.2 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -84,12 +84,6 @@ else FFMPEG_CONF_OPTS += --disable-ffplay endif -ifeq ($(BR2_PACKAGE_FFMPEG_FFSERVER),y) -FFMPEG_CONF_OPTS += --enable-ffserver -else -FFMPEG_CONF_OPTS += --disable-ffserver -endif - ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y) FFMPEG_CONF_OPTS += --enable-avresample else @@ -141,7 +135,7 @@ endif ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_BSFS)),all) FFMPEG_CONF_OPTS += --disable-bsfs \ - $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_BSFS)),--enable-bsfs=$(x)) + $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_BSFS)),--enable-bsf=$(x)) endif ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_PROTOCOLS)),all) @@ -315,6 +309,13 @@ else FFMPEG_CONF_OPTS += --disable-libbluray endif +ifeq ($(BR2_PACKAGE_INTEL_MEDIASDK),y) +FFMPEG_CONF_OPTS += --enable-libmfx +FFMPEG_DEPENDENCIES += intel-mediasdk +else +FFMPEG_CONF_OPTS += --disable-libmfx +endif + ifeq ($(BR2_PACKAGE_RTMPDUMP),y) FFMPEG_CONF_OPTS += --enable-librtmp FFMPEG_DEPENDENCIES += rtmpdump @@ -402,6 +403,13 @@ else FFMPEG_CONF_OPTS += --disable-libx265 endif +ifeq ($(BR2_PACKAGE_DAV1D),y) +FFMPEG_CONF_OPTS += --enable-libdav1d +FFMPEG_DEPENDENCIES += dav1d +else +FFMPEG_CONF_OPTS += --disable-libdav1d +endif + ifeq ($(BR2_X86_CPU_HAS_MMX),y) FFMPEG_CONF_OPTS += --enable-x86asm FFMPEG_DEPENDENCIES += host-nasm @@ -488,6 +496,11 @@ FFMPEG_CONF_OPTS += --disable-mipsfpu else FFMPEG_CONF_OPTS += --enable-mipsfpu endif + +# Fix build failure on "addi opcode not supported" +ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y) +FFMPEG_CONF_OPTS += --disable-asm +endif endif # MIPS ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) diff --git a/buildroot/package/fftw/fftw.mk b/buildroot/package/fftw/fftw.mk index bcfdb9c96..279244a5d 100644 --- a/buildroot/package/fftw/fftw.mk +++ b/buildroot/package/fftw/fftw.mk @@ -27,10 +27,10 @@ endif # Generic optimisations ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) FFTW_COMMON_CONF_OPTS += --enable-threads -FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--without,--with)-combined-threads +FFTW_COMMON_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_OPENMP),--without,--with)-combined-threads else FFTW_COMMON_CONF_OPTS += --disable-threads endif -FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openmp +FFTW_COMMON_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_OPENMP),--enable,--disable)-openmp include $(sort $(wildcard package/fftw/*/*.mk)) diff --git a/buildroot/package/ficl/ficl.hash b/buildroot/package/ficl/ficl.hash index 4bfbbd070..df53c843c 100644 --- a/buildroot/package/ficl/ficl.hash +++ b/buildroot/package/ficl/ficl.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 4daf74f3d3d6f8b86ea7cb47bc24931d50b4809b50ba34ca32e0ca1e972bd3a3 ficl-4.1.0.tar.gz +sha256 1d1dd1f1cde52e8b607c5ccb6a2e5de878fd1719b8c5a4d31b9cdb343c203d0d ReadMe.txt diff --git a/buildroot/package/file/0001-Add-libmagic.pc.patch b/buildroot/package/file/0001-Add-libmagic.pc.patch new file mode 100644 index 000000000..b26d16224 --- /dev/null +++ b/buildroot/package/file/0001-Add-libmagic.pc.patch @@ -0,0 +1,76 @@ +From d079cac1110cc2761417f0dcb0a142b217eb1eda Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 31 Jan 2020 20:26:29 +0100 +Subject: [PATCH] Add libmagic.pc + +libmagic can optionally depends on xz (for lzma) or bzip2 since version +5.38 and +https://github.com/file/file/commit/b259a07ea95827f565faa20f0316e5b2704064f7 +so add libmagic.pc so package (such as gerbera) that links with libmagic +will be able to use pkg-config to retrieve those static dependencies +For example, this will avoid the following build failure: + +[100%] Linking CXX executable gerbera +/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/br-user/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmagic.a(compress.o): in function `uncompressbuf': +compress.c:(.text+0x69c): undefined reference to `BZ2_bzDecompressInit' +/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x710): undefined reference to `BZ2_bzDecompress' +/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x730): undefined reference to `BZ2_bzDecompressEnd' +/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x7bc): undefined reference to `lzma_auto_decoder' +/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x828): undefined reference to `lzma_code' +/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x848): undefined reference to `lzma_end' + +Fixes: + - http://autobuild.buildroot.org/results/37b1ef54dc41100689f311fbc31fc9300dc6ae63 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://bugs.astron.com/view.php?id=136] +--- + Makefile.am | 5 +++++ + configure.ac | 2 +- + libmagic.pc.in | 10 ++++++++++ + 3 files changed, 16 insertions(+), 1 deletion(-) + create mode 100644 libmagic.pc.in + +diff --git a/Makefile.am b/Makefile.am +index 8bd927d9..2ab67ed7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,3 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 + EXTRA_DIST = MAINT + + SUBDIRS = src magic tests doc python ++ ++# This variable must have 'exec' in its name, in order to be installed ++# by 'install-exec' target (instead of default 'install-data') ++pkgconfigexecdir = $(libdir)/pkgconfig ++pkgconfigexec_DATA = libmagic.pc +diff --git a/configure.ac b/configure.ac +index ac37fccd..b2e2e5b8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -217,5 +217,5 @@ if test "$ac_cv_header_lzma_h$ac_cv_lib_lzma_lzma_stream_decoder" = "yesyes"; t + AC_DEFINE([XZLIBSUPPORT], 1, [Enable xzlib compression support]) + fi + +-AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile]) ++AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile libmagic.pc]) + AC_OUTPUT +diff --git a/libmagic.pc.in b/libmagic.pc.in +new file mode 100644 +index 00000000..3ad1290b +--- /dev/null ++++ b/libmagic.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: libmagic ++Description: Magic number recognition library ++Version: @VERSION@ ++Libs: -L${libdir} -lmagic ++Libs.private: @LIBS@ +-- +2.24.1 + diff --git a/buildroot/package/file/0001-Detect-multiplication-overflow-when-computing-sector.patch b/buildroot/package/file/0001-Detect-multiplication-overflow-when-computing-sector.patch deleted file mode 100644 index c7ef4f2e0..000000000 --- a/buildroot/package/file/0001-Detect-multiplication-overflow-when-computing-sector.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 06de62c022138f63de9bcd04074491945eaa8662 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Fri, 23 Aug 2019 14:29:14 +0000 -Subject: [PATCH] Detect multiplication overflow when computing sector position - (found by oss-fuzz) - -Fixes CVE-2019-18218 - -Signed-off-by: Peter Korsgaard ---- - src/cdf.c | 20 +++++++++++++++++--- - 1 file changed, 17 insertions(+), 3 deletions(-) - -diff --git a/src/cdf.c b/src/cdf.c -index 556a3ff8..9d639674 100644 ---- a/src/cdf.c -+++ b/src/cdf.c -@@ -35,7 +35,7 @@ - #include "file.h" - - #ifndef lint --FILE_RCSID("@(#)$File: cdf.c,v 1.114 2019/02/20 02:35:27 christos Exp $") -+FILE_RCSID("@(#)$File: cdf.c,v 1.115 2019/08/23 14:29:14 christos Exp $") - #endif - - #include -@@ -53,6 +53,10 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.114 2019/02/20 02:35:27 christos Exp $") - #define EFTYPE EINVAL - #endif - -+#ifndef SIZE_T_MAX -+#define SIZE_T_MAX CAST(size_t, ~0ULL) -+#endif -+ - #include "cdf.h" - - #ifdef CDF_DEBUG -@@ -405,7 +409,12 @@ cdf_read_sector(const cdf_info_t *info, void *buf, size_t offs, size_t len, - const cdf_header_t *h, cdf_secid_t id) - { - size_t ss = CDF_SEC_SIZE(h); -- size_t pos = CDF_SEC_POS(h, id); -+ size_t pos; -+ -+ if (SIZE_T_MAX / ss < CAST(size_t, id)) -+ return -1; -+ -+ pos = CDF_SEC_POS(h, id); - assert(ss == len); - return cdf_read(info, CAST(off_t, pos), RCAST(char *, buf) + offs, len); - } -@@ -415,7 +424,12 @@ cdf_read_short_sector(const cdf_stream_t *sst, void *buf, size_t offs, - size_t len, const cdf_header_t *h, cdf_secid_t id) - { - size_t ss = CDF_SHORT_SEC_SIZE(h); -- size_t pos = CDF_SHORT_SEC_POS(h, id); -+ size_t pos; -+ -+ if (SIZE_T_MAX / ss < CAST(size_t, id)) -+ return -1; -+ -+ pos = CDF_SHORT_SEC_POS(h, id); - assert(ss == len); - if (pos + len > CDF_SEC_SIZE(h) * sst->sst_len) { - DPRINTF(("Out of bounds read %" SIZE_T_FORMAT "u > %" --- -2.20.1 - diff --git a/buildroot/package/file/0002-Limit-the-number-of-elements-in-a-vector-found-by-os.patch b/buildroot/package/file/0002-Limit-the-number-of-elements-in-a-vector-found-by-os.patch deleted file mode 100644 index 6f16894f9..000000000 --- a/buildroot/package/file/0002-Limit-the-number-of-elements-in-a-vector-found-by-os.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 46a8443f76cec4b41ec736eca396984c74664f84 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Mon, 26 Aug 2019 14:31:39 +0000 -Subject: [PATCH] Limit the number of elements in a vector (found by oss-fuzz) - -Fixes CVE-2019-18218 - -Signed-off-by: Peter Korsgaard ---- - src/cdf.c | 9 ++++----- - src/cdf.h | 1 + - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/cdf.c b/src/cdf.c -index 9d639674..bb81d637 100644 ---- a/src/cdf.c -+++ b/src/cdf.c -@@ -35,7 +35,7 @@ - #include "file.h" - - #ifndef lint --FILE_RCSID("@(#)$File: cdf.c,v 1.115 2019/08/23 14:29:14 christos Exp $") -+FILE_RCSID("@(#)$File: cdf.c,v 1.116 2019/08/26 14:31:39 christos Exp $") - #endif - - #include -@@ -1027,8 +1027,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, - goto out; - } - nelements = CDF_GETUINT32(q, 1); -- if (nelements == 0) { -- DPRINTF(("CDF_VECTOR with nelements == 0\n")); -+ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) { -+ DPRINTF(("CDF_VECTOR with nelements == %" -+ SIZE_T_FORMAT "u\n", nelements)); - goto out; - } - slen = 2; -@@ -1070,8 +1071,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, - goto out; - inp += nelem; - } -- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n", -- nelements)); - for (j = 0; j < nelements && i < sh.sh_properties; - j++, i++) - { -diff --git a/src/cdf.h b/src/cdf.h -index 2f7e554b..05056668 100644 ---- a/src/cdf.h -+++ b/src/cdf.h -@@ -48,6 +48,7 @@ - typedef int32_t cdf_secid_t; - - #define CDF_LOOP_LIMIT 10000 -+#define CDF_ELEMENT_LIMIT 100000 - - #define CDF_SECID_NULL 0 - #define CDF_SECID_FREE -1 --- -2.20.1 - diff --git a/buildroot/package/file/Config.in b/buildroot/package/file/Config.in index 13934b223..edc4d874b 100644 --- a/buildroot/package/file/Config.in +++ b/buildroot/package/file/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_FILE bool "file" - select BR2_PACKAGE_ZLIB help Program to identify a file's format by scanning binary data for known patterns. diff --git a/buildroot/package/file/file.hash b/buildroot/package/file/file.hash index 241820d0f..96efaf848 100644 --- a/buildroot/package/file/file.hash +++ b/buildroot/package/file/file.hash @@ -1,7 +1,7 @@ # Locally calculated after verifying signature -# ftp://ftp.astron.com/pub/file/file-5.37.tar.gz.asc +# ftp://ftp.astron.com/pub/file/file-5.38.tar.gz.asc # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A -sha256 e9c13967f7dd339a3c241b7710ba093560b9a33013491318e88e6b8b57bae07f file-5.37.tar.gz +sha256 593c2ffc2ab349c5aea0f55fedfe4d681737b6b62376a9b3ad1e77b2cc19fa34 file-5.38.tar.gz sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h -sha256 7ac061e1a1c840c4dfa0573aec6f3497676c9295b5ec4190d3576646eb1646bf src/vasprintf.c +sha256 58b5932aca6c10f2194290a3b26088ec9ba07ef6b52cc9bb2dd638cc634db6f1 src/vasprintf.c diff --git a/buildroot/package/file/file.mk b/buildroot/package/file/file.mk index a13acbc47..42f9524ed 100644 --- a/buildroot/package/file/file.mk +++ b/buildroot/package/file/file.mk @@ -4,16 +4,25 @@ # ################################################################################ -FILE_VERSION = 5.37 +FILE_VERSION = 5.38 FILE_SITE = ftp://ftp.astron.com/pub/file -FILE_DEPENDENCIES = host-file zlib +FILE_DEPENDENCIES = host-file HOST_FILE_DEPENDENCIES = host-zlib FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c +# We're patching configure.ac +FILE_AUTORECONF = YES HOST_FILE_CONF_OPTS = --disable-libseccomp +ifeq ($(BR2_PACKAGE_BZIP2),y) +FILE_CONF_OPTS += --enable-bzlib +FILE_DEPENDENCIES += bzip2 +else +FILE_CONF_OPTS += --disable-bzlib +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) FILE_CONF_OPTS += --enable-libseccomp FILE_DEPENDENCIES += libseccomp @@ -21,5 +30,19 @@ else FILE_CONF_OPTS += --disable-libseccomp endif +ifeq ($(BR2_PACKAGE_XZ),y) +FILE_CONF_OPTS += --enable-xzlib +FILE_DEPENDENCIES += xz +else +FILE_CONF_OPTS += --disable-xzlib +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +FILE_CONF_OPTS += --enable-zlib +FILE_DEPENDENCIES += zlib +else +FILE_CONF_OPTS += --disable-zlib +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/filemq/filemq.hash b/buildroot/package/filemq/filemq.hash index d1df1ff2a..611d19208 100644 --- a/buildroot/package/filemq/filemq.hash +++ b/buildroot/package/filemq/filemq.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 f3764e1adacfbf7fd09fb9c553e796a80d8159f1ace689fb68307afbc1746d4c filemq-8940f34e0f1c8f25c1c693ed8db069f58fbc5ad0.tar.gz +sha256 f3764e1adacfbf7fd09fb9c553e796a80d8159f1ace689fb68307afbc1746d4c filemq-8940f34e0f1c8f25c1c693ed8db069f58fbc5ad0.tar.gz +sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d LICENSE diff --git a/buildroot/package/findutils/0001-mountlist-include-sysmacros-h-for-glibc.patch b/buildroot/package/findutils/0001-mountlist-include-sysmacros-h-for-glibc.patch deleted file mode 100644 index ebb4d38a5..000000000 --- a/buildroot/package/findutils/0001-mountlist-include-sysmacros-h-for-glibc.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 4da63c5881f60f71999a943612da9112232b9161 Mon Sep 17 00:00:00 2001 -From: Eric Blake -Date: Wed, 14 Sep 2016 19:21:42 -0500 -Subject: [PATCH] mountlist: include sysmacros.h for glibc - -On Fedora rawhide (glibc 2.25), './gnulib-tool --test mountlist' -reports: -../../gllib/mountlist.c: In function 'read_file_system_list': -../../gllib/mountlist.c:534:13: warning: '__makedev_from_sys_types' is deprecated: - In the GNU C Library, `makedev' is defined by . - For historical compatibility, it is currently defined by - as well, but we plan to remove this soon. - To use `makedev', include directly. - If you did not intend to use a system-defined macro `makedev', - you should #undef it after including . - [-Wdeprecated-declarations] - me->me_dev = makedev (devmaj, devmin); - ^~ -In file included from /usr/include/features.h:397:0, - from /usr/include/sys/types.h:25, - from ./sys/types.h:28, - from ../../gllib/mountlist.h:23, - from ../../gllib/mountlist.c:20: -/usr/include/sys/sysmacros.h:89:1: note: declared here - __SYSMACROS_DEFINE_MAKEDEV (__SYSMACROS_FST_IMPL_TEMPL) - ^ - -Fix it by including the right headers. We also need a fix to -autoconf's AC_HEADER_MAJOR, but that's a separate patch. - -* m4/mountlist.m4 (gl_PREREQ_MOUTLIST_EXTRA): Include -AC_HEADER_MAJOR. -* lib/mountlist.c (includes): Use correct headers. - -Signed-off-by: Eric Blake - -Signed-off-by: Fabrice Fontaine -[Backported on version 4.6 after being retrieved from -http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=patch;h=4da63c58] ---- - gl/lib/mountlist.c | 6 ++++++ - m4/mountlist.m4 | 3 ++- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/gl/lib/mountlist.c b/lib/mountlist.c -index bb4e4ee..cf4020e 100644 ---- a/gl/lib/mountlist.c -+++ b/gl/lib/mountlist.c -@@ -37,6 +37,12 @@ - # include - #endif - -+#if MAJOR_IN_MKDEV -+# include -+#elif MAJOR_IN_SYSMACROS -+# include -+#endif -+ - #if defined MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */ - # if HAVE_SYS_UCRED_H - # include /* needed on OSF V4.0 for definition of NGROUPS, -diff --git a/m4/mountlist.m4 b/m4/mountlist.m4 -index 2e2ca37..b6724fa 100644 ---- a/gl/m4/mountlist.m4 -+++ b/gl/m4/mountlist.m4 -@@ -1,4 +1,4 @@ --# serial 11 -+# serial 12 - dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -15,5 +15,6 @@ AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA], - [ - dnl Note gl_LIST_MOUNTED_FILE_SYSTEMS checks for mntent.h, not sys/mntent.h. - AC_CHECK_HEADERS([sys/mntent.h]) -+ AC_HEADER_MAJOR()dnl for use of makedev () - gl_FSTYPENAME - ]) --- -1.9.1 - diff --git a/buildroot/package/findutils/0002-fflush-adjust-to-glibc-2-28-libio-h-removal.patch b/buildroot/package/findutils/0002-fflush-adjust-to-glibc-2-28-libio-h-removal.patch deleted file mode 100644 index 3144f5e32..000000000 --- a/buildroot/package/findutils/0002-fflush-adjust-to-glibc-2-28-libio-h-removal.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 5 Mar 2018 10:56:29 -0800 -Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Problem reported by Daniel P. Berrangé in: -https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html -* lib/fbufmode.c (fbufmode): -* lib/fflush.c (clear_ungetc_buffer_preserving_position) -(disable_seek_optimization, rpl_fflush): -* lib/fpending.c (__fpending): -* lib/fpurge.c (fpurge): -* lib/freadable.c (freadable): -* lib/freadahead.c (freadahead): -* lib/freading.c (freading): -* lib/freadptr.c (freadptr): -* lib/freadseek.c (freadptrinc): -* lib/fseeko.c (fseeko): -* lib/fseterr.c (fseterr): -* lib/fwritable.c (fwritable): -* lib/fwriting.c (fwriting): -Check _IO_EOF_SEEN instead of _IO_ftrylockfile. -* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: -Define if not already defined. - -Signed-off-by: Fabrice Fontaine -[Backported in version 4.6 after being retrieved from -http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=patch;h=4af4a4a7] ---- - gl/lib/fflush.c | 6 +++--- - gl/lib/fpurge.c | 2 +- - gl/lib/freadahead.c | 2 +- - gl/lib/freading.c | 2 +- - gl/lib/fseeko.c | 4 ++-- - gl/lib/stdio-impl.h | 6 ++++++ - 6 files changed, 14 insertions(+), 8 deletions(-) - -diff --git a/gl/lib/fflush.c b/gl/lib/fflush.c -index 983ade0..a6edfa1 100644 ---- a/gl/lib/fflush.c -+++ b/gl/lib/fflush.c -@@ -33,7 +33,7 @@ - #undef fflush - - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ - static void -@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) - - #endif - --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) - - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) - if (stream == NULL || ! freading (stream)) - return fflush (stream); - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - -diff --git a/gl/lib/fpurge.c b/gl/lib/fpurge.c -index b1d417c..3aedcc3 100644 ---- a/gl/lib/fpurge.c -+++ b/gl/lib/fpurge.c -@@ -62,7 +62,7 @@ fpurge (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ -diff --git a/gl/lib/freadahead.c b/gl/lib/freadahead.c -index c2ecb5b..23ec76e 100644 ---- a/gl/lib/freadahead.c -+++ b/gl/lib/freadahead.c -@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *); - size_t - freadahead (FILE *fp) - { --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) -diff --git a/gl/lib/freading.c b/gl/lib/freading.c -index 73c28ac..c24d0c8 100644 ---- a/gl/lib/freading.c -+++ b/gl/lib/freading.c -@@ -31,7 +31,7 @@ freading (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); -diff --git a/gl/lib/fseeko.c b/gl/lib/fseeko.c -index 0101ab5..193f4e8 100644 ---- a/gl/lib/fseeko.c -+++ b/gl/lib/fseeko.c -@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -diff --git a/gl/lib/stdio-impl.h b/gl/lib/stdio-impl.h -index 78d896e..05c5752 100644 ---- a/gl/lib/stdio-impl.h -+++ b/gl/lib/stdio-impl.h -@@ -18,6 +18,12 @@ - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ - --- -1.9.1 - diff --git a/buildroot/package/findutils/findutils.hash b/buildroot/package/findutils/findutils.hash index d5c551930..392c62d25 100644 --- a/buildroot/package/findutils/findutils.hash +++ b/buildroot/package/findutils/findutils.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d findutils-4.6.0.tar.gz +sha256 c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a findutils-4.7.0.tar.xz + +# Hash for license file +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/buildroot/package/findutils/findutils.mk b/buildroot/package/findutils/findutils.mk index b0a2ea8c5..13d8271e1 100644 --- a/buildroot/package/findutils/findutils.mk +++ b/buildroot/package/findutils/findutils.mk @@ -4,7 +4,8 @@ # ################################################################################ -FINDUTILS_VERSION = 4.6.0 +FINDUTILS_VERSION = 4.7.0 +FINDUTILS_SOURCE = findutils-$(FINDUTILS_VERSION).tar.xz FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils FINDUTILS_LICENSE = GPL-3.0+ FINDUTILS_LICENSE_FILES = COPYING @@ -12,7 +13,5 @@ FINDUTILS_CONF_ENV = \ gl_cv_func_stdin=yes \ ac_cv_func_working_mktime=yes \ gl_cv_func_wcwidth_works=yes -# 0001-mountlist-include-sysmacros-h-for-glibc.patch -FINDUTILS_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/fio/fio.hash b/buildroot/package/fio/fio.hash index e7eea5820..4b6c9b8c1 100644 --- a/buildroot/package/fio/fio.hash +++ b/buildroot/package/fio/fio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b4009bf4f9ddbb4e8c72b2316f91dcf83e476e7a1132b0318c226d945a6d8247 fio-fio-3.9.tar.gz +sha256 2aa68326266ef074ecc0892ebfe165e28c981282f345ee05f9d06f11ada3f052 fio-3.17.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8a240c1ad13d1fe3e58588643d81d0695899be4a669fe6d8fafa76ca6a89db2c MORAL-LICENSE diff --git a/buildroot/package/fio/fio.mk b/buildroot/package/fio/fio.mk index 34e24e55d..5761d1c28 100644 --- a/buildroot/package/fio/fio.mk +++ b/buildroot/package/fio/fio.mk @@ -4,8 +4,8 @@ # ################################################################################ -FIO_VERSION = fio-3.9 -FIO_SITE = git://git.kernel.dk/fio.git +FIO_VERSION = 3.17 +FIO_SITE = http://brick.kernel.dk/snaps FIO_LICENSE = GPL-2.0 FIO_LICENSE_FILES = COPYING MORAL-LICENSE diff --git a/buildroot/package/fis/0001-checksum.patch b/buildroot/package/fis/0001-checksum.patch deleted file mode 100644 index a6325eb01..000000000 --- a/buildroot/package/fis/0001-checksum.patch +++ /dev/null @@ -1,274 +0,0 @@ -diff -uN fis.orig/crc.c fis/crc.c ---- fis.orig/crc.c 1970-01-01 10:00:00.000000000 +1000 -+++ fis/crc.c 2008-04-01 11:39:13.000000000 +1100 -@@ -0,0 +1,88 @@ -+/* -+ * crc.c -+ * -+ * $Id: crc.c,v 1.1 2006/02/13 09:58:08 andrzej Exp $ -+ * -+ * Gary S. Brown's CRC -+ * Code based on Gary S. Brown CRC (1986). -+ * Generation polynomial is: -+ * X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 -+ * -+ * Copyright (C) 2006 Ekiert sp z o.o. -+ * Author: Andrzej Ekiert -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#include -+ -+#include "crc.h" -+ -+static const uint32_t crc32_tab[] = { -+ 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, -+ 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, -+ 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, -+ 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, -+ 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, -+ 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, -+ 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, -+ 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, -+ 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, -+ 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, -+ 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, -+ 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, -+ 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, -+ 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, -+ 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, -+ 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, -+ 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, -+ 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, -+ 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, -+ 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, -+ 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, -+ 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, -+ 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, -+ 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, -+ 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, -+ 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, -+ 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, -+ 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, -+ 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, -+ 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, -+ 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, -+ 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, -+ 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, -+ 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, -+ 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, -+ 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, -+ 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, -+ 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, -+ 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, -+ 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, -+ 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, -+ 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, -+ 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, -+ 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, -+ 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, -+ 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, -+ 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, -+ 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, -+ 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, -+ 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, -+ 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, -+ 0x2d02ef8dL -+ }; -+ -+uint32_t crc32(uint8_t *s, uint32_t len) -+{ -+ uint32_t i, val = 0; -+ -+ for (i = 0; i < len; i++) { -+ val = crc32_tab[(val^s[i]) & 0xff] ^ (val >> 8); -+ } -+ return val; -+} -+ -diff -uN fis.orig/crc.h fis/crc.h ---- fis.orig/crc.h 1970-01-01 10:00:00.000000000 +1000 -+++ fis/crc.h 2008-04-01 11:39:13.000000000 +1100 -@@ -0,0 +1,25 @@ -+/* -+ * crc.h -+ * -+ * $Id: crc.h,v 1.1 2006/02/13 09:58:08 andrzej Exp $ -+ * -+ * Gary S. Brown's CRC - header. -+ * -+ * Copyright (C) 2006 Ekiert sp z o.o. -+ * Author: Andrzej Ekiert -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#ifndef CRC_H -+#define CRC_H -+ -+#include -+ -+uint32_t crc32(uint8_t *s, uint32_t len); -+ -+#endif //CRC_H -+ -diff -uN fis.orig/fis.c fis/fis.c ---- fis.orig/fis.c 2007-05-03 06:42:51.000000000 +1000 -+++ fis/fis.c 2008-04-01 11:52:11.000000000 +1100 -@@ -30,6 +30,7 @@ - #include - #include - -+#include "crc.h" - - // Report an error and terminate: - -@@ -141,8 +142,8 @@ - - static void dump_desc(FILE* f, const struct fis_image_desc* d) - { -- fprintf(f,"%16s: addr = 0x%08x, size = 0x%08x\n", -- d->name, d->flash_base, d->size); -+ fprintf(f,"%16s: flash addr = 0x%08x, mem addr = 0x%08x, size = 0x%08x, checksum = 0x%08x\n", -+ d->name, d->flash_base, d->mem_base, d->size, d->file_cksum); - for (unsigned int i=0; i<(sizeof(d->skips)/4); ++i) { - if (d->skips[i]==0x736b6970 || d->skips[i]==0x70696b73) { // "skip" - uint32_t offset = d->skips[i+1]; -@@ -332,6 +333,7 @@ - d->size = swap_end_32(d->size); - d->entry_point = swap_end_32(d->entry_point); - d->data_length = swap_end_32(d->data_length); -+ d->file_cksum = swap_end_32(d->file_cksum); - for (unsigned int i=0; i<(sizeof(d->skips)/4); ++i) { - d->skips[i] = swap_end_32(d->skips[i]); - } -@@ -446,19 +448,25 @@ - char* arg=argv[i]; - if (strcmp(arg,"-l")==0) { - if (i==argc-1) { -- fatal("argumnet missing for -l"); -+ fatal("argument missing for -l"); - } - ++i; - d->size = str_to_int_maybe_hex(argv[i]); - } else if (strcmp(arg,"-f")==0) { - if (i==argc-1) { -- fatal("argumnet missing for -f"); -+ fatal("argument missing for -f"); - } - ++i; - d->flash_base = str_to_int_maybe_hex(argv[i]); -+ } else if (strcmp(arg,"-m")==0) { -+ if (i==argc-1) { -+ fatal("argument missing for -m"); -+ } -+ ++i; -+ d->mem_base = str_to_int_maybe_hex(argv[i]); - } else if (strcmp(arg,"-n")==0) { - if (i==argc-1) { -- fatal("argumnet missing for -n"); -+ fatal("argument missing for -n"); - } - ++i; - char* name = argv[i]; -@@ -499,6 +507,66 @@ - save_dir(fd,offset,size,swap_endianness,dir); - } - -+static void fis_checksum(const char* device, int offset, int size, bool swap_endianness, -+ int argc, char* argv[]) -+{ -+ char* name = NULL; -+ char* filename = NULL; -+ -+ for (int i=0; i=16) { -+ fatal("name too long, max 16 chars including terminating null"); -+ } -+ } else { -+ fputs("Unrecognised option '",stderr); -+ fputs(arg,stderr); -+ fputs("'\n",stderr); -+ exit(1); -+ } -+ } -+ -+ if (name == NULL || filename == NULL) -+ fatal("filename and partition name must be specified"); -+ -+ int fd; -+ char *buf; -+ struct stat stat_buf; -+ uint32_t crc; -+ -+ CHECK(fd=open(filename,O_RDONLY),-1); -+ CHECK(stat(filename, &stat_buf),-1); -+ buf = (char*)chk_malloc(stat_buf.st_size); -+ CHECK(read(fd,buf,stat_buf.st_size),-1); -+ crc = crc32(buf,stat_buf.st_size); -+ close(fd); -+ free(buf); -+ -+ CHECK(fd=open(device,O_RDWR),-1); -+ dir_t dir; -+ load_dir(fd,offset,&size,swap_endianness,&dir); -+ iter_t after = NULL; -+ FOR_EACH_DIR_ENTRY(dir,i) { -+ if (strcmp(get(i)->name, name) == 0) { -+ get(i)->file_cksum = crc; -+ get(i)->data_length = stat_buf.st_size; -+ break; -+ } -+ } -+ save_dir(fd,offset,size,swap_endianness,dir); -+} - - static void fis_delete(const char* device, int offset, int size, bool swap_endianness, - char* name) -@@ -526,8 +594,9 @@ - fputs("Usage:\n" - " fis [options] list\n" - " fis [options] init\n" -- " fis [options] create -f address -l size -n name\n" -+ " fis [options] create -f address -l size -n name [-m memory_address]\n" - " fis [options] delete name\n" -+ " fis [options] checksum -f filename -n name\n" - "Options:\n" - " -d device specify /dev/mtd* device containing directory\n" - " -o offset specify offset into device of start of directory\n" -@@ -597,9 +666,14 @@ - fis_create(device,offset,size,swap_endianness, - argc-i-1,&argv[i+1]); - break; -+ } else if (strcmp(arg,"checksum")==0) { -+ check_dev(device); -+ fis_checksum(device,offset,size,swap_endianness, -+ argc-i-1,&argv[i+1]); -+ break; - } else if (strcmp(arg,"delete")==0) { - if (i!=argc-2) { -- fatal("Exactly one argumnet required after 'delete'"); -+ fatal("Exactly one argument required after 'delete'"); - } - ++i; - char* name = argv[i]; diff --git a/buildroot/package/fis/0003-list_output.patch b/buildroot/package/fis/0003-list_output.patch deleted file mode 100644 index 6c1e4eb9d..000000000 --- a/buildroot/package/fis/0003-list_output.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- fis.orig/fis.c 2010-05-12 10:22:10.000000000 -0700 -+++ fis/fis.c 2010-05-12 10:19:24.000000000 -0700 -@@ -142,8 +142,8 @@ - - static void dump_desc(FILE* f, const struct fis_image_desc* d) - { -- fprintf(f,"%16s: flash addr = 0x%08x, mem addr = 0x%08x, size = 0x%08x, checksum = 0x%08x\n", -- d->name, d->flash_base, d->mem_base, d->size, d->file_cksum); -+ fprintf(f,"%-16s 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x\n", -+ d->name, d->flash_base, d->mem_base, d->size, d->entry_point, d->file_cksum); - for (unsigned int i=0; i<(sizeof(d->skips)/4); ++i) { - if (d->skips[i]==0x736b6970 || d->skips[i]==0x70696b73) { // "skip" - uint32_t offset = d->skips[i+1]; -@@ -400,6 +400,7 @@ - CHECK(fd=open(device,O_RDONLY),-1); - dir_t dir; - load_dir(fd,offset,&size,swap_endianness,&dir); -+ fprintf(stdout,"Name FLASH addr Mem addr Length Entry point Checksum\n"); - FOR_EACH_DIR_ENTRY(dir,i) { - dump_desc(stdout,get(i)); - } diff --git a/buildroot/package/fis/0004-sorted_list.patch b/buildroot/package/fis/0004-sorted_list.patch deleted file mode 100644 index 6854977ba..000000000 --- a/buildroot/package/fis/0004-sorted_list.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- fis.orig/fis.c 2010-05-12 11:09:22.000000000 -0700 -+++ fis/fis.c 2010-05-12 11:05:45.000000000 -0700 -@@ -401,9 +401,24 @@ - dir_t dir; - load_dir(fd,offset,&size,swap_endianness,&dir); - fprintf(stdout,"Name FLASH addr Mem addr Length Entry point Checksum\n"); -- FOR_EACH_DIR_ENTRY(dir,i) { -- dump_desc(stdout,get(i)); -- } -+ uint32_t last_addr = 0; -+ bool image_found; -+ do { -+ uint32_t lowest_addr = 0xffffffff; -+ iter_t index; -+ image_found = false; -+ FOR_EACH_DIR_ENTRY(dir,i) { -+ const struct fis_image_desc *d = get(i); -+ if ((d->flash_base >= last_addr) && (d->flash_base < lowest_addr)) { -+ lowest_addr = d->flash_base; -+ image_found = true; -+ index = i; -+ } -+ } -+ if (image_found) -+ dump_desc(stdout,get(index)); -+ last_addr = lowest_addr + 1; -+ } while (image_found == true); - } - - diff --git a/buildroot/package/fis/Config.in b/buildroot/package/fis/Config.in deleted file mode 100644 index c5bfbb82c..000000000 --- a/buildroot/package/fis/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_FIS - bool "fis" - help - fis - manipulate RedBoot partition table from Linux. diff --git a/buildroot/package/fis/fis.mk b/buildroot/package/fis/fis.mk deleted file mode 100644 index 6db06bf74..000000000 --- a/buildroot/package/fis/fis.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# fis -# -################################################################################ - -FIS_SITE = http://svn.chezphil.org/utils/trunk -FIS_SITE_METHOD = svn -FIS_VERSION = 2892 -FIS_LICENSE = GPL-2.0+ -FIS_LICENSE_FILES = fis.c - -define FIS_BUILD_CMDS - $(TARGET_CC) $(TARGET_CFLAGS) -std=c99 -o $(@D)/fis \ - $(@D)/fis.c $(@D)/crc.c $(TARGET_LDFLAGS) -endef - -define FIS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/fis $(TARGET_DIR)/sbin/fis -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch b/buildroot/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch new file mode 100644 index 000000000..d1398d4b3 --- /dev/null +++ b/buildroot/package/flac/0001-configure.ac-check-for-sys-auxv.h-before-defining-FL.patch @@ -0,0 +1,36 @@ +From 14a0713389fbfef59225d027ea466ebb478a8c6b Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 19 Sep 2019 21:18:04 +0200 +Subject: [PATCH] configure.ac: check for sys/auxv.h before defining FLAC__CPU_PPC + +Upstream: https://github.com/xiph/flac/pull/142 +Signed-off-by: Peter Seiderer +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0228a12..64cb3f2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -144,7 +144,7 @@ case "$host_cpu" in + powerpc64|powerpc64le) + cpu_ppc64=true + cpu_ppc=true +- AC_DEFINE(FLAC__CPU_PPC) ++ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) + AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) + AC_DEFINE(FLAC__CPU_PPC64) + AH_TEMPLATE(FLAC__CPU_PPC64, [define if building for PowerPC64]) +@@ -152,7 +152,7 @@ case "$host_cpu" in + ;; + powerpc|powerpcle) + cpu_ppc=true +- AC_DEFINE(FLAC__CPU_PPC) ++ AC_CHECK_HEADER(sys/auxv.h, AC_DEFINE(FLAC__CPU_PPC)) + AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) + asm_optimisation=$asm_opt + ;; +-- +2.23.0 + diff --git a/buildroot/package/flac/0001-configure.ac-relax-linux-OS-detection.patch b/buildroot/package/flac/0001-configure.ac-relax-linux-OS-detection.patch deleted file mode 100644 index baf07bc16..000000000 --- a/buildroot/package/flac/0001-configure.ac-relax-linux-OS-detection.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8589b44c573d4228a9df3ba7bffdfdf584e7b033 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 9 Jan 2017 21:38:29 +0100 -Subject: [PATCH] configure.ac: relax linux OS detection - -Not all linux hosts match the *-pc-linux-gnu wildcard, causing build -failures for older glibc versions where we need to link with -lrt for -clock_gettime - E.G.: - - - arm-unknown-linux-musleabihf - - powerpc-unknown-linux-gnuspe - - bfin-linux-linux-uclibc - .. - -Signed-off-by: Peter Korsgaard ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 070ab357..235d2717 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -186,7 +186,7 @@ esac - AM_CONDITIONAL(OS_IS_WINDOWS, test "x$os_is_windows" = xyes) - - case "$host" in -- *-pc-linux-gnu) -+ *-linux-*) - sys_linux=true - AC_DEFINE(FLAC__SYS_LINUX) - AH_TEMPLATE(FLAC__SYS_LINUX, [define if building for Linux]) --- -2.11.0 - diff --git a/buildroot/package/flac/flac.hash b/buildroot/package/flac/flac.hash index 7ce76f107..df7c2d1b9 100644 --- a/buildroot/package/flac/flac.hash +++ b/buildroot/package/flac/flac.hash @@ -1,2 +1,10 @@ +# From https://ftp.osuosl.org/pub/xiph/releases/flac/MD5SUMS +md5 26703ed2858c1fc9ffc05136d13daa69 flac-1.3.3.tar.xz +# From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS +sha1 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe flac-1.3.3.tar.xz # From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f flac-1.3.2.tar.xz +sha256 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 flac-1.3.3.tar.xz +# Locally computed +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL +sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph diff --git a/buildroot/package/flac/flac.mk b/buildroot/package/flac/flac.mk index 34482133d..f2922ffef 100644 --- a/buildroot/package/flac/flac.mk +++ b/buildroot/package/flac/flac.mk @@ -4,15 +4,17 @@ # ################################################################################ -FLAC_VERSION = 1.3.2 +FLAC_VERSION = 1.3.3 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPL-2.1+ (other libraries) FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL -# 0001-configure.ac-relax-linux-OS-detection.patch patches configure.ac + +# patch touching configure.ac FLAC_AUTORECONF = YES + FLAC_CONF_OPTS = \ --disable-cpplibs \ --disable-xmms-plugin \ diff --git a/buildroot/package/flann/Config.in b/buildroot/package/flann/Config.in index a2cd50c86..3725fc784 100644 --- a/buildroot/package/flann/Config.in +++ b/buildroot/package/flann/Config.in @@ -2,9 +2,6 @@ config BR2_PACKAGE_FLANN bool "flann" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS - # all gcc versions fail to build flann on Microblaze due to - # gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69401 - depends on !BR2_microblaze help FLANN is a library for performing fast approximate nearest neighbor searches in high dimensional spaces. It contains a @@ -25,5 +22,4 @@ config BR2_PACKAGE_FLANN_EXAMPLES endif comment "flann needs a toolchain w/ C++, dynamic library" - depends on !BR2_microblaze depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/buildroot/package/flann/flann.hash b/buildroot/package/flann/flann.hash index c2c41beb0..543e4b483 100644 --- a/buildroot/package/flann/flann.hash +++ b/buildroot/package/flann/flann.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3 flann-1.9.1.tar.gz +sha256 b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3 flann-1.9.1.tar.gz +sha256 3993f339cc56506c62aa1eb2fb76f240ee93b738d857832899c1e207b1dc069a COPYING diff --git a/buildroot/package/flann/flann.mk b/buildroot/package/flann/flann.mk index ef61815bb..6c2e6a9e7 100644 --- a/buildroot/package/flann/flann.mk +++ b/buildroot/package/flann/flann.mk @@ -14,8 +14,16 @@ FLANN_CONF_OPTS = \ -DBUILD_PYTHON_BINDINGS=OFF \ -DBUILD_MATLAB_BINDINGS=OFF \ -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_FLANN_EXAMPLES),ON,OFF) \ - -DUSE_OPENMP=$(if $(BR2_GCC_ENABLE_OPENMP),ON,OFF) \ + -DUSE_OPENMP=$(if $(BR2_TOOLCHAIN_HAS_OPENMP),ON,OFF) \ -DPYTHON_EXECUTABLE=OFF \ -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=TRUE +FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +FLANN_CXXFLAGS += -O0 +endif + +FLANN_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(FLANN_CXXFLAGS)" + $(eval $(cmake-package)) diff --git a/buildroot/package/flannel/Config.in b/buildroot/package/flannel/Config.in index 134111b1c..326361080 100644 --- a/buildroot/package/flannel/Config.in +++ b/buildroot/package/flannel/Config.in @@ -1,12 +1,12 @@ comment "flannel needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS && \ - BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_FLANNEL bool "flannel" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS help Flannel is a virtual network that gives a subnet to each diff --git a/buildroot/package/flannel/flannel.hash b/buildroot/package/flannel/flannel.hash index 3e0b25cb4..57c2daf6d 100644 --- a/buildroot/package/flannel/flannel.hash +++ b/buildroot/package/flannel/flannel.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 dbbcb08c0e70713b0c920387a9967e5b30ef833c8118c847edbbca4f68ff0562 v0.5.5.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/flannel/flannel.mk b/buildroot/package/flannel/flannel.mk index d00d2df92..0af06c765 100644 --- a/buildroot/package/flannel/flannel.mk +++ b/buildroot/package/flannel/flannel.mk @@ -4,9 +4,9 @@ # ################################################################################ -FLANNEL_VERSION = v0.5.5 +FLANNEL_VERSION = 0.5.5 FLANNEL_SITE = https://github.com/coreos/flannel/archive -FLANNEL_SOURCE = $(FLANNEL_VERSION).tar.gz +FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz FLANNEL_LICENSE = Apache-2.0 FLANNEL_LICENSE_FILES = LICENSE diff --git a/buildroot/package/flare-engine/flare-engine.hash b/buildroot/package/flare-engine/flare-engine.hash index 8c6fc3ab1..e03bcc589 100644 --- a/buildroot/package/flare-engine/flare-engine.hash +++ b/buildroot/package/flare-engine/flare-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4bbd4674513b643be6294188904665c53f0ef2912e803212c05e8fd22a44d74d flare-engine-v1.0.tar.gz +sha256 4bbd4674513b643be6294188904665c53f0ef2912e803212c05e8fd22a44d74d flare-engine-1.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/flare-engine/flare-engine.mk b/buildroot/package/flare-engine/flare-engine.mk index 8a656d695..ed9dd19b0 100644 --- a/buildroot/package/flare-engine/flare-engine.mk +++ b/buildroot/package/flare-engine/flare-engine.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLARE_ENGINE_VERSION = v1.0 -FLARE_ENGINE_SITE = $(call github,clintbellanger,flare-engine,$(FLARE_ENGINE_VERSION)) +FLARE_ENGINE_VERSION = 1.0 +FLARE_ENGINE_SITE = $(call github,clintbellanger,flare-engine,v$(FLARE_ENGINE_VERSION)) FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING diff --git a/buildroot/package/flare-game/flare-game.hash b/buildroot/package/flare-game/flare-game.hash index a27c66d9e..51646269a 100644 --- a/buildroot/package/flare-game/flare-game.hash +++ b/buildroot/package/flare-game/flare-game.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5c8e9d72fcbe59f1861f79ac7b76ceffe3ec61d1df241c32d9133fe158fba4c1 flare-game-v1.0.tar.gz +sha256 5c8e9d72fcbe59f1861f79ac7b76ceffe3ec61d1df241c32d9133fe158fba4c1 flare-game-1.0.tar.gz sha256 9fce5eb663f136449e11293a871ed96db5ba579116a927fc6a70dd20a4a5b9e6 README diff --git a/buildroot/package/flare-game/flare-game.mk b/buildroot/package/flare-game/flare-game.mk index 89750d99b..a70e998d0 100644 --- a/buildroot/package/flare-game/flare-game.mk +++ b/buildroot/package/flare-game/flare-game.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLARE_GAME_VERSION = v1.0 -FLARE_GAME_SITE = $(call github,clintbellanger,flare-game,$(FLARE_GAME_VERSION)) +FLARE_GAME_VERSION = 1.0 +FLARE_GAME_SITE = $(call github,clintbellanger,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) FLARE_GAME_LICENSE_FILES = README diff --git a/buildroot/package/flashbench/flashbench.hash b/buildroot/package/flashbench/flashbench.hash index a5eb388c8..f82d7f0ee 100644 --- a/buildroot/package/flashbench/flashbench.hash +++ b/buildroot/package/flashbench/flashbench.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 12e2dcb6f041ef1a303fc5bc84642ed637c24d77ed6c667a2187f21d54555731 flashbench-2e30b1968a66147412f21002ea844122a0d5e2f0.tar.gz +sha256 12e2dcb6f041ef1a303fc5bc84642ed637c24d77ed6c667a2187f21d54555731 flashbench-2e30b1968a66147412f21002ea844122a0d5e2f0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/flashbench/flashbench.mk b/buildroot/package/flashbench/flashbench.mk index cbcf9ea2d..e89a250aa 100644 --- a/buildroot/package/flashbench/flashbench.mk +++ b/buildroot/package/flashbench/flashbench.mk @@ -9,16 +9,9 @@ FLASHBENCH_SITE = git://git.linaro.org/people/arnd/flashbench.git FLASHBENCH_LICENSE = GPL-2.0 FLASHBENCH_LICENSE_FILES = COPYING -FLASHBENCH_CFLAGS = $(TARGET_CFLAGS) - -ifeq ($(BR2_microblaze)$(BR2_sh2a),y) -# microblaze and sh2a toolchains only provide LLONG_MAX when used with gnu99 dialect -FLASHBENCH_CFLAGS += -std=gnu99 -endif - define FLASHBENCH_BUILD_CMDS $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(FLASHBENCH_CFLAGS)" \ + CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS) -lrt" endef diff --git a/buildroot/package/flashrom/0001-platform-Add-riscv-to-known-platforms.patch b/buildroot/package/flashrom/0001-platform-Add-riscv-to-known-platforms.patch deleted file mode 100644 index 06eb9256e..000000000 --- a/buildroot/package/flashrom/0001-platform-Add-riscv-to-known-platforms.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a9a03cc6ba71825bfae0d64e1888f33c77345bc3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 17 Mar 2018 23:08:29 -0700 -Subject: [PATCH] platform: Add riscv to known platforms - -Change-Id: I724a99e2493fcbf71c2fc2d9f6a1ad607c737087 -Signed-off-by: Khem Raj -Reviewed-on: https://review.coreboot.org/25260 -Tested-by: build bot (Jenkins) -Reviewed-by: Paul Menzel -Reviewed-by: David Hendricks -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/flashrom/flashrom/commit/a9a03cc6ba71825bfae0d64e1888f33c77345bc3] ---- - platform.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/platform.h b/platform.h -index e3b7674ae..65fe85881 100644 ---- a/platform.h -+++ b/platform.h -@@ -69,6 +69,9 @@ - #elif defined (__m68k__) - #define __FLASHROM_ARCH__ "m68k" - #define IS_M68K 1 -+#elif defined (__riscv) -+ #define __FLASHROM_ARCH__ "riscv" -+ #define IS_RISCV 1 - #elif defined (__sh__) - #define __FLASHROM_ARCH__ "sh" - #define IS_SH 1 -@@ -77,7 +80,7 @@ - #define IS_S390 1 - #endif - --#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_SH || IS_S390) -+#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_RISCV || IS_SH || IS_S390) - #error Unknown architecture - #endif - diff --git a/buildroot/package/flashrom/flashrom.hash b/buildroot/package/flashrom/flashrom.hash index 3a68e8acb..6622758a5 100644 --- a/buildroot/package/flashrom/flashrom.hash +++ b/buildroot/package/flashrom/flashrom.hash @@ -1,4 +1,4 @@ # Locally computed after checking pgp signature -# https://download.flashrom.org/releases/flashrom-1.0.tar.bz2.asc -sha256 3702fa215ba5fb5af8e54c852d239899cfa1389194c1e51cb2a170c4dc9dee64 flashrom-1.0.tar.bz2 +# https://download.flashrom.org/releases/flashrom-v1.1.tar.bz2.asc +sha256 aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19 flashrom-v1.1.tar.bz2 sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/flashrom/flashrom.mk b/buildroot/package/flashrom/flashrom.mk index 733ad7318..6b9e6dde9 100644 --- a/buildroot/package/flashrom/flashrom.mk +++ b/buildroot/package/flashrom/flashrom.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLASHROM_VERSION = 1.0 -FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2 +FLASHROM_VERSION = 1.1 +FLASHROM_SOURCE = flashrom-v$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING diff --git a/buildroot/package/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch b/buildroot/package/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch new file mode 100644 index 000000000..f3e82101b --- /dev/null +++ b/buildroot/package/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch @@ -0,0 +1,38 @@ +From bff7ffbc5130cd46caf33b76b4bb0593fcd15066 Mon Sep 17 00:00:00 2001 +From: Vladimir Glavnyy <31897320+vglavnyy@users.noreply.github.com> +Date: Fri, 10 May 2019 00:15:29 +0700 +Subject: [PATCH] Add detection of strtoull_l function (#5333) (#5337) + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/google/flatbuffers/commit/bff7ffbc5130cd46caf33b76b4bb0593fcd15066] +--- + CMakeLists.txt | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0640c37b5..30be238fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,12 +42,18 @@ if(DEFINED FLATBUFFERS_MAX_PARSING_DEPTH) + message(STATUS "FLATBUFFERS_MAX_PARSING_DEPTH: ${FLATBUFFERS_MAX_PARSING_DEPTH}") + endif() + +-# Auto-detect locale-narrow 'strtod_l' function. ++# Auto-detect locale-narrow 'strtod_l' and 'strtoull_l' functions. + if(NOT DEFINED FLATBUFFERS_LOCALE_INDEPENDENT) ++ set(FLATBUFFERS_LOCALE_INDEPENDENT 0) + if(MSVC) +- check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT) ++ check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L) ++ check_cxx_symbol_exists(_strtoui64_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L) + else() +- check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT) ++ check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L) ++ check_cxx_symbol_exists(strtoull_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L) ++ endif() ++ if(FLATBUFFERS_HAS_STRTOF_L AND FLATBUFFERS_HAS_STRTOULL_L) ++ set(FLATBUFFERS_LOCALE_INDEPENDENT 1) + endif() + endif() + add_definitions(-DFLATBUFFERS_LOCALE_INDEPENDENT=$) diff --git a/buildroot/package/flatbuffers/flatbuffers.hash b/buildroot/package/flatbuffers/flatbuffers.hash index a8f23f4ef..0cbdb6fe5 100644 --- a/buildroot/package/flatbuffers/flatbuffers.hash +++ b/buildroot/package/flatbuffers/flatbuffers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3 flatbuffers-v1.9.0.tar.gz +sha256 3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b flatbuffers-1.11.0.tar.gz sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 LICENSE.txt diff --git a/buildroot/package/flatbuffers/flatbuffers.mk b/buildroot/package/flatbuffers/flatbuffers.mk index 26d930789..dcb5579e6 100644 --- a/buildroot/package/flatbuffers/flatbuffers.mk +++ b/buildroot/package/flatbuffers/flatbuffers.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLATBUFFERS_VERSION = v1.9.0 -FLATBUFFERS_SITE = $(call github,google,flatbuffers,$(FLATBUFFERS_VERSION)) +FLATBUFFERS_VERSION = 1.11.0 +FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION)) FLATBUFFERS_LICENSE = Apache-2.0 FLATBUFFERS_LICENSE_FILES = LICENSE.txt FLATBUFFERS_INSTALL_STAGING = YES @@ -20,4 +20,14 @@ else FLATBUFFERS_CONF_OPTS += -DFLATBUFFERS_BUILD_SHAREDLIB=ON endif +HOST_FLATBUFFERS_CONF_OPTS += \ + -DCMAKE_CXX_FLAGS="-std=c++11" \ + -DFLATBUFFERS_BUILD_FLATLIB=OFF \ + -DFLATBUFFERS_BUILD_FLATC=ON \ + -DFLATBUFFERS_BUILD_FLATHASH=OFF \ + -DFLATBUFFERS_BUILD_GRPCTEST=OFF \ + -DFLATBUFFERS_BUILD_SHAREDLIB=OFF \ + -DFLATBUFFERS_BUILD_TESTS=OFF + $(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/buildroot/package/flatcc/0001-CMakeLists.txt-conditionally-require-C-based-on-FLAT.patch b/buildroot/package/flatcc/0001-CMakeLists.txt-conditionally-require-C-based-on-FLAT.patch deleted file mode 100644 index 7d76d6caf..000000000 --- a/buildroot/package/flatcc/0001-CMakeLists.txt-conditionally-require-C-based-on-FLAT.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 878d51187bbc1ad490b4cd15e3741bc0bd11b6b2 Mon Sep 17 00:00:00 2001 -From: Joel Carlson -Date: Thu, 6 Sep 2018 14:53:20 -0600 -Subject: [PATCH] CMakeLists.txt: conditionally require C++ based on - FLATCC_TEST (#94) - -C++ is only used when building the tests, so only include it as a -language via project() when FLATCC_TEST is enabled. This allows -toolchains that don't have C++ to build flatcc. - -Signed-off-by: Joel Carlson ---- -Upstream commit 878d51187bbc1ad490b4cd15e3741bc0bd11b6b2 ---- - CMakeLists.txt | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b39a3d1..5df5161 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,7 +4,18 @@ - #cmake_minimum_required (VERSION 2.8.11) - cmake_minimum_required (VERSION 2.8) - --project (FlatCC C CXX) -+# Disable build of tests and samples. Due to custom build step -+# dependency on flatcc tool, some custom build configurations may -+# experience issues, and this option can then help. -+option(FLATCC_TEST "enable tests" ON) -+ -+# Conditionally set project languages based on FLATCC_TEST, as C++ is -+# only necessary if building the tests. -+if (FLATCC_TEST) -+ project (FlatCC C CXX) -+else() -+ project (FlatCC C) -+endif() - - # - # NOTE: when changing build options, clean the build using on of: -@@ -35,11 +46,6 @@ option(FLATCC_RTONLY "enable build of runtime library only" OFF) - # cmake -DBUILD_SHARED_LIBS=on can override. - option(FLATCC_INSTALL "enable build of runtime library only" OFF) - --# Disable build of tests and samples. Due to custom build step --# dependency on flatcc tool, some custom build configurations may --# experience issues, and this option can then help. --option(FLATCC_TEST "enable tests" ON) -- - # Use with debug build with testing enabled only. Enables generation - # of coverage information during build and run. Adds target "coverage" - # which collects data and makes HTML report in build directory --- -2.7.4 - diff --git a/buildroot/package/flatcc/flatcc.hash b/buildroot/package/flatcc/flatcc.hash index b51725047..11d9d9803 100644 --- a/buildroot/package/flatcc/flatcc.hash +++ b/buildroot/package/flatcc/flatcc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 02dac93d3daf8d0a290aa8711a9b8a53f047436ec5331adb1972389061ec6615 flatcc-v0.5.2.tar.gz +sha256 a92da3566d11e19bb807a83554b1a2c644a5bd91c9d9b088514456bb56e1c666 flatcc-0.6.0.tar.gz sha256 c8f0d9c1f92c658d87ebd854ee7447a3d3912d2c3a5c78c117787be5d5da8af3 LICENSE diff --git a/buildroot/package/flatcc/flatcc.mk b/buildroot/package/flatcc/flatcc.mk index 1c8d0ec7f..c27809b86 100644 --- a/buildroot/package/flatcc/flatcc.mk +++ b/buildroot/package/flatcc/flatcc.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLATCC_VERSION = v0.5.2 -FLATCC_SITE = $(call github,dvidelabs,flatcc,$(FLATCC_VERSION)) +FLATCC_VERSION = 0.6.0 +FLATCC_SITE = $(call github,dvidelabs,flatcc,v$(FLATCC_VERSION)) FLATCC_LICENSE = Apache-2.0 FLATCC_LICENSE_FILES = LICENSE FLATCC_INSTALL_STAGING = YES diff --git a/buildroot/package/flickcurl/flickcurl.hash b/buildroot/package/flickcurl/flickcurl.hash index fd091ec4a..92ba68361 100644 --- a/buildroot/package/flickcurl/flickcurl.hash +++ b/buildroot/package/flickcurl/flickcurl.hash @@ -1,2 +1,7 @@ # Locally calculated after checking pgp signature sha256 ff42a36c7c1c7d368246f6bc9b7d792ed298348e5f0f5d432e49f6803562f5a3 flickcurl-1.26.tar.gz +# Locally computed +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE-2.0.txt +sha256 3590f30b0fb9446a1f0a7ea5bcbb5786fa66fa362800f53d2575875d74b91909 LICENSE.html diff --git a/buildroot/package/flot/flot.hash b/buildroot/package/flot/flot.hash index cb9f9ec9d..c8272fc0b 100644 --- a/buildroot/package/flot/flot.hash +++ b/buildroot/package/flot/flot.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 ef9a873befe3ff5ea42ebf1c3657887265a1717744ca8ed0c2bd3dd736d16b21 flot-0.8.3.tar.gz +sha256 52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c LICENSE.txt diff --git a/buildroot/package/fltk/fltk.hash b/buildroot/package/fltk/fltk.hash index af968aac7..f3430e41f 100644 --- a/buildroot/package/fltk/fltk.hash +++ b/buildroot/package/fltk/fltk.hash @@ -1,4 +1,5 @@ -# From http://www.fltk.org/software.php?VERSION=1.3.4 -md5 d7fcd27ab928648e1a1366dd2e273970 fltk-1.3.4-1-source.tar.gz +# From http://www.fltk.org/software.php?VERSION=1.3.5 +md5 e85017defd5a03ae82e634311db87bbf fltk-1.3.5-source.tar.gz # Locally generated -sha256 7fb2c8882433ce694e6900c94fda505e8f4ed3fa9c7e597007098a33b85c53f4 fltk-1.3.4-1-source.tar.gz +sha256 8729b2a055f38c1636ba20f749de0853384c1d3e9d1a6b8d4d1305143e115702 fltk-1.3.5-source.tar.gz +sha256 57dd381e713fb309fb7dd85c3c38b274557ecb333475d0f1d65a5f06ad85c9a6 COPYING diff --git a/buildroot/package/fltk/fltk.mk b/buildroot/package/fltk/fltk.mk index c37a13176..763ff612d 100644 --- a/buildroot/package/fltk/fltk.mk +++ b/buildroot/package/fltk/fltk.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLTK_VERSION = 1.3.4 -FLTK_SOURCE = fltk-$(FLTK_VERSION)-1-source.tar.gz +FLTK_VERSION = 1.3.5 +FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.gz FLTK_SITE = http://fltk.org/pub/fltk/$(FLTK_VERSION) FLTK_INSTALL_STAGING = YES # We force --libdir=/usr/lib, because by default, it is set to diff --git a/buildroot/package/fluid-soundfont/Config.in b/buildroot/package/fluid-soundfont/Config.in new file mode 100644 index 000000000..67f5ea111 --- /dev/null +++ b/buildroot/package/fluid-soundfont/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_FLUID_SOUNDFONT + bool "fluid-soundfont" + help + FluidR3 is the third release of Frank Wen's pro-quality + GM/GS soundfont. The soundfont has lots of excellent + samples, including all the GM instruments along side with + the GS instruments that are recycled and reprogrammed + versions of the GM presets. + + This package contains Fluid General Midi (GM) soundfont in + soundfont 2.0 (.sf2) format. + + This soundfont can be used with the FluidSynth real-time + software synthesizer. + + http://www.hammersound.net diff --git a/buildroot/package/fluid-soundfont/fluid-soundfont.hash b/buildroot/package/fluid-soundfont/fluid-soundfont.hash new file mode 100644 index 000000000..7aaac6008 --- /dev/null +++ b/buildroot/package/fluid-soundfont/fluid-soundfont.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 2621acaa1c78e4abdb24bdd163230cc577e61276936d6aa6e3180582142f0343 fluid-soundfont_3.1.orig.tar.gz +sha256 8ef830b65c97a976b86e34bb5fde08d99dfb1db13c4149b5b20bc837ac6c4568 COPYING diff --git a/buildroot/package/fluid-soundfont/fluid-soundfont.mk b/buildroot/package/fluid-soundfont/fluid-soundfont.mk new file mode 100644 index 000000000..f8fd986ce --- /dev/null +++ b/buildroot/package/fluid-soundfont/fluid-soundfont.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# fluid-soundfont +# +################################################################################ + +FLUID_SOUNDFONT_VERSION = 3.1 +FLUID_SOUNDFONT_SOURCE = fluid-soundfont_$(FLUID_SOUNDFONT_VERSION).orig.tar.gz +# The http://www.hammersound.net archive site seems unreliable (show HTTP 500 +# error), and also publish the file in the sfArk format, which is inconvenient +# to be used in automated build. We use here the Debian mirror publishing the +# file in a more convenient format (inative sf2 in a tar.gz archive). +FLUID_SOUNDFONT_SITE = http://http.debian.net/debian/pool/main/f/fluid-soundfont +FLUID_SOUNDFONT_LICENSE = MIT +FLUID_SOUNDFONT_LICENSE_FILES = COPYING + +define FLUID_SOUNDFONT_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0644 $(@D)/FluidR3_GM.sf2 $(TARGET_DIR)/usr/share/soundfonts/FluidR3_GM.sf2 +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/fluidsynth/Config.in b/buildroot/package/fluidsynth/Config.in new file mode 100644 index 000000000..c1cb92348 --- /dev/null +++ b/buildroot/package/fluidsynth/Config.in @@ -0,0 +1,120 @@ +config BR2_PACKAGE_FLUIDSYNTH + bool "fluidsynth" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_LIBGLIB2 + help + FluidSynth is a real-time software synthesizer based on the + SoundFont 2 specifications and has reached widespread + distribution. FluidSynth itself does not have a graphical + user interface, but due to its powerful API several + applications utilize it and it has even found its way onto + embedded systems and is used in some mobile apps. + + http://www.fluidsynth.org/ + +if BR2_PACKAGE_FLUIDSYNTH + +comment "Output support" + +config BR2_PACKAGE_FLUIDSYNTH_ALSA_LIB + bool "alsa" + default y + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_RAWMIDI + select BR2_PACKAGE_ALSA_LIB_SEQ + help + Enable alsa support. + +comment "alsa support needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_FLUIDSYNTH_JACK2 + bool "jack2" + # See: https://sourceware.org/bugzilla/show_bug.cgi?id=19908 + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS + depends on BR2_TOOLCHAIN_HAS_THREADS # jack2 + depends on BR2_USE_MMU # jack2 + depends on BR2_INSTALL_LIBSTDCPP # jack2 + depends on !BR2_STATIC_LIBS # jack2 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # jack2 + select BR2_PACKAGE_JACK2 + help + Enable jack support. + +comment "jack support needs a toolchain w/ dynamic library, threads, C++" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_FLUIDSYNTH_LIBSNDFILE + bool "libsndfile" + select BR2_PACKAGE_LIBSNDFILE + help + Enable libsndfile support, for writing output to WAV files. + +config BR2_PACKAGE_FLUIDSYNTH_PORTAUDIO + bool "portaudio" + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_PORTAUDIO + help + Enable portaudio support. + +comment "portaudio support needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_FLUIDSYNTH_PULSEAUDIO + bool "pulseaudio" + # See: https://sourceware.org/bugzilla/show_bug.cgi?id=19908 + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS + depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC # pulseaudio + depends on BR2_USE_WCHAR # pulseaudio + depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio + depends on !BR2_STATIC_LIBS # pulseaudio + depends on BR2_USE_MMU # pulseaudio + select BR2_PACKAGE_PULSEAUDIO + help + Enable PulseAudio support. + +comment "pulseaudio support needs a toolchain w/ dynamic library, wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS + depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC + depends on BR2_STATIC_LIBS || !BR2_USE_MMU || !BR2_TOOLCHAIN_HAS_THREADS + +comment "Misc options" + +config BR2_PACKAGE_FLUIDSYNTH_DBUS + bool "dbus" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + select BR2_PACKAGE_DBUS + help + Enable dbus support. + +comment "dbus support needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_FLUIDSYNTH_FLOATS + bool "32-bit single precision float" + help + Enable 32-bit single precision float support, instead of + 64-bit double precision floats for DSP samples. + +config BR2_PACKAGE_FLUIDSYNTH_READLINE + bool "readline" + select BR2_PACKAGE_READLINE + help + Enable readline support, for better line editing in FluidSynth + shell. + +endif # BR2_PACKAGE_FLUIDSYNTH + +comment "fluidsynth needs a toolchain w/ threads, wchar" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/fluidsynth/fluidsynth.hash b/buildroot/package/fluidsynth/fluidsynth.hash new file mode 100644 index 000000000..f7c9c88cd --- /dev/null +++ b/buildroot/package/fluidsynth/fluidsynth.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 966d0393591b505d694e51cbf653387007144e9ae0b8705d82ec7d943d31d348 fluidsynth-2.1.1.tar.gz +sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/buildroot/package/fluidsynth/fluidsynth.mk b/buildroot/package/fluidsynth/fluidsynth.mk new file mode 100644 index 000000000..b06db23cc --- /dev/null +++ b/buildroot/package/fluidsynth/fluidsynth.mk @@ -0,0 +1,69 @@ +################################################################################ +# +# fluidsynth +# +################################################################################ + +FLUIDSYNTH_VERSION = 2.1.1 +FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) +FLUIDSYNTH_LICENSE = LGPL-2.1+ +FLUIDSYNTH_LICENSE_FILES = LICENSE +FLUIDSYNTH_INSTALL_STAGING = YES +FLUIDSYNTH_DEPENDENCIES = libglib2 + +ifeq ($(BR2_PACKAGE_FLUIDSYNTH_ALSA_LIB),y) +FLUIDSYNTH_CONF_OPTS += -Denable-alsa=1 +FLUIDSYNTH_DEPENDENCIES += alsa-lib +else +FLUIDSYNTH_CONF_OPTS += -Denable-alsa=0 +endif + +ifeq ($(BR2_PACKAGE_FLUIDSYNTH_DBUS),y) +FLUIDSYNTH_CONF_OPTS += -Denable-dbus=1 +FLUIDSYNTH_DEPENDENCIES += dbus +else +FLUIDSYNTH_CONF_OPTS += -Denable-dbus=0 +endif + +ifeq ($(BR2_PACKAGE_FLUIDSYNTH_FLOATS),y) +FLUIDSYNTH_CONF_OPTS += -Denable-floats=1 +else +FLUIDSYNTH_CONF_OPTS += -Denable-floats=0 +endif + +ifeq ($(BR2_PACKAGE_FLUIDSYNTH_JACK2),y) +FLUIDSYNTH_CONF_OPTS += -Denable-jack=1 +FLUIDSYNTH_DEPENDENCIES += jack2 +else +FLUIDSYNTH_CONF_OPTS += -Denable-jack=0 +endif + +ifeq ($(BR2_PACKAGE_FLUIDSYNTH_LIBSNDFILE),y) +FLUIDSYNTH_CONF_OPTS += -Denable-libsndfile=1 +FLUIDSYNTH_DEPENDENCIES += libsndfile +else +FLUIDSYNTH_CONF_OPTS += -Denable-libsndfile=0 +endif + +ifeq ($(BR2_PACKAGE_FLUIDSYNTH_PORTAUDIO),y) +FLUIDSYNTH_CONF_OPTS += -Denable-portaudio=1 +FLUIDSYNTH_DEPENDENCIES += portaudio +else +FLUIDSYNTH_CONF_OPTS += -Denable-portaudio=0 +endif + +ifeq ($(BR2_PACKAGE_FLUIDSYNTH_PULSEAUDIO),y) +FLUIDSYNTH_CONF_OPTS += -Denable-pulseaudio=1 +FLUIDSYNTH_DEPENDENCIES += pulseaudio +else +FLUIDSYNTH_CONF_OPTS += -Denable-pulseaudio=0 +endif + +ifeq ($(BR2_PACKAGE_FLUIDSYNTH_READLINE),y) +FLUIDSYNTH_CONF_OPTS += -Denable-readline=1 +FLUIDSYNTH_DEPENDENCIES += readline +else +FLUIDSYNTH_CONF_OPTS += -Denable-readline=0 +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/fluxbox/fluxbox.hash b/buildroot/package/fluxbox/fluxbox.hash index b18582b6c..f59423c3d 100644 --- a/buildroot/package/fluxbox/fluxbox.hash +++ b/buildroot/package/fluxbox/fluxbox.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0 fluxbox-1.3.7.tar.xz +sha256 d445b8c8b3cedd8b9ebb7f450524cf658d4a199b3a89a9f2af4255cc589c6253 COPYING diff --git a/buildroot/package/fmc/fmc.hash b/buildroot/package/fmc/fmc.hash index 13d9d77ee..d31bb5e79 100644 --- a/buildroot/package/fmc/fmc.hash +++ b/buildroot/package/fmc/fmc.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 a91e0c9b7c7f238634c64a755c05671f33f2acdb6ae2d09cad4d683b364ee8e4 fmc-fsl-sdk-v2.0.tar.gz +sha256 a91e0c9b7c7f238634c64a755c05671f33f2acdb6ae2d09cad4d683b364ee8e4 fmc-fsl-sdk-v2.0.tar.gz +sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 COPYING diff --git a/buildroot/package/fmlib/fmlib.hash b/buildroot/package/fmlib/fmlib.hash index 3746695db..9143ac2c3 100644 --- a/buildroot/package/fmlib/fmlib.hash +++ b/buildroot/package/fmlib/fmlib.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 e5870756c7432b15f7a48b860625808f3c95d5f7fa5e251552eb2324ca51b0fa fmlib-fsl-sdk-v2.0.tar.gz +sha256 e5870756c7432b15f7a48b860625808f3c95d5f7fa5e251552eb2324ca51b0fa fmlib-fsl-sdk-v2.0.tar.gz +sha256 837559e20d83910a005e7883b876cc5c42805fe4abcf7e5c5b3c8d036b7f61c8 COPYING diff --git a/buildroot/package/fmt/fmt.hash b/buildroot/package/fmt/fmt.hash index 78665d2fa..24d05e778 100644 --- a/buildroot/package/fmt/fmt.hash +++ b/buildroot/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44 fmt-5.1.0.tar.gz -sha256 560d39617dfb4b4e4088597291a070ed6c3a8d67668114ed475c673430c3e49a LICENSE.rst +sha256 1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365 fmt-6.1.2.tar.gz +sha256 825c9324e70f8c839c8ba910543dd4a7daee243b86ef960594c11381a19980b8 LICENSE.rst diff --git a/buildroot/package/fmt/fmt.mk b/buildroot/package/fmt/fmt.mk index 39fd7e22d..5dc3088e8 100644 --- a/buildroot/package/fmt/fmt.mk +++ b/buildroot/package/fmt/fmt.mk @@ -4,14 +4,13 @@ # ################################################################################ -FMT_VERSION = 5.1.0 +FMT_VERSION = 6.1.2 FMT_SITE = $(call github,fmtlib,fmt,$(FMT_VERSION)) -FMT_LICENSE = BSD-2-Clause +FMT_LICENSE = MIT with exception FMT_LICENSE_FILES = LICENSE.rst FMT_INSTALL_STAGING = YES FMT_CONF_OPTS = \ - -DHAVE_OPEN=ON \ -DFMT_INSTALL=ON \ -DFMT_TEST=OFF diff --git a/buildroot/package/fmtools/fmtools.hash b/buildroot/package/fmtools/fmtools.hash index 435cf0adc..48f88be5f 100644 --- a/buildroot/package/fmtools/fmtools.hash +++ b/buildroot/package/fmtools/fmtools.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 75174e07d8cde6d4a8a5d7bbaa3a3b0760a850e7f6840cb7c6246227b18f5a39 fmtools-2.0.7.tar.gz +sha256 75174e07d8cde6d4a8a5d7bbaa3a3b0760a850e7f6840cb7c6246227b18f5a39 fmtools-2.0.7.tar.gz +# locally computed +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/font-awesome/font-awesome.hash b/buildroot/package/font-awesome/font-awesome.hash index e266168ac..2ea11d5fe 100644 --- a/buildroot/package/font-awesome/font-awesome.hash +++ b/buildroot/package/font-awesome/font-awesome.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 de512ba0e1dead382bbfce372cde74b3f18971d876fffb635ee9333f0db05d43 font-awesome-v4.7.0.tar.gz +sha256 de512ba0e1dead382bbfce372cde74b3f18971d876fffb635ee9333f0db05d43 font-awesome-4.7.0.tar.gz diff --git a/buildroot/package/font-awesome/font-awesome.mk b/buildroot/package/font-awesome/font-awesome.mk index f39401041..666346be0 100644 --- a/buildroot/package/font-awesome/font-awesome.mk +++ b/buildroot/package/font-awesome/font-awesome.mk @@ -4,8 +4,8 @@ # ################################################################################ -FONT_AWESOME_VERSION = v4.7.0 -FONT_AWESOME_SITE = $(call github,FortAwesome,Font-Awesome,$(FONT_AWESOME_VERSION)) +FONT_AWESOME_VERSION = 4.7.0 +FONT_AWESOME_SITE = $(call github,FortAwesome,Font-Awesome,v$(FONT_AWESOME_VERSION)) FONT_AWESOME_LICENSE = OFL-1.1 (font), MIT (CSS, LESS and Sass files) FONT_AWESOME_DIRECTORIES_LIST = css fonts less scss diff --git a/buildroot/package/fontconfig/fontconfig.hash b/buildroot/package/fontconfig/fontconfig.hash index 5243c0961..153f00c3d 100644 --- a/buildroot/package/fontconfig/fontconfig.hash +++ b/buildroot/package/fontconfig/fontconfig.hash @@ -1,2 +1,5 @@ # From https://lists.freedesktop.org/archives/fontconfig/2018-August/006324.html sha256 f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 fontconfig-2.13.1.tar.bz2 + +# Locally calculated +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 COPYING diff --git a/buildroot/package/fping/fping.hash b/buildroot/package/fping/fping.hash index e97709ca1..0aa0330b5 100644 --- a/buildroot/package/fping/fping.hash +++ b/buildroot/package/fping/fping.hash @@ -1,2 +1,5 @@ # Locally calculated -sha256 67eb4152b98ad34f99d2eec4e1098a0bb52caf13c0c89cd147349d08190fe8ce fping-4.0.tar.gz +sha256 7d339674b6a95aae1d8ad487ff5056fd95b474c3650938268f6a905c3771b64a fping-4.2.tar.gz + +# Hash for license file +sha256 6051b27e4b4a648f7bc8b329024da53a6e95ce88fcf0ccc259c371a74b741757 COPYING diff --git a/buildroot/package/fping/fping.mk b/buildroot/package/fping/fping.mk index 5af46c67f..5d3ad59e5 100644 --- a/buildroot/package/fping/fping.mk +++ b/buildroot/package/fping/fping.mk @@ -4,7 +4,7 @@ # ################################################################################ -FPING_VERSION = 4.0 +FPING_VERSION = 4.2 FPING_SITE = http://fping.org/dist FPING_LICENSE = BSD-like FPING_LICENSE_FILES = COPYING diff --git a/buildroot/package/freeradius-client/freeradius-client.hash b/buildroot/package/freeradius-client/freeradius-client.hash index 5931ac2b0..e343b3a4a 100644 --- a/buildroot/package/freeradius-client/freeradius-client.hash +++ b/buildroot/package/freeradius-client/freeradius-client.hash @@ -1,2 +1,3 @@ # Locally computed sha256 eada2861b8f4928e3ac6b5bbfe11e92cd6cdcacfce40cae1085e77c1b6add0e9 freeradius-client-1.1.7.tar.gz +sha256 e579878de7971b2224ae2263bbc61f6c465fe40e884a9068d5fa9d17fbfd2ebe COPYRIGHT diff --git a/buildroot/package/freerdp/Config.in b/buildroot/package/freerdp/Config.in index 59bc18b67..5705ce0e0 100644 --- a/buildroot/package/freerdp/Config.in +++ b/buildroot/package/freerdp/Config.in @@ -28,36 +28,18 @@ config BR2_PACKAGE_FREERDP if BR2_PACKAGE_FREERDP -choice - bool "gstreamer support" - depends on BR2_PACKAGE_XORG7 # xlib-libxrandr - depends on BR2_PACKAGE_GSTREAMER || BR2_PACKAGE_GSTREAMER1 - config BR2_PACKAGE_FREERDP_GSTREAMER1 - bool "gstreamer-1.x" + bool "gstreamer support" depends on BR2_PACKAGE_GSTREAMER1 + depends on BR2_PACKAGE_XORG7 # xlib-libxrandr # gstreamer-1.x dependencies already dependencies of FreeRDP select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP select BR2_PACKAGE_XLIB_LIBXRANDR -config BR2_PACKAGE_FREERDP_GSTREAMER - bool "gstreamer-0.x" - depends on BR2_PACKAGE_GSTREAMER - # gstreamer-0.x dependencies already dependencies of FreeRDP - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_LIBXML2 - -config BR2_PACKAGE_FREERDP_GSTREAMER_NO - bool "none" - -endchoice - comment "gstreamer support needs X.Org" depends on !BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_GSTREAMER || BR2_PACKAGE_GSTREAMER1 + depends on BR2_PACKAGE_GSTREAMER1 config BR2_PACKAGE_FREERDP_SERVER bool "server" diff --git a/buildroot/package/freerdp/freerdp.mk b/buildroot/package/freerdp/freerdp.mk index 293b6b5c0..a477e74cb 100644 --- a/buildroot/package/freerdp/freerdp.mk +++ b/buildroot/package/freerdp/freerdp.mk @@ -12,14 +12,7 @@ FREERDP_LICENSE_FILES = LICENSE FREERDP_INSTALL_STAGING = YES -FREERDP_CONF_OPTS = -DWITH_MANPAGES=OFF -Wno-dev - -ifeq ($(BR2_PACKAGE_FREERDP_GSTREAMER),y) -FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON -FREERDP_DEPENDENCIES += gstreamer gst-plugins-base libxml2 -else -FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF -endif +FREERDP_CONF_OPTS = -DWITH_MANPAGES=OFF -Wno-dev -DWITH_GSTREAMER_0_10=OFF ifeq ($(BR2_PACKAGE_FREERDP_GSTREAMER1),y) FREERDP_CONF_OPTS += -DWITH_GSTREAMER_1_0=ON diff --git a/buildroot/package/freescale-imx/Config.in b/buildroot/package/freescale-imx/Config.in index 95c0aab08..711e8f72c 100644 --- a/buildroot/package/freescale-imx/Config.in +++ b/buildroot/package/freescale-imx/Config.in @@ -40,8 +40,17 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 bool "imx7d/imx7ulp" +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + bool "imx8" + config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M bool "imx8m" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM + bool "imx8mm" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + bool "imx8x" endchoice config BR2_PACKAGE_FREESCALE_IMX_PLATFORM @@ -56,6 +65,7 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM default "IMX6S" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S default "IMX6UL" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL default "IMX7" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 + default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU @@ -74,7 +84,10 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X source "package/freescale-imx/imx-alsa-plugins/Config.in" source "package/freescale-imx/imx-codec/Config.in" @@ -87,6 +100,7 @@ source "package/freescale-imx/imx-vpu/Config.in" source "package/freescale-imx/imx-vpu-hantro/Config.in" source "package/freescale-imx/imx-vpuwrap/Config.in" source "package/freescale-imx/firmware-imx/Config.in" +source "package/freescale-imx/imx-sc-firmware/Config.in" if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53) source "package/freescale-imx/gpu-amd-bin-mx51/Config.in" source "package/freescale-imx/libz160/Config.in" diff --git a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash index c22ee4c19..85f203311 100644 --- a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash +++ b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 a8f099bdf786b2da1e8b43094950c033ccdbf93f1b8a93caffb912e1500cd735 firmware-imx-7.5.bin -sha256 fc93f26e4197b9240c327ce26ae6e02123f022423d4704c7b0448a37372cf2a2 EULA -sha256 78696664f7afe7f2b081c99af60082d6403fab935b1b10056ed41aec123ff7fa COPYING +sha256 c115d5d0d115fc14754671bd2428f672f9f99677988588accef2fbca2c3f749c firmware-imx-8.1.1.bin +sha256 69d19847bac9af7f9e832170a15138f5ef144d8064413434114d75a68982cc9c EULA +sha256 6467f2e81d06b19fe541de49bdba32a9a205e8d1c230220fe24247b48672cb46 COPYING diff --git a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk index f9db09dae..b251fcda2 100644 --- a/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIRMWARE_IMX_VERSION = 7.5 +FIRMWARE_IMX_VERSION = 8.1.1 FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin @@ -18,7 +18,7 @@ define FIRMWARE_IMX_EXTRACT_CMDS $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M),y) +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM),y) FIRMWARE_IMX_INSTALL_IMAGES = YES FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys define FIRMWARE_IMX_PREPARE_LPDDR4_FW @@ -45,6 +45,20 @@ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS cp $(@D)/firmware/hdmi/cadence/signed_hdmi_imx8m.bin \ $(BINARIES_DIR)/signed_hdmi_imx8m.bin endef +else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) +FIRMWARE_IMX_INSTALL_IMAGES = YES +define FIRMWARE_IMX_INSTALL_IMAGES_CMDS + # SECO firmware is needed when generating imx8-boot-sd.bin which + # is done in post-image script. + cp $(@D)/firmware/seco/mx8qx-ahab-container.img \ + $(BINARIES_DIR)/ahab-container.img +endef +define FIRMWARE_IMX_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_dec.bin \ + $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_dec.bin + $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_enc.bin \ + $(TARGET_DIR)/lib/firmware/vpu/vpu_fw_imx8_enc.bin +endef else define FIRMWARE_IMX_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/lib/firmware/imx diff --git a/buildroot/package/freescale-imx/imx-gpu-g2d/Config.in b/buildroot/package/freescale-imx/imx-gpu-g2d/Config.in index 47375788d..aeca087f8 100644 --- a/buildroot/package/freescale-imx/imx-gpu-g2d/Config.in +++ b/buildroot/package/freescale-imx/imx-gpu-g2d/Config.in @@ -2,10 +2,14 @@ comment "imx-gpu-g2d needs a glibc toolchain with armhf enabled" depends on BR2_arm depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF +comment "imx-gpu-g2d needs a glibc toolchain" + depends on BR2_aarch64 + depends on !BR2_TOOLCHAIN_USES_GLIBC + config BR2_PACKAGE_IMX_GPU_G2D bool "imx-gpu-g2d" # Pre-built binaries only available for ARM EABIhf - depends on BR2_ARM_EABIHF + depends on (BR2_arm && BR2_ARM_EABIHF) || BR2_aarch64 # Library binaries are linked against libc.so.6 depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_IMX_GPU_VIV diff --git a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash index 3bcbc558e..8ecfbfe40 100644 --- a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash +++ b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash @@ -1 +1,5 @@ -sha256 5f2d2171d5cd57f37ab07184fc908a0f6ecb2a97f023f04c2f9f3b3d7fec8481 imx-gpu-g2d-6.2.4.p1.2.bin +# Locally calculated +sha256 6d6d02d035d988cbdb2014794f2efe970a3f5ac277202882bbf553bb7fd789d2 imx-gpu-g2d-6.4.0.p1.0-aarch32.bin +sha256 35885f435dbe951d2c0f439a376ed8a59a50b67a1b7e1e14fa2ab03995abb1ad imx-gpu-g2d-6.4.0.p1.0-aarch64.bin +sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING +sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA diff --git a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index 015ab628b..6598e4c32 100644 --- a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -4,7 +4,11 @@ # ################################################################################ -IMX_GPU_G2D_VERSION = 6.2.4.p1.2 +ifeq ($(BR2_aarch64),y) +IMX_GPU_G2D_VERSION = 6.4.0.p1.0-aarch64 +else +IMX_GPU_G2D_VERSION = 6.4.0.p1.0-aarch32 +endif IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin IMX_GPU_G2D_DEPENDENCIES = imx-gpu-viv diff --git a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index 2cbc36a18..1a67b53ac 100644 --- a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1,2 +1,5 @@ -sha256 dddadd164bede4793409ccfb636324dd73862c33458db66a5860f126bada25dc imx-gpu-viv-6.2.4.p1.2-aarch32.bin -sha256 27ed3f58681cef18f87ea20946cc89b2cef4848006064303d20583e6ed7aeec7 imx-gpu-viv-6.2.4.p1.2-aarch64.bin +# Locally calculated +sha256 b5c94b56a9f7c84aa084603a6ca21b5f3941b400e4f6ee8558b58c9b9f1aab36 imx-gpu-viv-6.4.0.p1.0-aarch32.bin +sha256 45852a5c3c61a9215a2ffb7387a6e1cce7ddac6f12513fc77459ad7e1f1b3a27 imx-gpu-viv-6.4.0.p1.0-aarch64.bin +sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING +sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA diff --git a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index d2a9fad45..646d4e367 100644 --- a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_VIV_VERSION = 6.2.4.p1.2-aarch64 +IMX_GPU_VIV_VERSION = 6.4.0.p1.0-aarch64 else -IMX_GPU_VIV_VERSION = 6.2.4.p1.2-aarch32 +IMX_GPU_VIV_VERSION = 6.4.0.p1.0-aarch32 endif IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin @@ -42,9 +42,12 @@ endef # Make sure these commands are idempotent. define IMX_GPU_VIV_BUILD_CMDS $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/gpu-core/usr/include/*/*.h - ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so - ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1 - ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1.2.0 + $(if $(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11)$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL), + ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so + ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so.1 + ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so.1.2 + ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so.1.2.0 + ) ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1 ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1.0 diff --git a/buildroot/package/freescale-imx/imx-kobs/imx-kobs.hash b/buildroot/package/freescale-imx/imx-kobs/imx-kobs.hash index 2ede0a9b4..39f02ea04 100644 --- a/buildroot/package/freescale-imx/imx-kobs/imx-kobs.hash +++ b/buildroot/package/freescale-imx/imx-kobs/imx-kobs.hash @@ -1 +1,3 @@ -sha256 5855c8964f908ad30e5d4500180ee57c51af68186289ef1bdf8553ee60d3b1f5 imx-kobs-a0e9adce2fb7fcd57e794d7f9a5deba0f94f521b.tar.gz +# Locally computed +sha256 5855c8964f908ad30e5d4500180ee57c51af68186289ef1bdf8553ee60d3b1f5 imx-kobs-a0e9adce2fb7fcd57e794d7f9a5deba0f94f521b.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/freescale-imx/imx-lib/imx-lib.hash b/buildroot/package/freescale-imx/imx-lib/imx-lib.hash index abbf01745..c16dc7f9a 100644 --- a/buildroot/package/freescale-imx/imx-lib/imx-lib.hash +++ b/buildroot/package/freescale-imx/imx-lib/imx-lib.hash @@ -1,2 +1,3 @@ # locally computed -sha256 ced5ad0a179887ef1dd93e8103a9ab7372017cc1c241d28cded164cdece4b918 imx-lib-3f777974c0c146817e2ff5cb0340ca66a1f99e57.tar.gz +sha256 ced5ad0a179887ef1dd93e8103a9ab7372017cc1c241d28cded164cdece4b918 imx-lib-3f777974c0c146817e2ff5cb0340ca66a1f99e57.tar.gz +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING-LGPL-2.1 diff --git a/buildroot/package/freescale-imx/imx-sc-firmware/Config.in b/buildroot/package/freescale-imx/imx-sc-firmware/Config.in new file mode 100644 index 000000000..4932e62dd --- /dev/null +++ b/buildroot/package/freescale-imx/imx-sc-firmware/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_IMX_SC_FIRMWARE + bool "imx-sc-firmware" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + help + System Control Unit Firmware blobs for the Freescale i.MX8 + SoCs. + + This library is provided by Freescale as-is and doesn't have + an upstream. diff --git a/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash new file mode 100644 index 000000000..013201911 --- /dev/null +++ b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 c7b8fe249ba529d85bfe8540e073b73e4fcdf65ee56022c319e53e0065ff1549 imx-sc-firmware-1.2.1.bin +sha256 69d19847bac9af7f9e832170a15138f5ef144d8064413434114d75a68982cc9c EULA +sha256 6467f2e81d06b19fe541de49bdba32a9a205e8d1c230220fe24247b48672cb46 COPYING diff --git a/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk new file mode 100644 index 000000000..6a768ea10 --- /dev/null +++ b/buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# imx-sc-firmware +# +################################################################################ + +IMX_SC_FIRMWARE_VERSION = 1.2.1 +IMX_SC_FIRMWARE_SITE = $(FREESCALE_IMX_SITE) +IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION).bin + +IMX_SC_FIRMWARE_LICENSE = NXP Semiconductor Software License Agreement +IMX_SC_FIRMWARE_LICENSE_FILES = EULA COPYING +IMX_SC_FIRMWARE_REDISTRIBUTE = NO + +define IMX_SC_FIRMWARE_EXTRACT_CMDS + $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SC_FIRMWARE_DL_DIR)/$(IMX_SC_FIRMWARE_SOURCE)) +endef + +IMX_SC_FIRMWARE_INSTALL_IMAGES = YES + +# SCFW firmware is needed when generating imx8-boot-sd.bin which is +# done in post-image script. +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) +define IMX_SC_FIRMWARE_INSTALL_IMAGES_CMDS + cp $(@D)/mx8qx-mek-scfw-tcm.bin $(BINARIES_DIR)/mx8qx-mek-scfw-tcm.bin + cp $(@D)/mx8qx-val-scfw-tcm.bin $(BINARIES_DIR)/mx8qx-val-scfw-tcm.bin +endef +else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y) +define IMX_SC_FIRMWARE_INSTALL_IMAGES_CMDS + cp $(@D)/mx8qm-*-scfw-tcm.bin $(BINARIES_DIR)/ +endef +endif + +$(eval $(generic-package)) diff --git a/buildroot/package/freescale-imx/imx-uuc/imx-uuc.hash b/buildroot/package/freescale-imx/imx-uuc/imx-uuc.hash index 623bd2764..57a509859 100644 --- a/buildroot/package/freescale-imx/imx-uuc/imx-uuc.hash +++ b/buildroot/package/freescale-imx/imx-uuc/imx-uuc.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 ac4960b9dc53cfd09709951c4bf1f774567ff0918d0b216b480e1f7df8c6ee48 imx-uuc-79e9798eee9cd972d92ed2b18f170de856d153c9.tar.gz +sha256 2784e0826074335893fdad20e9a4faaedced2f206565c383043fbd169e9273a4 imx-uuc-fc48b497fe961d601b4bcced807f562090854ec9.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/freescale-imx/imx-uuc/imx-uuc.mk b/buildroot/package/freescale-imx/imx-uuc/imx-uuc.mk index e94648b83..2ed910cb8 100644 --- a/buildroot/package/freescale-imx/imx-uuc/imx-uuc.mk +++ b/buildroot/package/freescale-imx/imx-uuc/imx-uuc.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_UUC_VERSION = 79e9798eee9cd972d92ed2b18f170de856d153c9 +IMX_UUC_VERSION = fc48b497fe961d601b4bcced807f562090854ec9 IMX_UUC_SITE = $(call github,NXPmicro,imx-uuc,$(IMX_UUC_VERSION)) IMX_UUC_LICENSE = GPL-2.0+ IMX_UUC_LICENSE_FILES = COPYING @@ -33,9 +33,6 @@ endef define IMX_UUC_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/freescale-imx/imx-uuc/imx-uuc.service \ $(TARGET_DIR)/usr/lib/systemd/system/imx-uuc.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ - ln -fs ../../../../usr/lib/systemd/system/imx-uuc.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/imx-uuc.service endef $(eval $(generic-package)) diff --git a/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash index 3ed7ca2dd..19341db6b 100644 --- a/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash +++ b/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash @@ -1,2 +1,3 @@ # locally computed -sha256 ad910b7d36dc433bbbe85808d278312e9199635aaa5d00097b70ffab11bde9e6 kernel-module-imx-gpu-viv-86354002bea77acd9ce1812712e9d8485b377ec8.tar.gz +sha256 ad910b7d36dc433bbbe85808d278312e9199635aaa5d00097b70ffab11bde9e6 kernel-module-imx-gpu-viv-86354002bea77acd9ce1812712e9d8485b377ec8.tar.gz +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/buildroot/package/freescale-imx/libz160/libz160.hash b/buildroot/package/freescale-imx/libz160/libz160.hash index ee10630fd..75f266e3c 100644 --- a/buildroot/package/freescale-imx/libz160/libz160.hash +++ b/buildroot/package/freescale-imx/libz160/libz160.hash @@ -1,2 +1,3 @@ # locally computed sha256 08767eb269a0a30ca0aa3d3b5aa9a53a2d17ed1c24651b7e8cefc7704b883f19 libz160-bin-11.09.01.bin +sha256 6d7a2fefc2f7ce888f9eb74919b852aed5a1087b2e84345be90cadbebe1b6578 EULA diff --git a/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash b/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash index 475556ebe..a863dbfcf 100644 --- a/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash +++ b/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0dec5b78f655e175936806396b89b4997c8e543a1c84683a19ea2b6f36e01d7e freeswitch-mod-bcg729-v1.0.4.tar.gz +sha256 0dec5b78f655e175936806396b89b4997c8e543a1c84683a19ea2b6f36e01d7e freeswitch-mod-bcg729-1.0.4.tar.gz sha256 bb4680b13c3190429464a8308a07d7d891e6454349fb7be856e02405b25b1195 LICENSE diff --git a/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk b/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk index 98324b2a0..f92a49005 100644 --- a/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk +++ b/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk @@ -4,8 +4,8 @@ # ################################################################################ -FREESWITCH_MOD_BCG729_VERSION = v1.0.4 -FREESWITCH_MOD_BCG729_SITE = $(call github,xadhoom,mod_bcg729,$(FREESWITCH_MOD_BCG729_VERSION)) +FREESWITCH_MOD_BCG729_VERSION = 1.0.4 +FREESWITCH_MOD_BCG729_SITE = $(call github,xadhoom,mod_bcg729,v$(FREESWITCH_MOD_BCG729_VERSION)) FREESWITCH_MOD_BCG729_LICENSE = MPL-1.1 FREESWITCH_MOD_BCG729_LICENSE_FILES = LICENSE FREESWITCH_MOD_BCG729_DEPENDENCIES = freeswitch bcg729 diff --git a/buildroot/package/freeswitch/0001-Fix-cross-compiling-libvpx.patch b/buildroot/package/freeswitch/0001-Fix-cross-compiling-libvpx.patch deleted file mode 100644 index 1d4b97a7a..000000000 --- a/buildroot/package/freeswitch/0001-Fix-cross-compiling-libvpx.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix cross-compiling libvpx - -Freeswitch since version 1.6.7 only uses an in-tree-version of libvpx: -https://freeswitch.org/fisheye/changelog/freeswitch?cs=febe0f8dacea2d2a31902b3dc469be757f8c3c4d - -It is not possible to use an external version of libvpx anymore. -Unfortunately the freeswitch build system has no support for cross- -compiling libvpx so we need to patch Makefile to pass CROSS from -package/freeswitch/freeswitch.mk and add target=generic-gnu as -configure parameter: -https://freeswitch.org/stash/projects/FS/repos/freeswitch/browse/libs/libvpx/README#110 - -And yes, autoreconf is also broken, so we patch Makefile.in instead -of Makefile.am. - -Signed-off-by: Bernd Kuhls - -diff -uNr freeswitch-1.6.7.org/Makefile.in freeswitch-1.6.7/Makefile.in ---- freeswitch-1.6.7.org/Makefile.in 2016-04-01 18:09:54.000000000 +0200 -+++ freeswitch-1.6.7/Makefile.in 2016-04-22 20:11:37.938961730 +0200 -@@ -4025,7 +4025,7 @@ - cd libs/libzrtp && $(MAKE) - - libs/libvpx/Makefile: -- cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --size-limit=16384x16384 --extra-cflags="$(VISIBILITY_FLAG)" -+ cd libs/libvpx && CROSS=$(CROSS) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --size-limit=16384x16384 --extra-cflags="$(VISIBILITY_FLAG)" - - libs/libvpx/libvpx.a: libs/libvpx/Makefile - @cd libs/libvpx && $(MAKE) diff --git a/buildroot/package/freeswitch/freeswitch.hash b/buildroot/package/freeswitch/freeswitch.hash index 1c5de7bcc..f300e69bf 100644 --- a/buildroot/package/freeswitch/freeswitch.hash +++ b/buildroot/package/freeswitch/freeswitch.hash @@ -1,11 +1,12 @@ -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.8.6.tar.xz.md5 -md5 cadec07057786cfb0bb805edc279d752 freeswitch-1.8.6.tar.xz -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.8.6.tar.xz.sha1 -sha1 c6eb7de942a61604774ca08ac8070244b7c3167a freeswitch-1.8.6.tar.xz -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.8.6.tar.xz.sha256 -sha256 b87f47e57d13de2b901bd1e4eb85491178e59a159a2831d7430abe7947f0d3a4 freeswitch-1.8.6.tar.xz +# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.2.tar.xz.md5 +md5 89d66f87f0f6c2471aa95aee48f55fdc freeswitch-1.10.2.-release.tar.xz +# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.2.tar.xz.sha1 +sha1 90dac82cb4fb8fc11e399fd4bdac7163fb40259b freeswitch-1.10.2.-release.tar.xz +# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.2.tar.xz.sha256 +sha256 1fd46dee82ecc52ac90ebab6bd454e34c64950fae7d6dc0589c8daa14bfc7d34 freeswitch-1.10.2.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING +sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/apr-util/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE diff --git a/buildroot/package/freeswitch/freeswitch.mk b/buildroot/package/freeswitch/freeswitch.mk index 8c0c7fb11..5985df4a6 100644 --- a/buildroot/package/freeswitch/freeswitch.mk +++ b/buildroot/package/freeswitch/freeswitch.mk @@ -4,9 +4,9 @@ # ################################################################################ -FREESWITCH_VERSION = 1.8.6 -FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz -FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases +FREESWITCH_VERSION = 1.10.2 +FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz +FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging FREESWITCH_INSTALL_STAGING = YES FREESWITCH_LICENSE = MPL-1.1, \ @@ -164,7 +164,7 @@ FREESWITCH_PRE_CONFIGURE_HOOKS += FREESWITCH_ENABLE_MODULES # mod_isac supports a limited set of archs # src/mod/codecs/mod_isac/typedefs.h ifeq ($(BR2_i386)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_x86_64),y) -FREESWITCH_LICENSE := $(FREESWITCH_LICENSE), BSD-3-Clause (mod_isac) +FREESWITCH_LICENSE += , BSD-3-Clause (mod_isac) FREESWITCH_LICENSE_FILES += src/mod/codecs/mod_isac/LICENSE FREESWITCH_ENABLED_MODULES += codecs/mod_isac endif @@ -220,6 +220,13 @@ FREESWITCH_DEPENDENCIES += libmemcached FREESWITCH_ENABLED_MODULES += applications/mod_memcache endif +ifeq ($(BR2_PACKAGE_LIBOPENH264),y) +FREESWITCH_LICENSE += , BSD-2-Clause (libopenh264) +FREESWITCH_LICENSE_FILES += docs/OPENH264_BINARY_LICENSE.txt +FREESWITCH_DEPENDENCIES += libopenh264 +FREESWITCH_ENABLED_MODULES += codecs/mod_openh264 +endif + ifeq ($(BR2_PACKAGE_LIBPNG),y) FREESWITCH_DEPENDENCIES += libpng FREESWITCH_ENABLED_MODULES += formats/mod_png @@ -278,12 +285,8 @@ endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) FREESWITCH_CONF_ENV += \ ac_cv_path_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config -FREESWITCH_CONF_OPTS += \ - --enable-core-pgsql-pkgconfig \ - --enable-core-pgsql-support FREESWITCH_DEPENDENCIES += postgresql -else -FREESWITCH_CONF_OPTS += --disable-core-pgsql-support +FREESWITCH_ENABLED_MODULES += databases/mod_pgsql endif ifeq ($(BR2_PACKAGE_UNIXODBC),y) @@ -300,12 +303,45 @@ FREESWITCH_DEPENDENCIES += xz endif ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8)$(BR2_PACKAGE_FFMPEG),yy) -FREESWITCH_LICENSE := $(FREESWITCH_LICENSE), BSD-3-Clause (libvpx, libyuv) +FREESWITCH_LICENSE += , BSD-3-Clause (libvpx, libyuv) FREESWITCH_LICENSE_FILES += libs/libvpx/LICENSE libs/libyuv/LICENSE FREESWITCH_CONF_OPTS += --enable-libvpx --enable-libyuv FREESWITCH_DEPENDENCIES += host-yasm ffmpeg FREESWITCH_ENABLED_MODULES += applications/mod_av applications/mod_fsv FREESWITCH_MAKE_ENV += CROSS=$(TARGET_CROSS) + +# Freeswitch's buildsystem forgets to pass important environment +# variables and config options when it configures libvpx, so +# pre-build libvpx manually, so Freeswitch does not attempt to run +# its flawed commands... +# Freeswitch only ever uses the static libtrary, that's hard-coded, +# we can't do anything about that... +# From package/libvpx/libvpx.mk: +# - this is not a true autotools package. It is based on the ffmpeg +# build system. +# - ld is being used with cc options. therefore, pretend ld is cc. +define FREESWITCH_BUILD_LIBVPX + cd $(@D)/libs/libvpx && \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + LD="$(TARGET_CC)" \ + CROSS=$(GNU_TARGET_NAME) \ + ./configure \ + --target=generic-gnu \ + --enable-pic \ + --prefix=/usr \ + --disable-shared --enable-static \ + --disable-examples \ + --disable-docs \ + --disable-unit-tests && \ + $(TARGET_MAKE_ENV) \ + $(LIBVPX_MAKE_ENV) \ + $(MAKE) \ + -C $(@D)/libs/libvpx \ + all +endef +FREESWITCH_PRE_BUILD_HOOKS += FREESWITCH_BUILD_LIBVPX + else FREESWITCH_CONF_OPTS += --disable-libvpx --disable-libyuv endif diff --git a/buildroot/package/freetype/freetype.hash b/buildroot/package/freetype/freetype.hash index c98674c7c..c4e75c327 100644 --- a/buildroot/package/freetype/freetype.hash +++ b/buildroot/package/freetype/freetype.hash @@ -1,9 +1,9 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.9.1/ -md5 60ef7d8160cd4bf8cb118ee9d65367ca freetype-2.9.1.tar.bz2 -sha1 220c82062171c513e4017c523d196933c9de4a7d freetype-2.9.1.tar.bz2 +# From https://sourceforge.net/projects/freetype/files/freetype2/2.10.1/ +md5 bd42e75127f8431923679480efb5ba8f freetype-2.10.1.tar.xz +sha1 79874ef4eaa52025126b71d836453b8279bdd331 freetype-2.10.1.tar.xz # Locally calculated -sha256 db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d freetype-2.9.1.tar.bz2 +sha256 16dbfa488a21fe827dc27eaf708f42f7aa3bb997d745d31a19781628c36ba26f freetype-2.10.1.tar.xz sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/buildroot/package/freetype/freetype.mk b/buildroot/package/freetype/freetype.mk index 716706156..8b3a4ca09 100644 --- a/buildroot/package/freetype/freetype.mk +++ b/buildroot/package/freetype/freetype.mk @@ -4,8 +4,8 @@ # ################################################################################ -FREETYPE_VERSION = 2.9.1 -FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 +FREETYPE_VERSION = 2.10.1 +FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" diff --git a/buildroot/package/fstrcmp/0001-disable-rpath.patch b/buildroot/package/fstrcmp/0001-disable-rpath.patch new file mode 100644 index 000000000..cec57e7e9 --- /dev/null +++ b/buildroot/package/fstrcmp/0001-disable-rpath.patch @@ -0,0 +1,25 @@ +Remove rpath from linking command + +Fixes build error: + +lib/.libs/libfstrcmp.so: undefined reference to `__ctype_b_loc@GLIBC_2.3' +lib/.libs/libfstrcmp.so: undefined reference to `mbstowcs@GLIBC_2.2.5' +lib/.libs/libfstrcmp.so: undefined reference to `printf@GLIBC_2.2.5' +lib/.libs/libfstrcmp.so: undefined reference to `readlink@GLIBC_2.2.5' +lib/.libs/libfstrcmp.so: undefined reference to `malloc@GLIBC_2.2.5' +lib/.libs/libfstrcmp.so: undefined reference to `memcmp@GLIBC_2.2.5' +lib/.libs/libfstrcmp.so: undefined reference to `wcslen@GLIBC_2.2.5' + +Signed-off-by: Bernd Kuhls + +--- fstrcmp-0.7.D001/Makefile.in.orig 2014-03-05 01:13:45.000000000 +0100 ++++ fstrcmp-0.7.D001/Makefile.in 2019-04-07 13:55:07.817689231 +0200 +@@ -507,7 +507,7 @@ + lib/libfstrcmp.la: $(lib_obj) + rm -f $@ + $(LIBTOOL) --mode=link --tag=CC $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \ +- -o $@ $(lib_obj) $(LIBS) -rpath $(libdir) -version-info 6:0:6 ++ -o $@ $(lib_obj) $(LIBS) -version-info 6:0:6 + + # + # The install of the *.la file automatically causes "$(LIBTOOL) --mode=install" diff --git a/buildroot/package/fstrcmp/Config.in b/buildroot/package/fstrcmp/Config.in new file mode 100644 index 000000000..04f11b0f9 --- /dev/null +++ b/buildroot/package/fstrcmp/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_FSTRCMP + bool "fstrcmp" + depends on BR2_USE_WCHAR + help + The fstrcmp project provides a library that is used to make + fuzzy comparisons of strings and byte arrays, including multi- + byte character strings. + + http://fstrcmp.sourceforge.net/ + +comment "fstrcmp needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR diff --git a/buildroot/package/fstrcmp/fstrcmp.hash b/buildroot/package/fstrcmp/fstrcmp.hash new file mode 100644 index 000000000..9a43c59c0 --- /dev/null +++ b/buildroot/package/fstrcmp/fstrcmp.hash @@ -0,0 +1,6 @@ +# From https://sourceforge.net/projects/fstrcmp/files/fstrcmp/0.7/ +md5 9c440bbdfcad9fd22e38f2388715b0cc fstrcmp-0.7.D001.tar.gz +sha1 bb848118fb157dc624ae9fac0566a64cc85f2ef2 fstrcmp-0.7.D001.tar.gz +# Locally computed +sha256 e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476 fstrcmp-0.7.D001.tar.gz +sha256 5352e426b563eda9252d76be92337b49f7b5cfdd1302a1e8d99389840c0e46be LICENSE diff --git a/buildroot/package/fstrcmp/fstrcmp.mk b/buildroot/package/fstrcmp/fstrcmp.mk new file mode 100644 index 000000000..9c42159af --- /dev/null +++ b/buildroot/package/fstrcmp/fstrcmp.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# fstrcmp +# +################################################################################ + +FSTRCMP_VERSION_MAJOR = 0.7 +FSTRCMP_VERSION = $(FSTRCMP_VERSION_MAJOR).D001 +FSTRCMP_SITE = https://sourceforge.net/projects/fstrcmp/files/fstrcmp/$(FSTRCMP_VERSION_MAJOR) +FSTRCMP_LICENSE = GPL-3.0+ +FSTRCMP_LICENSE_FILES = LICENSE +FSTRCMP_INSTALL_STAGING = YES +FSTRCMP_DEPENDENCIES = host-libtool +FSTRCMP_CONF_ENV = LIBTOOL="$(HOST_DIR)/bin/libtool" + +FSTRCMP_MAKE_OPTS = all-bin libdir/pkgconfig/fstrcmp.pc + +# We need to install the package files ourselves due to upstream trying +# to install a .lai file which is missing because of rpath removal +define FSTRCMP_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install-include + $(INSTALL) -D -m 755 $(@D)/lib/.libs/libfstrcmp.a $(STAGING_DIR)/usr/lib/libfstrcmp.a + $(INSTALL) -D -m 755 $(@D)/lib/libfstrcmp.la $(STAGING_DIR)/usr/lib/libfstrcmp.la + $(INSTALL) -D -m 755 $(@D)/libdir/pkgconfig/fstrcmp.pc $(STAGING_DIR)/usr/lib/pkgconfig/fstrcmp.pc +endef + +define FSTRCMP_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/bin/fstrcmp $(TARGET_DIR)/usr/bin/fstrcmp +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/fswebcam/fswebcam.hash b/buildroot/package/fswebcam/fswebcam.hash index 1e75f237e..28f604547 100644 --- a/buildroot/package/fswebcam/fswebcam.hash +++ b/buildroot/package/fswebcam/fswebcam.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 444d6a8a82102e09e935540c64a731021de36db03e1e74181f41ca6f39aa6474 fswebcam-20140113.tar.xz +sha256 444d6a8a82102e09e935540c64a731021de36db03e1e74181f41ca6f39aa6474 fswebcam-20140113.tar.xz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/buildroot/package/ftop/ftop.hash b/buildroot/package/ftop/ftop.hash index ca8dc827e..cf0d99dbe 100644 --- a/buildroot/package/ftop/ftop.hash +++ b/buildroot/package/ftop/ftop.hash @@ -3,3 +3,4 @@ md5 57c68b6e7431f4219d9eddaebcb395da ftop-1.0.tar.bz2 sha1 d3ef1b74825f50c7c442d299b29d23c2478f199b ftop-1.0.tar.bz2 # Locally computed sha256 3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82 ftop-1.0.tar.bz2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/fwts/0001-build-do-not-use-Werror.patch b/buildroot/package/fwts/0001-build-do-not-use-Werror.patch index 2dbf5313d..c3ea2efc2 100644 --- a/buildroot/package/fwts/0001-build-do-not-use-Werror.patch +++ b/buildroot/package/fwts/0001-build-do-not-use-Werror.patch @@ -10,6 +10,8 @@ newer versions that introduce new warnings. Remove use of -Werror. Signed-off-by: Erico Nunes +[Fabrice: updated for 19.09.00] +Signed-off-by: Fabrice Fontaine --- configure.ac | 2 +- src/Makefile.am | 2 +- @@ -36,11 +38,11 @@ index 52c637dd..d9d73f1c 100644 `pkg-config --silence-errors --cflags json` \ `pkg-config --silence-errors --cflags json-c` \ -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ -- -Wall -Werror -Wextra -+ -Wall -Wextra +- -Wall -Werror -Wextra \ ++ -Wall -Wextra \ + -Wno-address-of-packed-member bin_PROGRAMS = fwts - diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am index 54de7f44..e129ed16 100644 --- a/src/lib/src/Makefile.am @@ -49,11 +51,11 @@ index 54de7f44..e129ed16 100644 `pkg-config --silence-errors --cflags json-c` \ `pkg-config --cflags glib-2.0 gio-2.0` \ -DDATAROOTDIR=\"$(datarootdir)\" \ -- -Wall -Werror -Wextra -+ -Wall -Wextra +- -Wall -Werror -Wextra \ ++ -Wall -Wextra \ + -Wno-address-of-packed-member pkglib_LTLIBRARIES = libfwts.la - diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am index aa37de55..4d5297cc 100644 --- a/src/utilities/Makefile.am diff --git a/buildroot/package/fwts/fwts.hash b/buildroot/package/fwts/fwts.hash index c3f3b5780..633807773 100644 --- a/buildroot/package/fwts/fwts.hash +++ b/buildroot/package/fwts/fwts.hash @@ -1,2 +1,5 @@ # Hash from: http://fwts.ubuntu.com/release/SHA256SUMS -sha256 7fcdcf3acecfb92510fcb2faef3ab0db66f639bf3f068cf77a4e0aebba036f93 fwts-V18.09.00.tar.gz +sha256 91075982d067deef86d2830d622c27ed5f5c0b04dfd712902343a67fee753bfd fwts-V19.09.00.tar.gz + +# Hash for license file +sha256 9cfdcde669bcdbd2eb640dca6ed3f9b5ae381d100ac208f9dca6e12e61ad639c debian/copyright diff --git a/buildroot/package/fwts/fwts.mk b/buildroot/package/fwts/fwts.mk index b29de2cf2..853f27af4 100644 --- a/buildroot/package/fwts/fwts.mk +++ b/buildroot/package/fwts/fwts.mk @@ -4,7 +4,8 @@ # ################################################################################ -FWTS_VERSION = V18.09.00 +FWTS_VERSION = 19.09.00 +FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = http://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 FWTS_LICENSE = GPL-2.0, LGPL-2.1, Custom diff --git a/buildroot/package/fwup/fwup.hash b/buildroot/package/fwup/fwup.hash index 73bff448d..337883f9a 100644 --- a/buildroot/package/fwup/fwup.hash +++ b/buildroot/package/fwup/fwup.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 20302dc96cef88438034e15551e178bb0652c28d99aa7ca5260100cb3bebbc2a fwup-v1.2.5.tar.gz +sha256 20302dc96cef88438034e15551e178bb0652c28d99aa7ca5260100cb3bebbc2a fwup-1.2.5.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/fwup/fwup.mk b/buildroot/package/fwup/fwup.mk index be0b1d13b..e1e546776 100644 --- a/buildroot/package/fwup/fwup.mk +++ b/buildroot/package/fwup/fwup.mk @@ -4,8 +4,8 @@ # ################################################################################ -FWUP_VERSION = v1.2.5 -FWUP_SITE = $(call github,fhunleth,fwup,$(FWUP_VERSION)) +FWUP_VERSION = 1.2.5 +FWUP_SITE = $(call github,fhunleth,fwup,v$(FWUP_VERSION)) FWUP_LICENSE = Apache-2.0 FWUP_LICENSE_FILES = LICENSE FWUP_DEPENDENCIES = host-pkgconf libconfuse libarchive libsodium diff --git a/buildroot/package/fxload/Config.in b/buildroot/package/fxload/Config.in index 88cc6d1e5..f4d6ef54f 100644 --- a/buildroot/package/fxload/Config.in +++ b/buildroot/package/fxload/Config.in @@ -1,9 +1,5 @@ config BR2_PACKAGE_FXLOAD bool "fxload" - # Hits gcc PR63261 on Microblaze with debugging symbols - # enabled. Since this package is unlikely to be useful on - # Microblaze, just disable it on this architecture. - depends on !BR2_microblaze help This program is conveniently able to download firmware into FX, FX2, and FX2LP EZ-USB devices, as well as the original diff --git a/buildroot/package/fxload/fxload.hash b/buildroot/package/fxload/fxload.hash index 7febbccf1..68a6ba847 100644 --- a/buildroot/package/fxload/fxload.hash +++ b/buildroot/package/fxload/fxload.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 0cc8bfd2a7cbba2f68e0c5767477634922287943c91dd9fcf029fc8b9d577858 fxload-2008_10_13.tar.gz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/buildroot/package/fxload/fxload.mk b/buildroot/package/fxload/fxload.mk index 94b11d0f1..d3d654a4b 100644 --- a/buildroot/package/fxload/fxload.mk +++ b/buildroot/package/fxload/fxload.mk @@ -9,8 +9,15 @@ FXLOAD_SITE = http://downloads.sourceforge.net/project/linux-hotplug/fxload/$(FX FXLOAD_LICENSE = GPL-2.0+ FXLOAD_LICENSE_FILES = COPYING +FXLOAD_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y) +FXLOAD_CFLAGS += -O0 +endif + define FXLOAD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(FXLOAD_CFLAGS)" -C $(@D) all endef define FXLOAD_INSTALL_TARGET_CMDS diff --git a/buildroot/package/gadgetfs-test/0001-fix-usb-ch9-include.patch b/buildroot/package/gadgetfs-test/0001-fix-usb-ch9-include.patch deleted file mode 100644 index 3d7ce82b4..000000000 --- a/buildroot/package/gadgetfs-test/0001-fix-usb-ch9-include.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8cf5909c6f8e0a892155dea14a07adfad445762d Mon Sep 17 00:00:00 2001 -From: Haavard Skinnemoen -Date: Sat, 23 Jun 2007 18:34:09 +0200 -Subject: [PATCH] Include usb/ch9.h instead of usb_ch9.h - -Signed-off-by: Haavard Skinnemoen ---- - usb.c | 2 +- - usbstring.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/usb.c b/usb.c -index ea6c7de..b161154 100644 ---- a/usb.c -+++ b/usb.c -@@ -35,7 +35,7 @@ - - #include - #include --#include -+#include - - #ifdef AIO - /* this aio code works with libaio-0.3.106 */ -diff --git a/usbstring.c b/usbstring.c -index 4bf2965..993acc2 100644 ---- a/usbstring.c -+++ b/usbstring.c -@@ -11,7 +11,7 @@ - #include - - #include --#include -+#include - - #include "usbstring.h" - --- -1.5.2.2 - diff --git a/buildroot/package/gadgetfs-test/0002-rename-include-usb_gadgetfs-to-usb-dir.patch b/buildroot/package/gadgetfs-test/0002-rename-include-usb_gadgetfs-to-usb-dir.patch deleted file mode 100644 index ffc2da377..000000000 --- a/buildroot/package/gadgetfs-test/0002-rename-include-usb_gadgetfs-to-usb-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr gadgetfs-test-orig/usb.c gadgetfs-test/usb.c ---- gadgetfs-test-orig/usb.c 2007-07-18 14:38:38.000000000 +0200 -+++ gadgetfs-test/usb.c 2007-07-18 15:33:04.000000000 +0200 -@@ -34,7 +34,7 @@ - #include - - #include --#include -+#include - #include - - #ifdef AIO diff --git a/buildroot/package/gadgetfs-test/Config.in b/buildroot/package/gadgetfs-test/Config.in deleted file mode 100644 index ca14c91b4..000000000 --- a/buildroot/package/gadgetfs-test/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_GADGETFS_TEST - bool "gadgetfs-test" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Test program for gadgetfs from linux-usb.org - -if BR2_PACKAGE_GADGETFS_TEST - -config BR2_PACKAGE_GADGETFS_TEST_USE_AIO - bool "use asynchronous i/o" - select BR2_PACKAGE_LIBAIO - help - Select this to have gadgetfs-test do asynchronous I/O using - the libaio library. - -endif - -comment "gadgetfs-test needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/gadgetfs-test/gadgetfs-test.hash b/buildroot/package/gadgetfs-test/gadgetfs-test.hash deleted file mode 100644 index b96190a57..000000000 --- a/buildroot/package/gadgetfs-test/gadgetfs-test.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 bd8ebcf7ce86f4b022a4e7ba6b1cc16ffc4022bb58c1910fe4ac96c88217e7ec gadgetfs-test.tar.bz2 diff --git a/buildroot/package/gadgetfs-test/gadgetfs-test.mk b/buildroot/package/gadgetfs-test/gadgetfs-test.mk deleted file mode 100644 index ca47738f5..000000000 --- a/buildroot/package/gadgetfs-test/gadgetfs-test.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# gadgetfs-test -# -################################################################################ - -GADGETFS_TEST_SOURCE = gadgetfs-test.tar.bz2 -GADGETFS_TEST_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/GadgetFsTest - -GADGETFS_TEST_MAKEOPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" - -ifeq ($(BR2_PACKAGE_GADGETFS_TEST_USE_AIO),y) -GADGETFS_TEST_DEPENDENCIES = libaio -GADGETFS_TEST_MAKEOPTS += USE_AIO=y -endif - -define GADGETFS_TEST_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(GADGETFS_TEST_MAKEOPTS) -endef - -define GADGETFS_TEST_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) prefix=/usr install -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/gamin/gamin.hash b/buildroot/package/gamin/gamin.hash index 0a4370619..e28660dde 100644 --- a/buildroot/package/gamin/gamin.hash +++ b/buildroot/package/gamin/gamin.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1 gamin-0.1.10.tar.gz +sha256 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1 gamin-0.1.10.tar.gz +sha256 7f9ffc38883325f011f331a9d6074ffd0175fbcecd57f69c577fb3845f333876 COPYING diff --git a/buildroot/package/gauche/0001-fix-so-suffix.patch b/buildroot/package/gauche/0001-fix-so-suffix.patch index b65e26998..8a0937681 100644 --- a/buildroot/package/gauche/0001-fix-so-suffix.patch +++ b/buildroot/package/gauche/0001-fix-so-suffix.patch @@ -1,31 +1,32 @@ +From cefd57f76f7faec4143bf1e42ed148cad973c1f4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 12 Aug 2019 23:17:21 +0200 +Subject: [PATCH] configure.ac: fix so suffix + With uclibc or musl configuration, $host does not match to '*-linux-gnu*'. -I touch configure directly instead of configure.ac because autoreconf -failed by version mismatch of autotools. Signed-off-by: Hiroshi Kawashima +[Retrieved (and slightly updated) from: +https://git.buildroot.net/buildroot/tree/package/gauche/0001-fix-so-suffix.patch] +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/shirok/Gauche/pull/508] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff -ur a/configure b/configure ---- a/configure 2014-07-20 15:15:05.000000000 +0900 -+++ b/configure 2015-10-20 21:52:32.791442291 +0900 -@@ -6843,7 +6843,7 @@ +diff --git a/configure.ac b/configure.ac +index 15092a2d6..b82b762a9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -641,7 +641,7 @@ AS_CASE([$host], SHLIB_MAIN_LDFLAGS="" SHLIB_OK=ok - ;; -- *-linux-gnu*|*-*-gnu*|*freebsd*|*dragonfly*) -+ *-linux-*|*-*-gnu*|*freebsd*|*dragonfly*) + ], +- [*-linux-gnu*|*-*-gnu*|*freebsd*|*dragonfly*], [ ++ [*-linux-*|*-*-gnu*|*freebsd*|*dragonfly*], [ SHLIB_SO_CFLAGS="-fPIC" SHLIB_SO_LDFLAGS="$rpath -shared -o" SHLIB_SO_SUFFIX="so" +-- +2.20.1 -diff -ur a/configure.ac b/configure.ac ---- a/configure.ac 2015-10-21 21:33:17.370000200 +0900 -+++ b/configure.ac 2015-10-21 21:33:39.784110527 +0900 -@@ -572,7 +572,7 @@ - SHLIB_MAIN_LDFLAGS="" - SHLIB_OK=ok - ;; -- *-linux-gnu*|*-*-gnu*|*freebsd*|*dragonfly*) -+ *-linux-*|*-*-gnu*|*freebsd*|*dragonfly*) - SHLIB_SO_CFLAGS="-fPIC" - SHLIB_SO_LDFLAGS="$rpath -shared -o" - SHLIB_SO_SUFFIX="so" diff --git a/buildroot/package/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch b/buildroot/package/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch deleted file mode 100644 index 6cc065693..000000000 --- a/buildroot/package/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch +++ /dev/null @@ -1,62 +0,0 @@ -gc/configure.ac: add check for NO_GETCONTEXT definition - -This patch is ported from bdwgc package. Since Gauche uses an internal -copy of the boehm gc code, it is affected by the same problem. - -Both configure and configure.ac are modified because autoreconf fails -due to an incompatibility with the version of the autotools used by -Buildroot. - -Signed-off-by: Hiroshi Kawashima - -Original credits of patch in bdwgc package: -Signed-off-by: Samuel Martin -[yann.morin.1998@free.fr: add a comment, change variable name, use - AS_IF, remove debug traces, use AC_CHECK_FUNCS (as suggested by - Thomas)] -Signed-off-by: "Yann E. MORIN" -Cc: Thomas Petazzoni - -diff -ur a/gc/configure b/gc/configure ---- a/gc/configure 2015-11-12 21:41:02.394822056 +0900 -+++ b/gc/configure 2015-11-12 22:04:14.655157423 +0900 -@@ -16153,6 +16153,23 @@ - $as_echo "$ac_cv_fno_strict_aliasing" >&6; } - fi - -+# Check for getcontext (uClibc can be configured without it, for example) -+for ac_func in getcontext -+do : -+ ac_fn_c_check_func "$LINENO" "getcontext" "ac_cv_func_getcontext" -+if test "x$ac_cv_func_getcontext" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_GETCONTEXT 1 -+_ACEOF -+ -+fi -+done -+ -+if test "$ac_cv_func_getcontext" = "no"; then : -+ CFLAGS="$CFLAGS -DNO_GETCONTEXT" -+ CPPFLAGS="$CPPFLAGS -DNO_GETCONTEXT" -+fi -+ - case "$host" in - # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64 - # and unnecessary everywhere. -diff -ur a/gc/configure.ac b/gc/configure.ac ---- a/gc/configure.ac 2015-11-12 22:31:44.851510997 +0900 -+++ b/gc/configure.ac 2015-11-12 22:33:39.292191227 +0900 -@@ -459,6 +459,12 @@ - AC_MSG_RESULT($ac_cv_fno_strict_aliasing) - fi - -+# Check for getcontext (uClibc can be configured without it, for example) -+AC_CHECK_FUNCS([getcontext]) -+AS_IF([test "$ac_cv_func_getcontext" = "no"], -+ [CFLAGS="$CFLAGS -DNO_GETCONTEXT" -+ CPPFLAGS="$CPPFLAGS -DNO_GETCONTEXT"]) -+ - case "$host" in - # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64 - # and unnecessary everywhere. diff --git a/buildroot/package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch b/buildroot/package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch deleted file mode 100644 index 61a3f1aad..000000000 --- a/buildroot/package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4b9692c93d658015087f19016b2bd0c9dfbccee6 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 28 May 2017 20:21:09 +0200 -Subject: [PATCH] Fix 'missing libc-version.h' build error (uClibc/x86[_64]) - (fix commit 3d34255) - -uClibc defines __GLIBC__ but does not contain libc-version.h file. - -* include/private/gcconfig.h [(I386 || X86_64) && LINUX && __GLIBC__] -(GLIBC_2_19_TSX_BUG): Do not define (and do not include -gnu/libc-version.h) if __UCLIBC__. - -[baruch: cherry pick from upstream bdwgc commit 047230b71d42140] -Signed-off-by: Baruch Siach ---- -Upstream status: patch applied to bdwgc; will propagate to gauche on the next -synch of its bundled bdwgc - - gc/include/private/gcconfig.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gc/include/private/gcconfig.h b/gc/include/private/gcconfig.h -index 80920e5af570..f063664c3f52 100644 ---- a/gc/include/private/gcconfig.h -+++ b/gc/include/private/gcconfig.h -@@ -1420,7 +1420,7 @@ - # define GC_PREFETCH_FOR_WRITE(x) \ - __asm__ __volatile__ ("prefetchw %0" : : "m"(*(char *)(x))) - # endif --# if defined(__GLIBC__) -+# if defined(__GLIBC__) && !defined(__UCLIBC__) - /* Workaround lock elision implementation for some glibc. */ - # define GLIBC_2_19_TSX_BUG - # include /* for gnu_get_libc_version() */ -@@ -2431,7 +2431,7 @@ - /* FIXME: This seems to be fixed in GLibc v2.14. */ - # define GETCONTEXT_FPU_EXCMASK_BUG - # endif --# if defined(__GLIBC__) -+# if defined(__GLIBC__) && !defined(__UCLIBC__) - /* Workaround lock elision implementation for some glibc. */ - # define GLIBC_2_19_TSX_BUG - # include /* for gnu_get_libc_version() */ --- -2.11.0 - diff --git a/buildroot/package/gauche/0004-rfc-needs-srfi.patch b/buildroot/package/gauche/0004-rfc-needs-srfi.patch deleted file mode 100644 index 8b83b7872..000000000 --- a/buildroot/package/gauche/0004-rfc-needs-srfi.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 33ba5e73ec09f1308f897128334e955debd9ea43 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 21 Nov 2018 08:58:25 +0100 -Subject: [PATCH] rfc: needs srfi - -ext/rfc needs srfi-19 since version 0.9.5 and -https://github.com/shirok/Gauche/commit/bd22bc82361c5eeb5d3b58c3836236566746bb96 - -So add a dependency on srfi for rfc target in Makefile.in - -Fixes: - - http://autobuild.buildroot.org/results/f4935e29ce6aaebdaa47d46c56120b7e97145d1b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/shirok/Gauche/pull/397] ---- - ext/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/Makefile.in b/ext/Makefile.in -index 57ddf457e..de8d59a4d 100644 ---- a/ext/Makefile.in -+++ b/ext/Makefile.in -@@ -54,7 +54,7 @@ bcrypt: mt-random - - dbm : threads - --rfc: gauche util -+rfc: gauche srfi util - - test : check - --- -2.14.1 - diff --git a/buildroot/package/gauche/gauche.hash b/buildroot/package/gauche/gauche.hash index 8f45ef997..600c46fbd 100644 --- a/buildroot/package/gauche/gauche.hash +++ b/buildroot/package/gauche/gauche.hash @@ -1,5 +1,6 @@ # From https://sourceforge.net/projects/gauche/files/Gauche/ -sha1 c3e1ea21f3acc66fd26eced117caab3f86531db4 Gauche-0.9.5.tgz -md5 8bac7cbd99a91f6f2c037ac6988db14d Gauche-0.9.5.tgz +sha1 ff7878ab19c56b49b4b6d77009300a3592cc903c Gauche-0.9.8.tgz +md5 efd1b12cd5708d9e1e4358ab2d2e1e32 Gauche-0.9.8.tgz # Locally calculated -sha256 4c8a53213de112708bbda5fa9648c21497d43ebf809ed5b32b15f21266b4e73c Gauche-0.9.5.tgz +sha256 3eb30d1051d8b48999fe46511c9f6983057735312c9832b7db13f9db140db74b Gauche-0.9.8.tgz +sha256 d537f80c0bb3cc203bc2675b766b9de9573243026fa3e8ad78368abd4b14aac8 COPYING diff --git a/buildroot/package/gauche/gauche.mk b/buildroot/package/gauche/gauche.mk index 0b4185f5b..2a30a2b39 100644 --- a/buildroot/package/gauche/gauche.mk +++ b/buildroot/package/gauche/gauche.mk @@ -4,16 +4,28 @@ # ################################################################################ -GAUCHE_VERSION = 0.9.5 +GAUCHE_VERSION = 0.9.8 GAUCHE_SOURCE = Gauche-$(GAUCHE_VERSION).tgz GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) GAUCHE_LICENSE_FILES = COPYING GAUCHE_DEPENDENCIES = host-gauche +# We're patching configure.ac +GAUCHE_AUTORECONF = YES HOST_GAUCHE_CONF_OPTS = --without-zlib GAUCHE_CONF_OPTS = --without-libatomic-ops +# Enable embedded axTLS +GAUCHE_TLS_LIBS = axtls + +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +GAUCHE_TLS_LIBS += mbedtls +GAUCHE_DEPENDENCIES += mbedtls +endif + +GAUCHE_CONF_OPTS += --with-tls="$(GAUCHE_TLS_LIBS)" + ifeq ($(BR2_PACKAGE_ZLIB),y) GAUCHE_CONF_OPTS += --with-zlib=$(STAGING_DIR) GAUCHE_DEPENDENCIES += zlib diff --git a/buildroot/package/gawk/gawk.hash b/buildroot/package/gawk/gawk.hash index d8dd27c17..f80f2b202 100644 --- a/buildroot/package/gawk/gawk.hash +++ b/buildroot/package/gawk/gawk.hash @@ -1,5 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/gawk/gawk-4.2.1.tar.xz.sig -sha256 d1119785e746d46a8209d28b2de404a57f983aa48670f4e225531d3bdc175551 gawk-4.2.1.tar.xz +# https://ftp.gnu.org/gnu/gawk/gawk-5.0.1.tar.xz.sig +# Primary key fingerprint: D196 7C63 7887 1317 7D86 1ED7 DF59 7815 937E C0D2 +sha256 8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794 gawk-5.0.1.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gawk/gawk.mk b/buildroot/package/gawk/gawk.mk index 7c93aefed..1a5f87f60 100644 --- a/buildroot/package/gawk/gawk.mk +++ b/buildroot/package/gawk/gawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAWK_VERSION = 4.2.1 +GAWK_VERSION = 5.0.1 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_DEPENDENCIES = host-gawk diff --git a/buildroot/package/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch b/buildroot/package/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch deleted file mode 100644 index fd2bc6953..000000000 --- a/buildroot/package/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 80bc14a5249da7054b716229206b453f339b4a5e Mon Sep 17 00:00:00 2001 -From: nsz -Date: Mon, 23 Nov 2015 15:17:55 +0000 -Subject: [PATCH] [ARM] PR target/68059 libgcc should not use __write for - printing fatal error - -libgcc/ - PR target/68059 - * config/arm/linux-atomic-64bit.c (__write): Rename to... - (write): ...this and fix the return type. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230762 138bc75d-0d04-0410-961f-82ee72b054a4 - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - libgcc/config/arm/linux-atomic-64bit.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgcc/config/arm/linux-atomic-64bit.c b/libgcc/config/arm/linux-atomic-64bit.c -index 5b8c6e2..9078673 100644 ---- a/libgcc/config/arm/linux-atomic-64bit.c -+++ b/libgcc/config/arm/linux-atomic-64bit.c -@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - kernels; we check for that in an init section and bail out rather - unceremoneously. */ - --extern unsigned int __write (int fd, const void *buf, unsigned int count); -+extern int write (int fd, const void *buf, unsigned int count); - extern void abort (void); - - /* Kernel helper for compare-and-exchange. */ -@@ -56,7 +56,7 @@ static void __check_for_sync8_kernelhelper (void) - for the user - I'm not sure I can rely on much else being - available at this point, so do the same as generic-morestack.c - write () and abort (). */ -- __write (2 /* stderr. */, err, sizeof (err)); -+ write (2 /* stderr. */, err, sizeof (err)); - abort (); - } - }; --- -2.10.2 - diff --git a/buildroot/package/gcc/4.9.4/0002-m68k-coldfire-pr68467.patch b/buildroot/package/gcc/4.9.4/0002-m68k-coldfire-pr68467.patch deleted file mode 100644 index d701ab687..000000000 --- a/buildroot/package/gcc/4.9.4/0002-m68k-coldfire-pr68467.patch +++ /dev/null @@ -1,48 +0,0 @@ -Backport from upstream, see -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.9.4.orig/gcc/config/m68k/m68k.c gcc-4.9.4/gcc/config/m68k/m68k.c ---- gcc-4.9.4.orig/gcc/config/m68k/m68k.c 2014-02-27 12:10:55.000000000 +0100 -+++ gcc-4.9.4/gcc/config/m68k/m68k.c 2018-02-17 21:28:53.430538916 +0100 -@@ -166,6 +166,8 @@ - const_tree, bool); - static bool m68k_cannot_force_const_mem (enum machine_mode mode, rtx x); - static bool m68k_output_addr_const_extra (FILE *, rtx); -+static machine_mode m68k_promote_function_mode (const_tree, machine_mode, -+ int *, const_tree, int); - static void m68k_init_sync_libfuncs (void) ATTRIBUTE_UNUSED; - - /* Initialize the GCC target structure. */ -@@ -308,6 +310,9 @@ - #undef TARGET_ATOMIC_TEST_AND_SET_TRUEVAL - #define TARGET_ATOMIC_TEST_AND_SET_TRUEVAL 128 - -+#undef TARGET_PROMOTE_FUNCTION_MODE -+#define TARGET_PROMOTE_FUNCTION_MODE m68k_promote_function_mode -+ - static const struct attribute_spec m68k_attribute_table[] = - { - /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler, -@@ -6527,4 +6532,20 @@ - == m68k_fk_interrupt_handler)); - } - -+/* Implement TARGET_PROMOTE_FUNCTION_MODE. */ -+ -+static machine_mode -+m68k_promote_function_mode (const_tree type, machine_mode mode, -+ int *punsignedp ATTRIBUTE_UNUSED, -+ const_tree fntype ATTRIBUTE_UNUSED, -+ int for_return) -+{ -+ /* Promote libcall arguments narrower than int to match the normal C -+ ABI (for which promotions are handled via -+ TARGET_PROMOTE_PROTOTYPES). */ -+ if (type == NULL_TREE && !for_return && (mode == QImode || mode == HImode)) -+ return SImode; -+ return mode; -+} -+ - #include "gt-m68k.h" diff --git a/buildroot/package/gcc/4.9.4/0003-libsanitizer-Use-pre-computed-size.patch b/buildroot/package/gcc/4.9.4/0003-libsanitizer-Use-pre-computed-size.patch deleted file mode 100644 index 5b4c05a71..000000000 --- a/buildroot/package/gcc/4.9.4/0003-libsanitizer-Use-pre-computed-size.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 61f38c64c01a15560026115a157b7021ec67bd3b Mon Sep 17 00:00:00 2001 -From: hjl -Date: Thu, 24 May 2018 20:21:54 +0000 -Subject: [PATCH] libsanitizer: Use pre-computed size of struct ustat for Linux - -Cherry-pick compiler-rt revision 333213: - - has been removed from glibc 2.28 by: - -commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7 -Author: Adhemerval Zanella -Date: Sun Mar 18 11:28:59 2018 +0800 - - Deprecate ustat syscall interface - -This patch uses pre-computed size of struct ustat for Linux. - - PR sanitizer/85835 - * sanitizer_common/sanitizer_platform_limits_posix.cc: Don't - include for Linux. - (SIZEOF_STRUCT_USTAT): New. - (struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@260688 138bc75d-0d04-0410-961f-82ee72b054a4 - -Backported from upstream commit -https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=61f38c64c01a15560026115a157b7021ec67bd3b - -Signed-off-by: Bernd Kuhls ---- - libsanitizer/ChangeLog | 8 ++++++++ - .../sanitizer_common/sanitizer_platform_limits_posix.cc | 15 +++++++++++++-- - 2 files changed, 21 insertions(+), 2 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -index 31a5e69..8017afd 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -81,7 +89,6 @@ typedef struct user_fpregs elf_fpregset_t; - # include - #endif - #include --#include - #include - #include - #include -@@ -163,7 +170,19 @@ - unsigned struct_old_utsname_sz = sizeof(struct old_utsname); - unsigned struct_oldold_utsname_sz = sizeof(struct oldold_utsname); - unsigned struct_itimerspec_sz = sizeof(struct itimerspec); -- unsigned struct_ustat_sz = sizeof(struct ustat); -+ // Use pre-computed size of struct ustat to avoid which -+ // has been removed from glibc 2.28. -+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ -+ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ -+ || defined(__x86_64__) -+#define SIZEOF_STRUCT_USTAT 32 -+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ -+ || defined(__powerpc__) || defined(__s390__) -+#define SIZEOF_STRUCT_USTAT 20 -+#else -+#error Unknown size of struct ustat -+#endif -+ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID --- -2.9.3 diff --git a/buildroot/package/gcc/4.9.4/100-uclibc-conf.patch b/buildroot/package/gcc/4.9.4/100-uclibc-conf.patch deleted file mode 100644 index d56bf0a19..000000000 --- a/buildroot/package/gcc/4.9.4/100-uclibc-conf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: gcc-4.8.0/contrib/regression/objs-gcc.sh -=================================================================== ---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh 2009-04-09 17:00:19.000000000 +0200 -+++ gcc-4.8.0/contrib/regression/objs-gcc.sh 2013-03-23 17:39:04.000000000 +0100 -@@ -106,6 +106,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 diff --git a/buildroot/package/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional b/buildroot/package/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional deleted file mode 100644 index 5e0484fbb..000000000 --- a/buildroot/package/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional +++ /dev/null @@ -1,122 +0,0 @@ -http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html - -On glibc the libc.so carries a copy of the math function copysignl() but -on uClibc math functions like copysignl() live in libm. Since libgcc_s -contains unresolved symbols, any attempt to link against libgcc_s -without explicitely specifying -lm fails, resulting in a broken -bootstrap of the compiler. - -Forward port to gcc 4.5.1 by Gustavo Zacarias - ---- - libgcc/Makefile.in | 4 +++- - libgcc/configure | 32 ++++++++++++++++++++++++++++++++ - libgcc/configure.ac | 21 +++++++++++++++++++++ - 3 files changed, 56 insertions(+), 1 deletion(-) - -Index: b/libgcc/Makefile.in -=================================================================== ---- a/libgcc/Makefile.in -+++ b/libgcc/Makefile.in -@@ -42,6 +42,7 @@ - enable_vtable_verify = @enable_vtable_verify@ - enable_decimal_float = @enable_decimal_float@ - fixed_point = @fixed_point@ -+LIBGCC_LIBM = @LIBGCC_LIBM@ - - host_noncanonical = @host_noncanonical@ - target_noncanonical = @target_noncanonical@ -@@ -943,9 +944,10 @@ - @multilib_dir@,$(MULTIDIR),$(subst \ - @shlib_objs@,$(objects) libgcc.a,$(subst \ - @shlib_base_name@,libgcc_s,$(subst \ -+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \ - @shlib_map_file@,$(mapfile),$(subst \ - @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \ -- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))) -+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))) - - libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts) - # @multilib_flags@ is still needed because this may use -Index: b/libgcc/configure -=================================================================== ---- a/libgcc/configure -+++ b/libgcc/configure -@@ -564,6 +564,7 @@ - tmake_file - sfp_machine_header - set_use_emutls -+LIBGCC_LIBM - set_have_cc_tls - vis_hide - fixed_point -@@ -4535,6 +4536,37 @@ - fi - fi - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+echo "$as_me:$LINENO: checking for library containing copysignl" >&5 -+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6 -+if test "${libgcc_cv_copysignl_lib+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ -+fi -+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5 -+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6 -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac - - # Conditionalize the makefile for this target machine. - tmake_file_= -Index: b/libgcc/configure.ac -=================================================================== ---- a/libgcc/configure.ac -+++ b/libgcc/configure.ac -@@ -357,6 +357,27 @@ - fi - AC_SUBST(set_have_cc_tls) - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+AC_CACHE_CHECK -+ libgcc_cv_copysignl_lib, -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD) -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ ]) -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac -+AC_SUBST(LIBGCC_LIBM) -+ - # See if we have emulated thread-local storage. - GCC_CHECK_EMUTLS - set_use_emutls= diff --git a/buildroot/package/gcc/4.9.4/111-pr65730.patch b/buildroot/package/gcc/4.9.4/111-pr65730.patch deleted file mode 100644 index 8a41fd2a1..000000000 --- a/buildroot/package/gcc/4.9.4/111-pr65730.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b9a7775674d91c7af8043a83211ffeaa576327d7 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 10 Apr 2015 17:46:30 +0300 -Subject: [PATCH] Fix PR target/65730 - -2015-05-20 Max Filippov -gcc/ - * config/xtensa/xtensa.c (init_alignment_context): Replace MULT - by BITS_PER_UNIT with ASHIFT by exact_log2 (BITS_PER_UNIT). - -Signed-off-by: Max Filippov ---- -Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452 -Changes to ChangeLog are dropped. - - gcc/config/xtensa/xtensa.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -Index: b/gcc/config/xtensa/xtensa.c -=================================================================== ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -1436,8 +1436,9 @@ - if (ac->shift != NULL_RTX) - { - /* Shift is the byte count, but we need the bitcount. */ -- ac->shift = expand_simple_binop (SImode, MULT, ac->shift, -- GEN_INT (BITS_PER_UNIT), -+ gcc_assert (exact_log2 (BITS_PER_UNIT) >= 0); -+ ac->shift = expand_simple_binop (SImode, ASHIFT, ac->shift, -+ GEN_INT (exact_log2 (BITS_PER_UNIT)), - NULL_RTX, 1, OPTAB_DIRECT); - ac->modemask = expand_simple_binop (SImode, ASHIFT, - GEN_INT (GET_MODE_MASK (mode)), diff --git a/buildroot/package/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/buildroot/package/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch deleted file mode 100644 index bb77c4b9e..000000000 --- a/buildroot/package/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9bf6066d588632dab9f78932df15b5b4140f31f3 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Fri, 6 Nov 2015 14:27:23 +0100 -Subject: [PATCH] gcc/config.gcc: fix typo for powerpc e6500 cpu_is_64bit - -Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate -64-bit binaries by default. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gcc/config.gcc | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -441,7 +441,7 @@ - extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h" - need_64bit_hwint=yes - case x$with_cpu in -- xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500) -+ xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|xe6500) - cpu_is_64bit=yes - ;; - esac diff --git a/buildroot/package/gcc/4.9.4/130-pr43538.patch b/buildroot/package/gcc/4.9.4/130-pr43538.patch deleted file mode 100644 index 19e57bb05..000000000 --- a/buildroot/package/gcc/4.9.4/130-pr43538.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c037df1be41f8daf4d581d7ffa4ec8cfa640bccf Mon Sep 17 00:00:00 2001 -From: glisse -Date: Fri, 25 Apr 2014 08:03:08 +0000 -Subject: [PATCH] 2014-04-25 Marc Glisse - - PR target/43538 - * mt-gnu: Don't reset CXXFLAGS_FOR_TARGET. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4 -Signed-off-by: Max Filippov ---- - config/mt-gnu | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config/mt-gnu b/config/mt-gnu -index 15bf417..5c696f5 100644 ---- a/config/mt-gnu -+++ b/config/mt-gnu -@@ -1 +1 @@ --CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE -+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE --- -2.1.4 - diff --git a/buildroot/package/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch b/buildroot/package/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch deleted file mode 100644 index 55f32288f..000000000 --- a/buildroot/package/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3c536954a67a883630f4a7513a27f02a892c3dcb Mon Sep 17 00:00:00 2001 -From: Evgeniy Stepanov -Date: Tue, 21 Oct 2014 21:08:13 +0000 -Subject: [PATCH] [sanitizer] Fix build with _FILE_OFFSET_BITS=64. - -Sanitizer source is not affected by _FILE_OFFSET_BITS in general, -but this one file must be built with 32-bit off_t. More details in the code. - -git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@220328 91177308-0d34-0410-b5e6-96231b3b80d8 -Signed-off-by: Max Filippov ---- - lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -index bbc1108..fc09522 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -13,7 +13,15 @@ - - #include "sanitizer_platform.h" - #if SANITIZER_LINUX || SANITIZER_MAC -+// Tests in this file assume that off_t-dependent data structures match the -+// libc ABI. For example, struct dirent here is what readdir() function (as -+// exported from libc) returns, and not the user-facing "dirent", which -+// depends on _FILE_OFFSET_BITS setting. -+// To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. -+#ifdef _FILE_OFFSET_BITS -+#undef _FILE_OFFSET_BITS -+#endif - - #include "sanitizer_internal_defs.h" - #include "sanitizer_platform_limits_posix.h" - --- -2.1.4 - diff --git a/buildroot/package/gcc/4.9.4/301-missing-execinfo_h.patch b/buildroot/package/gcc/4.9.4/301-missing-execinfo_h.patch deleted file mode 100644 index 00efda24a..000000000 --- a/buildroot/package/gcc/4.9.4/301-missing-execinfo_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gcc-4.8.0/boehm-gc/include/gc.h -=================================================================== ---- gcc-4.8.0.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200 -+++ gcc-4.8.0/boehm-gc/include/gc.h 2013-03-23 17:39:20.000000000 +0100 -@@ -503,7 +503,7 @@ - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/buildroot/package/gcc/4.9.4/810-arm-softfloat-libgcc.patch b/buildroot/package/gcc/4.9.4/810-arm-softfloat-libgcc.patch deleted file mode 100644 index 5efa7fd1b..000000000 --- a/buildroot/package/gcc/4.9.4/810-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: b/gcc/config/arm/linux-elf.h -=================================================================== ---- a/gcc/config/arm/linux-elf.h -+++ b/gcc/config/arm/linux-elf.h -@@ -60,7 +60,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - -Index: b/libgcc/config/arm/t-linux -=================================================================== ---- a/libgcc/config/arm/t-linux -+++ b/libgcc/config/arm/t-linux -@@ -1,6 +1,11 @@ - LIB1ASMSRC = arm/lib1funcs.S - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 -+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # Just for these, we omit the frame pointer since it makes such a big - # difference. diff --git a/buildroot/package/gcc/4.9.4/830-arm_unbreak_armv4t.patch b/buildroot/package/gcc/4.9.4/830-arm_unbreak_armv4t.patch deleted file mode 100644 index 37f8f2a54..000000000 --- a/buildroot/package/gcc/4.9.4/830-arm_unbreak_armv4t.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00009.html - ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -45,7 +45,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/buildroot/package/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch b/buildroot/package/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch deleted file mode 100644 index 03fc47f19..000000000 --- a/buildroot/package/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch +++ /dev/null @@ -1,166 +0,0 @@ -Fetched from Xilinx gcc git at https://github.com/Xilinx/gcc - -From 23c35173490ac2d6348a668dfc9c1a6eb62171f2 Mon Sep 17 00:00:00 2001 -From: "Edgar E. Iglesias" -Date: Mon, 18 Jun 2012 20:18:13 +0200 -Subject: [PATCH] [Patch, microblaze]: Enable DWARF exception handling support. - -Changelog - -2013-03-18 Edgar E. Iglesias - David Holsgrove - - * common/config/microblaze/microblaze-common.c: Remove - TARGET_EXCEPT_UNWIND_INFO definition. - * config/microblaze/microblaze-protos.h: Add - microblaze_eh_return prototype. - * gcc/config/microblaze/microblaze.c: (microblaze_must_save_register, - microblaze_expand_epilogue, microblaze_return_addr): Handle - calls_eh_return - (microblaze_eh_return): New function. - * gcc/config/microblaze/microblaze.h: Define RETURN_ADDR_OFFSET, - EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM, EH_RETURN_STACKADJ_RTX, - ASM_PREFERRED_EH_DATA_FORMAT - * gcc/config/microblaze/microblaze.md: Define eh_return pattern. - -Signed-off-by: David Holsgrove -Signed-off-by: Edgar E. Iglesias ---- - gcc/common/config/microblaze/microblaze-common.c | 3 --- - gcc/config/microblaze/microblaze-protos.h | 1 + - gcc/config/microblaze/microblaze.c | 29 ++++++++++++++++++++---- - gcc/config/microblaze/microblaze.h | 15 ++++++++++++ - gcc/config/microblaze/microblaze.md | 11 +++++++++ - 5 files changed, 52 insertions(+), 7 deletions(-) - -Index: b/gcc/common/config/microblaze/microblaze-common.c -=================================================================== ---- a/gcc/common/config/microblaze/microblaze-common.c -+++ b/gcc/common/config/microblaze/microblaze-common.c -@@ -37,7 +37,4 @@ - #undef TARGET_OPTION_OPTIMIZATION_TABLE - #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table - --#undef TARGET_EXCEPT_UNWIND_INFO --#define TARGET_EXCEPT_UNWIND_INFO sjlj_except_unwind_info -- - struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER; -Index: b/gcc/config/microblaze/microblaze-protos.h -=================================================================== ---- a/gcc/config/microblaze/microblaze-protos.h -+++ b/gcc/config/microblaze/microblaze-protos.h -@@ -54,6 +54,7 @@ - extern int symbol_mentioned_p (rtx); - extern int label_mentioned_p (rtx); - extern bool microblaze_cannot_force_const_mem (enum machine_mode, rtx); -+extern void microblaze_eh_return (rtx op0); - #endif /* RTX_CODE */ - - /* Declare functions in microblaze-c.c. */ -Index: b/gcc/config/microblaze/microblaze.c -=================================================================== ---- a/gcc/config/microblaze/microblaze.c -+++ b/gcc/config/microblaze/microblaze.c -@@ -1906,6 +1906,11 @@ - if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM)) - return 1; - -+ if (crtl->calls_eh_return -+ && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) { -+ return 1; -+ } -+ - if (!crtl->is_leaf) - { - if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) -@@ -1933,6 +1938,13 @@ - return 1; - } - -+ if (crtl->calls_eh_return -+ && (regno == EH_RETURN_DATA_REGNO (0) -+ || regno == EH_RETURN_DATA_REGNO (1))) -+ { -+ return 1; -+ } -+ - return 0; - } - -@@ -2962,6 +2974,12 @@ - emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx)); - } - -+ if (crtl->calls_eh_return) -+ emit_insn (gen_addsi3 (stack_pointer_rtx, -+ stack_pointer_rtx, -+ gen_rtx_raw_REG (SImode, -+ MB_EH_STACKADJ_REGNUM))); -+ - emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST + - MB_ABI_SUB_RETURN_ADDR_REGNUM))); - } -@@ -3256,10 +3274,13 @@ - if (count != 0) - return NULL_RTX; - -- return gen_rtx_PLUS (Pmode, -- get_hard_reg_initial_val (Pmode, -- MB_ABI_SUB_RETURN_ADDR_REGNUM), -- GEN_INT (8)); -+ return get_hard_reg_initial_val (Pmode, -+ MB_ABI_SUB_RETURN_ADDR_REGNUM); -+} -+ -+void microblaze_eh_return (rtx op0) -+{ -+ emit_insn (gen_movsi(gen_rtx_MEM(Pmode, stack_pointer_rtx), op0)); - } - - /* Queue an .ident string in the queue of top-level asm statements. -Index: b/gcc/config/microblaze/microblaze.h -=================================================================== ---- a/gcc/config/microblaze/microblaze.h -+++ b/gcc/config/microblaze/microblaze.h -@@ -184,6 +184,21 @@ - #define INCOMING_RETURN_ADDR_RTX \ - gen_rtx_REG (VOIDmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM) - -+/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC. */ -+#define RETURN_ADDR_OFFSET (8) -+ -+/* Describe how we implement __builtin_eh_return. */ -+#define EH_RETURN_DATA_REGNO(N) (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM) -+ -+#define MB_EH_STACKADJ_REGNUM MB_ABI_INT_RETURN_VAL2_REGNUM -+#define EH_RETURN_STACKADJ_RTX gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM) -+ -+/* Select a format to encode pointers in exception handling data. CODE -+ is 0 for data, 1 for code labels, 2 for function pointers. GLOBAL is -+ true if the symbol may be affected by dynamic relocations. */ -+#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \ -+ ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr) -+ - /* Use DWARF 2 debugging information by default. */ - #define DWARF2_DEBUGGING_INFO - #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG -Index: b/gcc/config/microblaze/microblaze.md -=================================================================== ---- a/gcc/config/microblaze/microblaze.md -+++ b/gcc/config/microblaze/microblaze.md -@@ -2261,4 +2261,15 @@ - (set_attr "mode" "SI") - (set_attr "length" "4")]) - -+; This is used in compiling the unwind routines. -+(define_expand "eh_return" -+ [(use (match_operand 0 "general_operand" ""))] -+ "" -+ " -+{ -+ microblaze_eh_return(operands[0]); -+ DONE; -+}") -+ - (include "sync.md") -+ diff --git a/buildroot/package/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch b/buildroot/package/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch deleted file mode 100644 index 533d01fad..000000000 --- a/buildroot/package/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch +++ /dev/null @@ -1,274 +0,0 @@ -Allow C99-depending features of libstdc++ with uClibc - -The libstdc++ code is fairly restrictive on how it checks for C99 -compatibility: it requires *complete* C99 support to enable certain -features. For example, uClibc provides a good number of C99 features, -but not C99 complex number support. For this reason, libstdc++ -completely disables many the standard C++ methods that can in fact -work because uClibc provides the necessary functions. - -This patch is similar and highly inspired from -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in -a way that doesn't involve changing the configure.ac script, as -autoreconfiguring gcc is complicated. It simply relies on the fact -that uClibc defines the __UCLIBC__ definition. - -Signed-off-by: Thomas Petazzoni -[Gustavo: update for 4.9.3] - -Index: b/libstdc++-v3/config/locale/generic/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/generic/c_locale.h -+++ b/libstdc++-v3/config/locale/generic/c_locale.h -@@ -70,7 +70,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/config/locale/gnu/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/gnu/c_locale.h -+++ b/libstdc++-v3/config/locale/gnu/c_locale.h -@@ -88,7 +88,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/include/bits/basic_string.h -=================================================================== ---- a/libstdc++-v3/include/bits/basic_string.h -+++ b/libstdc++-v3/include/bits/basic_string.h -@@ -2843,7 +2843,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99) -+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) - - #include - -Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc -+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -@@ -572,7 +572,7 @@ - { - const locale __loc = __io.getloc(); - const ctype<_CharT>& __ctype = use_facet >(__loc); --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough. - int __cs_size = 64; - char* __cs = static_cast(__builtin_alloca(__cs_size)); -Index: b/libstdc++-v3/include/bits/locale_facets.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets.tcc -+++ b/libstdc++-v3/include/bits/locale_facets.tcc -@@ -987,7 +987,7 @@ - char __fbuf[16]; - __num_base::_S_format_float(__io, __fbuf, __mod); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough (most probably sufficient - // for non-ios_base::fixed outputs) - int __cs_size = __max_digits * 3; -Index: b/libstdc++-v3/include/c_compatibility/math.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/math.h -+++ b/libstdc++-v3/include/c_compatibility/math.h -@@ -56,7 +56,7 @@ - using std::floor; - using std::fmod; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::fpclassify; - using std::isfinite; - using std::isinf; -Index: b/libstdc++-v3/include/c_compatibility/wchar.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/wchar.h -+++ b/libstdc++-v3/include/c_compatibility/wchar.h -@@ -103,7 +103,7 @@ - using std::wmemset; - using std::wcsftime; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_global/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdio -+++ b/libstdc++-v3/include/c_global/cstdio -@@ -146,7 +146,7 @@ - using ::vsprintf; - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf -Index: b/libstdc++-v3/include/c_global/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdlib -+++ b/libstdc++-v3/include/c_global/cstdlib -@@ -182,7 +182,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_global/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_global/cwchar -+++ b/libstdc++-v3/include/c_global/cwchar -@@ -232,7 +232,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -@@ -289,7 +289,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_std/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdio -+++ b/libstdc++-v3/include/c_std/cstdio -@@ -144,7 +144,7 @@ - using ::vsprintf; - } // namespace std - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf -Index: b/libstdc++-v3/include/c_std/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdlib -+++ b/libstdc++-v3/include/c_std/cstdlib -@@ -180,7 +180,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_std/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_std/cwchar -+++ b/libstdc++-v3/include/c_std/cwchar -@@ -228,7 +228,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -Index: b/libstdc++-v3/include/ext/vstring.h -=================================================================== ---- a/libstdc++-v3/include/ext/vstring.h -+++ b/libstdc++-v3/include/ext/vstring.h -@@ -2680,7 +2680,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99)) -+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))) - - #include - -Index: b/libstdc++-v3/include/tr1/cstdio -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdio -+++ b/libstdc++-v3/include/tr1/cstdio -@@ -33,7 +33,7 @@ - - #include - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cstdlib -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdlib -+++ b/libstdc++-v3/include/tr1/cstdlib -@@ -35,7 +35,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cwchar -=================================================================== ---- a/libstdc++-v3/include/tr1/cwchar -+++ b/libstdc++-v3/include/tr1/cwchar -@@ -52,7 +52,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/tr1/stdlib.h -=================================================================== ---- a/libstdc++-v3/include/tr1/stdlib.h -+++ b/libstdc++-v3/include/tr1/stdlib.h -@@ -33,7 +33,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - using std::tr1::atoll; - using std::tr1::strtoll; -Index: b/libstdc++-v3/src/c++11/debug.cc -=================================================================== ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -788,7 +788,7 @@ - int __n __attribute__ ((__unused__)), - const char* __fmt, _Tp __s) const throw () - { --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - std::snprintf(__buf, __n, __fmt, __s); - #else - std::sprintf(__buf, __fmt, __s); diff --git a/buildroot/package/gcc/4.9.4/860-cilk-wchar.patch b/buildroot/package/gcc/4.9.4/860-cilk-wchar.patch deleted file mode 100644 index 183740515..000000000 --- a/buildroot/package/gcc/4.9.4/860-cilk-wchar.patch +++ /dev/null @@ -1,56 +0,0 @@ -[PATCH] cilk: fix build without wchar - -When building against uClibc with wchar support disabled, WCHAR_MIN and -WCHAR_MAX are not defined leading to compilation errors. - -Fix it by only including the wchar code if available. - -Signed-off-by: Peter Korsgaard ---- - libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -Index: host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h -=================================================================== ---- host-gcc-final-4.9.2.orig/libcilkrts/include/cilk/reducer_min_max.h -+++ host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h -@@ -3154,7 +3154,9 @@ - CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) -@@ -3306,7 +3308,9 @@ - CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) -@@ -3432,7 +3436,9 @@ - CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) -@@ -3584,7 +3590,9 @@ - CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) diff --git a/buildroot/package/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch b/buildroot/package/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch deleted file mode 100644 index 98c7b3f32..000000000 --- a/buildroot/package/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch +++ /dev/null @@ -1,287 +0,0 @@ -From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 6 Aug 2015 01:16:02 +0300 -Subject: [PATCH] xtensa: add -mauto-litpools option - -With support from assembler this option allows compiling huge functions, -where single literal pool at the beginning of a function may not be -reachable by L32R instructions at its end. - -Currently assembler --auto-litpools option cannot deal with literals -used from multiple locations separated by more than 256 KBytes of code. -Don't turn constants into literals, instead use MOVI instruction to load -them into registers and let the assembler turn them into literals as -necessary. - -2015-08-12 Max Filippov -gcc/ - * config/xtensa/constraints.md (define_constraint "Y"): New - constraint. - * config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools. - * config/xtensa/linux.h (ASM_SPEC): Likewise. - * config/xtensa/predicates.md (move_operand): Match constants - and symbols in the presence of TARGET_AUTO_LITPOOLS. - * config/xtensa/xtensa.c (xtensa_valid_move): Don't allow - immediate references to TLS data. - (xtensa_emit_move_sequence): Don't force constants to memory in - the presence of TARGET_AUTO_LITPOOLS. - (print_operand): Add 'y' format, same as default, but capable of - printing SF mode constants as well. - * config/xtensa/xtensa.md (movsi_internal, movhi_internal) - (movsf_internal): Add movi pattern that loads literal. - (movsf, movdf): Don't force constants to memory in the presence - of TARGET_AUTO_LITPOOLS. - (movdf_internal): Add 'Y' constraint. - * config/xtensa/xtensa.opt (mauto-litpools): New option. - -Signed-off-by: Max Filippov ---- -Backported from: r226828 -Changes to ChangeLogs and documentation are dropped. - - gcc/config/xtensa/constraints.md | 5 +++++ - gcc/config/xtensa/elf.h | 4 +++- - gcc/config/xtensa/linux.h | 4 +++- - gcc/config/xtensa/predicates.md | 3 ++- - gcc/config/xtensa/xtensa.c | 19 ++++++++++++++++++- - gcc/config/xtensa/xtensa.md | 35 +++++++++++++++++++---------------- - gcc/config/xtensa/xtensa.opt | 4 ++++ - 7 files changed, 54 insertions(+), 20 deletions(-) - -Index: b/gcc/config/xtensa/constraints.md -=================================================================== ---- a/gcc/config/xtensa/constraints.md -+++ b/gcc/config/xtensa/constraints.md -@@ -111,6 +111,11 @@ - (and (match_code "const_int") - (match_test "xtensa_mask_immediate (ival)"))) - -+(define_constraint "Y" -+ "A constant that can be used in relaxed MOVI instructions." -+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref") -+ (match_test "TARGET_AUTO_LITPOOLS"))) -+ - ;; Memory constraints. Do not use define_memory_constraint here. Doing so - ;; causes reload to force some constants into the constant pool, but since - ;; the Xtensa constant pool can only be accessed with L32R instructions, it -Index: b/gcc/config/xtensa/elf.h -=================================================================== ---- a/gcc/config/xtensa/elf.h -+++ b/gcc/config/xtensa/elf.h -@@ -48,7 +48,9 @@ - %{mtarget-align:--target-align} \ - %{mno-target-align:--no-target-align} \ - %{mlongcalls:--longcalls} \ -- %{mno-longcalls:--no-longcalls}" -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" - - #undef LIB_SPEC - #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal" -Index: b/gcc/config/xtensa/linux.h -=================================================================== ---- a/gcc/config/xtensa/linux.h -+++ b/gcc/config/xtensa/linux.h -@@ -42,7 +42,9 @@ - %{mtarget-align:--target-align} \ - %{mno-target-align:--no-target-align} \ - %{mlongcalls:--longcalls} \ -- %{mno-longcalls:--no-longcalls}" -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - -Index: b/gcc/config/xtensa/predicates.md -=================================================================== ---- a/gcc/config/xtensa/predicates.md -+++ b/gcc/config/xtensa/predicates.md -@@ -142,7 +142,8 @@ - (match_test "GET_MODE_CLASS (mode) == MODE_INT - && xtensa_simm12b (INTVAL (op))")) - (and (match_code "const_int,const_double,const,symbol_ref,label_ref") -- (match_test "TARGET_CONST16 && CONSTANT_P (op) -+ (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS) -+ && CONSTANT_P (op) - && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0"))))) - - ;; Accept the floating point constant 1 in the appropriate mode. -Index: b/gcc/config/xtensa/xtensa.c -=================================================================== ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -477,6 +477,9 @@ - { - int dst_regnum = xt_true_regnum (operands[0]); - -+ if (xtensa_tls_referenced_p (operands[1])) -+ return FALSE; -+ - /* The stack pointer can only be assigned with a MOVSP opcode. */ - if (dst_regnum == STACK_POINTER_REGNUM) - return (mode == SImode -@@ -1044,7 +1047,7 @@ - return 1; - } - -- if (! TARGET_CONST16) -+ if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16) - { - src = force_const_mem (SImode, src); - operands[1] = src; -@@ -2428,6 +2431,20 @@ - } - break; - -+ case 'y': -+ if (GET_CODE (x) == CONST_DOUBLE && -+ GET_MODE (x) == SFmode) -+ { -+ REAL_VALUE_TYPE r; -+ long l; -+ REAL_VALUE_FROM_CONST_DOUBLE (r, x); -+ REAL_VALUE_TO_TARGET_SINGLE (r, l); -+ fprintf (file, "0x%08lx", l); -+ break; -+ } -+ -+ /* fall through */ -+ - default: - if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG) - fprintf (file, "%s", reg_names[xt_true_regnum (x)]); -Index: b/gcc/config/xtensa/xtensa.md -=================================================================== ---- a/gcc/config/xtensa/xtensa.md -+++ b/gcc/config/xtensa/xtensa.md -@@ -799,8 +799,8 @@ - }) - - (define_insn "movsi_internal" -- [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A") -- (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))] -+ [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A") -+ (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))] - "xtensa_valid_move (SImode, operands)" - "@ - movi.n\t%0, %x1 -@@ -812,15 +812,16 @@ - mov\t%0, %1 - movsp\t%0, %1 - movi\t%0, %x1 -+ movi\t%0, %1 - const16\t%0, %t1\;const16\t%0, %b1 - %v1l32r\t%0, %1 - %v1l32i\t%0, %1 - %v0s32i\t%1, %0 - rsr\t%0, ACCLO - wsr\t%1, ACCLO" -- [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr") -+ [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr") - (set_attr "mode" "SI") -- (set_attr "length" "2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")]) -+ (set_attr "length" "2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")]) - - ;; 16-bit Integer moves - -@@ -834,21 +835,22 @@ - }) - - (define_insn "movhi_internal" -- [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A") -- (match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))] -+ [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A") -+ (match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))] - "xtensa_valid_move (HImode, operands)" - "@ - movi.n\t%0, %x1 - mov.n\t%0, %1 - mov\t%0, %1 - movi\t%0, %x1 -+ movi\t%0, %1 - %v1l16ui\t%0, %1 - %v0s16i\t%1, %0 - rsr\t%0, ACCLO - wsr\t%1, ACCLO" -- [(set_attr "type" "move,move,move,move,load,store,rsr,wsr") -+ [(set_attr "type" "move,move,move,move,move,load,store,rsr,wsr") - (set_attr "mode" "HI") -- (set_attr "length" "2,2,3,3,3,3,3,3")]) -+ (set_attr "length" "2,2,3,3,3,3,3,3,3")]) - - ;; 8-bit Integer moves - -@@ -919,7 +921,7 @@ - (match_operand:SF 1 "general_operand" ""))] - "" - { -- if (!TARGET_CONST16 && CONSTANT_P (operands[1])) -+ if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1])) - operands[1] = force_const_mem (SFmode, operands[1]); - - if ((!register_operand (operands[0], SFmode) -@@ -934,8 +936,8 @@ - }) - - (define_insn "movsf_internal" -- [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U") -- (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))] -+ [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U") -+ (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))] - "((register_operand (operands[0], SFmode) - || register_operand (operands[1], SFmode)) - && !(FP_REG_P (xt_true_regnum (operands[0])) -@@ -950,13 +952,14 @@ - mov\t%0, %1 - wfr\t%0, %1 - rfr\t%0, %1 -+ movi\t%0, %y1 - const16\t%0, %t1\;const16\t%0, %b1 - %v1l32r\t%0, %1 - %v1l32i\t%0, %1 - %v0s32i\t%1, %0" -- [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store") -+ [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store") - (set_attr "mode" "SF") -- (set_attr "length" "3,3,3,2,2,2,3,3,3,6,3,3,3")]) -+ (set_attr "length" "3,3,3,2,2,2,3,3,3,3,6,3,3,3")]) - - (define_insn "*lsiu" - [(set (match_operand:SF 0 "register_operand" "=f") -@@ -997,7 +1000,7 @@ - (match_operand:DF 1 "general_operand" ""))] - "" - { -- if (CONSTANT_P (operands[1]) && !TARGET_CONST16) -+ if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS) - operands[1] = force_const_mem (DFmode, operands[1]); - - if (!register_operand (operands[0], DFmode) -@@ -1008,8 +1011,8 @@ - }) - - (define_insn_and_split "movdf_internal" -- [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U") -- (match_operand:DF 1 "move_operand" "r,iF,T,U,r"))] -+ [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U") -+ (match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))] - "register_operand (operands[0], DFmode) - || register_operand (operands[1], DFmode)" - "#" -Index: b/gcc/config/xtensa/xtensa.opt -=================================================================== ---- a/gcc/config/xtensa/xtensa.opt -+++ b/gcc/config/xtensa/xtensa.opt -@@ -38,6 +38,10 @@ - Target - Intersperse literal pools with code in the text section - -+mauto-litpools -+Target Report Mask(AUTO_LITPOOLS) -+Relax literals in assembler and place them automatically in the text section -+ - mserialize-volatile - Target Report Mask(SERIALIZE_VOLATILE) - -mno-serialize-volatile Do not serialize volatile memory references with MEMW instructions diff --git a/buildroot/package/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch b/buildroot/package/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch deleted file mode 100644 index abc7a08e8..000000000 --- a/buildroot/package/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 05154174b369505238b759cf80d595d8cfc8c731 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Mon, 10 Aug 2015 21:35:20 +0300 -Subject: [PATCH 1/3] xtensa: reimplement register spilling - -Spilling windowed registers in userspace is much easier, more portable, -less error-prone and equally effective as in kernel. Now that register -spilling syscall is considered obsolete in the xtensa linux kernel -replace it with CALL12 followed by series of ENTRY in libgcc. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use - CALL12 followed by series of ENTRY to spill windowed registers. - (__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill - instead of making linux spill syscall. - -Signed-off-by: Max Filippov ---- -Backported from: r226962 - - libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++------- - 1 file changed, 23 insertions(+), 7 deletions(-) - -diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S -index 3ac8c1d..2e678af 100644 ---- a/libgcc/config/xtensa/lib2funcs.S -+++ b/libgcc/config/xtensa/lib2funcs.S -@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - .global __xtensa_libgcc_window_spill - .type __xtensa_libgcc_window_spill,@function - __xtensa_libgcc_window_spill: -- entry sp, 32 -- movi a2, 0 -- syscall -+ entry sp, 48 -+#if XCHAL_NUM_AREGS > 16 -+ call12 1f -+ retw -+ .align 4 -+1: -+ .rept (XCHAL_NUM_AREGS - 24) / 12 -+ _entry sp, 48 -+ mov a12, a0 -+ .endr -+ _entry sp, 16 -+#if XCHAL_NUM_AREGS % 12 == 0 -+ mov a4, a4 -+#elif XCHAL_NUM_AREGS % 12 == 4 -+ mov a8, a8 -+#elif XCHAL_NUM_AREGS % 12 == 8 -+ mov a12, a12 -+#endif -+ retw -+#else -+ mov a8, a8 - retw -+#endif - .size __xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill - - -@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto: - entry sp, 32 - - /* Flush registers. */ -- mov a5, a2 -- movi a2, 0 -- syscall -- mov a2, a5 -+ call8 __xtensa_libgcc_window_spill - - /* Because the save area for a0-a3 is stored one frame below - the one identified by a2, the only way to restore those --- -1.8.1.4 - diff --git a/buildroot/package/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/buildroot/package/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch deleted file mode 100644 index f23a5c073..000000000 --- a/buildroot/package/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f66206679a0ad604f13673559f230160cd3d1189 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 14 Aug 2015 02:45:02 +0300 -Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde - -This allows having exception cleanup code in binaries that don't -register their unwind tables. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/t-xtensa (LIB2ADDEH): Replace unwind-dw2-fde - with unwind-dw2-fde-dip. - -Signed-off-by: Max Filippov ---- -Backported from: r226963 - - libgcc/config/xtensa/t-xtensa | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa -index 27399e6..66d0eb3 100644 ---- a/libgcc/config/xtensa/t-xtensa -+++ b/libgcc/config/xtensa/t-xtensa -@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \ - LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S - - LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \ -- $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c -+ $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c --- -1.8.1.4 - diff --git a/buildroot/package/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch b/buildroot/package/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch deleted file mode 100644 index dc405132c..000000000 --- a/buildroot/package/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 15c7c4d39b317f0d902ef28fd43eca5c3369f891 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 15 Aug 2015 05:12:11 +0300 -Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA - -Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame -higher than what was actually used by code at context->ra. This results -in invalid CFA value in signal frames and premature unwinding completion -in forced unwinding used by uClibc NPTL thread cancellation. -Returning context->sp from _Unwind_GetCFA makes all CFA values valid and -matching code that used them. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return - context->sp instead of context->cfa. - -Signed-off-by: Max Filippov ---- -Backported from: r226964 - - libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c -index 35f7797..ef6b900 100644 ---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c -+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c -@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index) - _Unwind_Word - _Unwind_GetCFA (struct _Unwind_Context *context) - { -- return (_Unwind_Ptr) context->cfa; -+ return (_Unwind_Ptr) context->sp; - } - - /* Overwrite the saved value for register INDEX in CONTEXT with VAL. */ --- -1.8.1.4 - diff --git a/buildroot/package/gcc/4.9.4/874-xtensa-add-uclinux-support.patch b/buildroot/package/gcc/4.9.4/874-xtensa-add-uclinux-support.patch deleted file mode 100644 index 881aec09d..000000000 --- a/buildroot/package/gcc/4.9.4/874-xtensa-add-uclinux-support.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 70c2cb98fb129b4766b5da0f945dc41fd568c77a Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 22 Aug 2015 08:44:26 +0300 -Subject: [PATCH] xtensa: add uclinux support - -2015-10-03 Max Filippov -gcc/ - * config.gcc (xtensa*-*-uclinux*): New configuration. - * config/xtensa/uclinux.h: New file. - * config/xtensa/uclinux.opt: New file. - -libgcc/ - * config.host (xtensa*-*-uclinux*): New configuration. - -Signed-off-by: Max Filippov ---- -Backported from: r228450 - - gcc/config.gcc | 5 ++++ - gcc/config/xtensa/uclinux.h | 69 +++++++++++++++++++++++++++++++++++++++++++ - gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++ - libgcc/config.host | 5 ++++ - 4 files changed, 111 insertions(+) - create mode 100644 gcc/config/xtensa/uclinux.h - create mode 100644 gcc/config/xtensa/uclinux.opt - -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -2871,6 +2871,11 @@ - tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h" - tmake_file="${tmake_file} xtensa/t-xtensa" - ;; -+xtensa*-*-uclinux*) -+ tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/uclinux.h" -+ tmake_file="${tmake_file} xtensa/t-xtensa" -+ extra_options="${extra_options} xtensa/uclinux.opt" -+ ;; - am33_2.0-*-linux*) - tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h" - gas=yes gnu_ld=yes -Index: b/gcc/config/xtensa/uclinux.h -=================================================================== ---- /dev/null -+++ b/gcc/config/xtensa/uclinux.h -@@ -0,0 +1,69 @@ -+/* Xtensa uClinux configuration. -+ Derived from the configuration for GCC for Intel i386 running Linux. -+ Copyright (C) 2001-2015 Free Software Foundation, Inc. -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify it under -+the terms of the GNU General Public License as published by the Free -+Software Foundation; either version 3, or (at your option) any later -+version. -+ -+GCC is distributed in the hope that it will be useful, but WITHOUT ANY -+WARRANTY; without even the implied warranty of MERCHANTABILITY or -+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING3. If not see -+. */ -+ -+#undef TARGET_OS_CPP_BUILTINS -+#define TARGET_OS_CPP_BUILTINS() \ -+ do \ -+ { \ -+ GNU_USER_TARGET_OS_CPP_BUILTINS (); \ -+ builtin_define ("__uClinux__"); \ -+ } \ -+ while (0) -+ -+#undef SUBTARGET_CPP_SPEC -+#define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" -+ -+#undef SIZE_TYPE -+#define SIZE_TYPE "unsigned int" -+ -+#undef PTRDIFF_TYPE -+#define PTRDIFF_TYPE "int" -+ -+#undef WCHAR_TYPE -+#define WCHAR_TYPE "long int" -+ -+#undef WCHAR_TYPE_SIZE -+#define WCHAR_TYPE_SIZE 32 -+ -+#undef ASM_SPEC -+#define ASM_SPEC \ -+ "%{mtext-section-literals:--text-section-literals} \ -+ %{mno-text-section-literals:--no-text-section-literals} \ -+ %{mtarget-align:--target-align} \ -+ %{mno-target-align:--no-target-align} \ -+ %{mlongcalls:--longcalls} \ -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" -+ -+#undef LINK_SPEC -+#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}" -+ -+#undef LOCAL_LABEL_PREFIX -+#define LOCAL_LABEL_PREFIX "." -+ -+/* Always enable "-fpic" for Xtensa Linux. */ -+#define XTENSA_ALWAYS_PIC 1 -+ -+#undef TARGET_LIBC_HAS_FUNCTION -+#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function -+ -+#undef DBX_REGISTER_NUMBER -+ -Index: b/gcc/config/xtensa/uclinux.opt -=================================================================== ---- /dev/null -+++ b/gcc/config/xtensa/uclinux.opt -@@ -0,0 +1,32 @@ -+; Xtensa uClinux options. -+ -+; Copyright (C) 2015 Free Software Foundation, Inc. -+; -+; This file is part of GCC. -+; -+; GCC is free software; you can redistribute it and/or modify it under -+; the terms of the GNU General Public License as published by the Free -+; Software Foundation; either version 3, or (at your option) any later -+; version. -+; -+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY -+; WARRANTY; without even the implied warranty of MERCHANTABILITY or -+; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+; for more details. -+; -+; You should have received a copy of the GNU General Public License -+; along with GCC; see the file COPYING3. If not see -+; . -+ -+; See the GCC internals manual (options.texi) for a description of -+; this file's format. -+ -+; Please try to keep this file in ASCII collating order. -+ -+elf2flt -+Driver -+ -+elf2flt= -+Driver JoinedOrMissing -+ -+; This comment is to ensure we retain the blank line above. -Index: b/libgcc/config.host -=================================================================== ---- a/libgcc/config.host -+++ b/libgcc/config.host -@@ -1213,6 +1213,11 @@ - tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc" - md_unwind_header=xtensa/linux-unwind.h - ;; -+xtensa*-*-uclinux*) -+ tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc" -+ md_unwind_header=xtensa/linux-unwind.h -+ extra_parts="$extra_parts crtbeginS.o crtbeginT.o crtendS.o" -+ ;; - am33_2.0-*-linux*) - # Don't need crtbeginT.o from *-*-linux* default. - extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o" diff --git a/buildroot/package/gcc/4.9.4/875-xtensa-fix-PR-target-82181.patch b/buildroot/package/gcc/4.9.4/875-xtensa-fix-PR-target-82181.patch deleted file mode 100644 index 266e659c1..000000000 --- a/buildroot/package/gcc/4.9.4/875-xtensa-fix-PR-target-82181.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8dd3af97bb6ccb3dfd6cbe20c5a28ce80fcd0de7 Mon Sep 17 00:00:00 2001 -From: jcmvbkbc -Date: Mon, 11 Sep 2017 21:53:38 +0000 -Subject: [PATCH] xtensa: fix PR target/82181 - -2017-09-11 Max Filippov -gcc/ - Backport from mainline - * config/xtensa/xtensa.c (xtensa_mem_offset): Check that both - words of DImode object are reachable by xtensa_uimm8x4 access. - -Signed-off-by: Max Filippov ---- - gcc/config/xtensa/xtensa.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index 3c0096113775..3eb4db85b971 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -612,6 +612,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode) - case HImode: - return xtensa_uimm8x2 (v); - -+ case DImode: - case DFmode: - return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4)); - --- -2.1.4 - diff --git a/buildroot/package/gcc/4.9.4/880-nios2_legitimize_address.patch b/buildroot/package/gcc/4.9.4/880-nios2_legitimize_address.patch deleted file mode 100644 index 4623f295a..000000000 --- a/buildroot/package/gcc/4.9.4/880-nios2_legitimize_address.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b0ea54f3f995754881e0ea6651133aa7b58eeaa2 Mon Sep 17 00:00:00 2001 -From: cltang -Date: Tue, 22 Sep 2015 12:23:20 +0000 -Subject: [PATCH] nios2_legitimize_address 2015-09-22 Chung-Lin Tang - - - Backport from mainline - 2015-09-22 Chung-Lin Tang - - * config/nios2/nios2.c (nios2_legitimize_address): When handling - 'reg + reloc' cases, allow first operand to be non-REG, and use - force_reg() to enforce address pattern. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@228013 138bc75d-0d04-0410-961f-82ee72b054a4 - -Fixes: -http://autobuild.buildroot.net/results/901/90186d1fe134b804c0101554296b1235dc0ccbb0 - -[backported to 4.9.3] -Signed-off-by: Romain Naour ---- - gcc/config/nios2/nios2.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c -index 047b615..41dd6f9 100644 ---- a/gcc/config/nios2/nios2.c -+++ b/gcc/config/nios2/nios2.c -@@ -1786,15 +1786,15 @@ nios2_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED, - - Which will be output as '%tls_le(var+48)(r23)' in assembly. */ - if (GET_CODE (x) == PLUS -- && GET_CODE (XEXP (x, 0)) == REG - && GET_CODE (XEXP (x, 1)) == CONST) - { -- rtx unspec, offset, reg = XEXP (x, 0); -+ rtx unspec, offset; - split_const (XEXP (x, 1), &unspec, &offset); - if (GET_CODE (unspec) == UNSPEC - && !nios2_large_offset_p (XINT (unspec, 1)) - && offset != const0_rtx) - { -+ rtx reg = force_reg (Pmode, XEXP (x, 0)); - unspec = copy_rtx (unspec); - XVECEXP (unspec, 0, 0) - = plus_constant (Pmode, XVECEXP (unspec, 0, 0), INTVAL (offset)); --- -2.5.0 - diff --git a/buildroot/package/gcc/4.9.4/890-fix-m68k-compile.patch b/buildroot/package/gcc/4.9.4/890-fix-m68k-compile.patch deleted file mode 100644 index 140977b3c..000000000 --- a/buildroot/package/gcc/4.9.4/890-fix-m68k-compile.patch +++ /dev/null @@ -1,15 +0,0 @@ -remove unused header, which breaks the toolchain building - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c gcc-4.9.3/libgcc/config/m68k/linux-atomic.c ---- gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c 2014-01-02 23:25:22.000000000 +0100 -+++ gcc-4.9.3/libgcc/config/m68k/linux-atomic.c 2016-03-18 22:24:40.000000000 +0100 -@@ -33,7 +33,6 @@ - using the kernel helper defined below. There is no support for - 64-bit operations yet. */ - --#include - #include - - #ifndef __NR_atomic_cmpxchg_32 diff --git a/buildroot/package/gcc/4.9.4/900-musl-support.patch b/buildroot/package/gcc/4.9.4/900-musl-support.patch deleted file mode 100644 index a862d0111..000000000 --- a/buildroot/package/gcc/4.9.4/900-musl-support.patch +++ /dev/null @@ -1,640 +0,0 @@ -Add musl support to gcc - -This patch comes from the musl-cross project at -https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version: - - * the config.sub modifications have been removed, because Buildroot - already overwrites all config.sub with a more recent config.sub - that has musl support. - - * change to ensure that a dummy dynamic linker path - MUSL_DYNAMIC_LINKER is defined for all architectures, - otherwise building gcc for architectures not supported by musl was - causing build failure. Bug reported upstream at - https://bitbucket.org/GregorR/musl-gcc-patches/issue/4/musl-gcc-patches-break-the-build-on. - - * change the USE_PT_GNU_EH_FRAME logic to keep the existing gcc logic - and only add the musl one as an addition, not as a replacement. Not - doing this breaks C++ exception handling with glibc, because - USE_PT_GNU_EH_FRAME doesn't get defined due to the configure script - not testing dl_iterate_phdr() on any system except Solaris. - -[Gustavo: remove upstream applied gcc/config/sh/sh.c chunk for 4.9.1] -Signed-off-by: Thomas Petazzoni ---- - -Index: b/fixincludes/mkfixinc.sh -=================================================================== ---- a/fixincludes/mkfixinc.sh -+++ b/fixincludes/mkfixinc.sh -@@ -19,7 +19,8 @@ - powerpc-*-eabi* | \ - powerpc-*-rtems* | \ - powerpcle-*-eabisim* | \ -- powerpcle-*-eabi* ) -+ powerpcle-*-eabi* | \ -+ *-musl* ) - # IF there is no include fixing, - # THEN create a no-op fixer and exit - (echo "#! /bin/sh" ; echo "exit 0" ) > ${target} -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -594,7 +594,7 @@ - esac - - # Common C libraries. --tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" -+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" - - # 32-bit x86 processors supported by --with-arch=. Each processor - # MUST be separated by exactly one space. -@@ -719,6 +719,9 @@ - *-*-*uclibc*) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" - ;; -+ *-*-*musl*) -+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" -+ ;; - *) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" - ;; -@@ -2338,6 +2341,10 @@ - powerpc*-*-linux*paired*) - tm_file="${tm_file} rs6000/750cl.h" ;; - esac -+ case ${target} in -+ *-linux*-musl*) -+ enable_secureplt=yes ;; -+ esac - if test x${enable_secureplt} = xyes; then - tm_file="rs6000/secureplt.h ${tm_file}" - fi -Index: b/gcc/config/aarch64/aarch64-linux.h -=================================================================== ---- a/gcc/config/aarch64/aarch64-linux.h -+++ b/gcc/config/aarch64/aarch64-linux.h -@@ -22,6 +22,8 @@ - #define GCC_AARCH64_LINUX_H - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" - - #define CPP_SPEC "%{pthread:-D_REENTRANT}" - -Index: b/gcc/config/arm/linux-eabi.h -=================================================================== ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -77,6 +77,23 @@ - %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ - %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" - -+/* For ARM musl currently supports four dynamic linkers: -+ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI -+ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI -+ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB -+ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB -+ musl does not support the legacy OABI mode. -+ All the dynamic linkers live in /lib. -+ We default to soft-float, EL. */ -+#undef MUSL_DYNAMIC_LINKER -+#if TARGET_BIG_ENDIAN_DEFAULT -+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" -+#endif -+#define MUSL_DYNAMIC_LINKER \ -+ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" -+ - /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to - use the GNU/Linux version, not the generic BPABI version. */ - #undef LINK_SPEC -Index: b/gcc/config/i386/linux.h -=================================================================== ---- a/gcc/config/i386/linux.h -+++ b/gcc/config/i386/linux.h -@@ -21,3 +21,5 @@ - - #define GNU_USER_LINK_EMULATION "elf_i386" - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" -Index: b/gcc/config/i386/linux64.h -=================================================================== ---- a/gcc/config/i386/linux64.h -+++ b/gcc/config/i386/linux64.h -@@ -30,3 +30,10 @@ - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" - #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -+ -+#undef MUSL_DYNAMIC_LINKER32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" -+#undef MUSL_DYNAMIC_LINKERX32 -+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" -Index: b/gcc/config/linux.h -=================================================================== ---- a/gcc/config/linux.h -+++ b/gcc/config/linux.h -@@ -32,10 +32,12 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ -@@ -53,18 +55,21 @@ - uClibc or Bionic is the default C library and whether - -muclibc or -mglibc or -mbionic has been passed to change the default. */ - --#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ -- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" -+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ -+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" - - #if DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) - #elif DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) - #elif DEFAULT_LIBC == LIBC_BIONIC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) - #else - #error "Unsupported DEFAULT_LIBC" - #endif /* DEFAULT_LIBC */ -@@ -82,23 +87,103 @@ - #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" - #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32" - -+/* Musl dynamic linker paths must be defined on a per-architecture -+ basis, for each architecture supported by Musl. However, in order -+ to let other architectures continue to build with other C -+ libraries, we provide a dummy definition of the following defines. */ -+#define MUSL_DYNAMIC_LINKER "invalid" -+#define MUSL_DYNAMIC_LINKER32 "invalid" -+#define MUSL_DYNAMIC_LINKER64 "invalid" -+#define MUSL_DYNAMIC_LINKERX32 "invalid" -+ - #define GNU_USER_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ -- BIONIC_DYNAMIC_LINKER) -+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - #define GNU_USER_DYNAMIC_LINKER32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ -- BIONIC_DYNAMIC_LINKER32) -+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) - #define GNU_USER_DYNAMIC_LINKER64 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ -- BIONIC_DYNAMIC_LINKER64) -+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - #define GNU_USER_DYNAMIC_LINKERX32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ -- BIONIC_DYNAMIC_LINKERX32) -+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKER32) - - /* Whether we have Bionic libc runtime */ - #undef TARGET_HAS_BIONIC - #define TARGET_HAS_BIONIC (OPTION_BIONIC) - -+/* musl avoids problematic includes by rearranging the include directories. -+ * Unfortunately, this is mostly duplicated from cppdefault.c */ -+#if DEFAULT_LIBC == LIBC_MUSL -+#define INCLUDE_DEFAULTS_MUSL_GPP \ -+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ -+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ -+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, -+ -+#ifdef LOCAL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_LOCAL \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_LOCAL -+#endif -+ -+#ifdef PREFIX_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_PREFIX -+#endif -+ -+#ifdef CROSS_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_CROSS \ -+ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#ifdef TOOL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_TOOL \ -+ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_TOOL -+#endif -+ -+#ifdef NATIVE_SYSTEM_HEADER_DIR -+#define INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_NATIVE -+#endif -+ -+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) -+# undef INCLUDE_DEFAULTS_MUSL_LOCAL -+# define INCLUDE_DEFAULTS_MUSL_LOCAL -+# undef INCLUDE_DEFAULTS_MUSL_NATIVE -+# define INCLUDE_DEFAULTS_MUSL_NATIVE -+#else -+# undef INCLUDE_DEFAULTS_MUSL_CROSS -+# define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#undef INCLUDE_DEFAULTS -+#define INCLUDE_DEFAULTS \ -+ { \ -+ INCLUDE_DEFAULTS_MUSL_GPP \ -+ INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ INCLUDE_DEFAULTS_MUSL_CROSS \ -+ INCLUDE_DEFAULTS_MUSL_TOOL \ -+ INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ -+ { 0, 0, 0, 0, 0, 0 } \ -+ } -+#endif -+ - #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ - /* This is a *uclinux* target. We don't define below macros to normal linux - versions, because doing so would require *uclinux* targets to include -Index: b/gcc/config/linux.opt -=================================================================== ---- a/gcc/config/linux.opt -+++ b/gcc/config/linux.opt -@@ -30,3 +30,7 @@ - muclibc - Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) - Use uClibc C library -+ -+mmusl -+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) -+Use musl C library -Index: b/gcc/config/microblaze/linux.h -=================================================================== ---- a/gcc/config/microblaze/linux.h -+++ b/gcc/config/microblaze/linux.h -@@ -28,7 +28,23 @@ - #undef TLS_NEEDS_GOT - #define TLS_NEEDS_GOT 1 - --#define DYNAMIC_LINKER "/lib/ld.so.1" -+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ -+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" -+#endif -+ -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" -+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+ -+#if DEFAULT_LIBC == LIBC_MUSL -+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER -+#else -+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER -+#endif -+ -+ - #undef SUBTARGET_EXTRA_SPECS - #define SUBTARGET_EXTRA_SPECS \ - { "dynamic_linker", DYNAMIC_LINKER } -Index: b/gcc/config/rs6000/linux64.h -=================================================================== ---- a/gcc/config/rs6000/linux64.h -+++ b/gcc/config/rs6000/linux64.h -@@ -371,17 +371,23 @@ - #endif - #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" - #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" -+#undef MUSL_DYNAMIC_LINKER32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" - #if DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" - #elif DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" - #else - #error "Unsupported DEFAULT_LIBC" - #endif - #define GNU_USER_DYNAMIC_LINKER32 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) - #define GNU_USER_DYNAMIC_LINKER64 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - - #undef DEFAULT_ASM_ENDIAN - #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) -Index: b/gcc/config/rs6000/secureplt.h -=================================================================== ---- a/gcc/config/rs6000/secureplt.h -+++ b/gcc/config/rs6000/secureplt.h -@@ -18,3 +18,4 @@ - . */ - - #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" -+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" -Index: b/gcc/config/rs6000/sysv4.h -=================================================================== ---- a/gcc/config/rs6000/sysv4.h -+++ b/gcc/config/rs6000/sysv4.h -@@ -537,6 +537,9 @@ - #ifndef CC1_SECURE_PLT_DEFAULT_SPEC - #define CC1_SECURE_PLT_DEFAULT_SPEC "" - #endif -+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC -+#define LINK_SECURE_PLT_DEFAULT_SPEC "" -+#endif - - /* Pass -G xxx to the compiler. */ - #define CC1_SPEC "%{G*} %(cc1_cpu)" \ -@@ -585,7 +588,8 @@ - - /* Override the default target of the linker. */ - #define LINK_TARGET_SPEC \ -- ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") -+ ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \ -+ "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}" - - /* Any specific OS flags. */ - #define LINK_OS_SPEC "\ -@@ -763,15 +767,18 @@ - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" - #if DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" - #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" - #else - #error "Unsupported DEFAULT_LIBC" - #endif - #define GNU_USER_DYNAMIC_LINKER \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - - #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -894,6 +901,7 @@ - { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ - { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ - { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ -+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ - { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ - { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ - { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ -Index: b/gcc/config/sh/linux.h -=================================================================== ---- a/gcc/config/sh/linux.h -+++ b/gcc/config/sh/linux.h -@@ -43,7 +43,15 @@ - - #define TARGET_ASM_FILE_END file_end_indicate_exec_stack - -+#if TARGET_BIG_ENDIAN_DEFAULT /* BE */ -+#define MUSL_DYNAMIC_LINKER_E "eb" -+#else -+#define MUSL_DYNAMIC_LINKER_E -+#endif -+ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1" - - #undef SUBTARGET_LINK_EMUL_SUFFIX - #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" -Index: b/gcc/configure -=================================================================== ---- a/gcc/configure -+++ b/gcc/configure -@@ -27601,6 +27601,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/configure.ac -=================================================================== ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -5173,6 +5173,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/ginclude/stddef.h -=================================================================== ---- a/gcc/ginclude/stddef.h -+++ b/gcc/ginclude/stddef.h -@@ -181,6 +181,7 @@ - #ifndef _GCC_SIZE_T - #ifndef _SIZET_ - #ifndef __size_t -+#ifndef __DEFINED_size_t /* musl */ - #define __size_t__ /* BeOS */ - #define __SIZE_T__ /* Cray Unicos/Mk */ - #define _SIZE_T -@@ -197,6 +198,7 @@ - #define ___int_size_t_h - #define _GCC_SIZE_T - #define _SIZET_ -+#define __DEFINED_size_t /* musl */ - #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ - || defined(__FreeBSD_kernel__) - /* __size_t is a typedef on FreeBSD 5, must not trash it. */ -@@ -214,6 +216,7 @@ - typedef long ssize_t; - #endif /* __BEOS__ */ - #endif /* !(defined (__GNUG__) && defined (size_t)) */ -+#endif /* __DEFINED_size_t */ - #endif /* __size_t */ - #endif /* _SIZET_ */ - #endif /* _GCC_SIZE_T */ -Index: b/libgcc/unwind-dw2-fde-dip.c -=================================================================== ---- a/libgcc/unwind-dw2-fde-dip.c -+++ b/libgcc/unwind-dw2-fde-dip.c -@@ -73,6 +73,13 @@ - && defined(TARGET_DL_ITERATE_PHDR) \ - && defined(__sun__) && defined(__svr4__) - # define USE_PT_GNU_EH_FRAME -+ #endif -+ -+/* For musl libc, TARGET_DL_ITERATE_PHDR gets defined by the configure -+ script. */ -+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ -+ && defined(TARGET_DL_ITERATE_PHDR) -+# define USE_PT_GNU_EH_FRAME - #endif - - #if defined(USE_PT_GNU_EH_FRAME) -Index: b/libgomp/config/posix/time.c -=================================================================== ---- a/libgomp/config/posix/time.c -+++ b/libgomp/config/posix/time.c -@@ -28,6 +28,8 @@ - The following implementation uses the most simple POSIX routines. - If present, POSIX 4 clocks should be used instead. */ - -+#define _POSIX_C_SOURCE 199309L /* for clocks */ -+ - #include "libgomp.h" - #include - #if TIME_WITH_SYS_TIME -Index: b/libitm/config/arm/hwcap.cc -=================================================================== ---- a/libitm/config/arm/hwcap.cc -+++ b/libitm/config/arm/hwcap.cc -@@ -40,7 +40,11 @@ - - #ifdef __linux__ - #include -+#ifdef __GLIBC__ - #include -+#else -+#include -+#endif - #include - - static void __attribute__((constructor)) -Index: b/libitm/config/linux/x86/tls.h -=================================================================== ---- a/libitm/config/linux/x86/tls.h -+++ b/libitm/config/linux/x86/tls.h -@@ -25,16 +25,19 @@ - #ifndef LIBITM_X86_TLS_H - #define LIBITM_X86_TLS_H 1 - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - /* Use slots in the TCB head rather than __thread lookups. - GLIBC has reserved words 10 through 13 for TM. */ - #define HAVE_ARCH_GTM_THREAD 1 - #define HAVE_ARCH_GTM_THREAD_DISP 1 - #endif -+#endif - - #include "config/generic/tls.h" - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - namespace GTM HIDDEN { - - #ifdef __x86_64__ -@@ -101,5 +104,6 @@ - - } // namespace GTM - #endif /* >= GLIBC 2.10 */ -+#endif - - #endif // LIBITM_X86_TLS_H -Index: b/libstdc++-v3/configure.host -=================================================================== ---- a/libstdc++-v3/configure.host -+++ b/libstdc++-v3/configure.host -@@ -266,6 +266,13 @@ - os_include_dir="os/bsd/freebsd" - ;; - gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) -+ # check for musl by target -+ case "${host_os}" in -+ *-musl*) -+ os_include_dir="os/generic" -+ ;; -+ *) -+ - if [ "$uclibc" = "yes" ]; then - os_include_dir="os/uclibc" - elif [ "$bionic" = "yes" ]; then -@@ -274,6 +281,9 @@ - os_include_dir="os/gnu-linux" - fi - ;; -+ -+ esac -+ ;; - hpux*) - os_include_dir="os/hpux" - ;; -Index: b/gcc/config/mips/linux64.h -=================================================================== ---- a/gcc/config/mips/linux64.h -+++ b/gcc/config/mips/linux64.h -@@ -41,4 +41,4 @@ - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ -- BIONIC_DYNAMIC_LINKERN32) -+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER) -Index: b/gcc/config/mips/linux.h -=================================================================== ---- a/gcc/config/mips/linux.h -+++ b/gcc/config/mips/linux.h -@@ -23,3 +23,11 @@ - #undef UCLIBC_DYNAMIC_LINKER - #define UCLIBC_DYNAMIC_LINKER \ - "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}" -+ -+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ -+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" -+#endif -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" diff --git a/buildroot/package/gcc/4.9.4/901-microblaze-uclibc.patch b/buildroot/package/gcc/4.9.4/901-microblaze-uclibc.patch deleted file mode 100644 index 82c44e149..000000000 --- a/buildroot/package/gcc/4.9.4/901-microblaze-uclibc.patch +++ /dev/null @@ -1,21 +0,0 @@ -Add dynamic linker support for uClibc - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.9.3.orig/gcc/config/microblaze/linux.h gcc-4.9.3/gcc/config/microblaze/linux.h ---- gcc-4.9.3.orig/gcc/config/microblaze/linux.h 2016-06-04 21:21:09.430646655 +0200 -+++ gcc-4.9.3/gcc/config/microblaze/linux.h 2016-06-04 21:21:44.596003509 +0200 -@@ -36,10 +36,13 @@ - - #undef MUSL_DYNAMIC_LINKER - #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" -+#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - - #if DEFAULT_LIBC == LIBC_MUSL - #define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER -+#elif DEFAULT_LIBC == LIBC_UCLIBC -+#define DYNAMIC_LINKER UCLIBC_DYNAMIC_LINKER - #else - #define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER - #endif diff --git a/buildroot/package/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch b/buildroot/package/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch deleted file mode 100644 index 670cf8dae..000000000 --- a/buildroot/package/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch +++ /dev/null @@ -1,14 +0,0 @@ -disable split-stack for non-thread builds - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.9.3.orig/libgcc/config/t-stack gcc-4.9.3/libgcc/config/t-stack ---- gcc-4.9.3.orig/libgcc/config/t-stack 2010-10-01 21:31:49.000000000 +0200 -+++ gcc-4.9.3/libgcc/config/t-stack 2016-03-07 01:34:32.000000000 +0100 -@@ -1,4 +1,6 @@ - # Makefile fragment to provide generic support for -fsplit-stack. - # This should be used in config.host for any host which supports - # -fsplit-stack. -+ifeq ($(enable_threads),yes) - LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c -+endif diff --git a/buildroot/package/gcc/4.9.4/940-uclinux-enable-threads.patch b/buildroot/package/gcc/4.9.4/940-uclinux-enable-threads.patch deleted file mode 100644 index 510814762..000000000 --- a/buildroot/package/gcc/4.9.4/940-uclinux-enable-threads.patch +++ /dev/null @@ -1,20 +0,0 @@ -Enable POSIX threads for uClinux targets -Reported upstream: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721 - -Signed-off-by: Waldemar Brodkorb - -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -810,6 +810,9 @@ - *-*-uclinux*) - extra_options="$extra_options gnu-user.opt" - use_gcc_stdint=wrap -+ case ${enable_threads} in -+ "" | yes | posix) thread_file='posix' ;; -+ esac - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC" - ;; - *-*-rdos*) diff --git a/buildroot/package/gcc/4.9.4/942-asan-fix-missing-include-signal-h.patch b/buildroot/package/gcc/4.9.4/942-asan-fix-missing-include-signal-h.patch deleted file mode 100644 index 5f00c04d2..000000000 --- a/buildroot/package/gcc/4.9.4/942-asan-fix-missing-include-signal-h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 205aa8e97bab553e5e6fe45896325e97962de704 Mon Sep 17 00:00:00 2001 -From: Rolf Eike Beer -Date: Wed, 8 Feb 2017 11:42:52 +0100 -Subject: [PATCH] asan: fix missing include of signal.h - -This breaks when building gcc 4.9.4 / 5.4.0 with -target_platform=powerpc-unknown-linux-gnu with glibc 2.25: - -../../../../gcc-host/libsanitizer/asan/asan_linux.cc: In function 'bool __asan::AsanInterceptsSignal(int)': -../../../../gcc-host/libsanitizer/asan/asan_linux.cc:222:20: error: 'SIGSEGV' was not declared in this scope - return signum == SIGSEGV && common_flags()->handle_segv; - -This has been verified to apply to at least 4.9.4 and up to 5.4, -the code has been reworked for gcc 6. - -Resolves (Buildroot) Bug: https://bugs.busybox.net/show_bug.cgi?id=10061 - -Upstream: https://patchwork.ozlabs.org/patch/725596/ - -Signed-off-by: Matthew Weber ---- - libsanitizer/asan/asan_linux.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc -index c504168..59087b9 100644 ---- a/libsanitizer/asan/asan_linux.cc -+++ b/libsanitizer/asan/asan_linux.cc -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/buildroot/package/gcc/4.9.4/943-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch b/buildroot/package/gcc/4.9.4/943-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch deleted file mode 100644 index 526346c6f..000000000 --- a/buildroot/package/gcc/4.9.4/943-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch +++ /dev/null @@ -1,190 +0,0 @@ -From b7e85069238c40eae54d0ca03ab6d5470d1815f9 Mon Sep 17 00:00:00 2001 -From: jsm28 -Date: Tue, 4 Jul 2017 10:25:10 +0000 -Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files. - -Current glibc no longer gives the ucontext_t type the tag struct -ucontext, to conform with POSIX namespace rules. This requires -various linux-unwind.h files in libgcc, that were previously using -struct ucontext, to be fixed to use ucontext_t instead. This is -similar to the removal of the struct siginfo tag from siginfo_t some -years ago. - -This patch changes those files to use ucontext_t instead. As the -standard name that should be unconditionally safe, so this is not -restricted to architectures supported by glibc, or conditioned on the -glibc version. - -Tested compilation together with current glibc with glibc's -build-many-glibcs.py. - - * config/aarch64/linux-unwind.h (aarch64_fallback_frame_state), - config/alpha/linux-unwind.h (alpha_fallback_frame_state), - config/bfin/linux-unwind.h (bfin_fallback_frame_state), - config/i386/linux-unwind.h (x86_64_fallback_frame_state, - x86_fallback_frame_state), config/m68k/linux-unwind.h (struct - uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext), - config/pa/linux-unwind.h (pa32_fallback_frame_state), - config/sh/linux-unwind.h (sh_fallback_frame_state), - config/tilepro/linux-unwind.h (tile_fallback_frame_state), - config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use - ucontext_t instead of struct ucontext. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@249958 138bc75d-0d04-0410-961f-82ee72b054a4 -[Romain backport from gcc-5-branch] -Signed-off-by: Romain Naour ---- - libgcc/config/aarch64/linux-unwind.h | 2 +- - libgcc/config/alpha/linux-unwind.h | 2 +- - libgcc/config/bfin/linux-unwind.h | 2 +- - libgcc/config/i386/linux-unwind.h | 4 ++-- - libgcc/config/m68k/linux-unwind.h | 2 +- - libgcc/config/nios2/linux-unwind.h | 2 +- - libgcc/config/pa/linux-unwind.h | 2 +- - libgcc/config/sh/linux-unwind.h | 2 +- - libgcc/config/tilepro/linux-unwind.h | 2 +- - libgcc/config/xtensa/linux-unwind.h | 2 +- - 10 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h -index 6b5b3cd..d13dc34 100644 ---- a/libgcc/config/aarch64/linux-unwind.h -+++ b/libgcc/config/aarch64/linux-unwind.h -@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context, - struct rt_sigframe - { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - }; - - struct rt_sigframe *rt_; -diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h -index b5bfd1c..166d3d2 100644 ---- a/libgcc/config/alpha/linux-unwind.h -+++ b/libgcc/config/alpha/linux-unwind.h -@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - sc = &rt_->uc.uc_mcontext; - } -diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h -index dc58f0a..8b94568 100644 ---- a/libgcc/config/bfin/linux-unwind.h -+++ b/libgcc/config/bfin/linux-unwind.h -@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, - void *puc; - char retcode[8]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - - /* The void * cast is necessary to avoid an aliasing warning. -diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h -index 7986928..a9d621c 100644 ---- a/libgcc/config/i386/linux-unwind.h -+++ b/libgcc/config/i386/linux-unwind.h -@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, - if (*(unsigned char *)(pc+0) == 0x48 - && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) - { -- struct ucontext *uc_ = context->cfa; -+ ucontext_t *uc_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem - because it does not alias anything. */ -@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context, - siginfo_t *pinfo; - void *puc; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h -index 1ba2a0c4..d67767e 100644 ---- a/libgcc/config/m68k/linux-unwind.h -+++ b/libgcc/config/m68k/linux-unwind.h -@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - /* is unfortunately broken right now. */ - struct uw_ucontext { - unsigned long uc_flags; -- struct ucontext *uc_link; -+ ucontext_t *uc_link; - stack_t uc_stack; - mcontext_t uc_mcontext; - unsigned long uc_filler[80]; -diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h -index ba4bd80..8978868 100644 ---- a/libgcc/config/nios2/linux-unwind.h -+++ b/libgcc/config/nios2/linux-unwind.h -@@ -38,7 +38,7 @@ struct nios2_mcontext { - - struct nios2_ucontext { - unsigned long uc_flags; -- struct ucontext *uc_link; -+ ucontext_t *uc_link; - stack_t uc_stack; - struct nios2_mcontext uc_mcontext; - sigset_t uc_sigmask; /* mask last for extensibility */ -diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h -index 4a3cfff..d2ac437 100644 ---- a/libgcc/config/pa/linux-unwind.h -+++ b/libgcc/config/pa/linux-unwind.h -@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, - struct sigcontext *sc; - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *frame; - - /* rt_sigreturn trampoline: -diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h -index 4875706..671bde7 100644 ---- a/libgcc/config/sh/linux-unwind.h -+++ b/libgcc/config/sh/linux-unwind.h -@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h -index 27481cf..c24d58c 100644 ---- a/libgcc/config/tilepro/linux-unwind.h -+++ b/libgcc/config/tilepro/linux-unwind.h -@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context, - struct rt_sigframe { - unsigned char save_area[C_ABI_SAVE_AREA_SIZE]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_; - - /* Return if this is not a signal handler. */ -diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h -index 6832d0b..cb15b4c 100644 ---- a/libgcc/config/xtensa/linux-unwind.h -+++ b/libgcc/config/xtensa/linux-unwind.h -@@ -63,7 +63,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, - - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_; - - /* movi a2, __NR_rt_sigreturn; syscall */ --- -2.9.5 - diff --git a/buildroot/package/gcc/4.9.4/944-sanitizer-linux.patch b/buildroot/package/gcc/4.9.4/944-sanitizer-linux.patch deleted file mode 100644 index caadf2de7..000000000 --- a/buildroot/package/gcc/4.9.4/944-sanitizer-linux.patch +++ /dev/null @@ -1,88 +0,0 @@ -From f9a35ba5c150da2e381c4cab01f8f12bcd6af5d2 Mon Sep 17 00:00:00 2001 -From: jakub -Date: Mon, 17 Jul 2017 19:41:08 +0000 -Subject: [PATCH] Backported from mainline 2017-07-14 Jakub - Jelinek - - PR sanitizer/81066 - * sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969. - * sanitizer_common/sanitizer_linux.cc: Likewise. - * sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise. - * tsan/tsan_platform_linux.cc: Likewise. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@250287 138bc75d-0d04-0410-961f-82ee72b054a4 -(cherry picked from commit 72edc2c02f8b4768ad660f46a1c7e2400c0a8e06) -[Romain backport to 4.9.4] -Signed-off-by: Romain Naour ---- - libsanitizer/sanitizer_common/sanitizer_linux.cc | 3 +-- - libsanitizer/sanitizer_common/sanitizer_linux.h | 4 +--- - libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +- - libsanitizer/tsan/tsan_platform_linux.cc | 2 +- - 4 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc -index 69c9c10..8e53673 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_linux.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc -@@ -599,8 +599,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { - return internal_syscall(__NR_prctl, option, arg2, arg3, arg4, arg5); - } - --uptr internal_sigaltstack(const struct sigaltstack *ss, -- struct sigaltstack *oss) { -+uptr internal_sigaltstack(const void *ss, void *oss) { - return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss); - } - -diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h -index 6422df1..8e111d1 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_linux.h -+++ b/libsanitizer/sanitizer_common/sanitizer_linux.h -@@ -18,7 +18,6 @@ - #include "sanitizer_platform_limits_posix.h" - - struct link_map; // Opaque type returned by dlopen(). --struct sigaltstack; - - namespace __sanitizer { - // Dirent structure for getdents(). Note that this structure is different from -@@ -28,8 +27,7 @@ struct linux_dirent; - // Syscall wrappers. - uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); - uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5); --uptr internal_sigaltstack(const struct sigaltstack* ss, -- struct sigaltstack* oss); -+uptr internal_sigaltstack(const void* ss, void* oss); - uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act, - __sanitizer_kernel_sigaction_t *oldact); - uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set, -diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -index 6ee63ec..50c21a3 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -@@ -238,7 +238,7 @@ static int TracerThread(void* argument) { - - // Alternate stack for signal handling. - InternalScopedBuffer handler_stack_memory(kHandlerStackSize); -- struct sigaltstack handler_stack; -+ stack_t handler_stack; - internal_memset(&handler_stack, 0, sizeof(handler_stack)); - handler_stack.ss_sp = handler_stack_memory.data(); - handler_stack.ss_size = kHandlerStackSize; -diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc -index fe69430..49f5270 100644 ---- a/libsanitizer/tsan/tsan_platform_linux.cc -+++ b/libsanitizer/tsan/tsan_platform_linux.cc -@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) { - // closes within glibc. The code is a pure hack. - int ExtractResolvFDs(void *state, int *fds, int nfd) { - int cnt = 0; -- __res_state *statp = (__res_state*)state; -+ struct __res_state *statp = (struct __res_state*)state; - for (int i = 0; i < MAXNS && cnt < nfd; i++) { - if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) - fds[cnt++] = statp->_u._ext.nssocks[i]; --- -2.9.5 - diff --git a/buildroot/package/gcc/6.5.0/0001-m68k-coldfire-pr68467.patch b/buildroot/package/gcc/6.5.0/0001-m68k-coldfire-pr68467.patch deleted file mode 100644 index afc18a508..000000000 --- a/buildroot/package/gcc/6.5.0/0001-m68k-coldfire-pr68467.patch +++ /dev/null @@ -1,48 +0,0 @@ -Backport from upstream, see -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-6.4.0.orig/gcc/config/m68k/m68k.c gcc-6.4.0/gcc/config/m68k/m68k.c ---- gcc-6.4.0.orig/gcc/config/m68k/m68k.c 2016-01-04 15:30:50.652828000 +0100 -+++ gcc-6.4.0/gcc/config/m68k/m68k.c 2018-02-17 19:08:16.313168186 +0100 -@@ -180,6 +180,8 @@ - const_tree, bool); - static bool m68k_cannot_force_const_mem (machine_mode mode, rtx x); - static bool m68k_output_addr_const_extra (FILE *, rtx); -+static machine_mode m68k_promote_function_mode (const_tree, machine_mode, -+ int *, const_tree, int); - static void m68k_init_sync_libfuncs (void) ATTRIBUTE_UNUSED; - - /* Initialize the GCC target structure. */ -@@ -322,6 +324,9 @@ - #undef TARGET_ATOMIC_TEST_AND_SET_TRUEVAL - #define TARGET_ATOMIC_TEST_AND_SET_TRUEVAL 128 - -+#undef TARGET_PROMOTE_FUNCTION_MODE -+#define TARGET_PROMOTE_FUNCTION_MODE m68k_promote_function_mode -+ - static const struct attribute_spec m68k_attribute_table[] = - { - /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler, -@@ -6524,4 +6529,20 @@ - == m68k_fk_interrupt_handler)); - } - -+/* Implement TARGET_PROMOTE_FUNCTION_MODE. */ -+ -+static machine_mode -+m68k_promote_function_mode (const_tree type, machine_mode mode, -+ int *punsignedp ATTRIBUTE_UNUSED, -+ const_tree fntype ATTRIBUTE_UNUSED, -+ int for_return) -+{ -+ /* Promote libcall arguments narrower than int to match the normal C -+ ABI (for which promotions are handled via -+ TARGET_PROMOTE_PROTOTYPES). */ -+ if (type == NULL_TREE && !for_return && (mode == QImode || mode == HImode)) -+ return SImode; -+ return mode; -+} -+ - #include "gt-m68k.h" diff --git a/buildroot/package/gcc/6.5.0/0004-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch b/buildroot/package/gcc/6.5.0/0004-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch deleted file mode 100644 index 360947cbb..000000000 --- a/buildroot/package/gcc/6.5.0/0004-gcc-xtensa-don-t-force-PIC-for-uclinux-target.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 960a2552f7b418134cdf7a31e96023a3811b98dd Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 4 Nov 2018 23:55:59 -0800 -Subject: [PATCH] gcc: xtensa: don't force PIC for uclinux target - -xtensa-uclinux uses bFLT executable file format that cannot relocate -fields representing offsets from data to code. C++ objects built as PIC -use offsets to encode FDE structures. As a result C++ exception handling -doesn't work correctly on xtensa-uclinux. Don't use PIC by default on -xtensa-uclinux. - -gcc/ -2018-11-05 Max Filippov - - * config/xtensa/uclinux.h (XTENSA_ALWAYS_PIC): Change to 0. - -Signed-off-by: Max Filippov ---- -Backported from: r265823 - - gcc/config/xtensa/uclinux.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h -index ba26187c8f7a..c7743df9d97c 100644 ---- a/gcc/config/xtensa/uclinux.h -+++ b/gcc/config/xtensa/uclinux.h -@@ -59,8 +59,8 @@ along with GCC; see the file COPYING3. If not see - #undef LOCAL_LABEL_PREFIX - #define LOCAL_LABEL_PREFIX "." - --/* Always enable "-fpic" for Xtensa Linux. */ --#define XTENSA_ALWAYS_PIC 1 -+/* Don't enable "-fpic" for Xtensa uclinux. */ -+#define XTENSA_ALWAYS_PIC 0 - - #undef TARGET_LIBC_HAS_FUNCTION - #define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function --- -2.11.0 - diff --git a/buildroot/package/gcc/6.5.0/100-uclibc-conf.patch b/buildroot/package/gcc/6.5.0/100-uclibc-conf.patch deleted file mode 100644 index 73d1f0d3a..000000000 --- a/buildroot/package/gcc/6.5.0/100-uclibc-conf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: b/contrib/regression/objs-gcc.sh -=================================================================== ---- a/contrib/regression/objs-gcc.sh -+++ b/contrib/regression/objs-gcc.sh -@@ -106,6 +106,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 diff --git a/buildroot/package/gcc/6.5.0/301-missing-execinfo_h.patch b/buildroot/package/gcc/6.5.0/301-missing-execinfo_h.patch deleted file mode 100644 index 2d0e7baa4..000000000 --- a/buildroot/package/gcc/6.5.0/301-missing-execinfo_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/boehm-gc/include/gc.h -=================================================================== ---- a/boehm-gc/include/gc.h -+++ b/boehm-gc/include/gc.h -@@ -503,7 +503,7 @@ - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/buildroot/package/gcc/6.5.0/810-arm-softfloat-libgcc.patch b/buildroot/package/gcc/6.5.0/810-arm-softfloat-libgcc.patch deleted file mode 100644 index 5efa7fd1b..000000000 --- a/buildroot/package/gcc/6.5.0/810-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: b/gcc/config/arm/linux-elf.h -=================================================================== ---- a/gcc/config/arm/linux-elf.h -+++ b/gcc/config/arm/linux-elf.h -@@ -60,7 +60,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - -Index: b/libgcc/config/arm/t-linux -=================================================================== ---- a/libgcc/config/arm/t-linux -+++ b/libgcc/config/arm/t-linux -@@ -1,6 +1,11 @@ - LIB1ASMSRC = arm/lib1funcs.S - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 -+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # Just for these, we omit the frame pointer since it makes such a big - # difference. diff --git a/buildroot/package/gcc/6.5.0/830-arm_unbreak_armv4t.patch b/buildroot/package/gcc/6.5.0/830-arm_unbreak_armv4t.patch deleted file mode 100644 index b73005918..000000000 --- a/buildroot/package/gcc/6.5.0/830-arm_unbreak_armv4t.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00009.html - -Index: b/gcc/config/arm/linux-eabi.h -=================================================================== ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -45,7 +45,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/buildroot/package/gcc/6.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/buildroot/package/gcc/6.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch deleted file mode 100644 index af9fb1d6b..000000000 --- a/buildroot/package/gcc/6.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 07453188b18a2cbe815917dbb893b4ebfdd793b6 Mon Sep 17 00:00:00 2001 -From: ktkachov -Date: Fri, 26 Aug 2016 10:23:20 +0000 -Subject: [PATCH] [ARM] PR target/70473: Reduce size of Cortex-A8 automaton - - PR target/70473 - * config/arm/cortex-a8-neon.md (cortex_a8_vfp_muld): Reduce - reservation duration to 15 cycles. - (cortex_a8_vfp_macs): Likewise. - (cortex_a8_vfp_macd): Likewise. - (cortex_a8_vfp_divs): Likewise. - (cortex_a8_vfp_divd): Likewise. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239772 -138bc75d-0d04-0410-961f-82ee72b054a4 - -[Backport from gcc upstream commit 79f5d5e3cd5a668d5ecb2b6b0cce80ef5706ac53.] -Signed-off-by: Thomas Petazzoni ---- - gcc/config/arm/cortex-a8-neon.md | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/gcc/config/arm/cortex-a8-neon.md b/gcc/config/arm/cortex-a8-neon.md -index 45f861f..b16c299 100644 ---- a/gcc/config/arm/cortex-a8-neon.md -+++ b/gcc/config/arm/cortex-a8-neon.md -@@ -357,30 +357,34 @@ - (eq_attr "type" "fmuls")) - "cortex_a8_vfp,cortex_a8_vfplite*11") - -+;; Don't model a reservation for more than 15 cycles as this explodes the -+;; state space of the automaton for little gain. It is unlikely that the -+;; scheduler will find enough instructions to hide the full latency of the -+;; instructions. - (define_insn_reservation "cortex_a8_vfp_muld" 17 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fmuld")) -- "cortex_a8_vfp,cortex_a8_vfplite*16") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_macs" 21 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fmacs,ffmas")) -- "cortex_a8_vfp,cortex_a8_vfplite*20") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_macd" 26 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fmacd,ffmad")) -- "cortex_a8_vfp,cortex_a8_vfplite*25") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_divs" 37 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fdivs, fsqrts")) -- "cortex_a8_vfp,cortex_a8_vfplite*36") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_divd" 65 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fdivd, fsqrtd")) -- "cortex_a8_vfp,cortex_a8_vfplite*64") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - ;; Comparisons can actually take 7 cycles sometimes instead of four, - ;; but given all the other instructions lumped into type=ffarith that --- -2.7.4 - diff --git a/buildroot/package/gcc/6.5.0/860-cilk-wchar.patch b/buildroot/package/gcc/6.5.0/860-cilk-wchar.patch deleted file mode 100644 index 1d9916f55..000000000 --- a/buildroot/package/gcc/6.5.0/860-cilk-wchar.patch +++ /dev/null @@ -1,56 +0,0 @@ -[PATCH] cilk: fix build without wchar - -When building against uClibc with wchar support disabled, WCHAR_MIN and -WCHAR_MAX are not defined leading to compilation errors. - -Fix it by only including the wchar code if available. - -Signed-off-by: Peter Korsgaard ---- - libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -Index: b/libcilkrts/include/cilk/reducer_min_max.h -=================================================================== ---- a/libcilkrts/include/cilk/reducer_min_max.h -+++ b/libcilkrts/include/cilk/reducer_min_max.h -@@ -3154,7 +3154,9 @@ - CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) -@@ -3306,7 +3308,9 @@ - CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) -@@ -3432,7 +3436,9 @@ - CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) -@@ -3584,7 +3590,9 @@ - CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) diff --git a/buildroot/package/gcc/6.5.0/890-fix-m68k-compile.patch b/buildroot/package/gcc/6.5.0/890-fix-m68k-compile.patch deleted file mode 100644 index 6e63de0cd..000000000 --- a/buildroot/package/gcc/6.5.0/890-fix-m68k-compile.patch +++ /dev/null @@ -1,15 +0,0 @@ -remove unused header, which breaks the toolchain building - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c ---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c 2015-01-05 13:33:28.000000000 +0100 -+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c 2016-03-19 09:25:07.000000000 +0100 -@@ -33,7 +33,6 @@ - using the kernel helper defined below. There is no support for - 64-bit operations yet. */ - --#include - #include - - #ifndef __NR_atomic_cmpxchg_32 diff --git a/buildroot/package/gcc/6.5.0/896-microblaze-Revert.patch b/buildroot/package/gcc/6.5.0/896-microblaze-Revert.patch deleted file mode 100644 index 7026d0efe..000000000 --- a/buildroot/package/gcc/6.5.0/896-microblaze-Revert.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 707a69dfb56a2976e2b5c010f0e5cb2ac9905a07 Mon Sep 17 00:00:00 2001 -From: eager -Date: Sat, 27 May 2017 18:29:40 +0000 -Subject: [PATCH] Revert: 2016-01-21 Ajit Agarwal - - - See https://gcc.gnu.org/ml/gcc/2017-05/msg00221.html. - - * config/microblaze/microblaze.h - (FIXED_REGISTERS): Update in macro. - (CALL_USED_REGISTERS): Update in macro. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248540 138bc75d-0d04-0410-961f-82ee72b054a4 -Signed-off-by: Waldemar Brodkorb -diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h -index 66e4ef5..2c9ece1 100644 ---- a/gcc/config/microblaze/microblaze.h -+++ b/gcc/config/microblaze/microblaze.h -@@ -269,14 +269,14 @@ extern enum pipeline_type microblaze_pipe; - #define FIXED_REGISTERS \ - { \ - 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, \ -- 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ -+ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ - 1, 1, 1, 1 \ - } - - #define CALL_USED_REGISTERS \ - { \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ -- 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ -+ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ - 1, 1, 1, 1 \ - } - #define GP_REG_FIRST 0 --- -2.1.4 - diff --git a/buildroot/package/gcc/6.5.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch b/buildroot/package/gcc/6.5.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch deleted file mode 100644 index 1f2dcabed..000000000 --- a/buildroot/package/gcc/6.5.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 81aab124bc697a87ad492d4cd3380599c0e0747e Mon Sep 17 00:00:00 2001 -From: jsm28 -Date: Fri, 6 Jan 2017 20:54:34 +0000 -Subject: [PATCH] Make MicroBlaze support DWARF EH (old Xilinx patch, needed - for glibc build). - -This patch, taken from - -and with a few formatting cleanups and an update for the removal of -gen_rtx_raw_REG, enables DWARF EH support for MicroBlaze. - -This is needed for building glibc with a compiler that includes shared -libgcc; right now all glibc builds for MicroBlaze are failing with my -bot for lack of this support. (It's dubious if we should have glibc -ports at all where required support is missing in FSF GCC.) - -Tested building glibc with build-many-glibcs.py. I have *not* done -any other testing or any execution testing for MicroBlaze. - -2017-01-06 Edgar E. Iglesias - David Holsgrove - - * common/config/microblaze/microblaze-common.c - (TARGET_EXCEPT_UNWIND_INFO): Remove. - * config/microblaze/microblaze-protos.h (microblaze_eh_return): - New prototype. - * config/microblaze/microblaze.c (microblaze_must_save_register) - (microblaze_expand_epilogue, microblaze_return_addr): Handle - calls_eh_return. - (microblaze_eh_return): New function. - * config/microblaze/microblaze.h (RETURN_ADDR_OFFSET) - (EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM) - (EH_RETURN_STACKADJ_RTX, ASM_PREFERRED_EH_DATA_FORMAT): New macros. - * config/microblaze/microblaze.md (eh_return): New pattern. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244183 138bc75d-0d04-0410-961f-82ee72b054a4 -Signed-off-by: Waldemar Brodkorb ---- - gcc/common/config/microblaze/microblaze-common.c | 3 --- - gcc/config/microblaze/microblaze-protos.h | 1 + - gcc/config/microblaze/microblaze.c | 27 ++++++++++++++++++++---- - gcc/config/microblaze/microblaze.h | 16 ++++++++++++++ - gcc/config/microblaze/microblaze.md | 10 +++++++++ - 6 files changed, 66 insertions(+), 7 deletions(-) - -diff --git a/gcc/common/config/microblaze/microblaze-common.c b/gcc/common/config/microblaze/microblaze-common.c -index 57a3099..4975663 100644 ---- a/gcc/common/config/microblaze/microblaze-common.c -+++ b/gcc/common/config/microblaze/microblaze-common.c -@@ -37,7 +37,4 @@ static const struct default_options microblaze_option_optimization_table[] = - #undef TARGET_OPTION_OPTIMIZATION_TABLE - #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table - --#undef TARGET_EXCEPT_UNWIND_INFO --#define TARGET_EXCEPT_UNWIND_INFO sjlj_except_unwind_info -- - struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER; -diff --git a/gcc/config/microblaze/microblaze-protos.h b/gcc/config/microblaze/microblaze-protos.h -index 6fb3066..9ba8f2d 100644 ---- a/gcc/config/microblaze/microblaze-protos.h -+++ b/gcc/config/microblaze/microblaze-protos.h -@@ -57,6 +57,7 @@ extern bool microblaze_tls_referenced_p (rtx); - extern int symbol_mentioned_p (rtx); - extern int label_mentioned_p (rtx); - extern bool microblaze_cannot_force_const_mem (machine_mode, rtx); -+extern void microblaze_eh_return (rtx op0); - #endif /* RTX_CODE */ - - /* Declare functions in microblaze-c.c. */ -diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c -index 03b70e1..746bef1 100644 ---- a/gcc/config/microblaze/microblaze.c -+++ b/gcc/config/microblaze/microblaze.c -@@ -1926,6 +1926,10 @@ microblaze_must_save_register (int regno) - if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM)) - return 1; - -+ if (crtl->calls_eh_return -+ && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) -+ return 1; -+ - if (!crtl->is_leaf) - { - if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) -@@ -1953,6 +1957,11 @@ microblaze_must_save_register (int regno) - return 1; - } - -+ if (crtl->calls_eh_return -+ && (regno == EH_RETURN_DATA_REGNO (0) -+ || regno == EH_RETURN_DATA_REGNO (1))) -+ return 1; -+ - return 0; - } - -@@ -3029,6 +3038,12 @@ microblaze_expand_epilogue (void) - emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx)); - } - -+ if (crtl->calls_eh_return) -+ emit_insn (gen_addsi3 (stack_pointer_rtx, -+ stack_pointer_rtx, -+ gen_raw_REG (SImode, -+ MB_EH_STACKADJ_REGNUM))); -+ - emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST + - MB_ABI_SUB_RETURN_ADDR_REGNUM))); - } -@@ -3326,10 +3341,14 @@ microblaze_return_addr (int count, rtx frame ATTRIBUTE_UNUSED) - if (count != 0) - return NULL_RTX; - -- return gen_rtx_PLUS (Pmode, -- get_hard_reg_initial_val (Pmode, -- MB_ABI_SUB_RETURN_ADDR_REGNUM), -- GEN_INT (8)); -+ return get_hard_reg_initial_val (Pmode, -+ MB_ABI_SUB_RETURN_ADDR_REGNUM); -+} -+ -+void -+microblaze_eh_return (rtx op0) -+{ -+ emit_insn (gen_movsi (gen_rtx_MEM (Pmode, stack_pointer_rtx), op0)); - } - - /* Queue an .ident string in the queue of top-level asm statements. -diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h -index 527f4d3..8fdadbf 100644 ---- a/gcc/config/microblaze/microblaze.h -+++ b/gcc/config/microblaze/microblaze.h -@@ -184,6 +184,22 @@ extern enum pipeline_type microblaze_pipe; - #define INCOMING_RETURN_ADDR_RTX \ - gen_rtx_REG (Pmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM) - -+/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC. */ -+#define RETURN_ADDR_OFFSET (8) -+ -+/* Describe how we implement __builtin_eh_return. */ -+#define EH_RETURN_DATA_REGNO(N) \ -+ (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM) -+ -+#define MB_EH_STACKADJ_REGNUM MB_ABI_INT_RETURN_VAL2_REGNUM -+#define EH_RETURN_STACKADJ_RTX gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM) -+ -+/* Select a format to encode pointers in exception handling data. CODE -+ is 0 for data, 1 for code labels, 2 for function pointers. GLOBAL is -+ true if the symbol may be affected by dynamic relocations. */ -+#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \ -+ ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr) -+ - /* Use DWARF 2 debugging information by default. */ - #define DWARF2_DEBUGGING_INFO - #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG -diff --git a/gcc/config/microblaze/microblaze.md b/gcc/config/microblaze/microblaze.md -index 8f83daa..66ebc1e 100644 ---- a/gcc/config/microblaze/microblaze.md -+++ b/gcc/config/microblaze/microblaze.md -@@ -2324,4 +2324,14 @@ - (set_attr "mode" "SI") - (set_attr "length" "4")]) - -+; This is used in compiling the unwind routines. -+(define_expand "eh_return" -+ [(use (match_operand 0 "general_operand" ""))] -+ "" -+ " -+{ -+ microblaze_eh_return (operands[0]); -+ DONE; -+}") -+ - (include "sync.md") --- -2.1.4 - diff --git a/buildroot/package/gcc/6.5.0/940-uclinux-enable-threads.patch b/buildroot/package/gcc/6.5.0/940-uclinux-enable-threads.patch deleted file mode 100644 index 553265672..000000000 --- a/buildroot/package/gcc/6.5.0/940-uclinux-enable-threads.patch +++ /dev/null @@ -1,19 +0,0 @@ -Enable POSIX threads for uClinux targets -Reported upstream: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-6.1.0.orig/gcc/config.gcc gcc-6.1.0/gcc/config.gcc ---- gcc-6.1.0.orig/gcc/config.gcc 2016-04-11 12:14:59.000000000 +0200 -+++ gcc-6.1.0/gcc/config.gcc 2016-07-02 20:04:25.732169982 +0200 -@@ -833,6 +833,9 @@ - *-*-uclinux*) - extra_options="$extra_options gnu-user.opt" - use_gcc_stdint=wrap -+ case ${enable_threads} in -+ "" | yes | posix) thread_file='posix' ;; -+ esac - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC" - ;; - *-*-rdos*) diff --git a/buildroot/package/gcc/6.5.0/941-mips-Add-support-for-mips-r6-musl.patch b/buildroot/package/gcc/6.5.0/941-mips-Add-support-for-mips-r6-musl.patch deleted file mode 100644 index 337d376b7..000000000 --- a/buildroot/package/gcc/6.5.0/941-mips-Add-support-for-mips-r6-musl.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 83717065090bb8b954556d1216dd9dc397dc0243 Mon Sep 17 00:00:00 2001 -From: nsz -Date: Thu, 25 Aug 2016 14:13:02 +0000 -Subject: [PATCH] [mips] Add support for mips*r6-*-musl - -gcc/ - * config/mips/linux.h (MUSL_DYNAMIC_LINKER32): Update. - (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERN32): Update. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239760 138bc75d-0d04-0410-961f-82ee72b054a4 - -[Vincent: tweak to not patch ChangeLog] - -Signed-off-by: Vicente Olivert Riera ---- - gcc/config/mips/linux.h | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h -index fa253b6..dc51c45 100644 ---- a/gcc/config/mips/linux.h -+++ b/gcc/config/mips/linux.h -@@ -38,10 +38,13 @@ along with GCC; see the file COPYING3. If not see - "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" - - #undef MUSL_DYNAMIC_LINKER32 --#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKER32 \ -+ "/lib/ld-musl-mips%{mips32r6|mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" - #undef MUSL_DYNAMIC_LINKER64 --#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1" --#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKER64 \ -+ "/lib/ld-musl-mips64%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKERN32 \ -+ "/lib/ld-musl-mipsn32%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" - - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ --- -2.10.0 - diff --git a/buildroot/package/gcc/7.4.0/0810-arm-softfloat-libgcc.patch b/buildroot/package/gcc/7.4.0/0810-arm-softfloat-libgcc.patch deleted file mode 100644 index 63880dd09..000000000 --- a/buildroot/package/gcc/7.4.0/0810-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 420a304ac0daa29d66da6ed5b0b49fc4c482d522 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 2 May 2017 22:46:18 +0200 -Subject: [PATCH] arm softfloat libgcc - -[Romain: convert to git patch] -Signed-off-by: Romain Naour ---- - gcc/config/arm/linux-elf.h | 2 +- - libgcc/config/arm/t-linux | 7 ++++++- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h -index 3d62367..dad0b97 100644 ---- a/gcc/config/arm/linux-elf.h -+++ b/gcc/config/arm/linux-elf.h -@@ -58,7 +58,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - -diff --git a/libgcc/config/arm/t-linux b/libgcc/config/arm/t-linux -index 3d520de..e7bc042 100644 ---- a/libgcc/config/arm/t-linux -+++ b/libgcc/config/arm/t-linux -@@ -1,6 +1,11 @@ - LIB1ASMSRC = arm/lib1funcs.S - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 -+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # Just for these, we omit the frame pointer since it makes such a big - # difference. --- -2.9.3 - diff --git a/buildroot/package/gcc/7.4.0/0860-cilk-fix-build-without-wchar.patch b/buildroot/package/gcc/7.4.0/0860-cilk-fix-build-without-wchar.patch deleted file mode 100644 index 61ab01c71..000000000 --- a/buildroot/package/gcc/7.4.0/0860-cilk-fix-build-without-wchar.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 714739e69ead1d9823233af40645277f6d4633ea Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Tue, 2 May 2017 23:21:46 +0200 -Subject: [PATCH] cilk: fix build without wchar - -When building against uClibc with wchar support disabled, WCHAR_MIN and -WCHAR_MAX are not defined leading to compilation errors. - -Fix it by only including the wchar code if available. - -Signed-off-by: Peter Korsgaard -[Romain: convert to git patch] -Signed-off-by: Romain Naour ---- - libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libcilkrts/include/cilk/reducer_min_max.h b/libcilkrts/include/cilk/reducer_min_max.h -index 641aa82..4f8e010 100644 ---- a/libcilkrts/include/cilk/reducer_min_max.h -+++ b/libcilkrts/include/cilk/reducer_min_max.h -@@ -3289,7 +3289,9 @@ __CILKRTS_BEGIN_EXTERN_C - CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) -@@ -3441,7 +3443,9 @@ __CILKRTS_BEGIN_EXTERN_C - CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) -@@ -3567,7 +3571,9 @@ __CILKRTS_BEGIN_EXTERN_C - CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) -@@ -3719,7 +3725,9 @@ __CILKRTS_BEGIN_EXTERN_C - CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) --- -2.9.3 - diff --git a/buildroot/package/gcc/7.4.0/0892-microblaze-Revert.patch b/buildroot/package/gcc/7.4.0/0892-microblaze-Revert.patch deleted file mode 100644 index f7ea1e838..000000000 --- a/buildroot/package/gcc/7.4.0/0892-microblaze-Revert.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 707a69dfb56a2976e2b5c010f0e5cb2ac9905a07 Mon Sep 17 00:00:00 2001 -From: eager -Date: Sat, 27 May 2017 18:29:40 +0000 -Subject: [PATCH] Revert: 2016-01-21 Ajit Agarwal - - - See https://gcc.gnu.org/ml/gcc/2017-05/msg00221.html. - - * config/microblaze/microblaze.h - (FIXED_REGISTERS): Update in macro. - (CALL_USED_REGISTERS): Update in macro. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248540 138bc75d-0d04-0410-961f-82ee72b054a4 -Signed-off-by: Waldemar Brodkorb -Signed-off-by: Romain Naour -diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h -index 66e4ef5..2c9ece1 100644 ---- a/gcc/config/microblaze/microblaze.h -+++ b/gcc/config/microblaze/microblaze.h -@@ -269,14 +269,14 @@ extern enum pipeline_type microblaze_pipe; - #define FIXED_REGISTERS \ - { \ - 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, \ -- 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ -+ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ - 1, 1, 1, 1 \ - } - - #define CALL_USED_REGISTERS \ - { \ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ -- 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ -+ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ - 1, 1, 1, 1 \ - } - #define GP_REG_FIRST 0 --- -2.1.4 - diff --git a/buildroot/package/gcc/7.4.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch b/buildroot/package/gcc/7.4.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch deleted file mode 100644 index fb8509fae..000000000 --- a/buildroot/package/gcc/7.4.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch +++ /dev/null @@ -1,324 +0,0 @@ -From 1a259ac3e39bf87e6e6a5eface8b0ebc6b2a0dfe Mon Sep 17 00:00:00 2001 -From: ktkachov -Date: Tue, 5 Jun 2018 09:50:16 +0000 -Subject: [PATCH] [arm] PR target/81497: Fix arm_acle.h for C++ -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -When trying to compile something with arm_acle.h using G++ we get a number of nasty errors: -arm_acle.h:48:49: error: invalid conversion from ‘const void*’ to ‘const int*’ [-fpermissive] - return __builtin_arm_ldc (__coproc, __CRd, __p); - -This is because the intrinsics that are supposed to be void return the "result" of their builtin, -which is void. C lets that slide but C++ complains. - -After fixing that we run into further errors: -arm_acle.h:48:46: error: invalid conversion from 'const void*' to 'const int*' [-fpermissive] - return __builtin_arm_ldc (__coproc, __CRd, __p); - ^~~ -Because the pointer arguments in these intrinsics are void pointers but the builtin -expects int pointers. So this patch introduces new qualifiers for void pointers and their -const-qualified versions and uses that in the specification of these intrinsics. - -This gives us the opportunity of creating an arm subdirectory in g++.dg and inaugurates it -with the first arm-specific C++ tests (in that directory). - - - PR target/81497 - * config/arm/arm-builtins.c (arm_type_qualifiers): Add - qualifier_void_pointer and qualifier_const_void_pointer. - (arm_ldc_qualifiers, arm_stc_qualifiers): Use the above. - (arm_init_builtins): Handle the above. - * config/arm/arm_acle.h (__arm_cdp, __arm_ldc, __arm_ldcl, __arm_stc, - __arm_stcl, __arm_mcr, __arm_cdp2, __arm_ldc2, __arm_ldcl2, __arm_stc2, - __arm_stcl2,__arm_mcr2, __arm_mcrr, __arm_mcrr2): Remove return for - void intrinsics. - - * g++.target/arm/arm.exp: New file. - * g++.target/arm/pr81497.C: Likewise. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261191 138bc75d-0d04-0410-961f-82ee72b054a4 -Upstream-Status: Merged (gcc-8-branch) -Signed-off-by: Gaël PORTAY -[gportay: drop gcc/{,testsuite/}ChangeLog changes] -Signed-off-by: Romain Naour ---- - gcc/config/arm/arm-builtins.c | 42 +++++++++++++--------- - gcc/config/arm/arm_acle.h | 28 +++++++-------- - gcc/testsuite/g++.target/arm/arm.exp | 50 ++++++++++++++++++++++++++ - gcc/testsuite/g++.target/arm/pr81497.C | 9 +++++ - 4 files changed, 99 insertions(+), 30 deletions(-) - create mode 100644 gcc/testsuite/g++.target/arm/arm.exp - create mode 100644 gcc/testsuite/g++.target/arm/pr81497.C - -diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c -index 7fde7a04672..183a7b907f6 100644 ---- a/gcc/config/arm/arm-builtins.c -+++ b/gcc/config/arm/arm-builtins.c -@@ -75,7 +75,11 @@ enum arm_type_qualifiers - /* Lane indices - must be within range of previous argument = a vector. */ - qualifier_lane_index = 0x200, - /* Lane indices for single lane structure loads and stores. */ -- qualifier_struct_load_store_lane_index = 0x400 -+ qualifier_struct_load_store_lane_index = 0x400, -+ /* A void pointer. */ -+ qualifier_void_pointer = 0x800, -+ /* A const void pointer. */ -+ qualifier_const_void_pointer = 0x802 - }; - - /* The qualifier_internal allows generation of a unary builtin from -@@ -185,7 +189,7 @@ arm_cdp_qualifiers[SIMD_MAX_BUILTIN_ARGS] - static enum arm_type_qualifiers - arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS] - = { qualifier_void, qualifier_unsigned_immediate, -- qualifier_unsigned_immediate, qualifier_const_pointer }; -+ qualifier_unsigned_immediate, qualifier_const_void_pointer }; - #define LDC_QUALIFIERS \ - (arm_ldc_qualifiers) - -@@ -193,7 +197,7 @@ arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS] - static enum arm_type_qualifiers - arm_stc_qualifiers[SIMD_MAX_BUILTIN_ARGS] - = { qualifier_void, qualifier_unsigned_immediate, -- qualifier_unsigned_immediate, qualifier_pointer }; -+ qualifier_unsigned_immediate, qualifier_void_pointer }; - #define STC_QUALIFIERS \ - (arm_stc_qualifiers) - -@@ -1079,19 +1083,25 @@ arm_init_builtin (unsigned int fcode, arm_builtin_datum *d, - if (qualifiers & qualifier_pointer && VECTOR_MODE_P (op_mode)) - op_mode = GET_MODE_INNER (op_mode); - -- eltype = arm_simd_builtin_type -- (op_mode, -- (qualifiers & qualifier_unsigned) != 0, -- (qualifiers & qualifier_poly) != 0); -- gcc_assert (eltype != NULL); -- -- /* Add qualifiers. */ -- if (qualifiers & qualifier_const) -- eltype = build_qualified_type (eltype, TYPE_QUAL_CONST); -- -- if (qualifiers & qualifier_pointer) -- eltype = build_pointer_type (eltype); -- -+ /* For void pointers we already have nodes constructed by the midend. */ -+ if (qualifiers & qualifier_void_pointer) -+ eltype = qualifiers & qualifier_const -+ ? const_ptr_type_node : ptr_type_node; -+ else -+ { -+ eltype -+ = arm_simd_builtin_type (op_mode, -+ (qualifiers & qualifier_unsigned) != 0, -+ (qualifiers & qualifier_poly) != 0); -+ gcc_assert (eltype != NULL); -+ -+ /* Add qualifiers. */ -+ if (qualifiers & qualifier_const) -+ eltype = build_qualified_type (eltype, TYPE_QUAL_CONST); -+ -+ if (qualifiers & qualifier_pointer) -+ eltype = build_pointer_type (eltype); -+ } - /* If we have reached arg_num == 0, we are at a non-void - return type. Otherwise, we are still processing - arguments. */ -diff --git a/gcc/config/arm/arm_acle.h b/gcc/config/arm/arm_acle.h -index 9a2f0ba30dc..c0f6ea2d156 100644 ---- a/gcc/config/arm/arm_acle.h -+++ b/gcc/config/arm/arm_acle.h -@@ -38,35 +38,35 @@ __arm_cdp (const unsigned int __coproc, const unsigned int __opc1, - const unsigned int __CRd, const unsigned int __CRn, - const unsigned int __CRm, const unsigned int __opc2) - { -- return __builtin_arm_cdp (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); -+ __builtin_arm_cdp (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_ldc (const unsigned int __coproc, const unsigned int __CRd, - const void * __p) - { -- return __builtin_arm_ldc (__coproc, __CRd, __p); -+ __builtin_arm_ldc (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_ldcl (const unsigned int __coproc, const unsigned int __CRd, - const void * __p) - { -- return __builtin_arm_ldcl (__coproc, __CRd, __p); -+ __builtin_arm_ldcl (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_stc (const unsigned int __coproc, const unsigned int __CRd, - void * __p) - { -- return __builtin_arm_stc (__coproc, __CRd, __p); -+ __builtin_arm_stc (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_stcl (const unsigned int __coproc, const unsigned int __CRd, - void * __p) - { -- return __builtin_arm_stcl (__coproc, __CRd, __p); -+ __builtin_arm_stcl (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) -@@ -74,7 +74,7 @@ __arm_mcr (const unsigned int __coproc, const unsigned int __opc1, - uint32_t __value, const unsigned int __CRn, const unsigned int __CRm, - const unsigned int __opc2) - { -- return __builtin_arm_mcr (__coproc, __opc1, __value, __CRn, __CRm, __opc2); -+ __builtin_arm_mcr (__coproc, __opc1, __value, __CRn, __CRm, __opc2); - } - - __extension__ static __inline uint32_t __attribute__ ((__always_inline__)) -@@ -90,35 +90,35 @@ __arm_cdp2 (const unsigned int __coproc, const unsigned int __opc1, - const unsigned int __CRd, const unsigned int __CRn, - const unsigned int __CRm, const unsigned int __opc2) - { -- return __builtin_arm_cdp2 (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); -+ __builtin_arm_cdp2 (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_ldc2 (const unsigned int __coproc, const unsigned int __CRd, - const void * __p) - { -- return __builtin_arm_ldc2 (__coproc, __CRd, __p); -+ __builtin_arm_ldc2 (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_ldc2l (const unsigned int __coproc, const unsigned int __CRd, - const void * __p) - { -- return __builtin_arm_ldc2l (__coproc, __CRd, __p); -+ __builtin_arm_ldc2l (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_stc2 (const unsigned int __coproc, const unsigned int __CRd, - void * __p) - { -- return __builtin_arm_stc2 (__coproc, __CRd, __p); -+ __builtin_arm_stc2 (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_stc2l (const unsigned int __coproc, const unsigned int __CRd, - void * __p) - { -- return __builtin_arm_stc2l (__coproc, __CRd, __p); -+ __builtin_arm_stc2l (__coproc, __CRd, __p); - } - - __extension__ static __inline void __attribute__ ((__always_inline__)) -@@ -126,7 +126,7 @@ __arm_mcr2 (const unsigned int __coproc, const unsigned int __opc1, - uint32_t __value, const unsigned int __CRn, - const unsigned int __CRm, const unsigned int __opc2) - { -- return __builtin_arm_mcr2 (__coproc, __opc1, __value, __CRn, __CRm, __opc2); -+ __builtin_arm_mcr2 (__coproc, __opc1, __value, __CRn, __CRm, __opc2); - } - - __extension__ static __inline uint32_t __attribute__ ((__always_inline__)) -@@ -143,7 +143,7 @@ __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_mcrr (const unsigned int __coproc, const unsigned int __opc1, - uint64_t __value, const unsigned int __CRm) - { -- return __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm); -+ __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm); - } - - __extension__ static __inline uint64_t __attribute__ ((__always_inline__)) -@@ -159,7 +159,7 @@ __extension__ static __inline void __attribute__ ((__always_inline__)) - __arm_mcrr2 (const unsigned int __coproc, const unsigned int __opc1, - uint64_t __value, const unsigned int __CRm) - { -- return __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm); -+ __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm); - } - - __extension__ static __inline uint64_t __attribute__ ((__always_inline__)) -diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp -new file mode 100644 -index 00000000000..1a169d2f220 ---- /dev/null -+++ b/gcc/testsuite/g++.target/arm/arm.exp -@@ -0,0 +1,50 @@ -+# Specific regression driver for arm. -+# Copyright (C) 2009-2018 Free Software Foundation, Inc. -+# -+# This file is part of GCC. -+# -+# GCC is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3, or (at your option) -+# any later version. -+# -+# GCC is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with GCC; see the file COPYING3. If not see -+# . */ -+ -+# GCC testsuite that uses the `dg.exp' driver. -+ -+# Exit immediately if this isn't an arm target. -+if {![istarget arm*-*-*] } then { -+ return -+} -+ -+# Load support procs. -+load_lib g++-dg.exp -+ -+global DEFAULT_CXXFLAGS -+if ![info exists DEFAULT_CXXFLAGS] then { -+ set DEFAULT_CXXFLAGS " -pedantic-errors" -+} -+ -+ -+global dg_runtest_extra_prunes -+set dg_runtest_extra_prunes "" -+lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch" -+ -+# Initialize `dg'. -+dg-init -+ -+# Main loop. -+dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] \ -+ "" $DEFAULT_CXXFLAGS -+ -+# All done. -+set dg_runtest_extra_prunes "" -+dg-finish -+ -diff --git a/gcc/testsuite/g++.target/arm/pr81497.C b/gcc/testsuite/g++.target/arm/pr81497.C -new file mode 100644 -index 00000000000..0519a3a3045 ---- /dev/null -+++ b/gcc/testsuite/g++.target/arm/pr81497.C -@@ -0,0 +1,9 @@ -+/* { dg-do compile } */ -+/* { dg-require-effective-target arm_thumb2_ok } */ -+ -+#include -+ -+int main () -+{ -+ return 0; -+} --- -2.17.1 - diff --git a/buildroot/package/gcc/7.4.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch b/buildroot/package/gcc/7.4.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch deleted file mode 100644 index accaf0214..000000000 --- a/buildroot/package/gcc/7.4.0/1001-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6ea832d09415cd82b744d0cf168cdd728c43df47 Mon Sep 17 00:00:00 2001 -From: Mark Corbin -Date: Thu, 22 Nov 2018 12:19:11 +0000 -Subject: [PATCH] gcc: define _REENTRANT for RISC-V when -pthread is passed - -The detection of pthread support fails on RISC-V unless _REENTRANT -is defined. Added the CPP_SPEC definition from gcc 8.1.0 to correct -this. - -Signed-off-by: Mark Corbin -Signed-off-by: Romain Naour ---- - gcc/config/riscv/linux.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h -index 4b2f7b6e1fd..b00d23ddfa0 100644 ---- a/gcc/config/riscv/linux.h -+++ b/gcc/config/riscv/linux.h -@@ -47,6 +47,8 @@ along with GCC; see the file COPYING3. If not see - - #define ICACHE_FLUSH_FUNC "__riscv_flush_icache" - -+#define CPP_SPEC "%{pthread:-D_REENTRANT}" -+ - #define LINK_SPEC "\ - -melf" XLEN_SPEC "lriscv \ - %{shared} \ --- -2.19.1 - diff --git a/buildroot/package/gcc/7.4.0/1002-xtensa-backport-fix-for-PR-target-90922.patch b/buildroot/package/gcc/7.4.0/1002-xtensa-backport-fix-for-PR-target-90922.patch deleted file mode 100644 index 38e0309e5..000000000 --- a/buildroot/package/gcc/7.4.0/1002-xtensa-backport-fix-for-PR-target-90922.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a592242578e573778241cae6d3928c064dcdfda4 Mon Sep 17 00:00:00 2001 -From: jcmvbkbc -Date: Tue, 18 Jun 2019 22:19:12 +0000 -Subject: [PATCH] xtensa: fix for PR target/90922 - -Stack pointer adjustment code in prologue missed a case of no -callee-saved registers and a stack frame size bigger than 128 bytes. -Handle that case. - -This fixes the following gcc tests with call0 ABI: - gcc.c-torture/execute/stdarg-2.c - gcc.dg/torture/pr55882.c - gcc.dg/torture/pr57569.c - -gcc/ -2019-06-18 Max Filippov - - * config/xtensa/xtensa.c (xtensa_expand_prologue): Add stack - pointer adjustment for the case of no callee-saved registers and - stack frame bigger than 128 bytes. - -Signed-off-by: Max Filippov ---- - gcc/config/xtensa/xtensa.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index 19bd616d67f6..ee5612441e25 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -2802,7 +2802,8 @@ xtensa_expand_prologue (void) - gen_rtx_SET (mem, reg)); - } - } -- if (total_size > 1024) -+ if (total_size > 1024 -+ || (!callee_save_size && total_size > 128)) - { - rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); - emit_move_insn (tmp_reg, GEN_INT (total_size - --- -2.11.0 - diff --git a/buildroot/package/gcc/7.5.0/0001-uclibc-conf.patch b/buildroot/package/gcc/7.5.0/0001-uclibc-conf.patch new file mode 100644 index 000000000..29c5c010e --- /dev/null +++ b/buildroot/package/gcc/7.5.0/0001-uclibc-conf.patch @@ -0,0 +1,29 @@ +From 0ff63500a600b758cd88ebcd048d7150df9ac881 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 2 May 2017 22:36:15 +0200 +Subject: [PATCH] uclibc-conf + +[Romain: convert to git patch] +Signed-off-by: Romain Naour +--- + contrib/regression/objs-gcc.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh +index 60b0497fea2..6dc7eadff36 100755 +--- a/contrib/regression/objs-gcc.sh ++++ b/contrib/regression/objs-gcc.sh +@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ] + then + make all-gdb all-dejagnu all-ld || exit 1 + make install-gdb install-dejagnu install-ld || exit 1 ++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] ++ then ++ make all-gdb all-dejagnu all-ld || exit 1 ++ make install-gdb install-dejagnu install-ld || exit 1 + elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then + make bootstrap || exit 1 + make install || exit 1 +-- +2.21.0 + diff --git a/buildroot/package/gcc/7.5.0/0002-arm-softfloat-libgcc.patch b/buildroot/package/gcc/7.5.0/0002-arm-softfloat-libgcc.patch new file mode 100644 index 000000000..c2c345031 --- /dev/null +++ b/buildroot/package/gcc/7.5.0/0002-arm-softfloat-libgcc.patch @@ -0,0 +1,45 @@ +From 1d0a47a72a1357e4a298d611bd2499e1b72c6f86 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 2 May 2017 22:46:18 +0200 +Subject: [PATCH] arm softfloat libgcc + +[Romain: convert to git patch] +Signed-off-by: Romain Naour +--- + gcc/config/arm/linux-elf.h | 2 +- + libgcc/config/arm/t-linux | 7 ++++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h +index 3d62367ae68..dad0b97d39f 100644 +--- a/gcc/config/arm/linux-elf.h ++++ b/gcc/config/arm/linux-elf.h +@@ -58,7 +58,7 @@ + %{shared:-lc} \ + %{!shared:%{profile:-lc_p}%{!profile:-lc}}" + +-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" ++#define LIBGCC_SPEC "-lgcc" + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" + +diff --git a/libgcc/config/arm/t-linux b/libgcc/config/arm/t-linux +index 3d520decafb..e7bc042d4e4 100644 +--- a/libgcc/config/arm/t-linux ++++ b/libgcc/config/arm/t-linux +@@ -1,6 +1,11 @@ + LIB1ASMSRC = arm/lib1funcs.S + LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ +- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 ++ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ ++ _arm_addsubdf3 _arm_addsubsf3 \ ++ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ ++ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ ++ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ ++ _arm_fixsfsi _arm_fixunssfsi + + # Just for these, we omit the frame pointer since it makes such a big + # difference. +-- +2.21.0 + diff --git a/buildroot/package/gcc/7.5.0/0003-cilk-fix-build-without-wchar.patch b/buildroot/package/gcc/7.5.0/0003-cilk-fix-build-without-wchar.patch new file mode 100644 index 000000000..7821d0602 --- /dev/null +++ b/buildroot/package/gcc/7.5.0/0003-cilk-fix-build-without-wchar.patch @@ -0,0 +1,64 @@ +From a605662776a3bd50ebbb84509958cb42f44ec998 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Tue, 2 May 2017 23:21:46 +0200 +Subject: [PATCH] cilk: fix build without wchar + +When building against uClibc with wchar support disabled, WCHAR_MIN and +WCHAR_MAX are not defined leading to compilation errors. + +Fix it by only including the wchar code if available. + +Signed-off-by: Peter Korsgaard +[Romain: convert to git patch] +Signed-off-by: Romain Naour +--- + libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/libcilkrts/include/cilk/reducer_min_max.h b/libcilkrts/include/cilk/reducer_min_max.h +index 641aa823901..4f8e0102b90 100644 +--- a/libcilkrts/include/cilk/reducer_min_max.h ++++ b/libcilkrts/include/cilk/reducer_min_max.h +@@ -3289,7 +3289,9 @@ __CILKRTS_BEGIN_EXTERN_C + CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) + CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) + CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) ++#ifdef WCHAR_MIN + CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) ++#endif + CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) + CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) + CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) +@@ -3441,7 +3443,9 @@ __CILKRTS_BEGIN_EXTERN_C + CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) + CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) + CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) ++#ifdef WCHAR_MIN + CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) ++#endif + CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) + CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) + CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) +@@ -3567,7 +3571,9 @@ __CILKRTS_BEGIN_EXTERN_C + CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) + CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) + CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) ++#ifdef WCHAR_MAX + CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) ++#endif + CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) + CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) + CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) +@@ -3719,7 +3725,9 @@ __CILKRTS_BEGIN_EXTERN_C + CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) + CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) + CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) ++#ifdef WCHAR_MAX + CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) ++#endif + CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) + CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) + CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) +-- +2.21.0 + diff --git a/buildroot/package/gcc/7.5.0/0004-Revert-2016-01-21-Ajit-Agarwal-ajitkum-xilinx.com.patch b/buildroot/package/gcc/7.5.0/0004-Revert-2016-01-21-Ajit-Agarwal-ajitkum-xilinx.com.patch new file mode 100644 index 000000000..0ae6876ee --- /dev/null +++ b/buildroot/package/gcc/7.5.0/0004-Revert-2016-01-21-Ajit-Agarwal-ajitkum-xilinx.com.patch @@ -0,0 +1,42 @@ +From 01fb9550fd858e441c3c2f358318af6e28e56181 Mon Sep 17 00:00:00 2001 +From: eager +Date: Sat, 27 May 2017 18:29:40 +0000 +Subject: [PATCH] Revert: 2016-01-21 Ajit Agarwal + + See https://gcc.gnu.org/ml/gcc/2017-05/msg00221.html. + + * config/microblaze/microblaze.h + (FIXED_REGISTERS): Update in macro. + (CALL_USED_REGISTERS): Update in macro. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248540 138bc75d-0d04-0410-961f-82ee72b054a4 +Signed-off-by: Waldemar Brodkorb +Signed-off-by: Romain Naour +--- + gcc/config/microblaze/microblaze.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h +index 66e4ef5c3db..2c9ece1d6c6 100644 +--- a/gcc/config/microblaze/microblaze.h ++++ b/gcc/config/microblaze/microblaze.h +@@ -269,14 +269,14 @@ extern enum pipeline_type microblaze_pipe; + #define FIXED_REGISTERS \ + { \ + 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, \ +- 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ ++ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 1, 1, 1, 1 \ + } + + #define CALL_USED_REGISTERS \ + { \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ +- 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ ++ 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ + 1, 1, 1, 1 \ + } + #define GP_REG_FIRST 0 +-- +2.21.0 + diff --git a/buildroot/package/gcc/7.5.0/0005-PR-target-81497-Fix-arm_acle.h-for-C.patch b/buildroot/package/gcc/7.5.0/0005-PR-target-81497-Fix-arm_acle.h-for-C.patch new file mode 100644 index 000000000..0c7ab3677 --- /dev/null +++ b/buildroot/package/gcc/7.5.0/0005-PR-target-81497-Fix-arm_acle.h-for-C.patch @@ -0,0 +1,323 @@ +From f1c05207166a16d0a6242f2fa642adc439f835a8 Mon Sep 17 00:00:00 2001 +From: ktkachov +Date: Tue, 5 Jun 2018 09:50:16 +0000 +Subject: [PATCH] PR target/81497: Fix arm_acle.h for C++ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When trying to compile something with arm_acle.h using G++ we get a number of nasty errors: +arm_acle.h:48:49: error: invalid conversion from ‘const void*’ to ‘const int*’ [-fpermissive] + return __builtin_arm_ldc (__coproc, __CRd, __p); + +This is because the intrinsics that are supposed to be void return the "result" of their builtin, +which is void. C lets that slide but C++ complains. + +After fixing that we run into further errors: +arm_acle.h:48:46: error: invalid conversion from 'const void*' to 'const int*' [-fpermissive] + return __builtin_arm_ldc (__coproc, __CRd, __p); + ^~~ +Because the pointer arguments in these intrinsics are void pointers but the builtin +expects int pointers. So this patch introduces new qualifiers for void pointers and their +const-qualified versions and uses that in the specification of these intrinsics. + +This gives us the opportunity of creating an arm subdirectory in g++.dg and inaugurates it +with the first arm-specific C++ tests (in that directory). + + PR target/81497 + * config/arm/arm-builtins.c (arm_type_qualifiers): Add + qualifier_void_pointer and qualifier_const_void_pointer. + (arm_ldc_qualifiers, arm_stc_qualifiers): Use the above. + (arm_init_builtins): Handle the above. + * config/arm/arm_acle.h (__arm_cdp, __arm_ldc, __arm_ldcl, __arm_stc, + __arm_stcl, __arm_mcr, __arm_cdp2, __arm_ldc2, __arm_ldcl2, __arm_stc2, + __arm_stcl2,__arm_mcr2, __arm_mcrr, __arm_mcrr2): Remove return for + void intrinsics. + + * g++.target/arm/arm.exp: New file. + * g++.target/arm/pr81497.C: Likewise. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261191 138bc75d-0d04-0410-961f-82ee72b054a4 +Upstream-Status: Merged (gcc-8-branch) +Signed-off-by: Gaël PORTAY +[gportay: drop gcc/{,testsuite/}ChangeLog changes] +Signed-off-by: Romain Naour +--- + gcc/config/arm/arm-builtins.c | 42 +++++++++++++--------- + gcc/config/arm/arm_acle.h | 28 +++++++-------- + gcc/testsuite/g++.target/arm/arm.exp | 50 ++++++++++++++++++++++++++ + gcc/testsuite/g++.target/arm/pr81497.C | 9 +++++ + 4 files changed, 99 insertions(+), 30 deletions(-) + create mode 100644 gcc/testsuite/g++.target/arm/arm.exp + create mode 100644 gcc/testsuite/g++.target/arm/pr81497.C + +diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c +index d3b67184362..dd56f13251f 100644 +--- a/gcc/config/arm/arm-builtins.c ++++ b/gcc/config/arm/arm-builtins.c +@@ -75,7 +75,11 @@ enum arm_type_qualifiers + /* Lane indices - must be within range of previous argument = a vector. */ + qualifier_lane_index = 0x200, + /* Lane indices for single lane structure loads and stores. */ +- qualifier_struct_load_store_lane_index = 0x400 ++ qualifier_struct_load_store_lane_index = 0x400, ++ /* A void pointer. */ ++ qualifier_void_pointer = 0x800, ++ /* A const void pointer. */ ++ qualifier_const_void_pointer = 0x802 + }; + + /* The qualifier_internal allows generation of a unary builtin from +@@ -185,7 +189,7 @@ arm_cdp_qualifiers[SIMD_MAX_BUILTIN_ARGS] + static enum arm_type_qualifiers + arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS] + = { qualifier_void, qualifier_unsigned_immediate, +- qualifier_unsigned_immediate, qualifier_const_pointer }; ++ qualifier_unsigned_immediate, qualifier_const_void_pointer }; + #define LDC_QUALIFIERS \ + (arm_ldc_qualifiers) + +@@ -193,7 +197,7 @@ arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS] + static enum arm_type_qualifiers + arm_stc_qualifiers[SIMD_MAX_BUILTIN_ARGS] + = { qualifier_void, qualifier_unsigned_immediate, +- qualifier_unsigned_immediate, qualifier_pointer }; ++ qualifier_unsigned_immediate, qualifier_void_pointer }; + #define STC_QUALIFIERS \ + (arm_stc_qualifiers) + +@@ -1079,19 +1083,25 @@ arm_init_builtin (unsigned int fcode, arm_builtin_datum *d, + if (qualifiers & qualifier_pointer && VECTOR_MODE_P (op_mode)) + op_mode = GET_MODE_INNER (op_mode); + +- eltype = arm_simd_builtin_type +- (op_mode, +- (qualifiers & qualifier_unsigned) != 0, +- (qualifiers & qualifier_poly) != 0); +- gcc_assert (eltype != NULL); +- +- /* Add qualifiers. */ +- if (qualifiers & qualifier_const) +- eltype = build_qualified_type (eltype, TYPE_QUAL_CONST); +- +- if (qualifiers & qualifier_pointer) +- eltype = build_pointer_type (eltype); +- ++ /* For void pointers we already have nodes constructed by the midend. */ ++ if (qualifiers & qualifier_void_pointer) ++ eltype = qualifiers & qualifier_const ++ ? const_ptr_type_node : ptr_type_node; ++ else ++ { ++ eltype ++ = arm_simd_builtin_type (op_mode, ++ (qualifiers & qualifier_unsigned) != 0, ++ (qualifiers & qualifier_poly) != 0); ++ gcc_assert (eltype != NULL); ++ ++ /* Add qualifiers. */ ++ if (qualifiers & qualifier_const) ++ eltype = build_qualified_type (eltype, TYPE_QUAL_CONST); ++ ++ if (qualifiers & qualifier_pointer) ++ eltype = build_pointer_type (eltype); ++ } + /* If we have reached arg_num == 0, we are at a non-void + return type. Otherwise, we are still processing + arguments. */ +diff --git a/gcc/config/arm/arm_acle.h b/gcc/config/arm/arm_acle.h +index 972e28edb86..69c29df4313 100644 +--- a/gcc/config/arm/arm_acle.h ++++ b/gcc/config/arm/arm_acle.h +@@ -38,35 +38,35 @@ __arm_cdp (const unsigned int __coproc, const unsigned int __opc1, + const unsigned int __CRd, const unsigned int __CRn, + const unsigned int __CRm, const unsigned int __opc2) + { +- return __builtin_arm_cdp (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); ++ __builtin_arm_cdp (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_ldc (const unsigned int __coproc, const unsigned int __CRd, + const void * __p) + { +- return __builtin_arm_ldc (__coproc, __CRd, __p); ++ __builtin_arm_ldc (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_ldcl (const unsigned int __coproc, const unsigned int __CRd, + const void * __p) + { +- return __builtin_arm_ldcl (__coproc, __CRd, __p); ++ __builtin_arm_ldcl (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_stc (const unsigned int __coproc, const unsigned int __CRd, + void * __p) + { +- return __builtin_arm_stc (__coproc, __CRd, __p); ++ __builtin_arm_stc (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_stcl (const unsigned int __coproc, const unsigned int __CRd, + void * __p) + { +- return __builtin_arm_stcl (__coproc, __CRd, __p); ++ __builtin_arm_stcl (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) +@@ -74,7 +74,7 @@ __arm_mcr (const unsigned int __coproc, const unsigned int __opc1, + uint32_t __value, const unsigned int __CRn, const unsigned int __CRm, + const unsigned int __opc2) + { +- return __builtin_arm_mcr (__coproc, __opc1, __value, __CRn, __CRm, __opc2); ++ __builtin_arm_mcr (__coproc, __opc1, __value, __CRn, __CRm, __opc2); + } + + __extension__ static __inline uint32_t __attribute__ ((__always_inline__)) +@@ -90,35 +90,35 @@ __arm_cdp2 (const unsigned int __coproc, const unsigned int __opc1, + const unsigned int __CRd, const unsigned int __CRn, + const unsigned int __CRm, const unsigned int __opc2) + { +- return __builtin_arm_cdp2 (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); ++ __builtin_arm_cdp2 (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_ldc2 (const unsigned int __coproc, const unsigned int __CRd, + const void * __p) + { +- return __builtin_arm_ldc2 (__coproc, __CRd, __p); ++ __builtin_arm_ldc2 (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_ldc2l (const unsigned int __coproc, const unsigned int __CRd, + const void * __p) + { +- return __builtin_arm_ldc2l (__coproc, __CRd, __p); ++ __builtin_arm_ldc2l (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_stc2 (const unsigned int __coproc, const unsigned int __CRd, + void * __p) + { +- return __builtin_arm_stc2 (__coproc, __CRd, __p); ++ __builtin_arm_stc2 (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_stc2l (const unsigned int __coproc, const unsigned int __CRd, + void * __p) + { +- return __builtin_arm_stc2l (__coproc, __CRd, __p); ++ __builtin_arm_stc2l (__coproc, __CRd, __p); + } + + __extension__ static __inline void __attribute__ ((__always_inline__)) +@@ -126,7 +126,7 @@ __arm_mcr2 (const unsigned int __coproc, const unsigned int __opc1, + uint32_t __value, const unsigned int __CRn, + const unsigned int __CRm, const unsigned int __opc2) + { +- return __builtin_arm_mcr2 (__coproc, __opc1, __value, __CRn, __CRm, __opc2); ++ __builtin_arm_mcr2 (__coproc, __opc1, __value, __CRn, __CRm, __opc2); + } + + __extension__ static __inline uint32_t __attribute__ ((__always_inline__)) +@@ -143,7 +143,7 @@ __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_mcrr (const unsigned int __coproc, const unsigned int __opc1, + uint64_t __value, const unsigned int __CRm) + { +- return __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm); ++ __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm); + } + + __extension__ static __inline uint64_t __attribute__ ((__always_inline__)) +@@ -159,7 +159,7 @@ __extension__ static __inline void __attribute__ ((__always_inline__)) + __arm_mcrr2 (const unsigned int __coproc, const unsigned int __opc1, + uint64_t __value, const unsigned int __CRm) + { +- return __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm); ++ __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm); + } + + __extension__ static __inline uint64_t __attribute__ ((__always_inline__)) +diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp +new file mode 100644 +index 00000000000..1a169d2f220 +--- /dev/null ++++ b/gcc/testsuite/g++.target/arm/arm.exp +@@ -0,0 +1,50 @@ ++# Specific regression driver for arm. ++# Copyright (C) 2009-2018 Free Software Foundation, Inc. ++# ++# This file is part of GCC. ++# ++# GCC is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3, or (at your option) ++# any later version. ++# ++# GCC is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with GCC; see the file COPYING3. If not see ++# . */ ++ ++# GCC testsuite that uses the `dg.exp' driver. ++ ++# Exit immediately if this isn't an arm target. ++if {![istarget arm*-*-*] } then { ++ return ++} ++ ++# Load support procs. ++load_lib g++-dg.exp ++ ++global DEFAULT_CXXFLAGS ++if ![info exists DEFAULT_CXXFLAGS] then { ++ set DEFAULT_CXXFLAGS " -pedantic-errors" ++} ++ ++ ++global dg_runtest_extra_prunes ++set dg_runtest_extra_prunes "" ++lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch" ++ ++# Initialize `dg'. ++dg-init ++ ++# Main loop. ++dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] \ ++ "" $DEFAULT_CXXFLAGS ++ ++# All done. ++set dg_runtest_extra_prunes "" ++dg-finish ++ +diff --git a/gcc/testsuite/g++.target/arm/pr81497.C b/gcc/testsuite/g++.target/arm/pr81497.C +new file mode 100644 +index 00000000000..0519a3a3045 +--- /dev/null ++++ b/gcc/testsuite/g++.target/arm/pr81497.C +@@ -0,0 +1,9 @@ ++/* { dg-do compile } */ ++/* { dg-require-effective-target arm_thumb2_ok } */ ++ ++#include ++ ++int main () ++{ ++ return 0; ++} +-- +2.21.0 + diff --git a/buildroot/package/gcc/7.5.0/0006-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch b/buildroot/package/gcc/7.5.0/0006-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch new file mode 100644 index 000000000..de0f45334 --- /dev/null +++ b/buildroot/package/gcc/7.5.0/0006-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch @@ -0,0 +1,31 @@ +From 1d78555bfc753039546ce5ca655dece67732e7bd Mon Sep 17 00:00:00 2001 +From: Mark Corbin +Date: Thu, 22 Nov 2018 12:19:11 +0000 +Subject: [PATCH] gcc: define _REENTRANT for RISC-V when -pthread is passed + +The detection of pthread support fails on RISC-V unless _REENTRANT +is defined. Added the CPP_SPEC definition from gcc 8.1.0 to correct +this. + +Signed-off-by: Mark Corbin +Signed-off-by: Romain Naour +--- + gcc/config/riscv/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h +index 4b2f7b6e1fd..b00d23ddfa0 100644 +--- a/gcc/config/riscv/linux.h ++++ b/gcc/config/riscv/linux.h +@@ -47,6 +47,8 @@ along with GCC; see the file COPYING3. If not see + + #define ICACHE_FLUSH_FUNC "__riscv_flush_icache" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #define LINK_SPEC "\ + -melf" XLEN_SPEC "lriscv \ + %{shared} \ +-- +2.21.0 + diff --git a/buildroot/package/gcc/7.4.0/1003-xtensa-fix-PR-target-91880.patch b/buildroot/package/gcc/7.5.0/0007-xtensa-fix-PR-target-91880.patch similarity index 100% rename from buildroot/package/gcc/7.4.0/1003-xtensa-fix-PR-target-91880.patch rename to buildroot/package/gcc/7.5.0/0007-xtensa-fix-PR-target-91880.patch diff --git a/buildroot/package/gcc/8.3.0/0001-xtensa-backport-fix-for-PR-target-90922.patch b/buildroot/package/gcc/8.3.0/0001-xtensa-backport-fix-for-PR-target-90922.patch deleted file mode 100644 index c961ce5d2..000000000 --- a/buildroot/package/gcc/8.3.0/0001-xtensa-backport-fix-for-PR-target-90922.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a592242578e573778241cae6d3928c064dcdfda4 Mon Sep 17 00:00:00 2001 -From: jcmvbkbc -Date: Tue, 18 Jun 2019 22:19:12 +0000 -Subject: [PATCH] xtensa: fix for PR target/90922 - -Stack pointer adjustment code in prologue missed a case of no -callee-saved registers and a stack frame size bigger than 128 bytes. -Handle that case. - -This fixes the following gcc tests with call0 ABI: - gcc.c-torture/execute/stdarg-2.c - gcc.dg/torture/pr55882.c - gcc.dg/torture/pr57569.c - -gcc/ -2019-06-18 Max Filippov - - * config/xtensa/xtensa.c (xtensa_expand_prologue): Add stack - pointer adjustment for the case of no callee-saved registers and - stack frame bigger than 128 bytes. - -Signed-off-by: Max Filippov ---- - gcc/config/xtensa/xtensa.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index 19bd616d67f6..ee5612441e25 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -2862,7 +2862,8 @@ xtensa_expand_prologue (void) - gen_rtx_SET (mem, reg)); - } - } -- if (total_size > 1024) -+ if (total_size > 1024 -+ || (!callee_save_size && total_size > 128)) - { - rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); - emit_move_insn (tmp_reg, GEN_INT (total_size - --- -2.11.0 - diff --git a/buildroot/package/gcc/8.3.0/0002-xtensa-fix-PR-target-91880.patch b/buildroot/package/gcc/8.3.0/0002-xtensa-fix-PR-target-91880.patch deleted file mode 100644 index e65352501..000000000 --- a/buildroot/package/gcc/8.3.0/0002-xtensa-fix-PR-target-91880.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7c11710230921246156aecc20eb4b6ccaeaaa473 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 24 Sep 2019 04:15:17 -0700 -Subject: [PATCH] xtensa: fix PR target/91880 - -Xtensa hwloop_optimize segfaults when zero overhead loop is about to be -inserted as the first instruction of the function. -Insert zero overhead loop instruction into new basic block before the -loop when basic block that precedes the loop is empty. - -2019-09-26 Max Filippov -gcc/ - * config/xtensa/xtensa.c (hwloop_optimize): Insert zero overhead - loop instruction into new basic block before the loop when basic - block that precedes the loop is empty. - -Signed-off-by: Max Filippov ---- -Backported from: r276166 - - gcc/config/xtensa/xtensa.c | 5 ++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index ee5612441e25..2527468d57db 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -4232,7 +4232,9 @@ hwloop_optimize (hwloop_info loop) - - seq = get_insns (); - -- if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1) -+ entry_after = BB_END (entry_bb); -+ if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1 -+ || !entry_after) - { - basic_block new_bb; - edge e; -@@ -4253,7 +4255,6 @@ hwloop_optimize (hwloop_info loop) - } - else - { -- entry_after = BB_END (entry_bb); - while (DEBUG_INSN_P (entry_after) - || (NOTE_P (entry_after) - && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK)) --- -2.11.0 - diff --git a/buildroot/package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch b/buildroot/package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch new file mode 100644 index 000000000..119826b51 --- /dev/null +++ b/buildroot/package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch @@ -0,0 +1,51 @@ +From 28623c81b50663e946790649352cb1b3ed23954d Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Tue, 24 Sep 2019 04:15:17 -0700 +Subject: [PATCH] xtensa: fix PR target/91880 + +Xtensa hwloop_optimize segfaults when zero overhead loop is about to be +inserted as the first instruction of the function. +Insert zero overhead loop instruction into new basic block before the +loop when basic block that precedes the loop is empty. + +2019-09-26 Max Filippov +gcc/ + * config/xtensa/xtensa.c (hwloop_optimize): Insert zero overhead + loop instruction into new basic block before the loop when basic + block that precedes the loop is empty. + +Signed-off-by: Max Filippov +[Romain: rebase on gcc 8.4.0] +Signed-off-by: Romain Naour +--- +Backported from: r276166 + + gcc/config/xtensa/xtensa.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index 08f9f7c7a8f..de206527810 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -4232,7 +4232,9 @@ hwloop_optimize (hwloop_info loop) + + seq = get_insns (); + +- if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1) ++ entry_after = BB_END (entry_bb); ++ if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1 ++ || !entry_after) + { + basic_block new_bb; + edge e; +@@ -4253,7 +4255,6 @@ hwloop_optimize (hwloop_info loop) + } + else + { +- entry_after = BB_END (entry_bb); + while (DEBUG_INSN_P (entry_after) + || (NOTE_P (entry_after) + && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK)) +-- +2.24.1 + diff --git a/buildroot/package/gcc/9.3.0/0001-xtensa-fix-PR-target-91880.patch b/buildroot/package/gcc/9.3.0/0001-xtensa-fix-PR-target-91880.patch new file mode 100644 index 000000000..4e5aea2c7 --- /dev/null +++ b/buildroot/package/gcc/9.3.0/0001-xtensa-fix-PR-target-91880.patch @@ -0,0 +1,50 @@ +From 0a59aa440a4c125b81504c777b066ae4eb1f09f0 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Tue, 24 Sep 2019 04:15:17 -0700 +Subject: [PATCH] xtensa: fix PR target/91880 + +Xtensa hwloop_optimize segfaults when zero overhead loop is about to be +inserted as the first instruction of the function. +Insert zero overhead loop instruction into new basic block before the +loop when basic block that precedes the loop is empty. + +2019-09-26 Max Filippov +gcc/ + * config/xtensa/xtensa.c (hwloop_optimize): Insert zero overhead + loop instruction into new basic block before the loop when basic + block that precedes the loop is empty. + +Signed-off-by: Max Filippov +Signed-off-by: Romain Naour +--- +Backported from: r276166 + + gcc/config/xtensa/xtensa.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index ee5612441e2..2527468d57d 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -4235,7 +4235,9 @@ hwloop_optimize (hwloop_info loop) + + seq = get_insns (); + +- if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1) ++ entry_after = BB_END (entry_bb); ++ if (!single_succ_p (entry_bb) || vec_safe_length (loop->incoming) > 1 ++ || !entry_after) + { + basic_block new_bb; + edge e; +@@ -4256,7 +4258,6 @@ hwloop_optimize (hwloop_info loop) + } + else + { +- entry_after = BB_END (entry_bb); + while (DEBUG_INSN_P (entry_after) + || (NOTE_P (entry_after) + && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK)) +-- +2.24.1 + diff --git a/buildroot/package/gcc/9.3.0/0002-or1k-Fix-issue-with-set_got-clobbering-LR-r9.patch b/buildroot/package/gcc/9.3.0/0002-or1k-Fix-issue-with-set_got-clobbering-LR-r9.patch new file mode 100644 index 000000000..e40b96fe0 --- /dev/null +++ b/buildroot/package/gcc/9.3.0/0002-or1k-Fix-issue-with-set_got-clobbering-LR-r9.patch @@ -0,0 +1,105 @@ +From 1383012ae409ed91903b2b76ee15137bc1f89900 Mon Sep 17 00:00:00 2001 +From: shorne +Date: Sat, 31 Aug 2019 06:00:56 +0000 +Subject: [PATCH] or1k: Fix issue with set_got clobbering LR (r9) + +When compiling glibc we found that the GOT register was being allocated +r9 when the instruction was still set_got_tmp. That is a problem +because r9 is the Link Register (LR) in OpenRISC which is used/clobbered +in set_got. We cannot use r9 as the GOT register. Also, we cannot +simply say set_got_tmp clobbers r9 as this is the reason for having the +temporary set_got_tmp. + +Fix by using a register class constraint that does not allow r9 during +register allocation. + +gcc/ChangeLog: + + * config/or1k/constraints.md (t): New constraint. + * config/or1k/or1k.h (GOT_REGS): New register class. + * config/or1k/or1k.md (set_got_tmp, set_got): Use t contraint. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@275242 138bc75d-0d04-0410-961f-82ee72b054a4 +(cherry picked from commit 5b9471ffca25d39635680516ba2ff85295480fc3) +Signed-off-by: Romain Naour +--- + gcc/config/or1k/constraints.md | 4 ++++ + gcc/config/or1k/or1k.h | 3 +++ + gcc/config/or1k/or1k.md | 4 ++-- + 3 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/or1k/constraints.md b/gcc/config/or1k/constraints.md +index 93da8c058c6..a16b749008f 100644 +--- a/gcc/config/or1k/constraints.md ++++ b/gcc/config/or1k/constraints.md +@@ -24,6 +24,7 @@ + + ; We use: + ; c - sibcall registers ++; t - got address registers (excludes LR (r9) which is clobbered by set_got) + ; I - constant signed 16-bit + ; K - constant unsigned 16-bit + ; M - constant signed 16-bit shifted left 16-bits (l.movhi) +@@ -32,6 +33,9 @@ + (define_register_constraint "c" "SIBCALL_REGS" + "Registers which can hold a sibling call address") + ++(define_register_constraint "t" "GOT_REGS" ++ "Registers which can be used to store the Global Offset Table (GOT) address.") ++ + ;; Immediates + (define_constraint "I" + "A signed 16-bit immediate in the range -32768 to 32767." +diff --git a/gcc/config/or1k/or1k.h b/gcc/config/or1k/or1k.h +index 6dda230f217..feee702d89c 100644 +--- a/gcc/config/or1k/or1k.h ++++ b/gcc/config/or1k/or1k.h +@@ -189,6 +189,7 @@ enum reg_class + { + NO_REGS, + SIBCALL_REGS, ++ GOT_REGS, + GENERAL_REGS, + FLAG_REGS, + ALL_REGS, +@@ -200,6 +201,7 @@ enum reg_class + #define REG_CLASS_NAMES { \ + "NO_REGS", \ + "SIBCALL_REGS", \ ++ "GOT_REGS", \ + "GENERAL_REGS", \ + "FLAG_REGS", \ + "ALL_REGS" } +@@ -212,6 +214,7 @@ enum reg_class + #define REG_CLASS_CONTENTS \ + { { 0x00000000, 0x00000000 }, \ + { SIBCALL_REGS_MASK, 0 }, \ ++ { 0xfffffdff, 0x00000000 }, \ + { 0xffffffff, 0x00000003 }, \ + { 0x00000000, 0x00000004 }, \ + { 0xffffffff, 0x00000007 } \ +diff --git a/gcc/config/or1k/or1k.md b/gcc/config/or1k/or1k.md +index 2dad51cd46b..88f3f02630f 100644 +--- a/gcc/config/or1k/or1k.md ++++ b/gcc/config/or1k/or1k.md +@@ -595,7 +595,7 @@ + ;; set_got pattern below. This works because the set_got_tmp insn is the + ;; first insn in the stream and that it isn't moved during RA. + (define_insn "set_got_tmp" +- [(set (match_operand:SI 0 "register_operand" "=r") ++ [(set (match_operand:SI 0 "register_operand" "=t") + (unspec_volatile:SI [(const_int 0)] UNSPECV_SET_GOT))] + "" + { +@@ -604,7 +604,7 @@ + + ;; The insn to initialize the GOT. + (define_insn "set_got" +- [(set (match_operand:SI 0 "register_operand" "=r") ++ [(set (match_operand:SI 0 "register_operand" "=t") + (unspec:SI [(const_int 0)] UNSPEC_SET_GOT)) + (clobber (reg:SI LR_REGNUM))] + "" +-- +2.24.1 + diff --git a/buildroot/package/gcc/9.3.0/0003-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch b/buildroot/package/gcc/9.3.0/0003-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch new file mode 100644 index 000000000..3ff64b71f --- /dev/null +++ b/buildroot/package/gcc/9.3.0/0003-gcc-define-_REENTRANT-for-RISC-V-when-pthread-is-pas.patch @@ -0,0 +1,31 @@ +From 2aefc4ee703ce3ff70ad25915005cacfbaae0c49 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index 4b2f7b6e1fd..b00d23ddfa0 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.21.0 + diff --git a/buildroot/package/gcc/Config.in.host b/buildroot/package/gcc/Config.in.host index 4934c2852..243310f61 100644 --- a/buildroot/package/gcc/Config.in.host +++ b/buildroot/package/gcc/Config.in.host @@ -3,38 +3,22 @@ comment "GCC Options" choice prompt "GCC compiler Version" default BR2_GCC_VERSION_ARC if BR2_arc - default BR2_GCC_VERSION_OR1K if BR2_or1k - default BR2_GCC_VERSION_7_X + default BR2_GCC_VERSION_CSKY if BR2_csky + default BR2_GCC_VERSION_8_X help Select the version of gcc you wish to use. config BR2_GCC_VERSION_ARC - bool "gcc arc (8.x)" + bool "gcc arc (9.x)" # Only supported architecture depends on BR2_arc - select BR2_TOOLCHAIN_GCC_AT_LEAST_8 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 -config BR2_GCC_VERSION_OR1K - bool "gcc or1k (5.x)" +config BR2_GCC_VERSION_CSKY + bool "gcc csky" # Only supported architecture - depends on BR2_or1k - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - -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 - depends on !BR2_or1k - # musl on microblaze, ppc64 and mips64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe)) - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - # glibc >= 2.26 needs gcc >= 6.2 - depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_powerpc64le) - # glibc >= 2.27 needs gcc >= 5 - depends on !(BR2_TOOLCHAIN_USES_GLIBC && (BR2_aarch64 || BR2_aarch64_be)) - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_csky + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 config BR2_GCC_VERSION_5_X bool "gcc 5.x" @@ -45,18 +29,10 @@ config BR2_GCC_VERSION_5_X # musl on ppc64 and mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - # glibc >= 2.26 needs gcc >= 6.2 - depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_powerpc64le) + # glibc >= 2.30 needs gcc >= 6.2 on all architectures. + depends on !BR2_TOOLCHAIN_USES_GLIBC select BR2_TOOLCHAIN_GCC_AT_LEAST_5 -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 - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - config BR2_GCC_VERSION_7_X bool "gcc 7.x" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 @@ -66,6 +42,7 @@ config BR2_GCC_VERSION_7_X config BR2_GCC_VERSION_8_X bool "gcc 8.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_9 # Broken or unsupported architectures depends on !BR2_or1k # powerpc spe support has been deprecated since gcc 8.x. @@ -73,23 +50,47 @@ config BR2_GCC_VERSION_8_X depends on !BR2_powerpc_SPE select BR2_TOOLCHAIN_GCC_AT_LEAST_8 +config BR2_GCC_VERSION_9_X + bool "gcc 9.x" + # or1k needs binutils >= 2.32 + depends on !(BR2_or1k && BR2_BINUTILS_VERSION_2_31_X) + # powerpc spe support has been deprecated since gcc 8.x. + # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html + depends on !BR2_powerpc_SPE + # C-SKY sk610 needs abiv1, which is not supported in + # upstream gcc. C-SKY gcc upstream support not tested + # with upstream binutils and glibc. + depends on !BR2_csky + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + endchoice -# libcilkrts was introduced in gcc 4.9 (oldest gcc version we -# support), and removed in gcc 8.x +# libcilkrts was introduced in gcc 4.9 and removed in gcc 8.x config BR2_GCC_SUPPORTS_LIBCILKRTS bool default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 +config BR2_GCC_SUPPORTS_DLANG + bool + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_i386 + default y if BR2_mips || BR2_mipsel + default y if BR2_mips64 || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_x86_64 + default y if BR2_riscv && !BR2_RISCV_64 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 + depends on BR2_TOOLCHAIN_USES_GLIBC + config BR2_GCC_VERSION string - default "4.9.4" if BR2_GCC_VERSION_4_9_X default "5.5.0" if BR2_GCC_VERSION_5_X - default "6.5.0" if BR2_GCC_VERSION_6_X - default "7.4.0" if BR2_GCC_VERSION_7_X - default "8.3.0" if BR2_GCC_VERSION_8_X - default "arc-2018.09-release" if BR2_GCC_VERSION_ARC - default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K + default "7.5.0" if BR2_GCC_VERSION_7_X + default "8.4.0" if BR2_GCC_VERSION_8_X + default "9.3.0" if BR2_GCC_VERSION_9_X + default "arc-2019.09-release" if BR2_GCC_VERSION_ARC + default "48152afb96c59733d5bc79e3399bb7b3d4b44266" if BR2_GCC_VERSION_CSKY config BR2_EXTRA_GCC_CONFIG_OPTIONS string "Additional gcc options" @@ -122,6 +123,15 @@ config BR2_TOOLCHAIN_BUILDROOT_FORTRAN Fortran language and you want Fortran libraries to be installed on your target system. +config BR2_TOOLCHAIN_BUILDROOT_DLANG + bool "Enable D language support" + depends on BR2_GCC_SUPPORTS_DLANG + select BR2_TOOLCHAIN_HAS_DLANG + help + Enable this option if you want your toolchain to support the + D language and you want D libraries to be installed on your + target system. + config BR2_GCC_ENABLE_LTO bool "Enable compiler link-time-optimization support" select BR2_BINUTILS_ENABLE_LTO @@ -132,25 +142,10 @@ config BR2_GCC_ENABLE_LTO config BR2_GCC_ENABLE_OPENMP bool "Enable compiler OpenMP support" depends on !BR2_PTHREADS_NONE && !BR2_arc && !BR2_microblaze + select BR2_TOOLCHAIN_HAS_OPENMP help Enable OpenMP support for the compiler -config BR2_GCC_ENABLE_LIBMUDFLAP - bool "Enable libmudflap support" - # There are architectures, or specific configurations for - # which mudflap is not supported. - depends on !BR2_ARM_INSTRUCTIONS_THUMB && !BR2_powerpc_SPE - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - help - libmudflap is a gcc library used for the mudflap pointer - debugging functionality. It is only needed if you intend to - use the -fmudflap gcc flag. - - See http://gcc.gnu.org/wiki/Mudflap_Pointer_Debugging and - the help of the gcc -fmudflap option for more details. - - If you're unsure, leave this option disabled. - config BR2_GCC_ENABLE_GRAPHITE bool "Enable graphite support" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/buildroot/package/gcc/arc-2018.09-release/0100-uclibc-conf.patch b/buildroot/package/gcc/arc-2018.09-release/0100-uclibc-conf.patch deleted file mode 100644 index d354baf81..000000000 --- a/buildroot/package/gcc/arc-2018.09-release/0100-uclibc-conf.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 326b880b20e5f8187dbda736b4c4c662cbfb00ca Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 2 May 2017 22:36:15 +0200 -Subject: [PATCH] uclibc-conf - -[Romain: convert to git patch] -Signed-off-by: Romain Naour ---- - contrib/regression/objs-gcc.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh -index 60b0497..6dc7ead 100755 ---- a/contrib/regression/objs-gcc.sh -+++ b/contrib/regression/objs-gcc.sh -@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ] - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 --- -2.9.3 - diff --git a/buildroot/package/gcc/7.4.0/0100-uclibc-conf.patch b/buildroot/package/gcc/arc-2019.09-release/0100-uclibc-conf.patch similarity index 100% rename from buildroot/package/gcc/7.4.0/0100-uclibc-conf.patch rename to buildroot/package/gcc/arc-2019.09-release/0100-uclibc-conf.patch diff --git a/buildroot/package/gcc/gcc-final/gcc-final.mk b/buildroot/package/gcc/gcc-final/gcc-final.mk index 49f16f699..24d034b72 100644 --- a/buildroot/package/gcc/gcc-final/gcc-final.mk +++ b/buildroot/package/gcc/gcc-final/gcc-final.mk @@ -55,6 +55,7 @@ endef # Languages supported by the cross-compiler GCC_FINAL_CROSS_LANGUAGES-y = c GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_LIBSTDCPP) += c++ +GCC_FINAL_CROSS_LANGUAGES-$(BR2_TOOLCHAIN_BUILDROOT_DLANG) += d GCC_FINAL_CROSS_LANGUAGES-$(BR2_TOOLCHAIN_BUILDROOT_FORTRAN) += fortran GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGES-y)) @@ -63,18 +64,16 @@ HOST_GCC_FINAL_CONF_OPTS = \ --enable-languages=$(GCC_FINAL_CROSS_LANGUAGES) \ --with-build-time-tools=$(HOST_DIR)/$(GNU_TARGET_NAME)/bin -HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib* # The kernel wants to use the -m4-nofpu option to make sure that it # doesn't use floating point operations. ifeq ($(BR2_sh4)$(BR2_sh4eb),y) HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4,m4-nofpu" -# check-package OverriddenVariable HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4* -endif -ifeq ($(BR2_sh4a)$(BR2_sh4aeb),y) +else ifeq ($(BR2_sh4a)$(BR2_sh4aeb),y) HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4a,m4a-nofpu" -# check-package OverriddenVariable HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4* +else +HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib* endif ifeq ($(BR2_GCC_SUPPORTS_LIBCILKRTS),y) @@ -172,6 +171,10 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),y) HOST_GCC_FINAL_USR_LIBS += libstdc++ endif +ifeq ($(BR2_TOOLCHAIN_BUILDROOT_DLANG),y) +HOST_GCC_FINAL_USR_LIBS += libgdruntime libgphobos +endif + ifeq ($(BR2_TOOLCHAIN_BUILDROOT_FORTRAN),y) HOST_GCC_FINAL_USR_LIBS += libgfortran # fortran needs quadmath on x86 and x86_64 @@ -184,13 +187,7 @@ ifeq ($(BR2_GCC_ENABLE_OPENMP),y) HOST_GCC_FINAL_USR_LIBS += libgomp endif -ifeq ($(BR2_GCC_ENABLE_LIBMUDFLAP),y) -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -HOST_GCC_FINAL_USR_LIBS += libmudflapth -else -HOST_GCC_FINAL_USR_LIBS += libmudflap -endif -endif +HOST_GCC_FINAL_USR_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_LIBS)) ifneq ($(HOST_GCC_FINAL_USR_LIBS),) define HOST_GCC_FINAL_INSTALL_STATIC_LIBS diff --git a/buildroot/package/gcc/gcc-initial/gcc-initial.mk b/buildroot/package/gcc/gcc-initial/gcc-initial.mk index 1decca825..f5bc6c5b7 100644 --- a/buildroot/package/gcc/gcc-initial/gcc-initial.mk +++ b/buildroot/package/gcc/gcc-initial/gcc-initial.mk @@ -38,7 +38,6 @@ HOST_GCC_INITIAL_CONF_OPTS = \ --disable-threads \ --with-newlib \ --disable-largefile \ - --disable-nls \ $(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS)) HOST_GCC_INITIAL_CONF_ENV = \ diff --git a/buildroot/package/gcc/gcc.hash b/buildroot/package/gcc/gcc.hash index 4f1e7f932..d9df3408d 100644 --- a/buildroot/package/gcc/gcc.hash +++ b/buildroot/package/gcc/gcc.hash @@ -1,15 +1,15 @@ -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.9.4/sha512.sum -sha512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe gcc-4.9.4.tar.bz2 # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-5.5.0/sha512.sum sha512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1 gcc-5.5.0.tar.xz -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.5.0/sha512.sum -sha512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac gcc-6.5.0.tar.xz -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.4.0/sha512.sum -sha512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e gcc-7.4.0.tar.xz -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.3.0/sha512.sum -sha512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802 gcc-8.3.0.tar.xz +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.5.0/sha512.sum +sha512 fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60 gcc-7.5.0.tar.xz +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.4.0/sha512.sum +sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280 gcc-8.4.0.tar.xz +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-9.3.0/sha512.sum +sha512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de gcc-9.3.0.tar.xz # Locally calculated (fetched from Github) -sha512 4d12c3ac27b9de9c533be3b8964cf23d21bf6933b5073183e1affe714b0ff33f9d6169e3b55a5c505d7dae33c9bb4f8b0d110461e3a124182d8c8d51b66b8e45 gcc-arc-2018.09-release.tar.gz +sha512 84648d13f174102733e06ccdf7b351150babe06af0f2b99b8dfb2b2d3c3f13e424547349939806fe19932ad347977cad79cd8b37be9cbb03e6a4d03cdf95a72e gcc-arc-2019.09-release.tar.gz # Locally calculated (fetched from Github) sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz +# Locally calculated (fetched from https://github.com/c-sky/gcc) +sha512 1c3564fd6573dce13451a73015e7d88fecbb214dc1df96607976255b1d8b9e60318405333f4f218eea8d07e3675a802b66eff6df3921d505c4036481512792c2 gcc-48152afb96c59733d5bc79e3399bb7b3d4b44266.tar.gz diff --git a/buildroot/package/gcc/gcc.mk b/buildroot/package/gcc/gcc.mk index 5901624ea..fe7167b2f 100644 --- a/buildroot/package/gcc/gcc.mk +++ b/buildroot/package/gcc/gcc.mk @@ -13,19 +13,13 @@ GCC_VERSION = $(call qstrip,$(BR2_GCC_VERSION)) 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) -GCC_SITE = $(call github,openrisc,or1k-gcc,$(GCC_VERSION)) +else ifeq ($(BR2_GCC_VERSION_CSKY),y) +GCC_SITE = $(call github,c-sky,gcc,$(GCC_VERSION)) GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz else GCC_SITE = $(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION) -# From version 5.5.0, 6.4.0, 7.2.0 and 8.1.0 a bz2 release tarball is not -# provided anymore. Use the xz tarball instead. -ifeq ($(BR2_GCC_VERSION_4_9_X),y) -GCC_SOURCE = gcc-$(GCC_VERSION).tar.bz2 -else GCC_SOURCE = gcc-$(GCC_VERSION).tar.xz endif -endif # # Xtensa special hook @@ -106,6 +100,11 @@ HOST_GCC_COMMON_CONF_ENV = \ GCC_COMMON_TARGET_CFLAGS = $(TARGET_CFLAGS) GCC_COMMON_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) +# used to fix ../../../../libsanitizer/libbacktrace/../../libbacktrace/elf.c:772:21: error: ‘st.st_mode’ may be used uninitialized in this function [-Werror=maybe-uninitialized] +ifeq ($(BR2_ENABLE_DEBUG),y) +GCC_COMMON_TARGET_CFLAGS += -Wno-error +endif + # Propagate options used for target software building to GCC target libs HOST_GCC_COMMON_CONF_ENV += CFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CFLAGS)" HOST_GCC_COMMON_CONF_ENV += CXXFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CXXFLAGS)" @@ -152,12 +151,6 @@ ifeq ($(BR2_GCC_ENABLE_LTO),y) HOST_GCC_COMMON_CONF_OPTS += --enable-plugins --enable-lto endif -ifeq ($(BR2_GCC_ENABLE_LIBMUDFLAP),y) -HOST_GCC_COMMON_CONF_OPTS += --enable-libmudflap -else -HOST_GCC_COMMON_CONF_OPTS += --disable-libmudflap -endif - ifeq ($(BR2_PTHREADS_NONE),y) HOST_GCC_COMMON_CONF_OPTS += \ --disable-threads \ @@ -177,7 +170,7 @@ else HOST_GCC_COMMON_CONF_OPTS += --without-isl --without-cloog endif -ifeq ($(BR2_arc)$(BR2_or1k),y) +ifeq ($(BR2_arc),y) HOST_GCC_COMMON_DEPENDENCIES += host-flex host-bison endif @@ -310,7 +303,7 @@ define HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS *-ar|*-ranlib|*-nm) \ ln -snf $$i $(ARCH)-linux$${i##$(GNU_TARGET_NAME)}; \ ;; \ - *cc|*cc-*|*++|*++-*|*cpp|*-gfortran) \ + *cc|*cc-*|*++|*++-*|*cpp|*-gfortran|*-gdc) \ rm -f $$i.br_real; \ mv $$i $$i.br_real; \ ln -sf toolchain-wrapper $$i; \ diff --git a/buildroot/package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch b/buildroot/package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch deleted file mode 100644 index 73d1f0d3a..000000000 --- a/buildroot/package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: b/contrib/regression/objs-gcc.sh -=================================================================== ---- a/contrib/regression/objs-gcc.sh -+++ b/contrib/regression/objs-gcc.sh -@@ -106,6 +106,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 diff --git a/buildroot/package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch b/buildroot/package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch deleted file mode 100644 index 2d0e7baa4..000000000 --- a/buildroot/package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/boehm-gc/include/gc.h -=================================================================== ---- a/boehm-gc/include/gc.h -+++ b/boehm-gc/include/gc.h -@@ -503,7 +503,7 @@ - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/buildroot/package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch b/buildroot/package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch deleted file mode 100644 index 9e97d945d..000000000 --- a/buildroot/package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch +++ /dev/null @@ -1,273 +0,0 @@ -Allow C99-depending features of libstdc++ with uClibc - -The libstdc++ code is fairly restrictive on how it checks for C99 -compatibility: it requires *complete* C99 support to enable certain -features. For example, uClibc provides a good number of C99 features, -but not C99 complex number support. For this reason, libstdc++ -completely disables many the standard C++ methods that can in fact -work because uClibc provides the necessary functions. - -This patch is similar and highly inspired from -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in -a way that doesn't involve changing the configure.ac script, as -autoreconfiguring gcc is complicated. It simply relies on the fact -that uClibc defines the __UCLIBC__ definition. - -Signed-off-by: Thomas Petazzoni - -Index: b/libstdc++-v3/config/locale/generic/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/generic/c_locale.h -+++ b/libstdc++-v3/config/locale/generic/c_locale.h -@@ -70,7 +70,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/config/locale/gnu/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/gnu/c_locale.h -+++ b/libstdc++-v3/config/locale/gnu/c_locale.h -@@ -88,7 +88,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/include/bits/basic_string.h -=================================================================== ---- a/libstdc++-v3/include/bits/basic_string.h -+++ b/libstdc++-v3/include/bits/basic_string.h -@@ -5239,7 +5239,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99) -+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) - - #include - -Index: b/libstdc++-v3/include/bits/locale_facets.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets.tcc -+++ b/libstdc++-v3/include/bits/locale_facets.tcc -@@ -992,7 +992,7 @@ - char __fbuf[16]; - __num_base::_S_format_float(__io, __fbuf, __mod); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // Precision is always used except for hexfloat format. - const bool __use_prec = - (__io.flags() & ios_base::floatfield) != ios_base::floatfield; -Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc -+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -@@ -578,7 +578,7 @@ - { - const locale __loc = __io.getloc(); - const ctype<_CharT>& __ctype = use_facet >(__loc); --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough. - int __cs_size = 64; - char* __cs = static_cast(__builtin_alloca(__cs_size)); -Index: b/libstdc++-v3/include/c_compatibility/math.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/math.h -+++ b/libstdc++-v3/include/c_compatibility/math.h -@@ -56,7 +56,7 @@ - using std::floor; - using std::fmod; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::fpclassify; - using std::isfinite; - using std::isinf; -Index: b/libstdc++-v3/include/c_compatibility/wchar.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/wchar.h -+++ b/libstdc++-v3/include/c_compatibility/wchar.h -@@ -103,7 +103,7 @@ - using std::wmemset; - using std::wcsftime; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_global/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdlib -+++ b/libstdc++-v3/include/c_global/cstdlib -@@ -195,7 +195,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_global/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_global/cwchar -+++ b/libstdc++-v3/include/c_global/cwchar -@@ -232,7 +232,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -@@ -289,7 +289,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_std/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdio -+++ b/libstdc++-v3/include/c_std/cstdio -@@ -144,7 +144,7 @@ - using ::vsprintf; - } // namespace std - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf -Index: b/libstdc++-v3/include/c_std/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdlib -+++ b/libstdc++-v3/include/c_std/cstdlib -@@ -192,7 +192,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_std/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_std/cwchar -+++ b/libstdc++-v3/include/c_std/cwchar -@@ -228,7 +228,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -Index: b/libstdc++-v3/include/ext/vstring.h -=================================================================== ---- a/libstdc++-v3/include/ext/vstring.h -+++ b/libstdc++-v3/include/ext/vstring.h -@@ -2680,7 +2680,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99)) -+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))) - - #include - -Index: b/libstdc++-v3/include/tr1/cstdio -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdio -+++ b/libstdc++-v3/include/tr1/cstdio -@@ -33,7 +33,7 @@ - - #include - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cstdlib -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdlib -+++ b/libstdc++-v3/include/tr1/cstdlib -@@ -35,7 +35,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cwchar -=================================================================== ---- a/libstdc++-v3/include/tr1/cwchar -+++ b/libstdc++-v3/include/tr1/cwchar -@@ -52,7 +52,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/tr1/stdlib.h -=================================================================== ---- a/libstdc++-v3/include/tr1/stdlib.h -+++ b/libstdc++-v3/include/tr1/stdlib.h -@@ -33,7 +33,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - using std::tr1::atoll; - using std::tr1::strtoll; -Index: b/libstdc++-v3/src/c++11/debug.cc -=================================================================== ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -788,7 +788,7 @@ - int __n __attribute__ ((__unused__)), - const char* __fmt, _Tp __s) const throw () - { --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - std::snprintf(__buf, __n, __fmt, __s); - #else - std::sprintf(__buf, __fmt, __s); -Index: b/libstdc++-v3/include/c_global/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdio -+++ b/libstdc++-v3/include/c_global/cstdio -@@ -146,7 +146,7 @@ - using ::vsprintf; - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf diff --git a/buildroot/package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch b/buildroot/package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch deleted file mode 100644 index 1d9916f55..000000000 --- a/buildroot/package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch +++ /dev/null @@ -1,56 +0,0 @@ -[PATCH] cilk: fix build without wchar - -When building against uClibc with wchar support disabled, WCHAR_MIN and -WCHAR_MAX are not defined leading to compilation errors. - -Fix it by only including the wchar code if available. - -Signed-off-by: Peter Korsgaard ---- - libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -Index: b/libcilkrts/include/cilk/reducer_min_max.h -=================================================================== ---- a/libcilkrts/include/cilk/reducer_min_max.h -+++ b/libcilkrts/include/cilk/reducer_min_max.h -@@ -3154,7 +3154,9 @@ - CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) -@@ -3306,7 +3308,9 @@ - CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) -@@ -3432,7 +3436,9 @@ - CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) -@@ -3584,7 +3590,9 @@ - CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) diff --git a/buildroot/package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch b/buildroot/package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch deleted file mode 100644 index 07f9a7395..000000000 --- a/buildroot/package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch +++ /dev/null @@ -1,14 +0,0 @@ -disable split-stack for non-thread builds - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack ---- gcc-5.3.0.orig/libgcc/config/t-stack 2010-10-01 21:31:49.000000000 +0200 -+++ gcc-5.3.0/libgcc/config/t-stack 2016-03-07 03:25:32.000000000 +0100 -@@ -1,4 +1,6 @@ - # Makefile fragment to provide generic support for -fsplit-stack. - # This should be used in config.host for any host which supports - # -fsplit-stack. -+ifeq ($(enable_threads),yes) - LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c -+endif diff --git a/buildroot/package/gcnano-binaries/Config.in b/buildroot/package/gcnano-binaries/Config.in new file mode 100644 index 000000000..01e1aacf1 --- /dev/null +++ b/buildroot/package/gcnano-binaries/Config.in @@ -0,0 +1,33 @@ +comment "gcnano-binaries needs a Linux kernel to be built" + depends on BR2_arm + depends on !BR2_LINUX_KERNEL + +comment "gcnano-binaries needs a glibc toolchain w/ threads, dynamic library" + depends on BR2_arm + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS + +config BR2_PACKAGE_GCNANO_BINARIES + bool "gcnano-binaries" + depends on BR2_arm + depends on BR2_LINUX_KERNEL + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_WAYLAND + help + Driver and libaries for stm vivante gcnano gpu. + https://github.com/STMicroelectronics/gcnano-binaries/ + +if BR2_PACKAGE_GCNANO_BINARIES + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "gcnano-binaries" + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "gcnano-binaries" + +endif diff --git a/buildroot/package/gcnano-binaries/gcnano-binaries.hash b/buildroot/package/gcnano-binaries/gcnano-binaries.hash new file mode 100644 index 000000000..e753f944a --- /dev/null +++ b/buildroot/package/gcnano-binaries/gcnano-binaries.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 255db9c58627f5f54fd15263647cc97a55927363fec42e7c8d7486170a65d84d gcnano-binaries-c01642ed5e18cf09ecd905af193e935cb3be95ed.tar.gz +sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA diff --git a/buildroot/package/gcnano-binaries/gcnano-binaries.mk b/buildroot/package/gcnano-binaries/gcnano-binaries.mk new file mode 100644 index 000000000..b27571a08 --- /dev/null +++ b/buildroot/package/gcnano-binaries/gcnano-binaries.mk @@ -0,0 +1,76 @@ +################################################################################ +# +# gcnano-binaries +# +################################################################################ + +GCNANO_BINARIES_LIB_VERSION = 6.2.4 +GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION).p4 +GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION).p4-20190626 +GCNANO_BINARIES_VERSION = c01642ed5e18cf09ecd905af193e935cb3be95ed +GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION)) + +GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms +GCNANO_BINARIES_LICENSE_FILES = EULA +GCNANO_BINARIES_REDISTRIBUTE = NO + +GCNANO_BINARIES_DEPENDENCIES = linux wayland libdrm + +GCNANO_BINARIES_INSTALL_STAGING = YES + +GCNANO_BINARIES_PROVIDES = libegl libgles + +# The Github repository doesn't contain the source code as-is: it +# contains a tarball with the kernel driver source code, and a +# self-extractible binary for the user-space parts. So we extract both +# below, and also extract the EULA text from the self-extractible binary +define GCNANO_BINARIES_EXTRACT_HELPER + tar --strip-components=1 -xJf $(@D)/gcnano-driver-$(GCNANO_BINARIES_DRIVER_VERSION).tar.xz -C $(@D) + awk 'BEGIN { start = 0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /< $(@D)/EULA + cd $(@D) && sh gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION).bin --auto-accept +endef + +GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER + +GCNANO_BINARIES_MODULE_MAKE_OPTS = \ + KERNEL_DIR=$(LINUX_DIR) \ + SOC_PLATFORM=st-st \ + AQROOT=$(@D) \ + DEBUG=0 + +GCNANO_BINARIES_LIBRARIES = \ + gbm_viv libEGL libGAL libgbm libGLESv1_CM \ + libGLESv2 libGLSLC libOpenVG libVSC + +GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION) + +GCNANO_BINARIES_PKG_CONFIGS = egl gbm glesv1_cm glesv2 vg + +define GCNANO_BINARIES_INSTALL + $(foreach lib,$(GCNANO_BINARIES_LIBRARIES), \ + $(INSTALL) -D -m 0755 $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/$(lib).$(GCNANO_BINARIES_LIB_VERSION).multi.release.so \ + $(1)/usr/lib/$(lib).$(GCNANO_BINARIES_LIB_VERSION).multi.release.so ; \ + cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/$(lib).so* $(1)/usr/lib + ) + mkdir -p $(1)/usr/include + cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/include/* $(1)/usr/include/ + $(foreach pkgconfig,$(GCNANO_BINARIES_PKG_CONFIGS), \ + $(INSTALL) -D -m 0644 $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/pkgconfig/$(pkgconfig).pc \ + $(1)/usr/lib/pkgconfig/$(pkgconfig).pc + ) +endef + +define GCNANO_BINARIES_INSTALL_TARGET_CMDS + $(call GCNANO_BINARIES_INSTALL,$(TARGET_DIR)) +endef + +define GCNANO_BINARIES_INSTALL_STAGING_CMDS + $(call GCNANO_BINARIES_INSTALL,$(STAGING_DIR)) +endef + +$(eval $(kernel-module)) +$(eval $(generic-package)) diff --git a/buildroot/package/gcr/gcr.hash b/buildroot/package/gcr/gcr.hash index 8b8b748b9..7d5786db9 100644 --- a/buildroot/package/gcr/gcr.hash +++ b/buildroot/package/gcr/gcr.hash @@ -1,2 +1,3 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.20/gcr-3.20.0.sha256sum -sha256 90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379 gcr-3.20.0.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.34/gcr-3.34.0.sha256sum +sha256 29df50974a90987af694c0fb8926a6b366e68cacd8abd813817cfe1eb5d54524 gcr-3.34.0.tar.xz +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING diff --git a/buildroot/package/gcr/gcr.mk b/buildroot/package/gcr/gcr.mk index 7cb35af83..2fe583978 100644 --- a/buildroot/package/gcr/gcr.mk +++ b/buildroot/package/gcr/gcr.mk @@ -4,11 +4,16 @@ # ################################################################################ -GCR_VERSION_MAJOR = 3.20 +GCR_VERSION_MAJOR = 3.34 GCR_VERSION = $(GCR_VERSION_MAJOR).0 GCR_SITE = http://ftp.acc.umu.se/pub/gnome/sources/gcr/$(GCR_VERSION_MAJOR) GCR_SOURCE = gcr-$(GCR_VERSION).tar.xz -GCR_DEPENDENCIES = host-intltool host-pkgconf libgcrypt libglib2 p11-kit +GCR_DEPENDENCIES = \ + host-pkgconf \ + libgcrypt \ + libglib2 \ + p11-kit \ + $(TARGET_NLS_DEPENDENCIES) GCR_INSTALL_STAGING = YES GCR_CONF_ENV = ac_cv_path_GNUPG=/usr/bin/gpg2 GCR_CONF_OPTS = \ diff --git a/buildroot/package/gdb/7.12.1/0001-Remove-const-in-xtensa-linux-nat.c-fetch_gregs.patch b/buildroot/package/gdb/7.12.1/0001-Remove-const-in-xtensa-linux-nat.c-fetch_gregs.patch deleted file mode 100644 index bb3d99d63..000000000 --- a/buildroot/package/gdb/7.12.1/0001-Remove-const-in-xtensa-linux-nat.c-fetch_gregs.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d274ecf4ddf76768af57e27f654b9ce6784b391c Mon Sep 17 00:00:00 2001 -From: Simon Marchi -Date: Mon, 6 Mar 2017 16:06:42 -0500 -Subject: [PATCH] Remove const in xtensa-linux-nat.c:fetch_gregs - -Fixes: - -/home/emaisin/src/binutils-gdb/gdb/xtensa-linux-nat.c: In function 'void fetch_gregs(regcache*, ptid_t, int)': -/home/emaisin/src/binutils-gdb/gdb/xtensa-linux-nat.c:178:23: error: uninitialized const 'regs' [-fpermissive] - const gdb_gregset_t regs; - ^ - -gdb/ChangeLog: - - * xtensa-linux-nat.c (fetch_gregs): Remove const. - -Signed-off-by: Max Filippov ---- -Backported from: d274ecf4ddf76768af57e27f654b9ce6784b391c - - gdb/xtensa-linux-nat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c -index afe15f6..c29f0c7 100644 ---- a/gdb/xtensa-linux-nat.c -+++ b/gdb/xtensa-linux-nat.c -@@ -175,7 +175,7 @@ static void - fetch_gregs (struct regcache *regcache, int regnum) - { - int tid = ptid_get_lwp (inferior_ptid); -- const gdb_gregset_t regs; -+ gdb_gregset_t regs; - int areg; - - if (ptrace (PTRACE_GETREGS, tid, 0, (long) ®s) < 0) --- -2.1.4 - diff --git a/buildroot/package/gdb/7.12.1/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/buildroot/package/gdb/7.12.1/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch deleted file mode 100644 index f6ec1d787..000000000 --- a/buildroot/package/gdb/7.12.1/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c45f07aec83ccb732ece970cb387f2db8b6896e4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 6 Aug 2016 17:32:50 -0700 -Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -Signed-off-by: Thomas Petazzoni ---- - gdb/gdbserver/linux-ppc-low.c | 6 ++++++ - gdb/nat/ppc-linux.h | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 33a9feb..1a9141f 100644 ---- a/gdb/gdbserver/linux-ppc-low.c -+++ b/gdb/gdbserver/linux-ppc-low.c -@@ -21,7 +21,13 @@ - #include "linux-low.h" - - #include -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - - #include "nat/ppc-linux.h" - #include "linux-ppc-tdesc.h" -diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index 5837ea1..7233929 100644 ---- a/gdb/nat/ppc-linux.h -+++ b/gdb/nat/ppc-linux.h -@@ -18,7 +18,13 @@ - #ifndef PPC_LINUX_H - #define PPC_LINUX_H 1 - -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+#endif - #include - - /* This sometimes isn't defined. */ --- -2.7.4 - diff --git a/buildroot/package/gdb/7.12.1/0003-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/buildroot/package/gdb/7.12.1/0003-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch deleted file mode 100644 index 4f142ecf0..000000000 --- a/buildroot/package/gdb/7.12.1/0003-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 00a0ba059f01784e8da5cec3439ea2d6c4a2ef40 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 3 Jun 2017 21:23:52 +0200 -Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC - systems - -Fixes a pt_{dsp,}regs redefinition when building with the musl C library -on SuperH. - -Inspired by -http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch, -adapted for SuperH. - -Signed-off-by: Thomas Petazzoni ---- - gdb/gdbserver/linux-sh-low.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c -index ac084c9..08e104a 100644 ---- a/gdb/gdbserver/linux-sh-low.c -+++ b/gdb/gdbserver/linux-sh-low.c -@@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh; - #include - #endif - -+#if !defined(__GLIBC__) -+# define pt_regs uapi_pt_regs -+# define pt_dspregs uapi_pt_dspregs -+#endif - #include -+#if !defined(__GLIBC__) -+# undef pt_regs -+# undef pt_dspregs -+#endif - - #define sh_num_regs 41 - --- -2.7.4 - diff --git a/buildroot/package/gdb/7.12.1/0004-Fix-gdbserver-build-on-uClibc-noMMU.patch b/buildroot/package/gdb/7.12.1/0004-Fix-gdbserver-build-on-uClibc-noMMU.patch deleted file mode 100644 index cbdfc4de6..000000000 --- a/buildroot/package/gdb/7.12.1/0004-Fix-gdbserver-build-on-uClibc-noMMU.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 430ab62f356d9e45e2231b0483ee33eaf3af5df3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 9 Jun 2017 10:19:32 +0200 -Subject: [PATCH] Fix gdbserver build on uClibc/noMMU - -The noMMU specific code requires including . - -Originally from -https://cgit.openadk.org/cgi/cgit/openadk.git/plain/package/gdbserver/patches/nommu.patch. - -Signed-off-by: Thomas Petazzoni ---- - gdb/nat/linux-ptrace.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h -index 5954945..80bb674 100644 ---- a/gdb/nat/linux-ptrace.h -+++ b/gdb/nat/linux-ptrace.h -@@ -23,7 +23,8 @@ struct buffer; - #include "nat/gdb_ptrace.h" - - #ifdef __UCLIBC__ --#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__)) -+#include -+#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_USE_MMU__)) - /* PTRACE_TEXT_ADDR and friends. */ - #include - #define HAS_NOMMU --- -2.7.4 - diff --git a/buildroot/package/gdb/7.12.1/0005-use-asm-sgidefs.h.patch b/buildroot/package/gdb/7.12.1/0005-use-asm-sgidefs.h.patch deleted file mode 100644 index d30336904..000000000 --- a/buildroot/package/gdb/7.12.1/0005-use-asm-sgidefs.h.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH] use - -Build fix for MIPS with musl libc - -The MIPS specific header is provided by glibc and uclibc -but not by musl. Regardless of the libc, the kernel headers provide - which provides the same definitions, so use that -instead. - -Upstream-Status: Pending - -[Vincent: -Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] - -Signed-off-by: Andre McCurdy -Signed-off-by: Khem Raj -Signed-off-by: Vicente Olivert Riera ---- - gdb/mips-linux-nat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index f2df1b9907..d24664cb56 100644 ---- a/gdb/mips-linux-nat.c -+++ b/gdb/mips-linux-nat.c -@@ -31,7 +31,7 @@ - #include "gdb_proc_service.h" - #include "gregset.h" - --#include -+#include - #include "nat/gdb_ptrace.h" - #include - #include "inf-ptrace.h" --- -2.13.1 - diff --git a/buildroot/package/gdb/7.12.1/0006-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch b/buildroot/package/gdb/7.12.1/0006-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch deleted file mode 100644 index 4eb72e408..000000000 --- a/buildroot/package/gdb/7.12.1/0006-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 09a2c3e0164545324a1ddee70f5c9fdee71e2079 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 18 Jun 2017 23:09:43 +0200 -Subject: [PATCH] nat/linux-ptrace.c: add missing gdb_byte* cast - -On noMMU platforms, the following code gets compiled: - - child_stack = xmalloc (STACK_SIZE * 4); - -Where child_stack is a gdb_byte*, and xmalloc() returns a void*. While -the lack of cast is valid in C, it is not in C++, causing the -following build failure: - -../nat/linux-ptrace.c: In function 'int linux_fork_to_function(gdb_byte*, int (*)(void*))': -../nat/linux-ptrace.c:273:29: error: invalid conversion from 'void*' to 'gdb_byte* {aka unsigned char*}' [-fpermissive] - child_stack = xmalloc (STACK_SIZE * 4); - -Therefore, this commit adds the appropriate cast. - -Signed-off-by: Thomas Petazzoni -[Upstream commit: ffce45d2243e5f52f411e314fc4e1a69f431a81f] ---- - gdb/nat/linux-ptrace.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c -index 3447e07..33833e2 100644 ---- a/gdb/nat/linux-ptrace.c -+++ b/gdb/nat/linux-ptrace.c -@@ -270,7 +270,7 @@ linux_fork_to_function (gdb_byte *child_stack, int (*function) (void *)) - #define STACK_SIZE 4096 - - if (child_stack == NULL) -- child_stack = xmalloc (STACK_SIZE * 4); -+ child_stack = (gdb_byte*) xmalloc (STACK_SIZE * 4); - - /* Use CLONE_VM instead of fork, to support uClinux (no MMU). */ - #ifdef __ia64__ --- -2.9.4 - diff --git a/buildroot/package/gdb/7.12.1/0007-gdbserver-fix-build-for-m68k.patch b/buildroot/package/gdb/7.12.1/0007-gdbserver-fix-build-for-m68k.patch deleted file mode 100644 index 451bed312..000000000 --- a/buildroot/package/gdb/7.12.1/0007-gdbserver-fix-build-for-m68k.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 80c60ea9fb3634272a98ec526eabff25f5255bae Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 22 Jun 2018 22:40:26 +0200 -Subject: [PATCH] gdbserver: fix build for m68k -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As for strace [1], when is included after , -the build fails on m68k with the following diagnostics: - -In file included from ./../nat/linux-ptrace.h:28:0, - from linux-low.h:27, - from linux-m68k-low.c:20: -[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant - PT_D1 = 0, - ^ -[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant -[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant -In file included from linux-m68k-low.c:27:0: -[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token - }; - ^ - -Fix this by moving on top of "linux-low.h". - -[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 - -Signed-off-by: Romain Naour ---- - gdb/gdbserver/linux-m68k-low.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c -index 5594f10f927..19b4ef7b259 100644 ---- a/gdb/gdbserver/linux-m68k-low.c -+++ b/gdb/gdbserver/linux-m68k-low.c -@@ -17,16 +17,17 @@ - along with this program. If not, see . */ - - #include "server.h" -+ -+#ifdef HAVE_SYS_REG_H -+#include -+#endif -+ - #include "linux-low.h" - - /* Defined in auto-generated file reg-m68k.c. */ - void init_registers_m68k (void); - extern const struct target_desc *tdesc_m68k; - --#ifdef HAVE_SYS_REG_H --#include --#endif -- - #define m68k_num_regs 29 - #define m68k_num_gregs 18 - --- -2.14.4 - diff --git a/buildroot/package/gdb/7.12.1/0008-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch b/buildroot/package/gdb/7.12.1/0008-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch deleted file mode 100644 index 3cfc0feb5..000000000 --- a/buildroot/package/gdb/7.12.1/0008-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 Mon Sep 17 00:00:00 2001 -From: James Clarke -Date: Fri, 19 Jan 2018 17:22:49 +0000 -Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including - gdb_wait.h - -On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which -contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot -define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included -earlier; include it from linux-ptrace.h so it can never come afterwards. - -gdb/ChangeLog: - - * nat/linux-ptrace.c: Remove unnecessary reinclusion of - gdb_ptrace.h, and move including gdb_wait.h ... - * nat/linux-ptrace.h: ... to here. - -Signed-off-by: Fabrice Fontaine -[Retrieved (and backported/updated to remove ChangeLog update) from: -https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8] ---- - gdb/ChangeLog | 6 ++++++ - gdb/nat/linux-ptrace.c | 2 -- - gdb/nat/linux-ptrace.h | 1 + - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c -index 5c4ddc9..1f21ef0 100644 ---- a/gdb/nat/linux-ptrace.c -+++ b/gdb/nat/linux-ptrace.c -@@ -21,8 +21,6 @@ - #include "linux-procfs.h" - #include "linux-waitpid.h" - #include "buffer.h" --#include "gdb_wait.h" --#include "gdb_ptrace.h" - #include - - /* Stores the ptrace options supported by the running kernel. -diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h -index 60967a3..dc180fb 100644 ---- a/gdb/nat/linux-ptrace.h -+++ b/gdb/nat/linux-ptrace.h -@@ -21,6 +21,7 @@ - struct buffer; - - #include "nat/gdb_ptrace.h" -+#include "gdb_wait.h" - - #ifdef __UCLIBC__ - #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__)) --- -2.9.3 - diff --git a/buildroot/package/gdb/8.0.1/0004-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch b/buildroot/package/gdb/8.0.1/0004-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch deleted file mode 100644 index 4eb72e408..000000000 --- a/buildroot/package/gdb/8.0.1/0004-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 09a2c3e0164545324a1ddee70f5c9fdee71e2079 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 18 Jun 2017 23:09:43 +0200 -Subject: [PATCH] nat/linux-ptrace.c: add missing gdb_byte* cast - -On noMMU platforms, the following code gets compiled: - - child_stack = xmalloc (STACK_SIZE * 4); - -Where child_stack is a gdb_byte*, and xmalloc() returns a void*. While -the lack of cast is valid in C, it is not in C++, causing the -following build failure: - -../nat/linux-ptrace.c: In function 'int linux_fork_to_function(gdb_byte*, int (*)(void*))': -../nat/linux-ptrace.c:273:29: error: invalid conversion from 'void*' to 'gdb_byte* {aka unsigned char*}' [-fpermissive] - child_stack = xmalloc (STACK_SIZE * 4); - -Therefore, this commit adds the appropriate cast. - -Signed-off-by: Thomas Petazzoni -[Upstream commit: ffce45d2243e5f52f411e314fc4e1a69f431a81f] ---- - gdb/nat/linux-ptrace.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c -index 3447e07..33833e2 100644 ---- a/gdb/nat/linux-ptrace.c -+++ b/gdb/nat/linux-ptrace.c -@@ -270,7 +270,7 @@ linux_fork_to_function (gdb_byte *child_stack, int (*function) (void *)) - #define STACK_SIZE 4096 - - if (child_stack == NULL) -- child_stack = xmalloc (STACK_SIZE * 4); -+ child_stack = (gdb_byte*) xmalloc (STACK_SIZE * 4); - - /* Use CLONE_VM instead of fork, to support uClinux (no MMU). */ - #ifdef __ia64__ --- -2.9.4 - diff --git a/buildroot/package/gdb/8.0.1/0005-gdbserver-fix-build-for-m68k.patch b/buildroot/package/gdb/8.0.1/0005-gdbserver-fix-build-for-m68k.patch deleted file mode 100644 index 451bed312..000000000 --- a/buildroot/package/gdb/8.0.1/0005-gdbserver-fix-build-for-m68k.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 80c60ea9fb3634272a98ec526eabff25f5255bae Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 22 Jun 2018 22:40:26 +0200 -Subject: [PATCH] gdbserver: fix build for m68k -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As for strace [1], when is included after , -the build fails on m68k with the following diagnostics: - -In file included from ./../nat/linux-ptrace.h:28:0, - from linux-low.h:27, - from linux-m68k-low.c:20: -[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant - PT_D1 = 0, - ^ -[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant -[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant -In file included from linux-m68k-low.c:27:0: -[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token - }; - ^ - -Fix this by moving on top of "linux-low.h". - -[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 - -Signed-off-by: Romain Naour ---- - gdb/gdbserver/linux-m68k-low.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c -index 5594f10f927..19b4ef7b259 100644 ---- a/gdb/gdbserver/linux-m68k-low.c -+++ b/gdb/gdbserver/linux-m68k-low.c -@@ -17,16 +17,17 @@ - along with this program. If not, see . */ - - #include "server.h" -+ -+#ifdef HAVE_SYS_REG_H -+#include -+#endif -+ - #include "linux-low.h" - - /* Defined in auto-generated file reg-m68k.c. */ - void init_registers_m68k (void); - extern const struct target_desc *tdesc_m68k; - --#ifdef HAVE_SYS_REG_H --#include --#endif -- - #define m68k_num_regs 29 - #define m68k_num_gregs 18 - --- -2.14.4 - diff --git a/buildroot/package/gdb/8.0.1/0006-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch b/buildroot/package/gdb/8.0.1/0006-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch deleted file mode 100644 index 1e85d9314..000000000 --- a/buildroot/package/gdb/8.0.1/0006-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 Mon Sep 17 00:00:00 2001 -From: James Clarke -Date: Fri, 19 Jan 2018 17:22:49 +0000 -Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including - gdb_wait.h - -On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which -contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot -define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included -earlier; include it from linux-ptrace.h so it can never come afterwards. - -gdb/ChangeLog: - - * nat/linux-ptrace.c: Remove unnecessary reinclusion of - gdb_ptrace.h, and move including gdb_wait.h ... - * nat/linux-ptrace.h: ... to here. - -Signed-off-by: Fabrice Fontaine -[Retrieved (and updated to remove ChangeLog update) from: -https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8] ---- - gdb/ChangeLog | 6 ++++++ - gdb/nat/linux-ptrace.c | 2 -- - gdb/nat/linux-ptrace.h | 1 + - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c -index 5c4ddc9..1f21ef0 100644 ---- a/gdb/nat/linux-ptrace.c -+++ b/gdb/nat/linux-ptrace.c -@@ -21,8 +21,6 @@ - #include "linux-procfs.h" - #include "linux-waitpid.h" - #include "buffer.h" --#include "gdb_wait.h" --#include "gdb_ptrace.h" - #ifdef HAVE_SYS_PROCFS_H - #include - #endif -diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h -index 60967a3..dc180fb 100644 ---- a/gdb/nat/linux-ptrace.h -+++ b/gdb/nat/linux-ptrace.h -@@ -21,6 +21,7 @@ - struct buffer; - - #include "nat/gdb_ptrace.h" -+#include "gdb_wait.h" - - #ifdef __UCLIBC__ - #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__)) --- -2.9.3 - diff --git a/buildroot/package/gdb/8.0.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/buildroot/package/gdb/8.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 75% rename from buildroot/package/gdb/8.0.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to buildroot/package/gdb/8.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 9e011c728..ab8dc626f 100644 --- a/buildroot/package/gdb/8.0.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/buildroot/package/gdb/8.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -1,4 +1,4 @@ -From 2acd9d3eb703b9a64ac92b3880ed546bec92af95 Mon Sep 17 00:00:00 2001 +From 72ee19f54fd35595465b2e35eccf1f3d65fe21c6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Aug 2016 17:32:50 -0700 Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems @@ -7,7 +7,7 @@ Upstream-Status: Pending Signed-off-by: Khem Raj Signed-off-by: Thomas Petazzoni -[Rebase on gdb 8.0] +[Rebase on gdb 8.3] Signed-off-by: Romain Naour --- gdb/gdbserver/linux-ppc-low.c | 6 ++++++ @@ -15,12 +15,12 @@ Signed-off-by: Romain Naour 2 files changed, 12 insertions(+) diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 33a9feb..1a9141f 100644 +index 1b695e53fe9..1978347c02c 100644 --- a/gdb/gdbserver/linux-ppc-low.c +++ b/gdb/gdbserver/linux-ppc-low.c -@@ -21,7 +21,13 @@ - #include "linux-low.h" - +@@ -23,7 +23,13 @@ + #include "elf/common.h" + #include #include +#if !defined(__GLIBC__) +# define pt_regs uapi_pt_regs @@ -30,15 +30,15 @@ index 33a9feb..1a9141f 100644 +# undef pt_regs +#endif - #include "nat/ppc-linux.h" - #include "linux-ppc-tdesc.h" + #include "arch/ppc-linux-common.h" + #include "arch/ppc-linux-tdesc.h" diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index 5837ea1..7233929 100644 +index f1561b3b357..40399361c09 100644 --- a/gdb/nat/ppc-linux.h +++ b/gdb/nat/ppc-linux.h @@ -18,7 +18,13 @@ - #ifndef PPC_LINUX_H - #define PPC_LINUX_H 1 + #ifndef NAT_PPC_LINUX_H + #define NAT_PPC_LINUX_H +#if !defined(__GLIBC__) +# define pt_regs uapi_pt_regs @@ -51,5 +51,5 @@ index 5837ea1..7233929 100644 /* This sometimes isn't defined. */ -- -2.9.4 +2.21.0 diff --git a/buildroot/package/gdb/8.0.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/buildroot/package/gdb/8.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 89% rename from buildroot/package/gdb/8.0.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to buildroot/package/gdb/8.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch index d31e5dd11..9d508fbf1 100644 --- a/buildroot/package/gdb/8.0.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch +++ b/buildroot/package/gdb/8.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch @@ -1,8 +1,8 @@ -From dfe4a40bc9d2fc1fd1b1a11ed733a0c0a1f59f3c Mon Sep 17 00:00:00 2001 +From ef630288fdc2d4d22651702672f9d5c9cd767e5b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 3 Jun 2017 21:23:52 +0200 -Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on - !GLIBC systems +Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC + systems Fixes a pt_{dsp,}regs redefinition when building with the musl C library on SuperH. @@ -19,7 +19,7 @@ Signed-off-by: Romain Naour 1 file changed, 8 insertions(+) diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c -index ac084c9..08e104a 100644 +index 0953721a190..c331c1382f7 100644 --- a/gdb/gdbserver/linux-sh-low.c +++ b/gdb/gdbserver/linux-sh-low.c @@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh; @@ -39,5 +39,5 @@ index ac084c9..08e104a 100644 #define sh_num_regs 41 -- -2.9.4 +2.21.0 diff --git a/buildroot/package/gdb/8.0.1/0003-use-asm-sgidefs.h.patch b/buildroot/package/gdb/8.3/0003-use-asm-sgidefs.h.patch similarity index 90% rename from buildroot/package/gdb/8.0.1/0003-use-asm-sgidefs.h.patch rename to buildroot/package/gdb/8.3/0003-use-asm-sgidefs.h.patch index d30336904..2909f62c6 100644 --- a/buildroot/package/gdb/8.0.1/0003-use-asm-sgidefs.h.patch +++ b/buildroot/package/gdb/8.3/0003-use-asm-sgidefs.h.patch @@ -1,4 +1,4 @@ -From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001 +From 19a0f664809b6858e69aa98188eb739415de044c Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 Subject: [PATCH] use @@ -23,7 +23,7 @@ Signed-off-by: Vicente Olivert Riera 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index f2df1b9907..d24664cb56 100644 +index e68ed1e4da9..bc42aa59685 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -36,5 +36,5 @@ index f2df1b9907..d24664cb56 100644 #include #include "inf-ptrace.h" -- -2.13.1 +2.21.0 diff --git a/buildroot/package/gdb/8.3/0004-gdbserver-fix-build-for-m68k.patch b/buildroot/package/gdb/8.3/0004-gdbserver-fix-build-for-m68k.patch new file mode 100644 index 000000000..d71829389 --- /dev/null +++ b/buildroot/package/gdb/8.3/0004-gdbserver-fix-build-for-m68k.patch @@ -0,0 +1,62 @@ +From 448e481aab86c823d908530038e20a14213db0a2 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 22 Jun 2018 22:40:26 +0200 +Subject: [PATCH] gdbserver: fix build for m68k +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As for strace [1], when is included after , +the build fails on m68k with the following diagnostics: + +In file included from ./../nat/linux-ptrace.h:28:0, + from linux-low.h:27, + from linux-m68k-low.c:20: +[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant + PT_D1 = 0, + ^ +[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant +[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant +In file included from linux-m68k-low.c:27:0: +[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token + }; + ^ + +Fix this by moving on top of "linux-low.h". + +[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 + +Signed-off-by: Romain Naour +--- + gdb/gdbserver/linux-m68k-low.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c +index 16f639d02fc..969d9973737 100644 +--- a/gdb/gdbserver/linux-m68k-low.c ++++ b/gdb/gdbserver/linux-m68k-low.c +@@ -17,16 +17,17 @@ + along with this program. If not, see . */ + + #include "server.h" ++ ++#ifdef HAVE_SYS_REG_H ++#include ++#endif ++ + #include "linux-low.h" + + /* Defined in auto-generated file reg-m68k.c. */ + void init_registers_m68k (void); + extern const struct target_desc *tdesc_m68k; + +-#ifdef HAVE_SYS_REG_H +-#include +-#endif +- + #define m68k_num_regs 29 + #define m68k_num_gregs 18 + +-- +2.21.0 + diff --git a/buildroot/package/gdb/8.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/buildroot/package/gdb/8.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch new file mode 100644 index 000000000..394e7a2c2 --- /dev/null +++ b/buildroot/package/gdb/8.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch @@ -0,0 +1,53 @@ +From d84ecfa3a8c8fbade89229ac66c09f2a97ab00fb Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 24 Jun 2018 23:33:55 +0200 +Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h + +To decide whether fork() or vfork() should be used, fork-inferior.c +uses the following test: + + #if !(defined(__UCLIBC__) && defined(HAS_NOMMU)) + +However, HAS_NOMMU is never defined, because it gets defined in +linux-ptrace.h, which is not included by fork-inferior.c. Due to this, +gdbserver fails to build on noMMU architectures. This commit fixes +that by simply including linux-ptrace.h. + +This bug was introduced by commit +2090129c36c7e582943b7d300968d19b46160d84 ("Share fork_inferior et al +with gdbserver"). Indeed, the same fork()/vfork() selection was done, +but in another file where linux-ptrace.h was included. + +Fixes the following build issue: + +../nat/fork-inferior.c: In function 'pid_t fork_inferior(const char*, const string&, char**, void (*)(), void (*)(int), void (*)(), const char*, void (*)(const char*, char* const*, char* const*))': +../nat/fork-inferior.c:376:11: error: 'fork' was not declared in this scope + pid = fork (); + ^~~~ +../nat/fork-inferior.c:376:11: note: suggested alternative: 'vfork' + pid = fork (); + ^~~~ + vfork + +Signed-off-by: Thomas Petazzoni +[Romain: rebase on gdb 8.3] +Signed-off-by: Romain Naour +--- + gdb/nat/fork-inferior.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c +index fe9360a5039..626fe7c1fbf 100644 +--- a/gdb/nat/fork-inferior.c ++++ b/gdb/nat/fork-inferior.c +@@ -27,6 +27,7 @@ + #include "common/pathstuff.h" + #include "common/signals-state-save-restore.h" + #include "common/gdb_tilde_expand.h" ++#include "linux-ptrace.h" + #include + + extern char **environ; +-- +2.21.0 + diff --git a/buildroot/package/gdb/Config.in b/buildroot/package/gdb/Config.in index 0c3465d14..4c787d49a 100644 --- a/buildroot/package/gdb/Config.in +++ b/buildroot/package/gdb/Config.in @@ -5,21 +5,21 @@ config BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on !BR2_microblaze depends on !BR2_nios2 depends on !BR2_or1k + depends on !BR2_nds32 comment "gdb/gdbserver needs a toolchain w/ threads, threads debug" depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG comment "gdb/gdbserver >= 8.x needs a toolchain w/ C++, gcc >= 4.8" - depends on BR2_PACKAGE_GDB_NEEDS_CXX11 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 config BR2_PACKAGE_GDB bool "gdb" depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_PACKAGE_GDB_NEEDS_CXX11 - depends on BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_GDB_NEEDS_CXX11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_INSTALL_LIBSTDCPP # no gdbserver on riscv select BR2_PACKAGE_GDB_DEBUGGER if BR2_riscv # When the external toolchain gdbserver is copied to the @@ -49,6 +49,11 @@ config BR2_PACKAGE_GDB_SERVER bool "gdbserver" depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY depends on !BR2_riscv + # Simultaneous build of gdbserver and full gdb is not possible + # with arc-2019.09. This bug comes from upstream GDB. So + # simultaneous usage of full gdb and gdbserver is temporaly + # disabled for ARC until a fix becomes available. + depends on !(BR2_arc && BR2_PACKAGE_GDB_DEBUGGER) help Build the gdbserver stub to run on the target. A full gdb is needed to debug the progam. @@ -57,6 +62,7 @@ config BR2_PACKAGE_GDB_DEBUGGER bool "full debugger" depends on BR2_USE_WCHAR depends on !BR2_sh + depends on !BR2_csky select BR2_PACKAGE_NCURSES comment "full gdb on target needs a toolchain w/ wchar" diff --git a/buildroot/package/gdb/Config.in.host b/buildroot/package/gdb/Config.in.host index 969168ffa..5315f1049 100644 --- a/buildroot/package/gdb/Config.in.host +++ b/buildroot/package/gdb/Config.in.host @@ -1,13 +1,12 @@ config BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS bool default y - # The ARC version needs C++11, thus gcc >= 4.8, like gdb-8.0.x - depends on BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_arc depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT) depends on !BR2_microblaze depends on !BR2_nios2 depends on !BR2_or1k depends on !BR2_riscv + depends on !BR2_nds32 comment "Host GDB Options" depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY @@ -46,57 +45,31 @@ config BR2_PACKAGE_HOST_GDB_SIM choice prompt "GDB debugger Version" - default BR2_GDB_VERSION_8_1 + default BR2_GDB_VERSION_8_2 depends on !BR2_arc + depends on !BR2_csky help Select the version of gdb you wish to use. -config BR2_GDB_VERSION_7_12 - bool "gdb 7.12.x" - -config BR2_GDB_VERSION_8_0 - bool "gdb 8.0.x" - # Needs a C++11 compiler - depends on BR2_HOST_GCC_AT_LEAST_4_8 - config BR2_GDB_VERSION_8_1 bool "gdb 8.1.x" - # Needs a C++11 compiler - depends on BR2_HOST_GCC_AT_LEAST_4_8 config BR2_GDB_VERSION_8_2 bool "gdb 8.2.x" - # Needs a C++11 compiler - depends on BR2_HOST_GCC_AT_LEAST_4_8 + +config BR2_GDB_VERSION_8_3 + bool "gdb 8.3.x" endchoice endif -# Tells whether the currently selected gdb version requires C++11 -# support in the toolchain. When host-gdb is not enabled, the target -# gdb built is 8.0, which requires C++11 support, which is why -# BR2_PACKAGE_GDB_NEEDS_CXX11 is 'y' when BR2_PACKAGE_HOST_GDB is not -# enabled. When host-gdb is built, with the version set to 8.0 or 8.1 -# then C++11 support is needed in the toolchain to build gdb for the -# target. -# -# Even though this option is related to target gdb dependencies, we -# keep it next to the BR2_GDB_VERSION so that they are kept in sync. -config BR2_PACKAGE_GDB_NEEDS_CXX11 - bool - default y if !BR2_PACKAGE_HOST_GDB - default y if BR2_GDB_VERSION_8_0 - default y if BR2_GDB_VERSION_8_1 - default y if BR2_GDB_VERSION_8_2 - default y if BR2_arc - # If cross-gdb is not enabled, the latest working version is chosen. config BR2_GDB_VERSION string - default "arc-2018.09-release-gdb" if BR2_arc - default "7.12.1" if BR2_GDB_VERSION_7_12 - default "8.0.1" if BR2_GDB_VERSION_8_0 - default "8.1.1" if BR2_GDB_VERSION_8_1 || !BR2_PACKAGE_HOST_GDB - default "8.2.1" if BR2_GDB_VERSION_8_2 + default "arc-2019.09-release-gdb" if BR2_arc + default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky + default "8.1.1" if BR2_GDB_VERSION_8_1 + default "8.2.1" if BR2_GDB_VERSION_8_2 || !BR2_PACKAGE_HOST_GDB + default "8.3" if BR2_GDB_VERSION_8_3 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/buildroot/package/gdb/arc-2018.09-gdb/0001-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch b/buildroot/package/gdb/arc-2018.09-gdb/0001-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch deleted file mode 100644 index 1ee39658f..000000000 --- a/buildroot/package/gdb/arc-2018.09-gdb/0001-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e213d8e1b5317389c3beee648811bc649d62d743 Mon Sep 17 00:00:00 2001 -From: James Clarke -Date: Fri, 19 Jan 2018 17:22:49 +0000 -Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including - gdb_wait.h - -On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which -contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot -define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included -earlier; include it from linux-ptrace.h so it can never come afterwards. - -gdb/ChangeLog: - - * nat/linux-ptrace.c: Remove unnecessary reinclusion of - gdb_ptrace.h, and move including gdb_wait.h ... - * nat/linux-ptrace.h: ... to here. - -[Backport from upstream 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8] -Signed-off-by: Alexey Brodkin ---- - gdb/nat/linux-ptrace.c | 2 -- - gdb/nat/linux-ptrace.h | 1 + - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c -index 438177fa7622..1240eead0d50 100644 ---- a/gdb/nat/linux-ptrace.c -+++ b/gdb/nat/linux-ptrace.c -@@ -21,8 +21,6 @@ - #include "linux-procfs.h" - #include "linux-waitpid.h" - #include "buffer.h" --#include "gdb_wait.h" --#include "gdb_ptrace.h" - #ifdef HAVE_SYS_PROCFS_H - #include - #endif -diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h -index 59549452c099..6faa89b22a0e 100644 ---- a/gdb/nat/linux-ptrace.h -+++ b/gdb/nat/linux-ptrace.h -@@ -21,6 +21,7 @@ - struct buffer; - - #include "nat/gdb_ptrace.h" -+#include "gdb_wait.h" - - #ifdef __UCLIBC__ - #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__)) --- -2.19.2 - diff --git a/buildroot/package/gdb/gdb.hash b/buildroot/package/gdb/gdb.hash index 1104da5dc..b98d6d6a6 100644 --- a/buildroot/package/gdb/gdb.hash +++ b/buildroot/package/gdb/gdb.hash @@ -1,8 +1,10 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8 gdb-7.12.1.tar.xz -sha512 5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1 gdb-8.0.1.tar.xz sha512 7dcd5e8c90de92f577834d887b5f54edb93a07083bfe661bc46c270a6cc4919f0b348e7e2fe8ae4511298a570ef150eeefdc667ef7cf527f0cf60943177ab6c9 gdb-8.1.1.tar.xz sha512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11 gdb-8.2.1.tar.xz +sha512 47ac074d20a09a3fac8f4a41dce0a0cbe6ef702f7dc21ba8b7d650d306128dcae481e9a16bf65e596b3a541dc82ae57c02bcbb786d551b4ef3e2917b9b6f0ae1 gdb-8.3.tar.xz # Locally calculated (fetched from Github) -sha512 8303e399e396f5c15dc976e48503fc7d45a720dd1a470443f755c5f2458d092b4392e7ae582abc251bc4b43a778ad784f764286a2a05abfc1649cbeeeb6e7d15 gdb-arc-2018.09-release-gdb.tar.gz +sha512 c33818f8679d99d5315220578864b04b87f69c46ebe62472809ee6e1d260e5ec84d598f38d80c127a2045d6624f28803c2720d89434204acbd94e988a45870f1 gdb-arc-2019.09-release-gdb.tar.gz + +# Locally calculated (fetched from https://github.com/c-sky/binutils-gdb) +sha512 c421e1f3c0d6cfb3c04544573c0c4b0075c8d8e3d563c6c234fcc1e4c2167ab203d1e57aec3b58abd348dc46f8cf9b47b753d3a43dba3ea970c9c9a6bd78c07b gdb-4ecb98fbc2f94dbe01b69384afbc515107de73df.tar.gz diff --git a/buildroot/package/gdb/gdb.mk b/buildroot/package/gdb/gdb.mk index a92696137..46d745a89 100644 --- a/buildroot/package/gdb/gdb.mk +++ b/buildroot/package/gdb/gdb.mk @@ -14,6 +14,12 @@ GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz GDB_FROM_GIT = y endif +ifeq ($(BR2_csky),y) +GDB_SITE = $(call github,c-sky,binutils-gdb,$(GDB_VERSION)) +GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz +GDB_FROM_GIT = y +endif + GDB_LICENSE = GPL-2.0+, LGPL-2.0+, GPL-3.0+, LGPL-3.0+ GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB diff --git a/buildroot/package/gdbm/gdbm.hash b/buildroot/package/gdbm/gdbm.hash index cab712e17..8de9f6368 100644 --- a/buildroot/package/gdbm/gdbm.hash +++ b/buildroot/package/gdbm/gdbm.hash @@ -1,5 +1,6 @@ -# From http://www.gnu.org.ua/software/gdbm/download.html -md5 8929dcda2a8de3fd2367bdbf66769376 gdbm-1.13.tar.gz -sha1 7f2a8301497bbcac91808b011ca533380914fd21 gdbm-1.13.tar.gz +# From https://lists.gnu.org/archive/html/info-gnu/2018-10/msg00006.html +md5 988dc82182121c7570e0cb8b4fcd5415 gdbm-1.18.1.tar.gz +sha1 4a923ebfac06bb05c1c7699b206719e06a938f0d gdbm-1.18.1.tar.gz # Locally computed -sha256 9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d851c386c37207000a253 gdbm-1.13.tar.gz +sha256 86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc gdbm-1.18.1.tar.gz +sha256 690d762f2e8e149ab1e2d6a409a3853b6151a2533b2382fae549a176d6bedecf COPYING diff --git a/buildroot/package/gdbm/gdbm.mk b/buildroot/package/gdbm/gdbm.mk index acd8cd2ac..084a7769f 100644 --- a/buildroot/package/gdbm/gdbm.mk +++ b/buildroot/package/gdbm/gdbm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GDBM_VERSION = 1.13 +GDBM_VERSION = 1.18.1 GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm GDBM_LICENSE = GPL-3.0+ GDBM_LICENSE_FILES = COPYING diff --git a/buildroot/package/genext2fs/genext2fs.hash b/buildroot/package/genext2fs/genext2fs.hash index 46b8af352..add44c4c4 100644 --- a/buildroot/package/genext2fs/genext2fs.hash +++ b/buildroot/package/genext2fs/genext2fs.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 404dbbfa7a86a6c3de8225c8da254d026b17fd288e05cec4df2cc7e1f4feecfc genext2fs-1.4.1.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch b/buildroot/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch new file mode 100644 index 000000000..d43714a3d --- /dev/null +++ b/buildroot/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch @@ -0,0 +1,51 @@ +From 250bee9e02546846d70dbe88ac36bb83c6a7ebdf Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 22 Sep 2019 09:27:24 +0200 +Subject: [PATCH] configure.ac: add --disable-doc option + +Add --disable-doc option to allow the user to disable documentation + +Signed-off-by: Fabrice Fontaine +[Sent upstream: https://savannah.gnu.org/bugs/index.php?56931] +--- + Makefile.am | 6 +++++- + configure.ac | 7 +++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index dbb5719..2db307a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -18,6 +18,10 @@ + ACLOCAL_AMFLAGS = -I m4 -I gl/m4 + + EXTRA_DIST = configure TODO LICENSE gl/m4/gnulib-cache.m4 +-SUBDIRS = gl src doc tests ++SUBDIRS = gl src tests ++ ++if ENABLE_DOC ++SUBDIRS += doc ++endif + + gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE +diff --git a/configure.ac b/configure.ac +index 0ee89db..915706c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -61,6 +61,13 @@ AC_ARG_ENABLE( + AC_COMPILE_WARNINGS + ) + ++AC_ARG_ENABLE( ++ [doc], ++ [--enable-doc enable documentation], ++ [enable_doc=$enableval], ++ [enable_doc=yes]) ++AM_CONDITIONAL(ENABLE_DOC, test x"$enable_doc" = xyes) ++ + AC_ARG_WITH( + [gengen], + [ --with-gengen=mygengen gengen to use], +-- +2.23.0 + diff --git a/buildroot/package/gengetopt/0001-fix-compilation-warnings-in-generated-code.patch b/buildroot/package/gengetopt/0001-fix-compilation-warnings-in-generated-code.patch deleted file mode 100644 index 88961e669..000000000 --- a/buildroot/package/gengetopt/0001-fix-compilation-warnings-in-generated-code.patch +++ /dev/null @@ -1,65 +0,0 @@ -Fix compilation warnings in generated code - -Patch taken from open bug report http://savannah.gnu.org/bugs/?40243 -(project gengetopt seems to be dead; no hope for a new release soon) - -Imported by Philippe Mariman. -This description by Thomas De Schampheleire. - -Signed-off-by: Thomas De Schampheleire - -Index: gengetopt-2.22.6/src/skels/c_source.cc -=================================================================== ---- gengetopt-2.22.6.orig/src/skels/c_source.cc 2012-11-07 20:58:29.000000000 +0100 -+++ gengetopt-2.22.6/src/skels/c_source.cc 2014-11-20 12:05:02.597527761 +0100 -@@ -2424,9 +2424,12 @@ - stream << " FIX_UNUSED (field);"; - stream << "\n"; - stream << indent_str; -+ stream << " FIX_UNUSED (stop_char);"; -+ stream << "\n"; -+ stream << indent_str; -+ stream << " FIX_UNUSED (val);"; - stream << "\n"; - stream << indent_str; -- stream << " stop_char = 0;"; - stream << "\n"; - stream << indent_str; - stream << " found = 0;"; -@@ -3981,6 +3984,12 @@ - stream << "\n"; - stream << indent_str; - } -+ else -+ { -+ stream << " FIX_UNUSED (check_required);"; -+ stream << "\n"; -+ stream << indent_str; -+ } - stream << "\n"; - stream << indent_str; - indent = 2; -Index: gengetopt-2.22.6/src/skels/c_source.h_skel -=================================================================== ---- gengetopt-2.22.6.orig/src/skels/c_source.h_skel 2012-11-02 18:43:24.000000000 +0100 -+++ gengetopt-2.22.6/src/skels/c_source.h_skel 2014-11-20 12:05:22.501528424 +0100 -@@ -767,8 +767,9 @@ - char **string_field; - @ENDIF@ - FIX_UNUSED (field); -+ FIX_UNUSED (stop_char); -+ FIX_UNUSED (val); - -- stop_char = 0; - found = 0; - - if (!multiple_option && prev_given && (*prev_given || (check_ambiguity && *field_given))) -@@ -1327,6 +1328,8 @@ - { - error_occurred += @parser_name@_required2 (args_info, argv[0], additional_error); - } -+@ELSE@ -+ FIX_UNUSED (check_required); - @ENDIF@ - - @parser_name@_release (&local_args_info); diff --git a/buildroot/package/gengetopt/gengetopt.hash b/buildroot/package/gengetopt/gengetopt.hash index 4f411ac8b..35c214fce 100644 --- a/buildroot/package/gengetopt/gengetopt.hash +++ b/buildroot/package/gengetopt/gengetopt.hash @@ -1,2 +1,4 @@ # Locally computed -sha256 30b05a88604d71ef2a42a2ef26cd26df242b41f5b011ad03083143a31d9b01f7 gengetopt-2.22.6.tar.gz +sha256 b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac gengetopt-2.23.tar.xz +sha256 afab96ff35204960631dc05506034f9efc01e6d696f0ac93718d6bd43512cda7 COPYING +sha256 72a43351233d6a581f891cdfff78b7b7d5f2a12522523929c5f7e8f674c2f6fc LICENSE diff --git a/buildroot/package/gengetopt/gengetopt.mk b/buildroot/package/gengetopt/gengetopt.mk index e7c49ba52..5ecd44bc7 100644 --- a/buildroot/package/gengetopt/gengetopt.mk +++ b/buildroot/package/gengetopt/gengetopt.mk @@ -4,12 +4,12 @@ # ################################################################################ -GENGETOPT_VERSION = 2.22.6 +GENGETOPT_VERSION = 2.23 +GENGETOPT_SOURCE = gengetopt-$(GENGETOPT_VERSION).tar.xz GENGETOPT_SITE = $(BR2_GNU_MIRROR)/gengetopt GENGETOPT_LICENSE = GPL-3.0+ GENGETOPT_LICENSE_FILES = COPYING LICENSE - -# Parallel build broken -GENGETOPT_MAKE = $(MAKE1) +# We're patching configure.ac +HOST_GENGETOPT_AUTORECONF = YES $(eval $(host-autotools-package)) diff --git a/buildroot/package/genimage/genimage.hash b/buildroot/package/genimage/genimage.hash index 095eb1413..fb5d23550 100644 --- a/buildroot/package/genimage/genimage.hash +++ b/buildroot/package/genimage/genimage.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 5a36b2c1387007c2d6535a722ee257a387d0913bddcf8a94d460e6acd4d01859 genimage-10.tar.xz +sha256 2e9b43d1288f4e216d6c79de2a0c53ce1bd41f93cec750d8ab057aa2d0b0ee4a genimage-12.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/genimage/genimage.mk b/buildroot/package/genimage/genimage.mk index 393c3e9b9..896039390 100644 --- a/buildroot/package/genimage/genimage.mk +++ b/buildroot/package/genimage/genimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENIMAGE_VERSION = 10 +GENIMAGE_VERSION = 12 GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION) HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse diff --git a/buildroot/package/genromfs/genromfs.hash b/buildroot/package/genromfs/genromfs.hash index 477e5d2dc..0be88ee1b 100644 --- a/buildroot/package/genromfs/genromfs.hash +++ b/buildroot/package/genromfs/genromfs.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 30f37fc734572c1dbaa2504585bc23ba6b8fd7df767ae7155995b2ca0ebed960 genromfs-0.5.2.tar.gz +sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING diff --git a/buildroot/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch b/buildroot/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch new file mode 100644 index 000000000..5a9f3b7da --- /dev/null +++ b/buildroot/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch @@ -0,0 +1,29 @@ +From f63b15e690581d898da56ef2540b6199f5728e58 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 11 Feb 2020 19:14:53 +0100 +Subject: [PATCH] tests/Makefile.am: don't add -lpthread + +Don't add -lpthread unconditionally to oomtest_LDADD to avoid a build +failure without threads, it will be added to LIBS by configure.ac if +needed + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/cminyard/gensio/commit/f63b15e690581d898da56ef2540b6199f5728e58] +--- + tests/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index a280acc..b4335c5 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -127,7 +127,7 @@ test_fuzz: test_fuzz_certauth test_fuzz_mux test_fuzz_ssl test_fuzz_telnet \ + + oomtest_SOURCES = oomtest.c + +-oomtest_LDADD = $(top_builddir)/lib/libgensio.la $(OPENSSL_LIBS) -lpthread ++oomtest_LDADD = $(top_builddir)/lib/libgensio.la $(OPENSSL_LIBS) + + noinst_PROGRAMS = oomtest + diff --git a/buildroot/package/gensio/Config.in b/buildroot/package/gensio/Config.in new file mode 100644 index 000000000..f874d1a46 --- /dev/null +++ b/buildroot/package/gensio/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_GENSIO + bool "gensio" + depends on BR2_USE_MMU # fork() + help + A library to abstract stream I/O like serial port, TCP, + telnet, UDP, SSL, IPMI SOL, etc. + + https://github.com/cminyard/gensio diff --git a/buildroot/package/gensio/gensio.hash b/buildroot/package/gensio/gensio.hash new file mode 100644 index 000000000..623b41904 --- /dev/null +++ b/buildroot/package/gensio/gensio.hash @@ -0,0 +1,7 @@ +# From https://sourceforge.net/projects/ser2net/files/ser2net/ +md5 53c027dfaaf374f57d5f36a6250fc018 gensio-1.5.1.tar.gz +sha1 8329d7828016e643f60b8b3e70564d32cd03008f gensio-1.5.1.tar.gz +# Locally computed: +sha256 c1ed28f5bd72185dba666a900d29afbecba58727d6c0dde4a182143273fc1e6b gensio-1.5.1.tar.gz +sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING +sha256 dcac7d447dd81ab96d28dce00a07a6486e623f7ded94e2a2a8e83312405cdf89 COPYING.LIB diff --git a/buildroot/package/gensio/gensio.mk b/buildroot/package/gensio/gensio.mk new file mode 100644 index 000000000..0386b30fd --- /dev/null +++ b/buildroot/package/gensio/gensio.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# gensio +# +################################################################################ + +GENSIO_VERSION = 1.5.1 +GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net +GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) +GENSIO_LICENSE_FILES = COPYING.LIB COPYING +GENSIO_INSTALL_STAGING = YES +# We're patching configure.ac +GENSIO_AUTORECONF = YES +GENSIO_CONF_OPTS = \ + --without-openipmi \ + --without-swig \ + --without-python + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +GENSIO_DEPENDENCIES += host-pkgconf openssl +GENSIO_CONF_OPTS += --with-openssl +else +GENSIO_CONF_OPTS += --without-openssl +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +GENSIO_CONF_OPTS += --with-pthreads +else +GENSIO_CONF_OPTS += --without-pthreads +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/gerbera/0001-CMakeLists.txt-fix-static-build-with-curl-and-libidn.patch b/buildroot/package/gerbera/0001-CMakeLists.txt-fix-static-build-with-curl-and-libidn.patch deleted file mode 100644 index 94f742c3f..000000000 --- a/buildroot/package/gerbera/0001-CMakeLists.txt-fix-static-build-with-curl-and-libidn.patch +++ /dev/null @@ -1,41 +0,0 @@ -From de0e7fe3b56cff79c11aedc89448814fab8d1877 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 8 Mar 2019 19:11:11 +0100 -Subject: [PATCH] MakeLists.txt: fix static build with curl and libidn2 - -curl can be statically linked with libidn2, in this case, build fails: -/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-0/output/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libcurl.a(libcurl_la-url.o): In function `free_idnconverted_hostname.isra.1': -url.c:(.text+0xf4): undefined reference to `idn2_free' - -To fix this issue, add a call to pkg_check_modules to retrieve any -needed dependencies - -Fixes: - - http://autobuild.buildroot.org/results/be5893b507d22a23951efeea20c18642742cef5a - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/gerbera/gerbera/pull/429] ---- - CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d0eed230..e6b62c96 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -443,7 +443,11 @@ if(WITH_MYSQL) - endif() - - if(WITH_CURL) -- find_package (CURL REQUIRED) -+ find_package(PkgConfig QUIET) -+ pkg_check_modules (CURL QUIET libcurl) -+ if (NOT CURL_FOUND) -+ find_package (CURL REQUIRED) -+ endif() - if (CURL_FOUND) - include_directories(${CURL_INCLUDE_DIRS}) - target_link_libraries (gerbera ${CURL_LIBRARIES}) --- -2.20.1 - diff --git a/buildroot/package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch b/buildroot/package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch new file mode 100644 index 000000000..5a189614f --- /dev/null +++ b/buildroot/package/gerbera/0001-cmake-FindLibMagic.cmake-fix-static-linking.patch @@ -0,0 +1,60 @@ +From 64f49c6131f4112e5efd8b69094235f13882ccf5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 31 Jan 2020 17:14:11 +0100 +Subject: [PATCH] cmake/FindLibMagic.cmake: fix static linking + +libmagic can optionally depends on xz (for lzma) or bzip2 since version +5.38 and +https://github.com/file/file/commit/b259a07ea95827f565faa20f0316e5b2704064f7 +so use pkg-config to retrieve those static dependencies and avoid the +following build failure: + +[100%] Linking CXX executable gerbera +/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/br-user/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmagic.a(compress.o): in function `uncompressbuf': +compress.c:(.text+0x69c): undefined reference to `BZ2_bzDecompressInit' +/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x710): undefined reference to `BZ2_bzDecompress' +/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x730): undefined reference to `BZ2_bzDecompressEnd' +/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x7bc): undefined reference to `lzma_auto_decoder' +/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x828): undefined reference to `lzma_code' +/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x848): undefined reference to `lzma_end' + +Fixes: + - http://autobuild.buildroot.org/results/37b1ef54dc41100689f311fbc31fc9300dc6ae63 + +Signed-off-by: Fabrice Fontaine +--- + cmake/FindLibMagic.cmake | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/cmake/FindLibMagic.cmake b/cmake/FindLibMagic.cmake +index f68ab923..04995af4 100644 +--- a/cmake/FindLibMagic.cmake ++++ b/cmake/FindLibMagic.cmake +@@ -1,11 +1,22 @@ + INCLUDE (FindPackageHandleStandardArgs) + +-FIND_PATH(MAGIC_INCLUDE_DIR magic.h) +-FIND_LIBRARY(MAGIC_LIBRARIES NAMES magic) ++find_package(PkgConfig QUIET) ++ ++pkg_check_modules(PC_MAGIC QUIET libmagic) ++ ++FIND_PATH(MAGIC_INCLUDE_DIR magic.h ++ HINTS ${PC_MAGIC_INCLUDEDIR} ${PC_MAGIC_INCLUDE_DIRS}) ++FIND_LIBRARY(MAGIC_LIBRARIES NAMES magic ++ HINTS ${PC_MAGIC_LIBDIR} ${PC_MAGIC_LIBRARY_DIRS}) + + # handle the QUIETLY and REQUIRED arguments and set MAGIC_FOUND to TRUE + find_package_handle_standard_args(MAGIC DEFAULT_MSG MAGIC_LIBRARIES) + ++if (MAGIC_FOUND) ++ set (MAGIC_LIBRARIES ${MAGIC_LIBRARY} ${PC_MAGIC_LIBRARIES}) ++ set (MAGIC_INCLUDE_DIRS ${MAGIC_INCLUDE_DIR} ) ++endif () ++ + MARK_AS_ADVANCED( + MAGIC_LIBRARIES + MAGIC_INCLUDE_DIRS ) +-- +2.24.1 + diff --git a/buildroot/package/gerbera/0002-Fix-find_program-taglib-config-when-cross-compiling.patch b/buildroot/package/gerbera/0002-Fix-find_program-taglib-config-when-cross-compiling.patch deleted file mode 100644 index d5cc908e2..000000000 --- a/buildroot/package/gerbera/0002-Fix-find_program-taglib-config-when-cross-compiling.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0f78b883f02651bd15a96a7294e01f94b28c20f8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 13 May 2019 13:42:14 +0200 -Subject: [PATCH] Fix find_program taglib-config when cross-compiling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When cross-compiling Gerbera CMakes `find_program()` will search for -binaries on the host. This is typically correct, e.g. when search for -compilers or shells. - -When cross-compiling searching for `taglib-config` should not find the -binary on the host, instead it should find the binary in the sysroot -directory, as the host `taglib-config` will output the wrong host paths -and libs, whereas the sysroot `taglib-config` will output the correct sysroot -paths and libs. - -Therefore, use the `CMAKE_FIND_ROOT_PATH_MODE_PROGRAM` variable when -cross-compiling. This variable controls whether the `CMAKE_FIND_ROOT_PATH` -and `CMAKE_SYSROOT` are used by find_program(). - -Backported from: 0f78b883f02651bd15a96a7294e01f94b28c20f8 - -Signed-off-by: Jörg Krause ---- - cmake/FindTaglib.cmake | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/cmake/FindTaglib.cmake b/cmake/FindTaglib.cmake -index 46a20ff2..7135d766 100644 ---- a/cmake/FindTaglib.cmake -+++ b/cmake/FindTaglib.cmake -@@ -19,6 +19,9 @@ ELSE() - endif(NOT TAGLIB_MIN_VERSION) - - if(NOT WIN32) -+ if (CMAKE_CROSSCOMPILING) -+ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) -+ endif(CMAKE_CROSSCOMPILING) - find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS - ${BIN_INSTALL_DIR} - ) --- -2.22.0 - diff --git a/buildroot/package/gerbera/0002-cmake-FindFFMPEG-cmake-use-pkgconfig.patch b/buildroot/package/gerbera/0002-cmake-FindFFMPEG-cmake-use-pkgconfig.patch deleted file mode 100644 index b5f79173b..000000000 --- a/buildroot/package/gerbera/0002-cmake-FindFFMPEG-cmake-use-pkgconfig.patch +++ /dev/null @@ -1,175 +0,0 @@ -From fbbc07ce53e884b1603461ee5642d5f02788678d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 21 Mar 2019 16:32:44 +0100 -Subject: [PATCH] cmake/FindFFMPEG.cmake: use pkgconfig - -ffmpeg has too many optional dependencies (opus, openssl, ...) instead -of trying to find them all one by one, use pkg-config to get them and -fallback on current mechanism - -Fixes: - - http://autobuild.buildroot.org/results/2b99fabd798db84a0fce26ad696c58e54c6ff626 - - http://autobuild.buildroot.org/results/95e410e5ab34c6d4626a58f97c0d2d5e6829a300 - -Signed-off-by: Fabrice Fontaine -[Retrieved (and backported) from: -https://github.com/gerbera/gerbera/commit/fbbc07ce53e884b1603461ee5642d5f02788678d] ---- - cmake/FindFFMPEG.cmake | 147 +++++++++++++++++++++-------------------- - 1 file changed, 75 insertions(+), 72 deletions(-) - -diff --git a/cmake/FindFFMPEG.cmake b/cmake/FindFFMPEG.cmake -index 0a4a409f..9548b566 100644 ---- a/cmake/FindFFMPEG.cmake -+++ b/cmake/FindFFMPEG.cmake -@@ -82,70 +82,76 @@ ENDIF (NOT FFMPEG_INCLUDE_DIR) - # ffmpeg uses relative includes such as or - get_filename_component(FFMPEG_INCLUDE_DIR ${FFMPEG_INCLUDE_DIR} ABSOLUTE) - --FIND_LIBRARY(FFMPEG_avformat_LIBRARY avformat -- /usr/local/lib -- /usr/lib -- ) -- --FIND_LIBRARY(FFMPEG_avcodec_LIBRARY avcodec -- /usr/local/lib -- /usr/lib -- ) -- --FIND_LIBRARY(FFMPEG_avutil_LIBRARY avutil -- /usr/local/lib -- /usr/lib -- ) -- --FIND_LIBRARY(FFMPEG_swresample_LIBRARY swresample -- /usr/local/lib -- /usr/lib -- ) -- --FIND_LIBRARY(FFMPEG_vorbis_LIBRARY vorbis -- /usr/local/lib -- /usr/lib -- ) -- --FIND_LIBRARY(FFMPEG_dc1394_LIBRARY dc1394_control -- /usr/local/lib -- /usr/lib -- ) -- --FIND_LIBRARY(FFMPEG_vorbisenc_LIBRARY vorbisenc -- /usr/local/lib -- /usr/lib -- ) -- --FIND_LIBRARY(FFMPEG_theora_LIBRARY theora -- /usr/local/lib -- /usr/lib -- ) -- --FIND_LIBRARY(FFMPEG_dts_LIBRARY dts -- /usr/local/lib -- /usr/lib -- ) -- --FIND_LIBRARY(FFMPEG_gsm_LIBRARY gsm -- /usr/local/lib -- /usr/lib -- ) -- --FIND_LIBRARY(FFMPEG_swscale_LIBRARY swscale -- /usr/local/lib -- /usr/lib -- ) -- --FIND_LIBRARY(FFMPEG_z_LIBRARY z -- /usr/local/lib -- /usr/lib -- ) -- --FIND_LIBRARY(FFMPEG_bz2_LIBRARY bz2 -- /usr/local/lib -- /usr/lib -- ) -+CHECK_STRUCT_HAS_MEMBER("struct AVStream" codecpar libavformat/avformat.h HAVE_AVSTREAM_CODECPAR LANGUAGE C) -+ -+FIND_PACKAGE(PkgConfig QUIET) -+PKG_CHECK_MODULES(FFMPEG QUIET libavformat libavutil) -+IF (NOT FFMPEG_FOUND) -+ FIND_LIBRARY(FFMPEG_avformat_LIBRARY avformat -+ /usr/local/lib -+ /usr/lib -+ ) -+ -+ FIND_LIBRARY(FFMPEG_avcodec_LIBRARY avcodec -+ /usr/local/lib -+ /usr/lib -+ ) -+ -+ FIND_LIBRARY(FFMPEG_avutil_LIBRARY avutil -+ /usr/local/lib -+ /usr/lib -+ ) -+ -+ FIND_LIBRARY(FFMPEG_swresample_LIBRARY swresample -+ /usr/local/lib -+ /usr/lib -+ ) -+ -+ FIND_LIBRARY(FFMPEG_vorbis_LIBRARY vorbis -+ /usr/local/lib -+ /usr/lib -+ ) -+ -+ FIND_LIBRARY(FFMPEG_dc1394_LIBRARY dc1394_control -+ /usr/local/lib -+ /usr/lib -+ ) -+ -+ FIND_LIBRARY(FFMPEG_vorbisenc_LIBRARY vorbisenc -+ /usr/local/lib -+ /usr/lib -+ ) -+ -+ FIND_LIBRARY(FFMPEG_theora_LIBRARY theora -+ /usr/local/lib -+ /usr/lib -+ ) -+ -+ FIND_LIBRARY(FFMPEG_dts_LIBRARY dts -+ /usr/local/lib -+ /usr/lib -+ ) -+ -+ FIND_LIBRARY(FFMPEG_gsm_LIBRARY gsm -+ /usr/local/lib -+ /usr/lib -+ ) -+ -+ FIND_LIBRARY(FFMPEG_swscale_LIBRARY swscale -+ /usr/local/lib -+ /usr/lib -+ ) -+ -+ FIND_LIBRARY(FFMPEG_z_LIBRARY z -+ /usr/local/lib -+ /usr/lib -+ ) -+ -+ FIND_LIBRARY(FFMPEG_bz2_LIBRARY bz2 -+ /usr/local/lib -+ /usr/lib -+ ) -+ENDIF(NOT FFMPEG_FOUND) - - SET(FFMPEG_LIBRARIES) - IF (FFMPEG_INCLUDE_DIR) -@@ -205,9 +211,6 @@ IF (FFMPEG_INCLUDE_DIR) - ENDIF (FFMPEG_bz2_LIBRARY) - - SET(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} CACHE INTERNAL "All presently found FFMPEG libraries.") -- -- CHECK_STRUCT_HAS_MEMBER("struct AVStream" codecpar libavformat/avformat.h HAVE_AVSTREAM_CODECPAR LANGUAGE C) -- - ENDIF (FFMPEG_avutil_LIBRARY) - ENDIF (FFMPEG_avcodec_LIBRARY) - ENDIF (FFMPEG_avformat_LIBRARY) diff --git a/buildroot/package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch b/buildroot/package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch deleted file mode 100644 index 510bf2837..000000000 --- a/buildroot/package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e2f8e6c30e43c1818a6677d17de87f53c9414405 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 2 Apr 2019 10:44:06 +0200 -Subject: [PATCH] cmake/FindLibUpnp.cmake: fix static linking - -Fix static linking with an openssl enabled upnp: - - remove libupnp-1.8 from pkg_check_modules call otherwise test will - fail if libupnp-1.8.pc is not found - - add PC_UPNP_LIBRARIES to UPNP_LIBRARIES - -Fixes: - - http://autobuild.buildroot.org/results/10098c8972725d54b717ddc8ea41f4de5e5b066d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/gerbera/gerbera/pull/443] ---- - cmake/FindLibUpnp.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/FindLibUpnp.cmake b/cmake/FindLibUpnp.cmake -index ec198d4d..5d2b032d 100644 ---- a/cmake/FindLibUpnp.cmake -+++ b/cmake/FindLibUpnp.cmake -@@ -8,7 +8,7 @@ - # UPNP_HAS_REUSEADDR - If LinUPnP was built with SO_REUSEADDR support - - find_package(PkgConfig QUIET) --pkg_check_modules (PC_UPNP QUIET libupnp-1.8 libupnp) -+pkg_search_module (PC_UPNP QUIET libupnp-1.8 libupnp) - - find_path(UPNP_INCLUDE_DIR upnp.h - HINTS ${PC_UPNP_INCLUDEDIR} ${PC_UPNP_INCLUDE_DIRS} -@@ -41,7 +41,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(UPnP - VERSION_VAR UPNP_VERSION_STRING) - - if (UPNP_FOUND) -- set (UPNP_LIBRARIES ${UPNP_UPNP_LIBRARY} ${UPNP_IXML_LIBRARY}) -+ set (UPNP_LIBRARIES ${UPNP_UPNP_LIBRARY} ${UPNP_IXML_LIBRARY} ${PC_UPNP_LIBRARIES}) - set (UPNP_INCLUDE_DIRS ${UPNP_INCLUDE_DIR} ) - endif () - --- -2.14.1 - diff --git a/buildroot/package/gerbera/gerbera.hash b/buildroot/package/gerbera/gerbera.hash index bcac080c9..533a90388 100644 --- a/buildroot/package/gerbera/gerbera.hash +++ b/buildroot/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5e40971c519eb322fe0111754cafa12d99c47c2ae7d0f9f1aebb19b06e74a912 gerbera-v1.3.0.tar.gz +sha256 c7fbb6104dd03ed22d114c7b1fbe95eb7f90893148630e16b0a4c23f1f631341 gerbera-1.3.4.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/buildroot/package/gerbera/gerbera.mk b/buildroot/package/gerbera/gerbera.mk index 7ded7cec7..21c683695 100644 --- a/buildroot/package/gerbera/gerbera.mk +++ b/buildroot/package/gerbera/gerbera.mk @@ -4,8 +4,8 @@ # ################################################################################ -GERBERA_VERSION = v1.3.0 -GERBERA_SITE = $(call github,gerbera,gerbera,$(GERBERA_VERSION)) +GERBERA_VERSION = 1.3.4 +GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md GERBERA_DEPENDENCIES = \ @@ -104,11 +104,4 @@ define GERBERA_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S99gerbera endef -# gerbera.service is installed by cmake in $(TARGET_DIR)/usr/lib/systemd/system -define GERBERA_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/gerbera.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/gerbera.service -endef - $(eval $(cmake-package)) diff --git a/buildroot/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch b/buildroot/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch new file mode 100644 index 000000000..3697d0e52 --- /dev/null +++ b/buildroot/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch @@ -0,0 +1,30 @@ +From 4b5c7eb63894bd2b1fedeb2a8e9bd16bf3c8c555 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bernd=20Holzm=C3=BCller?= + +Date: Mon, 11 Feb 2019 23:57:01 +0100 +Subject: [PATCH] Change order of v3-attributes according to + draft-ietf-secsh-filexfer-00/02 + +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: "Yann E. MORIN" +--- + v3.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/v3.c b/v3.c +index 57cc31e..1fd86ad 100644 +--- a/v3.c ++++ b/v3.c +@@ -121,8 +121,8 @@ static void v3_sendattrs(struct sftpjob *job, const struct sftpattr *attrs) { + fatal("sending out-of-range mtime"); + if(a != attrs->atime.seconds) + fatal("sending out-of-range mtime"); +- sftp_send_uint32(job->worker, m); + sftp_send_uint32(job->worker, a); ++ sftp_send_uint32(job->worker, m); + } + /* Note that we just discard unknown bits rather than reporting errors. */ + } +-- +2.14.1 + diff --git a/buildroot/package/gesftpserver/gesftpserver.hash b/buildroot/package/gesftpserver/gesftpserver.hash index 1a8a5f349..790cbe97c 100644 --- a/buildroot/package/gesftpserver/gesftpserver.hash +++ b/buildroot/package/gesftpserver/gesftpserver.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 8ac1938d0f62a05799b2aeab489d6ce098c3fe53280a9b66c0957b1fdcbcbab9 sftpserver-0.2.2.tar.gz +sha256 4963b85787de3485085a5356c671c58b8b33125f528ff1b2fe8b534ed8a0c1bd sftpserver-1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/gesftpserver/gesftpserver.mk b/buildroot/package/gesftpserver/gesftpserver.mk index 58c6270a0..ff7ce768a 100644 --- a/buildroot/package/gesftpserver/gesftpserver.mk +++ b/buildroot/package/gesftpserver/gesftpserver.mk @@ -4,11 +4,15 @@ # ################################################################################ -GESFTPSERVER_VERSION = 0.2.2 +GESFTPSERVER_VERSION = 1 GESFTPSERVER_SOURCE = sftpserver-$(GESFTPSERVER_VERSION).tar.gz GESFTPSERVER_SITE = http://www.greenend.org.uk/rjk/sftpserver GESFTPSERVER_LICENSE = GPL-2.0+ GESFTPSERVER_LICENSE_FILES = COPYING + +# "Missing prototype" warning treated as error +GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors + # forgets to link against pthread when cross compiling GESFTPSERVER_CONF_ENV = LIBS=-lpthread diff --git a/buildroot/package/gettext/0001-error_print_progname.patch b/buildroot/package/gettext-gnu/0001-error_print_progname.patch similarity index 100% rename from buildroot/package/gettext/0001-error_print_progname.patch rename to buildroot/package/gettext-gnu/0001-error_print_progname.patch diff --git a/buildroot/package/gettext/0002-Update-after-gnulib-changed.patch b/buildroot/package/gettext-gnu/0002-Update-after-gnulib-changed.patch similarity index 100% rename from buildroot/package/gettext/0002-Update-after-gnulib-changed.patch rename to buildroot/package/gettext-gnu/0002-Update-after-gnulib-changed.patch diff --git a/buildroot/package/gettext-gnu/Config.in b/buildroot/package/gettext-gnu/Config.in new file mode 100644 index 000000000..27e7a3da4 --- /dev/null +++ b/buildroot/package/gettext-gnu/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_GETTEXT_GNU + bool + depends on BR2_USE_WCHAR + select BR2_PACKAGE_HAS_GETTEXT + help + The GNU `gettext' utilities are a set of tools that provide a + framework to help other GNU packages produce multi-lingual + messages. + + Only the libintl library will be installed in the + target. The full gettext suite, including tools, will be + installed in the staging directory. + + http://www.gnu.org/software/gettext/ + +if BR2_PACKAGE_GETTEXT_GNU + +config BR2_PACKAGE_PROVIDES_GETTEXT + default "gettext-gnu" + +endif + +config BR2_PACKAGE_PROVIDES_HOST_GETTEXT + default "host-gettext-gnu" if BR2_SYSTEM_ENABLE_NLS diff --git a/buildroot/package/gettext-gnu/gettext-gnu.hash b/buildroot/package/gettext-gnu/gettext-gnu.hash new file mode 100644 index 000000000..5a621ae2d --- /dev/null +++ b/buildroot/package/gettext-gnu/gettext-gnu.hash @@ -0,0 +1,6 @@ +# From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html +md5 df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz +sha1 e0fe90ede22f7f16bbde7bdea791a835f2773fc9 gettext-0.19.8.1.tar.xz +# License files, locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 3fe5361f24b7c49ba12911c08f5a33f9cb18871d95d9fb881f5b8a4793e04288 gettext-runtime/intl/COPYING.LIB diff --git a/buildroot/package/gettext-gnu/gettext-gnu.mk b/buildroot/package/gettext-gnu/gettext-gnu.mk new file mode 100644 index 000000000..28662e0de --- /dev/null +++ b/buildroot/package/gettext-gnu/gettext-gnu.mk @@ -0,0 +1,99 @@ +################################################################################ +# +# gettext-gnu +# +################################################################################ + +GETTEXT_GNU_VERSION = 0.19.8.1 +GETTEXT_GNU_SITE = $(BR2_GNU_MIRROR)/gettext +GETTEXT_GNU_SOURCE = gettext-$(GETTEXT_GNU_VERSION).tar.xz +GETTEXT_GNU_INSTALL_STAGING = YES +GETTEXT_GNU_LICENSE = LGPL-2.1+ (libintl), GPL-3.0+ (the rest) +GETTEXT_GNU_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB +# 0002-Update-after-gnulib-changed.patch +GETTEXT_GNU_AUTORECONF = YES +GETTEXT_GNU_PROVIDES = gettext +GETTEXT_GNU_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) + +# Avoid using the bundled subset of libxml2 +HOST_GETTEXT_GNU_DEPENDENCIES = host-libxml2 + +GETTEXT_GNU_CONF_OPTS += \ + --disable-libasprintf \ + --disable-acl \ + --disable-openmp \ + --disable-rpath \ + --disable-java \ + --disable-native-java \ + --disable-csharp \ + --disable-relocatable \ + --without-emacs + +HOST_GETTEXT_GNU_CONF_OPTS = \ + --disable-libasprintf \ + --disable-acl \ + --disable-openmp \ + --disable-rpath \ + --disable-java \ + --disable-native-java \ + --disable-csharp \ + --disable-relocatable \ + --without-emacs + +# Force the build of libintl, even if the C library provides a stub +# gettext implementation +ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y) +GETTEXT_GNU_CONF_OPTS += --with-included-gettext +else +GETTEXT_GNU_CONF_OPTS += --without-included-gettext +endif + +# For the target version, we only need the runtime, and for the host +# version, we only need the tools. +GETTEXT_GNU_SUBDIR = gettext-runtime +HOST_GETTEXT_GNU_SUBDIR = gettext-tools + +# Disable the build of documentation and examples of gettext-tools, +# and the build of documentation and tests of gettext-runtime. +define HOST_GETTEXT_GNU_DISABLE_UNNEEDED + $(SED) '/^SUBDIRS/s/ doc //;/^SUBDIRS/s/examples$$//' $(@D)/gettext-tools/Makefile.in + $(SED) '/^SUBDIRS/s/ doc //;/^SUBDIRS/s/tests$$//' $(@D)/gettext-runtime/Makefile.in +endef + +GETTEXT_GNU_POST_PATCH_HOOKS += HOST_GETTEXT_GNU_DISABLE_UNNEEDED +HOST_GETTEXT_GNU_POST_PATCH_HOOKS += HOST_GETTEXT_GNU_DISABLE_UNNEEDED + +define GETTEXT_GNU_REMOVE_UNNEEDED + $(RM) -rf $(TARGET_DIR)/usr/share/gettext/ABOUT-NLS + rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/gettext +endef + +GETTEXT_GNU_POST_INSTALL_TARGET_HOOKS += GETTEXT_GNU_REMOVE_UNNEEDED + +# Force build with NLS support, otherwise libintl is not built +# This is needed because some packages (eg. libglib2) requires +# locales, but do not properly depend on BR2_ENABLE_LOCALE, and +# instead select BR2_PACKAGE_GETTEXT_GNU. Those packages need to be +# fixed before we can remove the following 3 lines... :-( +ifeq ($(BR2_ENABLE_LOCALE),) +GETTEXT_GNU_CONF_OPTS += --enable-nls +endif + +# Disable interactive confirmation in host gettextize for package fixups +define HOST_GETTEXT_GNU_GETTEXTIZE_CONFIRMATION + $(SED) '/read dummy/d' $(HOST_DIR)/bin/gettextize +endef +HOST_GETTEXT_GNU_POST_INSTALL_HOOKS += HOST_GETTEXT_GNU_GETTEXTIZE_CONFIRMATION + +# autoreconf expects gettextize to install ABOUT-NLS, but it only gets +# installed by gettext-runtime which we don't build/install for the +# host, so do it manually +define HOST_GETTEXT_GNU_ADD_ABOUT_NLS + $(INSTALL) -m 0644 $(@D)/$(HOST_GETTEXT_GNU_SUBDIR)/ABOUT-NLS \ + $(HOST_DIR)/share/gettext/ABOUT-NLS +endef + +HOST_GETTEXT_GNU_POST_INSTALL_HOOKS += HOST_GETTEXT_GNU_ADD_ABOUT_NLS + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/gettext-tiny/Config.in b/buildroot/package/gettext-tiny/Config.in new file mode 100644 index 000000000..6f91a00b0 --- /dev/null +++ b/buildroot/package/gettext-tiny/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_GETTEXT_TINY + bool + select BR2_PACKAGE_HAS_GETTEXT + help + Stub and/or lightweight replacements of the gnu gettext + suite; because the GNU one takes ages to compile. + + https://github.com/sabotage-linux/gettext-tiny + +if BR2_PACKAGE_GETTEXT_TINY + +config BR2_PACKAGE_PROVIDES_GETTEXT + default "gettext-tiny" + +endif + +config BR2_PACKAGE_PROVIDES_HOST_GETTEXT + default "host-gettext-tiny" if !BR2_SYSTEM_ENABLE_NLS diff --git a/buildroot/package/gettext-tiny/gettext-tiny.hash b/buildroot/package/gettext-tiny/gettext-tiny.hash new file mode 100644 index 000000000..9232fe853 --- /dev/null +++ b/buildroot/package/gettext-tiny/gettext-tiny.hash @@ -0,0 +1,7 @@ +# Locally Computed: +sha256 efc740007c82a9b3a0d382fb50d212fa7dc0beddb9695409ee79684f9f2124b2 gettext-tiny-adaa9c64921e80f2b8dd3610ffb508618b9204f3.tar.gz +sha256 b57aa4fdc1c614c28d41c1e2d5c4090935964c5f86291ba7d1c99ffd1d698b34 LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 extra/COPYING +# From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html +md5 df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz +sha1 e0fe90ede22f7f16bbde7bdea791a835f2773fc9 gettext-0.19.8.1.tar.xz diff --git a/buildroot/package/gettext-tiny/gettext-tiny.mk b/buildroot/package/gettext-tiny/gettext-tiny.mk new file mode 100644 index 000000000..09a98f99b --- /dev/null +++ b/buildroot/package/gettext-tiny/gettext-tiny.mk @@ -0,0 +1,109 @@ +################################################################################ +# +# gettext-tiny +# +################################################################################ + +GETTEXT_TINY_VERSION = adaa9c64921e80f2b8dd3610ffb508618b9204f3 +GETTEXT_TINY_SITE = $(call github,sabotage-linux,gettext-tiny,$(GETTEXT_TINY_VERSION)) +GETTEXT_TINY_LICENSE = MIT, GPL-3.0+ (extra gettext) +GETTEXT_TINY_INSTALL_STAGING = YES +GETTEXT_TINY_LICENSE_FILES = LICENSE +HOST_GETTEXT_TINY_LICENSE_FILES = LICENSE extra/COPYING + +GETTEXT_TINY_PROVIDES = gettext + +# needed for gettextize +GETTEXT_TINY_ARCHIVE_VERSION = 0.19.8 + +GETTEXT_TINY_EXTRA_GETTEXT_FILES = \ + gettext-tools/misc/gettextize.in \ + gettext-tools/po/Makevars.template \ + gettext-runtime/m4/lock.m4 \ + gettext-runtime/po/boldquot.sed \ + gettext-runtime/po/en@boldquot.header \ + gettext-runtime/po/en@quot.header \ + gettext-runtime/po/insert-header.sin \ + gettext-runtime/po/quot.sed \ + gettext-runtime/po/remove-potcdate.sin \ + gettext-runtime/po/Rules-quot \ + gettext-runtime/po/Makefile.in.in \ + COPYING + +HOST_GETTEXT_TINY_EXTRA_DOWNLOADS = $(GETTEXT_GNU_SITE)/$(GETTEXT_GNU_SOURCE) + +define HOST_GETTEXT_TINY_EXTRACT_GNU_GETTEXT + mkdir -p $(@D)/gettext-gnu + $(call suitable-extractor,$(GETTEXT_GNU_SOURCE)) \ + $(GETTEXT_TINY_DL_DIR)/$(GETTEXT_GNU_SOURCE) | \ + $(TAR) --strip-components=1 -C $(@D)/gettext-gnu $(TAR_OPTIONS) - +endef +HOST_GETTEXT_TINY_POST_EXTRACT_HOOKS += HOST_GETTEXT_TINY_EXTRACT_GNU_GETTEXT + +define HOST_GETTEXT_TINY_COPY_EXTRA_FILES + $(foreach f,$(GETTEXT_TINY_EXTRA_GETTEXT_FILES),\ + $(INSTALL) -D -m 0644 $(@D)/gettext-gnu/$(f) $(@D)/extra/$(notdir $(f)) + ) + $(INSTALL) -D -m 0755 $(@D)/gettext-gnu/build-aux/config.rpath \ + $(@D)/build-aux/config.rpath +endef +HOST_GETTEXT_TINY_POST_PATCH_HOOKS += HOST_GETTEXT_TINY_COPY_EXTRA_FILES + +define HOST_GETTEXT_TINY_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ + $(HOST_CONFIGURE_OPTS) \ + prefix=$(HOST_DIR) \ + CFLAGS="$(HOST_CFLAGS) -fPIC" \ + LIBINTL=NONE + + cp $(@D)/extra/gettextize.in $(@D)/gettextize + + $(SED) 's,@PACKAGE@,gettext-tools,g;' $(@D)/gettextize + $(SED) 's,@VERSION@,$(GETTEXT_GNU_VERSION),g;' $(@D)/gettextize + $(SED) 's,@ARCHIVE_VERSION@,$(GETTEXT_TINY_ARCHIVE_VERSION),' $(@D)/gettextize + $(SED) 's,@prefix@,$(HOST_DIR),g;' $(@D)/gettextize + $(SED) 's,@datarootdir@,$${prefix}/share,g;' $(@D)/gettextize + $(SED) 's,@datadir@,$${prefix}/share,g;' $(@D)/gettextize + $(SED) 's,@PATH_SEPARATOR@,:,g;' $(@D)/gettextize + $(SED) 's,@RELOCATABLE@,no,g;' $(@D)/gettextize + $(SED) 's,@exec_prefix@,$${prefix},g;' $(@D)/gettextize + $(SED) 's,@bindir@,$${exec_prefix}/bin,g;' $(@D)/gettextize +endef + +define HOST_GETTEXT_TINY_INSTALL_CMDS + $(Q)mkdir -p $(HOST_DIR)/share/gettext-tiny/po + $(Q)mkdir -p $(HOST_DIR)/share/gettext-tiny/m4 + + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ + $(HOST_CONFIGURE_OPTS) \ + prefix=$(HOST_DIR) \ + LIBINTL=NONE install + + $(SED) '/read dummy/d' $(@D)/gettextize + + $(INSTALL) -m 0755 -D $(@D)/gettextize $(HOST_DIR)/bin/gettextize + $(INSTALL) -m 0644 -D $(@D)/build-aux/config.rpath $(HOST_DIR)/share/gettext-tiny/config.rpath + $(INSTALL) -m 0644 -D $(@D)/extra/lock.m4 $(HOST_DIR)/share/gettext-tiny/m4/lock.m4 + $(INSTALL) -m 0644 -D $(@D)/extra/Makefile.in.in $(HOST_DIR)/share/gettext-tiny/po/Makefile.in.in + $(INSTALL) -m 0644 -D $(@D)/extra/boldquot.sed $(HOST_DIR)/share/gettext-tiny/po/boldquot.sed + $(INSTALL) -m 0644 -D $(@D)/extra/en@boldquot.header $(HOST_DIR)/share/gettext-tiny/po/en@boldquot.header + $(INSTALL) -m 0644 -D $(@D)/extra/en@quot.header $(HOST_DIR)/share/gettext-tiny/po/en@quot.header + $(INSTALL) -m 0644 -D $(@D)/extra/insert-header.sin $(HOST_DIR)/share/gettext-tiny/po/insert-header.sin + $(INSTALL) -m 0644 -D $(@D)/extra/quot.sed $(HOST_DIR)/share/gettext-tiny/po/quot.sed + $(INSTALL) -m 0644 -D $(@D)/extra/remove-potcdate.sin $(HOST_DIR)/share/gettext-tiny/po/remove-potcdate.sin + $(INSTALL) -m 0644 -D $(@D)/extra/Rules-quot $(HOST_DIR)/share/gettext-tiny/po/Rules-quot + $(INSTALL) -m 0644 -D $(@D)/extra/Makevars.template $(HOST_DIR)/share/gettext-tiny/po/Makevars.template + + $(Q)touch $(HOST_DIR)/share/gettext-tiny/ABOUT-NLS + + # for gettextize + ln -sf $(HOST_DIR)/usr/share/gettext-tiny $(HOST_DIR)/usr/share/gettext +endef + +# Install simple echo wrapper for gettext tool +define GETTEXT_TINY_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(GETTEXT_TINY_PKGDIR)/gettext-wrapper $(TARGET_DIR)/usr/bin/gettext +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/buildroot/package/gettext-tiny/gettext-wrapper b/buildroot/package/gettext-tiny/gettext-wrapper new file mode 100644 index 000000000..11424824c --- /dev/null +++ b/buildroot/package/gettext-tiny/gettext-wrapper @@ -0,0 +1,24 @@ +#!/bin/sh +# +# Thanks to "Yann E. MORIN" +# for this gettext replacement. + +while [ ${#} -ne 0 ]; do + case "${1}" in + (-h) printf "no help\n"; return 0;; + (-V) printf "0.0.0\n"; return 0;; + (-d|--domain) shift 2;; + (-d*|--domain=*) shift 1;; + (-e|-E|-n) shift 1;; + (-s) shift 1;; # Ignore? + (-*) printf "invalid option '%s'\n" "${1}" >&2; return 1;; + (*) break;; + esac +done + +case ${#} in + (0) printf "missing arguments\n" >&2; return 1;; + (1) printf "%s" "${1}";; + (2) printf "%s" "${2}";; + (*) printf "too many arguments\n" >&2; return 1;; +esac diff --git a/buildroot/package/gettext/Config.in b/buildroot/package/gettext/Config.in index e55663b1d..6d83388ce 100644 --- a/buildroot/package/gettext/Config.in +++ b/buildroot/package/gettext/Config.in @@ -1,25 +1,18 @@ config BR2_PACKAGE_GETTEXT bool "gettext" - depends on BR2_USE_WCHAR - help - The GNU `gettext' utilities are a set of tools that provide a - framework to help other GNU packages produce multi-lingual - messages. - - Only the libintl library will be installed in the - target. The full gettext suite, including tools, will be - installed in the staging directory. - - http://www.gnu.org/software/gettext/ - -if BR2_PACKAGE_GETTEXT + select BR2_PACKAGE_GETTEXT_GNU if BR2_SYSTEM_ENABLE_NLS + select BR2_PACKAGE_GETTEXT_TINY if !BR2_SYSTEM_ENABLE_NLS config BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL bool default y if BR2_SYSTEM_ENABLE_NLS depends on !BR2_TOOLCHAIN_HAS_FULL_GETTEXT -endif +config BR2_PACKAGE_HAS_GETTEXT + bool -comment "gettext needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR +config BR2_PACKAGE_PROVIDES_GETTEXT + string + +config BR2_PACKAGE_PROVIDES_HOST_GETTEXT + string diff --git a/buildroot/package/gettext/gettext.hash b/buildroot/package/gettext/gettext.hash deleted file mode 100644 index a2ab29876..000000000 --- a/buildroot/package/gettext/gettext.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html -md5 df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz -sha1 e0fe90ede22f7f16bbde7bdea791a835f2773fc9 gettext-0.19.8.1.tar.xz -# License files, locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gettext/gettext.mk b/buildroot/package/gettext/gettext.mk index ec9588f8a..146d40e13 100644 --- a/buildroot/package/gettext/gettext.mk +++ b/buildroot/package/gettext/gettext.mk @@ -4,97 +4,7 @@ # ################################################################################ -GETTEXT_VERSION = 0.19.8.1 -GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext -GETTEXT_SOURCE = gettext-$(GETTEXT_VERSION).tar.xz -GETTEXT_INSTALL_STAGING = YES -GETTEXT_LICENSE = LGPL-2.1+ (libintl), GPL-3.0+ (the rest) -GETTEXT_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB -# 0002-Update-after-gnulib-changed.patch -GETTEXT_AUTORECONF = YES -GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -# Avoid using the bundled subset of libxml2 -HOST_GETTEXT_DEPENDENCIES = host-libxml2 - -GETTEXT_CONF_OPTS += \ - --disable-libasprintf \ - --disable-acl \ - --disable-openmp \ - --disable-rpath \ - --disable-java \ - --disable-native-java \ - --disable-csharp \ - --disable-relocatable \ - --without-emacs - -HOST_GETTEXT_CONF_OPTS = \ - --disable-libasprintf \ - --disable-acl \ - --disable-openmp \ - --disable-rpath \ - --disable-java \ - --disable-native-java \ - --disable-csharp \ - --disable-relocatable \ - --without-emacs - -# Force the build of libintl, even if the C library provides a stub -# gettext implementation -ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y) -GETTEXT_CONF_OPTS += --with-included-gettext -else -GETTEXT_CONF_OPTS += --without-included-gettext -endif - -# For the target version, we only need the runtime, and for the host -# version, we only need the tools. -GETTEXT_SUBDIR = gettext-runtime -HOST_GETTEXT_SUBDIR = gettext-tools - -# Disable the build of documentation and examples of gettext-tools, -# and the build of documentation and tests of gettext-runtime. -define HOST_GETTEXT_DISABLE_UNNEEDED - $(SED) '/^SUBDIRS/s/ doc //;/^SUBDIRS/s/examples$$//' $(@D)/gettext-tools/Makefile.in - $(SED) '/^SUBDIRS/s/ doc //;/^SUBDIRS/s/tests$$//' $(@D)/gettext-runtime/Makefile.in -endef - -GETTEXT_POST_PATCH_HOOKS += HOST_GETTEXT_DISABLE_UNNEEDED -HOST_GETTEXT_POST_PATCH_HOOKS += HOST_GETTEXT_DISABLE_UNNEEDED - -define GETTEXT_REMOVE_UNNEEDED - $(RM) -rf $(TARGET_DIR)/usr/share/gettext/ABOUT-NLS - rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/gettext -endef - -GETTEXT_POST_INSTALL_TARGET_HOOKS += GETTEXT_REMOVE_UNNEEDED - -# Force build with NLS support, otherwise libintl is not built -# This is needed because some packages (eg. libglib2) requires -# locales, but do not properly depend on BR2_ENABLE_LOCALE, and -# instead select BR2_PACKAGE_GETTEXT. Those packages need to be -# fixed before we can remove the following 3 lines... :-( -ifeq ($(BR2_ENABLE_LOCALE),) -GETTEXT_CONF_OPTS += --enable-nls -endif - -# Disable interactive confirmation in host gettextize for package fixups -define HOST_GETTEXT_GETTEXTIZE_CONFIRMATION - $(SED) '/read dummy/d' $(HOST_DIR)/bin/gettextize -endef -HOST_GETTEXT_POST_INSTALL_HOOKS += HOST_GETTEXT_GETTEXTIZE_CONFIRMATION - -# autoreconf expects gettextize to install ABOUT-NLS, but it only gets -# installed by gettext-runtime which we don't build/install for the -# host, so do it manually -define HOST_GETTEXT_ADD_ABOUT_NLS - $(INSTALL) -m 0644 $(@D)/$(HOST_GETTEXT_SUBDIR)/ABOUT-NLS \ - $(HOST_DIR)/share/gettext/ABOUT-NLS -endef - -HOST_GETTEXT_POST_INSTALL_HOOKS += HOST_GETTEXT_ADD_ABOUT_NLS - GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/bin/autom4te $(HOST_DIR)/bin/gettextize -f -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(virtual-package)) +$(eval $(host-virtual-package)) diff --git a/buildroot/package/gflags/gflags.hash b/buildroot/package/gflags/gflags.hash index 3cae2b03b..1f7fe6033 100644 --- a/buildroot/package/gflags/gflags.hash +++ b/buildroot/package/gflags/gflags.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 466c36c6508a451734e4f4d76825cf9cd9b8716d2b70ef36479ae40f08271f88 gflags-v2.2.0.tar.gz +sha256 34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf gflags-2.2.2.tar.gz # Hash for license file: sha256 90d1f3701813c3cd65eee2dc736746fe46b465918f3f7d6d31463a2018b33fa5 COPYING.txt diff --git a/buildroot/package/gflags/gflags.mk b/buildroot/package/gflags/gflags.mk index 45186a33c..c4fce45b3 100644 --- a/buildroot/package/gflags/gflags.mk +++ b/buildroot/package/gflags/gflags.mk @@ -4,8 +4,8 @@ # ################################################################################ -GFLAGS_VERSION = v2.2.0 -GFLAGS_SITE = $(call github,gflags,gflags,$(GFLAGS_VERSION)) +GFLAGS_VERSION = 2.2.2 +GFLAGS_SITE = $(call github,gflags,gflags,v$(GFLAGS_VERSION)) GFLAGS_INSTALL_STAGING = YES GFLAGS_LICENSE = BSD-3-Clause GFLAGS_LICENSE_FILES = COPYING.txt diff --git a/buildroot/package/ghostscript-fonts/ghostscript-fonts.hash b/buildroot/package/ghostscript-fonts/ghostscript-fonts.hash index e9c7fdf99..d6df0e745 100644 --- a/buildroot/package/ghostscript-fonts/ghostscript-fonts.hash +++ b/buildroot/package/ghostscript-fonts/ghostscript-fonts.hash @@ -1,2 +1,5 @@ # From http://sourceforge.net/projects/gs-fonts/files/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ sha1 2a7198e8178b2e7dba87cb5794da515200b568f5 ghostscript-fonts-std-8.11.tar.gz +# Locally computed +sha256 0eb6f356119f2e49b2563210852e17f57f9dcc5755f350a69a46a0d641a0c401 ghostscript-fonts-std-8.11.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/giblib/giblib.hash b/buildroot/package/giblib/giblib.hash index 942aee705..0c83a5545 100644 --- a/buildroot/package/giblib/giblib.hash +++ b/buildroot/package/giblib/giblib.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac giblib-1.2.4.tar.gz +sha256 176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac giblib-1.2.4.tar.gz +sha256 8601e2dacede853fe325f7fd3a11f93b1753d576db60426f1b0ff4e68f41ff07 COPYING diff --git a/buildroot/package/giflib/0001-Address-SF-bug-113-Heap-Buffer-Overflow-2-in-functio.patch b/buildroot/package/giflib/0001-Address-SF-bug-113-Heap-Buffer-Overflow-2-in-functio.patch deleted file mode 100644 index 9c6f344be..000000000 --- a/buildroot/package/giflib/0001-Address-SF-bug-113-Heap-Buffer-Overflow-2-in-functio.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 08438a5098f3bb1de23a29334af55eba663f75bd Mon Sep 17 00:00:00 2001 -From: "Eric S. Raymond" -Date: Sat, 9 Feb 2019 10:52:21 -0500 -Subject: [PATCH] Address SF bug #113: Heap Buffer Overflow-2 in function - DGifDecompressLine()... - -This was CVE-2018-11490 - -[Retrieved from: -https://sourceforge.net/p/giflib/code/ci/08438a5098f3bb1de23a29334af55eba663f75bd] -Signed-off-by: Fabrice Fontaine ---- - lib/dgif_lib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c -index 15c1460..c4aee5f 100644 ---- a/lib/dgif_lib.c -+++ b/lib/dgif_lib.c -@@ -930,7 +930,7 @@ DGifDecompressLine(GifFileType *GifFile, GifPixelType *Line, int LineLen) - while (StackPtr != 0 && i < LineLen) - Line[i++] = Stack[--StackPtr]; - } -- if (LastCode != NO_SUCH_CODE && Prefix[Private->RunningCode - 2] == NO_SUCH_CODE) { -+ if (LastCode != NO_SUCH_CODE && Private->RunningCode - 2 < LZ_MAX_CODE && Prefix[Private->RunningCode - 2] == NO_SUCH_CODE) { - Prefix[Private->RunningCode - 2] = LastCode; - - if (CrntCode == Private->RunningCode - 2) { --- -2.20.1 - diff --git a/buildroot/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch b/buildroot/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch new file mode 100644 index 000000000..384457d0b --- /dev/null +++ b/buildroot/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch @@ -0,0 +1,69 @@ +From 487407d722714f13e8a06d1a9d89f48a5738191e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 12 Jul 2019 12:20:38 +0200 +Subject: [PATCH] Makefile: add targets to manage static building + +Add static-lib, shared-lib, install-static-lib and install-shared-lib +targets to allow the user to build giflib when dynamic library support +is not available or enable on the toolchain + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://sourceforge.net/p/giflib/code/merge-requests/7] +--- + Makefile | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index b2bf6de..111f52f 100644 +--- a/Makefile ++++ b/Makefile +@@ -61,10 +61,17 @@ UTILS = $(INSTALLABLE) \ + + LDLIBS=libgif.a -lm + +-all: libgif.so libgif.a libutil.so libutil.a $(UTILS) ++SHARED_LIBS = libgif.so libutil.so ++STATIC_LIBS = libgif.a libutil.a ++ ++all: shared-lib static-lib $(UTILS) + $(MAKE) -C doc + +-$(UTILS):: libgif.a libutil.a ++$(UTILS):: $(STATIC_LIBS) ++ ++shared-lib: $(SHARED_LIBS) ++ ++static-lib: $(STATIC_LIBS) + + libgif.so: $(OBJECTS) $(HEADERS) + $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) +@@ -79,7 +86,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) + $(AR) rcs libutil.a $(UOBJECTS) + + clean: +- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a libgif.so libutil.a libutil.so *.o ++ rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o + rm -f libgif.so.$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) + rm -f libgif.so.$(LIBMAJOR) + rm -fr doc/*.1 *.html doc/staging +@@ -96,12 +103,15 @@ install-bin: $(INSTALLABLE) + install-include: + $(INSTALL) -d "$(DESTDIR)$(INCDIR)" + $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" +-install-lib: ++install-static-lib: + $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" + $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a" ++install-shared-lib: ++ $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" + $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)" + ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" + ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" ++install-lib: install-static-lib install-shared-lib + install-man: + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1" +-- +2.20.1 + diff --git a/buildroot/package/giflib/0002-Address-SF-bug-119-MemorySanitizer-FPE-on-unknown-ad.patch b/buildroot/package/giflib/0002-Address-SF-bug-119-MemorySanitizer-FPE-on-unknown-ad.patch deleted file mode 100644 index 60e9a324a..000000000 --- a/buildroot/package/giflib/0002-Address-SF-bug-119-MemorySanitizer-FPE-on-unknown-ad.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 799eb6a3af8a3dd81e2429bf11a72a57e541f908 Mon Sep 17 00:00:00 2001 -From: "Eric S. Raymond" -Date: Sun, 17 Mar 2019 12:37:21 -0400 -Subject: [PATCH] Address SF bug #119: MemorySanitizer: FPE on unknown address - -[Retrieved (and backported) from: -https://sourceforge.net/p/giflib/code/ci/08438a5098f3bb1de23a29334af55eba663f75bd] -Signed-off-by: Fabrice Fontaine ---- - dgif_lib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c -index 3a52467..179bd84 100644 ---- a/lib/dgif_lib.c -+++ b/lib/dgif_lib.c -@@ -1143,7 +1143,7 @@ DGifSlurp(GifFileType *GifFile) - - sp = &GifFile->SavedImages[GifFile->ImageCount - 1]; - /* Allocate memory for the image */ -- if (sp->ImageDesc.Width < 0 && sp->ImageDesc.Height < 0 && -+ if (sp->ImageDesc.Width <= 0 || sp->ImageDesc.Height <= 0 || - sp->ImageDesc.Width > (INT_MAX / sp->ImageDesc.Height)) { - return GIF_ERROR; - } --- -2.20.1 - diff --git a/buildroot/package/giflib/giflib.hash b/buildroot/package/giflib/giflib.hash index 189dca9f1..f7db1626d 100644 --- a/buildroot/package/giflib/giflib.hash +++ b/buildroot/package/giflib/giflib.hash @@ -1,5 +1,5 @@ # From http://sourceforge.net/projects/giflib/files -md5 2c171ced93c0e83bb09e6ccad8e3ba2b giflib-5.1.4.tar.bz2 -sha1 5f1157cfc377916280849e247b8e34fa0446513f giflib-5.1.4.tar.bz2 +md5 6f03aee4ebe54ac2cc1ab3e4b0a049e5 giflib-5.2.1.tar.gz +sha1 c3f774dcbdf26afded7788979c8081d33c6426dc giflib-5.2.1.tar.gz # Locally computed sha256 0c9b7990ecdca88b676db232c226548ac408b279f550d424d996f0d83591dd8e COPYING diff --git a/buildroot/package/giflib/giflib.mk b/buildroot/package/giflib/giflib.mk index 29666eebe..3dd17972e 100644 --- a/buildroot/package/giflib/giflib.mk +++ b/buildroot/package/giflib/giflib.mk @@ -4,27 +4,45 @@ # ################################################################################ -GIFLIB_VERSION = 5.1.4 -GIFLIB_SOURCE = giflib-$(GIFLIB_VERSION).tar.bz2 +GIFLIB_VERSION = 5.2.1 GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib GIFLIB_INSTALL_STAGING = YES GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING -GIFLIB_BINS = \ - gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifbuild gifburst gifclip \ - gifclrmp gifcolor gifcomb gifcompose gifecho giffiltr giffix gifflip \ - gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \ - gifrsize gifspnge giftext giftool gifwedge icon2gif raw2gif rgb2gif \ - text2gif +ifeq ($(BR2_STATIC_LIBS),y) +GIFLIB_BUILD_LIBS = static-lib +GIFLIB_INSTALL_LIBS = install-static-lib +else ifeq ($(BR2_SHARED_LIBS),y) +GIFLIB_BUILD_LIBS = shared-lib +GIFLIB_INSTALL_LIBS = install-shared-lib +else +GIFLIB_BUILD_LIBS = static-lib shared-lib +GIFLIB_INSTALL_LIBS = install-lib +endif -GIFLIB_CONF_ENV = ac_cv_prog_have_xmlto=no - -define GIFLIB_BINS_CLEANUP - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(GIFLIB_BINS)) +define GIFLIB_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(GIFLIB_BUILD_LIBS) endef -GIFLIB_POST_INSTALL_TARGET_HOOKS += GIFLIB_BINS_CLEANUP +define HOST_GIFLIB_BUILD_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +define GIFLIB_INSTALL_STAGING_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) \ + PREFIX=/usr install-include $(GIFLIB_INSTALL_LIBS) +endef + +define GIFLIB_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \ + PREFIX=/usr install-include $(GIFLIB_INSTALL_LIBS) +endef + +define HOST_GIFLIB_INSTALL_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \ + PREFIX=/usr install +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/buildroot/package/git/0001-configure.ac-Properly-check-for-libintl.patch b/buildroot/package/git/0001-configure.ac-Properly-check-for-libintl.patch deleted file mode 100644 index 2f367f547..000000000 --- a/buildroot/package/git/0001-configure.ac-Properly-check-for-libintl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 01da08fd60a0bdb2994f85f943dba148d9321d4d Mon Sep 17 00:00:00 2001 -From: Vadim Kochan -Date: Wed, 17 Apr 2019 01:25:40 +0300 -Subject: [PATCH 1/1] configure.ac: Properly check for libintl - -Some libc implementations like uclibc or musl provides -gettext stubs via libintl library but this case is not checked -by AC_CHECK_LIBRARY(c, gettext ...) because gcc has gettext as builtin -which passess the check. - -So check it with included libintl.h where gettext may unfold into -libintl_gettext which will cause check to fail if libintl_gettext are -needed to be linked with -lintl. - -Signed-off-by: Vadim Kochan ---- - configure.ac | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7f84151..0b8e25f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -762,9 +762,19 @@ AC_CHECK_LIB([c], [basename], - GIT_CONF_SUBST([NEEDS_LIBGEN]) - test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen" - --AC_CHECK_LIB([c], [gettext], --[LIBC_CONTAINS_LIBINTL=YesPlease], --[LIBC_CONTAINS_LIBINTL=]) -+AC_DEFUN([LIBINTL_SRC], [ -+AC_LANG_PROGRAM([[ -+#include -+]],[[ -+char *msg = gettext("test"); -+]])]) -+ -+AC_MSG_CHECKING([if libc contains libintl]) -+AC_LINK_IFELSE([LIBINTL_SRC], -+ [AC_MSG_RESULT([yes]) -+ LIBC_CONTAINS_LIBINTL=YesPlease], -+ [AC_MSG_RESULT([no]) -+ LIBC_CONTAINS_LIBINTL=]) - GIT_CONF_SUBST([LIBC_CONTAINS_LIBINTL]) - - # --- -2.14.1 - diff --git a/buildroot/package/git/git.hash b/buildroot/package/git/git.hash index c258abf3c..74bf334b7 100644 --- a/buildroot/package/git/git.hash +++ b/buildroot/package/git/git.hash @@ -1,4 +1,4 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 cd45502a4146d8e77f40cc64b3b484247e6165633bb024d7a9385a85f68e1d52 git-2.16.6.tar.xz +sha256 723f24dce8fdd621a308b6187553fce7d5244205c065fe0a3aebd0b7c3f88562 git-2.24.1.tar.xz sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/buildroot/package/git/git.mk b/buildroot/package/git/git.mk index 8866909cc..dd79c41e4 100644 --- a/buildroot/package/git/git.mk +++ b/buildroot/package/git/git.mk @@ -4,13 +4,12 @@ # ################################################################################ -GIT_VERSION = 2.16.6 +GIT_VERSION = 2.24.1 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) -GIT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) GIT_DEPENDENCIES += host-pkgconf openssl @@ -35,7 +34,7 @@ ifeq ($(BR2_PACKAGE_LIBCURL),y) GIT_DEPENDENCIES += libcurl GIT_CONF_OPTS += --with-curl GIT_CONF_ENV += \ - ac_cv_prog_curl_config=$(STAGING_DIR)/usr/bin/$(LIBCURL_CONFIG_SCRIPTS) + ac_cv_prog_CURL_CONFIG=$(STAGING_DIR)/usr/bin/$(LIBCURL_CONFIG_SCRIPTS) else GIT_CONF_OPTS += --without-curl endif @@ -68,7 +67,7 @@ endif GIT_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180)$(BR2_TOOLCHAIN_HAS_GCC_BUG_93847),) GIT_CFLAGS += -O0 endif diff --git a/buildroot/package/gli/Config.in b/buildroot/package/gli/Config.in new file mode 100644 index 000000000..da7ce28ba --- /dev/null +++ b/buildroot/package/gli/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_GLI + bool "gli" + depends on BR2_INSTALL_LIBSTDCPP + help + OpenGL Image (GLI) + + http://gli.g-truc.net + +comment "gli needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/gli/gli.hash b/buildroot/package/gli/gli.hash new file mode 100644 index 000000000..177358a75 --- /dev/null +++ b/buildroot/package/gli/gli.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 9374f3cf6441dac0154f7e5ae9ad9ae99f4c4a36f8eb6de23f54a1996b9f2769 gli-559cbe1ec38878e182507d331e0780fbae5baf15.tar.gz +sha256 e26459f62353e631d18379668c82b85f9fd2fd993f2818277e4fce21e957f87a manual.md diff --git a/buildroot/package/gli/gli.mk b/buildroot/package/gli/gli.mk new file mode 100644 index 000000000..6a332d0e0 --- /dev/null +++ b/buildroot/package/gli/gli.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# gli +# +################################################################################ + +GLI_VERSION = 559cbe1ec38878e182507d331e0780fbae5baf15 +GLI_SITE = $(call github,g-truc,gli,$(GLI_VERSION)) +GLI_LICENSE = MIT +GLI_LICENSE_FILES = manual.md + +# GLI is a header-only library, it only makes sense +# to have it installed into the staging directory. +GLI_INSTALL_STAGING = YES +GLI_INSTALL_TARGET = NO + +$(eval $(cmake-package)) diff --git a/buildroot/package/glib-networking/Config.in b/buildroot/package/glib-networking/Config.in index 1a8ebe6c0..22331255f 100644 --- a/buildroot/package/glib-networking/Config.in +++ b/buildroot/package/glib-networking/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_GLIB_NETWORKING bool "glib-networking" - depends on BR2_USE_WCHAR # glib2, gnutls + depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 - depends on !BR2_STATIC_LIBS # gnutls - select BR2_PACKAGE_GNUTLS + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS help Network-related GIO modules for glib. @@ -13,4 +13,5 @@ config BR2_PACKAGE_GLIB_NETWORKING comment "glib-networking needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/buildroot/package/glib-networking/glib-networking.hash b/buildroot/package/glib-networking/glib-networking.hash index d959175e7..061b7af69 100644 --- a/buildroot/package/glib-networking/glib-networking.hash +++ b/buildroot/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.58/glib-networking-2.58.0.sha256sum -sha256 bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068 glib-networking-2.58.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.61/glib-networking-2.61.1.sha256sum +sha256 a3acbe8953ba80e408bdc4a3e8c240fd9447181c7e800a175c3105604c38bad5 glib-networking-2.61.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/glib-networking/glib-networking.mk b/buildroot/package/glib-networking/glib-networking.mk index 163f1b0dd..39133371f 100644 --- a/buildroot/package/glib-networking/glib-networking.mk +++ b/buildroot/package/glib-networking/glib-networking.mk @@ -4,26 +4,37 @@ # ################################################################################ -GLIB_NETWORKING_VERSION_MAJOR = 2.58 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 +GLIB_NETWORKING_VERSION_MAJOR = 2.61 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES GLIB_NETWORKING_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ host-pkgconf \ - libglib2 \ - gnutls + libglib2 GLIB_NETWORKING_CONF_OPTS = \ - -Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt \ - -Dlibproxy_support=false \ - -Dgnome_proxy_support=false \ - -Dpkcs11_support=false + -Dlibproxy=disabled \ + -Dgnome_proxy=disabled GLIB_NETWORKING_LICENSE = LGPL-2.0+ GLIB_NETWORKING_LICENSE_FILES = COPYING GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \ GIO_MODULE_DIR=/usr/lib/gio/modules install +ifeq ($(BR2_PACKAGE_GNUTLS),y) +GLIB_NETWORKING_DEPENDENCIES += gnutls +GLIB_NETWORKING_CONF_OPTS += -Dgnutls=enabled +else +GLIB_NETWORKING_CONF_OPTS += -Dgnutls=disabled +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +GLIB_NETWORKING_DEPENDENCIES += openssl +GLIB_NETWORKING_CONF_OPTS += -Dopenssl=enabled +else +GLIB_NETWORKING_CONF_OPTS += -Dopenssl=disabled +endif + $(eval $(meson-package)) diff --git a/buildroot/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash b/buildroot/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash new file mode 100644 index 000000000..ce378c0bd --- /dev/null +++ b/buildroot/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash @@ -0,0 +1,7 @@ +# Locally calculated (fetched from Github) +sha256 703877c0df77fce00719fe55cc62b07bb8d5f44fdb704bbb1b0bf2cf38afe10a glibc-06983fe52cfe8e4779035c27e8cc5d2caab31531.tar.gz + +# Hashes for license files +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES diff --git a/buildroot/package/glibc/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/glibc.hash b/buildroot/package/glibc/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/glibc.hash new file mode 100644 index 000000000..4283ea04b --- /dev/null +++ b/buildroot/package/glibc/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/glibc.hash @@ -0,0 +1,7 @@ +# Locally calculated (fetched from Github) +sha256 fe1ca8099bc2cda997d8a585f1a512e59df56c52c9c7363a4058da2725c8f4a9 glibc-2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91.tar.gz + +# Hashes for license files +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES diff --git a/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0001-Fix-RISC-V-32-bit-build-of-riscv-glibc-2.26.patch b/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0001-Fix-RISC-V-32-bit-build-of-riscv-glibc-2.26.patch deleted file mode 100644 index ab157e9e7..000000000 --- a/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0001-Fix-RISC-V-32-bit-build-of-riscv-glibc-2.26.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 4909cfbbe8dd512b8fc0892859549c26e1b14d30 Mon Sep 17 00:00:00 2001 -From: Mark Corbin -Date: Sun, 21 Oct 2018 10:38:18 +0100 -Subject: [PATCH] Fix RISC-V 32-bit build of riscv-glibc 2.26 - -This patch fixes two build errors with the 32-bit version of -glibc-2.26 from the riscv-glibc repository. - -A void reference to 'refsym' has been added to dl-runtime.c to avoid -an 'unused variable' error when building with '-Werror'. - -Some data types were hard-coded for 64-bit in ldsodefs.h. These have -been modified to allow 32-bit builds. - -This patch was provided by Fabrice Bellard as part of his RISC-V -Buildroot development source. - -Signed-off-by: Mark Corbin ---- - elf/dl-runtime.c | 1 + - sysdeps/riscv/ldsodefs.h | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c -index 51d3819d4a..e728e8907e 100644 ---- a/elf/dl-runtime.c -+++ b/elf/dl-runtime.c -@@ -146,6 +146,7 @@ _dl_fixup ( - if (__glibc_unlikely (GLRO(dl_bind_not))) - return value; - -+ (void)refsym; - return elf_machine_fixup_plt (l, result, refsym, sym, reloc, rel_addr, value); - } - -diff --git a/sysdeps/riscv/ldsodefs.h b/sysdeps/riscv/ldsodefs.h -index db993df80a..91e7a8c88f 100644 ---- a/sysdeps/riscv/ldsodefs.h -+++ b/sysdeps/riscv/ldsodefs.h -@@ -25,14 +25,14 @@ struct La_riscv_regs; - struct La_riscv_retval; - - #define ARCH_PLTENTER_MEMBERS \ -- Elf64_Addr (*riscv_gnu_pltenter) (Elf64_Sym *, unsigned int, \ -+ ElfW(Addr) (*riscv_gnu_pltenter) (ElfW(Sym) *, unsigned int, \ - uintptr_t *, uintptr_t *, \ - const struct La_riscv_regs *, \ - unsigned int *, const char *name, \ - long int *framesizep); - - #define ARCH_PLTEXIT_MEMBERS \ -- unsigned int (*riscv_gnu_pltexit) (Elf64_Sym *, unsigned int, \ -+ unsigned int (*riscv_gnu_pltexit) (ElfW(Sym) *, unsigned int, \ - uintptr_t *, uintptr_t *, \ - const struct La_riscv_regs *, \ - struct La_riscv_retval *, \ --- -2.17.1 - diff --git a/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch b/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch deleted file mode 100644 index 961d5a1cb..000000000 --- a/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6b4520e13c2ed7fca725d5f5c879854cd7c96c19 Mon Sep 17 00:00:00 2001 -From: Mark Corbin -Date: Mon, 4 Feb 2019 10:35:27 +0000 -Subject: [PATCH] Fix mcontext_t error that breaks RISC-V architecture - package builds - -The riscv-glibc repository version of glibc 2.26 will build for -RISC-V 32bit, but when many packages are built against the resulting -library an 'unknown type name mcontext_t' error is reported. The -definition of mcontext_h in the ucontext.h header file needs to be -moved outside of the '#ifdef __USE_MISC' structure to fix this -issue. - -Signed-off-by: Mark Corbin ---- - sysdeps/unix/sysv/linux/riscv/sys/ucontext.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h b/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h -index 8f02f09106..b9dd04564a 100644 ---- a/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h -+++ b/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h -@@ -48,12 +48,11 @@ typedef greg_t gregset_t[NGREG]; - - /* Container for floating-point state. */ - typedef union __riscv_fp_state fpregset_t; -+#endif - - /* Context to describe whole processor state. */ - typedef struct sigcontext mcontext_t; - --#endif -- - /* Userlevel context. */ - typedef struct ucontext - { --- -2.19.1 - diff --git a/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/glibc.hash b/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/glibc.hash deleted file mode 100644 index 3eb5e04e9..000000000 --- a/buildroot/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/glibc.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 a40f908125135bad2cf92c18d07ad25b3091b161b3a5d3aea46c23ffd2ac90b8 glibc-4e2943456e690d89f48e6e710757dd09404b0c9a.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 61abdd6930c9c599062d89e916b3e7968783879b6be0ee1c6229dd6169def431 LICENSES diff --git a/buildroot/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash b/buildroot/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash new file mode 100644 index 000000000..a61bd65f8 --- /dev/null +++ b/buildroot/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash @@ -0,0 +1,2 @@ +# Locally calculated (fetched from https://github.com/c-sky/glibc) +sha512 9deb2deceefe347d72de13510a5baa3de00f94c684f3b25e136ca3660f61e65a69f2115abb488c2ab0fa93cda8535853ce1e13e186efcc8434ecc4049efd82b5 glibc-7630ed2fa60caea98f500e4a7a51b88f9bf1e176.tar.gz diff --git a/buildroot/package/glibc/Config.in b/buildroot/package/glibc/Config.in index 782125108..5ecd05814 100644 --- a/buildroot/package/glibc/Config.in +++ b/buildroot/package/glibc/Config.in @@ -1,5 +1,7 @@ if BR2_TOOLCHAIN_BUILDROOT_GLIBC +comment "Glibc Options" + config BR2_PACKAGE_GLIBC bool default y @@ -7,4 +9,11 @@ config BR2_PACKAGE_GLIBC select BR2_TOOLCHAIN_HAS_SSP if BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI help https://www.gnu.org/software/libc/ -endif + +config BR2_PACKAGE_GLIBC_UTILS + bool "Install glibc utilities" + help + Enabling this option will compile and install the getconf, + ldconfig, ldd and locale glibc utilities for the target. + +endif # BR2_TOOLCHAIN_BUILDROOT_GLIBC diff --git a/buildroot/package/glibc/arc-2018.09-release/glibc.hash b/buildroot/package/glibc/arc-2018.09-release/glibc.hash deleted file mode 100644 index 8e70ce043..000000000 --- a/buildroot/package/glibc/arc-2018.09-release/glibc.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 cc2aa6b16641ebcf1492bf6245897d8c263c96b6e30375d09351306a12b6d529 glibc-arc-2018.09-release.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES diff --git a/buildroot/package/glibc/arc-2019.09-release/glibc.hash b/buildroot/package/glibc/arc-2019.09-release/glibc.hash new file mode 100644 index 000000000..296035c49 --- /dev/null +++ b/buildroot/package/glibc/arc-2019.09-release/glibc.hash @@ -0,0 +1,7 @@ +# Locally calculated (fetched from Github) +sha256 0e0fd7603938fd8ebd793385a3d72c6e1fba22e16a600a16cc953a93f0e85943 glibc-arc-2019.09-release.tar.gz + +# Hashes for license files +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES diff --git a/buildroot/package/glibc/glibc-2.28-133-g6578d89c170cc7b524b9bccafffd5b4207bf646f/glibc.hash b/buildroot/package/glibc/glibc-2.28-133-g6578d89c170cc7b524b9bccafffd5b4207bf646f/glibc.hash deleted file mode 100644 index 0e2d05be3..000000000 --- a/buildroot/package/glibc/glibc-2.28-133-g6578d89c170cc7b524b9bccafffd5b4207bf646f/glibc.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 8cb918cef45112554dd5efdbe4e3d4bb2909708a2b115a3b612b22bd7c670859 glibc-glibc-2.28-133-g6578d89c170cc7b524b9bccafffd5b4207bf646f.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES diff --git a/buildroot/package/glibc/glibc.mk b/buildroot/package/glibc/glibc.mk index dcf012656..2ca73343b 100644 --- a/buildroot/package/glibc/glibc.mk +++ b/buildroot/package/glibc/glibc.mk @@ -5,15 +5,19 @@ ################################################################################ ifeq ($(BR2_arc),y) -GLIBC_VERSION = arc-2018.09-release +GLIBC_VERSION = arc-2019.09-release GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION)) else ifeq ($(BR2_RISCV_32),y) -GLIBC_VERSION = 4e2943456e690d89f48e6e710757dd09404b0c9a +GLIBC_VERSION = 06983fe52cfe8e4779035c27e8cc5d2caab31531 GLIBC_SITE = $(call github,riscv,riscv-glibc,$(GLIBC_VERSION)) +else ifeq ($(BR2_csky),y) +GLIBC_VERSION = 7630ed2fa60caea98f500e4a7a51b88f9bf1e176 +GLIBC_SITE = $(call github,c-sky,glibc,$(GLIBC_VERSION)) else # Generate version string using: -# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master -GLIBC_VERSION = glibc-2.28-133-g6578d89c170cc7b524b9bccafffd5b4207bf646f +# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- +# When updating the version, please also update localedef +GLIBC_VERSION = 2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -32,7 +36,7 @@ GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO # Before glibc is configured, we must have the first stage # cross-compiler and the kernel headers GLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-bison host-gawk \ - $(BR2_MAKE_HOST_DEPENDENCY) + $(BR2_MAKE_HOST_DEPENDENCY) $(BR2_PYTHON3_HOST_DEPENDENCY) GLIBC_SUBDIR = build @@ -71,10 +75,19 @@ endef endif GLIBC_CONF_ENV = \ - ac_cv_path_BASH_SHELL=/bin/bash \ + ac_cv_path_BASH_SHELL=/bin/$(if $(BR2_PACKAGE_BASH),bash,sh) \ libc_cv_forced_unwind=yes \ libc_cv_ssp=no +# POSIX shell does not support localization, so remove the corresponding +# syntax from ldd if bash is not selected. +ifeq ($(BR2_PACKAGE_BASH),) +define GLIBC_LDD_NO_BASH + $(SED) 's/$$"/"/g' $(@D)/elf/ldd.bash.in +endef +GLIBC_POST_PATCH_HOOKS += GLIBC_LDD_NO_BASH +endif + # Override the default library locations of /lib64/ and # /usr/lib64// for RISC-V. ifeq ($(BR2_riscv),y) @@ -140,10 +153,24 @@ ifeq ($(BR2_PACKAGE_GDB),y) GLIBC_LIBS_LIB += libthread_db.so.* endif +ifeq ($(BR2_PACKAGE_GLIBC_UTILS),y) +GLIBC_TARGET_UTILS_USR_BIN = posix/getconf elf/ldd +GLIBC_TARGET_UTILS_SBIN = elf/ldconfig +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +GLIBC_TARGET_UTILS_USR_BIN += locale/locale +endif +endif + define GLIBC_INSTALL_TARGET_CMDS for libpattern in $(GLIBC_LIBS_LIB); do \ $(call copy_toolchain_lib_root,$$libpattern) ; \ done + $(foreach util,$(GLIBC_TARGET_UTILS_USR_BIN), \ + $(INSTALL) -D -m 0755 $(@D)/build/$(util) $(TARGET_DIR)/usr/bin/$(notdir $(util)) + ) + $(foreach util,$(GLIBC_TARGET_UTILS_SBIN), \ + $(INSTALL) -D -m 0755 $(@D)/build/$(util) $(TARGET_DIR)/sbin/$(notdir $(util)) + ) endef $(eval $(autotools-package)) diff --git a/buildroot/package/glibmm/glibmm.hash b/buildroot/package/glibmm/glibmm.hash index 6131f9dca..021b77ef0 100644 --- a/buildroot/package/glibmm/glibmm.hash +++ b/buildroot/package/glibmm/glibmm.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.56/glibmm-2.56.0.sha256sum -sha256 6e74fcba0d245451c58fc8a196e9d103789bc510e1eee1a9b1e816c5209e79a9 glibmm-2.56.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.62/glibmm-2.62.0.sha256sum +sha256 36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe glibmm-2.62.0.tar.xz # License files, locally calculated sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/buildroot/package/glibmm/glibmm.mk b/buildroot/package/glibmm/glibmm.mk index e66d56eac..c31c794ca 100644 --- a/buildroot/package/glibmm/glibmm.mk +++ b/buildroot/package/glibmm/glibmm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLIBMM_VERSION_MAJOR = 2.56 +GLIBMM_VERSION_MAJOR = 2.62 GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).0 GLIBMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GLIBMM_LICENSE_FILES = COPYING COPYING.tools diff --git a/buildroot/package/glm/glm.hash b/buildroot/package/glm/glm.hash index c87d4ca2f..2073d6bf0 100644 --- a/buildroot/package/glm/glm.hash +++ b/buildroot/package/glm/glm.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 a220e60f8711265595be3221e530d632d5823641ecd46a3a54bc174933bff14c glm-0.9.8.4.tar.gz +sha256 5e33b6131cea6a904339734b015110d4342b7dc02d995164fdb86332d28a5aa4 glm-0.9.9.5.tar.gz +sha256 337130631a714eeae017556cad101d5324c2961214120b6214741d3d43667086 manual.md diff --git a/buildroot/package/glm/glm.mk b/buildroot/package/glm/glm.mk index 1f23146dd..3ef106a94 100644 --- a/buildroot/package/glm/glm.mk +++ b/buildroot/package/glm/glm.mk @@ -4,14 +4,20 @@ # ################################################################################ -GLM_VERSION = 0.9.8.4 +GLM_VERSION = 0.9.9.5 GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) GLM_LICENSE = MIT -GLM_LICENSE_FILES = copying.txt +GLM_LICENSE_FILES = manual.md # GLM is a header-only library, it only makes sense # to have it installed into the staging directory. GLM_INSTALL_STAGING = YES GLM_INSTALL_TARGET = NO +# Don't build libraries as GLM is header-only +GLM_CONF_OPTS = \ + -DGLM_TEST_ENABLE=OFF \ + -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_STATIC_LIBS=OFF + $(eval $(cmake-package)) diff --git a/buildroot/package/glmark2/Config.in b/buildroot/package/glmark2/Config.in index addd7a906..153eb3b0a 100644 --- a/buildroot/package/glmark2/Config.in +++ b/buildroot/package/glmark2/Config.in @@ -1,27 +1,65 @@ -config BR2_PACKAGE_GLMARK2_EGL_GLES +config BR2_PACKAGE_GLMARK2_FLAVOR_ANY + bool + +config BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2 bool default y - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL - depends on BR2_PACKAGE_MESA3D_OPENGL_ES + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGLES + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_GLMARK2_FLAVOR_ANY -config BR2_PACKAGE_GLMARK2_GL +config BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GL + bool + default y + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_GLMARK2_FLAVOR_ANY + +config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2 + bool + default y + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGLES + depends on BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_GLMARK2_FLAVOR_ANY + +config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL + bool + default y + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_GLMARK2_FLAVOR_ANY + +config BR2_PACKAGE_GLMARK2_FLAVOR_X11_GLESV2 + bool + default y + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGLES + depends on BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_GLMARK2_FLAVOR_ANY + +config BR2_PACKAGE_GLMARK2_FLAVOR_X11_GL bool default y depends on BR2_PACKAGE_HAS_LIBGL - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER + depends on BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_GLMARK2_FLAVOR_ANY comment "glmark2 needs a toolchain w/ C++, gcc >= 4.9" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -comment "glmark2 needs an OpenGL or an openGL ES and EGL backend provided by mesa3d" +comment "glmark2 needs an OpenGL or an openGL ES and EGL backend" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 && BR2_INSTALL_LIBSTDCPP - depends on !BR2_PACKAGE_GLMARK2_GL && !BR2_PACKAGE_GLMARK2_EGL_GLES + depends on !BR2_PACKAGE_GLMARK2_FLAVOR_ANY config BR2_PACKAGE_GLMARK2 bool "glmark2" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - depends on BR2_PACKAGE_GLMARK2_GL || BR2_PACKAGE_GLMARK2_EGL_GLES + depends on BR2_PACKAGE_GLMARK2_FLAVOR_ANY select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBPNG help diff --git a/buildroot/package/glmark2/glmark2.hash b/buildroot/package/glmark2/glmark2.hash index aeb8a7856..ffd1ba2d5 100644 --- a/buildroot/package/glmark2/glmark2.hash +++ b/buildroot/package/glmark2/glmark2.hash @@ -1,2 +1,4 @@ # Locally computed -sha256 8800f3cab0575df217adc166b181930e1f881efb6f764f35872993ee78dea5f0 glmark2-9b1070fe9c5cf908f323909d3c8cbed08022abe8.tar.gz +sha256 6a9de46c098406895411b629fe8fadfdce92360500f0f10e4cc60a889a1692eb glmark2-9e01aef1a786b28aca73135a5b00f85c357e8f5e.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 16fbc228292bd774b263b212ae422c524cbf3b2078bcf21b22f8bdd4373be617 COPYING.SGI diff --git a/buildroot/package/glmark2/glmark2.mk b/buildroot/package/glmark2/glmark2.mk index 4eeaec79c..3d31003d0 100644 --- a/buildroot/package/glmark2/glmark2.mk +++ b/buildroot/package/glmark2/glmark2.mk @@ -4,40 +4,39 @@ # ################################################################################ -GLMARK2_VERSION = 9b1070fe9c5cf908f323909d3c8cbed08022abe8 +GLMARK2_VERSION = 9e01aef1a786b28aca73135a5b00f85c357e8f5e GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION)) GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI -GLMARK2_DEPENDENCIES = host-pkgconf jpeg libpng \ - $(if $(BR2_PACKAGE_HAS_LIBEGL),libegl) \ - $(if $(BR2_PACKAGE_HAS_LIBGLES),libgles) \ - $(if $(BR2_PACKAGE_HAS_LIBGL),libgl) +GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -GLMARK2_DEPENDENCIES += xlib_libX11 -ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yy) -GLMARK2_FLAVORS += x11-glesv2 -endif -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -GLMARK2_FLAVORS += x11-gl -endif -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yy) +ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y) +GLMARK2_DEPENDENCIES += libgles udev GLMARK2_FLAVORS += drm-glesv2 endif -ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL),yy) +ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GL),y) +GLMARK2_DEPENDENCIES += libgl udev GLMARK2_FLAVORS += drm-gl endif -ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yyy) -GLMARK2_DEPENDENCIES += wayland +ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_X11_GLESV2),y) +GLMARK2_DEPENDENCIES += libgles xlib_libX11 +GLMARK2_FLAVORS += x11-glesv2 +endif + +ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_X11_GL),y) +GLMARK2_DEPENDENCIES += libgl xlib_libX11 +GLMARK2_FLAVORS += x11-gl +endif + +ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2),y) +GLMARK2_DEPENDENCIES += libgles wayland GLMARK2_FLAVORS += wayland-glesv2 endif -ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL),yyy) -GLMARK2_DEPENDENCIES += wayland +ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL),y) +GLMARK2_DEPENDENCIES += libgl wayland GLMARK2_FLAVORS += wayland-gl endif diff --git a/buildroot/package/glog/0001-src-symbolize.cc-fix-build-without-dlfcn.h.patch b/buildroot/package/glog/0001-src-symbolize.cc-fix-build-without-dlfcn.h.patch new file mode 100644 index 000000000..73c6e670e --- /dev/null +++ b/buildroot/package/glog/0001-src-symbolize.cc-fix-build-without-dlfcn.h.patch @@ -0,0 +1,37 @@ +From f71e0899439aaa0e6172243a0862bf8a72a241fc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 28 Oct 2019 18:21:55 +0100 +Subject: [PATCH] src/symbolize.cc: fix build without dlfcn.h + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/google/glog/pull/475] +--- + src/symbolize.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/symbolize.cc b/src/symbolize.cc +index 1ffc607..ff027f2 100644 +--- a/src/symbolize.cc ++++ b/src/symbolize.cc +@@ -110,7 +110,9 @@ _END_GOOGLE_NAMESPACE_ + + #if defined(__ELF__) + ++#if defined(HAVE_DLFCN_H) + #include ++#endif + #if defined(OS_OPENBSD) + #include + #else +@@ -832,7 +834,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, + + _END_GOOGLE_NAMESPACE_ + +-#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) ++#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) && defined(HAVE_DLFCN_H) + + #include + #include +-- +2.23.0 + diff --git a/buildroot/package/glog/0002-src-utilities-fix-build-without-pthread.patch b/buildroot/package/glog/0002-src-utilities-fix-build-without-pthread.patch new file mode 100644 index 000000000..503f57a69 --- /dev/null +++ b/buildroot/package/glog/0002-src-utilities-fix-build-without-pthread.patch @@ -0,0 +1,83 @@ +From 9630e0e848da22e27b346c38d9b05f0a16cbf7b3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 31 Oct 2019 19:27:16 +0100 +Subject: [PATCH] src/utilities: fix build without pthread + +- Remove is_default_thread function which is an internal and not used + function +- Remove g_main_thread_id as it was used only by is_default_thread + +Fixes: + - http://autobuild.buildroot.net/results/5320bbe1205e782e3516d9bead8d1ed825bcbaad + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/google/glog/commit/9630e0e848da22e27b346c38d9b05f0a16cbf7b3] +--- + src/utilities.cc | 16 +++------------- + src/utilities.h | 2 -- + 2 files changed, 3 insertions(+), 15 deletions(-) + +diff --git a/src/utilities.cc b/src/utilities.cc +index d463b33b..9a1e35d0 100644 +--- a/src/utilities.cc ++++ b/src/utilities.cc +@@ -61,7 +61,6 @@ using std::string; + _START_GOOGLE_NAMESPACE_ + + static const char* g_program_invocation_short_name = NULL; +-static pthread_t g_main_thread_id; + + _END_GOOGLE_NAMESPACE_ + +@@ -181,16 +180,6 @@ bool IsGoogleLoggingInitialized() { + return g_program_invocation_short_name != NULL; + } + +-bool is_default_thread() { +- if (g_program_invocation_short_name == NULL) { +- // InitGoogleLogging() not yet called, so unlikely to be in a different +- // thread +- return true; +- } else { +- return pthread_equal(pthread_self(), g_main_thread_id); +- } +-} +- + #ifdef OS_WINDOWS + struct timeval { + long tv_sec, tv_usec; +@@ -276,9 +265,11 @@ pid_t GetTID() { + return getpid(); // Linux: getpid returns thread ID when gettid is absent + #elif defined OS_WINDOWS && !defined OS_CYGWIN + return GetCurrentThreadId(); +-#else ++#elif defined(HAVE_PTHREAD) + // If none of the techniques above worked, we use pthread_self(). + return (pid_t)(uintptr_t)pthread_self(); ++#else ++ return -1; + #endif + } + +@@ -350,7 +341,6 @@ void InitGoogleLoggingUtilities(const char* argv0) { + if (!slash) slash = strrchr(argv0, '\\'); + #endif + g_program_invocation_short_name = slash ? slash + 1 : argv0; +- g_main_thread_id = pthread_self(); + + #ifdef HAVE_STACKTRACE + InstallFailureFunction(&DumpStackTraceAndExit); +diff --git a/src/utilities.h b/src/utilities.h +index ca21cfb3..c66f9146 100644 +--- a/src/utilities.h ++++ b/src/utilities.h +@@ -163,8 +163,6 @@ const char* ProgramInvocationShortName(); + + bool IsGoogleLoggingInitialized(); + +-bool is_default_thread(); +- + int64 CycleClock_Now(); + + int64 UsecToCycles(int64 usec); diff --git a/buildroot/package/glog/Config.in b/buildroot/package/glog/Config.in index 534997af4..337632300 100644 --- a/buildroot/package/glog/Config.in +++ b/buildroot/package/glog/Config.in @@ -1,13 +1,13 @@ config BR2_PACKAGE_GLOG bool "glog" + # __ELF__ not defined on Microblaze + depends on !BR2_microblaze depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS help C++ implementation of the Google logging module https://github.com/google/glog -comment "glog needs a toolchain w/ C++, threads, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS +comment "glog needs a toolchain w/ C++" + depends on !BR2_microblaze + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/glog/glog.hash b/buildroot/package/glog/glog.hash index 909e072b6..b9ba66540 100644 --- a/buildroot/package/glog/glog.hash +++ b/buildroot/package/glog/glog.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 7580e408a2c0b5a89ca214739978ce6ff480b5e7d8d7698a2aa92fadc484d1e0 glog-v0.3.5.tar.gz +sha256 f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c glog-0.4.0.tar.gz # Hash for License file: sha256 0fc497129c5c69ff6f22da6933c7e4aaef082fde8437fd57680c2780100772a4 COPYING diff --git a/buildroot/package/glog/glog.mk b/buildroot/package/glog/glog.mk index 3f17529f5..9d31732a8 100644 --- a/buildroot/package/glog/glog.mk +++ b/buildroot/package/glog/glog.mk @@ -4,25 +4,19 @@ # ################################################################################ -GLOG_VERSION = v0.3.5 -GLOG_SITE = $(call github,google,glog,$(GLOG_VERSION)) +GLOG_VERSION = 0.4.0 +GLOG_SITE = $(call github,google,glog,v$(GLOG_VERSION)) GLOG_INSTALL_STAGING = YES GLOG_LICENSE = BSD-3-Clause GLOG_LICENSE_FILES = COPYING +GLOG_CONF_OPTS = \ + $(if $(BR2_TOOLCHAIN_HAS_THREADS),-DWITH_THREADS=ON, -DWITH_THREADS=OFF) ifeq ($(BR2_PACKAGE_GFLAGS),y) GLOG_DEPENDENCIES = gflags +GLOG_CONF_OPTS += -DWITH_GFLAGS=ON +else +GLOG_CONF_OPTS += -DWITH_GFLAGS=OFF endif -# glog can optionally use atomic __sync built-ins. However, its -# configure script only checks for the availability of the 4 bytes -# version, but the code also uses the 1 byte version. While this works -# on most architectures, it does not on architectures that implement -# only the 4 bytes version, such as Microblaze. So if the architecture -# does not implement the 1 byte version, we hint the configure script -# that atomic built-ins should not be used. -ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_1),) -GLOG_CONF_ENV += ac_cv___sync_val_compare_and_swap=no -endif - -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/buildroot/package/glorytun/glorytun.hash b/buildroot/package/glorytun/glorytun.hash index 59a5f09c0..30e8fd34a 100644 --- a/buildroot/package/glorytun/glorytun.hash +++ b/buildroot/package/glorytun/glorytun.hash @@ -1,2 +1,2 @@ -sha256 5e23afad4592d6af27ffd2cb3c826cf0ea1b5166a05ef1ae5c77fb4e465bb735 glorytun-0.0.99-mud.tar.gz -sha256 bd418f8ef7d62f2c89e3aa1e5dc41c7d7a6212eb1cdb4d39a26a5bd333e1b4a3 LICENSE +sha256 457552232c72d5fec7ba46382784685c2e8167d49d8182ab3afbfb2b0bce1b01 glorytun-0.2.2.tar.gz +sha256 02e492aa724ce3a64800ed9429cbabf811935ad1be95d667fae9187baa94e359 LICENSE diff --git a/buildroot/package/glorytun/glorytun.mk b/buildroot/package/glorytun/glorytun.mk index f6d87c260..9207388d7 100644 --- a/buildroot/package/glorytun/glorytun.mk +++ b/buildroot/package/glorytun/glorytun.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLORYTUN_VERSION = 0.0.99-mud +GLORYTUN_VERSION = 0.2.2 GLORYTUN_SITE = https://github.com/angt/glorytun/releases/download/v$(GLORYTUN_VERSION) GLORYTUN_DEPENDENCIES = libsodium host-pkgconf GLORYTUN_LICENSE = BSD-2-clause diff --git a/buildroot/package/glslsandbox-player/Config.in b/buildroot/package/glslsandbox-player/Config.in new file mode 100644 index 000000000..dc0d2c07f --- /dev/null +++ b/buildroot/package/glslsandbox-player/Config.in @@ -0,0 +1,112 @@ +config BR2_PACKAGE_GLSLSANDBOX_PLAYER + bool "glslsandbox-player" + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGLES + # Doesn't really depend on threads, but this makes sure we have at least + # one native windowing system available, and is good enough in practice. + depends on BR2_TOOLCHAIN_HAS_THREADS + help + GLSL Sandbox standalone player allow one to run and render + (most of) nice shaders available online on the + http://glslsandbox.com/ website, but without the need of an + Internet connection, a web browser or any of its + dependencies. Instead, the only requirement of + glslsandbox-player is a working EGL and GLESv2 libraries. + + This package is useful for stressing and testing GLES shader + compiler in GPU drivers. + + https://github.com/jolivain/glslsandbox-player + +if BR2_PACKAGE_GLSLSANDBOX_PLAYER + +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_PNG + bool "Enable PNG support" + select BR2_PACKAGE_LIBPNG + help + Enable PNG texture loading support + +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_TESTING + bool "Enable testing" + help + Generate and install test suite on target + +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS + bool "Install scripts" + depends on !BR2_PACKAGE_PYTHON # python3 + depends on !BR2_STATIC_LIBS # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on BR2_USE_MMU # bash, python3 + depends on BR2_USE_WCHAR # python3 + select BR2_PACKAGE_BASH # runtime + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS if BR2_PACKAGE_BUSYBOX # bash + select BR2_PACKAGE_COREUTILS # runtime (timeout) + select BR2_PACKAGE_LIBCURL_CURL # runtime + select BR2_PACKAGE_IMAGEMAGICK # runtime + select BR2_PACKAGE_JPEG # runtime + select BR2_PACKAGE_LIBCURL # runtime + select BR2_PACKAGE_LIBOPENSSL_BIN if BR2_PACKAGE_LIBOPENSSL # runtime + select BR2_PACKAGE_LIBRESSL_BIN if BR2_PACKAGE_LIBRESSL # runtime + select BR2_PACKAGE_MAKE # runtime + select BR2_PACKAGE_OPENSSL # runtime + select BR2_PACKAGE_PYTHON3 # runtime + help + Install additional helper scripts + +choice + prompt "Native windowing system" + default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_MAINLINE + default BR2_PACKAGE_GLSLSANDBOX_PLAYER_RPI if BR2_PACKAGE_RPI_USERLAND + default BR2_PACKAGE_GLSLSANDBOX_PLAYER_SDL2 if BR2_PACKAGE_SDL2_OPENGLES + default BR2_PACKAGE_GLSLSANDBOX_PLAYER_TISGX if BR2_PACKAGE_TI_SGX_UM + default BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL if BR2_PACKAGE_WAYLAND + default BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11 if BR2_PACKAGE_XORG7 + help + Select the native windowing system you wish to use. + +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS + bool "KMS/DRM/GBM" + depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + select BR2_PACKAGE_LIBDRM + +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI + bool "Allwinner ARM/Mali Frame Buffer" + depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_RPI + bool "RaspberryPI Frame Buffer" + depends on BR2_PACKAGE_RPI_USERLAND + +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SDL2 + bool "SDL2" + depends on BR2_PACKAGE_SDL2_OPENGLES + +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_TISGX + bool "TI/SGX Frame Buffer" + depends on BR2_PACKAGE_TI_SGX_UM + +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_VIVFB + bool "Vivante Frame Buffer" + depends on BR2_PACKAGE_IMX_GPU_VIV + +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL + bool "Wayland" + depends on BR2_PACKAGE_WAYLAND + +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11 + bool "X11" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + +endchoice + +if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI + bool "Wayland IVI shell support" +endif + +endif + +comment "glslsandbox-player needs a toolchain w/ threads and an openGL ES and EGL driver" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES diff --git a/buildroot/package/glslsandbox-player/glslsandbox-player.hash b/buildroot/package/glslsandbox-player/glslsandbox-player.hash new file mode 100644 index 000000000..66dac9354 --- /dev/null +++ b/buildroot/package/glslsandbox-player/glslsandbox-player.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 3458294a50c3d2fd54f806e46dd7bfba5f1e6aedadd6c396c76d70793419432b glslsandbox-player-2019.08.23.tar.gz +sha256 06a79395e8f3a4cc7ad068c6b59dfbe12c0efa4d27791e532345ceb1f41aea8a LICENSE diff --git a/buildroot/package/glslsandbox-player/glslsandbox-player.mk b/buildroot/package/glslsandbox-player/glslsandbox-player.mk new file mode 100644 index 000000000..5ace69d7d --- /dev/null +++ b/buildroot/package/glslsandbox-player/glslsandbox-player.mk @@ -0,0 +1,72 @@ +################################################################################ +# +# glslsandbox-player +# +################################################################################ + +GLSLSANDBOX_PLAYER_VERSION = 2019.08.23 +GLSLSANDBOX_PLAYER_SITE = $(call github,jolivain,glslsandbox-player,v$(GLSLSANDBOX_PLAYER_VERSION)) +GLSLSANDBOX_PLAYER_AUTORECONF = YES +GLSLSANDBOX_PLAYER_DEPENDENCIES = libegl libgles host-pkgconf + +GLSLSANDBOX_PLAYER_LICENSE = BSD-2-Clause +GLSLSANDBOX_PLAYER_LICENSE_FILES = LICENSE + +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_PNG),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += libpng +GLSLSANDBOX_PLAYER_CONF_OPTS += --with-libpng +else +GLSLSANDBOX_PLAYER_CONF_OPTS += --without-libpng +endif + +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_TESTING),y) +GLSLSANDBOX_PLAYER_CONF_OPTS += \ + --with-shader-list=shader-tests.list \ + --enable-testing \ + --enable-install-testsuite +else +GLSLSANDBOX_PLAYER_CONF_OPTS += \ + --with-shader-list=shader-local.list \ + --disable-testing +endif + +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS),y) +GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-install-scripts +else +GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-install-scripts +endif + +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS),y) +# gbm dependency is not needed, as it is normally packaged with +# libegl/libgles drivers. +GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm +GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=kms +else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-mainline +GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=mali +else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_RPI),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += rpi-userland +GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=rpi +else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_SDL2),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += sdl2 +GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=sdl2 +else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_TISGX),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += ti-sgx-um +GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=tisgx +else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_VIVFB),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += imx-gpu-viv +GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=vivfb +else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += wayland +GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=wl +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI),y) +GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-ivi +else +GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi +endif +else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11 +GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11 +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/gmp/gmp.hash b/buildroot/package/gmp/gmp.hash index f4793cd93..417b9d17b 100644 --- a/buildroot/package/gmp/gmp.hash +++ b/buildroot/package/gmp/gmp.hash @@ -1,2 +1,6 @@ # Locally calculated after checking pgp signature sha256 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 gmp-6.1.2.tar.xz + +# Locally calculated +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/buildroot/package/gmp/gmp.mk b/buildroot/package/gmp/gmp.mk index 7236e37bb..d124463a9 100644 --- a/buildroot/package/gmp/gmp.mk +++ b/buildroot/package/gmp/gmp.mk @@ -19,5 +19,11 @@ ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CP GMP_CONF_OPTS += --disable-assembly endif +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +GMP_CONF_OPTS += --enable-cxx +else +GMP_CONF_OPTS += --disable-cxx +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/gmpc/gmpc.hash b/buildroot/package/gmpc/gmpc.hash index cd39822c3..66de8b622 100644 --- a/buildroot/package/gmpc/gmpc.hash +++ b/buildroot/package/gmpc/gmpc.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c gmpc-11.8.16.tar.gz +sha256 a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c gmpc-11.8.16.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/gmrender-resurrect/Config.in b/buildroot/package/gmrender-resurrect/Config.in index db655ad7f..e7424e3b2 100644 --- a/buildroot/package/gmrender-resurrect/Config.in +++ b/buildroot/package/gmrender-resurrect/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_GMRENDER_RESURRECT depends on BR2_USE_MMU # gstreamer1 select BR2_PACKAGE_GSTREAMER1 select BR2_PACKAGE_GST1_PLUGINS_BASE # run-time only - select BR2_PACKAGE_LIBUPNP + select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP help UPnP (DLNA) media renderer based on gstreamer diff --git a/buildroot/package/gmrender-resurrect/gmrender-resurrect.hash b/buildroot/package/gmrender-resurrect/gmrender-resurrect.hash index 522bd2ae8..dc474be61 100644 --- a/buildroot/package/gmrender-resurrect/gmrender-resurrect.hash +++ b/buildroot/package/gmrender-resurrect/gmrender-resurrect.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 dcbde3601c3389e8dd21fe1842a92abf4cc06f6e3a375f1df63fdbf784a6650b gmrender-resurrect-33600ab663f181c4f4f5c48aba25bf961760a300.tar.gz +sha256 1f0cef76e4543879c9cd31cad73d6c4f778b965884c586405efcf63f2bdbb06f gmrender-resurrect-0.0.8.tar.gz +sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/buildroot/package/gmrender-resurrect/gmrender-resurrect.mk b/buildroot/package/gmrender-resurrect/gmrender-resurrect.mk index 2b6a56f0e..e25be3949 100644 --- a/buildroot/package/gmrender-resurrect/gmrender-resurrect.mk +++ b/buildroot/package/gmrender-resurrect/gmrender-resurrect.mk @@ -4,13 +4,15 @@ # ################################################################################ -GMRENDER_RESURRECT_VERSION = 33600ab663f181c4f4f5c48aba25bf961760a300 -GMRENDER_RESURRECT_SITE = $(call github,hzeller,gmrender-resurrect,$(GMRENDER_RESURRECT_VERSION)) +GMRENDER_RESURRECT_VERSION = 0.0.8 +GMRENDER_RESURRECT_SITE = $(call github,hzeller,gmrender-resurrect,v$(GMRENDER_RESURRECT_VERSION)) # Original distribution does not have default configure, # so we need to autoreconf: GMRENDER_RESURRECT_AUTORECONF = YES GMRENDER_RESURRECT_LICENSE = GPL-2.0+ GMRENDER_RESURRECT_LICENSE_FILES = COPYING -GMRENDER_RESURRECT_DEPENDENCIES = gstreamer1 libupnp +GMRENDER_RESURRECT_DEPENDENCIES = \ + gstreamer1 \ + $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18) $(eval $(autotools-package)) diff --git a/buildroot/package/gnu-efi/0002-Make.defaults-don-t-override-ARCH-when-cross-compili.patch b/buildroot/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch similarity index 100% rename from buildroot/package/gnu-efi/0002-Make.defaults-don-t-override-ARCH-when-cross-compili.patch rename to buildroot/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch diff --git a/buildroot/package/gnu-efi/0001-efilink-fix-build-with-gcc-4.8.patch b/buildroot/package/gnu-efi/0001-efilink-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 57c78c9bd..000000000 --- a/buildroot/package/gnu-efi/0001-efilink-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6335e5c697c57d8b5854b8202de3733bcb151ca6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 18 Jan 2019 22:05:37 +0100 -Subject: [PATCH] efilink: fix build with gcc 4.8 - -intptr_t is undefined without an include on stdint.h - -Fixes: - - http://autobuild.buildroot.org/results/a0ca37b5ed27af445344e3ac49dc87bb17512c50 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://sourceforge.net/p/gnu-efi/code/merge-requests/3] ---- - inc/efilink.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/inc/efilink.h b/inc/efilink.h -index cc5aa2d..b69a6fd 100644 ---- a/inc/efilink.h -+++ b/inc/efilink.h -@@ -1,6 +1,10 @@ - #ifndef _EFI_LINK_H - #define _EFI_LINK_H - -+#if defined(__GNUC__) -+#include -+#endif -+ - /*++ - - Copyright (c) 1998 Intel Corporation --- -2.14.1 - diff --git a/buildroot/package/gnu-efi/0002-Revert-efilink-fix-build-with-gcc-4.8.patch b/buildroot/package/gnu-efi/0002-Revert-efilink-fix-build-with-gcc-4.8.patch new file mode 100644 index 000000000..5a08c2425 --- /dev/null +++ b/buildroot/package/gnu-efi/0002-Revert-efilink-fix-build-with-gcc-4.8.patch @@ -0,0 +1,38 @@ +From 1f7b2e5bd6603b30202a66b6317a41e2be85742b Mon Sep 17 00:00:00 2001 +From: Esben Haabendal +Date: Tue, 26 Mar 2019 13:37:02 +0100 +Subject: [PATCH] Revert "efilink: fix build with gcc 4.8" + +This reverts commit 6335e5c697c57d8b5854b8202de3733bcb151ca6, as it breaks +gcc builds with '-nostdinc' flag. + +The fix in 1a53d8f88a452847b25f9689f9a08dbcf82c86e4 +(Fix for problem with undeclared intptr_t type), which is also merged +fixes the same problem, without causing breakage. + +Signed-off-by: Esben Haabendal +Signed-off-by: James Hilliard +[Upstream status: +https://sourceforge.net/p/gnu-efi/code/merge-requests/6/] +--- + inc/efilink.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/inc/efilink.h b/inc/efilink.h +index b69a6fd..cc5aa2d 100644 +--- a/inc/efilink.h ++++ b/inc/efilink.h +@@ -1,10 +1,6 @@ + #ifndef _EFI_LINK_H + #define _EFI_LINK_H + +-#if defined(__GNUC__) +-#include +-#endif +- + /*++ + + Copyright (c) 1998 Intel Corporation +-- +2.20.1 + diff --git a/buildroot/package/gnu-efi/gnu-efi.hash b/buildroot/package/gnu-efi/gnu-efi.hash index 9ac2b51fe..bf9792b29 100644 --- a/buildroot/package/gnu-efi/gnu-efi.hash +++ b/buildroot/package/gnu-efi/gnu-efi.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/gnu-efi/files -md5 32af17b917545a693e549af2439c4a99 gnu-efi-3.0.9.tar.bz2 -sha1 9b39e06206e63eba56d59a648a7e4f20aead6962 gnu-efi-3.0.9.tar.bz2 +md5 960a8379b6f95ee73d7778b70bf2a089 gnu-efi-3.0.10.tar.bz2 +sha1 a51b81eda97c0acbf3ac86123f298d3c0e396ce5 gnu-efi-3.0.10.tar.bz2 # Locally computed -sha256 6715ea7eae1c7e4fc5041034bd3f107ec2911962ed284a081e491646b12277f0 gnu-efi-3.0.9.tar.bz2 +sha256 f12082a3a5f0c3e38c67262a9f34245d139ac2cdfc0a0bdcf03c9b1f56fa4fed gnu-efi-3.0.10.tar.bz2 sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib diff --git a/buildroot/package/gnu-efi/gnu-efi.mk b/buildroot/package/gnu-efi/gnu-efi.mk index fe3c8ac34..69618029f 100644 --- a/buildroot/package/gnu-efi/gnu-efi.mk +++ b/buildroot/package/gnu-efi/gnu-efi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNU_EFI_VERSION = 3.0.9 +GNU_EFI_VERSION = 3.0.10 GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2 GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi GNU_EFI_INSTALL_STAGING = YES diff --git a/buildroot/package/gnupg/gnupg.hash b/buildroot/package/gnupg/gnupg.hash index 3bacdf656..f4b33bda6 100644 --- a/buildroot/package/gnupg/gnupg.hash +++ b/buildroot/package/gnupg/gnupg.hash @@ -1,3 +1,5 @@ # Locally computed based on signature # https://gnupg.org/ftp/gcrypt/gnupg/gnupg-1.4.23.tar.bz2.sig -sha256 c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba gnupg-1.4.23.tar.bz2 +sha256 c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba gnupg-1.4.23.tar.bz2 +# locally computed +sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/buildroot/package/gnupg/gnupg.mk b/buildroot/package/gnupg/gnupg.mk index bedcf6c98..617def884 100644 --- a/buildroot/package/gnupg/gnupg.mk +++ b/buildroot/package/gnupg/gnupg.mk @@ -79,5 +79,11 @@ endef GNUPG_POST_INSTALL_TARGET_HOOKS += GNUPG_REMOVE_GPGSPLIT endif +define GNUPG_FIXUP_GPG_ZIP + test -f $(TARGET_DIR)/usr/bin/gpg-zip && \ + $(SED) 's%^TAR=.*%TAR=/bin/tar%' $(TARGET_DIR)/usr/bin/gpg-zip +endef +GNUPG_POST_INSTALL_TARGET_HOOKS += GNUPG_FIXUP_GPG_ZIP + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/gnuplot/gnuplot.hash b/buildroot/package/gnuplot/gnuplot.hash index 1ea8c2852..1f3a08bb0 100644 --- a/buildroot/package/gnuplot/gnuplot.hash +++ b/buildroot/package/gnuplot/gnuplot.hash @@ -2,4 +2,5 @@ md5 8ec46520a86a61163a701b00404faf1a gnuplot-5.0.6.tar.gz sha1 f7b8948166b22e5bd658d5cf7579716f4821dba0 gnuplot-5.0.6.tar.gz # Locally computed -sha256 5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 gnuplot-5.0.6.tar.gz +sha256 5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 gnuplot-5.0.6.tar.gz +sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/buildroot/package/gnuradio/0001-add-boost-unit_test_framework-required-only-when-ENA.patch b/buildroot/package/gnuradio/0001-add-boost-unit_test_framework-required-only-when-ENA.patch new file mode 100644 index 000000000..e00ed226c --- /dev/null +++ b/buildroot/package/gnuradio/0001-add-boost-unit_test_framework-required-only-when-ENA.patch @@ -0,0 +1,92 @@ +From d6647680612276f2321cc6a83964e9264fca42a1 Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Wed, 15 Jan 2020 17:23:08 +0100 +Subject: [PATCH] add boost unit_test_framework required only when + ENABLE_TESTING=ON + +Signed-off-by: Gwenhael Goavec-Merou +--- + CMakeLists.txt | 7 +++---- + cmake/Modules/GnuradioConfig.cmake.in | 16 +++++++++++++--- + cmake/Modules/GrBoost.cmake | 5 ++++- + 3 files changed, 20 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a47a945f9..58add6136 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,6 +46,9 @@ GR_CHECK_BUILD_TYPE(${CMAKE_BUILD_TYPE}) + SET(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") + message(STATUS "Build type set to ${CMAKE_BUILD_TYPE}.") + ++include(GrComponent) ++GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING) ++ + # Set the version information here + SET(VERSION_MAJOR 3) + SET(VERSION_API 8) +@@ -377,10 +380,6 @@ GR_REGISTER_COMPONENT("python-support" ENABLE_PYTHON + SIX_FOUND + ) + +-GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING +- Boost_FOUND +-) +- + if(${CMAKE_BUILD_TYPE} STREQUAL "Coverage") + include(CodeCoverage) + setup_target_for_coverage(coverage "ctest || exit 0" coverage) +diff --git a/cmake/Modules/GnuradioConfig.cmake.in b/cmake/Modules/GnuradioConfig.cmake.in +index 1e5ad20ec..f59e74b8b 100644 +--- a/cmake/Modules/GnuradioConfig.cmake.in ++++ b/cmake/Modules/GnuradioConfig.cmake.in +@@ -24,15 +24,25 @@ list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}") + + find_dependency(LOG4CPP) + find_dependency(MPLIB) +-find_dependency(Boost "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@.@Boost_SUBMINOR_VERSION@" COMPONENTS ++ ++set(BOOST_REQUIRED_COMPONENTS + date_time + program_options + filesystem + system + regex + thread +- unit_test_framework +- ) ++) ++ ++if (NOT ENABLE_TESTING) ++ set(ENABLE_TESTING @ENABLE_TESTING@ CACHE BOOL "Enable testing support") ++endif() ++ ++if(ENABLE_TESTING) ++ list(APPEND BOOST_REQUIRED_COMPONENTS unit_test_framework) ++endif(ENABLE_TESTING) ++ ++find_dependency(Boost "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@.@Boost_SUBMINOR_VERSION@" COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) + find_dependency(Volk) + set(ENABLE_PYTHON @ENABLE_PYTHON@ CACHE BOOL "Enable Python & SWIG") + if(${ENABLE_PYTHON}) +diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake +index cd4b120f7..670e61054 100644 +--- a/cmake/Modules/GrBoost.cmake ++++ b/cmake/Modules/GrBoost.cmake +@@ -33,9 +33,12 @@ set(BOOST_REQUIRED_COMPONENTS + system + regex + thread +- unit_test_framework + ) + ++if(ENABLE_TESTING) ++ list(APPEND BOOST_REQUIRED_COMPONENTS unit_test_framework) ++endif(ENABLE_TESTING) ++ + if(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") + list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix + endif(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") +-- +2.24.1 + diff --git a/buildroot/package/gnuradio/0002-lib-CMakeLists-fix-neon-version-detection.patch b/buildroot/package/gnuradio/0002-lib-CMakeLists-fix-neon-version-detection.patch new file mode 100644 index 000000000..aa160ea41 --- /dev/null +++ b/buildroot/package/gnuradio/0002-lib-CMakeLists-fix-neon-version-detection.patch @@ -0,0 +1,50 @@ +From 08f335450b9809acdbe88d894449ccd6d4a9ec75 Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Wed, 15 Jan 2020 17:27:15 +0100 +Subject: [PATCH] lib/CMakeLists: fix neon version detection + +Signed-off-by: Gwenhael Goavec-Merou +--- + volk/lib/CMakeLists.txt | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index f969f2e..b85a22b 100644 +--- a/volk/lib/CMakeLists.txt ++++ b/volk/lib/CMakeLists.txt +@@ -144,7 +144,7 @@ set(HAVE_AVX_CVTPI32_PS 0) + if(CPU_IS_x86) + # check to see if the compiler/linker works with xgetb instruction + if (NOT MSVC) +- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv.c "unsigned long long _xgetbv(unsigned int index) { unsigned int eax, edx; __asm__ __volatile__(\"xgetbv\" : \"=a\"(eax), \"=d\"(edx) : \"c\"(index)); return ((unsigned long long)edx << 32) | eax; } int main (void) { (void) _xgetbv(0); return (0); }") ++ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv.c "#include \n unsigned long long _xgetbv(unsigned int index) { unsigned int eax, edx; __VOLK_ASM __volatile__(\"xgetbv\" : \"=a\"(eax), \"=d\"(edx) : \"c\"(index)); return ((unsigned long long)edx << 32) | eax; } int main (void) { (void) _xgetbv(0); return (0); }") + else (NOT MSVC) + #MSVC defines an intrinsic + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv.c "#include \n #include \n int main() { int avxSupported = 0; \n#if (_MSC_FULL_VER >= 160040219) \nint cpuInfo[4]; __cpuid(cpuInfo, 1);\nif ((cpuInfo[2] & (1 << 27) || 0) && (cpuInfo[2] & (1 << 28) || 0)) \n{\nunsigned long long xcrFeatureMask = _xgetbv(_XCR_XFEATURE_ENABLED_MASK);\n avxSupported = (xcrFeatureMask & 0x6) == 6;}\n#endif \n return 1- avxSupported; }") +@@ -263,17 +263,17 @@ check_c_source_compiles("#include \nint main(){ uint8_t *dest; uint8 + neon_compile_result) + + if(neon_compile_result) +- check_c_source_compiles("int main(){asm volatile(\"vrev32.8 q0, q0\");}" ++ check_c_source_compiles("#include \n int main(){__VOLK_ASM volatile(\"vrev32.8 q0, q0\");}" + have_neonv7_result ) +- check_c_source_compiles("int main(){asm volatile(\"sub v1.4s,v1.4s,v1.4s\");}" ++ check_c_source_compiles("#include \n int main(){__VOLK_ASM volatile(\"sub v1.4s,v1.4s,v1.4s\");}" + have_neonv8_result ) + +- if (have_neonv7_result) +- OVERRULE_ARCH(neonv8 "CPU is armv7") ++ if (NOT have_neonv7_result) ++ OVERRULE_ARCH(neonv7 "Compiler doesn't support neonv7") + endif() + +- if (have_neonv8_result) +- OVERRULE_ARCH(neonv7 "CPU is armv8") ++ if (NOT have_neonv8_result) ++ OVERRULE_ARCH(neonv8 "Compiler doesn't support neonv8") + endif() + else(neon_compile_result) + OVERRULE_ARCH(neon "Compiler doesn't support NEON") +-- +2.24.1 + diff --git a/buildroot/package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch b/buildroot/package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch new file mode 100644 index 000000000..532bebcf2 --- /dev/null +++ b/buildroot/package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch @@ -0,0 +1,39 @@ +From f643bc12100c67288adda3699a9e61d6a66fb529 Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Fri, 7 Feb 2020 16:49:30 +0100 +Subject: [PATCH] gr-digital:glfsr.h: drop boost/cstdint.hpp and use cstdint + +gr-digital/glfsr.h include boost/cstdint.hpp to have uintxx_t. +These types are in boost namespace but nor using namespace xxx, nor boost:: are used. +The result is : +In file included from /home/buildroot/autobuild/instance-0/output-1/build/gnuradio-3.8.0.0/gr-digital/lib/glfsr.cc:23: +/home/buildroot/autobuild/instance-0/output-1/build/gnuradio-3.8.0.0/gr-digital/lib/../include/gnuradio/digital/glfsr.h:42:5: error: 'uint32_t' does not name a type; did you mean 'u_int32_t'? +uint32_t d_shift_register; +^~~~~~~~ +u_int32_t + +Since Gnuradio policy is Less boost == better and C++11 is used, use cstdint +instead of boost/cstdint.hpp. + +[backported from 475e4a156b516c089175afb998acdc80b740b437] +Signed-off-by: Gwenhael Goavec-Merou +--- + gr-digital/include/gnuradio/digital/glfsr.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gr-digital/include/gnuradio/digital/glfsr.h b/gr-digital/include/gnuradio/digital/glfsr.h +index 0b5141f1f..1003bcd01 100644 +--- a/gr-digital/include/gnuradio/digital/glfsr.h ++++ b/gr-digital/include/gnuradio/digital/glfsr.h +@@ -24,7 +24,7 @@ + #define INCLUDED_DIGITAL_GLFSR_H + + #include +-#include ++#include + + namespace gr { + namespace digital { +-- +2.24.1 + diff --git a/buildroot/package/gnuradio/Config.in b/buildroot/package/gnuradio/Config.in index 80f6a1c53..6d438bcd6 100644 --- a/buildroot/package/gnuradio/Config.in +++ b/buildroot/package/gnuradio/Config.in @@ -1,9 +1,11 @@ comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "gnuradio needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + config BR2_PACKAGE_GNURADIO bool "gnuradio" depends on BR2_INSTALL_LIBSTDCPP @@ -11,14 +13,17 @@ config BR2_PACKAGE_GNURADIO depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # use fork() depends on BR2_USE_WCHAR # boost - depends on !BR2_PACKAGE_PYTHON3 + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS select BR2_PACKAGE_BOOST_REGEX select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD + select BR2_PACKAGE_LOG4CPP + select BR2_PACKAGE_GMP help GNU Radio is a free & open-source software development toolkit that provides signal processing blocks to implement @@ -56,19 +61,14 @@ config BR2_PACKAGE_GNURADIO_FEC help FEC signal processing blocks -config BR2_PACKAGE_GNURADIO_LOG - bool "gr-log support" - select BR2_PACKAGE_LOG4CPP - help - Enable logger component - config BR2_PACKAGE_GNURADIO_PYTHON bool "python support" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_BOOST_PYTHON select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime help Enable python component diff --git a/buildroot/package/gnuradio/gnuradio.hash b/buildroot/package/gnuradio/gnuradio.hash index 884f7ae75..7c3811077 100644 --- a/buildroot/package/gnuradio/gnuradio.hash +++ b/buildroot/package/gnuradio/gnuradio.hash @@ -1,5 +1,3 @@ -# From http://gnuradio.org/releases/gnuradio/sha256sums -sha256 1e07ce40fa3c3eede1fb54e320dad8a221a3c01de341e9cef2d7b265ed06a6e9 gnuradio-3.7.13.3.tar.gz - -# Hash for license file: +# Locally computed +sha256 3a9c90111f22f2f6f30450731dc671ad28ce824fc1a7bc8ea0783da9b95a7092 gnuradio-3.8.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gnuradio/gnuradio.mk b/buildroot/package/gnuradio/gnuradio.mk index ef9723cb0..41d4619f7 100644 --- a/buildroot/package/gnuradio/gnuradio.mk +++ b/buildroot/package/gnuradio/gnuradio.mk @@ -4,8 +4,8 @@ # ################################################################################ -GNURADIO_VERSION = 3.7.13.3 -GNURADIO_SITE = http://gnuradio.org/releases/gnuradio +GNURADIO_VERSION = 3.8.0.0 +GNURADIO_SITE = https://gnuradio.org/releases/gnuradio GNURADIO_LICENSE = GPL-3.0+ GNURADIO_LICENSE_FILES = COPYING @@ -13,19 +13,20 @@ GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO # host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \ host-python-mako \ host-python-six \ host-swig \ - boost - -ifeq ($(BR2_PACKAGE_ORC),y) -GNURADIO_DEPENDENCIES += orc -endif + boost \ + log4cpp \ + gmp GNURADIO_CONF_OPTS = \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ -DENABLE_DEFAULT=OFF \ -DENABLE_VOLK=ON \ -DENABLE_GNURADIO_RUNTIME=ON \ + -DENABLE_TESTING=OFF \ -DENABLE_GR_QTGUI=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND @@ -37,20 +38,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) GNURADIO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif -# Yes, this is silly, because -march is already known by the compiler -# with the internal toolchain, and passed by the external wrapper for -# external toolchains. Nonetheless, gnuradio does some matching on the -# CFLAGS to decide whether to build the NEON functions or not, and -# wants to see the string 'armv7' in the CFLAGS. -ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_ARM_CPU_HAS_NEON),yy) -GNURADIO_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -march=armv7-a" -endif - -# As soon as -mfpu=neon is supported by the compiler, gnuradio will try -# to use it. But having NEON support in the compiler doesn't necessarily -# mean we have NEON support in our CPU. -ifeq ($(BR2_ARM_CPU_HAS_NEON),) -GNURADIO_CONF_OPTS += -Dhave_mfpu_neon=0 +ifeq ($(BR2_PACKAGE_ORC),y) +GNURADIO_DEPENDENCIES += orc +GNURADIO_CONF_OPTS += -DENABLE_ORC=ON +else +GNURADIO_CONF_OPTS += -DENABLE_ORC=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) @@ -115,24 +107,17 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif -ifeq ($(BR2_PACKAGE_GNURADIO_LOG),y) -GNURADIO_DEPENDENCIES += log4cpp -GNURADIO_CONF_OPTS += -DENABLE_GR_LOG=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_LOG=OFF -endif - ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) -GNURADIO_DEPENDENCIES += python +GNURADIO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_PAGER),y) -GNURADIO_CONF_OPTS += -DENABLE_PAGER=ON +GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=ON else -GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF +GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y) diff --git a/buildroot/package/gnutls/Config.in b/buildroot/package/gnutls/Config.in index 7e8dcc1e4..15b930b6b 100644 --- a/buildroot/package/gnutls/Config.in +++ b/buildroot/package/gnutls/Config.in @@ -16,6 +16,11 @@ config BR2_PACKAGE_GNUTLS if BR2_PACKAGE_GNUTLS +config BR2_PACKAGE_GNUTLS_OPENSSL + bool "OpenSSL compatibility library" + help + Install OpenSSL compatibility library. + config BR2_PACKAGE_GNUTLS_TOOLS bool "install tools" select BR2_PACKAGE_ARGP_STANDALONE \ diff --git a/buildroot/package/gnutls/gnutls.hash b/buildroot/package/gnutls/gnutls.hash index 8c0e0d69d..99279bfb6 100644 --- a/buildroot/package/gnutls/gnutls.hash +++ b/buildroot/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.7.1.tar.xz.sig -sha256 881b26409ecd8ea4c514fd3fbdb6fae5fab422ca7b71116260e263940a4bbbad gnutls-3.6.7.1.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.13.tar.xz.sig +sha256 32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38 gnutls-3.6.13.tar.xz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/buildroot/package/gnutls/gnutls.mk b/buildroot/package/gnutls/gnutls.mk index f2e654fc1..a1dfce62a 100644 --- a/buildroot/package/gnutls/gnutls.mk +++ b/buildroot/package/gnutls/gnutls.mk @@ -5,11 +5,17 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.6 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).7.1 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).13 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) -GNUTLS_LICENSE = LGPL-2.1+ (core library), GPL-3.0+ (gnutls-openssl library) -GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER +GNUTLS_LICENSE = LGPL-2.1+ (core library) +GNUTLS_LICENSE_FILES = doc/COPYING.LESSER + +ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y) +GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library) +GNUTLS_LICENSE_FILES += doc/COPYING +endif + GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre GNUTLS_CONF_OPTS = \ --disable-doc \ @@ -20,6 +26,7 @@ GNUTLS_CONF_OPTS = \ --enable-openssl-compatibility \ --with-librt-prefix=$(STAGING_DIR) \ --without-tpm \ + $(if $(BR2_PACKAGE_GNUTLS_OPENSSL),--enable,--disable)-openssl-compatibility \ $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \ ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \ diff --git a/buildroot/package/go-bootstrap/go-bootstrap.hash b/buildroot/package/go-bootstrap/go-bootstrap.hash index 8938266f2..03fd7d571 100644 --- a/buildroot/package/go-bootstrap/go-bootstrap.hash +++ b/buildroot/package/go-bootstrap/go-bootstrap.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 go1.4.3.src.tar.gz +sha256 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 go1.4.3.src.tar.gz +sha256 dd26a7abddd02e2d0aba97805b31f248ef7835d9e10da289b22e3b8ab78b324d LICENSE diff --git a/buildroot/package/go/0002-Fix-CVE-2019-16276.patch b/buildroot/package/go/0002-Fix-CVE-2019-16276.patch deleted file mode 100644 index c3fe163c3..000000000 --- a/buildroot/package/go/0002-Fix-CVE-2019-16276.patch +++ /dev/null @@ -1,123 +0,0 @@ -From: "Dr. Tobias Quathamer" -Date: Thu, 26 Sep 2019 11:46:46 +0200 -Subject: Fix CVE-2019-16276 - -Cherry-picked from upstream: -https://github.com/golang/go/commit/6e6f4aaf70c8b1cc81e65a26332aa9409de03ad8 - -[Upstream: https://sources.debian.org/src/golang-1.11/1.11.6-1+deb10u2/debian/patches/0007-Fix-CVE-2019-16276.patch] -Signed-off-by: Peter Korsgaard ---- - src/net/http/serve_test.go | 4 ++++ - src/net/http/transport_test.go | 27 +++++++++++++++++++++++++++ - src/net/textproto/reader.go | 10 ++-------- - src/net/textproto/reader_test.go | 13 ++++++------- - 4 files changed, 39 insertions(+), 15 deletions(-) - -diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go -index a438541..18edf98 100644 ---- a/src/net/http/serve_test.go -+++ b/src/net/http/serve_test.go -@@ -4725,6 +4725,10 @@ func TestServerValidatesHeaders(t *testing.T) { - {"foo\xffbar: foo\r\n", 400}, // binary in header - {"foo\x00bar: foo\r\n", 400}, // binary in header - {"Foo: " + strings.Repeat("x", 1<<21) + "\r\n", 431}, // header too large -+ // Spaces between the header key and colon are not allowed. -+ // See RFC 7230, Section 3.2.4. -+ {"Foo : bar\r\n", 400}, -+ {"Foo\t: bar\r\n", 400}, - - {"foo: foo foo\r\n", 200}, // LWS space is okay - {"foo: foo\tfoo\r\n", 200}, // LWS tab is okay -diff --git a/src/net/http/transport_test.go b/src/net/http/transport_test.go -index b2036df..dff940e 100644 ---- a/src/net/http/transport_test.go -+++ b/src/net/http/transport_test.go -@@ -4838,3 +4838,30 @@ func TestClientTimeoutKillsConn_AfterHeaders(t *testing.T) { - t.Fatal("timeout") - } - } -+ -+func TestInvalidHeaderResponse(t *testing.T) { -+ setParallel(t) -+ defer afterTest(t) -+ cst := newClientServerTest(t, h1Mode, HandlerFunc(func(w ResponseWriter, r *Request) { -+ conn, buf, _ := w.(Hijacker).Hijack() -+ buf.Write([]byte("HTTP/1.1 200 OK\r\n" + -+ "Date: Wed, 30 Aug 2017 19:09:27 GMT\r\n" + -+ "Content-Type: text/html; charset=utf-8\r\n" + -+ "Content-Length: 0\r\n" + -+ "Foo : bar\r\n\r\n")) -+ buf.Flush() -+ conn.Close() -+ })) -+ defer cst.close() -+ res, err := cst.c.Get(cst.ts.URL) -+ if err != nil { -+ t.Fatal(err) -+ } -+ defer res.Body.Close() -+ if v := res.Header.Get("Foo"); v != "" { -+ t.Errorf(`unexpected "Foo" header: %q`, v) -+ } -+ if v := res.Header.Get("Foo "); v != "bar" { -+ t.Errorf(`bad "Foo " header value: %q, want %q`, v, "bar") -+ } -+} -diff --git a/src/net/textproto/reader.go b/src/net/textproto/reader.go -index feb464b..6a37b2d 100644 ---- a/src/net/textproto/reader.go -+++ b/src/net/textproto/reader.go -@@ -492,18 +492,12 @@ func (r *Reader) ReadMIMEHeader() (MIMEHeader, error) { - return m, err - } - -- // Key ends at first colon; should not have trailing spaces -- // but they appear in the wild, violating specs, so we remove -- // them if present. -+ // Key ends at first colon. - i := bytes.IndexByte(kv, ':') - if i < 0 { - return m, ProtocolError("malformed MIME header line: " + string(kv)) - } -- endKey := i -- for endKey > 0 && kv[endKey-1] == ' ' { -- endKey-- -- } -- key := canonicalMIMEHeaderKey(kv[:endKey]) -+ key := canonicalMIMEHeaderKey(kv[:i]) - - // As per RFC 7230 field-name is a token, tokens consist of one or more chars. - // We could return a ProtocolError here, but better to be liberal in what we -diff --git a/src/net/textproto/reader_test.go b/src/net/textproto/reader_test.go -index 7cff7b4..3af77d2 100644 ---- a/src/net/textproto/reader_test.go -+++ b/src/net/textproto/reader_test.go -@@ -188,11 +188,10 @@ func TestLargeReadMIMEHeader(t *testing.T) { - } - } - --// Test that we read slightly-bogus MIME headers seen in the wild, --// with spaces before colons, and spaces in keys. -+// TestReadMIMEHeaderNonCompliant checks that we don't normalize headers -+// with spaces before colons, and accept spaces in keys. - func TestReadMIMEHeaderNonCompliant(t *testing.T) { -- // Invalid HTTP response header as sent by an Axis security -- // camera: (this is handled by IE, Firefox, Chrome, curl, etc.) -+ // These invalid headers will be rejected by net/http according to RFC 7230. - r := reader("Foo: bar\r\n" + - "Content-Language: en\r\n" + - "SID : 0\r\n" + -@@ -202,9 +201,9 @@ func TestReadMIMEHeaderNonCompliant(t *testing.T) { - want := MIMEHeader{ - "Foo": {"bar"}, - "Content-Language": {"en"}, -- "Sid": {"0"}, -- "Audio Mode": {"None"}, -- "Privilege": {"127"}, -+ "SID ": {"0"}, -+ "Audio Mode ": {"None"}, -+ "Privilege ": {"127"}, - } - if !reflect.DeepEqual(m, want) || err != nil { - t.Fatalf("ReadMIMEHeader =\n%v, %v; want:\n%v", m, err, want) diff --git a/buildroot/package/go/0003-Fix-CVE-2019-17596.patch b/buildroot/package/go/0003-Fix-CVE-2019-17596.patch deleted file mode 100644 index 33a5baad5..000000000 --- a/buildroot/package/go/0003-Fix-CVE-2019-17596.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: "Dr. Tobias Quathamer" -Date: Sat, 19 Oct 2019 14:03:22 +0200 -Subject: Fix CVE-2019-17596 - -Cherry-picked from upstream: -https://github.com/golang/go/commit/2017d88dbc096381d4f348d2fb08bfb3c2b7ed73 - -[Upstream: https://sources.debian.org/src/golang-1.11/1.11.6-1+deb10u3/debian/patches/0008-Fix-CVE-2019-17596.patch] -Signed-off-by: Peter Korsgaard ---- - src/crypto/dsa/dsa.go | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/crypto/dsa/dsa.go b/src/crypto/dsa/dsa.go -index 575314b..2fc4f1f 100644 ---- a/src/crypto/dsa/dsa.go -+++ b/src/crypto/dsa/dsa.go -@@ -279,6 +279,9 @@ func Verify(pub *PublicKey, hash []byte, r, s *big.Int) bool { - } - - w := new(big.Int).ModInverse(s, pub.Q) -+ if w == nil { -+ return false -+ } - - n := pub.Q.BitLen() - if n&7 != 0 { diff --git a/buildroot/package/go/Config.in.host b/buildroot/package/go/Config.in.host index f619ca007..3f16dbaec 100644 --- a/buildroot/package/go/Config.in.host +++ b/buildroot/package/go/Config.in.host @@ -1,4 +1,5 @@ -config BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS +# Target go packages should depend on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_20006 @@ -10,10 +11,16 @@ config BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS # MIPS R6 support in Go has not yet been developed. depends on !BR2_MIPS_CPU_MIPS64R6 -config BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS +config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # Go doesn't support CGO linking on MIPS64x platforms # See: https://github.com/karalabe/xgo/issues/46 depends on !BR2_mips64 && !BR2_mips64el + +# Host go packages should depend on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS +config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS diff --git a/buildroot/package/go/go.hash b/buildroot/package/go/go.hash index 2b6248e92..dc966e85d 100644 --- a/buildroot/package/go/go.hash +++ b/buildroot/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 5032095fd3f641cafcce164f551e5ae873785ce7b07ca7c143aecd18f7ba4076 go1.11.13.src.tar.gz +sha256 b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34 go1.13.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/buildroot/package/go/go.mk b/buildroot/package/go/go.mk index f510440a8..376c3db7f 100644 --- a/buildroot/package/go/go.mk +++ b/buildroot/package/go/go.mk @@ -4,13 +4,20 @@ # ################################################################################ -GO_VERSION = 1.11.13 +GO_VERSION = 1.13.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE +HOST_GO_DEPENDENCIES = host-go-bootstrap +HOST_GO_HOST_CACHE = $(HOST_DIR)/usr/share/host-go-cache +HOST_GO_ROOT = $(HOST_DIR)/lib/go +HOST_GO_TARGET_CACHE = $(HOST_DIR)/usr/share/go-cache + +ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) + ifeq ($(BR2_arm),y) GO_GOARCH = arm ifeq ($(BR2_ARM_CPU_ARMV5),y) @@ -36,11 +43,6 @@ else ifeq ($(BR2_mips64el),y) GO_GOARCH = mips64le endif -HOST_GO_DEPENDENCIES = host-go-bootstrap -HOST_GO_HOST_CACHE = $(HOST_DIR)/usr/share/host-go-cache -HOST_GO_ROOT = $(HOST_DIR)/lib/go -HOST_GO_TARGET_CACHE = $(HOST_DIR)/usr/share/go-cache - # For the convienience of target packages. HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH) HOST_GO_TARGET_ENV = \ @@ -62,6 +64,19 @@ else HOST_GO_CGO_ENABLED = 0 endif +HOST_GO_CROSS_ENV = \ + CC_FOR_TARGET="$(TARGET_CC)" \ + CXX_FOR_TARGET="$(TARGET_CXX)" \ + GOARCH=$(GO_GOARCH) \ + $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ + GO_ASSUME_CROSSCOMPILING=1 + +else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +# host-go can still be used to build packages for the host. No need to set all +# the arch stuff since we will not be cross-compiling. +HOST_GO_CGO_ENABLED = 1 +endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + # The go build system is not compatible with ccache, so use # HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. HOST_GO_MAKE_ENV = \ @@ -71,21 +86,15 @@ HOST_GO_MAKE_ENV = \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ - GOARCH=$(GO_GOARCH) \ - $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ GOOS=linux \ CC=$(HOSTCC_NOCCACHE) \ CXX=$(HOSTCXX_NOCCACHE) \ - GO_ASSUME_CROSSCOMPILING=1 - -HOST_GO_TARGET_CC = \ - CC_FOR_TARGET="$(TARGET_CC)" \ - CXX_FOR_TARGET="$(TARGET_CXX)" + CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ + $(HOST_GO_CROSS_ENV) define HOST_GO_BUILD_CMDS cd $(@D)/src && \ - $(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ - ./make.bash $(if $(VERBOSE),-v) + $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) endef define HOST_GO_INSTALL_CMDS diff --git a/buildroot/package/google-breakpad/0003-src-client-linux-handler-exception_handler.cc-rename.patch b/buildroot/package/google-breakpad/0003-src-client-linux-handler-exception_handler.cc-rename.patch new file mode 100644 index 000000000..579e7f345 --- /dev/null +++ b/buildroot/package/google-breakpad/0003-src-client-linux-handler-exception_handler.cc-rename.patch @@ -0,0 +1,59 @@ +From 2fa414c8655c421e7eb0bb1719928babb0ecf7c6 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 26 Dec 2019 22:21:33 +0100 +Subject: [PATCH] src/client/linux/handler/exception_handler.cc: rename tgkill + to BreakpadTgkill() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since glibc 2.30, a tgkill() function was added in the C library, and +its definition obviously conflicts with the internal definition of +google-breakpad, causing build failures: + +src/client/linux/handler/exception_handler.cc:109:12: error: ‘int tgkill(pid_t, pid_t, int)’ was declared ‘extern’ and later ‘static’ [-fpermissive] + 109 | static int tgkill(pid_t tgid, pid_t tid, int sig) { + | ^~~~~~ +In file included from /usr/include/signal.h:374, + from ./src/client/linux/handler/exception_handler.h:33, + from src/client/linux/handler/exception_handler.cc:66: +/usr/include/bits/signal_ext.h:29:12: note: previous declaration of ‘int tgkill(__pid_t, __pid_t, int)’ + 29 | extern int tgkill (__pid_t __tgid, __pid_t __tid, int __signal); + | ^~~~~~ + +Upstream google-breakpad simply dropped the use of the internal +tgkill() in commit +https://chromium.googlesource.com/breakpad/breakpad/+/7e3c165000d44fa153a3270870ed500bc8bbb461. However, +this is not realistic for Buildroot, since we do support old systems +where the system C library will not necessarily provide tgkill(). + +Signed-off-by: Thomas Petazzoni +--- + src/client/linux/handler/exception_handler.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc +index b63f973b..b4c279b8 100644 +--- a/src/client/linux/handler/exception_handler.cc ++++ b/src/client/linux/handler/exception_handler.cc +@@ -106,7 +106,7 @@ + #endif + + // A wrapper for the tgkill syscall: send a signal to a specific thread. +-static int tgkill(pid_t tgid, pid_t tid, int sig) { ++static int BreakpadTgkill(pid_t tgid, pid_t tid, int sig) { + return syscall(__NR_tgkill, tgid, tid, sig); + return 0; + } +@@ -387,7 +387,7 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) { + // In order to retrigger it, we have to queue a new signal by calling + // kill() ourselves. The special case (si_pid == 0 && sig == SIGABRT) is + // due to the kernel sending a SIGABRT from a user request via SysRQ. +- if (tgkill(getpid(), syscall(__NR_gettid), sig) < 0) { ++ if (BreakpadTgkill(getpid(), syscall(__NR_gettid), sig) < 0) { + // If we failed to kill ourselves (e.g. because a sandbox disallows us + // to do so), we instead resort to terminating our process. This will + // result in an incorrect exit code. +-- +2.24.1 + diff --git a/buildroot/package/google-breakpad/Config.in b/buildroot/package/google-breakpad/Config.in index 91ec9ce30..07c49996d 100644 --- a/buildroot/package/google-breakpad/Config.in +++ b/buildroot/package/google-breakpad/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS config BR2_PACKAGE_GOOGLE_BREAKPAD bool "google-breakpad" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS @@ -41,4 +40,4 @@ comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/google-breakpad/google-breakpad.hash b/buildroot/package/google-breakpad/google-breakpad.hash index 79e8d08b2..81715ec57 100644 --- a/buildroot/package/google-breakpad/google-breakpad.hash +++ b/buildroot/package/google-breakpad/google-breakpad.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 6f444233e88957c30cc2d5497ee9d72d104122ce2c25a7ef7f6be3af1b3f7353 google-breakpad-7515ab13768c7edc09f0f2ec2354dc6c928239a6.tar.gz +sha256 6f444233e88957c30cc2d5497ee9d72d104122ce2c25a7ef7f6be3af1b3f7353 google-breakpad-7515ab13768c7edc09f0f2ec2354dc6c928239a6.tar.gz +sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 LICENSE diff --git a/buildroot/package/google-material-design-icons/google-material-design-icons.hash b/buildroot/package/google-material-design-icons/google-material-design-icons.hash index 9a6633649..535eca810 100644 --- a/buildroot/package/google-material-design-icons/google-material-design-icons.hash +++ b/buildroot/package/google-material-design-icons/google-material-design-icons.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 769547061a51f81623bf5174767c08fc587fd6946339592fbd6cd0dd45f56b4c 2.2.3.tar.gz +sha256 8ae9438818c26e4873b91d8c6ad620526c011e27e125677f13031eda903f007c LICENSE diff --git a/buildroot/package/gperf/gperf.hash b/buildroot/package/gperf/gperf.hash index 370235c62..3d8aafbdc 100644 --- a/buildroot/package/gperf/gperf.hash +++ b/buildroot/package/gperf/gperf.hash @@ -1,2 +1,7 @@ # Locally calculated after checking pgp signature -sha256 767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e gperf-3.0.4.tar.gz +# https://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz.sig +# with key 93C08C88471097CD +sha256 588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 gperf-3.1.tar.gz + +# Locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gperf/gperf.mk b/buildroot/package/gperf/gperf.mk index 2a6192a48..4b928a0eb 100644 --- a/buildroot/package/gperf/gperf.mk +++ b/buildroot/package/gperf/gperf.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPERF_VERSION = 3.0.4 +GPERF_VERSION = 3.1 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf GPERF_LICENSE = GPL-3.0+ GPERF_LICENSE_FILES = COPYING diff --git a/buildroot/package/gpm/gpm.hash b/buildroot/package/gpm/gpm.hash index 7bbc43dd4..fac893183 100644 --- a/buildroot/package/gpm/gpm.hash +++ b/buildroot/package/gpm/gpm.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c gpm-1.20.7.tar.lzma +sha256 1b2a567f289f66a143c56353e7b3d4fa5862514a5e3c5cfdf8b02ee5e5aaa953 COPYING diff --git a/buildroot/package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch b/buildroot/package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch deleted file mode 100644 index 77badb31c..000000000 --- a/buildroot/package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 21a752e827bc9e14de4b4c26aef4d0db7403a5b7 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 9 Oct 2018 15:22:46 +0300 -Subject: [PATCH] driver_greis: fix build with reconfigure disabled - -Unhide the definition of greis_parse_input and greis_event_hook since -they are used unconditionally. - -Fixes the following build failure: - -driver_greis.c:969:25: error: 'greis_parse_input' undeclared here (not in a function); did you mean 'generic_parse_input'? - .parse_packet = greis_parse_input, - ^~~~~~~~~~~~~~~~~ - generic_parse_input -driver_greis.c:973:25: error: 'greis_event_hook' undeclared here (not in a function) - .event_hook = greis_event_hook, - ^~~~~~~~~~~~~~~~ - -Cc: Gregory Fong -Signed-off-by: Baruch Siach ---- -Upstream status: http://lists.nongnu.org/archive/html/gpsd-dev/2018-10/msg00012.html - - driver_greis.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/driver_greis.c b/driver_greis.c -index 9eb148fc76cd..222bd9daf020 100644 ---- a/driver_greis.c -+++ b/driver_greis.c -@@ -797,7 +797,6 @@ static ssize_t greis_control_send(struct gps_device_t *session, - } - #endif /* CONTROLSEND_ENABLE */ - --#ifdef RECONFIGURE_ENABLE - static void greis_event_hook(struct gps_device_t *session, event_t event) - { - if (session->context->readonly) -@@ -870,6 +869,7 @@ static gps_mask_t greis_parse_input(struct gps_device_t *session) - return 0; - } - -+#ifdef RECONFIGURE_ENABLE - /** - * Set port operating mode, speed, parity, stopbits etc. here. - * Note: parity is passed as 'N'/'E'/'O', but you should program --- -2.19.1 - diff --git a/buildroot/package/gpsd/Config.in b/buildroot/package/gpsd/Config.in index e951c0154..ea0dea3ba 100644 --- a/buildroot/package/gpsd/Config.in +++ b/buildroot/package/gpsd/Config.in @@ -18,7 +18,7 @@ menuconfig BR2_PACKAGE_GPSD The D-Bus interface is included if dbus-glib is enabled. - http://www.catb.org/gpsd/ + https://gpsd.gitlab.io/gpsd if BR2_PACKAGE_GPSD @@ -44,12 +44,8 @@ config BR2_PACKAGE_GPSD_PROFILING comment "profiling support not available with uClibc-based toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC -config BR2_PACKAGE_GPSD_NTP_SHM - bool "NTP time hinting support" - config BR2_PACKAGE_GPSD_PPS bool "PPS time syncing support" - select BR2_PACKAGE_GPSD_NTP_SHM config BR2_PACKAGE_GPSD_USER bool "GPSD privilege revocation user" @@ -222,6 +218,11 @@ config BR2_PACKAGE_GPSD_SIRF help SiRF binary support +config BR2_PACKAGE_GPSD_SKYTRAQ + bool "Skytraq" + help + Skytraq support + config BR2_PACKAGE_GPSD_SUPERSTAR2 bool "SuperStarII" help diff --git a/buildroot/package/gpsd/gpsd.hash b/buildroot/package/gpsd/gpsd.hash index fe594ea28..40f2b7c99 100644 --- a/buildroot/package/gpsd/gpsd.hash +++ b/buildroot/package/gpsd/gpsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 48521f5158f5fda4c88a6f75e8bfc1ee67e999e3fc095e4a06cb8c2af56712f4 gpsd-3.18.tar.gz -sha256 71ff85d18bf063954cfc4251678d0e772223e21f80febbd99d5524c90f73f832 COPYING +sha256 27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39 gpsd-3.19.tar.gz +sha256 13ba6fe5b2f41f03b854f9ac5f271e116d5ed55890cc20f5fe44dcfa0dc5958b COPYING diff --git a/buildroot/package/gpsd/gpsd.mk b/buildroot/package/gpsd/gpsd.mk index bc9fcf27c..49de4b256 100644 --- a/buildroot/package/gpsd/gpsd.mk +++ b/buildroot/package/gpsd/gpsd.mk @@ -4,13 +4,13 @@ # ################################################################################ -GPSD_VERSION = 3.18 +GPSD_VERSION = 3.19 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd -GPSD_LICENSE = BSD-3-Clause +GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING GPSD_INSTALL_STAGING = YES -GPSD_DEPENDENCIES = host-scons host-pkgconf +GPSD_DEPENDENCIES = host-python3 host-scons host-pkgconf GPSD_LDFLAGS = $(TARGET_LDFLAGS) GPSD_CFLAGS = $(TARGET_CFLAGS) @@ -18,13 +18,15 @@ GPSD_CFLAGS = $(TARGET_CFLAGS) GPSD_SCONS_ENV = $(TARGET_CONFIGURE_OPTS) GPSD_SCONS_OPTS = \ - arch=$(ARCH)\ + arch=$(ARCH) \ manbuild=no \ - prefix=/usr\ - sysroot=$(STAGING_DIR)\ - strip=no\ + prefix=/usr \ + sysroot=$(STAGING_DIR) \ + strip=no \ python=no \ - qt=no + qt=no \ + ntpshm=yes \ + systemd=$(if $(BR2_INIT_SYSTEMD),yes,no) ifeq ($(BR2_PACKAGE_NCURSES),y) GPSD_DEPENDENCIES += ncurses @@ -42,10 +44,7 @@ else GPSD_SCONS_OPTS += libgpsmm=no endif -# prevents from triggering GCC ICE -# A bug was reported to the gcc bug tracker: -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68485 -ifeq ($(BR2_microblaze),y) +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) GPSD_CFLAGS += -O0 endif @@ -57,8 +56,8 @@ GPSD_SCONS_OPTS += usb=no endif # If bluetooth is available build it before so the package can use it -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -GPSD_DEPENDENCIES += bluez_utils +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) +GPSD_DEPENDENCIES += bluez5_utils else GPSD_SCONS_OPTS += bluez=no endif @@ -144,6 +143,9 @@ endif ifneq ($(BR2_PACKAGE_GPSD_SIRF),y) GPSD_SCONS_OPTS += sirf=no endif +ifneq ($(BR2_PACKAGE_GPSD_SKYTRAQ),y) +GPSD_SCONS_OPTS += skytraq=no +endif ifneq ($(BR2_PACKAGE_GPSD_SUPERSTAR2),y) GPSD_SCONS_OPTS += superstar2=no endif @@ -161,9 +163,6 @@ GPSD_SCONS_OPTS += ublox=no endif # Features -ifneq ($(BR2_PACKAGE_GPSD_NTP_SHM),y) -GPSD_SCONS_OPTS += ntpshm=no -endif ifneq ($(BR2_PACKAGE_GPSD_PPS),y) GPSD_SCONS_OPTS += pps=no endif @@ -206,7 +205,7 @@ GPSD_SCONS_ENV += LDFLAGS="$(GPSD_LDFLAGS)" CFLAGS="$(GPSD_CFLAGS)" define GPSD_BUILD_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ - $(SCONS) \ + $(HOST_DIR)/bin/python3 $(SCONS) \ $(GPSD_SCONS_OPTS)) endef @@ -214,9 +213,9 @@ define GPSD_INSTALL_TARGET_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ DESTDIR=$(TARGET_DIR) \ - $(SCONS) \ + $(HOST_DIR)/bin/python3 $(SCONS) \ $(GPSD_SCONS_OPTS) \ - install) + $(if $(BR2_PACKAGE_HAS_UDEV),udev-install,install)) endef define GPSD_INSTALL_INIT_SYSV @@ -224,25 +223,27 @@ define GPSD_INSTALL_INIT_SYSV $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd endef +# systemd unit files are installed automatically, but need to update the +# /usr/local path references in the provided files to /usr. +define GPSD_INSTALL_INIT_SYSTEMD + $(SED) 's%/usr/local%/usr%' \ + $(TARGET_DIR)/usr/lib/systemd/system/gpsd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/gpsdctl@.service +endef + define GPSD_INSTALL_STAGING_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ DESTDIR=$(STAGING_DIR) \ - $(SCONS) \ + $(HOST_DIR)/bin/python3 $(SCONS) \ $(GPSD_SCONS_OPTS) \ install) endef -# After installing the udev rule, make it writable so that this +# After the udev rule is installed, make it writable so that this # package can be re-built/re-installed. ifeq ($(BR2_PACKAGE_HAS_UDEV),y) define GPSD_INSTALL_UDEV_RULES - (cd $(@D); \ - $(GPSD_SCONS_ENV) \ - DESTDIR=$(TARGET_DIR) \ - $(SCONS) \ - $(GPSD_SCONS_OPTS) \ - udev-install) chmod u+w $(TARGET_DIR)/lib/udev/rules.d/25-gpsd.rules endef diff --git a/buildroot/package/gptfdisk/gptfdisk.hash b/buildroot/package/gptfdisk/gptfdisk.hash index d55797c05..0e52d9917 100644 --- a/buildroot/package/gptfdisk/gptfdisk.hash +++ b/buildroot/package/gptfdisk/gptfdisk.hash @@ -1,5 +1,6 @@ -# 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 +# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.4/ +md5 5ecc3c44913bb6b53d3708d1ac7ac295 gptfdisk-1.0.4.tar.gz +sha1 4c2d60bedd4eac1014727e3b126de96966205410 gptfdisk-1.0.4.tar.gz # Locally computed -sha256 89fd5aec35c409d610a36cb49c65b442058565ed84042f767bba614b8fc91b5c gptfdisk-1.0.3.tar.gz +sha256 b663391a6876f19a3cd901d862423a16e2b5ceaa2f4a3b9bb681e64b9c7ba78d gptfdisk-1.0.4.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/gptfdisk/gptfdisk.mk b/buildroot/package/gptfdisk/gptfdisk.mk index b669e22aa..afe4a7288 100644 --- a/buildroot/package/gptfdisk/gptfdisk.mk +++ b/buildroot/package/gptfdisk/gptfdisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPTFDISK_VERSION = 1.0.3 +GPTFDISK_VERSION = 1.0.4 GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk GPTFDISK_LICENSE = GPL-2.0+ GPTFDISK_LICENSE_FILES = COPYING diff --git a/buildroot/package/gqrx/Config.in b/buildroot/package/gqrx/Config.in index b0d7e7b9f..d873c6a4d 100644 --- a/buildroot/package/gqrx/Config.in +++ b/buildroot/package/gqrx/Config.in @@ -1,6 +1,5 @@ comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library" depends on BR2_USE_MMU # gnuradio - depends on !BR2_PACKAGE_PYTHON3 # gnuradio depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || !BR2_STATIC_LIBS @@ -8,6 +7,9 @@ comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library" comment "gqrx needs qt5" depends on !BR2_PACKAGE_QT5 +comment "gqrx needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + config BR2_PACKAGE_GQRX bool "gqrx" depends on BR2_USE_MMU # gnuradio @@ -17,7 +19,7 @@ config BR2_PACKAGE_GQRX depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_QT5 - depends on !BR2_PACKAGE_PYTHON3 + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # gnuradio select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS select BR2_PACKAGE_BOOST_SYSTEM diff --git a/buildroot/package/gqrx/gqrx.hash b/buildroot/package/gqrx/gqrx.hash index 7c1fc9852..8f5f2ca43 100644 --- a/buildroot/package/gqrx/gqrx.hash +++ b/buildroot/package/gqrx/gqrx.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 c4e836c552dc99bf383ca84b2ddc0c67e3d05b073676318e2a011bcd463303ef gqrx-v2.11.4.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK +sha256 7c626db9f22c3edbe30299a08f7f549b4f30dd83c883595468029a27c3e8fda9 gqrx-2.12.1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK diff --git a/buildroot/package/gqrx/gqrx.mk b/buildroot/package/gqrx/gqrx.mk index d93c07d10..b3438ac1f 100644 --- a/buildroot/package/gqrx/gqrx.mk +++ b/buildroot/package/gqrx/gqrx.mk @@ -4,8 +4,8 @@ # ################################################################################ -GQRX_VERSION = v2.11.4 -GQRX_SITE = $(call github,csete,gqrx,$(GQRX_VERSION)) +GQRX_VERSION = 2.12.1 +GQRX_SITE = $(call github,csete,gqrx,v$(GQRX_VERSION)) GQRX_LICENSE = GPL-3.0+, Apache-2.0 GQRX_LICENSE_FILES = COPYING LICENSE-CTK GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg diff --git a/buildroot/package/gqview/gqview.hash b/buildroot/package/gqview/gqview.hash index eb6549713..3d1330d4f 100644 --- a/buildroot/package/gqview/gqview.hash +++ b/buildroot/package/gqview/gqview.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 12fea494e607a69eff31cdca13d306ef1b0b3b7850be0f8b236f267d8f2e9546 gqview-2.1.5.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/gr-osmosdr/Config.in b/buildroot/package/gr-osmosdr/Config.in index f26380371..1e80137f3 100644 --- a/buildroot/package/gr-osmosdr/Config.in +++ b/buildroot/package/gr-osmosdr/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_GR_OSMOSDR bool "gr-osmosdr" depends on BR2_PACKAGE_GNURADIO select BR2_PACKAGE_GNURADIO_BLOCKS + select BR2_PACKAGE_GNURADIO_FFT + select BR2_PACKAGE_GNURADIO_FILTER help GNU Radio block for interfacing with various radio hardware diff --git a/buildroot/package/gr-osmosdr/gr-osmosdr.hash b/buildroot/package/gr-osmosdr/gr-osmosdr.hash index 337f3ef86..4a1e56aba 100644 --- a/buildroot/package/gr-osmosdr/gr-osmosdr.hash +++ b/buildroot/package/gr-osmosdr/gr-osmosdr.hash @@ -1,2 +1,3 @@ # Locally calculated: -sha256 274960cd32bc8a7216eeed8967bf078efd6123332808b405ec42c24a7e426b7c gr-osmosdr-164a09fc11cec2d8b15b38e8b512fa542d6cecc7.tar.gz +sha256 48f92dc02b86ce6d299b35db249f2c8099bb45326c979b6225a020a4188e4204 gr-osmosdr-46698a67e7e06419eefaf45c95129c0c12669045.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gr-osmosdr/gr-osmosdr.mk b/buildroot/package/gr-osmosdr/gr-osmosdr.mk index 9ed4ad311..fcc817fe8 100644 --- a/buildroot/package/gr-osmosdr/gr-osmosdr.mk +++ b/buildroot/package/gr-osmosdr/gr-osmosdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -GR_OSMOSDR_VERSION = 164a09fc11cec2d8b15b38e8b512fa542d6cecc7 +GR_OSMOSDR_VERSION = 46698a67e7e06419eefaf45c95129c0c12669045 GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,$(GR_OSMOSDR_VERSION)) GR_OSMOSDR_LICENSE = GPL-3.0+ GR_OSMOSDR_LICENSE_FILES = COPYING @@ -14,7 +14,9 @@ GR_OSMOSDR_SUPPORTS_IN_SOURCE_BUILD = NO GR_OSMOSDR_DEPENDENCIES = gnuradio host-python-cheetah -GR_OSMOSDR_CONF_OPTS = -DENABLE_DEFAULT=OFF +GR_OSMOSDR_CONF_OPTS = \ + -DENABLE_DEFAULT=OFF \ + -DENABLE_DOXYGEN=OFF # For third-party blocks, the gr-osmosdr libraries are mandatory at # compile time. @@ -22,7 +24,7 @@ GR_OSMOSDR_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_GR_OSMOSDR_PYTHON),y) GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=ON -GR_OSMOSDR_DEPENDENCIES += python +GR_OSMOSDR_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) else GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=OFF endif diff --git a/buildroot/package/granite/granite.hash b/buildroot/package/granite/granite.hash index b9ed2874c..48f62604f 100644 --- a/buildroot/package/granite/granite.hash +++ b/buildroot/package/granite/granite.hash @@ -1,4 +1,6 @@ # From https://launchpad.net/granite/0.4/0.4.1/+download/granite-0.4.1.tar.xz/+md5 md5 b1002c0488bb9ade0ef89730c4f84393 granite-0.4.1.tar.xz # Calculated based on the hash above -sha256 8bb411523e6cd5685c928dbfe08893892189cedf9fad5f537aa76182032cf09c granite-0.4.1.tar.xz +sha256 8bb411523e6cd5685c928dbfe08893892189cedf9fad5f537aa76182032cf09c granite-0.4.1.tar.xz +# Locally computed +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/buildroot/package/grantlee/0001-Remove-vestigial-ansi-flag.patch b/buildroot/package/grantlee/0001-Remove-vestigial-ansi-flag.patch new file mode 100644 index 000000000..250463c2f --- /dev/null +++ b/buildroot/package/grantlee/0001-Remove-vestigial-ansi-flag.patch @@ -0,0 +1,27 @@ +From c989fcf192d01d26866faf6405a28ba4fdce64c3 Mon Sep 17 00:00:00 2001 +From: Stephen Kelly +Date: Sun, 21 Jul 2019 16:00:41 +0100 +Subject: [PATCH] Remove vestigial -ansi flag + +This causes the compiler to not operate in C++11 mode, meaning that +headers such as issue errors. +[Retrieved from: +https://github.com/steveire/grantlee/commit/c989fcf192d01d26866faf6405a28ba4fdce64c3] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d51110..9172213 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,7 +59,7 @@ endif() + + if (CMAKE_COMPILER_IS_GNUCXX) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ") + + if (CMAKE_BUILD_TYPE MATCHES TestCocoon) + # Needed on 64 bit diff --git a/buildroot/package/grantlee/grantlee.hash b/buildroot/package/grantlee/grantlee.hash index cdff77804..2be423bd9 100644 --- a/buildroot/package/grantlee/grantlee.hash +++ b/buildroot/package/grantlee/grantlee.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature sha256 ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478 grantlee-5.1.0.tar.gz + +# Hash for license file +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/buildroot/package/graphite2/graphite2.hash b/buildroot/package/graphite2/graphite2.hash index ecf082b08..e0c1aae67 100644 --- a/buildroot/package/graphite2/graphite2.hash +++ b/buildroot/package/graphite2/graphite2.hash @@ -2,4 +2,5 @@ md5 b39d5ed21195f8b709bcee548c87e2b5 graphite2-1.3.10.tgz sha1 668f3bce96fc02d90ea875b401ed36b2e8957d2f graphite2-1.3.10.tgz # Locally computed -sha256 90fde3b2f9ea95d68ffb19278d07d9b8a7efa5ba0e413bebcea802ce05cda1ae graphite2-1.3.10.tgz +sha256 90fde3b2f9ea95d68ffb19278d07d9b8a7efa5ba0e413bebcea802ce05cda1ae graphite2-1.3.10.tgz +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE diff --git a/buildroot/package/grep/Config.in b/buildroot/package/grep/Config.in index 5b0471b4c..665c05c05 100644 --- a/buildroot/package/grep/Config.in +++ b/buildroot/package/grep/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_GREP help The GNU regular expression matcher. + egrep/fgrep aliases need /bin/sh to be available. + http://www.gnu.org/software/grep/grep.html comment "grep needs a toolchain w/ wchar" diff --git a/buildroot/package/grep/grep.mk b/buildroot/package/grep/grep.mk index 96685b027..cc80553eb 100644 --- a/buildroot/package/grep/grep.mk +++ b/buildroot/package/grep/grep.mk @@ -10,6 +10,25 @@ GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPL-3.0+ GREP_LICENSE_FILES = COPYING GREP_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +# install into /bin like busybox grep +GREP_CONF_OPTS = --exec-prefix=/ + +ifeq ($(BR2_SYSTEM_BIN_SH_NONE),y) + +define GREP_REMOVE_ALIAS + $(RM) $(TARGET_DIR)/bin/[fe]grep +endef +GREP_POST_INSTALL_TARGET_HOOKS += GREP_REMOVE_ALIAS + +else + +# ensure egrep/fgrep shell wrappers use #!/bin/sh +define GREP_FIXUP_SHEBANG + $(SED) 's/bash$$/sh/' $(TARGET_DIR)/bin/[fe]grep +endef +GREP_POST_INSTALL_TARGET_HOOKS += GREP_FIXUP_SHEBANG + +endif # link with iconv if enabled ifeq ($(BR2_PACKAGE_LIBICONV),y) diff --git a/buildroot/package/grpc/0001-target-build-using-host-plugin.patch b/buildroot/package/grpc/0001-target-build-using-host-plugin.patch index 5993987bc..2da657762 100644 --- a/buildroot/package/grpc/0001-target-build-using-host-plugin.patch +++ b/buildroot/package/grpc/0001-target-build-using-host-plugin.patch @@ -20,7 +20,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index fc76cf5..7a22b08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -13108,6 +13108,18 @@ target_link_libraries(grpc_cli +@@ -13420,6 +13420,18 @@ target_link_libraries(grpc_cli endif (gRPC_BUILD_TESTS) if (gRPC_BUILD_CODEGEN) @@ -39,7 +39,7 @@ index fc76cf5..7a22b08 100644 add_executable(grpc_cpp_plugin src/compiler/cpp_plugin.cc ) -@@ -13143,6 +13155,7 @@ if (gRPC_INSTALL) +@@ -13457,6 +13469,7 @@ if (gRPC_INSTALL) ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ) endif() diff --git a/buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch b/buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch index 766f75817..86586d850 100644 --- a/buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch +++ b/buildroot/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch @@ -1,4 +1,4 @@ -From 0aeefca28104f86f14b511feee8d5711f2e8bcb5 Mon Sep 17 00:00:00 2001 +From 0dfb289a3b362b082ac3608d887e42f09dadc0d2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 31 Dec 2018 16:22:07 +0100 Subject: [PATCH] Properly detect the availability of pthread_setname_np() @@ -17,10 +17,10 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc76cf50da..8dd457fb1a 100644 +index 89e834b..c7bd2ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -94,6 +94,12 @@ endif() +@@ -97,6 +97,12 @@ endif() set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) @@ -30,14 +30,14 @@ index fc76cf50da..8dd457fb1a 100644 + add_definitions(-DHAVE_PTHREAD_SETNAME_NP) +endif () + - add_definitions(-DPB_FIELD_16BIT) - if (MSVC) + include(cmake/msvc_static_runtime.cmake) + add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h -index b2028a6305..dc89e6ed57 100644 +index 031c0c3..a29a9dc 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h -@@ -173,7 +173,9 @@ +@@ -181,7 +181,9 @@ #endif /* _LP64 */ #ifdef __GLIBC__ #define GPR_POSIX_CRASH_HANDLER 1 @@ -48,5 +48,5 @@ index b2028a6305..dc89e6ed57 100644 #else /* musl libc */ #define GPR_MUSL_LIBC_COMPAT 1 -- -2.20.1 +2.14.4 diff --git a/buildroot/package/grpc/0003-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch b/buildroot/package/grpc/0003-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch new file mode 100644 index 000000000..ad6480447 --- /dev/null +++ b/buildroot/package/grpc/0003-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch @@ -0,0 +1,34 @@ +From be030314805137cd63b46ea6eaa702b608669910 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 2 Jun 2019 17:45:47 +0200 +Subject: [PATCH] wrap_memcpy.cc: add GPR_DISABLE_WRAPPED_MEMCPY + +Add GPR_DISABLE_WRAPPED_MEMCPY to allow the user to disable wrapped +memcpy. This will fix build on x86_64 on musl/uclibc without changing +the cpu behavior. + +Fixes: + - http://autobuild.buildroot.org/results/20d6f2489a4e291a53bd514da66105eb607e1014 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/grpc/grpc/pull/19207] +--- + src/core/lib/gpr/wrap_memcpy.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/lib/gpr/wrap_memcpy.cc b/src/core/lib/gpr/wrap_memcpy.cc +index 9b8608e056..38b76acf95 100644 +--- a/src/core/lib/gpr/wrap_memcpy.cc ++++ b/src/core/lib/gpr/wrap_memcpy.cc +@@ -28,7 +28,7 @@ + + extern "C" { + #ifdef __linux__ +-#if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT) ++#if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT) && !defined(GPR_DISABLE_WRAPPED_MEMCPY) + __asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); + void* __wrap_memcpy(void* destination, const void* source, size_t num) { + return memcpy(destination, source, num); +-- +2.20.1 + diff --git a/buildroot/package/grpc/Config.in b/buildroot/package/grpc/Config.in index 2765d0fb4..43f446d8d 100644 --- a/buildroot/package/grpc/Config.in +++ b/buildroot/package/grpc/Config.in @@ -1,9 +1,8 @@ config BR2_PACKAGE_GRPC bool "grpc" - depends on BR2_INSTALL_LIBSTDCPP # protobuf + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_HOST_GCC_AT_LEAST_4_8 # protobuf depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf depends on !BR2_STATIC_LIBS # protobuf depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC @@ -17,9 +16,8 @@ config BR2_PACKAGE_GRPC http://github.com/grpc/grpc -comment "grpc needs a toolchain w/ C++, threads, dynamic library, host and target gcc >= 4.8" +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_4_8 \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/buildroot/package/grpc/grpc.hash b/buildroot/package/grpc/grpc.hash index 9e5011125..5201f7210 100644 --- a/buildroot/package/grpc/grpc.hash +++ b/buildroot/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a5342629fe1b689eceb3be4d4f167b04c70a84b9d61cf8b555e968bc500bdb5a grpc-v1.16.1.tar.gz +sha256 ffbe61269160ea745e487f79b0fd06b6edd3d50c6d9123f053b5634737cf2f69 grpc-1.25.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/grpc/grpc.mk b/buildroot/package/grpc/grpc.mk index 6c804429f..39f612379 100644 --- a/buildroot/package/grpc/grpc.mk +++ b/buildroot/package/grpc/grpc.mk @@ -4,8 +4,8 @@ # ################################################################################ -GRPC_VERSION = v1.16.1 -GRPC_SITE = $(call github,grpc,grpc,$(GRPC_VERSION)) +GRPC_VERSION = 1.25.0 +GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0 GRPC_LICENSE_FILES = LICENSE @@ -15,6 +15,10 @@ GRPC_INSTALL_STAGING = YES GRPC_DEPENDENCIES = c-ares host-grpc openssl protobuf zlib HOST_GRPC_DEPENDENCIES = host-c-ares host-openssl host-protobuf host-zlib +# gRPC_CARES_PROVIDER=package won't work because it requires c-ares to have +# installed a cmake config file, but buildroot uses c-ares' autotools build, +# which doesn't do this. These CARES settings trick the gRPC cmake code into +# not looking for c-ares at all and yet still linking with the library. GRPC_CONF_OPTS = \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ @@ -29,10 +33,36 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif +GRPC_CFLAGS = $(TARGET_CFLAGS) +GRPC_CXXFLAGS = $(TARGET_CXXFLAGS) + +# Set GPR_DISABLE_WRAPPED_MEMCPY otherwise build will fail on x86_64 with uclibc +# because grpc tries to link with memcpy@GLIBC_2.2.5 +ifeq ($(BR2_x86_64):$(BR2_TOOLCHAIN_USES_GLIBC),y:) +GRPC_CFLAGS += -DGPR_DISABLE_WRAPPED_MEMCPY +GRPC_CXXFLAGS += -DGPR_DISABLE_WRAPPED_MEMCPY +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +GRPC_CFLAGS += -O0 +GRPC_CXXFLAGS += -O0 +endif + +# Toolchains older than gcc5 will fail to compile with -0s due to: +# error: failure memory model cannot be stronger than success memory model for +# '__atomic_compare_exchange', so we use -O2 in these cases +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5):$(BR2_OPTIMIZE_S),:y) +GRPC_CFLAGS += -O2 +GRPC_CXXFLAGS += -O2 +endif + +GRPC_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(GRPC_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(GRPC_CXXFLAGS)" + HOST_GRPC_CONF_OPTS = \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ - -DgRPC_CARES_PROVIDER=none \ -DgRPC_PROTOBUF_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package diff --git a/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash b/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash index 05ec7a418..c37b7377d 100644 --- a/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash +++ b/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash @@ -1,2 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/3.22/gsettings-desktop-schemas-3.22.0.sha256sum -sha256 0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1 gsettings-desktop-schemas-3.22.0.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/3.33/gsettings-desktop-schemas-3.33.1.sha256sum +sha256 bd337f13955856140fdbd3073c56d4adca20333f8bdac41e429c3dca4730cdff gsettings-desktop-schemas-3.33.1.tar.xz + +# Hash for license file +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk b/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk index 420ceda81..98d16745b 100644 --- a/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk +++ b/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk @@ -4,13 +4,14 @@ # ################################################################################ -GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR = 3.22 -GSETTINGS_DESKTOP_SCHEMAS_VERSION = $(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR).0 +GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR = 3.33 +GSETTINGS_DESKTOP_SCHEMAS_VERSION = $(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR).1 GSETTINGS_DESKTOP_SCHEMAS_SOURCE = gsettings-desktop-schemas-$(GSETTINGS_DESKTOP_SCHEMAS_VERSION).tar.xz GSETTINGS_DESKTOP_SCHEMAS_SITE = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR) GSETTINGS_DESKTOP_SCHEMAS_INSTALL_STAGING = YES -GSETTINGS_DESKTOP_SCHEMAS_DEPENDENCIES = host-intltool host-pkgconf libglib2 +GSETTINGS_DESKTOP_SCHEMAS_DEPENDENCIES = host-pkgconf libglib2 GSETTINGS_DESKTOP_SCHEMAS_LICENSE = LGPL-2.1+ GSETTINGS_DESKTOP_SCHEMAS_LICENSE_FILES = COPYING +GSETTINGS_DESKTOP_SCHEMAS_CONF_OPTS = -Dintrospection=false -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/gsl/gsl.hash b/buildroot/package/gsl/gsl.hash index f7b1d5338..8a979d6e8 100644 --- a/buildroot/package/gsl/gsl.hash +++ b/buildroot/package/gsl/gsl.hash @@ -1,2 +1,3 @@ # Locally calculated after checking pgp signature -sha256 562500b789cd599b3a4f88547a7a3280538ab2ff4939504c8b4ac4ca25feadfb gsl-2.3.tar.gz +sha256 0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d gsl-2.5.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gsl/gsl.mk b/buildroot/package/gsl/gsl.mk index 41379f433..d3c764787 100644 --- a/buildroot/package/gsl/gsl.mk +++ b/buildroot/package/gsl/gsl.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSL_VERSION = 2.3 +GSL_VERSION = 2.5 GSL_SITE = $(BR2_GNU_MIRROR)/gsl GSL_INSTALL_STAGING = YES GSL_LICENSE = GPL-3.0 diff --git a/buildroot/package/gssdp/gssdp.hash b/buildroot/package/gssdp/gssdp.hash index acf6b3ab2..b389d0205 100644 --- a/buildroot/package/gssdp/gssdp.hash +++ b/buildroot/package/gssdp/gssdp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.0/gssdp-1.0.2.sha256sum: -sha256 a1e17c09c7e1a185b0bd84fd6ff3794045a3cd729b707c23e422ff66471535dc gssdp-1.0.2.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.0/gssdp-1.0.3.sha256sum: +sha256 211387a62bc1d99821dd0333d873a781320287f5436f91e58b2ca145b378be41 gssdp-1.0.3.tar.xz # Hash for license file: sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/gssdp/gssdp.mk b/buildroot/package/gssdp/gssdp.mk index 2ce1f9b0b..071ad0010 100644 --- a/buildroot/package/gssdp/gssdp.mk +++ b/buildroot/package/gssdp/gssdp.mk @@ -5,12 +5,23 @@ ################################################################################ GSSDP_VERSION_MAJOR = 1.0 -GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).2 +GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).3 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR) GSSDP_LICENSE = LGPL-2.0+ GSSDP_LICENSE_FILES = COPYING GSSDP_INSTALL_STAGING = YES GSSDP_DEPENDENCIES = host-pkgconf libglib2 libsoup +GSSDP_CONF_OPTS = \ + -Dexamples=false \ + -Dintrospection=false \ + -Dvapi=false -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_LIBGTK3),y) +GSSDP_DEPENDENCIES += libgtk3 +GSSDP_CONF_OPTS += -Dsniffer=true +else +GSSDP_CONF_OPTS += -Dsniffer=false +endif + +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer/Config.in b/buildroot/package/gstreamer/Config.in deleted file mode 100644 index e922437f2..000000000 --- a/buildroot/package/gstreamer/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -# Gstreamer 0.10.x & Plugins -source "package/gstreamer/gstreamer/Config.in" - -if BR2_PACKAGE_GSTREAMER -source "package/gstreamer/gst-plugins-base/Config.in" -source "package/gstreamer/gst-plugins-good/Config.in" -source "package/gstreamer/gst-plugins-bad/Config.in" -source "package/gstreamer/gst-plugins-ugly/Config.in" -source "package/gstreamer/gst-ffmpeg/Config.in" -source "package/gstreamer/gst-fsl-plugins/Config.in" -source "package/gstreamer/gst-omapfb/Config.in" -source "package/gstreamer/gst-plugin-x170/Config.in" -endif diff --git a/buildroot/package/gstreamer/gst-ffmpeg/0001-gcc47.patch b/buildroot/package/gstreamer/gst-ffmpeg/0001-gcc47.patch deleted file mode 100644 index 16744abae..000000000 --- a/buildroot/package/gstreamer/gst-ffmpeg/0001-gcc47.patch +++ /dev/null @@ -1,65 +0,0 @@ -gst-ffmpeg libav: Fixes compiling gst-ffmpeg with gcc-4.7 - -Fetch from: http://www.slackware.com/~alien/slackbuilds/gst-plugins-ffmpeg/build/gst-ffmpeg-0.10.13_gcc47.patch - -Signed-off-by: Bernd Kuhls ---- -Submitted By: Andrew Benton -Date: 2012-06-15 -Initial Package Version: 0.10.13 -Upstream Status: From upstream -Origin: -http://git.videolan.org/?p=ffmpeg.git;a=patch;h=5f654897e325349dacf2546674e0510bb72ecb50 - -Description: Fixes compiling gst-ffmpeg with gcc-4.7 - -libavcodec/x86/h264_qpel_mmx.c: Assembler messages: -libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' -make[5]: *** [libavcodec/x86/dsputil_mmx.o] Error 1 - -Index: gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c -=================================================================== ---- gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700 -+++ gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700 -@@ -398,7 +398,7 @@ - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : "memory"\ - );\ - src += 4-(h+5)*srcStride;\ -@@ -446,7 +446,7 @@ - QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ - "2: \n\t"\ - : "+a"(src)\ -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ - : "memory"\ - );\ - tmp += 4;\ -@@ -823,7 +823,7 @@ - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ - "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ - "memory"\ -@@ -878,7 +878,7 @@ - QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) - "2: \n\t" - : "+a"(src) -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", - "%xmm4", "%xmm5", "%xmm6", "%xmm7",) - "memory" diff --git a/buildroot/package/gstreamer/gst-ffmpeg/0002-arm-avoid-using-the-movw-instruction.patch b/buildroot/package/gstreamer/gst-ffmpeg/0002-arm-avoid-using-the-movw-instruction.patch deleted file mode 100644 index 288dc3d6e..000000000 --- a/buildroot/package/gstreamer/gst-ffmpeg/0002-arm-avoid-using-the-movw-instruction.patch +++ /dev/null @@ -1,41 +0,0 @@ -Date: Mon, 1 Aug 2011 20:21:04 +0300 -Subject: [libavcodec] arm: Avoid using the movw instruction needlessly -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -This fixes building for ARM11 without Thumb2. - -Signed-off-by: Martin Storsjö - -[Arnout: backported to gst-ffmpeg, from ffmpeg 9a83adaf3] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S b/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S -index d3058ff..b6aee86 100644 ---- a/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S -+++ b/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S -@@ -37,7 +37,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 - ldrb r10, [r4], #1 - 1: - ldrsh r9, [r0], #2 @ mask[band] -- movw r8, #0x1fe0 -+ mov r8, #0xff0 - sub r9, r9, r12 @ - snr_offset - mov r11, r10 - ldrb r10, [r4], #1 @ band_start_tab[band++] -@@ -44,7 +44,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 - subs r9, r9, r5 @ - floor - movlt r9, #0 - cmp r10, r3 @ - end -- and r9, r9, r8 @ & 0x1fe0 -+ and r9, r9, r8, lsl #1 @ & 0x1fe0 - subgt r8, r3, r11 - suble r8, r10, r11 - add r9, r9, r5 @ + floor => m --- -1.7.10.4 - diff --git a/buildroot/package/gstreamer/gst-ffmpeg/Config.in b/buildroot/package/gstreamer/gst-ffmpeg/Config.in deleted file mode 100644 index 32bfdd53c..000000000 --- a/buildroot/package/gstreamer/gst-ffmpeg/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_GST_FFMPEG - bool "gst-ffmpeg" - # Unsupported for MIPS R6. It bundles a version of libav which - # doesn't have support for MIPS R6. - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 - # triggers https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65151 on sh - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_sh - select BR2_PACKAGE_GST_PLUGINS_BASE - help - GStreamer plugin containing one plugin with a set of - elements using the Libav library. It contains most popular - decoders as well as colorspace conversion elements. - - This package is configured to use an internal copy of the - Libav library. - - http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html - -if BR2_PACKAGE_GST_FFMPEG - -config BR2_PACKAGE_GST_FFMPEG_GPL - bool "Enable GPL code" - help - Allow use of GPL code. The resulting libs and binaries will - be under GPL. - -endif - -comment "gst-ffmpeg needs a toolchain w/ gcc >= 5" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 && BR2_sh diff --git a/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.hash b/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.hash deleted file mode 100644 index 5f7f35d9a..000000000 --- a/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.13.tar.bz2.md5 -md5 7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2 diff --git a/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk deleted file mode 100644 index 0d584a15b..000000000 --- a/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk +++ /dev/null @@ -1,103 +0,0 @@ -################################################################################ -# -# gst-ffmpeg -# -################################################################################ - -GST_FFMPEG_VERSION = 0.10.13 -GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2 -GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg -GST_FFMPEG_INSTALL_STAGING = YES -GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base - -ifeq ($(BR2_PACKAGE_GST_FFMPEG_GPL),y) -GST_FFMPEG_CONF_OPTS += --disable-lgpl -GST_FFMPEG_LICENSE = GPL-2.0+ (gst-ffmpeg), GPL-2.0+/GPL-3.0+ (libav) -GST_FFMPEG_LICENSE_FILES = COPYING gst-libs/ext/libav/COPYING.GPLv2 gst-libs/ext/libav/COPYING.GPLv3 -else -GST_FFMPEG_CONF_OPTS += --enable-lgpl -GST_FFMPEG_LICENSE = LGPL-2.0+ (gst-ffmpeg), LGPL-2.1+/LGPL-3.0+ (libav) -GST_FFMPEG_LICENSE_FILES = COPYING.LIB gst-libs/ext/libav/COPYING.LGPLv2.1 gst-libs/ext/libav/COPYING.LGPLv3 -endif - -GST_FFMPEG_CONF_EXTRA_OPTS = \ - --cross-prefix=$(TARGET_CROSS) \ - --target-os=linux \ - --pkg-config='$(PKG_CONFIG_HOST_BINARY)' - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-zlib -GST_FFMPEG_DEPENDENCIES += zlib -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-bzlib -GST_FFMPEG_DEPENDENCIES += bzip2 -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-bzlib -endif - -ifeq ($(BR2_X86_CPU_HAS_MMX),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-yasm -GST_FFMPEG_DEPENDENCIES += host-yasm -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-yasm -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-mmx -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-sse -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-sse -endif - -ifeq ($(BR2_X86_CPU_HAS_SSSE3),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-ssse3 -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-ssse3 -endif - -# Explicitly disable everything that doesn't match for ARM -# FFMPEG "autodetects" by compiling an extended instruction via AS -# This works on compilers that aren't built for generic by default -ifeq ($(BR2_ARM_CPU_ARMV4),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv5te -endif -ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-armv6 -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2 -endif -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-neon -endif - -ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-altivec -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-altivec -endif - -# libav configure script misdetects the VIS optimizations as being -# available, so forcefully disable them. -ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-vis -endif - -ifeq ($(BR2_STATIC_LIBS),) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-pic -endif - -GST_FFMPEG_CFLAGS = $(TARGET_CFLAGS) - -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-optimizations -GST_FFMPEG_CFLAGS += -O0 -endif - -GST_FFMPEG_CONF_ENV += CFLAGS="$(GST_FFMPEG_CFLAGS)" -GST_FFMPEG_CONF_OPTS += --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPTS)" - -$(eval $(autotools-package)) diff --git a/buildroot/package/gstreamer/gst-fsl-plugins/0001-gplay-add-missing-include.patch b/buildroot/package/gstreamer/gst-fsl-plugins/0001-gplay-add-missing-include.patch deleted file mode 100644 index 19753bc78..000000000 --- a/buildroot/package/gstreamer/gst-fsl-plugins/0001-gplay-add-missing-include.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ed649ccb8ddc724546172d329fca39b23c49b804 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Mon, 17 Dec 2012 17:58:28 +0100 -Subject: [PATCH] gplay: add missing include - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - tools/gplay/gst_snapshot.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/gplay/gst_snapshot.c b/tools/gplay/gst_snapshot.c -index 40dbb6f..596f399 100755 ---- a/tools/gplay/gst_snapshot.c -+++ b/tools/gplay/gst_snapshot.c -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include "gst_snapshot.h" - - static void --- diff --git a/buildroot/package/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch b/buildroot/package/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch deleted file mode 100644 index 471c48364..000000000 --- a/buildroot/package/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 83b4f84b1c490b9bb816e1ecbc743d80d48cc06d Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Tue, 18 Dec 2012 12:05:22 +0100 -Subject: [PATCH] Fix bashism in configure script. - -The configure script uses +=, which is not POSIX. Debians that -have the default dash as /bin/sh define a variable ending with -+ instead of appending to it. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - configure.ac | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5968eb6..1a31a06 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -152,7 +152,7 @@ AC_SUBST(GST_PLUGINS_BASE_LIBS) - AC_CHECK_HEADERS([vpu_lib.h], [HAVE_VPU_LIB=yes], [HAVE_VPU_LIB=no]) - if test "x$HAVE_VPU_LIB" = "xyes"; then - VPU_LIBS=`$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null` -- VPU_LIBS+=" -lvpu" -+ VPU_LIBS="$VPU_LIBS -lvpu" - fi - AC_SUBST(VPU_LIBS) - -@@ -176,14 +176,14 @@ AC_SUBST(RT_CFLAGS) - AC_SUBST(RT_LIBS) - - FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null` --FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null` --FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslparser 2>/dev/null` --FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null` -+FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`" -+FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslparser 2>/dev/null`" -+FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`" - AC_SUBST(FSL_MM_CORE_CFLAGS) - - FSL_MM_CORE_LIBS=`$PKG_CONFIG --libs libfslaudiocodec 2>/dev/null` --FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvideocodec 2>/dev/null` --FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslparser 2>/dev/null` -+FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`" -+FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslparser 2>/dev/null`" - AC_SUBST(FSL_MM_CORE_LIBS) - - EXTRAPLATFORMCFLAGS="-DARM -D_GNUC_" --- diff --git a/buildroot/package/gstreamer/gst-fsl-plugins/0003-Use-proper-objdump.patch b/buildroot/package/gstreamer/gst-fsl-plugins/0003-Use-proper-objdump.patch deleted file mode 100644 index b7b8c9f74..000000000 --- a/buildroot/package/gstreamer/gst-fsl-plugins/0003-Use-proper-objdump.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c58b658a93b1b6d6e94ba0306d58de845012cef6 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Tue, 18 Dec 2012 12:22:52 +0100 -Subject: [PATCH] Use proper objdump - -If the OBJDUMP environment variable is set, that should be used rather -than the objdump in PATH. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1a31a06..cc7557d 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -17,7 +17,7 @@ AC_DEFUN([FIND_PARSER_SONAME], - AC_MSG_CHECKING([for lib_$1_parser_$2_elinux.3.0.so soname]) - path=`$PKG_CONFIG --variable=libdir libfslparser` - SONAME=$( $CC -print-file-name=$PKG_CONFIG_SYSROOT_DIR$path/lib_$1_parser_$2_elinux.so | \ -- while read output; do objdump -p $output | \ -+ while read output; do $OBJDUMP -p $output | \ - grep "SONAME" | \ - sed -e 's/ \+SONAME \+//'; done 2> /dev/null ) - if [[ -z "$SONAME" ]]; then -@@ -36,7 +36,7 @@ AC_DEFUN([FIND_ACODEC_SONAME], - AC_MSG_CHECKING([for lib_$1_wrap_$2_elinux.so soname]) - path=`$PKG_CONFIG --variable=libdir libfslaudiocodec` - SONAME=$( $CC -print-file-name=$PKG_CONFIG_SYSROOT_DIR$path/wrap/lib_$1_wrap_$2_elinux.so | \ -- while read output; do objdump -p $output | \ -+ while read output; do $OBJDUMP -p $output | \ - grep "SONAME" | \ - sed -e 's/ \+SONAME \+//'; done 2> /dev/null ) - if [[ -z "$SONAME" ]]; then --- diff --git a/buildroot/package/gstreamer/gst-fsl-plugins/0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch b/buildroot/package/gstreamer/gst-fsl-plugins/0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch deleted file mode 100644 index 763703c27..000000000 --- a/buildroot/package/gstreamer/gst-fsl-plugins/0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ca4251d1284f2cb56e31aaec4d369809e2139c9 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 24 Feb 2014 16:30:39 +0100 -Subject: [PATCH] Fix libgstfsl linkage (add -lrt for shared memory functions). - -Fixes runtime failure of gst-fsl-plugins, e.g.: -(gst-plugin-scanner:1700): GStreamer-WARNING **: Failed to load - plugin '/usr/lib/gstreamer-0.10/libmfw_vpu.so': - /usr/lib/libgstfsl-0.10.so.0: undefined symbol: shm_open) - -Signed-off-by: Peter Seiderer ---- - configure.ac | 3 +++ - libs/Makefile.am | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a5d1655..7b5a7a6 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -170,6 +170,9 @@ AC_CHECK_LIB(ipu, mxc_ipu_lib_task_init, [IPU_LIBS=-lipu], [echo "No libipu arou - AC_SUBST(IPU_CFLAGS) - AC_SUBST(IPU_LIBS) - -+AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"]) -+AC_SUBST(SHM_LIBS) -+ - dnl of the POSIX Real-Time Extensions. - AC_CHECK_LIB(rt, clock_gettime) - AC_SUBST(RT_CFLAGS) -diff --git a/libs/Makefile.am b/libs/Makefile.am -index 2f56bba..5b30657 100755 ---- a/libs/Makefile.am -+++ b/libs/Makefile.am -@@ -42,7 +42,7 @@ libgstfsl_@GST_MAJORMINOR@_la_CFLAGS += -DIPULIB - endif - - libgstfsl_@GST_MAJORMINOR@_la_LDFLAGS = -version-info @GSTMXLIBS_VERSION@ --libgstfsl_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS) -+libgstfsl_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS) $(SHM_LIBS) - - libgstfsl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/imx-mm - libgstfsl_@GST_MAJORMINOR@include_HEADERS = \ --- -1.8.1.4 - diff --git a/buildroot/package/gstreamer/gst-fsl-plugins/0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch b/buildroot/package/gstreamer/gst-fsl-plugins/0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch deleted file mode 100644 index 56352753a..000000000 --- a/buildroot/package/gstreamer/gst-fsl-plugins/0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch +++ /dev/null @@ -1,69 +0,0 @@ -From ce90794a3458af0aed43b8570cf44cd87900185d Mon Sep 17 00:00:00 2001 -From: Gary Bisson -Date: Fri, 25 Jul 2014 16:44:53 -0700 -Subject: [PATCH] Remove use of obsolete VIDIOC_DBG_G_CHIP_IDENT - -This ioctl should never be used in application as -stated in videodev2.h header. -Moreover, its use in this plugin was very limited. - -Signed-off-by: Gary Bisson ---- - src/misc/tvsrc/src/mfw_gst_tvsrc.c | 8 -------- - src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 7 ------- - 2 files changed, 15 deletions(-) - -diff --git a/src/misc/tvsrc/src/mfw_gst_tvsrc.c b/src/misc/tvsrc/src/mfw_gst_tvsrc.c -index 67e0cd2..f495b6f 100755 ---- a/src/misc/tvsrc/src/mfw_gst_tvsrc.c -+++ b/src/misc/tvsrc/src/mfw_gst_tvsrc.c -@@ -450,7 +450,6 @@ mfw_gst_tvsrc_capture_setup (MFWGstTVSRC * v4l_src) - struct v4l2_format fmt; - struct v4l2_control ctrl; - struct v4l2_streamparm parm; -- struct v4l2_dbg_chip_ident chip; - gint fd_v4l = 0; - struct v4l2_mxc_offset off; - gint in_width = 0, in_height = 0; -@@ -461,13 +460,6 @@ mfw_gst_tvsrc_capture_setup (MFWGstTVSRC * v4l_src) - return 0; - } - -- if (ioctl (fd_v4l, VIDIOC_DBG_G_CHIP_IDENT, &chip)) { -- g_print ("VIDIOC_DBG_G_CHIP_IDENT failed.\n"); -- } else -- g_print ("sensor chip is %s\n", chip.match.name); -- -- -- - if (ioctl (fd_v4l, VIDIOC_G_STD, &id) < 0) { - g_print ("VIDIOC_G_STD failed\n"); - close (fd_v4l); -diff --git a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c -index 2c2e838..85e7ff0 100755 ---- a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c -+++ b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c -@@ -464,7 +464,6 @@ mfw_gst_v4lsrc_capture_setup (MFWGstV4LSrc * v4l_src) - struct v4l2_format fmt = {0}; - struct v4l2_control ctrl = {0}; - struct v4l2_streamparm parm = {0}; -- struct v4l2_dbg_chip_ident chip = {0}; - struct v4l2_frmsizeenum fszenum = {0}; - gint input; - gint fd_v4l = 0; -@@ -476,12 +475,6 @@ mfw_gst_v4lsrc_capture_setup (MFWGstV4LSrc * v4l_src) - return 0; - } - -- if (ioctl (fd_v4l, VIDIOC_DBG_G_CHIP_IDENT, &chip)) { -- GST_ERROR ("VIDIOC_DBG_G_CHIP_IDENT failed."); -- } else -- GST_INFO ("sensor chip is %s", chip.match.name); -- -- - if (v4l_src->crop_pixel) { - in_width = v4l_src->capture_width - (2 * v4l_src->crop_pixel); - in_height = v4l_src->capture_height - (2 * v4l_src->crop_pixel); --- -2.0.1 - diff --git a/buildroot/package/gstreamer/gst-fsl-plugins/Config.in b/buildroot/package/gstreamer/gst-fsl-plugins/Config.in deleted file mode 100644 index a2ff11ec3..000000000 --- a/buildroot/package/gstreamer/gst-fsl-plugins/Config.in +++ /dev/null @@ -1,105 +0,0 @@ -comment "gst-fsl-plugins needs an imx-specific Linux kernel to be built" - depends on BR2_arm && !BR2_LINUX_KERNEL - -comment "gst-fsl-plugins needs a glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC - -config BR2_PACKAGE_GST_FSL_PLUGINS - bool "gst-fsl-plugins" - depends on BR2_LINUX_KERNEL - depends on BR2_arm # Only relevant for i.MX - depends on BR2_TOOLCHAIN_USES_GLIBC # imx-codec - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_IMX_VPUWRAP if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU - select BR2_PACKAGE_IMX_LIB - select BR2_PACKAGE_IMX_PARSER - select BR2_PACKAGE_IMX_CODEC - select BR2_PACKAGE_FREESCALE_IMX - help - GStreamer plugins for hardware-accelerated audio and video - parsers and codecs on i.MX platforms. It requires a kernel - that includes the i.MX specific headers to be built. - - To use the VPU, its firmware blob must be installed as - well. This can be found in the firmware-imx package in the - "Hardware handling" menu. - - This library is provided by Freescale as-is and doesn't have - an upstream. Pengutronix maintains gst-fsl-plugins at - git://git.pengutronix.de/git/imx/gst-plugins-fsl-vpu.git but - it diverges heavily from Freescale's original - implementation. - -if BR2_PACKAGE_GST_FSL_PLUGINS -choice - prompt "i.MX platform" - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX37_3STACK - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX50 - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX233 - bool "imx233" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25 - bool "imx25" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27 - bool "imx27" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX28 - bool "imx28" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX31 - bool "imx31" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX35 - bool "imx35" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37 - bool "imx37" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50 - bool "imx50" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50 - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51 - bool "imx51" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51 - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53 - bool "imx53" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53 - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX5X - bool "imx5X" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX5X - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6 - bool "imx6" - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q - -endchoice - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM - string - default "MX233" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX233 - default "MX25" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25 - default "MX27" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27 - default "MX28" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX28 - default "MX31" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX31 - default "MX35" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX35 - default "MX37" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37 - default "MX50" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50 - default "MX51" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51 - default "MX53" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53 - default "MX5X" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX5X - default "MX6" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6 -endif diff --git a/buildroot/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash b/buildroot/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash deleted file mode 100644 index f1d639142..000000000 --- a/buildroot/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 568883b2a1d8d32e4004cb3f123790d0b4286c91c1fac38c9dc8e20bd1250764 gst-fsl-plugins-4.0.3.tar.gz diff --git a/buildroot/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/buildroot/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk deleted file mode 100644 index 547d253e8..000000000 --- a/buildroot/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# gst-fsl-plugins -# -################################################################################ - -GST_FSL_PLUGINS_VERSION = 4.0.3 -GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE) - -# Most is LGPL-2.0+, but some sources are copied from upstream and are -# LGPL-2.1+, which essentially makes it LGPL-2.1+ -GST_FSL_PLUGINS_LICENSE = LGPL-2.0+, LGPL-2.1+, PROPRIETARY (asf.h) -GST_FSL_PLUGINS_LICENSE_FILES = COPYING-LGPL-2.1 COPYING-LGPL-2 - -GST_FSL_PLUGINS_INSTALL_STAGING = YES -GST_FSL_PLUGINS_AUTORECONF = YES - -GST_FSL_PLUGINS_DEPENDENCIES += host-pkgconf gstreamer gst-plugins-base \ - imx-lib imx-parser imx-codec - -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_HAS_VPU),y) -GST_FSL_PLUGINS_DEPENDENCIES += imx-vpuwrap -endif - -GST_FSL_PLUGINS_CONF_ENV = \ - PLATFORM=$(BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM) \ - CROSS_ROOT="$(STAGING_DIR)" - -# needs access to imx-specific kernel headers -GST_FSL_PLUGINS_DEPENDENCIES += linux -GST_FSL_PLUGINS_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -idirafter $(LINUX_DIR)/include/uapi" - -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -GST_FSL_PLUGINS_DEPENDENCIES += xlib_libX11 -GST_FSL_PLUGINS_CONF_OPTS += --enable-x11 -else -GST_FSL_PLUGINS_CONF_OPTS += --disable-x11 -endif - -# Autoreconf requires an m4 directory to exist -define GST_FSL_PLUGINS_PATCH_M4 - mkdir -p $(@D)/m4 -endef - -GST_FSL_PLUGINS_POST_PATCH_HOOKS += GST_FSL_PLUGINS_PATCH_M4 - -$(eval $(autotools-package)) diff --git a/buildroot/package/gstreamer/gst-omapfb/Config.in b/buildroot/package/gstreamer/gst-omapfb/Config.in deleted file mode 100644 index cfe5bba6b..000000000 --- a/buildroot/package/gstreamer/gst-omapfb/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_GST_OMAPFB - bool "gst-omapfb" - depends on BR2_cortex_a8 - help - GStreamer plug-in to use OMAP framebuffer. - - http://github.com/felipec/gst-omapfb diff --git a/buildroot/package/gstreamer/gst-omapfb/gst-omapfb.hash b/buildroot/package/gstreamer/gst-omapfb/gst-omapfb.hash deleted file mode 100644 index 7d1c722de..000000000 --- a/buildroot/package/gstreamer/gst-omapfb/gst-omapfb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 56c719584d7a7ede5fc2053e8d1060f623b226a60672de0faba46fad646658a4 gst-omapfb-v1.0.tar.gz diff --git a/buildroot/package/gstreamer/gst-omapfb/gst-omapfb.mk b/buildroot/package/gstreamer/gst-omapfb/gst-omapfb.mk deleted file mode 100644 index c0bf69053..000000000 --- a/buildroot/package/gstreamer/gst-omapfb/gst-omapfb.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# gst-omapfb -# -################################################################################ - -GST_OMAPFB_VERSION = v1.0 -GST_OMAPFB_SITE = $(call github,felipec,gst-omapfb,$(GST_OMAPFB_VERSION)) - -define GST_OMAPFB_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e -endef - -define GST_OMAPFB_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e DESTDIR=$(TARGET_DIR) install -endef - -GST_OMAPFB_DEPENDENCIES = gstreamer - -$(eval $(generic-package)) diff --git a/buildroot/package/gstreamer/gst-plugin-x170/0001-correct-CFLAGS.patch b/buildroot/package/gstreamer/gst-plugin-x170/0001-correct-CFLAGS.patch deleted file mode 100644 index 9c32e46cc..000000000 --- a/buildroot/package/gstreamer/gst-plugin-x170/0001-correct-CFLAGS.patch +++ /dev/null @@ -1,28 +0,0 @@ -The configure script is correctly getting the CFLAGS needed to compile a plugin -for gstreamer and storing them in GST_BASE_CFLAGS but the Makefiles are never -making use of those. - -We actually have to use AM_CPPFLAGS as AM_CFLAGS is used everywhere but on the -real compiling rule... - -Signed-off-by: Alexandre Belloni ---- - src/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 8cb51d1..6af5d91 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -5,6 +5,8 @@ - ############################################################################## - plugin_LTLIBRARIES = libgstx170.la - -+AM_CPPFLAGS = @GST_BASE_CFLAGS@ -+ - ############################################################################## - # for the next set of variables, rename the prefix if you renamed the .la, # - # e.g. libgstplugin_la_SOURCES => libmysomething_la_SOURCES # --- -1.8.1.2 - diff --git a/buildroot/package/gstreamer/gst-plugin-x170/Config.in b/buildroot/package/gstreamer/gst-plugin-x170/Config.in deleted file mode 100644 index d0ba763a2..000000000 --- a/buildroot/package/gstreamer/gst-plugin-x170/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_GST_PLUGIN_X170 - bool "gst-plugin-x170" - depends on BR2_arm926t - # glibc toolchain includes WCHAR and threading for libglib2 - depends on BR2_TOOLCHAIN_USES_GLIBC # on2-8170-libs - depends on BR2_LINUX_KERNEL # on2-8170-libs - select BR2_PACKAGE_ON2_8170_LIBS - help - GStreamer plug-in to use the Hantro X170 video decoder - present on ATMEL AT91SAM9M10 SoC. - - http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer - -comment "gst-plugin-x170 needs a glibc toolchain and a Linux kernel to be built" - depends on BR2_arm926t - depends on !BR2_LINUX_KERNEL || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/buildroot/package/gstreamer/gst-plugin-x170/gst-plugin-x170.hash b/buildroot/package/gstreamer/gst-plugin-x170/gst-plugin-x170.hash deleted file mode 100644 index 527c46165..000000000 --- a/buildroot/package/gstreamer/gst-plugin-x170/gst-plugin-x170.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 734ded3618246d946b53c2c8c7ab5a0961287485aaef5fb9bf874f93e3caa342 gst-plugin-x170-1.0.tar.gz diff --git a/buildroot/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk b/buildroot/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk deleted file mode 100644 index 378cd7a81..000000000 --- a/buildroot/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# gst-plugin-x170 -# -################################################################################ - -GST_PLUGIN_X170_VERSION = 1.0 -GST_PLUGIN_X170_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec - -GST_PLUGIN_X170_LICENSE = BSD-1c -#A license file is included but it is just a placeholder - -# There is no generated configure script in the tarball. -GST_PLUGIN_X170_AUTORECONF = YES -GST_PLUGIN_X170_AUTORECONF_OPTS = -Im4/ -GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs - -$(eval $(autotools-package)) diff --git a/buildroot/package/gstreamer/gst-plugins-bad/0001-opus-jpegformat-unbreak-non-debug-build.patch b/buildroot/package/gstreamer/gst-plugins-bad/0001-opus-jpegformat-unbreak-non-debug-build.patch deleted file mode 100644 index 2c98c3e10..000000000 --- a/buildroot/package/gstreamer/gst-plugins-bad/0001-opus-jpegformat-unbreak-non-debug-build.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1725e702a3622cb45c8142622dd419fa0c410ac9 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Wed, 12 Sep 2012 09:10:35 +0200 -Subject: [PATCH] gst-plugins-bad: opus + jpegformat: unbreak non-debug build - -opus + jpegformat plugin builds fail when gstreamer is configured with ---disable-gst-debug as they are checking the GST_DISABLE_DEBUG symbol -instead of GST_DISABLE_GST_DEBUG. - -Submitted upstream as https://bugzilla.gnome.org/show_bug.cgi?id=683850 - -Signed-off-by: Peter Korsgaard ---- - ext/opus/gstopusdec.c | 2 +- - ext/opus/gstopusenc.c | 4 ++-- - gst/jpegformat/gstjpegparse.c | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/ext/opus/gstopusdec.c b/ext/opus/gstopusdec.c -index 0e2805c..ab7221d 100644 ---- a/ext/opus/gstopusdec.c -+++ b/ext/opus/gstopusdec.c -@@ -357,7 +357,7 @@ opus_dec_chain_parse_data (GstOpusDec * dec, GstBuffer * buffer) - - GST_DEBUG_OBJECT (dec, "Creating decoder with %d channels, %d Hz", - dec->n_channels, dec->sample_rate); --#ifndef GST_DISABLE_DEBUG -+#ifndef GST_DISABLE_GST_DEBUG - gst_opus_common_log_channel_mapping_table (GST_ELEMENT (dec), opusdec_debug, - "Mapping table", dec->n_channels, dec->channel_mapping); - #endif -diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c -index 240a2cb..d991795 100644 ---- a/ext/opus/gstopusenc.c -+++ b/ext/opus/gstopusenc.c -@@ -589,7 +589,7 @@ gst_opus_enc_setup_channel_mappings (GstOpusEnc * enc, - } - } - --#ifndef GST_DISABLE_DEBUG -+#ifndef GST_DISABLE_GST_DEBUG - GST_INFO_OBJECT (enc, - "Mapping tables built: %d channels, %d stereo streams", enc->n_channels, - enc->n_stereo_streams); -@@ -654,7 +654,7 @@ gst_opus_enc_setup (GstOpusEnc * enc) - { - int error = OPUS_OK; - --#ifndef GST_DISABLE_DEBUG -+#ifndef GST_DISABLE_GST_DEBUG - GST_DEBUG_OBJECT (enc, - "setup: %d Hz, %d channels, %d stereo streams, family %d", - enc->sample_rate, enc->n_channels, enc->n_stereo_streams, -diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c -index f984a52..b4af9ed 100644 ---- a/gst/jpegformat/gstjpegparse.c -+++ b/gst/jpegformat/gstjpegparse.c -@@ -545,7 +545,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse, - if (!gst_byte_reader_get_uint16_be (reader, &size)) - return FALSE; - --#ifndef GST_DISABLE_DEBUG -+#ifndef GST_DISABLE_GST_DEBUG - /* We'd pry the id of the skipped application segment */ - if (marker >= APP0 && marker <= APP15) { - const gchar *id_str = NULL; -@@ -561,7 +561,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse, - #else - GST_DEBUG_OBJECT (parse, "unhandled marker %x skiping %u bytes", marker, - size); --#endif // GST_DISABLE_DEBUG -+#endif // GST_DISABLE_GST_DEBUG - - if (!gst_byte_reader_skip (reader, size - 2)) - return FALSE; --- -1.7.10 - diff --git a/buildroot/package/gstreamer/gst-plugins-bad/0002-fix-dfb-example.patch b/buildroot/package/gstreamer/gst-plugins-bad/0002-fix-dfb-example.patch deleted file mode 100644 index b2057484c..000000000 --- a/buildroot/package/gstreamer/gst-plugins-bad/0002-fix-dfb-example.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix dfb-example - -Order of inclusion gives a strange effect on the definition of -gst_debug_log. Swapping the include statements solve it. - -Not upstreamed since there will be no more updates to this version -of gst-plugins-bad. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- -diff -rup gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c gst-plugins-bad-0.10.23.fixed/ext/directfb/dfb-example.c ---- gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c 2011-12-11 19:49:11.000000000 +0100 -+++ gst-plugins-bad-0.10.23.fixed/ext/directfb/dfb-example.c 2013-05-13 00:32:00.507469138 +0200 -@@ -1,7 +1,7 @@ - --#include - #include - #include -+#include - - static IDirectFB *dfb = NULL; - static IDirectFBSurface *primary = NULL; diff --git a/buildroot/package/gstreamer/gst-plugins-bad/0003-drop-buggy-libvpx-legacy-handling.patch b/buildroot/package/gstreamer/gst-plugins-bad/0003-drop-buggy-libvpx-legacy-handling.patch deleted file mode 100644 index 780b5e38e..000000000 --- a/buildroot/package/gstreamer/gst-plugins-bad/0003-drop-buggy-libvpx-legacy-handling.patch +++ /dev/null @@ -1,44 +0,0 @@ -[PATCH] vp8: drop buggy libvpx legacy handling - -Legacy handling for older libvpx versions were added back in 2010, but this -was unfortunately buggy as these symbols are enums and not defines - So they -are never defined and the legacy symbols always used. - -Now that the legacy symbols are completely removed from libvpx from v1.4.0 -onwards this breaks. Fix it by simply dropping the legacy handling, nobody -should be using libvpx versions from before 2010 (or gstreamer 0.10 for that -matter) any more. - -Signed-off-by: Peter Korsgaard ---- - ext/vp8/gstvp8utils.h | 17 ----------------- - 1 file changed, 17 deletions(-) - -Index: gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h -=================================================================== ---- gst-plugins-bad-0.10.23.orig/ext/vp8/gstvp8utils.h -+++ gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h -@@ -25,23 +25,6 @@ - - G_BEGIN_DECLS - --/* Some compatibility defines for older libvpx versions */ --#ifndef VPX_IMG_FMT_I420 --#define VPX_IMG_FMT_I420 IMG_FMT_I420 --#endif -- --#ifndef VPX_PLANE_Y --#define VPX_PLANE_Y PLANE_Y --#endif -- --#ifndef VPX_PLANE_U --#define VPX_PLANE_U PLANE_U --#endif -- --#ifndef VPX_PLANE_V --#define VPX_PLANE_V PLANE_V --#endif -- - const char * gst_vpx_error_name (vpx_codec_err_t status); - - G_END_DECLS diff --git a/buildroot/package/gstreamer/gst-plugins-bad/Config.in b/buildroot/package/gstreamer/gst-plugins-bad/Config.in deleted file mode 100644 index 411e4b617..000000000 --- a/buildroot/package/gstreamer/gst-plugins-bad/Config.in +++ /dev/null @@ -1,332 +0,0 @@ -menuconfig BR2_PACKAGE_GST_PLUGINS_BAD - bool "gst-plugins-bad" - select BR2_PACKAGE_GST_PLUGINS_BASE - help - A set of plug-ins for GStreamer that may be of poor quality or - lacking some features. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST_PLUGINS_BAD - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMDEC - bool "adpcmdec" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMENC - bool "adpcmenc" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF - bool "aiff" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX - bool "asfmux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT - bool "autoconvert" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS - bool "audiovisualizers" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER - bool "bayer" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN - bool "camerabin" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2 - bool "camerabin2" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE - bool "cdxaparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS - bool "coloreffects" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE - bool "colorspace" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC - bool "dataurisrc" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DCCP - bool "dccp" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS - bool "debugutils" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK - bool "decklink" - depends on BR2_INSTALL_LIBSTDCPP - -comment "decklink needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF - bool "dtmf" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY - bool "dvdsuboverlay" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU - bool "dvdspu" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FACEOVERLAY - bool "faceoverlay" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL - bool "festival" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS - bool "fieldanalysis" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB - bool "freeverb" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE - bool "freeze" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R - bool "frei0r" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS - bool "gaudieffects" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM - bool "geometrictransform" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GSETTINGS - bool "gsettings" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE - bool "h264parse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HDVPARSE - bool "hdvparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HLS - bool "hls" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ID3TAG - bool "id3tag" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTER - bool "inter" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE - bool "interlace" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE - bool "ivfparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR - bool "jp2kdecimator" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JPEGFORMAT - bool "jpegformat" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE - bool "legacyresample" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB - bool "librfb" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LINSYS - bool "linsys" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIVEADDER - bool "liveadder" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGDEMUX - bool "mpegdemux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGPSMUX - bool "mpegpsmux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX - bool "mpegtsdemux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX - bool "mpegtsmux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGVIDEOPARSE - bool "mpegvideoparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MVE - bool "mve" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MXF - bool "mxf" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NSF - bool "nsf" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NUVDEMUX - bool "nuvdemux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PATCHDETECT - bool "patchdetect" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PCAPPARSE - bool "pcapparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PNM - bool "pnm" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE - bool "rawparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REAL - bool "real" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REMOVESILENCE - bool "removesilence" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX - bool "rtpmux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPVP8 - bool "rtpvp8" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SCALETEMPO - bool "scaletempo" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDI - bool "sdi" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDP - bool "sdp" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SEGMENTCLIP - bool "segmentclip" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN - bool "siren" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH - bool "smooth" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED - bool "speed" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO - bool "stereo" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SUBENC - bool "subenc" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TTA - bool "tta" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOFILTERS - bool "videofilters" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE - bool "videomaxrate" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMEASURE - bool "videomeasure" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOPARSERS - bool "videoparsers" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL - bool "videosignal" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VMNC - bool "vmnc" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M - bool "y4m" - -comment "plugins with external dependencies (there may be more available)" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2 - bool "bz2" - select BR2_PACKAGE_BZIP2 - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO - bool "cdaudio" - depends on !BR2_nios2 # libcdaudio - select BR2_PACKAGE_LIBCDAUDIO - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL - bool "curl" - select BR2_PACKAGE_LIBCURL - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB - bool "directfb" - default y - depends on BR2_PACKAGE_DIRECTFB - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB - bool "dvb" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV - bool "fbdev" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD - bool "faad" - select BR2_PACKAGE_FAAD2 - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS - bool "libmms" - depends on BR2_USE_WCHAR # libmms -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2 - select BR2_PACKAGE_LIBMMS - -comment "libmms needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK - bool "musepack" - select BR2_PACKAGE_MUSEPACK - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON - bool "neon" - select BR2_PACKAGE_NEON - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS - bool "opus" - select BR2_PACKAGE_OPUS - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG - bool "rsvg" - depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz - select BR2_PACKAGE_LIBRSVG - -comment "rsvg plugin needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL - bool "sdl" - select BR2_PACKAGE_SDL - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE - bool "sndfile" - select BR2_PACKAGE_LIBSNDFILE - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD - bool "vcd" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VP8 - bool "vp8" - select BR2_PACKAGE_LIBVPX - -config BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR - bool "zbar" - depends on BR2_TOOLCHAIN_HAS_THREADS # zbar-> libv4l - depends on BR2_USE_MMU # zbar-> libv4l - depends on BR2_INSTALL_LIBSTDCPP # zbar-> libv4l - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # zbar - select BR2_PACKAGE_ZBAR - -comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.17" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 - -endif diff --git a/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.hash b/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.hash deleted file mode 100644 index 760ed31c9..000000000 --- a/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz.md5 -md5 e4822fa2cc933768e2998311a1565979 gst-plugins-bad-0.10.23.tar.xz diff --git a/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk deleted file mode 100644 index a98eac423..000000000 --- a/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk +++ /dev/null @@ -1,593 +0,0 @@ -################################################################################ -# -# gst-plugins-bad -# -################################################################################ - -GST_PLUGINS_BAD_VERSION = 0.10.23 -GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.xz -GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad -# COPYING.LIB is in fact v2, but most of the code is v2.1+ -GST_PLUGINS_BAD_LICENSE = LGPL-2.1+, GPL-2.0+ -GST_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB COPYING - -GST_PLUGINS_BAD_CONF_OPTS = \ - --disable-apexsink \ - --disable-examples \ - --disable-spandsp - -GST_PLUGINS_BAD_DEPENDENCIES = gst-plugins-base gstreamer - -ifeq ($(BR2_PACKAGE_ORC),y) -GST_PLUGINS_BAD_DEPENDENCIES += orc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMDEC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-adpcmdec -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-adpcmdec -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMENC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-adpcmenc -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-adpcmenc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-aiff -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-aiff -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-asfmux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-asfmux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-autoconvert -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-autoconvert -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-bayer -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-bayer -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-camerabin -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-camerabin -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-camerabin2 -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-camerabin2 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-cdxaparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-cdxaparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-coloreffects -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-coloreffects -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-colorspace -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-colorspace -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dataurisrc -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dataurisrc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DCCP),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dccp -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dccp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-debugutils -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-debugutils -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-decklink -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-decklink -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dtmf -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dtmf -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dvbsuboverlay -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dvdspu -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dvdspu -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-faceoverlay -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-faceoverlay -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-festival -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-festival -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-fieldanalysis -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-fieldanalysis -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-freeze -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-freeze -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-freeverb -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-freeverb -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-frei0r -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-frei0r -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-gaudieffects -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-gaudieffects -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-geometrictransform -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-geometrictransform -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GSETTINGS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-gsettings -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-gsettings -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-h264parse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-h264parse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HDVPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-hdvparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-hdvparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HLS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-hls -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-hls -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ID3TAG),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-id3tag -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-id3tag -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTER),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-inter -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-inter -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-interlace -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-interlace -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-ivfparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-ivfparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-jp2kdecimator -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-jp2kdecimator -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-jpegformat -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-jpegformat -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-legacyresample -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-legacyresample -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-librfb -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-librfb -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LINSYS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-linsys -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-linsys -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIVEADDER),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-liveadder -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-liveadder -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegdemux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegdemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegpsmux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegpsmux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsdemux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsdemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsmux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsmux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGVIDEOPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegvideoparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegvideoparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MVE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mve -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mve -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MXF),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mxf -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mxf -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NSF),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-nsf -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-nsf -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NUVDEMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-nuvdemux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-nuvdemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PATCHDETECT),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-patchdetect -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-patchdetect -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PCAPPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-pcapparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-pcapparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PNM),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-pnm -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-pnm -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-rawparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-rawparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REAL),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-real -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-real -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-removesilence -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-removesilence -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-rtpmux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-rtpmux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPVP8),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-rtpvp8 -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-rtpvp8 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SCALETEMPO),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-scaletempo -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-scaletempo -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDI),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-sdi -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-sdi -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDP),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-sdp -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-sdp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-segmentclip -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-segmentclip -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-siren -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-siren -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-smooth -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-smooth -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-speed -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-speed -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SUBENC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-subenc -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-subenc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-stereo -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-stereo -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TTA),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-tta -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-tta -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videofilters -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videofilters -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videomaxrate -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videomaxrate -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMEASURE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videomeasure -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videomeasure -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videoparsers -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videoparsers -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videosignal -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videosignal -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VMNC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-vmnc -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-vmnc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-y4m -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-y4m -endif - -# plugins with deps -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-bz2 -GST_PLUGINS_BAD_DEPENDENCIES += bzip2 -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-bz2 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-cdaudio -GST_PLUGINS_BAD_DEPENDENCIES += libcdaudio -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-cdaudio -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-curl -GST_PLUGINS_BAD_DEPENDENCIES += libcurl -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-curl -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-directfb -GST_PLUGINS_BAD_DEPENDENCIES += directfb -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-directfb -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dvb -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dvb -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-faad -GST_PLUGINS_BAD_DEPENDENCIES += faad2 -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-faad -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-fbdev -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-fbdev -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-libmms -GST_PLUGINS_BAD_DEPENDENCIES += libmms -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-libmms -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-musepack -GST_PLUGINS_BAD_DEPENDENCIES += musepack -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-musepack -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-neon -GST_PLUGINS_BAD_DEPENDENCIES += neon -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-neon -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-opus -GST_PLUGINS_BAD_DEPENDENCIES += opus -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-opus -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-rsvg -GST_PLUGINS_BAD_DEPENDENCIES += librsvg -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-rsvg -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL),y) -GST_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config -GST_PLUGINS_BAD_CONF_OPTS += --enable-sdl -GST_PLUGINS_BAD_DEPENDENCIES += sdl -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-sdl -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-sndfile -GST_PLUGINS_BAD_DEPENDENCIES += libsndfile -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-sndfile -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-vcd -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-vcd -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VP8),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-vp8 -GST_PLUGINS_BAD_DEPENDENCIES += libvpx -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-vp8 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-zbar -GST_PLUGINS_BAD_DEPENDENCIES += zbar -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-zbar -endif - -$(eval $(autotools-package)) diff --git a/buildroot/package/gstreamer/gst-plugins-base/0001-tremor.patch b/buildroot/package/gstreamer/gst-plugins-base/0001-tremor.patch deleted file mode 100644 index fa8785bed..000000000 --- a/buildroot/package/gstreamer/gst-plugins-base/0001-tremor.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 0088753651350de3060ece22c1be4153b6009515 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Wed, 25 Jan 2012 23:53:04 +0100 -Subject: [PATCH] base: vorbisdeclib: support modern Tremor versions - -Reported upstream as https://bugzilla.gnome.org/show_bug.cgi?id=668726 - -Tremor changed to use standard libogg rather than its own incompatible -copy back in Aug 2010 (r17375), causing gst-plugin-base build to fail. - -Tremolo so far unfortunately hasn't been updated. Restructure -vorbisdeclib.h so the legacy _ogg_packet_wrapper code is only used for -Tremolo. - -Signed-off-by: Peter Korsgaard ---- - ext/vorbis/gstvorbisdeclib.h | 77 ++++++++++++++++++++++------------------- - 1 files changed, 41 insertions(+), 36 deletions(-) - -diff --git a/ext/vorbis/gstvorbisdeclib.h b/ext/vorbis/gstvorbisdeclib.h -index ca00af9..e147591 100644 ---- a/ext/vorbis/gstvorbisdeclib.h -+++ b/ext/vorbis/gstvorbisdeclib.h -@@ -29,11 +29,6 @@ - - #ifndef TREMOR - --#include -- --typedef float vorbis_sample_t; --typedef ogg_packet ogg_packet_wrapper; -- - #define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to float audio" - - #define GST_VORBIS_DEC_SRC_CAPS \ -@@ -47,6 +42,42 @@ typedef ogg_packet ogg_packet_wrapper; - - #define GST_VORBIS_DEC_GLIB_TYPE_NAME GstVorbisDec - -+#else /* TREMOR */ -+ -+#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio" -+ -+#define GST_VORBIS_DEC_SRC_CAPS \ -+ GST_STATIC_CAPS ("audio/x-raw-int, " \ -+ "rate = (int) [ 1, MAX ], " \ -+ "channels = (int) [ 1, 6 ], " \ -+ "endianness = (int) BYTE_ORDER, " \ -+ "width = (int) { 16, 32 }, " \ -+ "depth = (int) 16, " \ -+ "signed = (boolean) true") -+ -+#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16) -+ -+/* we need a different type name here */ -+#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec -+ -+/* and still have it compile */ -+typedef struct _GstVorbisDec GstIVorbisDec; -+typedef struct _GstVorbisDecClass GstIVorbisDecClass; -+ -+#endif /* TREMOR */ -+ -+#ifndef USE_TREMOLO -+ -+#ifdef TREMOR -+ #include -+ typedef ogg_int32_t vorbis_sample_t; -+#else -+ #include -+ typedef float vorbis_sample_t; -+#endif -+ -+typedef ogg_packet ogg_packet_wrapper; -+ - static inline guint8 * - gst_ogg_packet_data (ogg_packet * p) - { -@@ -72,17 +103,11 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * packet) - return packet; - } - --#else -- --#ifdef USE_TREMOLO -- #include -- #include -- typedef ogg_int16_t vorbis_sample_t; --#else -- #include -- typedef ogg_int32_t vorbis_sample_t; --#endif -+#else /* USE_TREMOLO */ - -+#include -+#include -+typedef ogg_int16_t vorbis_sample_t; - typedef struct _ogg_packet_wrapper ogg_packet_wrapper; - - struct _ogg_packet_wrapper { -@@ -91,26 +116,6 @@ struct _ogg_packet_wrapper { - ogg_buffer buf; - }; - --#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio" -- --#define GST_VORBIS_DEC_SRC_CAPS \ -- GST_STATIC_CAPS ("audio/x-raw-int, " \ -- "rate = (int) [ 1, MAX ], " \ -- "channels = (int) [ 1, 6 ], " \ -- "endianness = (int) BYTE_ORDER, " \ -- "width = (int) { 16, 32 }, " \ -- "depth = (int) 16, " \ -- "signed = (boolean) true") -- --#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16) -- --/* we need a different type name here */ --#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec -- --/* and still have it compile */ --typedef struct _GstVorbisDec GstIVorbisDec; --typedef struct _GstVorbisDecClass GstIVorbisDecClass; -- - /* compensate minor variation */ - #define vorbis_synthesis(a, b) vorbis_synthesis (a, b, 1) - -@@ -154,7 +159,7 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * packet) - return &(packet->packet); - } - --#endif -+#endif /* USE_TREMOLO */ - - typedef void (*CopySampleFunc)(vorbis_sample_t *out, vorbis_sample_t **in, - guint samples, gint channels, gint width); --- -1.7.8.3 - diff --git a/buildroot/package/gstreamer/gst-plugins-base/0002-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch b/buildroot/package/gstreamer/gst-plugins-base/0002-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch deleted file mode 100644 index eabea4f8c..000000000 --- a/buildroot/package/gstreamer/gst-plugins-base/0002-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch +++ /dev/null @@ -1,38 +0,0 @@ -From daa194b71ea6f9e8ee522ab02e8c56150b7e62b3 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Mon, 20 Jan 2014 15:44:09 +0100 -Subject: [PATCH] audioresample: Fix build on x86 if emmintrin.h is available - but can't be used - -On i386, EMMINTRIN is defined but not usable without SSE so check for -__SSE__ and __SSE2__ as well. - -https://bugzilla.gnome.org/show_bug.cgi?id=670690 -Signed-off-by: Peter Korsgaard ---- - gst/audioresample/resample.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c -index 98d006c..481fa01 100644 ---- a/gst/audioresample/resample.c -+++ b/gst/audioresample/resample.c -@@ -77,13 +77,13 @@ - #define EXPORT G_GNUC_INTERNAL - - #ifdef _USE_SSE --#ifndef HAVE_XMMINTRIN_H -+#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H) - #undef _USE_SSE - #endif - #endif - - #ifdef _USE_SSE2 --#ifndef HAVE_EMMINTRIN_H -+#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H) - #undef _USE_SSE2 - #endif - #endif --- -2.1.4 - diff --git a/buildroot/package/gstreamer/gst-plugins-base/0003-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch b/buildroot/package/gstreamer/gst-plugins-base/0003-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch deleted file mode 100644 index e67531d2f..000000000 --- a/buildroot/package/gstreamer/gst-plugins-base/0003-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4e3d101aa854cfee633a9689efeb75e5001baa5e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Mon, 20 Jan 2014 16:11:04 +0100 -Subject: [PATCH] audioresample: It's HAVE_EMMINTRIN_H, not HAVE_XMMINTRIN_H - for SSE2 - -Signed-off-by: Peter Korsgaard ---- - gst/audioresample/resample.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c -index 481fa01..4410bdd 100644 ---- a/gst/audioresample/resample.c -+++ b/gst/audioresample/resample.c -@@ -83,7 +83,7 @@ - #endif - - #ifdef _USE_SSE2 --#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H) -+#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H) - #undef _USE_SSE2 - #endif - #endif --- -2.1.4 - diff --git a/buildroot/package/gstreamer/gst-plugins-base/Config.in b/buildroot/package/gstreamer/gst-plugins-base/Config.in deleted file mode 100644 index e9c8239f7..000000000 --- a/buildroot/package/gstreamer/gst-plugins-base/Config.in +++ /dev/null @@ -1,108 +0,0 @@ -menuconfig BR2_PACKAGE_GST_PLUGINS_BASE - bool "gst-plugins-base" - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7 - help - A basic set of well-supported plug-ins for GStreamer. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST_PLUGINS_BASE - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER - bool "adder" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - bool "app" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOCONVERT - bool "audioconvert (mandatory for audio playback)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORATE - bool "audiorate" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE - bool "audioresample (mandatory for audio playback)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC - bool "audiotestsrc" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING - bool "encoding" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE - bool "ffmpegcolorspace (mandatory for video playback)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP - bool "gdp" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK - bool "playback (mandatory)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TCP - bool "tcp" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TYPEFIND - bool "typefind (mandatory)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC - bool "videotestsrc" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEORATE - bool "videorate" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOSCALE - bool "videoscale (mandatory for video playback)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME - bool "volume (mandatory for audio playback)" - default y - -comment "plugins with external dependencies (there may be more available)" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA - bool "alsa (mandatory for audio playback)" - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_ALSA_LIB_MIXER - select BR2_PACKAGE_ALSA_LIB_PCM - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG - bool "ogg (*.ogg audio/video)" - select BR2_PACKAGE_LIBOGG - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO - bool "pango font renderer" - depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - select BR2_PACKAGE_PANGO - -comment "pango plugin needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_SUBPARSE - bool "subparse" - select BR2_PACKAGE_LIBXML2 - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA - bool "theora (*.ogg video)" - select BR2_PACKAGE_LIBTHEORA - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR - bool "tremor" - select BR2_PACKAGE_TREMOR - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS - bool "vorbis (*.ogg audio)" - select BR2_PACKAGE_LIBVORBIS - -endif diff --git a/buildroot/package/gstreamer/gst-plugins-base/gst-plugins-base.hash b/buildroot/package/gstreamer/gst-plugins-base/gst-plugins-base.hash deleted file mode 100644 index 77eba71bb..000000000 --- a/buildroot/package/gstreamer/gst-plugins-base/gst-plugins-base.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz.md5 -md5 3d2337841b132fe996e5eb2396ac9438 gst-plugins-base-0.10.36.tar.xz diff --git a/buildroot/package/gstreamer/gst-plugins-base/gst-plugins-base.mk b/buildroot/package/gstreamer/gst-plugins-base/gst-plugins-base.mk deleted file mode 100644 index 735314365..000000000 --- a/buildroot/package/gstreamer/gst-plugins-base/gst-plugins-base.mk +++ /dev/null @@ -1,196 +0,0 @@ -################################################################################ -# -# gst-plugins-base -# -################################################################################ - -GST_PLUGINS_BASE_VERSION = 0.10.36 -GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.xz -GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base -GST_PLUGINS_BASE_INSTALL_STAGING = YES -GST_PLUGINS_BASE_LICENSE = GPL-2.0+, LGPL-2.0+ -GST_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB - -# freetype is only used by examples, but if it is not found -# and the host has a freetype-config script, then the host -# include dirs are added to the search path causing trouble -GST_PLUGINS_BASE_CONF_ENV = \ - FT2_CONFIG=/bin/false \ - ac_cv_header_stdint_t="stdint.h" - -GST_PLUGINS_BASE_CONF_OPTS = \ - --disable-examples \ - --disable-oggtest \ - --disable-vorbistest \ - --disable-freetypetest - -GST_PLUGINS_BASE_DEPENDENCIES = gstreamer - -ifeq ($(BR2_PACKAGE_XORG7),y) -GST_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv -GST_PLUGINS_BASE_CONF_OPTS += \ - --enable-x \ - --enable-xshm \ - --enable-xvideo -else -GST_PLUGINS_BASE_CONF_OPTS += \ - --disable-x \ - --disable-xshm \ - --disable-xvideo -endif - -ifeq ($(BR2_PACKAGE_ORC),y) -GST_PLUGINS_BASE_DEPENDENCIES += orc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA),y) -GST_PLUGINS_BASE_DEPENDENCIES += alsa-lib -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-alsa -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-adder -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-adder -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-app -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-app -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOCONVERT),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-audioconvert -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-audioconvert -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORATE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-audiorate -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-audiorate -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-audioresample -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-audioresample -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-audiotestsrc -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-audiotestsrc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-encoding -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-encoding -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-ffmpegcolorspace -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-ffmpegcolorspace -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-gdp -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-gdp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-playback -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-playback -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_SUBPARSE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-subparse -GST_PLUGINS_BASE_DEPENDENCIES += libxml2 -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-subparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TCP),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-tcp -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-tcp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TYPEFIND),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-typefind -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-typefind -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-videotestsrc -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-videotestsrc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEORATE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-videorate -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-videorate -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-videoscale -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-videoscale -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-volume -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-volume -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-ogg -GST_PLUGINS_BASE_DEPENDENCIES += libogg -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-ogg -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-pango -GST_PLUGINS_BASE_DEPENDENCIES += pango -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-pango -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-theora -GST_PLUGINS_BASE_DEPENDENCIES += libtheora -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-theora -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-ivorbis -GST_PLUGINS_BASE_DEPENDENCIES += tremor -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-ivorbis -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-vorbis -GST_PLUGINS_BASE_DEPENDENCIES += libvorbis -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-vorbis -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GST_PLUGINS_BASE_DEPENDENCIES += zlib -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-zlib -endif - -$(eval $(autotools-package)) diff --git a/buildroot/package/gstreamer/gst-plugins-good/0001-linux36.patch b/buildroot/package/gstreamer/gst-plugins-good/0001-linux36.patch deleted file mode 100644 index 5d7cd932e..000000000 --- a/buildroot/package/gstreamer/gst-plugins-good/0001-linux36.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix building with Linux headers 3.6 - -Signed-off-by: Markos Chandras - -From bfb1ac952b4c3caaba0297bbe7dc73ea92f9b292 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Thu, 09 Aug 2012 07:35:23 +0000 -Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was removed - -This was unused apparently and removed in the kernel in commit: - - From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001 - From: Sakari Ailus - Date: Wed, 2 May 2012 09:40:03 -0300 - Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT - - Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which - tells the former is valid. The flag is used by no driver currently. - -https://bugzilla.gnome.org/show_bug.cgi?id=681491 ---- -(limited to 'sys/v4l2/gstv4l2bufferpool.c') - -diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c -index 2e3a563..5aaed5a 100644 ---- a/sys/v4l2/gstv4l2bufferpool.c -+++ b/sys/v4l2/gstv4l2bufferpool.c -@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps) - GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", - ret->vbuffer.m.offset); - GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); -- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); - - ret->mmap_length = ret->vbuffer.length; - data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, --- -cgit v0.9.0.2-2-gbebe diff --git a/buildroot/package/gstreamer/gst-plugins-good/0002-v4l2-fix-compilation-against-newer-kernel-headers.patch b/buildroot/package/gstreamer/gst-plugins-good/0002-v4l2-fix-compilation-against-newer-kernel-headers.patch deleted file mode 100644 index 62c3bb24e..000000000 --- a/buildroot/package/gstreamer/gst-plugins-good/0002-v4l2-fix-compilation-against-newer-kernel-headers.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 18 Mar 2013 14:59:35 +0000 -Subject: [PATCH] v4l2: fix compilation against newer kernel headers as on - FC19 - ---- - sys/v4l2/v4l2_calls.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c -index 07d390a..4c10f4f 100644 ---- a/sys/v4l2/v4l2_calls.c -+++ b/sys/v4l2/v4l2_calls.c -@@ -291,8 +291,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) - break; - case V4L2_CID_HFLIP: - case V4L2_CID_VFLIP: -+#ifndef V4L2_CID_PAN_RESET - case V4L2_CID_HCENTER: -+#endif -+#ifndef V4L2_CID_TILT_RESET - case V4L2_CID_VCENTER: -+#endif - #ifdef V4L2_CID_PAN_RESET - case V4L2_CID_PAN_RESET: - #endif --- -1.7.10.4 - diff --git a/buildroot/package/gstreamer/gst-plugins-good/Config.in b/buildroot/package/gstreamer/gst-plugins-good/Config.in deleted file mode 100644 index 3b2a99f5b..000000000 --- a/buildroot/package/gstreamer/gst-plugins-good/Config.in +++ /dev/null @@ -1,234 +0,0 @@ -menuconfig BR2_PACKAGE_GST_PLUGINS_GOOD - bool "gst-plugins-good" - select BR2_PACKAGE_GST_PLUGINS_BASE - help - A set of well-supported plug-ins for GStreamer under the - preferred license. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST_PLUGINS_GOOD - -config BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG - bool "jpeg (JPEG support)" - select BR2_PACKAGE_JPEG - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PNG - bool "png (PNG support)" - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2 - bool "bz2 support" - depends on BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA - select BR2_PACKAGE_BZIP2 - help - Enable bz2 support for the following plugins: - matroska - -config BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB - bool "zlib support" - depends on BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4 || BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX || BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA - select BR2_PACKAGE_ZLIB - help - Enable zlib support for the following plugins: - id3demux, isomp4, matroska - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ALPHA - bool "alpha" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_APETAG - bool "apetag" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOFX - bool "audiofx" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS - bool "audioparsers" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUPARSE - bool "auparse" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUTODETECT - bool "autodetect" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AVI - bool "avi (*.avi video)" - default y - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CUTTER - bool "cutter" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEBUGUTILS - bool "debugutils" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEINTERLACE - bool "deinterlace" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EFFECTV - bool "effectv" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EQUALIZER - bool "equalizer" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLV - bool "flv" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX - bool "flx" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM - bool "goom" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1 - bool "goom2k1" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX - bool "id3demux (*.mp3 audio)" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ICYDEMUX - bool "icydemux" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE - bool "imagefreeze" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE - bool "interleave" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4 - bool "isomp4" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW - bool "law" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LEVEL - bool "level" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA - bool "matroska" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MONOSCOPE - bool "monoscope" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE - bool "multifile" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART - bool "multipart" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_REPLAYGAIN - bool "replaygain" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP - bool "rtp" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTPMANAGER - bool "rtpmanager" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP - bool "rtsp" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SHAPEWIPE - bool "shapewipe" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE - bool "smpte" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPECTRUM - bool "spectrum" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP - bool "udp" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX - bool "videobox" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOCROP - bool "videocrop" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER - bool "videofilter" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOMIXER - bool "videomixer" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVENC - bool "wavenc" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE - bool "wavparse (*.wav audio)" - default y - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_Y4M - bool "y4m" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2 - bool "v4l2" - -comment "plugins with external dependencies" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX - bool "annodex (XML Library)" - select BR2_PACKAGE_LIBXML2 - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO - bool "cairo" - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC - bool "flac (libFLAC)" - depends on BR2_USE_WCHAR # flac - select BR2_PACKAGE_FLAC - -comment "flac needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF - bool "gdkpixbuf" - depends on BR2_USE_WCHAR # gdk-pixbuf -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2 - select BR2_PACKAGE_GDK_PIXBUF - -comment "gdkpixbuf needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS - bool "ossaudio (OSS audio)" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4 - bool "oss4 (Open Sound System 4)" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE - bool "pulseaudio" - depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio - depends on BR2_USE_MMU # pulseaudio - depends on !BR2_STATIC_LIBS # pulseaudio - depends on BR2_USE_WCHAR # pulseaudio - depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC # pulseaudio - select BR2_PACKAGE_PULSEAUDIO - -comment "pulseaudio support needs a toolchain w/ threads, wchar, dynamic library" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_USE_WCHAR - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC - bool "souphttpsrc (http client)" - depends on BR2_USE_WCHAR # libsoup -> glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup -> glib2 - select BR2_PACKAGE_LIBSOUP - -comment "souphttpsrc needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX - bool "speex" - select BR2_PACKAGE_SPEEX - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK - bool "wavpack (*.wv audio)" - select BR2_PACKAGE_WAVPACK - -endif diff --git a/buildroot/package/gstreamer/gst-plugins-good/gst-plugins-good.hash b/buildroot/package/gstreamer/gst-plugins-good/gst-plugins-good.hash deleted file mode 100644 index 094dc8797..000000000 --- a/buildroot/package/gstreamer/gst-plugins-good/gst-plugins-good.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz.md5 -md5 555845ceab722e517040bab57f9ace95 gst-plugins-good-0.10.31.tar.xz diff --git a/buildroot/package/gstreamer/gst-plugins-good/gst-plugins-good.mk b/buildroot/package/gstreamer/gst-plugins-good/gst-plugins-good.mk deleted file mode 100644 index 791b41351..000000000 --- a/buildroot/package/gstreamer/gst-plugins-good/gst-plugins-good.mk +++ /dev/null @@ -1,394 +0,0 @@ -################################################################################ -# -# gst-plugins-good -# -################################################################################ - -GST_PLUGINS_GOOD_VERSION = 0.10.31 -GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.xz -GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good -GST_PLUGINS_GOOD_LICENSE = LGPL-2.1+ -GST_PLUGINS_GOOD_LICENSE_FILES = COPYING - -GST_PLUGINS_GOOD_CONF_OPTS = \ - --disable-examples \ - --disable-directsound \ - --disable-sunaudio \ - --disable-osx_audio \ - --disable-osx_video \ - --disable-aalib \ - --disable-aalibtest \ - --disable-esd \ - --disable-esdtest \ - --disable-shout2 - -GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base - -ifeq ($(BR2_PACKAGE_XORG7),y) -GST_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv -GST_PLUGINS_GOOD_CONF_OPTS += \ - --enable-x \ - --enable-xshm \ - --enable-xvideo -else -GST_PLUGINS_GOOD_CONF_OPTS += \ - --disable-x \ - --disable-xshm \ - --disable-xvideo -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-jpeg -GST_PLUGINS_GOOD_DEPENDENCIES += jpeg -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-jpeg -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PNG),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-libpng -GST_PLUGINS_GOOD_DEPENDENCIES += libpng -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-libpng -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-bz2 -GST_PLUGINS_GOOD_DEPENDENCIES += bzip2 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-bz2 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-zlib -GST_PLUGINS_GOOD_DEPENDENCIES += zlib -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ALPHA),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-alpha -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-alpha -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_APETAG),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-apetag -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-apetag -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOFX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-audiofx -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-audiofx -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-audioparsers -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-audioparsers -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUPARSE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-auparse -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-auparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUTODETECT),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-autodetect -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-autodetect -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AVI),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-avi -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-avi -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CUTTER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-cutter -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-cutter -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEBUGUTILS),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-debugutils -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-debugutils -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEINTERLACE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-deinterlace -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-deinterlace -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EFFECTV),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-effectv -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-effectv -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EQUALIZER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-equalizer -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-equalizer -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLV),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-flv -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-flv -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-flx -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-flx -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-goom -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-goom -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-goom2k1 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-goom2k1 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-id3demux -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-id3demux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ICYDEMUX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-icydemux -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-icydemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-imagefreeze -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-imagefreeze -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-interleave -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-interleave -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-isomp4 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-isomp4 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-law -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-law -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LEVEL),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-level -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-level -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-matroska -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-matroska -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MONOSCOPE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-monoscope -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-monoscope -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-multifile -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-multifile -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-multipart -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-multipart -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_REPLAYGAIN),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-replaygain -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-replaygain -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtp -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTPMANAGER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtpmanager -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtpmanager -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtsp -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtsp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-shapewipe -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-shapewipe -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-smpte -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-smpte -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPECTRUM),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-spectrum -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-spectrum -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-udp -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-udp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-videobox -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-videobox -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOCROP),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-videocrop -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-videocrop -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-videofilter -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-videofilter -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOMIXER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-videomixer -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-videomixer -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVENC),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavenc -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavenc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavparse -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_Y4M),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-y4m -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-y4m -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-gst_v4l2 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-gst_v4l2 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-annodex -GST_PLUGINS_GOOD_DEPENDENCIES += libxml2 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-annodex -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-cairo -GST_PLUGINS_GOOD_DEPENDENCIES += cairo -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-cairo -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-flac -GST_PLUGINS_GOOD_DEPENDENCIES += flac -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-flac -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-gdk_pixbuf -GST_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-gdk_pixbuf -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-oss -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-oss -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-oss4 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-oss4 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-pulse -GST_PLUGINS_GOOD_DEPENDENCIES += pulseaudio -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-pulse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-soup -GST_PLUGINS_GOOD_DEPENDENCIES += libsoup -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-soup -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-speex -GST_PLUGINS_GOOD_DEPENDENCIES += speex -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-speex -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavpack -GST_PLUGINS_GOOD_DEPENDENCIES += wavpack -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavpack -endif - -$(eval $(autotools-package)) diff --git a/buildroot/package/gstreamer/gst-plugins-ugly/Config.in b/buildroot/package/gstreamer/gst-plugins-ugly/Config.in deleted file mode 100644 index 3d133cf3f..000000000 --- a/buildroot/package/gstreamer/gst-plugins-ugly/Config.in +++ /dev/null @@ -1,53 +0,0 @@ -menuconfig BR2_PACKAGE_GST_PLUGINS_UGLY - bool "gst-plugins-ugly" - select BR2_PACKAGE_GST_PLUGINS_BASE - help - A set of well-supported plug-ins for GStreamer, but might pose - problems for distributors. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST_PLUGINS_UGLY - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ASFDEMUX - bool "asfdemux" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC - bool "dvdlpcmdec" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDSUB - bool "dvdsub" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_IEC958 - bool "iec958" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGAUDIOPARSE - bool "mpegaudioparse" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGSTREAM - bool "mpegstream" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_REALMEDIA - bool "realmedia" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_SYNAESTHESIA - bool "synaesthesia" - -comment "plugins with external dependencies (there may be more available)" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_LAME - bool "lame (*.mp3 audio encoder)" - select BR2_PACKAGE_LAME - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD - bool "mad (*.mp3 audio)" - select BR2_PACKAGE_LIBID3TAG - select BR2_PACKAGE_LIBMAD - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEG2DEC - bool "mpeg2dec" - select BR2_PACKAGE_LIBMPEG2 - -endif diff --git a/buildroot/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.hash b/buildroot/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.hash deleted file mode 100644 index 56f2a8c4b..000000000 --- a/buildroot/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz.md5 -md5 ba26045c8c8c91f0d48d327ccf53ac0c gst-plugins-ugly-0.10.19.tar.xz -# Locally computed -sha256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 gst-plugins-ugly-0.10.19.tar.xz -sha256 2a8aa4cd019fab333f1f8377bf7afa426d3038a033361d90fab70c335e9a53e7 cdio-cd-text-api.patch diff --git a/buildroot/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk b/buildroot/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk deleted file mode 100644 index 1a1e2a11b..000000000 --- a/buildroot/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk +++ /dev/null @@ -1,90 +0,0 @@ -################################################################################ -# -# gst-plugins-ugly -# -################################################################################ - -GST_PLUGINS_UGLY_VERSION = 0.10.19 -GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.xz -GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly -GST_PLUGINS_UGLY_PATCH = http://git.alpinelinux.org/cgit/aports/plain/main/gst-plugins-ugly0.10/cdio-cd-text-api.patch -# COPYING is in fact LGPL-2.1, but all of the code is LGPL-2.0+ -# (except for one test, xingmux) -GST_PLUGINS_UGLY_LICENSE = LGPL-2.0+, GPL-2.0+ (synaesthesia) -GST_PLUGINS_UGLY_LICENSE_FILES = COPYING - -GST_PLUGINS_UGLY_CONF_OPTS = \ - --disable-examples - -GST_PLUGINS_UGLY_DEPENDENCIES = gstreamer gst-plugins-base - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-asfdemux -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-asfdemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-dvdlpcmdec -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-dvdlpcmdec -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDSUB),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-dvdsub -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_IEC958),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-iec958 -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-iec958 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGAUDIOPARSE),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpegaudioparse -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpegaudioparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGSTREAM),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpegstream -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpegstream -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-realmedia -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_SYNAESTHESIA),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-synaesthesia -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-synaesthesia -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_LAME),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-lame -GST_PLUGINS_UGLY_DEPENDENCIES += lame -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-lame -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-mad -GST_PLUGINS_UGLY_DEPENDENCIES += libid3tag libmad -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-mad -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec -GST_PLUGINS_UGLY_DEPENDENCIES += libmpeg2 -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec -endif - -$(eval $(autotools-package)) diff --git a/buildroot/package/gstreamer/gstreamer.mk b/buildroot/package/gstreamer/gstreamer.mk deleted file mode 100644 index 22240bcee..000000000 --- a/buildroot/package/gstreamer/gstreamer.mk +++ /dev/null @@ -1 +0,0 @@ -include $(sort $(wildcard package/gstreamer/*/*.mk)) diff --git a/buildroot/package/gstreamer/gstreamer/0001-bison3.patch b/buildroot/package/gstreamer/gstreamer/0001-bison3.patch deleted file mode 100644 index f9ec52d95..000000000 --- a/buildroot/package/gstreamer/gstreamer/0001-bison3.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix deprecation from bison 3.0+ -From http://comments.gmane.org/gmane.linux.lfs.beyond.devel/24620 - -Signed-off-by: Gustavo Zacarias - -diff -Nura gstreamer-0.10.36.orig/gst/parse/grammar.y gstreamer-0.10.36/gst/parse/grammar.y ---- gstreamer-0.10.36.orig/gst/parse/grammar.y 2013-10-04 09:52:21.685282055 -0300 -+++ gstreamer-0.10.36/gst/parse/grammar.y 2013-10-04 10:21:54.800211238 -0300 -@@ -26,7 +26,6 @@ - */ - - #define YYERROR_VERBOSE 1 --#define YYLEX_PARAM scanner - - #define YYENABLE_NLS 0 - -@@ -648,6 +647,7 @@ - %right '.' - %left '!' '=' - -+%lex-param { void *scanner } - %parse-param { void *scanner } - %parse-param { graph_t *graph } - %pure-parser diff --git a/buildroot/package/gstreamer/gstreamer/Config.in b/buildroot/package/gstreamer/gstreamer/Config.in deleted file mode 100644 index b1334abfc..000000000 --- a/buildroot/package/gstreamer/gstreamer/Config.in +++ /dev/null @@ -1,38 +0,0 @@ -comment "gstreamer 0.10 needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - -config BR2_PACKAGE_GSTREAMER - bool "gstreamer 0.10" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBGLIB2 - help - GStreamer is an open source multimedia framework. - - This 0.10.x version of GStreamer is incompatible with - GStreamer 1.X. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GSTREAMER - -config BR2_PACKAGE_GSTREAMER_GST_DEBUG - bool "enable gst-debug trace support" - default y - help - Enable support for the gst-debug tracing functionality in - gstreamer. This has limited CPU overhead, but does increase - the rootfs size somewhat. - -config BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY - bool "enable plugin registry" - default y - help - Enable support for the GStreamer plugin registry. This may - increase the launch-time for a GStreamer application. - -endif diff --git a/buildroot/package/gstreamer/gstreamer/gstreamer.hash b/buildroot/package/gstreamer/gstreamer/gstreamer.hash deleted file mode 100644 index 4fcf34ac3..000000000 --- a/buildroot/package/gstreamer/gstreamer/gstreamer.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.36.tar.xz.md5 -md5 15389c73e091b1dda915279c388b9cb2 gstreamer-0.10.36.tar.xz -# locally computed -sha256 9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da gstreamer-0.10.36.tar.xz diff --git a/buildroot/package/gstreamer/gstreamer/gstreamer.mk b/buildroot/package/gstreamer/gstreamer/gstreamer.mk deleted file mode 100644 index 2ec360c94..000000000 --- a/buildroot/package/gstreamer/gstreamer/gstreamer.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# gstreamer -# -################################################################################ - -GSTREAMER_VERSION = 0.10.36 -GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.xz -GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer -GSTREAMER_INSTALL_STAGING = YES -# COPYING is in fact v2, but most of the code is v2.1+ -GSTREAMER_LICENSE = LGPL-2.1+ -GSTREAMER_LICENSE_FILES = COPYING - -# Checking if unaligned memory access works correctly cannot be done when cross -# compiling. For the following architectures there is no information available -# in the configure script. -ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze)$(BR2_nios2)$(BR2_or1k)$(BR2_riscv),y) -GSTREAMER_CONF_ENV = as_cv_unaligned_access=no -endif -ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) -GSTREAMER_CONF_ENV = as_cv_unaligned_access=yes -endif - -GSTREAMER_CONF_OPTS = \ - --disable-examples \ - --disable-tests \ - --disable-failing-tests \ - --disable-loadsave \ - $(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug) \ - $(if $(BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY),,--disable-registry) - -GSTREAMER_DEPENDENCIES = libglib2 host-pkgconf host-bison host-flex \ - $(if $(BR2_PACKAGE_LIBXML2),libxml2) - -$(eval $(autotools-package)) diff --git a/buildroot/package/gstreamer1/Config.in b/buildroot/package/gstreamer1/Config.in index 922ecefcf..bb5c1d2af 100644 --- a/buildroot/package/gstreamer1/Config.in +++ b/buildroot/package/gstreamer1/Config.in @@ -4,6 +4,7 @@ source "package/gstreamer1/gstreamer1/Config.in" if BR2_PACKAGE_GSTREAMER1 source "package/gstreamer1/gstreamer1-mm/Config.in" source "package/gstreamer1/gst1-plugins-base/Config.in" +source "package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in" source "package/gstreamer1/gst1-plugins-good/Config.in" source "package/gstreamer1/gst1-plugins-bad/Config.in" source "package/gstreamer1/gst1-plugins-ugly/Config.in" diff --git a/buildroot/package/gstreamer1/gst-omx/gst-omx.hash b/buildroot/package/gstreamer1/gst-omx/gst-omx.hash index 3efd9f322..85487f349 100644 --- a/buildroot/package/gstreamer1/gst-omx/gst-omx.hash +++ b/buildroot/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.14.4.tar.xz.sha256sum -sha256 969870e75c1f75c96f8783530e2c2932fc3afbfd976eb0c466f51dae268ea3d4 gst-omx-1.14.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.16.2.tar.xz.sha256sum +sha256 11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439 gst-omx-1.16.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/gstreamer1/gst-omx/gst-omx.mk b/buildroot/package/gstreamer1/gst-omx/gst-omx.mk index bb325ad1d..5ed9e3ce2 100644 --- a/buildroot/package/gstreamer1/gst-omx/gst-omx.mk +++ b/buildroot/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.14.4 +GST_OMX_VERSION = 1.16.2 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx diff --git a/buildroot/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch b/buildroot/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch new file mode 100644 index 000000000..dcc586311 --- /dev/null +++ b/buildroot/package/gstreamer1/gst1-imx/0001-waf-update-to-2-0-12.patch @@ -0,0 +1,28 @@ +From 66bc1c2b9c74dab4706a1ca3696e863ed8d30433 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Sun, 15 Dec 2019 14:24:54 +0000 +Subject: [PATCH] waf: update to 2.0.12 + +Prepare to allow building with python3. + +Signed-off-by: Max Krummenacher +[Titouan: backport part from upstream, but drop the update of waf itself] +Signed-off-by: Titouan Christophe +--- + wscript | 3 ++- + 2 files changed, 12 insertions(+), 11 deletions(-) + +diff --git a/wscript b/wscript +index c3a9926..f076b64 100644 +--- a/wscript ++++ b/wscript +@@ -152,7 +152,8 @@ def configure(conf): + + # test for GStreamer libraries + +- gst_version_str = conf.check_cfg(package = 'gstreamer-1.0 >= 1.2.0', modversion = "gstreamer-1.0", uselib_store = 'GSTREAMER', args = '--cflags --libs', mandatory = 1) ++ conf.check_cfg(package = 'gstreamer-1.0 >= 1.2.0', uselib_store = 'GSTREAMER', args = '--cflags --libs', mandatory = 1) ++ gst_version_str = conf.check_cfg(modversion = "gstreamer-1.0", uselib_store = 'GSTREAMER', args = '--cflags --libs', mandatory = 1) + gst_version = [int(x) for x in re.match('(\d*)\.(\d*)\.(\d*)', gst_version_str).groups()] + conf.env['GSTREAMER_VERSION'] = gst_version + diff --git a/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk b/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk index 43b4d9b15..115607727 100644 --- a/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk +++ b/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk @@ -11,6 +11,7 @@ GST1_IMX_LICENSE = LGPL-2.0+ GST1_IMX_LICENSE_FILES = LICENSE GST1_IMX_INSTALL_STAGING = YES +GST1_IMX_NEEDS_EXTERNAL_WAF = YES GST1_IMX_DEPENDENCIES += \ host-pkgconf \ diff --git a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index b9b1c5e42..0ce6ad460 100644 --- a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 3f8cc5cf4861e5836938c66415b47555550c93b06b1bc9faed83e89bacf705cf gst1-interpipe-10dba89eecc200e49f0b432e299f1c8a4312b657.tar.gz +sha256 6dc2c9d5ff4c3777d40712199a0cafa6bc0058327bca5a20e31d743a46e1ad21 gst1-interpipe-9af5b40d106f35ce75f8baa5efc8c59fc5f7eda1.tar.gz # Hashes for license files: sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index 8f810f9cf..87e5f2e5d 100644 --- a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 10dba89eecc200e49f0b432e299f1c8a4312b657 +GST1_INTERPIPE_VERSION = 9af5b40d106f35ce75f8baa5efc8c59fc5f7eda1 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module diff --git a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash index 741c58231..15e4d859e 100644 --- a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.14.4.tar.xz.sha256sum -sha256 dfd78591901df7853eab7e56a86c34a1b03635da0d3d56b89aa577f1897865da gst-libav-1.14.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.2.tar.xz.sha256sum +sha256 c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2 gst-libav-1.16.2.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk index 7ed90a941..fdd4d6cc2 100644 --- a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,15 +4,39 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.14.4 +GST1_LIBAV_VERSION = 1.16.2 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav -GST1_LIBAV_CONF_OPTS = --with-system-libav + GST1_LIBAV_DEPENDENCIES = \ host-pkgconf ffmpeg gstreamer1 gst1-plugins-base \ $(if $(BR2_PACKAGE_BZIP2),bzip2) \ $(if $(BR2_PACKAGE_XZ),xz) GST1_LIBAV_LICENSE = GPL-2.0+ GST1_LIBAV_LICENSE_FILES = COPYING +GST1_LIBAV_CONF_EXTRA_OPTS = --cross-prefix=$(TARGET_CROSS) --target-os=linux + +# fixes arm build: https://bugzilla.gnome.org/show_bug.cgi?id=694416 +ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be),y) +GST1_LIBAV_CONF_ENV = AS="$(TARGET_CROSS)gcc" +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +GST1_LIBAV_CONF_EXTRA_OPTS += --enable-zlib +GST1_LIBAV_DEPENDENCIES += zlib +else +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-zlib +endif + +ifeq ($(BR2_PACKAGE_BZIP2),y) +GST1_LIBAV_CONF_EXTRA_OPTS += --enable-bzlib +GST1_LIBAV_DEPENDENCIES += bzip2 +else +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-bzlib +endif + +GST1_LIBAV_CONF_OPTS = \ + --with-system-libav \ + --with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPTS)" $(eval $(autotools-package)) diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/0001-fdkaacenc-Remove-MODE_2_1.patch b/buildroot/package/gstreamer1/gst1-plugins-bad/0001-fdkaacenc-Remove-MODE_2_1.patch deleted file mode 100644 index a9c5d44d9..000000000 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/0001-fdkaacenc-Remove-MODE_2_1.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f4fdb9770c76113f38515245fecc5f11b3ace20d Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Tue, 4 Dec 2018 17:54:42 +0100 -Subject: [PATCH] fdkaacenc: Remove MODE_2_1 - -This is not a standard mode and no longer supported by fdk-aac 2.0.0. - -For https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/825 - -Signed-off-by: Peter Korsgaard ---- - ext/fdkaac/gstfdkaacenc.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/ext/fdkaac/gstfdkaacenc.c b/ext/fdkaac/gstfdkaacenc.c -index ad2bcb492..8410e684c 100644 ---- a/ext/fdkaac/gstfdkaacenc.c -+++ b/ext/fdkaac/gstfdkaacenc.c -@@ -71,10 +71,6 @@ static const struct - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, - GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}}, { -- 3, MODE_2_1, { -- GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, -- GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, -- GST_AUDIO_CHANNEL_POSITION_LFE1}}, { - 4, MODE_1_2_1, { - GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, - GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, --- -2.11.0 - diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/0002-fdkaacdec-Use-WAV-channel-mapping-instead-of-interle.patch b/buildroot/package/gstreamer1/gst1-plugins-bad/0002-fdkaacdec-Use-WAV-channel-mapping-instead-of-interle.patch deleted file mode 100644 index 004971426..000000000 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/0002-fdkaacdec-Use-WAV-channel-mapping-instead-of-interle.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 19d34f6b5e1633d5ec4bb2832c58470f0c829cab Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Wed, 5 Dec 2018 10:10:39 +0100 -Subject: [PATCH] fdkaacdec: Use WAV channel mapping instead of interleave - setting - -The latter is going away in libfdk-aac 2.0.0. Instead, MPEG-style output -is always non-interleaved and WAV-style output is always interleaved. -Earlier libfdk-aac also defaults interleaving accordingly. - -Since our reordering looks at the associated PCE indices instead of the -actual channel order, we're agnostic to the mapping. - -For https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/825 - -Signed-off-by: Peter Korsgaard ---- - ext/fdkaac/gstfdkaacdec.c | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/ext/fdkaac/gstfdkaacdec.c b/ext/fdkaac/gstfdkaacdec.c -index c27183752..f5136b334 100644 ---- a/ext/fdkaac/gstfdkaacdec.c -+++ b/ext/fdkaac/gstfdkaacdec.c -@@ -151,17 +151,13 @@ gst_fdkaacdec_set_format (GstAudioDecoder * dec, GstCaps * caps) - gst_buffer_unref (codec_data); - } - -+ /* Choose WAV channel mapping to get interleaving even with libfdk-aac 2.0.0 -+ * The pChannelIndices retain the indices from the standard MPEG mapping so -+ * we're agnostic to the actual order. */ - if ((err = - aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_CHANNEL_MAPPING, -- 0)) != AAC_DEC_OK) { -- GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err); -- return FALSE; -- } -- -- if ((err = -- aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_INTERLEAVED, - 1)) != AAC_DEC_OK) { -- GST_ERROR_OBJECT (self, "Failed to set interleaved output: %d", err); -+ GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err); - return FALSE; - } - --- -2.11.0 - diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in b/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in index d36316bf3..08de5d218 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in @@ -46,16 +46,16 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD help Audio filters plugin +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOLATENCY + bool "audiolatency" + help + Audio latency plugin + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX bool "audiomixmatrix" help Audio N:M mixer plugin -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR - bool "compositor" - help - Video compositor plugin - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS bool "audiovisualizers" help @@ -217,6 +217,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM help PNM plugin +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PROXY + bool "proxy" + help + Proxy plugin + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE bool "rawparse" help @@ -263,9 +268,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC help subtitle encoders -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO - bool "stereo" - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE bool "timecode" @@ -279,11 +281,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFRAME_AUDIOLEVEL help videoframe_audiolevel -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IQA - bool "iqa" - help - Image Quality Assessment - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS bool "videoparsers" help @@ -311,6 +308,24 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER bool "assrender" select BR2_PACKAGE_LIBASS +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ + bool "bluez" + depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, libglib2 + depends on BR2_USE_MMU # bluez5_utils -> dbus + depends on !BR2_STATIC_LIBS # bluez5_utils -> uses dlfcn + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils + select BR2_PACKAGE_BLUEZ5_UTILS + help + Bluetooth audio A2DP/AVDTP sink, AVDTP source plugin + +comment "bluez plugin needs a toolchain w/ wchar, threads, headers >= 3.4, dynamic library" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_USE_MMU + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2 bool "bz2" select BR2_PACKAGE_BZIP2 @@ -378,6 +393,19 @@ comment "fdk-aac needs a toolchain w/ C++" depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH + bool "fluidsynth" + depends on BR2_USE_WCHAR # fluidsynth + depends on BR2_TOOLCHAIN_HAS_THREADS # fluidsynth + depends on BR2_USE_MMU # fluidsynth + select BR2_PACKAGE_FLUIDSYNTH + help + Fluidsynth MIDI decoder plugin + +comment "fluidsynth needs a toolchain w/ threads, wchar" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL bool "gl" default y @@ -435,10 +463,19 @@ comment "ttml needs a toolchain w/ wchar, threads, C++" config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC bool "mpeg2enc" + depends on BR2_USE_MMU # fork + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBMPEG2 + select BR2_PACKAGE_MJPEGTOOLS help High-quality MPEG-1/2 video encoder +comment "mpeg2enc needs a toolchain w/ threads, C++" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MUSEPACK bool "musepack" select BR2_PACKAGE_MUSEPACK @@ -461,27 +498,6 @@ comment "openal plugin needs a toolchain w/ NPTL, C++" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_INSTALL_LIBSTDCPP -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV - bool "opencv" - depends on BR2_PACKAGE_OPENCV - # Remove the following opencv modules when gstreamer fixes the - # problem of including the old "cv.h" header - # bug: https://bugzilla.gnome.org/show_bug.cgi?id=725163 - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_CONTRIB - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_FLANN - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_LEGACY - select BR2_PACKAGE_OPENCV_LIB_ML - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - GStreamer OpenCV Plugins - -comment "opencv plugin needs OpenCV-2.4" - depends on !BR2_PACKAGE_OPENCV - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264 bool "openh264" depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS @@ -513,12 +529,14 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG bool "rsvg" depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # librsvg -> pango -> harfbuzz select BR2_PACKAGE_LIBRSVG help RSVG plugin library -comment "rsvg plugin needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "rsvg plugin needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_SYNC_4 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SBC @@ -538,9 +556,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SRTP bool "srtp" select BR2_PACKAGE_LIBSRTP -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD - bool "vcd" - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC bool "voaacenc" select BR2_PACKAGE_VO_AACENC @@ -549,6 +564,8 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND bool "wayland" default y depends on BR2_PACKAGE_WAYLAND + depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm -> libpthread-stubs + select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_WAYLAND_PROTOCOLS help Wayland Video Sink @@ -559,6 +576,17 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP help Webp image format plugin +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC + bool "webrtc" + depends on !BR2_STATIC_LIBS # libnice -> gnutls + select BR2_PACKAGE_GST1_PLUGINS_BASE # libgstsdp + select BR2_PACKAGE_LIBNICE + help + WebRTC plugins (webrtcbin - a bin for webrtc connections) + +comment "webrtc needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP bool "webrtcdsp" # All depends from webrtc-audio-processing @@ -575,6 +603,16 @@ comment "webrtcdsp needs a toolchain w/ C++, NPTL, gcc >= 4.8" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WPE + bool "wpe" + default y + depends on BR2_PACKAGE_WPEWEBKIT + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL + +comment "wpe needs the gst1-plugins-base opengl library and wpewebkit" + depends on !BR2_PACKAGE_WPEWEBKIT \ + || !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265 bool "x265" depends on BR2_INSTALL_LIBSTDCPP @@ -587,4 +625,17 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265 comment "x265 needs a toolchain w/ C++, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +config BR2_PACKAGE_GST1_PLUGINS_BAD_ZBAR + bool "zbar" + depends on BR2_TOOLCHAIN_HAS_THREADS # zbar-> libv4l + depends on BR2_USE_MMU # zbar-> libv4l + depends on BR2_INSTALL_LIBSTDCPP # zbar-> libv4l + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # zbar -> libv4l + select BR2_PACKAGE_ZBAR + +comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + endif diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index cb4bf6467..7b59b4dbe 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.4.tar.xz.sha256sum -sha256 910b4e0e2e897e8b6d06767af1779d70057c309f67292f485ff988d087aa0de5 gst-plugins-bad-1.14.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz.sha256sum +sha256 f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74 gst-plugins-bad-1.16.2.tar.xz sha256 0b12e4d1cd5db5f8a0c04fc98a1d8c3acc533097b6198d6644420da78d460223 COPYING sha256 cf9b86bcf2d298e8cf5b9d8982f9dab296465b002fdfa0347357a0732f961e03 COPYING.LIB diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ac39f1e5c..ef36e4dc0 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,738 +4,739 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.14.4 +GST1_PLUGINS_BAD_VERSION = 1.16.2 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES # Additional plugin licenses will be appended to GST1_PLUGINS_BAD_LICENSE and # GST1_PLUGINS_BAD_LICENSE_FILES if enabled. GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB -GST1_PLUGINS_BAD_LICENSE := LGPL-2.0+, LGPL-2.1+ +GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+, LGPL-2.1+ + +GST1_PLUGINS_BAD_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_PLUGINS_BAD_CONF_OPTS = \ - --disable-examples \ - --disable-valgrind \ - --disable-directsound \ - --disable-direct3d \ - --disable-winks \ - --disable-android_media \ - --disable-apple_media \ - --disable-acm \ - --disable-introspection + -Dexamples=disabled \ + -Dtests=disabled \ + -Ddirectsound=disabled \ + -Dd3dvideosink=disabled \ + -Dwinks=disabled \ + -Dandroidmedia=disabled \ + -Dapplemedia=disabled \ + -Dintrospection=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled # Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \ - --disable-avc \ - --disable-opensles \ - --disable-uvch264 \ - --disable-msdk \ - --disable-voamrwbenc \ - --disable-bs2b \ - --disable-chromaprint \ - --disable-dc1394 \ - --disable-dts \ - --disable-resindvd \ - --disable-faac \ - --disable-flite \ - --disable-gsm \ - --disable-fluidsynth \ - --disable-kate \ - --disable-ladspa \ - --disable-lv2 \ - --disable-libde265 \ - --disable-modplug \ - --disable-mplex \ - --disable-ofa \ - --disable-openexr \ - --disable-openni2 \ - --disable-teletextdec \ - --disable-wildmidi \ - --disable-smoothstreaming \ - --disable-soundtouch \ - --disable-spc \ - --disable-gme \ - --disable-vdpau \ - --disable-schro \ - --disable-zbar \ - --disable-spandsp \ - --disable-gtk3 + -Dopensles=disabled \ + -Duvch264=disabled \ + -Dmsdk=disabled \ + -Dvoamrwbenc=disabled \ + -Dbs2b=disabled \ + -Dchromaprint=disabled \ + -Ddc1394=disabled \ + -Ddts=disabled \ + -Dresindvd=disabled \ + -Dfaac=disabled \ + -Dflite=disabled \ + -Dgsm=disabled \ + -Dkate=disabled \ + -Dladspa=disabled \ + -Dlv2=disabled \ + -Dlibde265=disabled \ + -Dmodplug=disabled \ + -Dmplex=disabled \ + -Dofa=disabled \ + -Dopenexr=disabled \ + -Dopenni2=disabled \ + -Dteletextdec=disabled \ + -Dwildmidi=disabled \ + -Dsmoothstreaming=disabled \ + -Dsoundtouch=disabled \ + -Dgme=disabled \ + -Dvdpau=disabled \ + -Dspandsp=disabled \ + -Diqa=disabled \ + -Dopencv=disabled GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1 -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -# RPI has odd locations for several required headers. -GST1_PLUGINS_BAD_CONF_ENV += \ - CPPFLAGS="$(TARGET_CPPFLAGS) \ - -I$(STAGING_DIR)/usr/include/IL \ - -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-wayland -GST1_PLUGINS_BAD_DEPENDENCIES += wayland wayland-protocols +GST1_PLUGINS_BAD_CONF_OPTS += -Dwayland=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += libdrm wayland wayland-protocols else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-wayland +GST1_PLUGINS_BAD_CONF_OPTS += -Dwayland=disabled endif ifeq ($(BR2_PACKAGE_ORC),y) GST1_PLUGINS_BAD_DEPENDENCIES += orc -GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc +GST1_PLUGINS_BAD_CONF_OPTS += -Dorc=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dorc=disabled endif -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -GST1_PLUGINS_BAD_DEPENDENCIES += bluez_utils -GST1_PLUGINS_BAD_CONF_OPTS += --enable-bluez +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ),y) +GST1_PLUGINS_BAD_DEPENDENCIES += bluez5_utils +GST1_PLUGINS_BAD_CONF_OPTS += -Dbluez=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-bluez +GST1_PLUGINS_BAD_CONF_OPTS += -Dbluez=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ACCURIP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-accurip +GST1_PLUGINS_BAD_CONF_OPTS += -Daccurip=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-accurip +GST1_PLUGINS_BAD_CONF_OPTS += -Daccurip=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-adpcmdec +GST1_PLUGINS_BAD_CONF_OPTS += -Dadpcmdec=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-adpcmdec +GST1_PLUGINS_BAD_CONF_OPTS += -Dadpcmdec=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-adpcmenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dadpcmenc=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-adpcmenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dadpcmenc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AIFF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-aiff +GST1_PLUGINS_BAD_CONF_OPTS += -Daiff=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-aiff +GST1_PLUGINS_BAD_CONF_OPTS += -Daiff=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASFMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-asfmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dasfmux=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-asfmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dasfmux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOBUFFERSPLIT),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiobuffersplit +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiobuffersplit=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiobuffersplit +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiobuffersplit=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiofxbad +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiofxbad=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiofxbad +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiofxbad=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOLATENCY),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiolatency=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiolatency=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixmatrix +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiomixmatrix=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiomixmatrix -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-compositor -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-compositor +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiomixmatrix=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiovisualizers=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiovisualizers=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-autoconvert +GST1_PLUGINS_BAD_CONF_OPTS += -Dautoconvert=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-autoconvert +GST1_PLUGINS_BAD_CONF_OPTS += -Dautoconvert=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-bayer +GST1_PLUGINS_BAD_CONF_OPTS += -Dbayer=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-bayer +GST1_PLUGINS_BAD_CONF_OPTS += -Dbayer=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-camerabin2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dcamerabin2=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-camerabin2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dcamerabin2=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-coloreffects +GST1_PLUGINS_BAD_CONF_OPTS += -Dcoloreffects=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-coloreffects +GST1_PLUGINS_BAD_CONF_OPTS += -Dcoloreffects=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-debugutils +GST1_PLUGINS_BAD_CONF_OPTS += -Ddebugutils=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-debugutils +GST1_PLUGINS_BAD_CONF_OPTS += -Ddebugutils=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsuboverlay=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvbsuboverlay +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsuboverlay=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvdspu +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvdspu=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvdspu +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvdspu=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-faceoverlay +GST1_PLUGINS_BAD_CONF_OPTS += -Dfaceoverlay=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-faceoverlay +GST1_PLUGINS_BAD_CONF_OPTS += -Dfaceoverlay=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FESTIVAL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-festival +GST1_PLUGINS_BAD_CONF_OPTS += -Dfestival=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-festival +GST1_PLUGINS_BAD_CONF_OPTS += -Dfestival=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-fieldanalysis +GST1_PLUGINS_BAD_CONF_OPTS += -Dfieldanalysis=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-fieldanalysis +GST1_PLUGINS_BAD_CONF_OPTS += -Dfieldanalysis=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREEVERB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-freeverb +GST1_PLUGINS_BAD_CONF_OPTS += -Dfreeverb=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-freeverb +GST1_PLUGINS_BAD_CONF_OPTS += -Dfreeverb=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREI0R),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-frei0r +GST1_PLUGINS_BAD_CONF_OPTS += -Dfrei0r=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-frei0r +GST1_PLUGINS_BAD_CONF_OPTS += -Dfrei0r=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gaudieffects +GST1_PLUGINS_BAD_CONF_OPTS += -Dgaudieffects=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gaudieffects +GST1_PLUGINS_BAD_CONF_OPTS += -Dgaudieffects=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-geometrictransform +GST1_PLUGINS_BAD_CONF_OPTS += -Dgeometrictransform=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-geometrictransform +GST1_PLUGINS_BAD_CONF_OPTS += -Dgeometrictransform=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gdp +GST1_PLUGINS_BAD_CONF_OPTS += -Dgdp=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gdp +GST1_PLUGINS_BAD_CONF_OPTS += -Dgdp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-id3tag +GST1_PLUGINS_BAD_CONF_OPTS += -Did3tag=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-id3tag +GST1_PLUGINS_BAD_CONF_OPTS += -Did3tag=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-inter +GST1_PLUGINS_BAD_CONF_OPTS += -Dinter=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-inter +GST1_PLUGINS_BAD_CONF_OPTS += -Dinter=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-interlace +GST1_PLUGINS_BAD_CONF_OPTS += -Dinterlace=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-interlace +GST1_PLUGINS_BAD_CONF_OPTS += -Dinterlace=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVFPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-ivfparse +GST1_PLUGINS_BAD_CONF_OPTS += -Divfparse=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-ivfparse +GST1_PLUGINS_BAD_CONF_OPTS += -Divfparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVTC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-ivtc +GST1_PLUGINS_BAD_CONF_OPTS += -Divtc=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-ivtc +GST1_PLUGINS_BAD_CONF_OPTS += -Divtc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-jp2kdecimator +GST1_PLUGINS_BAD_CONF_OPTS += -Djp2kdecimator=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-jp2kdecimator +GST1_PLUGINS_BAD_CONF_OPTS += -Djp2kdecimator=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-jpegformat +GST1_PLUGINS_BAD_CONF_OPTS += -Djpegformat=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-jpegformat +GST1_PLUGINS_BAD_CONF_OPTS += -Djpegformat=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBRFB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-librfb +GST1_PLUGINS_BAD_CONF_OPTS += -Dlibrfb=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-librfb +GST1_PLUGINS_BAD_CONF_OPTS += -Dlibrfb=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-midi +GST1_PLUGINS_BAD_CONF_OPTS += -Dmidi=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-midi +GST1_PLUGINS_BAD_CONF_OPTS += -Dmidi=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegdemux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegdemux=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegdemux -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsdemux -GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsdemux -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsmux -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegdemux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegpsmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegpsmux=enabled GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegpsmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegpsmux=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegtsmux=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegtsmux=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegtsdemux=enabled +GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegtsdemux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mxf +GST1_PLUGINS_BAD_CONF_OPTS += -Dmxf=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mxf +GST1_PLUGINS_BAD_CONF_OPTS += -Dmxf=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NETSIM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-netsim +GST1_PLUGINS_BAD_CONF_OPTS += -Dnetsim=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-netsim +GST1_PLUGINS_BAD_CONF_OPTS += -Dnetsim=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ONVIF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-onvif +GST1_PLUGINS_BAD_CONF_OPTS += -Donvif=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-onvif +GST1_PLUGINS_BAD_CONF_OPTS += -Donvif=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PCAPPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-pcapparse +GST1_PLUGINS_BAD_CONF_OPTS += -Dpcapparse=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-pcapparse +GST1_PLUGINS_BAD_CONF_OPTS += -Dpcapparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-pnm +GST1_PLUGINS_BAD_CONF_OPTS += -Dpnm=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-pnm +GST1_PLUGINS_BAD_CONF_OPTS += -Dpnm=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PROXY),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dproxy=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dproxy=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-rawparse +GST1_PLUGINS_BAD_CONF_OPTS += -Drawparse=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-rawparse +GST1_PLUGINS_BAD_CONF_OPTS += -Drawparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-removesilence +GST1_PLUGINS_BAD_CONF_OPTS += -Dremovesilence=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-removesilence +GST1_PLUGINS_BAD_CONF_OPTS += -Dremovesilence=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-rtmp +GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += rtmpdump else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-rtmp +GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdp +GST1_PLUGINS_BAD_CONF_OPTS += -Dsdp=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sdp +GST1_PLUGINS_BAD_CONF_OPTS += -Dsdp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-segmentclip +GST1_PLUGINS_BAD_CONF_OPTS += -Dsegmentclip=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-segmentclip +GST1_PLUGINS_BAD_CONF_OPTS += -Dsegmentclip=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SIREN),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-siren +GST1_PLUGINS_BAD_CONF_OPTS += -Dsiren=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-siren +GST1_PLUGINS_BAD_CONF_OPTS += -Dsiren=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SMOOTH),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-smooth +GST1_PLUGINS_BAD_CONF_OPTS += -Dsmooth=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-smooth +GST1_PLUGINS_BAD_CONF_OPTS += -Dsmooth=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SPEED),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-speed +GST1_PLUGINS_BAD_CONF_OPTS += -Dspeed=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-speed +GST1_PLUGINS_BAD_CONF_OPTS += -Dspeed=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-subenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dsubenc=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-subenc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-stereo -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-stereo +GST1_PLUGINS_BAD_CONF_OPTS += -Dsubenc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-timecode +GST1_PLUGINS_BAD_CONF_OPTS += -Dtimecode=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-timecode +GST1_PLUGINS_BAD_CONF_OPTS += -Dtimecode=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videofilters +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideofilters=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videofilters +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideofilters=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFRAME_AUDIOLEVEL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videoframe_audiolevel +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideoframe_audiolevel=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videoframe_audiolevel -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IQA),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-iqa -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-iqa +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideoframe_audiolevel=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videoparsers +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideoparsers=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videoparsers +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideoparsers=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videosignal +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideosignal=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videosignal +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideosignal=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VMNC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-vmnc +GST1_PLUGINS_BAD_CONF_OPTS += -Dvmnc=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-vmnc +GST1_PLUGINS_BAD_CONF_OPTS += -Dvmnc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-y4m +GST1_PLUGINS_BAD_CONF_OPTS += -Dy4m=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-y4m +GST1_PLUGINS_BAD_CONF_OPTS += -Dy4m=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-yadif +GST1_PLUGINS_BAD_CONF_OPTS += -Dyadif=enabled GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-yadif +GST1_PLUGINS_BAD_CONF_OPTS += -Dyadif=disabled endif # Plugins with dependencies ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-assrender +GST1_PLUGINS_BAD_CONF_OPTS += -Dassrender=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libass else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-assrender +GST1_PLUGINS_BAD_CONF_OPTS += -Dassrender=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-bz2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dbz2=enabled GST1_PLUGINS_BAD_DEPENDENCIES += bzip2 else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-bz2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dbz2=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-curl +GST1_PLUGINS_BAD_CONF_OPTS += -Dcurl=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libcurl else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-curl +GST1_PLUGINS_BAD_CONF_OPTS += -Dcurl=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dash +GST1_PLUGINS_BAD_CONF_OPTS += -Ddash=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libxml2 else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dash +GST1_PLUGINS_BAD_CONF_OPTS += -Ddash=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-decklink +GST1_PLUGINS_BAD_CONF_OPTS += -Ddecklink=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-decklink +GST1_PLUGINS_BAD_CONF_OPTS += -Ddecklink=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-directfb +GST1_PLUGINS_BAD_CONF_OPTS += -Ddirectfb=enabled GST1_PLUGINS_BAD_DEPENDENCIES += directfb else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-directfb +GST1_PLUGINS_BAD_CONF_OPTS += -Ddirectfb=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvb +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvb=enabled GST1_PLUGINS_BAD_DEPENDENCIES += dtv-scan-tables else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvb +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvb=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-faad +GST1_PLUGINS_BAD_CONF_OPTS += -Dfaad=enabled GST1_PLUGINS_BAD_DEPENDENCIES += faad2 GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-faad +GST1_PLUGINS_BAD_CONF_OPTS += -Dfaad=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-fbdev +GST1_PLUGINS_BAD_CONF_OPTS += -Dfbdev=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-fbdev +GST1_PLUGINS_BAD_CONF_OPTS += -Dfbdev=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-fdk_aac +GST1_PLUGINS_BAD_CONF_OPTS += -Dfdkaac=enabled GST1_PLUGINS_BAD_DEPENDENCIES += fdk-aac else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-fdk_aac +GST1_PLUGINS_BAD_CONF_OPTS += -Dfdkaac=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dfluidsynth=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += fluidsynth +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dfluidsynth=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gl +GST1_PLUGINS_BAD_CONF_OPTS += -Dgl=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gl +GST1_PLUGINS_BAD_CONF_OPTS += -Dgl=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-hls +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls=enabled ifeq ($(BR2_PACKAGE_NETTLE),y) GST1_PLUGINS_BAD_DEPENDENCIES += nettle -GST1_PLUGINS_BAD_CONF_OPTS += --with-hls-crypto=nettle +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls-crypto='nettle' else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) GST1_PLUGINS_BAD_DEPENDENCIES += libgcrypt -GST1_PLUGINS_BAD_CONF_OPTS += --with-hls-crypto=libgcrypt \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls-crypto='libgcrypt' else GST1_PLUGINS_BAD_DEPENDENCIES += openssl -GST1_PLUGINS_BAD_CONF_OPTS += --with-hls-crypto=openssl +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls-crypto='openssl' endif else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-hls +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-kms +GST1_PLUGINS_BAD_CONF_OPTS += -Dkms=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libdrm else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-kms +GST1_PLUGINS_BAD_CONF_OPTS += -Dkms=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-libmms +GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libmms else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-libmms +GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dtls +GST1_PLUGINS_BAD_CONF_OPTS += -Ddtls=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openssl GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dtls +GST1_PLUGINS_BAD_CONF_OPTS += -Ddtls=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTML),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-ttml +GST1_PLUGINS_BAD_CONF_OPTS += -Dttml=enabled GST1_PLUGINS_BAD_DEPENDENCIES += cairo libxml2 pango else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-ttml +GST1_PLUGINS_BAD_CONF_OPTS += -Dttml=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpeg2enc -GST1_PLUGINS_BAD_DEPENDENCIES += libmpeg2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpeg2enc=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += libmpeg2 mjpegtools GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpeg2enc +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpeg2enc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MUSEPACK),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-musepack +GST1_PLUGINS_BAD_CONF_OPTS += -Dmusepack=enabled GST1_PLUGINS_BAD_DEPENDENCIES += musepack else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-musepack +GST1_PLUGINS_BAD_CONF_OPTS += -Dmusepack=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-neon +GST1_PLUGINS_BAD_CONF_OPTS += -Dneon=enabled GST1_PLUGINS_BAD_DEPENDENCIES += neon else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-neon +GST1_PLUGINS_BAD_CONF_OPTS += -Dneon=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENAL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-openal +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenal=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openal else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-openal -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-opencv -GST1_PLUGINS_BAD_DEPENDENCIES += opencv -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-opencv +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenal=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-openh264 +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenh264=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libopenh264 GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-openh264 +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenh264=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-openjpeg +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenjpeg=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openjpeg else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-openjpeg +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenjpeg=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-opus +GST1_PLUGINS_BAD_CONF_OPTS += -Dopus=enabled GST1_PLUGINS_BAD_DEPENDENCIES += opus else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-opus +GST1_PLUGINS_BAD_CONF_OPTS += -Dopus=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-rsvg +GST1_PLUGINS_BAD_CONF_OPTS += -Drsvg=enabled GST1_PLUGINS_BAD_DEPENDENCIES += librsvg else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-rsvg +GST1_PLUGINS_BAD_CONF_OPTS += -Drsvg=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SBC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sbc +GST1_PLUGINS_BAD_CONF_OPTS += -Dsbc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += sbc else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sbc +GST1_PLUGINS_BAD_CONF_OPTS += -Dsbc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-shm +GST1_PLUGINS_BAD_CONF_OPTS += -Dshm=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-shm +GST1_PLUGINS_BAD_CONF_OPTS += -Dshm=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sndfile +GST1_PLUGINS_BAD_CONF_OPTS += -Dsndfile=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libsndfile else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sndfile +GST1_PLUGINS_BAD_CONF_OPTS += -Dsndfile=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SRTP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-srtp +GST1_PLUGINS_BAD_CONF_OPTS += -Dsrtp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libsrtp else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-srtp -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-vcd -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-vcd +GST1_PLUGINS_BAD_CONF_OPTS += -Dsrtp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-voaacenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += vo-aacenc else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-voaacenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-webp +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += webp else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-webp +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebp=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebrtc=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += gst1-plugins-base libnice +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebrtc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-webrtcdsp +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebrtcdsp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += webrtc-audio-processing else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-webrtcdsp +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebrtcdsp=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WPE),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dwpe=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += libwpe wpewebkit wpebackend-fdo +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dwpe=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-x265 +GST1_PLUGINS_BAD_CONF_OPTS += -Dx265=enabled GST1_PLUGINS_BAD_DEPENDENCIES += x265 GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-x265 +GST1_PLUGINS_BAD_CONF_OPTS += -Dx265=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_ZBAR),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += zbar +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=disabled endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL-2.0+ +GST1_PLUGINS_BAD_LICENSE += , GPL-2.0+ GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif # Add BSD license if BSD licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), BSD-2-Clause +GST1_PLUGINS_BAD_LICENSE += , BSD-2-Clause endif # Add Unknown license if Unknown licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), UNKNOWN +GST1_PLUGINS_BAD_LICENSE += , UNKNOWN endif # Use the following command to extract license info for plugins. # # find . -name 'plugin-*.xml' | xargs grep license -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/0001-gstrtspconnection-Security-loophole-making-heap-over.patch b/buildroot/package/gstreamer1/gst1-plugins-base/0001-gstrtspconnection-Security-loophole-making-heap-over.patch deleted file mode 100644 index de88f67a3..000000000 --- a/buildroot/package/gstreamer1/gst1-plugins-base/0001-gstrtspconnection-Security-loophole-making-heap-over.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f672277509705c4034bc92a141eefee4524d15aa Mon Sep 17 00:00:00 2001 -From: Tobias Ronge -Date: Thu, 14 Mar 2019 10:12:27 +0100 -Subject: [PATCH] gstrtspconnection: Security loophole making heap overflow - -The former code allowed an attacker to create a heap overflow by -sending a longer than allowed session id in a response and including a -semicolon to change the maximum length. With this change, the parser -will never go beyond 512 bytes. - -Signed-off-by: Peter Korsgaard ---- - gst-libs/gst/rtsp/gstrtspconnection.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c -index a6755bedd..c0429064a 100644 ---- a/gst-libs/gst/rtsp/gstrtspconnection.c -+++ b/gst-libs/gst/rtsp/gstrtspconnection.c -@@ -2461,7 +2461,7 @@ build_next (GstRTSPBuilder * builder, GstRTSPMessage * message, - maxlen = sizeof (conn->session_id) - 1; - /* the sessionid can have attributes marked with ; - * Make sure we strip them */ -- for (i = 0; session_id[i] != '\0'; i++) { -+ for (i = 0; i < maxlen && session_id[i] != '\0'; i++) { - if (session_id[i] == ';') { - maxlen = i; - /* parse timeout */ --- -2.11.0 - diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/0001-meson-static-linkig-of-tools-needs-gmodule_dep.patch b/buildroot/package/gstreamer1/gst1-plugins-base/0001-meson-static-linkig-of-tools-needs-gmodule_dep.patch new file mode 100644 index 000000000..b778f7a12 --- /dev/null +++ b/buildroot/package/gstreamer1/gst1-plugins-base/0001-meson-static-linkig-of-tools-needs-gmodule_dep.patch @@ -0,0 +1,38 @@ +From 443244e54d1e2813560d364b44b35d49b3987b67 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 3 Mar 2020 17:07:24 +0100 +Subject: [PATCH] meson: static linkig of tools needs gmodule_dep + +Add gmodule_dep (analog to gstreamer/tools/meson.build). + +Fixes: + +.../bin/ld: .../usr/lib/libgstreamer-1.0.a(gstplugin.c.o): in function `gst_plugin_register_func': +gstplugin.c:(.text+0x3bc): undefined reference to `g_module_make_resident' +.../bin/ld: .../usr/lib/libgstreamer-1.0.a(gstplugin.c.o): in function `_priv_gst_plugin_load_file_for_registry': +gstplugin.c:(.text+0x1228): undefined reference to `g_module_supported' +.../bin/ld: gstplugin.c:(.text+0x126c): undefined reference to `g_module_open' +.../bin/ld: gstplugin.c:(.text+0x1368): undefined reference to `g_module_symbol' +.../bin/ld: gstplugin.c:(.text+0x1494): undefined reference to `g_module_supported' +.../bin/ld: gstplugin.c:(.text+0x17f4): undefined reference to `g_module_close' +.../bin/ld: gstplugin.c:(.text+0x1a2c): undefined reference to `g_module_error' + +[Upstream suggested: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/587 ] +Signed-off-by: Peter Seiderer +--- + tools/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/meson.build b/tools/meson.build +index 57595fb47..bcbe11ca1 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -1,4 +1,4 @@ +-tool_deps = glib_deps + [pbutils_dep, audio_dep, video_dep, tag_dep, gst_dep, gst_base_dep] ++tool_deps = glib_deps + [pbutils_dep, audio_dep, video_dep, tag_dep, gst_dep, gst_base_dep, gmodule_dep] + + executable('gst-device-monitor-@0@'.format(api_version), + 'gst-device-monitor.c', +-- +2.25.1 + diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/Config.in b/buildroot/package/gstreamer1/gst1-plugins-base/Config.in index 340926ecb..f60d54033 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-base/Config.in +++ b/buildroot/package/gstreamer1/gst1-plugins-base/Config.in @@ -43,6 +43,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC help Creates audio test signals of given frequency and volume +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR + bool "compositor" + help + Video compositor plugin + config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING bool "encoding" help @@ -58,6 +63,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO help GIO elements +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OVERLAYCOMPOSITION + bool "overlaycomposition" + help + Overlaycomposition plugin. + config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK bool "playback" default y @@ -272,12 +282,14 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO bool "pango font renderer" depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz select BR2_PACKAGE_PANGO help Pango-based text rendering and overlay -comment "pango plugin needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "pango plugin needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_SYNC_4 config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index c508bdc00..2074c0272 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,4 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.4.tar.xz.sha256sum -sha256 ca6139490e48863e7706d870ff4e8ac9f417b56f3b9e4b3ce490c13b09a77461 gst-plugins-base-1.14.4.tar.xz -sha256 78fb5977f177ab71cba77a4a127d29b93cb1ca5c25962204b31f183a20cf5c7a COPYING -sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz.sha256sum +sha256 b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a gst-plugins-base-1.16.2.tar.xz +sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 5b7db0814..1781a5d46 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,263 +4,273 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.14.4 +GST1_PLUGINS_BASE_VERSION = 1.16.2 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES -GST1_PLUGINS_BASE_LICENSE_FILES = COPYING.LIB +GST1_PLUGINS_BASE_LICENSE_FILES = COPYING GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+ GST1_PLUGINS_BASE_CONF_OPTS = \ - --disable-examples \ - --disable-valgrind \ - --disable-introspection + -Dexamples=disabled \ + -Dtests=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \ + -Dgtk_doc=disabled \ + -Dintrospection=disabled # Options which require currently unpackaged libraries GST1_PLUGINS_BASE_CONF_OPTS += \ - --disable-cdparanoia \ - --disable-libvisual \ - --disable-iso-codes + -Dcdparanoia=disabled \ + -Dlibvisual=disabled \ + -Diso-codes=disabled -GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 +GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 $(TARGET_NLS_DEPENDENCIES) + +GST1_PLUGINS_BASE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) # These plugins are listed in the order from ./configure --help ifeq ($(BR2_PACKAGE_ORC),y) GST1_PLUGINS_BASE_DEPENDENCIES += orc -GST1_PLUGINS_BASE_CONF_OPTS += --enable-orc +GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=enabled +else +GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=enabled ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-opengl +GST1_PLUGINS_BASE_GL_API_LIST = opengl GST1_PLUGINS_BASE_DEPENDENCIES += libgl libglu -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-opengl endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-gles2 +GST1_PLUGINS_BASE_GL_API_LIST += gles2 GST1_PLUGINS_BASE_DEPENDENCIES += libgles -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-gles2 endif +else +GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=disabled +endif +GST1_PLUGINS_BASE_CONF_OPTS += -Dgl_api='$(subst $(space),$(comma),$(GST1_PLUGINS_BASE_GL_API_LIST))' ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-glx +GST1_PLUGINS_BASE_GL_PLATFORM_LIST += glx GST1_PLUGINS_BASE_DEPENDENCIES += xorgproto xlib_libXrender -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-glx endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-egl +GST1_PLUGINS_BASE_GL_PLATFORM_LIST += egl GST1_PLUGINS_BASE_DEPENDENCIES += libegl -GST1_PLUGINS_BASE_CONF_ENV += \ - CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" \ - LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs egl`" -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-egl endif +GST1_PLUGINS_BASE_CONF_OPTS += -Dgl_platform='$(subst $(space),$(comma),$(GST1_PLUGINS_BASE_GL_PLATFORM_LIST))' ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-x11 +GST1_PLUGINS_BASE_WINSYS_LIST += x11 GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-x11 endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_WAYLAND),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-wayland +GST1_PLUGINS_BASE_WINSYS_LIST += wayland GST1_PLUGINS_BASE_DEPENDENCIES += wayland wayland-protocols -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-wayland endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_DISPMANX),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-dispmanx +GST1_PLUGINS_BASE_WINSYS_LIST += dispmanx GST1_PLUGINS_BASE_DEPENDENCIES += rpi-userland -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-dispmanx endif +GST1_PLUGINS_BASE_CONF_OPTS += -Dgl_winsys='$(subst $(space),$(comma),$(GST1_PLUGINS_BASE_WINSYS_LIST))' ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-adder +GST1_PLUGINS_BASE_CONF_OPTS += -Dadder=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-adder +GST1_PLUGINS_BASE_CONF_OPTS += -Dadder=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-app +GST1_PLUGINS_BASE_CONF_OPTS += -Dapp=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-app +GST1_PLUGINS_BASE_CONF_OPTS += -Dapp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audioconvert +GST1_PLUGINS_BASE_CONF_OPTS += -Daudioconvert=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audioconvert +GST1_PLUGINS_BASE_CONF_OPTS += -Daudioconvert=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiomixer +GST1_PLUGINS_BASE_CONF_OPTS += -Daudiomixer=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audiomixer +GST1_PLUGINS_BASE_CONF_OPTS += -Daudiomixer=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiorate +GST1_PLUGINS_BASE_CONF_OPTS += -Daudiorate=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audiorate +GST1_PLUGINS_BASE_CONF_OPTS += -Daudiorate=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiotestsrc +GST1_PLUGINS_BASE_CONF_OPTS += -Daudiotestsrc=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audiotestsrc +GST1_PLUGINS_BASE_CONF_OPTS += -Daudiotestsrc=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Dcompositor=enabled +else +GST1_PLUGINS_BASE_CONF_OPTS += -Dcompositor=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-encoding +GST1_PLUGINS_BASE_CONF_OPTS += -Dencoding=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-encoding +GST1_PLUGINS_BASE_CONF_OPTS += -Dencoding=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-videoconvert +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-videoconvert +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-gio +GST1_PLUGINS_BASE_CONF_OPTS += -Dgio=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-gio +GST1_PLUGINS_BASE_CONF_OPTS += -Dgio=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OVERLAYCOMPOSITION),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Doverlaycomposition=enabled +else +GST1_PLUGINS_BASE_CONF_OPTS += -Doverlaycomposition=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-playback +GST1_PLUGINS_BASE_CONF_OPTS += -Dplayback=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-playback +GST1_PLUGINS_BASE_CONF_OPTS += -Dplayback=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audioresample +GST1_PLUGINS_BASE_CONF_OPTS += -Daudioresample=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audioresample +GST1_PLUGINS_BASE_CONF_OPTS += -Daudioresample=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_RAWPARSE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-rawparse +GST1_PLUGINS_BASE_CONF_OPTS += -Drawparse=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-rawparse +GST1_PLUGINS_BASE_CONF_OPTS += -Drawparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-subparse +GST1_PLUGINS_BASE_CONF_OPTS += -Dsubparse=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-subparse +GST1_PLUGINS_BASE_CONF_OPTS += -Dsubparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-tcp +GST1_PLUGINS_BASE_CONF_OPTS += -Dtcp=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-tcp +GST1_PLUGINS_BASE_CONF_OPTS += -Dtcp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-typefind +GST1_PLUGINS_BASE_CONF_OPTS += -Dtypefind=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-typefind +GST1_PLUGINS_BASE_CONF_OPTS += -Dtypefind=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-videotestsrc +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideotestsrc=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-videotestsrc +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideotestsrc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-videorate +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideorate=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-videorate +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideorate=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-videoscale +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-videoscale +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-volume +GST1_PLUGINS_BASE_CONF_OPTS += -Dvolume=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-volume +GST1_PLUGINS_BASE_CONF_OPTS += -Dvolume=disabled endif +# Zlib is checked for headers and is not an option. ifeq ($(BR2_PACKAGE_ZLIB),y) GST1_PLUGINS_BASE_DEPENDENCIES += zlib -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-zlib endif ifeq ($(BR2_PACKAGE_XORG7),y) GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv GST1_PLUGINS_BASE_CONF_OPTS += \ - --enable-x \ - --enable-xshm \ - --enable-xvideo + -Dx11=enabled \ + -Dxshm=enabled \ + -Dxvideo=enabled else GST1_PLUGINS_BASE_CONF_OPTS += \ - --disable-x \ - --disable-xshm \ - --disable-xvideo + -Dx11=disabled \ + -Dxshm=disabled \ + -Dxvideo=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA),y) GST1_PLUGINS_BASE_DEPENDENCIES += alsa-lib +GST1_PLUGINS_BASE_CONF_OPTS += -Dalsa=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-alsa +GST1_PLUGINS_BASE_CONF_OPTS += -Dalsa=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-ivorbis +GST1_PLUGINS_BASE_CONF_OPTS += -Dtremor=enabled GST1_PLUGINS_BASE_DEPENDENCIES += tremor else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-ivorbis +GST1_PLUGINS_BASE_CONF_OPTS += -Dtremor=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-opus +GST1_PLUGINS_BASE_CONF_OPTS += -Dopus=enabled GST1_PLUGINS_BASE_DEPENDENCIES += opus else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-opus +GST1_PLUGINS_BASE_CONF_OPTS += -Dopus=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-ogg +GST1_PLUGINS_BASE_CONF_OPTS += -Dogg=enabled GST1_PLUGINS_BASE_DEPENDENCIES += libogg else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-ogg +GST1_PLUGINS_BASE_CONF_OPTS += -Dogg=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-pango +GST1_PLUGINS_BASE_CONF_OPTS += -Dpango=enabled GST1_PLUGINS_BASE_DEPENDENCIES += pango else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-pango +GST1_PLUGINS_BASE_CONF_OPTS += -Dpango=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-theora +GST1_PLUGINS_BASE_CONF_OPTS += -Dtheora=enabled GST1_PLUGINS_BASE_DEPENDENCIES += libtheora else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-theora +GST1_PLUGINS_BASE_CONF_OPTS += -Dtheora=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-vorbis +GST1_PLUGINS_BASE_CONF_OPTS += -Dvorbis=enabled GST1_PLUGINS_BASE_DEPENDENCIES += libvorbis else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-vorbis +GST1_PLUGINS_BASE_CONF_OPTS += -Dvorbis=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in new file mode 100644 index 000000000..b7cac08d7 --- /dev/null +++ b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in @@ -0,0 +1,20 @@ +menuconfig BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON + bool "gst1-plugins-bayer2rgb-neon" + depends on BR2_arm && BR2_ARM_CPU_HAS_NEON # bayer2rgb-neon + depends on !BR2_STATIC_LIBS # bayer2rgb-neon + depends on BR2_INSTALL_LIBSTDCPP # bayer2rgb-neon + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # bayer2rgb-neon + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_BAYER2RGB_NEON + help + gst1-plugins-bayer2rgb-neon is a gstreamer1 + plugin which uses bayer2rgb-neon library to + decode raw camera bayer to RGB using + NEON hardware acceleration. + + https://git.phytec.de/gst-bayer2rgb-neon + +comment "gst1-plugins-bayer2rgb-neon needs a toolchain w/ C++, dynamic library, gcc >= 4.9" + depends on BR2_arm && BR2_ARM_CPU_HAS_NEON + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash new file mode 100644 index 000000000..129be67c3 --- /dev/null +++ b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 8d317b892bf1c99e9999a6d9b027a22c4ea2940f1ac504c03560b3d476e1c9c8 gst-bayer2rgb-neon-v0.3.tar.bz2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk new file mode 100644 index 000000000..734800a74 --- /dev/null +++ b/buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# gst1-plugins-bayer2rgb-neon +# +################################################################################ + +GST1_PLUGINS_BAYER2RGB_NEON_VERSION = 0.3 +GST1_PLUGINS_BAYER2RGB_NEON_SOURCE = gst-bayer2rgb-neon-v$(GST1_PLUGINS_BAYER2RGB_NEON_VERSION).tar.bz2 +GST1_PLUGINS_BAYER2RGB_NEON_SITE = https://git.phytec.de/gst-bayer2rgb-neon/snapshot +GST1_PLUGINS_BAYER2RGB_NEON_LICENSE = GPL-3.0 +GST1_PLUGINS_BAYER2RGB_NEON_LICENSE_FILES = COPYING + +GST1_PLUGINS_BAYER2RGB_NEON_INSTALL_STAGING = YES + +GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \ + host-pkgconf \ + gstreamer1 \ + gst1-plugins-base \ + bayer2rgb-neon + +GST1_PLUGINS_BAYER2RGB_NEON_AUTORECONF = YES + +$(eval $(autotools-package)) diff --git a/buildroot/package/gstreamer1/gst1-plugins-good/Config.in b/buildroot/package/gstreamer1/gst1-plugins-good/Config.in index afb9a418d..c8bf58bb8 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-good/Config.in +++ b/buildroot/package/gstreamer1/gst1-plugins-good/Config.in @@ -32,14 +32,6 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_BZ2 Enable bz2 support for the following plugins: matroska -config BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB - bool "zlib support" - depends on BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 || BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX || BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA - select BR2_PACKAGE_ZLIB - help - Enable zlib support for the following plugins: - id3demux, isomp4, matroska - comment "dependency-less plugins" config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA @@ -283,6 +275,29 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4 help Open Sound System (OSS) version 4 support for GStreamer +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL + bool "qmlgl (qt5)" + depends on BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative-quick + select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK + select BR2_PACKAGE_QT5X11EXTRAS if BR2_PACKAGE_QT5BASE_XCB + help + QT5 plugin which includes elements qmlglsrc and qmlglsink + +comment "qmlgl (qt5) plugin needs an OpenGL-capable Qt5 backend" + depends on BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST + +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHOUT2 + bool "shout2" + select BR2_PACKAGE_LIBSHOUT + help + Elements to send data to an icecast server using libshout2 + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2 bool "v4l2" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # multi planar api @@ -328,6 +343,19 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF comment "gdkpixbuf needs a toolchain w/ wchar, threads" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_JACK + bool "jack" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + select BR2_PACKAGE_JACK2 + help + JACK audio source/sink plugin + +comment "jack needs a toolchain w/ C++, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE bool "pulseaudio" depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio @@ -372,6 +400,12 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB comment "taglib needs a toolchain w/ C++, wchar" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TWOLAME + bool "twolame" + select BR2_PACKAGE_TWOLAME + help + twolame mp2 audio encoder plugin + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX bool "vpx (webm)" depends on BR2_TOOLCHAIN_HAS_THREADS # libvpx diff --git a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 1d08938e0..075338b14 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz.sha256sum -sha256 5f8b553260cb0aac56890053d8511db1528d53cae10f0287cfce2cb2acc70979 gst-plugins-good-1.14.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz.sha256sum +sha256 40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319 gst-plugins-good-1.16.2.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 2e6ac6dbb..6709f14cc 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,448 +4,477 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.14.4 +GST1_PLUGINS_GOOD_VERSION = 1.16.2 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING GST1_PLUGINS_GOOD_LICENSE = LGPL-2.1+ +GST1_PLUGINS_GOOD_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) + GST1_PLUGINS_GOOD_CONF_OPTS = \ - --disable-valgrind \ - --disable-examples \ - --disable-directsound \ - --disable-waveform \ - --disable-sunaudio \ - --disable-osx_audio \ - --disable-osx_video \ - --disable-aalib \ - --disable-aalibtest \ - --disable-libcaca \ - --disable-qt + -Dexamples=disabled \ + -Dtests=disabled \ + -Ddirectsound=disabled \ + -Dwaveform=disabled \ + -Dosxaudio=disabled \ + -Dosxvideo=disabled \ + -Daalib=disabled \ + -Dlibcaca=disabled # Options which require currently unpackaged libraries GST1_PLUGINS_GOOD_CONF_OPTS += \ - --disable-libdv \ - --disable-dv1394 \ - --disable-shout2 + -Ddv=disabled \ + -Ddv1394=disabled -GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base +GST1_PLUGINS_GOOD_DEPENDENCIES = \ + gstreamer1 \ + gst1-plugins-base \ + $(TARGET_NLS_DEPENDENCIES) -ifeq ($(BR2_PACKAGE_JACK2),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-jack +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_JACK),y) +GST1_PLUGINS_GOOD_CONF_OPTS += -Djack=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += jack2 else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-jack +GST1_PLUGINS_GOOD_CONF_OPTS += -Djack=disabled endif ifeq ($(BR2_PACKAGE_LIBV4L),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --with-libv4l2 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-libv4l2=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += libv4l else -GST1_PLUGINS_GOOD_CONF_OPTS += --without-libv4l2 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-libv4l2=disabled endif ifeq ($(BR2_PACKAGE_ORC),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-orc +GST1_PLUGINS_GOOD_CONF_OPTS += -Dorc=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += orc endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-alpha +GST1_PLUGINS_GOOD_CONF_OPTS += -Dalpha=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-alpha +GST1_PLUGINS_GOOD_CONF_OPTS += -Dalpha=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_APETAG),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-apetag +GST1_PLUGINS_GOOD_CONF_OPTS += -Dapetag=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-apetag +GST1_PLUGINS_GOOD_CONF_OPTS += -Dapetag=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-audiofx +GST1_PLUGINS_GOOD_CONF_OPTS += -Daudiofx=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-audiofx +GST1_PLUGINS_GOOD_CONF_OPTS += -Daudiofx=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-audioparsers +GST1_PLUGINS_GOOD_CONF_OPTS += -Daudioparsers=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-audioparsers +GST1_PLUGINS_GOOD_CONF_OPTS += -Daudioparsers=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUPARSE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-auparse +GST1_PLUGINS_GOOD_CONF_OPTS += -Dauparse=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-auparse +GST1_PLUGINS_GOOD_CONF_OPTS += -Dauparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-autodetect +GST1_PLUGINS_GOOD_CONF_OPTS += -Dautodetect=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-autodetect +GST1_PLUGINS_GOOD_CONF_OPTS += -Dautodetect=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AVI),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-avi +GST1_PLUGINS_GOOD_CONF_OPTS += -Davi=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-avi +GST1_PLUGINS_GOOD_CONF_OPTS += -Davi=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CUTTER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-cutter +GST1_PLUGINS_GOOD_CONF_OPTS += -Dcutter=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-cutter +GST1_PLUGINS_GOOD_CONF_OPTS += -Dcutter=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEBUGUTILS),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-debugutils +GST1_PLUGINS_GOOD_CONF_OPTS += -Ddebugutils=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-debugutils +GST1_PLUGINS_GOOD_CONF_OPTS += -Ddebugutils=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-deinterlace +GST1_PLUGINS_GOOD_CONF_OPTS += -Ddeinterlace=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-deinterlace +GST1_PLUGINS_GOOD_CONF_OPTS += -Ddeinterlace=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DTMF),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-dtmf +GST1_PLUGINS_GOOD_CONF_OPTS += -Ddtmf=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-dtmf +GST1_PLUGINS_GOOD_CONF_OPTS += -Ddtmf=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-effectv +GST1_PLUGINS_GOOD_CONF_OPTS += -Deffectv=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-effectv +GST1_PLUGINS_GOOD_CONF_OPTS += -Deffectv=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EQUALIZER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-equalizer +GST1_PLUGINS_GOOD_CONF_OPTS += -Dequalizer=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-equalizer +GST1_PLUGINS_GOOD_CONF_OPTS += -Dequalizer=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-flv +GST1_PLUGINS_GOOD_CONF_OPTS += -Dflv=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-flv +GST1_PLUGINS_GOOD_CONF_OPTS += -Dflv=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-flx +GST1_PLUGINS_GOOD_CONF_OPTS += -Dflx=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-flx +GST1_PLUGINS_GOOD_CONF_OPTS += -Dflx=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-goom +GST1_PLUGINS_GOOD_CONF_OPTS += -Dgoom=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-goom +GST1_PLUGINS_GOOD_CONF_OPTS += -Dgoom=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM2K1),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-goom2k1 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dgoom2k1=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-goom2k1 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dgoom2k1=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-icydemux +GST1_PLUGINS_GOOD_CONF_OPTS += -Dicydemux=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-icydemux +GST1_PLUGINS_GOOD_CONF_OPTS += -Dicydemux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-id3demux +GST1_PLUGINS_GOOD_CONF_OPTS += -Did3demux=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-id3demux +GST1_PLUGINS_GOOD_CONF_OPTS += -Did3demux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-imagefreeze +GST1_PLUGINS_GOOD_CONF_OPTS += -Dimagefreeze=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-imagefreeze +GST1_PLUGINS_GOOD_CONF_OPTS += -Dimagefreeze=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-interleave +GST1_PLUGINS_GOOD_CONF_OPTS += -Dinterleave=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-interleave +GST1_PLUGINS_GOOD_CONF_OPTS += -Dinterleave=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-isomp4 +GST1_PLUGINS_GOOD_CONF_OPTS += -Disomp4=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-isomp4 +GST1_PLUGINS_GOOD_CONF_OPTS += -Disomp4=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-lame +GST1_PLUGINS_GOOD_CONF_OPTS += -Dlame=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += lame else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-lame +GST1_PLUGINS_GOOD_CONF_OPTS += -Dlame=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-mpg123 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmpg123=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += mpg123 else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-mpg123 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmpg123=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-law +GST1_PLUGINS_GOOD_CONF_OPTS += -Dlaw=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-law +GST1_PLUGINS_GOOD_CONF_OPTS += -Dlaw=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LEVEL),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-level +GST1_PLUGINS_GOOD_CONF_OPTS += -Dlevel=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-level +GST1_PLUGINS_GOOD_CONF_OPTS += -Dlevel=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-matroska +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmatroska=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-matroska +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmatroska=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MONOSCOPE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-monoscope +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmonoscope=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-monoscope +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmonoscope=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-multifile +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmultifile=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-multifile +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmultifile=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-multipart +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmultipart=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-multipart +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmultipart=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_REPLAYGAIN),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-replaygain +GST1_PLUGINS_GOOD_CONF_OPTS += -Dreplaygain=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-replaygain +GST1_PLUGINS_GOOD_CONF_OPTS += -Dreplaygain=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-rtp +GST1_PLUGINS_GOOD_CONF_OPTS += -Drtp=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-rtp +GST1_PLUGINS_GOOD_CONF_OPTS += -Drtp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-rtpmanager +GST1_PLUGINS_GOOD_CONF_OPTS += -Drtpmanager=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-rtpmanager +GST1_PLUGINS_GOOD_CONF_OPTS += -Drtpmanager=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-rtsp +GST1_PLUGINS_GOOD_CONF_OPTS += -Drtsp=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-rtsp +GST1_PLUGINS_GOOD_CONF_OPTS += -Drtsp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-shapewipe +GST1_PLUGINS_GOOD_CONF_OPTS += -Dshapewipe=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-shapewipe +GST1_PLUGINS_GOOD_CONF_OPTS += -Dshapewipe=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-smpte +GST1_PLUGINS_GOOD_CONF_OPTS += -Dsmpte=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-smpte +GST1_PLUGINS_GOOD_CONF_OPTS += -Dsmpte=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPECTRUM),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-spectrum +GST1_PLUGINS_GOOD_CONF_OPTS += -Dspectrum=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-spectrum +GST1_PLUGINS_GOOD_CONF_OPTS += -Dspectrum=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-udp +GST1_PLUGINS_GOOD_CONF_OPTS += -Dudp=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-udp +GST1_PLUGINS_GOOD_CONF_OPTS += -Dudp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videobox +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideobox=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videobox +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideobox=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videocrop +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideocrop=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videocrop +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideocrop=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videofilter +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideofilter=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videofilter +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideofilter=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videomixer +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideomixer=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videomixer +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideomixer=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-wavenc +GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavenc=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-wavenc +GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavenc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-wavparse +GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavparse=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-wavparse +GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-y4m +GST1_PLUGINS_GOOD_CONF_OPTS += -Dy4m=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-y4m +GST1_PLUGINS_GOOD_CONF_OPTS += -Dy4m=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-oss +GST1_PLUGINS_GOOD_CONF_OPTS += -Doss=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-oss +GST1_PLUGINS_GOOD_CONF_OPTS += -Doss=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-oss4 +GST1_PLUGINS_GOOD_CONF_OPTS += -Doss4=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-oss4 +GST1_PLUGINS_GOOD_CONF_OPTS += -Doss4=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL),y) +GST1_PLUGINS_GOOD_CONF_OPTS += -Dqt5=enabled +GST1_PLUGINS_GOOD_DEPENDENCIES += qt5declarative +ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) +GST1_PLUGINS_GOOD_DEPENDENCIES += qt5x11extras +endif +else +GST1_PLUGINS_GOOD_CONF_OPTS += -Dqt5=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHOUT2),y) +GST1_PLUGINS_GOOD_CONF_OPTS += -Dshout2=enabled +GST1_PLUGINS_GOOD_DEPENDENCIES += libshout +else +GST1_PLUGINS_GOOD_CONF_OPTS += -Dshout2=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-gst_v4l2 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-gst_v4l2 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-v4l2-probe +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-probe=true else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-v4l2-probe +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-probe=false endif ifeq ($(BR2_PACKAGE_XORG7),y) GST1_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv -GST1_PLUGINS_GOOD_CONF_OPTS += \ - --enable-x \ - $(if $(BR2_PACKAGE_XLIB_LIBXFIXES),xlib_libXfixes) \ - $(if $(BR2_PACKAGE_XLIB_LIBXDAMAGE),xlib_libXdamage) +GST1_PLUGINS_GOOD_CONF_OPTS += -Dximagesrc=enabled +ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) +GST1_PLUGINS_GOOD_DEPENDENCIES += xlib_libXfixes +GST1_PLUGINS_GOOD_CONF_OPTS += -Dximagesrc-xfixes=enabled +endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y) +GST1_PLUGINS_GOOD_DEPENDENCIES += xlib_libXdamage +GST1_PLUGINS_GOOD_CONF_OPTS += -Dximagesrc-xdamage=enabled +endif else GST1_PLUGINS_GOOD_CONF_OPTS += \ - --disable-x + -Dximagesrc=disabled \ + -Dximagesrc-xfixes=disabled \ + -Dximagesrc-xdamage=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-cairo +GST1_PLUGINS_GOOD_CONF_OPTS += -Dcairo=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += cairo else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-cairo +GST1_PLUGINS_GOOD_CONF_OPTS += -Dcairo=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-flac +GST1_PLUGINS_GOOD_CONF_OPTS += -Dflac=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += flac else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-flac +GST1_PLUGINS_GOOD_CONF_OPTS += -Dflac=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-gdk_pixbuf +GST1_PLUGINS_GOOD_CONF_OPTS += -Dgdk-pixbuf=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-gdk_pixbuf +GST1_PLUGINS_GOOD_CONF_OPTS += -Dgdk-pixbuf=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-jpeg +GST1_PLUGINS_GOOD_CONF_OPTS += -Djpeg=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += jpeg else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-jpeg +GST1_PLUGINS_GOOD_CONF_OPTS += -Djpeg=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-libpng +GST1_PLUGINS_GOOD_CONF_OPTS += -Dpng=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += libpng else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-libpng +GST1_PLUGINS_GOOD_CONF_OPTS += -Dpng=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-pulse +GST1_PLUGINS_GOOD_CONF_OPTS += -Dpulse=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += pulseaudio else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-pulse +GST1_PLUGINS_GOOD_CONF_OPTS += -Dpulse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-soup +GST1_PLUGINS_GOOD_CONF_OPTS += -Dsoup=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += libsoup else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-soup +GST1_PLUGINS_GOOD_CONF_OPTS += -Dsoup=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-speex +GST1_PLUGINS_GOOD_CONF_OPTS += -Dspeex=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += speex else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-speex +GST1_PLUGINS_GOOD_CONF_OPTS += -Dspeex=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-taglib +GST1_PLUGINS_GOOD_CONF_OPTS += -Dtaglib=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += taglib else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-taglib +GST1_PLUGINS_GOOD_CONF_OPTS += -Dtaglib=disabled +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TWOLAME),y) +GST1_PLUGINS_GOOD_CONF_OPTS += -Dtwolame=enabled +GST1_PLUGINS_GOOD_DEPENDENCIES += twolame +else +GST1_PLUGINS_GOOD_CONF_OPTS += -Dtwolame=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-vpx +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvpx=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += libvpx else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-vpx +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvpx=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-wavpack +GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavpack=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += wavpack else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-wavpack +GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavpack=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-zlib GST1_PLUGINS_GOOD_DEPENDENCIES += zlib -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-zlib endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_BZ2),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-bz2 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dbz2=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += bzip2 else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-bz2 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dbz2=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index f93c7e234..e5df44ab9 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.4.tar.xz.sha256sum -sha256 ac02d837f166c35ff6ce0738e281680d0b90052cfb1f0255dcf6aaca5f0f6d23 gst-plugins-ugly-1.14.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz.sha256sum +sha256 5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca gst-plugins-ugly-1.16.2.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 25546258c..284516f7d 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,86 +4,91 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.14.4 +GST1_PLUGINS_UGLY_VERSION = 1.16.2 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING # GPL licensed plugins will append to GST1_PLUGINS_UGLY_LICENSE if enabled. GST1_PLUGINS_UGLY_LICENSE = LGPL-2.1+ -GST1_PLUGINS_UGLY_CONF_OPTS = --disable-examples --disable-valgrind +GST1_PLUGINS_UGLY_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_PLUGINS_UGLY_CONF_OPTS += \ - --disable-a52dec \ - --disable-amrnb \ - --disable-amrwb \ - --disable-cdio \ - --disable-sidplay \ - --disable-twolame + -Dexamples=disabled \ + -Dtests=disabled + +GST1_PLUGINS_UGLY_CONF_OPTS += \ + -Da52dec=disabled \ + -Damrnb=disabled \ + -Damrwbdec=disabled \ + -Dcdio=disabled \ + -Dsidplay=disabled GST1_PLUGINS_UGLY_DEPENDENCIES = gstreamer1 gst1-plugins-base ifeq ($(BR2_PACKAGE_ORC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-orc +GST1_PLUGINS_UGLY_CONF_OPTS += -Dorc=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += orc +else +GST1_PLUGINS_UGLY_CONF_OPTS += -Dorc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-asfdemux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dasfdemux=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-asfdemux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dasfdemux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdlpcmdec +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdlpcmdec=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdlpcmdec +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdlpcmdec=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdsub +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-xingmux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-xingmux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-realmedia +GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia +GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD),y) # configure does not use pkg-config to detect libdvdread ifeq ($(BR2_PACKAGE_LIBDVDCSS)$(BR2_STATIC_LIBS),yy) -GST1_PLUGINS_UGLY_CONF_ENV += LIBS="-ldvdcss" +GST1_PLUGINS_UGLY_LDFLAGS += "-ldvdcss" endif -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdread +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdread=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += libdvdread GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdread +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdread=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec +GST1_PLUGINS_UGLY_CONF_OPTS += -Dmpeg2dec=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += libmpeg2 GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec +GST1_PLUGINS_UGLY_CONF_OPTS += -Dmpeg2dec=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-x264 +GST1_PLUGINS_UGLY_CONF_OPTS += -Dx264=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += x264 GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-x264 +GST1_PLUGINS_UGLY_CONF_OPTS += -Dx264=disabled endif # Add GPL license if GPL plugins enabled. @@ -94,4 +99,4 @@ endif # Use the following command to extract license info for plugins. # # find . -name 'plugin-*.xml' | xargs grep license -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index fa6e71f49..f3dca615c 100644 --- a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.14.4.tar.xz.sha256sum -sha256 3d0ece2afdcd601c175ece24e32a30bc19247b454f4eafd3deeec2533c6884f1 gst-rtsp-server-1.14.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.16.2.tar.xz.sha256sum +sha256 de07a2837b3b04820ce68264a4909f70c221b85dbff0cede7926e9cdbb1dc26e gst-rtsp-server-1.16.2.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index a5df7c66b..df873ad73 100644 --- a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.14.4 +GST1_RTSP_SERVER_VERSION = 1.16.2 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ @@ -15,9 +15,20 @@ GST1_RTSP_SERVER_DEPENDENCIES = \ gstreamer1 \ gst1-plugins-base \ gst1-plugins-good + +GST1_RTSP_SERVER_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) + GST1_RTSP_SERVER_CONF_OPTS = \ - --disable-examples \ - --disable-tests + -Dexamples=disabled \ + -Dtests=disabled + +GST1_RTSP_SERVER_CONF_OPTS += \ + -Dexamples=disabled \ + -Dtests=disabled \ + -Dintrospection=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled ifeq ($(BR2_PACKAGE_LIBCGROUP),y) GST1_RTSP_SERVER_DEPENDENCIES += libcgroup @@ -27,4 +38,4 @@ ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD),y) GST1_RTSP_SERVER_DEPENDENCIES += gst1-plugins-bad endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash index fdcbc563a..6bf4739ab 100644 --- a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash +++ b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 35c56b89c10f42c623f5831f9533e1b9dcab8946eff0e4000bf3137bad5c705a gst1-shark-v0.5.5.tar.gz +sha256 3c1f865533750f9fe511336e673e89bc93ac05e896bd3f4fc68d3cc0c142a861 gst1-shark-v0.6.1.tar.gz # Hashes for license files: sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING diff --git a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk index 1e198f0cd..6dc702b48 100644 --- a/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk +++ b/buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_SHARK_VERSION = v0.5.5 +GST1_SHARK_VERSION = v0.6.1 GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git GST1_SHARK_SITE_METHOD = git GST1_SHARK_GIT_SUBMODULES = YES diff --git a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index f00cdc0ff..f9bec2483 100644 --- a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.14.4.tar.xz.sha256sum -sha256 ce18dbfe961c6a8d31270231686075586bf7a7df62b778c8e7f5ec148251d0a3 gstreamer-vaapi-1.14.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.16.2.tar.xz.sha256sum +sha256 191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601 gstreamer-vaapi-1.16.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 4f2ac598e..00a6ec5e0 100644 --- a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.14.4 +GST1_VAAPI_VERSION = 1.16.2 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/gstreamer1/gst1-validate/Config.in b/buildroot/package/gstreamer1/gst1-validate/Config.in index 2022d38d9..63bce613e 100644 --- a/buildroot/package/gstreamer1/gst1-validate/Config.in +++ b/buildroot/package/gstreamer1/gst1-validate/Config.in @@ -1,9 +1,10 @@ config BR2_PACKAGE_GST1_VALIDATE bool "gst1-validate" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_JSON_GLIB - select BR2_PACKAGE_PYTHON_PYEXPAT + select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # cairo is autodetected but needs PNG support select BR2_PACKAGE_CAIRO_PNG if BR2_PACKAGE_CAIRO help @@ -15,3 +16,4 @@ config BR2_PACKAGE_GST1_VALIDATE comment "gst1-validate depends on python" depends on !BR2_PACKAGE_PYTHON + depends on !BR2_PACKAGE_PYTHON3 diff --git a/buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash b/buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash index 87bb29462..9a0fbf66a 100644 --- a/buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash +++ b/buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.14.4.tar.xz.sha256sum -sha256 18dccca94bdc0bab3cddb07817bd280df7ab4abbec9a83b92620367a22d955c7 gst-validate-1.14.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.16.2.tar.xz.sha256sum +sha256 4861ccb9326200e74d98007e316b387d48dd49f072e0b78cb9d3303fdecfeeca gst-validate-1.16.2.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk b/buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk index 0f3d25178..38b50b673 100644 --- a/buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk +++ b/buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VALIDATE_VERSION = 1.14.4 +GST1_VALIDATE_VERSION = 1.16.2 GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate GST1_VALIDATE_LICENSE = LGPL-2.1+ @@ -14,10 +14,16 @@ GST1_VALIDATE_DEPENDENCIES = \ gstreamer1 \ gst1-plugins-base \ json-glib \ - host-python \ - python \ $(if $(BR2_PACKAGE_CAIRO),cairo) -GST1_VALIDATE_CONF_OPTS += --disable-sphinx-doc +ifeq ($(BR2_PACKAGE_PYTHON3),y) +GST1_VALIDATE_DEPENDENCIES += host-python3 python3 +else +GST1_VALIDATE_DEPENDENCIES += host-python python +endif + +GST1_VALIDATE_CONF_OPTS = \ + --disable-introspection \ + --disable-sphinx-doc $(eval $(autotools-package)) diff --git a/buildroot/package/gstreamer1/gstreamer1-editing-services/0001-examples-ges-ui-fix-some-gtk2-ism.patch b/buildroot/package/gstreamer1/gstreamer1-editing-services/0001-examples-ges-ui-fix-some-gtk2-ism.patch deleted file mode 100644 index 5a074941f..000000000 --- a/buildroot/package/gstreamer1/gstreamer1-editing-services/0001-examples-ges-ui-fix-some-gtk2-ism.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 76f3dcb8f11a240fc7147ab556c57f10abc9e957 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Sun, 20 May 2018 23:46:42 +0100 -Subject: [PATCH] examples: ges-ui: fix some gtk2-ism - -Still lots of deprecated API to update. - -https://bugzilla.gnome.org/show_bug.cgi?id=796243 - -Upstream: https://cgit.freedesktop.org/gstreamer/gst-editing-services/commit/?id=76f3dcb8f11a240fc7147ab556c57f10abc9e957 -Signed-off-by: Peter Seiderer ---- - examples/c/ges-ui.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/examples/c/ges-ui.c b/examples/c/ges-ui.c -index 4acd1ee9..45694a6b 100644 ---- a/examples/c/ges-ui.c -+++ b/examples/c/ges-ui.c -@@ -106,7 +106,7 @@ static int n_instances = 0; - * These are declared non-static for signal auto-connection - */ - --gboolean window_delete_event_cb (GtkObject * window, GdkEvent * event, -+gboolean window_delete_event_cb (GtkWidget * window, GdkEvent * event, - App * app); - void new_activate_cb (GtkMenuItem * item, App * app); - void open_activate_cb (GtkMenuItem * item, App * app); -@@ -1076,14 +1076,14 @@ gboolean - add_effect_dlg_delete_event_cb (GtkWidget * widget, GdkEvent * event, - gpointer * app) - { -- gtk_widget_hide_all (((App *) app)->add_effect_dlg); -+ gtk_widget_hide (((App *) app)->add_effect_dlg); - return TRUE; - } - - void - on_cancel_add_effect_cb (GtkButton * button, App * app) - { -- gtk_widget_hide_all (app->add_effect_dlg); -+ gtk_widget_hide (app->add_effect_dlg); - } - - void -@@ -1103,7 +1103,7 @@ on_apply_effect_cb (GtkButton * button, App * app) - - gtk_entry_set_text (GTK_ENTRY (app->audio_effect_entry), ""); - -- gtk_widget_hide_all (app->add_effect_dlg); -+ gtk_widget_hide (app->add_effect_dlg); - } - - static void -@@ -1347,7 +1347,7 @@ app_new_from_uri (gchar * uri) - /* UI callbacks ************************************************************/ - - gboolean --window_delete_event_cb (GtkObject * window, GdkEvent * event, App * app) -+window_delete_event_cb (GtkWidget * window, GdkEvent * event, App * app) - { - app_dispose (app); - return FALSE; --- -2.19.0 - diff --git a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index a388a097d..8724f3949 100644 --- a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.14.4.tar.xz.sha256sum -sha256 53d1d25b356009505ae0d22c218d6c6b1215399d9f6e3fe5d7b88e156531b35f gstreamer-editing-services-1.14.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.16.2.tar.xz.sha256sum +sha256 0e06a6191a0c6c16e16272bf2573cecaeb245f10629486ad940a299bef700c16 gstreamer-editing-services-1.16.2.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 74a36824e..e2bb747d0 100644 --- a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.14.4 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.16.2 GSTREAMER1_EDITING_SERVICES_SOURCE = gstreamer-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = http://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/gstreamer1/gstreamer1/0001-gstconfig.h.in-initial-RISC-V-support.patch b/buildroot/package/gstreamer1/gstreamer1/0001-gstconfig.h.in-initial-RISC-V-support.patch deleted file mode 100644 index 689346a3e..000000000 --- a/buildroot/package/gstreamer1/gstreamer1/0001-gstconfig.h.in-initial-RISC-V-support.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 58982c0d28f1eb385319307ee47bd6522c812f22 Mon Sep 17 00:00:00 2001 -From: Aurelien Jarno -Date: Sun, 15 Apr 2018 00:49:55 +0200 -Subject: [PATCH] gstconfig.h.in: initial RISC-V support - -RISC-V supports unaligned accesses, but these might run extremely slowly -depending on the implementation. Therefore set GST_HAVE_UNALIGNED_ACCESS -to 0 on this architecture. - -https://bugzilla.gnome.org/show_bug.cgi?id=795271 - -Upstream: https://gitlab.freedesktop.org/gstreamer/gstreamer/commit/8a156d1725ecd03f2e8cdc8874e081dda2d3b43d - -Signed-off-by: Peter Seiderer ---- - gst/gstconfig.h.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in -index 6351c04da..33dfed1f6 100644 ---- a/gst/gstconfig.h.in -+++ b/gst/gstconfig.h.in -@@ -104,7 +104,7 @@ - * http://docs.oracle.com/cd/E19205-01/820-4155/c++_faq.html#Vers6 - * https://software.intel.com/en-us/node/583402 - */ --#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__or1k__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) || defined(__xtensa__) || defined(__e2k__) -+#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__or1k__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) || defined(__xtensa__) || defined(__e2k__) || defined(__riscv) - # define GST_HAVE_UNALIGNED_ACCESS 0 - #elif defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__m68k__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || defined(__s390__) || defined(__s390x__) || defined(__zarch__) - # define GST_HAVE_UNALIGNED_ACCESS 1 --- -2.19.1 - diff --git a/buildroot/package/gstreamer1/gstreamer1/Config.in b/buildroot/package/gstreamer1/gstreamer1/Config.in index e9f1bd038..0626bcc96 100644 --- a/buildroot/package/gstreamer1/gstreamer1/Config.in +++ b/buildroot/package/gstreamer1/gstreamer1/Config.in @@ -51,10 +51,11 @@ config BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY increase the launch-time for a GStreamer application. config BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS - bool "install gst-launch & gst-inspect" + bool "install tools" default y help - Install the gst-launch and gst-inspect tools. This will take - up additional space on the target. + Install the gst-inspect, gst-launch, gst-stats and + gst-typefind tools. This will take up additional space on + the target. endif diff --git a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash index 204bb74fd..dd379e602 100644 --- a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.14.4.tar.xz.sha256sum -sha256 f94f6696c5f05a3b3a9183e39c5f5c0b779f75a04c0efa497e7920afa985ffc7 gstreamer-1.14.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.16.2.tar.xz.sha256sum +sha256 e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e gstreamer-1.16.2.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk index 76a74a080..4eb3158b8 100644 --- a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.14.4 +GSTREAMER1_VERSION = 1.16.2 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES @@ -12,24 +12,30 @@ GSTREAMER1_LICENSE_FILES = COPYING GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+ GSTREAMER1_CONF_OPTS = \ - --disable-examples \ - --disable-tests \ - --disable-failing-tests \ - --disable-valgrind \ - --disable-benchmarks \ - --disable-introspection \ - $(if $(BR2_PACKAGE_GSTREAMER1_CHECK),,--disable-check) \ - $(if $(BR2_PACKAGE_GSTREAMER1_TRACE),,--disable-trace) \ - $(if $(BR2_PACKAGE_GSTREAMER1_PARSE),,--disable-parse) \ - $(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),,--disable-gst-debug) \ - $(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),,--disable-registry) \ - $(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),,--disable-tools) + -Dexamples=disabled \ + -Dtests=disabled \ + -Dbenchmarks=disabled \ + -Dgtk_doc=disabled \ + -Dintrospection=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \ + -Dgobject-cast-checks=disabled \ + -Dcheck=$(if $(BR2_PACKAGE_GSTREAMER1_CHECK),enabled,disabled) \ + -Dtracer_hooks=$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),true,false) \ + -Doption-parsing=$(if $(BR2_PACKAGE_GSTREAMER1_PARSE),true,false) \ + -Dgst_debug=$(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),true,false) \ + -Dregistry=$(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),true,false) \ + -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) GSTREAMER1_DEPENDENCIES = \ host-bison \ host-flex \ host-pkgconf \ libglib2 \ - $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) + $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \ + $(if $(BR2_PACKAGE_VALGRIND),valgrind) \ + $(TARGET_NLS_DEPENDENCIES) -$(eval $(autotools-package)) +GSTREAMER1_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) + +$(eval $(meson-package)) diff --git a/buildroot/package/gtest/gmock.pc b/buildroot/package/gtest/gmock.pc deleted file mode 100644 index 4c723542a..000000000 --- a/buildroot/package/gtest/gmock.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib/ -includedir=${prefix}/include - -Name: gmock -Description: Google C++ Mocking Framework -Version: 1.8.0 -Libs: -L${libdir} -lgmock -Libs.private: -lpthread -Cflags: -I${includedir} diff --git a/buildroot/package/gtest/gtest.hash b/buildroot/package/gtest/gtest.hash index 0a8d8ba09..082c59778 100644 --- a/buildroot/package/gtest/gtest.hash +++ b/buildroot/package/gtest/gtest.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8 gtest-release-1.8.0.tar.gz +sha256 9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb gtest-1.10.0.tar.gz sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 googletest/LICENSE diff --git a/buildroot/package/gtest/gtest.mk b/buildroot/package/gtest/gtest.mk index b62ceb327..7f967b8bf 100644 --- a/buildroot/package/gtest/gtest.mk +++ b/buildroot/package/gtest/gtest.mk @@ -4,8 +4,8 @@ # ################################################################################ -GTEST_VERSION = release-1.8.0 -GTEST_SITE = $(call github,google,googletest,$(GTEST_VERSION)) +GTEST_VERSION = 1.10.0 +GTEST_SITE = $(call github,google,googletest,release-$(GTEST_VERSION)) GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO GTEST_LICENSE = BSD-3-Clause @@ -46,17 +46,9 @@ endif GTEST_CONF_OPTS += -DBUILD_GTEST=ON -ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) -GTEST_CONF_OPTS += -DBUILD_GMOCK=ON -else -GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF -endif - -define GTEST_INSTALL_MISSING_FILES - $(INSTALL) -D -m 0644 package/gtest/gtest.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/gtest.pc - # Generate the gtest-config script manually, since the CMake - # build system is not doing it. +# Generate the gtest-config script manually, since the CMake build system is +# not doing it. +define GTEST_INSTALL_GTEST_CONFIG sed 's%@PACKAGE_TARNAME@%gtest%;\ s%@PACKAGE_VERSION@%$(GTEST_VERSION)%;\ s%@prefix@%$(STAGING_DIR)/usr%;\ @@ -70,16 +62,30 @@ define GTEST_INSTALL_MISSING_FILES > $(STAGING_DIR)/usr/bin/gtest-config chmod +x $(STAGING_DIR)/usr/bin/gtest-config endef - -GTEST_POST_INSTALL_STAGING_HOOKS = GTEST_INSTALL_MISSING_FILES +GTEST_POST_INSTALL_STAGING_HOOKS = GTEST_INSTALL_GTEST_CONFIG ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) -define GTEST_GMOCK_INSTALL_MISSING_FILE - $(INSTALL) -D -m 0644 package/gtest/gmock.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/gmock.pc -endef +GTEST_CONF_OPTS += -DBUILD_GMOCK=ON -GTEST_POST_INSTALL_STAGING_HOOKS += GTEST_GMOCK_INSTALL_MISSING_FILE +# Generate the gmock-config script manually, since the CMake build system is +# not doing it. +define GTEST_INSTALL_GMOCK_CONFIG + sed 's%@PACKAGE_TARNAME@%gmock%;\ + s%@PACKAGE_VERSION@%$(GTEST_VERSION)%;\ + s%@prefix@%$(STAGING_DIR)/usr%;\ + s%@exec_prefix@%$(STAGING_DIR)/usr%;\ + s%@libdir@%$(STAGING_DIR)/usr/lib%;\ + s%@includedir@%$(STAGING_DIR)/usr/include%;\ + s%@bindir@%$(STAGING_DIR)/usr/bin%;\ + s%@PTHREAD_CFLAGS@%%;\ + s%@PTHREAD_LIBS@%-lpthread%;' \ + $(@D)/googlemock/scripts/gmock-config.in \ + > $(STAGING_DIR)/usr/bin/gmock-config + chmod +x $(STAGING_DIR)/usr/bin/gmock-config +endef +GTEST_POST_INSTALL_STAGING_HOOKS += GTEST_INSTALL_GMOCK_CONFIG +else +GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF endif define HOST_GTEST_INSTALL_CMDS diff --git a/buildroot/package/gtest/gtest.pc b/buildroot/package/gtest/gtest.pc deleted file mode 100644 index 594e79d7c..000000000 --- a/buildroot/package/gtest/gtest.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib/ -includedir=${prefix}/include - -Name: gtest -Description: Google C++ Testing Framework -Version: 1.8.0 -Libs: -L${libdir} -lgtest -Libs.private: -lpthread -Cflags: -I${includedir} diff --git a/buildroot/package/gtk2-engines/gtk2-engines.hash b/buildroot/package/gtk2-engines/gtk2-engines.hash index ac56c7d73..20125c706 100644 --- a/buildroot/package/gtk2-engines/gtk2-engines.hash +++ b/buildroot/package/gtk2-engines/gtk2-engines.hash @@ -1,2 +1,4 @@ # From http://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.sha256sum -sha256 15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5 gtk-engines-2.20.2.tar.bz2 +sha256 15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5 gtk-engines-2.20.2.tar.bz2 +# Locally computed +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/buildroot/package/gtkmm3/gtkmm3.hash b/buildroot/package/gtkmm3/gtkmm3.hash index 951b481f2..87c59b2ca 100644 --- a/buildroot/package/gtkmm3/gtkmm3.hash +++ b/buildroot/package/gtkmm3/gtkmm3.hash @@ -1,2 +1,5 @@ # From http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.0.sha256sum sha256 05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5 gtkmm-3.22.0.tar.xz +# Locally computed +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/buildroot/package/guile/0004-Makefile.am-fix-build-without-makeinfo.patch b/buildroot/package/guile/0004-Makefile.am-fix-build-without-makeinfo.patch new file mode 100644 index 000000000..0d16f9238 --- /dev/null +++ b/buildroot/package/guile/0004-Makefile.am-fix-build-without-makeinfo.patch @@ -0,0 +1,51 @@ +From 9304ad88a5f4b083d348563c5de00da53b34cf46 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 6 Mar 2020 23:20:39 +0100 +Subject: [PATCH] Makefile.am: fix build without makeinfo + +Don't build doc subdir if makeinfo is not available otherwise build +fails on: + +make[4]: Entering directory '/nvmedata/autobuild/instance-7/output-1/build/host-guile-2.0.14/doc/ref' + MAKEINFO guile.info +/nvmedata/autobuild/instance-7/output-1/build/host-guile-2.0.14/build-aux/missing: line 81: makeinfo: command not found +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + + +Fixes: + - http://autobuild.buildroot.org/results/9605aac6f760bfff190d0ab95fa50f65486ffe90 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to bug-guile@gnu.org] +--- + Makefile.am | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index ebbf6d476..2270afb9f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -38,8 +38,12 @@ SUBDIRS = \ + test-suite \ + benchmark-suite \ + gc-benchmarks \ +- am \ ++ am ++ ++if HAVE_MAKEINFO ++SUBDIRS += \ + doc ++endif + + DIST_SUBDIRS = $(SUBDIRS) prebuilt + +-- +2.25.0 + diff --git a/buildroot/package/guile/guile.hash b/buildroot/package/guile/guile.hash index 63651cf74..47ac00975 100644 --- a/buildroot/package/guile/guile.hash +++ b/buildroot/package/guile/guile.hash @@ -1,2 +1,6 @@ # Locally calculated after checking pgp signature -sha256 e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8619d82 guile-2.0.14.tar.xz +sha256 e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8619d82 guile-2.0.14.tar.xz +# Locally computed +sha256 b51c6f20e6d029cb5b3e5bf235ac562c9a188c5bdc4ffcdc663897772d6e0260 LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING.LESSER diff --git a/buildroot/package/guile/guile.mk b/buildroot/package/guile/guile.mk index f53ebdd5c..499286107 100644 --- a/buildroot/package/guile/guile.mk +++ b/buildroot/package/guile/guile.mk @@ -8,7 +8,8 @@ GUILE_VERSION = 2.0.14 GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz GUILE_SITE = $(BR2_GNU_MIRROR)/guile GUILE_INSTALL_STAGING = YES -# For 0002-calculate-csqrt_manually.patch +# For 0002-calculate-csqrt_manually.patch and +# 0004-Makefile.am-fix-build-without-makeinfo.patch GUILE_AUTORECONF = YES GUILE_LICENSE = LGPL-3.0+ GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER diff --git a/buildroot/package/gupnp-av/0001-Fix-static-library-linking-with-gupnp.patch b/buildroot/package/gupnp-av/0001-Fix-static-library-linking-with-gupnp.patch deleted file mode 100644 index eba99da45..000000000 --- a/buildroot/package/gupnp-av/0001-Fix-static-library-linking-with-gupnp.patch +++ /dev/null @@ -1,354 +0,0 @@ -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 - diff --git a/buildroot/package/gupnp-av/gupnp-av.hash b/buildroot/package/gupnp-av/gupnp-av.hash index e106b18aa..5dc2ac1a9 100644 --- a/buildroot/package/gupnp-av/gupnp-av.hash +++ b/buildroot/package/gupnp-av/gupnp-av.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.12/gupnp-av-0.12.10.sha256sum: -sha256 8038ef84dddbe7ad91c205bf91dddf684f072df8623f39b6555a6bb72837b85a gupnp-av-0.12.10.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.12/gupnp-av-0.12.11.sha256sum: +sha256 689dcf1492ab8991daea291365a32548a77d1a2294d85b33622b55cca9ce6fdc gupnp-av-0.12.11.tar.xz # Hash for license file: sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/gupnp-av/gupnp-av.mk b/buildroot/package/gupnp-av/gupnp-av.mk index 0940db761..c670ab6d4 100644 --- a/buildroot/package/gupnp-av/gupnp-av.mk +++ b/buildroot/package/gupnp-av/gupnp-av.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_AV_VERSION_MAJOR = 0.12 -GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).10 +GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).11 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) GUPNP_AV_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/gupnp-dlna/gupnp-dlna.mk b/buildroot/package/gupnp-dlna/gupnp-dlna.mk index 304f86a55..6f9ff8a58 100644 --- a/buildroot/package/gupnp-dlna/gupnp-dlna.mk +++ b/buildroot/package/gupnp-dlna/gupnp-dlna.mk @@ -15,12 +15,7 @@ GUPNP_DLNA_LICENSE_FILES = COPYING GUPNP_DLNA_INSTALL_STAGING = YES GUPNP_DLNA_DEPENDENCIES = host-pkgconf libglib2 libxml2 -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y) -GUPNP_DLNA_CONF_OPTS += --enable-legacy-gstreamer-metadata-backend -GUPNP_DLNA_DEPENDENCIES += gstreamer gst-plugins-base -else -GUPNP_DLNA_CONF_OPTS += --disable-legacy-gstreamer-metadata-backend -endif +GUPNP_DLNA_CONF_OPTS = --disable-legacy-gstreamer-metadata-backend ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) GUPNP_DLNA_CONF_OPTS += --enable-gstreamer-metadata-backend diff --git a/buildroot/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch b/buildroot/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch new file mode 100644 index 000000000..f8eba7677 --- /dev/null +++ b/buildroot/package/gupnp-tools/0001-src-meson.build-upload-needs-gupnp-av.patch @@ -0,0 +1,30 @@ +From 0831f77e990e363f78e3f6a5c461084988824f7b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 2 Jul 2019 23:48:12 +0200 +Subject: [PATCH] src/meson.build: upload needs gupnp-av + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/gupnp-tools/merge_requests/3] +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 84b2ca2..6601f45 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -2,9 +2,9 @@ subdir('common') + + if get_option('av-tools') and gupnp_av.found() + subdir('av-cp') ++ subdir('upload') + endif + + subdir('discover') + subdir('network-light') + subdir('universal-cp') +-subdir('upload') +-- +2.20.1 + diff --git a/buildroot/package/gupnp-tools/gupnp-tools.hash b/buildroot/package/gupnp-tools/gupnp-tools.hash index d80d83263..b7015e13a 100644 --- a/buildroot/package/gupnp-tools/gupnp-tools.hash +++ b/buildroot/package/gupnp-tools/gupnp-tools.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.14.sha256sum: -sha256 682b952b3cf43818c7d27549c152ea52e43320500820ab3392cf5a29a95e7efa gupnp-tools-0.8.14.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.15.sha256sum: +sha256 336ef4a09b9fc83444a1594c8215e2bed55fbea5b6d1bf6b54c63104b4c497ab gupnp-tools-0.8.15.tar.xz # Locally computed: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/gupnp-tools/gupnp-tools.mk b/buildroot/package/gupnp-tools/gupnp-tools.mk index 06c7b1fd3..6852697b8 100644 --- a/buildroot/package/gupnp-tools/gupnp-tools.mk +++ b/buildroot/package/gupnp-tools/gupnp-tools.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_TOOLS_VERSION_MAJOR = 0.8 -GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).14 +GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).15 GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz GUPNP_TOOLS_SITE = \ http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR) @@ -22,17 +22,17 @@ GUPNP_TOOLS_DEPENDENCIES = \ libgtk3 \ $(TARGET_NLS_DEPENDENCIES) -GUPNP_TOOLS_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +GUPNP_TOOLS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_GUPNP_AV),y) -GUPNP_TOOLS_CONF_OPTS += --with-av +GUPNP_TOOLS_CONF_OPTS += -Dav-tools=true GUPNP_TOOLS_DEPENDENCIES += gupnp-av else -GUPNP_TOOLS_CONF_OPTS += --without-av +GUPNP_TOOLS_CONF_OPTS += -Dav-tools=false endif ifeq ($(BR2_PACKAGE_GTKSOURCEVIEW),y) GUPNP_TOOLS_DEPENDENCIES += gtksourceview endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/gupnp/gupnp.hash b/buildroot/package/gupnp/gupnp.hash index ba73aa104..c530eb7ef 100644 --- a/buildroot/package/gupnp/gupnp.hash +++ b/buildroot/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.0/gupnp-1.0.3.sha256sum: -sha256 794b162ee566d85eded8c3f3e8c9c99f6b718a6b812d8b56f0c2ed72ac37cbbb gupnp-1.0.3.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.0/gupnp-1.0.4.sha256sum: +sha256 8b0992650c6ef8566d2d0c9198c8a669106dc2c73aa908fcc4a4d043a8c0b544 gupnp-1.0.4.tar.xz # Hash for license file: sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/gupnp/gupnp.mk b/buildroot/package/gupnp/gupnp.mk index 3c014ccc9..29305f0b4 100644 --- a/buildroot/package/gupnp/gupnp.mk +++ b/buildroot/package/gupnp/gupnp.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_VERSION_MAJOR = 1.0 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).3 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).4 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/gutenprint/0003-print-olympus.c-fix-endianness-detection.patch b/buildroot/package/gutenprint/0003-print-olympus.c-fix-endianness-detection.patch deleted file mode 100644 index fc1746ca0..000000000 --- a/buildroot/package/gutenprint/0003-print-olympus.c-fix-endianness-detection.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e0dad4bb237f1155e920c30c6fd3412e96a3e84d Mon Sep 17 00:00:00 2001 -From: Olivier Schonken -Date: Sun, 24 Jan 2016 17:14:21 +0200 -Subject: [PATCH 1/1] print-olympus.c: fix endianness detection - -The __LITTLE_ENDIAN__ and __BIG_ENDIAN__ macros are not a reliable way to -detect endianness. Instead, rely on __BYTE_ORDER like we do in the rest of -the code. - -Signed-off-by: Olivier Schonken ---- - src/main/print-olympus.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c -index 42c4897..8b2aa80 100644 ---- a/src/main/print-olympus.c -+++ b/src/main/print-olympus.c -@@ -4901,9 +4901,9 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image) - } - - if (pv.bytes_per_ink_channel > 1) { --#if defined(__LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN__) -+#if (__BYTE_ORDER == __LITTLE_ENDIAN) - pv.byteswap = dyesub_feature(caps, DYESUB_FEATURE_BIGENDIAN); --#elif defined (__BIG_ENDIAN) || defined(__BIG_ENDIAN__) -+#elif (__BYTE_ORDER == __BIG_ENDIAN) - pv.byteswap = !dyesub_feature(caps, DYESUB_FEATURE_BIGENDIAN); - #else - #error "Unable to determine endianness, aborting compilation!" --- -1.9.1 - diff --git a/buildroot/package/gutenprint/0004-build-Don-t-allow-USB-backends-to-be-built-if-CUPS-i.patch b/buildroot/package/gutenprint/0004-build-Don-t-allow-USB-backends-to-be-built-if-CUPS-i.patch deleted file mode 100644 index 1ecc89ede..000000000 --- a/buildroot/package/gutenprint/0004-build-Don-t-allow-USB-backends-to-be-built-if-CUPS-i.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b5e8dc446572c1198a24eff105a394d0f307951e Mon Sep 17 00:00:00 2001 -From: Solomon Peachy -Date: Fri, 15 Apr 2016 23:05:43 -0400 -Subject: [PATCH] build: Don't allow USB backends to be built if CUPS is not - enabled. - -[Waldemar: backport from upstream commit -fc1713589fed645f2c8002c3f66dfb69af314716.] -Signed-off-by: Waldemar Brodkorb ---- - configure.ac | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 800794b..ba30019 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -442,12 +442,14 @@ dnl if test -z "${[EXTRA_LIBREADLINE_DEPS]}" ; then - dnl [EXTRA_LIBREADLINE_DEPS]="" - dnl fi - --# libusb-1.0 (For CUPS backends) --PKG_CHECK_MODULES([LIBUSB], [libusb-1.0], -- [HAVE_LIBUSB=yes -- BUILD_LIBUSB_BACKENDS=yes], -- [HAVE_LIBUSB=no -- BUILD_LIBUSB_BACKENDS=no]) -+# libusb-1.0 (For CUPS backends, but only bother if CUPS is enabled) -+if test "x$BUILD_CUPS" = "xyes" ; then -+ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0], -+ [HAVE_LIBUSB=yes -+ BUILD_LIBUSB_BACKENDS=yes], -+ [HAVE_LIBUSB=no -+ BUILD_LIBUSB_BACKENDS=no]) -+fi - - AC_PATH_PROGS([GIMPTOOL2_CHECK], [gimptool-2.0 gimptool]) - if test -z "${GIMPTOOL2_CHECK}" ; then --- -2.6.4 - diff --git a/buildroot/package/gutenprint/gutenprint.hash b/buildroot/package/gutenprint/gutenprint.hash index a52cc7d42..811888498 100644 --- a/buildroot/package/gutenprint/gutenprint.hash +++ b/buildroot/package/gutenprint/gutenprint.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 c1a34cd2e02527de4d2a9bf6c14732cb9aa11b333f771eb6043fdc974de24df9 gutenprint-5.2.11.tar.bz2 +sha256 45bf0766f196a764c113bfad7ab1ea748f1d5ff9ebb0d3a2206705fe52e82389 gutenprint-5.2.14.tar.bz2 +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/gutenprint/gutenprint.mk b/buildroot/package/gutenprint/gutenprint.mk index 65b8d3109..9cb80c3e9 100644 --- a/buildroot/package/gutenprint/gutenprint.mk +++ b/buildroot/package/gutenprint/gutenprint.mk @@ -5,15 +5,22 @@ ################################################################################ GUTENPRINT_VERSION_MAJOR = 5.2 -GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).11 +GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).14 GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint-$(GUTENPRINT_VERSION_MAJOR)/$(GUTENPRINT_VERSION) GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2 GUTENPRINT_LICENSE = GPL-2.0+ GUTENPRINT_LICENSE_FILES = COPYING -# Needed, as we touch Makefile.am and configure.ac +# Needed, as we touch Makefile.am GUTENPRINT_AUTORECONF = YES +# Needed by autoreconf +define GUTENPRINT_CREATE_M4_DIR + mkdir -p $(@D)/m4local +endef +GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR +HOST_GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR + GUTENPRINT_DEPENDENCIES = \ cups host-pkgconf \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ @@ -33,8 +40,6 @@ GUTENPRINT_CONF_OPTS = \ --disable-samples \ --without-doc \ --without-gimp2 \ - --without-foomatic \ - --without-foomatic3 \ --disable-escputil \ --disable-test \ --disable-testpattern \ @@ -61,8 +66,6 @@ HOST_GUTENPRINT_CONF_OPTS = \ --disable-samples \ --without-gimp2 \ --without-doc \ - --disable-nls \ - --disable-nls-macos \ --without-foomatic \ --without-foomatic3 \ --disable-escputil \ @@ -70,13 +73,6 @@ HOST_GUTENPRINT_CONF_OPTS = \ --disable-testpattern \ --without-cups -# Needed by autoreconf -define GUTENPRINT_CREATE_M4_DIR - mkdir -p $(@D)/m4local -endef -GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR -HOST_GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR - define HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/include endef diff --git a/buildroot/package/gvfs/0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch b/buildroot/package/gvfs/0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch new file mode 100644 index 000000000..b5a6d024c --- /dev/null +++ b/buildroot/package/gvfs/0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch @@ -0,0 +1,46 @@ +From d8d0c8c40049cfd824b2b90d0cd47914052b9811 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Wed, 2 Jan 2019 17:13:27 +0100 +Subject: [PATCH] admin: Prevent access if any authentication agent isn't + available + +The backend currently allows to access and modify files without prompting +for password if any polkit authentication agent isn't available. This seems +isn't usually problem, because polkit agents are integral parts of +graphical environments / linux distributions. The agents can't be simply +disabled without root permissions and are automatically respawned. However, +this might be a problem in some non-standard cases. + +This affects only users which belong to wheel group (i.e. those who are +already allowed to use sudo). It doesn't allow privilege escalation for +users, who don't belong to that group. + +Let's return permission denied error also when the subject can't be +authorized by any polkit agent to prevent this behavior. + +Closes: https://gitlab.gnome.org/GNOME/gvfs/issues/355 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/gvfs/commit/d8d0c8c40049cfd824b2b90d0cd47914052b9811] +Signed-off-by: Fabrice Fontaine +--- + daemon/gvfsbackendadmin.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/daemon/gvfsbackendadmin.c b/daemon/gvfsbackendadmin.c +index ec0f2392..0f849008 100644 +--- a/daemon/gvfsbackendadmin.c ++++ b/daemon/gvfsbackendadmin.c +@@ -130,8 +130,7 @@ check_permission (GVfsBackendAdmin *self, + return FALSE; + } + +- is_authorized = polkit_authorization_result_get_is_authorized (result) || +- polkit_authorization_result_get_is_challenge (result); ++ is_authorized = polkit_authorization_result_get_is_authorized (result); + + g_object_unref (result); + +-- +2.24.1 + diff --git a/buildroot/package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch b/buildroot/package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch new file mode 100644 index 000000000..42174153d --- /dev/null +++ b/buildroot/package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch @@ -0,0 +1,131 @@ +From 5cd76d627f4d1982b6e77a0e271ef9301732d09e Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Thu, 23 May 2019 10:24:36 +0200 +Subject: [PATCH] admin: Add query_info_on_read/write functionality + +Admin backend doesn't implement query_info_on_read/write which might +potentially lead to some race conditions which aren't really wanted +especially in case of admin backend. Let's add this missing functionality. + +[Retrieved fom: +https://gitlab.gnome.org/GNOME/gvfs/commit/5cd76d627f4d1982b6e77a0e271ef9301732d09e] +Signed-off-by: Fabrice Fontaine +--- + daemon/gvfsbackendadmin.c | 79 +++++++++++++++++++++++++++++++++------ + 1 file changed, 67 insertions(+), 12 deletions(-) + +diff --git a/daemon/gvfsbackendadmin.c b/daemon/gvfsbackendadmin.c +index 65a979e7..23d16f16 100644 +--- a/daemon/gvfsbackendadmin.c ++++ b/daemon/gvfsbackendadmin.c +@@ -42,6 +42,8 @@ + #include "gvfsjobopenforwrite.h" + #include "gvfsjobqueryattributes.h" + #include "gvfsjobqueryinfo.h" ++#include "gvfsjobqueryinforead.h" ++#include "gvfsjobqueryinfowrite.h" + #include "gvfsjobread.h" + #include "gvfsjobseekread.h" + #include "gvfsjobseekwrite.h" +@@ -155,6 +157,19 @@ complete_job (GVfsJob *job, + g_vfs_job_succeeded (job); + } + ++static void ++fix_file_info (GFileInfo *info) ++{ ++ /* Override read/write flags, since the above call will use access() ++ * to determine permissions, which does not honor our privileged ++ * capabilities. ++ */ ++ g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_READ, TRUE); ++ g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, TRUE); ++ g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, TRUE); ++ g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME, TRUE); ++} ++ + static void + do_query_info (GVfsBackend *backend, + GVfsJobQueryInfo *query_info_job, +@@ -180,19 +195,57 @@ do_query_info (GVfsBackend *backend, + if (error != NULL) + goto out; + +- /* Override read/write flags, since the above call will use access() +- * to determine permissions, which does not honor our privileged +- * capabilities. +- */ +- g_file_info_set_attribute_boolean (real_info, +- G_FILE_ATTRIBUTE_ACCESS_CAN_READ, TRUE); +- g_file_info_set_attribute_boolean (real_info, +- G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, TRUE); +- g_file_info_set_attribute_boolean (real_info, +- G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, TRUE); +- g_file_info_set_attribute_boolean (real_info, +- G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME, TRUE); ++ fix_file_info (real_info); ++ g_file_info_copy_into (real_info, info); ++ g_object_unref (real_info); ++ ++ out: ++ complete_job (job, error); ++} ++ ++static void ++do_query_info_on_read (GVfsBackend *backend, ++ GVfsJobQueryInfoRead *query_info_job, ++ GVfsBackendHandle handle, ++ GFileInfo *info, ++ GFileAttributeMatcher *matcher) ++{ ++ GVfsJob *job = G_VFS_JOB (query_info_job); ++ GFileInputStream *stream = handle; ++ GError *error = NULL; ++ GFileInfo *real_info; ++ ++ real_info = g_file_input_stream_query_info (stream, query_info_job->attributes, ++ job->cancellable, &error); ++ if (error != NULL) ++ goto out; ++ ++ fix_file_info (real_info); ++ g_file_info_copy_into (real_info, info); ++ g_object_unref (real_info); ++ ++ out: ++ complete_job (job, error); ++} ++ ++static void ++do_query_info_on_write (GVfsBackend *backend, ++ GVfsJobQueryInfoWrite *query_info_job, ++ GVfsBackendHandle handle, ++ GFileInfo *info, ++ GFileAttributeMatcher *matcher) ++{ ++ GVfsJob *job = G_VFS_JOB (query_info_job); ++ GFileOutputStream *stream = handle; ++ GError *error = NULL; ++ GFileInfo *real_info; ++ ++ real_info = g_file_output_stream_query_info (stream, query_info_job->attributes, ++ job->cancellable, &error); ++ if (error != NULL) ++ goto out; + ++ fix_file_info (real_info); + g_file_info_copy_into (real_info, info); + g_object_unref (real_info); + +@@ -868,6 +921,8 @@ g_vfs_backend_admin_class_init (GVfsBackendAdminClass * klass) + backend_class->mount = do_mount; + backend_class->open_for_read = do_open_for_read; + backend_class->query_info = do_query_info; ++ backend_class->query_info_on_read = do_query_info_on_read; ++ backend_class->query_info_on_write = do_query_info_on_write; + backend_class->read = do_read; + backend_class->create = do_create; + backend_class->append_to = do_append_to; +-- +2.24.1 + diff --git a/buildroot/package/gvfs/0003-admin-Allow-changing-file-owner.patch b/buildroot/package/gvfs/0003-admin-Allow-changing-file-owner.patch new file mode 100644 index 000000000..04138b395 --- /dev/null +++ b/buildroot/package/gvfs/0003-admin-Allow-changing-file-owner.patch @@ -0,0 +1,34 @@ +From daf1163aba229afcfddf0f925aef7e97047e8959 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Thu, 23 May 2019 10:29:08 +0200 +Subject: [PATCH] admin: Allow changing file owner + +CAP_CHOWN is dropped together with other privilages and thus the backend +can't change file owner. This might be probably e.g. in case of copy +operation when G_FILE_COPY_ALL_METADATA is used. Let's keep CAP_CHOWN +to fix this. + +[Retrieved from: +https://gitlab.gnome.org/GNOME/gvfs/commit/daf1163aba229afcfddf0f925aef7e97047e8959] +Signed-off-by: Fabrice Fontaine +--- + daemon/gvfsbackendadmin.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/daemon/gvfsbackendadmin.c b/daemon/gvfsbackendadmin.c +index 23d16f16..a74d09cf 100644 +--- a/daemon/gvfsbackendadmin.c ++++ b/daemon/gvfsbackendadmin.c +@@ -968,7 +968,8 @@ g_vfs_backend_admin_init (GVfsBackendAdmin *self) + + #define REQUIRED_CAPS (CAP_TO_MASK(CAP_FOWNER) | \ + CAP_TO_MASK(CAP_DAC_OVERRIDE) | \ +- CAP_TO_MASK(CAP_DAC_READ_SEARCH)) ++ CAP_TO_MASK(CAP_DAC_READ_SEARCH) | \ ++ CAP_TO_MASK(CAP_CHOWN)) + + static void + acquire_caps (uid_t uid) +-- +2.24.1 + diff --git a/buildroot/package/gvfs/0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch b/buildroot/package/gvfs/0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch new file mode 100644 index 000000000..22fe57002 --- /dev/null +++ b/buildroot/package/gvfs/0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch @@ -0,0 +1,91 @@ +From 3895e09d784ebec0fbc4614d5c37068736120e1d Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Thu, 23 May 2019 10:33:30 +0200 +Subject: [PATCH] admin: Use fsuid to ensure correct file ownership + +Files created over admin backend should be owned by root, but they are +owned by the user itself. This is because the daemon drops the uid to +make dbus connection work. Use fsuid and euid to fix this issue. + +Closes: https://gitlab.gnome.org/GNOME/gvfs/issues/21 + +[Retrieved from: +https://gitlab.gnome.org/GNOME/gvfs/commit/3895e09d784ebec0fbc4614d5c37068736120e1d] +Signed-off-by: Fabrice Fontaine +--- + daemon/gvfsbackendadmin.c | 29 +++++++---------------------- + 1 file changed, 7 insertions(+), 22 deletions(-) + +diff --git a/daemon/gvfsbackendadmin.c b/daemon/gvfsbackendadmin.c +index a74d09cf..32b51b1a 100644 +--- a/daemon/gvfsbackendadmin.c ++++ b/daemon/gvfsbackendadmin.c +@@ -157,19 +157,6 @@ complete_job (GVfsJob *job, + g_vfs_job_succeeded (job); + } + +-static void +-fix_file_info (GFileInfo *info) +-{ +- /* Override read/write flags, since the above call will use access() +- * to determine permissions, which does not honor our privileged +- * capabilities. +- */ +- g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_READ, TRUE); +- g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, TRUE); +- g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, TRUE); +- g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME, TRUE); +-} +- + static void + do_query_info (GVfsBackend *backend, + GVfsJobQueryInfo *query_info_job, +@@ -195,7 +182,6 @@ do_query_info (GVfsBackend *backend, + if (error != NULL) + goto out; + +- fix_file_info (real_info); + g_file_info_copy_into (real_info, info); + g_object_unref (real_info); + +@@ -220,7 +206,6 @@ do_query_info_on_read (GVfsBackend *backend, + if (error != NULL) + goto out; + +- fix_file_info (real_info); + g_file_info_copy_into (real_info, info); + g_object_unref (real_info); + +@@ -245,7 +230,6 @@ do_query_info_on_write (GVfsBackend *backend, + if (error != NULL) + goto out; + +- fix_file_info (real_info); + g_file_info_copy_into (real_info, info); + g_object_unref (real_info); + +@@ -977,14 +961,15 @@ acquire_caps (uid_t uid) + struct __user_cap_header_struct hdr; + struct __user_cap_data_struct data; + +- /* Tell kernel not clear capabilities when dropping root */ +- if (prctl (PR_SET_KEEPCAPS, 1, 0, 0, 0) < 0) +- g_error ("prctl(PR_SET_KEEPCAPS) failed"); +- +- /* Drop root uid, but retain the required permitted caps */ +- if (setuid (uid) < 0) ++ /* Set euid to user to make dbus work */ ++ if (seteuid (uid) < 0) + g_error ("unable to drop privs"); + ++ /* Set fsuid to still behave like root when working with files */ ++ setfsuid (0); ++ if (setfsuid (-1) != 0) ++ g_error ("setfsuid failed"); ++ + memset (&hdr, 0, sizeof(hdr)); + hdr.version = _LINUX_CAPABILITY_VERSION; + +-- +2.24.1 + diff --git a/buildroot/package/gvfs/0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch b/buildroot/package/gvfs/0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch new file mode 100644 index 000000000..29f7573a6 --- /dev/null +++ b/buildroot/package/gvfs/0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch @@ -0,0 +1,84 @@ +From d5dfd823c94045488aef8727c553f1e0f7666b90 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Fri, 24 May 2019 09:43:43 +0200 +Subject: [PATCH] admin: Ensure correct ownership when moving to file:// uri + +User and group is not restored properly when moving (or copying with +G_FILE_COPY_ALL_METADATA) from admin:// to file://, because it is handled +by GIO fallback code, which doesn't run with root permissions. Let's +handle this case with pull method to ensure correct ownership. + +[Retrieved from: +https://gitlab.gnome.org/GNOME/gvfs/commit/d5dfd823c94045488aef8727c553f1e0f7666b90] +Signed-off-by: Fabrice Fontaine +--- + daemon/gvfsbackendadmin.c | 46 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +diff --git a/daemon/gvfsbackendadmin.c b/daemon/gvfsbackendadmin.c +index 32b51b1a..9a7e8295 100644 +--- a/daemon/gvfsbackendadmin.c ++++ b/daemon/gvfsbackendadmin.c +@@ -807,6 +807,51 @@ do_move (GVfsBackend *backend, + complete_job (job, error); + } + ++static void ++do_pull (GVfsBackend *backend, ++ GVfsJobPull *pull_job, ++ const char *source, ++ const char *local_path, ++ GFileCopyFlags flags, ++ gboolean remove_source, ++ GFileProgressCallback progress_callback, ++ gpointer progress_callback_data) ++{ ++ GVfsBackendAdmin *self = G_VFS_BACKEND_ADMIN (backend); ++ GVfsJob *job = G_VFS_JOB (pull_job); ++ GError *error = NULL; ++ GFile *src_file, *dst_file; ++ ++ /* Pull method is necessary when user/group needs to be restored, return ++ * G_IO_ERROR_NOT_SUPPORTED in other cases to proceed with the fallback code. ++ */ ++ if (!(flags & G_FILE_COPY_ALL_METADATA)) ++ { ++ g_vfs_job_failed_literal (G_VFS_JOB (job), G_IO_ERROR, ++ G_IO_ERROR_NOT_SUPPORTED, ++ _("Operation not supported")); ++ return; ++ } ++ ++ if (!check_permission (self, job)) ++ return; ++ ++ src_file = g_file_new_for_path (source); ++ dst_file = g_file_new_for_path (local_path); ++ ++ if (remove_source) ++ g_file_move (src_file, dst_file, flags, job->cancellable, ++ progress_callback, progress_callback_data, &error); ++ else ++ g_file_copy (src_file, dst_file, flags, job->cancellable, ++ progress_callback, progress_callback_data, &error); ++ ++ g_object_unref (src_file); ++ g_object_unref (dst_file); ++ ++ complete_job (job, error); ++} ++ + static void + do_query_settable_attributes (GVfsBackend *backend, + GVfsJobQueryAttributes *query_job, +@@ -927,6 +972,7 @@ g_vfs_backend_admin_class_init (GVfsBackendAdminClass * klass) + backend_class->set_attribute = do_set_attribute; + backend_class->delete = do_delete; + backend_class->move = do_move; ++ backend_class->pull = do_pull; + backend_class->query_settable_attributes = do_query_settable_attributes; + backend_class->query_writable_namespaces = do_query_writable_namespaces; + } +-- +2.24.1 + diff --git a/buildroot/package/gvfs/0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch b/buildroot/package/gvfs/0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch new file mode 100644 index 000000000..56bef26b0 --- /dev/null +++ b/buildroot/package/gvfs/0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch @@ -0,0 +1,96 @@ +From 70dbfc68a79faac49bd3423e079cb6902522082a Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Wed, 5 Jun 2019 13:33:38 +0100 +Subject: [PATCH] gvfsdaemon: Check that the connecting client is the same user + +Otherwise, an attacker who learns the abstract socket address from +netstat(8) or similar could connect to it and issue D-Bus method +calls. + +Signed-off-by: Simon McVittie + +[Retrieved from: +https://gitlab.gnome.org/GNOME/gvfs/commit/70dbfc68a79faac49bd3423e079cb6902522082a] +Signed-off-by: Fabrice Fontaine +--- + daemon/gvfsdaemon.c | 36 +++++++++++++++++++++++++++++++++++- + 1 file changed, 35 insertions(+), 1 deletion(-) + +diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c +index 406d4f8e..be148a7b 100644 +--- a/daemon/gvfsdaemon.c ++++ b/daemon/gvfsdaemon.c +@@ -79,6 +79,7 @@ struct _GVfsDaemon + + gint mount_counter; + ++ GDBusAuthObserver *auth_observer; + GDBusConnection *conn; + GVfsDBusDaemon *daemon_skeleton; + GVfsDBusMountable *mountable_skeleton; +@@ -171,6 +172,8 @@ g_vfs_daemon_finalize (GObject *object) + } + if (daemon->conn != NULL) + g_object_unref (daemon->conn); ++ if (daemon->auth_observer != NULL) ++ g_object_unref (daemon->auth_observer); + + g_hash_table_destroy (daemon->registered_paths); + g_hash_table_destroy (daemon->client_connections); +@@ -236,6 +239,35 @@ name_vanished_handler (GDBusConnection *connection, + daemon->lost_main_daemon = TRUE; + } + ++/* ++ * Authentication observer signal handler that authorizes connections ++ * from the same uid as this process. This matches the behaviour of a ++ * libdbus DBusServer/DBusConnection when no DBusAllowUnixUserFunction ++ * has been set, but is not the default in GDBus. ++ */ ++static gboolean ++authorize_authenticated_peer_cb (GDBusAuthObserver *observer, ++ G_GNUC_UNUSED GIOStream *stream, ++ GCredentials *credentials, ++ G_GNUC_UNUSED gpointer user_data) ++{ ++ gboolean authorized = FALSE; ++ ++ if (credentials != NULL) ++ { ++ GCredentials *own_credentials; ++ ++ own_credentials = g_credentials_new (); ++ ++ if (g_credentials_is_same_user (credentials, own_credentials, NULL)) ++ authorized = TRUE; ++ ++ g_object_unref (own_credentials); ++ } ++ ++ return authorized; ++} ++ + static void + g_vfs_daemon_init (GVfsDaemon *daemon) + { +@@ -265,6 +297,8 @@ g_vfs_daemon_init (GVfsDaemon *daemon) + + daemon->conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); + g_assert (daemon->conn != NULL); ++ daemon->auth_observer = g_dbus_auth_observer_new (); ++ g_signal_connect (daemon->auth_observer, "authorize-authenticated-peer", G_CALLBACK (authorize_authenticated_peer_cb), NULL); + + daemon->daemon_skeleton = gvfs_dbus_daemon_skeleton_new (); + g_signal_connect (daemon->daemon_skeleton, "handle-get-connection", G_CALLBACK (handle_get_connection), daemon); +@@ -876,7 +910,7 @@ handle_get_connection (GVfsDBusDaemon *object, + server = g_dbus_server_new_sync (address1, + G_DBUS_SERVER_FLAGS_NONE, + guid, +- NULL, /* GDBusAuthObserver */ ++ daemon->auth_observer, + NULL, /* GCancellable */ + &error); + g_free (guid); +-- +2.24.1 + diff --git a/buildroot/package/gvfs/gvfs.mk b/buildroot/package/gvfs/gvfs.mk index c380a710f..b3b18a348 100644 --- a/buildroot/package/gvfs/gvfs.mk +++ b/buildroot/package/gvfs/gvfs.mk @@ -15,6 +15,22 @@ GVFS_LICENSE = LGPL-2.0+ GVFS_LICENSE_FILES = COPYING GVFS_LIBS = $(TARGET_NLS_LIBS) +# 0001-admin-Prevent-access-if-any-authentication-agent-isn-t-available.patch +GVFS_IGNORE_CVES += CVE-2019-3827 + +# package/gvfs/0002-admin-Add-query_info_on_read-write-functionality.patch +GVFS_IGNORE_CVES += CVE-2019-12448 + +# 0003-admin-Allow-changing-file-owner.patch +# 0004-admin-Use-fsuid-to-ensure-correct-file-ownership.patch +GVFS_IGNORE_CVES += CVE-2019-12447 + +# 0005-admin-Ensure-correct-ownership-when-moving-to-file-uri.patch +GVFS_IGNORE_CVES += CVE-2019-12449 + +# 0006-gvfsdaemon-Check-that-the-connecting-client-is-the-same-user.patch +GVFS_IGNORE_CVES += CVE-2019-12795 + # Export ac_cv_path_LIBGCRYPT_CONFIG unconditionally to prevent # build system from searching the host paths. GVFS_CONF_ENV = \ diff --git a/buildroot/package/gzip/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/buildroot/package/gzip/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch deleted file mode 100644 index 11d2af6d4..000000000 --- a/buildroot/package/gzip/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 5 Mar 2018 10:56:29 -0800 -Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Daniel P. Berrange in: -https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html -* lib/fbufmode.c (fbufmode): -* lib/fflush.c (clear_ungetc_buffer_preserving_position) -(disable_seek_optimization, rpl_fflush): -* lib/fpending.c (__fpending): -* lib/fpurge.c (fpurge): -* lib/freadable.c (freadable): -* lib/freadahead.c (freadahead): -* lib/freading.c (freading): -* lib/freadptr.c (freadptr): -* lib/freadseek.c (freadptrinc): -* lib/fseeko.c (fseeko): -* lib/fseterr.c (fseterr): -* lib/fwritable.c (fwritable): -* lib/fwriting.c (fwriting): -Check _IO_EOF_SEEN instead of _IO_ftrylockfile. -* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: -Define if not already defined. ---- - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Signed-off-by: Yegor Yefremov - - ChangeLog | 23 +++++++++++++++++++++++ - lib/fbufmode.c | 2 +- - lib/fflush.c | 6 +++--- - lib/fpending.c | 2 +- - lib/fpurge.c | 2 +- - lib/freadable.c | 2 +- - lib/freadahead.c | 2 +- - lib/freading.c | 2 +- - lib/freadptr.c | 2 +- - lib/freadseek.c | 2 +- - lib/fseeko.c | 4 ++-- - lib/fseterr.c | 2 +- - lib/fwritable.c | 2 +- - lib/fwriting.c | 2 +- - lib/stdio-impl.h | 6 ++++++ - 15 files changed, 45 insertions(+), 16 deletions(-) - -Index: gzip-1.9/ChangeLog -=================================================================== ---- gzip-1.9.orig/ChangeLog -+++ gzip-1.9/ChangeLog -@@ -1,3 +1,26 @@ -+2018-03-05 Paul Eggert -+ -+ fflush: adjust to glibc 2.28 libio.h removal -+ Problem reported by Daniel P. Berrange in: -+ https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html -+ * lib/fbufmode.c (fbufmode): -+ * lib/fflush.c (clear_ungetc_buffer_preserving_position) -+ (disable_seek_optimization, rpl_fflush): -+ * lib/fpending.c (__fpending): -+ * lib/fpurge.c (fpurge): -+ * lib/freadable.c (freadable): -+ * lib/freadahead.c (freadahead): -+ * lib/freading.c (freading): -+ * lib/freadptr.c (freadptr): -+ * lib/freadseek.c (freadptrinc): -+ * lib/fseeko.c (fseeko): -+ * lib/fseterr.c (fseterr): -+ * lib/fwritable.c (fwritable): -+ * lib/fwriting.c (fwriting): -+ Check _IO_EOF_SEEN instead of _IO_ftrylockfile. -+ * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: -+ Define if not already defined. -+ - 2018-01-07 Jim Meyering - - version 1.9 -Index: gzip-1.9/lib/fflush.c -=================================================================== ---- gzip-1.9.orig/lib/fflush.c -+++ gzip-1.9/lib/fflush.c -@@ -33,7 +33,7 @@ - #undef fflush - - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ - static void -@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) - - #endif - --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) - - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) - if (stream == NULL || ! freading (stream)) - return fflush (stream); - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - -Index: gzip-1.9/lib/fpurge.c -=================================================================== ---- gzip-1.9.orig/lib/fpurge.c -+++ gzip-1.9/lib/fpurge.c -@@ -62,7 +62,7 @@ fpurge (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ -Index: gzip-1.9/lib/freading.c -=================================================================== ---- gzip-1.9.orig/lib/freading.c -+++ gzip-1.9/lib/freading.c -@@ -31,7 +31,7 @@ freading (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); -Index: gzip-1.9/lib/fseeko.c -=================================================================== ---- gzip-1.9.orig/lib/fseeko.c -+++ gzip-1.9/lib/fseeko.c -@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -Index: gzip-1.9/lib/fseterr.c -=================================================================== ---- gzip-1.9.orig/lib/fseterr.c -+++ gzip-1.9/lib/fseterr.c -@@ -29,7 +29,7 @@ fseterr (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags |= _IO_ERR_SEEN; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -Index: gzip-1.9/lib/stdio-impl.h -=================================================================== ---- gzip-1.9.orig/lib/stdio-impl.h -+++ gzip-1.9/lib/stdio-impl.h -@@ -18,6 +18,12 @@ - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ diff --git a/buildroot/package/gzip/gzip.hash b/buildroot/package/gzip/gzip.hash index 632176c2b..5675b3ed5 100644 --- a/buildroot/package/gzip/gzip.hash +++ b/buildroot/package/gzip/gzip.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/gzip/gzip-1.9.tar.xz.sig +# https://ftp.gnu.org/gnu/gzip/gzip-1.10.tar.xz.sig # using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 ae506144fc198bd8f81f1f4ad19ce63d5a2d65e42333255977cf1dcf1479089a gzip-1.9.tar.xz +sha256 8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0 gzip-1.10.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gzip/gzip.mk b/buildroot/package/gzip/gzip.mk index 8ac6ddd6e..17b27b497 100644 --- a/buildroot/package/gzip/gzip.mk +++ b/buildroot/package/gzip/gzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -GZIP_VERSION = 1.9 +GZIP_VERSION = 1.10 GZIP_SOURCE = gzip-$(GZIP_VERSION).tar.xz GZIP_SITE = $(BR2_GNU_MIRROR)/gzip # Some other tools expect it to be in /bin diff --git a/buildroot/package/hans/hans.hash b/buildroot/package/hans/hans.hash index bde6a7ab8..fe46ab588 100644 --- a/buildroot/package/hans/hans.hash +++ b/buildroot/package/hans/hans.hash @@ -2,4 +2,5 @@ md5 8628393ec1b61a6c3a47a0a3dcb455b3 hans-1.0.tar.gz sha1 0bc857df109af222732cb95c861a0f0a6dd53dee hans-1.0.tar.gz # Locally computed -sha256 f8f70cf22ba14d9223695c9e9a2d75289d8360f61f533b83ee538836f29a458e hans-1.0.tar.gz +sha256 f8f70cf22ba14d9223695c9e9a2d75289d8360f61f533b83ee538836f29a458e hans-1.0.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/buildroot/package/haproxy/Config.in b/buildroot/package/haproxy/Config.in index 670de5a3e..b348eb9d8 100644 --- a/buildroot/package/haproxy/Config.in +++ b/buildroot/package/haproxy/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS bool default y - # internal compiler error: in do_output_reload, at reload1.c:7978 - depends on !BR2_microblaze # src/proto_http.c:6330:1: internal compiler error: Segmentation fault depends on !BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60040 @@ -12,7 +10,7 @@ config BR2_PACKAGE_HAPROXY bool "haproxy" depends on BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics + depends on BR2_TOOLCHAIN_HAS_SYNC_1 && BR2_TOOLCHAIN_HAS_SYNC_4 help HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and diff --git a/buildroot/package/haproxy/haproxy.hash b/buildroot/package/haproxy/haproxy.hash index 6060400de..b89bda834 100644 --- a/buildroot/package/haproxy/haproxy.hash +++ b/buildroot/package/haproxy/haproxy.hash @@ -1,5 +1,6 @@ +# From: http://www.haproxy.org/download/2.1/src/haproxy-2.1.4.tar.gz.sha256 +sha256 51030ff696d7067162b4d24d354044293aecfbb36d7acc2f840c8d928bfe91cd haproxy-2.1.4.tar.gz # Locally computed: -sha256 adae40f963b03df0917edc44681064627f77683dcf7db66ef030672ad6d00547 haproxy-1.9.13.tar.gz -sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt -sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 doc/gpl.txt +sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt +sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 doc/gpl.txt diff --git a/buildroot/package/haproxy/haproxy.mk b/buildroot/package/haproxy/haproxy.mk index aa440d7d6..6752367fa 100644 --- a/buildroot/package/haproxy/haproxy.mk +++ b/buildroot/package/haproxy/haproxy.mk @@ -4,8 +4,8 @@ # ################################################################################ -HAPROXY_VERSION_MAJOR = 1.9 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).13 +HAPROXY_VERSION_MAJOR = 2.1 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).4 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt @@ -69,9 +69,15 @@ endif HAPROXY_MAKE_OPTS += ADDLIB="$(HAPROXY_LIBS)" +HAPROXY_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_90620),y) +HAPROXY_CFLAGS += -O0 +endif + define HAPROXY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(HAPROXY_MAKE_OPTS) -C $(@D) + $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D) endef define HAPROXY_INSTALL_TARGET_CMDS diff --git a/buildroot/package/harfbuzz/Config.in b/buildroot/package/harfbuzz/Config.in index a6db9840c..e8f407bb8 100644 --- a/buildroot/package/harfbuzz/Config.in +++ b/buildroot/package/harfbuzz/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_HARFBUZZ bool "harfbuzz" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 help HarfBuzz is an OpenType text shaping engine @@ -10,6 +11,7 @@ config BR2_PACKAGE_HARFBUZZ Harfbuzz can make optional use of cairo, freetype, glib2 and icu packages if they are selected. -comment "harfbuzz needs a toolchain w/ C++" +comment "harfbuzz needs a toolchain w/ C++, gcc => 4.8" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_INSTALL_LIBSTDCPP + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/harfbuzz/harfbuzz.hash b/buildroot/package/harfbuzz/harfbuzz.hash index a10b4cfd5..ba54f477a 100644 --- a/buildroot/package/harfbuzz/harfbuzz.hash +++ b/buildroot/package/harfbuzz/harfbuzz.hash @@ -1,6 +1,5 @@ -# From https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.8.8.tar.bz2.sha256 -sha256 a8e5c86e4d99e1cc9865ec1b8e9b05b98e413c2a885cd11f8e9bb9502dd3e3a9 harfbuzz-1.8.8.tar.bz2 +# From https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.4.tar.xz.sha256 +sha256 9413b8d96132d699687ef914ebb8c50440efc87b3f775d25856d7ec347c03c12 harfbuzz-2.6.4.tar.xz # Locally computed -sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 COPYING -sha256 ec20cbe051200fc846caf4dc253cf660e874a2d9e4f3a682e08354b567fae409 src/hb-ucdn/COPYING +sha256 1b32b6e2fea50440c128c5ba482f7691367c46fd0cd573b80fc863bf07964cea COPYING diff --git a/buildroot/package/harfbuzz/harfbuzz.mk b/buildroot/package/harfbuzz/harfbuzz.mk index 52374c9c9..3006b5ab9 100644 --- a/buildroot/package/harfbuzz/harfbuzz.mk +++ b/buildroot/package/harfbuzz/harfbuzz.mk @@ -4,11 +4,11 @@ # ################################################################################ -HARFBUZZ_VERSION = 1.8.8 +HARFBUZZ_VERSION = 2.6.4 HARFBUZZ_SITE = https://www.freedesktop.org/software/harfbuzz/release -HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 +HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) -HARFBUZZ_LICENSE_FILES = COPYING src/hb-ucdn/COPYING +HARFBUZZ_LICENSE_FILES = COPYING HARFBUZZ_INSTALL_STAGING = YES HARFBUZZ_CONF_OPTS = --with-coretext=no --with-uniscribe=no diff --git a/buildroot/package/haserl/haserl.hash b/buildroot/package/haserl/haserl.hash index 2b23a6c6e..149bf0b0a 100644 --- a/buildroot/package/haserl/haserl.hash +++ b/buildroot/package/haserl/haserl.hash @@ -1,3 +1,5 @@ # From http://sourceforge.net/projects/haserl/files/haserl-devel/ md5 918f0b4f6cec0b438c8b5c78f2989010 haserl-0.9.35.tar.gz sha1 9a331d41e9d47a81e81e158f9a16bf5443347cd4 haserl-0.9.35.tar.gz +# Locally computed +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/haveged/haveged.hash b/buildroot/package/haveged/haveged.hash index fc7858787..2bb1fdd84 100644 --- a/buildroot/package/haveged/haveged.hash +++ b/buildroot/package/haveged/haveged.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4d4c046755476d3734ffb78772c242c25913ff0eb7509c143671dae6ec9d1189 haveged-1.9.6.tar.gz +sha256 99aa1996c6e39ea2459cfc37addfb8b1eecc63f3a2b6da9db17b22e76b6851ae haveged-1.9.8.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/haveged/haveged.mk b/buildroot/package/haveged/haveged.mk index afb54df1a..cc834304d 100644 --- a/buildroot/package/haveged/haveged.mk +++ b/buildroot/package/haveged/haveged.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAVEGED_VERSION = 1.9.6 +HAVEGED_VERSION = 1.9.8 HAVEGED_SITE = $(call github,jirka-h,haveged,v$(HAVEGED_VERSION)) HAVEGED_LICENSE = GPL-3.0+ HAVEGED_LICENSE_FILES = COPYING @@ -21,9 +21,6 @@ endef define HAVEGED_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/haveged/haveged.service \ $(TARGET_DIR)/usr/lib/systemd/system/haveged.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs /usr/lib/systemd/system/haveged.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/haveged.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/hdparm/hdparm.hash b/buildroot/package/hdparm/hdparm.hash index 2ce23cf84..4251b5a65 100644 --- a/buildroot/package/hdparm/hdparm.hash +++ b/buildroot/package/hdparm/hdparm.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/hdparm/files/hdparm/ -md5 7900608e32834f65d2654fdb696e71a0 hdparm-9.56.tar.gz -sha1 9e143065115229c4f929530157627dc92e5f6deb hdparm-9.56.tar.gz +md5 4652c49cf096a64683c05f54b4fa4679 hdparm-9.58.tar.gz +sha1 b3425a141f1c0fe9f53b18631437129c2155ee45 hdparm-9.58.tar.gz # Locally computed -sha256 6ff9ed695f1017396eec4101f990f114b7b0e0a04c5aa6369c0394053d16e4da hdparm-9.56.tar.gz +sha256 9ae78e883f3ce071d32ee0f1b9a2845a634fc4dd94a434e653fdbef551c5e10f hdparm-9.58.tar.gz sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT diff --git a/buildroot/package/hdparm/hdparm.mk b/buildroot/package/hdparm/hdparm.mk index 7ed1ed862..9826dde01 100644 --- a/buildroot/package/hdparm/hdparm.mk +++ b/buildroot/package/hdparm/hdparm.mk @@ -4,7 +4,7 @@ # ################################################################################ -HDPARM_VERSION = 9.56 +HDPARM_VERSION = 9.58 HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm HDPARM_LICENSE = BSD-Style HDPARM_LICENSE_FILES = LICENSE.TXT diff --git a/buildroot/package/heimdal/heimdal.hash b/buildroot/package/heimdal/heimdal.hash index ac26aa60e..075023385 100644 --- a/buildroot/package/heimdal/heimdal.hash +++ b/buildroot/package/heimdal/heimdal.hash @@ -1,2 +1,5 @@ -# Locally calculated -sha256 c5a2a0030fcc728022fa2332bad85569084d1c3b9a59587b7ebe141b0532acad heimdal-7.5.0.tar.gz +# From https://github.com/heimdal/heimdal/releases +sha1 5dd16703be7255f66a4d65440f0c622aeeca60d9 heimdal-7.7.0.tar.gz +sha256 f02d3314d634cc55eb9cf04a1eae0d96b293e45a1f837de9d894e800161b7d1b heimdal-7.7.0.tar.gz +# Locally computed +sha256 0c4b07bf5b98f7a1d01f8e60722d6c6747ef052c2aa6d2043daf690d4e1b0a7f LICENSE diff --git a/buildroot/package/heimdal/heimdal.mk b/buildroot/package/heimdal/heimdal.mk index 5f7b6c685..5c0570fdd 100644 --- a/buildroot/package/heimdal/heimdal.mk +++ b/buildroot/package/heimdal/heimdal.mk @@ -4,7 +4,7 @@ # ################################################################################ -HEIMDAL_VERSION = 7.5.0 +HEIMDAL_VERSION = 7.7.0 HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf HEIMDAL_INSTALL_STAGING = YES diff --git a/buildroot/package/heirloom-mailx/0002-fix-libressl-support.patch b/buildroot/package/heirloom-mailx/0002-fix-libressl-support.patch index 0fafa4ae0..b54aaaf73 100644 --- a/buildroot/package/heirloom-mailx/0002-fix-libressl-support.patch +++ b/buildroot/package/heirloom-mailx/0002-fix-libressl-support.patch @@ -1,5 +1,5 @@ From aad28d30af6c3a74c522dd61943788e908860c84 Mon Sep 17 00:00:00 2001 -From: Adam Duskett +From: Adam Duskett Date: Fri, 4 Aug 2017 07:22:47 -0400 Subject: [PATCH] fix libressl support @@ -10,7 +10,7 @@ heirloom-mailx has two small issues when compiling against LibreSSL: - SSLv3_client_method function is used (LibreSSL does not support SSLv3) Solution: "Guard" the code with #ifndef OPENSSL_NO_SSL3 -Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett --- openssl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/buildroot/package/heirloom-mailx/heirloom-mailx.hash b/buildroot/package/heirloom-mailx/heirloom-mailx.hash index 6fc36c953..1f59f7349 100644 --- a/buildroot/package/heirloom-mailx/heirloom-mailx.hash +++ b/buildroot/package/heirloom-mailx/heirloom-mailx.hash @@ -1,2 +1,4 @@ # From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-3.dsc sha256 015ba4209135867f37a0245d22235a392b8bbed956913286b887c2e2a9a421ad heirloom-mailx_12.5.orig.tar.gz +# Locally computed +sha256 5ddc00aed98a0cf75fc7edfd9f3aeb1e919ae0ad5e9ff55d61f643d62d802b07 COPYING diff --git a/buildroot/package/hiawatha/Config.in b/buildroot/package/hiawatha/Config.in index 68e47fde8..8f1908f6f 100644 --- a/buildroot/package/hiawatha/Config.in +++ b/buildroot/package/hiawatha/Config.in @@ -1,11 +1,13 @@ comment "hiawatha needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS config BR2_PACKAGE_HIAWATHA bool "hiawatha" # needs fork() depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS select BR2_PACKAGE_ZLIB diff --git a/buildroot/package/hiawatha/hiawatha.hash b/buildroot/package/hiawatha/hiawatha.hash index 7d98c01bf..359a43542 100644 --- a/buildroot/package/hiawatha/hiawatha.hash +++ b/buildroot/package/hiawatha/hiawatha.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0f013afc71284bab7267b0d80a51133a8fd4248575dbcbabf338cf826095cda8 hiawatha-10.8.1.tar.gz +sha256 b5e46f5757fa647e77d21d24f7eea912d59f26a75558cba780b45c1c3a33a4d9 hiawatha-10.10.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/buildroot/package/hiawatha/hiawatha.mk b/buildroot/package/hiawatha/hiawatha.mk index 776efc1dc..eefd0f6f8 100644 --- a/buildroot/package/hiawatha/hiawatha.mk +++ b/buildroot/package/hiawatha/hiawatha.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIAWATHA_VERSION = 10.8.1 +HIAWATHA_VERSION = 10.10 HIAWATHA_SITE = https://www.hiawatha-webserver.org/files HIAWATHA_DEPENDENCIES = zlib HIAWATHA_LICENSE = GPL-2.0 diff --git a/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.hash b/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.hash index 522dcfcd8..b1dcaf4ae 100644 --- a/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.hash +++ b/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 9cc45ac3318c31212ea2d8cb99e64020732393ee7630fa6c1810af5f987033cc hicolor-icon-theme-0.15.tar.xz +sha256 9cc45ac3318c31212ea2d8cb99e64020732393ee7630fa6c1810af5f987033cc hicolor-icon-theme-0.15.tar.xz +sha256 b0a64377d4ee87b7dbcf418ce4fb33ec3b2d7081b6732890e4af06b8118c4526 COPYING diff --git a/buildroot/package/hidapi/Config.in b/buildroot/package/hidapi/Config.in index b98c2db91..d7d8cd53d 100644 --- a/buildroot/package/hidapi/Config.in +++ b/buildroot/package/hidapi/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_HIDAPI to interface with USB and Bluetooth HID-Class devices on Windows, Linux, and Mac OS X. - http://www.signal11.us/oss/hidapi/ + http://github.com/libusb/hidapi/ comment "hidapi needs udev /dev management and a toolchain w/ NPTL threads" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_PACKAGE_HAS_UDEV diff --git a/buildroot/package/hidapi/hidapi.hash b/buildroot/package/hidapi/hidapi.hash index ed22c7886..232c1ec48 100644 --- a/buildroot/package/hidapi/hidapi.hash +++ b/buildroot/package/hidapi/hidapi.hash @@ -1,2 +1,6 @@ # Locally calculated -sha256 f2ffe5dbba12dfa0a647ae71b1ec5612fed4c20322ef6f6fd46f6f9713ed1a8e hidapi-b5b2e1779b6cd2edda3066bbbf0921a2d6b1c3c0.tar.gz +sha256 630ee1834bdd5c5761ab079fd04f463a89585df8fcae51a7bfe4229b1e02a652 hidapi-0.9.0.tar.gz +sha256 7d3b087c34f35d4d538e3bcddd1ff8f66e92f9ef336881999482800ddf840913 LICENSE.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-gpl3.txt +sha256 30eb1bef29b46f8ba7ab8b416035dbd93cb034a45481dd97815b944284582cd2 LICENSE-bsd.txt +sha256 fb5436aa63d1b71a8dfbf74ecaf1a5b4e1ec4df7f80074d11fec99284f69ca5f LICENSE-orig.txt diff --git a/buildroot/package/hidapi/hidapi.mk b/buildroot/package/hidapi/hidapi.mk index 7eed80032..abbe5878e 100644 --- a/buildroot/package/hidapi/hidapi.mk +++ b/buildroot/package/hidapi/hidapi.mk @@ -4,10 +4,8 @@ # ################################################################################ -# Use master version as the current stable is very old and some bugs -# have been fixed since then. -HIDAPI_VERSION = b5b2e1779b6cd2edda3066bbbf0921a2d6b1c3c0 -HIDAPI_SITE = $(call github,signal11,hidapi,$(HIDAPI_VERSION)) +HIDAPI_VERSION = 0.9.0 +HIDAPI_SITE = $(call github,libusb,hidapi,hidapi-$(HIDAPI_VERSION)) HIDAPI_INSTALL_STAGING = YES # No configure provided, so we need to autoreconf. HIDAPI_AUTORECONF = YES diff --git a/buildroot/package/hiredis/hiredis.hash b/buildroot/package/hiredis/hiredis.hash index 7478ae0f2..2d50ce0f5 100644 --- a/buildroot/package/hiredis/hiredis.hash +++ b/buildroot/package/hiredis/hiredis.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 042f965e182b80693015839a9d0278ae73fae5d5d09d8bf6d0e6a39a8c4393bd hiredis-v0.14.0.tar.gz -sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb COPYING +sha256 2663b2aed9fd430507e30fc5e63274ee40cdd1a296026e22eafd7d99b01c8913 hiredis-0.14.1.tar.gz +sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb COPYING diff --git a/buildroot/package/hiredis/hiredis.mk b/buildroot/package/hiredis/hiredis.mk index e187aed52..230fb2d18 100644 --- a/buildroot/package/hiredis/hiredis.mk +++ b/buildroot/package/hiredis/hiredis.mk @@ -5,8 +5,8 @@ ################################################################################ HIREDIS_VERSION_MAJOR = 0.14 -HIREDIS_VERSION = v$(HIREDIS_VERSION_MAJOR).0 -HIREDIS_SITE = $(call github,redis,hiredis,$(HIREDIS_VERSION)) +HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).1 +HIREDIS_SITE = $(call github,redis,hiredis,v$(HIREDIS_VERSION)) HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING HIREDIS_INSTALL_STAGING = YES @@ -55,7 +55,7 @@ endif define HIREDIS_INSTALL_STAGING_CMDS mkdir -p $(HIREDIS_INCLUDE_DIR) cp -dpfr $(@D)/hiredis.h $(@D)/async.h $(@D)/read.h $(@D)/sds.h \ - $(@D)/adapters $(HIREDIS_INCLUDE_DIR) + $(@D)/alloc.h $(@D)/adapters $(HIREDIS_INCLUDE_DIR) $(INSTALL) -D -m 0644 $(@D)/hiredis.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/hiredis.pc $(HIREDIS_INSTALL_STAGING_STATIC_LIB) diff --git a/buildroot/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/buildroot/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch new file mode 100644 index 000000000..959788c2e --- /dev/null +++ b/buildroot/package/hostapd/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch @@ -0,0 +1,77 @@ +From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Thu, 29 Aug 2019 11:52:04 +0300 +Subject: [PATCH] AP: Silently ignore management frame from unexpected source + address + +Do not process any received Management frames with unexpected/invalid SA +so that we do not add any state for unexpected STA addresses or end up +sending out frames to unexpected destination. This prevents unexpected +sequences where an unprotected frame might end up causing the AP to send +out a response to another device and that other device processing the +unexpected response. + +In particular, this prevents some potential denial of service cases +where the unexpected response frame from the AP might result in a +connected station dropping its association. + +Signed-off-by: Jouni Malinen + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch] +--- + src/ap/drv_callbacks.c | 13 +++++++++++++ + src/ap/ieee802_11.c | 12 ++++++++++++ + 2 files changed, 25 insertions(+) + +diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c +index 31587685fe3b..34ca379edc3d 100644 +--- a/src/ap/drv_callbacks.c ++++ b/src/ap/drv_callbacks.c +@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, + "hostapd_notif_assoc: Skip event with no address"); + return -1; + } ++ ++ if (is_multicast_ether_addr(addr) || ++ is_zero_ether_addr(addr) || ++ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { ++ /* Do not process any frames with unexpected/invalid SA so that ++ * we do not add any state for unexpected STA addresses or end ++ * up sending out frames to unexpected destination. */ ++ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR ++ " in received indication - ignore this indication silently", ++ __func__, MAC2STR(addr)); ++ return 0; ++ } ++ + random_add_randomness(addr, ETH_ALEN); + + hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, +diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c +index c85a28db44b7..e7065372e158 100644 +--- a/src/ap/ieee802_11.c ++++ b/src/ap/ieee802_11.c +@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, + fc = le_to_host16(mgmt->frame_control); + stype = WLAN_FC_GET_STYPE(fc); + ++ if (is_multicast_ether_addr(mgmt->sa) || ++ is_zero_ether_addr(mgmt->sa) || ++ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { ++ /* Do not process any frames with unexpected/invalid SA so that ++ * we do not add any state for unexpected STA addresses or end ++ * up sending out frames to unexpected destination. */ ++ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR ++ " in received frame - ignore this frame silently", ++ MAC2STR(mgmt->sa)); ++ return 0; ++ } ++ + if (stype == WLAN_FC_STYPE_BEACON) { + handle_beacon(hapd, mgmt, len, fi); + return 1; +-- +2.20.1 + diff --git a/buildroot/package/hostapd/Config.in b/buildroot/package/hostapd/Config.in index 37c112685..54d2086c0 100644 --- a/buildroot/package/hostapd/Config.in +++ b/buildroot/package/hostapd/Config.in @@ -31,12 +31,6 @@ config BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 comment "nl80211 driver needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS -config BR2_PACKAGE_HOSTAPD_DRIVER_RTW - bool "Enable rtl871xdrv driver" - select BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS - help - Enable support for Realtek wireless chips. - config BR2_PACKAGE_HOSTAPD_DRIVER_WIRED bool "Enable wired driver" help @@ -47,7 +41,6 @@ config BR2_PACKAGE_HOSTAPD_DRIVER_NONE default y depends on !BR2_PACKAGE_HOSTAPD_DRIVER_HOSTAP depends on !BR2_PACKAGE_HOSTAPD_DRIVER_NL80211 - depends on !BR2_PACKAGE_HOSTAPD_DRIVER_RTW depends on !BR2_PACKAGE_HOSTAPD_DRIVER_WIRED config BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS @@ -81,6 +74,13 @@ config BR2_PACKAGE_HOSTAPD_WPS help Enable support for Wi-Fi Protected Setup. +config BR2_PACKAGE_HOSTAPD_WPA3 + bool "Enable WPA3 support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + help + Enable WPA3 support including OWE, SAE, DPP + config BR2_PACKAGE_HOSTAPD_VLAN bool "Enable VLAN support" default y diff --git a/buildroot/package/hostapd/hostapd.hash b/buildroot/package/hostapd/hostapd.hash index 8901aa43b..bf5016acc 100644 --- a/buildroot/package/hostapd/hostapd.hash +++ b/buildroot/package/hostapd/hostapd.hash @@ -1,20 +1,3 @@ # Locally calculated -sha256 21b0dda3cc3abe75849437f6b9746da461f88f0ea49dd621216936f87440a141 hostapd-2.7.tar.gz -sha256 86979655f1c5a9578acbf83e8acdf69a36dcc0966a8819f3b6918530ad3e0c67 0001-OpenSSL-Use-constant-time-operations-for-private-big.patch -sha256 5663da175ecc344c90bea8c95ab831ad47a8002ccbb834f6c091705b92e90e71 0002-Add-helper-functions-for-constant-time-operations.patch -sha256 e5a6bc9f587351d4495740239ceb0a64958a59b3e875722dcaeb4c93fa517f64 0003-OpenSSL-Use-constant-time-selection-for-crypto_bignu.patch -sha256 aa5b722bebbaf175ff89a3653c3d048afe0d0f866989fca6b4c8e882a864392a 0004-EAP-pwd-Use-constant-time-and-memory-access-for-find.patch -sha256 bad9eeaeb118f88303a7a718820b3ba03d705e99b6183b3c44556bedf99db423 0005-SAE-Minimize-timing-differences-in-PWE-derivation.patch -sha256 ae7be450f652f6f77ad868856ab61ba6cb6d7e768585cf5f9f9f674a66e05b40 0006-SAE-Avoid-branches-in-is_quadratic_residue_blind.patch -sha256 86b731c787ca58ac001d20fb769b136e2ca76bf81a8465a8e72c50573cfc4b09 0007-SAE-Mask-timing-of-MODP-groups-22-23-24.patch -sha256 ff7305005217a34818dae247886b9fb1b1db781ab31fb5eac9ebdd9cb0d1edfe 0008-SAE-Use-const_time-selection-for-PWE-in-FFC.patch -sha256 707057cc0e60fe763350f82135dbe407bc289a4958879c8ff1e9413243a1caa4 0009-SAE-Use-constant-time-operations-in-sae_test_pwd_see.patch -sha256 82d8ae4fabfe3674bcb5412befe3a74e40d6485906589c219be72e4fd1e70baa 0010-SAE-Fix-confirm-message-validation-in-error-cases.patch -sha256 ff8d6d92ad4b01987be63cdaf67a24d2eba5b3cd654f37664a8a198e501c0e3b 0011-EAP-pwd-server-Verify-received-scalar-and-element.patch -sha256 d5ebf4e5a810e9a0c035f9268195c542273998ea70fd58697ee25965094062cc 0012-EAP-pwd-server-Detect-reflection-attacks.patch -sha256 7156656498f03b24a0b69a26a59d17a9fcc8e76761f1dabe6d13b4176ffd2ef8 0013-EAP-pwd-client-Verify-received-scalar-and-element.patch -sha256 69926854ec2a79dada290f79f04202764c5d6400d232e3a567ebe633a02c1c66 0014-EAP-pwd-Check-element-x-y-coordinates-explicitly.patch -sha256 cba82a051a39c48872250b2e85ca8ebc628cfe75a9ccec29f3e994abd4156152 0001-EAP-pwd-server-Fix-reassembly-buffer-handling.patch -sha256 dc0e015463e1fd1f230795e1a49ddd1b9d00e726cd9f38846d0f4892d7978162 0003-EAP-pwd-peer-Fix-reassembly-buffer-handling.patch -sha256 e204da659d0583c71af23cb9b55536fe99598ee26a44104344f456e4d17350c6 rtlxdrv.patch -sha256 76eeecd8fc291a71f29189ea20e6a34387b8048a959cbc6a65c41b98194643a2 README +sha256 881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7 hostapd-2.9.tar.gz +sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README diff --git a/buildroot/package/hostapd/hostapd.mk b/buildroot/package/hostapd/hostapd.mk index 550f88720..b94a0e457 100644 --- a/buildroot/package/hostapd/hostapd.mk +++ b/buildroot/package/hostapd/hostapd.mk @@ -4,34 +4,24 @@ # ################################################################################ -HOSTAPD_VERSION = 2.7 +HOSTAPD_VERSION = 2.9 HOSTAPD_SITE = http://w1.fi/releases -HOSTAPD_PATCH = \ - https://w1.fi/security/2019-1/0001-OpenSSL-Use-constant-time-operations-for-private-big.patch \ - https://w1.fi/security/2019-1/0002-Add-helper-functions-for-constant-time-operations.patch \ - https://w1.fi/security/2019-1/0003-OpenSSL-Use-constant-time-selection-for-crypto_bignu.patch \ - https://w1.fi/security/2019-2/0004-EAP-pwd-Use-constant-time-and-memory-access-for-find.patch \ - https://w1.fi/security/2019-1/0005-SAE-Minimize-timing-differences-in-PWE-derivation.patch \ - https://w1.fi/security/2019-1/0006-SAE-Avoid-branches-in-is_quadratic_residue_blind.patch \ - https://w1.fi/security/2019-1/0007-SAE-Mask-timing-of-MODP-groups-22-23-24.patch \ - https://w1.fi/security/2019-1/0008-SAE-Use-const_time-selection-for-PWE-in-FFC.patch \ - https://w1.fi/security/2019-1/0009-SAE-Use-constant-time-operations-in-sae_test_pwd_see.patch \ - https://w1.fi/security/2019-3/0010-SAE-Fix-confirm-message-validation-in-error-cases.patch \ - https://w1.fi/security/2019-4/0011-EAP-pwd-server-Verify-received-scalar-and-element.patch \ - https://w1.fi/security/2019-4/0012-EAP-pwd-server-Detect-reflection-attacks.patch \ - https://w1.fi/security/2019-4/0013-EAP-pwd-client-Verify-received-scalar-and-element.patch \ - https://w1.fi/security/2019-4/0014-EAP-pwd-Check-element-x-y-coordinates-explicitly.patch \ - https://w1.fi/security/2019-5/0001-EAP-pwd-server-Fix-reassembly-buffer-handling.patch \ - https://w1.fi/security/2019-5/0003-EAP-pwd-peer-Fix-reassembly-buffer-handling.patch HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config HOSTAPD_DEPENDENCIES = host-pkgconf HOSTAPD_CFLAGS = $(TARGET_CFLAGS) HOSTAPD_LICENSE = BSD-3-Clause HOSTAPD_LICENSE_FILES = README + +# 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch +HOSTAPD_IGNORE_CVES += CVE-2019-16275 + HOSTAPD_CONFIG_SET = -HOSTAPD_CONFIG_ENABLE = CONFIG_INTERNAL_LIBTOMMATH +HOSTAPD_CONFIG_ENABLE = \ + CONFIG_INTERNAL_LIBTOMMATH \ + CONFIG_DEBUG_FILE \ + CONFIG_DEBUG_SYSLOG HOSTAPD_CONFIG_DISABLE = @@ -41,7 +31,7 @@ HOSTAPD_DEPENDENCIES += host-pkgconf libopenssl HOSTAPD_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl` HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/' else -HOSTAPD_CONFIG_DISABLE += CONFIG_EAP_PWD +HOSTAPD_CONFIG_DISABLE += CONFIG_EAP_PWD CONFIG_EAP_TEAP HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/' endif @@ -53,11 +43,6 @@ ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_NL80211),) HOSTAPD_CONFIG_DISABLE += CONFIG_DRIVER_NL80211 endif -ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_RTW),y) -HOSTAPD_PATCH += https://github.com/pritambaral/hostapd-rtl871xdrv/raw/master/rtlxdrv.patch -HOSTAPD_CONFIG_SET += CONFIG_DRIVER_RTW -endif - ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_WIRED),y) HOSTAPD_CONFIG_ENABLE += CONFIG_DRIVER_WIRED endif @@ -98,12 +83,24 @@ ifeq ($(BR2_PACKAGE_HOSTAPD_WPS),y) HOSTAPD_CONFIG_ENABLE += CONFIG_WPS endif +ifeq ($(BR2_PACKAGE_HOSTAPD_WPA3),y) +HOSTAPD_CONFIG_SET += \ + CONFIG_DPP \ + CONFIG_SAE +HOSTAPD_CONFIG_ENABLE += \ + CONFIG_OWE +else +HOSTAPD_CONFIG_DISABLE += \ + CONFIG_OWE +endif + ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN),) HOSTAPD_CONFIG_ENABLE += CONFIG_NO_VLAN endif ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC),y) HOSTAPD_CONFIG_ENABLE += CONFIG_FULL_DYNAMIC_VLAN +HOSTAPD_CONFIG_SET += NEED_LINUX_IOCTL endif ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_NETLINK),y) diff --git a/buildroot/package/hplip/hplip.hash b/buildroot/package/hplip/hplip.hash index 2260850e3..0a4d7eebc 100644 --- a/buildroot/package/hplip/hplip.hash +++ b/buildroot/package/hplip/hplip.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 0f7344174672f63a98a22f3c109005b6eb89fe738b7d466316bf2c53d083476c hplip-3.17.10.tar.gz +sha256 8af0e85fc6b88aec25200bcb4f604d886818482bd2c5cc81038f4c6a311c913a COPYING diff --git a/buildroot/package/hwdata/hwdata.hash b/buildroot/package/hwdata/hwdata.hash index dba1be31e..80e61e212 100644 --- a/buildroot/package/hwdata/hwdata.hash +++ b/buildroot/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 986d919c20a0c7f8b669a63830f6d2f4cb5c4cddcfc944c5e2ae05c2e9e5ec9f hwdata-v0.308.tar.gz +sha256 d90de6eb0937ad4c667e5f0edcc4ab3d6d91d2d2dbc08f70b5b99be3800ed836 hwdata-0.326.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/buildroot/package/hwdata/hwdata.mk b/buildroot/package/hwdata/hwdata.mk index 4603ad6ec..f32a0ef93 100644 --- a/buildroot/package/hwdata/hwdata.mk +++ b/buildroot/package/hwdata/hwdata.mk @@ -4,8 +4,8 @@ # ################################################################################ -HWDATA_VERSION = v0.308 -HWDATA_SITE = $(call github,vcrhonek,hwdata,$(HWDATA_VERSION)) +HWDATA_VERSION = 0.326 +HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE diff --git a/buildroot/package/hwloc/hwloc.hash b/buildroot/package/hwloc/hwloc.hash index c523bc537..9637ba132 100644 --- a/buildroot/package/hwloc/hwloc.hash +++ b/buildroot/package/hwloc/hwloc.hash @@ -1,5 +1,6 @@ # From https://www.open-mpi.org/software/hwloc/v1.11/ -md5 13d2e4dbce392cda41f1451d386d9a45 hwloc-1.11.7.tar.bz2 -sha1 7b78850b8504a93972a3f114a0e75f9b115607d9 hwloc-1.11.7.tar.bz2 +md5 3c792e23c209e9e1bafe9bdbc613d401 hwloc-1.11.13.tar.bz2 +sha1 c3ae96a845ff3800f28b28fdb48146f971589653 hwloc-1.11.13.tar.bz2 # Locally computed -sha256 ab6910e248eed8c85d08b529917a6aae706b32b346e886ba830895e36a809729 hwloc-1.11.7.tar.bz2 +sha256 a4494b7765f517c0990d1c7f09d98cb87755bb6b841e4e2cbfebca1b14bac9c8 hwloc-1.11.13.tar.bz2 +sha256 c1816ed2da6aea779c4f27352f807c8bbaf545c2843d7b2ae818e1d529028821 COPYING diff --git a/buildroot/package/hwloc/hwloc.mk b/buildroot/package/hwloc/hwloc.mk index 598a9c6e7..81cb89e35 100644 --- a/buildroot/package/hwloc/hwloc.mk +++ b/buildroot/package/hwloc/hwloc.mk @@ -5,7 +5,7 @@ ################################################################################ HWLOC_VERSION_MAJOR = 1.11 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).7 +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).13 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 HWLOC_SITE = http://www.open-mpi.org/software/hwloc/v$(HWLOC_VERSION_MAJOR)/downloads HWLOC_LICENSE = BSD-3-Clause diff --git a/buildroot/package/i2pd/i2pd.hash b/buildroot/package/i2pd/i2pd.hash index c3c9a48ec..0ae6ea05f 100644 --- a/buildroot/package/i2pd/i2pd.hash +++ b/buildroot/package/i2pd/i2pd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6547d7a560482c5eda9106ae19267bc8afbb6af48fed3bebf423ade28103e173 i2pd-2.22.0.tar.gz +sha256 fd0474c33b411593b9dc8197f3799d37d68455c11a9ee3994ec993a96388ec06 i2pd-2.29.0.tar.gz sha256 d147a6acdaf8ec9f6513802ef6cad4a4afcdb5ab6b98d9f6bb26d2b7f4cf454c LICENSE diff --git a/buildroot/package/i2pd/i2pd.mk b/buildroot/package/i2pd/i2pd.mk index 3ce5f97fb..c03114547 100644 --- a/buildroot/package/i2pd/i2pd.mk +++ b/buildroot/package/i2pd/i2pd.mk @@ -4,7 +4,7 @@ # ################################################################################ -I2PD_VERSION = 2.22.0 +I2PD_VERSION = 2.29.0 I2PD_SITE = $(call github,PurpleI2P,i2pd,$(I2PD_VERSION)) I2PD_LICENSE = BSD-3-Clause I2PD_LICENSE_FILES = LICENSE @@ -22,7 +22,9 @@ I2PD_CONF_OPTS += -DWITH_GUI=OFF I2PD_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -I2PD_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +I2PD_CONF_OPTS += \ + -DHAVE_CXX_ATOMICS_WITHOUT_LIB=OFF \ + -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=OFF endif ifeq ($(BR2_STATIC_LIBS),y) @@ -59,9 +61,6 @@ endef define I2PD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/i2pd/i2pd.service \ $(TARGET_DIR)/usr/lib/systemd/system/i2pd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/i2pd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/i2pd.service endef $(eval $(cmake-package)) diff --git a/buildroot/package/i7z/i7z.hash b/buildroot/package/i7z/i7z.hash index 1bcf2c635..d3affe8dc 100644 --- a/buildroot/package/i7z/i7z.hash +++ b/buildroot/package/i7z/i7z.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 e127bddf850e7febd39cef2d2b13dca5fe19cc2a1bb1099d72b683be5d8bd1c0 i7z-5023138d7c35c4667c938b853e5ea89737334e92.tar.gz +sha256 e127bddf850e7febd39cef2d2b13dca5fe19cc2a1bb1099d72b683be5d8bd1c0 i7z-5023138d7c35c4667c938b853e5ea89737334e92.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/ibrdtn-tools/ibrdtn-tools.hash b/buildroot/package/ibrdtn-tools/ibrdtn-tools.hash index fb7720752..c9fb64cde 100644 --- a/buildroot/package/ibrdtn-tools/ibrdtn-tools.hash +++ b/buildroot/package/ibrdtn-tools/ibrdtn-tools.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 eab066cf15f9c322d769c6c9c58adfb474cba7d446fd12e8de5ff6344376795b ibrdtn-tools-1.0.1.tar.gz +sha256 eab066cf15f9c322d769c6c9c58adfb474cba7d446fd12e8de5ff6344376795b ibrdtn-tools-1.0.1.tar.gz +sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 COPYING diff --git a/buildroot/package/ibrdtn/ibrdtn.hash b/buildroot/package/ibrdtn/ibrdtn.hash index 5f233277c..0712df1cb 100644 --- a/buildroot/package/ibrdtn/ibrdtn.hash +++ b/buildroot/package/ibrdtn/ibrdtn.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 288b14ccbaefb5e3234065c2778c247797ccb3c7afbb6746bb37dc12c620d360 ibrdtn-1.0.1.tar.gz +sha256 288b14ccbaefb5e3234065c2778c247797ccb3c7afbb6746bb37dc12c620d360 ibrdtn-1.0.1.tar.gz +sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 COPYING diff --git a/buildroot/package/ibrdtnd/ibrdtnd.hash b/buildroot/package/ibrdtnd/ibrdtnd.hash index 4b7dd7c3d..e1438bee3 100644 --- a/buildroot/package/ibrdtnd/ibrdtnd.hash +++ b/buildroot/package/ibrdtnd/ibrdtnd.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 9bd79636154093ab6bf4fd10d6c62d67c6db45141460847b19def327c93771ed ibrdtnd-1.0.1.tar.gz +sha256 9bd79636154093ab6bf4fd10d6c62d67c6db45141460847b19def327c93771ed ibrdtnd-1.0.1.tar.gz +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 COPYING diff --git a/buildroot/package/icu/0005-Fix-big-endian-build.patch b/buildroot/package/icu/0005-Fix-big-endian-build.patch new file mode 100644 index 000000000..2cb212901 --- /dev/null +++ b/buildroot/package/icu/0005-Fix-big-endian-build.patch @@ -0,0 +1,34 @@ +From 9be0b489a94b57419202c552022f25cb95bfac51 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 17 Apr 2019 16:41:58 +0200 +Subject: [PATCH] Fix big-endian build + +Bug-report: https://unicode-org.atlassian.net/browse/ICU-20533 +Patch taken from: https://bugs.gentoo.org/682170 + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin + +Downloaded from +http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch?h=master + +[Bernd: Fixed path] +Signed-off-by: Bernd Kuhls +--- + data/Makefile.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/source/data/Makefile.in b/source/data/Makefile.in +index 778b6c7..67203e7 100644 +--- a/source/data/Makefile.in ++++ b/source/data/Makefile.in +@@ -148,7 +148,8 @@ ICUDATA_ARCHIVE = $(firstword $(wildcard $(srcdir)/in/$(ICUDATA_BASENAME_VERSION + # and convert it to the current type. + ifneq ($(ICUDATA_ARCHIVE),) + ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat +-$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR) ++$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) ++ $(MKINSTALLDIRS) $(OUTDIR) + $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE) + endif + else diff --git a/buildroot/package/icu/0006-ICU-20751-Fix-nios2-build.patch b/buildroot/package/icu/0006-ICU-20751-Fix-nios2-build.patch new file mode 100644 index 000000000..6587de484 --- /dev/null +++ b/buildroot/package/icu/0006-ICU-20751-Fix-nios2-build.patch @@ -0,0 +1,46 @@ +From d9d99097a5b28f4204b3a15e82564e50f9e62f5a Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 3 Aug 2019 08:05:35 +0200 +Subject: [PATCH] ICU-20751 Fix nios2 build + +Nios2 supports double conversion, tested using qemu: + +./main || echo "correct" +correct +uname -a +Linux buildroot 4.19.16 #4 Sat Aug 3 14:46:48 CEST 2019 nios2 GNU/Linux + +Solves build error + +In file included from double-conversion.h:42:0, + from number_decimalquantity.cpp:19: +double-conversion-utils.h:119:2: error: #error Target architecture was not detected as supported by Double-Conversion. + #error Target architecture was not detected as supported by Double-Conversion. + +detected by buildroot autobuilders: +http://autobuild.buildroot.net/results/91e/91eaec34708d91f8a05af189243be0b7cabce31b/ + +Patch sent upstream: https://github.com/unicode-org/icu/pull/725 +Bug report: https://unicode-org.atlassian.net/browse/ICU-20751 + +[Bernd: Fixed path] +Signed-off-by: Bernd Kuhls +--- + source/i18n/double-conversion-utils.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h +index 1e44fcaa0e..0cf993929f 100644 +--- a/source/i18n/double-conversion-utils.h ++++ b/source/i18n/double-conversion-utils.h +@@ -95,6 +95,7 @@ int main(int argc, char** argv) { + defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ ++ defined(__nios2__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ + defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ +-- +2.20.1 + diff --git a/buildroot/package/icu/0007-double-conversion-enable-for-microblaze.patch b/buildroot/package/icu/0007-double-conversion-enable-for-microblaze.patch new file mode 100644 index 000000000..278c6c61e --- /dev/null +++ b/buildroot/package/icu/0007-double-conversion-enable-for-microblaze.patch @@ -0,0 +1,25 @@ +From 395f063b6af8885cc9d688eeeb44acf9d75c6045 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 3 Oct 2019 16:31:22 +0200 +Subject: [PATCH] double-conversion: enable for microblaze + +Signed-off-by: Peter Seiderer +--- + source/i18n/double-conversion-utils.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h +index 0cf9939..a00037e 100644 +--- a/source/i18n/double-conversion-utils.h ++++ b/source/i18n/double-conversion-utils.h +@@ -104,6 +104,7 @@ int main(int argc, char** argv) { + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ ++ defined(__microblaze__) || \ + defined(__EMSCRIPTEN__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) || \ +-- +2.23.0 + diff --git a/buildroot/package/icu/0008-double-conversion-enable-for-xtensa.patch b/buildroot/package/icu/0008-double-conversion-enable-for-xtensa.patch new file mode 100644 index 000000000..cb6be5188 --- /dev/null +++ b/buildroot/package/icu/0008-double-conversion-enable-for-xtensa.patch @@ -0,0 +1,26 @@ +From f8f37357fa7cc403848d2bafe6152a707ca3a074 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 28 Oct 2019 21:26:05 +0100 +Subject: [PATCH] double-conversion: enable for xtensa + +Signed-off-by: Peter Seiderer +--- + source/i18n/double-conversion-utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h +index a00037e..b3100ac 100644 +--- a/source/i18n/double-conversion-utils.h ++++ b/source/i18n/double-conversion-utils.h +@@ -104,7 +104,7 @@ int main(int argc, char** argv) { + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ +- defined(__microblaze__) || \ ++ defined(__microblaze__) || defined(__XTENSA__) || \ + defined(__EMSCRIPTEN__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) || \ +-- +2.23.0 + diff --git a/buildroot/package/icu/Config.in b/buildroot/package/icu/Config.in index fde486b60..32f35b9d9 100644 --- a/buildroot/package/icu/Config.in +++ b/buildroot/package/icu/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_ICU bool "icu" - depends on BR2_HOST_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 @@ -27,9 +26,8 @@ config BR2_PACKAGE_ICU_CUSTOM_DATA_PATH endif -comment "icu needs a toolchain w/ C++, wchar, threads, gcc >= 4.8, host gcc >= 4.8" +comment "icu needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ - !BR2_HOST_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/icu/icu.hash b/buildroot/package/icu/icu.hash index 66a0a8dc8..5eb508d2c 100644 --- a/buildroot/package/icu/icu.hash +++ b/buildroot/package/icu/icu.hash @@ -1,3 +1,4 @@ -# From http://download.icu-project.org/files/icu4c/60.2/SHASUM512.txt -sha512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694 icu4c-60_2-src.tgz -sha256 24c771ce37201a3ab604852e47d10d21595d0493269dd6c8a5e567e998e18c00 LICENSE +# From https://github.com/unicode-org/icu/releases/download/release-65-1/SHASUM512.txt +sha512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139 icu4c-65_1-src.tgz +# Locally computed +sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d LICENSE diff --git a/buildroot/package/icu/icu.mk b/buildroot/package/icu/icu.mk index a9466c832..0b8aeeaee 100644 --- a/buildroot/package/icu/icu.mk +++ b/buildroot/package/icu/icu.mk @@ -4,9 +4,13 @@ # ################################################################################ -ICU_VERSION = 60.2 -ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz -ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION) +# Git tags (and therefore versions on release-monitoring.org) use the +# XX-Y format, but the tarballs are named XX_Y and the containing +# directories XX.Y. +ICU_VERSION = 65-1 +ICU_SOURCE = icu4c-$(subst -,_,$(ICU_VERSION))-src.tgz +ICU_SITE = \ + https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) ICU_LICENSE = ICU License ICU_LICENSE_FILES = LICENSE diff --git a/buildroot/package/ifenslave/ifenslave.hash b/buildroot/package/ifenslave/ifenslave.hash index dcf31d090..9073165e7 100644 --- a/buildroot/package/ifenslave/ifenslave.hash +++ b/buildroot/package/ifenslave/ifenslave.hash @@ -1,3 +1,5 @@ # From http://snapshot.debian.org/archive/debian/20170102T091407Z/pool/main/i/ifenslave/ifenslave_2.9.dsc sha1 a17e88fa298ef337e872c8aa5d7a390921239d1a ifenslave_2.9.tar.xz -sha256 e5666c0b61347bd06f2394c16eca6895fcb5e5cc83d0a1c596a975274de5a3c9 ifenslave_2.9.tar.xz +sha256 e5666c0b61347bd06f2394c16eca6895fcb5e5cc83d0a1c596a975274de5a3c9 ifenslave_2.9.tar.xz +# Locally computed +sha256 299e00f3afc0e6ea0685340df73ad444e58e6fe0229989ba0983f5f33e275c41 debian/copyright diff --git a/buildroot/package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch b/buildroot/package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch new file mode 100644 index 000000000..8986b4fc3 --- /dev/null +++ b/buildroot/package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch @@ -0,0 +1,29 @@ +From 0c80f9ead3eb1d938b3e8e68165c91e62db72de3 Mon Sep 17 00:00:00 2001 +From: Damjan Georgievski +Date: Wed, 15 Aug 2012 00:54:38 +0200 +Subject: [PATCH] Fix issue: NETLINK: Packet too small or truncated! + 92!=16!=244 + +As reported in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=514197#22 + +Signed-off-by: Peter Korsgaard +--- + src/nlrequest.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nlrequest.c b/src/nlrequest.c +index 99fd3d0..3a1f794 100644 +--- a/src/nlrequest.c ++++ b/src/nlrequest.c +@@ -44,7 +44,7 @@ int netlink_request(int s, struct nlmsghdr *n, int (*callback) (struct nlmsghdr + + for (;;) { + int bytes; +- char replybuf[2048]; ++ char replybuf[4096]; + struct nlmsghdr *p = (struct nlmsghdr *) replybuf; + + if ((bytes = recv(s, &replybuf, sizeof(replybuf), 0)) < 0) { +-- +2.11.0 + diff --git a/buildroot/package/ifmetric/Config.in b/buildroot/package/ifmetric/Config.in new file mode 100644 index 000000000..64c8ace84 --- /dev/null +++ b/buildroot/package/ifmetric/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_IFMETRIC + bool "ifmetric" + help + Ifmetric is a Linux tool for setting the metrics of all IPv4 + routes attached to a given network interface at once. This + may be used to change the priority of routing IPv4 traffic + over the interface. Lower metrics correlate with higher + priorities. + + http://0pointer.de/lennart/projects/ifmetric/ diff --git a/buildroot/package/ifmetric/ifmetric.hash b/buildroot/package/ifmetric/ifmetric.hash new file mode 100644 index 000000000..186522efa --- /dev/null +++ b/buildroot/package/ifmetric/ifmetric.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 0fa8510a4e34e555f136f9df81d26618313f2d69a4880c0fb5967f19502f1aec ifmetric-0.3.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE +sha256 1e33d5a8750b4b3c2cb4fb89a916463f3c838f8eb361abbf72faf244c7dde771 README diff --git a/buildroot/package/ifmetric/ifmetric.mk b/buildroot/package/ifmetric/ifmetric.mk new file mode 100644 index 000000000..29a6cbcdd --- /dev/null +++ b/buildroot/package/ifmetric/ifmetric.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# ifmetric +# +################################################################################ + +IFMETRIC_VERSION = 0.3 +IFMETRIC_SITE = http://0pointer.de/lennart/projects/ifmetric +IFMETRIC_LICENSE = GPL-2.0+ +IFMETRIC_LICENSE_FILES = LICENSE README +# do not generate documentation +IFMETRIC_CONF_OPTS = --disable-lynx --disable-xmltoman + +$(eval $(autotools-package)) diff --git a/buildroot/package/ifplugd/ifplugd.hash b/buildroot/package/ifplugd/ifplugd.hash index 2977c69aa..9b720e31c 100644 --- a/buildroot/package/ifplugd/ifplugd.hash +++ b/buildroot/package/ifplugd/ifplugd.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0 ifplugd-0.28.tar.gz +sha256 474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0 ifplugd-0.28.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE diff --git a/buildroot/package/iftop/iftop.hash b/buildroot/package/iftop/iftop.hash index 19ce66b0a..3611a6a6c 100644 --- a/buildroot/package/iftop/iftop.hash +++ b/buildroot/package/iftop/iftop.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97 iftop-1.0pre4.tar.gz +sha256 f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97 iftop-1.0pre4.tar.gz +sha256 c00d1408e080e7f14615c7c2e0fbd079f1b2c19e93fc6eab819bdee8d5fdfbc4 COPYING diff --git a/buildroot/package/ifupdown-scripts/Config.in b/buildroot/package/ifupdown-scripts/Config.in index 2f4b0d546..4b984bc30 100644 --- a/buildroot/package/ifupdown-scripts/Config.in +++ b/buildroot/package/ifupdown-scripts/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_IFUPDOWN_SCRIPTS bool "ifupdown scripts" default y if BR2_ROOTFS_SKELETON_DEFAULT - depends on !BR2_PACKAGE_SYSTEMD_NETWORKD + depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_OPENRC help Set of scripts used by ifupdown (either the standalone one, or the busybox one) to bring network up, or tear it down. diff --git a/buildroot/package/ifupdown-scripts/ifupdown-scripts.mk b/buildroot/package/ifupdown-scripts/ifupdown-scripts.mk index 17364aed0..abb457577 100644 --- a/buildroot/package/ifupdown-scripts/ifupdown-scripts.mk +++ b/buildroot/package/ifupdown-scripts/ifupdown-scripts.mk @@ -48,9 +48,6 @@ endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \ $(TARGET_DIR)/etc/systemd/system/network.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../network.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service endef $(eval $(generic-package)) diff --git a/buildroot/package/ifupdown/ifupdown.hash b/buildroot/package/ifupdown/ifupdown.hash index 01353c639..f8844a60a 100644 --- a/buildroot/package/ifupdown/ifupdown.hash +++ b/buildroot/package/ifupdown/ifupdown.hash @@ -1,2 +1,4 @@ # From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.16.dsc -sha256 601416c12e39ac29022951a2867aed5c607f732ac57fd51517bfba92a4cc4fb0 ifupdown_0.8.16.tar.xz +sha256 601416c12e39ac29022951a2867aed5c607f732ac57fd51517bfba92a4cc4fb0 ifupdown_0.8.16.tar.xz +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/igd2-for-linux/igd2-for-linux.hash b/buildroot/package/igd2-for-linux/igd2-for-linux.hash index 042539950..ecde4b51c 100644 --- a/buildroot/package/igd2-for-linux/igd2-for-linux.hash +++ b/buildroot/package/igd2-for-linux/igd2-for-linux.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 523545a26b0d662e9f6913bec2518df6e70f4d497935d88983d994336a1b0ea9 igd2-for-linux-v1.2.tar.gz +sha256 523545a26b0d662e9f6913bec2518df6e70f4d497935d88983d994336a1b0ea9 igd2-for-linux-1.2.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 linuxigd2/doc/LICENSE diff --git a/buildroot/package/igd2-for-linux/igd2-for-linux.mk b/buildroot/package/igd2-for-linux/igd2-for-linux.mk index 68b64f1d4..478c35399 100644 --- a/buildroot/package/igd2-for-linux/igd2-for-linux.mk +++ b/buildroot/package/igd2-for-linux/igd2-for-linux.mk @@ -4,8 +4,8 @@ # ################################################################################ -IGD2_FOR_LINUX_VERSION = v1.2 -IGD2_FOR_LINUX_SITE = $(call github,ffontaine,igd2-for-linux,$(IGD2_FOR_LINUX_VERSION)) +IGD2_FOR_LINUX_VERSION = 1.2 +IGD2_FOR_LINUX_SITE = $(call github,ffontaine,igd2-for-linux,v$(IGD2_FOR_LINUX_VERSION)) IGD2_FOR_LINUX_LICENSE = GPL-2.0 IGD2_FOR_LINUX_LICENSE_FILES = linuxigd2/doc/LICENSE @@ -40,9 +40,6 @@ endef define IGD2_FOR_LINUX_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/igd2-for-linux/upnpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/upnpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/upnpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/upnpd.service endef $(eval $(generic-package)) diff --git a/buildroot/package/igh-ethercat/igh-ethercat.hash b/buildroot/package/igh-ethercat/igh-ethercat.hash index b5ee124aa..fd373a140 100644 --- a/buildroot/package/igh-ethercat/igh-ethercat.hash +++ b/buildroot/package/igh-ethercat/igh-ethercat.hash @@ -1,2 +1,5 @@ # From http://etherlab.org/download/ethercat/ethercat-1.5.2.tar.bz2.md5 md5 6b4001f8d975865d74a0b108b3bdda3d ethercat-1.5.2.tar.bz2 +# Locally computed +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/buildroot/package/ijs/ijs.hash b/buildroot/package/ijs/ijs.hash index 1a8f564ef..6accb5712 100644 --- a/buildroot/package/ijs/ijs.hash +++ b/buildroot/package/ijs/ijs.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 11a5f5084488c480f3ff5a24d64d7147bb64272bf60a0ba51330a56c5b50cab9 ijs-0.35.tar.bz2 +sha256 f723390b7ee019eccf07763dcb5744acf8bb43034bc3ba3d6f1c94440e365b4f README diff --git a/buildroot/package/ima-evm-utils/Config.in b/buildroot/package/ima-evm-utils/Config.in new file mode 100644 index 000000000..851e2456b --- /dev/null +++ b/buildroot/package/ima-evm-utils/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_IMA_EVM_UTILS + bool "ima-evm-utils" + depends on BR2_USE_MMU # keyutils + depends on !BR2_STATIC_LIBS # keyutils + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_KEYUTILS + help + Linux Integrity Measurement Architecture (IMA) + Extended Verification Module (EVM) tools. + + https://sourceforge.net/p/linux-ima/wiki/Home/ + +comment "ima-evm-utils needs dynamic library support" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/ima-evm-utils/ima-evm-utils.hash b/buildroot/package/ima-evm-utils/ima-evm-utils.hash new file mode 100644 index 000000000..24be627d2 --- /dev/null +++ b/buildroot/package/ima-evm-utils/ima-evm-utils.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 ad8471b58c4df29abd51c80d74b1501cfe3289b60d32d1b318618a8fd26c0c0a ima-evm-utils-1.2.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/ima-evm-utils/ima-evm-utils.mk b/buildroot/package/ima-evm-utils/ima-evm-utils.mk new file mode 100644 index 000000000..b944eda13 --- /dev/null +++ b/buildroot/package/ima-evm-utils/ima-evm-utils.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# ima-evm-utils +# +################################################################################ + +IMA_EVM_UTILS_VERSION = 1.2.1 +IMA_EVM_UTILS_SITE = http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils +IMA_EVM_UTILS_LICENSE = GPL-2.0 +IMA_EVM_UTILS_LICENSE_FILES = COPYING +IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl + +# Tarball doesn't contain configure +IMA_EVM_UTILS_AUTORECONF = YES + +# Build and install in the src subdirectory. This avoids building the +# documentation, which requires asciidoc and xsltproc. Note that configure still +# needs to be run from the top dir, so _SUBDIR can't be used. + +define IMA_EVM_UTILS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src all +endef + +define IMA_EVM_UTILS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(@D)/src install +endef + +define IMA_EVM_UTILS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D)/src install +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/imagemagick/Config.in.host b/buildroot/package/imagemagick/Config.in.host new file mode 100644 index 000000000..bbe23baa6 --- /dev/null +++ b/buildroot/package/imagemagick/Config.in.host @@ -0,0 +1,26 @@ +config BR2_PACKAGE_HOST_IMAGEMAGICK + bool "host imagemagick" + help + ImageMagick(R) is a software suite to create, edit, and + compose bitmap images. It can read, convert and write images + in a variety of formats (about 100) including DPX, EXR, GIF, + JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. + Use ImageMagick to translate, flip, mirror, rotate, scale, + shear and transform images, adjust image colors, apply various + special effects, or draw text, lines, polygons, ellipses and + Bézier curves. + + http://www.imagemagick.org/ + +if BR2_PACKAGE_HOST_IMAGEMAGICK + +config BR2_PACKAGE_HOST_IMAGEMAGICK_SVG + bool "SVG support" + help + Say 'y' here is you need ImageMagick tools (like convert) + to support SVG. + + This is not enabled by default, as it brings quite a few + extra dependencies, and thus extra build time. + +endif diff --git a/buildroot/package/imagemagick/imagemagick.mk b/buildroot/package/imagemagick/imagemagick.mk index a0c91f918..5ef04973a 100644 --- a/buildroot/package/imagemagick/imagemagick.mk +++ b/buildroot/package/imagemagick/imagemagick.mk @@ -18,10 +18,13 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_USE_WCHAR),yy) IMAGEMAGICK_CONFIG_SCRIPTS += Magick++-config endif -IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64 +IMAGEMAGICK_CONF_ENV = \ + ac_cv_sys_file_offset_bits=64 \ + ax_cv_check_cl_libcl=no IMAGEMAGICK_CONF_OPTS = \ --program-transform-name='s,,,' \ + --disable-opencl \ --disable-openmp \ --without-djvu \ --without-dps \ @@ -152,6 +155,7 @@ IMAGEMAGICK_CONF_OPTS += --without-bzlib endif HOST_IMAGEMAGICK_CONF_OPTS = \ + --disable-opencl \ --disable-openmp \ --without-djvu \ --without-dps \ @@ -168,21 +172,18 @@ HOST_IMAGEMAGICK_CONF_OPTS = \ --without-x \ --without-bzlib \ --without-fftw \ - --without-fontconfig \ - --without-freetype \ --without-lcms \ --without-lzma \ - --without-pango \ - --without-rsvg \ --without-tiff \ --without-webp \ - --without-xml \ --with-jpeg \ --with-png \ --with-zlib # uses clock_gettime, which was provided by librt in glibc < 2.17 -HOST_IMAGEMAGICK_CONF_ENV = LIBS="-lrt" +HOST_IMAGEMAGICK_CONF_ENV = \ + LIBS="-lrt" \ + ax_cv_check_cl_libcl=no HOST_IMAGEMAGICK_DEPENDENCIES = \ host-libjpeg \ @@ -190,5 +191,28 @@ HOST_IMAGEMAGICK_DEPENDENCIES = \ host-pkgconf \ host-zlib +ifeq ($(BR2_PACKAGE_HOST_IMAGEMAGICK_SVG),y) +HOST_IMAGEMAGICK_DEPENDENCIES += \ + host-fontconfig \ + host-freetype \ + host-librsvg \ + host-libxml2 \ + host-pango +HOST_IMAGEMAGICK_CONF_ENV += ac_cv_path_xml2_config=$(HOST_DIR)/bin/xml2-config +HOST_IMAGEMAGICK_CONF_OPTS += \ + --with-fontconfig \ + --with-freetype \ + --with-pango \ + --with-rsvg \ + --with-xml +else +HOST_IMAGEMAGICK_CONF_OPTS += \ + --without-fontconfig \ + --without-freetype \ + --without-pango \ + --without-rsvg \ + --without-xml +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/imx-mkimage/0003-Add-unused-fake-version.patch b/buildroot/package/imx-mkimage/0003-Add-unused-fake-version.patch new file mode 100644 index 000000000..9652a817b --- /dev/null +++ b/buildroot/package/imx-mkimage/0003-Add-unused-fake-version.patch @@ -0,0 +1,33 @@ +From e75feef80b51c9060e3702390040495312648ad2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= +Date: Mon, 25 Feb 2019 22:15:55 +0100 +Subject: [PATCH] Add unused fake version + +The Makefile makes the assumption that the build process runs +from a Git clone of the source code. +We can safely add a fake version here, because the code to +print it is broken anyway. + +Signed-off-by: André Hentschel +--- + Makefile | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index ccf42e8..6041574 100644 +--- a/Makefile ++++ b/Makefile +@@ -37,9 +37,7 @@ $(MKIMG): src/build_info.h $(SRCS) + bin: $(MKIMG) + + src/build_info.h: +- @echo -n '#define MKIMAGE_COMMIT 0x' > src/build_info.h +- @git rev-parse --short=8 HEAD >> src/build_info.h +- @echo '' >> src/build_info.h ++ @echo '#define MKIMAGE_COMMIT 0xdeadbeef' > src/build_info.h + + help: + @echo $(CURR_DIR) +-- +2.17.1 + diff --git a/buildroot/package/imx-mkimage/imx-mkimage.hash b/buildroot/package/imx-mkimage/imx-mkimage.hash index e1cbdd973..e75619b8d 100644 --- a/buildroot/package/imx-mkimage/imx-mkimage.hash +++ b/buildroot/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bc79e11cfbde303e200287fa6624028c8ce5344f8a35ed179b3fe217d74155da imx-mkimage-rel_imx_4.9.51_8mq_ga.tar.gz -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c iMX8dv/COPYING +sha256 ceeb297bb0aee02d7b105ee245d00f3cafd74fc73ef0c6182b058b234d5bbbd7 imx-mkimage-rel_imx_4.14.98_2.0.0_ga.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/imx-mkimage/imx-mkimage.mk b/buildroot/package/imx-mkimage/imx-mkimage.mk index 6fd6aa39b..a58ddf07b 100644 --- a/buildroot/package/imx-mkimage/imx-mkimage.mk +++ b/buildroot/package/imx-mkimage/imx-mkimage.mk @@ -4,22 +4,34 @@ # ################################################################################ -IMX_MKIMAGE_VERSION = rel_imx_4.9.51_8mq_ga +IMX_MKIMAGE_VERSION = rel_imx_4.14.98_2.0.0_ga IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage IMX_MKIMAGE_SITE_METHOD = git IMX_MKIMAGE_LICENSE = GPL-2.0+ -IMX_MKIMAGE_LICENSE_FILES = iMX8dv/COPYING +IMX_MKIMAGE_LICENSE_FILES = COPYING HOST_IMX_MKIMAGE_DEPENDENCIES = host-zlib +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM),y) +# i.MX8M needs a different binary define HOST_IMX_MKIMAGE_BUILD_CMDS - # Currently this only supports iMX8M. When more hardware is available - # this needs to be selectable based on iMX8-version (iMX8M,iMXQ etc). - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)/iMX8M -f soc.mak mkimage_imx8 + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(HOST_CFLAGS) -std=c99" \ + -C $(@D)/iMX8M -f soc.mak mkimage_imx8 endef - define HOST_IMX_MKIMAGE_INSTALL_CMDS $(INSTALL) -D -m 755 $(@D)/iMX8M/mkimage_imx8 $(HOST_DIR)/bin/mkimage_imx8 $(INSTALL) -D -m 755 $(@D)/iMX8M/mkimage_fit_atf.sh $(HOST_DIR)/bin/mkimage_fit_atf.sh endef +else +# i.MX8 and i.MX8X +define HOST_IMX_MKIMAGE_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(HOST_CFLAGS) -std=c99" \ + -C $(@D) MKIMG=mkimage_imx8 mkimage_imx8 +endef +define HOST_IMX_MKIMAGE_INSTALL_CMDS + $(INSTALL) -D -m 755 $(@D)/mkimage_imx8 $(HOST_DIR)/bin/mkimage_imx8 +endef +endif $(eval $(host-generic-package)) diff --git a/buildroot/package/imx-usb-loader/imx-usb-loader.hash b/buildroot/package/imx-usb-loader/imx-usb-loader.hash index 149be676d..182116a25 100644 --- a/buildroot/package/imx-usb-loader/imx-usb-loader.hash +++ b/buildroot/package/imx-usb-loader/imx-usb-loader.hash @@ -1,2 +1,3 @@ # locally computed sha256 5a17886042c09f0f16093031183a287a2a7ae0fa9cd8bdfa31e7b31cb92510d9 imx-usb-loader-4aa9809099dcece9a9225776321f3b4b5b896d78.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/inadyn/inadyn.mk b/buildroot/package/inadyn/inadyn.mk index 96a37d476..5f6784925 100644 --- a/buildroot/package/inadyn/inadyn.mk +++ b/buildroot/package/inadyn/inadyn.mk @@ -34,9 +34,6 @@ endef define INADYN_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/inadyn/inadyn.service \ $(TARGET_DIR)/usr/lib/systemd/system/inadyn.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/inadyn.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/inadyn.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/inconsolata/inconsolata.hash b/buildroot/package/inconsolata/inconsolata.hash index 49ea95847..d222fc32c 100644 --- a/buildroot/package/inconsolata/inconsolata.hash +++ b/buildroot/package/inconsolata/inconsolata.hash @@ -1,2 +1,4 @@ # From http://snapshot.debian.org/archive/debian/20091207T044352Z/pool/main/t/ttf-inconsolata/ttf-inconsolata_001.010-2.dsc -sha256 ecf8ba44911fcb3c9683aef1ca2b3cfbafa119a3e93c682f448850e1ae08ce93 ttf-inconsolata_001.010.orig.tar.gz +sha256 ecf8ba44911fcb3c9683aef1ca2b3cfbafa119a3e93c682f448850e1ae08ce93 ttf-inconsolata_001.010.orig.tar.gz +# Locally computed +sha256 8bbed014d1c85a9e3f36703816833c9538e140fea88c2bc3a745ce2449dc18ab OFL.txt diff --git a/buildroot/package/initscripts/init.d/S20urandom b/buildroot/package/initscripts/init.d/S20urandom index cababe102..e4fd12572 100644 --- a/buildroot/package/initscripts/init.d/S20urandom +++ b/buildroot/package/initscripts/init.d/S20urandom @@ -1,51 +1,74 @@ #! /bin/sh # -# urandom This script saves the random seed between reboots. -# It is called from the boot, halt and reboot scripts. -# -# Version: @(#)urandom 1.33 22-Jun-1998 miquels@cistron.nl +# Preserve the random seed between reboots. See urandom(4). # +# Quietly do nothing if /dev/urandom does not exist [ -c /dev/urandom ] || exit 0 -#. /etc/default/rcS + +URANDOM_SEED="/var/lib/random-seed" + +# shellcheck source=/dev/null +[ -r "/etc/default/urandom" ] && . "/etc/default/urandom" + +if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then + pool_size=$((pool_bits/8)) +else + pool_size=512 +fi + +check_file_size() { + [ -f "$URANDOM_SEED" ] || return 1 + # Try to read two blocks but exactly one will be read if the file has + # the correct size. + size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) + test "$size" -eq "$pool_size" +} + +init_rng() { + if check_file_size; then + printf 'Initializing random number generator: ' + dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" + fi +} + +save_random_seed() { + printf 'Saving random seed: ' + if touch "$URANDOM_SEED" 2> /dev/null; then + old_umask=$(umask) + umask 077 + dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null + status=$? + umask "$old_umask" + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + else + status=$? + echo "SKIP (read-only file system detected)" + fi + return "$status" +} case "$1" in - start|"") - # check for read only file system - if ! touch /etc/random-seed 2>/dev/null - then - echo "read-only file system detected...done" - exit - fi - if [ "$VERBOSE" != no ] - then - printf "Initializing random number generator... " - fi - # Load and then save 512 bytes, - # which is the size of the entropy pool - cat /etc/random-seed >/dev/urandom - rm -f /etc/random-seed - umask 077 - dd if=/dev/urandom of=/etc/random-seed count=1 \ - >/dev/null 2>&1 || echo "urandom start: failed." - umask 022 - [ "$VERBOSE" != no ] && echo "done." - ;; + start|restart|reload) + # Carry a random seed from start-up to start-up + # Load and then save the whole entropy pool + init_rng && save_random_seed;; stop) - if ! touch /etc/random-seed 2>/dev/null - then - exit - fi - # Carry a random seed from shut-down to start-up; - # see documentation in linux/drivers/char/random.c - [ "$VERBOSE" != no ] && printf "Saving random seed... " - umask 077 - dd if=/dev/urandom of=/etc/random-seed count=1 \ - >/dev/null 2>&1 || echo "urandom stop: failed." - [ "$VERBOSE" != no ] && echo "done." - ;; + # Carry a random seed from shut-down to start-up + # Save the whole entropy pool + save_random_seed;; *) - echo "Usage: urandom {start|stop}" >&2 + echo "Usage: $0 {start|stop|restart|reload}" exit 1 - ;; esac diff --git a/buildroot/package/input-event-daemon/input-event-daemon.hash b/buildroot/package/input-event-daemon/input-event-daemon.hash index d5364a95e..ad0c4e991 100644 --- a/buildroot/package/input-event-daemon/input-event-daemon.hash +++ b/buildroot/package/input-event-daemon/input-event-daemon.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1d9a44160aead88080093f74be9d709fbbc2637f982958e2673d80aedacd0a65 input-event-daemon-v0.1.3.tar.gz +sha256 1d9a44160aead88080093f74be9d709fbbc2637f982958e2673d80aedacd0a65 input-event-daemon-0.1.3.tar.gz +sha256 56f6614c63a023e4d486332968bfa7933f06ea7c785ef85f403448022ae7f912 README diff --git a/buildroot/package/input-event-daemon/input-event-daemon.mk b/buildroot/package/input-event-daemon/input-event-daemon.mk index e61c8cc4b..dbe2d4bfb 100644 --- a/buildroot/package/input-event-daemon/input-event-daemon.mk +++ b/buildroot/package/input-event-daemon/input-event-daemon.mk @@ -4,8 +4,8 @@ # ################################################################################ -INPUT_EVENT_DAEMON_VERSION = v0.1.3 -INPUT_EVENT_DAEMON_SITE = $(call github,gandro,input-event-daemon,$(INPUT_EVENT_DAEMON_VERSION)) +INPUT_EVENT_DAEMON_VERSION = 0.1.3 +INPUT_EVENT_DAEMON_SITE = $(call github,gandro,input-event-daemon,v$(INPUT_EVENT_DAEMON_VERSION)) INPUT_EVENT_DAEMON_LICENSE = input-event-daemon license INPUT_EVENT_DAEMON_LICENSE_FILES = README @@ -30,9 +30,6 @@ endef define INPUT_EVENT_DAEMON_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/input-event-daemon/input-event-daemon.service \ $(TARGET_DIR)/usr/lib/systemd/system/input-event-daemon.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf /usr/lib/systemd/system/input-event-daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/input-event-daemon.service endef $(eval $(generic-package)) diff --git a/buildroot/package/intel-gmmlib/intel-gmmlib.hash b/buildroot/package/intel-gmmlib/intel-gmmlib.hash index d54abd2a4..a23020673 100644 --- a/buildroot/package/intel-gmmlib/intel-gmmlib.hash +++ b/buildroot/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7970a8ae4e16efb98f38fbbc0346eea03227fc4462a9bd8e8077277cc3430a84 intel-gmmlib-18.4.1.tar.gz +sha256 60944d54a4992553f92d71ba9f8f4191d297407b564b0f24e9912b415689582e intel-gmmlib-19.2.3.tar.gz sha256 b61d639c5d84ec710ffcf5600ac92f8a4ace66670c1f9bd921f3bde671d36033 LICENSE.md diff --git a/buildroot/package/intel-gmmlib/intel-gmmlib.mk b/buildroot/package/intel-gmmlib/intel-gmmlib.mk index 4d8908659..7a943ed14 100644 --- a/buildroot/package/intel-gmmlib/intel-gmmlib.mk +++ b/buildroot/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 18.4.1 +INTEL_GMMLIB_VERSION = 19.2.3 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md diff --git a/buildroot/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch b/buildroot/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch new file mode 100644 index 000000000..bc2920331 --- /dev/null +++ b/buildroot/package/intel-mediadriver/0001-Drop-hardening-related-flags.patch @@ -0,0 +1,63 @@ +From 8916c8480eb3483c2ffb41ad8961cd0c2b0fb1c4 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 15 Apr 2019 22:48:21 +0200 +Subject: [PATCH] Drop hardening-related flags + +These will be set by Buildroot depending on toolchain capabilities and +global Buildroot options. + +Signed-off-by: Thomas Petazzoni +--- + cmrtlib/linux/CMakeLists.txt | 8 ++++---- + media_driver/cmake/linux/media_compile_flags_linux.cmake | 1 - + media_driver/media_top_cmake.cmake | 2 +- + 3 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt +index 44ce4f08..b462fbea 100644 +--- a/cmrtlib/linux/CMakeLists.txt ++++ b/cmrtlib/linux/CMakeLists.txt +@@ -26,11 +26,11 @@ set(LIBRARY_OUTPUT_PATH ${MDF_OPTION__OUTPUT_DIR}) + + # Set up compile options that will be used for the Linux build + if(CMAKE_COMPILER_IS_GNUCC) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -fstack-protector-all -Werror") +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -Werror") ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing ") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -fstack-protector-all -Werror") +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -Werror") ++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") + + set(GCC_SECURE_LINK_FLAGS "-z relro -z now") +diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake +index 9e85fdb2..c45ce11b 100755 +--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake ++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake +@@ -64,7 +64,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON + # Other common flags + -fmessage-length=0 + -fvisibility=hidden +- -fstack-protector + -fdata-sections + -ffunction-sections + -Wl,--gc-sections +diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake +index 3491db1e..b30fa04a 100755 +--- a/media_driver/media_top_cmake.cmake ++++ b/media_driver/media_top_cmake.cmake +@@ -88,7 +88,7 @@ if(MEDIA_BUILD_FATAL_WARNINGS) + set_target_properties(${LIB_NAME_OBJ} PROPERTIES COMPILE_FLAGS "-Werror") + endif() + +-set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fstack-protector -fPIC") ++set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -fPIC") + set_target_properties(${LIB_NAME} PROPERTIES PREFIX "") + set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "") + +-- +2.20.1 + diff --git a/buildroot/package/intel-mediadriver/Config.in b/buildroot/package/intel-mediadriver/Config.in new file mode 100644 index 000000000..35117f771 --- /dev/null +++ b/buildroot/package/intel-mediadriver/Config.in @@ -0,0 +1,30 @@ +config BR2_PACKAGE_INTEL_MEDIADRIVER + bool "intel-mediadriver" + depends on BR2_x86_64 + depends on !BR2_STATIC_LIBS # mesa3d, libva + depends on BR2_INSTALL_LIBSTDCPP # mesa3d + depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d + depends on BR2_TOOLCHAIN_HAS_THREADS # libva + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_INTEL_GMMLIB + select BR2_PACKAGE_LIBPCIACCESS + select BR2_PACKAGE_LIBVA + select BR2_PACKAGE_MESA3D + select BR2_PACKAGE_XLIB_LIBX11 + help + The Intel(R) Media Driver for VAAPI is a new VA-API (Video + Acceleration API) user mode driver supporting hardware + accelerated decoding, encoding, and video post processing for + GEN based graphics hardware. + + https://github.com/intel/media-driver + +comment "intel-mediadriver needs X.org" + depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 + depends on !BR2_PACKAGE_XORG7 + +comment "intel-mediadriver needs a toolchain w/ dynamic library, C++, NPTL" + depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/buildroot/package/intel-mediadriver/intel-mediadriver.hash b/buildroot/package/intel-mediadriver/intel-mediadriver.hash new file mode 100644 index 000000000..f53d19a69 --- /dev/null +++ b/buildroot/package/intel-mediadriver/intel-mediadriver.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 79279c991d918deaa52239dac55787b9c7562e520cd58744171b468d28b8af40 intel-media-19.2.1.tar.gz +sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/buildroot/package/intel-mediadriver/intel-mediadriver.mk b/buildroot/package/intel-mediadriver/intel-mediadriver.mk new file mode 100644 index 000000000..0acac52e3 --- /dev/null +++ b/buildroot/package/intel-mediadriver/intel-mediadriver.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# intel-mediadriver +# +################################################################################ + +# based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack + +INTEL_MEDIADRIVER_VERSION = 19.2.1 +INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive +INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz +INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause +INTEL_MEDIADRIVER_LICENSE_FILES = LICENSE.md + +INTEL_MEDIADRIVER_DEPENDENCIES = \ + intel-gmmlib \ + libpciaccess \ + libva \ + mesa3d \ + xlib_libX11 + +INTEL_MEDIADRIVER_SUPPORTS_IN_SOURCE_BUILD = NO + +INTEL_MEDIADRIVER_CONF_OPTS = \ + -DBUILD_ALONG_WITH_CMRTLIB=1 \ + -DINSTALL_DRIVERS_SYSCONF=OFF \ + -DMEDIA_RUN_TEST_SUITE=OFF \ + -DRUN_TEST_SUITE=OFF + +$(eval $(cmake-package)) diff --git a/buildroot/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch b/buildroot/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch new file mode 100644 index 000000000..a33c218c0 --- /dev/null +++ b/buildroot/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch @@ -0,0 +1,52 @@ +From 28ca7393c08cb54b87d11c1ca92821e48f54781b Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 15 Apr 2019 23:09:33 +0200 +Subject: [PATCH] Don't force -fstack-protector + +This allows the environment to decide whether SSP should be used or +not, for example to support toolchains that don't have SSP support. + +Signed-off-by: Thomas Petazzoni +--- + api/mfx_dispatch/linux/CMakeLists.txt | 2 +- + builder/FindPackages.cmake | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/api/mfx_dispatch/linux/CMakeLists.txt b/api/mfx_dispatch/linux/CMakeLists.txt +index 15a4bd9a..4415f840 100644 +--- a/api/mfx_dispatch/linux/CMakeLists.txt ++++ b/api/mfx_dispatch/linux/CMakeLists.txt +@@ -100,7 +100,7 @@ target_link_libraries(mfx dl) + get_api_version(MFX_VERSION_MAJOR MFX_VERSION_MINOR) + + set_target_properties( mfx PROPERTIES LINK_FLAGS +- "-Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libmfx.map -fstack-protector") ++ "-Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libmfx.map") + set_target_properties( mfx PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIB_DIR}/${CMAKE_BUILD_TYPE} FOLDER mfx ) + set_target_properties( mfx PROPERTIES VERSION ${MFX_VERSION_MAJOR}.${MFX_VERSION_MINOR}) + set_target_properties( mfx PROPERTIES SOVERSION ${MFX_VERSION_MAJOR}) +diff --git a/builder/FindPackages.cmake b/builder/FindPackages.cmake +index 7e36ae2d..5b8b9b9d 100644 +--- a/builder/FindPackages.cmake ++++ b/builder/FindPackages.cmake +@@ -83,7 +83,7 @@ function( configure_build_variant_linux target variant ) + return() # should not occur; just in case + endif() + set( link_flags_list "-Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -Wl,--no-as-needed -ldl") +- append_property( ${ARGV0} LINK_FLAGS "${link_flags_list} ${MFX_LDFLAGS} -fstack-protector" ) ++ append_property( ${ARGV0} LINK_FLAGS "${link_flags_list} ${MFX_LDFLAGS}" ) + # message( STATUS "Libva located at: ${PKG_LIBVA_LIBRARY_DIRS}" ) + + if( ARGV1 MATCHES hw AND Linux ) +@@ -448,7 +448,7 @@ function(configure_dependencies target dependencies variant) + endforeach() + + set(SCOPE_CFLAGS ${SCOPE_CFLAGS} PARENT_SCOPE) +- set(SCOPE_LINKFLAGS "${SCOPE_LINKFLAGS} -Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack -fstack-protector" PARENT_SCOPE) ++ set(SCOPE_LINKFLAGS "${SCOPE_LINKFLAGS} -Wl,--no-undefined,-z,relro,-z,now,-z,noexecstack" PARENT_SCOPE) + set(SCOPE_LIBS ${SCOPE_LIBS} PARENT_SCOPE) + endfunction() + +-- +2.20.1 + diff --git a/buildroot/package/intel-mediasdk/Config.in b/buildroot/package/intel-mediasdk/Config.in new file mode 100644 index 000000000..05293d760 --- /dev/null +++ b/buildroot/package/intel-mediasdk/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_INTEL_MEDIASDK + bool "intel-mediasdk" + depends on BR2_x86_64 + depends on !BR2_STATIC_LIBS # intel-mediadriver + depends on BR2_INSTALL_LIBSTDCPP # intel-mediadriver + depends on BR2_TOOLCHAIN_HAS_SYNC_1 # intel-mediadriver + depends on BR2_TOOLCHAIN_HAS_THREADS # intel-mediadriver + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # intel-mediadriver + depends on BR2_PACKAGE_XORG7 # intel-mediadriver + select BR2_PACKAGE_INTEL_MEDIADRIVER + select BR2_PACKAGE_LIBDRM_INTEL + help + Intel(R) Media SDK provides an API to access + hardware-accelerated video decode, encode and filtering on + Intel® platforms with integrated graphics. + + Supported video encoders: HEVC, AVC, MPEG-2, JPEG + Supported Video decoders: HEVC, AVC, VP8, MPEG-2, VC1, JPEG + Supported video pre-processing filters: Color Conversion, + Deinterlace, Denoise, Resize, Rotate, Composition + + http://mediasdk.intel.com/ + +comment "intel-mediasdk needs X.org" + depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 + depends on !BR2_PACKAGE_XORG7 + +comment "intel-mediasdk needs a toolchain w/ dynamic library, C++, NPTL" + depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/buildroot/package/intel-mediasdk/intel-mediasdk.hash b/buildroot/package/intel-mediasdk/intel-mediasdk.hash new file mode 100644 index 000000000..2a582e611 --- /dev/null +++ b/buildroot/package/intel-mediasdk/intel-mediasdk.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 03c11a0379b61e292e789fa3dc9308ce45f36d68b4ebf437806c0e2c32357970 intel-mediasdk-19.2.1.tar.gz +sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/buildroot/package/intel-mediasdk/intel-mediasdk.mk b/buildroot/package/intel-mediasdk/intel-mediasdk.mk new file mode 100644 index 000000000..368e10830 --- /dev/null +++ b/buildroot/package/intel-mediasdk/intel-mediasdk.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# intel-mediasdk +# +################################################################################ + +INTEL_MEDIASDK_VERSION = 19.2.1 +INTEL_MEDIASDK_SITE = http://github.com/Intel-Media-SDK/MediaSDK/archive +INTEL_MEDIASDK_LICENSE = MIT +INTEL_MEDIASDK_LICENSE_FILES = LICENSE + +INTEL_MEDIASDK_INSTALL_STAGING = YES +INTEL_MEDIASDK_DEPENDENCIES = intel-mediadriver + +INTEL_MEDIASDK_CONF_OPTS = -DMFX_INCLUDE="$(@D)/api/include" + +$(eval $(cmake-package)) diff --git a/buildroot/package/intltool/intltool.hash b/buildroot/package/intltool/intltool.hash index f6f41dc70..de1df87bc 100644 --- a/buildroot/package/intltool/intltool.hash +++ b/buildroot/package/intltool/intltool.hash @@ -3,3 +3,4 @@ md5 12e517cac2b57a0121cda351570f1e63 intltool-0.51.0.tar.gz # Locally calculated sha256 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd intltool-0.51.0.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/iodine/iodine.hash b/buildroot/package/iodine/iodine.hash index 94eb5aa9c..691ef4d7f 100644 --- a/buildroot/package/iodine/iodine.hash +++ b/buildroot/package/iodine/iodine.hash @@ -1,2 +1,4 @@ # From http://code.kryo.se/iodine/ md5 fdbf3b81cd69caf5230d76a8b039fd99 iodine-0.7.0.tar.gz +# Locally computed +sha256 f41a252b2218759aa351270b7ad9791bdd323836b940e35c0614837a5d24dcb7 README diff --git a/buildroot/package/iostat/iostat.hash b/buildroot/package/iostat/iostat.hash index 2ba10a369..0f58bbf79 100644 --- a/buildroot/package/iostat/iostat.hash +++ b/buildroot/package/iostat/iostat.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 edc5aa73f43bd6c7d49f2c1d5906a0a68c0b28bc4dfdaf1f2aa5ae4a2449c58e iostat-2.2.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE diff --git a/buildroot/package/iotop/iotop.hash b/buildroot/package/iotop/iotop.hash index b2c497c77..a8e964796 100644 --- a/buildroot/package/iotop/iotop.hash +++ b/buildroot/package/iotop/iotop.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1a7c02fd3758bb048d8af861c5f8735eb3ee9abadeaa787f27b8af2b1eaee8ce iotop-0.6.tar.gz +sha256 1a7c02fd3758bb048d8af861c5f8735eb3ee9abadeaa787f27b8af2b1eaee8ce iotop-0.6.tar.gz +sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/buildroot/package/iozone/iozone.hash b/buildroot/package/iozone/iozone.hash index 2a027317f..f2f40473c 100644 --- a/buildroot/package/iozone/iozone.hash +++ b/buildroot/package/iozone/iozone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 eeaf16cfbee095b16e4934180c6c7438539629489ce42ef4ace48feb23916b12 iozone3_483.tar +sha256 6155850d1019f2450dc926bbdb5a24abf423ee3bb928ab1e68569cf60a908584 iozone3_489.tar diff --git a/buildroot/package/iozone/iozone.mk b/buildroot/package/iozone/iozone.mk index 903d2a188..a491faf9d 100644 --- a/buildroot/package/iozone/iozone.mk +++ b/buildroot/package/iozone/iozone.mk @@ -4,7 +4,7 @@ # ################################################################################ -IOZONE_VERSION = 3_483 +IOZONE_VERSION = 3_489 IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) @@ -25,6 +25,8 @@ endef define IOZONE_INSTALL_TARGET_CMDS $(INSTALL) -D -m 755 $(@D)/src/current/iozone \ $(TARGET_DIR)/usr/bin/iozone + $(INSTALL) -D -m 755 $(@D)/src/current/fileop \ + $(TARGET_DIR)/usr/bin/fileop endef $(eval $(generic-package)) diff --git a/buildroot/package/iperf3/0001-disable-profiling.patch b/buildroot/package/iperf3/0001-disable-profiling.patch deleted file mode 100644 index 09da98e97..000000000 --- a/buildroot/package/iperf3/0001-disable-profiling.patch +++ /dev/null @@ -1,20 +0,0 @@ -This should be an option, but it's not. -Don't force profiled builds, it breaks on many toolchains. -Patch Makefile.in to avoid AUTORECONFing since it needs dummy files -that are missing to succeed (ChangeLog, COPYING, NEWS, README) and it's -simple enough so avoid pulling in dependencies and delays. - -Signed-off-by: Gustavo Zacarias - -diff -Nura iperf-3.0.10.orig/src/Makefile.in iperf-3.0.10/src/Makefile.in ---- iperf-3.0.10.orig/src/Makefile.in 2014-12-17 07:30:46.878310789 -0300 -+++ iperf-3.0.10/src/Makefile.in 2014-12-17 07:33:41.879356643 -0300 -@@ -82,7 +82,7 @@ - host_triplet = @host@ - bin_PROGRAMS = iperf3$(EXEEXT) - noinst_PROGRAMS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT) \ -- iperf3_profile$(EXEEXT) -+ iperf3$(EXEEXT) - TESTS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT) - subdir = src - DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ diff --git a/buildroot/package/iperf3/0002-Fix-build-using-musl-libc.patch b/buildroot/package/iperf3/0002-Fix-build-using-musl-libc.patch deleted file mode 100644 index f2203605f..000000000 --- a/buildroot/package/iperf3/0002-Fix-build-using-musl-libc.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 30 Jan 2016 19:23:20 +0100 -Subject: [PATCH 1/1] Fix build using musl libc - -Fixes https://github.com/esnet/iperf/issues/331 - -Signed-off-by: Bernd Kuhls ---- -Patch sent upstream: https://github.com/esnet/iperf/pull/344 - - src/cjson.h | 2 ++ - src/timer.h | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/src/cjson.h b/src/cjson.h -index d4449e6..7af19a9 100644 ---- a/src/cjson.h -+++ b/src/cjson.h -@@ -23,6 +23,8 @@ - #ifndef cJSON__h - #define cJSON__h - -+#include -+ - #ifdef __cplusplus - extern "C" - { -diff --git a/src/timer.h b/src/timer.h -index 0f9c5eb..9b22b7f 100644 ---- a/src/timer.h -+++ b/src/timer.h -@@ -30,6 +30,7 @@ - #ifndef __TIMER_H - #define __TIMER_H - -+#include - #include - - /* TimerClientData is an opaque value that tags along with a timer. The --- -2.7.0.rc3 - diff --git a/buildroot/package/iperf3/iperf3.hash b/buildroot/package/iperf3/iperf3.hash index 06dae4214..2e6cfd5ab 100644 --- a/buildroot/package/iperf3/iperf3.hash +++ b/buildroot/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.6.tar.gz.sha256 -sha256 de5d51e46dc460cc590fb4d44f95e7cad54b74fea1eba7d6ebd6f8887d75946e iperf-3.6.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.7.tar.gz.sha256 +sha256 d846040224317caf2f75c843d309a950a7db23f9b44b94688ccbe557d6d1710c iperf-3.7.tar.gz # Locally computed -sha256 52c42914d7d79fe5e95d0d1b821556d9f06bf756ac910fe085a46d238a33e594 LICENSE +sha256 ee58f1e69139d39cfb055df15fe84453a379936dd45e44dbebf26c78afa3f5d4 LICENSE diff --git a/buildroot/package/iperf3/iperf3.mk b/buildroot/package/iperf3/iperf3.mk index 8ac4b078c..3537b2382 100644 --- a/buildroot/package/iperf3/iperf3.mk +++ b/buildroot/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.6 +IPERF3_VERSION = 3.7 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT @@ -12,6 +12,8 @@ IPERF3_LICENSE_FILES = LICENSE IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" +IPERF3_CONF_OPTS += --disable-profiling + ifeq ($(BR2_PACKAGE_OPENSSL),y) # We intentionally don't pass --with-openssl, otherwise pkg-config is # not used, and indirect libraries are not picked up when static diff --git a/buildroot/package/ipmitool/ipmitool.hash b/buildroot/package/ipmitool/ipmitool.hash index 9b1641480..5c053dc86 100644 --- a/buildroot/package/ipmitool/ipmitool.hash +++ b/buildroot/package/ipmitool/ipmitool.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01 ipmitool-1.8.18.tar.bz2 +sha256 b7e2382a8be43b5f6cb092f2d2bda163bf1a1938be9300f821a845cbcd535f56 COPYING diff --git a/buildroot/package/ipmiutil/ipmiutil.hash b/buildroot/package/ipmiutil/ipmiutil.hash index e09511f96..3f89b9049 100644 --- a/buildroot/package/ipmiutil/ipmiutil.hash +++ b/buildroot/package/ipmiutil/ipmiutil.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ipmiutil/files/ -md5 ee90387f8a14dea3f867167865c7c968 ipmiutil-3.1.2.tar.gz -sha1 9453db110bffab3111d6ff4047243a34084e5878 ipmiutil-3.1.2.tar.gz +md5 0d448d14726e2fda0eb9451fb2866a5c ipmiutil-3.1.3.tar.gz +sha1 d20cb3194f4c5cb8c9fd64b3693d5b53dc9510d4 ipmiutil-3.1.3.tar.gz # Locally computed -sha256 768053b3e3adfe1bf656e2848b2805ede87e429c10d282929a7c4ceeebc24703 ipmiutil-3.1.2.tar.gz +sha256 b80303b6f05cbe48e728dd925fef201e9604a90cd3fc9c8af113367e8d6dbe57 ipmiutil-3.1.3.tar.gz sha256 7e0ec8238aa1431e95a4950032a4483fe33fec3fac348eaade5856cdc5ae3e39 COPYING diff --git a/buildroot/package/ipmiutil/ipmiutil.mk b/buildroot/package/ipmiutil/ipmiutil.mk index 0d9a4509b..9633914e1 100644 --- a/buildroot/package/ipmiutil/ipmiutil.mk +++ b/buildroot/package/ipmiutil/ipmiutil.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPMIUTIL_VERSION = 3.1.2 +IPMIUTIL_VERSION = 3.1.3 IPMIUTIL_SITE = https://sourceforge.net/projects/ipmiutil/files IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING diff --git a/buildroot/package/iproute2/0001-utils.h-provide-fallback-CLOCK_TAI-definition.patch b/buildroot/package/iproute2/0001-utils.h-provide-fallback-CLOCK_TAI-definition.patch deleted file mode 100644 index c89db2b2e..000000000 --- a/buildroot/package/iproute2/0001-utils.h-provide-fallback-CLOCK_TAI-definition.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 950bf78adc9a3290ed383eaeef01dee6543cfb97 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sat, 27 Oct 2018 17:25:31 +0200 -Subject: [PATCH] utils.h: provide fallback CLOCK_TAI definition - -q_{etf,taprio}.c uses CLOCK_TAI, which isn't exposed by glibc < 2.21 or -uClibc, breaking the build. Provide a fallback definition like it is done -for IPPROTO_MPLS and others. - -Signed-off-by: Peter Korsgaard ---- - include/utils.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/utils.h b/include/utils.h -index 258d630e..685d2c1d 100644 ---- a/include/utils.h -+++ b/include/utils.h -@@ -126,6 +126,10 @@ struct ipx_addr { - #define IPPROTO_MPLS 137 - #endif - -+#ifndef CLOCK_TAI -+# define CLOCK_TAI 11 -+#endif -+ - __u32 get_addr32(const char *name); - int get_addr_1(inet_prefix *dst, const char *arg, int family); - int get_prefix_1(inet_prefix *dst, char *arg, int family); --- -2.11.0 - diff --git a/buildroot/package/iproute2/0002-ss-fix-compilation-under-glibc-2.18.patch b/buildroot/package/iproute2/0002-ss-fix-compilation-under-glibc-2.18.patch deleted file mode 100644 index b6934f5d1..000000000 --- a/buildroot/package/iproute2/0002-ss-fix-compilation-under-glibc-2.18.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9700927a008a803ac119bdf816bdc1baa69d705c Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Wed, 20 Feb 2019 15:41:51 +0100 -Subject: [PATCH] ss: fix compilation under glibc < 2.18 - -Commit c759116a0b2b6da8df9687b0a40ac69050132c77 introduced support for -AF_VSOCK. This define is only provided since glibc version 2.18, so -compilation fails when using older toolchains. - -Provide the necessary definitions if needed. - -Signed-off-by: Thomas De Schampheleire -Signed-off-by: Stephen Hemminger ---- - misc/ss.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/misc/ss.c b/misc/ss.c -index 9e821faf..766fdc5f 100644 ---- a/misc/ss.c -+++ b/misc/ss.c -@@ -51,6 +51,14 @@ - #include - #include - -+/* AF_VSOCK/PF_VSOCK is only provided since glibc 2.18 */ -+#ifndef PF_VSOCK -+#define PF_VSOCK 40 -+#endif -+#ifndef AF_VSOCK -+#define AF_VSOCK PF_VSOCK -+#endif -+ - #define MAGIC_SEQ 123456 - #define BUF_CHUNK (1024 * 1024) - #define LEN_ALIGN(x) (((x) + 1) & ~1) --- -2.19.2 - diff --git a/buildroot/package/iproute2/iproute2.hash b/buildroot/package/iproute2/iproute2.hash index 00bd1c646..c451cfa94 100644 --- a/buildroot/package/iproute2/iproute2.hash +++ b/buildroot/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 d9ec5ca1f47d8a85416fa26e7dc1cbf5d067640eb60e90bdc1c7e5bdc6a29984 iproute2-4.19.0.tar.xz +sha256 bac543435cac208a11db44c9cc8e35aa902befef8750594654ee71941c388f7b iproute2-5.5.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/iproute2/iproute2.mk b/buildroot/package/iproute2/iproute2.mk index 41d0b2c3d..a2e2d25d8 100644 --- a/buildroot/package/iproute2/iproute2.mk +++ b/buildroot/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 4.19.0 +IPROUTE2_VERSION = 5.5.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ diff --git a/buildroot/package/iprutils/iprutils.hash b/buildroot/package/iprutils/iprutils.hash index e5c175469..423943b22 100644 --- a/buildroot/package/iprutils/iprutils.hash +++ b/buildroot/package/iprutils/iprutils.hash @@ -3,3 +3,4 @@ md5 e4011051bba7470df3936cbba7dced98 iprutils-2.4.15.1.tar.gz sha1 ed6c362ee3c6bd9023ee60d0d1a1ce5543c27c41 iprutils-2.4.15.1.tar.gz # Locally computed: sha256 a733e65f8fb19565f2ef5191eaa2a14d816fabed0fc254ab4bbf1a4c7800ebe5 iprutils-2.4.15.1.tar.gz +sha256 59b4179e61248aff9cd2d6ee4cd1dbbd0ef48836fe2eeee19f4b16459785104a LICENSE diff --git a/buildroot/package/ipsec-tools/ipsec-tools.mk b/buildroot/package/ipsec-tools/ipsec-tools.mk index 634d75266..72bd8c196 100644 --- a/buildroot/package/ipsec-tools/ipsec-tools.mk +++ b/buildroot/package/ipsec-tools/ipsec-tools.mk @@ -15,6 +15,11 @@ IPSEC_TOOLS_DEPENDENCIES = openssl flex host-pkgconf host-flex host-bison # we patch configure.ac IPSEC_TOOLS_AUTORECONF = YES +# 0004-CVE-2015-4047.patch +IPSEC_TOOLS_IGNORE_CVES += CVE-2015-4047 +# 0005-CVE-2016-10396.patch +IPSEC_TOOLS_IGNORE_CVES += CVE-2016-10396 + # configure hardcodes -Werror, so override CFLAGS on make invocation IPSEC_TOOLS_MAKE_OPTS = CFLAGS='$(TARGET_CFLAGS)' diff --git a/buildroot/package/ipset/ipset.hash b/buildroot/package/ipset/ipset.hash index 46e285b1e..9c95ca420 100644 --- a/buildroot/package/ipset/ipset.hash +++ b/buildroot/package/ipset/ipset.hash @@ -1,6 +1,6 @@ -# From http://ipset.netfilter.org/ipset-7.1.tar.bz2.md5sum.txt -md5 72b477d1ce076d681b0799f88280f2f3 ipset-7.1.tar.bz2 +# From http://ipset.netfilter.org/ipset-7.5.tar.bz2.md5sum.txt +md5 1f3156c68f6fa6de03d8f3ca0539fb78 ipset-7.5.tar.bz2 # Calculated based on the hash above -sha256 7b5eb3b93205c20cdc39e3fc8b6e5f7bb214bf79a7c0c00729dd4a31ce16adc4 ipset-7.1.tar.bz2 +sha256 a57aee54ab6ffe9e04603a464bbf69d66db976500bb04dd04fd3fbd6efb36a0b ipset-7.5.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/ipset/ipset.mk b/buildroot/package/ipset/ipset.mk index 542afc963..383e90af3 100644 --- a/buildroot/package/ipset/ipset.mk +++ b/buildroot/package/ipset/ipset.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPSET_VERSION = 7.1 +IPSET_VERSION = 7.5 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf diff --git a/buildroot/package/iptraf-ng/iptraf-ng.hash b/buildroot/package/iptraf-ng/iptraf-ng.hash index 7cb4d1b13..0a257ec2f 100644 --- a/buildroot/package/iptraf-ng/iptraf-ng.hash +++ b/buildroot/package/iptraf-ng/iptraf-ng.hash @@ -1,2 +1,4 @@ # From https://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-1.1.4.tar.gz.sum sha1 a2e51b0dd6b8c80583fc25d055850c96b3d2f544 iptraf-ng-1.1.4.tar.gz +# Locally computed +sha256 4e49bef38f621aac4a870da4b30011c7b7abc7256b218daec1c425b08448ae1e LICENSE diff --git a/buildroot/package/iputils/0001-meson.build-fix-static-build-with-libidn2.patch b/buildroot/package/iputils/0001-meson.build-fix-static-build-with-libidn2.patch new file mode 100644 index 000000000..851d04378 --- /dev/null +++ b/buildroot/package/iputils/0001-meson.build-fix-static-build-with-libidn2.patch @@ -0,0 +1,39 @@ +From 5bb4432b8c194620c28a45a069de1b3dad692ac9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 28 Dec 2019 11:24:12 +0100 +Subject: [PATCH] meson.build: fix static build with libidn2 + +libidn2 can optionnaly depends on libunistring so use dependency +function instead of cc.find_library ro retrieve this dependency and +avoid the following build failure when building statically: + +FAILED: ping +/home/buildroot/autobuild/run/instance-1/output-1/host/bin/arm-linux-gcc -o ping 'ping@exe/ping.c.o' 'ping@exe/ping_common.c.o' 'ping@exe/ping6_common.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static -Wl,--start-group libcommon.a -lm -lcap -lidn2 /home/buildroot/autobuild/run/instance-1/output-1/host/usr/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a /home/buildroot/autobuild/run/instance-1/output-1/host/usr/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libz.a /home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/7.4.0/../../../../arm-buildroot-linux-uclibcgnueabi/lib/libatomic.a -lpthread /home/buildroot/autobuild/run/instance-1/output-1/host/usr/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libcrypto.a -lresolv -Wl,--end-group '-Wl,-rpath,$ORIGIN/' -Wl,-rpath-link,/home/buildroot/autobuild/run/instance-1/output-1/build/iputils-20190709/build/ +/home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/7.4.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/run/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libidn2.a(lookup.o): in function `idn2_lookup_u8': +lookup.c:(.text+0x7c): undefined reference to `u8_strlen' + +Fixes: + - http://autobuild.buildroot.org/results/82d4738711a009959436fa419bd78c7a9540d33e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/iputils/iputils/pull/245] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 53c65b2..905cb96 100644 +--- a/meson.build ++++ b/meson.build +@@ -130,7 +130,7 @@ endif + + opt = get_option('USE_IDN') + if opt == true +- idn_dep = cc.find_library('idn2', required : false) ++ idn_dep = dependency('libidn2', required : false) + if idn_dep.found() + add_project_arguments('-DUSE_IDN', language : 'c') + conf.set('USE_IDN', 1, +-- +2.24.0 + diff --git a/buildroot/package/iputils/0001-ping-Fix-AI_CANONIDN-usage-on-some-systems.patch b/buildroot/package/iputils/0001-ping-Fix-AI_CANONIDN-usage-on-some-systems.patch deleted file mode 100644 index 556d3786f..000000000 --- a/buildroot/package/iputils/0001-ping-Fix-AI_CANONIDN-usage-on-some-systems.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 25899e849aa3abc1ad29ebf0b830262a859eaed5 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Sat, 21 Jul 2018 17:46:14 +0200 -Subject: [PATCH] ping: Fix AI_CANONIDN usage on some systems - -Commit 99f67db used AI_CANONIDN in a way, which broke compilation on -systems where AI_CANONIDN is not defined in netdb.h (e.g. glibc < 2.3.4, -alternative libcs that don't support IDN: e.g. current musl 1.1.19 and -uClibc-ng 1.0.30) when not using the system libidn2. - -Fixes: 99f67db ping: Fix ping name encoded using ACE on C locale - -Reported-by: Nicholas Fish -Signed-off-by: Petr Vorel ---- - ping.c | 2 +- - ping.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ping.c b/ping.c -index 733477f..b241815 100644 ---- a/ping.c -+++ b/ping.c -@@ -207,9 +207,9 @@ main(int argc, char **argv) - - #ifdef USE_IDN - setlocale(LC_ALL, ""); --#endif - if (!strcmp(setlocale(LC_ALL, NULL), "C")) - hints.ai_flags &= ~ AI_CANONIDN; -+#endif - - /* Support being called using `ping4` or `ping6` symlinks */ - if (argv[0][strlen(argv[0])-1] == '4') -diff --git a/ping.h b/ping.h -index 3e09685..8a0c4ef 100644 ---- a/ping.h -+++ b/ping.h -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - - #ifdef CAPABILITIES - #include -@@ -36,6 +35,7 @@ - #endif - - #ifdef USE_IDN -+#include - #include - #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN) - #define getnameinfo_flags NI_IDN --- -2.19.0.rc2 - diff --git a/buildroot/package/iputils/iputils.hash b/buildroot/package/iputils/iputils.hash index 14e2c6713..3630ae867 100644 --- a/buildroot/package/iputils/iputils.hash +++ b/buildroot/package/iputils/iputils.hash @@ -1,3 +1,6 @@ +# https://github.com/iputils/iputils/releases/download/s20190709/sha256sum.asc +sha256 a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a iputils-20190709.tar.gz # Locally computed -sha256 da14105291dd491f28ea91ade854ed10aee8ba019641c80eed233de3908be7c5 iputils-s20180629.tar.gz -sha256 966075293e45785230c19415bcda15bd07c75bead4fe73332d1a4b9c45bb321f ninfod/COPYING +sha256 b8ea785d12fa6a44916601104dd746216957e93f13a26d3eb858b3b5a4ad66ab LICENSE +sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/LICENSE.GPL2 diff --git a/buildroot/package/iputils/iputils.mk b/buildroot/package/iputils/iputils.mk index 837197123..0d260891e 100644 --- a/buildroot/package/iputils/iputils.mk +++ b/buildroot/package/iputils/iputils.mk @@ -11,61 +11,106 @@ # and IPv6 updates. # http://www.spinics.net/lists/netdev/msg279881.html -IPUTILS_VERSION = s20180629 -IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) -IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause, BSD-4-Clause -# Only includes a license file for BSD -IPUTILS_LICENSE_FILES = ninfod/COPYING - -IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_SYSFS=no USE_IDN=no\ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" +IPUTILS_VERSION = 20190709 +IPUTILS_SITE = $(call github,iputils,iputils,s$(IPUTILS_VERSION)) +IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause +IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 +IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBCAP),y) -IPUTILS_MAKE_OPTS += USE_CAP=yes +IPUTILS_CONF_OPTS += -DUSE_CAP=true IPUTILS_DEPENDENCIES += libcap else -IPUTILS_MAKE_OPTS += USE_CAP=no +IPUTILS_CONF_OPTS += -DUSE_CAP=false endif -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -IPUTILS_MAKE_OPTS += USE_GCRYPT=yes -IPUTILS_DEPENDENCIES += libgcrypt +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +IPUTILS_CONF_OPTS += -DUSE_IDN=true +IPUTILS_DEPENDENCIES += libidn2 else -IPUTILS_MAKE_OPTS += USE_GCRYPT=no +IPUTILS_CONF_OPTS += -DUSE_IDN=false endif ifeq ($(BR2_PACKAGE_NETTLE),y) -IPUTILS_MAKE_OPTS += USE_NETTLE=yes +IPUTILS_CONF_OPTS += -DUSE_CRYPTO=nettle IPUTILS_DEPENDENCIES += nettle -else -IPUTILS_MAKE_OPTS += USE_NETTLE=no -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -IPUTILS_MAKE_OPTS += USE_CRYPTO=yes +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +IPUTILS_CONF_OPTS += -DUSE_CRYPTO=gcrypt +IPUTILS_DEPENDENCIES += libgcrypt +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +IPUTILS_CONF_OPTS += -DUSE_CRYPTO=openssl IPUTILS_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_LINUX_HEADERS),y) +IPUTILS_CONF_OPTS += -DUSE_CRYPTO=kernel +IPUTILS_DEPENDENCIES += linux-headers else -IPUTILS_MAKE_OPTS += USE_CRYPTO=no +IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none +# BUILD_NINFOD=true and USE_CRYPTO=none cannot be combined +IPUTILS_NINFOD = n endif -define IPUTILS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS) -endef +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +IPUTILS_DEPENDENCIES += systemd +endif -define IPUTILS_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/arping $(TARGET_DIR)/sbin/arping - $(INSTALL) -D -m 755 $(@D)/clockdiff $(TARGET_DIR)/bin/clockdiff - $(INSTALL) -D -m 755 $(@D)/ping $(TARGET_DIR)/bin/ping - $(INSTALL) -D -m 755 $(@D)/rarpd $(TARGET_DIR)/sbin/rarpd - $(INSTALL) -D -m 755 $(@D)/rdisc $(TARGET_DIR)/sbin/rdisc - $(INSTALL) -D -m 755 $(@D)/tftpd $(TARGET_DIR)/usr/sbin/in.tftpd - $(INSTALL) -D -m 755 $(@D)/tracepath $(TARGET_DIR)/bin/tracepath - $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6 -endef +# ninfod requires +ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +IPUTILS_NINFOD = n +endif +ifeq ($(IPUTILS_NINFOD),n) +IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false +else +IPUTILS_CONF_OPTS += -DBUILD_NINFOD=true +endif + +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +IPUTILS_CONF_OPTS += -DUSE_GETTEXT=true +else +IPUTILS_CONF_OPTS += -DUSE_GETTEXT=false +endif + +IPUTILS_CONF_OPTS += -DBUILD_TRACEROUTE6=true + +# XSL Stylesheets for DocBook 5 not packaged for buildroot +IPUTILS_CONF_OPTS += -DBUILD_MANS=false -DBUILD_HTML_MANS=false + +# move iputils binaries to the same location as where Busybox installs +# the corresponding applets, so that we have a single version of the +# tools (from iputils) +define IPUTILS_MOVE_BINARIES + mv $(TARGET_DIR)/usr/bin/arping $(TARGET_DIR)/usr/sbin/arping + $(if $(BR2_ROOTFS_MERGED_USR),,\ + mv $(TARGET_DIR)/usr/bin/ping $(TARGET_DIR)/bin/ping) + mv $(TARGET_DIR)/usr/bin/tftpd $(TARGET_DIR)/usr/sbin/tftpd +endef +IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_BINARIES + +# upstream requires distros to create symlink +define IPUTILS_CREATE_PING6_SYMLINK + ln -sf ping $(TARGET_DIR)/bin/ping6 +endef +IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_CREATE_PING6_SYMLINK + +# handle permissions ourselves +IPUTILS_CONF_OPTS += -DNO_SETCAP_OR_SUID=true +ifeq ($(BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES),y) define IPUTILS_PERMISSIONS - /bin/ping f 4755 0 0 - - - - - - /bin/traceroute6 f 4755 0 0 - - - - - + /usr/sbin/arping f 755 0 0 - - - - - + /usr/bin/clockdiff f 755 0 0 - - - - - + |xattr cap_net_raw+p + /bin/ping f 755 0 0 - - - - - + |xattr cap_net_raw+p + /usr/bin/traceroute6 f 755 0 0 - - - - - + |xattr cap_net_raw+p endef +else +define IPUTILS_PERMISSIONS + /usr/sbin/arping f 755 0 0 - - - - - + /usr/bin/clockdiff f 4755 0 0 - - - - - + /bin/ping f 4755 0 0 - - - - - + /usr/bin/traceroute6 f 4755 0 0 - - - - - +endef +endif -$(eval $(generic-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/irda-utils/irda-utils.hash b/buildroot/package/irda-utils/irda-utils.hash index 6a71c47f0..8a513cf31 100644 --- a/buildroot/package/irda-utils/irda-utils.hash +++ b/buildroot/package/irda-utils/irda-utils.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6 irda-utils-0.9.18.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 man/COPYING diff --git a/buildroot/package/irqbalance/irqbalance.hash b/buildroot/package/irqbalance/irqbalance.hash index dfe14c900..2e7cf49c2 100644 --- a/buildroot/package/irqbalance/irqbalance.hash +++ b/buildroot/package/irqbalance/irqbalance.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3318eddc03782cfdad22b20eff18eaf378c498c5de286e8cbaa5521ddf4f810b irqbalance-v1.5.0.tar.gz +sha256 5ace9dd69d5190e24ee34210c3131333e9963e3ba649bf9237eabb4313c300d2 irqbalance-1.6.0.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/irqbalance/irqbalance.mk b/buildroot/package/irqbalance/irqbalance.mk index 063b02bb6..36e9e4249 100644 --- a/buildroot/package/irqbalance/irqbalance.mk +++ b/buildroot/package/irqbalance/irqbalance.mk @@ -4,8 +4,8 @@ # ################################################################################ -IRQBALANCE_VERSION = v1.5.0 -IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,$(IRQBALANCE_VERSION)) +IRQBALANCE_VERSION = 1.6.0 +IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,v$(IRQBALANCE_VERSION)) IRQBALANCE_LICENSE = GPL-2.0 IRQBALANCE_LICENSE_FILES = COPYING IRQBALANCE_DEPENDENCIES = host-pkgconf libglib2 @@ -40,13 +40,6 @@ else IRQBALANCE_CONF_OPTS += --without-systemd endif -# This would be done by the package's autogen.sh script -define IRQBALANCE_PRECONFIGURE - mkdir -p $(@D)/m4 -endef - -IRQBALANCE_PRE_CONFIGURE_HOOKS += IRQBALANCE_PRECONFIGURE - define IRQBALANCE_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/irqbalance/S13irqbalance \ $(TARGET_DIR)/etc/init.d/S13irqbalance @@ -55,9 +48,6 @@ endef define IRQBALANCE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/irqbalance/irqbalance.service \ $(TARGET_DIR)/usr/lib/systemd/system/irqbalance.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/irqbalance.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/irqbalance.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/irrlicht/irrlicht.hash b/buildroot/package/irrlicht/irrlicht.hash index 489790e29..1f5631f22 100644 --- a/buildroot/package/irrlicht/irrlicht.hash +++ b/buildroot/package/irrlicht/irrlicht.hash @@ -1,5 +1,10 @@ # From https://sourceforge.net/projects/irrlicht/files/Irrlicht%20SDK/1.8/1.8.4 md5 9401cfff801395010b0912211f3cbb4f irrlicht-1.8.4.zip sha1 38bf0223fe868d243d6a39d0dc191c8df6e03b3b irrlicht-1.8.4.zip -# locally calculated -sha256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 irrlicht-1.8.4.zip +# Locally calculated +sha256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 irrlicht-1.8.4.zip +sha256 cc86e0b830f9d48933feb198f2741a7d9bb7c34fe8a35302d8ce36b8e2ecb27b doc/aesGladman.txt +sha256 e8a6b63336018eec09ac3a7cdfe5a80bda635641bc0397a77b8baa25bed03800 doc/bzip2-license.txt +sha256 ca38f1ba4ab901111f6eee50009bd46dbd866e6beb98d592d843f7c162d73409 doc/irrlicht-license.txt +sha256 67f098c29401646a0f52da432efc3bab0433c13f17effc3314e9fa523da51b75 doc/jpglib-license.txt +sha256 e0f86c3e4acd285618faa55735ceedce46084a3cfb06b8f31d0d092bb68ae151 doc/libpng-license.txt diff --git a/buildroot/package/isl/isl.hash b/buildroot/package/isl/isl.hash index 43e5a463a..40d04dca8 100644 --- a/buildroot/package/isl/isl.hash +++ b/buildroot/package/isl/isl.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 0f35051cc030b87c673ac1f187de40e386a1482a0cfdf2c552dd6031b307ddc4 isl-0.18.tar.xz +sha256 6c8bc56c477affecba9c59e2c9f026967ac8bad01b51bdd07916db40a517b9fa isl-0.22.tar.xz +sha256 3a2c398103f6bca0f50a9a9465deca9230b370b0212af5fdf31ed88a36215c30 LICENSE diff --git a/buildroot/package/isl/isl.mk b/buildroot/package/isl/isl.mk index b5f01c4c8..a1a597d03 100644 --- a/buildroot/package/isl/isl.mk +++ b/buildroot/package/isl/isl.mk @@ -4,7 +4,7 @@ # ################################################################################ -ISL_VERSION = 0.18 +ISL_VERSION = 0.22 ISL_SOURCE = isl-$(ISL_VERSION).tar.xz ISL_SITE = http://isl.gforge.inria.fr ISL_LICENSE = MIT diff --git a/buildroot/package/iucode-tool/iucode-tool.mk b/buildroot/package/iucode-tool/iucode-tool.mk index e900888d7..bddc37295 100644 --- a/buildroot/package/iucode-tool/iucode-tool.mk +++ b/buildroot/package/iucode-tool/iucode-tool.mk @@ -21,9 +21,6 @@ endef define IUCODE_TOOL_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/iucode-tool/iucode.service \ $(TARGET_DIR)/usr/lib/systemd/system/iucode.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/iucode.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/iucode.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/iw/iw.hash b/buildroot/package/iw/iw.hash index 6423df773..458262b71 100644 --- a/buildroot/package/iw/iw.hash +++ b/buildroot/package/iw/iw.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/iw/sha256sums.asc -sha256 f01671c0074bfdec082a884057edba1b9efd35c89eda554638496f03b769ad89 iw-4.14.tar.xz +sha256 04afe857bc8dea67e461946de30ae1b012954b6965839c5c3fda7d0ed15505d5 iw-5.3.tar.xz # Locally calculated sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING diff --git a/buildroot/package/iw/iw.mk b/buildroot/package/iw/iw.mk index 8264e8b5d..fae65f739 100644 --- a/buildroot/package/iw/iw.mk +++ b/buildroot/package/iw/iw.mk @@ -4,7 +4,7 @@ # ################################################################################ -IW_VERSION = 4.14 +IW_VERSION = 5.3 IW_SOURCE = iw-$(IW_VERSION).tar.xz IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw IW_LICENSE = ISC @@ -12,8 +12,7 @@ IW_LICENSE_FILES = COPYING IW_DEPENDENCIES = host-pkgconf libnl IW_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ - PKG_CONFIG="$(HOST_DIR)/bin/pkg-config" \ - GIT_DIR=$(IW_DIR) + PKG_CONFIG="$(HOST_DIR)/bin/pkg-config" define IW_BUILD_CMDS $(IW_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) diff --git a/buildroot/package/iwd/iwd.hash b/buildroot/package/iwd/iwd.hash index d8eefc064..e7ba107a3 100644 --- a/buildroot/package/iwd/iwd.hash +++ b/buildroot/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 e416bd549474b2940b0e43ac680795fbafe2b4965fe6a977cd4c1caa1a05e897 iwd-0.13.tar.gz +sha256 f52ed3cc0dae1f9a82c601df638977f0f6d8d4629ba5e333b4743748a907c0e7 iwd-0.22.tar.gz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/buildroot/package/iwd/iwd.mk b/buildroot/package/iwd/iwd.mk index 63736947c..fc8b83d1b 100644 --- a/buildroot/package/iwd/iwd.mk +++ b/buildroot/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 0.13 +IWD_VERSION = 0.22 IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git IWD_SITE_METHOD = git IWD_LICENSE = LGPL-2.1+ @@ -12,7 +12,9 @@ IWD_LICENSE_FILES = COPYING # sources from git, no configure script provided IWD_AUTORECONF = YES -IWD_CONF_OPTS = --enable-external-ell +IWD_CONF_OPTS = \ + --disable-manual-pages \ + --enable-external-ell IWD_DEPENDENCIES = ell # autoreconf requires an existing build-aux directory @@ -30,7 +32,7 @@ endif ifeq ($(BR2_PACKAGE_READLINE),y) # iwd client depends on readline (GPL-3.0+) -IWD_LICENSE := $(IWD_LICENSE), GPL-3.0+ (client) +IWD_LICENSE += , GPL-3.0+ (client) IWD_CONF_OPTS += --enable-client IWD_DEPENDENCIES += readline else diff --git a/buildroot/package/jack1/Config.in b/buildroot/package/jack1/Config.in new file mode 100644 index 000000000..b9299e2fd --- /dev/null +++ b/buildroot/package/jack1/Config.in @@ -0,0 +1,33 @@ +config BR2_PACKAGE_JACK1 + bool "jack1" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_PACKAGE_JACK2 + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_HWDEP + select BR2_PACKAGE_ALSA_LIB_RAWMIDI + select BR2_PACKAGE_ALSA_LIB_SEQ + select BR2_PACKAGE_BERKELEYDB + select BR2_PACKAGE_LIBSAMPLERATE + select BR2_PACKAGE_LIBSNDFILE + help + JACK Audio Connection Kit (JACK 1 implementation). + + JACK is a low-latency sound server, allowing multiple + applications to connect to one audio device, and to share + audio between themselves. This package contains the daemon + jackd as well as some example clients. + + http://jackaudio.org/ + + Another implementation (BR2_PACKAGE_JACK2) is also available, + please consult the documentation to choose the right one: + + https://github.com/jackaudio/jackaudio.github.com/wiki/Q_difference_jack1_jack2 + +comment "jack1 needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/jack1/jack1.hash b/buildroot/package/jack1/jack1.hash new file mode 100644 index 000000000..d7787ac2a --- /dev/null +++ b/buildroot/package/jack1/jack1.hash @@ -0,0 +1,5 @@ +# Locally computed +sha256 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444 jack-audio-connection-kit-0.125.0.tar.gz +sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL +sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL diff --git a/buildroot/package/jack1/jack1.mk b/buildroot/package/jack1/jack1.mk new file mode 100644 index 000000000..2f97434eb --- /dev/null +++ b/buildroot/package/jack1/jack1.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# jack1 +# +################################################################################ + +JACK1_VERSION = 0.125.0 +JACK1_SOURCE = jack-audio-connection-kit-$(JACK1_VERSION).tar.gz +JACK1_SITE = http://jackaudio.org/downloads +JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) +JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL +JACK1_INSTALL_STAGING = YES + +# Dependency to celt can't be met: jack1 requires celt >= 0.8.0 but we +# only have 0.5.1.3 and we cannot upgrade. +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile + +ifeq ($(BR2_PACKAGE_READLINE),y) +JACK1_DEPENDENCIES += readline +endif + +JACK1_CONF_OPTS = --without-html-dir --disable-oss + +$(eval $(autotools-package)) diff --git a/buildroot/package/jack2/0001-Fix-initialization-in-test-iodelay.patch b/buildroot/package/jack2/0001-Fix-initialization-in-test-iodelay.patch deleted file mode 100644 index ee2493886..000000000 --- a/buildroot/package/jack2/0001-Fix-initialization-in-test-iodelay.patch +++ /dev/null @@ -1,65 +0,0 @@ -From ff1ed2c4524095055140370c1008a2d9cccc5645 Mon Sep 17 00:00:00 2001 -From: Adrian Knoth -Date: Sat, 11 Jun 2016 05:35:07 +0200 -Subject: [PATCH] Fix initialization in test/iodelay.cpp - -jack_latency_range_t is - -struct _jack_latency_range { - jack_nframes_t min; - jack_nframes_t max; -}; - -and jack_nframes_t is - -typedef uint32_t jack_nframes_t; - -so it's unsigned. Initialising it with -1 is invalid (at least in C++14). We cannot use {0, 0}, because latency_cb has - - jack_latency_range_t range; - range.min = range.max = 0; - if ((range.min != capture_latency.min) || (range.max != - capture_latency.max)) { - capture_latency = range; - } - -so we must not have {0, 0}, otherwise the condition would never be true. - -Using UINT32_MAX should be equivalent to the previous -1. - -[Upstream commit https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645] -Signed-off-by: Thomas Petazzoni ---- - tests/iodelay.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/tests/iodelay.cpp b/tests/iodelay.cpp -index e1ba63fa..1ef470fd 100644 ---- a/tests/iodelay.cpp -+++ b/tests/iodelay.cpp -@@ -20,6 +20,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -167,8 +168,8 @@ static jack_client_t *jack_handle; - static jack_port_t *jack_capt; - static jack_port_t *jack_play; - --jack_latency_range_t capture_latency = {-1, -1}; --jack_latency_range_t playback_latency = {-1, -1}; -+jack_latency_range_t capture_latency = {UINT32_MAX, UINT32_MAX}; -+jack_latency_range_t playback_latency = {UINT32_MAX, UINT32_MAX}; - - void - latency_cb (jack_latency_callback_mode_t mode, void *arg) -@@ -266,4 +267,4 @@ int main (int ac, char *av []) - return 0; - } - --// -------------------------------------------------------------------------------- -\ No newline at end of file -+// -------------------------------------------------------------------------------- diff --git a/buildroot/package/jack2/0002-Improve-check-for-ucontext.patch b/buildroot/package/jack2/0002-Improve-check-for-ucontext.patch deleted file mode 100644 index b8aa1da72..000000000 --- a/buildroot/package/jack2/0002-Improve-check-for-ucontext.patch +++ /dev/null @@ -1,84 +0,0 @@ -From ad79670d6d1e7ef2aad6935715921e5317cbe618 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 23 May 2016 22:28:12 +0200 -Subject: [PATCH] Improve check for ucontext - -The ucontext functionality is not available on all CPUs with all C -libraries. Instead of making just assumptions based on the CPU -architecture, this commit adds the necessary checks in wscript to verify -the availability of the ucontext functionality, before using it in -dbus/sigsegv.c. - -This avoids the long list of architecture exclusions, and make it more -robust when building jack2 for new CPU architectures. - -Signed-off-by: Thomas Petazzoni ---- - dbus/sigsegv.c | 12 ++++++------ - wscript | 16 +++++++++++++++- - 2 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c -index df2c42c..00a62b5 100644 ---- a/dbus/sigsegv.c -+++ b/dbus/sigsegv.c -@@ -106,20 +106,20 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) { - jack_error("info.si_errno = %d", info->si_errno); - jack_error("info.si_code = %d (%s)", info->si_code, si_code_str); - jack_error("info.si_addr = %p", info->si_addr); --#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) -+#if defined(HAVE_UCONTEXT) && defined(HAVE_NGREG) - for(i = 0; i < NGREG; i++) - jack_error("reg[%02d] = 0x" REGFORMAT, i, --#if defined(__powerpc64__) -+#if defined(HAVE_UCONTEXT_GP_REGS) - ucontext->uc_mcontext.gp_regs[i] --#elif defined(__powerpc__) -+#elif defined(HAVE_UCONTEXT_UC_REGS) - ucontext->uc_mcontext.uc_regs[i] --#elif defined(__sparc__) && defined(__arch64__) -+#elif defined(HAVE_UCONTEXT_MC_GREGS) - ucontext->uc_mcontext.mc_gregs[i] --#else -+#elif defined(HAVE_UCONTEXT_GREGS) - ucontext->uc_mcontext.gregs[i] - #endif - ); --#endif /* alpha, ia64, kFreeBSD, arm, hppa */ -+#endif /* defined(HAVE_UCONTEXT) && defined(HAVE_NGREG) */ - - #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64) - # if defined(SIGSEGV_STACK_IA64) -diff --git a/wscript b/wscript -index 63ba3aa..34a56fc 100644 ---- a/wscript -+++ b/wscript -@@ -168,10 +168,24 @@ def configure(conf): - - conf.check_cc(header_name='execinfo.h', define_name="HAVE_EXECINFO_H", mandatory=False) - conf.check_cc(header_name='samplerate.h', define_name="HAVE_SAMPLERATE") -- - if conf.is_defined('HAVE_SAMPLERATE'): - conf.env['LIB_SAMPLERATE'] = ['samplerate'] - -+ # test for the availability of ucontext, and how it should be used -+ for t in ("gp_regs", "uc_regs", "mc_gregs", "gregs"): -+ fragment = "#include \n" -+ fragment += "int main() { ucontext_t *ucontext; return (int) ucontext->uc_mcontext.%s[0]; }" % t -+ confvar = "HAVE_UCONTEXT_%s" % t.upper() -+ conf.check_cc(fragment=fragment, define_name=confvar, mandatory=False, -+ msg="Checking for ucontext->uc_mcontext.%s" % t) -+ if conf.is_defined(confvar): -+ conf.define('HAVE_UCONTEXT', 1) -+ -+ fragment = "#include \n" -+ fragment += "int main() { return NGREG; }" -+ conf.check_cc(fragment=fragment, define_name="HAVE_NGREG", mandatory=False, -+ msg="Checking for NGREG") -+ - conf.sub_config('example-clients') - - if conf.check_cfg(package='celt', atleast_version='0.11.0', args='--cflags --libs', mandatory=False): --- -2.7.4 - diff --git a/buildroot/package/jack2/0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch b/buildroot/package/jack2/0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch deleted file mode 100644 index 719c6a83b..000000000 --- a/buildroot/package/jack2/0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 4b2c73ad056aa327dc3b505410da68cf384317ba Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Mon, 16 May 2016 22:26:05 +0200 -Subject: [PATCH] Make backtrace support depends on execinfo.h existence - -In some C-libraries (like uclibc), backtrace support is optional, so the -execinfo.h file may not exist. - -This change adds the check for execinfo.h header and conditionnaly enable -backtrace support. - -This issue has been triggered by Buildroot farms: - http://autobuild.buildroot.org/results/391/391e71a988250ea66ec4dbee6f60fdce9eaf2766/build-end.log - -Signed-off-by: Samuel Martin ---- - dbus/sigsegv.c | 8 +++++++- - wscript | 1 + - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c -index ee12f91..0b31d89 100644 ---- a/dbus/sigsegv.c -+++ b/dbus/sigsegv.c -@@ -27,7 +27,9 @@ - #include - #include - #include --#include -+#if defined(HAVE_EXECINFO_H) -+# include -+#endif /* defined(HAVE_EXECINFO_H) */ - #include - #ifndef NO_CPP_DEMANGLE - char * __cxa_demangle(const char * __mangled_name, char * __output_buffer, size_t * __length, int * __status); -@@ -161,12 +163,16 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) { - bp = (void**)bp[0]; - } - #else -+# if defined(HAVE_EXECINFO_H) - jack_error("Stack trace (non-dedicated):"); - sz = backtrace(bt, 20); - strings = backtrace_symbols(bt, sz); - - for(i = 0; i < sz; ++i) - jack_error("%s", strings[i]); -+# else /* defined(HAVE_EXECINFO_H) */ -+ jack_error("Stack trace not available"); -+# endif /* defined(HAVE_EXECINFO_H) */ - #endif - jack_error("End of stack trace"); - exit (-1); -diff --git a/wscript b/wscript -index aef4bd8..63ba3aa 100644 ---- a/wscript -+++ b/wscript -@@ -166,6 +166,7 @@ def configure(conf): - if conf.env['BUILD_JACKDBUS'] != True: - conf.fatal('jackdbus was explicitly requested but cannot be built') - -+ conf.check_cc(header_name='execinfo.h', define_name="HAVE_EXECINFO_H", mandatory=False) - conf.check_cc(header_name='samplerate.h', define_name="HAVE_SAMPLERATE") - - if conf.is_defined('HAVE_SAMPLERATE'): --- -2.8.2 - diff --git a/buildroot/package/jack2/0004-tests-define-__STDC_LIMIT_MACROS.patch b/buildroot/package/jack2/0004-tests-define-__STDC_LIMIT_MACROS.patch deleted file mode 100644 index e4990b5c3..000000000 --- a/buildroot/package/jack2/0004-tests-define-__STDC_LIMIT_MACROS.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c971aaab74ca6e7d4ac3a06bd26e7309dfc5da45 Mon Sep 17 00:00:00 2001 -From: Rahul Bedarkar -Date: Mon, 22 Aug 2016 19:04:47 +0530 -Subject: [PATCH] tests: define __STDC_LIMIT_MACROS - -With glibc 2.16, we get following build error when building jack2: - - [193/247] cxx: tests/iodelay.cpp -> build/tests/iodelay.cpp.4.o - ../tests/iodelay.cpp:171:43: error: 'UINT32_MAX' was not declared in this scope - ../tests/iodelay.cpp:171:55: error: 'UINT32_MAX' was not declared in this scope - ../tests/iodelay.cpp:172:44: error: 'UINT32_MAX' was not declared in this scope - ../tests/iodelay.cpp:172:56: error: 'UINT32_MAX' was not declared in this scope - -In glibc 2.17 or older version, Header defines these macros -for C++ only if explicitly requested by defining __STDC_LIMIT_MACROS. - -We can't use since it requires C++11 standard. - -This build issue found by Buildroot autobuilder. -http://autobuild.buildroot.net/results/369/369ce208ffea43dad75ba0a13469159b341e3bf5/ - -Signed-off-by: Rahul Bedarkar ---- - tests/iodelay.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/iodelay.cpp b/tests/iodelay.cpp -index 1ef470f..f5c5836 100644 ---- a/tests/iodelay.cpp -+++ b/tests/iodelay.cpp -@@ -20,6 +20,7 @@ - - #include - #include -+#define __STDC_LIMIT_MACROS - #include - #include - #include --- -2.6.2 - diff --git a/buildroot/package/jack2/0005-gcc7.patch b/buildroot/package/jack2/0005-gcc7.patch deleted file mode 100644 index dadaf44ed..000000000 --- a/buildroot/package/jack2/0005-gcc7.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f7bccdca651592cc4082b28fd4a01ed6ef8ab655 Mon Sep 17 00:00:00 2001 -From: Kjetil Matheussen -Date: Sat, 15 Jul 2017 13:21:59 +0200 -Subject: [PATCH] Tests: Fix compilation with gcc7 - -Fixes -../tests/test.cpp: In function ‘int process4(jack_nframes_t, void*)’: -../tests/test.cpp:483:73: error: call of overloaded ‘abs(jack_nframes_t)’ is ambiguous - if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { - -Downloaded from upstream commit -https://github.com/jackaudio/jack2/commit/f7bccdca651592cc4082b28fd4a01ed6ef8ab655 - -Signed-off-by: Bernd Kuhls ---- - tests/test.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test.cpp b/tests/test.cpp -index 8a8a8117..d2ef9a05 100644 ---- a/tests/test.cpp -+++ b/tests/test.cpp -@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg) - jack_nframes_t delta_time = cur_time - last_time; - - Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time); -- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { -+ if (delta_time > 0 && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)tolerance) { - printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance); - } - diff --git a/buildroot/package/jack2/0006-fix-ftbfs-with-clang.patch b/buildroot/package/jack2/0006-fix-ftbfs-with-clang.patch deleted file mode 100644 index a73fe69e1..000000000 --- a/buildroot/package/jack2/0006-fix-ftbfs-with-clang.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001 -From: Adrian Knoth -Date: Thu, 18 Sep 2014 18:29:23 +0200 -Subject: [PATCH] Fix FTBFS with clang++ - -Forwarded from http://bugs.debian.org/757820 - -Downloaded from upstream commit -https://github.com/jackaudio/jack2/commit/d3c8e2d8d78899fba40a3e677ed4dbe388d82269 - -Signed-off-by: Bernd Kuhls ---- - common/memops.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/common/memops.c b/common/memops.c -index 27f6194a..2d416b64 100644 ---- a/common/memops.c -+++ b/common/memops.c -@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s) - */ - static unsigned int seed = 22222; - --inline unsigned int fast_rand() { -+static inline unsigned int fast_rand() { - seed = (seed * 96314165) + 907633515; - return seed; - } diff --git a/buildroot/package/jack2/jack2.hash b/buildroot/package/jack2/jack2.hash index ab031b9d9..aec56e24a 100644 --- a/buildroot/package/jack2/jack2.hash +++ b/buildroot/package/jack2/jack2.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d jack2-v1.9.10.tar.gz +sha256 a20a32366780c0061fd58fbb5f09e514ea9b7ce6e53b080a44b11a558a83217c jack2-1.9.14.tar.gz diff --git a/buildroot/package/jack2/jack2.mk b/buildroot/package/jack2/jack2.mk index b61c5d75f..db63b7f4b 100644 --- a/buildroot/package/jack2/jack2.mk +++ b/buildroot/package/jack2/jack2.mk @@ -4,10 +4,10 @@ # ################################################################################ -JACK2_VERSION = v1.9.10 -JACK2_SITE = $(call github,jackaudio,jack2,$(JACK2_VERSION)) +JACK2_VERSION = 1.9.14 +JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) -JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python +JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib JACK2_INSTALL_STAGING = YES JACK2_CONF_OPTS = --alsa @@ -34,11 +34,6 @@ JACK2_DEPENDENCIES += dbus JACK2_CONF_OPTS += --dbus endif -# Even though it advertises support for celt-0.5.x, jack2 really -# requires celt >= 0.5.2 but we only have 0.5.1.3 and we cannot -# upgrade, so we do not add a dependency to celt051, which it can't -# find anyway as it looks for celt.pc but we only have celt-51.pc. - # The dependency against eigen is only useful in conjunction with # gtkiostream, which we do not have, so we don't need to depend on # eigen. diff --git a/buildroot/package/jailhouse/Config.in b/buildroot/package/jailhouse/Config.in new file mode 100644 index 000000000..596b4951d --- /dev/null +++ b/buildroot/package/jailhouse/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_JAILHOUSE + bool "jailhouse" + depends on BR2_aarch64 || BR2_x86_64 + depends on BR2_LINUX_KERNEL + help + The Jailhouse partitioning Hypervisor based on Linux. + + https://github.com/siemens/jailhouse + +if BR2_PACKAGE_JAILHOUSE + +config BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS + bool "helper scripts" + depends on BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON_MAKO # runtime + help + Python-based helpers for the Jailhouse Hypervisor. + + https://github.com/siemens/jailhouse + +comment "helper scripts require Python" + depends on !BR2_PACKAGE_PYTHON + +endif + +comment "jailhouse needs a Linux kernel to be built" + depends on BR2_aarch64 || BR2_x86_64 + depends on !BR2_LINUX_KERNEL diff --git a/buildroot/package/jailhouse/jailhouse.hash b/buildroot/package/jailhouse/jailhouse.hash new file mode 100644 index 000000000..9fb4d599d --- /dev/null +++ b/buildroot/package/jailhouse/jailhouse.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 8de2406f455db07794cc750238ce57bc897673ba2b68c56fc9ae2d8079142b33 jailhouse-0.11.tar.gz +sha256 3aafb31a2436178323663e00511f16d58fc36ea654b1457532e79d017205efd8 COPYING diff --git a/buildroot/package/jailhouse/jailhouse.mk b/buildroot/package/jailhouse/jailhouse.mk new file mode 100644 index 000000000..1aa785170 --- /dev/null +++ b/buildroot/package/jailhouse/jailhouse.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# jailhouse +# +################################################################################ + +JAILHOUSE_VERSION = 0.11 +JAILHOUSE_SITE = $(call github,siemens,jailhouse,v$(JAILHOUSE_VERSION)) +JAILHOUSE_LICENSE = GPL-2.0 +JAILHOUSE_LICENSE_FILES = COPYING +JAILHOUSE_DEPENDENCIES = \ + linux + +JAILHOUSE_MAKE_OPTS = \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + ARCH="$(KERNEL_ARCH)" \ + KDIR="$(LINUX_DIR)" \ + DESTDIR="$(TARGET_DIR)" + +ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y) +JAILHOUSE_DEPENDENCIES += \ + host-python-mako \ + host-python-setuptools +JAILHOUSE_MAKE_OPTS += \ + HAS_PYTHON_MAKO="yes" \ + PYTHON_PIP_USABLE="yes" +else +JAILHOUSE_MAKE_OPTS += \ + HAS_PYTHON_MAKO="no" \ + PYTHON_PIP_USABLE="no" +endif + +define JAILHOUSE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(JAILHOUSE_MAKE_OPTS) -C $(@D) + + $(if $(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS), \ + cd $(@D) && $(PKG_PYTHON_SETUPTOOLS_ENV) $(HOST_DIR)/bin/python setup.py build) +endef + +define JAILHOUSE_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(JAILHOUSE_MAKE_OPTS) -C $(@D) modules_install firmware_install tool_inmates_install + $(TARGET_MAKE_ENV) $(MAKE) $(JAILHOUSE_MAKE_OPTS) -C $(@D)/tools src=$(@D)/tools install + + $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/jailhouse + $(INSTALL) -D -m 0644 $(@D)/configs/*/*.cell $(TARGET_DIR)/etc/jailhouse + + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/libexec/jailhouse/demos + $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/local/libexec/jailhouse/demos + + $(if $(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS), \ + cd $(@D) && $(PKG_PYTHON_SETUPTOOLS_ENV) $(HOST_DIR)/bin/python setup.py install --no-compile $(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/jamvm/0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch b/buildroot/package/jamvm/0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch deleted file mode 100644 index 78ee9b7e1..000000000 --- a/buildroot/package/jamvm/0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch +++ /dev/null @@ -1,108 +0,0 @@ -From ecd4eceae98cfb1c83133bdeaa9095546ca8b7c6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 26 May 2016 15:05:48 +0200 -Subject: [PATCH] Use when available instead of - -musl libc (http://musl-libc.org lack the non-standard -header, which is used in src/os/linux/{i386,x86_64}/init.c files to -setup the floating point precision. This patch makes it use the -standard C header instead when available. - -Original patch at Felix Janda at -https://sourceforge.net/p/jamvm/patches/6/, adapted to still use - if is not provided. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 +- - src/os/linux/i386/init.c | 15 +++++++++++++++ - src/os/linux/x86_64/init.c | 15 +++++++++++++-- - 3 files changed, 29 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 19f77e6..ce59a3e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -279,7 +279,7 @@ fi - - dnl Checks for header files. - AC_HEADER_STDC --AC_CHECK_HEADERS(sys/time.h unistd.h endian.h sys/param.h locale.h alloca.h) -+AC_CHECK_HEADERS(sys/time.h unistd.h endian.h sys/param.h locale.h alloca.h fenv.h) - - if test "$enable_zip" != no; then - AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR(zlib.h is missing)) -diff --git a/src/os/linux/i386/init.c b/src/os/linux/i386/init.c -index d9c6648..8fefe7d 100644 ---- a/src/os/linux/i386/init.c -+++ b/src/os/linux/i386/init.c -@@ -19,18 +19,33 @@ - * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -+#include "config.h" -+ -+#if defined(HAVE_FENV_H) -+#include -+#else - #include -+#endif - - /* Change floating point precision to double (64-bit) from - * the extended (80-bit) Linux default. */ - - void setDoublePrecision() { -+#if defined(HAVE_FENV_H) -+ fenv_t fenv; -+ -+ fegetenv(&fenv); -+ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ -+ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ -+ fesetenv(&fenv); -+#else - fpu_control_t cw; - - _FPU_GETCW(cw); - cw &= ~_FPU_EXTENDED; - cw |= _FPU_DOUBLE; - _FPU_SETCW(cw); -+#endif - } - - void initialisePlatform() { -diff --git a/src/os/linux/x86_64/init.c b/src/os/linux/x86_64/init.c -index 9d55229..b42b14e 100644 ---- a/src/os/linux/x86_64/init.c -+++ b/src/os/linux/x86_64/init.c -@@ -19,7 +19,11 @@ - * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - --#ifdef __linux__ -+#include "config.h" -+ -+#if defined(HAVE_FENV_H) -+#include -+#else - #include - #endif - -@@ -30,7 +34,14 @@ - */ - - void setDoublePrecision() { --#ifdef __linux__ -+#if defined(HAVE_FENV_H) -+ fenv_t fenv; -+ -+ fegetenv(&fenv); -+ fenv.__control_word &= ~0x300; /*_FPU_EXTENDED */ -+ fenv.__control_word |= 0x200; /*_FPU_DOUBLE */ -+ fesetenv(&fenv); -+#else - fpu_control_t cw; - - _FPU_GETCW(cw); --- -2.7.4 - diff --git a/buildroot/package/jamvm/Config.in b/buildroot/package/jamvm/Config.in deleted file mode 100644 index 7717ccaad..000000000 --- a/buildroot/package/jamvm/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_JAMVM_ARCH_SUPPORTS - bool - default y if BR2_arm || BR2_armeb - default y if BR2_i386 || BR2_x86_64 - default y if (BR2_mips || BR2_mipsel) \ - && (BR2_MIPS_FP32_MODE_32 || BR2_MIPS_SOFT_FLOAT) - default y if BR2_powerpc - -config BR2_PACKAGE_JAMVM - bool "jamvm" - depends on BR2_PACKAGE_JAMVM_ARCH_SUPPORTS - depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_CLASSPATH - help - JamVM is a new Java Virtual Machine which conforms to the - JVM specification version 2 (blue book). - - http://jamvm.sf.net - -comment "jamvm needs a toolchain w/ threads, dynamic library" - depends on BR2_PACKAGE_JAMVM_ARCH_SUPPORTS - depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/jamvm/jamvm.hash b/buildroot/package/jamvm/jamvm.hash deleted file mode 100644 index f8ef76cb9..000000000 --- a/buildroot/package/jamvm/jamvm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da jamvm-2.0.0.tar.gz diff --git a/buildroot/package/jamvm/jamvm.mk b/buildroot/package/jamvm/jamvm.mk deleted file mode 100644 index 3fcf460bc..000000000 --- a/buildroot/package/jamvm/jamvm.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# jamvm -# -################################################################################ - -JAMVM_VERSION = 2.0.0 -JAMVM_SITE = http://downloads.sourceforge.net/project/jamvm/jamvm/JamVM%20$(JAMVM_VERSION) -JAMVM_LICENSE = GPL-2.0+ -JAMVM_LICENSE_FILES = COPYING -JAMVM_DEPENDENCIES = zlib classpath -# For 0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch -JAMVM_AUTORECONF = YES -# int inlining seems to crash jamvm, don't build shared version of internal lib -JAMVM_CONF_OPTS = \ - --with-classpath-install-dir=/usr \ - --disable-int-inlining \ - --disable-shared \ - --without-pic - -# jamvm has ARM assembly code that cannot be compiled in Thumb2 mode, -# so we must force traditional ARM mode. -ifeq ($(BR2_arm),y) -JAMVM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -marm" -endif - -# Needed for autoreconf -define JAMVM_CREATE_M4_DIR - mkdir -p $(@D)/m4 -endef - -JAMVM_POST_PATCH_HOOKS += JAMVM_CREATE_M4_DIR - -$(eval $(autotools-package)) diff --git a/buildroot/package/janus-gateway/0001-disable-ssp.patch b/buildroot/package/janus-gateway/0001-disable-ssp.patch index f03b58589..22f7f1a41 100644 --- a/buildroot/package/janus-gateway/0001-disable-ssp.patch +++ b/buildroot/package/janus-gateway/0001-disable-ssp.patch @@ -1,4 +1,7 @@ -Do not force SSP usage +From 4b02c8207adb888d35951bbc1c5b3029594f44c6 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Wed, 24 Apr 2019 13:56:27 -0400 +Subject: [PATCH] Do not force SSP usage The toolchain may not support SSP, so do not enforce its usage, let the package user pass the appropriate CFLAGS to enable SSP if needed. @@ -7,16 +10,24 @@ Signed-off-by: Gregory Dymarek Signed-off-by: Thomas Petazzoni (rebased against v0.1.0) Signed-off-by: Bernd Kuhls +(rebased against v0.6.3) +Signed-off-by: Adam Duskett +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 257ea8c..ca17a29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,7 +20,6 @@ LT_INIT + # Common CFLAGS + CFLAGS="$CFLAGS \ + -fPIC \ +- -fstack-protector-all \ + -fstrict-aliasing \ + -ggdb3 \ + -pthread \ +-- +2.20.1 -diff -rupN janus-gateway-master.orig/Makefile.am janus-gateway-master/Makefile.am ---- janus-gateway-master.orig/Makefile.am 2014-11-27 14:36:31.000000000 +0000 -+++ janus-gateway-master/Makefile.am 2014-12-01 16:39:50.551935028 +0000 -@@ -14,7 +14,7 @@ AM_CFLAGS += -Wredundant-decls # sophia - # some fairly big refactoring though, which can wait. - # AM_CFLAGS += -Wshadow -Wstrict-aliasing=2 - --AM_CFLAGS += -fstack-protector-all -g -ggdb -fPIC -rdynamic -pthread -+AM_CFLAGS += -g -ggdb -fPIC -rdynamic -pthread - - # FIXME: make docs work with distcheck - DISTCHECK_CONFIGURE_FLAGS = --disable-docs --enable-post-processing diff --git a/buildroot/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/buildroot/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch index 13bc21ea4..ac6b04507 100644 --- a/buildroot/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +++ b/buildroot/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch @@ -16,32 +16,33 @@ supported, and only uses it in this case. Signed-off-by: Thomas Petazzoni (rebased against v0.1.0) Signed-off-by: Bernd Kuhls +(rebased against v0.6.3) +Signed-off-by: Adam Duskett --- - Makefile.am | 2 +- - configure.ac | 3 ++ - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 78 insertions(+), 1 deletion(-) + Makefile.am | 1 + + configure.ac | 6 ++- + m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/Makefile.am b/Makefile.am -index 5d23e0b..0f51f6a 100644 +index c6e9ad2..42d256b 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -6,7 +6,7 @@ AM_CFLAGS = \ - -Wnested-externs -Wstrict-prototypes -Wunsafe-loop-optimizations \ - -Wwrite-strings -Wno-missing-field-initializers -Wno-unused-parameter \ - -Wcast-align -Wformat-nonliteral -Wformat-security -Wswitch-default \ -- -Wmissing-include-dirs -Wno-aggregate-return -Wunused-but-set-variable \ -+ -Wmissing-include-dirs -Wno-aggregate-return @GCC_WARN_UNUSED_BUT_SET@ \ - -Warray-bounds -Wold-style-definition -Wsign-compare -Wlarger-than=65537 - AM_CFLAGS += -Wno-undef # sophiasip is not -Wundef--safe - AM_CFLAGS += -Wno-redundant-decls # sophiasip also contains redundant declarations +@@ -140,6 +140,7 @@ janus_CFLAGS = \ + -DTRANSPORTDIR=\"$(transportdir)\" \ + -DEVENTDIR=\"$(eventdir)\" \ + -DCONFDIR=\"$(confdir)\" \ ++ @GCC_WARN_UNUSED_BUT_SET@ \ + $(BORINGSSL_CFLAGS) \ + $(NULL) + diff --git a/configure.ac b/configure.ac -index 17870a7..f9bb1e4 100644 +index ca17a29..beef91a 100644 --- a/configure.ac +++ b/configure.ac -@@ -7,6 +7,9 @@ AM_SILENT_RULES([yes]) - AC_GNU_SOURCE +@@ -13,6 +13,9 @@ AM_SILENT_RULES([yes]) + AC_USE_SYSTEM_EXTENSIONS AC_PROG_CC +AX_CHECK_COMPILE_FLAG([-Wunused-but-set-variable], @@ -50,6 +51,16 @@ index 17870a7..f9bb1e4 100644 LT_PREREQ([2.2]) LT_INIT +@@ -64,8 +67,7 @@ clang*) + CFLAGS="$CFLAGS \ + -Wcast-align \ + -Wno-override-init \ +- -Wunsafe-loop-optimizations \ +- -Wunused-but-set-variable" ++ -Wunsafe-loop-optimizations" + esac + + JANUS_VERSION=63 diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 0000000..51df0c0 @@ -131,5 +142,5 @@ index 0000000..51df0c0 +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS -- -2.1.0 +2.20.1 diff --git a/buildroot/package/janus-gateway/Config.in b/buildroot/package/janus-gateway/Config.in index 6eac763f7..9b70fa0ca 100644 --- a/buildroot/package/janus-gateway/Config.in +++ b/buildroot/package/janus-gateway/Config.in @@ -5,6 +5,7 @@ menuconfig BR2_PACKAGE_JANUS_GATEWAY depends on BR2_USE_MMU # libnice depends on !BR2_STATIC_LIBS # dlopen select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_LIBCONFIG select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBNICE select BR2_PACKAGE_LIBSRTP diff --git a/buildroot/package/janus-gateway/janus-gateway.hash b/buildroot/package/janus-gateway/janus-gateway.hash index 9b13e0f0f..b74ec2511 100644 --- a/buildroot/package/janus-gateway/janus-gateway.hash +++ b/buildroot/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c9c3b741a5d9f956845d5094c211690178cc0d630a7b23b870437c88a7e4ed3b janus-gateway-v0.5.0.tar.gz -sha256 0a884af515b4593503f6f0c9b424db3945bd77eaa2644d25f45eb93a412b3c19 COPYING +sha256 668758f06e2a158f83b89d17aad322959221fbeadcc5611c6f7a38ff76fd2896 janus-gateway-0.8.1.tar.gz +sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/buildroot/package/janus-gateway/janus-gateway.mk b/buildroot/package/janus-gateway/janus-gateway.mk index cea06b754..d17a80f78 100644 --- a/buildroot/package/janus-gateway/janus-gateway.mk +++ b/buildroot/package/janus-gateway/janus-gateway.mk @@ -4,24 +4,19 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = v0.5.0 -JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,$(JANUS_GATEWAY_VERSION)) -JANUS_GATEWAY_LICENSE = GPL-3.0 +JANUS_GATEWAY_VERSION = 0.8.1 +JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION)) +JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING # ding-libs provides the ini_config library JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \ - libsrtp host-gengetopt libglib2 openssl + libsrtp host-gengetopt libglib2 openssl libconfig # Straight out of the repository, no ./configure, and we also patch # configure.ac. JANUS_GATEWAY_AUTORECONF = YES -define JANUS_GATEWAY_M4 - mkdir -p $(@D)/m4 -endef -JANUS_GATEWAY_POST_PATCH_HOOKS += JANUS_GATEWAY_M4 - JANUS_GATEWAY_CONF_OPTS = \ --disable-data-channels \ --disable-sample-event-handler @@ -117,7 +112,4 @@ else JANUS_GATEWAY_CONF_OPTS += --disable-websockets endif -# Parallel build broken -JANUS_GATEWAY_MAKE = $(MAKE1) - $(eval $(autotools-package)) diff --git a/buildroot/package/jemalloc/0001-Disable-documentation.patch b/buildroot/package/jemalloc/0001-Disable-documentation.patch deleted file mode 100644 index a5f252cd7..000000000 --- a/buildroot/package/jemalloc/0001-Disable-documentation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b9113f8dc939dab775dbc64bae03b927f0679467 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Sun, 2 Apr 2017 19:26:04 +0200 -Subject: [PATCH] Disable documentation - -As there is no option to disable documentation, update Makefile.in to -skip it. - -Signed-off-by: Eric Le Bihan ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index e49a871..74a7541 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -383,7 +383,7 @@ done - - install_doc: install_doc_html install_doc_man - --install: install_bin install_include install_lib install_doc -+install: install_bin install_include install_lib - - tests_unit: $(TESTS_UNIT:$(srcroot)%.c=$(objroot)%$(EXE)) - tests_integration: $(TESTS_INTEGRATION:$(srcroot)%.c=$(objroot)%$(EXE)) --- -2.9.3 - diff --git a/buildroot/package/jemalloc/Config.in b/buildroot/package/jemalloc/Config.in index edb582d20..c272d4522 100644 --- a/buildroot/package/jemalloc/Config.in +++ b/buildroot/package/jemalloc/Config.in @@ -1,17 +1,21 @@ config BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS bool + # see include/jemalloc/internal/quantum.h default y if BR2_arm || BR2_armeb default y if BR2_aarch64 || BR2_aarch64_be default y if BR2_i386 || BR2_x86_64 + default y if BR2_m68k default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - default y if BR2_sparc64 + default y if BR2_nios2 + default y if BR2_or1k default y if BR2_powerpc + default y if BR2_riscv default y if BR2_sh4 || BR2sh4eb || BR2_sh4a || BR2_sh4aeb + default y if BR2_sparc64 config BR2_PACKAGE_JEMALLOC bool "jemalloc" depends on BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS - depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS help This library providing a malloc(3) implementation that @@ -20,6 +24,6 @@ config BR2_PACKAGE_JEMALLOC http://jemalloc.net/ -comment "jemalloc needs a toolchain w/ dynamic library, threads" +comment "jemalloc needs a toolchain w/ threads" depends on BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/jemalloc/jemalloc.hash b/buildroot/package/jemalloc/jemalloc.hash index 50ac68283..5db53d053 100644 --- a/buildroot/package/jemalloc/jemalloc.hash +++ b/buildroot/package/jemalloc/jemalloc.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9 jemalloc-5.0.1.tar.bz2 +sha256 34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6 jemalloc-5.2.1.tar.bz2 +sha256 94aa2caa98c25d942f58b956c71dba6a99ff98fc3a31cbc669fe2a4cd0268b53 COPYING diff --git a/buildroot/package/jemalloc/jemalloc.mk b/buildroot/package/jemalloc/jemalloc.mk index 2424eb54c..aedc1f04b 100644 --- a/buildroot/package/jemalloc/jemalloc.mk +++ b/buildroot/package/jemalloc/jemalloc.mk @@ -4,21 +4,18 @@ # ################################################################################ -JEMALLOC_VERSION = 5.0.1 +JEMALLOC_VERSION = 5.2.1 JEMALLOC_SOURCE = jemalloc-$(JEMALLOC_VERSION).tar.bz2 JEMALLOC_SITE = https://github.com/jemalloc/jemalloc/releases/download/$(JEMALLOC_VERSION) JEMALLOC_LICENSE = BSD-2-Clause JEMALLOC_LICENSE_FILES = COPYING JEMALLOC_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_VALGRIND),y) -JEMALLOC_DEPENDENCIES += valgrind -JEMALLOC_CONF_OPTS += --enable-valgrind -else -JEMALLOC_CONF_OPTS += --disable-valgrind +# gcc bug internal compiler error: in merge_overlapping_regs, at +# regrename.c:304. This bug is fixed since gcc 6. +ifeq ($(BR2_or1k):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:) +JEMALLOC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0" endif -HOST_JEMALLOC_CONF_OPTS += --disable-valgrind - $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/jhead/0001-use-ldflags.patch b/buildroot/package/jhead/0001-use-ldflags.patch deleted file mode 100644 index a1d8185a2..000000000 --- a/buildroot/package/jhead/0001-use-ldflags.patch +++ /dev/null @@ -1,16 +0,0 @@ -Make jhead use LDFLAGS for the final link. - -Signed-off-by: Gustavo Zacarias - -diff -Nura jhead-2.97.orig/makefile jhead-2.97/makefile ---- jhead-2.97.orig/makefile 2013-03-27 09:22:38.759966389 -0300 -+++ jhead-2.97/makefile 2013-03-27 09:25:06.290691745 -0300 -@@ -14,7 +14,7 @@ - ${CC} $(CFLAGS) -c $< -o $@ - - jhead: $(objs) jhead.h -- ${CC} -o jhead $(objs) -lm -+ ${CC} $(LDFLAGS) -o jhead $(objs) -lm - - clean: - rm -f $(objs) jhead diff --git a/buildroot/package/jhead/jhead.hash b/buildroot/package/jhead/jhead.hash index 55af7a724..ffe75381b 100644 --- a/buildroot/package/jhead/jhead.hash +++ b/buildroot/package/jhead/jhead.hash @@ -1,2 +1,3 @@ # Locally calculated from download (no sig, hash) -sha256 88cc01da018e242fe2e05db73f91b6288106858dd70f27506c4989a575d2895e jhead-3.00.tar.gz +sha256 ef89bbcf4f6c25ed88088cf242a47a6aedfff4f08cc7dc205bf3e2c0f10a03c9 jhead-3.04.tar.gz +sha256 46c870a208305489eea862ec8b05b030ba1f06d99195f660dc0ba541cc38d82b readme.txt diff --git a/buildroot/package/jhead/jhead.mk b/buildroot/package/jhead/jhead.mk index 8a99915ba..d56ee0daf 100644 --- a/buildroot/package/jhead/jhead.mk +++ b/buildroot/package/jhead/jhead.mk @@ -4,7 +4,7 @@ # ################################################################################ -JHEAD_VERSION = 3.00 +JHEAD_VERSION = 3.04 JHEAD_SITE = http://www.sentex.net/~mwandel/jhead JHEAD_LICENSE = Public Domain JHEAD_LICENSE_FILES = readme.txt diff --git a/buildroot/package/jimtcl/jimtcl.hash b/buildroot/package/jimtcl/jimtcl.hash index 223dbcf57..21d75c4f4 100644 --- a/buildroot/package/jimtcl/jimtcl.hash +++ b/buildroot/package/jimtcl/jimtcl.hash @@ -1,2 +1,3 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/j/jimtcl/jimtcl_0.75-1.dsc -sha256 432ad29b98f33efd018d9e1d49a5d07a5efc523c5660983733f7e30d9b2b76cb jimtcl_0.75.orig.tar.xz +# Locally computed +sha256 ab8204cd03b946f5149e1273af9c86d8e73b146084a0fbeb1d4f41a75b0b3411 jimtcl-0.79.tar.gz +sha256 419f1146334e57fb258d6c957d1f94d43455ec0d24b1b54c4447e5f61a353950 LICENSE diff --git a/buildroot/package/jimtcl/jimtcl.mk b/buildroot/package/jimtcl/jimtcl.mk index 389a72ab8..e712dff0b 100644 --- a/buildroot/package/jimtcl/jimtcl.mk +++ b/buildroot/package/jimtcl/jimtcl.mk @@ -4,9 +4,8 @@ # ################################################################################ -JIMTCL_VERSION = 0.75 -JIMTCL_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/j/jimtcl -JIMTCL_SOURCE = jimtcl_$(JIMTCL_VERSION).orig.tar.xz +JIMTCL_VERSION = 0.79 +JIMTCL_SITE = $(call github,msteveb,jimtcl,$(JIMTCL_VERSION)) JIMTCL_INSTALL_STAGING = YES JIMTCL_LICENSE = BSD-2-Clause JIMTCL_LICENSE_FILES = LICENSE @@ -43,6 +42,7 @@ endif # Buildroot, so update config.guess / config.sub like we do in # pkg-autotools.mk JIMTCL_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK +HOST_JIMTCL_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK # jimtcl really wants to find a existing $CXX, so feed it false # when we do not have one. @@ -79,4 +79,25 @@ define JIMTCL_INSTALL_TARGET_CMDS $(JIMTCL_LINK_TCLSH) endef +define HOST_JIMTCL_CONFIGURE_CMDS + cd $(@D) && \ + $(HOST_CONFIGURE_OPTS) \ + CCACHE=none \ + ./configure --prefix=$(HOST_DIR) --shared +endef + +define HOST_JIMTCL_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define HOST_JIMTCL_INSTALL_CMDS + for i in $(JIMTCL_HEADERS_TO_INSTALL); do \ + cp -a $(@D)/$$i $(HOST_DIR)/usr/include/ || exit 1 ; \ + done; + $(INSTALL) -m 0755 -D $(@D)/libjim.so.$(JIMTCL_VERSION) \ + $(HOST_DIR)/usr/lib/libjim.so.$(JIMTCL_VERSION) + ln -sf libjim.so.$(JIMTCL_VERSION) $(HOST_DIR)/usr/lib/libjim.so +endef + $(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/buildroot/package/jitterentropy-library/0001-Makefile-cleanup-install.patch b/buildroot/package/jitterentropy-library/0001-Makefile-cleanup-install.patch new file mode 100644 index 000000000..9c7e40369 --- /dev/null +++ b/buildroot/package/jitterentropy-library/0001-Makefile-cleanup-install.patch @@ -0,0 +1,54 @@ +From 060b9b4147f6e5ff386a8b017796118d783e59fa Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Tue, 22 Oct 2019 12:44:30 -0500 +Subject: [PATCH] Makefile: cleanup install for rebuilds + +Support the ability to rebuild and redeploy without a clean. This +required some force linking and man archive creation. + +Provide the ability to override the stripping of the shared lib for +cases where a embedded target build may want to control stripping +or provide cross arch tools. + +Signed-off-by: Matthew Weber +Signed-off-by: Stephan Mueller +[Retrieved from: +https://github.com/smuellerDD/jitterentropy-library/commit/060b9b4147f6e5ff386a8b017796118d783e59fa] +Signed-off-by: Fabrice Fontaine +--- + Makefile | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 4ff069b..2e78607 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,8 @@ LIBDIR := lib + # include target directory + INCDIR := include + ++INSTALL_STRIP ?= install -s ++ + NAME := jitterentropy + LIBMAJOR=$(shell cat jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}') + LIBMINOR=$(shell cat jitterentropy-base.c | grep define | grep MINVERSION | awk '{print $$3}') +@@ -58,15 +60,15 @@ cppcheck: + install: + install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 + install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ +- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 ++ gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 + install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) +- install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ ++ $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ + install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) + install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ + install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ + $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) +- ln -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) +- ln -s lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so ++ ln -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) ++ ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so + + clean: + @- $(RM) $(NAME) diff --git a/buildroot/package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch b/buildroot/package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch new file mode 100644 index 000000000..a331c9f33 --- /dev/null +++ b/buildroot/package/jitterentropy-library/0002-Makefile-add-additional-install-targets.patch @@ -0,0 +1,56 @@ +From d545d76cb3173cc98e1421604929248f2d882821 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Oct 2019 18:48:47 +0200 +Subject: [PATCH] Makefile: add additional install targets + +Add install-includes, install-man, install-shared and install-static +targets to allow the user to configure what must be installed + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://github.com/smuellerDD/jitterentropy-library/pull/11] +--- + Makefile | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 2e78607..41bc4f7 100644 +--- a/Makefile ++++ b/Makefile +@@ -57,19 +57,29 @@ scan: $(analyze_plists) + cppcheck: + cppcheck --force -q --enable=performance --enable=warning --enable=portability *.h *.c + +-install: ++install: install-man install-shared install-includes ++ ++install-man: + install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 + install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ + gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 ++ ++install-shared: + install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) + $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ +- install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) +- install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ +- install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ + $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) + ln -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) + ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so + ++install-includes: ++ install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) ++ install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ ++ install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ ++ ++install-static: ++ install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) ++ install -m 0755 lib$(NAME).a $(DESTDIR)$(PREFIX)/$(LIBDIR)/ ++ + clean: + @- $(RM) $(NAME) + @- $(RM) $(OBJS) +-- +2.23.0 + diff --git a/buildroot/package/jitterentropy-library/0003-Makefile-allow-the-user-to-disable-stack-protector.patch b/buildroot/package/jitterentropy-library/0003-Makefile-allow-the-user-to-disable-stack-protector.patch new file mode 100644 index 000000000..eeff0a0fe --- /dev/null +++ b/buildroot/package/jitterentropy-library/0003-Makefile-allow-the-user-to-disable-stack-protector.patch @@ -0,0 +1,36 @@ +From 37e8a6a7e5875e20a8de07fbfbb69912f1964f7d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 28 Oct 2019 09:47:49 +0100 +Subject: [PATCH] Makefile: allow the user to disable stack protector + +Allow the user to disable stack-protector by overriding CFLAGS as it is +not supported by all toolchains. + +Fixes: + - http://autobuild.buildroot.net/results/cba1ae830c7a4d1740098fe67aec59b4dc2f9a03 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/smuellerDD/jitterentropy-library/pull/12] +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 41bc4f7..b0f20e2 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,9 +1,9 @@ + # Compile Noise Source as user space application + + CC ?= gcc +-CFLAGS +=-Wextra -Wall -pedantic -fPIC -O0 + #Hardening +-CFLAGS +=-fstack-protector-all -fwrapv --param ssp-buffer-size=4 ++CFLAGS ?=-fstack-protector-all --param ssp-buffer-size=4 ++CFLAGS +=-Wextra -Wall -pedantic -fPIC -O0 -fwrapv + LDFLAGS +=-Wl,-z,relro,-z,now + + # Change as necessary +-- +2.23.0 + diff --git a/buildroot/package/jitterentropy-library/Config.in b/buildroot/package/jitterentropy-library/Config.in new file mode 100644 index 000000000..02f8ff616 --- /dev/null +++ b/buildroot/package/jitterentropy-library/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_JITTERENTROPY_LIBRARY + bool "libjitterentropy" + help + Hardware RNG based on CPU timing jitter. + + https://github.com/smuellerDD/jitterentropy-library diff --git a/buildroot/package/jitterentropy-library/jitterentropy-library.hash b/buildroot/package/jitterentropy-library/jitterentropy-library.hash new file mode 100644 index 000000000..5ff38f6fe --- /dev/null +++ b/buildroot/package/jitterentropy-library/jitterentropy-library.hash @@ -0,0 +1,5 @@ +# Locally computed +sha256 42d4bd1050b5f0d7b45b5453e5b6cfc45c0492bb428791f571d8f69b066351a4 jitterentropy-library-2.2.0.tar.gz +sha256 96b5a6b49aaeeba9036f9b80e6e299d613a8eca158741a25a67dc78792413e23 COPYING +sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.bsd +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING.gplv2 diff --git a/buildroot/package/jitterentropy-library/jitterentropy-library.mk b/buildroot/package/jitterentropy-library/jitterentropy-library.mk new file mode 100644 index 000000000..3db04b27d --- /dev/null +++ b/buildroot/package/jitterentropy-library/jitterentropy-library.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# jitterentropy-library +# +################################################################################ + +JITTERENTROPY_LIBRARY_VERSION = 2.2.0 +JITTERENTROPY_LIBRARY_SITE = $(call github,smuellerDD,$(JITTERENTROPY_LIBRARY_NAME),v$(JITTERENTROPY_LIBRARY_VERSION)) +JITTERENTROPY_LIBRARY_LICENSE = GPL-2.0 or BSD-3-Clause +JITTERENTROPY_LIBRARY_LICENSE_FILES = COPYING COPYING.bsd COPYING.gplv2 +JITTERENTROPY_LIBRARY_INSTALL_STAGING = YES +JITTERENTROPY_LIBRARY_INSTALL_TARGETS = install-includes + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy-static +JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-static +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +JITTERENTROPY_LIBRARY_BUILD_TARGETS += jitterentropy +JITTERENTROPY_LIBRARY_INSTALL_TARGETS += install-shared +endif + +define JITTERENTROPY_LIBRARY_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(JITTERENTROPY_LIBRARY_BUILD_TARGETS) +endef + +define JITTERENTROPY_LIBRARY_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) \ + INSTALL_STRIP="install" PREFIX=/usr \ + $(JITTERENTROPY_LIBRARY_INSTALL_TARGETS) +endef + +define JITTERENTROPY_LIBRARY_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \ + INSTALL_STRIP="install" PREFIX=/usr \ + $(JITTERENTROPY_LIBRARY_INSTALL_TARGETS) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/jo/jo.hash b/buildroot/package/jo/jo.hash index 736b0fb8f..8190a15e2 100644 --- a/buildroot/package/jo/jo.hash +++ b/buildroot/package/jo/jo.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 63ed4766c2e0fcb5391a14033930329369f437d7060a11d82874e57e278bda5f jo-1.1.tar.gz +sha256 de25c95671a3b392c6bcaba0b15d48eb8e2435508008c29477982d2d2f5ade64 jo-1.3.tar.gz +sha256 41d8b23dc6e76731f4920b9ce42d0d4a248d243a510319e2441d174a115f35cf COPYING diff --git a/buildroot/package/jo/jo.mk b/buildroot/package/jo/jo.mk index ad085b29f..5eb013245 100644 --- a/buildroot/package/jo/jo.mk +++ b/buildroot/package/jo/jo.mk @@ -4,8 +4,8 @@ # ################################################################################ -JO_VERSION = 1.1 -JO_SITE = https://github.com/jpmens/jo/releases/download/v$(JO_VERSION) +JO_VERSION = 1.3 +JO_SITE = https://github.com/jpmens/jo/releases/download/$(JO_VERSION) JO_LICENSE = MIT (json.[ch]), GPL-2.0+ (rest) JO_LICENSE_FILES = COPYING # don't build man pages diff --git a/buildroot/package/joe/joe.hash b/buildroot/package/joe/joe.hash index 0a9c1fb8d..1e2de4225 100644 --- a/buildroot/package/joe/joe.hash +++ b/buildroot/package/joe/joe.hash @@ -1,5 +1,6 @@ -# From https://sourceforge.net/projects/joe-editor/files/JOE%20sources/joe-4.4/ -sha1 aedf1ac9e6b91053aa26c70e7bba5bbd8136f033 joe-4.4.tar.gz -md5 59e63debe60b456a6ee5c0c27a756a47 joe-4.4.tar.gz +# From https://sourceforge.net/projects/joe-editor/files/JOE%20sources/joe-4.6/ +sha1 da7712333f676cfb5ae9f3565fd2225c5a2185ca joe-4.6.tar.gz +md5 9017484e6116830d846678b625ea5c43 joe-4.6.tar.gz # Locally computed: -sha256 a5704828bbca29acb9e200414fef522c66cdf9ce28150f402d6767da43460979 joe-4.4.tar.gz +sha256 495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de joe-4.6.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/joe/joe.mk b/buildroot/package/joe/joe.mk index 3aef8e4c8..f0cac402e 100644 --- a/buildroot/package/joe/joe.mk +++ b/buildroot/package/joe/joe.mk @@ -4,7 +4,7 @@ # ################################################################################ -JOE_VERSION = 4.4 +JOE_VERSION = 4.6 JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION) JOE_LICENSE = GPL-2.0+ JOE_LICENSE_FILES = COPYING diff --git a/buildroot/package/jpeg-turbo/jpeg-turbo.hash b/buildroot/package/jpeg-turbo/jpeg-turbo.hash index ea6060f2b..874f04fc8 100644 --- a/buildroot/package/jpeg-turbo/jpeg-turbo.hash +++ b/buildroot/package/jpeg-turbo/jpeg-turbo.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.3/ -sha1 539363a444f92421c098a1a3e7cebfda48d4cfb3 libjpeg-turbo-2.0.3.tar.gz -md5 bd07fddf26f9def7bab02739eb655116 libjpeg-turbo-2.0.3.tar.gz +# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.4/ +sha1 163d8f96d0999526a117de0388624241b54dcd67 libjpeg-turbo-2.0.4.tar.gz +md5 d01d9e0c28c27bc0de9f4e2e8ff49855 libjpeg-turbo-2.0.4.tar.gz # Locally computed -sha256 4246de500544d4ee408ee57048aa4aadc6f165fc17f141da87669f20ed3241b7 libjpeg-turbo-2.0.3.tar.gz +sha256 33dd8547efd5543639e890efbf2ef52d5a21df81faf41bb940657af916a23406 libjpeg-turbo-2.0.4.tar.gz sha256 69e570a251515ced17d4492256d57c89db77ed949652f88a44c80c1ca9607920 LICENSE.md sha256 82fece2bff2669c476495f0fe70096b154e8bc5b40916a64e99836d9a01c3110 README.ijg diff --git a/buildroot/package/jpeg-turbo/jpeg-turbo.mk b/buildroot/package/jpeg-turbo/jpeg-turbo.mk index 0c75cf1db..126b47063 100644 --- a/buildroot/package/jpeg-turbo/jpeg-turbo.mk +++ b/buildroot/package/jpeg-turbo/jpeg-turbo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JPEG_TURBO_VERSION = 2.0.3 +JPEG_TURBO_VERSION = 2.0.4 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) @@ -31,6 +31,16 @@ else JPEG_TURBO_CONF_OPTS += -DWITH_SIMD=OFF endif +# Ensure that jpeg-turbo is compiled with -fPIC to allow linking the static +# libraries with dynamically linked programs. This is not a requirement +# for most architectures but is mandatory for ARM. +# This allow to avoid link issues with BR2_SSP_ALL: +# jsimd_none.c.o: relocation R_AARCH64_ADR_PREL_PG_HI21 against external symbol `__stack_chk_guard@@GLIBC_2.17' +# can not be used when making a shared object; recompile with -fPIC +ifeq ($(BR2_STATIC_LIBS),) +JPEG_TURBO_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON +endif + define JPEG_TURBO_REMOVE_USELESS_TOOLS rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) endef diff --git a/buildroot/package/jpeg/Config.in b/buildroot/package/jpeg/Config.in index a4a63cc7d..3d0fea83b 100644 --- a/buildroot/package/jpeg/Config.in +++ b/buildroot/package/jpeg/Config.in @@ -38,6 +38,9 @@ config BR2_PACKAGE_JPEG_TURBO http://www.libjpeg-turbo.org +# libjpeg from br2-external trees, if any +source "$BR2_BASE_DIR/.br2-external.in.jpeg" + endchoice config BR2_PACKAGE_HAS_JPEG diff --git a/buildroot/package/jq/jq.hash b/buildroot/package/jq/jq.hash index 449619b02..2cddda32c 100644 --- a/buildroot/package/jq/jq.hash +++ b/buildroot/package/jq/jq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72 jq-1.6.tar.gz +sha256 3002cf80d871728562989b4a47d90a7301fe049a4e1d69836b99108f198dac06 jq-a97638713ad30653d424f136018098c4b0e5c71b.tar.gz sha256 111136aebcbfa68b6b0084e582b30e981da76adcff84eab6f9be32a1f38c5bf1 COPYING diff --git a/buildroot/package/jq/jq.mk b/buildroot/package/jq/jq.mk index aebe8c86e..3d2230653 100644 --- a/buildroot/package/jq/jq.mk +++ b/buildroot/package/jq/jq.mk @@ -4,12 +4,15 @@ # ################################################################################ -JQ_VERSION = 1.6 -JQ_SITE = https://github.com/stedolan/jq/releases/download/jq-$(JQ_VERSION) +JQ_VERSION = a97638713ad30653d424f136018098c4b0e5c71b +JQ_SITE = $(call github,stedolan,jq,$(JQ_VERSION)) JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation) JQ_LICENSE_FILES = COPYING JQ_INSTALL_STAGING = YES +# currently using git version directly +JQ_AUTORECONF = YES + # uses c99 specific features # _GNU_SOURCE added to fix gcc6+ host compilation # (https://github.com/stedolan/jq/issues/1598) @@ -17,8 +20,15 @@ JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_GNU_SOURCE" HOST_JQ_CONF_ENV += CFLAGS="$(HOST_CFLAGS) -std=c99 -D_GNU_SOURCE" # jq explicitly enables maintainer mode, which we don't need/want -JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma +JQ_CONF_OPTS += --disable-maintainer-mode HOST_JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma +ifeq ($(BR2_PACKAGE_ONIGURUMA),y) +JQ_DEPENDENCIES += oniguruma +JQ_CONF_OPTS += --with-oniguruma +else +JQ_CONF_OPTS += --without-oniguruma +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/jquery-datetimepicker/jquery-datetimepicker.hash b/buildroot/package/jquery-datetimepicker/jquery-datetimepicker.hash index b6aba8792..1fbd428e7 100644 --- a/buildroot/package/jquery-datetimepicker/jquery-datetimepicker.hash +++ b/buildroot/package/jquery-datetimepicker/jquery-datetimepicker.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 2f362a8acd149d1487a9460942f135d1037f01ee0cbfecba8c352fa2f79c34c9 jquery-datetimepicker-2.4.5.tar.gz +sha256 2f362a8acd149d1487a9460942f135d1037f01ee0cbfecba8c352fa2f79c34c9 jquery-datetimepicker-2.4.5.tar.gz +sha256 491add640b4678b78571d3b4c0840422b48a5b397e47e2104c1942ff1fce1a68 MIT-LICENSE.txt diff --git a/buildroot/package/jquery-keyboard/jquery-keyboard.hash b/buildroot/package/jquery-keyboard/jquery-keyboard.hash index 7502867c8..a0d9d7d88 100644 --- a/buildroot/package/jquery-keyboard/jquery-keyboard.hash +++ b/buildroot/package/jquery-keyboard/jquery-keyboard.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 6a20a1cdc9367c218048125eeb6f78d775175a964b3b9b781a931b63c0f98c66 jquery-keyboard-v1.18.12.tar.gz +sha256 6a20a1cdc9367c218048125eeb6f78d775175a964b3b9b781a931b63c0f98c66 jquery-keyboard-1.18.12.tar.gz +sha256 0ad9a0e7291b45cdb5abe2a517d8b82282a816d41c9224660849792ce01fe983 README.markdown diff --git a/buildroot/package/jquery-keyboard/jquery-keyboard.mk b/buildroot/package/jquery-keyboard/jquery-keyboard.mk index a1320dc97..5066aa2c6 100644 --- a/buildroot/package/jquery-keyboard/jquery-keyboard.mk +++ b/buildroot/package/jquery-keyboard/jquery-keyboard.mk @@ -4,8 +4,8 @@ # ################################################################################ -JQUERY_KEYBOARD_VERSION = v1.18.12 -JQUERY_KEYBOARD_SITE = $(call github,Mottie,Keyboard,$(JQUERY_KEYBOARD_VERSION)) +JQUERY_KEYBOARD_VERSION = 1.18.12 +JQUERY_KEYBOARD_SITE = $(call github,Mottie,Keyboard,v$(JQUERY_KEYBOARD_VERSION)) JQUERY_KEYBOARD_LICENSE = MIT WTFPL JQUERY_KEYBOARD_LICENSE_FILES = README.markdown diff --git a/buildroot/package/jquery-sidebar/jquery-sidebar.hash b/buildroot/package/jquery-sidebar/jquery-sidebar.hash index 60e44d418..5d336fee2 100644 --- a/buildroot/package/jquery-sidebar/jquery-sidebar.hash +++ b/buildroot/package/jquery-sidebar/jquery-sidebar.hash @@ -1,2 +1,3 @@ # Locally computed sha256 c96e46439a87555f2200442f597cce64f21f81f94d7601ddfc3b837913ddb42f jquery-sidebar-3.3.2.tar.gz +sha256 f3522370f4b6accf9c1344f520bdea35f2388f1cbb124c0c179d2ca2a6a94c76 LICENSE diff --git a/buildroot/package/jquery-ui-themes/jquery-ui-themes.hash b/buildroot/package/jquery-ui-themes/jquery-ui-themes.hash index 5441789b9..5f662dad5 100644 --- a/buildroot/package/jquery-ui-themes/jquery-ui-themes.hash +++ b/buildroot/package/jquery-ui-themes/jquery-ui-themes.hash @@ -1,2 +1,3 @@ # locally computed sha256 90467a83abcb8d2471b0d53d21b4c09e2cf686d5350e10a6e84fa3f3616a840f jquery-ui-themes-1.10.4.zip +sha256 ef1fdd608b20fbea7ef269ed03bd24e637717cc193971798a394bf2fa983cd53 MIT-LICENSE.txt diff --git a/buildroot/package/jquery-ui/jquery-ui.hash b/buildroot/package/jquery-ui/jquery-ui.hash index daf89d095..453ecd552 100644 --- a/buildroot/package/jquery-ui/jquery-ui.hash +++ b/buildroot/package/jquery-ui/jquery-ui.hash @@ -1,2 +1,3 @@ # locally computed sha256 c76f349930245360f4d1dea672b9a587f8938b536a378e20eeff919f7263f99f jquery-ui-1.10.4.zip +sha256 ef1fdd608b20fbea7ef269ed03bd24e637717cc193971798a394bf2fa983cd53 MIT-LICENSE.txt diff --git a/buildroot/package/jquery-validation/jquery-validation.hash b/buildroot/package/jquery-validation/jquery-validation.hash index 61c16cf09..af451a6c1 100644 --- a/buildroot/package/jquery-validation/jquery-validation.hash +++ b/buildroot/package/jquery-validation/jquery-validation.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 14efe6f1784ef6e97116b15c77b04b7e8f47ec07b1479bcd6fa0b081faa19440 jquery-validation-1.14.0.zip +sha256 14efe6f1784ef6e97116b15c77b04b7e8f47ec07b1479bcd6fa0b081faa19440 jquery-validation-1.14.0.zip +sha256 c2f9aa180de990ff16ca7e756c9af52ecc1b3536e3fb32649d7b2c510bccf9d0 README.md diff --git a/buildroot/package/jsmin/jsmin.hash b/buildroot/package/jsmin/jsmin.hash index 6080f109d..c16097851 100644 --- a/buildroot/package/jsmin/jsmin.hash +++ b/buildroot/package/jsmin/jsmin.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 aae127bf7291a7b2592f36599e5ed6c6423eac7abe0cd5992f82d6d46fe9ed2d jsmin-1bf6ce5f74a9f8752ac7f5d115b8d7ccb31cfe1b.tar.gz +sha256 b420f61778af09534adc836a5086f5625b8499124051c50baefa218e7c03a58c jsmin.c diff --git a/buildroot/package/jsmn/jsmn.hash b/buildroot/package/jsmn/jsmn.hash index 91f64201e..b5a78f6eb 100644 --- a/buildroot/package/jsmn/jsmn.hash +++ b/buildroot/package/jsmn/jsmn.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 e08993848b2abab62aa9572a560bb6e5ed4762f8537cd67c4de6cb17e17090a0 jsmn-6021415cc75e7922d45b12935f56348b064d8a7f.tar.gz +sha256 5f0913a10657fe7ec8d5794ccf00a01000e3e1f2f1e1f143c34a0f7b47edcb38 jsmn-1.1.0.tar.gz +sha256 4675b94a50d2afe811c52785463c854f1156056632cce17cc7133939eac8ed55 LICENSE diff --git a/buildroot/package/jsmn/jsmn.mk b/buildroot/package/jsmn/jsmn.mk index c98f2798e..750e8cf82 100644 --- a/buildroot/package/jsmn/jsmn.mk +++ b/buildroot/package/jsmn/jsmn.mk @@ -4,20 +4,15 @@ # ################################################################################ -JSMN_VERSION = 6021415cc75e7922d45b12935f56348b064d8a7f -JSMN_SITE = $(call github,zserge,jsmn,$(JSMN_VERSION)) +JSMN_VERSION = 1.1.0 +JSMN_SITE = $(call github,zserge,jsmn,v$(JSMN_VERSION)) JSMN_LICENSE = MIT JSMN_LICENSE_FILES = LICENSE -# static library only +# single-header, header-only library JSMN_INSTALL_STAGING = YES JSMN_INSTALL_TARGET = NO -define JSMN_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - define JSMN_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0644 $(@D)/libjsmn.a $(STAGING_DIR)/usr/lib/libjsmn.a $(INSTALL) -D -m 0644 $(@D)/jsmn.h $(STAGING_DIR)/usr/include/jsmn.h endef diff --git a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash index cff01db74..c67cd3755 100644 --- a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e0b1fc6cc6ca05706cce99118a87aca5248bd9db3113e703023d23f044995c1d json-v3.5.0.tar.gz -sha256 7b875bb7a4e28abb7956ea821b4b7d88ff6a2a4fabf261c3993730a365ec56dd LICENSE.MIT +sha256 249548f4867417d66ae46b338dfe0a2805f3323e81c9e9b83c89f3adbfde6f31 json-3.7.3.tar.gz +sha256 7400586ce89c6a2cc65f6ca46997da5d356a230673d3a211e040b783f23578a1 LICENSE.MIT diff --git a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk index 86399fd60..e6f1df96f 100644 --- a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,9 +4,9 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = v3.5.0 +JSON_FOR_MODERN_CPP_VERSION = 3.7.3 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz -JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,$(JSON_FOR_MODERN_CPP_VERSION)) +JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT JSON_FOR_MODERN_CPP_LICENSE_FILES = LICENSE.MIT JSON_FOR_MODERN_CPP_INSTALL_STAGING = YES diff --git a/buildroot/package/json-glib/json-glib.hash b/buildroot/package/json-glib/json-glib.hash index fae4df36d..b68794db3 100644 --- a/buildroot/package/json-glib/json-glib.hash +++ b/buildroot/package/json-glib/json-glib.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.4/json-glib-1.4.2.sha256sum -sha256 2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8 json-glib-1.4.2.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.4/json-glib-1.4.4.sha256sum +sha256 720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47 json-glib-1.4.4.tar.xz # Hash for license file: sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/buildroot/package/json-glib/json-glib.mk b/buildroot/package/json-glib/json-glib.mk index 5c1fca3fd..7405b28b2 100644 --- a/buildroot/package/json-glib/json-glib.mk +++ b/buildroot/package/json-glib/json-glib.mk @@ -5,7 +5,7 @@ ################################################################################ JSON_GLIB_VERSION_MAJOR = 1.4 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).2 +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).4 JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz JSON_GLIB_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/json-javascript/json-javascript.hash b/buildroot/package/json-javascript/json-javascript.hash index 6216445ce..9522fee9e 100644 --- a/buildroot/package/json-javascript/json-javascript.hash +++ b/buildroot/package/json-javascript/json-javascript.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1a9dd4429e4bb4929dcb438f9591a3625bc8cc161f840b5f843d8b1d2c8dcfe5 json-javascript-3d7767b6b1f3da363c625ff54e63bbf20e9e83ac.tar.gz +sha256 1a9dd4429e4bb4929dcb438f9591a3625bc8cc161f840b5f843d8b1d2c8dcfe5 json-javascript-3d7767b6b1f3da363c625ff54e63bbf20e9e83ac.tar.gz +sha256 925947d3d711c4441a9db20f51215fbf5c119d2a3b51cadb2c9031907d8014b5 json2.js diff --git a/buildroot/package/jsoncpp/0001-Meson-updates.patch b/buildroot/package/jsoncpp/0001-Meson-updates.patch new file mode 100644 index 000000000..8a44c5b03 --- /dev/null +++ b/buildroot/package/jsoncpp/0001-Meson-updates.patch @@ -0,0 +1,147 @@ +From 6bc55ec35d02931960ec1f5768fc9c56ab62ef66 Mon Sep 17 00:00:00 2001 +From: David Seifert <16636962+SoapGentoo@users.noreply.github.com> +Date: Tue, 7 Jan 2020 02:23:50 +0100 +Subject: [PATCH] Meson updates (#1124) + +* Modernize meson.build + +* Make tests optional +* Use `files()` for quick sanity checks + +* Bump version to 1.9.3 + +* Bump SOVERSION, as some functions were removed + and structs were changed, as determined by + libabigail. + +[Retrieved from: +https://github.com/open-source-parsers/jsoncpp/commit/6bc55ec35d02931960ec1f5768fc9c56ab62ef66] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 2 +- + include/json/version.h | 4 ++-- + meson.build | 33 ++++++++++++++++++--------------- + meson_options.txt | 5 +++++ + 4 files changed, 26 insertions(+), 18 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4e063317..c05ddccb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,7 +70,7 @@ project(JSONCPP + # 2. /include/json/version.h + # 3. /CMakeLists.txt + # IMPORTANT: also update the SOVERSION!! +- VERSION 1.9.2 # [.[.[.]]] ++ VERSION 1.9.3 # [.[.[.]]] + LANGUAGES CXX) + + message(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}") +diff --git a/include/json/version.h b/include/json/version.h +index ff94372b..0f298341 100644 +--- a/include/json/version.h ++++ b/include/json/version.h +@@ -9,10 +9,10 @@ + // 3. /CMakeLists.txt + // IMPORTANT: also update the SOVERSION!! + +-#define JSONCPP_VERSION_STRING "1.9.2" ++#define JSONCPP_VERSION_STRING "1.9.3" + #define JSONCPP_VERSION_MAJOR 1 + #define JSONCPP_VERSION_MINOR 9 +-#define JSONCPP_VERSION_PATCH 2 ++#define JSONCPP_VERSION_PATCH 3 + #define JSONCPP_VERSION_QUALIFIER + #define JSONCPP_VERSION_HEXA \ + ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | \ +diff --git a/meson.build b/meson.build +index 1bc94a8a..c2932030 100644 +--- a/meson.build ++++ b/meson.build +@@ -9,7 +9,7 @@ project( + # 2. /include/json/version.h + # 3. /CMakeLists.txt + # IMPORTANT: also update the SOVERSION!! +- version : '1.9.2', ++ version : '1.9.3', + default_options : [ + 'buildtype=release', + 'cpp_std=c++11', +@@ -18,7 +18,7 @@ project( + meson_version : '>= 0.49.0') + + +-jsoncpp_headers = [ ++jsoncpp_headers = files([ + 'include/json/allocator.h', + 'include/json/assertions.h', + 'include/json/config.h', +@@ -28,7 +28,8 @@ jsoncpp_headers = [ + 'include/json/reader.h', + 'include/json/value.h', + 'include/json/version.h', +- 'include/json/writer.h'] ++ 'include/json/writer.h', ++]) + jsoncpp_include_directories = include_directories('include') + + install_headers( +@@ -44,13 +45,12 @@ else + endif + + jsoncpp_lib = library( +- 'jsoncpp', +- [ jsoncpp_headers, +- 'src/lib_json/json_tool.h', ++ 'jsoncpp', files([ + 'src/lib_json/json_reader.cpp', + 'src/lib_json/json_value.cpp', +- 'src/lib_json/json_writer.cpp'], +- soversion : 22, ++ 'src/lib_json/json_writer.cpp', ++ ]), ++ soversion : 23, + install : true, + include_directories : jsoncpp_include_directories, + cpp_args: dll_export_flag) +@@ -66,18 +66,21 @@ import('pkgconfig').generate( + jsoncpp_dep = declare_dependency( + include_directories : jsoncpp_include_directories, + link_with : jsoncpp_lib, +- version : meson.project_version(), +- ) ++ version : meson.project_version()) + + # tests +-python = import('python').find_installation() ++if meson.is_subproject() or not get_option('tests') ++ subdir_done() ++endif ++ ++python = import('python').find_installation('python3') + + jsoncpp_test = executable( +- 'jsoncpp_test', +- [ 'src/test_lib_json/jsontest.cpp', +- 'src/test_lib_json/jsontest.h', ++ 'jsoncpp_test', files([ ++ 'src/test_lib_json/jsontest.cpp', + 'src/test_lib_json/main.cpp', +- 'src/test_lib_json/fuzz.cpp'], ++ 'src/test_lib_json/fuzz.cpp', ++ ]), + include_directories : jsoncpp_include_directories, + link_with : jsoncpp_lib, + install : false, +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 00000000..9c215ae6 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1,5 @@ ++option( ++ 'tests', ++ type : 'boolean', ++ value : true, ++ description : 'Enable building tests') diff --git a/buildroot/package/jsoncpp/jsoncpp.hash b/buildroot/package/jsoncpp/jsoncpp.hash index 3391d9ecc..100016761 100644 --- a/buildroot/package/jsoncpp/jsoncpp.hash +++ b/buildroot/package/jsoncpp/jsoncpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6 jsoncpp-1.8.4.tar.gz +sha256 77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0 jsoncpp-1.9.2.tar.gz sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a LICENSE diff --git a/buildroot/package/jsoncpp/jsoncpp.mk b/buildroot/package/jsoncpp/jsoncpp.mk index 2b527fc30..f9761d4a6 100644 --- a/buildroot/package/jsoncpp/jsoncpp.mk +++ b/buildroot/package/jsoncpp/jsoncpp.mk @@ -4,21 +4,11 @@ # ################################################################################ -JSONCPP_VERSION = 1.8.4 +JSONCPP_VERSION = 1.9.2 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE JSONCPP_INSTALL_STAGING = YES +JSONCPP_CONF_OPTS = -Dtests=false -JSONCPP_CONF_OPTS += \ - -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \ - -DJSONCPP_WITH_TESTS=OFF \ - -DJSONCPP_WITH_STRICT_ISO=OFF - -ifeq ($(BR2_SHARED_LIBS),y) -JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -else -JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -endif - -$(eval $(cmake-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/kbd/kbd.hash b/buildroot/package/kbd/kbd.hash index 3fed6ace0..cf29c5986 100644 --- a/buildroot/package/kbd/kbd.hash +++ b/buildroot/package/kbd/kbd.hash @@ -1,2 +1,3 @@ # From https://www.kernel.org/pub/linux/utils/kbd/sha256sums.asc -sha256 5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88 kbd-2.0.4.tar.xz +sha256 5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88 kbd-2.0.4.tar.xz +sha256 8682bd7a7fe88bad31bf94ee9795c73fd4bc27bfcd50fb135f36dd8762c52035 COPYING diff --git a/buildroot/package/keepalived/0001-Ensure-that-lm-linker-library-flag-is-always-set.patch b/buildroot/package/keepalived/0001-Ensure-that-lm-linker-library-flag-is-always-set.patch new file mode 100644 index 000000000..3c6bc72a2 --- /dev/null +++ b/buildroot/package/keepalived/0001-Ensure-that-lm-linker-library-flag-is-always-set.patch @@ -0,0 +1,62 @@ +From dea6cfba122439b29cdcb833a59868dd51a4eae4 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Mon, 13 May 2019 14:25:26 +0100 +Subject: [PATCH] Ensure that -lm linker library flag is always set + +configure was testing whether it was necessary to add the -lm option, +but for some reason gcc adds it itself if -Os is not specified, but +does not add it if -Os is specified. Consequently if configure was +run without -Os, and make was run with -Os the link failed. + +The commit ensures that -lm is always used. + +Signed-off-by: Quentin Armitage +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/acassen/keepalived/commit/dea6cfba122439b29cdcb833a59868dd51a4eae4] +--- + configure.ac | 24 +++--------------------- + 1 file changed, 3 insertions(+), 21 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5023900f4..ae420d5a6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -340,6 +340,9 @@ WARNINGS_EXTRA="aggregate-return conversion padded pedantic sign-conversion stri + # We want _GNU_SOURCE defined always + add_to_var([CFLAGS], [-D_GNU_SOURCE]) + ++# fpclassify() needs -lm ++add_to_var([KA_LIBS], [-lm]) ++ + # Some sanity checks on configure options + AS_IF([test .$enable_vrrp = .no], + [ +@@ -779,27 +782,6 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([[ + LDFLAGS=$SAV_LDFLAGS + ]) + +-# Check if fpclassify() requires -lm +-CFLAGS= +-LDFLAGS= +-AC_MSG_CHECKING([whether fpclassify() requires -lm]) +-AC_LINK_IFELSE([AC_LANG_SOURCE([[ +- # include +- int main(int argc, char **argv) +- { +- double zero = 0.0; +- if (fpclassify(zero) == FP_ZERO) +- return 0; +- return 1; +- } +- ]])], +- AC_MSG_RESULT([no]), +- AC_MSG_RESULT([yes]) +- add_to_var([KA_LIBS], [-lm]) +- ) +-CFLAGS=$SAV_CFLAGS +-LDFLAGS=$SAV_LDFLAGS +- + # Checks for header files. + AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/prctl.h sys/socket.h sys/time.h syslog.h unistd.h], + [], [AC_MSG_ERROR([Missing/unusable system header file <$ac_header>])]) diff --git a/buildroot/package/keepalived/0001-Rename-TIMER_MAX-to-TIMER_MAXIMUM.patch b/buildroot/package/keepalived/0001-Rename-TIMER_MAX-to-TIMER_MAXIMUM.patch deleted file mode 100644 index 4402b48a8..000000000 --- a/buildroot/package/keepalived/0001-Rename-TIMER_MAX-to-TIMER_MAXIMUM.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 7d4856e213f349bcd97b3644b01d6170b226de16 Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Tue, 20 Nov 2018 17:24:58 +0000 -Subject: [PATCH] Rename TIMER_MAX to TIMER_MAXIMUM - -ulibC defines TIMER_MAX, so to avoid naming conflict rename it. - -This issue was reported by Paul Gildea who also -provided the patch. - -Signed-off-by: Quentin Armitage -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/acassen/keepalived/commit/7d4856e213f349bcd97b3644b01d6170b226de16] ---- - lib/parser.c | 8 ++++---- - lib/parser.h | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/parser.c b/lib/parser.c -index 1d53595c0..cc9b644e2 100644 ---- a/lib/parser.c -+++ b/lib/parser.c -@@ -1915,20 +1915,20 @@ read_timer(vector_t *strvec, size_t index, unsigned long *res, unsigned long min - #endif - - if (!max_time) -- max_time = TIMER_MAX; -+ max_time = TIMER_MAXIMUM; - - errno = 0; - timer = strtoul(vector_slot(strvec, index), &endptr, 10); -- *res = (timer > TIMER_MAX ? TIMER_MAX : timer) * TIMER_HZ; -+ *res = (timer > TIMER_MAXIMUM ? TIMER_MAXIMUM : timer) * TIMER_HZ; - - if (FMT_STR_VSLOT(strvec, index)[0] == '-') - report_config_error(CONFIG_INVALID_NUMBER, "%snegative number '%s'", warn, FMT_STR_VSLOT(strvec, index)); - else if (*endptr) - report_config_error(CONFIG_INVALID_NUMBER, "%sinvalid number '%s'", warn, FMT_STR_VSLOT(strvec, index)); -- else if (errno == ERANGE || timer > TIMER_MAX) -+ else if (errno == ERANGE || timer > TIMER_MAXIMUM) - report_config_error(CONFIG_INVALID_NUMBER, "%snumber '%s' outside timer range", warn, FMT_STR_VSLOT(strvec, index)); - else if (timer < min_time || timer > max_time) -- report_config_error(CONFIG_INVALID_NUMBER, "number '%s' outside range [%ld, %ld]", FMT_STR_VSLOT(strvec, index), min_time, max_time ? max_time : TIMER_MAX); -+ report_config_error(CONFIG_INVALID_NUMBER, "number '%s' outside range [%ld, %ld]", FMT_STR_VSLOT(strvec, index), min_time, max_time ? max_time : TIMER_MAXIMUM); - else - return true; - -diff --git a/lib/parser.h b/lib/parser.h -index 88a74474a..291aa8ffe 100644 ---- a/lib/parser.h -+++ b/lib/parser.h -@@ -38,7 +38,7 @@ - #define MAXBUF 1024 - - /* Maximum time read_timer can return */ --#define TIMER_MAX (ULONG_MAX / TIMER_HZ) -+#define TIMER_MAXIMUM (ULONG_MAX / TIMER_HZ) - - /* Configuration test errors. These should be in decreasing order of severity */ - typedef enum { diff --git a/buildroot/package/keepalived/0002-Fix-order-of-include-files-in-configure-COLLISION-test.patch b/buildroot/package/keepalived/0002-Fix-order-of-include-files-in-configure-COLLISION-test.patch deleted file mode 100644 index 76c88a76b..000000000 --- a/buildroot/package/keepalived/0002-Fix-order-of-include-files-in-configure-COLLISION-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e4dd33f16fe56d09c8d59d1254a4ed1d8e9bb29c Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Thu, 6 Dec 2018 12:16:08 +0000 -Subject: [PATCH] Fix order of include files in configure COLLISION test - -Since Linux 4.4.11 (commit 1575c09) including linux/if.h after -net/if.h works, whereas until glibc fix their headers including -net/if.h after linux/if.h causes compiler redefinition errors. - -Unfortunately the test for the collision was done the wrong way -round, as identified in issue #1079. The patch included in the -issue report corrects the order of inclusion of the header files. - -What we should do is ensure that glibc header files are included -before Linux header files, so that at least if kernel headers from -4.4.11 onwards are used, the conflict will not occur. - -Signed-off-by: Quentin Armitage -Signed-off-by: Fabrice Fontaine -[Retrieved from: https://github.com/acassen/keepalived/commit/e4dd33f16fe56d09c8d59d1254a4ed1d8e9bb29c] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7a2e8ce1..9badcc62 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1349,8 +1349,8 @@ AC_MSG_CHECKING([for linux/if.h and net/if.h namespace collision]) - SAV_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $kernelinc" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -- #include - #include -+ #include - ]])], - [ - AC_MSG_RESULT([no]) diff --git a/buildroot/package/keepalived/keepalived.hash b/buildroot/package/keepalived/keepalived.hash index 3ad3e6e6a..091821467 100644 --- a/buildroot/package/keepalived/keepalived.hash +++ b/buildroot/package/keepalived/keepalived.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 40e0e55afed9ca313d621a9c5878579696fafb5504dab521aadaf20ba6e7f597 keepalived-2.0.10.tar.gz +sha256 933ee01bc6346aa573453b998f87510d3cce4aba4537c9642b24e6dbfba5c6f4 keepalived-2.0.15.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/keepalived/keepalived.mk b/buildroot/package/keepalived/keepalived.mk index 4f6db0172..02c5a0cf3 100644 --- a/buildroot/package/keepalived/keepalived.mk +++ b/buildroot/package/keepalived/keepalived.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEEPALIVED_VERSION = 2.0.10 +KEEPALIVED_VERSION = 2.0.15 KEEPALIVED_SITE = http://www.keepalived.org/software KEEPALIVED_DEPENDENCIES = host-pkgconf openssl KEEPALIVED_LICENSE = GPL-2.0+ @@ -48,4 +48,11 @@ else KEEPALIVED_CONF_OPTS += --disable-libiptc endif +ifeq ($(BR2_PACKAGE_LIBNFTNL),y) +KEEPALIVED_DEPENDENCIES += libnftnl +KEEPALIVED_CONF_OPTS += --enable-nftables +else +KEEPALIVED_CONF_OPTS += --disable-nftables +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/kexec-lite/kexec-lite.hash b/buildroot/package/kexec-lite/kexec-lite.hash index d71e8d00a..01008236a 100644 --- a/buildroot/package/kexec-lite/kexec-lite.hash +++ b/buildroot/package/kexec-lite/kexec-lite.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 2e9b131324cec9d27840179daa35e3159a4032ff78b74e301850faa007567d0e kexec-lite-87d044a895b1c004320a2676099a54a5a2a74f2e.tar.gz +sha256 6eb115c8db3a071b970d7ba985ea5e2425e1e716952186f9a4fe329a2e2bb1ca kexec-lite-18ec88310c4134eca2f9e3c417cd09f5914bf633.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/kexec-lite/kexec-lite.mk b/buildroot/package/kexec-lite/kexec-lite.mk index 8e1ad8d52..e44c6df8f 100644 --- a/buildroot/package/kexec-lite/kexec-lite.mk +++ b/buildroot/package/kexec-lite/kexec-lite.mk @@ -4,18 +4,11 @@ # ################################################################################ -KEXEC_LITE_VERSION = 87d044a895b1c004320a2676099a54a5a2a74f2e +KEXEC_LITE_VERSION = 18ec88310c4134eca2f9e3c417cd09f5914bf633 KEXEC_LITE_SITE = $(call github,antonblanchard,kexec-lite,$(KEXEC_LITE_VERSION)) KEXEC_LITE_LICENSE = GPL-2.0+ KEXEC_LITE_LICENSE_FILES = COPYING KEXEC_LITE_DEPENDENCIES = elfutils dtc +KEXEC_LITE_AUTORECONF = YES -define KEXEC_LITE_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all -endef - -define KEXEC_LITE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/kexec $(TARGET_DIR)/usr/sbin/kexec -endef - -$(eval $(generic-package)) +$(eval $(autotools-package)) diff --git a/buildroot/package/keyutils/Config.in b/buildroot/package/keyutils/Config.in index 6f0758f47..7813de379 100644 --- a/buildroot/package/keyutils/Config.in +++ b/buildroot/package/keyutils/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KEYUTILS bool "keyutils" - depends on !BR2_microblaze depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # dlopen help @@ -10,6 +9,5 @@ config BR2_PACKAGE_KEYUTILS http://people.redhat.com/~dhowells/keyutils/ comment "keyutils needs a toolchain w/ dynamic library" - depends on !BR2_microblaze depends on BR2_USE_MMU depends on BR2_STATIC_LIBS diff --git a/buildroot/package/kismet/kismet.hash b/buildroot/package/kismet/kismet.hash index 913dffc9d..30780b1cc 100644 --- a/buildroot/package/kismet/kismet.hash +++ b/buildroot/package/kismet/kismet.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237 kismet-2016-07-R1.tar.xz +sha256 bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237 kismet-2016-07-R1.tar.xz +sha256 92b9eae679d8efbcd7514f7ff1346e4c1d42d272cd10bcb724d1511d35e28cd1 debian/copyright diff --git a/buildroot/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch b/buildroot/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch new file mode 100644 index 000000000..3be40d499 --- /dev/null +++ b/buildroot/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch @@ -0,0 +1,75 @@ +From 55a0a0aac503f5012ff2df7af37107544c757f19 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 22 Oct 2019 09:56:32 +0200 +Subject: [PATCH kmod] Do not check for undefined symbols when building the + Python modules + +kmod's configure.ac uses the -Wl,--no-undefined linker flag to verify +at link time that all symbols of shared libraries are available, and +that there are no undefined symbols. + +This make perfect sense for regular shared libraries. However, for +Python extensions, which will be dlopen()ed inside the Python +interpreter, it makes less sense. + +Since Python 3.8, there is a change in python-config script and +Python's pkg-config file: it no longer links Python extensions with +the libpython library. See +https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build +which states: + + On the other hand, pkg-config python3.8 --libs no longer contains + -lpython3.8. C extensions must not be linked to libpython (except on + Android and Cygwin, whose cases are handled by the script); this + change is backward incompatible on purpose. (Contributed by Victor + Stinner in bpo-36721.) + +So, when linking the kmod Python extensions, it currently fails with +numerous unresolved symbols, that were previously provided by +libpython: + +/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__Pyx_PyObject_GetAttrStr': +list.c:(.text.__Pyx_PyObject_GetAttrStr+0x48): undefined reference to `PyObject_GetAttr' +/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__pyx_tp_dealloc_4kmod_4list_ModListItem': +list.c:(.text.__pyx_tp_dealloc_4kmod_4list_ModListItem+0x78): undefined reference to `PyObject_CallFinalizerFromDealloc' +/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__pyx_tp_dealloc_4kmod_4list_ModList': +list.c:(.text.__pyx_tp_dealloc_4kmod_4list_ModList+0x30): undefined reference to `PyErr_Fetch' + +[Complete log at http://autobuild.buildroot.net/results/79a/79a5a0398723e8cfea0d0aa3dec5f7649aee4c63/build-end.log] + +Linking with libpython is no longer recommended: those symbols should +remain unresolved in the Python extensions, as they wil be properly +resolved when the Python extension gets loaded into the Python +interpreter. + +Since we want to keep -Wl,--no-undefined globally in kmod, we leave +the configure.ac file unchanged, and instead, specifically in the +LDFLAGS used to build the Python extensions, we override +-Wl,--no-undefined with -Wl,-z,undefs. Ideally, -Wl,--no-undefined is +the same as -Wl,-z,defs, and the effect of these options can be +canceled on the linker command line by a following -Wl,-z,undefs (see +the ld man page for details). + +Upstream: https://lore.kernel.org/linux-modules/20191024174710.9441-1-thomas.petazzoni@bootlin.com/ +Signed-off-by: Thomas Petazzoni +Cc: Victor Stinner +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index c5c2f06..8e9c90d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -173,7 +173,7 @@ CPYTHON_MODULE_CFLAGS = \ + $(AM_CFLAGS) -DCPYTHON_COMPILING_IN_PYPY=0 \ + $(PYTHON_NOWARN) $(PYTHON_CFLAGS) \ + -fvisibility=default +-CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared ++CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -Wl,-z,undefs + + if BUILD_PYTHON + pkgpyexec_LTLIBRARIES = \ +-- +2.21.0 + diff --git a/buildroot/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch b/buildroot/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch new file mode 100644 index 000000000..f4d90d4c2 --- /dev/null +++ b/buildroot/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch @@ -0,0 +1,43 @@ +From 7a55f18e14f606500fdeab6bc116ec74f3e5b1c3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 16 Nov 2019 17:40:32 +0100 +Subject: [PATCH] Makefile.am: filter -Wl,--no-undefined + +Commit 1d14ef82f4a3be741bcdf6b1c6d51ce9dce43567 does not completely fix +the build with python 3.8 as we still get link failure due to +'-z undefs' being ignored by some versions of ld: + +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mips-linux-gnu/5.3.0/../../../../mips-linux-gnu/bin/ld: warning: -z undefs ignored. + +/home/naourr/work/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-linux-gnu/7.3.1/../../../../aarch64_be-linux-gnu/bin/ld: warning: -z undefs ignored. + +So filter -Wl,--no-undefined to fix the issue + +Fixes: + - http://autobuild.buildroot.org/results/e9645d9969481b09f507f6e0d0b35faaa283eb60 + - http://autobuild.buildroot.org/results/06a6d865b6b7d8ebd793bde214f4a4c40e0962e1 + +Signed-off-by: Fabrice Fontaine +--- + Makefile.am | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 8e9c90d..47505c1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -173,7 +173,10 @@ CPYTHON_MODULE_CFLAGS = \ + $(AM_CFLAGS) -DCPYTHON_COMPILING_IN_PYPY=0 \ + $(PYTHON_NOWARN) $(PYTHON_CFLAGS) \ + -fvisibility=default +-CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -Wl,-z,undefs ++# Filter -Wl,--no-undefined to fix build with python 3.8 ++comma = , ++CPYTHON_MODULE_LDFLAGS = $(subst -Wl$(comma)--no-undefined,,$(AM_LDFLAGS)) ++CPYTHON_MODULE_LDFLAGS += -module -avoid-version -shared + + if BUILD_PYTHON + pkgpyexec_LTLIBRARIES = \ +-- +2.24.0 + diff --git a/buildroot/package/kmod/kmod.hash b/buildroot/package/kmod/kmod.hash index 0e8f034e0..dea5c0c10 100644 --- a/buildroot/package/kmod/kmod.hash +++ b/buildroot/package/kmod/kmod.hash @@ -1,2 +1,6 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc -sha256 7165e6496656159dcb909a91ed708a0fe273a4b128b4b1dc997ccb5189eef1cd kmod-25.tar.xz +sha256 57bb22c8bb56435991f6b0810a042b0a65e2f1e217551efa58235b7034cdbb9d kmod-26.tar.xz + +# Locally calculated +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/kmod/kmod.mk b/buildroot/package/kmod/kmod.mk index ea5d29113..e21f40a84 100644 --- a/buildroot/package/kmod/kmod.mk +++ b/buildroot/package/kmod/kmod.mk @@ -4,10 +4,12 @@ # ################################################################################ -KMOD_VERSION = 25 +KMOD_VERSION = 26 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod KMOD_INSTALL_STAGING = YES +# 0002-Do-not-check-for-undefined-symbols-when-building-the.patch +KMOD_AUTORECONF = YES KMOD_DEPENDENCIES = host-pkgconf HOST_KMOD_DEPENDENCIES = host-pkgconf @@ -50,7 +52,7 @@ endif ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y) # add license info for kmod tools -KMOD_LICENSE := $(KMOD_LICENSE), GPL-2.0+ (tools) +KMOD_LICENSE += , GPL-2.0+ (tools) KMOD_LICENSE_FILES += COPYING # /sbin is really /usr/sbin with merged /usr, so adjust relative symlink diff --git a/buildroot/package/kmscube/Config.in b/buildroot/package/kmscube/Config.in index b9fe627c8..b6ad305bf 100644 --- a/buildroot/package/kmscube/Config.in +++ b/buildroot/package/kmscube/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_KMSCUBE help kmscube is an application to test kms/drm drivers. - https://cgit.freedesktop.org/mesa/kmscube/ + https://gitlab.freedesktop.org/mesa/kmscube diff --git a/buildroot/package/kmscube/kmscube.mk b/buildroot/package/kmscube/kmscube.mk index 37983b1a7..73d290c88 100644 --- a/buildroot/package/kmscube/kmscube.mk +++ b/buildroot/package/kmscube/kmscube.mk @@ -5,7 +5,7 @@ ################################################################################ KMSCUBE_VERSION = 6cbd03ab94066dddbba7bedfde87c7c4319c18d5 -KMSCUBE_SITE = https://cgit.freedesktop.org/mesa/kmscube/snapshot +KMSCUBE_SITE = https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION) KMSCUBE_LICENSE = MIT KMSCUBE_DEPENDENCIES = host-pkgconf mesa3d libdrm KMSCUBE_AUTORECONF = YES diff --git a/buildroot/package/kmsxx/kmsxx.hash b/buildroot/package/kmsxx/kmsxx.hash index 94a9ea1ea..b8d06ac47 100644 --- a/buildroot/package/kmsxx/kmsxx.hash +++ b/buildroot/package/kmsxx/kmsxx.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 28892e50c1d1c83fddff9ec683e3bdbd465f5032d0014ceeab43563b813807e1 kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9.tar.gz +sha256 022b4d51da34a380d74dc24eea8e2c4e1a4c8776a52171f8d9e941cf56daf888 LICENSE diff --git a/buildroot/package/kmsxx/kmsxx.mk b/buildroot/package/kmsxx/kmsxx.mk index c664d5236..829beb1d6 100644 --- a/buildroot/package/kmsxx/kmsxx.mk +++ b/buildroot/package/kmsxx/kmsxx.mk @@ -12,6 +12,14 @@ KMSXX_INSTALL_STAGING = YES KMSXX_DEPENDENCIES = libdrm host-pkgconf KMSXX_CONF_OPTS = -DKMSXX_ENABLE_PYTHON=OFF +KMSXX_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +KMSXX_CXXFLAGS += -O0 +endif + +KMSXX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(KMSXX_CXXFLAGS)" + ifeq ($(BR2_PACKAGE_KMSXX_INSTALL_TESTS),y) KMSXX_TESTS = \ fbtest kmsblank kmscapture \ diff --git a/buildroot/package/knock/knock.hash b/buildroot/package/knock/knock.hash index 3599e43da..0b9a0918f 100644 --- a/buildroot/package/knock/knock.hash +++ b/buildroot/package/knock/knock.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 940a8de61b4b3530560805c3b9310a077c28c99173c2ccb07ff96720b0e93c58 knock-258a27e5a47809f97c2b9f2751a88c2f94aae891.tar.gz +sha256 940a8de61b4b3530560805c3b9310a077c28c99173c2ccb07ff96720b0e93c58 knock-258a27e5a47809f97c2b9f2751a88c2f94aae891.tar.gz +sha256 d747e19206e41702e40822dd91d37cbf40edd86f364ea416d667a0e3013f7189 COPYING diff --git a/buildroot/package/kodi-audiodecoder-modplug/Config.in b/buildroot/package/kodi-audiodecoder-modplug/Config.in index 026997319..856ca8beb 100644 --- a/buildroot/package/kodi-audiodecoder-modplug/Config.in +++ b/buildroot/package/kodi-audiodecoder-modplug/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_KODI_AUDIODECODER_MODPLUG bool "kodi-audiodecoder-modplug" - select BR2_PACKAGE_KODI_PLATFORM select BR2_PACKAGE_LIBMODPLUG help Modplug decoder addon for Kodi - https://github.com/notspiff/audiodecoder.modplug + https://github.com/xbmc/audiodecoder.modplug diff --git a/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash index 9b1c2114a..11542f9c9 100644 --- a/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash +++ b/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 8be4f8c6324bf790069e42c963e14733c53fcdc27548f21f4822b178f47b8177 kodi-audiodecoder-modplug-v1.1.0.tar.gz +sha256 2e99f1c8b28e176268644c07020aa92ad74d22e7244db1af69f31b767f8e845f kodi-audiodecoder-modplug-2.0.2-Leia.tar.gz +sha256 785e25c61cbc691e7cebcd1d084ca3e5f7a20d5e99ea89ddd2ce7aed6c94c27d src/ModplugCodec.cpp diff --git a/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk index c5a6f3267..6a501c237 100644 --- a/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ b/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_MODPLUG_VERSION = v1.1.0 -KODI_AUDIODECODER_MODPLUG_SITE = $(call github,notspiff,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) +KODI_AUDIODECODER_MODPLUG_VERSION = 2.0.2-Leia +KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+ KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = src/ModplugCodec.cpp -KODI_AUDIODECODER_MODPLUG_DEPENDENCIES = kodi-platform libmodplug +KODI_AUDIODECODER_MODPLUG_DEPENDENCIES = kodi libmodplug $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audiodecoder-nosefart/Config.in b/buildroot/package/kodi-audiodecoder-nosefart/Config.in index 96591aae5..bb56a3d6d 100644 --- a/buildroot/package/kodi-audiodecoder-nosefart/Config.in +++ b/buildroot/package/kodi-audiodecoder-nosefart/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_AUDIODECODER_NOSEFART bool "kodi-audiodecoder-nosefart" - select BR2_PACKAGE_KODI_PLATFORM help Nosefart decoder addon for Kodi - https://github.com/notspiff/audiodecoder.nosefart + https://github.com/xbmc/audiodecoder.nosefart diff --git a/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash index df93b25c8..756d85e80 100644 --- a/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash +++ b/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 444cc85f4618daa5147a63633db3f300123d5e33b1b5894e7036fa9243e8a535 kodi-audiodecoder-nosefart-v1.1.0.tar.gz +sha256 0c17f407d90dd08368aead5df8bacf7589b97bf1c0d1ea45c60cc7d0da26844c kodi-audiodecoder-nosefart-2.0.1-Leia.tar.gz +sha256 8ff36ab79bfc1960b47d01bb33ef106e8eca495a85b206192d8a26bbf8055821 src/NSFCodec.cpp diff --git a/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk index f56dc1915..1d9944d6c 100644 --- a/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ b/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_NOSEFART_VERSION = v1.1.0 -KODI_AUDIODECODER_NOSEFART_SITE = $(call github,notspiff,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION)) +KODI_AUDIODECODER_NOSEFART_VERSION = 2.0.1-Leia +KODI_AUDIODECODER_NOSEFART_SITE = $(call github,xbmc,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION)) KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+ KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = src/NSFCodec.cpp -KODI_AUDIODECODER_NOSEFART_DEPENDENCIES = kodi-platform +KODI_AUDIODECODER_NOSEFART_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audiodecoder-opus/Config.in b/buildroot/package/kodi-audiodecoder-opus/Config.in deleted file mode 100644 index 12d7247d5..000000000 --- a/buildroot/package/kodi-audiodecoder-opus/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIODECODER_OPUS - bool "kodi-audiodecoder-opus" - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_OPUS - select BR2_PACKAGE_OPUSFILE - help - Opus audio decoder for Kodi - - https://github.com/notspiff/audiodecoder.opus diff --git a/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash b/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash deleted file mode 100644 index 117e9f833..000000000 --- a/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 bb7037f903f0396da739005843264acd7227cf96eeeac78b0e36d82872c9acc4 kodi-audiodecoder-opus-d6eb25f0c08033f9a2b4d7402e8baf866ebc731c.tar.gz diff --git a/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk b/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk deleted file mode 100644 index d93c33ac5..000000000 --- a/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-audiodecoder-opus -# -################################################################################ - -KODI_AUDIODECODER_OPUS_VERSION = d6eb25f0c08033f9a2b4d7402e8baf866ebc731c -KODI_AUDIODECODER_OPUS_SITE = $(call github,notspiff,audiodecoder.opus,$(KODI_AUDIODECODER_OPUS_VERSION)) -KODI_AUDIODECODER_OPUS_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_OPUS_LICENSE_FILES = src/OpusCodec.cpp -KODI_AUDIODECODER_OPUS_DEPENDENCIES = kodi-platform libogg opus opusfile - -$(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audiodecoder-sidplay/Config.in b/buildroot/package/kodi-audiodecoder-sidplay/Config.in index ae99afa9e..eca4160a9 100644 --- a/buildroot/package/kodi-audiodecoder-sidplay/Config.in +++ b/buildroot/package/kodi-audiodecoder-sidplay/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_KODI_AUDIODECODER_SIDPLAY bool "kodi-audiodecoder-sidplay" - select BR2_PACKAGE_KODI_PLATFORM select BR2_PACKAGE_LIBSIDPLAY2 help Sidplay decoder addon for Kodi - https://github.com/notspiff/audiodecoder.sidplay + https://github.com/xbmc/audiodecoder.sidplay diff --git a/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash index b806956a7..7255319aa 100644 --- a/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash +++ b/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 527b188679add8043e8cd691af9735b6fe8bd6935ad8ac8312b459d6f160cdac kodi-audiodecoder-sidplay-v1.1.0.tar.gz +sha256 0dbff020e1988261680f2329fb6a29a034fede467885158ee63bae7e763d8e87 kodi-audiodecoder-sidplay-1.2.1-Leia.tar.gz +sha256 0a9cf3c7f8aaa2bbbe4cbf80307513eb99595ebb8179e8bc549159184bbdca3a src/SIDCodec.cpp diff --git a/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk index 8eb425f44..83541d5ec 100644 --- a/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk +++ b/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_SIDPLAY_VERSION = v1.1.0 -KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,notspiff,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION)) +KODI_AUDIODECODER_SIDPLAY_VERSION = 1.2.1-Leia +KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,xbmc,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION)) KODI_AUDIODECODER_SIDPLAY_LICENSE = GPL-2.0+ KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = src/SIDCodec.cpp -KODI_AUDIODECODER_SIDPLAY_DEPENDENCIES = host-pkgconf kodi-platform libsidplay2 +KODI_AUDIODECODER_SIDPLAY_DEPENDENCIES = host-pkgconf kodi libsidplay2 $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audiodecoder-snesapu/Config.in b/buildroot/package/kodi-audiodecoder-snesapu/Config.in index 0cb572fec..2c3bb15d2 100644 --- a/buildroot/package/kodi-audiodecoder-snesapu/Config.in +++ b/buildroot/package/kodi-audiodecoder-snesapu/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_AUDIODECODER_SNESAPU bool "kodi-audiodecoder-snesapu" - select BR2_PACKAGE_KODI_PLATFORM help SPC decoder addon for Kodi - https://github.com/notspiff/audiodecoder.snesapu + https://github.com/xbmc/audiodecoder.snesapu diff --git a/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash index 159d67ecd..1a4c9a0e7 100644 --- a/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash +++ b/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 20d85822d0c01223903b5e5472a1d029fa4931c2a9ac4d399345c4363fa8f905 kodi-audiodecoder-snesapu-v1.1.0.tar.gz +sha256 db39f1f4a892fede45a5bffadd760962b5f02ab62e095a35dc37298cf548013d kodi-audiodecoder-snesapu-2.0.1-Leia.tar.gz +sha256 44d53bc17eb40ff1bdce9418be001334a99af9f41cf36e917f766e44604f63f8 src/SPCCodec.cpp diff --git a/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk index 6104de717..d78f91538 100644 --- a/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ b/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_SNESAPU_VERSION = v1.1.0 -KODI_AUDIODECODER_SNESAPU_SITE = $(call github,notspiff,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION)) +KODI_AUDIODECODER_SNESAPU_VERSION = 2.0.1-Leia +KODI_AUDIODECODER_SNESAPU_SITE = $(call github,xbmc,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION)) KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+ KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = src/SPCCodec.cpp -KODI_AUDIODECODER_SNESAPU_DEPENDENCIES = kodi-platform +KODI_AUDIODECODER_SNESAPU_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audiodecoder-stsound/Config.in b/buildroot/package/kodi-audiodecoder-stsound/Config.in index 6be216a2c..2001e481c 100644 --- a/buildroot/package/kodi-audiodecoder-stsound/Config.in +++ b/buildroot/package/kodi-audiodecoder-stsound/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_AUDIODECODER_STSOUND bool "kodi-audiodecoder-stsound" - select BR2_PACKAGE_KODI_PLATFORM help YM decoder addon for Kodi - https://github.com/notspiff/audiodecoder.stsound + https://github.com/xbmc/audiodecoder.stsound diff --git a/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash index 133e645fa..e5a96bdba 100644 --- a/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash +++ b/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 c9b6e98d544712f7cec3cf18f866ccaed2fbcd20410179259ae0455ffa967ca4 kodi-audiodecoder-stsound-v1.1.0.tar.gz +sha256 75e219bf9abac3949dd3dd3fe908bc2b6e6b85654594e5494335e7e2f14dd1f1 kodi-audiodecoder-stsound-2.0.1-Leia.tar.gz +sha256 dea29ec20a9d23f0f85cd863a2ecf38fad8b9267e2f298f22a4b1adb0a2a853e src/YMCodec.cpp diff --git a/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk index dd5b9da3f..b20fc345f 100644 --- a/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk +++ b/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_STSOUND_VERSION = v1.1.0 -KODI_AUDIODECODER_STSOUND_SITE = $(call github,notspiff,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION)) +KODI_AUDIODECODER_STSOUND_VERSION = 2.0.1-Leia +KODI_AUDIODECODER_STSOUND_SITE = $(call github,xbmc,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION)) KODI_AUDIODECODER_STSOUND_LICENSE = GPL-2.0+ KODI_AUDIODECODER_STSOUND_LICENSE_FILES = src/YMCodec.cpp -KODI_AUDIODECODER_STSOUND_DEPENDENCIES = kodi-platform +KODI_AUDIODECODER_STSOUND_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audiodecoder-timidity/Config.in b/buildroot/package/kodi-audiodecoder-timidity/Config.in index 3372dc5c0..ad3caf1e4 100644 --- a/buildroot/package/kodi-audiodecoder-timidity/Config.in +++ b/buildroot/package/kodi-audiodecoder-timidity/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_KODI_AUDIODECODER_TIMIDITY help Timidity decoder addon for Kodi - https://github.com/notspiff/audiodecoder.timidity + https://github.com/xbmc/audiodecoder.timidity diff --git a/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash index 5711b87a6..0a8bdb279 100644 --- a/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash +++ b/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 83a740010dc7fa01101da370c74e79287ebd67bd28d27125e4372abe2fb3bb47 kodi-audiodecoder-timidity-v1.1.1.tar.gz +sha256 bc6dea6dca0949571a3123e26f27dc73c78b8a876362fc8e95649280f2557bc0 kodi-audiodecoder-timidity-2.0.3-Leia.tar.gz +sha256 d1b64dcec44f6dfa0168a93bf1e1497e233cf3a6a475f60ca7e0a813510d6aba src/TimidityCodec.cpp diff --git a/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk index e4a97fa7f..fa78a3d78 100644 --- a/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk +++ b/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk @@ -4,8 +4,8 @@ # ################################################################################ -KODI_AUDIODECODER_TIMIDITY_VERSION = v1.1.1 -KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,notspiff,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION)) +KODI_AUDIODECODER_TIMIDITY_VERSION = 2.0.3-Leia +KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,xbmc,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION)) KODI_AUDIODECODER_TIMIDITY_LICENSE = GPL-2.0+ KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = src/TimidityCodec.cpp KODI_AUDIODECODER_TIMIDITY_DEPENDENCIES = kodi diff --git a/buildroot/package/kodi-audiodecoder-vgmstream/Config.in b/buildroot/package/kodi-audiodecoder-vgmstream/Config.in index ebf83df23..440edc7cf 100644 --- a/buildroot/package/kodi-audiodecoder-vgmstream/Config.in +++ b/buildroot/package/kodi-audiodecoder-vgmstream/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_AUDIODECODER_VGMSTREAM bool "kodi-audiodecoder-vgmstream" - select BR2_PACKAGE_KODI_PLATFORM help VGM decoder addon for Kodi - https://github.com/notspiff/audiodecoder.vgmstream + https://github.com/xbmc/audiodecoder.vgmstream diff --git a/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash b/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash index 28f4272e2..c4a3cdf23 100644 --- a/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash +++ b/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 40cd4f7f143c9313a4437854e31c460046af47bd709364439f0e370ec464af0d kodi-audiodecoder-vgmstream-v1.1.0.tar.gz +sha256 6f1940d2a0607342cba8cffc0beb7c78caae5995c2d554a6079f4849997da7ba kodi-audiodecoder-vgmstream-1.1.4-Leia.tar.gz +sha256 976ef407b9b30a6c30dab03a8fbb32d0e7e45713b2121d9b378bfb15dc1dfc09 src/VGMCodec.cpp diff --git a/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk index 8dc09fa7e..81f482588 100644 --- a/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk +++ b/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_VGMSTREAM_VERSION = v1.1.0 -KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,notspiff,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION)) +KODI_AUDIODECODER_VGMSTREAM_VERSION = 1.1.4-Leia +KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,xbmc,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION)) KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPL-2.0+ KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = src/VGMCodec.cpp -KODI_AUDIODECODER_VGMSTREAM_DEPENDENCIES = kodi-platform +KODI_AUDIODECODER_VGMSTREAM_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash index 41ddeb4ee..4f410b484 100644 --- a/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash +++ b/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 811dac5766dc9ef1a3447c55637edde55c5ddca1d583124e9312328152015ae5 kodi-audioencoder-flac-v1.1.0.tar.gz +sha256 e6b8ad024c171eb463339a1f136f3ee9465267ef7fd3b80a5f0007b0180f36e5 kodi-audioencoder-flac-2.0.5-Leia.tar.gz +sha256 ce7b890ad56521f1628569be22eff040ef2870213b89098e491d57f729e0d7b6 src/EncoderFlac.cpp diff --git a/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk index d1c41ca36..9940949c7 100644 --- a/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk +++ b/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_FLAC_VERSION = v1.1.0 +KODI_AUDIOENCODER_FLAC_VERSION = 2.0.5-Leia KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION)) KODI_AUDIOENCODER_FLAC_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_FLAC_LICENSE_FILES = src/EncoderFlac.cpp diff --git a/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index b93ae02e2..d66ab591a 100644 --- a/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash +++ b/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 5118a2925bb0f7eca36b2d0f4d6822b45a8967c9fb91054bfaa8f83d21209c95 kodi-audioencoder-lame-v1.2.0.tar.gz +sha256 c9c0e700012e2763eb6d9ffcc80ccd87faf991e5cf58b30cabd51b435fd48614 kodi-audioencoder-lame-2.0.3-Leia.tar.gz +sha256 12d9ad0578d7a09ebb1bdb53d71798b81eed5072866b8bcfae5dff0c34a00b42 src/EncoderLame.cpp diff --git a/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk index 941604ae4..a278a0f41 100644 --- a/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = v1.2.0 +KODI_AUDIOENCODER_LAME_VERSION = 2.0.3-Leia KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION)) KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_LAME_LICENSE_FILES = src/EncoderLame.cpp diff --git a/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash index 094b2fabc..a316a7525 100644 --- a/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash +++ b/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 f00c74f010b465d43e8206bcbe155785e1f34660ca010acff3b890595ea2352c kodi-audioencoder-vorbis-v1.1.0.tar.gz +sha256 0bc1470ecef83ecc7e36239ef414abc49380394b551d35eb7bcc6704e74b469c kodi-audioencoder-vorbis-2.0.3-Leia.tar.gz +sha256 34c561f838b57d681bb795de0a26eacf610477a50cdca1ae707591ec607de42a src/EncoderVorbis.cpp diff --git a/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk index 198d3b1c6..8b2b0fc64 100644 --- a/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk +++ b/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_VORBIS_VERSION = v1.1.0 +KODI_AUDIOENCODER_VORBIS_VERSION = 2.0.3-Leia KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION)) KODI_AUDIOENCODER_VORBIS_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = src/EncoderVorbis.cpp diff --git a/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash index c6bbe79e1..a1bff2e00 100644 --- a/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash +++ b/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 f9b0f79c8364fb7ef584137031fceb8d2ab1af28e110cfe2a31932631cb8d36e kodi-audioencoder-wav-v1.1.0.tar.gz +sha256 eb6939551fa7da01a7f333702af1959771e7db46437647d32eb2b002b142c9a0 kodi-audioencoder-wav-2.0.2-Leia.tar.gz +sha256 20c587f004bcc79f3faee1000af6567fdf8676965130af51e733338b81b27be1 src/EncoderWav.cpp diff --git a/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk index 1a9a6b7bb..25551927d 100644 --- a/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk +++ b/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_WAV_VERSION = v1.1.0 +KODI_AUDIOENCODER_WAV_VERSION = 2.0.2-Leia KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION)) KODI_AUDIOENCODER_WAV_LICENSE = GPL-2.0+ KODI_AUDIOENCODER_WAV_LICENSE_FILES = src/EncoderWav.cpp diff --git a/buildroot/package/kodi-inputstream-adaptive/Config.in b/buildroot/package/kodi-inputstream-adaptive/Config.in index cb5127363..f9ba20adc 100644 --- a/buildroot/package/kodi-inputstream-adaptive/Config.in +++ b/buildroot/package/kodi-inputstream-adaptive/Config.in @@ -3,8 +3,6 @@ config BR2_PACKAGE_KODI_INPUTSTREAM_ADAPTIVE # wvdecrypter/cdm/build/build_config.h depends on BR2_aarch64 || BR2_arm || BR2_i386 || BR2_mipsel \ || BR2_mips64el || BR2_x86_64 - select BR2_PACKAGE_LIBPLATFORM - select BR2_PACKAGE_KODI_PLATFORM help Kodi inputstream addon for several manifest types diff --git a/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index 15ecf494f..60bc0031b 100644 --- a/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 872a6ffefb90b6201a1e01fe5a52e05877e2040737e052b2f249725b9a8a44ff kodi-inputstream-adaptive-c51b9a9b58a645f820883e6d99982277fc58aac5.tar.gz +sha256 e47263240ac9276546ead439ba14ee26c3f3b45f2882351a9081e5502e296329 kodi-inputstream-adaptive-2.4.2-Leia.tar.gz +sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL diff --git a/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index ab810d324..1a083b188 100644 --- a/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,12 +4,10 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_INPUTSTREAM_ADAPTIVE_VERSION = c51b9a9b58a645f820883e6d99982277fc58aac5 +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.4.2-Leia 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 -KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = libplatform kodi-platform +KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL +KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-inputstream-rtmp/Config.in b/buildroot/package/kodi-inputstream-rtmp/Config.in index c40bff2d7..fa8392630 100644 --- a/buildroot/package/kodi-inputstream-rtmp/Config.in +++ b/buildroot/package/kodi-inputstream-rtmp/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_KODI_INPUTSTREAM_RTMP help RTMP input stream add-on for Kodi - https://github.com/notspiff/inputstream.rtmp + https://github.com/xbmc/inputstream.rtmp diff --git a/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash b/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash index f5a82d2aa..c984f44e7 100644 --- a/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash +++ b/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 75a3cc87243a7c92a0a2e3f16710a1e60d05cd8dbc8b7fd1852244fbc5da2ae8 kodi-inputstream-rtmp-v1.0.4.tar.gz +sha256 69f63289bd560f8491fca32e98603afd05a6c94f0791856d873a36285d54c185 kodi-inputstream-rtmp-2.0.8-Leia.tar.gz +sha256 ddba7d22c2586f13de40786c21f3b87c6913c9937f4862dc828d33cfff0395eb debian/copyright diff --git a/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk b/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk index 80c4bccd6..6b62e6eb0 100644 --- a/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk +++ b/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_INPUTSTREAM_RTMP_VERSION = v1.0.4 -KODI_INPUTSTREAM_RTMP_SITE = $(call github,notspiff,inputstream.rtmp,$(KODI_INPUTSTREAM_RTMP_VERSION)) +KODI_INPUTSTREAM_RTMP_VERSION = 2.0.8-Leia +KODI_INPUTSTREAM_RTMP_SITE = $(call github,xbmc,inputstream.rtmp,$(KODI_INPUTSTREAM_RTMP_VERSION)) KODI_INPUTSTREAM_RTMP_LICENSE = GPL-2.0+ -KODI_INPUTSTREAM_RTMP_LICENSE_FILES = src/RTMPStream.cpp +KODI_INPUTSTREAM_RTMP_LICENSE_FILES = debian/copyright KODI_INPUTSTREAM_RTMP_DEPENDENCIES = kodi rtmpdump $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 713d415fe..31003fe85 100644 --- a/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,12 +6,12 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 17.6-Krypton +KODI_JSONSCHEMABUILDER_VERSION = 18.5-Leia KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi KODI_JSONSCHEMABUILDER_LICENSE = GPL-2.0 -KODI_JSONSCHEMABUILDER_LICENSE_FILES = LICENSE.GPL +KODI_JSONSCHEMABUILDER_LICENSE_FILES = LICENSE.md HOST_KODI_JSONSCHEMABUILDER_SUBDIR = tools/depends/native/JsonSchemaBuilder HOST_KODI_JSONSCHEMABUILDER_CONF_OPTS = \ diff --git a/buildroot/package/kodi-peripheral-joystick/Config.in b/buildroot/package/kodi-peripheral-joystick/Config.in index f257710a8..d93e71b60 100644 --- a/buildroot/package/kodi-peripheral-joystick/Config.in +++ b/buildroot/package/kodi-peripheral-joystick/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_KODI_PERIPHERAL_JOYSTICK bool "kodi-peripheral-joystick" depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_TINYXML help Kodi joystick support (drivers and button maps) diff --git a/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 728c3cac5..15397c05c 100644 --- a/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 9a183e1f92ff2c68816bfa0056c65585a3e1129d924326359d7a5dfbcba6c56a kodi-peripheral-joystick-v1.3.4.tar.gz +sha256 e83c32380a51ea74bd5f0af74afc747ff5de99167934e2644bc2b3438cd998d0 kodi-peripheral-joystick-1.4.9-Leia.tar.gz +sha256 2bb807179053b1a7795f9952539a394664847f561a9ffa4ccc36d7bb3cddadf9 debian/copyright diff --git a/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index 2fadbcc21..9cce174da 100644 --- a/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,12 +4,10 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PERIPHERAL_JOYSTICK_VERSION = v1.3.4 +KODI_PERIPHERAL_JOYSTICK_VERSION = 1.4.9-Leia KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ -KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = src/addon.cpp -KODI_PERIPHERAL_JOYSTICK_DEPENDENCIES = kodi-platform udev +KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = debian/copyright +KODI_PERIPHERAL_JOYSTICK_DEPENDENCIES = kodi tinyxml udev $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash b/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash index c0b3bf6e2..15706cb04 100644 --- a/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash +++ b/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 d5547b78ba84c9743c884a9377c398b540bfcf23e467e1edf8be2625d400c205 kodi-peripheral-steamcontroller-ef527cd81cfcd6c8342691f5c764e5c51df1fca2.tar.gz +sha256 aece8f4b4c4360ae6b8007c9a1d1ee39d90808053bc5b2e3e08e4c5c70a7f8db kodi-peripheral-steamcontroller-702fea828f9c5c94d0bd77dbb5fe78451edfa2ea.tar.gz +sha256 243622a4e1a2ba091ae1d433483ad8b34a7cc337048d5bef8072fbb324fbc79a debian/copyright diff --git a/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk b/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk index 98cccc852..15607145b 100644 --- a/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk +++ b/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PERIPHERAL_STEAMCONTROLLER_VERSION = ef527cd81cfcd6c8342691f5c764e5c51df1fca2 +KODI_PERIPHERAL_STEAMCONTROLLER_VERSION = 702fea828f9c5c94d0bd77dbb5fe78451edfa2ea KODI_PERIPHERAL_STEAMCONTROLLER_SITE = $(call github,kodi-game,peripheral.steamcontroller,$(KODI_PERIPHERAL_STEAMCONTROLLER_VERSION)) KODI_PERIPHERAL_STEAMCONTROLLER_LICENSE = GPL-2.0+ -KODI_PERIPHERAL_STEAMCONTROLLER_LICENSE_FILES = src/addon.cpp +KODI_PERIPHERAL_STEAMCONTROLLER_LICENSE_FILES = debian/copyright KODI_PERIPHERAL_STEAMCONTROLLER_DEPENDENCIES = kodi-platform libusb $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash index 48dc5a041..8067d495c 100644 --- a/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash +++ b/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 cd503e7f1413214693c28b59f19f3fffe0a54cff5c29d43b2eca9bb31c10edeb kodi-peripheral-xarcade-f1875ba4b7aa6ce85ec40fedf48ed5501c79e5fd.tar.gz +sha256 c1d755230b0f2fe943cf7297a6d187371088f39391944d422d2bf5969c8863c1 kodi-peripheral-xarcade-51e1a4550a6c7d7feeb01760a731af17bea6c524.tar.gz +sha256 6d79d409e34af80656244d38643cfb60c715b19a266d82fb27c4ec8caf46bb5b src/addon.cpp diff --git a/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk index c4ddba3eb..0946a90d7 100644 --- a/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk +++ b/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_XARCADE_VERSION = f1875ba4b7aa6ce85ec40fedf48ed5501c79e5fd +KODI_PERIPHERAL_XARCADE_VERSION = 51e1a4550a6c7d7feeb01760a731af17bea6c524 KODI_PERIPHERAL_XARCADE_SITE = $(call github,kodi-game,peripheral.xarcade,$(KODI_PERIPHERAL_XARCADE_VERSION)) KODI_PERIPHERAL_XARCADE_LICENSE = GPL-2.0+ KODI_PERIPHERAL_XARCADE_LICENSE_FILES = src/addon.cpp diff --git a/buildroot/package/kodi-platform/kodi-platform.hash b/buildroot/package/kodi-platform/kodi-platform.hash index d99c6225c..3c4da93af 100644 --- a/buildroot/package/kodi-platform/kodi-platform.hash +++ b/buildroot/package/kodi-platform/kodi-platform.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 c53f37888d752e233f5adabc6ecfb8a1ea02728e010007200bbf671f6b9462de kodi-platform-36fb49371dbce49bf470a5bb1fc51b74b4a3612d.tar.gz +sha256 d5b9b61c1c22b471d948b2c8de50f77ccadbd908869b13b5d98c42f447268d56 kodi-platform-915da086fa7b4ea72796052a04ed6de95501b95c.tar.gz +sha256 0c4ce7041d4a3059389fb8b6d85e417447072adbc149a55664e02cad6995b434 src/util/XMLUtils.h diff --git a/buildroot/package/kodi-platform/kodi-platform.mk b/buildroot/package/kodi-platform/kodi-platform.mk index 53f8ce956..8bf517fa5 100644 --- a/buildroot/package/kodi-platform/kodi-platform.mk +++ b/buildroot/package/kodi-platform/kodi-platform.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PLATFORM_VERSION = 36fb49371dbce49bf470a5bb1fc51b74b4a3612d +KODI_PLATFORM_VERSION = 915da086fa7b4ea72796052a04ed6de95501b95c KODI_PLATFORM_SITE = $(call github,xbmc,kodi-platform,$(KODI_PLATFORM_VERSION)) KODI_PLATFORM_LICENSE = GPL-2.0+ KODI_PLATFORM_LICENSE_FILES = src/util/XMLUtils.h diff --git a/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index 138efa1d0..1568f4b08 100644 --- a/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 ba9e4d76b9e6d2d879e95eeda0d919ca5eabc0d6f59037f173cd9294b2ce8e4a kodi-pvr-argustv-2.5.6-Krypton.tar.gz +sha256 2d0fae3721715a17e1c1454dd7029eb8d18e7f761ed65e00f8c488c7c08433e8 kodi-pvr-argustv-3.5.4-Leia.tar.gz +sha256 9a5b69143f47289e5d649a78a0f0aaf21a75fa8866bd2b8c6c559e57cd221295 src/client.h diff --git a/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 2cf4d7529..f59f4467a 100644 --- a/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_ARGUSTV_VERSION = 2.5.6-Krypton +KODI_PVR_ARGUSTV_VERSION = 3.5.4-Leia KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash index e9b867318..4bec77ddc 100644 --- a/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash +++ b/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 a45fff0c1fe6d91fd957e2a4e62e9c72a5c36d796c41caa6b1e5a4814f82a503 kodi-pvr-dvblink-3.4.5v2-Krypton.tar.gz +sha256 ad7586abfe7b3f9dd67b3a2225c442fc8d2a442e48bd7df75b11652286392c2f kodi-pvr-dvblink-4.7.2-Leia.tar.gz +sha256 2a643b774c0b5238ff2d284bad43ec69c2ad4b848b6c58a73dbabffa55d62bfe src/client.h diff --git a/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk index 9860b63b2..423faf763 100644 --- a/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk +++ b/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_DVBLINK_VERSION = 3.4.5v2-Krypton +KODI_PVR_DVBLINK_VERSION = 4.7.2-Leia KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION)) KODI_PVR_DVBLINK_LICENSE = GPL-2.0+ KODI_PVR_DVBLINK_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash index 017bd8360..f63f90714 100644 --- a/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash +++ b/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 f1cd26234e33a027d1ef2f3ea7b5f33be3a8aff9a7bf0117ee4bdfcf1e18fd9f kodi-pvr-dvbviewer-2.4.14-Krypton.tar.gz +sha256 8a3d167e652574caf30ba0ce9c22d278715e0237774b817e37826f1b2d647bff kodi-pvr-dvbviewer-3.7.11-Leia.tar.gz +sha256 d60190aad6c2e704c7ef51693afec2530a54e357ed217313570004cc59c9a4d8 src/client.h diff --git a/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk index bc37de754..4c221c012 100644 --- a/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk +++ b/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_DVBVIEWER_VERSION = 2.4.14-Krypton +KODI_PVR_DVBVIEWER_VERSION = 3.7.11-Leia KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION)) KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+ KODI_PVR_DVBVIEWER_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash index 7417b2672..ad777e538 100644 --- a/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash +++ b/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 0384db9cbcd8ab2e7b8b0eb8c22e8913e734e436234c43d357718c5273058605 kodi-pvr-filmon-1.4.8-Krypton.tar.gz +sha256 763500fb4a7210569f05dba8307d400e532dd0e72b24f1a1d2cd516695145190 kodi-pvr-filmon-2.4.4-Leia.tar.gz +sha256 8300bc67ff10aad7f271e96f867ad024fcdfc114caca04fefa437231945e6315 src/client.h diff --git a/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk index daa3e39df..44f13909f 100644 --- a/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk +++ b/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_FILMON_VERSION = 1.4.8-Krypton +KODI_PVR_FILMON_VERSION = 2.4.4-Leia KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION)) KODI_PVR_FILMON_LICENSE = GPL-2.0+ KODI_PVR_FILMON_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index 8262f4e11..1bc71c06f 100644 --- a/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ b/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 3c000b3ebab2b12f5635451f6a71ad01c4f4d7043623cfeebfe6b7c662e026d9 kodi-pvr-hdhomerun-2.4.7-Krypton.tar.gz +sha256 815ba3dfbe6e1318226d41879057f0b8a4f0ac960d12ebc5d69f0a1ac28cfa09 kodi-pvr-hdhomerun-3.5.0-Leia.tar.gz +sha256 b184cd8a52f77f6c02c1da89dfc17dff989c50c400acab10148ab77f02723d84 src/client.h diff --git a/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk index 75fa48764..6e6dd4dfa 100644 --- a/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ b/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_HDHOMERUN_VERSION = 2.4.7-Krypton +KODI_PVR_HDHOMERUN_VERSION = 3.5.0-Leia KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION)) KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+ KODI_PVR_HDHOMERUN_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash b/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash index 87eafac85..ffbe36863 100644 --- a/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 96e949526ebf4af542da572e704c0c052ec807408dc0ea65603a15614b889dd1 kodi-pvr-hts-3211941dade740ad92581f488402146794798e74.tar.gz +sha256 fcf2df3566b196addf99d8166fa5a8b77635ac905214c36071d9e778cc42978e kodi-pvr-hts-4.4.20-Leia.tar.gz +sha256 a6cd848443278bf312680e08d13fa898e4242fd76de8c86aea5f09a51826885c src/client.h diff --git a/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk b/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk index 7f43b0485..0184f77ec 100644 --- a/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_HTS_VERSION = 3211941dade740ad92581f488402146794798e74 +KODI_PVR_HTS_VERSION = 4.4.20-Leia KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-iptvsimple/Config.in b/buildroot/package/kodi-pvr-iptvsimple/Config.in index b59674979..94fc1f060 100644 --- a/buildroot/package/kodi-pvr-iptvsimple/Config.in +++ b/buildroot/package/kodi-pvr-iptvsimple/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_KODI_PVR_IPTVSIMPLE bool "kodi-pvr-iptvsimple" select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_RAPIDXML help IPTV Live TV and Radio PVR client addon for Kodi diff --git a/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 0b0406feb..38e857138 100644 --- a/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 329bd71e5c786d7b037bf5fd103ee4abff892afc6e5186a5d0a797194a8c4c7c kodi-pvr-iptvsimple-2.4.14-Krypton.tar.gz +sha256 25eff252ad748e0cf166cd01b0f08e8fb3977c98a1b04cad9ef6509ea30c5fa9 kodi-pvr-iptvsimple-3.8.8-Leia.tar.gz +sha256 f5890f1869491e6e6674029355d40b1f4cf57f065da4f37d5b1b3d2dd41ba092 src/client.h diff --git a/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 0df509ea6..16007cf40 100644 --- a/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,12 +4,10 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_IPTVSIMPLE_VERSION = 2.4.14-Krypton +KODI_PVR_IPTVSIMPLE_VERSION = 3.8.8-Leia KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.h -KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi-platform +KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi-platform rapidxml $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-mediaportal-tvserver/0001-live555-remove-xlocale.h-from-Locale.hh.patch b/buildroot/package/kodi-pvr-mediaportal-tvserver/0001-live555-remove-xlocale.h-from-Locale.hh.patch deleted file mode 100644 index 7abb153b0..000000000 --- a/buildroot/package/kodi-pvr-mediaportal-tvserver/0001-live555-remove-xlocale.h-from-Locale.hh.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 64b264d141fd80991ac071c5370802e2d7394f6d Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 3 Dec 2017 22:17:12 +0100 -Subject: [PATCH] live555: remove xlocale.h from Locale.hh - -Fixes build error with glibc 2.26: -https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 - -Patch sent upstream: -https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/79 - -Signed-off-by: Bernd Kuhls ---- - src/lib/live555/liveMedia/include/Locale.hh | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/lib/live555/liveMedia/include/Locale.hh b/src/lib/live555/liveMedia/include/Locale.hh -index b327948..c4b4f4a 100644 ---- a/src/lib/live555/liveMedia/include/Locale.hh -+++ b/src/lib/live555/liveMedia/include/Locale.hh -@@ -43,9 +43,6 @@ along with this library; if not, write to the Free Software Foundation, Inc., - - #ifndef LOCALE_NOT_USED - #include --#ifndef XLOCALE_NOT_USED --#include // because, on some systems, doesn't include ; this makes sure that we get both --#endif - #endif - - --- -2.11.0 - diff --git a/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index 6eb0abfba..ce24491ec 100644 --- a/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 3f5c022f83636b3739f26c1a07166b498eac82e8081ed7551980f4bb27c6b56e kodi-pvr-mediaportal-tvserver-2.4.19v2-Krypton.tar.gz +sha256 9c05578566f7448dc3a7677587c804596aa314afd493cb9c62cc65ea883645aa kodi-pvr-mediaportal-tvserver-3.5.18-Leia.tar.gz +sha256 b9966d774c89672efb8d6501d636038a77888c044d15e68af604e9366c1b1a0a src/client.h diff --git a/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index 99a318911..1b6ad39ef 100644 --- a/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 2.4.19v2-Krypton +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 3.5.18-Leia KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 82923a89a..a8aaef631 100644 --- a/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 fd60aba0dac25ab5885371495a5dfca53308c1fa23215299b0f62997c7391e1e kodi-pvr-mythtv-4.15.3.tar.gz +sha256 36d9142e0e19b904e1c4a6d8cd67063d291e63971f80a98a6f24b7f4554bb2e3 kodi-pvr-mythtv-5.10.15-Leia.tar.gz +sha256 ca8fee175b3a02d106870b991ed29b07dfc5024ce3992bbb872d0654467f132b src/client.h diff --git a/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 8099ffae3..e644f9bc7 100644 --- a/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_MYTHTV_VERSION = 4.15.3 +KODI_PVR_MYTHTV_VERSION = 5.10.15-Leia KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 3d10b5bbe..28bad5fca 100644 --- a/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 b126943a6d48ea4d2df38951505f385c2a499e399201eccd798a34076d3c5842 kodi-pvr-nextpvr-2.4.13-Krypton.tar.gz +sha256 f7b6ea2e79e469fc265d008d3ba8ebb7e286e789a8b4bc809681a254ff225775 kodi-pvr-nextpvr-3.3.18-Leia.tar.gz +sha256 71c90cfb2792702a6bc13dd10e34c2f181b5e923ab4ae2b1b0674c5b8867b2ad src/client.h diff --git a/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index d0a04991d..059430ebb 100644 --- a/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_NEXTPVR_VERSION = 2.4.13-Krypton +KODI_PVR_NEXTPVR_VERSION = 3.3.18-Leia KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash index 261558ee3..472dc7862 100644 --- a/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ b/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 e4e0a6bb1bf0c6f8ae011eba58c5f0ae19a6574bb35fc6a7fbdbb99d20242a2c kodi-pvr-njoy-2.4.3-Krypton.tar.gz +sha256 8c42a3c3754d7a07de9682504c4883a584eb21a92b9af70f0129ffc2707c1554 kodi-pvr-njoy-3.4.2-Leia.tar.gz +sha256 69e4681abe815ce2f3ec2c9f34c2292e95e56424d9403fe91a91baeb23e91ec0 src/client.h diff --git a/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk index e946e6783..1099e6621 100644 --- a/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ b/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_NJOY_VERSION = 2.4.3-Krypton +KODI_PVR_NJOY_VERSION = 3.4.2-Leia KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION)) KODI_PVR_NJOY_LICENSE = GPL-2.0+ KODI_PVR_NJOY_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index 504480676..850ca7ac7 100644 --- a/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 95f95f39739baf6013bb6c9188743f842f6ba3e1fa541907067f795e1a3c66a1 kodi-pvr-pctv-1.4.7-Krypton.tar.gz +sha256 a9f1c5596786cf4cfa279d0b4477839ef7f5bb7267c65152dbcf7ae0bda56679 kodi-pvr-pctv-2.4.5-Leia.tar.gz +sha256 03798669132b75111ef5731f6f9c5e519faf088fe4ef3233289bc140e26d2845 src/client.h diff --git a/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index 6c7a03049..014d1d3f9 100644 --- a/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_PCTV_VERSION = 1.4.7-Krypton +KODI_PVR_PCTV_VERSION = 2.4.5-Leia KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) KODI_PVR_PCTV_LICENSE = GPL-2.0+ KODI_PVR_PCTV_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch b/buildroot/package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch deleted file mode 100644 index 2d85f6bc6..000000000 --- a/buildroot/package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bb16ccd14deb3a01049daec37b6d2e7711ef4738 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 13 May 2017 20:22:08 +0200 -Subject: [PATCH] src/CWatchdog.h: Fix gcc7 build - -Building with gcc7 is broken: - -src/CWatchdog.h:31:58: error: 'std::function' has not been declared - CWatchdog(unsigned int interval, SAPI *api, std::function errorCallback); - ^~~~~~~~ - -Submitted-upstream: https://github.com/kodi-pvr/pvr.stalker/pull/93 -Signed-off-by: Bernd Kuhls ---- - src/CWatchdog.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/CWatchdog.h b/src/CWatchdog.h -index c465e91..239d95d 100644 ---- a/src/CWatchdog.h -+++ b/src/CWatchdog.h -@@ -22,6 +22,7 @@ - */ - - #include -+#include - - #include "SAPI.h" - diff --git a/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 07c768f25..4db4f7974 100644 --- a/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 466cb3869927cdd245a746a32d92250e198befe577f7a847884eab1fd8eeb139 kodi-pvr-stalker-2.8.6-Krypton.tar.gz +sha256 03eb428f21d6b8526b6671278b60ac6dc5a761a515af27172d8ac5c814cc3f65 kodi-pvr-stalker-3.4.10-Leia.tar.gz +sha256 31d746afd12ac7ebcbc2a4b525de77d31d10bc4f7a0a45830d6f899a2953bc95 src/client.h diff --git a/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index 32ac2cad0..1b1592320 100644 --- a/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_STALKER_VERSION = 2.8.6-Krypton +KODI_PVR_STALKER_VERSION = 3.4.10-Leia KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ KODI_PVR_STALKER_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash index 5f2c78f0f..42fee0b5a 100644 --- a/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash +++ b/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 78065a46b95b3988b1e49fe05da249a1896f54a2c30116a9446f7c4f55db743b kodi-pvr-vbox-3.6.10-Krypton.tar.gz +sha256 98aadcf3d0109a7dc5f85b4e5473d595039b59c46b0686a2fbda88ff7631ee0c kodi-pvr-vbox-4.7.0-Leia.tar.gz +sha256 d50cada312480496eeb901e1809cfadaea256f82359d2cb01ae44f28e2191b33 src/client.h diff --git a/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk index 2c54e1493..8c8382a1d 100644 --- a/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk +++ b/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_VBOX_VERSION = 3.6.10-Krypton +KODI_PVR_VBOX_VERSION = 4.7.0-Leia KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION)) KODI_PVR_VBOX_LICENSE = GPL-2.0+ KODI_PVR_VBOX_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index 6d42583a9..c0e1d90bf 100644 --- a/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 b65acb7ade6eaac395ea357158a4aae5ccd141612acfd834b72fbdf8db4e8b0e kodi-pvr-vdr-vnsi-4ed7d602924dbfcdd2770c0e13423092e829460d.tar.gz +sha256 6afaf1f3f1e0670edb9dc01581a0d6c3f57502c791e19283eb63807e8936a768 kodi-pvr-vdr-vnsi-3.6.3-Leia.tar.gz +sha256 4da4a184b215913b33f48ee26990b34daa7a15e00cc23e60975d391b7168597b src/client.h diff --git a/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index e068641c0..ec8fc7fc7 100644 --- a/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_VDR_VNSI_VERSION = 4ed7d602924dbfcdd2770c0e13423092e829460d +KODI_PVR_VDR_VNSI_VERSION = 3.6.3-Leia KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ KODI_PVR_VDR_VNSI_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-pvr-vuplus/Config.in b/buildroot/package/kodi-pvr-vuplus/Config.in index a56c4ede9..96320f6fc 100644 --- a/buildroot/package/kodi-pvr-vuplus/Config.in +++ b/buildroot/package/kodi-pvr-vuplus/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_KODI_PVR_VUPLUS bool "kodi-pvr-vuplus" + select BR2_PACKAGE_JSON_FOR_MODERN_CPP select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_TINYXML help VuPlus PVR client addon for Kodi diff --git a/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash index f4f675693..a8f81244f 100644 --- a/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash +++ b/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 a8c7345e4e2e415e29c21f14460b257dfbe08ed5ecf1cc2dc6bc393a10f95cf3 kodi-pvr-vuplus-2.4.12-Krypton.tar.gz +sha256 d7dd890e4491e211ff3781cdc043347ab7a4ef6e00619ac1b4641ed81b0c3626 kodi-pvr-vuplus-3.28.9-Leia.tar.gz +sha256 21f5b12ef73285dbf9709fd42b719b719285a7e8a6741913664b58b8e08374c8 src/client.h diff --git a/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk index 581d884ca..34ec5d238 100644 --- a/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ b/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk @@ -4,12 +4,10 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_VUPLUS_VERSION = 2.4.12-Krypton +KODI_PVR_VUPLUS_VERSION = 3.28.9-Leia KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION)) KODI_PVR_VUPLUS_LICENSE = GPL-2.0+ KODI_PVR_VUPLUS_LICENSE_FILES = src/client.h -KODI_PVR_VUPLUS_DEPENDENCIES = kodi-platform +KODI_PVR_VUPLUS_DEPENDENCIES = json-for-modern-cpp kodi-platform tinyxml $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index 4c050fb65..643549ea7 100644 --- a/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 7f5dfb88f54d511d575b7aabd94e1a862afb7e8a0b89fa957db6a135c31846eb kodi-pvr-wmc-1.4.9v2-Krypton.tar.gz +sha256 4cb81f29cba23172d042e50bbab00cd64cd5670ad7350fd9d25301f63178e5f7 kodi-pvr-wmc-2.4.5-Leia.tar.gz +sha256 1a2f68003a1149b6f6480f4cc749089aed8cbf16529300cc8458c5c7925ce917 src/client.h diff --git a/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index b6e3d4325..82397163f 100644 --- a/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'Krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_WMC_VERSION = 1.4.9v2-Krypton +KODI_PVR_WMC_VERSION = 2.4.5-Leia KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ KODI_PVR_WMC_LICENSE_FILES = src/client.h diff --git a/buildroot/package/kodi-screensaver-asteroids/Config.in b/buildroot/package/kodi-screensaver-asteroids/Config.in index ccc2aba6a..3d66c3dcc 100644 --- a/buildroot/package/kodi-screensaver-asteroids/Config.in +++ b/buildroot/package/kodi-screensaver-asteroids/Config.in @@ -1,10 +1,11 @@ config BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS bool "kodi-screensaver-asteroids" depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_GLM help Asteroids screensaver for Kodi - https://github.com/notspiff/screensaver.asteroids + https://github.com/xbmc/screensaver.asteroids comment "kodi-screensaver-asteroids needs OpenGL" depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash b/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash index 7d105beeb..00d40413b 100644 --- a/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash +++ b/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 2e072e6aad12f707dec1e70b7df26c590bb41fed8880dcfdbe6c99949b7e287a kodi-screensaver-asteroids-v1.1.2.tar.gz +sha256 c359f8bb6a2e9b42dcfb063cdf965ce0b3fc95761816d98160000aea33894241 kodi-screensaver-asteroids-2.3.2-Leia.tar.gz +sha256 297a1d34e6000f1b1a924f5ab75c16c2270968bfa47357dd8fa3799c9dfc47d8 debian/copyright diff --git a/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk index 46df2e76a..278efb4ee 100644 --- a/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk +++ b/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_ASTEROIDS_VERSION = v1.1.2 -KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,notspiff,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION)) +KODI_SCREENSAVER_ASTEROIDS_VERSION = 2.3.2-Leia +KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,xbmc,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION)) KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = src/main.cpp -KODI_SCREENSAVER_ASTEROIDS_DEPENDENCIES = kodi +KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = debian/copyright +KODI_SCREENSAVER_ASTEROIDS_DEPENDENCIES = glm kodi $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-screensaver-asterwave/Config.in b/buildroot/package/kodi-screensaver-asterwave/Config.in index bd5db738c..b5e80cc53 100644 --- a/buildroot/package/kodi-screensaver-asterwave/Config.in +++ b/buildroot/package/kodi-screensaver-asterwave/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_ASTERWAVE help AsterWave screensaver for Kodi - https://github.com/notspiff/screensaver.asterwave + https://github.com/xbmc/screensaver.asterwave comment "kodi-screensaver-asterwave needs OpenGL" depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash b/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash index f8f6d7b2f..b05c9a180 100644 --- a/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash +++ b/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 48cd459b60b2407b8bae9107760a013d04ee29e00fddbce9550291896d42ef64 kodi-screensaver-asterwave-v1.1.0.tar.gz +sha256 ff018b5bdd353747a4e962c72ec622a74232e05eae1742a116259273f1db0552 kodi-screensaver-asterwave-3.0.3-Leia.tar.gz diff --git a/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk index b8c3a2adf..82996bc3e 100644 --- a/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk +++ b/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk @@ -4,8 +4,8 @@ # ################################################################################ -KODI_SCREENSAVER_ASTERWAVE_VERSION = v1.1.0 -KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,notspiff,screensaver.asterwave,$(KODI_SCREENSAVER_ASTERWAVE_VERSION)) +KODI_SCREENSAVER_ASTERWAVE_VERSION = 3.0.3-Leia +KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,xbmc,screensaver.asterwave,$(KODI_SCREENSAVER_ASTERWAVE_VERSION)) KODI_SCREENSAVER_ASTERWAVE_DEPENDENCIES = kodi libglu libsoil $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch b/buildroot/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch new file mode 100644 index 000000000..378b3ad1d --- /dev/null +++ b/buildroot/package/kodi-screensaver-biogenesis/0001-Add-missing-stddef-include.patch @@ -0,0 +1,25 @@ +From 86da3bfecf8ddd2f8c2c3eed6e1cb8850883f4b2 Mon Sep 17 00:00:00 2001 +From: Rechi +Date: Sun, 24 Mar 2019 10:53:31 +0100 +Subject: [PATCH] [fix] add missing stddef.h include for offsetof macro + +Downloaded from upstream commit: +https://github.com/xbmc/screensaver.biogenesis/commit/86da3bfecf8ddd2f8c2c3eed6e1cb8850883f4b2 + +Signed-off-by: Bernd Kuhls +--- + src/Life.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Life.cpp b/src/Life.cpp +index 762ad7d..68be133 100644 +--- a/src/Life.cpp ++++ b/src/Life.cpp +@@ -24,6 +24,7 @@ + + #include "types.h" + #include ++#include + #ifdef WIN32 + #include + #else diff --git a/buildroot/package/kodi-screensaver-biogenesis/Config.in b/buildroot/package/kodi-screensaver-biogenesis/Config.in index cdc2d9195..9703e9091 100644 --- a/buildroot/package/kodi-screensaver-biogenesis/Config.in +++ b/buildroot/package/kodi-screensaver-biogenesis/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_BIOGENESIS help BioGenesis screensaver for Kodi - https://github.com/notspiff/screensaver.biogenesis + https://github.com/xbmc/screensaver.biogenesis comment "kodi-screensaver-biogenesis needs OpenGL" depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash b/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash index 63b9d3c93..851519a23 100644 --- a/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash +++ b/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 b97dc804261b19df725e0a9f1af3be6903226ae616fcac170f7b9c1a67bf811a kodi-screensaver-biogenesis-v1.1.0.tar.gz +sha256 1d1edff918d2a94ba0efd329a45294be47e73eef65f700d62b311eb750d0fef7 kodi-screensaver-biogenesis-2.2.2-Leia.tar.gz +sha256 2bca14bf4f7391885dc6bb7c7ef190238e529a03b92cb22c09a37c178bc94b76 src/Life.cpp diff --git a/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk index c5ebd8559..3888f2996 100644 --- a/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk +++ b/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk @@ -4,8 +4,8 @@ # ################################################################################ -KODI_SCREENSAVER_BIOGENESIS_VERSION = v1.1.0 -KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,notspiff,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION)) +KODI_SCREENSAVER_BIOGENESIS_VERSION = 2.2.2-Leia +KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,xbmc,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION)) KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = src/Life.cpp KODI_SCREENSAVER_BIOGENESIS_DEPENDENCIES = kodi diff --git a/buildroot/package/kodi-screensaver-cpblobs/Config.in b/buildroot/package/kodi-screensaver-cpblobs/Config.in index e80ea0ebb..4e0003bdd 100644 --- a/buildroot/package/kodi-screensaver-cpblobs/Config.in +++ b/buildroot/package/kodi-screensaver-cpblobs/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_CPBLOBS help CpBlobs screensaver for Kodi - https://github.com/notspiff/screensaver.cpblobs + https://github.com/xbmc/screensaver.cpblobs comment "kodi-screensaver-cpblobs needs OpenGL" depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash b/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash index 21443d82b..eca5d805e 100644 --- a/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash +++ b/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 1ca5e4de61251de7e420dc6ded3156960f9bb52ed7ff0243f305768147d470e3 kodi-screensaver-cpblobs-v1.1.0.tar.gz +sha256 6d7a0036a118778117d1d1ebeca96903e66f49a166848a1c884aaf3ed65fdd46 kodi-screensaver-cpblobs-e65b34fb75ac258a8563169b9c00ebf739dbc7ca.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk index 63a8dfa8c..bb6811dab 100644 --- a/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk +++ b/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk @@ -4,8 +4,8 @@ # ################################################################################ -KODI_SCREENSAVER_CPBLOBS_VERSION = v1.1.0 -KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,notspiff,screensaver.cpblobs,$(KODI_SCREENSAVER_CPBLOBS_VERSION)) +KODI_SCREENSAVER_CPBLOBS_VERSION = e65b34fb75ac258a8563169b9c00ebf739dbc7ca +KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,xbmc,screensaver.cpblobs,$(KODI_SCREENSAVER_CPBLOBS_VERSION)) KODI_SCREENSAVER_CPBLOBS_LICENSE = GPL-2.0 KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE KODI_SCREENSAVER_CPBLOBS_DEPENDENCIES = kodi libsoil diff --git a/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash b/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash index ff9d6d024..407093f19 100644 --- a/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash +++ b/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 a8400c8d8be0fe0ba616ad1d0ef5fd798980a9dd4e38ef88bee9bf74a06975d5 kodi-screensaver-crystalmorph-1dc9bf3f57cc2c5345efec64d9499c3bf8f7bd6e.tar.gz +sha256 d8ed548222f1118964104fefc8ac3056dfe6c9d2ee35cd7c8355c9ea9fcaffc5 kodi-screensaver-crystalmorph-4439c84c38abf889e19a1863e745942c0d7f8203.tar.gz +sha256 febce1924ed772f22ec3fabec646b1401aad4f4a81a7f1baeb858f27ae4f5241 src/Fractal.cpp diff --git a/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk b/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk index 83629e41c..35642d558 100644 --- a/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk +++ b/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_CRYSTALMORPH_VERSION = 1dc9bf3f57cc2c5345efec64d9499c3bf8f7bd6e +KODI_SCREENSAVER_CRYSTALMORPH_VERSION = 4439c84c38abf889e19a1863e745942c0d7f8203 KODI_SCREENSAVER_CRYSTALMORPH_SITE = $(call github,notspiff,screensaver.crystalmorph,$(KODI_SCREENSAVER_CRYSTALMORPH_VERSION)) KODI_SCREENSAVER_CRYSTALMORPH_LICENSE = GPL-2.0+ KODI_SCREENSAVER_CRYSTALMORPH_LICENSE_FILES = src/Fractal.cpp diff --git a/buildroot/package/kodi-screensaver-greynetic/Config.in b/buildroot/package/kodi-screensaver-greynetic/Config.in index ce636b827..685feb887 100644 --- a/buildroot/package/kodi-screensaver-greynetic/Config.in +++ b/buildroot/package/kodi-screensaver-greynetic/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_GREYNETIC help Greynetic screensaver for Kodi - https://github.com/notspiff/screensaver.greynetic + https://github.com/xbmc/screensaver.greynetic comment "kodi-screensaver-greynetic needs OpenGL" depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash b/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash index 212aee663..71734ee6e 100644 --- a/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash +++ b/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 55a77487f02d282e8431e64de3cb263489037c2374a4b9cdd7aa189093e7621f kodi-screensaver-greynetic-v1.1.0.tar.gz +sha256 d95bc93d022b12fbfcbaedf1128292b40dd16276b65a3ffecb90707055e1d55f kodi-screensaver-greynetic-2.2.1-Leia.tar.gz +sha256 f3e1fc9e8f86842be8af2500e9b2a50ab8597ad997908228a00c3c8a4abb9426 src/GreyNetic.cpp diff --git a/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk index 66435eb27..f9b0be1ad 100644 --- a/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk +++ b/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk @@ -4,8 +4,8 @@ # ################################################################################ -KODI_SCREENSAVER_GREYNETIC_VERSION = v1.1.0 -KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,notspiff,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION)) +KODI_SCREENSAVER_GREYNETIC_VERSION = 2.2.1-Leia +KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,xbmc,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION)) KODI_SCREENSAVER_GREYNETIC_LICENSE = GPL-2.0+ KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = src/GreyNetic.cpp KODI_SCREENSAVER_GREYNETIC_DEPENDENCIES = kodi diff --git a/buildroot/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch b/buildroot/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch new file mode 100644 index 000000000..75cadfcb1 --- /dev/null +++ b/buildroot/package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch @@ -0,0 +1,25 @@ +From 404763f096a312e12c0dc4764834987797411745 Mon Sep 17 00:00:00 2001 +From: Rechi +Date: Sun, 24 Mar 2019 11:44:05 +0100 +Subject: [PATCH] [fix] add missing stddef.h include for offsetof macro + +Downloaded from upstream commit: +https://github.com/xbmc/screensaver.matrixtrails/commit/404763f096a312e12c0dc4764834987797411745 + +Signed-off-by: Bernd Kuhls +--- + src/matrixtrails.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/matrixtrails.cpp b/src/matrixtrails.cpp +index 220855a..2817dbe 100644 +--- a/src/matrixtrails.cpp ++++ b/src/matrixtrails.cpp +@@ -25,6 +25,7 @@ + #include "matrixtrails.h" + #include "SOIL2/SOIL2.h" + ++#include + #include + + //////////////////////////////////////////////////////////////////////////// diff --git a/buildroot/package/kodi-screensaver-matrixtrails/Config.in b/buildroot/package/kodi-screensaver-matrixtrails/Config.in index e2d3f71ac..270a51c9f 100644 --- a/buildroot/package/kodi-screensaver-matrixtrails/Config.in +++ b/buildroot/package/kodi-screensaver-matrixtrails/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_MATRIXTRAILS help Matrix trails screensaver for Kodi - https://github.com/notspiff/screensaver.matrixtrails + https://github.com/xbmc/screensaver.matrixtrails comment "kodi-screensaver-matrixtrails needs OpenGL" depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash b/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash index 55deabea1..01a26bf5f 100644 --- a/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash +++ b/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 2b531f51b86536df2a5268547e3d1b7fabc8a1dc930808b46685afcc455bb8fa kodi-screensaver-matrixtrails-v1.1.0.tar.gz +sha256 2d2c795853c5a72184bb6720247d79c48b1d9fbc97e9c2913003a707d612e3ac kodi-screensaver-matrixtrails-2.2.1-Leia.tar.gz +sha256 5f8e5e8435ce1c5ca39d0cb081a9ae4d8ab56a8b6b7f438d7bbe65cdf1603453 src/matrixtrails.cpp diff --git a/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk index 142e48dc7..674a0116e 100644 --- a/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk +++ b/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk @@ -4,11 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_MATRIXTRAILS_VERSION = v1.1.0 -KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,notspiff,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION)) +KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 2.2.1-Leia +KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,v$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION)) KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = src/matrixtrails.cpp - KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi libsoil $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch b/buildroot/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch new file mode 100644 index 000000000..f71e1899a --- /dev/null +++ b/buildroot/package/kodi-screensaver-pingpong/0001-Backport-Add-missing-cstddef-includes.patch @@ -0,0 +1,32 @@ +From 6ca75e7d421a49b6124d0e1cd37a529c66a701cb Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 18 Jan 2020 20:01:21 +0100 +Subject: [PATCH] [Backport] Add missing cstddef includes + +Fixes build error with gcc 5.5.0. + +Backported from https://github.com/xbmc/screensaver.pingpong/pull/21 + +Patch sent upstream: +https://github.com/xbmc/screensaver.pingpong/pull/22 + +Signed-off-by: Bernd Kuhls +--- + src/pingpong.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pingpong.cpp b/src/pingpong.cpp +index e1df353..9cd9fb5 100644 +--- a/src/pingpong.cpp ++++ b/src/pingpong.cpp +@@ -24,6 +24,7 @@ + #include "main.h" + #include "pingpong.h" + ++#include + #include + + #define NUMQUADS 3 +-- +2.20.1 + diff --git a/buildroot/package/kodi-screensaver-pingpong/Config.in b/buildroot/package/kodi-screensaver-pingpong/Config.in index 3971052b9..bc76fffd6 100644 --- a/buildroot/package/kodi-screensaver-pingpong/Config.in +++ b/buildroot/package/kodi-screensaver-pingpong/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_PINGPONG help Ping-pong screensaver for Kodi - https://github.com/notspiff/screensaver.pingpong + https://github.com/xbmc/screensaver.pingpong comment "kodi-screensaver-pingpong needs OpenGL" depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash b/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash index aad8314bd..b4e22420a 100644 --- a/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash +++ b/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 99e9cbc3815d4e3dad964b2d233dbf6acc4416121398f7fca75f3811cb04d88f kodi-screensaver-pingpong-v1.1.0.tar.gz +sha256 d4e09509bf036b7d5c381cd4ecac926a59396fb481347a4056d843ae68d3a20d kodi-screensaver-pingpong-2.1.1-Leia.tar.gz +sha256 47ff769788026a338740772250197acd0a84f26b57dda49e5b14d63f2f2937ee src/readme.txt diff --git a/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk index 8b6426dae..45f2d2303 100644 --- a/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk +++ b/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk @@ -4,8 +4,8 @@ # ################################################################################ -KODI_SCREENSAVER_PINGPONG_VERSION = v1.1.0 -KODI_SCREENSAVER_PINGPONG_SITE = $(call github,notspiff,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION)) +KODI_SCREENSAVER_PINGPONG_VERSION = 2.1.1-Leia +KODI_SCREENSAVER_PINGPONG_SITE = $(call github,xbmc,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION)) KODI_SCREENSAVER_PINGPONG_LICENSE = GPL-2.0+ KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = src/readme.txt KODI_SCREENSAVER_PINGPONG_DEPENDENCIES = kodi diff --git a/buildroot/package/kodi-screensaver-planestate/Config.in b/buildroot/package/kodi-screensaver-planestate/Config.in deleted file mode 100644 index b63d70e64..000000000 --- a/buildroot/package/kodi-screensaver-planestate/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_PLANESTATE - bool "kodi-screensaver-planestate" - depends on BR2_PACKAGE_HAS_LIBGL # libsoil - select BR2_PACKAGE_LIBSOIL - help - PlaneState screensaver for Kodi - - https://github.com/notspiff/screensaver.planestate - -comment "kodi-screensaver-planestate needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.hash b/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.hash deleted file mode 100644 index de5f6cf5d..000000000 --- a/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 6059630e56bd022a27f73fe7c94fcf6a66792e7bb10f54a7893f536c23b95b99 kodi-screensaver-planestate-5341406dd05439a1a0245ab3f6d1a8964461d0e5.tar.gz diff --git a/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.mk b/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.mk deleted file mode 100644 index 0e90ffc5d..000000000 --- a/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# -# kodi-screensaver-planestate -# -################################################################################ - -KODI_SCREENSAVER_PLANESTATE_VERSION = 5341406dd05439a1a0245ab3f6d1a8964461d0e5 -KODI_SCREENSAVER_PLANESTATE_SITE = $(call github,notspiff,screensaver.planestate,$(KODI_SCREENSAVER_PLANESTATE_VERSION)) -KODI_SCREENSAVER_PLANESTATE_DEPENDENCIES = kodi libsoil - -$(eval $(cmake-package)) diff --git a/buildroot/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch b/buildroot/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch new file mode 100644 index 000000000..c463d42d5 --- /dev/null +++ b/buildroot/package/kodi-screensaver-pyro/0001-Add-missing-stddef-include.patch @@ -0,0 +1,25 @@ +From e1dbe7822b35b889fdc5ea54114ad3f9669d440e Mon Sep 17 00:00:00 2001 +From: Rechi +Date: Sun, 24 Mar 2019 10:55:44 +0100 +Subject: [PATCH] [fix] add missing stddef.h include for offsetof macro + +Downloaded from upstream commit in master branch: +https://github.com/xbmc/screensaver.pyro/commit/e1dbe7822b35b889fdc5ea54114ad3f9669d440e + +Signed-off-by: Bernd Kuhls +--- + src/Pyro.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Pyro.cpp b/src/Pyro.cpp +index 3f873a2..6dfa764 100644 +--- a/src/Pyro.cpp ++++ b/src/Pyro.cpp +@@ -34,6 +34,7 @@ + #include "Pyro.h" + #include + #include ++#include + #include + + #ifdef WIN32 diff --git a/buildroot/package/kodi-screensaver-pyro/Config.in b/buildroot/package/kodi-screensaver-pyro/Config.in index 982542d5a..e2d1988ec 100644 --- a/buildroot/package/kodi-screensaver-pyro/Config.in +++ b/buildroot/package/kodi-screensaver-pyro/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_PYRO help Pyro screensaver for Kodi - https://github.com/notspiff/screensaver.pyro + https://github.com/xbmc/screensaver.pyro comment "kodi-screensaver-pyro needs OpenGL" depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash b/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash index a16ee8e09..fc41e80ee 100644 --- a/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash +++ b/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 0dcaed581ffe5595878338a8c9c55bd7acc87e03d30a4d3ca4a03c3f8db66ddc kodi-screensaver-pyro-v1.1.0.tar.gz +sha256 55f867b703e5cf409f8e0a8a2c34373f896feb990004b5901b4efaee905d42e5 kodi-screensaver-pyro-3.0.0-Leia.tar.gz +sha256 b945c014a69091c728caa3fca547c2747911e61e1dd2cef9928cf92a6a45655f src/Pyro.cpp diff --git a/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk index bc5011830..7b3b63ab7 100644 --- a/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk +++ b/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk @@ -4,8 +4,8 @@ # ################################################################################ -KODI_SCREENSAVER_PYRO_VERSION = v1.1.0 -KODI_SCREENSAVER_PYRO_SITE = $(call github,notspiff,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION)) +KODI_SCREENSAVER_PYRO_VERSION = 3.0.0-Leia +KODI_SCREENSAVER_PYRO_SITE = $(call github,xbmc,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION)) KODI_SCREENSAVER_PYRO_LICENSE = GPL-2.0+ KODI_SCREENSAVER_PYRO_LICENSE_FILES = src/Pyro.cpp KODI_SCREENSAVER_PYRO_DEPENDENCIES = kodi diff --git a/buildroot/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch b/buildroot/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch new file mode 100644 index 000000000..e76a9b994 --- /dev/null +++ b/buildroot/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch @@ -0,0 +1,40 @@ +From 28c01686ba0d67d317e058776f01efba5e6471bd Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 13 Jul 2019 14:18:12 +0200 +Subject: [PATCH] Disable drempels + +Does not build with ImageMagick 7.x: + +src/drempels/TexMgr.cpp:31:10: fatal error: magick/api.h: + No such file or directory + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a86ccd0..b5ca03f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,8 +40,7 @@ include_directories(${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Ko + if(ImageMagick_FOUND AND NOT ${OWN_IMAGE_MAGICK}) + message(STATUS "ImageMagick found in the system and is used") + else() +- message(STATUS "ImageMagick not found or forced and add custom created") +- add_subdirectory(lib/ImageMagick) ++ message(STATUS "ImageMagick not found") + endif() + add_subdirectory(lib/kodi/gui/gl) + add_subdirectory(lib/Implicit) +@@ -70,7 +69,6 @@ include(src/biof/CMakeLists.txt) + include(src/busyspheres/CMakeLists.txt) + include(src/colorfire/CMakeLists.txt) + include(src/cyclone/CMakeLists.txt) +-include(src/drempels/CMakeLists.txt) + include(src/euphoria/CMakeLists.txt) + include(src/feedback/CMakeLists.txt) + include(src/fieldlines/CMakeLists.txt) +-- +2.20.1 + diff --git a/buildroot/package/kodi-screensaver-rsxs/0001-cross-compile.patch b/buildroot/package/kodi-screensaver-rsxs/0001-cross-compile.patch deleted file mode 100644 index a7b2053d7..000000000 --- a/buildroot/package/kodi-screensaver-rsxs/0001-cross-compile.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix cross-compilation - -Use the cross-compiler and not the host version. - -Patch sent upstream: -https://github.com/notspiff/screensavers.rsxs/pull/5 - -Signed-off-by: Bernd Kuhls - -diff -uNr screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLists.txt screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259/CMakeLists.txt ---- screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLists.txt 2015-03-19 12:20:23.000000000 +0100 -+++ screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259/CMakeLists.txt 2015-07-19 20:26:16.660481032 +0200 -@@ -33,6 +33,11 @@ - ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src/skyrocket - ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src/solarwinds) - -+ -+get_filename_component( COMPILER_FILENAME "${CMAKE_C_COMPILER}" NAME ) -+string( REGEX REPLACE "-[^-]+$" "" -+ TOOLCHAIN_NAME "${COMPILER_FILENAME}" ) -+ - include(ExternalProject) - set(update_command "") - if(BOOTSTRAP_IN_TREE OR NOT DEFINED BOOTSTRAP_IN_TREE) -@@ -46,8 +51,11 @@ - endif() - endif() - externalproject_add(rsxs SOURCE_DIR ${PROJECT_SOURCE_DIR}/${rsxs_dir} -- CONFIGURE_COMMAND ${configure_start} -+ CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no ac_cv_type__Bool=yes -+ ac_cv_func_malloc_0_nonnull=yes -+ ${configure_start} - --prefix= -+ --host=${TOOLCHAIN_NAME} - --without-xscreensaver - --disable-cyclone - --disable-euphoria diff --git a/buildroot/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch b/buildroot/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch deleted file mode 100644 index a7e7c74b0..000000000 --- a/buildroot/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix X include path to prevent error during configure - -Downloaded from -https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/patches/screensavers.rsxs-0002-fix-default-include-dir.patch - -Signed-off-by: Bernd Kuhls - -diff -Naur screensavers.rsxs-3241d29.orig/CMakeLists.txt screensavers.rsxs-3241d29/CMakeLists.txt ---- screensavers.rsxs-3241d29.orig/CMakeLists.txt 2015-10-22 23:59:38.187280475 -0700 -+++ screensavers.rsxs-3241d29/CMakeLists.txt 2015-10-23 00:00:27.228113829 -0700 -@@ -17,7 +17,7 @@ - include_directories(${OpenGL_INCLUDE_DIR} - ${PNG_INCLUDE_DIR} - ${KODI_INCLUDE_DIR} -- ${X_INCLUDE_DIRS} -+ ${X_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/rsxs-prefix/src/rsxs-build - ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src - ${PROJECT_SOURCE_DIR}/${rsxs_dir}/lib -@@ -67,7 +67,7 @@ - --disable-skyrocket - --disable-solarwinds - --disable-sound -- --x-includes=${X_INCLUDE_DIRS} -+ --x-includes=${X_INCLUDE_DIR} - --x-libraries=${X_LIBRARIES} - ${PNG_PATH} - ${EXTRA_FLAGS} diff --git a/buildroot/package/kodi-screensaver-rsxs/Config.in b/buildroot/package/kodi-screensaver-rsxs/Config.in index c523ce5a1..076c7effa 100644 --- a/buildroot/package/kodi-screensaver-rsxs/Config.in +++ b/buildroot/package/kodi-screensaver-rsxs/Config.in @@ -1,13 +1,17 @@ config BR2_PACKAGE_KODI_SCREENSAVER_RSXS bool "kodi-screensaver-rsxs" depends on BR2_PACKAGE_HAS_LIBGL # libglu - depends on BR2_PACKAGE_XORG7 # xlib_libXmu + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_GLI + select BR2_PACKAGE_GLM + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_XLIB_LIBXMU + select BR2_PACKAGE_LIBTOOL + select BR2_PACKAGE_TIFF help RSXS screensaver add-ons for Kodi - https://github.com/notspiff/screensavers.rsxs + https://github.com/xbmc/screensavers.rsxs -comment "kodi-screensaver-rsxs depends on X.org and needs OpenGL" - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL +comment "kodi-screensaver-rsxs needs an OpenGL backend" + depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash index 66d79a06f..8f34b349e 100644 --- a/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash +++ b/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 8436c29d2f42bc65ff6f1abc2f1d05a613cc2ebb16d793e02b1f2bee296952a6 kodi-screensaver-rsxs-v1.3.0.tar.gz +sha256 22ff3f0ca9679c59ce1a90b98d918dd10a8012b789729b2e44c04d4ce8c86ad8 kodi-screensaver-rsxs-7cb648507440d87948dec10d5bfdab3b722d37fe.tar.gz +sha256 fa0ff8b6a6267b9477be7d505aa384056633b4be17e0b9d308df9bd70d1c99f6 debian/copyright diff --git a/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk index 8445bf88d..aa881d0d5 100644 --- a/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk +++ b/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_RSXS_VERSION = v1.3.0 -KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION)) -KODI_SCREENSAVER_RSXS_LICENSE = GPL-3.0 -KODI_SCREENSAVER_RSXS_LICENSE_FILES = lib/rsxs-1.0/COPYING -KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi libpng xlib_libXmu +KODI_SCREENSAVER_RSXS_VERSION = 7cb648507440d87948dec10d5bfdab3b722d37fe +KODI_SCREENSAVER_RSXS_SITE = $(call github,xbmc,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION)) +KODI_SCREENSAVER_RSXS_LICENSE = GPL-2.0+ +KODI_SCREENSAVER_RSXS_LICENSE_FILES = debian/copyright +KODI_SCREENSAVER_RSXS_DEPENDENCIES = bzip2 gli glm jpeg kodi libpng libtool tiff $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-screensaver-stars/Config.in b/buildroot/package/kodi-screensaver-stars/Config.in index bcfb47b2c..a2e435c0f 100644 --- a/buildroot/package/kodi-screensaver-stars/Config.in +++ b/buildroot/package/kodi-screensaver-stars/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_STARS help Starfield screensaver for Kodi - https://github.com/notspiff/screensaver.stars + https://github.com/xbmc/screensaver.stars comment "kodi-screensaver-stars needs OpenGL" depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash b/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash index 7f8c9aefd..9a8246e9d 100644 --- a/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash +++ b/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 525caac94fd2bd858daf9fa7719eea4181c168e5c692bb896689625bf4437d32 kodi-screensaver-stars-v1.1.0.tar.gz +sha256 dca39e68d803cca3c1d9524df17feb3e12fc7eeae4166c6311a97dc68c29f523 kodi-screensaver-stars-2.1.3-Leia.tar.gz +sha256 962bb1e8e5da407e871adcdb6868371fdb2ca0c01e8ffb4bb01a8e87b1eafe88 src/StarField.cpp diff --git a/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk b/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk index e94670c6f..a23f4d93f 100644 --- a/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk +++ b/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk @@ -4,8 +4,8 @@ # ################################################################################ -KODI_SCREENSAVER_STARS_VERSION = v1.1.0 -KODI_SCREENSAVER_STARS_SITE = $(call github,notspiff,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION)) +KODI_SCREENSAVER_STARS_VERSION = 2.1.3-Leia +KODI_SCREENSAVER_STARS_SITE = $(call github,xbmc,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION)) KODI_SCREENSAVER_STARS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_STARS_LICENSE_FILES = src/StarField.cpp KODI_SCREENSAVER_STARS_DEPENDENCIES = kodi diff --git a/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash b/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash index 2dabbbd4c..113548bf6 100644 --- a/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash +++ b/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 1fa8ebeec269e678111f64bec373d98e34b4ba1b32e583a505431b2562910ba0 kodi-skin-confluence-37bba429adc16d49a07add08de406682e1cc673a.tar.gz +sha256 dc4a0abf05db50caf8e70e4904b8c2c445008ec3d6d23381c9c31dedaf6109de kodi-skin-confluence-cffcb8320003e6048abe4b26316e5d5f3d50eac9.tar.gz +sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.txt diff --git a/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.mk b/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.mk index e9cdf3fbf..d9bd10bdf 100644 --- a/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.mk +++ b/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.mk @@ -4,9 +4,7 @@ # ################################################################################ -# This cset is on the branch 'krypton' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_SKIN_CONFLUENCE_VERSION = 37bba429adc16d49a07add08de406682e1cc673a +KODI_SKIN_CONFLUENCE_VERSION = cffcb8320003e6048abe4b26316e5d5f3d50eac9 KODI_SKIN_CONFLUENCE_SITE = $(call github,xbmc,skin.confluence,$(KODI_SKIN_CONFLUENCE_VERSION)) KODI_SKIN_CONFLUENCE_LICENSE = GPL-2.0 KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch b/buildroot/package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch new file mode 100644 index 000000000..ddd82439f --- /dev/null +++ b/buildroot/package/kodi-texturepacker/0002-fix-texture-packer-cmake-source-dir.patch @@ -0,0 +1,27 @@ +Fix stand-alone build + +CMake Error at CMakeLists.txt:40 (add_executable): + Cannot find source file: + + /home/bernd/buildroot/output/build/host-kodi-texturepacker-18.4-Leia/tools/depends/native/TexturePacker/xbmc/guilib/XBTF.cpp + + Tried extensions .c .C .c++ .cc .cpp .cxx .cu .m .M .mm .h .hh .h++ .hm + .hpp .hxx .in .txx + +CMake Error at CMakeLists.txt:40 (add_executable): + No SOURCES given to target: TexturePacker + +Downloaded from +https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/mediacenter/kodi/patches/kodi-100.25-hack-fix-texture-packer-cmake-source-dir.patch + +Signed-off-by: Bernd Kuhls + +diff -Naur a/tools/depends/native/TexturePacker/CMakeLists.txt b/tools/depends/native/TexturePacker/CMakeLists.txt +--- a/tools/depends/native/TexturePacker/CMakeLists.txt 2016-12-23 17:10:28.593185862 +0000 ++++ b/tools/depends/native/TexturePacker/CMakeLists.txt 2016-12-23 17:10:39.469253011 +0000 +@@ -1,3 +1,5 @@ ++set(CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/../../../..) ++ + list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) + + if(APPLE) diff --git a/buildroot/package/kodi-texturepacker/0002-fix_reallocarray.patch b/buildroot/package/kodi-texturepacker/0002-fix_reallocarray.patch deleted file mode 100644 index e32d09ef5..000000000 --- a/buildroot/package/kodi-texturepacker/0002-fix_reallocarray.patch +++ /dev/null @@ -1,170 +0,0 @@ -From ebc5dfcad836936a14e6f18fd7faa377b3c804e7 Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Mon, 6 Nov 2017 11:47:28 +0000 -Subject: [PATCH] TexturePacker: use C++ headers - -Signed-off-by: Dagg Stompler ---- - tools/depends/native/TexturePacker/src/SimpleFS.h | 4 ++-- - tools/depends/native/TexturePacker/src/TexturePacker.cpp | 2 +- - tools/depends/native/TexturePacker/src/XBTFWriter.cpp | 6 +++--- - tools/depends/native/TexturePacker/src/XBTFWriter.h | 2 +- - tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp | 2 +- - tools/depends/native/TexturePacker/src/md5.h | 4 ++-- - 6 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/tools/depends/native/TexturePacker/src/SimpleFS.h b/tools/depends/native/TexturePacker/src/SimpleFS.h -index c48814c0ad..c2288cf8de 100644 ---- a/tools/depends/native/TexturePacker/src/SimpleFS.h -+++ b/tools/depends/native/TexturePacker/src/SimpleFS.h -@@ -20,9 +20,9 @@ - * - */ - --#include -+#include - #include --#include -+#include - - class CFile - { -diff --git a/tools/depends/native/TexturePacker/src/TexturePacker.cpp b/tools/depends/native/TexturePacker/src/TexturePacker.cpp -index ba618be574..045c5ce38d 100644 ---- a/tools/depends/native/TexturePacker/src/TexturePacker.cpp -+++ b/tools/depends/native/TexturePacker/src/TexturePacker.cpp -@@ -22,7 +22,7 @@ - #include - #include - #define __STDC_FORMAT_MACROS --#include -+#include - #define platform_stricmp _stricmp - #else - #define platform_stricmp stricmp -diff --git a/tools/depends/native/TexturePacker/src/XBTFWriter.cpp b/tools/depends/native/TexturePacker/src/XBTFWriter.cpp -index 9e2493369b..2e80ba674c 100644 ---- a/tools/depends/native/TexturePacker/src/XBTFWriter.cpp -+++ b/tools/depends/native/TexturePacker/src/XBTFWriter.cpp -@@ -19,14 +19,14 @@ - */ - - #define __STDC_FORMAT_MACROS --#include -+#include - #if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN) --#include -+#include - #elif !defined(TARGET_DARWIN) - #include - #endif - #include --#include -+#include - - #include "XBTFWriter.h" - #include "guilib/XBTFReader.h" -diff --git a/tools/depends/native/TexturePacker/src/XBTFWriter.h b/tools/depends/native/TexturePacker/src/XBTFWriter.h -index 7509303a51..d5cf1a2965 100644 ---- a/tools/depends/native/TexturePacker/src/XBTFWriter.h -+++ b/tools/depends/native/TexturePacker/src/XBTFWriter.h -@@ -23,7 +23,7 @@ - - #include - #include --#include -+#include - - #include "guilib/XBTF.h" - -diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp -index 56c22f7c3a..3ddb20fe88 100644 ---- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp -+++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp -@@ -20,7 +20,7 @@ - - #include "GifHelper.h" - #include --#include -+#include - #include - - #define UNSIGNED_LITTLE_ENDIAN(lo, hi) ((lo) | ((hi) << 8)) -diff --git a/tools/depends/native/TexturePacker/src/md5.h b/tools/depends/native/TexturePacker/src/md5.h -index 456e5be17f..4bb48e0810 100644 ---- a/tools/depends/native/TexturePacker/src/md5.h -+++ b/tools/depends/native/TexturePacker/src/md5.h -@@ -23,8 +23,8 @@ - #ifndef MD5_H - #define MD5_H - --#include /* for memcpy() */ --#include -+#include /* for memcpy() */ -+#include - - struct MD5Context - { --- -2.16.0 - -From ff3e6dad5fdb7b9a2985b2547c8020c709af0340 Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Mon, 6 Nov 2017 18:05:17 +0000 -Subject: [PATCH] TexturePacker: drop unused variable - ---- - tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp b/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp -index 53f5e9beb7..b0f18bed68 100644 ---- a/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp -+++ b/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp -@@ -72,7 +72,6 @@ bool JPGDecoder::LoadFile(const std::string &filename, DecodedFrames &frames) - struct jpeg_decompress_struct cinfo; - struct jpeg_error_mgr jerr; - -- char *linha; - int ImageSize; - - cinfo.err = jpeg_std_error(&jerr); -@@ -89,7 +88,6 @@ bool JPGDecoder::LoadFile(const std::string &filename, DecodedFrames &frames) - DecodedFrame frame; - - frame.rgbaImage.pixels = (char *)new char[ImageSize]; -- linha = (char *)frame.rgbaImage.pixels; - - unsigned char *scanlinebuff = new unsigned char[3 * cinfo.image_width]; - unsigned char *dst = (unsigned char *)frame.rgbaImage.pixels; --- -2.16.0 - -From ee441543be07de1222bcff2587bfcdb5c1231989 Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Mon, 6 Nov 2017 21:02:06 +0000 -Subject: [PATCH] TexturePacker: include GifHelper after system headers - ---- - tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp -index 3ddb20fe88..9ced4ec5bc 100644 ---- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp -+++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp -@@ -18,10 +18,10 @@ - * - */ - --#include "GifHelper.h" - #include - #include - #include -+#include "GifHelper.h" - - #define UNSIGNED_LITTLE_ENDIAN(lo, hi) ((lo) | ((hi) << 8)) - #define GIF_MAX_MEMORY 82944000U // about 79 MB, which is equivalent to 10 full hd frames. --- -2.16.0 - diff --git a/buildroot/package/kodi-texturepacker/kodi-texturepacker.mk b/buildroot/package/kodi-texturepacker/kodi-texturepacker.mk index bb35252b9..e33e680e1 100644 --- a/buildroot/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/buildroot/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,12 +6,12 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 17.6-Krypton +KODI_TEXTUREPACKER_VERSION = 18.5-Leia KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi KODI_TEXTUREPACKER_LICENSE = GPL-2.0 -KODI_TEXTUREPACKER_LICENSE_FILES = LICENSE.GPL +KODI_TEXTUREPACKER_LICENSE_FILES = LICENSE.md HOST_KODI_TEXTUREPACKER_SUBDIR = tools/depends/native/TexturePacker HOST_KODI_TEXTUREPACKER_DEPENDENCIES = \ host-giflib \ @@ -29,8 +29,7 @@ HOST_KODI_TEXTUREPACKER_CXXFLAGS = \ HOST_KODI_TEXTUREPACKER_CONF_OPTS += \ -DCMAKE_CXX_FLAGS="$(HOST_KODI_TEXTUREPACKER_CXXFLAGS)" \ - -DCMAKE_MODULE_PATH=$(@D)/project/cmake/modules \ - -DCORE_SOURCE_DIR=$(@D) \ + -DCMAKE_MODULE_PATH=$(@D)/cmake/modules \ -Wno-dev define HOST_KODI_TEXTUREPACKER_INSTALL_CMDS diff --git a/buildroot/package/kodi-vfs-rar/Config.in b/buildroot/package/kodi-vfs-rar/Config.in new file mode 100644 index 000000000..f855fb6c9 --- /dev/null +++ b/buildroot/package/kodi-vfs-rar/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_KODI_VFS_RAR + bool "kodi-vfs-rar" + select BR2_PACKAGE_LIBPLATFORM + help + RAR VFS addon for Kodi + + https://github.com/xbmc/vfs.rar diff --git a/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.hash b/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.hash new file mode 100644 index 000000000..f0b539852 --- /dev/null +++ b/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.hash @@ -0,0 +1,5 @@ +# Locally computed +sha256 09a16bf0be13c7d9ed43c6608f662374cb3b8b35c05492ce1117f58270d8d005 kodi-vfs-rar-60f92ff28ee6c94211b628990696c60518bffcf6.tar.gz +# License files +sha256 e0c2f13c3a78c8d2b91cb846b8a13fb650fcc88c0630e38ce9c0b7c34631d1cc lib/UnrarXLib/license.txt +sha256 2ddada473db917f5d0ed191d8b571aa04af8926807f61398e602b971eaf5ccb7 src/RarManager.h diff --git a/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.mk b/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.mk new file mode 100644 index 000000000..b113fa5a0 --- /dev/null +++ b/buildroot/package/kodi-vfs-rar/kodi-vfs-rar.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# kodi-vfs-rar +# +################################################################################ + +KODI_VFS_RAR_VERSION = 60f92ff28ee6c94211b628990696c60518bffcf6 +KODI_VFS_RAR_SITE = $(call github,xbmc,vfs.rar,$(KODI_VFS_RAR_VERSION)) +KODI_VFS_RAR_LICENSE = unrar, GPL-2.0+ +KODI_VFS_RAR_LICENSE_FILES = lib/UnrarXLib/license.txt src/RarManager.h +KODI_VFS_RAR_DEPENDENCIES = libplatform kodi + +$(eval $(cmake-package)) diff --git a/buildroot/package/kodi-vfs-sftp/Config.in b/buildroot/package/kodi-vfs-sftp/Config.in new file mode 100644 index 000000000..a939bd927 --- /dev/null +++ b/buildroot/package/kodi-vfs-sftp/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_KODI_VFS_SFTP + bool "kodi-vfs-sftp" + select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_LIBPLATFORM + select BR2_PACKAGE_LIBSSH + help + SFTP VFS addon for Kodi + + https://github.com/xbmc/vfs.sftp diff --git a/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.hash new file mode 100644 index 000000000..08115847b --- /dev/null +++ b/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 6a6d7fc777f574746bcc34b618700a4db3981aee470b68d60c3407eeeb0c16d9 kodi-vfs-sftp-1.0.5-Leia.tar.gz +sha256 394c58f6cf5e728770c1ac7ea7d509fa54f950cad6e757a9f093344f5230b7b9 src/SFTPFile.cpp diff --git a/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.mk new file mode 100644 index 000000000..8657ebdce --- /dev/null +++ b/buildroot/package/kodi-vfs-sftp/kodi-vfs-sftp.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# kodi-vfs-sftp +# +################################################################################ + +KODI_VFS_SFTP_VERSION = 1.0.5-Leia +KODI_VFS_SFTP_SITE = $(call github,xbmc,vfs.sftp,$(KODI_VFS_SFTP_VERSION)) +KODI_VFS_SFTP_LICENSE = GPL-2.0+ +KODI_VFS_SFTP_LICENSE_FILES = src/SFTPFile.cpp +KODI_VFS_SFTP_DEPENDENCIES = kodi-platform libplatform libssh + +$(eval $(cmake-package)) diff --git a/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash index c89ca9a61..e8b5c6cb5 100644 --- a/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash +++ b/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 cf42a21978578cb5ecb10c20fe09791183d8ef2998ff9d956a84142a7dda8f72 kodi-visualisation-fishbmc-v4.1.0.tar.gz +sha256 8142fe4a32c0c113945c5fc9745e54639ca73308371d292e3422730bfad1d064 kodi-visualisation-fishbmc-5.1.2-Leia.tar.gz +sha256 684792cea796ea39d086ffd6cf5cb7c70ab8188dcf493707ba90d081d28f787e visualization.fishbmc/LICENSE diff --git a/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk index d08c215ee..a89c559d2 100644 --- a/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk +++ b/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk @@ -4,8 +4,8 @@ # ################################################################################ -KODI_VISUALISATION_FISHBMC_VERSION = v4.1.0 -KODI_VISUALISATION_FISHBMC_SITE = $(call github,notspiff,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION)) +KODI_VISUALISATION_FISHBMC_VERSION = 5.1.2-Leia +KODI_VISUALISATION_FISHBMC_SITE = $(call github,xbmc,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION)) KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+ KODI_VISUALISATION_FISHBMC_LICENSE_FILES = visualization.fishbmc/LICENSE KODI_VISUALISATION_FISHBMC_DEPENDENCIES = kodi diff --git a/buildroot/package/kodi-visualisation-goom/0001-cross-compile.patch b/buildroot/package/kodi-visualisation-goom/0001-cross-compile.patch deleted file mode 100644 index 8dd0fe910..000000000 --- a/buildroot/package/kodi-visualisation-goom/0001-cross-compile.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix cross-compilation - -Use the cross-compiler and not the host version. - -Patch sent upstream: -https://github.com/notspiff/visualization.goom/pull/4 - -Signed-off-by: Bernd Kuhls - -diff -uNr visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305.org/CMakeLists.txt visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305/CMakeLists.txt ---- visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305.org/CMakeLists.txt 2014-10-31 11:34:21.000000000 +0100 -+++ visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305/CMakeLists.txt 2015-07-19 19:49:43.340054342 +0200 -@@ -13,6 +13,10 @@ - ${KODI_INCLUDE_DIR} - ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/src) - -+get_filename_component( COMPILER_FILENAME "${CMAKE_C_COMPILER}" NAME ) -+string( REGEX REPLACE "-[^-]+$" "" -+ TOOLCHAIN_NAME "${COMPILER_FILENAME}" ) -+ - include(ExternalProject) - set(update_command "") - if(BOOTSTRAP_IN_TREE OR NOT DEFINED BOOTSTRAP_IN_TREE) -@@ -20,7 +24,7 @@ - endif() - externalproject_add(libgoom SOURCE_DIR ${PROJECT_SOURCE_DIR}/lib/goom2k4-0 - "${update_command}" -- CONFIGURE_COMMAND ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/configure --disable-shared --enable-static --with-pic --prefix= -+ CONFIGURE_COMMAND ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/configure --disable-shared --enable-static --with-pic --prefix= --host=${TOOLCHAIN_NAME} - BUILD_COMMAND ${MAKE} - INSTALL_COMMAND "") - diff --git a/buildroot/package/kodi-visualisation-goom/Config.in b/buildroot/package/kodi-visualisation-goom/Config.in index de4d2ef2f..065bc1d77 100644 --- a/buildroot/package/kodi-visualisation-goom/Config.in +++ b/buildroot/package/kodi-visualisation-goom/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_KODI_VISUALISATION_GOOM bool "kodi-visualisation-goom" depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_GLM help GOOM visualiser for Kodi diff --git a/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash b/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash index fa5fbf6c3..4439240d7 100644 --- a/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash +++ b/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 501b8b1d5bd174ec71d57894293ae5eb0c1f41c3b725ab5e7b5a1c5eeea77a7f kodi-visualisation-goom-54da35870930acd1a3a36195dd2c1498ac336b90.tar.gz +sha256 49f193d32a14b26a39d6572fcbdd8b69a9e559f453bca017086336e985bf6b2c kodi-visualisation-goom-2.1.0-Leia.tar.gz +sha256 e5776a7262955801be2e19a84024cf4d0589253c8d77dd09a1db01bf5ed07683 src/Main.cpp diff --git a/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk index a7503a97d..0184d8474 100644 --- a/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk +++ b/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk @@ -4,11 +4,14 @@ # ################################################################################ -KODI_VISUALISATION_GOOM_VERSION = 54da35870930acd1a3a36195dd2c1498ac336b90 -KODI_VISUALISATION_GOOM_SITE = $(call github,notspiff,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION)) +KODI_VISUALISATION_GOOM_VERSION = 2.1.0-Leia +KODI_VISUALISATION_GOOM_SITE = $(call github,xbmc,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION)) KODI_VISUALISATION_GOOM_LICENSE = GPL-2.0+ KODI_VISUALISATION_GOOM_LICENSE_FILES = src/Main.cpp -KODI_VISUALISATION_GOOM_DEPENDENCIES = kodi +KODI_VISUALISATION_GOOM_DEPENDENCIES = glm kodi + +KODI_VISUALISATION_GOOM_CONF_OPTS += \ + -DCMAKE_C_FLAGS="-std=c11" $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch b/buildroot/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch deleted file mode 100644 index 8de96a6de..000000000 --- a/buildroot/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9c428c3c9f120a11468f98546bcc754d2c3302af Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 30 Jul 2015 10:02:15 +0200 -Subject: [PATCH] FindOpenGLES2: also search for egl with pkg-config - -The non-pkg-config path looks for both EGL *and* OpenGL ES, but not -the pkg-config path, which might lead to missing libraries/headers if -egl.pc has more header paths or libraries than glesv2.pc. - -Signed-off-by: Thomas Petazzoni ---- - CMakeLists.txt | 2 +- - FindOpenGLES2.cmake | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8b084cf..81bbe27 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,7 +35,7 @@ - endif() - endif() - -- include_directories(${OpenGL_INCLUDE_DIR} -+ include_directories(${OpenGL_INCLUDE_DIR} ${OpenGLES2_INCLUDE_DIRS} - ${KODI_INCLUDE_DIR} - ${p8-platform_INCLUDE_DIRS} - ${PROJECT_SOURCE_DIR}/lib/kissfft -diff --git a/FindOpenGLES2.cmake b/FindOpenGLES2.cmake -index e1b7d21..2a9ce0d 100644 ---- a/FindOpenGLES2.cmake -+++ b/FindOpenGLES2.cmake -@@ -7,7 +7,7 @@ - - find_package(PkgConfig) - if(PKG_CONFIG_FOUND) -- pkg_check_modules(OpenGLES2 glesv2) -+ pkg_check_modules(OpenGLES2 glesv2 egl) - endif(PKG_CONFIG_FOUND) - - if(NOT OPENGLES2_FOUND) --- -2.5.0 - diff --git a/buildroot/package/kodi-visualisation-shadertoy/Config.in b/buildroot/package/kodi-visualisation-shadertoy/Config.in index 3b981d0bf..1fabba5ef 100644 --- a/buildroot/package/kodi-visualisation-shadertoy/Config.in +++ b/buildroot/package/kodi-visualisation-shadertoy/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_VISUALISATION_SHADERTOY bool "kodi-visualisation-shadertoy" + select BR2_PACKAGE_GLM select BR2_PACKAGE_LIBPLATFORM help Shadertoy visualiser for Kodi diff --git a/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash index a0df397e8..fd29651b6 100644 --- a/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash +++ b/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 4456e88bc94bcb3e2481286b27926a1f6d85d6f857de31a46d50f44fead01abd kodi-visualisation-shadertoy-v1.1.5.tar.gz +sha256 7b09de334ed3c96d2e2552e0594b8f76c11e36edfc10efd725851140132a4d4f kodi-visualisation-shadertoy-1.2.3-Leia.tar.gz +sha256 bf8d322650b3d36c6781a9d14c6194530d5677c14291d51e2a3992c6550a62da src/main.cpp diff --git a/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk index 923891595..add0f3dde 100644 --- a/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk +++ b/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_SHADERTOY_VERSION = v1.1.5 -KODI_VISUALISATION_SHADERTOY_SITE = $(call github,notspiff,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION)) +KODI_VISUALISATION_SHADERTOY_VERSION = 1.2.3-Leia +KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION)) KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+ KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = src/main.cpp -KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = kodi libplatform +KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = glm kodi libplatform $(eval $(cmake-package)) diff --git a/buildroot/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch b/buildroot/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch new file mode 100644 index 000000000..5b1bb0c47 --- /dev/null +++ b/buildroot/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch @@ -0,0 +1,30 @@ +From b2c54c1043c2396678005b578e85db30bdf5ccb9 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 18 Jan 2020 20:22:41 +0100 +Subject: [PATCH] [Backport] Add missing cstddef include + +Backported from https://github.com/xbmc/visualization.spectrum/pull/37 + +Patch sent upstream: +https://github.com/xbmc/visualization.spectrum/pull/38 + +Signed-off-by: Bernd Kuhls +--- + src/opengl_spectrum.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/opengl_spectrum.cpp b/src/opengl_spectrum.cpp +index 05409ea..2441fd6 100644 +--- a/src/opengl_spectrum.cpp ++++ b/src/opengl_spectrum.cpp +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + #include + #include +-- +2.20.1 + diff --git a/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash index 6c892ed0b..4064184a7 100644 --- a/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash +++ b/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 7ee78ff5c24e3f81b6e2a9208237f34667cb9faa5453d7bdb900ab65245973f1 kodi-visualisation-spectrum-v1.1.1.tar.gz +sha256 ec88defbb90fdb03f075abdba39c436906a8fbad8f034da3e3b31f75842206cc kodi-visualisation-spectrum-3.0.2-Leia.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk index 3ab2c9975..c3d61c1ef 100644 --- a/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk +++ b/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk @@ -4,8 +4,8 @@ # ################################################################################ -KODI_VISUALISATION_SPECTRUM_VERSION = v1.1.1 -KODI_VISUALISATION_SPECTRUM_SITE = $(call github,notspiff,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION)) +KODI_VISUALISATION_SPECTRUM_VERSION = 3.0.2-Leia +KODI_VISUALISATION_SPECTRUM_SITE = $(call github,xbmc,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION)) KODI_VISUALISATION_SPECTRUM_LICENSE = GPL-2.0+ KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = COPYING KODI_VISUALISATION_SPECTRUM_DEPENDENCIES = kodi diff --git a/buildroot/package/kodi-visualisation-waveforhue/Config.in b/buildroot/package/kodi-visualisation-waveforhue/Config.in deleted file mode 100644 index 9694027d2..000000000 --- a/buildroot/package/kodi-visualisation-waveforhue/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_KODI_VISUALISATION_WAVEFORHUE - bool "kodi-visualisation-waveforhue" - help - WaveForHue visualiser for Kodi - - https://github.com/notspiff/visualization.waveforhue diff --git a/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash b/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash deleted file mode 100644 index e7e97f1d8..000000000 --- a/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 80c466c55aee97d01442892135d4785070333e39f45942da17b65239758e5ae9 kodi-visualisation-waveforhue-b1805dbdba07e5e5b62115490c703aca43e9065c.tar.gz diff --git a/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk b/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk deleted file mode 100644 index 3ff32e658..000000000 --- a/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-visualisation-waveforhue -# -################################################################################ - -KODI_VISUALISATION_WAVEFORHUE_VERSION = b1805dbdba07e5e5b62115490c703aca43e9065c -KODI_VISUALISATION_WAVEFORHUE_SITE = $(call github,hardyt,visualization.waveforhue,$(KODI_VISUALISATION_WAVEFORHUE_VERSION)) -KODI_VISUALISATION_WAVEFORHUE_LICENSE = GPL-2.0+ -KODI_VISUALISATION_WAVEFORHUE_LICENSE_FILES = COPYING -KODI_VISUALISATION_WAVEFORHUE_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash index 1fdecbede..80808663c 100644 --- a/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash +++ b/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 cf10d8d78cb2bde4a0a21bb7e467445617b46593c093ef05f336f95a048f2d54 kodi-visualisation-waveform-v1.1.0.tar.gz +sha256 c5fbf48c2251b61d9abfcd679a750199f5efc78e63fded9a1482cfd9b41d0b5b kodi-visualisation-waveform-3.1.1-Leia.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk index d906c653c..2d65df853 100644 --- a/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk +++ b/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk @@ -4,8 +4,8 @@ # ################################################################################ -KODI_VISUALISATION_WAVEFORM_VERSION = v1.1.0 -KODI_VISUALISATION_WAVEFORM_SITE = $(call github,notspiff,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION)) +KODI_VISUALISATION_WAVEFORM_VERSION = 3.1.1-Leia +KODI_VISUALISATION_WAVEFORM_SITE = $(call github,xbmc,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION)) KODI_VISUALISATION_WAVEFORM_LICENSE = GPL-2.0+ KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = COPYING KODI_VISUALISATION_WAVEFORM_DEPENDENCIES = kodi diff --git a/buildroot/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/buildroot/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch index 0b88ce9d2..5abb77e77 100644 --- a/buildroot/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch +++ b/buildroot/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch @@ -17,9 +17,9 @@ Signed-off-by: Bernd Kuhls diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in index 76626ec..ffb8e1d 100644 ---- a/project/cmake/KodiConfig.cmake.in -+++ b/project/cmake/KodiConfig.cmake.in -@@ -7,7 +7,7 @@ if(NOT @APP_NAME_UC@_PREFIX) +--- a/cmake/KodiConfig.cmake.in ++++ b/cmake/KodiConfig.cmake.in +@@ -8,7 +8,7 @@ if(NOT @APP_NAME_UC@_PREFIX) set(@APP_NAME_UC@_PREFIX @APP_PREFIX@) endif() if(NOT @APP_NAME_UC@_INCLUDE_DIR) @@ -28,7 +28,7 @@ index 76626ec..ffb8e1d 100644 endif() if(NOT @APP_NAME_UC@_LIB_DIR) set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) -@@ -18,7 +18,7 @@ endif() +@@ -20,7 +20,7 @@ endif() if(NOT WIN32) set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") endif() diff --git a/buildroot/package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch b/buildroot/package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch deleted file mode 100644 index 80bf954d5..000000000 --- a/buildroot/package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch +++ /dev/null @@ -1,39 +0,0 @@ -CMake: Remove dependency on gmp and libintl from FindPython.cmake - -Downloaded from Openelec: -https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/mediacenter/kodi/patches/kodi-998.02-cmake-python.patch - -The dependency for libintl and gmp was introduced by this commit -https://github.com/xbmc/xbmc/commit/8558d672e98b62f3ea0126ba491376add8ed71cb -without further explanation and, apparently, without necessity. - -A question asking whether this is really needed was sent upstream: -https://github.com/xbmc/xbmc/pull/10973#pullrequestreview-34179550 - -Signed-off-by: Bernd Kuhls - -diff -Naur kodi-17.1-Krypton/project/cmake/modules/FindPython.cmake kodi-17.1-Krypton.patch/project/cmake/modules/FindPython.cmake ---- kodi-17.1-Krypton/project/cmake/modules/FindPython.cmake 2017-03-20 17:17:49.000000000 +0100 -+++ kodi-17.1-Krypton.patch/project/cmake/modules/FindPython.cmake 2017-03-30 11:10:01.065718667 +0200 -@@ -16,14 +16,12 @@ - if(KODI_DEPENDSBUILD) - find_library(FFI_LIBRARY ffi REQUIRED) - find_library(EXPAT_LIBRARY expat REQUIRED) -- find_library(INTL_LIBRARY intl REQUIRED) -- find_library(GMP_LIBRARY gmp REQUIRED) - - if(NOT CORE_SYSTEM_NAME STREQUAL android) - set(PYTHON_DEP_LIBRARIES pthread dl util) - endif() - -- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) -+ set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${PYTHON_DEP_LIBRARIES}) - else() - find_package(PythonLibs 2.7 REQUIRED) - list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES}) -@@ -36,4 +34,4 @@ - set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) - endif() - --mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY) -+mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY) diff --git a/buildroot/package/kodi/0002-Fix-crosscompiling-issues.patch b/buildroot/package/kodi/0002-Fix-crosscompiling-issues.patch new file mode 100644 index 000000000..12bb66dde --- /dev/null +++ b/buildroot/package/kodi/0002-Fix-crosscompiling-issues.patch @@ -0,0 +1,76 @@ +From d2c343a20bb61098d0450b15ea2d1dacd28d954a Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 12 Aug 2018 15:13:24 +0200 +Subject: [PATCH] Fix crosscompiling issues + +The codepath for KODI_DEPENDSBUILD needs to be used in order to provide +the correct crosscompiling options to ffmpeg. The CMake option +KODI_DEPENDSBUILD itself can not be enabled because it disables the +internal build of libdvd*. + +To link kodi.bin with the statically built ffmpeg libraries kodi uses +a wrapper script which calls pkgconfig. Our pkgconfig is patched to +alter paths which breaks the link command in this case, to fix this +PKG_CONFIG_SYSROOT_DIR was added. + +Also remove configure option --cpu from ffmpeg_conf to fix build +errors. + +Signed-off-by: Bernd Kuhls +--- + project/cmake/modules/FindFFMPEG.cmake | 16 +++++++--------- + tools/depends/target/ffmpeg/CMakeLists.txt | 2 +- + 2 files changed, 8 insertions(+), 10 deletions(-) + +diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake +index 28cc80710e..1ac8793149 100644 +--- a/cmake/modules/FindFFMPEG.cmake ++++ b/cmake/modules/FindFFMPEG.cmake +@@ -234,14 +234,12 @@ + -DENABLE_VAAPI=${ENABLE_VAAPI} + -DENABLE_VDPAU=${ENABLE_VDPAU}) + +- if(KODI_DEPENDSBUILD) + set(CROSS_ARGS -DDEPENDS_PATH=${DEPENDS_PATH} + -DPKG_CONFIG_EXECUTABLE=${PKG_CONFIG_EXECUTABLE} + -DCROSSCOMPILING=${CMAKE_CROSSCOMPILING} + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} +- -DOS=${OS} ++ -DOS=linux + -DCMAKE_AR=${CMAKE_AR}) +- endif() + set(LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}) + list(APPEND LINKER_FLAGS ${SYSTEM_LDFLAGS}) + +@@ -280,12 +278,12 @@ + "#!${BASH_COMMAND} + if [[ $@ == *${APP_NAME_LC}.bin* || $@ == *${APP_NAME_LC}${APP_BINARY_SUFFIX}* || $@ == *${APP_NAME_LC}.so* || $@ == *${APP_NAME_LC}-test* ]] + then +- avformat=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavcodec` +- avcodec=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavformat` +- avfilter=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavfilter` +- avutil=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavutil` +- swscale=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswscale` +- swresample=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample` ++ avformat=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavcodec` ++ avcodec=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavformat` ++ avfilter=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavfilter` ++ avutil=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavutil` ++ swscale=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswscale` ++ swresample=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample` + gnutls=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors gnutls` + $@ $avcodec $avformat $avcodec $avfilter $swscale $swresample -lpostproc $gnutls + else +diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt +index fda6b0cac4..af3afa6b60 100644 +--- a/tools/depends/target/ffmpeg/CMakeLists.txt ++++ b/tools/depends/target/ffmpeg/CMakeLists.txt +@@ -13,7 +13,7 @@ + if(CROSSCOMPILING) + set(pkgconf "PKG_CONFIG_LIBDIR=${DEPENDS_PATH}/lib/pkgconfig") + list(APPEND ffmpeg_conf --pkg-config=${PKG_CONFIG_EXECUTABLE} --pkg-config-flags=--static) +- list(APPEND ffmpeg_conf --enable-cross-compile --cpu=${CPU} --arch=${CPU} --target-os=${OS}) ++ list(APPEND ffmpeg_conf --enable-cross-compile --arch=${CPU} --target-os=${OS}) + list(APPEND ffmpeg_conf --ar=${CMAKE_AR} --strip=${CMAKE_STRIP}) + message(STATUS "CROSS: ${ffmpeg_conf}") + endif() diff --git a/buildroot/package/kodi/0003-Add-missing-cassert-includes.patch b/buildroot/package/kodi/0003-Add-missing-cassert-includes.patch new file mode 100644 index 000000000..ec52f32d0 --- /dev/null +++ b/buildroot/package/kodi/0003-Add-missing-cassert-includes.patch @@ -0,0 +1,50 @@ +From 711845d533f9f6b5fe68b7cbcc8f369ce7efe445 Mon Sep 17 00:00:00 2001 +From: Craig Andrews +Date: Thu, 5 Dec 2019 14:49:50 -0500 +Subject: [PATCH] Add missing cassert includes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without these includes, ‘assert’ was not declared in this scope errors +occur. + +Backport of https://github.com/xbmc/xbmc/pull/17000 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/17213 + +Signed-off-by: Bernd Kuhls +--- + xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp | 2 ++ + xbmc/windowing/GraphicContext.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp +index 222d1fa2c8..070ea0ae46 100644 +--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp ++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp +@@ -33,6 +33,8 @@ + #include "utils/Variant.h" + #include "ServiceBroker.h" + ++#include ++ + #define SETTING_PROFILE_NAME "profile.name" + #define SETTING_PROFILE_IMAGE "profile.image" + #define SETTING_PROFILE_DIRECTORY "profile.directory" +diff --git a/xbmc/windowing/GraphicContext.cpp b/xbmc/windowing/GraphicContext.cpp +index 1ced49671b..0ddbe64c9f 100644 +--- a/xbmc/windowing/GraphicContext.cpp ++++ b/xbmc/windowing/GraphicContext.cpp +@@ -24,6 +24,8 @@ + #include "guilib/GUIWindowManager.h" + #include "guilib/TextureManager.h" + ++#include ++ + using namespace KODI::MESSAGING; + + CGraphicContext::CGraphicContext(void) = default; +-- +2.20.1 + diff --git a/buildroot/package/kodi/0003-cmake-iconv-is-a-required-dependency.patch b/buildroot/package/kodi/0003-cmake-iconv-is-a-required-dependency.patch deleted file mode 100644 index b95771c52..000000000 --- a/buildroot/package/kodi/0003-cmake-iconv-is-a-required-dependency.patch +++ /dev/null @@ -1,92 +0,0 @@ -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/buildroot/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch b/buildroot/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch new file mode 100644 index 000000000..607c80610 --- /dev/null +++ b/buildroot/package/kodi/0004-Backport-Add-missing-cstddef-includes.patch @@ -0,0 +1,44 @@ +From d1b2a27d2d2795fe82c103b49faef74b55df22c7 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 18 Jan 2020 14:49:16 +0100 +Subject: [PATCH] [Backport] Add missing cstddef includes + +Backport of https://github.com/xbmc/xbmc/pull/17214 + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/17215 + +Signed-off-by: Bernd Kuhls +--- + .../rendering/VideoRenderers/RPRendererGuiTexture.cpp | 2 ++ + xbmc/pictures/SlideShowPicture.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp b/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp +index 5485358cad..ad2bf1b984 100644 +--- a/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp ++++ b/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp +@@ -17,6 +17,8 @@ + using namespace DirectX; + #endif + ++#include ++ + using namespace KODI; + using namespace RETRO; + +diff --git a/xbmc/pictures/SlideShowPicture.cpp b/xbmc/pictures/SlideShowPicture.cpp +index 05848191d2..08fc754471 100644 +--- a/xbmc/pictures/SlideShowPicture.cpp ++++ b/xbmc/pictures/SlideShowPicture.cpp +@@ -32,6 +32,8 @@ using namespace DirectX; + using namespace Microsoft::WRL; + #endif + ++#include ++ + #define IMMEDIATE_TRANSITION_TIME 20 + + #define PICTURE_MOVE_AMOUNT 0.02f +-- +2.20.1 + diff --git a/buildroot/package/kodi/0004-Fix-ffmpeg-build-for-mips.patch b/buildroot/package/kodi/0004-Fix-ffmpeg-build-for-mips.patch deleted file mode 100644 index 709a2d39d..000000000 --- a/buildroot/package/kodi/0004-Fix-ffmpeg-build-for-mips.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e3882a7d6c2e47731c0435d0faa3594041d58a2c Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 12 Aug 2018 15:12:29 +0200 -Subject: [PATCH] Fix ffmpeg build for mips - -Backported from upstream master branch: -https://github.com/xbmc/xbmc/commit/71e09dd1ac66059e31e6240352da7091d820ef83 - -Signed-off-by: Bernd Kuhls ---- - tools/depends/target/ffmpeg/CMakeLists.txt | 2 +- - tools/depends/target/ffmpeg/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt -index 0a9e9d38ea..fda6b0cac4 100644 ---- a/tools/depends/target/ffmpeg/CMakeLists.txt -+++ b/tools/depends/target/ffmpeg/CMakeLists.txt -@@ -63,7 +63,7 @@ endif() - if(CPU MATCHES arm OR CORE_SYSTEM_NAME STREQUAL rbpi) - list(APPEND ffmpeg_conf --enable-pic --disable-armv5te --disable-armv6t2) - elseif(CPU MATCHES mips) -- list(APPEND ffmpeg_conf --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2) -+ list(APPEND ffmpeg_conf --disable-mips32r2 --disable-mipsdsp --disable-mipsdspr2) - endif() - - find_package(GnuTls) -diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile -index ea1113d293..098f6c0c14 100644 ---- a/tools/depends/target/ffmpeg/Makefile -+++ b/tools/depends/target/ffmpeg/Makefile -@@ -58,7 +58,7 @@ ifeq ($(findstring arm, $(CPU)), arm) - ffmpg_config += --enable-pic --disable-armv5te --disable-armv6t2 - endif - ifeq ($(findstring mips, $(CPU)), mips) -- ffmpg_config += --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2 -+ ffmpg_config += --disable-mips32r2 --disable-mipsdsp --disable-mipsdspr2 - endif - ifeq ($(Configuration), Release) - ffmpg_config += --disable-debug --- -2.18.0 - diff --git a/buildroot/package/kodi/0005-Fix-crosscompiling-issues.patch b/buildroot/package/kodi/0005-Fix-crosscompiling-issues.patch deleted file mode 100644 index 63f71cabe..000000000 --- a/buildroot/package/kodi/0005-Fix-crosscompiling-issues.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d2c343a20bb61098d0450b15ea2d1dacd28d954a Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 12 Aug 2018 15:13:24 +0200 -Subject: [PATCH] Fix crosscompiling issues - -The codepath for KODI_DEPENDSBUILD needs to be used in order to provide -the correct crosscompiling options to ffmpeg. The CMake option -KODI_DEPENDSBUILD itself can not be enabled because it disables the -internal build of libdvd*. - -To link kodi.bin with the statically built ffmpeg libraries kodi uses -a wrapper script which calls pkgconfig. Our pkgconfig is patched to -alter paths which breaks the link command in this case, to fix this -PKG_CONFIG_SYSROOT_DIR was added. - -Also remove configure option --cpu from ffmpeg_conf to fix build -errors. - -Signed-off-by: Bernd Kuhls ---- - project/cmake/modules/FindFFMPEG.cmake | 16 +++++++--------- - tools/depends/target/ffmpeg/CMakeLists.txt | 2 +- - 2 files changed, 8 insertions(+), 10 deletions(-) - -diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake -index 28cc80710e..1ac8793149 100644 ---- a/project/cmake/modules/FindFFMPEG.cmake -+++ b/project/cmake/modules/FindFFMPEG.cmake -@@ -233,16 +233,14 @@ if(NOT FFMPEG_FOUND) - message(STATUS "FFMPEG_URL: ${FFMPEG_URL}") - endif() - -- if(KODI_DEPENDSBUILD) - set(CROSS_ARGS -DDEPENDS_PATH=${DEPENDS_PATH} - -DPKG_CONFIG_EXECUTABLE=${PKG_CONFIG_EXECUTABLE} - -DCROSSCOMPILING=${CMAKE_CROSSCOMPILING} - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -- -DOS=${OS} -+ -DOS=linux - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_AR=${CMAKE_AR}) -- endif() - - externalproject_add(ffmpeg - URL ${FFMPEG_URL} -@@ -270,12 +268,12 @@ if(NOT FFMPEG_FOUND) - "#!/bin/bash - if [[ $@ == *${APP_NAME_LC}.bin* || $@ == *${APP_NAME_LC}.so* || $@ == *${APP_NAME_LC}-test* ]] - then -- avformat=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavcodec` -- avcodec=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavformat` -- avfilter=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavfilter` -- avutil=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavutil` -- swscale=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswscale` -- swresample=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample` -+ avformat=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavcodec` -+ avcodec=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavformat` -+ avfilter=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavfilter` -+ avutil=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavutil` -+ swscale=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswscale` -+ swresample=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample` - gnutls=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors gnutls` - $@ $avcodec $avformat $avcodec $avfilter $swscale $swresample -lpostproc $gnutls - else -diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt -index fda6b0cac4..af3afa6b60 100644 ---- a/tools/depends/target/ffmpeg/CMakeLists.txt -+++ b/tools/depends/target/ffmpeg/CMakeLists.txt -@@ -9,7 +9,7 @@ set(ffmpeg_conf "") - if(CROSSCOMPILING) - set(pkgconf "PKG_CONFIG_LIBDIR=${DEPENDS_PATH}/lib/pkgconfig") - list(APPEND ffmpeg_conf --pkg-config=${PKG_CONFIG_EXECUTABLE} --pkg-config-flags=--static) -- list(APPEND ffmpeg_conf --enable-cross-compile --cpu=${CPU} --arch=${CPU} --target-os=${OS}) -+ list(APPEND ffmpeg_conf --enable-cross-compile --arch=${CPU} --target-os=${OS}) - list(APPEND ffmpeg_conf --cc=${CMAKE_C_COMPILER} --cxx=${CMAKE_CXX_COMPILER} --ar=${CMAKE_AR}) - message(STATUS "CROSS: ${ffmpeg_conf}") - endif() --- -2.18.0 - diff --git a/buildroot/package/kodi/Config.in b/buildroot/package/kodi/Config.in index 28c56ac1b..b9eea78d5 100644 --- a/buildroot/package/kodi/Config.in +++ b/buildroot/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++, 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" depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_HOST_GCC_AT_LEAST_4_6 \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ || BR2_TOOLCHAIN_USES_MUSL \ || !BR2_PACKAGE_PYTHON \ @@ -18,13 +17,6 @@ comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, t config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS bool -config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_AML - bool - default y - depends on BR2_PACKAGE_LIBAMCODEC - depends on BR2_PACKAGE_ODROID_MALI - select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS - config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI bool default y @@ -32,6 +24,27 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI # https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake#L12 depends on BR2_arm1176jzf_s || BR2_cortex_a7 || BR2_cortex_a53 depends on BR2_PACKAGE_RPI_USERLAND + depends on BR2_PACKAGE_HAS_UDEV # libinput + select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GL + bool + default y + depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp + depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp + depends on BR2_PACKAGE_WAYLAND # waylandpp + select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GLES + bool + default y + depends on BR2_PACKAGE_HAS_LIBGLES + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp + depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp + depends on BR2_PACKAGE_WAYLAND # waylandpp select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL @@ -48,7 +61,6 @@ comment "kodi needs an OpenGL EGL backend with OpenGL support" menuconfig BR2_PACKAGE_KODI bool "kodi" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_HOST_GCC_AT_LEAST_4_6 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_MUSL @@ -59,10 +71,12 @@ menuconfig BR2_PACKAGE_KODI depends on BR2_PACKAGE_PYTHON depends on !BR2_PACKAGE_PYTHON_PYC_ONLY select BR2_NEEDS_HOST_JAVA - select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_FLATBUFFERS + select BR2_PACKAGE_FMT select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_FSTRCMP select BR2_PACKAGE_GNUTLS select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBCDIO @@ -70,6 +84,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBFRIBIDI select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST select BR2_PACKAGE_LIBSAMPLERATE select BR2_PACKAGE_LZO @@ -78,17 +93,16 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE_UCP select BR2_PACKAGE_PYTHON_BSDDB - select BR2_PACKAGE_PYTHON_BZIP2 select BR2_PACKAGE_PYTHON_CURSES select BR2_PACKAGE_PYTHON_PYEXPAT select BR2_PACKAGE_PYTHON_SQLITE select BR2_PACKAGE_PYTHON_SSL select BR2_PACKAGE_PYTHON_UNICODEDATA select BR2_PACKAGE_PYTHON_ZLIB + select BR2_PACKAGE_RAPIDJSON select BR2_PACKAGE_SQLITE select BR2_PACKAGE_TAGLIB select BR2_PACKAGE_TINYXML - select BR2_PACKAGE_YAJL select BR2_PACKAGE_ZLIB select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support help @@ -118,7 +132,6 @@ config BR2_PACKAGE_KODI_AVAHI config BR2_PACKAGE_KODI_BLUEZ bool "bluetooth" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils - depends on !BR2_PACKAGE_BLUEZ_UTILS # bluez5_utils depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS help @@ -161,11 +174,6 @@ config BR2_PACKAGE_KODI_LCMS2 help Enable color management support. -config BR2_PACKAGE_KODI_LIRC - bool "lirc" - help - Enable lirc support - config BR2_PACKAGE_KODI_LIBMICROHTTPD bool "web server" depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd @@ -190,23 +198,28 @@ config BR2_PACKAGE_KODI_MYSQL help Enable MySQL support -config BR2_PACKAGE_KODI_NONFREE - bool "nonfree components" - help - Enable components with non-free licenses. This option - currently only controls support for RAR archives. - choice prompt "platform" default BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL -config BR2_PACKAGE_KODI_PLATFORM_AML - bool "AMLogic" - depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_AML - config BR2_PACKAGE_KODI_PLATFORM_RBPI bool "Raspberry Pi" depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + +config BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL + bool "Wayland/OpenGL" + depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GL + select BR2_PACKAGE_LIBGLU + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_WAYLANDPP + +config BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES + bool "Wayland/GLES" + depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GLES + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_WAYLANDPP config BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL bool "X11/OpenGL" @@ -242,12 +255,6 @@ config BR2_PACKAGE_KODI_LIBSMBCLIENT help Enable Samba support -config BR2_PACKAGE_KODI_LIBSSH - bool "ssh" - select BR2_PACKAGE_LIBSSH - help - Enable sftp virtual filesystem using libssh. - config BR2_PACKAGE_KODI_LIBTHEORA bool "theora" select BR2_PACKAGE_LIBTHEORA @@ -267,13 +274,19 @@ config BR2_PACKAGE_KODI_LIBUSB config BR2_PACKAGE_KODI_LIBVA bool "va" - depends on BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL + depends on \ + BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL || \ + BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES || \ + BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL select BR2_PACKAGE_LIBVA help Enable libva support. -comment "libva support needs platform 'X11/OpenGL'" - depends on !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL +comment "libva support needs platform 'Wayland' or 'X11/OpenGL'" + depends on \ + !BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL && \ + !BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES && \ + !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL config BR2_PACKAGE_KODI_LIBVDPAU bool "vdpau" @@ -298,7 +311,6 @@ config BR2_PACKAGE_KODI_OPTICALDRIVE menu "Audio decoder addons" source "package/kodi-audiodecoder-modplug/Config.in" source "package/kodi-audiodecoder-nosefart/Config.in" - source "package/kodi-audiodecoder-opus/Config.in" source "package/kodi-audiodecoder-sidplay/Config.in" source "package/kodi-audiodecoder-snesapu/Config.in" source "package/kodi-audiodecoder-stsound/Config.in" @@ -353,7 +365,6 @@ menu "Screensavers" source "package/kodi-screensaver-greynetic/Config.in" source "package/kodi-screensaver-matrixtrails/Config.in" source "package/kodi-screensaver-pingpong/Config.in" - source "package/kodi-screensaver-planestate/Config.in" source "package/kodi-screensaver-pyro/Config.in" source "package/kodi-screensaver-rsxs/Config.in" source "package/kodi-screensaver-stars/Config.in" @@ -363,12 +374,16 @@ menu "Skins" source "package/kodi-skin-confluence/Config.in" endmenu +menu "Virtual file systems" + source "package/kodi-vfs-rar/Config.in" + source "package/kodi-vfs-sftp/Config.in" +endmenu + menu "Visualisations" source "package/kodi-visualisation-fishbmc/Config.in" source "package/kodi-visualisation-goom/Config.in" source "package/kodi-visualisation-shadertoy/Config.in" source "package/kodi-visualisation-spectrum/Config.in" - source "package/kodi-visualisation-waveforhue/Config.in" source "package/kodi-visualisation-waveform/Config.in" endmenu diff --git a/buildroot/package/kodi/kodi.hash b/buildroot/package/kodi/kodi.hash index 2b2e5e64f..578befec1 100644 --- a/buildroot/package/kodi/kodi.hash +++ b/buildroot/package/kodi/kodi.hash @@ -1,12 +1,7 @@ # Locally computed -sha256 c8312fe92e5bab1cdac1da93d60baed88fa1574146c50c44e3c86d01671c2b1d kodi-17.6-Krypton.tar.gz -# Locally computed - ffmpeg -sha256 7df8bce40765b39de5766ca9d08b5b9ac1f498c65c805c989461b907cee6b7c0 3.1.11-Krypton-17.5.tar.gz -# Locally computed - libdvdcss -sha256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 2f12236.tar.gz -# Locally computed - libdvdnav -sha256 312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d 981488f.tar.gz -# Locally computed - libdvdread -sha256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b 17d99db.tar.gz -# Locally computed -sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL +sha256 108979df8b41ab4168f5cdc0233f46e38767eda5921f4ccae16584e98d0d6b29 kodi-18.5-Leia.tar.gz +sha256 e11e7594af35f36ab2711252c3d6bb106908f26605498aef4a9be2d7bc001db2 kodi-ffmpeg-4.0.4-Leia-18.4.tar.gz +sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz +sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz +sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz +sha256 9d2396ef3e091d3b82bc84143e070700412984e8589513570f54e0675d1e8851 LICENSE.md diff --git a/buildroot/package/kodi/kodi.mk b/buildroot/package/kodi/kodi.mk index 3ba89abcc..2f2a92a88 100644 --- a/buildroot/package/kodi/kodi.mk +++ b/buildroot/package/kodi/kodi.mk @@ -6,18 +6,23 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION = 17.6-Krypton +KODI_VERSION = 18.5-Leia KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPL-2.0 -KODI_LICENSE_FILES = LICENSE.GPL +KODI_LICENSE_FILES = LICENSE.md # needed for binary addons KODI_INSTALL_STAGING = YES +# kodi recommends building out-of-source +KODI_SUPPORTS_IN_SOURCE_BUILD = NO KODI_DEPENDENCIES = \ - bzip2 \ expat \ + flatbuffers \ + fmt \ fontconfig \ freetype \ + fstrcmp \ gnutls \ + host-flatbuffers \ host-gawk \ host-gettext \ host-gperf \ @@ -26,7 +31,6 @@ KODI_DEPENDENCIES = \ host-nasm \ host-swig \ host-xmlstarlet \ - host-zip \ libass \ libcdio \ libcrossguid \ @@ -39,44 +43,48 @@ KODI_DEPENDENCIES = \ openssl \ pcre \ python \ + rapidjson \ sqlite \ taglib \ tinyxml \ - yajl \ zlib -KODI_SUBDIR = project/cmake - -# taken from tools/depends/target/ffmpeg/FFMPEG-VERSION -KODI_FFMPEG_VERSION = 3.1.11-Krypton-17.5 +# taken from tools/depends/target/*/*-VERSION +KODI_FFMPEG_VERSION = 4.0.4-Leia-18.4 +KODI_LIBDVDCSS_VERSION = 1.4.2-Leia-Beta-5 +KODI_LIBDVDNAV_VERSION = 6.0.0-Leia-Alpha-3 +KODI_LIBDVDREAD_VERSION = 6.0.0-Leia-Alpha-3 KODI_EXTRA_DOWNLOADS += \ - https://github.com/xbmc/FFmpeg/archive/$(KODI_FFMPEG_VERSION).tar.gz + $(call github,xbmc,FFmpeg,$(KODI_FFMPEG_VERSION))/kodi-ffmpeg-$(KODI_FFMPEG_VERSION).tar.gz \ + $(call github,xbmc,libdvdcss,$(KODI_LIBDVDCSS_VERSION))/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ + $(call github,xbmc,libdvdnav,$(KODI_LIBDVDNAV_VERSION))/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \ + $(call github,xbmc,libdvdread,$(KODI_LIBDVDREAD_VERSION))/kodi-libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz -KODI_LIBDVDCSS_VERSION = 2f12236 -KODI_LIBDVDNAV_VERSION = 981488f -KODI_LIBDVDREAD_VERSION = 17d99db -KODI_EXTRA_DOWNLOADS += \ - https://github.com/xbmc/libdvdcss/archive/$(KODI_LIBDVDCSS_VERSION).tar.gz \ - https://github.com/xbmc/libdvdnav/archive/$(KODI_LIBDVDNAV_VERSION).tar.gz \ - https://github.com/xbmc/libdvdread/archive/$(KODI_LIBDVDREAD_VERSION).tar.gz +define KODI_CPLUFF_AUTOCONF + cd $(KODI_SRCDIR)/lib/cpluff && ./autogen.sh +endef +KODI_PRE_CONFIGURE_HOOKS += KODI_CPLUFF_AUTOCONF +KODI_DEPENDENCIES += host-automake host-autoconf host-libtool KODI_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(KODI_C_FLAGS)" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(KODI_CXX_FLAGS)" \ + -DENABLE_APP_AUTONAME=OFF \ -DENABLE_CCACHE=OFF \ -DENABLE_DVDCSS=ON \ -DENABLE_INTERNAL_CROSSGUID=OFF \ -DENABLE_INTERNAL_FFMPEG=ON \ - -DFFMPEG_URL=$(KODI_DL_DIR)/$(KODI_FFMPEG_VERSION).tar.gz \ + -DENABLE_INTERNAL_FLATBUFFERS=OFF \ + -DFFMPEG_URL=$(KODI_DL_DIR)/kodi-ffmpeg-$(KODI_FFMPEG_VERSION).tar.gz \ -DKODI_DEPENDSBUILD=OFF \ - -DENABLE_OPENSSL=ON \ + -DENABLE_LDGOLD=OFF \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ + -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ - -DLIBDVDCSS_URL=$(KODI_DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \ - -DLIBDVDNAV_URL=$(KODI_DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \ - -DLIBDVDREAD_URL=$(KODI_DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz \ - -DENABLE_IMX=OFF + -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ + -DLIBDVDNAV_URL=$(KODI_DL_DIR)/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \ + -DLIBDVDREAD_URL=$(KODI_DL_DIR)/kodi-libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz ifeq ($(BR2_ENABLE_LOCALE),) KODI_DEPENDENCIES += libiconv @@ -88,8 +96,7 @@ ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y) ifeq ($(BR2_arm1176jzf_s)$(BR2_cortex_a7)$(BR2_cortex_a53),y) KODI_CONF_OPTS += -DWITH_CPU="$(GCC_TARGET_CPU)" endif -else -ifeq ($(BR2_arceb)$(BR2_arcle),y) +else ifeq ($(BR2_arceb)$(BR2_arcle),y) KODI_CONF_OPTS += -DWITH_ARCH=arc -DWITH_CPU=arc else ifeq ($(BR2_armeb),y) KODI_CONF_OPTS += -DWITH_ARCH=arm -DWITH_CPU=arm @@ -108,7 +115,6 @@ else # see project/cmake/scripts/linux/ArchSetup.cmake KODI_CONF_OPTS += -DWITH_CPU=$(BR2_ARCH) endif -endif ifeq ($(BR2_X86_CPU_HAS_SSE),y) KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON @@ -163,37 +169,31 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) KODI_CXX_FLAGS += -latomic endif -ifeq ($(BR2_PACKAGE_KODI_PLATFORM_AML),y) -KODI_CONF_OPTS += -DENABLE_AML=ON -DENABLE_OPENGLES=ON -# The following line can be removed when bumping to 18.0-Leia, -# see upstream PR 13425 -KODI_CXX_FLAGS += -DMESA_EGL_NO_X11_HEADERS -KODI_DEPENDENCIES += libamcodec odroid-mali -else -KODI_CONF_OPTS += -DENABLE_AML=OFF +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y) +KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=rbpi +KODI_DEPENDENCIES += libinput libxkbcommon rpi-userland endif -ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y) -KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi -DENABLE_OPENGLES=ON -KODI_DEPENDENCIES += rpi-userland -else -# Kodi considers "rpbi" and "linux" as two separate platforms. The -# below options, defined in -# project/cmake/scripts/linux/ArchSetup.cmake are only valid for the -# "linux" platforms. The "rpbi" platform has a different set of -# options, defined in project/cmake/scripts/rbpi/ -KODI_CONF_OPTS += -DENABLE_LDGOLD=OFF +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL),y) +KODI_CONF_OPTS += \ + -DCORE_PLATFORM_NAME=wayland \ + -DWAYLAND_RENDER_SYSTEM=gl +KODI_DEPENDENCIES += libegl libgl libglu libxkbcommon waylandpp +endif + +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES),y) +KODI_CONF_OPTS += \ + -DCORE_PLATFORM_NAME=wayland \ + -DWAYLAND_RENDER_SYSTEM=gles +KODI_C_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl` +KODI_CXX_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl` +KODI_DEPENDENCIES += libegl libgles libxkbcommon waylandpp endif ifeq ($(BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL),y) -KODI_CONF_OPTS += \ - -DENABLE_OPENGL=ON \ - -DENABLE_OPENGLES=OFF \ - -DENABLE_X11=ON +KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=x11 KODI_DEPENDENCIES += libegl libglu libgl xlib_libX11 xlib_libXext \ xlib_libXrandr libdrm -else -KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF endif ifeq ($(BR2_PACKAGE_KODI_MYSQL),y) @@ -203,14 +203,6 @@ else KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=OFF endif -ifeq ($(BR2_PACKAGE_KODI_NONFREE),y) -KODI_CONF_OPTS += -DENABLE_NONFREE=ON -KODI_LICENSE := $(KODI_LICENSE), unrar -KODI_LICENSE_FILES += lib/UnrarXLib/license.txt -else -KODI_CONF_OPTS += -DENABLE_NONFREE=OFF -endif - ifeq ($(BR2_PACKAGE_HAS_UDEV),y) KODI_CONF_OPTS += -DENABLE_UDEV=ON KODI_DEPENDENCIES += udev @@ -298,13 +290,6 @@ else KODI_CONF_OPTS += -DENABLE_AIRTUNES=OFF endif -ifeq ($(BR2_PACKAGE_KODI_LIBSSH),y) -KODI_DEPENDENCIES += libssh -KODI_CONF_OPTS += -DENABLE_SSH=ON -else -KODI_CONF_OPTS += -DENABLE_SSH=OFF -endif - ifeq ($(BR2_PACKAGE_KODI_AVAHI),y) KODI_DEPENDENCIES += avahi KODI_CONF_OPTS += -DENABLE_AVAHI=ON @@ -326,10 +311,8 @@ else KODI_CONF_OPTS += -DENABLE_LCMS2=OFF endif -ifeq ($(BR2_PACKAGE_KODI_LIRC),y) -KODI_CONF_OPTS += -DENABLE_LIRC=ON -else -KODI_CONF_OPTS += -DENABLE_LIRC=OFF +ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) +KODI_DEPENDENCIES += lirc-tools endif ifeq ($(BR2_PACKAGE_KODI_LIBTHEORA),y) @@ -408,11 +391,6 @@ endef define KODI_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/kodi/kodi.service \ $(TARGET_DIR)/usr/lib/systemd/system/kodi.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/kodi.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/kodi.service endef $(eval $(cmake-package)) diff --git a/buildroot/package/kompexsqlite/kompexsqlite.hash b/buildroot/package/kompexsqlite/kompexsqlite.hash index 3c94adf09..8869e9b7d 100644 --- a/buildroot/package/kompexsqlite/kompexsqlite.hash +++ b/buildroot/package/kompexsqlite/kompexsqlite.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 73bec94fe5dd3a24bd8668b3a131a84dbe39a992579eebab1236aa0e73b2c9cc v1.10.12-1.tar.gz +sha256 73bec94fe5dd3a24bd8668b3a131a84dbe39a992579eebab1236aa0e73b2c9cc kompexsqlite-1.10.12-1.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/buildroot/package/kompexsqlite/kompexsqlite.mk b/buildroot/package/kompexsqlite/kompexsqlite.mk index 51b80aa86..a40088fa2 100644 --- a/buildroot/package/kompexsqlite/kompexsqlite.mk +++ b/buildroot/package/kompexsqlite/kompexsqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -KOMPEXSQLITE_VERSION = v1.10.12-1 -KOMPEXSQLITE_SOURCE = $(KOMPEXSQLITE_VERSION).tar.gz -KOMPEXSQLITE_SITE = https://github.com/Aethelflaed/kompex-sqlite-wrapper/archive +KOMPEXSQLITE_VERSION = 1.10.12-1 +KOMPEXSQLITE_SITE = \ + $(call github,Aethelflaed,kompex-sqlite-wrapper,v$(KOMPEXSQLITE_VERSION)) KOMPEXSQLITE_INSTALL_STAGING = YES KOMPEXSQLITE_LICENSE = LGPL-3.0+ (wrapper), Public Domain (bundled sqlite) KOMPEXSQLITE_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/kvazaar/kvazaar.hash b/buildroot/package/kvazaar/kvazaar.hash index aa746ca17..fe3255a6c 100644 --- a/buildroot/package/kvazaar/kvazaar.hash +++ b/buildroot/package/kvazaar/kvazaar.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 480ecfd9b4d2b7d21b355e4a35fcf47b4db7a3b0315b6219d93733db42392bd9 kvazaar-v1.2.0.tar.gz +sha256 480ecfd9b4d2b7d21b355e4a35fcf47b4db7a3b0315b6219d93733db42392bd9 kvazaar-1.2.0.tar.gz sha256 531712277c3543b9ee86c4c4e0e424f531b893a44cc021c74a24b038d8de4d2a COPYING diff --git a/buildroot/package/kvazaar/kvazaar.mk b/buildroot/package/kvazaar/kvazaar.mk index 0cf965dd8..29433d6eb 100644 --- a/buildroot/package/kvazaar/kvazaar.mk +++ b/buildroot/package/kvazaar/kvazaar.mk @@ -4,8 +4,8 @@ # ################################################################################ -KVAZAAR_VERSION = v1.2.0 -KVAZAAR_SITE = $(call github,ultravideo,kvazaar,$(KVAZAAR_VERSION)) +KVAZAAR_VERSION = 1.2.0 +KVAZAAR_SITE = $(call github,ultravideo,kvazaar,v$(KVAZAAR_VERSION)) KVAZAAR_LICENSE = LGPL-2.1+ KVAZAAR_LICENSE_FILES = COPYING KVAZAAR_AUTORECONF = YES diff --git a/buildroot/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch b/buildroot/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch new file mode 100644 index 000000000..be819f27c --- /dev/null +++ b/buildroot/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch @@ -0,0 +1,36 @@ +From 9bf9155804652c0b3a94af9723c79b6de430187b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 24 Feb 2020 00:04:06 +0100 +Subject: [PATCH] Makefile: fix stack-protector tests + +Rename fnostack_protector into fno_stack_protector and +fnostack_protector_all into fnostack_protector_all otherwise build will +fail if -fstack-protector is passed by the toolchain + +Fixes: + - http://autobuild.buildroot.org/results/ad689b08173548af21dd1fb0e827fd561de6dfef + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to kvm@vger.kernel.org] +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 767b6c6..754ed65 100644 +--- a/Makefile ++++ b/Makefile +@@ -55,8 +55,8 @@ COMMON_CFLAGS += -Wignored-qualifiers -Werror + + frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer + fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") +-fnostack_protector := $(call cc-option, -fno-stack-protector, "") +-fnostack_protector_all := $(call cc-option, -fno-stack-protector-all, "") ++fno_stack_protector := $(call cc-option, -fno-stack-protector, "") ++fno_stack_protector_all := $(call cc-option, -fno-stack-protector-all, "") + wno_frame_address := $(call cc-option, -Wno-frame-address, "") + fno_pic := $(call cc-option, -fno-pic, "") + no_pie := $(call cc-option, -no-pie, "") +-- +2.25.0 + diff --git a/buildroot/package/kvm-unit-tests/Config.in b/buildroot/package/kvm-unit-tests/Config.in index 8b7908eee..e470dd615 100644 --- a/buildroot/package/kvm-unit-tests/Config.in +++ b/buildroot/package/kvm-unit-tests/Config.in @@ -14,7 +14,6 @@ config BR2_PACKAGE_KVM_UNIT_TESTS # gcc 4.5 at least. on i386, we use the target gcc, while on # x86-64 we use the host gcc (see .mk file for details) depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || !BR2_i386 - depends on BR2_HOST_GCC_AT_LEAST_4_5 || !BR2_x86_64 depends on BR2_HOSTARCH = "x86_64" || !BR2_x86_64 select BR2_HOSTARCH_NEEDS_IA32_COMPILER if BR2_x86_64=y help @@ -38,7 +37,3 @@ config BR2_PACKAGE_KVM_UNIT_TESTS comment "kvm-unit-tests needs a toolchain w/ gcc >= 4.5" depends on BR2_i386 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - -comment "kvm-unit-tests needs a host gcc >= 4.5" - depends on BR2_x86_64 - depends on !BR2_HOST_GCC_AT_LEAST_4_5 diff --git a/buildroot/package/kvm-unit-tests/kvm-unit-tests.hash b/buildroot/package/kvm-unit-tests/kvm-unit-tests.hash index bb827de93..345877893 100644 --- a/buildroot/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/buildroot/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 346c543de9e953db283072e1c591cab9d0eb775f7fb1fff3d7560f38bdf6bdf2 kvm-unit-tests-kvm-unit-tests-20171020.tar.gz +sha256 346c543de9e953db283072e1c591cab9d0eb775f7fb1fff3d7560f38bdf6bdf2 kvm-unit-tests-kvm-unit-tests-20171020.tar.gz +sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT diff --git a/buildroot/package/kvmtool/kvmtool.hash b/buildroot/package/kvmtool/kvmtool.hash index 428277354..fd841c354 100644 --- a/buildroot/package/kvmtool/kvmtool.hash +++ b/buildroot/package/kvmtool/kvmtool.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 2d55e4521ac040b870db015e1f075d69b89f940242d7ce5708f7d7060d62c0cc kvmtool-f77d646ba01d04be5aad9449ac00719c043fe36e.tar.gz +sha256 2d55e4521ac040b870db015e1f075d69b89f940242d7ce5708f7d7060d62c0cc kvmtool-f77d646ba01d04be5aad9449ac00719c043fe36e.tar.gz +sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING diff --git a/buildroot/package/kyua/kyua.hash b/buildroot/package/kyua/kyua.hash index 298d0d85c..66681692f 100644 --- a/buildroot/package/kyua/kyua.hash +++ b/buildroot/package/kyua/kyua.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 2b8b64a458b642df75086eeb73e8073d105b8d9cff04c9b1a905b68bc8502560 kyua-0.11.tar.gz +sha256 db6e5d341d5cf7e49e50aa361243e19087a00ba33742b0855d2685c0b8e721d6 kyua-0.13.tar.gz +sha256 a6a8f43f6d2ed9b801978cc012cc816c4a9421a6dcea0579d3a40eab4b349674 LICENSE diff --git a/buildroot/package/kyua/kyua.mk b/buildroot/package/kyua/kyua.mk index 9e1c810ac..5caa20391 100644 --- a/buildroot/package/kyua/kyua.mk +++ b/buildroot/package/kyua/kyua.mk @@ -4,12 +4,12 @@ # ################################################################################ -KYUA_VERSION = 0.11 +KYUA_VERSION = 0.13 KYUA_SITE = https://github.com/jmmv/kyua/releases/download/kyua-$(KYUA_VERSION) KYUA_DEPENDENCIES = host-pkgconf atf lutok sqlite KYUA_CONF_OPTS = --without-doxygen --without-atf KYUA_LICENSE = BSD-3-Clause -KYUA_LICENSE_FILES = COPYING +KYUA_LICENSE_FILES = LICENSE KYUA_CONF_ENV = \ kyua_cv_attribute_noreturn=yes \ kyua_cv_getcwd_dyn=yes \ diff --git a/buildroot/package/lapack/Config.in b/buildroot/package/lapack/Config.in index 9687ace82..6cd0810cb 100644 --- a/buildroot/package/lapack/Config.in +++ b/buildroot/package/lapack/Config.in @@ -5,6 +5,7 @@ comment "lapack/blas needs a toolchain w/ fortran" config BR2_PACKAGE_LAPACK bool "lapack/blas" depends on BR2_TOOLCHAIN_HAS_FORTRAN + depends on !BR2_PACKAGE_CLAPACK # _fpu_control is used on PowerPC, but not available with uClibc depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) help diff --git a/buildroot/package/lapack/lapack.hash b/buildroot/package/lapack/lapack.hash index fd3feef55..bac7210c2 100644 --- a/buildroot/package/lapack/lapack.hash +++ b/buildroot/package/lapack/lapack.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 f6c53fd9f56932f3ddb3d5e24c1c07e4cd9b3b08e7f89de9c867125eecc9a1c8 lapack-3.7.1.tgz +sha256 106087f1bb5f46afdfba7f569d0cbe23dacb9a07cd24733765a0e89dbe1ad573 lapack-3.9.0.tar.gz +sha256 d56bd4441b999b80c88df04faf0d8b3d7d3b2bd781cf91242c4188e8a6d0f8be LICENSE diff --git a/buildroot/package/lapack/lapack.mk b/buildroot/package/lapack/lapack.mk index 4e74bbd65..41774f616 100644 --- a/buildroot/package/lapack/lapack.mk +++ b/buildroot/package/lapack/lapack.mk @@ -4,11 +4,10 @@ # ################################################################################ -LAPACK_VERSION = 3.7.1 -LAPACK_SOURCE = lapack-$(LAPACK_VERSION).tgz +LAPACK_VERSION = 3.9.0 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE -LAPACK_SITE = http://www.netlib.org/lapack +LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) LAPACK_INSTALL_STAGING = YES LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON diff --git a/buildroot/package/latencytop/latencytop.hash b/buildroot/package/latencytop/latencytop.hash index 4be004caf..74b8a03a2 100644 --- a/buildroot/package/latencytop/latencytop.hash +++ b/buildroot/package/latencytop/latencytop.hash @@ -1,2 +1,3 @@ # locally computed sha256 9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef latencytop-0.5.tar.gz +sha256 34d1db30ab21eaedb2c191b2787632a960090a0c63da9f5b481d84b23b98c438 latencytop.c diff --git a/buildroot/package/lbase64/lbase64.hash b/buildroot/package/lbase64/lbase64.hash index d835d40b2..34ef21324 100644 --- a/buildroot/package/lbase64/lbase64.hash +++ b/buildroot/package/lbase64/lbase64.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 b83dbc87330a322e5222cd891a6e258b533f5b6c46e8f3c18fc0265e4c991aaa lbase64.tar.gz +sha256 b83dbc87330a322e5222cd891a6e258b533f5b6c46e8f3c18fc0265e4c991aaa lbase64.tar.gz +sha256 a2b4f2d25b56c40801ce4f403541cbc301313048acfaa59c9509024bec57b662 README diff --git a/buildroot/package/lbreakout2/lbreakout2.hash b/buildroot/package/lbreakout2/lbreakout2.hash index 0d305dcd7..56d0a9501 100644 --- a/buildroot/package/lbreakout2/lbreakout2.hash +++ b/buildroot/package/lbreakout2/lbreakout2.hash @@ -2,4 +2,5 @@ md5 1a9238b83f9f13f09b7a4d53e00b4e84 lbreakout2-2.6.5.tar.gz sha1 d92326499165fd368be04378d633e13d42b4d2d7 lbreakout2-2.6.5.tar.gz # Locally computed: -sha256 9104d6175553da3442dc6a5fc407a669e2f5aff3eedc5d30409eb003b7a78d6f lbreakout2-2.6.5.tar.gz +sha256 9104d6175553da3442dc6a5fc407a669e2f5aff3eedc5d30409eb003b7a78d6f lbreakout2-2.6.5.tar.gz +sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/buildroot/package/lcdapi/lcdapi.hash b/buildroot/package/lcdapi/lcdapi.hash index c04ea021f..fc86b66d0 100644 --- a/buildroot/package/lcdapi/lcdapi.hash +++ b/buildroot/package/lcdapi/lcdapi.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 6afdd4238af1fa7ea5f10378601381fc3f535a10504dc7d4ea8eab56e0dda091 lcdapi-v0.11.tar.gz +sha256 6afdd4238af1fa7ea5f10378601381fc3f535a10504dc7d4ea8eab56e0dda091 lcdapi-0.11.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/lcdapi/lcdapi.mk b/buildroot/package/lcdapi/lcdapi.mk index b27abcdbf..f6b14cd2c 100644 --- a/buildroot/package/lcdapi/lcdapi.mk +++ b/buildroot/package/lcdapi/lcdapi.mk @@ -4,17 +4,11 @@ # ################################################################################ -LCDAPI_VERSION = v0.11 -LCDAPI_SITE = $(call github,spdawson,lcdapi,$(LCDAPI_VERSION)) +LCDAPI_VERSION = 0.11 +LCDAPI_SITE = $(call github,spdawson,lcdapi,v$(LCDAPI_VERSION)) LCDAPI_LICENSE = LGPL-2.1+ LCDAPI_LICENSE_FILES = COPYING LCDAPI_AUTORECONF = YES LCDAPI_INSTALL_STAGING = YES -define LCDAPI_CREATE_M4_DIR - mkdir -p $(@D)/m4 -endef - -LCDAPI_POST_PATCH_HOOKS += LCDAPI_CREATE_M4_DIR - $(eval $(autotools-package)) diff --git a/buildroot/package/lcdproc/lcdproc.hash b/buildroot/package/lcdproc/lcdproc.hash index 00f685448..a90d43c1f 100644 --- a/buildroot/package/lcdproc/lcdproc.hash +++ b/buildroot/package/lcdproc/lcdproc.hash @@ -1,3 +1,4 @@ # Locally computed: sha256 843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804 lcdproc-0.5.7.tar.gz sha256 d48a915496c96ff775b377d2222de3150ae5172bfb84a6ec9f9ceab962f97b83 lcdproc-0.5.9.tar.gz +sha256 1b2a567f289f66a143c56353e7b3d4fa5862514a5e3c5cfdf8b02ee5e5aaa953 COPYING diff --git a/buildroot/package/leafnode2/leafnode2.hash b/buildroot/package/leafnode2/leafnode2.hash index 9c94fb9ec..7dfa7cce8 100644 --- a/buildroot/package/leafnode2/leafnode2.hash +++ b/buildroot/package/leafnode2/leafnode2.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 34eba2cbbb871b724c8d5dd402d1c358aeb21ba426beb5658e155ed0d7461075 leafnode-2.0.0.alpha20140727b.tar.bz2 +sha256 34eba2cbbb871b724c8d5dd402d1c358aeb21ba426beb5658e155ed0d7461075 leafnode-2.0.0.alpha20140727b.tar.bz2 +sha256 59d37f745dc5a2d63a51dff344f4ad89f72e76f8c7b7d877f20880d838b1bec9 COPYING +sha256 0c92246a9d3636e0aa6a244f6c481639b2e530fbbb25bc048ce7acd83e1fc5f6 COPYING.LGPL diff --git a/buildroot/package/leafpad/leafpad.hash b/buildroot/package/leafpad/leafpad.hash index be56d4145..e21c07ad2 100644 --- a/buildroot/package/leafpad/leafpad.hash +++ b/buildroot/package/leafpad/leafpad.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c leafpad-0.8.18.1.tar.gz +sha256 959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c leafpad-0.8.18.1.tar.gz +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/lensfun/lensfun.hash b/buildroot/package/lensfun/lensfun.hash index a60f8f461..1a27373f2 100644 --- a/buildroot/package/lensfun/lensfun.hash +++ b/buildroot/package/lensfun/lensfun.hash @@ -2,4 +2,6 @@ sha1 1d978b15aa7304d66a4931fa37ca9f8f89396c16 lensfun-0.3.2.tar.gz md5 247e59a0812ec451f6cd0d20b3379cb5 lensfun-0.3.2.tar.gz # Locally calculated -sha256 ae8bcad46614ca47f5bda65b00af4a257a9564a61725df9c74cb260da544d331 lensfun-0.3.2.tar.gz +sha256 ae8bcad46614ca47f5bda65b00af4a257a9564a61725df9c74cb260da544d331 lensfun-0.3.2.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 docs/gpl-3.0.txt +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c docs/lgpl-3.0.txt diff --git a/buildroot/package/leptonica/leptonica.hash b/buildroot/package/leptonica/leptonica.hash index 14c750c2c..56f864335 100644 --- a/buildroot/package/leptonica/leptonica.hash +++ b/buildroot/package/leptonica/leptonica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 dd7990ab6b6824b0cfed70920824d37b47184240f98db4085f7dbf1250cd4899 leptonica-1.77.0.tar.gz +sha256 e2ed2e81e7a22ddf45d2c05f0bc8b9ae7450545d995bfe28517ba408d14a5a88 leptonica-1.78.0.tar.gz sha256 ca0ac11c7c0acad9599d54990942cc11c9f6d9b569f1a360d774a628819c3518 leptonica-license.txt diff --git a/buildroot/package/leptonica/leptonica.mk b/buildroot/package/leptonica/leptonica.mk index 7c6fa12bb..309c65052 100644 --- a/buildroot/package/leptonica/leptonica.mk +++ b/buildroot/package/leptonica/leptonica.mk @@ -4,7 +4,7 @@ # ################################################################################ -LEPTONICA_VERSION = 1.77.0 +LEPTONICA_VERSION = 1.78.0 LEPTONICA_SITE = http://www.leptonica.org/source LEPTONICA_LICENSE = BSD-2-Clause LEPTONICA_LICENSE_FILES = leptonica-license.txt diff --git a/buildroot/package/less/less.hash b/buildroot/package/less/less.hash index 3a6c799aa..57a857efe 100644 --- a/buildroot/package/less/less.hash +++ b/buildroot/package/less/less.hash @@ -1,2 +1,6 @@ # Locally calculated after checking pgp signature -sha256 f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706 less-487.tar.gz +# using DSA key F153A7C833235259 +# http://www.greenwoodsoftware.com/less/less-551.sig +sha256 ff165275859381a63f19135a8f1f6c5a194d53ec3187f94121ecd8ef0795fe3d less-551.tar.gz +# Locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/less/less.mk b/buildroot/package/less/less.mk index ef3643c0a..3e58d39ca 100644 --- a/buildroot/package/less/less.mk +++ b/buildroot/package/less/less.mk @@ -4,8 +4,8 @@ # ################################################################################ -LESS_VERSION = 487 -LESS_SITE = $(BR2_GNU_MIRROR)/less +LESS_VERSION = 551 +LESS_SITE = http://www.greenwoodsoftware.com/less LESS_LICENSE = GPL-3.0+ LESS_LICENSE_FILES = COPYING LESS_DEPENDENCIES = ncurses diff --git a/buildroot/package/lesstif/lesstif.hash b/buildroot/package/lesstif/lesstif.hash index c2ede8b6a..31a394dbb 100644 --- a/buildroot/package/lesstif/lesstif.hash +++ b/buildroot/package/lesstif/lesstif.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 eb4aa38858c29a4a3bcf605cfe7d91ca41f4522d78d770f69721e6e3a4ecf7e3 lesstif-0.95.2.tar.bz2 +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING.LIB diff --git a/buildroot/package/let-me-create/let-me-create.hash b/buildroot/package/let-me-create/let-me-create.hash index 45b5e55bc..899761786 100644 --- a/buildroot/package/let-me-create/let-me-create.hash +++ b/buildroot/package/let-me-create/let-me-create.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 5f42858a2062f34d2578e9cb1aed3ccb8d2409d908aa4c41a924418666d5f2bd let-me-create-v1.5.2.tar.gz +sha256 5f42858a2062f34d2578e9cb1aed3ccb8d2409d908aa4c41a924418666d5f2bd let-me-create-1.5.2.tar.gz +sha256 8ffc162e1435e810845b09a4c0d534df057a030f4c107778677b6621dc203426 LICENSE diff --git a/buildroot/package/let-me-create/let-me-create.mk b/buildroot/package/let-me-create/let-me-create.mk index 2dd07ef48..faa5e14d9 100644 --- a/buildroot/package/let-me-create/let-me-create.mk +++ b/buildroot/package/let-me-create/let-me-create.mk @@ -4,8 +4,8 @@ # ################################################################################ -LET_ME_CREATE_VERSION = v1.5.2 -LET_ME_CREATE_SITE = $(call github,CreatorDev,LetMeCreate,$(LET_ME_CREATE_VERSION)) +LET_ME_CREATE_VERSION = 1.5.2 +LET_ME_CREATE_SITE = $(call github,CreatorDev,LetMeCreate,v$(LET_ME_CREATE_VERSION)) LET_ME_CREATE_INSTALL_STAGING = YES LET_ME_CREATE_LICENSE = BSD-3-Clause LET_ME_CREATE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/leveldb/0002-Add-install-recipe.patch b/buildroot/package/leveldb/0002-Add-install-recipe.patch deleted file mode 100644 index 29bf4a483..000000000 --- a/buildroot/package/leveldb/0002-Add-install-recipe.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bf646b73391d3d2d0b9780a399dd24880c66b9ab Mon Sep 17 00:00:00 2001 -From: Steve James -Date: Sun, 5 Apr 2015 16:30:46 +0200 -Subject: [PATCH 2/2] Add install recipe - -Upstream-Status: Rejected [https://github.com/google/leveldb/pull/276] - -Signed-off-by: Steve James -Signed-off-by: Thomas Petazzoni -[baruch: update for v1.19] -Signed-off-by: Baruch Siach -[Bernd: update for v1.20] -Signed-off-by: Bernd Kuhls ---- - Makefile | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/Makefile b/Makefile -index 07a5a1ead6fd..c87023db527a 100644 ---- a/Makefile -+++ b/Makefile -@@ -412,3 +412,17 @@ $(SHARED_OUTDIR)/%.o: %.cc - - $(SHARED_OUTDIR)/port/port_posix_sse.o: port/port_posix_sse.cc - $(CXX) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(PLATFORM_SSEFLAGS) -c $< -o $@ -+ -+INSTALL_ROOT = / -+INSTALL_PREFIX= usr/local -+ -+install: all -+ install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb -+ install -D -m 0644 include/leveldb/*.h $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb -+ install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib -+ install -m 0644 $(STATIC_OUTDIR)/libleveldb.a $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib -+ifneq (,$(SHARED_LIBS)) -+ install -m 0755 $(SHARED_OUTDIR)/$(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib -+ ln -sf $(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED_LIB1) -+ ln -sf $(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED_LIB2) -+endif --- -2.1.0 - diff --git a/buildroot/package/leveldb/0002-CMake-install-libmemenv.a.patch b/buildroot/package/leveldb/0002-CMake-install-libmemenv.a.patch new file mode 100644 index 000000000..ab23a1881 --- /dev/null +++ b/buildroot/package/leveldb/0002-CMake-install-libmemenv.a.patch @@ -0,0 +1,74 @@ +From 2fa960098e5b6f9daa9f7d6cab27188566859be8 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 12 Oct 2019 14:43:46 +0200 +Subject: [PATCH] CMake: install libmemenv.a + +Needed for qt5webkit +https://git.busybox.net/buildroot/commit/?id=8a10d9ce311c6cb0490d76921cae55618c258354 +https://git.busybox.net/buildroot/commit/?id=16f847340d07dce620e4c3fc0a099aa79898d86a + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a65afbf..83b2425 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,6 +187,30 @@ target_sources(leveldb + "${LEVELDB_PUBLIC_INCLUDE_DIR}/write_batch.h" + ) + ++set(libmemenv_a_sources ++ "${PROJECT_SOURCE_DIR}/helpers/memenv/memenv.cc" ++ "${PROJECT_SOURCE_DIR}/helpers/memenv/memenv.h" ++ ) ++add_library(memenv STATIC ${libmemenv_a_sources}) ++target_compile_definitions(memenv ++ PRIVATE ++ # Used by include/export.h when building shared libraries. ++ LEVELDB_COMPILE_LIBRARY ++ # Used by port/port.h. ++ ${LEVELDB_PLATFORM_NAME}=1 ++) ++if (NOT HAVE_CXX17_HAS_INCLUDE) ++ target_compile_definitions(memenv ++ PRIVATE ++ LEVELDB_HAS_PORT_CONFIG_H=1 ++ ) ++endif(NOT HAVE_CXX17_HAS_INCLUDE) ++target_include_directories(memenv ++ PUBLIC ++ $ ++ $ ++) ++ + if (WIN32) + target_sources(leveldb + PRIVATE +@@ -418,7 +436,7 @@ endif(LEVELDB_BUILD_BENCHMARKS) + + if(LEVELDB_INSTALL) + include(GNUInstallDirs) +- install(TARGETS leveldb ++ install(TARGETS leveldb memenv + EXPORT leveldbTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -444,6 +462,12 @@ if(LEVELDB_INSTALL) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/leveldb + ) + ++ install( ++ FILES ++ "${PROJECT_SOURCE_DIR}/helpers/memenv/memenv.h" ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/helpers/memenv ++ ) ++ + include(CMakePackageConfigHelpers) + write_basic_package_version_file( + "${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake" +-- +2.20.1 + diff --git a/buildroot/package/leveldb/0003-CMakeLists.txt-check-for-atomic-library.patch b/buildroot/package/leveldb/0003-CMakeLists.txt-check-for-atomic-library.patch new file mode 100644 index 000000000..98609b6b9 --- /dev/null +++ b/buildroot/package/leveldb/0003-CMakeLists.txt-check-for-atomic-library.patch @@ -0,0 +1,49 @@ +From 9e82eb57870ec7c01734b44ed4bb994362004df3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 27 Dec 2019 10:20:53 +0100 +Subject: [PATCH] CMakeLists.txt: check for atomic library + +On some architectures, atomic binutils are provided by the libatomic +library from gcc. Linking with libatomic is therefore necessary, +otherwise the build fails with: + +[100%] Linking CXX executable leveldbutil +/home/fabrice/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/7.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: libleveldb.a(env_posix.cc.o): in function `leveldb::(anonymous namespace)::Limiter::Acquire()': +env_posix.cc:(.text+0x124): undefined reference to `__atomic_fetch_sub_4' + +This is often for example the case on sparcv8 32 bit. + +Fixes: + - http://autobuild.buildroot.org/results/01d5a50581ac9e9b46f40e6f9665f74897db5e6f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/google/leveldb/pull/765] +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index be41ba4..9d6773f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,7 @@ include(CheckIncludeFile) + check_include_file("unistd.h" HAVE_UNISTD_H) + + include(CheckLibraryExists) ++check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_ATOMIC) + check_library_exists(crc32c crc32c_value "" HAVE_CRC32C) + check_library_exists(snappy snappy_compress "" HAVE_SNAPPY) + check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC) +@@ -270,6 +271,9 @@ if(HAVE_CLANG_THREAD_SAFETY) + -Werror -Wthread-safety) + endif(HAVE_CLANG_THREAD_SAFETY) + ++if(HAVE_ATOMIC) ++ target_link_libraries(leveldb atomic) ++endif(HAVE_ATOMIC) + if(HAVE_CRC32C) + target_link_libraries(leveldb crc32c) + endif(HAVE_CRC32C) +-- +2.24.0 + diff --git a/buildroot/package/leveldb/0003-Generate-position-independant-code-for-static-librar.patch b/buildroot/package/leveldb/0003-Generate-position-independant-code-for-static-librar.patch deleted file mode 100644 index dce06ec72..000000000 --- a/buildroot/package/leveldb/0003-Generate-position-independant-code-for-static-librar.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 6ed1b57ef6bcee0d497c181730710b2b0fafbfb3 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Fri, 31 Aug 2018 12:23:46 -0400 -Subject: [PATCH] Generate position independant code for static library -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -Currently, only shared libraries are using the PIC flag. - -Generalize this flag for static libraries in order to let them linkable -by dynamic libraries. - -Fixes: - - /home/gportay/src/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-amd-linux-gnu/6.2.0/../../../../x86_64-amd-linux-gnu/bin/ld: /home/gportay/src/buildroot/output/host/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libmemenv.a(memenv.o): relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC - /home/gportay/src/buildroot/output/host/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libmemenv.a: error adding symbols: Bad value - collect2: error: ld returned 1 exit status - -Upstream-Status: Inappropriate [upstream has migrated to cmake] -Signed-off-by: Gaël PORTAY ---- - build_detect_platform | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/build_detect_platform b/build_detect_platform -index d2a20ce..4839444 100755 ---- a/build_detect_platform -+++ b/build_detect_platform -@@ -55,8 +55,8 @@ fi - - COMMON_FLAGS= - CROSS_COMPILE= --PLATFORM_CCFLAGS= --PLATFORM_CXXFLAGS= -+PLATFORM_CCFLAGS="-fPIC" -+PLATFORM_CXXFLAGS="-fPIC" - PLATFORM_LDFLAGS= - PLATFORM_LIBS= - PLATFORM_SHARED_EXT="so" -@@ -197,7 +197,7 @@ else - EOF - if [ "$?" = 0 ]; then - COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX -DLEVELDB_ATOMIC_PRESENT" -- PLATFORM_CXXFLAGS="-std=c++0x" -+ PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS -std=c++0x" - else - COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX" - fi --- -2.18.0 - diff --git a/buildroot/package/leveldb/Config.in b/buildroot/package/leveldb/Config.in index 163a75e8f..c767b8864 100644 --- a/buildroot/package/leveldb/Config.in +++ b/buildroot/package/leveldb/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LEVELDB bool "leveldb" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_SNAPPY help @@ -10,5 +11,6 @@ config BR2_PACKAGE_LEVELDB https://github.com/google/leveldb -comment "leveldb needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "leveldb needs a toolchain w/ C++, threads, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/leveldb/leveldb.hash b/buildroot/package/leveldb/leveldb.hash index a5300d7cd..c4a8499de 100644 --- a/buildroot/package/leveldb/leveldb.hash +++ b/buildroot/package/leveldb/leveldb.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 f5abe8b5b209c2f36560b75f32ce61412f39a2922f7045ae764a2c23335b6664 leveldb-v1.20.tar.gz +sha256 55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2 leveldb-1.22.tar.gz +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 LICENSE diff --git a/buildroot/package/leveldb/leveldb.mk b/buildroot/package/leveldb/leveldb.mk index 6078cd496..cf3c096f5 100644 --- a/buildroot/package/leveldb/leveldb.mk +++ b/buildroot/package/leveldb/leveldb.mk @@ -4,35 +4,14 @@ # ################################################################################ -LEVELDB_VERSION = v1.20 +LEVELDB_VERSION = 1.22 LEVELDB_SITE = $(call github,google,leveldb,$(LEVELDB_VERSION)) LEVELDB_LICENSE = BSD-3-Clause LEVELDB_LICENSE_FILES = LICENSE LEVELDB_INSTALL_STAGING = YES LEVELDB_DEPENDENCIES = snappy +LEVELDB_CONF_OPTS = \ + -DLEVELDB_BUILD_BENCHMARKS=OFF \ + -DLEVELDB_BUILD_TESTS=OFF -# Disable the shared library for static only build -ifeq ($(BR2_STATIC_LIBS),y) -LEVELDB_MAKE_ARGS += SHARED_LIBS= SHARED_PROGRAMS= -endif - -define LEVELDB_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) \ - $(LEVELDB_MAKE_ARGS) -C $(@D) -endef - -define LEVELDB_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) \ - INSTALL_ROOT=$(STAGING_DIR) INSTALL_PREFIX=/usr \ - $(LEVELDB_MAKE_ARGS) -C $(@D) install - $(INSTALL) -D -m 0644 $(@D)/out-static/libmemenv.a $(STAGING_DIR)/usr/lib/libmemenv.a - $(INSTALL) -D -m 0644 $(@D)/helpers/memenv/memenv.h $(STAGING_DIR)/usr/include/helpers/memenv/memenv.h -endef - -define LEVELDB_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) \ - INSTALL_ROOT=$(TARGET_DIR) INSTALL_PREFIX=/usr \ - $(LEVELDB_MAKE_ARGS) -C $(@D) install -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) diff --git a/buildroot/package/lft/lft.hash b/buildroot/package/lft/lft.hash index 1b0454cf5..91a1fb065 100644 --- a/buildroot/package/lft/lft.hash +++ b/buildroot/package/lft/lft.hash @@ -1,4 +1,5 @@ # From http://pwhois.org/lft/ -md5 746dc08f2e20d0e0240f28873b3bb244 lft-3.79.tar.gz +md5 31b15aabc619707427a73657512560f8 lft-3.8.tar.gz # Locally calculated -sha256 08e5c7973551b529c850bffbc7152c4e5f0bcb1f07ebbb39151a7dc9a3bf9de0 lft-3.79.tar.gz +sha256 10f427e77b0f8207817329bd8ef0310078434612620073369264d15e6f97e990 lft-3.8.tar.gz +sha256 e3b7634630e6800eccca6ecafb5d40153d4f8f7a20e2b2399bf3c0ea92f44614 COPYING diff --git a/buildroot/package/lft/lft.mk b/buildroot/package/lft/lft.mk index 0555ab9a1..5154c83fe 100644 --- a/buildroot/package/lft/lft.mk +++ b/buildroot/package/lft/lft.mk @@ -4,7 +4,7 @@ # ################################################################################ -LFT_VERSION = 3.79 +LFT_VERSION = 3.8 LFT_SITE = http://pwhois.org/get LFT_DEPENDENCIES = libpcap LFT_LICENSE = VOSTROM Public License for Open Source diff --git a/buildroot/package/lftp/0001-fix-static-link-with-readline.patch b/buildroot/package/lftp/0001-fix-static-link-with-readline.patch deleted file mode 100644 index 339239668..000000000 --- a/buildroot/package/lftp/0001-fix-static-link-with-readline.patch +++ /dev/null @@ -1,40 +0,0 @@ -fix static link with readline - -When readline is static library, we need to link against ncurses -because readline needs ncurses. It is because, dependent library's -symbols are not resolved when static library is built. Those symbols -are resolved program tries to link with static library. - -We can't pass linker flags for ncurses by setting LIBS environment -variable via _CONF_ENV because it looks like build system is not -taking that into account and even though it would have been, order of -linking is important. - -We can't also pass linker flags for ncurses via --with-readline-libs -conf options because it causes lftp_LIB_READLINE macro to take readline -headers from host machine if available. To use --with-readline-libs -we need to set --with-readline=yes and --with-readline-inc to include -dir. But when --with-readline=yes, readline_prefix is computed based -on if headers can be found in /usr/local or /usr. If readline is -installed on host machine, then configure fails since we are using -headers for host machine. If headers are not found in /usr/local or /usr -then only path specified --with-readline-inc is taken into account. -So specifying linker flags for ncurses via --with-readline-libs will -not work in all cases. - -So it looks like, updating linker flags directly is only option to fix -static link issue against readline. - -Signed-off-by: Rahul Bedarkar - ---- lftp-4.7.3/m4/lftp_lib_readline.m4.old 2016-08-08 19:49:12.217596470 +0530 -+++ lftp-4.7.3/m4/lftp_lib_readline.m4 2016-08-08 19:49:46.265596398 +0530 -@@ -108,7 +108,7 @@ AC_DEFUN([lftp_LIB_READLINE], - readline_include_dir="$readline_include_dir/readline" - fi - readline_ld_flags="-L$readline_prefix/lib" -- readline_lib_flags="-lreadline" -+ readline_lib_flags="-lreadline -lncurses" - run_readline_test="yes" - elif test "$readline_requested" = "yes"; then - if test -n "$readline_include_dir" -a -n "$readline_lib_flags"; then diff --git a/buildroot/package/lftp/0002-fix-gcc-6-conflicts-signbit.patch b/buildroot/package/lftp/0002-fix-gcc-6-conflicts-signbit.patch deleted file mode 100644 index e906c7ac8..000000000 --- a/buildroot/package/lftp/0002-fix-gcc-6-conflicts-signbit.patch +++ /dev/null @@ -1,57 +0,0 @@ -Use instead of to fix gcc 6.x build - -This patch fixes the following build issue: - -../lib/math.h:2577:1: error: ‘int signbit(float)’ conflicts with a previous declaration - -that occurs with gcc 6.x. - -Patch taken from -https://raw.githubusercontent.com/openembedded/meta-openembedded/master/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch - -Signed-off-by: Thomas Petazzoni - ---- lftp-4.6.3a/src/NetAccess.cc.orig 2016-06-18 10:25:51.063358981 -0400 -+++ lftp-4.6.3a/src/NetAccess.cc 2016-06-18 10:26:04.143359209 -0400 -@@ -21,7 +21,7 @@ - - #include - #include --#include -+#include - #include - - #include "NetAccess.h" ---- lftp-4.6.3a/src/Speedometer.cc.orig 2016-06-18 10:24:58.895358073 -0400 -+++ lftp-4.6.3a/src/Speedometer.cc 2016-06-18 10:25:10.879358281 -0400 -@@ -18,7 +18,7 @@ - */ - - #include --#include -+#include - #include - #include "Speedometer.h" - #include "misc.h" ---- lftp-4.6.3a/src/FileCopy.cc.orig 2016-06-18 10:24:15.939357325 -0400 -+++ lftp-4.6.3a/src/FileCopy.cc 2016-06-18 10:24:24.583357475 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include "FileCopy.h" - #include "url.h" ---- lftp-4.6.3a/src/ResMgr.cc.orig 2016-06-18 10:23:31.387356549 -0400 -+++ lftp-4.6.3a/src/ResMgr.cc 2016-06-18 10:23:41.771356729 -0400 -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/buildroot/package/lftp/lftp.hash b/buildroot/package/lftp/lftp.hash index 64aba12b2..a2f60f95b 100644 --- a/buildroot/package/lftp/lftp.hash +++ b/buildroot/package/lftp/lftp.hash @@ -1,7 +1,7 @@ -# From http://lftp.yar.ru/ftp/lftp-4.8.4.md5sum -md5 b75c43797e817529d486be640232d708 lftp-4.8.4.tar.xz +# From http://lftp.yar.ru/ftp/lftp-4.9.1.md5sum +md5 3da57b1960b1416e89a532c54a67a936 lftp-4.9.1.tar.xz # Locally calculated after checking gpg signature -sha256 4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62 lftp-4.8.4.tar.xz +sha256 5969fcaefd102955dd882f3bcd8962198bc537224749ed92f206f415207a024b lftp-4.9.1.tar.xz # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/lftp/lftp.mk b/buildroot/package/lftp/lftp.mk index b8a2b2430..9c568da67 100644 --- a/buildroot/package/lftp/lftp.mk +++ b/buildroot/package/lftp/lftp.mk @@ -4,19 +4,17 @@ # ################################################################################ -LFTP_VERSION = 4.8.4 +LFTP_VERSION = 4.9.1 LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz LFTP_SITE = http://lftp.yar.ru/ftp LFTP_LICENSE = GPL-3.0+ LFTP_LICENSE_FILES = COPYING -# Needed so that our libtool patch applies properly, and for patch -# 0001-fix-static-link-with-readline.patch. -LFTP_AUTORECONF = YES LFTP_DEPENDENCIES = readline zlib host-pkgconf # Help lftp finding readline and zlib LFTP_CONF_OPTS = \ --with-readline=$(STAGING_DIR)/usr \ + --with-readline-lib="`$(PKG_CONFIG_HOST_BINARY) --libs readline`" \ --with-zlib=$(STAGING_DIR)/usr ifneq ($(BR2_STATIC_LIBS),y) diff --git a/buildroot/package/libamcodec/Config.in b/buildroot/package/libamcodec/Config.in deleted file mode 100644 index 45846e6d2..000000000 --- a/buildroot/package/libamcodec/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -comment "libamcodec needs a toolchain w/ threads, dynamic library" - depends on BR2_arm || BR2_aarch64 - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_LIBAMCODEC - bool "libamcodec" - depends on BR2_arm || BR2_aarch64 - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib - depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_ALSA_LIB - help - Interface library for Amlogic media codecs - - https://github.com/mdrjr/c2_aml_libs.git diff --git a/buildroot/package/libamcodec/libamcodec.hash b/buildroot/package/libamcodec/libamcodec.hash deleted file mode 100644 index a76d20a95..000000000 --- a/buildroot/package/libamcodec/libamcodec.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed hash -sha256 2c9812154b6dfd6a6c9c43aa334d0d03f299379fdf83c20121ad3f3d3f97c666 libamcodec-296f39bc6fc47ddf5d88b9fd3cfb82a5b39048ca.tar.gz diff --git a/buildroot/package/libamcodec/libamcodec.mk b/buildroot/package/libamcodec/libamcodec.mk deleted file mode 100644 index 3fab228fd..000000000 --- a/buildroot/package/libamcodec/libamcodec.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# libamcodec -# -################################################################################ - -LIBAMCODEC_VERSION = 296f39bc6fc47ddf5d88b9fd3cfb82a5b39048ca -LIBAMCODEC_SITE = $(call github,mdrjr,c2_aml_libs,$(LIBAMCODEC_VERSION)) -LIBAMCODEC_DEPENDENCIES = alsa-lib -LIBAMCODEC_LICENSE = Unclear -LIBAMCODEC_INSTALL_STAGING = YES - -# This package uses the AML_LIBS_STAGING_DIR variable to construct the -# header and library paths used when compiling -define LIBAMCODEC_BUILD_CMDS - $(foreach d,amavutils amadec amcodec,\ - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - -C $(@D)/$(d) AML_LIBS_STAGING_DIR=$(STAGING_DIR) - ) -endef - -define LIBAMCODEC_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0755 $(@D)/amavutils/libamavutils.so $(STAGING_DIR)/usr/lib/libamavutils.so - $(INSTALL) -D -m 0555 $(@D)/amadec/libamadec.so $(STAGING_DIR)/usr/lib/libamadec.so - $(INSTALL) -D -m 0555 $(@D)/amcodec/libamcodec.so $(STAGING_DIR)/usr/lib/libamcodec.so - mkdir -p $(STAGING_DIR)/usr/include/amcodec - cp -rf $(@D)/amcodec/include/* $(STAGING_DIR)/usr/include/amcodec -endef - -define LIBAMCODEC_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/amavutils/libamavutils.so $(TARGET_DIR)/usr/lib/libamavutils.so - $(INSTALL) -D -m 0555 $(@D)/amadec/libamadec.so $(TARGET_DIR)/usr/lib/libamadec.so - $(INSTALL) -D -m 0555 $(@D)/amcodec/libamcodec.so $(TARGET_DIR)/usr/lib/libamcodec.so -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/libarchive/0001-Avoid-a-double-free-when-a-window-size-of-0-is-speci.patch b/buildroot/package/libarchive/0001-Avoid-a-double-free-when-a-window-size-of-0-is-speci.patch deleted file mode 100644 index 76096f7a4..000000000 --- a/buildroot/package/libarchive/0001-Avoid-a-double-free-when-a-window-size-of-0-is-speci.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 021efa522ad729ff0f5806c4ce53e4a6cc1daa31 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 20 Nov 2018 17:56:29 +1100 -Subject: [PATCH] Avoid a double-free when a window size of 0 is specified - -new_size can be 0 with a malicious or corrupted RAR archive. - -realloc(area, 0) is equivalent to free(area), so the region would -be free()d here and the free()d again in the cleanup function. - -Found with a setup running AFL, afl-rb, and qsym. ---- - libarchive/archive_read_support_format_rar.c | 5 +++++ - 1 file changed, 5 insertions(+) - -[for import into Buildroot] -Signed-off-by: Thomas De Schampheleire -Upstream-status: backport - -CVE-2018-1000877 - -diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c -index 23452222..6f419c27 100644 ---- a/libarchive/archive_read_support_format_rar.c -+++ b/libarchive/archive_read_support_format_rar.c -@@ -2300,6 +2300,11 @@ parse_codes(struct archive_read *a) - new_size = DICTIONARY_MAX_SIZE; - else - new_size = rar_fls((unsigned int)rar->unp_size) << 1; -+ if (new_size == 0) { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Zero window size is invalid."); -+ return (ARCHIVE_FATAL); -+ } - new_window = realloc(rar->lzss.window, new_size); - if (new_window == NULL) { - archive_set_error(&a->archive, ENOMEM, --- -2.19.2 - diff --git a/buildroot/package/libarchive/0002-rar-file-split-across-multi-part-archives-must-match.patch b/buildroot/package/libarchive/0002-rar-file-split-across-multi-part-archives-must-match.patch deleted file mode 100644 index 4bf68d61d..000000000 --- a/buildroot/package/libarchive/0002-rar-file-split-across-multi-part-archives-must-match.patch +++ /dev/null @@ -1,81 +0,0 @@ -From bfcfe6f04ed20db2504db8a254d1f40a1d84eb28 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 4 Dec 2018 00:55:22 +1100 -Subject: [PATCH] rar: file split across multi-part archives must match - -Fuzzing uncovered some UAF and memory overrun bugs where a file in a -single file archive reported that it was split across multiple -volumes. This was caused by ppmd7 operations calling -rar_br_fillup. This would invoke rar_read_ahead, which would in some -situations invoke archive_read_format_rar_read_header. That would -check the new file name against the old file name, and if they didn't -match up it would free the ppmd7 buffer and allocate a new -one. However, because the ppmd7 decoder wasn't actually done with the -buffer, it would continue to used the freed buffer. Both reads and -writes to the freed region can be observed. - -This is quite tricky to solve: once the buffer has been freed it is -too late, as the ppmd7 decoder functions almost universally assume -success - there's no way for ppmd_read to signal error, nor are there -good ways for functions like Range_Normalise to propagate them. So we -can't detect after the fact that we're in an invalid state - e.g. by -checking rar->cursor, we have to prevent ourselves from ever ending up -there. So, when we are in the dangerous part or rar_read_ahead that -assumes a valid split, we set a flag force read_header to either go -down the path for split files or bail. This means that the ppmd7 -decoder keeps a valid buffer and just runs out of data. - -Found with a combination of AFL, afl-rb and qsym. ---- - libarchive/archive_read_support_format_rar.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -[for import into Buildroot] -Signed-off-by: Thomas De Schampheleire -Upstream-status: backport - -CVE-2018-1000878 - -diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c -index 6f419c27..a8cc5c94 100644 ---- a/libarchive/archive_read_support_format_rar.c -+++ b/libarchive/archive_read_support_format_rar.c -@@ -258,6 +258,7 @@ struct rar - struct data_block_offsets *dbo; - unsigned int cursor; - unsigned int nodes; -+ char filename_must_match; - - /* LZSS members */ - struct huffman_code maincode; -@@ -1560,6 +1561,12 @@ read_header(struct archive_read *a, struct archive_entry *entry, - } - return ret; - } -+ else if (rar->filename_must_match) -+ { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Mismatch of file parts split across multi-volume archive"); -+ return (ARCHIVE_FATAL); -+ } - - rar->filename_save = (char*)realloc(rar->filename_save, - filename_size + 1); -@@ -2933,12 +2940,14 @@ rar_read_ahead(struct archive_read *a, size_t min, ssize_t *avail) - else if (*avail == 0 && rar->main_flags & MHD_VOLUME && - rar->file_flags & FHD_SPLIT_AFTER) - { -+ rar->filename_must_match = 1; - ret = archive_read_format_rar_read_header(a, a->entry); - if (ret == (ARCHIVE_EOF)) - { - rar->has_endarc_header = 1; - ret = archive_read_format_rar_read_header(a, a->entry); - } -+ rar->filename_must_match = 0; - if (ret != (ARCHIVE_OK)) - return NULL; - return rar_read_ahead(a, min, avail); --- -2.19.2 - diff --git a/buildroot/package/libarchive/0003-Skip-0-length-ACL-fields.patch b/buildroot/package/libarchive/0003-Skip-0-length-ACL-fields.patch deleted file mode 100644 index 796bfbdeb..000000000 --- a/buildroot/package/libarchive/0003-Skip-0-length-ACL-fields.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 15bf44fd2c1ad0e3fd87048b3fcc90c4dcff1175 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 4 Dec 2018 14:29:42 +1100 -Subject: [PATCH] Skip 0-length ACL fields - -Currently, it is possible to create an archive that crashes bsdtar -with a malformed ACL: - -Program received signal SIGSEGV, Segmentation fault. -archive_acl_from_text_l (acl=, text=0x7e2e92 "", want_type=, sc=) at libarchive/archive_acl.c:1726 -1726 switch (*s) { -(gdb) p n -$1 = 1 -(gdb) p field[n] -$2 = {start = 0x0, end = 0x0} - -Stop this by checking that the length is not zero before beginning -the switch statement. - -I am pretty sure this is the bug mentioned in the qsym paper [1], -and I was able to replicate it with a qsym + AFL + afl-rb setup. - -[1] https://www.usenix.org/conference/usenixsecurity18/presentation/yun ---- - libarchive/archive_acl.c | 5 +++++ - 1 file changed, 5 insertions(+) - -[for import into Buildroot] -Signed-off-by: Thomas De Schampheleire -Upstream-status: backport - -CVE-2018-1000879 - -diff --git a/libarchive/archive_acl.c b/libarchive/archive_acl.c -index 512beee1..7beeee86 100644 ---- a/libarchive/archive_acl.c -+++ b/libarchive/archive_acl.c -@@ -1723,6 +1723,11 @@ archive_acl_from_text_l(struct archive_acl *acl, const char *text, - st = field[n].start + 1; - len = field[n].end - field[n].start; - -+ if (len == 0) { -+ ret = ARCHIVE_WARN; -+ continue; -+ } -+ - switch (*s) { - case 'u': - if (len == 1 || (len == 4 --- -2.19.2 - diff --git a/buildroot/package/libarchive/0004-warc-consume-data-once-read.patch b/buildroot/package/libarchive/0004-warc-consume-data-once-read.patch deleted file mode 100644 index f07d6c08c..000000000 --- a/buildroot/package/libarchive/0004-warc-consume-data-once-read.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9c84b7426660c09c18cc349f6d70b5f8168b5680 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 4 Dec 2018 16:33:42 +1100 -Subject: [PATCH] warc: consume data once read - -The warc decoder only used read ahead, it wouldn't actually consume -data that had previously been printed. This means that if you specify -an invalid content length, it will just reprint the same data over -and over and over again until it hits the desired length. - -This means that a WARC resource with e.g. -Content-Length: 666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666665 -but only a few hundred bytes of data, causes a quasi-infinite loop. - -Consume data in subsequent calls to _warc_read. - -Found with an AFL + afl-rb + qsym setup. ---- - libarchive/archive_read_support_format_warc.c | 5 +++++ - 1 file changed, 5 insertions(+) - -[for import into Buildroot] -Signed-off-by: Thomas De Schampheleire -Upstream-status: backport - -CVE-2018-1000880 - -diff --git a/libarchive/archive_read_support_format_warc.c b/libarchive/archive_read_support_format_warc.c -index e8753853..e8fc8428 100644 ---- a/libarchive/archive_read_support_format_warc.c -+++ b/libarchive/archive_read_support_format_warc.c -@@ -386,6 +386,11 @@ _warc_read(struct archive_read *a, const void **buf, size_t *bsz, int64_t *off) - return (ARCHIVE_EOF); - } - -+ if (w->unconsumed) { -+ __archive_read_consume(a, w->unconsumed); -+ w->unconsumed = 0U; -+ } -+ - rab = __archive_read_ahead(a, 1U, &nrd); - if (nrd < 0) { - *bsz = 0U; --- -2.19.2 - diff --git a/buildroot/package/libarchive/0005-iso9660-Fail-when-expected-Rockridge-extensions-is-m.patch b/buildroot/package/libarchive/0005-iso9660-Fail-when-expected-Rockridge-extensions-is-m.patch deleted file mode 100644 index bd36ce4b5..000000000 --- a/buildroot/package/libarchive/0005-iso9660-Fail-when-expected-Rockridge-extensions-is-m.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 8312eaa576014cd9b965012af51bc1f967b12423 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 1 Jan 2019 17:10:49 +1100 -Subject: [PATCH] iso9660: Fail when expected Rockridge extensions is missing - -A corrupted or malicious ISO9660 image can cause read_CE() to loop -forever. - -read_CE() calls parse_rockridge(), expecting a Rockridge extension -to be read. However, parse_rockridge() is structured as a while -loop starting with a sanity check, and if the sanity check fails -before the loop has run, the function returns ARCHIVE_OK without -advancing the position in the file. This causes read_CE() to retry -indefinitely. - -Make parse_rockridge() return ARCHIVE_WARN if it didn't read an -extension. As someone with no real knowledge of the format, this -seems more apt than ARCHIVE_FATAL, but both the call-sites escalate -it to a fatal error immediately anyway. - -Found with a combination of AFL, afl-rb (FairFuzz) and qsym. - -Signed-off-by: Baruch Siach ---- -Upstream status: commit 8312eaa57601 - - libarchive/archive_read_support_format_iso9660.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c -index 28acfefbba8a..bad8f1dfef3a 100644 ---- a/libarchive/archive_read_support_format_iso9660.c -+++ b/libarchive/archive_read_support_format_iso9660.c -@@ -2102,6 +2102,7 @@ parse_rockridge(struct archive_read *a, struct file_info *file, - const unsigned char *p, const unsigned char *end) - { - struct iso9660 *iso9660; -+ int entry_seen = 0; - - iso9660 = (struct iso9660 *)(a->format->data); - -@@ -2257,8 +2258,16 @@ parse_rockridge(struct archive_read *a, struct file_info *file, - } - - p += p[2]; -+ entry_seen = 1; -+ } -+ -+ if (entry_seen) -+ return (ARCHIVE_OK); -+ else { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Tried to parse Rockridge extensions, but none found"); -+ return (ARCHIVE_WARN); - } -- return (ARCHIVE_OK); - } - - static int --- -2.20.1 - diff --git a/buildroot/package/libarchive/0006-7zip-fix-crash-when-parsing-certain-archives.patch b/buildroot/package/libarchive/0006-7zip-fix-crash-when-parsing-certain-archives.patch deleted file mode 100644 index bad33d952..000000000 --- a/buildroot/package/libarchive/0006-7zip-fix-crash-when-parsing-certain-archives.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 65a23f5dbee4497064e9bb467f81138a62b0dae1 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 1 Jan 2019 16:01:40 +1100 -Subject: [PATCH] 7zip: fix crash when parsing certain archives - -Fuzzing with CRCs disabled revealed that a call to get_uncompressed_data() -would sometimes fail to return at least 'minimum' bytes. This can cause -the crc32() invocation in header_bytes to read off into invalid memory. - -A specially crafted archive can use this to cause a crash. - -An ASAN trace is below, but ASAN is not required - an uninstrumented -binary will also crash. - -==7719==ERROR: AddressSanitizer: SEGV on unknown address 0x631000040000 (pc 0x7fbdb3b3ec1d bp 0x7ffe77a51310 sp 0x7ffe77a51150 T0) -==7719==The signal is caused by a READ memory access. - #0 0x7fbdb3b3ec1c in crc32_z (/lib/x86_64-linux-gnu/libz.so.1+0x2c1c) - #1 0x84f5eb in header_bytes (/tmp/libarchive/bsdtar+0x84f5eb) - #2 0x856156 in read_Header (/tmp/libarchive/bsdtar+0x856156) - #3 0x84e134 in slurp_central_directory (/tmp/libarchive/bsdtar+0x84e134) - #4 0x849690 in archive_read_format_7zip_read_header (/tmp/libarchive/bsdtar+0x849690) - #5 0x5713b7 in _archive_read_next_header2 (/tmp/libarchive/bsdtar+0x5713b7) - #6 0x570e63 in _archive_read_next_header (/tmp/libarchive/bsdtar+0x570e63) - #7 0x6f08bd in archive_read_next_header (/tmp/libarchive/bsdtar+0x6f08bd) - #8 0x52373f in read_archive (/tmp/libarchive/bsdtar+0x52373f) - #9 0x5257be in tar_mode_x (/tmp/libarchive/bsdtar+0x5257be) - #10 0x51daeb in main (/tmp/libarchive/bsdtar+0x51daeb) - #11 0x7fbdb27cab96 in __libc_start_main /build/glibc-OTsEL5/glibc-2.27/csu/../csu/libc-start.c:310 - #12 0x41dd09 in _start (/tmp/libarchive/bsdtar+0x41dd09) - -This was primarly done with afl and FairFuzz. Some early corpus entries -may have been generated by qsym. - -Signed-off-by: Baruch Siach ---- -Upstream status: commit 65a23f5dbee - - libarchive/archive_read_support_format_7zip.c | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c -index bccbf896603b..b6d1505d372e 100644 ---- a/libarchive/archive_read_support_format_7zip.c -+++ b/libarchive/archive_read_support_format_7zip.c -@@ -2964,13 +2964,7 @@ get_uncompressed_data(struct archive_read *a, const void **buff, size_t size, - if (zip->codec == _7Z_COPY && zip->codec2 == (unsigned long)-1) { - /* Copy mode. */ - -- /* -- * Note: '1' here is a performance optimization. -- * Recall that the decompression layer returns a count of -- * available bytes; asking for more than that forces the -- * decompressor to combine reads by copying data. -- */ -- *buff = __archive_read_ahead(a, 1, &bytes_avail); -+ *buff = __archive_read_ahead(a, minimum, &bytes_avail); - if (bytes_avail <= 0) { - archive_set_error(&a->archive, - ARCHIVE_ERRNO_FILE_FORMAT, --- -2.20.1 - diff --git a/buildroot/package/libarchive/0007-RAR-reader-fix-use-after-free.patch b/buildroot/package/libarchive/0007-RAR-reader-fix-use-after-free.patch deleted file mode 100644 index 5acbb77e9..000000000 --- a/buildroot/package/libarchive/0007-RAR-reader-fix-use-after-free.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b8592ecba2f9e451e1f5cb7ab6dcee8b8e7b3f60 Mon Sep 17 00:00:00 2001 -From: Martin Matuska -Date: Sat, 11 May 2019 02:36:53 +0200 -Subject: [PATCH] RAR reader: fix use after free - -If read_data_compressed() returns ARCHIVE_FAILED, the caller is allowed -to continue with next archive headers. We need to set rar->start_new_table -after the ppmd7_context got freed, otherwise it won't be allocated again. - -Reported by: OSS-Fuzz issue 2582 - -[Peter: fixes CVE-2019-18408] -Signed-off-by: Peter Korsgaard ---- - libarchive/archive_read_support_format_rar.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c -index a8cc5c94..49360876 100644 ---- a/libarchive/archive_read_support_format_rar.c -+++ b/libarchive/archive_read_support_format_rar.c -@@ -1024,8 +1024,10 @@ archive_read_format_rar_read_data(struct archive_read *a, const void **buff, - case COMPRESS_METHOD_GOOD: - case COMPRESS_METHOD_BEST: - ret = read_data_compressed(a, buff, size, offset); -- if (ret != ARCHIVE_OK && ret != ARCHIVE_WARN) -+ if (ret != ARCHIVE_OK && ret != ARCHIVE_WARN) { - __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context); -+ rar->start_new_table = 1; -+ } - break; - - default: --- -2.20.1 - diff --git a/buildroot/package/libarchive/0008-Bugfix-and-optimize-archive_wstring_append_from_mbs.patch b/buildroot/package/libarchive/0008-Bugfix-and-optimize-archive_wstring_append_from_mbs.patch deleted file mode 100644 index a047e26c0..000000000 --- a/buildroot/package/libarchive/0008-Bugfix-and-optimize-archive_wstring_append_from_mbs.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 22b1db9d46654afc6f0c28f90af8cdc84a199f41 Mon Sep 17 00:00:00 2001 -From: Martin Matuska -Date: Thu, 21 Nov 2019 03:08:40 +0100 -Subject: [PATCH] Bugfix and optimize archive_wstring_append_from_mbs() - -The cal to mbrtowc() or mbtowc() should read up to mbs_length -bytes and not wcs_length. This avoids out-of-bounds reads. - -mbrtowc() and mbtowc() return (size_t)-1 wit errno EILSEQ when -they encounter an invalid multibyte character and (size_t)-2 when -they they encounter an incomplete multibyte character. As we return -failure and all our callers error out it makes no sense to continue -parsing mbs. - -As we allocate `len` wchars at the beginning and each wchar has -at least one byte, there will never be need to grow the buffer, -so the code can be left out. On the other hand, we are always -allocatng more memory than we need. - -As long as wcs_length == mbs_length == len we can omit wcs_length. -We keep the old code commented if we decide to save memory and -use autoexpanding wcs_length in the future. - -Fixes #1276 - -Signed-off-by: Peter Korsgaard -[Peter: fixes CVE-2019-19221] ---- - libarchive/archive_string.c | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c -index 979a418b..bd39c96f 100644 ---- a/libarchive/archive_string.c -+++ b/libarchive/archive_string.c -@@ -591,7 +591,7 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - * No single byte will be more than one wide character, - * so this length estimate will always be big enough. - */ -- size_t wcs_length = len; -+ // size_t wcs_length = len; - size_t mbs_length = len; - const char *mbs = p; - wchar_t *wcs; -@@ -600,7 +600,11 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - - memset(&shift_state, 0, sizeof(shift_state)); - #endif -- if (NULL == archive_wstring_ensure(dest, dest->length + wcs_length + 1)) -+ /* -+ * As we decided to have wcs_length == mbs_length == len -+ * we can use len here instead of wcs_length -+ */ -+ if (NULL == archive_wstring_ensure(dest, dest->length + len + 1)) - return (-1); - wcs = dest->s + dest->length; - /* -@@ -609,6 +613,12 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - * multi bytes. - */ - while (*mbs && mbs_length > 0) { -+ /* -+ * The buffer we allocated is always big enough. -+ * Keep this code path in a comment if we decide to choose -+ * smaller wcs_length in the future -+ */ -+/* - if (wcs_length == 0) { - dest->length = wcs - dest->s; - dest->s[dest->length] = L'\0'; -@@ -618,24 +628,20 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - return (-1); - wcs = dest->s + dest->length; - } -+*/ - #if HAVE_MBRTOWC -- r = mbrtowc(wcs, mbs, wcs_length, &shift_state); -+ r = mbrtowc(wcs, mbs, mbs_length, &shift_state); - #else -- r = mbtowc(wcs, mbs, wcs_length); -+ r = mbtowc(wcs, mbs, mbs_length); - #endif - if (r == (size_t)-1 || r == (size_t)-2) { - ret_val = -1; -- if (errno == EILSEQ) { -- ++mbs; -- --mbs_length; -- continue; -- } else -- break; -+ break; - } - if (r == 0 || r > mbs_length) - break; - wcs++; -- wcs_length--; -+ // wcs_length--; - mbs += r; - mbs_length -= r; - } --- -2.20.1 - diff --git a/buildroot/package/libarchive/libarchive.hash b/buildroot/package/libarchive/libarchive.hash index cde48c842..9da4eb3ba 100644 --- a/buildroot/package/libarchive/libarchive.hash +++ b/buildroot/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ -# From http://www.libarchive.org/downloads/libarchive-3.3.3.sha512.txt -sha512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7 libarchive-3.3.3.tar.gz +# From https://www.libarchive.de/downloads/sha256sums +sha256 b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176 libarchive-3.4.2.tar.gz # Locally computed: -sha256 ae6f35cc1979beb316e4d6431fc34c6fc59f0dd126b425c8552bb41c86e4825d COPYING +sha256 e1e3d4ba9d0b0ccba333b5f5539f7c6c9a3ef3d57a96cd165d2c45eaa1cd026d COPYING diff --git a/buildroot/package/libarchive/libarchive.mk b/buildroot/package/libarchive/libarchive.mk index b7619b03d..60838eea0 100644 --- a/buildroot/package/libarchive/libarchive.mk +++ b/buildroot/package/libarchive/libarchive.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.3.3 -LIBARCHIVE_SITE = http://www.libarchive.org/downloads +LIBARCHIVE_VERSION = 3.4.2 +LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES -LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause +LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING +LIBARCHIVE_CONF_OPTS = --without-mbedtls ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) @@ -86,6 +87,7 @@ endif ifeq ($(BR2_PACKAGE_NETTLE),y) LIBARCHIVE_DEPENDENCIES += nettle +LIBARCHIVE_CONF_OPTS += --with-nettle else LIBARCHIVE_CONF_OPTS += --without-nettle endif @@ -123,6 +125,7 @@ HOST_LIBARCHIVE_CONF_OPTS = \ --without-libiconv-prefix \ --without-xml2 \ --without-lzo2 \ + --without-mbedtls \ --without-nettle \ --without-openssl \ --without-lzma diff --git a/buildroot/package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch b/buildroot/package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch new file mode 100644 index 000000000..43a6deb9f --- /dev/null +++ b/buildroot/package/libargon2/0001-libargon2-dont-fail-on-existing-symlink.patch @@ -0,0 +1,23 @@ +From b997b9e7d4744020409223afddc7299a771eb52d Mon Sep 17 00:00:00 2001 +From: Pascal de Bruijn +Date: Thu, 7 Nov 2019 09:55:32 +0100 +Subject: [PATCH] Don't fail on existing symlink + +Signed-off-by: Pascal de Bruijn +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 837e7f7..7c116c9 100644 +--- a/Makefile ++++ b/Makefile +@@ -238,7 +238,7 @@ install: $(RUN) libs + $(INSTALL) -d $(INST_LIBRARY) + $(INSTALL) -m 0644 $(LIBRARIES) $(INST_LIBRARY) + ifdef LINKED_LIB_SH +- cd $(INST_LIBRARY) && ln -s $(notdir $(LIB_SH) $(LINKED_LIB_SH)) ++ cd $(INST_LIBRARY) && ln -sf $(notdir $(LIB_SH) $(LINKED_LIB_SH)) + endif + $(INSTALL) -d $(INST_BINARY) + $(INSTALL) $(RUN) $(INST_BINARY) diff --git a/buildroot/package/libargon2/Config.in b/buildroot/package/libargon2/Config.in new file mode 100644 index 000000000..6bba74cfb --- /dev/null +++ b/buildroot/package/libargon2/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBARGON2 + bool "libargon2" + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + help + A modern password hashing algorithm + + https://password-hashing.net/#argon2 + +comment "libargon needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/libargon2/libargon2.hash b/buildroot/package/libargon2/libargon2.hash new file mode 100644 index 000000000..c524b4271 --- /dev/null +++ b/buildroot/package/libargon2/libargon2.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 eaea0172c1f4ee4550d1b6c9ce01aab8d1ab66b4207776aa67991eb5872fdcd8 libargon2-20171227.tar.gz +sha256 220f8736a89ff51c92ef3d497f413b48e6cf1df3d6278bc909c6308c78e1718e LICENSE diff --git a/buildroot/package/libargon2/libargon2.mk b/buildroot/package/libargon2/libargon2.mk new file mode 100644 index 000000000..e10343a15 --- /dev/null +++ b/buildroot/package/libargon2/libargon2.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# libargon2 +# +################################################################################ + +# 20190702 is not recognized by php7.3 +LIBARGON2_VERSION = 20171227 +LIBARGON2_SITE = $(call github,P-H-C,phc-winner-argon2,$(LIBARGON2_VERSION)) +LIBARGON2_LICENSE = CC0-1.0 or Apache-2.0 +LIBARGON2_LICENSE_FILES = LICENSE +LIBARGON2_INSTALL_STAGING = YES + +# GCC_TARGET_ARCH is not defined for all architectures, but libargon2 +# only uses it to detect if some x86 optimizations can be used, and +# GCC_TARGET_ARCH is defined on x86. +ifneq ($(GCC_TARGET_ARCH),) +LIBARGON2_OPTS = OPTTARGET=$(GCC_TARGET_ARCH) +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +LIBARGON2_OPTS += NO_THREADS=1 +endif + +define LIBARGON2_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(LIBARGON2_OPTS) +endef + +define LIBARGON2_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + DESTDIR=$(STAGING_DIR) install +endef + +define LIBARGON2_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/libassuan/libassuan.hash b/buildroot/package/libassuan/libassuan.hash index 4878a692c..bb008d6ed 100644 --- a/buildroot/package/libassuan/libassuan.hash +++ b/buildroot/package/libassuan/libassuan.hash @@ -1,8 +1,8 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 fb66bc1e8971d48ac9dbacd1cdaf6487a3e77375 libassuan-2.5.2.tar.bz2 +sha1 6d81bf42fa91ed2894df8b65764ce899e39776f8 libassuan-2.5.3.tar.bz2 # Locally calculated after checking signature -# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.2.tar.bz2.sig +# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.3.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 986b1bf277e375f7a960450fbb8ffbd45294d06598916ad4ebf79aee0cb788e7 libassuan-2.5.2.tar.bz2 +sha256 91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702 libassuan-2.5.3.tar.bz2 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/buildroot/package/libassuan/libassuan.mk b/buildroot/package/libassuan/libassuan.mk index 1e4467b36..034a9bfdf 100644 --- a/buildroot/package/libassuan/libassuan.mk +++ b/buildroot/package/libassuan/libassuan.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASSUAN_VERSION = 2.5.2 +LIBASSUAN_VERSION = 2.5.3 LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2 LIBASSUAN_LICENSE = LGPL-2.1+ (library), GPL-3.0 (tests, doc) diff --git a/buildroot/package/libatomic_ops/libatomic_ops.hash b/buildroot/package/libatomic_ops/libatomic_ops.hash index a913023e2..3fca4a8c5 100644 --- a/buildroot/package/libatomic_ops/libatomic_ops.hash +++ b/buildroot/package/libatomic_ops/libatomic_ops.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 61754aa60bb8052ea64175794df2afae8baacca5420e06eb150230681e71ff5e libatomic_ops-v7.6.6.tar.gz +sha256 e6b0909cf4e63cec693fe6c48191ce864c32c5113e16c3f517aa2a244b46992f libatomic_ops-7.6.10.tar.gz sha256 f0e630c0ca489767033da5a0c869fb4231db522c5ff479ce55a853a923a00f69 doc/LICENSING.txt sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/libatomic_ops/libatomic_ops.mk b/buildroot/package/libatomic_ops/libatomic_ops.mk index 100ad7025..cc890a7f2 100644 --- a/buildroot/package/libatomic_ops/libatomic_ops.mk +++ b/buildroot/package/libatomic_ops/libatomic_ops.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBATOMIC_OPS_VERSION = v7.6.6 -LIBATOMIC_OPS_SITE = $(call github,ivmai,libatomic_ops,$(LIBATOMIC_OPS_VERSION)) +LIBATOMIC_OPS_VERSION = 7.6.10 +LIBATOMIC_OPS_SITE = $(call github,ivmai,libatomic_ops,v$(LIBATOMIC_OPS_VERSION)) LIBATOMIC_OPS_AUTORECONF = YES # From doc/LICENSING.txt: "Our intent is to make it easy to use diff --git a/buildroot/package/libavl/0001-fix-makefile.patch b/buildroot/package/libavl/0001-fix-makefile.patch new file mode 100644 index 000000000..6cc96e5f7 --- /dev/null +++ b/buildroot/package/libavl/0001-fix-makefile.patch @@ -0,0 +1,49 @@ +makefile: fix compilation and installation + +This was originally taken from: +https://sources.debian.org/data/main/liba/libavl/0.3.5-4/debian/patches/fix-makefile + +Unfortunately, the URL does not end in ".patch", therefore we cannot +use it in the FOO_PATCH variable directly. + +Signed-off-by: Michael Walle + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -6,7 +6,8 @@ + LDCONFIG ?= /sbin/ldconfig + + # Some suggestions: (-mcpu= generates i386 compatible code) +-CFLAGS ?= -O2 -fomit-frame-pointer -pipe -mcpu=i686 -w ++CFLAGS ?= -O2 -pipe -Wall -Werror ++CFLAGS += -fPIC + #CFLAGS = -O2 -fomit-frame-pointer -pipe -march=i586 -Wall -g + #CFLAGS = -O6 -fomit-frame-pointer -pipe -march=i586 -Wall -ansi -pedantic + #CFLAGS = -O6 -fomit-frame-pointer -pipe -march=i686 -Wall -ansi -pedantic +@@ -34,20 +35,21 @@ + $(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + $(LIBRARY): avl.o +- $(CC) -nostdlib -shared -Wl,-soname,libavl.so.1 $^ -o $@ -lc ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libavl.so.1 $^ -o $@ -lc + + clean: + $(RM) *.o $(PROGRAMS) libavl.* + + install: all + $(INSTALL) -d $(DESTDIR)$(libdir) +- $(INSTALL) avl.h $(DESTDIR)$(includedir) +- $(INSTALL) $(LIBRARIES) $(DESTDIR)$(libdir) +- for i in $(LIBRARIES); do\ ++ $(INSTALL) -d $(DESTDIR)$(includedir) ++ $(INSTALL) -m 644 avl.h $(DESTDIR)$(includedir) ++ $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) ++ for i in $(LIBRARY); do\ + $(LN) -sf $$i $(DESTDIR)$(libdir)/$${i%.*};\ + $(LN) -sf $${i%.*} $(DESTDIR)$(libdir)/$${i%.*.*};\ + done +- -$(LDCONFIG) ++ #-$(LDCONFIG) + + .PHONY: clean install all + .PRECIOUS: %.h %.c diff --git a/buildroot/package/libavl/Config.in b/buildroot/package/libavl/Config.in new file mode 100644 index 000000000..20d3c5ef7 --- /dev/null +++ b/buildroot/package/libavl/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_LIBAVL + bool "libavl" + depends on !BR2_STATIC_LIBS + help + AVLTree is a small implementation of AVL trees for the C + programming language. + + https://packages.debian.org/buster/libavl1 + + This is not the GNU AVL library by Ben Pfaff. + +comment "libavl needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/libavl/libavl.hash b/buildroot/package/libavl/libavl.hash new file mode 100644 index 000000000..4d70f0cca --- /dev/null +++ b/buildroot/package/libavl/libavl.hash @@ -0,0 +1,5 @@ +# From http://snapshot.debian.org/archive/debian/20160621T164030Z/pool/main/liba/libavl/libavl_0.3.5-4.dsc +sha256 4497b9e22cdd61ae2fa893b9d5fd6213dc306726d7c4be08c29e173622dca8a0 libavl_0.3.5.orig.tar.gz + +# Locally computed +sha256 767a9accfe3b110153b567983b98889469dfaae02899a632aeadbb81ad611293 COPYING diff --git a/buildroot/package/libavl/libavl.mk b/buildroot/package/libavl/libavl.mk new file mode 100644 index 000000000..75ada3276 --- /dev/null +++ b/buildroot/package/libavl/libavl.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# libavl +# +################################################################################ + +LIBAVL_VERSION = 0.3.5 +LIBAVL_SITE = http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/liba/libavl +LIBAVL_SOURCE = libavl_$(LIBAVL_VERSION).orig.tar.gz +LIBAVL_LICENSE = LGPL-2.0+ +LIBAVL_LICENSE_FILES = COPYING +LIBAVL_INSTALL_STAGING = YES + +LIBAVL_CFLAGS = $(TARGET_CFLAGS) -fPIC +HOST_LIBAVL_CFLAGS = $(HOST_CFLAGS) -fPIC + +define LIBAVL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + CFLAGS="$(LIBAVL_CFLAGS)" +endef + +define LIBAVL_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install \ + prefix=/usr DESTDIR=$(STAGING_DIR) +endef + +define LIBAVL_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install \ + prefix=/usr DESTDIR=$(TARGET_DIR) +endef + +define HOST_LIBAVL_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ + CFLAGS="$(HOST_LIBAVL_CFLAGS)" +endef + +define HOST_LIBAVL_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) install \ + prefix=$(HOST_DIR) +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/buildroot/package/libbluray/libbluray.hash b/buildroot/package/libbluray/libbluray.hash index 9a35c5daf..1757192b0 100644 --- a/buildroot/package/libbluray/libbluray.hash +++ b/buildroot/package/libbluray/libbluray.hash @@ -1,3 +1,4 @@ -# From http://get.videolan.org/libbluray/1.0.2/libbluray-1.0.2.tar.bz2.sha512 -sha512 e1360ad08aa6cc67a80efa81a09004faebbe31105f1961494f82f655e3e7378b198ee3bc534b0d0c2bfec726939b11b545cc8bbfa30794fc647432dadf71089b libbluray-1.0.2.tar.bz2 +# From http://get.videolan.org/libbluray/1.1.2/libbluray-1.1.2.tar.bz2.sha512 +sha512 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7 libbluray-1.1.2.tar.bz2 +# Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/buildroot/package/libbluray/libbluray.mk b/buildroot/package/libbluray/libbluray.mk index 3d7ce351c..49ee933d0 100644 --- a/buildroot/package/libbluray/libbluray.mk +++ b/buildroot/package/libbluray/libbluray.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.0.2 +LIBBLURAY_VERSION = 1.1.2 LIBBLURAY_SITE = http://get.videolan.org/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES diff --git a/buildroot/package/libbsd/Config.in b/buildroot/package/libbsd/Config.in index a163ce9b6..e54f5e6f2 100644 --- a/buildroot/package/libbsd/Config.in +++ b/buildroot/package/libbsd/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on !BR2_microblaze depends on !BR2_arc depends on !BR2_xtensa + depends on !BR2_nds32 config BR2_PACKAGE_LIBBSD bool "libbsd" diff --git a/buildroot/package/libbson/libbson.hash b/buildroot/package/libbson/libbson.hash index b20a0cd8d..568459900 100644 --- a/buildroot/package/libbson/libbson.hash +++ b/buildroot/package/libbson/libbson.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c3cc230a3451bf7fedc5bb34c3191fd23d841e65ec415301f6c77e531924b769 libbson-1.9.4.tar.gz +sha256 6bb51b863a4641d6d7729e4b55df8f4389ed534c34eb3a1cda906a53df11072c libbson-1.9.5.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING sha256 8dc5cb3146b026715e6c145621c7732f36c295d825b7b3a03076ad3f238db48e THIRD_PARTY_NOTICES diff --git a/buildroot/package/libbson/libbson.mk b/buildroot/package/libbson/libbson.mk index 2c9cbc7fe..931df333c 100644 --- a/buildroot/package/libbson/libbson.mk +++ b/buildroot/package/libbson/libbson.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBSON_VERSION = 1.9.4 +LIBBSON_VERSION = 1.9.5 LIBBSON_SITE = https://github.com/mongodb/libbson/releases/download/$(LIBBSON_VERSION) LIBBSON_LICENSE = Apache-2.0, MIT (jsonl), ISC (b64), Zlib (md5) LIBBSON_LICENSE_FILES = COPYING THIRD_PARTY_NOTICES diff --git a/buildroot/package/libcamera/Config.in b/buildroot/package/libcamera/Config.in new file mode 100644 index 000000000..0b3540a65 --- /dev/null +++ b/buildroot/package/libcamera/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBCAMERA + bool "libcamera" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + # C++11 + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54316 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_PACKAGE_HAS_UDEV + help + libcamera provides a software stack to support + complex devices that need heavy hardware image + processing operations. + + http://www.libcamera.org/ + +comment "libcamera needs udev and a toolchain w/ C++, threads, gcc >= 5" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_PACKAGE_HAS_UDEV diff --git a/buildroot/package/libcamera/libcamera.hash b/buildroot/package/libcamera/libcamera.hash new file mode 100644 index 000000000..6f721d87e --- /dev/null +++ b/buildroot/package/libcamera/libcamera.hash @@ -0,0 +1,3 @@ +sha256 cbaa7e06059717f71b57f9c20135c86d5f121d9aab10bfc20513ba5d04478756 libcamera-448393f77ec9e37cb807e8e8d35c1a4877d253d4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licenses/gnu-gpl-2.0.txt +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c licenses/gnu-lgpl-2.1.txt diff --git a/buildroot/package/libcamera/libcamera.mk b/buildroot/package/libcamera/libcamera.mk new file mode 100644 index 000000000..d209a38df --- /dev/null +++ b/buildroot/package/libcamera/libcamera.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# libcamera +# +################################################################################ + +LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git +LIBCAMERA_VERSION = 448393f77ec9e37cb807e8e8d35c1a4877d253d4 +LIBCAMERA_SITE_METHOD = git +LIBCAMERA_DEPENDENCIES = udev +LIBCAMERA_CONF_OPTS = -Dtest=false -Ddocumentation=false +LIBCAMERA_INSTALL_STAGING = yes +LIBCAMERA_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (utils) +LIBCAMERA_LICENSE_FILES = \ + licenses/gnu-gpl-2.0.txt \ + licenses/gnu-lgpl-2.1.txt + +$(eval $(meson-package)) diff --git a/buildroot/package/libcap/libcap.hash b/buildroot/package/libcap/libcap.hash index 2d3aee591..cbef0dc86 100644 --- a/buildroot/package/libcap/libcap.hash +++ b/buildroot/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162 libcap-2.25.tar.xz +sha256 dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a libcap-2.27.tar.xz # Hash for license file: sha256 088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc License diff --git a/buildroot/package/libcap/libcap.mk b/buildroot/package/libcap/libcap.mk index a947fa068..4919a4adc 100644 --- a/buildroot/package/libcap/libcap.mk +++ b/buildroot/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.25 +LIBCAP_VERSION = 2.27 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause diff --git a/buildroot/package/libcdio-paranoia/libcdio-paranoia.hash b/buildroot/package/libcdio-paranoia/libcdio-paranoia.hash index 33e59ba70..18e6f33df 100644 --- a/buildroot/package/libcdio-paranoia/libcdio-paranoia.hash +++ b/buildroot/package/libcdio-paranoia/libcdio-paranoia.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d60f82ece97eeb92407a9ee03f3499c8983206672c28ae5e4e22179063c81941 libcdio-paranoia-10.2+0.94+2.tar.gz +sha256 33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a libcdio-paranoia-10.2+2.0.1.tar.bz2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/libcdio-paranoia/libcdio-paranoia.mk b/buildroot/package/libcdio-paranoia/libcdio-paranoia.mk index 3281aa014..944bb14d7 100644 --- a/buildroot/package/libcdio-paranoia/libcdio-paranoia.mk +++ b/buildroot/package/libcdio-paranoia/libcdio-paranoia.mk @@ -4,7 +4,8 @@ # ################################################################################ -LIBCDIO_PARANOIA_VERSION = 10.2+0.94+2 +LIBCDIO_PARANOIA_VERSION = 10.2+2.0.1 +LIBCDIO_PARANOIA_SOURCE = libcdio-paranoia-$(LIBCDIO_PARANOIA_VERSION).tar.bz2 LIBCDIO_PARANOIA_SITE = $(BR2_GNU_MIRROR)/libcdio LIBCDIO_PARANOIA_LICENSE = GPL-3.0+ LIBCDIO_PARANOIA_LICENSE_FILES = COPYING diff --git a/buildroot/package/libcdio/libcdio.hash b/buildroot/package/libcdio/libcdio.hash index 2b6f832cb..07bd85ff1 100644 --- a/buildroot/package/libcdio/libcdio.hash +++ b/buildroot/package/libcdio/libcdio.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -sha256 1b481b5da009bea31db875805665974e2fc568e2b2afa516f4036733657cf958 libcdio-2.0.0.tar.gz +sha256 8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b libcdio-2.1.0.tar.bz2 # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/libcdio/libcdio.mk b/buildroot/package/libcdio/libcdio.mk index f4a559172..4bf55d334 100644 --- a/buildroot/package/libcdio/libcdio.mk +++ b/buildroot/package/libcdio/libcdio.mk @@ -4,7 +4,8 @@ # ################################################################################ -LIBCDIO_VERSION = 2.0.0 +LIBCDIO_VERSION = 2.1.0 +LIBCDIO_SOURCE = libcdio-$(LIBCDIO_VERSION).tar.bz2 LIBCDIO_SITE = $(BR2_GNU_MIRROR)/libcdio LIBCDIO_INSTALL_STAGING = YES LIBCDIO_LICENSE = GPL-3.0+ diff --git a/buildroot/package/libcec/libcec.hash b/buildroot/package/libcec/libcec.hash index e7264b40c..6790b417f 100644 --- a/buildroot/package/libcec/libcec.hash +++ b/buildroot/package/libcec/libcec.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b8b8dd31f3ebdd5472f03ab7d401600ea0d959b1288b9ca24bf457ef60e2ba27 libcec-4.0.2.tar.gz +sha256 4382a964bf8c511c22c03cdab5ba2d81c241536e6479072a61516966804f400a libcec-4.0.4.tar.gz sha256 3618005b3db4eb8ede7292d233e6c41605cb8dcbd33e8790eff6e29c1e4f3789 COPYING diff --git a/buildroot/package/libcec/libcec.mk b/buildroot/package/libcec/libcec.mk index 99d1c8b2b..fe519d47b 100644 --- a/buildroot/package/libcec/libcec.mk +++ b/buildroot/package/libcec/libcec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCEC_VERSION = 4.0.2 +LIBCEC_VERSION = 4.0.4 LIBCEC_SITE = $(call github,Pulse-Eight,libcec,libcec-$(LIBCEC_VERSION)) LIBCEC_LICENSE = GPL-2.0+ LIBCEC_LICENSE_FILES = COPYING diff --git a/buildroot/package/libcgi/0001-CMakeLists.txt-libcgi-is-in-C.patch b/buildroot/package/libcgi/0001-CMakeLists.txt-libcgi-is-in-C.patch deleted file mode 100644 index 682bfe5d5..000000000 --- a/buildroot/package/libcgi/0001-CMakeLists.txt-libcgi-is-in-C.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 043f7a470e32c036f0fe933ec5cd2003087d6b2e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 2 Sep 2017 23:50:42 +0200 -Subject: [PATCH] CMakeLists.txt: libcgi is in C - -By default, CMake checks that both C and C++ compilers are -available. However, since libcgi is only C, there's no need for a C++ -compiler check. Therefore, this commit adjusts the project() variable -definition to only require C language support. - -Signed-off-by: Thomas Petazzoni -Submitted-upstream: https://github.com/rafaelsteil/libcgi/pull/38 ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f98a99d..c599ca9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,7 +3,7 @@ - # - cmake_minimum_required(VERSION 2.8.8) - --project(cgi) -+project(cgi C) - string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) - string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LC) - set(LIBPREFIX ${PROJECT_NAME}) --- -2.13.5 - diff --git a/buildroot/package/libcgi/0002-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch b/buildroot/package/libcgi/0002-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch deleted file mode 100644 index ebf91b0a6..000000000 --- a/buildroot/package/libcgi/0002-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9bb9d67da0e4faf4bb3a47786dee127e66a49ed0 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 3 Sep 2017 15:22:30 +0200 -Subject: [PATCH] CMakeLists.txt: don't force the build of a shared library - -Building a shared library doesn't work on all platforms, so instead, -let CMake rely on the standard BUILD_SHARED_LIBS variable to decide -whether a static or shared library should be built. - -Signed-off-by: Thomas Petazzoni -Submitted-upstream: https://github.com/rafaelsteil/libcgi/pull/39 ---- - src/CMakeLists.txt | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f32d22e..3bde408 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -23,17 +23,18 @@ set(CGI_SRC - ) - - # create binary --add_library(${PROJECT_NAME}-shared SHARED ${CGI_SRC}) --set_target_properties(${PROJECT_NAME}-shared PROPERTIES -+add_library(${PROJECT_NAME} ${CGI_SRC}) -+set_target_properties(${PROJECT_NAME} PROPERTIES - OUTPUT_NAME ${PROJECT_NAME} - SOVERSION ${PROJECT_VERSION_MAJOR} - VERSION ${PROJECT_VERSION} - ) - - # install binary --install(TARGETS ${PROJECT_NAME}-shared -+install(TARGETS ${PROJECT_NAME} - EXPORT ${PROJECT_NAME}-targets - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ) - - # install cmake targets --- -2.13.5 - diff --git a/buildroot/package/libcgi/libcgi.hash b/buildroot/package/libcgi/libcgi.hash index f071cc0ae..8760f91cf 100644 --- a/buildroot/package/libcgi/libcgi.hash +++ b/buildroot/package/libcgi/libcgi.hash @@ -1,5 +1,8 @@ -# From https://github.com/rafaelsteil/libcgi/releases/download/v1.1/libcgi-1.1.tar.gz.sha256sum -sha256 128445f2f828e84905d51bd53d11e2e08c489df3a07225ff9f198c1318092fe6 libcgi-1.1.tar.gz +# From https://github.com/rafaelsteil/libcgi/releases/download/v1.3.0/libcgi-1.3.0.tar.gz.md5 +md5 6efdc968bdf986832b7e220d1b914e57 libcgi-1.3.0.tar.gz +# From https://github.com/rafaelsteil/libcgi/releases/download/v1.3.0/libcgi-1.3.0.tar.gz.sha256 +sha256 d932f380b1a5dbfbddffaa76fac71bf505a9585d441c9ae86bfbf76033d9d8df libcgi-1.3.0.tar.gz # Hash for license file: -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1.txt +sha256 f32c31e26ec840753a8cd47cd2681e48be4cee853212d16a4b1d85ac4d677669 LICENSES/MIT.txt diff --git a/buildroot/package/libcgi/libcgi.mk b/buildroot/package/libcgi/libcgi.mk index d1e403fdf..22163310d 100644 --- a/buildroot/package/libcgi/libcgi.mk +++ b/buildroot/package/libcgi/libcgi.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBCGI_VERSION = 1.1 +LIBCGI_VERSION = 1.3.0 LIBCGI_SITE = https://github.com/rafaelsteil/libcgi/releases/download/v$(LIBCGI_VERSION) LIBCGI_INSTALL_STAGING = YES -LIBCGI_LICENSE = LGPL-2.1+ -LIBCGI_LICENSE_FILES = COPYING +LIBCGI_LICENSE = LGPL-2.1+, MIT (base64.c) +LIBCGI_LICENSE_FILES = LICENSES/LGPL-2.1.txt LICENSES/MIT.txt $(eval $(cmake-package)) diff --git a/buildroot/package/libcgroup/0001-cgrulesengd-remove-umask-0.patch b/buildroot/package/libcgroup/0001-cgrulesengd-remove-umask-0.patch new file mode 100644 index 000000000..1d9077a2d --- /dev/null +++ b/buildroot/package/libcgroup/0001-cgrulesengd-remove-umask-0.patch @@ -0,0 +1,33 @@ +From 0d88b73d189ea3440ccaab00418d6469f76fa590 Mon Sep 17 00:00:00 2001 +From: Michal Hocko +Date: Wed, 18 Jul 2018 11:24:29 +0200 +Subject: [PATCH] cgrulesengd: remove umask(0) + +One of our partners has noticed that cgred daemon is creating a log file +(/var/log/cgred) with too wide permissions (0666) and that is seen as +a security bug because an untrusted user can write to otherwise +restricted area. CVE-2018-14348 has been assigned to this issue. + +Signed-off-by: Michal Hocko +Acked-by: Balbir Singh +[Retrieved from: +https://github.com/libcgroup/libcgroup/commit/0d88b73d189ea3440ccaab00418d6469f76fa590] +Signed-off-by: Fabrice Fontaine +--- + src/daemon/cgrulesengd.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c +index ea51f11..0d288f3 100644 +--- a/src/daemon/cgrulesengd.c ++++ b/src/daemon/cgrulesengd.c +@@ -889,9 +889,6 @@ int cgre_start_daemon(const char *logp, const int logf, + } else if (pid > 0) { + exit(EXIT_SUCCESS); + } +- +- /* Change the file mode mask. */ +- umask(0); + } else { + flog(LOG_DEBUG, "Not using daemon mode\n"); + pid = getpid(); diff --git a/buildroot/package/libcgroup/libcgroup.mk b/buildroot/package/libcgroup/libcgroup.mk index 3845627d4..a26d5f2dd 100644 --- a/buildroot/package/libcgroup/libcgroup.mk +++ b/buildroot/package/libcgroup/libcgroup.mk @@ -12,6 +12,9 @@ LIBCGROUP_LICENSE_FILES = COPYING LIBCGROUP_DEPENDENCIES = host-bison host-flex LIBCGROUP_INSTALL_STAGING = YES +# 0001-cgrulesengd-remove-umask-0.patch +LIBCGROUP_IGNORE_CVES += CVE-2018-14348 + # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h # large file support. See https://bugzilla.redhat.com/show_bug.cgi?id=574992 # for more information. diff --git a/buildroot/package/libclc/Config.in b/buildroot/package/libclc/Config.in index 4bba6a917..797f090bf 100644 --- a/buildroot/package/libclc/Config.in +++ b/buildroot/package/libclc/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBCLC bool "libclc" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_HOST_GCC_AT_LEAST_4_8 help libclc is an open source, BSD licensed implementation of the library requirements of the OpenCL C programming language, diff --git a/buildroot/package/libclc/libclc.hash b/buildroot/package/libclc/libclc.hash index 6c06648fc..29728fbc7 100644 --- a/buildroot/package/libclc/libclc.hash +++ b/buildroot/package/libclc/libclc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 8d7b42fba6db4a124c74f0ac475c1bc515761cbf3d559820b4cbe5b33e94f26c libclc-dabae5a2afb78cba0320a86e3f5f0b5dc83e077c.tar.gz -sha256 45187a46f0637e4e92decb51d8dc3c9e4957b349d0283dfbd6647e8000d9ac7f LICENSE.TXT +sha256 5ea2cd2fa7fa1474d3e0580064e7a22014ef8d64dbbd7c546277fa4beb5acf86 libclc-d1cbc92e2ceee59963f5c3a576382e5bba31f060.tar.gz +sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT diff --git a/buildroot/package/libclc/libclc.mk b/buildroot/package/libclc/libclc.mk index 17903c05d..52249a708 100644 --- a/buildroot/package/libclc/libclc.mk +++ b/buildroot/package/libclc/libclc.mk @@ -4,12 +4,11 @@ # ################################################################################ -# There are only two releases: release_35 and release_38, but the last -# commit is from 2 years ago. Master has some recent activity. -LIBCLC_VERSION = dabae5a2afb78cba0320a86e3f5f0b5dc83e077c +# Use the latest commit from release_90 branch. +LIBCLC_VERSION = d1cbc92e2ceee59963f5c3a576382e5bba31f060 LIBCLC_SITE = https://git.llvm.org/git/libclc LIBCLC_SITE_METHOD = git -LIBCLC_LICENSE = NCSA or MIT +LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT LIBCLC_LICENSE_FILES = LICENSE.TXT LIBCLC_DEPENDENCIES = host-clang host-llvm diff --git a/buildroot/package/libcli/libcli.hash b/buildroot/package/libcli/libcli.hash index 729c63696..ce4373e92 100644 --- a/buildroot/package/libcli/libcli.hash +++ b/buildroot/package/libcli/libcli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3c801cb0112b6b5e07bdc3b98c034b36df6f33a8ed95ce74520b704bdbc0f36d libcli-c63c9d35144939c8b4fa3c5394aed2e29ff517b0.tar.gz -sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING +sha256 190f0a315dbc291400e9d33f701f9a66894102a6c29e1aebb63f01239bb164d0 libcli-1.10.2.tar.gz +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/buildroot/package/libcli/libcli.mk b/buildroot/package/libcli/libcli.mk index 0fef008a4..bc4608254 100644 --- a/buildroot/package/libcli/libcli.mk +++ b/buildroot/package/libcli/libcli.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCLI_VERSION = c63c9d35144939c8b4fa3c5394aed2e29ff517b0 -LIBCLI_SITE = $(call github,dparrish,libcli,$(LIBCLI_VERSION)) +LIBCLI_VERSION = 1.10.2 +LIBCLI_SITE = $(call github,dparrish,libcli,V$(LIBCLI_VERSION)) LIBCLI_LICENSE = LGPL-2.1 LIBCLI_LICENSE_FILES = COPYING LIBCLI_INSTALL_STAGING = YES diff --git a/buildroot/package/libcoap/libcoap.hash b/buildroot/package/libcoap/libcoap.hash index deb94ecd6..579a052c8 100644 --- a/buildroot/package/libcoap/libcoap.hash +++ b/buildroot/package/libcoap/libcoap.hash @@ -1,5 +1,4 @@ # Locally calculated -sha256 f7e26dc232c177336474a14487771037a8fb32e311f5ccd076a00dc04b6d7b7a libcoap-v4.1.2.tar.gz -sha256 28b61fbf3c5477611d7f6ead97d15348934496d27dca815b34d45e622730e72e COPYING -sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 LICENSE.GPL -sha256 9d5aeec17bdf82369bbe6e89efb07b7b35abefa044ea1d25cb2feeb70df1c208 LICENSE.BSD +sha256 9523e38da6ee8b2a8f5ce83ded64107dd1e514c7ad00cd74ccfe3454b679c271 libcoap-4.2.0.tar.gz +sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING +sha256 3821a9f881344ad53c543c84675ad4b6a29e913ca500cfa160ab52e4e6965b15 LICENSE diff --git a/buildroot/package/libcoap/libcoap.mk b/buildroot/package/libcoap/libcoap.mk index 4f87886ba..e2fbaa3df 100644 --- a/buildroot/package/libcoap/libcoap.mk +++ b/buildroot/package/libcoap/libcoap.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBCOAP_VERSION = v4.1.2 -LIBCOAP_SITE = $(call github,obgm,libcoap,$(LIBCOAP_VERSION)) +LIBCOAP_VERSION = 4.2.0 +LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION)) LIBCOAP_INSTALL_STAGING = YES -LIBCOAP_LICENSE = GPL-2.0+ or BSD-2-Clause -LIBCOAP_LICENSE_FILES = COPYING LICENSE.GPL LICENSE.BSD +LIBCOAP_LICENSE = BSD-2-Clause +LIBCOAP_LICENSE_FILES = COPYING LICENSE LIBCOAP_DEPENDENCIES = host-pkgconf LIBCOAP_CONF_OPTS = --disable-examples LIBCOAP_AUTORECONF = YES diff --git a/buildroot/package/libcodec2/0001-fix-codec2-pc-in.patch b/buildroot/package/libcodec2/0001-fix-codec2-pc-in.patch deleted file mode 100644 index 5950219de..000000000 --- a/buildroot/package/libcodec2/0001-fix-codec2-pc-in.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix includedir in codec2.pc.in - -The template file codec2.pc.in contains the wrong path to the header -files: they are installed in /usr/include/codec2 and not /usr/include/ -directly. - -Signed-off-by: Thomas Petazzoni - -Index: b/codec2.pc.in -=================================================================== ---- a/codec2.pc.in -+++ b/codec2.pc.in -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ --includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/ -+includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/codec2 - - Name: codec2 - Description: A speech codec for 2400 bit/s and below diff --git a/buildroot/package/libcodec2/libcodec2.hash b/buildroot/package/libcodec2/libcodec2.hash index e401e9d30..ec4f1f1a3 100644 --- a/buildroot/package/libcodec2/libcodec2.hash +++ b/buildroot/package/libcodec2/libcodec2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0695bb93cd985dd39f02f0db35ebc28a98b9b88747318f90774aba5f374eadb2 codec2-0.7.tar.xz +sha256 19181a446f4df3e6d616b50cabdac4485abb9cd3242cf312a0785f892ed4c76c libcodec2-0.9.2.tar.gz sha256 9ebb6f82b7380a62ac74c5f0322c88e6744dedf2ebe1f54d6f088282b39844bf COPYING diff --git a/buildroot/package/libcodec2/libcodec2.mk b/buildroot/package/libcodec2/libcodec2.mk index 3253a3595..8410ffc90 100644 --- a/buildroot/package/libcodec2/libcodec2.mk +++ b/buildroot/package/libcodec2/libcodec2.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBCODEC2_VERSION = 0.7 -LIBCODEC2_SITE = https://freedv.com/wp-content/uploads/sites/8/2017/10 -LIBCODEC2_SOURCE = codec2-$(LIBCODEC2_VERSION).tar.xz +LIBCODEC2_VERSION = 0.9.2 +LIBCODEC2_SITE = $(call github,drowe67,codec2,v$(LIBCODEC2_VERSION)) LIBCODEC2_LICENSE = LGPL-2.1 LIBCODEC2_LICENSE_FILES = COPYING LIBCODEC2_INSTALL_STAGING = YES diff --git a/buildroot/package/libcofi/libcofi.hash b/buildroot/package/libcofi/libcofi.hash index 1baaece4c..c5f6bb441 100644 --- a/buildroot/package/libcofi/libcofi.hash +++ b/buildroot/package/libcofi/libcofi.hash @@ -1,2 +1,3 @@ # locally computed sha256 72ec89c19267612b316ec9c5835c07212b8f0a377c5b4c20b6e46e69a6e4a5e5 libcofi-7313fbe12b0593034d0a1b606bf33c7cf4ababce.tar.gz +sha256 1a8203e5d11f0841235cf30265b1ffb19c0d9c4a6d2889554cbeccaf9f09b327 README.md diff --git a/buildroot/package/libconfig/libconfig.hash b/buildroot/package/libconfig/libconfig.hash index 7a77034e6..e056a17de 100644 --- a/buildroot/package/libconfig/libconfig.hash +++ b/buildroot/package/libconfig/libconfig.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f67ac44099916ae260a6c9e290a90809e7d782d96cdd462cac656ebc5b685726 libconfig-v1.7.2.tar.gz +sha256 f67ac44099916ae260a6c9e290a90809e7d782d96cdd462cac656ebc5b685726 libconfig-1.7.2.tar.gz sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING.LIB diff --git a/buildroot/package/libconfig/libconfig.mk b/buildroot/package/libconfig/libconfig.mk index 699f59338..a127f9bcc 100644 --- a/buildroot/package/libconfig/libconfig.mk +++ b/buildroot/package/libconfig/libconfig.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCONFIG_VERSION = v1.7.2 -LIBCONFIG_SITE = $(call github,hyperrealm,libconfig,$(LIBCONFIG_VERSION)) +LIBCONFIG_VERSION = 1.7.2 +LIBCONFIG_SITE = $(call github,hyperrealm,libconfig,v$(LIBCONFIG_VERSION)) LIBCONFIG_LICENSE = LGPL-2.1+ LIBCONFIG_LICENSE_FILES = COPYING.LIB LIBCONFIG_INSTALL_STAGING = YES diff --git a/buildroot/package/libcpprestsdk/libcpprestsdk.hash b/buildroot/package/libcpprestsdk/libcpprestsdk.hash index 331db664b..e226a581b 100644 --- a/buildroot/package/libcpprestsdk/libcpprestsdk.hash +++ b/buildroot/package/libcpprestsdk/libcpprestsdk.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 55e1521fb7b7c9b2f4f2065c5fb47e249227f15299257ee6f1a0c942a4057f4f libcpprestsdk-v2.10.10.tar.gz +sha256 f2628b248f714d7bbd6a536553bc3782602c68ca1b129017985dd70cc3515278 libcpprestsdk-2.10.14.tar.gz sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt diff --git a/buildroot/package/libcpprestsdk/libcpprestsdk.mk b/buildroot/package/libcpprestsdk/libcpprestsdk.mk index a03e6d250..8b9c7d4da 100644 --- a/buildroot/package/libcpprestsdk/libcpprestsdk.mk +++ b/buildroot/package/libcpprestsdk/libcpprestsdk.mk @@ -4,16 +4,45 @@ # ################################################################################ -LIBCPPRESTSDK_VERSION = v2.10.10 -LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,$(LIBCPPRESTSDK_VERSION)) +LIBCPPRESTSDK_VERSION = 2.10.14 +LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,v$(LIBCPPRESTSDK_VERSION)) LIBCPPRESTSDK_LICENSE = MIT LIBCPPRESTSDK_LICENSE_FILES = license.txt LIBCPPRESTSDK_SUBDIR = Release +LIBCPPRESTSDK_INSTALL_STAGING = YES LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib -LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=ON -DBUILD_SAMPLES=OFF +LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DBUILD_SAMPLES=OFF -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -LIBCPPRESTSDK_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +ifeq ($(BR2_STATIC_LIBS),y) +LIBCPPRESTSDK_CONF_OPTS += \ + -DBoost_USE_STATIC_LIBS=ON \ + -DBoost_USE_STATIC_RUNTIME=ON endif +LIBCPPRESTSDK_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBCPPRESTSDK_CXXFLAGS += -latomic +endif + +ifeq ($(BR2_PACKAGE_BROTLI),y) +LIBCPPRESTSDK_DEPENDENCIES += brotli +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_BROTLI=OFF +else +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_BROTLI=ON +endif + +ifeq ($(BR2_PACKAGE_WEBSOCKETPP),y) +LIBCPPRESTSDK_DEPENDENCIES += websocketpp +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_WEBSOCKETS=OFF +else +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_WEBSOCKETS=ON +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +LIBCPPRESTSDK_CXXFLAGS += -O0 +endif + +LIBCPPRESTSDK_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(LIBCPPRESTSDK_CXXFLAGS)" + $(eval $(cmake-package)) diff --git a/buildroot/package/libcroco/0001-input-check-end-of-input-before-reading-a-byte.patch b/buildroot/package/libcroco/0001-input-check-end-of-input-before-reading-a-byte.patch deleted file mode 100644 index 831b1a745..000000000 --- a/buildroot/package/libcroco/0001-input-check-end-of-input-before-reading-a-byte.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Sun, 16 Apr 2017 13:13:43 +0200 -Subject: [PATCH] input: check end of input before reading a byte - -Fixes CVE-2017-7960 - -When reading bytes we weren't check that the index wasn't -out of bound and this could produce an invalid read which -could deal to a security bug. - -Signed-off-by: Peter Korsgaard ---- - src/cr-input.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/cr-input.c b/src/cr-input.c -index 49000b1..3b63a88 100644 ---- a/src/cr-input.c -+++ b/src/cr-input.c -@@ -256,7 +256,7 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc) - *we should free buf here because it's own by CRInput. - *(see the last parameter of cr_input_new_from_buf(). - */ -- buf = NULL ; -+ buf = NULL; - } - - cleanup: -@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this) - enum CRStatus - cr_input_read_byte (CRInput * a_this, guchar * a_byte) - { -+ gulong nb_bytes_left = 0; -+ - g_return_val_if_fail (a_this && PRIVATE (a_this) - && a_byte, CR_BAD_PARAM_ERROR); - -@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte) - if (PRIVATE (a_this)->end_of_input == TRUE) - return CR_END_OF_INPUT_ERROR; - -+ nb_bytes_left = cr_input_get_nb_bytes_left (a_this); -+ -+ if (nb_bytes_left < 1) { -+ return CR_END_OF_INPUT_ERROR; -+ } -+ - *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index]; - - if (PRIVATE (a_this)->nb_bytes - -@@ -477,7 +485,6 @@ cr_input_read_char (CRInput * a_this, guint32 * a_char) - if (*a_char == '\n') { - PRIVATE (a_this)->end_of_line = TRUE; - } -- - } - - return status; --- -2.11.0 - diff --git a/buildroot/package/libcroco/0002-tknzr-support-only-max-long-rgb-values.patch b/buildroot/package/libcroco/0002-tknzr-support-only-max-long-rgb-values.patch deleted file mode 100644 index 1a9bcd947..000000000 --- a/buildroot/package/libcroco/0002-tknzr-support-only-max-long-rgb-values.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Sun, 16 Apr 2017 13:56:09 +0200 -Subject: [PATCH] tknzr: support only max long rgb values - -Fixes CVE-2017-7961 - -This fixes a possible out of bound when reading rgbs which -are longer than the support MAXLONG - -Signed-off-by: Peter Korsgaard ---- - src/cr-tknzr.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c -index 1a7cfeb..1548c35 100644 ---- a/src/cr-tknzr.c -+++ b/src/cr-tknzr.c -@@ -1279,6 +1279,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) - status = cr_tknzr_parse_num (a_this, &num); - ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); - -+ if (num->val > G_MAXLONG) { -+ status = CR_PARSING_ERROR; -+ goto error; -+ } -+ - red = num->val; - cr_num_destroy (num); - num = NULL; -@@ -1298,6 +1303,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) - status = cr_tknzr_parse_num (a_this, &num); - ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); - -+ if (num->val > G_MAXLONG) { -+ status = CR_PARSING_ERROR; -+ goto error; -+ } -+ - PEEK_BYTE (a_this, 1, &next_bytes[0]); - if (next_bytes[0] == '%') { - SKIP_CHARS (a_this, 1); --- -2.11.0 - diff --git a/buildroot/package/libcroco/libcroco.hash b/buildroot/package/libcroco/libcroco.hash index 809671c5e..b99820642 100644 --- a/buildroot/package/libcroco/libcroco.hash +++ b/buildroot/package/libcroco/libcroco.hash @@ -1,5 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libcroco/0.6/libcroco-0.6.12.sha256sum -sha256 ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860 libcroco-0.6.12.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/libcroco/0.6/libcroco-0.6.13.sha256sum +sha256 767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4 libcroco-0.6.13.tar.xz # Hash for license file: sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING.LIB diff --git a/buildroot/package/libcroco/libcroco.mk b/buildroot/package/libcroco/libcroco.mk index 612fd1f47..c717c9a21 100644 --- a/buildroot/package/libcroco/libcroco.mk +++ b/buildroot/package/libcroco/libcroco.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCROCO_VERSION_MAJOR = 0.6 -LIBCROCO_VERSION = $(LIBCROCO_VERSION_MAJOR).12 +LIBCROCO_VERSION = $(LIBCROCO_VERSION_MAJOR).13 LIBCROCO_SITE = http://ftp.gnome.org/pub/gnome/sources/libcroco/$(LIBCROCO_VERSION_MAJOR) LIBCROCO_SOURCE = libcroco-$(LIBCROCO_VERSION).tar.xz LIBCROCO_INSTALL_STAGING = YES diff --git a/buildroot/package/libcrossguid/libcrossguid.hash b/buildroot/package/libcrossguid/libcrossguid.hash index a991da56a..17dbe35c7 100644 --- a/buildroot/package/libcrossguid/libcrossguid.hash +++ b/buildroot/package/libcrossguid/libcrossguid.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 022c9f02cc36e865cd8fd0111a597ff2bd91988deeb348dbe2aba64aed1abd99 libcrossguid-8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz +sha256 022c9f02cc36e865cd8fd0111a597ff2bd91988deeb348dbe2aba64aed1abd99 libcrossguid-8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz +sha256 779e58787f966a1552f68d5ec041513cef68785dae4a519dbda7bc0b86eda20e LICENSE diff --git a/buildroot/package/libcue/libcue.hash b/buildroot/package/libcue/libcue.hash index 357807f0c..b69fb7fa2 100644 --- a/buildroot/package/libcue/libcue.hash +++ b/buildroot/package/libcue/libcue.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f27bc3ebb2e892cd9d32a7bee6d84576a60f955f29f748b9b487b173712f1200 libcue-v2.2.1.tar.gz +sha256 f27bc3ebb2e892cd9d32a7bee6d84576a60f955f29f748b9b487b173712f1200 libcue-2.2.1.tar.gz sha256 c388d36583fa54e13b6d73ad924d0b68d073ed8a5771e17cb49104705df4504f LICENSE diff --git a/buildroot/package/libcue/libcue.mk b/buildroot/package/libcue/libcue.mk index f2d64439f..3edb4f3b6 100644 --- a/buildroot/package/libcue/libcue.mk +++ b/buildroot/package/libcue/libcue.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCUE_VERSION = v2.2.1 -LIBCUE_SITE = $(call github,lipnitsk,libcue,$(LIBCUE_VERSION)) +LIBCUE_VERSION = 2.2.1 +LIBCUE_SITE = $(call github,lipnitsk,libcue,v$(LIBCUE_VERSION)) LIBCUE_LICENSE = GPL-2.0, BSD-2-Clause (rem.c) LIBCUE_LICENSE_FILES = LICENSE LIBCUE_DEPENDENCIES = host-bison host-flex flex diff --git a/buildroot/package/libcuefile/libcuefile.mk b/buildroot/package/libcuefile/libcuefile.mk index 66b589b19..891c1eec3 100644 --- a/buildroot/package/libcuefile/libcuefile.mk +++ b/buildroot/package/libcuefile/libcuefile.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBCUEFILE_VERSION = r475 +LIBCUEFILE_VERSION = 475 LIBCUEFILE_SITE = http://files.musepack.net/source -LIBCUEFILE_SOURCE = libcuefile_$(LIBCUEFILE_VERSION).tar.gz +LIBCUEFILE_SOURCE = libcuefile_r$(LIBCUEFILE_VERSION).tar.gz LIBCUEFILE_INSTALL_STAGING = YES LIBCUEFILE_LICENSE = GPL-2.0+ LIBCUEFILE_LICENSE_FILES = COPYING diff --git a/buildroot/package/libcurl/Config.in b/buildroot/package/libcurl/Config.in index 9c62539e4..d05cbedf7 100644 --- a/buildroot/package/libcurl/Config.in +++ b/buildroot/package/libcurl/Config.in @@ -9,26 +9,44 @@ config BR2_PACKAGE_LIBCURL if BR2_PACKAGE_LIBCURL -config BR2_PACKAGE_CURL +config BR2_PACKAGE_LIBCURL_CURL bool "curl binary" help Install curl binary as well config BR2_PACKAGE_LIBCURL_VERBOSE - bool "enable verbose strings" + bool "verbose strings" help Enable verbose text strings -config BR2_PACKAGE_LIBCURL_TLS_SUPPORT - bool - default y if BR2_PACKAGE_OPENSSL - default y if BR2_PACKAGE_GNUTLS - default y if BR2_PACKAGE_LIBNSS - default y if BR2_PACKAGE_MBEDTLS +config BR2_PACKAGE_LIBCURL_PROXY_SUPPORT + bool "proxy support" + default y + help + Enable proxy support. + +config BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT + bool "cookies support" + default y + help + Enable support for cookies. + +config BR2_PACKAGE_LIBCURL_EXTRA_PROTOCOLS_FEATURES + bool "enable extra protocols and features" + default y + help + Enable the following extra protocols and features: + - LDAP / LDAPS + - POP3 / IMAP / SMTP + - Telnet + - TFTP + - RTSP + - SMB / CIFS + - DICT + - Gopher choice prompt "SSL/TLS library to use" - depends on BR2_PACKAGE_LIBCURL_TLS_SUPPORT config BR2_PACKAGE_LIBCURL_OPENSSL bool "OpenSSL" @@ -46,9 +64,13 @@ config BR2_PACKAGE_LIBCURL_MBEDTLS bool "mbed TLS" depends on BR2_PACKAGE_MBEDTLS +config BR2_PACKAGE_LIBCURL_WOLFSSL + bool "WolfSSL" + depends on BR2_PACKAGE_WOLFSSL + +config BR2_PACKAGE_LIBCURL_TLS_NONE + bool "None" + endchoice -comment "A TLS library is needed for SSL/TLS support" - depends on !BR2_PACKAGE_LIBCURL_TLS_SUPPORT - endif diff --git a/buildroot/package/libcurl/libcurl.hash b/buildroot/package/libcurl/libcurl.hash index 8f2d0c058..e60194254 100644 --- a/buildroot/package/libcurl/libcurl.hash +++ b/buildroot/package/libcurl/libcurl.hash @@ -1,5 +1,3 @@ -# Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.66.0.tar.xz.asc -# with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 dbb48088193016d079b97c5c3efde8efa56ada2ebf336e8a97d04eb8e2ed98c1 curl-7.66.0.tar.xz -sha256 8c8824f50e73a021f5dde1fccbf69685939247399a33a32abab1fa448c9ddabb COPYING +# Locally calculated +sha256 b724240722276a27f6e770b952121a3afd097129d8c9fe18e6272dc34192035a curl-7.68.0.tar.xz +sha256 db3c4a3b3695a0f317a0c5176acd2f656d18abc45b3ee78e50935a78eb1e132e COPYING diff --git a/buildroot/package/libcurl/libcurl.mk b/buildroot/package/libcurl/libcurl.mk index e78049cdc..16b11ca94 100644 --- a/buildroot/package/libcurl/libcurl.mk +++ b/buildroot/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.66.0 +LIBCURL_VERSION = 7.68.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -18,9 +18,11 @@ LIBCURL_INSTALL_STAGING = YES # on non-MMU platforms. Moreover, this authentication method is # probably almost never used. See # http://curl.haxx.se/docs/manpage.html#--ntlm. +# Likewise, there is no compiler on the target, so libcurl-option (to +# generate C code) isn't very useful LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \ --enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug \ - --without-polarssl + --without-polarssl --disable-libcurl-option ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBCURL_CONF_OPTS += --enable-threaded-resolver @@ -72,6 +74,13 @@ else LIBCURL_CONF_OPTS += --without-mbedtls endif +ifeq ($(BR2_PACKAGE_LIBCURL_WOLFSSL),y) +LIBCURL_CONF_OPTS += --with-wolfssl=$(STAGING_DIR)/usr +LIBCURL_DEPENDENCIES += wolfssl +else +LIBCURL_CONF_OPTS += --without-wolfssl +endif + ifeq ($(BR2_PACKAGE_C_ARES),y) LIBCURL_DEPENDENCIES += c-ares LIBCURL_CONF_OPTS += --enable-ares @@ -108,12 +117,52 @@ else LIBCURL_CONF_OPTS += --without-nghttp2 endif +ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) +LIBCURL_CONF_OPTS += --enable-cookies +else +LIBCURL_CONF_OPTS += --disable-cookies +endif + +ifeq ($(BR2_PACKAGE_LIBCURL_PROXY_SUPPORT),y) +LIBCURL_CONF_OPTS += --enable-proxy +else +LIBCURL_CONF_OPTS += --disable-proxy +endif + +ifeq ($(BR2_PACKAGE_LIBCURL_EXTRA_PROTOCOLS_FEATURES),y) +LIBCURL_CONF_OPTS += \ + --enable-dict \ + --enable-gopher \ + --enable-imap \ + --enable-ldap \ + --enable-ldaps \ + --enable-pop3 \ + --enable-rtsp \ + --enable-smb \ + --enable-smtp \ + --enable-telnet \ + --enable-tftp +else +LIBCURL_CONF_OPTS += \ + --disable-dict \ + --disable-gopher \ + --disable-imap \ + --disable-ldap \ + --disable-ldaps \ + --disable-pop3 \ + --disable-rtsp \ + --disable-smb \ + --disable-smtp \ + --disable-telnet \ + --disable-tftp +endif + define LIBCURL_FIX_DOT_PC printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in endef LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_LIBCURL_OPENSSL),LIBCURL_FIX_DOT_PC) -ifeq ($(BR2_PACKAGE_CURL),) +ifeq ($(BR2_PACKAGE_LIBCURL_CURL),) define LIBCURL_TARGET_CLEANUP rm -rf $(TARGET_DIR)/usr/bin/curl endef diff --git a/buildroot/package/libdcadec/libdcadec.hash b/buildroot/package/libdcadec/libdcadec.hash index e2b68cd70..d3a9ae7d4 100644 --- a/buildroot/package/libdcadec/libdcadec.hash +++ b/buildroot/package/libdcadec/libdcadec.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44 libdcadec-v0.2.0.tar.gz +sha256 ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44 libdcadec-0.2.0.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/buildroot/package/libdcadec/libdcadec.mk b/buildroot/package/libdcadec/libdcadec.mk index a5a98bedc..a3579ad63 100644 --- a/buildroot/package/libdcadec/libdcadec.mk +++ b/buildroot/package/libdcadec/libdcadec.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBDCADEC_VERSION = v0.2.0 -LIBDCADEC_SITE = $(call github,foo86,dcadec,$(LIBDCADEC_VERSION)) +LIBDCADEC_VERSION = 0.2.0 +LIBDCADEC_SITE = $(call github,foo86,dcadec,v$(LIBDCADEC_VERSION)) LIBDCADEC_LICENSE = LGPL-2.1+ LIBDCADEC_LICENSE_FILES = COPYING.LGPLv2.1 LIBDCADEC_INSTALL_STAGING = YES diff --git a/buildroot/package/libdmtx/Config.in b/buildroot/package/libdmtx/Config.in index b81b99c42..20f469148 100644 --- a/buildroot/package/libdmtx/Config.in +++ b/buildroot/package/libdmtx/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LIBDMTX libdmtx is a software library that enables programs to read and write Data Matrix barcodes of the modern ECC200 variety. - http://www.libdmtx.org/ + https://github.com/dmtx/libdmtx diff --git a/buildroot/package/libdmtx/libdmtx.hash b/buildroot/package/libdmtx/libdmtx.hash index 01e4ba491..98eef9aee 100644 --- a/buildroot/package/libdmtx/libdmtx.hash +++ b/buildroot/package/libdmtx/libdmtx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 686bcfb44e50b96345aa53f41e285f2118a2cf87a333b69b74165a2e7ddca492 libdmtx-0.7.4.tar.gz -sha256 fe6959a664a7abb7d19bf125fa58a045d8757fe3cb3dc41975a54da0e627313d LICENSE +sha256 be0c5275695a732a5f434ded1fcc232aa63b1a6015c00044fe87f3a689b75f2e libdmtx-0.7.5.tar.gz +sha256 fcc277b7302645322c63de22b9b0bdae2df3dfa7d6cbc0d5bed7a4d3f1a9af79 LICENSE diff --git a/buildroot/package/libdmtx/libdmtx.mk b/buildroot/package/libdmtx/libdmtx.mk index f718b137b..04e089f1f 100644 --- a/buildroot/package/libdmtx/libdmtx.mk +++ b/buildroot/package/libdmtx/libdmtx.mk @@ -4,10 +4,12 @@ # ################################################################################ -LIBDMTX_VERSION = 0.7.4 -LIBDMTX_SITE = http://downloads.sourceforge.net/project/libdmtx/libdmtx/$(LIBDMTX_VERSION) +LIBDMTX_VERSION = 0.7.5 +LIBDMTX_SITE = $(call github,dmtx,libdmtx,v$(LIBDMTX_VERSION)) LIBDMTX_LICENSE = BSD-2-Clause or Special Permission LIBDMTX_LICENSE_FILES = LICENSE LIBDMTX_INSTALL_STAGING = YES +# github tarball does not include configure +LIBDMTX_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/libdrm/0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch b/buildroot/package/libdrm/0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch deleted file mode 100644 index 0fbe77ef7..000000000 --- a/buildroot/package/libdrm/0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 57d544ff2f96a26cac07d5be00ff7b67678ae7b8 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 18 Dec 2017 13:08:39 +0100 -Subject: [PATCH] configure/Makefile.am: use pkg-config to discover - libatomic_ops - -The configure script currently tests the availability of libatomic_ops -by checking the presence of atomic_ops.h. While this is good enough as -an availability test, it is not sufficient as on some platforms, -libatomic_ops provides an actual shared library against which we -should be linked to access libatomic_ops functionality. - -Therefore, we instead use PKG_CHECK_MODULES() to test the availability -of libatomic_ops. Besides testing its availability, this also fills in -the ATOMIC_OPS_LIBS variable with the list of libraries we need to -link with to use libatomic_ops. - -All Mesa drivers that include xf86atomic.h have been updated to link -against ATOMIC_OPS_LIBS. - -Of course, if we're not using libatomic_ops, ATOMIC_OPS_LIBS is empty, -and we don't link against it. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Peter Seiderer -[Bernd: PKG_CHECK_MODULES should not fail when libatomic_ops is missing] -Signed-off-by: Bernd Kuhls ---- - amdgpu/Makefile.am | 2 +- - configure.ac | 2 +- - etnaviv/Makefile.am | 3 ++- - freedreno/Makefile.am | 3 ++- - intel/Makefile.am | 3 ++- - nouveau/Makefile.am | 2 +- - omap/Makefile.am | 2 +- - radeon/Makefile.am | 2 +- - tegra/Makefile.am | 2 +- - 9 files changed, 12 insertions(+), 9 deletions(-) - -diff --git a/amdgpu/Makefile.am b/amdgpu/Makefile.am -index a1b0d05c..b2bcceff 100644 ---- a/amdgpu/Makefile.am -+++ b/amdgpu/Makefile.am -@@ -36,7 +36,7 @@ AM_CPPFLAGS = -DAMDGPU_ASIC_ID_TABLE=\"${libdrmdatadir}/amdgpu.ids\" - libdrm_amdgpu_la_LTLIBRARIES = libdrm_amdgpu.la - libdrm_amdgpu_ladir = $(libdir) - libdrm_amdgpu_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_amdgpu_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_amdgpu_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@ - - libdrm_amdgpu_la_SOURCES = $(LIBDRM_AMDGPU_FILES) - amdgpu_asic_id.lo: $(top_srcdir)/data/amdgpu.ids -diff --git a/configure.ac b/configure.ac -index 35378b33..501d0871 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -247,7 +247,7 @@ AC_CACHE_CHECK([for native atomic primitives], drm_cv_atomic_primitives, [ - ]],[[]])], [drm_cv_atomic_primitives="Intel"],[]) - - if test "x$drm_cv_atomic_primitives" = "xnone"; then -- AC_CHECK_HEADER([atomic_ops.h], drm_cv_atomic_primitives="libatomic-ops") -+ PKG_CHECK_MODULES(ATOMIC_OPS, [atomic_ops], drm_cv_atomic_primitives="libatomic-ops", true) - fi - - # atomic functions defined in & libc on Solaris -diff --git a/etnaviv/Makefile.am b/etnaviv/Makefile.am -index be96ba86..669cf14f 100644 ---- a/etnaviv/Makefile.am -+++ b/etnaviv/Makefile.am -@@ -12,7 +12,8 @@ libdrm_etnaviv_la_LDFLAGS = -version-number 1:0:0 -no-undefined - libdrm_etnaviv_la_LIBADD = \ - ../libdrm.la \ - @PTHREADSTUBS_LIBS@ \ -- @CLOCK_LIB@ -+ @CLOCK_LIB@ \ -+ @ATOMIC_OPS_LIBS@ - - libdrm_etnaviv_la_SOURCES = $(LIBDRM_ETNAVIV_FILES) - -diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am -index cbb0d031..238407e3 100644 ---- a/freedreno/Makefile.am -+++ b/freedreno/Makefile.am -@@ -14,7 +14,8 @@ libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined - libdrm_freedreno_la_LIBADD = \ - ../libdrm.la \ - @PTHREADSTUBS_LIBS@ \ -- @CLOCK_LIB@ -+ @CLOCK_LIB@ \ -+ @ATOMIC_OPS_LIBS@ - - libdrm_freedreno_la_SOURCES = $(LIBDRM_FREEDRENO_FILES) - if HAVE_FREEDRENO_KGSL -diff --git a/intel/Makefile.am b/intel/Makefile.am -index c52e8c08..f3635a64 100644 ---- a/intel/Makefile.am -+++ b/intel/Makefile.am -@@ -38,7 +38,8 @@ libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined - libdrm_intel_la_LIBADD = ../libdrm.la \ - @PTHREADSTUBS_LIBS@ \ - @PCIACCESS_LIBS@ \ -- @CLOCK_LIB@ -+ @CLOCK_LIB@ \ -+ @ATOMIC_OPS_LIBS@ - - libdrm_intel_la_SOURCES = $(LIBDRM_INTEL_FILES) - -diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am -index 344a8445..a4e6a78b 100644 ---- a/nouveau/Makefile.am -+++ b/nouveau/Makefile.am -@@ -10,7 +10,7 @@ AM_CFLAGS = \ - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@ - - libdrm_nouveau_la_SOURCES = $(LIBDRM_NOUVEAU_FILES) - -diff --git a/omap/Makefile.am b/omap/Makefile.am -index 599bb9de..524afee3 100644 ---- a/omap/Makefile.am -+++ b/omap/Makefile.am -@@ -7,7 +7,7 @@ AM_CFLAGS = \ - libdrm_omap_la_LTLIBRARIES = libdrm_omap.la - libdrm_omap_ladir = $(libdir) - libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@ - - libdrm_omap_la_SOURCES = omap_drm.c - -diff --git a/radeon/Makefile.am b/radeon/Makefile.am -index e2415314..c27d3c75 100644 ---- a/radeon/Makefile.am -+++ b/radeon/Makefile.am -@@ -33,7 +33,7 @@ AM_CFLAGS = \ - libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la - libdrm_radeon_ladir = $(libdir) - libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined --libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@ - - libdrm_radeon_la_SOURCES = $(LIBDRM_RADEON_FILES) - -diff --git a/tegra/Makefile.am b/tegra/Makefile.am -index fb40be55..12abe8c4 100644 ---- a/tegra/Makefile.am -+++ b/tegra/Makefile.am -@@ -9,7 +9,7 @@ AM_CFLAGS = \ - libdrm_tegra_ladir = $(libdir) - libdrm_tegra_la_LTLIBRARIES = libdrm_tegra.la - libdrm_tegra_la_LDFLAGS = -version-number 0:0:0 -no-undefined --libdrm_tegra_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_tegra_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@ - - libdrm_tegra_la_SOURCES = \ - private.h \ --- -2.14.3 - diff --git a/buildroot/package/libdrm/0003-meson.build-fix-intel-atomics-detection.patch b/buildroot/package/libdrm/0003-meson.build-fix-intel-atomics-detection.patch new file mode 100644 index 000000000..5d7cd5e4d --- /dev/null +++ b/buildroot/package/libdrm/0003-meson.build-fix-intel-atomics-detection.patch @@ -0,0 +1,35 @@ +From 00f6ac3c24f36fa07fa93f4a89ee873edf125098 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 16 Jul 2018 23:01:40 +0200 +Subject: [PATCH] meson.build: fix intel atomics detection + +Use the stronger compiler.link() test (instead of the weaker +compiler.compile()) to fix the intel atomics detection. + +Fixes false positive in case of sparc compile (buildroot toolchain). + +Upstream suggested: https://lists.freedesktop.org/archives/dri-devel/2018-July/183885.html +Signed-off-by: Peter Seiderer +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9b443a5..3c8afb6 100644 +--- a/meson.build ++++ b/meson.build +@@ -49,9 +49,10 @@ intel_atomics = false + lib_atomics = false + + dep_atomic_ops = dependency('atomic_ops', required : false) +-if cc.compiles(''' ++if cc.links(''' + int atomic_add(int *i) { return __sync_add_and_fetch (i, 1); } + int atomic_cmpxchg(int *i, int j, int k) { return __sync_val_compare_and_swap (i, j, k); } ++ int main() { } + ''', + name : 'Intel Atomics') + intel_atomics = true +-- +2.18.0 + diff --git a/buildroot/package/libdrm/0004-meson.build-enable-static-build.patch b/buildroot/package/libdrm/0004-meson.build-enable-static-build.patch new file mode 100644 index 000000000..28da70255 --- /dev/null +++ b/buildroot/package/libdrm/0004-meson.build-enable-static-build.patch @@ -0,0 +1,169 @@ +From d58a32776e08e193c24f7bb192daf72b66fbe550 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Wed, 18 Jul 2018 21:35:18 +0200 +Subject: [PATCH] meson.build: enable static build + +Use meson library instead of shared_library to enable static build. + +Upstream suggested: https://lists.freedesktop.org/archives/dri-devel/2018-July/183886.html +Signed-off-by: Peter Seiderer +--- + amdgpu/meson.build | 2 +- + etnaviv/meson.build | 2 +- + exynos/meson.build | 2 +- + freedreno/meson.build | 2 +- + intel/meson.build | 2 +- + libkms/meson.build | 2 +- + meson.build | 2 +- + nouveau/meson.build | 2 +- + omap/meson.build | 2 +- + radeon/meson.build | 2 +- + tegra/meson.build | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/amdgpu/meson.build b/amdgpu/meson.build +index f39d7bf..1b4b0be 100644 +--- a/amdgpu/meson.build ++++ b/amdgpu/meson.build +@@ -21,7 +21,7 @@ + + datadir_amdgpu = join_paths(get_option('prefix'), get_option('datadir'), 'libdrm') + +-libdrm_amdgpu = shared_library( ++libdrm_amdgpu = library( + 'drm_amdgpu', + [ + files( +diff --git a/etnaviv/meson.build b/etnaviv/meson.build +index ca2aa54..a0d994e 100644 +--- a/etnaviv/meson.build ++++ b/etnaviv/meson.build +@@ -19,7 +19,7 @@ + # SOFTWARE. + + +-libdrm_etnaviv = shared_library( ++libdrm_etnaviv = library( + 'drm_etnaviv', + [ + files( +diff --git a/exynos/meson.build b/exynos/meson.build +index 30d3640..fd14f3a 100644 +--- a/exynos/meson.build ++++ b/exynos/meson.build +@@ -18,7 +18,7 @@ + # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + # SOFTWARE. + +-libdrm_exynos = shared_library( ++libdrm_exynos = library( + 'drm_exynos', + [files('exynos_drm.c', 'exynos_fimg2d.c'), config_file], + c_args : warn_c_args, +diff --git a/freedreno/meson.build b/freedreno/meson.build +index 015b7fb..6c8a6a7 100644 +--- a/freedreno/meson.build ++++ b/freedreno/meson.build +@@ -39,7 +39,7 @@ if with_freedreno_kgsl + ) + endif + +-libdrm_freedreno = shared_library( ++libdrm_freedreno = library( + 'drm_freedreno', + [files_freedreno, config_file], + c_args : warn_c_args, +diff --git a/intel/meson.build b/intel/meson.build +index 53c7fce..14cabd3 100644 +--- a/intel/meson.build ++++ b/intel/meson.build +@@ -18,7 +18,7 @@ + # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + # SOFTWARE. + +-libdrm_intel = shared_library( ++libdrm_intel = library( + 'drm_intel', + [ + files( +diff --git a/libkms/meson.build b/libkms/meson.build +index 86d1a4e..9d21e4c 100644 +--- a/libkms/meson.build ++++ b/libkms/meson.build +@@ -41,7 +41,7 @@ if with_exynos + libkms_include += include_directories('../exynos') + endif + +-libkms = shared_library( ++libkms = library( + 'kms', + [files_libkms, config_file], + c_args : warn_c_args, +diff --git a/meson.build b/meson.build +index 3c8afb6..7aa5f8c 100644 +--- a/meson.build ++++ b/meson.build +@@ -279,7 +279,7 @@ add_project_arguments('-include', 'config.h', language : 'c') + inc_root = include_directories('.') + inc_drm = include_directories('include/drm') + +-libdrm = shared_library( ++libdrm = library( + 'drm', + [files( + 'xf86drm.c', 'xf86drmHash.c', 'xf86drmRandom.c', 'xf86drmSL.c', +diff --git a/nouveau/meson.build b/nouveau/meson.build +index 51c9a71..acba048 100644 +--- a/nouveau/meson.build ++++ b/nouveau/meson.build +@@ -19,7 +19,7 @@ + # SOFTWARE. + + +-libdrm_nouveau = shared_library( ++libdrm_nouveau = library( + 'drm_nouveau', + [files( 'nouveau.c', 'pushbuf.c', 'bufctx.c', 'abi16.c'), config_file], + c_args : warn_c_args, +diff --git a/omap/meson.build b/omap/meson.build +index e57b8f5..6cffb99 100644 +--- a/omap/meson.build ++++ b/omap/meson.build +@@ -18,7 +18,7 @@ + # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + # SOFTWARE. + +-libdrm_omap = shared_library( ++libdrm_omap = library( + 'drm_omap', + [files('omap_drm.c'), config_file], + include_directories : [inc_root, inc_drm], +diff --git a/radeon/meson.build b/radeon/meson.build +index b08c744..2f45ff7 100644 +--- a/radeon/meson.build ++++ b/radeon/meson.build +@@ -19,7 +19,7 @@ + # SOFTWARE. + + +-libdrm_radeon = shared_library( ++libdrm_radeon = library( + 'drm_radeon', + [ + files( +diff --git a/tegra/meson.build b/tegra/meson.build +index 1f5c74b..8d0cfa9 100644 +--- a/tegra/meson.build ++++ b/tegra/meson.build +@@ -18,7 +18,7 @@ + # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + # SOFTWARE. + +-libdrm_tegra = shared_library( ++libdrm_tegra = library( + 'drm_tegra', + [files('tegra.c'), config_file], + include_directories : [inc_root, inc_drm], +-- +2.18.0 + diff --git a/buildroot/package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patch b/buildroot/package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patch new file mode 100644 index 000000000..e2e18e122 --- /dev/null +++ b/buildroot/package/libdrm/0005-tests-meson.build-disable-nouveau-tests-for-static-b.patch @@ -0,0 +1,43 @@ +From c9036706b9f724f09ac6288f82b53f2e76264ec7 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 25 Nov 2019 15:59:15 +0100 +Subject: [PATCH] tests/meson.build: disable nouveau tests for static build + +Signed-off-by: Peter Seiderer +--- +Notes: + + - the existing test/check for static build in meson.build does not + catch this case because e.g. the buildroot toolchain + br-arm-full-static-2019.05.1 provides an empty libdl.a + + 169 # Among others FreeBSD does not have a separate dl library. + 170 if not cc.has_function('dlsym') + 171 dep_dl = cc.find_library('dl', required : with_nouveau) + 172 else + 173 dep_dl = [] + 174 endif +--- + tests/meson.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 6c8ddd9..f7cb5f0 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -44,8 +44,11 @@ endif + if with_etnaviv + subdir('etnaviv') + endif ++lib_type = get_option('default_library') + if with_nouveau +- subdir('nouveau') ++ if lib_type != 'static' ++ subdir('nouveau') ++ endif + endif + + drmsl = executable( +-- +2.24.0 + diff --git a/buildroot/package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch b/buildroot/package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch new file mode 100644 index 000000000..80845709d --- /dev/null +++ b/buildroot/package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch @@ -0,0 +1,37 @@ +From 6c7b305869b941e52cb846cbed5e4a5c85d035d9 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Mon, 18 Jun 2018 15:07:03 +0100 +Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature + +POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to +use (int, unsigned long int, ...) instead. + +Use a #ifdef to adapt the replacement function as appropriate. + +Signed-off-by: Ross Burton + +[Taken from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch] +Signed-off-by: Peter Seiderer +--- + tests/nouveau/threaded.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c +index 3669bcd..e1c27c0 100644 +--- a/tests/nouveau/threaded.c ++++ b/tests/nouveau/threaded.c +@@ -36,7 +36,11 @@ static int failed; + + static int import_fd; + ++#ifdef __GLIBC__ + int ioctl(int fd, unsigned long request, ...) ++#else ++int ioctl(int fd, int request, ...) ++#endif + { + va_list va; + int ret; +-- +2.24.0 + diff --git a/buildroot/package/libdrm/0007-tests-amdgpu-needs-atomic_ops.patch b/buildroot/package/libdrm/0007-tests-amdgpu-needs-atomic_ops.patch new file mode 100644 index 000000000..9c06675da --- /dev/null +++ b/buildroot/package/libdrm/0007-tests-amdgpu-needs-atomic_ops.patch @@ -0,0 +1,27 @@ +From f0adb08424e624aeee340291343281256b7a98e8 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sat, 7 Mar 2020 12:23:09 +0100 +Subject: [PATCH] tests/amdgpu: needs atomic_ops + +[Upstream: https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/50] +Signed-off-by: Peter Seiderer +--- + tests/amdgpu/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/amdgpu/meson.build b/tests/amdgpu/meson.build +index 1726cb43..4dfa5c83 100644 +--- a/tests/amdgpu/meson.build ++++ b/tests/amdgpu/meson.build +@@ -26,7 +26,7 @@ if dep_cunit.found() + 'vce_tests.c', 'uvd_enc_tests.c', 'vcn_tests.c', 'deadlock_tests.c', + 'vm_tests.c', 'ras_tests.c', 'syncobj_tests.c', + ), +- dependencies : [dep_cunit, dep_threads], ++ dependencies : [dep_cunit, dep_threads, dep_atomic_ops], + include_directories : [inc_root, inc_drm, include_directories('../../amdgpu')], + link_with : [libdrm, libdrm_amdgpu], + install : with_install_tests, +-- +2.25.1 + diff --git a/buildroot/package/libdrm/libdrm.hash b/buildroot/package/libdrm/libdrm.hash index 301866c8b..7b50e66a9 100644 --- a/buildroot/package/libdrm/libdrm.hash +++ b/buildroot/package/libdrm/libdrm.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2019-January/204447.html -md5 acef22d0c62c89692348c2dd5591393e libdrm-2.4.97.tar.bz2 -sha1 7635bec769a17edd140282fa2c46838c4a44bc91 libdrm-2.4.97.tar.bz2 -sha256 77d0ccda3e10d6593398edb70b1566bfe1a23a39bd3da98ace2147692eadd123 libdrm-2.4.97.tar.bz2 -sha512 3e08ee9d6c9ce265d783a59b51e22449905ea73aa27f25a082a1e9e1532f7c99e1c9f7cb966eb0970be2a08e2e5993dc9aa55093b1bff548689fdb465e7145ed libdrm-2.4.97.tar.bz2 +# From https://lists.freedesktop.org/archives/dri-devel/2019-October/240455.html +md5 f47bc87e28198ba527e6b44ffdd62f65 libdrm-2.4.100.tar.bz2 +sha1 9f526909aba08b5658cfba3f7fde9385cad6f3b5 libdrm-2.4.100.tar.bz2 +sha256 c77cc828186c9ceec3e56ae202b43ee99eb932b4a87255038a80e8a1060d0a5d libdrm-2.4.100.tar.bz2 +sha512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247 libdrm-2.4.100.tar.bz2 diff --git a/buildroot/package/libdrm/libdrm.mk b/buildroot/package/libdrm/libdrm.mk index cc7350c10..f7c920574 100644 --- a/buildroot/package/libdrm/libdrm.mk +++ b/buildroot/package/libdrm/libdrm.mk @@ -4,120 +4,113 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.97 +LIBDRM_VERSION = 2.4.100 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT LIBDRM_INSTALL_STAGING = YES -# patch 0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch -# touching configure.ac/Makefile.am (and host-xutil_util-macros dependency) -LIBDRM_AUTORECONF = YES - LIBDRM_DEPENDENCIES = \ libpthread-stubs \ - host-pkgconf \ - host-xutil_util-macros + host-pkgconf LIBDRM_CONF_OPTS = \ - --disable-cairo-tests \ - --disable-manpages - -LIBDRM_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' + -Dcairo-tests=false \ + -Dmanpages=false ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) LIBDRM_DEPENDENCIES += libatomic_ops ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) -LIBDRM_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DAO_NO_SPARC_V9" +LIBDRM_CFLAGS = $(TARGET_CFLAGS) -DAO_NO_SPARC_V9 endif endif ifeq ($(BR2_PACKAGE_LIBDRM_INTEL),y) -LIBDRM_CONF_OPTS += --enable-intel +LIBDRM_CONF_OPTS += -Dintel=true LIBDRM_DEPENDENCIES += libpciaccess else -LIBDRM_CONF_OPTS += --disable-intel +LIBDRM_CONF_OPTS += -Dintel=false endif ifeq ($(BR2_PACKAGE_LIBDRM_RADEON),y) -LIBDRM_CONF_OPTS += --enable-radeon +LIBDRM_CONF_OPTS += -Dradeon=true else -LIBDRM_CONF_OPTS += --disable-radeon +LIBDRM_CONF_OPTS += -Dradeon=false endif ifeq ($(BR2_PACKAGE_LIBDRM_AMDGPU),y) -LIBDRM_CONF_OPTS += --enable-amdgpu +LIBDRM_CONF_OPTS += -Damdgpu=true else -LIBDRM_CONF_OPTS += --disable-amdgpu +LIBDRM_CONF_OPTS += -Damdgpu=false endif ifeq ($(BR2_PACKAGE_LIBDRM_NOUVEAU),y) -LIBDRM_CONF_OPTS += --enable-nouveau +LIBDRM_CONF_OPTS += -Dnouveau=true else -LIBDRM_CONF_OPTS += --disable-nouveau +LIBDRM_CONF_OPTS += -Dnouveau=false endif ifeq ($(BR2_PACKAGE_LIBDRM_VMWGFX),y) -LIBDRM_CONF_OPTS += --enable-vmwgfx +LIBDRM_CONF_OPTS += -Dvmwgfx=true else -LIBDRM_CONF_OPTS += --disable-vmwgfx +LIBDRM_CONF_OPTS += -Dvmwgfx=false endif ifeq ($(BR2_PACKAGE_LIBDRM_OMAP),y) -LIBDRM_CONF_OPTS += --enable-omap-experimental-api +LIBDRM_CONF_OPTS += -Domap=true else -LIBDRM_CONF_OPTS += --disable-omap-experimental-api +LIBDRM_CONF_OPTS += -Domap=false endif ifeq ($(BR2_PACKAGE_LIBDRM_ETNAVIV),y) -LIBDRM_CONF_OPTS += --enable-etnaviv-experimental-api +LIBDRM_CONF_OPTS += -Detnaviv=true else -LIBDRM_CONF_OPTS += --disable-etnaviv-experimental-api +LIBDRM_CONF_OPTS += -Detnaviv=false endif ifeq ($(BR2_PACKAGE_LIBDRM_EXYNOS),y) -LIBDRM_CONF_OPTS += --enable-exynos-experimental-api +LIBDRM_CONF_OPTS += -Dexynos=true else -LIBDRM_CONF_OPTS += --disable-exynos-experimental-api +LIBDRM_CONF_OPTS += -Dexynos=false endif ifeq ($(BR2_PACKAGE_LIBDRM_FREEDRENO),y) -LIBDRM_CONF_OPTS += --enable-freedreno +LIBDRM_CONF_OPTS += -Dfreedreno=true else -LIBDRM_CONF_OPTS += --disable-freedreno +LIBDRM_CONF_OPTS += -Dfreedreno=false endif ifeq ($(BR2_PACKAGE_LIBDRM_TEGRA),y) -LIBDRM_CONF_OPTS += --enable-tegra-experimental-api +LIBDRM_CONF_OPTS += -Dtegra=true else -LIBDRM_CONF_OPTS += --disable-tegra-experimental-api +LIBDRM_CONF_OPTS += -Dtegra=false endif ifeq ($(BR2_PACKAGE_LIBDRM_VC4),y) -LIBDRM_CONF_OPTS += --enable-vc4 +LIBDRM_CONF_OPTS += -Dvc4=true else -LIBDRM_CONF_OPTS += --disable-vc4 +LIBDRM_CONF_OPTS += -Dvc4=false endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBDRM_CONF_OPTS += --enable-udev +LIBDRM_CONF_OPTS += -Dudev=true LIBDRM_DEPENDENCIES += udev else -LIBDRM_CONF_OPTS += --disable-udev +LIBDRM_CONF_OPTS += -Dudev=false endif ifeq ($(BR2_PACKAGE_VALGRIND),y) -LIBDRM_CONF_OPTS += --enable-valgrind +LIBDRM_CONF_OPTS += -Dvalgrind=true LIBDRM_DEPENDENCIES += valgrind else -LIBDRM_CONF_OPTS += --disable-valgrind +LIBDRM_CONF_OPTS += -Dvalgrind=false endif ifeq ($(BR2_PACKAGE_LIBDRM_INSTALL_TESTS),y) -LIBDRM_CONF_OPTS += --enable-install-test-programs +LIBDRM_CONF_OPTS += -Dinstall-test-programs=true ifeq ($(BR2_PACKAGE_CUNIT),y) LIBDRM_DEPENDENCIES += cunit endif endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/libdvbpsi/libdvbpsi.hash b/buildroot/package/libdvbpsi/libdvbpsi.hash index 5623250dd..727b1cf49 100644 --- a/buildroot/package/libdvbpsi/libdvbpsi.hash +++ b/buildroot/package/libdvbpsi/libdvbpsi.hash @@ -1,7 +1,6 @@ -# From http://download.videolan.org/pub/libdvbpsi/1.3.2/libdvbpsi-1.3.2.tar.bz2.md5 -md5 be7398560955c69d318439fce3a2d84f libdvbpsi-1.3.2.tar.bz2 -# From http://download.videolan.org/pub/libdvbpsi/1.3.2/libdvbpsi-1.3.2.tar.bz2.sha256 -sha256 ac4e39f2b9b1e15706ad261fa175a9430344d650a940be9aaf502d4cb683c5fe libdvbpsi-1.3.2.tar.bz2 - +# From http://download.videolan.org/pub/libdvbpsi/1.3.3/libdvbpsi-1.3.3.tar.bz2.md5 +md5 9b556ab08bb62a8bec61f5c1649bc9a8 libdvbpsi-1.3.3.tar.bz2 +# From http://download.videolan.org/pub/libdvbpsi/1.3.3/libdvbpsi-1.3.3.tar.bz2.sha256 +sha256 02b5998bcf289cdfbd8757bedd5987e681309b0a25b3ffe6cebae599f7a00112 libdvbpsi-1.3.3.tar.bz2 # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libdvbpsi/libdvbpsi.mk b/buildroot/package/libdvbpsi/libdvbpsi.mk index c4118b265..5a07ad0cb 100644 --- a/buildroot/package/libdvbpsi/libdvbpsi.mk +++ b/buildroot/package/libdvbpsi/libdvbpsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDVBPSI_VERSION = 1.3.2 +LIBDVBPSI_VERSION = 1.3.3 LIBDVBPSI_SITE = http://download.videolan.org/pub/libdvbpsi/$(LIBDVBPSI_VERSION) LIBDVBPSI_SOURCE = libdvbpsi-$(LIBDVBPSI_VERSION).tar.bz2 LIBDVBPSI_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libdvbsi/libdvbsi.hash b/buildroot/package/libdvbsi/libdvbsi.hash index 3628fdbdb..184da5286 100644 --- a/buildroot/package/libdvbsi/libdvbsi.hash +++ b/buildroot/package/libdvbsi/libdvbsi.hash @@ -1,5 +1,8 @@ -# From http://www.saftware.de/libdvbsi++/libdvbsi++-0.3.7.tar.bz2.md5 -md5 7eb50352c06b17c499a6d51e18e99ec5 libdvbsi++-0.3.7.tar.bz2 +# From http://www.saftware.de/libdvbsi++/libdvbsi++-0.3.8.tar.bz2.md5 +md5 c8e6ef55ef4b96dacdee250779219d2a libdvbsi++-0.3.8.tar.bz2 + +# Locally calculated +sha256 a5b3fa767aa45267178c169268df886b3e79431f335a24d779edf610e8372f89 libdvbsi++-0.3.8.tar.bz2 # Hash for license file: sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/libdvbsi/libdvbsi.mk b/buildroot/package/libdvbsi/libdvbsi.mk index bfddd647e..d1646c0ef 100644 --- a/buildroot/package/libdvbsi/libdvbsi.mk +++ b/buildroot/package/libdvbsi/libdvbsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDVBSI_VERSION = 0.3.7 +LIBDVBSI_VERSION = 0.3.8 LIBDVBSI_SOURCE = libdvbsi++-$(LIBDVBSI_VERSION).tar.bz2 LIBDVBSI_SITE = http://www.saftware.de/libdvbsi++ LIBDVBSI_INSTALL_STAGING = YES diff --git a/buildroot/package/libdvdnav/0001-do-not-match-nios2-as-os2.patch b/buildroot/package/libdvdnav/0001-do-not-match-nios2-as-os2.patch deleted file mode 100644 index 27030bb23..000000000 --- a/buildroot/package/libdvdnav/0001-do-not-match-nios2-as-os2.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix misdetection while nios2 cross-compile - -Signed-off-bye: Waldemar Brodkorb - -diff -Nur libdvdnav-5.0.3.orig/configure.ac libdvdnav-5.0.3/configure.ac ---- libdvdnav-5.0.3.orig/configure.ac 2015-01-27 16:57:43.000000000 +0100 -+++ libdvdnav-5.0.3/configure.ac 2016-07-31 11:48:09.312947473 +0200 -@@ -73,7 +73,7 @@ - [*mingw32* | *cygwin*], [AC_CHECK_FUNCS(gettimeofday)]) - - AS_CASE([$host], -- [*os2*], [LDFLAGS="$LDFLAGS -no-undefined"]) -+ [*-os2*], [LDFLAGS="$LDFLAGS -no-undefined"]) - - dnl --------------------------------------------- - dnl threads diff --git a/buildroot/package/libdvdnav/libdvdnav.hash b/buildroot/package/libdvdnav/libdvdnav.hash index c251d0af2..8de6debfe 100644 --- a/buildroot/package/libdvdnav/libdvdnav.hash +++ b/buildroot/package/libdvdnav/libdvdnav.hash @@ -1,5 +1,9 @@ -# From http://download.videolan.org/pub/videolan/libdvdnav/6.0.0/libdvdnav-6.0.0.tar.bz2.sha256 -sha256 f0a2711b08a021759792f8eb14bb82ff8a3c929bf88c33b64ffcddaa27935618 libdvdnav-6.0.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2.md5 +md5 3a28d2cc7e25c1cbcb06443f3114f0b1 libdvdnav-6.0.1.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2.sha1 +sha1 258b82156e13803f2b0dbaec74e15475b4341d2f libdvdnav-6.0.1.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2.sha256 +sha256 e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733 libdvdnav-6.0.1.tar.bz2 # Hash for license file: sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/libdvdnav/libdvdnav.mk b/buildroot/package/libdvdnav/libdvdnav.mk index 549a31829..450f8f687 100644 --- a/buildroot/package/libdvdnav/libdvdnav.mk +++ b/buildroot/package/libdvdnav/libdvdnav.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBDVDNAV_VERSION = 6.0.0 +LIBDVDNAV_VERSION = 6.0.1 LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 LIBDVDNAV_SITE = http://www.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION) LIBDVDNAV_INSTALL_STAGING = YES LIBDVDNAV_DEPENDENCIES = libdvdread host-pkgconf LIBDVDNAV_LICENSE = GPL-2.0+ LIBDVDNAV_LICENSE_FILES = COPYING -# 0001-do-not-match-nios2-as-os2.patch -LIBDVDNAV_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/libdvdread/libdvdread.hash b/buildroot/package/libdvdread/libdvdread.hash index 44a3f9846..c6b5807af 100644 --- a/buildroot/package/libdvdread/libdvdread.hash +++ b/buildroot/package/libdvdread/libdvdread.hash @@ -1,5 +1,9 @@ -# From http://download.videolan.org/pub/videolan/libdvdread/6.0.0/libdvdread-6.0.0.tar.bz2.sha256 -sha256 b33b1953b4860545b75f6efc06e01d9849e2ea4f797652263b0b4af6dd10f935 libdvdread-6.0.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdread/6.0.2/libdvdread-6.0.2.tar.bz2.md5 +md5 49990935174bf6b2fa501e789c578135 libdvdread-6.0.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdread/6.0.2/libdvdread-6.0.2.tar.bz2.sha1 +sha1 a3d4b85cbe52b11cff7587ed010fa38ce512fd95 libdvdread-6.0.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libdvdread/6.0.2/libdvdread-6.0.2.tar.bz2.sha256 +sha256 f91401af213b219cdde24b46c50a57f29301feb7f965678f1d7ed4632cc6feb0 libdvdread-6.0.2.tar.bz2 # Hash for license file: sha256 d6cb0e9e560f51085556949a84af12b79a00f10ab8b66c752537faf7cd665572 COPYING diff --git a/buildroot/package/libdvdread/libdvdread.mk b/buildroot/package/libdvdread/libdvdread.mk index f41a188f8..7744fc42a 100644 --- a/buildroot/package/libdvdread/libdvdread.mk +++ b/buildroot/package/libdvdread/libdvdread.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDVDREAD_VERSION = 6.0.0 +LIBDVDREAD_VERSION = 6.0.2 LIBDVDREAD_SOURCE = libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 LIBDVDREAD_SITE = http://www.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION) LIBDVDREAD_INSTALL_STAGING = YES diff --git a/buildroot/package/libebml/0001-EbmlSInteger-Use-limits-instead-of-climits.patch b/buildroot/package/libebml/0001-EbmlSInteger-Use-limits-instead-of-climits.patch deleted file mode 100644 index d6e906fe7..000000000 --- a/buildroot/package/libebml/0001-EbmlSInteger-Use-limits-instead-of-climits.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e46906b80e7662fb78d305f576412f9fa4a22218 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= -Date: Mon, 23 Apr 2018 12:05:42 +0200 -Subject: [PATCH] EbmlSInteger: Use instead of - -The former is the proper header to use for std::numerical_limits - -Retrieved from: -https://github.com/Matroska-Org/libebml/commit/e46906b80e7662fb78d305f576412f9fa4a22218 - -Signed-off-by: Fabrice Fontaine ---- - src/EbmlSInteger.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/EbmlSInteger.cpp b/src/EbmlSInteger.cpp -index 33f3637..b930f7d 100644 ---- a/src/EbmlSInteger.cpp -+++ b/src/EbmlSInteger.cpp -@@ -33,7 +33,7 @@ - \author Moritz Bunkus - */ - #include --#include -+#include - - #include "ebml/EbmlSInteger.h" - diff --git a/buildroot/package/libebml/libebml.hash b/buildroot/package/libebml/libebml.hash index 6daa4746c..88511f7b9 100644 --- a/buildroot/package/libebml/libebml.hash +++ b/buildroot/package/libebml/libebml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1e5a7a7820c493aa62b0f35e15b4233c792cc03458c55ebdfa7a6521e4b43e9e libebml-1.3.6.tar.xz +sha256 c6a792f4127b8059bc446fb32391e6633811f45748d7d7ba873d7028362f5e3e libebml-1.3.10.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL diff --git a/buildroot/package/libebml/libebml.mk b/buildroot/package/libebml/libebml.mk index 3c3446273..549d2f8e6 100644 --- a/buildroot/package/libebml/libebml.mk +++ b/buildroot/package/libebml/libebml.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEBML_VERSION = 1.3.6 +LIBEBML_VERSION = 1.3.10 LIBEBML_SOURCE = libebml-$(LIBEBML_VERSION).tar.xz LIBEBML_SITE = http://dl.matroska.org/downloads/libebml LIBEBML_INSTALL_STAGING = YES diff --git a/buildroot/package/libebur128/libebur128.hash b/buildroot/package/libebur128/libebur128.hash index 2b0d3e34c..e2285bc7c 100644 --- a/buildroot/package/libebur128/libebur128.hash +++ b/buildroot/package/libebur128/libebur128.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1d0d7e855da04010a2432e11fbc596502caf11b61c3b571ccbcb10095fe44b43 libebur128-v1.2.2.tar.gz +sha256 2ee41a3a5ae3891601ae975d5ec2642b997d276ef647cf5c5b363b6127f7add8 libebur128-1.2.4.tar.gz sha256 d6b4754bb67bdd08b97d5d11b2d7434997a371585a78fe77007149df3af8d09c COPYING diff --git a/buildroot/package/libebur128/libebur128.mk b/buildroot/package/libebur128/libebur128.mk index 24c2f2429..97c1bdbbd 100644 --- a/buildroot/package/libebur128/libebur128.mk +++ b/buildroot/package/libebur128/libebur128.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBEBUR128_VERSION = v1.2.2 -LIBEBUR128_SITE = $(call github,jiixyj,libebur128,$(LIBEBUR128_VERSION)) +LIBEBUR128_VERSION = 1.2.4 +LIBEBUR128_SITE = $(call github,jiixyj,libebur128,v$(LIBEBUR128_VERSION)) LIBEBUR128_LICENSE = MIT LIBEBUR128_LICENSE_FILES = COPYING LIBEBUR128_INSTALL_STAGING = YES diff --git a/buildroot/package/libedit/libedit.hash b/buildroot/package/libedit/libedit.hash index 3a5cdbac9..7b84909d8 100644 --- a/buildroot/package/libedit/libedit.hash +++ b/buildroot/package/libedit/libedit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c41bea8fd140fb57ba67a98ec1d8ae0b8ffa82f4aba9c35a87e5a9499e653116 libedit-20180525-3.1.tar.gz +sha256 ac8f0f51c1cf65492e4d1e3ed2be360bda41e54633444666422fbf393bba1bae libedit-20190324-3.1.tar.gz sha256 9da6c9c74987a36c84302982799d17d2f748ba1c1c0c471425716173c1d07649 COPYING diff --git a/buildroot/package/libedit/libedit.mk b/buildroot/package/libedit/libedit.mk index a4b32e05e..0a9b28afa 100644 --- a/buildroot/package/libedit/libedit.mk +++ b/buildroot/package/libedit/libedit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEDIT_VERSION = 20180525-3.1 +LIBEDIT_VERSION = 20190324-3.1 LIBEDIT_SITE = http://www.thrysoee.dk/editline LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses diff --git a/buildroot/package/libepoxy/libepoxy.hash b/buildroot/package/libepoxy/libepoxy.hash index dd1b13487..a37e3949a 100644 --- a/buildroot/package/libepoxy/libepoxy.hash +++ b/buildroot/package/libepoxy/libepoxy.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.2.sha256sum -sha256 a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8 libepoxy-1.5.2.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.4.sha256sum +sha256 0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2 libepoxy-1.5.4.tar.xz # Hashes for license files: sha256 8d5144666f9c4df9bbd69b8900086d5979259152a1060421cdcc0fb9061a1c12 COPYING diff --git a/buildroot/package/libepoxy/libepoxy.mk b/buildroot/package/libepoxy/libepoxy.mk index b1731a22c..efc23a763 100644 --- a/buildroot/package/libepoxy/libepoxy.mk +++ b/buildroot/package/libepoxy/libepoxy.mk @@ -5,26 +5,27 @@ ################################################################################ LIBEPOXY_VERSION_MAJOR = 1.5 -LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).2 +LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).4 LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz LIBEPOXY_INSTALL_STAGING = YES LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros LIBEPOXY_LICENSE = MIT LIBEPOXY_LICENSE_FILES = COPYING +LIBEPOXY_CONF_OPTS += -Ddocs=false -Dtests=false ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) -LIBEPOXY_CONF_OPTS += --enable-egl +LIBEPOXY_CONF_OPTS += -Degl=yes LIBEPOXY_DEPENDENCIES += libegl else -LIBEPOXY_CONF_OPTS += --disable-egl +LIBEPOXY_CONF_OPTS += -Degl=no endif ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_XLIB_LIBX11),yy) -LIBEPOXY_CONF_OPTS += --enable-glx +LIBEPOXY_CONF_OPTS += -Dglx=yes -Dx11=true LIBEPOXY_DEPENDENCIES += libgl xlib_libX11 else -LIBEPOXY_CONF_OPTS += --disable-glx +LIBEPOXY_CONF_OPTS += -Dglx=no -Dx11=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/liberation/liberation.hash b/buildroot/package/liberation/liberation.hash index 5ae4034de..a15dc2351 100644 --- a/buildroot/package/liberation/liberation.hash +++ b/buildroot/package/liberation/liberation.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504 liberation-fonts-ttf-2.00.1.tar.gz +sha256 f14ff0a0be87b5aeb672e669363b5a699db76feb1144b06798261c0fdcd2b24d liberation-fonts-ttf-2.00.5.tar.gz sha256 93fed46019c38bbe566b479d22148e2e8a1e85ada614accb0211c37b2c61c19b LICENSE diff --git a/buildroot/package/liberation/liberation.mk b/buildroot/package/liberation/liberation.mk index cabee1720..495a1ffa6 100644 --- a/buildroot/package/liberation/liberation.mk +++ b/buildroot/package/liberation/liberation.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBERATION_VERSION = 2.00.1 -LIBERATION_SITE = https://releases.pagure.org/liberation-fonts +LIBERATION_VERSION = 2.00.5 +LIBERATION_SITE = https://github.com/liberationfonts/liberation-fonts/files/2926169 LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation LIBERATION_LICENSE = OFL-1.1 diff --git a/buildroot/package/libestr/libestr.hash b/buildroot/package/libestr/libestr.hash index dcb504d3e..6445d0108 100644 --- a/buildroot/package/libestr/libestr.hash +++ b/buildroot/package/libestr/libestr.hash @@ -1,5 +1,5 @@ -# From http://libestr.adiscon.com/download/libestr-0-1-10/ -sha256 bd655e126e750edd18544b88eb1568d200a424a0c23f665eb14bbece07ac703c libestr-0.1.10.tar.gz +# From http://libestr.adiscon.com/download/libestr-0-1-11/ +sha256 46632b2785ff4a231dcf241eeb0dcb5fc0c7d4da8ee49cf5687722cdbe8b2024 libestr-0.1.11.tar.gz # Hash for license file: sha256 835b4793da5cbb8965fbd63905b55a4cb4310b7d1b882077d23066b08f901ff8 COPYING diff --git a/buildroot/package/libestr/libestr.mk b/buildroot/package/libestr/libestr.mk index dcd209474..30960f725 100644 --- a/buildroot/package/libestr/libestr.mk +++ b/buildroot/package/libestr/libestr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBESTR_VERSION = 0.1.10 +LIBESTR_VERSION = 0.1.11 LIBESTR_SITE = http://libestr.adiscon.com/files/download LIBESTR_LICENSE = LGPL-2.1+ LIBESTR_LICENSE_FILES = COPYING diff --git a/buildroot/package/libev/libev.hash b/buildroot/package/libev/libev.hash index ba9d654be..9ab341ded 100644 --- a/buildroot/package/libev/libev.hash +++ b/buildroot/package/libev/libev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 973593d3479abdf657674a55afe5f78624b0e440614e2b8cb3a07f16d4d7f821 libev-4.24.tar.gz +sha256 2d5526fc8da4f072dd5c73e18fbb1666f5ef8ed78b73bba12e195cfdd810344e libev-4.27.tar.gz sha256 c4dd1a5bc38b041a320b93c5d6c08f5c41a63f2ce718ee16cfcb757fad448199 LICENSE diff --git a/buildroot/package/libev/libev.mk b/buildroot/package/libev/libev.mk index 5d9020cd5..38b0530f6 100644 --- a/buildroot/package/libev/libev.mk +++ b/buildroot/package/libev/libev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEV_VERSION = 4.24 +LIBEV_VERSION = 4.27 LIBEV_SITE = http://dist.schmorp.de/libev/Attic LIBEV_INSTALL_STAGING = YES LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ @@ -18,3 +18,4 @@ endef LIBEV_POST_PATCH_HOOKS += LIBEV_DISABLE_EVENT_H_INSTALL $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/libevdev/libevdev.hash b/buildroot/package/libevdev/libevdev.hash index 4a750e0ac..0d2c99922 100644 --- a/buildroot/package/libevdev/libevdev.hash +++ b/buildroot/package/libevdev/libevdev.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/input-tools/2018-October/001488.html -md5 154b24f01425c4c82fdc3e11f2c13af6 libevdev-1.6.0.tar.xz -sha1 ef584a500833fe737bacb89350f93314b07f1c42 libevdev-1.6.0.tar.xz -sha256 f5005c865987d980cc1279b9ec6131b06a89fd9892f649f2a68262b8786ef814 libevdev-1.6.0.tar.xz -sha512 73046da447773716c9f0c9f511f3a0a6ababcf92a146eba363014afcbdb465f4c3cd8be0917f2f01561a72f24f20fe8ecd333467437d9d85c03afcb433d05060 libevdev-1.6.0.tar.xz +# From https://lists.freedesktop.org/archives/input-tools/2019-August/001521.html +md5 879631080be18526737e33b63d848039 libevdev-1.8.0.tar.xz +sha1 4392d28fb91a5f6eb404aab531526f5fa0bbe73d libevdev-1.8.0.tar.xz +sha256 20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211 libevdev-1.8.0.tar.xz +sha512 8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4 libevdev-1.8.0.tar.xz # Hash for license files: sha256 f063d1279b31e73007e1c54493391818b4cb5f9162d590120397e0347b932137 COPYING diff --git a/buildroot/package/libevdev/libevdev.mk b/buildroot/package/libevdev/libevdev.mk index d8361028d..8b243be74 100644 --- a/buildroot/package/libevdev/libevdev.mk +++ b/buildroot/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.6.0 +LIBEVDEV_VERSION = 1.8.0 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = X11 @@ -14,7 +14,7 @@ LIBEVDEV_LICENSE_FILES = COPYING LIBEVDEV_AUTORECONF = YES # Uses PKG_CHECK_MODULES() in configure.ac -LIBEVDEV_DEPENDENCIES = host-pkgconf +LIBEVDEV_DEPENDENCIES = host-pkgconf host-python LIBEVDEV_INSTALL_STAGING = YES diff --git a/buildroot/package/libevent/0001-Disable-building-test-programs.patch b/buildroot/package/libevent/0001-Disable-building-test-programs.patch deleted file mode 100644 index a1ce77464..000000000 --- a/buildroot/package/libevent/0001-Disable-building-test-programs.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4b5a135fa681e85eb6988a379f59f3c7a41cc48c Mon Sep 17 00:00:00 2001 -From: Gilles Talis -Date: Fri, 21 Jun 2013 15:25:11 -0700 -Subject: [PATCH 1/2] Disable building test programs - -We are not really interested in building test programs. -Moreover, these programs use fork() function that is -not available on MMU-less architectures. - -Signed-off-by: Gilles Talis -[aduskett@gmail.com: Updated for 2.1.8] -Signed-off-by: Adam Duskett ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 42879a3..dc90359 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -144,7 +144,6 @@ - BUILT_SOURCES = - include include/include.am - include sample/include.am --include test/include.am - - if BUILD_WIN32 - --- -2.1.1 - diff --git a/buildroot/package/libevent/libevent.hash b/buildroot/package/libevent/libevent.hash index aa0358bcf..7bcb381dd 100644 --- a/buildroot/package/libevent/libevent.hash +++ b/buildroot/package/libevent/libevent.hash @@ -1,4 +1,4 @@ # locally computed -md5 f3eeaed018542963b7d2416ef1135ecc libevent-2.1.8-stable.tar.gz -sha1 2a1b8bb7a262d3fd0ed6a080a20991a6eed675ec libevent-2.1.8-stable.tar.gz +md5 7f35cfe69b82d879111ec0d7b7b1c531 libevent-2.1.11-stable.tar.gz +sha1 a76bba0a281da9384d4be5b40f3907c07e21428c libevent-2.1.11-stable.tar.gz sha256 ff02effc9b331edcdac387d198691bfa3e575e7d244ad10cb826aa51ef085670 LICENSE diff --git a/buildroot/package/libevent/libevent.mk b/buildroot/package/libevent/libevent.mk index f0c989afa..d60455931 100644 --- a/buildroot/package/libevent/libevent.mk +++ b/buildroot/package/libevent/libevent.mk @@ -4,15 +4,19 @@ # ################################################################################ -LIBEVENT_VERSION = 2.1.8-stable -LIBEVENT_SITE = https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_VERSION) +LIBEVENT_VERSION = 2.1.11 +LIBEVENT_SITE = https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_VERSION)-stable +LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz LIBEVENT_INSTALL_STAGING = YES LIBEVENT_LICENSE = BSD-3-Clause, OpenBSD LIBEVENT_LICENSE_FILES = LICENSE -# For 0001-Disable-building-test-programs.patch -LIBEVENT_AUTORECONF = YES -LIBEVENT_CONF_OPTS = --disable-samples -HOST_LIBEVENT_CONF_OPTS = --disable-samples --disable-openssl +LIBEVENT_CONF_OPTS = \ + --disable-libevent-regress \ + --disable-samples +HOST_LIBEVENT_CONF_OPTS = \ + --disable-libevent-regress \ + --disable-samples \ + --disable-openssl define LIBEVENT_REMOVE_PYSCRIPT rm $(TARGET_DIR)/usr/bin/event_rpcgen.py @@ -20,7 +24,7 @@ endef # libevent installs a python script to target - get rid of it if we # don't have python support enabled -ifneq ($(BR2_PACKAGE_PYTHON),y) +ifneq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT endif diff --git a/buildroot/package/libexif/0001-fixes-some-not-all-buffer-overreads-during-decoding-.patch b/buildroot/package/libexif/0001-fixes-some-not-all-buffer-overreads-during-decoding-.patch new file mode 100644 index 000000000..c98ed748c --- /dev/null +++ b/buildroot/package/libexif/0001-fixes-some-not-all-buffer-overreads-during-decoding-.patch @@ -0,0 +1,65 @@ +From 41bd04234b104312f54d25822f68738ba8d7133d Mon Sep 17 00:00:00 2001 +From: Marcus Meissner +Date: Tue, 25 Jul 2017 23:44:44 +0200 +Subject: [PATCH] fixes some (not all) buffer overreads during decoding pentax + makernote entries. + +This should fix: +https://sourceforge.net/p/libexif/bugs/125/ CVE-2016-6328 + +Signed-off-by: Peter Korsgaard +--- + libexif/pentax/mnote-pentax-entry.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c +index d03d159..ea0429a 100644 +--- a/libexif/pentax/mnote-pentax-entry.c ++++ b/libexif/pentax/mnote-pentax-entry.c +@@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, + case EXIF_FORMAT_SHORT: + { + const unsigned char *data = entry->data; +- size_t k, len = strlen(val); ++ size_t k, len = strlen(val), sizeleft; ++ ++ sizeleft = entry->size; + for(k=0; kcomponents; k++) { ++ if (sizeleft < 2) ++ break; + vs = exif_get_short (data, entry->order); + snprintf (val+len, maxlen-len, "%i ", vs); + len = strlen(val); + data += 2; ++ sizeleft -= 2; + } + } + break; + case EXIF_FORMAT_LONG: + { + const unsigned char *data = entry->data; +- size_t k, len = strlen(val); ++ size_t k, len = strlen(val), sizeleft; ++ ++ sizeleft = entry->size; + for(k=0; kcomponents; k++) { ++ if (sizeleft < 4) ++ break; + vl = exif_get_long (data, entry->order); + snprintf (val+len, maxlen-len, "%li", (long int) vl); + len = strlen(val); + data += 4; ++ sizeleft -= 4; + } + } + break; +@@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, + break; + } + +- return (val); ++ return val; + } +-- +2.20.1 + diff --git a/buildroot/package/libexif/0002-On-saving-makernotes-make-sure-the-makernote-contain.patch b/buildroot/package/libexif/0002-On-saving-makernotes-make-sure-the-makernote-contain.patch new file mode 100644 index 000000000..84c92593b --- /dev/null +++ b/buildroot/package/libexif/0002-On-saving-makernotes-make-sure-the-makernote-contain.patch @@ -0,0 +1,41 @@ +From c39acd1692023b26290778a02a9232c873f9d71a Mon Sep 17 00:00:00 2001 +From: Marcus Meissner +Date: Tue, 25 Jul 2017 23:38:56 +0200 +Subject: [PATCH] On saving makernotes, make sure the makernote container tags + has a type with 1 byte components. + +Fixes (at least): + https://sourceforge.net/p/libexif/bugs/130 + https://sourceforge.net/p/libexif/bugs/129 + +CVE-2017-7544: libexif through 0.6.21 is vulnerable to out-of-bounds heap +read vulnerability in exif_data_save_data_entry function in +libexif/exif-data.c caused by improper length computation of the allocated +data of an ExifMnote entry which can cause denial-of-service or possibly +information disclosure. + +Signed-off-by: Peter Korsgaard +--- + libexif/exif-data.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libexif/exif-data.c b/libexif/exif-data.c +index 67df4db..91f4c33 100644 +--- a/libexif/exif-data.c ++++ b/libexif/exif-data.c +@@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e, + exif_mnote_data_set_offset (data->priv->md, *ds - 6); + exif_mnote_data_save (data->priv->md, &e->data, &e->size); + e->components = e->size; ++ if (exif_format_get_size (e->format) != 1) { ++ /* e->format is taken from input code, ++ * but we need to make sure it is a 1 byte ++ * entity due to the multiplication below. */ ++ e->format = EXIF_FORMAT_UNDEFINED; ++ } + } + } + +-- +2.20.1 + diff --git a/buildroot/package/libexif/0003-Reduce-maximum-recursion-depth-in-exif_data_load_dat.patch b/buildroot/package/libexif/0003-Reduce-maximum-recursion-depth-in-exif_data_load_dat.patch new file mode 100644 index 000000000..e662d6bfc --- /dev/null +++ b/buildroot/package/libexif/0003-Reduce-maximum-recursion-depth-in-exif_data_load_dat.patch @@ -0,0 +1,30 @@ +From 5d28011c40ec86cf52cffad541093d37c263898a Mon Sep 17 00:00:00 2001 +From: Dan Fandrich +Date: Fri, 20 Apr 2018 18:05:19 +0200 +Subject: [PATCH] Reduce maximum recursion depth in exif_data_load_data_content + +This only needs to be a small, single digit integer for normal files, +and reducing the maximum closer to this reduces the time and space +needed to detect pathological cases. + +Signed-off-by: Peter Korsgaard +--- + libexif/exif-data.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libexif/exif-data.c b/libexif/exif-data.c +index 91f4c33..04cdda2 100644 +--- a/libexif/exif-data.c ++++ b/libexif/exif-data.c +@@ -378,7 +378,7 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + if ((((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT)) + return; + +- if (recursion_depth > 30) { ++ if (recursion_depth > 12) { + exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", + "Deep recursion detected!"); + return; +-- +2.20.1 + diff --git a/buildroot/package/libexif/0004-Improve-deep-recursion-detection-in-exif_data_load_d.patch b/buildroot/package/libexif/0004-Improve-deep-recursion-detection-in-exif_data_load_d.patch new file mode 100644 index 000000000..ff991541f --- /dev/null +++ b/buildroot/package/libexif/0004-Improve-deep-recursion-detection-in-exif_data_load_d.patch @@ -0,0 +1,120 @@ +From 6aa11df549114ebda520dde4cdaea2f9357b2c89 Mon Sep 17 00:00:00 2001 +From: Dan Fandrich +Date: Fri, 12 Oct 2018 16:01:45 +0200 +Subject: [PATCH] Improve deep recursion detection in + exif_data_load_data_content. + +The existing detection was still vulnerable to pathological cases +causing DoS by wasting CPU. The new algorithm takes the number of tags +into account to make it harder to abuse by cases using shallow recursion +but with a very large number of tags. This improves on commit 5d28011c +which wasn't sufficient to counter this kind of case. + +The limitation in the previous fix was discovered by Laurent Delosieres, +Secunia Research at Flexera (Secunia Advisory SA84652) and is assigned +the identifier CVE-2018-20030. + +[Peter: drop NEWS change] +Signed-off-by: Peter Korsgaard +--- + libexif/exif-data.c | 45 +++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 37 insertions(+), 8 deletions(-) + +diff --git a/libexif/exif-data.c b/libexif/exif-data.c +index e35403d..a6f9c94 100644 +--- a/libexif/exif-data.c ++++ b/libexif/exif-data.c +@@ -35,6 +35,7 @@ + #include + #include + ++#include + #include + #include + #include +@@ -350,6 +351,20 @@ if (data->ifd[(i)]->count) { \ + break; \ + } + ++/*! Calculate the recursion cost added by one level of IFD loading. ++ * ++ * The work performed is related to the cost in the exponential relation ++ * work=1.1**cost ++ */ ++static unsigned int ++level_cost(unsigned int n) ++{ ++ static const double log_1_1 = 0.09531017980432493; ++ ++ /* Adding 0.1 protects against the case where n==1 */ ++ return ceil(log(n + 0.1)/log_1_1); ++} ++ + /*! Load data for an IFD. + * + * \param[in,out] data #ExifData +@@ -357,13 +372,13 @@ if (data->ifd[(i)]->count) { \ + * \param[in] d pointer to buffer containing raw IFD data + * \param[in] ds size of raw data in buffer at \c d + * \param[in] offset offset into buffer at \c d at which IFD starts +- * \param[in] recursion_depth number of times this function has been +- * recursively called without returning ++ * \param[in] recursion_cost factor indicating how expensive this recursive ++ * call could be + */ + static void + exif_data_load_data_content (ExifData *data, ExifIfd ifd, + const unsigned char *d, +- unsigned int ds, unsigned int offset, unsigned int recursion_depth) ++ unsigned int ds, unsigned int offset, unsigned int recursion_cost) + { + ExifLong o, thumbnail_offset = 0, thumbnail_length = 0; + ExifShort n; +@@ -378,9 +393,20 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + if ((((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT)) + return; + +- if (recursion_depth > 12) { ++ if (recursion_cost > 170) { ++ /* ++ * recursion_cost is a logarithmic-scale indicator of how expensive this ++ * recursive call might end up being. It is an indicator of the depth of ++ * recursion as well as the potential for worst-case future recursive ++ * calls. Since it's difficult to tell ahead of time how often recursion ++ * will occur, this assumes the worst by assuming every tag could end up ++ * causing recursion. ++ * The value of 170 was chosen to limit typical EXIF structures to a ++ * recursive depth of about 6, but pathological ones (those with very ++ * many tags) to only 2. ++ */ + exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", +- "Deep recursion detected!"); ++ "Deep/expensive recursion detected!"); + return; + } + +@@ -422,15 +448,18 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + switch (tag) { + case EXIF_TAG_EXIF_IFD_POINTER: + CHECK_REC (EXIF_IFD_EXIF); +- exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, recursion_depth + 1); ++ exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, ++ recursion_cost + level_cost(n)); + break; + case EXIF_TAG_GPS_INFO_IFD_POINTER: + CHECK_REC (EXIF_IFD_GPS); +- exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, recursion_depth + 1); ++ exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, ++ recursion_cost + level_cost(n)); + break; + case EXIF_TAG_INTEROPERABILITY_IFD_POINTER: + CHECK_REC (EXIF_IFD_INTEROPERABILITY); +- exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, recursion_depth + 1); ++ exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, ++ recursion_cost + level_cost(n)); + break; + case EXIF_TAG_JPEG_INTERCHANGE_FORMAT: + thumbnail_offset = o; +-- +2.20.1 + diff --git a/buildroot/package/libexif/0005-fix-CVE-2019-9278.patch b/buildroot/package/libexif/0005-fix-CVE-2019-9278.patch new file mode 100644 index 000000000..f708b2ae5 --- /dev/null +++ b/buildroot/package/libexif/0005-fix-CVE-2019-9278.patch @@ -0,0 +1,90 @@ +From 75aa73267fdb1e0ebfbc00369e7312bac43d0566 Mon Sep 17 00:00:00 2001 +From: Marcus Meissner +Date: Sat, 18 Jan 2020 09:29:42 +0100 +Subject: [PATCH] fix CVE-2019-9278 + +avoid the use of unsafe integer overflow checking constructs (unsigned integer operations cannot overflow, so "u1 + u2 > u1" can be optimized away) + +check for the actual sizes, which should also handle the overflows +document other places google patched, but do not seem relevant due to other restrictions + +fixes https://github.com/libexif/libexif/issues/26 + +Signed-off-by: Peter Korsgaard +--- + libexif/exif-data.c | 28 ++++++++++++++++++---------- + 1 file changed, 18 insertions(+), 10 deletions(-) + +diff --git a/libexif/exif-data.c b/libexif/exif-data.c +index a6f9c94..6332cd1 100644 +--- a/libexif/exif-data.c ++++ b/libexif/exif-data.c +@@ -192,9 +192,15 @@ exif_data_load_data_entry (ExifData *data, ExifEntry *entry, + doff = offset + 8; + + /* Sanity checks */ +- if ((doff + s < doff) || (doff + s < s) || (doff + s > size)) { ++ if (doff >= size) { + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", +- "Tag data past end of buffer (%u > %u)", doff+s, size); ++ "Tag starts past end of buffer (%u > %u)", doff, size); ++ return 0; ++ } ++ ++ if (s > size - doff) { ++ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", ++ "Tag data goes past end of buffer (%u > %u)", doff+s, size); + return 0; + } + +@@ -315,13 +321,14 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, + unsigned int ds, ExifLong o, ExifLong s) + { + /* Sanity checks */ +- if ((o + s < o) || (o + s < s) || (o + s > ds) || (o > ds)) { +- exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", +- "Bogus thumbnail offset (%u) or size (%u).", +- o, s); ++ if (o >= ds) { ++ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o); ++ return; ++ } ++ if (s > ds - o) { ++ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o); + return; + } +- + if (data->data) + exif_mem_free (data->priv->mem, data->data); + if (!(data->data = exif_data_alloc (data, s))) { +@@ -947,7 +954,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", + "IFD 0 at %i.", (int) offset); + +- /* Sanity check the offset, being careful about overflow */ ++ /* ds is restricted to 16 bit above, so offset is restricted too, and offset+8 should not overflow. */ + if (offset > ds || offset + 6 + 2 > ds) + return; + +@@ -956,6 +963,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, + + /* IFD 1 offset */ + n = exif_get_short (d + 6 + offset, data->priv->order); ++ /* offset < 2<<16, n is 16 bit at most, so this op will not overflow */ + if (offset + 6 + 2 + 12 * n + 4 > ds) + return; + +@@ -964,8 +972,8 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", + "IFD 1 at %i.", (int) offset); + +- /* Sanity check. */ +- if (offset > ds || offset + 6 > ds) { ++ /* Sanity check. ds is ensured to be above 6 above, offset is 16bit */ ++ if (offset > ds - 6) { + exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, + "ExifData", "Bogus offset of IFD1."); + } else { +-- +2.20.1 + diff --git a/buildroot/package/libexif/libexif.mk b/buildroot/package/libexif/libexif.mk index a4ec5ed3c..643d9ed89 100644 --- a/buildroot/package/libexif/libexif.mk +++ b/buildroot/package/libexif/libexif.mk @@ -12,4 +12,13 @@ LIBEXIF_DEPENDENCIES = host-pkgconf LIBEXIF_LICENSE = LGPL-2.1+ LIBEXIF_LICENSE_FILES = COPYING +# 0001-fixes-some-not-all-buffer-overreads-during-decoding-.patch +LIBEXIF_IGNORE_CVES += CVE-2016-6328 +# 0002-On-saving-makernotes-make-sure-the-makernote-contain.patch +LIBEXIF_IGNORE_CVES += CVE-2017-7544 +# 0004-Improve-deep-recursion-detection-in-exif_data_load_d.patch +LIBEXIF_IGNORE_CVES += CVE-2018-20030 +# 0005-fix-CVE-2019-9278.patch +LIBEXIF_IGNORE_CVES += CVE-2019-9278 + $(eval $(autotools-package)) diff --git a/buildroot/package/libfastjson/libfastjson.hash b/buildroot/package/libfastjson/libfastjson.hash index 72fb9856a..07ea88f11 100644 --- a/buildroot/package/libfastjson/libfastjson.hash +++ b/buildroot/package/libfastjson/libfastjson.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7e49057b26a5a9e3c6623e024f95f9fd9a14b571b9150aeb89d6d475fc3633e3 libfastjson-v0.99.8.tar.gz +sha256 7e49057b26a5a9e3c6623e024f95f9fd9a14b571b9150aeb89d6d475fc3633e3 libfastjson-0.99.8.tar.gz sha256 b29370bbfa98816e1fca0901f18149d920736771bfd68b4ee0eb00c78b38d245 COPYING diff --git a/buildroot/package/libfastjson/libfastjson.mk b/buildroot/package/libfastjson/libfastjson.mk index 565cdd0ec..ecca72f56 100644 --- a/buildroot/package/libfastjson/libfastjson.mk +++ b/buildroot/package/libfastjson/libfastjson.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBFASTJSON_VERSION = v0.99.8 -LIBFASTJSON_SITE = $(call github,rsyslog,libfastjson,$(LIBFASTJSON_VERSION)) +LIBFASTJSON_VERSION = 0.99.8 +LIBFASTJSON_SITE = $(call github,rsyslog,libfastjson,v$(LIBFASTJSON_VERSION)) LIBFASTJSON_INSTALL_STAGING = YES LIBFASTJSON_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' # From git diff --git a/buildroot/package/libfcgi/0001-eof.patch b/buildroot/package/libfcgi/0001-eof.patch deleted file mode 100644 index e7314265a..000000000 --- a/buildroot/package/libfcgi/0001-eof.patch +++ /dev/null @@ -1,24 +0,0 @@ -[PATCH] fix build with C++ support and gcc >= 4.4 - -EOF is defined in stdio, so ensure it is included. - -Based on similar patch by Markus Rothe: -http://comments.gmane.org/gmane.comp.web.fastcgi.devel/3205 - -Signed-off-by: Peter Korsgaard ---- - libfcgi/fcgio.cpp | 1 + - 1 file changed, 1 insertion(+) - -Index: fcgi-2.4.0/libfcgi/fcgio.cpp -=================================================================== ---- fcgi-2.4.0.orig/libfcgi/fcgio.cpp -+++ fcgi-2.4.0/libfcgi/fcgio.cpp -@@ -22,6 +22,7 @@ - #define DLLAPI __declspec(dllexport) - #endif - -+#include - #include - #include "fcgio.h" - diff --git a/buildroot/package/libfcgi/0001-link-against-math.patch b/buildroot/package/libfcgi/0001-link-against-math.patch new file mode 100644 index 000000000..efba67123 --- /dev/null +++ b/buildroot/package/libfcgi/0001-link-against-math.patch @@ -0,0 +1,18 @@ +Link libfcgi against the math library. + +Signed-off-by: Thomas Claveirole +[Louis: rebase on top of 2.4.2] +Signed-off-by: Louis Rannou + +Index: b/libfcgi/Makefile.am +=================================================================== +--- a/libfcgi/Makefile.am ++++ b/libfcgi/Makefile.am +@@ -18,4 +18,5 @@ + os_@SYSTEM@.c + libfcgi_la_CC = @PTHREAD_CC@ + libfcgi_la_CFLAGS = @PTHREAD_CFLAGS@ ++libfcgi_la_LIBADD = -lm + libfcgi_la_LDFLAGS = @EXTRA_LIBS@ -no-undefined + + libfcgi___la_SOURCES = $(INCLUDE_FILES) \ diff --git a/buildroot/package/libfcgi/0005-disable-examples.patch b/buildroot/package/libfcgi/0002-disable-examples.patch similarity index 100% rename from buildroot/package/libfcgi/0005-disable-examples.patch rename to buildroot/package/libfcgi/0002-disable-examples.patch diff --git a/buildroot/package/libfcgi/0002-link-against-libfcgi-la.patch b/buildroot/package/libfcgi/0002-link-against-libfcgi-la.patch deleted file mode 100644 index 8a5973ac5..000000000 --- a/buildroot/package/libfcgi/0002-link-against-libfcgi-la.patch +++ /dev/null @@ -1,20 +0,0 @@ -Properly link libfcgi++ against libfcgi - -We cannot directly use -lfcgi to link libfcgi++ against libfcgi, -because libfcgi is not installed at this time. Instead, we should rely -on libtool doing the right thing, by specifying libfcgi.la in -libfcgi++ LIBADD variable. - -Signed-off-by: Thomas Petazzoni - -Index: b/libfcgi/Makefile.am -=================================================================== ---- a/libfcgi/Makefile.am -+++ b/libfcgi/Makefile.am -@@ -23,5 +23,6 @@ - $(INCLUDEDIR)/fcgio.h \ - fcgio.cpp - libfcgi___la_CFLAGS = @PTHREAD_CFLAGS@ --libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@ -+libfcgi___la_LIBADD = libfcgi.la -+libfcgi___la_LDFLAGS = -rpath @libdir@ diff --git a/buildroot/package/libfcgi/0003-link-against-math.patch b/buildroot/package/libfcgi/0003-link-against-math.patch deleted file mode 100644 index c60c6d50c..000000000 --- a/buildroot/package/libfcgi/0003-link-against-math.patch +++ /dev/null @@ -1,16 +0,0 @@ -Link libfcgi against the math library. - -Signed-off-by: Thomas Claveirole - -Index: b/libfcgi/Makefile.am -=================================================================== ---- a/libfcgi/Makefile.am -+++ b/libfcgi/Makefile.am -@@ -18,6 +18,7 @@ - os_@SYSTEM@.c - libfcgi_la_CC = @PTHREAD_CC@ - libfcgi_la_CFLAGS = @PTHREAD_CFLAGS@ -+libfcgi_la_LIBADD = -lm - - libfcgi___la_SOURCES = $(INCLUDE_FILES) \ - $(INCLUDEDIR)/fcgio.h \ diff --git a/buildroot/package/libfcgi/0004-make-autoreconfable.patch b/buildroot/package/libfcgi/0004-make-autoreconfable.patch deleted file mode 100644 index e255fc6d3..000000000 --- a/buildroot/package/libfcgi/0004-make-autoreconfable.patch +++ /dev/null @@ -1,67 +0,0 @@ -Make the package autoreconfigurable - -Adjust minor details in Makefile.am and configure.in in order to make -the package compatible with the autoconf/automake versions we are -using in Buildroot. - -Signed-off-by: Thomas Petazzoni - -Index: b/cgi-fcgi/Makefile.am -=================================================================== ---- a/cgi-fcgi/Makefile.am -+++ b/cgi-fcgi/Makefile.am -@@ -2,7 +2,7 @@ - bin_PROGRAMS = cgi-fcgi - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -4,12 +4,13 @@ - dnl generate the file "configure", which is run during the build - dnl to configure the system for the local environment. - --AC_INIT --AM_INIT_AUTOMAKE(fcgi, 2.4.0) -+AC_INIT([fcgi], [2.4.0]) -+AM_INIT_AUTOMAKE([foreign]) - - AM_CONFIG_HEADER(fcgi_config.h) - - AC_PROG_CC -+AC_PROG_CC_C_O - AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_LIBTOOL -Index: b/examples/Makefile.am -=================================================================== ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -11,7 +11,7 @@ - EXTRA_PROGRAMS = threaded echo-cpp - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ -Index: b/libfcgi/Makefile.am -=================================================================== ---- a/libfcgi/Makefile.am -+++ b/libfcgi/Makefile.am -@@ -1,7 +1,7 @@ - # $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $ - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ diff --git a/buildroot/package/libfcgi/0006-fix-CVE-2012-6687.patch b/buildroot/package/libfcgi/0006-fix-CVE-2012-6687.patch deleted file mode 100644 index 10d33ed58..000000000 --- a/buildroot/package/libfcgi/0006-fix-CVE-2012-6687.patch +++ /dev/null @@ -1,104 +0,0 @@ -libfcgi:add security patch for CVE-2012-6687 -CVE-2012-6687 - remote attackers cause a denial of service (crash) via a large number -of connections (http://www.cvedetails.com/cve/CVE-2012-6687/). -Fix:use poll in os_unix.c instead of select to avoid problem with > 1024 connections. -This patch libfcgi_2.4.0-8.3.debian.tar.xz is pulled from the below link: -(https://launchpad.net/ubuntu/+source/libfcgi/2.4.0-8.3) -The next release of libfcgi is 2.4.1 which may have this fix is yet to be released -officially. - -Signed-off-by: Anton Kortunov -Signed-off-by: Niranjan Reddy - -Index: b/libfcgi/os_unix.c -=================================================================== ---- a/libfcgi/os_unix.c -+++ b/libfcgi/os_unix.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_NETDB_H - #include -@@ -103,6 +104,9 @@ - static int shutdownPending = FALSE; - static int shutdownNow = FALSE; - -+static int libfcgiOsClosePollTimeout = 2000; -+static int libfcgiIsAfUnixKeeperPollTimeout = 2000; -+ - void OS_ShutdownPending() - { - shutdownPending = TRUE; -@@ -168,6 +172,16 @@ - if(libInitialized) - return 0; - -+ char *libfcgiOsClosePollTimeoutStr = getenv( "LIBFCGI_OS_CLOSE_POLL_TIMEOUT" ); -+ if(libfcgiOsClosePollTimeoutStr) { -+ libfcgiOsClosePollTimeout = atoi(libfcgiOsClosePollTimeoutStr); -+ } -+ -+ char *libfcgiIsAfUnixKeeperPollTimeoutStr = getenv( "LIBFCGI_IS_AF_UNIX_KEEPER_POLL_TIMEOUT" ); -+ if(libfcgiIsAfUnixKeeperPollTimeoutStr) { -+ libfcgiIsAfUnixKeeperPollTimeout = atoi(libfcgiIsAfUnixKeeperPollTimeoutStr); -+ } -+ - asyncIoTable = (AioInfo *)malloc(asyncIoTableSize * sizeof(AioInfo)); - if(asyncIoTable == NULL) { - errno = ENOMEM; -@@ -755,19 +769,16 @@ - - if (shutdown(fd, 1) == 0) - { -- struct timeval tv; -- fd_set rfds; -+ struct pollfd pfd; - int rv; - char trash[1024]; - -- FD_ZERO(&rfds); -+ pfd.fd = fd; -+ pfd.events = POLLIN; - - do - { -- FD_SET(fd, &rfds); -- tv.tv_sec = 2; -- tv.tv_usec = 0; -- rv = select(fd + 1, &rfds, NULL, NULL, &tv); -+ rv = poll(&pfd, 1, libfcgiOsClosePollTimeout); - } - while (rv > 0 && read(fd, trash, sizeof(trash)) > 0); - } -@@ -1116,13 +1127,11 @@ - */ - static int is_af_unix_keeper(const int fd) - { -- struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL }; -- fd_set read_fds; -- -- FD_ZERO(&read_fds); -- FD_SET(fd, &read_fds); -+ struct pollfd pfd; -+ pfd.fd = fd; -+ pfd.events = POLLIN; - -- return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds); -+ return poll(&pfd, 1, libfcgiIsAfUnixKeeperPollTimeout) >= 0 && (pfd.revents & POLLIN); - } - - /* - -Index: b/examples/Makefile.am -=================================================================== ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -34,5 +34,5 @@ threaded_CFLAGS = @PTHREAD_CFLAGS@ - threaded_LDFLAGS = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ - - echo_cpp_SOURCES = $(INCLUDE_FILES) $(INCLUDEDIR)/fcgio.h echo-cpp.cpp --echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la -+echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la $(LIBDIR)/libfcgi.la diff --git a/buildroot/package/libfcgi/Config.in b/buildroot/package/libfcgi/Config.in index 47ff8a2d1..aceea3e89 100644 --- a/buildroot/package/libfcgi/Config.in +++ b/buildroot/package/libfcgi/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LIBFCGI help FCGI, a fastcgi developer library for C/C++ - http://www.fastcgi.com/ + https://fastcgi-archives.github.io/ diff --git a/buildroot/package/libfcgi/libfcgi.hash b/buildroot/package/libfcgi/libfcgi.hash index 98aa2ecf8..110461235 100644 --- a/buildroot/package/libfcgi/libfcgi.hash +++ b/buildroot/package/libfcgi/libfcgi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9 fcgi-2.4.0.tar.gz +sha256 1fe83501edfc3a7ec96bb1e69db3fd5ea1730135bd73ab152186fd0b437013bc libfcgi-2.4.2.tar.gz sha256 f0a8fe4513a43e8eebb24cdcf9d2e7efc52e4d8259178c6d76d3d84418397d81 LICENSE.TERMS diff --git a/buildroot/package/libfcgi/libfcgi.mk b/buildroot/package/libfcgi/libfcgi.mk index 78da77291..c158df239 100644 --- a/buildroot/package/libfcgi/libfcgi.mk +++ b/buildroot/package/libfcgi/libfcgi.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBFCGI_VERSION = 2.4.0 -LIBFCGI_SOURCE = fcgi-$(LIBFCGI_VERSION).tar.gz -LIBFCGI_SITE = http://www.fastcgi.com/dist +LIBFCGI_VERSION = 2.4.2 +LIBFCGI_SITE = $(call github,FastCGI-Archives,fcgi2,$(LIBFCGI_VERSION)) LIBFCGI_LICENSE = OML LIBFCGI_LICENSE_FILES = LICENSE.TERMS LIBFCGI_INSTALL_STAGING = YES diff --git a/buildroot/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch b/buildroot/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch new file mode 100644 index 000000000..7ee1f1029 --- /dev/null +++ b/buildroot/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch @@ -0,0 +1,51 @@ +From f9d8f11d60cdc656a801e0d8116101beb22e117b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 24 Nov 2019 09:52:01 +0100 +Subject: [PATCH] ffi_powerpc.h: fix build failure with powerpc7 + +Sicne commit 73dd43afc8a447ba98ea02e9aad4c6898dc77fb0, build on powerpc7 +fails on: + +In file included from ../src/powerpc/ffi.c:33:0: +../src/powerpc/ffi_powerpc.h:61:9: error: '_Float128' is not supported on this target + typedef _Float128 float128; + ^~~~~~~~~ + +Fix this build failure by checking for __HAVE_FLOAT128 before using +_Float128, as _Float128 is enabled only on specific conditions, see +output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/floatn.h: + + /* Defined to 1 if the current compiler invocation provides a + floating-point type with the IEEE 754 binary128 format, and this glibc + includes corresponding *f128 interfaces for it. */ + #if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \ + && defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH + # define __HAVE_FLOAT128 1 + #else + # define __HAVE_FLOAT128 0 + #endif + +Fixes: + - http://autobuild.buildroot.org/results/5c9dd8fb3b6a128882b6250f197c80232d8a3b53 + +Signed-off-by: Fabrice Fontaine +--- + src/powerpc/ffi_powerpc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h +index 5ee2a70..a5a786b 100644 +--- a/src/powerpc/ffi_powerpc.h ++++ b/src/powerpc/ffi_powerpc.h +@@ -57,7 +57,7 @@ typedef union + double d; + } ffi_dblfl; + +-#if defined(__FLOAT128_TYPE__) ++#if defined(__FLOAT128_TYPE__) && defined(__HAVE_FLOAT128) + typedef _Float128 float128; + #elif defined(__FLOAT128__) + typedef __float128 float128; +-- +2.24.0 + diff --git a/buildroot/package/libffi/0005-powerpc-fix-build-failure-on-power7-and-older.patch b/buildroot/package/libffi/0005-powerpc-fix-build-failure-on-power7-and-older.patch new file mode 100644 index 000000000..d0b91dda6 --- /dev/null +++ b/buildroot/package/libffi/0005-powerpc-fix-build-failure-on-power7-and-older.patch @@ -0,0 +1,39 @@ +From 01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Thu, 28 Nov 2019 12:42:41 +0000 +Subject: [PATCH] powerpc: fix build failure on power7 and older (#532) + +Build failure looks as: +``` +libtool: compile: powerpc-unknown-linux-gnu-gcc \ + -O2 -mcpu=powerpc -mtune=powerpc -pipe ... -c src/powerpc/ffi.c ... +In file included from src/powerpc/ffi.c:33: +src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target + 65 | typedef __int128 float128; + | ^~~~~~~~ +``` + +The fix avoids using __int128 in favour of aligned char[16]. + +Closes: https://github.com/libffi/libffi/issues/531 +Signed-off-by: Sergei Trofimovich +[Retrieved from: +https://github.com/libffi/libffi/commit/01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd] +Signed-off-by: Fabrice Fontaine +--- + src/powerpc/ffi_powerpc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h +index 5ee2a709..8e2f2f0e 100644 +--- a/src/powerpc/ffi_powerpc.h ++++ b/src/powerpc/ffi_powerpc.h +@@ -62,7 +62,7 @@ typedef _Float128 float128; + #elif defined(__FLOAT128__) + typedef __float128 float128; + #else +-typedef __int128 float128; ++typedef char float128[16] __attribute__((aligned(16))); + #endif + + void FFI_HIDDEN ffi_closure_SYSV (void); diff --git a/buildroot/package/libffi/0006-Address-platforms-with-no-__int128.patch b/buildroot/package/libffi/0006-Address-platforms-with-no-__int128.patch new file mode 100644 index 000000000..012c6f0da --- /dev/null +++ b/buildroot/package/libffi/0006-Address-platforms-with-no-__int128.patch @@ -0,0 +1,28 @@ +From 6663047f56c2932a6b10a790f4ac6666dd181326 Mon Sep 17 00:00:00 2001 +From: Anthony Green +Date: Fri, 29 Nov 2019 07:00:35 -0500 +Subject: [PATCH] Address platforms with no __int128. + +[Retrieved from: +https://github.com/libffi/libffi/commit/6663047f56c2932a6b10a790f4ac6666dd181326] +Signed-off-by: Fabrice Fontaine +--- + src/powerpc/ffi_linux64.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c +index de0d0337..73647701 100644 +--- a/src/powerpc/ffi_linux64.c ++++ b/src/powerpc/ffi_linux64.c +@@ -547,9 +547,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) + if (next_arg.ul == gpr_end.ul) + next_arg.ul = rest.ul; + if (vecarg_count < NUM_VEC_ARG_REGISTERS64 && i < nfixedargs) +- *vec_base.f128++ = **p_argv.f128; ++ memcpy (vec_base.f128++, *p_argv.f128, sizeof (float128)); + else +- *next_arg.f128 = **p_argv.f128; ++ memcpy (next_arg.f128, *p_argv.f128, sizeof (float128)); + if (++next_arg.f128 == gpr_end.f128) + next_arg.f128 = rest.f128; + vecarg_count++; diff --git a/buildroot/package/libffi/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch b/buildroot/package/libffi/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch new file mode 100644 index 000000000..53036707d --- /dev/null +++ b/buildroot/package/libffi/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch @@ -0,0 +1,42 @@ +From e50b9ef8b910fa642ef158f6642e60d54d7ad740 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 7 Dec 2019 02:34:14 -0800 +Subject: [PATCH] powerpc64: Use memcpy to help platforms with no __int128. + (#534) + +Signed-off-by: Khem Raj +[Retrieved from: +https://github.com/libffi/libffi/commit/e50b9ef8b910fa642ef158f6642e60d54d7ad740] +Signed-off-by: Fabrice Fontaine +--- + src/powerpc/ffi_linux64.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c +index 73647701..4d50878e 100644 +--- a/src/powerpc/ffi_linux64.c ++++ b/src/powerpc/ffi_linux64.c +@@ -680,9 +680,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) + { + if (vecarg_count < NUM_VEC_ARG_REGISTERS64 + && i < nfixedargs) +- *vec_base.f128++ = *arg.f128++; ++ memcpy (vec_base.f128++, arg.f128, sizeof (float128)); + else +- *next_arg.f128 = *arg.f128++; ++ memcpy (next_arg.f128, arg.f128++, sizeof (float128)); + if (++next_arg.f128 == gpr_end.f128) + next_arg.f128 = rest.f128; + vecarg_count++; +@@ -986,9 +986,9 @@ ffi_closure_helper_LINUX64 (ffi_cif *cif, + do + { + if (pvec < end_pvec && i < nfixedargs) +- *to.f128 = *pvec++; ++ memcpy (to.f128, pvec++, sizeof (float128)); + else +- *to.f128 = *from.f128; ++ memcpy (to.f128, from.f128, sizeof (float128)); + to.f128++; + from.f128++; + } diff --git a/buildroot/package/libffi/libffi.hash b/buildroot/package/libffi/libffi.hash index 97deb988e..496ae0d90 100644 --- a/buildroot/package/libffi/libffi.hash +++ b/buildroot/package/libffi/libffi.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 db41cfb9ec8052fcd116a94c12237303c4447af4844d50e4fea7163661e31743 libffi-v3.3-rc0.tar.gz +sha256 3f2f86094f5cf4c36cfe850d2fe029d01f5c2c2296619407c8ba0d8207da9a6b libffi-3.3.tar.gz # License files, locally calculated -sha256 0f4d7a0bfb83c37465d42dc305f124189196cc0cc2cc8d6f8461103682aebbc5 LICENSE +sha256 deaf3a42effb551a5b140fa9afefed183a27f1341c6d1bf430d106a5e6931fc0 LICENSE diff --git a/buildroot/package/libffi/libffi.mk b/buildroot/package/libffi/libffi.mk index b21d12cbd..722a03dca 100644 --- a/buildroot/package/libffi/libffi.mk +++ b/buildroot/package/libffi/libffi.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBFFI_VERSION = v3.3-rc0 -LIBFFI_SITE = $(call github,libffi,libffi,$(LIBFFI_VERSION)) +LIBFFI_VERSION = 3.3 +LIBFFI_SITE = $(call github,libffi,libffi,v$(LIBFFI_VERSION)) LIBFFI_LICENSE = MIT LIBFFI_LICENSE_FILES = LICENSE LIBFFI_INSTALL_STAGING = YES diff --git a/buildroot/package/libfm-extra/libfm-extra.hash b/buildroot/package/libfm-extra/libfm-extra.hash index 233abe7d7..e78fbab0d 100644 --- a/buildroot/package/libfm-extra/libfm-extra.hash +++ b/buildroot/package/libfm-extra/libfm-extra.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ -md5 02a024714d51e0d37afc7bd596a44f3b libfm-1.3.0.2.tar.xz -sha1 aa7f73987866e557b74b8a28d0fea339d53899b6 libfm-1.3.0.2.tar.xz +md5 c15ecd2c9317e2c385cd3f046d0b61ba libfm-1.3.1.tar.xz +sha1 29539f50acd5c00a00362adffd532053b0688e66 libfm-1.3.1.tar.xz # Hash for license files: sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/buildroot/package/libfm-extra/libfm-extra.mk b/buildroot/package/libfm-extra/libfm-extra.mk index 7802b8863..b41e8654b 100644 --- a/buildroot/package/libfm-extra/libfm-extra.mk +++ b/buildroot/package/libfm-extra/libfm-extra.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFM_EXTRA_VERSION = 1.3.0.2 +LIBFM_EXTRA_VERSION = 1.3.1 LIBFM_EXTRA_SOURCE = libfm-$(LIBFM_EXTRA_VERSION).tar.xz LIBFM_EXTRA_SITE = http://sourceforge.net/projects/pcmanfm/files LIBFM_EXTRA_DEPENDENCIES = libglib2 host-intltool diff --git a/buildroot/package/libfm/Config.in b/buildroot/package/libfm/Config.in index 81f2e1004..16676fbf2 100644 --- a/buildroot/package/libfm/Config.in +++ b/buildroot/package/libfm/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LIBFM depends on BR2_USE_MMU # libglib2 depends on BR2_INSTALL_LIBSTDCPP # libgtk2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11 @@ -21,8 +22,9 @@ config BR2_PACKAGE_LIBFM http://wiki.lxde.org/en/Libfm -comment "libfm needs X.org and a toolchain w/ wchar, threads, C++" +comment "libfm needs X.org and a toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_XORG7 diff --git a/buildroot/package/libfm/libfm.hash b/buildroot/package/libfm/libfm.hash index 71befc355..d63a43611 100644 --- a/buildroot/package/libfm/libfm.hash +++ b/buildroot/package/libfm/libfm.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ -md5 02a024714d51e0d37afc7bd596a44f3b libfm-1.3.0.2.tar.xz -sha1 aa7f73987866e557b74b8a28d0fea339d53899b6 libfm-1.3.0.2.tar.xz +md5 c15ecd2c9317e2c385cd3f046d0b61ba libfm-1.3.1.tar.xz +sha1 29539f50acd5c00a00362adffd532053b0688e66 libfm-1.3.1.tar.xz # Hash for license files: sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/buildroot/package/libfm/libfm.mk b/buildroot/package/libfm/libfm.mk index 292a0ab5d..47f01b17c 100644 --- a/buildroot/package/libfm/libfm.mk +++ b/buildroot/package/libfm/libfm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFM_VERSION = 1.3.0.2 +LIBFM_VERSION = 1.3.1 LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files LIBFM_DEPENDENCIES = menu-cache libglib2 cairo diff --git a/buildroot/package/libfreeglut/libfreeglut.hash b/buildroot/package/libfreeglut/libfreeglut.hash index cc7a28661..2771cbde2 100644 --- a/buildroot/package/libfreeglut/libfreeglut.hash +++ b/buildroot/package/libfreeglut/libfreeglut.hash @@ -1,5 +1,6 @@ -# From http://sourceforge.net/projects/freeglut/files/freeglut/3.0.0/ -sha1 fca52242f9344627a30f11487ee42002e6b0dacd freeglut-3.0.0.tar.gz - -# Hash for license file: +# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.1/ +md5 cd5c670c1086358598a6d4a9d166949d freeglut-3.2.1.tar.gz +sha1 7a62e0d2caad92ff745bc5037592b2753f0b2f20 freeglut-3.2.1.tar.gz +# Locally computed +sha256 d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 freeglut-3.2.1.tar.gz sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING diff --git a/buildroot/package/libfreeglut/libfreeglut.mk b/buildroot/package/libfreeglut/libfreeglut.mk index 507cb523a..379de3121 100644 --- a/buildroot/package/libfreeglut/libfreeglut.mk +++ b/buildroot/package/libfreeglut/libfreeglut.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFREEGLUT_VERSION = 3.0.0 +LIBFREEGLUT_VERSION = 3.2.1 LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut LIBFREEGLUT_LICENSE = MIT diff --git a/buildroot/package/libfreeimage/0003-LibWebP-fix-compilation-issue-with-GCC-5.x-C-11.patch b/buildroot/package/libfreeimage/0003-LibWebP-fix-compilation-issue-with-GCC-5.x-C-11.patch deleted file mode 100644 index 6964827cc..000000000 --- a/buildroot/package/libfreeimage/0003-LibWebP-fix-compilation-issue-with-GCC-5.x-C-11.patch +++ /dev/null @@ -1,1172 +0,0 @@ -From 44bce1b66c1cdd5308ac3ac773ea0a53d83790fd Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Tue, 24 Nov 2015 21:16:39 +0100 -Subject: [PATCH] LibWebP: fix compilation issue with GCC 5.x / C++11 - -GCC 5.1 / C++11 gets confused about the "#" in the inline assembly -code, and dies with errors like: - -Source/LibWebP/./src/dsp/dsp.upsampling_mips_dsp_r2.c:37:34: error: invalid -character ' ' in raw string delimiter - -Fix it by introducting white space around the string literals like it has -been done in upstream webp: - -https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef - -Discussed upstream: -http://sourceforge.net/p/freeimage/discussion/36110/thread/605ef8e4/ - -[Scripted by sed -i 's/"\(#[A-Z0-9]*\)"/" \1 "/g' *.c] -Signed-off-by: Peter Korsgaard ---- - Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c | 28 +- - Source/LibWebP/src/dsp/dsp.enc_mips32.c | 314 ++++++++++----------- - Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c | 288 +++++++++---------- - Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c | 10 +- - Source/LibWebP/src/dsp/dsp.lossless_mips32.c | 34 +-- - Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c | 8 +- - .../LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c | 18 +- - Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c | 10 +- - 8 files changed, 355 insertions(+), 355 deletions(-) - -diff --git a/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c -index dac2c93..aaa8111 100644 ---- a/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c -+++ b/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c -@@ -548,10 +548,10 @@ static void SimpleVFilter16(uint8_t* p, int stride, int thresh) { - // TEMP3 = SRC[D + D1 * BPS] - #define LOAD_4_BYTES(TEMP0, TEMP1, TEMP2, TEMP3, \ - A, A1, B, B1, C, C1, D, D1, SRC) \ -- "lbu %["#TEMP0"], "#A"+"#A1"*"XSTR(BPS)"(%["#SRC"]) \n\t" \ -- "lbu %["#TEMP1"], "#B"+"#B1"*"XSTR(BPS)"(%["#SRC"]) \n\t" \ -- "lbu %["#TEMP2"], "#C"+"#C1"*"XSTR(BPS)"(%["#SRC"]) \n\t" \ -- "lbu %["#TEMP3"], "#D"+"#D1"*"XSTR(BPS)"(%["#SRC"]) \n\t" \ -+ "lbu %[" #TEMP0 "], " #A "+" #A1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \ -+ "lbu %[" #TEMP1 "], " #B "+" #B1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \ -+ "lbu %[" #TEMP2 "], " #C "+" #C1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \ -+ "lbu %[" #TEMP3 "], " #D "+" #D1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \ - - static void SimpleHFilter16(uint8_t* p, int stride, int thresh) { - int i; -@@ -623,8 +623,8 @@ static void SimpleHFilter16i(uint8_t* p, int stride, int thresh) { - // DST[A * BPS] = TEMP0 - // DST[B + C * BPS] = TEMP1 - #define STORE_8_BYTES(TEMP0, TEMP1, A, B, C, DST) \ -- "usw %["#TEMP0"], "#A"*"XSTR(BPS)"(%["#DST"]) \n\t" \ -- "usw %["#TEMP1"], "#B"+"#C"*"XSTR(BPS)"(%["#DST"]) \n\t" -+ "usw %[" #TEMP0 "], " #A "*"XSTR(BPS)"(%[" #DST "]) \n\t" \ -+ "usw %[" #TEMP1 "], " #B "+" #C "*"XSTR(BPS)"(%[" #DST "]) \n\t" - - static void VE4(uint8_t* dst) { // vertical - const uint8_t* top = dst - BPS; -@@ -725,8 +725,8 @@ static void RD4(uint8_t* dst) { // Down-right - // TEMP0 = SRC[A * BPS] - // TEMP1 = SRC[B + C * BPS] - #define LOAD_8_BYTES(TEMP0, TEMP1, A, B, C, SRC) \ -- "ulw %["#TEMP0"], "#A"*"XSTR(BPS)"(%["#SRC"]) \n\t" \ -- "ulw %["#TEMP1"], "#B"+"#C"*"XSTR(BPS)"(%["#SRC"]) \n\t" -+ "ulw %[" #TEMP0 "], " #A "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \ -+ "ulw %[" #TEMP1 "], " #B "+" #C "*"XSTR(BPS)"(%[" #SRC "]) \n\t" - - static void LD4(uint8_t* dst) { // Down-Left - int temp0, temp1, temp2, temp3, temp4; -@@ -873,24 +873,24 @@ static void DC8uvNoTop(uint8_t* dst) { // DC with no top samples - #define CLIPPING(SIZE) \ - "preceu.ph.qbl %[temp2], %[temp0] \n\t" \ - "preceu.ph.qbr %[temp0], %[temp0] \n\t" \ --".if "#SIZE" == 8 \n\t" \ -+".if " #SIZE " == 8 \n\t" \ - "preceu.ph.qbl %[temp3], %[temp1] \n\t" \ - "preceu.ph.qbr %[temp1], %[temp1] \n\t" \ - ".endif \n\t" \ - "addu.ph %[temp2], %[temp2], %[dst_1] \n\t" \ - "addu.ph %[temp0], %[temp0], %[dst_1] \n\t" \ --".if "#SIZE" == 8 \n\t" \ -+".if " #SIZE " == 8 \n\t" \ - "addu.ph %[temp3], %[temp3], %[dst_1] \n\t" \ - "addu.ph %[temp1], %[temp1], %[dst_1] \n\t" \ - ".endif \n\t" \ - "shll_s.ph %[temp2], %[temp2], 7 \n\t" \ - "shll_s.ph %[temp0], %[temp0], 7 \n\t" \ --".if "#SIZE" == 8 \n\t" \ -+".if " #SIZE " == 8 \n\t" \ - "shll_s.ph %[temp3], %[temp3], 7 \n\t" \ - "shll_s.ph %[temp1], %[temp1], 7 \n\t" \ - ".endif \n\t" \ - "precrqu_s.qb.ph %[temp0], %[temp2], %[temp0] \n\t" \ --".if "#SIZE" == 8 \n\t" \ -+".if " #SIZE " == 8 \n\t" \ - "precrqu_s.qb.ph %[temp1], %[temp3], %[temp1] \n\t" \ - ".endif \n\t" - -@@ -899,7 +899,7 @@ static void DC8uvNoTop(uint8_t* dst) { // DC with no top samples - int dst_1 = ((int)(DST)[-1] << 16) + (DST)[-1]; \ - int temp0, temp1, temp2, temp3; \ - __asm__ volatile ( \ -- ".if "#SIZE" < 8 \n\t" \ -+ ".if " #SIZE " < 8 \n\t" \ - "ulw %[temp0], 0(%[top]) \n\t" \ - "subu.ph %[dst_1], %[dst_1], %[top_1] \n\t" \ - CLIPPING(4) \ -@@ -911,7 +911,7 @@ static void DC8uvNoTop(uint8_t* dst) { // DC with no top samples - CLIPPING(8) \ - "usw %[temp0], 0(%[dst]) \n\t" \ - "usw %[temp1], 4(%[dst]) \n\t" \ -- ".if "#SIZE" == 16 \n\t" \ -+ ".if " #SIZE " == 16 \n\t" \ - "ulw %[temp0], 8(%[top]) \n\t" \ - "ulw %[temp1], 12(%[top]) \n\t" \ - CLIPPING(8) \ -diff --git a/Source/LibWebP/src/dsp/dsp.enc_mips32.c b/Source/LibWebP/src/dsp/dsp.enc_mips32.c -index 545aa3a..bf1c16d 100644 ---- a/Source/LibWebP/src/dsp/dsp.enc_mips32.c -+++ b/Source/LibWebP/src/dsp/dsp.enc_mips32.c -@@ -31,26 +31,26 @@ static const int kC2 = 35468; - // TEMP0..TEMP3 - registers for corresponding tmp elements - // TEMP4..TEMP5 - temporary registers - #define VERTICAL_PASS(A, B, C, D, TEMP4, TEMP0, TEMP1, TEMP2, TEMP3) \ -- "lh %[temp16], "#A"(%[temp20]) \n\t" \ -- "lh %[temp18], "#B"(%[temp20]) \n\t" \ -- "lh %[temp17], "#C"(%[temp20]) \n\t" \ -- "lh %[temp19], "#D"(%[temp20]) \n\t" \ -- "addu %["#TEMP4"], %[temp16], %[temp18] \n\t" \ -+ "lh %[temp16], " #A "(%[temp20]) \n\t" \ -+ "lh %[temp18], " #B "(%[temp20]) \n\t" \ -+ "lh %[temp17], " #C "(%[temp20]) \n\t" \ -+ "lh %[temp19], " #D "(%[temp20]) \n\t" \ -+ "addu %[" #TEMP4 "], %[temp16], %[temp18] \n\t" \ - "subu %[temp16], %[temp16], %[temp18] \n\t" \ -- "mul %["#TEMP0"], %[temp17], %[kC2] \n\t" \ -+ "mul %[" #TEMP0 "], %[temp17], %[kC2] \n\t" \ - "mul %[temp18], %[temp19], %[kC1] \n\t" \ - "mul %[temp17], %[temp17], %[kC1] \n\t" \ - "mul %[temp19], %[temp19], %[kC2] \n\t" \ -- "sra %["#TEMP0"], %["#TEMP0"], 16 \n\n" \ -+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 16 \n\n" \ - "sra %[temp18], %[temp18], 16 \n\n" \ - "sra %[temp17], %[temp17], 16 \n\n" \ - "sra %[temp19], %[temp19], 16 \n\n" \ -- "subu %["#TEMP2"], %["#TEMP0"], %[temp18] \n\t" \ -- "addu %["#TEMP3"], %[temp17], %[temp19] \n\t" \ -- "addu %["#TEMP0"], %["#TEMP4"], %["#TEMP3"] \n\t" \ -- "addu %["#TEMP1"], %[temp16], %["#TEMP2"] \n\t" \ -- "subu %["#TEMP2"], %[temp16], %["#TEMP2"] \n\t" \ -- "subu %["#TEMP3"], %["#TEMP4"], %["#TEMP3"] \n\t" -+ "subu %[" #TEMP2 "], %[" #TEMP0 "], %[temp18] \n\t" \ -+ "addu %[" #TEMP3 "], %[temp17], %[temp19] \n\t" \ -+ "addu %[" #TEMP0 "], %[" #TEMP4 "], %[" #TEMP3 "] \n\t" \ -+ "addu %[" #TEMP1 "], %[temp16], %[" #TEMP2 "] \n\t" \ -+ "subu %[" #TEMP2 "], %[temp16], %[" #TEMP2 "] \n\t" \ -+ "subu %[" #TEMP3 "], %[" #TEMP4 "], %[" #TEMP3 "] \n\t" - - // macro for one horizontal pass in ITransformOne - // MUL and STORE macros inlined -@@ -59,58 +59,58 @@ static const int kC2 = 35468; - // A - offset in bytes to load from ref and store to dst buffer - // TEMP0, TEMP4, TEMP8 and TEMP12 - registers for corresponding tmp elements - #define HORIZONTAL_PASS(A, TEMP0, TEMP4, TEMP8, TEMP12) \ -- "addiu %["#TEMP0"], %["#TEMP0"], 4 \n\t" \ -- "addu %[temp16], %["#TEMP0"], %["#TEMP8"] \n\t" \ -- "subu %[temp17], %["#TEMP0"], %["#TEMP8"] \n\t" \ -- "mul %["#TEMP0"], %["#TEMP4"], %[kC2] \n\t" \ -- "mul %["#TEMP8"], %["#TEMP12"], %[kC1] \n\t" \ -- "mul %["#TEMP4"], %["#TEMP4"], %[kC1] \n\t" \ -- "mul %["#TEMP12"], %["#TEMP12"], %[kC2] \n\t" \ -- "sra %["#TEMP0"], %["#TEMP0"], 16 \n\t" \ -- "sra %["#TEMP8"], %["#TEMP8"], 16 \n\t" \ -- "sra %["#TEMP4"], %["#TEMP4"], 16 \n\t" \ -- "sra %["#TEMP12"], %["#TEMP12"], 16 \n\t" \ -- "subu %[temp18], %["#TEMP0"], %["#TEMP8"] \n\t" \ -- "addu %[temp19], %["#TEMP4"], %["#TEMP12"] \n\t" \ -- "addu %["#TEMP0"], %[temp16], %[temp19] \n\t" \ -- "addu %["#TEMP4"], %[temp17], %[temp18] \n\t" \ -- "subu %["#TEMP8"], %[temp17], %[temp18] \n\t" \ -- "subu %["#TEMP12"], %[temp16], %[temp19] \n\t" \ -+ "addiu %[" #TEMP0 "], %[" #TEMP0 "], 4 \n\t" \ -+ "addu %[temp16], %[" #TEMP0 "], %[" #TEMP8 "] \n\t" \ -+ "subu %[temp17], %[" #TEMP0 "], %[" #TEMP8 "] \n\t" \ -+ "mul %[" #TEMP0 "], %[" #TEMP4 "], %[kC2] \n\t" \ -+ "mul %[" #TEMP8 "], %[" #TEMP12 "], %[kC1] \n\t" \ -+ "mul %[" #TEMP4 "], %[" #TEMP4 "], %[kC1] \n\t" \ -+ "mul %[" #TEMP12 "], %[" #TEMP12 "], %[kC2] \n\t" \ -+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 16 \n\t" \ -+ "sra %[" #TEMP8 "], %[" #TEMP8 "], 16 \n\t" \ -+ "sra %[" #TEMP4 "], %[" #TEMP4 "], 16 \n\t" \ -+ "sra %[" #TEMP12 "], %[" #TEMP12 "], 16 \n\t" \ -+ "subu %[temp18], %[" #TEMP0 "], %[" #TEMP8 "] \n\t" \ -+ "addu %[temp19], %[" #TEMP4 "], %[" #TEMP12 "] \n\t" \ -+ "addu %[" #TEMP0 "], %[temp16], %[temp19] \n\t" \ -+ "addu %[" #TEMP4 "], %[temp17], %[temp18] \n\t" \ -+ "subu %[" #TEMP8 "], %[temp17], %[temp18] \n\t" \ -+ "subu %[" #TEMP12 "], %[temp16], %[temp19] \n\t" \ - "lw %[temp20], 0(%[args]) \n\t" \ -- "sra %["#TEMP0"], %["#TEMP0"], 3 \n\t" \ -- "sra %["#TEMP4"], %["#TEMP4"], 3 \n\t" \ -- "sra %["#TEMP8"], %["#TEMP8"], 3 \n\t" \ -- "sra %["#TEMP12"], %["#TEMP12"], 3 \n\t" \ -- "lbu %[temp16], 0+"XSTR(BPS)"*"#A"(%[temp20]) \n\t" \ -- "lbu %[temp17], 1+"XSTR(BPS)"*"#A"(%[temp20]) \n\t" \ -- "lbu %[temp18], 2+"XSTR(BPS)"*"#A"(%[temp20]) \n\t" \ -- "lbu %[temp19], 3+"XSTR(BPS)"*"#A"(%[temp20]) \n\t" \ -- "addu %["#TEMP0"], %[temp16], %["#TEMP0"] \n\t" \ -- "addu %["#TEMP4"], %[temp17], %["#TEMP4"] \n\t" \ -- "addu %["#TEMP8"], %[temp18], %["#TEMP8"] \n\t" \ -- "addu %["#TEMP12"], %[temp19], %["#TEMP12"] \n\t" \ -- "slt %[temp16], %["#TEMP0"], $zero \n\t" \ -- "slt %[temp17], %["#TEMP4"], $zero \n\t" \ -- "slt %[temp18], %["#TEMP8"], $zero \n\t" \ -- "slt %[temp19], %["#TEMP12"], $zero \n\t" \ -- "movn %["#TEMP0"], $zero, %[temp16] \n\t" \ -- "movn %["#TEMP4"], $zero, %[temp17] \n\t" \ -- "movn %["#TEMP8"], $zero, %[temp18] \n\t" \ -- "movn %["#TEMP12"], $zero, %[temp19] \n\t" \ -+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 3 \n\t" \ -+ "sra %[" #TEMP4 "], %[" #TEMP4 "], 3 \n\t" \ -+ "sra %[" #TEMP8 "], %[" #TEMP8 "], 3 \n\t" \ -+ "sra %[" #TEMP12 "], %[" #TEMP12 "], 3 \n\t" \ -+ "lbu %[temp16], 0+"XSTR(BPS)"*" #A "(%[temp20]) \n\t" \ -+ "lbu %[temp17], 1+"XSTR(BPS)"*" #A "(%[temp20]) \n\t" \ -+ "lbu %[temp18], 2+"XSTR(BPS)"*" #A "(%[temp20]) \n\t" \ -+ "lbu %[temp19], 3+"XSTR(BPS)"*" #A "(%[temp20]) \n\t" \ -+ "addu %[" #TEMP0 "], %[temp16], %[" #TEMP0 "] \n\t" \ -+ "addu %[" #TEMP4 "], %[temp17], %[" #TEMP4 "] \n\t" \ -+ "addu %[" #TEMP8 "], %[temp18], %[" #TEMP8 "] \n\t" \ -+ "addu %[" #TEMP12 "], %[temp19], %[" #TEMP12 "] \n\t" \ -+ "slt %[temp16], %[" #TEMP0 "], $zero \n\t" \ -+ "slt %[temp17], %[" #TEMP4 "], $zero \n\t" \ -+ "slt %[temp18], %[" #TEMP8 "], $zero \n\t" \ -+ "slt %[temp19], %[" #TEMP12 "], $zero \n\t" \ -+ "movn %[" #TEMP0 "], $zero, %[temp16] \n\t" \ -+ "movn %[" #TEMP4 "], $zero, %[temp17] \n\t" \ -+ "movn %[" #TEMP8 "], $zero, %[temp18] \n\t" \ -+ "movn %[" #TEMP12 "], $zero, %[temp19] \n\t" \ - "addiu %[temp20], $zero, 255 \n\t" \ -- "slt %[temp16], %["#TEMP0"], %[temp20] \n\t" \ -- "slt %[temp17], %["#TEMP4"], %[temp20] \n\t" \ -- "slt %[temp18], %["#TEMP8"], %[temp20] \n\t" \ -- "slt %[temp19], %["#TEMP12"], %[temp20] \n\t" \ -- "movz %["#TEMP0"], %[temp20], %[temp16] \n\t" \ -- "movz %["#TEMP4"], %[temp20], %[temp17] \n\t" \ -+ "slt %[temp16], %[" #TEMP0 "], %[temp20] \n\t" \ -+ "slt %[temp17], %[" #TEMP4 "], %[temp20] \n\t" \ -+ "slt %[temp18], %[" #TEMP8 "], %[temp20] \n\t" \ -+ "slt %[temp19], %[" #TEMP12 "], %[temp20] \n\t" \ -+ "movz %[" #TEMP0 "], %[temp20], %[temp16] \n\t" \ -+ "movz %[" #TEMP4 "], %[temp20], %[temp17] \n\t" \ - "lw %[temp16], 8(%[args]) \n\t" \ -- "movz %["#TEMP8"], %[temp20], %[temp18] \n\t" \ -- "movz %["#TEMP12"], %[temp20], %[temp19] \n\t" \ -- "sb %["#TEMP0"], 0+"XSTR(BPS)"*"#A"(%[temp16]) \n\t" \ -- "sb %["#TEMP4"], 1+"XSTR(BPS)"*"#A"(%[temp16]) \n\t" \ -- "sb %["#TEMP8"], 2+"XSTR(BPS)"*"#A"(%[temp16]) \n\t" \ -- "sb %["#TEMP12"], 3+"XSTR(BPS)"*"#A"(%[temp16]) \n\t" -+ "movz %[" #TEMP8 "], %[temp20], %[temp18] \n\t" \ -+ "movz %[" #TEMP12 "], %[temp20], %[temp19] \n\t" \ -+ "sb %[" #TEMP0 "], 0+"XSTR(BPS)"*" #A "(%[temp16]) \n\t" \ -+ "sb %[" #TEMP4 "], 1+"XSTR(BPS)"*" #A "(%[temp16]) \n\t" \ -+ "sb %[" #TEMP8 "], 2+"XSTR(BPS)"*" #A "(%[temp16]) \n\t" \ -+ "sb %[" #TEMP12 "], 3+"XSTR(BPS)"*" #A "(%[temp16]) \n\t" - - // Does one or two inverse transforms. - static WEBP_INLINE void ITransformOne(const uint8_t* ref, const int16_t* in, -@@ -161,9 +161,9 @@ static void ITransform(const uint8_t* ref, const int16_t* in, - // K - offset in bytes (kZigzag[n] * 4) - // N - offset in bytes (n * 2) - #define QUANTIZE_ONE(J, K, N) \ -- "lh %[temp0], "#J"(%[ppin]) \n\t" \ -- "lhu %[temp1], "#J"(%[ppsharpen]) \n\t" \ -- "lw %[temp2], "#K"(%[ppzthresh]) \n\t" \ -+ "lh %[temp0], " #J "(%[ppin]) \n\t" \ -+ "lhu %[temp1], " #J "(%[ppsharpen]) \n\t" \ -+ "lw %[temp2], " #K "(%[ppzthresh]) \n\t" \ - "sra %[sign], %[temp0], 15 \n\t" \ - "xor %[coeff], %[temp0], %[sign] \n\t" \ - "subu %[coeff], %[coeff], %[sign] \n\t" \ -@@ -172,9 +172,9 @@ static void ITransform(const uint8_t* ref, const int16_t* in, - "addiu %[temp5], $zero, 0 \n\t" \ - "addiu %[level], $zero, 0 \n\t" \ - "beqz %[temp4], 2f \n\t" \ -- "lhu %[temp1], "#J"(%[ppiq]) \n\t" \ -- "lw %[temp2], "#K"(%[ppbias]) \n\t" \ -- "lhu %[temp3], "#J"(%[ppq]) \n\t" \ -+ "lhu %[temp1], " #J "(%[ppiq]) \n\t" \ -+ "lw %[temp2], " #K "(%[ppbias]) \n\t" \ -+ "lhu %[temp3], " #J "(%[ppq]) \n\t" \ - "mul %[level], %[coeff], %[temp1] \n\t" \ - "addu %[level], %[level], %[temp2] \n\t" \ - "sra %[level], %[level], 17 \n\t" \ -@@ -184,8 +184,8 @@ static void ITransform(const uint8_t* ref, const int16_t* in, - "subu %[level], %[level], %[sign] \n\t" \ - "mul %[temp5], %[level], %[temp3] \n\t" \ - "2: \n\t" \ -- "sh %[temp5], "#J"(%[ppin]) \n\t" \ -- "sh %[level], "#N"(%[pout]) \n\t" -+ "sh %[temp5], " #J "(%[ppin]) \n\t" \ -+ "sh %[level], " #N "(%[pout]) \n\t" - - static int QuantizeBlock(int16_t in[16], int16_t out[16], - const VP8Matrix* const mtx) { -@@ -254,14 +254,14 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32], - // E..H - offsets in bytes to store first results to tmp buffer - // E1..H1 - offsets in bytes to store second results to tmp buffer - #define HORIZONTAL_PASS(A, E, F, G, H, E1, F1, G1, H1) \ -- "lbu %[temp0], 0+"XSTR(BPS)"*"#A"(%[a]) \n\t" \ -- "lbu %[temp1], 1+"XSTR(BPS)"*"#A"(%[a]) \n\t" \ -- "lbu %[temp2], 2+"XSTR(BPS)"*"#A"(%[a]) \n\t" \ -- "lbu %[temp3], 3+"XSTR(BPS)"*"#A"(%[a]) \n\t" \ -- "lbu %[temp4], 0+"XSTR(BPS)"*"#A"(%[b]) \n\t" \ -- "lbu %[temp5], 1+"XSTR(BPS)"*"#A"(%[b]) \n\t" \ -- "lbu %[temp6], 2+"XSTR(BPS)"*"#A"(%[b]) \n\t" \ -- "lbu %[temp7], 3+"XSTR(BPS)"*"#A"(%[b]) \n\t" \ -+ "lbu %[temp0], 0+"XSTR(BPS)"*" #A "(%[a]) \n\t" \ -+ "lbu %[temp1], 1+"XSTR(BPS)"*" #A "(%[a]) \n\t" \ -+ "lbu %[temp2], 2+"XSTR(BPS)"*" #A "(%[a]) \n\t" \ -+ "lbu %[temp3], 3+"XSTR(BPS)"*" #A "(%[a]) \n\t" \ -+ "lbu %[temp4], 0+"XSTR(BPS)"*" #A "(%[b]) \n\t" \ -+ "lbu %[temp5], 1+"XSTR(BPS)"*" #A "(%[b]) \n\t" \ -+ "lbu %[temp6], 2+"XSTR(BPS)"*" #A "(%[b]) \n\t" \ -+ "lbu %[temp7], 3+"XSTR(BPS)"*" #A "(%[b]) \n\t" \ - "addu %[temp8], %[temp0], %[temp2] \n\t" \ - "subu %[temp0], %[temp0], %[temp2] \n\t" \ - "addu %[temp2], %[temp1], %[temp3] \n\t" \ -@@ -278,14 +278,14 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32], - "subu %[temp3], %[temp3], %[temp6] \n\t" \ - "addu %[temp6], %[temp4], %[temp5] \n\t" \ - "subu %[temp4], %[temp4], %[temp5] \n\t" \ -- "sw %[temp7], "#E"(%[tmp]) \n\t" \ -- "sw %[temp2], "#H"(%[tmp]) \n\t" \ -- "sw %[temp8], "#F"(%[tmp]) \n\t" \ -- "sw %[temp0], "#G"(%[tmp]) \n\t" \ -- "sw %[temp1], "#E1"(%[tmp]) \n\t" \ -- "sw %[temp3], "#H1"(%[tmp]) \n\t" \ -- "sw %[temp6], "#F1"(%[tmp]) \n\t" \ -- "sw %[temp4], "#G1"(%[tmp]) \n\t" -+ "sw %[temp7], " #E "(%[tmp]) \n\t" \ -+ "sw %[temp2], " #H "(%[tmp]) \n\t" \ -+ "sw %[temp8], " #F "(%[tmp]) \n\t" \ -+ "sw %[temp0], " #G "(%[tmp]) \n\t" \ -+ "sw %[temp1], " #E1 "(%[tmp]) \n\t" \ -+ "sw %[temp3], " #H1 "(%[tmp]) \n\t" \ -+ "sw %[temp6], " #F1 "(%[tmp]) \n\t" \ -+ "sw %[temp4], " #G1 "(%[tmp]) \n\t" - - // macro for one vertical pass in Disto4x4 (TTransform) - // two calls of function TTransform are merged into single one -@@ -300,10 +300,10 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32], - // A1..D1 - offsets in bytes to load second results from tmp buffer - // E..H - offsets in bytes to load from w buffer - #define VERTICAL_PASS(A, B, C, D, A1, B1, C1, D1, E, F, G, H) \ -- "lw %[temp0], "#A1"(%[tmp]) \n\t" \ -- "lw %[temp1], "#C1"(%[tmp]) \n\t" \ -- "lw %[temp2], "#B1"(%[tmp]) \n\t" \ -- "lw %[temp3], "#D1"(%[tmp]) \n\t" \ -+ "lw %[temp0], " #A1 "(%[tmp]) \n\t" \ -+ "lw %[temp1], " #C1 "(%[tmp]) \n\t" \ -+ "lw %[temp2], " #B1 "(%[tmp]) \n\t" \ -+ "lw %[temp3], " #D1 "(%[tmp]) \n\t" \ - "addu %[temp8], %[temp0], %[temp1] \n\t" \ - "subu %[temp0], %[temp0], %[temp1] \n\t" \ - "addu %[temp1], %[temp2], %[temp3] \n\t" \ -@@ -324,18 +324,18 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32], - "subu %[temp1], %[temp1], %[temp5] \n\t" \ - "subu %[temp0], %[temp0], %[temp6] \n\t" \ - "subu %[temp8], %[temp8], %[temp7] \n\t" \ -- "lhu %[temp4], "#E"(%[w]) \n\t" \ -- "lhu %[temp5], "#F"(%[w]) \n\t" \ -- "lhu %[temp6], "#G"(%[w]) \n\t" \ -- "lhu %[temp7], "#H"(%[w]) \n\t" \ -+ "lhu %[temp4], " #E "(%[w]) \n\t" \ -+ "lhu %[temp5], " #F "(%[w]) \n\t" \ -+ "lhu %[temp6], " #G "(%[w]) \n\t" \ -+ "lhu %[temp7], " #H "(%[w]) \n\t" \ - "madd %[temp4], %[temp3] \n\t" \ - "madd %[temp5], %[temp1] \n\t" \ - "madd %[temp6], %[temp0] \n\t" \ - "madd %[temp7], %[temp8] \n\t" \ -- "lw %[temp0], "#A"(%[tmp]) \n\t" \ -- "lw %[temp1], "#C"(%[tmp]) \n\t" \ -- "lw %[temp2], "#B"(%[tmp]) \n\t" \ -- "lw %[temp3], "#D"(%[tmp]) \n\t" \ -+ "lw %[temp0], " #A "(%[tmp]) \n\t" \ -+ "lw %[temp1], " #C "(%[tmp]) \n\t" \ -+ "lw %[temp2], " #B "(%[tmp]) \n\t" \ -+ "lw %[temp3], " #D "(%[tmp]) \n\t" \ - "addu %[temp8], %[temp0], %[temp1] \n\t" \ - "subu %[temp0], %[temp0], %[temp1] \n\t" \ - "addu %[temp1], %[temp2], %[temp3] \n\t" \ -@@ -413,70 +413,70 @@ static int Disto16x16(const uint8_t* const a, const uint8_t* const b, - // A - offset in bytes to load from src and ref buffers - // TEMP0..TEMP3 - registers for corresponding tmp elements - #define HORIZONTAL_PASS(A, TEMP0, TEMP1, TEMP2, TEMP3) \ -- "lw %["#TEMP1"], 0(%[args]) \n\t" \ -- "lw %["#TEMP2"], 4(%[args]) \n\t" \ -- "lbu %[temp16], 0+"XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \ -- "lbu %[temp17], 0+"XSTR(BPS)"*"#A"(%["#TEMP2"]) \n\t" \ -- "lbu %[temp18], 1+"XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \ -- "lbu %[temp19], 1+"XSTR(BPS)"*"#A"(%["#TEMP2"]) \n\t" \ -+ "lw %[" #TEMP1 "], 0(%[args]) \n\t" \ -+ "lw %[" #TEMP2 "], 4(%[args]) \n\t" \ -+ "lbu %[temp16], 0+"XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \ -+ "lbu %[temp17], 0+"XSTR(BPS)"*" #A "(%[" #TEMP2 "]) \n\t" \ -+ "lbu %[temp18], 1+"XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \ -+ "lbu %[temp19], 1+"XSTR(BPS)"*" #A "(%[" #TEMP2 "]) \n\t" \ - "subu %[temp20], %[temp16], %[temp17] \n\t" \ -- "lbu %[temp16], 2+"XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \ -- "lbu %[temp17], 2+"XSTR(BPS)"*"#A"(%["#TEMP2"]) \n\t" \ -- "subu %["#TEMP0"], %[temp18], %[temp19] \n\t" \ -- "lbu %[temp18], 3+"XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \ -- "lbu %[temp19], 3+"XSTR(BPS)"*"#A"(%["#TEMP2"]) \n\t" \ -- "subu %["#TEMP1"], %[temp16], %[temp17] \n\t" \ -- "subu %["#TEMP2"], %[temp18], %[temp19] \n\t" \ -- "addu %["#TEMP3"], %[temp20], %["#TEMP2"] \n\t" \ -- "subu %["#TEMP2"], %[temp20], %["#TEMP2"] \n\t" \ -- "addu %[temp20], %["#TEMP0"], %["#TEMP1"] \n\t" \ -- "subu %["#TEMP0"], %["#TEMP0"], %["#TEMP1"] \n\t" \ -- "mul %[temp16], %["#TEMP2"], %[c5352] \n\t" \ -- "mul %[temp17], %["#TEMP2"], %[c2217] \n\t" \ -- "mul %[temp18], %["#TEMP0"], %[c5352] \n\t" \ -- "mul %[temp19], %["#TEMP0"], %[c2217] \n\t" \ -- "addu %["#TEMP1"], %["#TEMP3"], %[temp20] \n\t" \ -- "subu %[temp20], %["#TEMP3"], %[temp20] \n\t" \ -- "sll %["#TEMP0"], %["#TEMP1"], 3 \n\t" \ -- "sll %["#TEMP2"], %[temp20], 3 \n\t" \ -+ "lbu %[temp16], 2+"XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \ -+ "lbu %[temp17], 2+"XSTR(BPS)"*" #A "(%[" #TEMP2 "]) \n\t" \ -+ "subu %[" #TEMP0 "], %[temp18], %[temp19] \n\t" \ -+ "lbu %[temp18], 3+"XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \ -+ "lbu %[temp19], 3+"XSTR(BPS)"*" #A "(%[" #TEMP2 "]) \n\t" \ -+ "subu %[" #TEMP1 "], %[temp16], %[temp17] \n\t" \ -+ "subu %[" #TEMP2 "], %[temp18], %[temp19] \n\t" \ -+ "addu %[" #TEMP3 "], %[temp20], %[" #TEMP2 "] \n\t" \ -+ "subu %[" #TEMP2 "], %[temp20], %[" #TEMP2 "] \n\t" \ -+ "addu %[temp20], %[" #TEMP0 "], %[" #TEMP1 "] \n\t" \ -+ "subu %[" #TEMP0 "], %[" #TEMP0 "], %[" #TEMP1 "] \n\t" \ -+ "mul %[temp16], %[" #TEMP2 "], %[c5352] \n\t" \ -+ "mul %[temp17], %[" #TEMP2 "], %[c2217] \n\t" \ -+ "mul %[temp18], %[" #TEMP0 "], %[c5352] \n\t" \ -+ "mul %[temp19], %[" #TEMP0 "], %[c2217] \n\t" \ -+ "addu %[" #TEMP1 "], %[" #TEMP3 "], %[temp20] \n\t" \ -+ "subu %[temp20], %[" #TEMP3 "], %[temp20] \n\t" \ -+ "sll %[" #TEMP0 "], %[" #TEMP1 "], 3 \n\t" \ -+ "sll %[" #TEMP2 "], %[temp20], 3 \n\t" \ - "addiu %[temp16], %[temp16], 1812 \n\t" \ - "addiu %[temp17], %[temp17], 937 \n\t" \ - "addu %[temp16], %[temp16], %[temp19] \n\t" \ - "subu %[temp17], %[temp17], %[temp18] \n\t" \ -- "sra %["#TEMP1"], %[temp16], 9 \n\t" \ -- "sra %["#TEMP3"], %[temp17], 9 \n\t" -+ "sra %[" #TEMP1 "], %[temp16], 9 \n\t" \ -+ "sra %[" #TEMP3 "], %[temp17], 9 \n\t" - - // macro for one vertical pass in FTransform - // temp0..temp15 holds tmp[0]..tmp[15] - // A..D - offsets in bytes to store to out buffer - // TEMP0, TEMP4, TEMP8 and TEMP12 - registers for corresponding tmp elements - #define VERTICAL_PASS(A, B, C, D, TEMP0, TEMP4, TEMP8, TEMP12) \ -- "addu %[temp16], %["#TEMP0"], %["#TEMP12"] \n\t" \ -- "subu %[temp19], %["#TEMP0"], %["#TEMP12"] \n\t" \ -- "addu %[temp17], %["#TEMP4"], %["#TEMP8"] \n\t" \ -- "subu %[temp18], %["#TEMP4"], %["#TEMP8"] \n\t" \ -- "mul %["#TEMP8"], %[temp19], %[c2217] \n\t" \ -- "mul %["#TEMP12"], %[temp18], %[c2217] \n\t" \ -- "mul %["#TEMP4"], %[temp19], %[c5352] \n\t" \ -+ "addu %[temp16], %[" #TEMP0 "], %[" #TEMP12 "] \n\t" \ -+ "subu %[temp19], %[" #TEMP0 "], %[" #TEMP12 "] \n\t" \ -+ "addu %[temp17], %[" #TEMP4 "], %[" #TEMP8 "] \n\t" \ -+ "subu %[temp18], %[" #TEMP4 "], %[" #TEMP8 "] \n\t" \ -+ "mul %[" #TEMP8 "], %[temp19], %[c2217] \n\t" \ -+ "mul %[" #TEMP12 "], %[temp18], %[c2217] \n\t" \ -+ "mul %[" #TEMP4 "], %[temp19], %[c5352] \n\t" \ - "mul %[temp18], %[temp18], %[c5352] \n\t" \ - "addiu %[temp16], %[temp16], 7 \n\t" \ -- "addu %["#TEMP0"], %[temp16], %[temp17] \n\t" \ -- "sra %["#TEMP0"], %["#TEMP0"], 4 \n\t" \ -- "addu %["#TEMP12"], %["#TEMP12"], %["#TEMP4"] \n\t" \ -- "subu %["#TEMP4"], %[temp16], %[temp17] \n\t" \ -- "sra %["#TEMP4"], %["#TEMP4"], 4 \n\t" \ -- "addiu %["#TEMP8"], %["#TEMP8"], 30000 \n\t" \ -- "addiu %["#TEMP12"], %["#TEMP12"], 12000 \n\t" \ -- "addiu %["#TEMP8"], %["#TEMP8"], 21000 \n\t" \ -- "subu %["#TEMP8"], %["#TEMP8"], %[temp18] \n\t" \ -- "sra %["#TEMP12"], %["#TEMP12"], 16 \n\t" \ -- "sra %["#TEMP8"], %["#TEMP8"], 16 \n\t" \ -- "addiu %[temp16], %["#TEMP12"], 1 \n\t" \ -- "movn %["#TEMP12"], %[temp16], %[temp19] \n\t" \ -- "sh %["#TEMP0"], "#A"(%[temp20]) \n\t" \ -- "sh %["#TEMP4"], "#C"(%[temp20]) \n\t" \ -- "sh %["#TEMP8"], "#D"(%[temp20]) \n\t" \ -- "sh %["#TEMP12"], "#B"(%[temp20]) \n\t" -+ "addu %[" #TEMP0 "], %[temp16], %[temp17] \n\t" \ -+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 4 \n\t" \ -+ "addu %[" #TEMP12 "], %[" #TEMP12 "], %[" #TEMP4 "] \n\t" \ -+ "subu %[" #TEMP4 "], %[temp16], %[temp17] \n\t" \ -+ "sra %[" #TEMP4 "], %[" #TEMP4 "], 4 \n\t" \ -+ "addiu %[" #TEMP8 "], %[" #TEMP8 "], 30000 \n\t" \ -+ "addiu %[" #TEMP12 "], %[" #TEMP12 "], 12000 \n\t" \ -+ "addiu %[" #TEMP8 "], %[" #TEMP8 "], 21000 \n\t" \ -+ "subu %[" #TEMP8 "], %[" #TEMP8 "], %[temp18] \n\t" \ -+ "sra %[" #TEMP12 "], %[" #TEMP12 "], 16 \n\t" \ -+ "sra %[" #TEMP8 "], %[" #TEMP8 "], 16 \n\t" \ -+ "addiu %[temp16], %[" #TEMP12 "], 1 \n\t" \ -+ "movn %[" #TEMP12 "], %[temp16], %[temp19] \n\t" \ -+ "sh %[" #TEMP0 "], " #A "(%[temp20]) \n\t" \ -+ "sh %[" #TEMP4 "], " #C "(%[temp20]) \n\t" \ -+ "sh %[" #TEMP8 "], " #D "(%[temp20]) \n\t" \ -+ "sh %[" #TEMP12 "], " #B "(%[temp20]) \n\t" - - static void FTransform(const uint8_t* src, const uint8_t* ref, int16_t* out) { - int temp0, temp1, temp2, temp3, temp4, temp5, temp6, temp7, temp8; -@@ -516,14 +516,14 @@ static void FTransform(const uint8_t* src, const uint8_t* ref, int16_t* out) { - #if !defined(WORK_AROUND_GCC) - - #define GET_SSE_INNER(A, B, C, D) \ -- "lbu %[temp0], "#A"(%[a]) \n\t" \ -- "lbu %[temp1], "#A"(%[b]) \n\t" \ -- "lbu %[temp2], "#B"(%[a]) \n\t" \ -- "lbu %[temp3], "#B"(%[b]) \n\t" \ -- "lbu %[temp4], "#C"(%[a]) \n\t" \ -- "lbu %[temp5], "#C"(%[b]) \n\t" \ -- "lbu %[temp6], "#D"(%[a]) \n\t" \ -- "lbu %[temp7], "#D"(%[b]) \n\t" \ -+ "lbu %[temp0], " #A "(%[a]) \n\t" \ -+ "lbu %[temp1], " #A "(%[b]) \n\t" \ -+ "lbu %[temp2], " #B "(%[a]) \n\t" \ -+ "lbu %[temp3], " #B "(%[b]) \n\t" \ -+ "lbu %[temp4], " #C "(%[a]) \n\t" \ -+ "lbu %[temp5], " #C "(%[b]) \n\t" \ -+ "lbu %[temp6], " #D "(%[a]) \n\t" \ -+ "lbu %[temp7], " #D "(%[b]) \n\t" \ - "subu %[temp0], %[temp0], %[temp1] \n\t" \ - "subu %[temp2], %[temp2], %[temp3] \n\t" \ - "subu %[temp4], %[temp4], %[temp5] \n\t" \ -diff --git a/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c -index ec58efe..1a3f968 100644 ---- a/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c -+++ b/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c -@@ -27,25 +27,25 @@ static const int kC2 = 35468; - // I - input (macro doesn't change it) - #define ADD_SUB_HALVES_X4(O0, O1, O2, O3, O4, O5, O6, O7, \ - I0, I1, I2, I3, I4, I5, I6, I7) \ -- "addq.ph %["#O0"], %["#I0"], %["#I1"] \n\t" \ -- "subq.ph %["#O1"], %["#I0"], %["#I1"] \n\t" \ -- "addq.ph %["#O2"], %["#I2"], %["#I3"] \n\t" \ -- "subq.ph %["#O3"], %["#I2"], %["#I3"] \n\t" \ -- "addq.ph %["#O4"], %["#I4"], %["#I5"] \n\t" \ -- "subq.ph %["#O5"], %["#I4"], %["#I5"] \n\t" \ -- "addq.ph %["#O6"], %["#I6"], %["#I7"] \n\t" \ -- "subq.ph %["#O7"], %["#I6"], %["#I7"] \n\t" -+ "addq.ph %[" #O0 "], %[" #I0 "], %[" #I1 "] \n\t" \ -+ "subq.ph %[" #O1 "], %[" #I0 "], %[" #I1 "] \n\t" \ -+ "addq.ph %[" #O2 "], %[" #I2 "], %[" #I3 "] \n\t" \ -+ "subq.ph %[" #O3 "], %[" #I2 "], %[" #I3 "] \n\t" \ -+ "addq.ph %[" #O4 "], %[" #I4 "], %[" #I5 "] \n\t" \ -+ "subq.ph %[" #O5 "], %[" #I4 "], %[" #I5 "] \n\t" \ -+ "addq.ph %[" #O6 "], %[" #I6 "], %[" #I7 "] \n\t" \ -+ "subq.ph %[" #O7 "], %[" #I6 "], %[" #I7 "] \n\t" - - // IO - input/output - #define ABS_X8(IO0, IO1, IO2, IO3, IO4, IO5, IO6, IO7) \ -- "absq_s.ph %["#IO0"], %["#IO0"] \n\t" \ -- "absq_s.ph %["#IO1"], %["#IO1"] \n\t" \ -- "absq_s.ph %["#IO2"], %["#IO2"] \n\t" \ -- "absq_s.ph %["#IO3"], %["#IO3"] \n\t" \ -- "absq_s.ph %["#IO4"], %["#IO4"] \n\t" \ -- "absq_s.ph %["#IO5"], %["#IO5"] \n\t" \ -- "absq_s.ph %["#IO6"], %["#IO6"] \n\t" \ -- "absq_s.ph %["#IO7"], %["#IO7"] \n\t" -+ "absq_s.ph %[" #IO0 "], %[" #IO0 "] \n\t" \ -+ "absq_s.ph %[" #IO1 "], %[" #IO1 "] \n\t" \ -+ "absq_s.ph %[" #IO2 "], %[" #IO2 "] \n\t" \ -+ "absq_s.ph %[" #IO3 "], %[" #IO3 "] \n\t" \ -+ "absq_s.ph %[" #IO4 "], %[" #IO4 "] \n\t" \ -+ "absq_s.ph %[" #IO5 "], %[" #IO5 "] \n\t" \ -+ "absq_s.ph %[" #IO6 "], %[" #IO6 "] \n\t" \ -+ "absq_s.ph %[" #IO7 "], %[" #IO7 "] \n\t" - - // dpa.w.ph $ac0 temp0 ,temp1 - // $ac += temp0[31..16] * temp1[31..16] + temp0[15..0] * temp1[15..0] -@@ -56,15 +56,15 @@ static const int kC2 = 35468; - #define MUL_HALF(O0, I0, I1, I2, I3, I4, I5, I6, I7, \ - I8, I9, I10, I11, I12, I13, I14, I15) \ - "mult $ac0, $zero, $zero \n\t" \ -- "dpa.w.ph $ac0, %["#I2"], %["#I0"] \n\t" \ -- "dpax.w.ph $ac0, %["#I5"], %["#I6"] \n\t" \ -- "dpa.w.ph $ac0, %["#I8"], %["#I9"] \n\t" \ -- "dpax.w.ph $ac0, %["#I11"], %["#I4"] \n\t" \ -- "dpa.w.ph $ac0, %["#I12"], %["#I7"] \n\t" \ -- "dpax.w.ph $ac0, %["#I13"], %["#I1"] \n\t" \ -- "dpa.w.ph $ac0, %["#I14"], %["#I3"] \n\t" \ -- "dpax.w.ph $ac0, %["#I15"], %["#I10"] \n\t" \ -- "mflo %["#O0"], $ac0 \n\t" -+ "dpa.w.ph $ac0, %[" #I2 "], %[" #I0 "] \n\t" \ -+ "dpax.w.ph $ac0, %[" #I5 "], %[" #I6 "] \n\t" \ -+ "dpa.w.ph $ac0, %[" #I8 "], %[" #I9 "] \n\t" \ -+ "dpax.w.ph $ac0, %[" #I11 "], %[" #I4 "] \n\t" \ -+ "dpa.w.ph $ac0, %[" #I12 "], %[" #I7 "] \n\t" \ -+ "dpax.w.ph $ac0, %[" #I13 "], %[" #I1 "] \n\t" \ -+ "dpa.w.ph $ac0, %[" #I14 "], %[" #I3 "] \n\t" \ -+ "dpax.w.ph $ac0, %[" #I15 "], %[" #I10 "] \n\t" \ -+ "mflo %[" #O0 "], $ac0 \n\t" - - #define OUTPUT_EARLY_CLOBBER_REGS_17() \ - OUTPUT_EARLY_CLOBBER_REGS_10(), \ -@@ -77,69 +77,69 @@ static const int kC2 = 35468; - // A - offset in bytes to load from src and ref buffers - // TEMP0..TEMP3 - registers for corresponding tmp elements - #define HORIZONTAL_PASS(A, TEMP0, TEMP1, TEMP2, TEMP3) \ -- "lw %["#TEMP0"], 0(%[args]) \n\t" \ -- "lw %["#TEMP1"], 4(%[args]) \n\t" \ -- "lw %["#TEMP2"], "XSTR(BPS)"*"#A"(%["#TEMP0"]) \n\t" \ -- "lw %["#TEMP3"], "XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \ -- "preceu.ph.qbl %["#TEMP0"], %["#TEMP2"] \n\t" \ -- "preceu.ph.qbl %["#TEMP1"], %["#TEMP3"] \n\t" \ -- "preceu.ph.qbr %["#TEMP2"], %["#TEMP2"] \n\t" \ -- "preceu.ph.qbr %["#TEMP3"], %["#TEMP3"] \n\t" \ -- "subq.ph %["#TEMP0"], %["#TEMP0"], %["#TEMP1"] \n\t" \ -- "subq.ph %["#TEMP2"], %["#TEMP2"], %["#TEMP3"] \n\t" \ -- "rotr %["#TEMP0"], %["#TEMP0"], 16 \n\t" \ -- "addq.ph %["#TEMP1"], %["#TEMP2"], %["#TEMP0"] \n\t" \ -- "subq.ph %["#TEMP3"], %["#TEMP2"], %["#TEMP0"] \n\t" \ -- "seh %["#TEMP0"], %["#TEMP1"] \n\t" \ -- "sra %[temp16], %["#TEMP1"], 16 \n\t" \ -- "seh %[temp19], %["#TEMP3"] \n\t" \ -- "sra %["#TEMP3"], %["#TEMP3"], 16 \n\t" \ -- "subu %["#TEMP2"], %["#TEMP0"], %[temp16] \n\t" \ -- "addu %["#TEMP0"], %["#TEMP0"], %[temp16] \n\t" \ -+ "lw %[" #TEMP0 "], 0(%[args]) \n\t" \ -+ "lw %[" #TEMP1 "], 4(%[args]) \n\t" \ -+ "lw %[" #TEMP2 "], "XSTR(BPS)"*" #A "(%[" #TEMP0 "]) \n\t" \ -+ "lw %[" #TEMP3 "], "XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \ -+ "preceu.ph.qbl %[" #TEMP0 "], %[" #TEMP2 "] \n\t" \ -+ "preceu.ph.qbl %[" #TEMP1 "], %[" #TEMP3 "] \n\t" \ -+ "preceu.ph.qbr %[" #TEMP2 "], %[" #TEMP2 "] \n\t" \ -+ "preceu.ph.qbr %[" #TEMP3 "], %[" #TEMP3 "] \n\t" \ -+ "subq.ph %[" #TEMP0 "], %[" #TEMP0 "], %[" #TEMP1 "] \n\t" \ -+ "subq.ph %[" #TEMP2 "], %[" #TEMP2 "], %[" #TEMP3 "] \n\t" \ -+ "rotr %[" #TEMP0 "], %[" #TEMP0 "], 16 \n\t" \ -+ "addq.ph %[" #TEMP1 "], %[" #TEMP2 "], %[" #TEMP0 "] \n\t" \ -+ "subq.ph %[" #TEMP3 "], %[" #TEMP2 "], %[" #TEMP0 "] \n\t" \ -+ "seh %[" #TEMP0 "], %[" #TEMP1 "] \n\t" \ -+ "sra %[temp16], %[" #TEMP1 "], 16 \n\t" \ -+ "seh %[temp19], %[" #TEMP3 "] \n\t" \ -+ "sra %[" #TEMP3 "], %[" #TEMP3 "], 16 \n\t" \ -+ "subu %[" #TEMP2 "], %[" #TEMP0 "], %[temp16] \n\t" \ -+ "addu %[" #TEMP0 "], %[" #TEMP0 "], %[temp16] \n\t" \ - "mul %[temp17], %[temp19], %[c2217] \n\t" \ -- "mul %[temp18], %["#TEMP3"], %[c5352] \n\t" \ -- "mul %["#TEMP1"], %[temp19], %[c5352] \n\t" \ -- "mul %[temp16], %["#TEMP3"], %[c2217] \n\t" \ -- "sll %["#TEMP2"], %["#TEMP2"], 3 \n\t" \ -- "sll %["#TEMP0"], %["#TEMP0"], 3 \n\t" \ -- "subu %["#TEMP3"], %[temp17], %[temp18] \n\t" \ -- "addu %["#TEMP1"], %[temp16], %["#TEMP1"] \n\t" \ -- "addiu %["#TEMP3"], %["#TEMP3"], 937 \n\t" \ -- "addiu %["#TEMP1"], %["#TEMP1"], 1812 \n\t" \ -- "sra %["#TEMP3"], %["#TEMP3"], 9 \n\t" \ -- "sra %["#TEMP1"], %["#TEMP1"], 9 \n\t" -+ "mul %[temp18], %[" #TEMP3 "], %[c5352] \n\t" \ -+ "mul %[" #TEMP1 "], %[temp19], %[c5352] \n\t" \ -+ "mul %[temp16], %[" #TEMP3 "], %[c2217] \n\t" \ -+ "sll %[" #TEMP2 "], %[" #TEMP2 "], 3 \n\t" \ -+ "sll %[" #TEMP0 "], %[" #TEMP0 "], 3 \n\t" \ -+ "subu %[" #TEMP3 "], %[temp17], %[temp18] \n\t" \ -+ "addu %[" #TEMP1 "], %[temp16], %[" #TEMP1 "] \n\t" \ -+ "addiu %[" #TEMP3 "], %[" #TEMP3 "], 937 \n\t" \ -+ "addiu %[" #TEMP1 "], %[" #TEMP1 "], 1812 \n\t" \ -+ "sra %[" #TEMP3 "], %[" #TEMP3 "], 9 \n\t" \ -+ "sra %[" #TEMP1 "], %[" #TEMP1 "], 9 \n\t" - - // macro for one vertical pass in FTransform - // temp0..temp15 holds tmp[0]..tmp[15] - // A..D - offsets in bytes to store to out buffer - // TEMP0, TEMP4, TEMP8 and TEMP12 - registers for corresponding tmp elements - #define VERTICAL_PASS(A, B, C, D, TEMP0, TEMP4, TEMP8, TEMP12) \ -- "addu %[temp16], %["#TEMP0"], %["#TEMP12"] \n\t" \ -- "subu %[temp19], %["#TEMP0"], %["#TEMP12"] \n\t" \ -- "addu %[temp17], %["#TEMP4"], %["#TEMP8"] \n\t" \ -- "subu %[temp18], %["#TEMP4"], %["#TEMP8"] \n\t" \ -- "mul %["#TEMP8"], %[temp19], %[c2217] \n\t" \ -- "mul %["#TEMP12"], %[temp18], %[c2217] \n\t" \ -- "mul %["#TEMP4"], %[temp19], %[c5352] \n\t" \ -+ "addu %[temp16], %[" #TEMP0 "], %[" #TEMP12 "] \n\t" \ -+ "subu %[temp19], %[" #TEMP0 "], %[" #TEMP12 "] \n\t" \ -+ "addu %[temp17], %[" #TEMP4 "], %[" #TEMP8 "] \n\t" \ -+ "subu %[temp18], %[" #TEMP4 "], %[" #TEMP8 "] \n\t" \ -+ "mul %[" #TEMP8 "], %[temp19], %[c2217] \n\t" \ -+ "mul %[" #TEMP12 "], %[temp18], %[c2217] \n\t" \ -+ "mul %[" #TEMP4 "], %[temp19], %[c5352] \n\t" \ - "mul %[temp18], %[temp18], %[c5352] \n\t" \ - "addiu %[temp16], %[temp16], 7 \n\t" \ -- "addu %["#TEMP0"], %[temp16], %[temp17] \n\t" \ -- "sra %["#TEMP0"], %["#TEMP0"], 4 \n\t" \ -- "addu %["#TEMP12"], %["#TEMP12"], %["#TEMP4"] \n\t" \ -- "subu %["#TEMP4"], %[temp16], %[temp17] \n\t" \ -- "sra %["#TEMP4"], %["#TEMP4"], 4 \n\t" \ -- "addiu %["#TEMP8"], %["#TEMP8"], 30000 \n\t" \ -- "addiu %["#TEMP12"], %["#TEMP12"], 12000 \n\t" \ -- "addiu %["#TEMP8"], %["#TEMP8"], 21000 \n\t" \ -- "subu %["#TEMP8"], %["#TEMP8"], %[temp18] \n\t" \ -- "sra %["#TEMP12"], %["#TEMP12"], 16 \n\t" \ -- "sra %["#TEMP8"], %["#TEMP8"], 16 \n\t" \ -- "addiu %[temp16], %["#TEMP12"], 1 \n\t" \ -- "movn %["#TEMP12"], %[temp16], %[temp19] \n\t" \ -- "sh %["#TEMP0"], "#A"(%[temp20]) \n\t" \ -- "sh %["#TEMP4"], "#C"(%[temp20]) \n\t" \ -- "sh %["#TEMP8"], "#D"(%[temp20]) \n\t" \ -- "sh %["#TEMP12"], "#B"(%[temp20]) \n\t" -+ "addu %[" #TEMP0 "], %[temp16], %[temp17] \n\t" \ -+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 4 \n\t" \ -+ "addu %[" #TEMP12 "], %[" #TEMP12 "], %[" #TEMP4 "] \n\t" \ -+ "subu %[" #TEMP4 "], %[temp16], %[temp17] \n\t" \ -+ "sra %[" #TEMP4 "], %[" #TEMP4 "], 4 \n\t" \ -+ "addiu %[" #TEMP8 "], %[" #TEMP8 "], 30000 \n\t" \ -+ "addiu %[" #TEMP12 "], %[" #TEMP12 "], 12000 \n\t" \ -+ "addiu %[" #TEMP8 "], %[" #TEMP8 "], 21000 \n\t" \ -+ "subu %[" #TEMP8 "], %[" #TEMP8 "], %[temp18] \n\t" \ -+ "sra %[" #TEMP12 "], %[" #TEMP12 "], 16 \n\t" \ -+ "sra %[" #TEMP8 "], %[" #TEMP8 "], 16 \n\t" \ -+ "addiu %[temp16], %[" #TEMP12 "], 1 \n\t" \ -+ "movn %[" #TEMP12 "], %[temp16], %[temp19] \n\t" \ -+ "sh %[" #TEMP0 "], " #A "(%[temp20]) \n\t" \ -+ "sh %[" #TEMP4 "], " #C "(%[temp20]) \n\t" \ -+ "sh %[" #TEMP8 "], " #D "(%[temp20]) \n\t" \ -+ "sh %[" #TEMP12 "], " #B "(%[temp20]) \n\t" - - static void FTransform(const uint8_t* src, const uint8_t* ref, int16_t* out) { - const int c2217 = 2217; -@@ -329,11 +329,11 @@ static int Disto16x16(const uint8_t* const a, const uint8_t* const b, - // Intra predictions - - #define FILL_PART(J, SIZE) \ -- "usw %[value], 0+"#J"*"XSTR(BPS)"(%[dst]) \n\t" \ -- "usw %[value], 4+"#J"*"XSTR(BPS)"(%[dst]) \n\t" \ -- ".if "#SIZE" == 16 \n\t" \ -- "usw %[value], 8+"#J"*"XSTR(BPS)"(%[dst]) \n\t" \ -- "usw %[value], 12+"#J"*"XSTR(BPS)"(%[dst]) \n\t" \ -+ "usw %[value], 0+" #J "*"XSTR(BPS)"(%[dst]) \n\t" \ -+ "usw %[value], 4+" #J "*"XSTR(BPS)"(%[dst]) \n\t" \ -+ ".if " #SIZE " == 16 \n\t" \ -+ "usw %[value], 8+" #J "*"XSTR(BPS)"(%[dst]) \n\t" \ -+ "usw %[value], 12+" #J "*"XSTR(BPS)"(%[dst]) \n\t" \ - ".endif \n\t" - - #define FILL_8_OR_16(DST, VALUE, SIZE) do { \ -@@ -348,7 +348,7 @@ static int Disto16x16(const uint8_t* const a, const uint8_t* const b, - FILL_PART( 5, SIZE) \ - FILL_PART( 6, SIZE) \ - FILL_PART( 7, SIZE) \ -- ".if "#SIZE" == 16 \n\t" \ -+ ".if " #SIZE " == 16 \n\t" \ - FILL_PART( 8, 16) \ - FILL_PART( 9, 16) \ - FILL_PART(10, 16) \ -@@ -425,7 +425,7 @@ HORIZONTAL_PRED(dst, left, 16) - CLIPPING() \ - "usw %[temp0], 0(%[dst]) \n\t" \ - "usw %[temp1], 4(%[dst]) \n\t" \ -- ".if "#SIZE" == 16 \n\t" \ -+ ".if " #SIZE " == 16 \n\t" \ - "ulw %[temp0], 8(%[top]) \n\t" \ - "ulw %[temp1], 12(%[top]) \n\t" \ - CLIPPING() \ -@@ -1060,8 +1060,8 @@ static void Intra4Preds(uint8_t* dst, const uint8_t* top) { - #if !defined(WORK_AROUND_GCC) - - #define GET_SSE_INNER(A) \ -- "lw %[temp0], "#A"(%[a]) \n\t" \ -- "lw %[temp1], "#A"(%[b]) \n\t" \ -+ "lw %[temp0], " #A "(%[a]) \n\t" \ -+ "lw %[temp1], " #A "(%[b]) \n\t" \ - "preceu.ph.qbr %[temp2], %[temp0] \n\t" \ - "preceu.ph.qbl %[temp0], %[temp0] \n\t" \ - "preceu.ph.qbr %[temp3], %[temp1] \n\t" \ -@@ -1185,28 +1185,28 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) { - // N - offset in bytes (n * 2) - // N1 - offset in bytes ((n + 1) * 2) - #define QUANTIZE_ONE(J, K, N, N1) \ -- "ulw %[temp1], "#J"(%[ppin]) \n\t" \ -- "ulw %[temp2], "#J"(%[ppsharpen]) \n\t" \ -- "lhu %[temp3], "#K"(%[ppzthresh]) \n\t" \ -- "lhu %[temp6], "#K"+4(%[ppzthresh]) \n\t" \ -+ "ulw %[temp1], " #J "(%[ppin]) \n\t" \ -+ "ulw %[temp2], " #J "(%[ppsharpen]) \n\t" \ -+ "lhu %[temp3], " #K "(%[ppzthresh]) \n\t" \ -+ "lhu %[temp6], " #K "+4(%[ppzthresh]) \n\t" \ - "absq_s.ph %[temp4], %[temp1] \n\t" \ - "ins %[temp3], %[temp6], 16, 16 \n\t" \ - "addu.ph %[coeff], %[temp4], %[temp2] \n\t" \ - "shra.ph %[sign], %[temp1], 15 \n\t" \ - "li %[level], 0x10001 \n\t" \ - "cmp.lt.ph %[temp3], %[coeff] \n\t" \ -- "lhu %[temp1], "#J"(%[ppiq]) \n\t" \ -+ "lhu %[temp1], " #J "(%[ppiq]) \n\t" \ - "pick.ph %[temp5], %[level], $0 \n\t" \ -- "lw %[temp2], "#K"(%[ppbias]) \n\t" \ -+ "lw %[temp2], " #K "(%[ppbias]) \n\t" \ - "beqz %[temp5], 0f \n\t" \ -- "lhu %[temp3], "#J"(%[ppq]) \n\t" \ -+ "lhu %[temp3], " #J "(%[ppq]) \n\t" \ - "beq %[temp5], %[level], 1f \n\t" \ - "andi %[temp5], %[temp5], 0x1 \n\t" \ - "andi %[temp4], %[coeff], 0xffff \n\t" \ - "beqz %[temp5], 2f \n\t" \ - "mul %[level], %[temp4], %[temp1] \n\t" \ -- "sh $0, "#J"+2(%[ppin]) \n\t" \ -- "sh $0, "#N1"(%[pout]) \n\t" \ -+ "sh $0, " #J "+2(%[ppin]) \n\t" \ -+ "sh $0, " #N1 "(%[pout]) \n\t" \ - "addu %[level], %[level], %[temp2] \n\t" \ - "sra %[level], %[level], 17 \n\t" \ - "slt %[temp4], %[max_level], %[level] \n\t" \ -@@ -1216,15 +1216,15 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) { - "subu %[level], %[level], %[temp6] \n\t" \ - "mul %[temp5], %[level], %[temp3] \n\t" \ - "or %[ret], %[ret], %[level] \n\t" \ -- "sh %[level], "#N"(%[pout]) \n\t" \ -- "sh %[temp5], "#J"(%[ppin]) \n\t" \ -+ "sh %[level], " #N "(%[pout]) \n\t" \ -+ "sh %[temp5], " #J "(%[ppin]) \n\t" \ - "j 3f \n\t" \ - "2: \n\t" \ -- "lhu %[temp1], "#J"+2(%[ppiq]) \n\t" \ -+ "lhu %[temp1], " #J "+2(%[ppiq]) \n\t" \ - "srl %[temp5], %[coeff], 16 \n\t" \ - "mul %[level], %[temp5], %[temp1] \n\t" \ -- "lw %[temp2], "#K"+4(%[ppbias]) \n\t" \ -- "lhu %[temp3], "#J"+2(%[ppq]) \n\t" \ -+ "lw %[temp2], " #K "+4(%[ppbias]) \n\t" \ -+ "lhu %[temp3], " #J "+2(%[ppq]) \n\t" \ - "addu %[level], %[level], %[temp2] \n\t" \ - "sra %[level], %[level], 17 \n\t" \ - "srl %[temp6], %[sign], 16 \n\t" \ -@@ -1233,20 +1233,20 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) { - "xor %[level], %[level], %[temp6] \n\t" \ - "subu %[level], %[level], %[temp6] \n\t" \ - "mul %[temp5], %[level], %[temp3] \n\t" \ -- "sh $0, "#J"(%[ppin]) \n\t" \ -- "sh $0, "#N"(%[pout]) \n\t" \ -+ "sh $0, " #J "(%[ppin]) \n\t" \ -+ "sh $0, " #N "(%[pout]) \n\t" \ - "or %[ret], %[ret], %[level] \n\t" \ -- "sh %[temp5], "#J"+2(%[ppin]) \n\t" \ -- "sh %[level], "#N1"(%[pout]) \n\t" \ -+ "sh %[temp5], " #J "+2(%[ppin]) \n\t" \ -+ "sh %[level], " #N1 "(%[pout]) \n\t" \ - "j 3f \n\t" \ - "1: \n\t" \ -- "lhu %[temp1], "#J"(%[ppiq]) \n\t" \ -- "lw %[temp2], "#K"(%[ppbias]) \n\t" \ -- "ulw %[temp3], "#J"(%[ppq]) \n\t" \ -+ "lhu %[temp1], " #J "(%[ppiq]) \n\t" \ -+ "lw %[temp2], " #K "(%[ppbias]) \n\t" \ -+ "ulw %[temp3], " #J "(%[ppq]) \n\t" \ - "andi %[temp5], %[coeff], 0xffff \n\t" \ - "srl %[temp0], %[coeff], 16 \n\t" \ -- "lhu %[temp6], "#J"+2(%[ppiq]) \n\t" \ -- "lw %[coeff], "#K"+4(%[ppbias]) \n\t" \ -+ "lhu %[temp6], " #J "+2(%[ppiq]) \n\t" \ -+ "lw %[coeff], " #K "+4(%[ppbias]) \n\t" \ - "mul %[level], %[temp5], %[temp1] \n\t" \ - "mul %[temp4], %[temp0], %[temp6] \n\t" \ - "addu %[level], %[level], %[temp2] \n\t" \ -@@ -1259,15 +1259,15 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) { - "subu.ph %[level], %[level], %[sign] \n\t" \ - "mul.ph %[temp3], %[level], %[temp3] \n\t" \ - "or %[ret], %[ret], %[level] \n\t" \ -- "sh %[level], "#N"(%[pout]) \n\t" \ -+ "sh %[level], " #N "(%[pout]) \n\t" \ - "srl %[level], %[level], 16 \n\t" \ -- "sh %[level], "#N1"(%[pout]) \n\t" \ -- "usw %[temp3], "#J"(%[ppin]) \n\t" \ -+ "sh %[level], " #N1 "(%[pout]) \n\t" \ -+ "usw %[temp3], " #J "(%[ppin]) \n\t" \ - "j 3f \n\t" \ - "0: \n\t" \ -- "sh $0, "#N"(%[pout]) \n\t" \ -- "sh $0, "#N1"(%[pout]) \n\t" \ -- "usw $0, "#J"(%[ppin]) \n\t" \ -+ "sh $0, " #N "(%[pout]) \n\t" \ -+ "sh $0, " #N1 "(%[pout]) \n\t" \ -+ "usw $0, " #J "(%[ppin]) \n\t" \ - "3: \n\t" - - static int QuantizeBlock(int16_t in[16], int16_t out[16], -@@ -1326,37 +1326,37 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32], - // A, B, C, D - offset in bytes to load from in buffer - // TEMP0, TEMP1 - registers for corresponding tmp elements - #define HORIZONTAL_PASS_WHT(A, B, C, D, TEMP0, TEMP1) \ -- "lh %["#TEMP0"], "#A"(%[in]) \n\t" \ -- "lh %["#TEMP1"], "#B"(%[in]) \n\t" \ -- "lh %[temp8], "#C"(%[in]) \n\t" \ -- "lh %[temp9], "#D"(%[in]) \n\t" \ -- "ins %["#TEMP1"], %["#TEMP0"], 16, 16 \n\t" \ -+ "lh %[" #TEMP0 "], " #A "(%[in]) \n\t" \ -+ "lh %[" #TEMP1 "], " #B "(%[in]) \n\t" \ -+ "lh %[temp8], " #C "(%[in]) \n\t" \ -+ "lh %[temp9], " #D "(%[in]) \n\t" \ -+ "ins %[" #TEMP1 "], %[" #TEMP0 "], 16, 16 \n\t" \ - "ins %[temp9], %[temp8], 16, 16 \n\t" \ -- "subq.ph %[temp8], %["#TEMP1"], %[temp9] \n\t" \ -- "addq.ph %[temp9], %["#TEMP1"], %[temp9] \n\t" \ -- "precrq.ph.w %["#TEMP0"], %[temp8], %[temp9] \n\t" \ -+ "subq.ph %[temp8], %[" #TEMP1 "], %[temp9] \n\t" \ -+ "addq.ph %[temp9], %[" #TEMP1 "], %[temp9] \n\t" \ -+ "precrq.ph.w %[" #TEMP0 "], %[temp8], %[temp9] \n\t" \ - "append %[temp8], %[temp9], 16 \n\t" \ -- "subq.ph %["#TEMP1"], %["#TEMP0"], %[temp8] \n\t" \ -- "addq.ph %["#TEMP0"], %["#TEMP0"], %[temp8] \n\t" \ -- "rotr %["#TEMP1"], %["#TEMP1"], 16 \n\t" -+ "subq.ph %[" #TEMP1 "], %[" #TEMP0 "], %[temp8] \n\t" \ -+ "addq.ph %[" #TEMP0 "], %[" #TEMP0 "], %[temp8] \n\t" \ -+ "rotr %[" #TEMP1 "], %[" #TEMP1 "], 16 \n\t" - - // macro for one vertical pass in FTransformWHT - // temp0..temp7 holds tmp[0]..tmp[15] - // A, B, C, D - offsets in bytes to store to out buffer - // TEMP0, TEMP2, TEMP4 and TEMP6 - registers for corresponding tmp elements - #define VERTICAL_PASS_WHT(A, B, C, D, TEMP0, TEMP2, TEMP4, TEMP6) \ -- "addq.ph %[temp8], %["#TEMP0"], %["#TEMP4"] \n\t" \ -- "addq.ph %[temp9], %["#TEMP2"], %["#TEMP6"] \n\t" \ -- "subq.ph %["#TEMP2"], %["#TEMP2"], %["#TEMP6"] \n\t" \ -- "subq.ph %["#TEMP6"], %["#TEMP0"], %["#TEMP4"] \n\t" \ -- "addqh.ph %["#TEMP0"], %[temp8], %[temp9] \n\t" \ -- "subqh.ph %["#TEMP4"], %["#TEMP6"], %["#TEMP2"] \n\t" \ -- "addqh.ph %["#TEMP2"], %["#TEMP2"], %["#TEMP6"] \n\t" \ -- "subqh.ph %["#TEMP6"], %[temp8], %[temp9] \n\t" \ -- "usw %["#TEMP0"], "#A"(%[out]) \n\t" \ -- "usw %["#TEMP2"], "#B"(%[out]) \n\t" \ -- "usw %["#TEMP4"], "#C"(%[out]) \n\t" \ -- "usw %["#TEMP6"], "#D"(%[out]) \n\t" -+ "addq.ph %[temp8], %[" #TEMP0 "], %[" #TEMP4 "] \n\t" \ -+ "addq.ph %[temp9], %[" #TEMP2 "], %[" #TEMP6 "] \n\t" \ -+ "subq.ph %[" #TEMP2 "], %[" #TEMP2 "], %[" #TEMP6 "] \n\t" \ -+ "subq.ph %[" #TEMP6 "], %[" #TEMP0 "], %[" #TEMP4 "] \n\t" \ -+ "addqh.ph %[" #TEMP0 "], %[temp8], %[temp9] \n\t" \ -+ "subqh.ph %[" #TEMP4 "], %[" #TEMP6 "], %[" #TEMP2 "] \n\t" \ -+ "addqh.ph %[" #TEMP2 "], %[" #TEMP2 "], %[" #TEMP6 "] \n\t" \ -+ "subqh.ph %[" #TEMP6 "], %[temp8], %[temp9] \n\t" \ -+ "usw %[" #TEMP0 "], " #A "(%[out]) \n\t" \ -+ "usw %[" #TEMP2 "], " #B "(%[out]) \n\t" \ -+ "usw %[" #TEMP4 "], " #C "(%[out]) \n\t" \ -+ "usw %[" #TEMP6 "], " #D "(%[out]) \n\t" - - static void FTransformWHT(const int16_t* in, int16_t* out) { - int temp0, temp1, temp2, temp3, temp4; -@@ -1385,10 +1385,10 @@ static void FTransformWHT(const int16_t* in, int16_t* out) { - // convert 8 coeffs at time - // A, B, C, D - offsets in bytes to load from out buffer - #define CONVERT_COEFFS_TO_BIN(A, B, C, D) \ -- "ulw %[temp0], "#A"(%[out]) \n\t" \ -- "ulw %[temp1], "#B"(%[out]) \n\t" \ -- "ulw %[temp2], "#C"(%[out]) \n\t" \ -- "ulw %[temp3], "#D"(%[out]) \n\t" \ -+ "ulw %[temp0], " #A "(%[out]) \n\t" \ -+ "ulw %[temp1], " #B "(%[out]) \n\t" \ -+ "ulw %[temp2], " #C "(%[out]) \n\t" \ -+ "ulw %[temp3], " #D "(%[out]) \n\t" \ - "absq_s.ph %[temp0], %[temp0] \n\t" \ - "absq_s.ph %[temp1], %[temp1] \n\t" \ - "absq_s.ph %[temp2], %[temp2] \n\t" \ -diff --git a/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c -index 6c34efb..6a1f8f4 100644 ---- a/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c -+++ b/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c -@@ -48,7 +48,7 @@ - "srl %[temp0], %[length], 0x2 \n\t" \ - "beqz %[temp0], 4f \n\t" \ - " andi %[temp6], %[length], 0x3 \n\t" \ -- ".if "#INVERSE" \n\t" \ -+ ".if " #INVERSE " \n\t" \ - "lbu %[temp1], -1(%[src]) \n\t" \ - "1: \n\t" \ - "lbu %[temp2], 0(%[src]) \n\t" \ -@@ -84,7 +84,7 @@ - "lbu %[temp1], -1(%[src]) \n\t" \ - "lbu %[temp2], 0(%[src]) \n\t" \ - "addiu %[src], %[src], 1 \n\t" \ -- ".if "#INVERSE" \n\t" \ -+ ".if " #INVERSE " \n\t" \ - "addu %[temp3], %[temp1], %[temp2] \n\t" \ - "sb %[temp3], -1(%[src]) \n\t" \ - ".else \n\t" \ -@@ -131,7 +131,7 @@ static WEBP_INLINE void PredictLine(const uint8_t* src, uint8_t* dst, - "ulw %[temp3], 4(%[src]) \n\t" \ - "ulw %[temp4], 4(%[pred]) \n\t" \ - "addiu %[src], %[src], 8 \n\t" \ -- ".if "#INVERSE" \n\t" \ -+ ".if " #INVERSE " \n\t" \ - "addu.qb %[temp5], %[temp1], %[temp2] \n\t" \ - "addu.qb %[temp6], %[temp3], %[temp4] \n\t" \ - ".else \n\t" \ -@@ -152,7 +152,7 @@ static WEBP_INLINE void PredictLine(const uint8_t* src, uint8_t* dst, - "lbu %[temp2], 0(%[pred]) \n\t" \ - "addiu %[src], %[src], 1 \n\t" \ - "addiu %[pred], %[pred], 1 \n\t" \ -- ".if "#INVERSE" \n\t" \ -+ ".if " #INVERSE " \n\t" \ - "addu %[temp3], %[temp1], %[temp2] \n\t" \ - ".else \n\t" \ - "subu %[temp3], %[temp1], %[temp2] \n\t" \ -@@ -177,7 +177,7 @@ static WEBP_INLINE void PredictLine(const uint8_t* src, uint8_t* dst, - __asm__ volatile ( \ - "lbu %[temp1], 0(%[src]) \n\t" \ - "lbu %[temp2], 0(%[pred]) \n\t" \ -- ".if "#INVERSE" \n\t" \ -+ ".if " #INVERSE " \n\t" \ - "addu %[temp3], %[temp1], %[temp2] \n\t" \ - ".else \n\t" \ - "subu %[temp3], %[temp1], %[temp2] \n\t" \ -diff --git a/Source/LibWebP/src/dsp/dsp.lossless_mips32.c b/Source/LibWebP/src/dsp/dsp.lossless_mips32.c -index 68fbe85..abe97c1 100644 ---- a/Source/LibWebP/src/dsp/dsp.lossless_mips32.c -+++ b/Source/LibWebP/src/dsp/dsp.lossless_mips32.c -@@ -285,28 +285,28 @@ static VP8LStreaks HuffmanCostCombinedCount(const uint32_t* X, - // literal_ and successive histograms could be unaligned - // so we must use ulw and usw - #define ADD_TO_OUT(A, B, C, D, E, P0, P1, P2) \ -- "ulw %[temp0], "#A"(%["#P0"]) \n\t" \ -- "ulw %[temp1], "#B"(%["#P0"]) \n\t" \ -- "ulw %[temp2], "#C"(%["#P0"]) \n\t" \ -- "ulw %[temp3], "#D"(%["#P0"]) \n\t" \ -- "ulw %[temp4], "#A"(%["#P1"]) \n\t" \ -- "ulw %[temp5], "#B"(%["#P1"]) \n\t" \ -- "ulw %[temp6], "#C"(%["#P1"]) \n\t" \ -- "ulw %[temp7], "#D"(%["#P1"]) \n\t" \ -+ "ulw %[temp0], " #A "(%[" #P0 "]) \n\t" \ -+ "ulw %[temp1], " #B "(%[" #P0 "]) \n\t" \ -+ "ulw %[temp2], " #C "(%[" #P0 "]) \n\t" \ -+ "ulw %[temp3], " #D "(%[" #P0 "]) \n\t" \ -+ "ulw %[temp4], " #A "(%[" #P1 "]) \n\t" \ -+ "ulw %[temp5], " #B "(%[" #P1 "]) \n\t" \ -+ "ulw %[temp6], " #C "(%[" #P1 "]) \n\t" \ -+ "ulw %[temp7], " #D "(%[" #P1 "]) \n\t" \ - "addu %[temp4], %[temp4], %[temp0] \n\t" \ - "addu %[temp5], %[temp5], %[temp1] \n\t" \ - "addu %[temp6], %[temp6], %[temp2] \n\t" \ - "addu %[temp7], %[temp7], %[temp3] \n\t" \ -- "addiu %["#P0"], %["#P0"], 16 \n\t" \ -- ".if "#E" == 1 \n\t" \ -- "addiu %["#P1"], %["#P1"], 16 \n\t" \ -+ "addiu %[" #P0 "], %[" #P0 "], 16 \n\t" \ -+ ".if " #E " == 1 \n\t" \ -+ "addiu %[" #P1 "], %[" #P1 "], 16 \n\t" \ - ".endif \n\t" \ -- "usw %[temp4], "#A"(%["#P2"]) \n\t" \ -- "usw %[temp5], "#B"(%["#P2"]) \n\t" \ -- "usw %[temp6], "#C"(%["#P2"]) \n\t" \ -- "usw %[temp7], "#D"(%["#P2"]) \n\t" \ -- "addiu %["#P2"], %["#P2"], 16 \n\t" \ -- "bne %["#P0"], %[LoopEnd], 1b \n\t" \ -+ "usw %[temp4], " #A "(%[" #P2 "]) \n\t" \ -+ "usw %[temp5], " #B "(%[" #P2 "]) \n\t" \ -+ "usw %[temp6], " #C "(%[" #P2 "]) \n\t" \ -+ "usw %[temp7], " #D "(%[" #P2 "]) \n\t" \ -+ "addiu %[" #P2 "], %[" #P2 "], 16 \n\t" \ -+ "bne %[" #P0 "], %[LoopEnd], 1b \n\t" \ - ".set pop \n\t" \ - - #define ASM_END_COMMON_0 \ -diff --git a/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c -index 821cda9..31ac181 100644 ---- a/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c -+++ b/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c -@@ -29,14 +29,14 @@ static void FUNC_NAME(const TYPE* src, \ - for (x = 0; x < (width >> 2); ++x) { \ - int tmp1, tmp2, tmp3, tmp4; \ - __asm__ volatile ( \ -- ".ifc "#TYPE", uint8_t \n\t" \ -+ ".ifc " #TYPE ", uint8_t \n\t" \ - "lbu %[tmp1], 0(%[src]) \n\t" \ - "lbu %[tmp2], 1(%[src]) \n\t" \ - "lbu %[tmp3], 2(%[src]) \n\t" \ - "lbu %[tmp4], 3(%[src]) \n\t" \ - "addiu %[src], %[src], 4 \n\t" \ - ".endif \n\t" \ -- ".ifc "#TYPE", uint32_t \n\t" \ -+ ".ifc " #TYPE ", uint32_t \n\t" \ - "lw %[tmp1], 0(%[src]) \n\t" \ - "lw %[tmp2], 4(%[src]) \n\t" \ - "lw %[tmp3], 8(%[src]) \n\t" \ -@@ -55,7 +55,7 @@ static void FUNC_NAME(const TYPE* src, \ - "lwx %[tmp2], %[tmp2](%[color_map]) \n\t" \ - "lwx %[tmp3], %[tmp3](%[color_map]) \n\t" \ - "lwx %[tmp4], %[tmp4](%[color_map]) \n\t" \ -- ".ifc "#TYPE", uint8_t \n\t" \ -+ ".ifc " #TYPE ", uint8_t \n\t" \ - "ext %[tmp1], %[tmp1], 8, 8 \n\t" \ - "ext %[tmp2], %[tmp2], 8, 8 \n\t" \ - "ext %[tmp3], %[tmp3], 8, 8 \n\t" \ -@@ -66,7 +66,7 @@ static void FUNC_NAME(const TYPE* src, \ - "sb %[tmp4], 3(%[dst]) \n\t" \ - "addiu %[dst], %[dst], 4 \n\t" \ - ".endif \n\t" \ -- ".ifc "#TYPE", uint32_t \n\t" \ -+ ".ifc " #TYPE ", uint32_t \n\t" \ - "sw %[tmp1], 0(%[dst]) \n\t" \ - "sw %[tmp2], 4(%[dst]) \n\t" \ - "sw %[tmp3], 8(%[dst]) \n\t" \ -diff --git a/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c -index a7864a0..cb3adfe 100644 ---- a/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c -+++ b/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c -@@ -34,15 +34,15 @@ - G = G - t2 + kGCst; \ - B = B + kBCst; \ - __asm__ volatile ( \ -- "shll_s.w %["#R"], %["#R"], 9 \n\t" \ -- "shll_s.w %["#G"], %["#G"], 9 \n\t" \ -- "shll_s.w %["#B"], %["#B"], 9 \n\t" \ -- "precrqu_s.qb.ph %["#R"], %["#R"], $zero \n\t" \ -- "precrqu_s.qb.ph %["#G"], %["#G"], $zero \n\t" \ -- "precrqu_s.qb.ph %["#B"], %["#B"], $zero \n\t" \ -- "srl %["#R"], %["#R"], 24 \n\t" \ -- "srl %["#G"], %["#G"], 24 \n\t" \ -- "srl %["#B"], %["#B"], 24 \n\t" \ -+ "shll_s.w %[" #R "], %[" #R "], 9 \n\t" \ -+ "shll_s.w %[" #G "], %[" #G "], 9 \n\t" \ -+ "shll_s.w %[" #B "], %[" #B "], 9 \n\t" \ -+ "precrqu_s.qb.ph %[" #R "], %[" #R "], $zero \n\t" \ -+ "precrqu_s.qb.ph %[" #G "], %[" #G "], $zero \n\t" \ -+ "precrqu_s.qb.ph %[" #B "], %[" #B "], $zero \n\t" \ -+ "srl %[" #R "], %[" #R "], 24 \n\t" \ -+ "srl %[" #G "], %[" #G "], 24 \n\t" \ -+ "srl %[" #B "], %[" #B "], 24 \n\t" \ - : [R]"+r"(R), [G]"+r"(G), [B]"+r"(B) \ - : \ - ); \ -diff --git a/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c -index 66adde5..51cbe9e 100644 ---- a/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c -+++ b/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c -@@ -39,12 +39,12 @@ - "addu %[temp5], %[temp0], %[temp1] \n\t" \ - "subu %[temp6], %[temp0], %[temp2] \n\t" \ - "addu %[temp7], %[temp0], %[temp4] \n\t" \ --".if "#K" \n\t" \ -+".if " #K " \n\t" \ - "lbu %[temp0], 1(%[y]) \n\t" \ - ".endif \n\t" \ - "shll_s.w %[temp5], %[temp5], 9 \n\t" \ - "shll_s.w %[temp6], %[temp6], 9 \n\t" \ --".if "#K" \n\t" \ -+".if " #K " \n\t" \ - "mul %[temp0], %[t_con_5], %[temp0] \n\t" \ - ".endif \n\t" \ - "shll_s.w %[temp7], %[temp7], 9 \n\t" \ -@@ -54,9 +54,9 @@ - "srl %[temp5], %[temp5], 24 \n\t" \ - "srl %[temp6], %[temp6], 24 \n\t" \ - "srl %[temp7], %[temp7], 24 \n\t" \ -- "sb %[temp5], "#R"(%[dst]) \n\t" \ -- "sb %[temp6], "#G"(%[dst]) \n\t" \ -- "sb %[temp7], "#B"(%[dst]) \n\t" \ -+ "sb %[temp5], " #R "(%[dst]) \n\t" \ -+ "sb %[temp6], " #G "(%[dst]) \n\t" \ -+ "sb %[temp7], " #B "(%[dst]) \n\t" \ - - #define ASM_CLOBBER_LIST() \ - : [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), [temp2]"=&r"(temp2), \ --- -2.1.4 - diff --git a/buildroot/package/libfreeimage/0003-fix-big-endian-os.patch b/buildroot/package/libfreeimage/0003-fix-big-endian-os.patch new file mode 100644 index 000000000..e0d4e921c --- /dev/null +++ b/buildroot/package/libfreeimage/0003-fix-big-endian-os.patch @@ -0,0 +1,64 @@ +fixed PluginBMP, PluginDDS for compilation under Big Endian OS + +Downloaded from upstream commit: +https://sourceforge.net/p/freeimage/svn/1809/ + +Signed-off-by: Bernd Kuhls + +diff -uNr FreeImage.orig/Source/FreeImage/PluginBMP.cpp FreeImage/Source/FreeImage/PluginBMP.cpp +--- FreeImage.orig/Source/FreeImage/PluginBMP.cpp 2016-06-15 12:35:30.000000000 +0200 ++++ FreeImage/Source/FreeImage/PluginBMP.cpp 2019-08-31 16:00:27.813378612 +0200 +@@ -518,7 +518,7 @@ + io->read_proc(FreeImage_GetPalette(dib), used_colors * sizeof(RGBQUAD), 1, handle); + #if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB + RGBQUAD *pal = FreeImage_GetPalette(dib); +- for(int i = 0; i < used_colors; i++) { ++ for(unsigned int i = 0; i < used_colors; i++) { + INPLACESWAP(pal[i].rgbRed, pal[i].rgbBlue); + } + #endif +@@ -1419,7 +1419,7 @@ + + free(buffer); + #ifdef FREEIMAGE_BIGENDIAN +- } else if (bpp == 16) { ++ } else if (dst_bpp == 16) { + int padding = dst_pitch - dst_width * sizeof(WORD); + WORD pad = 0; + WORD pixel; +@@ -1440,7 +1440,7 @@ + } + #endif + #if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB +- } else if (bpp == 24) { ++ } else if (dst_bpp == 24) { + int padding = dst_pitch - dst_width * sizeof(FILE_BGR); + DWORD pad = 0; + FILE_BGR bgr; +@@ -1461,7 +1461,7 @@ + } + } + } +- } else if (bpp == 32) { ++ } else if (dst_bpp == 32) { + FILE_BGRA bgra; + for(unsigned y = 0; y < dst_height; y++) { + BYTE *line = FreeImage_GetScanLine(dib, y); +diff -uNr FreeImage.orig/Source/FreeImage/PluginDDS.cpp FreeImage/Source/FreeImage/PluginDDS.cpp +--- FreeImage.orig/Source/FreeImage/PluginDDS.cpp 2018-07-31 17:04:58.000000000 +0200 ++++ FreeImage/Source/FreeImage/PluginDDS.cpp 2019-08-31 16:00:39.213465120 +0200 +@@ -356,14 +356,6 @@ + for(int i=0; i<11; i++) { + SwapLong(&header->surfaceDesc.dwReserved1[i]); + } +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwSize); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwFlags); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwFourCC); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBBitCount); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRBitMask); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwGBitMask); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwBBitMask); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask); + SwapLong(&header->surfaceDesc.ddsCaps.dwCaps1); + SwapLong(&header->surfaceDesc.ddsCaps.dwCaps2); + SwapLong(&header->surfaceDesc.ddsCaps.dwReserved[0]); diff --git a/buildroot/package/libfreeimage/0004-fix-gcc-6.patch b/buildroot/package/libfreeimage/0004-fix-gcc-6.patch deleted file mode 100644 index 0f10dec71..000000000 --- a/buildroot/package/libfreeimage/0004-fix-gcc-6.patch +++ /dev/null @@ -1,31 +0,0 @@ -libraw/dc_raw: fix gcc-6 failures - -With gcc-6, it is no longer allowed to narrow the type of constants in -a constant array declaration. - -Fixes: - http://autobuild.buildroot.org/results/081/0811531872f69f9febbdc482dfbdd7fb5c35d1c8/build-end.log - -Signed-off-by: "Yann E. MORIN" - -diff -durN a/Source/LibRawLite/internal/dcraw_common.cpp b/Source/LibRawLite/internal/dcraw_common.cpp ---- a/Source/LibRawLite/internal/dcraw_common.cpp -+++ b/Source/LibRawLite/internal/dcraw_common.cpp -@@ -2479,7 +2479,7 @@ - - void CLASS kodak_radc_load_raw() - { -- static const char src[] = { -+ static const signed char src[] = { - 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8, - 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8, - 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8, -@@ -4519,7 +4519,7 @@ - */ - void CLASS vng_interpolate() - { -- static const signed char *cp, terms[] = { -+ static const int *cp, terms[] = { - -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01, - -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01, - -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03, diff --git a/buildroot/package/libfreeimage/0005-Manage-powf64-with-glibc.patch b/buildroot/package/libfreeimage/0005-Manage-powf64-with-glibc.patch deleted file mode 100644 index 948ba06eb..000000000 --- a/buildroot/package/libfreeimage/0005-Manage-powf64-with-glibc.patch +++ /dev/null @@ -1,725 +0,0 @@ -From d8f40eabb25953bff5d90017478dc59d586346d1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 3 May 2018 15:44:14 +0200 -Subject: [PATCH] Manage powf64 with glibc - -powf64 is now included in latest version of glibc so rename powf64 into -powf_64 - -Signed-off-by: Fabrice Fontaine ---- - Source/LibRawLite/dcraw/dcraw.c | 108 ++++++++++++++-------------- - Source/LibRawLite/internal/dcraw_common.cpp | 108 ++++++++++++++-------------- - 2 files changed, 108 insertions(+), 108 deletions(-) - -diff --git a/Source/LibRawLite/dcraw/dcraw.c b/Source/LibRawLite/dcraw/dcraw.c -index 6bf607d..3e52cec 100644 ---- a/Source/LibRawLite/dcraw/dcraw.c -+++ b/Source/LibRawLite/dcraw/dcraw.c -@@ -6727,7 +6727,7 @@ static float powf_lim(float a, float b, float limup) - { - return (b>limup || b < -limup)?0.f:powf(a,b); - } --static float powf64(float a, float b) -+static float powf_64(float a, float b) - { - return powf_lim(a,b,64.f); - } -@@ -6764,7 +6764,7 @@ static float _CanonConvert2EV(short in) - static float _CanonConvertAperture(short in) - { - if (in == (short)0xffe0) return 0.0f; -- else return powf64(2.0f, _CanonConvert2EV(in) / 2.0f); -+ else return powf_64(2.0f, _CanonConvert2EV(in) / 2.0f); - } - - void CLASS setCanonBodyFeatures (unsigned id) -@@ -7046,15 +7046,15 @@ void CLASS processNikonLensData (uchar *LensData, unsigned len) - imgdata.lens.nikon.NikonLensIDNumber = LensData[i]; - imgdata.lens.nikon.NikonLensFStops = LensData[i + 1]; - imgdata.lens.makernotes.LensFStops = (float)imgdata.lens.nikon.NikonLensFStops /12.0f; -- imgdata.lens.makernotes.MinFocal = 5.0f * powf64(2.0f, (float)LensData[i + 2] / 24.0f); -- imgdata.lens.makernotes.MaxFocal = 5.0f * powf64(2.0f, (float)LensData[i + 3] / 24.0f); -- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(2.0f, (float)LensData[i + 4] / 24.0f); -- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(2.0f, (float)LensData[i + 5] / 24.0f); -+ imgdata.lens.makernotes.MinFocal = 5.0f * powf_64(2.0f, (float)LensData[i + 2] / 24.0f); -+ imgdata.lens.makernotes.MaxFocal = 5.0f * powf_64(2.0f, (float)LensData[i + 3] / 24.0f); -+ imgdata.lens.makernotes.MaxAp4MinFocal = powf_64(2.0f, (float)LensData[i + 4] / 24.0f); -+ imgdata.lens.makernotes.MaxAp4MaxFocal = powf_64(2.0f, (float)LensData[i + 5] / 24.0f); - imgdata.lens.nikon.NikonMCUVersion = LensData[i + 6]; - if (i != 2) - { -- imgdata.lens.makernotes.CurFocal = 5.0f * powf64(2.0f, (float)LensData[i - 1] / 24.0f); -- imgdata.lens.nikon.NikonEffectiveMaxAp = powf64(2.0f, (float)LensData[i + 7] / 24.0f); -+ imgdata.lens.makernotes.CurFocal = 5.0f * powf_64(2.0f, (float)LensData[i - 1] / 24.0f); -+ imgdata.lens.nikon.NikonEffectiveMaxAp = powf_64(2.0f, (float)LensData[i + 7] / 24.0f); - } - imgdata.lens.makernotes.LensID = - (unsigned long long) LensData[i] << 56 | -@@ -7563,11 +7563,11 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id) - { - if (buf[0]) - imgdata.lens.makernotes.MaxAp = -- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; -+ my_roundf(powf_64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; - - if (buf[1]) - imgdata.lens.makernotes.MinAp = -- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; -+ my_roundf(powf_64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; - } - - if (imgdata.lens.makernotes.CameraMount != LIBRAW_MOUNT_FixedLens) -@@ -7577,7 +7577,7 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id) - lid = SonySubstitution[buf[0x3d]] << 8 | - SonySubstitution[buf[0x3c]]; - imgdata.lens.makernotes.CurAp = -- powf64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f); -+ powf_64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f); - } - if (buf[0x105] && (imgdata.lens.makernotes.LensMount != LIBRAW_MOUNT_Canon_EF)) - imgdata.lens.makernotes.LensMount = -@@ -7957,7 +7957,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - { - unsigned char cc; - fread(&cc, 1, 1, ifp); -- iso_speed = (int)(100.0 * powf64(2.0, (double)(cc) / 12.0 - 5.0)); -+ iso_speed = (int)(100.0 * powf_64(2.0, (double)(cc) / 12.0 - 5.0)); - break; - } - } -@@ -7989,7 +7989,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - } - break; - case 0x1002: -- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2); -+ imgdata.lens.makernotes.CurAp = powf_64(2.0f, getreal(type)/2); - break; - case 0x20100201: - imgdata.lens.makernotes.LensID = -@@ -8009,10 +8009,10 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - fread(imgdata.lens.makernotes.Lens, len, 1, ifp); - break; - case 0x20100205: -- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MinFocal = powf_64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100206: -- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MaxFocal = powf_64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100207: - imgdata.lens.makernotes.MinFocal = (float)get2(); -@@ -8023,7 +8023,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal; - break; - case 0x2010020a: -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100301: - imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8; -@@ -8121,13 +8121,13 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - if (table_buf[iLensData+9] && - (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f)) - imgdata.lens.makernotes.CurFocal = -- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2); -+ 10*(table_buf[iLensData+9]>>2) * powf_64(4, (table_buf[iLensData+9] & 0x03)-2); - if (table_buf[iLensData+10] & 0xf0) - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); - if (table_buf[iLensData+10] & 0x0f) - imgdata.lens.makernotes.MinAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); - if ( - (imgdata.lens.makernotes.CamID != 0x12e6c) && // K-r - (imgdata.lens.makernotes.CamID != 0x12e76) && // K-5 -@@ -8148,14 +8148,14 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - if ((table_buf[iLensData+14] > 1) && - (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); - } - else if ((imgdata.lens.makernotes.CamID != 0x12e76) && // K-5 - (table_buf[iLensData+15] > 1) && - (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) - { - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); - } - } - free(table_buf); -@@ -8321,7 +8321,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - lid = (((ushort)table_buf[2])<<8) | - ((ushort)table_buf[3]); - imgdata.lens.makernotes.CurAp = -- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); -+ powf_64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); - } - break; - case 1536: -@@ -8801,7 +8801,7 @@ void CLASS parse_makernote (int base, int uptag) - } - break; - case 0x1002: -- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2); -+ imgdata.lens.makernotes.CurAp = powf_64(2.0f, getreal(type)/2); - break; - case 0x20100201: - imgdata.lens.makernotes.LensID = -@@ -8821,10 +8821,10 @@ void CLASS parse_makernote (int base, int uptag) - fread(imgdata.lens.makernotes.Lens, len, 1, ifp); - break; - case 0x20100205: -- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MinFocal = powf_64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100206: -- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MaxFocal = powf_64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100207: - imgdata.lens.makernotes.MinFocal = (float)get2(); -@@ -8835,7 +8835,7 @@ void CLASS parse_makernote (int base, int uptag) - imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal; - break; - case 0x2010020a: -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100301: - imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8; -@@ -8993,13 +8993,13 @@ void CLASS parse_makernote (int base, int uptag) - { - if (table_buf[iLensData+9] && (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f)) - imgdata.lens.makernotes.CurFocal = -- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2); -+ 10*(table_buf[iLensData+9]>>2) * powf_64(4, (table_buf[iLensData+9] & 0x03)-2); - if (table_buf[iLensData+10] & 0xf0) - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); - if (table_buf[iLensData+10] & 0x0f) - imgdata.lens.makernotes.MinAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); - if ( - (imgdata.lens.makernotes.CamID != 0x12e6c) && // K-r - (imgdata.lens.makernotes.CamID != 0x12e76) && // K-5 -@@ -9020,14 +9020,14 @@ void CLASS parse_makernote (int base, int uptag) - if ((table_buf[iLensData+14] > 1) && - (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); - } - else if ((imgdata.lens.makernotes.CamID != 0x12e76) && // K-5 - (table_buf[iLensData+15] > 1) && - (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) - { - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); - } - } - free(table_buf); -@@ -9188,7 +9188,7 @@ void CLASS parse_makernote (int base, int uptag) - lid = (((ushort)table_buf[2])<<8) | - ((ushort)table_buf[3]); - imgdata.lens.makernotes.CurAp = -- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); -+ powf_64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); - } - break; - case 1536: -@@ -9273,15 +9273,15 @@ void CLASS parse_makernote (int base, int uptag) - { - unsigned char cc; - fread(&cc,1,1,ifp); -- iso_speed = int(100.0 * powf64(2.0f,float(cc)/12.0-5.0)); -+ iso_speed = int(100.0 * powf_64(2.0f,float(cc)/12.0-5.0)); - } - if (tag == 4 && len > 26 && len < 35) { - if ((i=(get4(),get2())) != 0x7fff && (!iso_speed || iso_speed == 65535)) -- iso_speed = 50 * powf64(2.0, i/32.0 - 4); -+ iso_speed = 50 * powf_64(2.0, i/32.0 - 4); - if ((i=(get2(),get2())) != 0x7fff && !aperture) -- aperture = powf64(2.0, i/64.0); -+ aperture = powf_64(2.0, i/64.0); - if ((i=get2()) != 0xffff && !shutter) -- shutter = powf64(2.0, (short) i/-32.0); -+ shutter = powf_64(2.0, (short) i/-32.0); - wbi = (get2(),get2()); - shot_order = (get2(),get2()); - } -@@ -9732,7 +9732,7 @@ void CLASS parse_exif (int base) - imgdata.lens.Lens[0] = 0; - break; - case 0x9205: -- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.EXIF_MaxAp = powf_64(2.0f, (getreal(type) / 2.0f)); - break; - #endif - case 33434: shutter = getreal(type); break; -@@ -9745,10 +9745,10 @@ void CLASS parse_exif (int base) - case 36867: - case 36868: get_timestamp(0); break; - case 37377: if ((expo = -getreal(type)) < 128 && shutter == 0.) -- shutter = powf64(2.0, expo); break; -+ shutter = powf_64(2.0, expo); break; - case 37378: - if (fabs(ape = getreal(type))<256.0) -- aperture = powf64(2.0, ape/2); -+ aperture = powf_64(2.0, ape/2); - break; - case 37385: flash_used = getreal(type); break; - case 37386: focal_len = getreal(type); break; -@@ -10361,7 +10361,7 @@ int CLASS parse_tiff_ifd (int base) - imgdata.lens.Lens[0] = 0; - break; - case 0x9205: -- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.EXIF_MaxAp = powf_64(2.0f, (getreal(type) / 2.0f)); - break; - // IB end - #endif -@@ -11130,22 +11130,22 @@ void CLASS parse_ciff (int offset, int length, int depth) - thumb_length = len; - } - if (type == 0x1818) { -- shutter = powf64(2.0f, -int_to_float((get4(),get4()))); -- aperture = powf64(2.0f, int_to_float(get4())/2); -+ shutter = powf_64(2.0f, -int_to_float((get4(),get4()))); -+ aperture = powf_64(2.0f, int_to_float(get4())/2); - #ifdef LIBRAW_LIBRARY_BUILD - imgdata.lens.makernotes.CurAp = aperture; - #endif - } - if (type == 0x102a) { - // iso_speed = pow (2.0, (get4(),get2())/32.0 - 4) * 50; -- iso_speed = powf64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f; -+ iso_speed = powf_64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f; - #ifdef LIBRAW_LIBRARY_BUILD - aperture = _CanonConvertAperture((get2(),get2())); - imgdata.lens.makernotes.CurAp = aperture; - #else -- aperture = powf64(2.0, (get2(),(short)get2())/64.0); -+ aperture = powf_64(2.0, (get2(),(short)get2())/64.0); - #endif -- shutter = powf64(2.0,-((short)get2())/32.0); -+ shutter = powf_64(2.0,-((short)get2())/32.0); - wbi = (get2(),get2()); - if (wbi > 17) wbi = 0; - fseek (ifp, 32, SEEK_CUR); -@@ -11349,8 +11349,8 @@ void CLASS parse_phase_one (int base) - setPhaseOneFeatures(unique_id); - break; - case 0x0401: -- if (type == 4) imgdata.lens.makernotes.CurAp = powf64(2.0f, (int_to_float(data)/2.0f)); -- else imgdata.lens.makernotes.CurAp = powf64(2.0f, (getreal(type)/2.0f)); -+ if (type == 4) imgdata.lens.makernotes.CurAp = powf_64(2.0f, (int_to_float(data)/2.0f)); -+ else imgdata.lens.makernotes.CurAp = powf_64(2.0f, (getreal(type)/2.0f)); - break; - case 0x0403: - if (type == 4) imgdata.lens.makernotes.CurFocal = int_to_float(data); -@@ -11364,16 +11364,16 @@ void CLASS parse_phase_one (int base) - break; - case 0x0414: - if (type == 4) { -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f)); -+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(2.0f, (int_to_float(data)/2.0f)); - } else { -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(2.0f, (getreal(type) / 2.0f)); - } - break; - case 0x0415: - if (type == 4) { -- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f)); -+ imgdata.lens.makernotes.MinAp4CurFocal = powf_64(2.0f, (int_to_float(data)/2.0f)); - } else { -- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.makernotes.MinAp4CurFocal = powf_64(2.0f, (getreal(type) / 2.0f)); - } - break; - case 0x0416: -@@ -13324,15 +13324,15 @@ void CLASS identify() - case 18: iso_speed = 320; break; - case 19: iso_speed = 400; break; - } -- shutter = powf64(2.0f, (((float)get4())/8.0f)) / 16000.0f; -+ shutter = powf_64(2.0f, (((float)get4())/8.0f)) / 16000.0f; - FORC4 cam_mul[c ^ (c >> 1)] = get4(); - fseek (ifp, 88, SEEK_SET); -- aperture = powf64(2.0f, ((float)get4())/16.0f); -+ aperture = powf_64(2.0f, ((float)get4())/16.0f); - fseek (ifp, 112, SEEK_SET); - focal_len = get4(); - #ifdef LIBRAW_LIBRARY_BUILD - fseek (ifp, 104, SEEK_SET); -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, ((float)get4())/16.0f); -+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(2.0f, ((float)get4())/16.0f); - fseek (ifp, 124, SEEK_SET); - fread(imgdata.lens.makernotes.Lens, 32, 1, ifp); - imgdata.lens.makernotes.CameraMount = LIBRAW_MOUNT_Contax_N; -diff --git a/Source/LibRawLite/internal/dcraw_common.cpp b/Source/LibRawLite/internal/dcraw_common.cpp -index a936a93..0fc4d81 100644 ---- a/Source/LibRawLite/internal/dcraw_common.cpp -+++ b/Source/LibRawLite/internal/dcraw_common.cpp -@@ -5543,7 +5543,7 @@ static float powf_lim(float a, float b, float limup) - { - return (b>limup || b < -limup)?0.f:powf(a,b); - } --static float powf64(float a, float b) -+static float powf_64(float a, float b) - { - return powf_lim(a,b,64.f); - } -@@ -5580,7 +5580,7 @@ static float _CanonConvert2EV(short in) - static float _CanonConvertAperture(short in) - { - if (in == (short)0xffe0) return 0.0f; -- else return powf64(2.0f, _CanonConvert2EV(in) / 2.0f); -+ else return powf_64(2.0f, _CanonConvert2EV(in) / 2.0f); - } - - void CLASS setCanonBodyFeatures (unsigned id) -@@ -5862,15 +5862,15 @@ void CLASS processNikonLensData (uchar *LensData, unsigned len) - imgdata.lens.nikon.NikonLensIDNumber = LensData[i]; - imgdata.lens.nikon.NikonLensFStops = LensData[i + 1]; - imgdata.lens.makernotes.LensFStops = (float)imgdata.lens.nikon.NikonLensFStops /12.0f; -- imgdata.lens.makernotes.MinFocal = 5.0f * powf64(2.0f, (float)LensData[i + 2] / 24.0f); -- imgdata.lens.makernotes.MaxFocal = 5.0f * powf64(2.0f, (float)LensData[i + 3] / 24.0f); -- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(2.0f, (float)LensData[i + 4] / 24.0f); -- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(2.0f, (float)LensData[i + 5] / 24.0f); -+ imgdata.lens.makernotes.MinFocal = 5.0f * powf_64(2.0f, (float)LensData[i + 2] / 24.0f); -+ imgdata.lens.makernotes.MaxFocal = 5.0f * powf_64(2.0f, (float)LensData[i + 3] / 24.0f); -+ imgdata.lens.makernotes.MaxAp4MinFocal = powf_64(2.0f, (float)LensData[i + 4] / 24.0f); -+ imgdata.lens.makernotes.MaxAp4MaxFocal = powf_64(2.0f, (float)LensData[i + 5] / 24.0f); - imgdata.lens.nikon.NikonMCUVersion = LensData[i + 6]; - if (i != 2) - { -- imgdata.lens.makernotes.CurFocal = 5.0f * powf64(2.0f, (float)LensData[i - 1] / 24.0f); -- imgdata.lens.nikon.NikonEffectiveMaxAp = powf64(2.0f, (float)LensData[i + 7] / 24.0f); -+ imgdata.lens.makernotes.CurFocal = 5.0f * powf_64(2.0f, (float)LensData[i - 1] / 24.0f); -+ imgdata.lens.nikon.NikonEffectiveMaxAp = powf_64(2.0f, (float)LensData[i + 7] / 24.0f); - } - imgdata.lens.makernotes.LensID = - (unsigned long long) LensData[i] << 56 | -@@ -6379,11 +6379,11 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id) - { - if (buf[0]) - imgdata.lens.makernotes.MaxAp = -- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; -+ my_roundf(powf_64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; - - if (buf[1]) - imgdata.lens.makernotes.MinAp = -- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; -+ my_roundf(powf_64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; - } - - if (imgdata.lens.makernotes.CameraMount != LIBRAW_MOUNT_FixedLens) -@@ -6393,7 +6393,7 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id) - lid = SonySubstitution[buf[0x3d]] << 8 | - SonySubstitution[buf[0x3c]]; - imgdata.lens.makernotes.CurAp = -- powf64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f); -+ powf_64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f); - } - if (buf[0x105] && (imgdata.lens.makernotes.LensMount != LIBRAW_MOUNT_Canon_EF)) - imgdata.lens.makernotes.LensMount = -@@ -6773,7 +6773,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - { - unsigned char cc; - fread(&cc, 1, 1, ifp); -- iso_speed = (int)(100.0 * powf64(2.0, (double)(cc) / 12.0 - 5.0)); -+ iso_speed = (int)(100.0 * powf_64(2.0, (double)(cc) / 12.0 - 5.0)); - break; - } - } -@@ -6805,7 +6805,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - } - break; - case 0x1002: -- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2); -+ imgdata.lens.makernotes.CurAp = powf_64(2.0f, getreal(type)/2); - break; - case 0x20100201: - imgdata.lens.makernotes.LensID = -@@ -6825,10 +6825,10 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - fread(imgdata.lens.makernotes.Lens, len, 1, ifp); - break; - case 0x20100205: -- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MinFocal = powf_64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100206: -- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MaxFocal = powf_64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100207: - imgdata.lens.makernotes.MinFocal = (float)get2(); -@@ -6839,7 +6839,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal; - break; - case 0x2010020a: -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100301: - imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8; -@@ -6937,13 +6937,13 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - if (table_buf[iLensData+9] && - (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f)) - imgdata.lens.makernotes.CurFocal = -- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2); -+ 10*(table_buf[iLensData+9]>>2) * powf_64(4, (table_buf[iLensData+9] & 0x03)-2); - if (table_buf[iLensData+10] & 0xf0) - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); - if (table_buf[iLensData+10] & 0x0f) - imgdata.lens.makernotes.MinAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); - if ( - (imgdata.lens.makernotes.CamID != 0x12e6c) && // K-r - (imgdata.lens.makernotes.CamID != 0x12e76) && // K-5 -@@ -6964,14 +6964,14 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - if ((table_buf[iLensData+14] > 1) && - (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); - } - else if ((imgdata.lens.makernotes.CamID != 0x12e76) && // K-5 - (table_buf[iLensData+15] > 1) && - (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) - { - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); - } - } - free(table_buf); -@@ -7137,7 +7137,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - lid = (((ushort)table_buf[2])<<8) | - ((ushort)table_buf[3]); - imgdata.lens.makernotes.CurAp = -- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); -+ powf_64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); - } - break; - case 1536: -@@ -7617,7 +7617,7 @@ void CLASS parse_makernote (int base, int uptag) - } - break; - case 0x1002: -- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2); -+ imgdata.lens.makernotes.CurAp = powf_64(2.0f, getreal(type)/2); - break; - case 0x20100201: - imgdata.lens.makernotes.LensID = -@@ -7637,10 +7637,10 @@ void CLASS parse_makernote (int base, int uptag) - fread(imgdata.lens.makernotes.Lens, len, 1, ifp); - break; - case 0x20100205: -- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MinFocal = powf_64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100206: -- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MaxFocal = powf_64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100207: - imgdata.lens.makernotes.MinFocal = (float)get2(); -@@ -7651,7 +7651,7 @@ void CLASS parse_makernote (int base, int uptag) - imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal; - break; - case 0x2010020a: -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100301: - imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8; -@@ -7809,13 +7809,13 @@ void CLASS parse_makernote (int base, int uptag) - { - if (table_buf[iLensData+9] && (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f)) - imgdata.lens.makernotes.CurFocal = -- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2); -+ 10*(table_buf[iLensData+9]>>2) * powf_64(4, (table_buf[iLensData+9] & 0x03)-2); - if (table_buf[iLensData+10] & 0xf0) - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); - if (table_buf[iLensData+10] & 0x0f) - imgdata.lens.makernotes.MinAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); - if ( - (imgdata.lens.makernotes.CamID != 0x12e6c) && // K-r - (imgdata.lens.makernotes.CamID != 0x12e76) && // K-5 -@@ -7836,14 +7836,14 @@ void CLASS parse_makernote (int base, int uptag) - if ((table_buf[iLensData+14] > 1) && - (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); - } - else if ((imgdata.lens.makernotes.CamID != 0x12e76) && // K-5 - (table_buf[iLensData+15] > 1) && - (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) - { - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); -+ powf_64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); - } - } - free(table_buf); -@@ -8004,7 +8004,7 @@ void CLASS parse_makernote (int base, int uptag) - lid = (((ushort)table_buf[2])<<8) | - ((ushort)table_buf[3]); - imgdata.lens.makernotes.CurAp = -- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); -+ powf_64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); - } - break; - case 1536: -@@ -8089,15 +8089,15 @@ void CLASS parse_makernote (int base, int uptag) - { - unsigned char cc; - fread(&cc,1,1,ifp); -- iso_speed = int(100.0 * powf64(2.0f,float(cc)/12.0-5.0)); -+ iso_speed = int(100.0 * powf_64(2.0f,float(cc)/12.0-5.0)); - } - if (tag == 4 && len > 26 && len < 35) { - if ((i=(get4(),get2())) != 0x7fff && (!iso_speed || iso_speed == 65535)) -- iso_speed = 50 * powf64(2.0, i/32.0 - 4); -+ iso_speed = 50 * powf_64(2.0, i/32.0 - 4); - if ((i=(get2(),get2())) != 0x7fff && !aperture) -- aperture = powf64(2.0, i/64.0); -+ aperture = powf_64(2.0, i/64.0); - if ((i=get2()) != 0xffff && !shutter) -- shutter = powf64(2.0, (short) i/-32.0); -+ shutter = powf_64(2.0, (short) i/-32.0); - wbi = (get2(),get2()); - shot_order = (get2(),get2()); - } -@@ -8548,7 +8548,7 @@ void CLASS parse_exif (int base) - imgdata.lens.Lens[0] = 0; - break; - case 0x9205: -- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.EXIF_MaxAp = powf_64(2.0f, (getreal(type) / 2.0f)); - break; - #endif - case 33434: shutter = getreal(type); break; -@@ -8561,10 +8561,10 @@ void CLASS parse_exif (int base) - case 36867: - case 36868: get_timestamp(0); break; - case 37377: if ((expo = -getreal(type)) < 128 && shutter == 0.) -- shutter = powf64(2.0, expo); break; -+ shutter = powf_64(2.0, expo); break; - case 37378: - if (fabs(ape = getreal(type))<256.0) -- aperture = powf64(2.0, ape/2); -+ aperture = powf_64(2.0, ape/2); - break; - case 37385: flash_used = getreal(type); break; - case 37386: focal_len = getreal(type); break; -@@ -9171,7 +9171,7 @@ int CLASS parse_tiff_ifd (int base) - imgdata.lens.Lens[0] = 0; - break; - case 0x9205: -- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.EXIF_MaxAp = powf_64(2.0f, (getreal(type) / 2.0f)); - break; - // IB end - #endif -@@ -9940,22 +9940,22 @@ void CLASS parse_ciff (int offset, int length, int depth) - thumb_length = len; - } - if (type == 0x1818) { -- shutter = powf64(2.0f, -int_to_float((get4(),get4()))); -- aperture = powf64(2.0f, int_to_float(get4())/2); -+ shutter = powf_64(2.0f, -int_to_float((get4(),get4()))); -+ aperture = powf_64(2.0f, int_to_float(get4())/2); - #ifdef LIBRAW_LIBRARY_BUILD - imgdata.lens.makernotes.CurAp = aperture; - #endif - } - if (type == 0x102a) { - // iso_speed = pow (2.0, (get4(),get2())/32.0 - 4) * 50; -- iso_speed = powf64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f; -+ iso_speed = powf_64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f; - #ifdef LIBRAW_LIBRARY_BUILD - aperture = _CanonConvertAperture((get2(),get2())); - imgdata.lens.makernotes.CurAp = aperture; - #else -- aperture = powf64(2.0, (get2(),(short)get2())/64.0); -+ aperture = powf_64(2.0, (get2(),(short)get2())/64.0); - #endif -- shutter = powf64(2.0,-((short)get2())/32.0); -+ shutter = powf_64(2.0,-((short)get2())/32.0); - wbi = (get2(),get2()); - if (wbi > 17) wbi = 0; - fseek (ifp, 32, SEEK_CUR); -@@ -10159,8 +10159,8 @@ void CLASS parse_phase_one (int base) - setPhaseOneFeatures(unique_id); - break; - case 0x0401: -- if (type == 4) imgdata.lens.makernotes.CurAp = powf64(2.0f, (int_to_float(data)/2.0f)); -- else imgdata.lens.makernotes.CurAp = powf64(2.0f, (getreal(type)/2.0f)); -+ if (type == 4) imgdata.lens.makernotes.CurAp = powf_64(2.0f, (int_to_float(data)/2.0f)); -+ else imgdata.lens.makernotes.CurAp = powf_64(2.0f, (getreal(type)/2.0f)); - break; - case 0x0403: - if (type == 4) imgdata.lens.makernotes.CurFocal = int_to_float(data); -@@ -10174,16 +10174,16 @@ void CLASS parse_phase_one (int base) - break; - case 0x0414: - if (type == 4) { -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f)); -+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(2.0f, (int_to_float(data)/2.0f)); - } else { -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(2.0f, (getreal(type) / 2.0f)); - } - break; - case 0x0415: - if (type == 4) { -- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f)); -+ imgdata.lens.makernotes.MinAp4CurFocal = powf_64(2.0f, (int_to_float(data)/2.0f)); - } else { -- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.makernotes.MinAp4CurFocal = powf_64(2.0f, (getreal(type) / 2.0f)); - } - break; - case 0x0416: -@@ -11996,15 +11996,15 @@ void CLASS identify() - case 18: iso_speed = 320; break; - case 19: iso_speed = 400; break; - } -- shutter = powf64(2.0f, (((float)get4())/8.0f)) / 16000.0f; -+ shutter = powf_64(2.0f, (((float)get4())/8.0f)) / 16000.0f; - FORC4 cam_mul[c ^ (c >> 1)] = get4(); - fseek (ifp, 88, SEEK_SET); -- aperture = powf64(2.0f, ((float)get4())/16.0f); -+ aperture = powf_64(2.0f, ((float)get4())/16.0f); - fseek (ifp, 112, SEEK_SET); - focal_len = get4(); - #ifdef LIBRAW_LIBRARY_BUILD - fseek (ifp, 104, SEEK_SET); -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, ((float)get4())/16.0f); -+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(2.0f, ((float)get4())/16.0f); - fseek (ifp, 124, SEEK_SET); - fread(imgdata.lens.makernotes.Lens, 32, 1, ifp); - imgdata.lens.makernotes.CameraMount = LIBRAW_MOUNT_Contax_N; --- -2.14.1 - diff --git a/buildroot/package/libfreeimage/libfreeimage.hash b/buildroot/package/libfreeimage/libfreeimage.hash index eded0297e..6d8ba2040 100644 --- a/buildroot/package/libfreeimage/libfreeimage.hash +++ b/buildroot/package/libfreeimage/libfreeimage.hash @@ -1,5 +1,9 @@ +# From https://sourceforge.net/projects/freeimage/files/Source%20Distribution/3.18.0/ +md5 f8ba138a3be233a3eed9c456e42e2578 FreeImage3180.zip +sha1 38daa9d8f1bca2330a2eaa42ec66fbe6ede7dce9 FreeImage3180.zip + # Locally computed -sha256 fbfc65e39b3d4e2cb108c4ffa8c41fd02c07d4d436c594fff8dab1a6d5297f89 FreeImage3170.zip +sha256 f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd FreeImage3180.zip sha256 d51615a1a47f1ddbb027920d60d3fc30a00e1284c795a47857883e641349fadf license-gplv2.txt sha256 084be110e3e8757d8e6945cda1fbc7e5073bbe688dc19b92c0d8440155d8e282 license-gplv3.txt sha256 0bb9a3123297c73ae6e19c70459fb0e58f313f67ca63176fd43f8e77668b8243 license-fi.txt diff --git a/buildroot/package/libfreeimage/libfreeimage.mk b/buildroot/package/libfreeimage/libfreeimage.mk index e0aa1f0ae..b254fa884 100644 --- a/buildroot/package/libfreeimage/libfreeimage.mk +++ b/buildroot/package/libfreeimage/libfreeimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFREEIMAGE_VERSION = 3.17.0 +LIBFREEIMAGE_VERSION = 3.18.0 LIBFREEIMAGE_SITE = http://downloads.sourceforge.net/freeimage LIBFREEIMAGE_SOURCE = FreeImage$(subst .,,$(LIBFREEIMAGE_VERSION)).zip LIBFREEIMAGE_LICENSE = GPL-2.0 or GPL-3.0 or FreeImage Public License diff --git a/buildroot/package/libfribidi/0001-Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.patch b/buildroot/package/libfribidi/0001-Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.patch new file mode 100644 index 000000000..b78f9b211 --- /dev/null +++ b/buildroot/package/libfribidi/0001-Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.patch @@ -0,0 +1,30 @@ +From 034c6e9a1d296286305f4cfd1e0072b879f52568 Mon Sep 17 00:00:00 2001 +From: Dov Grobgeld +Date: Thu, 24 Oct 2019 09:37:29 +0300 +Subject: [PATCH] Truncate isolate_level to FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL + +CVE-2019-18397 + +Signed-off-by: Peter Korsgaard +--- + lib/fribidi-bidi.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/fribidi-bidi.c b/lib/fribidi-bidi.c +index 6c84392..d384878 100644 +--- a/lib/fribidi-bidi.c ++++ b/lib/fribidi-bidi.c +@@ -747,7 +747,9 @@ fribidi_get_par_embedding_levels_ex ( + } + + RL_LEVEL (pp) = level; +- RL_ISOLATE_LEVEL (pp) = isolate_level++; ++ RL_ISOLATE_LEVEL (pp) = isolate_level; ++ if (isolate_level < FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL-1) ++ isolate_level++; + base_level_per_iso_level[isolate_level] = new_level; + + if (!FRIBIDI_IS_NEUTRAL (override)) +-- +2.20.1 + diff --git a/buildroot/package/libfribidi/libfribidi.hash b/buildroot/package/libfribidi/libfribidi.hash index 79b5dd318..eba767668 100644 --- a/buildroot/package/libfribidi/libfribidi.hash +++ b/buildroot/package/libfribidi/libfribidi.hash @@ -1,2 +1,3 @@ -# From http://www.fribidi.org/download/fribidi-0.19.7.tar.bz2.sha256 -sha256 08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e fribidi-0.19.7.tar.bz2 +# Locally computed +sha256 5ab5f21e9f2fc57b4b40f8ea8f14dba78a5cc46d9cf94bc5e00a58e6886a935d fribidi-1.0.7.tar.bz2 +sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/buildroot/package/libfribidi/libfribidi.mk b/buildroot/package/libfribidi/libfribidi.mk index a7a851918..0e17be6db 100644 --- a/buildroot/package/libfribidi/libfribidi.mk +++ b/buildroot/package/libfribidi/libfribidi.mk @@ -4,19 +4,13 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 0.19.7 +LIBFRIBIDI_VERSION = 1.0.7 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.bz2 -LIBFRIBIDI_SITE = http://www.fribidi.org/download +LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ LIBFRIBIDI_LICENSE_FILES = COPYING LIBFRIBIDI_INSTALL_STAGING = YES -# Ships a beta libtool version hence our patch doesn't apply. -# Run autoreconf to regenerate ltmain.sh. -LIBFRIBIDI_AUTORECONF = YES LIBFRIBIDI_DEPENDENCIES = host-pkgconf -# libglib2 dependency causes a build failure, and this optional -# dependency is going to be removed upstream, see -# https://github.com/behdad/fribidi/pull/14 -LIBFRIBIDI_CONF_OPTS = --with-glib=no $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/libftdi1/0003-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch b/buildroot/package/libftdi1/0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch similarity index 100% rename from buildroot/package/libftdi1/0003-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch rename to buildroot/package/libftdi1/0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch diff --git a/buildroot/package/libftdi1/0002-cmake-fix-FindUSB1.cmake.patch b/buildroot/package/libftdi1/0002-cmake-fix-FindUSB1.cmake.patch deleted file mode 100644 index 5619a0cee..000000000 --- a/buildroot/package/libftdi1/0002-cmake-fix-FindUSB1.cmake.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 81275d75ae88fe8ab1915d3ba260ea935e63c362 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 25 Jan 2015 10:01:17 +0100 -Subject: [PATCH 2/2] cmake: fix FindUSB1.cmake - -Make sure all ldflags are correctly set, especially for static build. - -Signed-off-by: Samuel Martin ---- - cmake/FindUSB1.cmake | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/cmake/FindUSB1.cmake b/cmake/FindUSB1.cmake -index b90e297..e7f1b3c 100644 ---- a/cmake/FindUSB1.cmake -+++ b/cmake/FindUSB1.cmake -@@ -26,8 +26,12 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) - PATH_SUFFIXES libusb-1.0 - PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) - -- FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0 -- PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) -+ set(LIBUSB_LIBRARIES ${PC_LIBUSB_STATIC_LDFLAGS} ${PC_LIBUSB_STATIC_LDFLAGS_OTHER}) -+ foreach(libname ${PC_LIBUSB_STATIC_LIBRARIES}) -+ FIND_LIBRARY(lib NAMES ${libname} -+ PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) -+ list(APPEND LIBUSB_LIBRARIES ${lib}) -+ endforeach() - - include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) --- -2.2.2 - diff --git a/buildroot/package/libftdi1/0004-cmake-find-swig.patch b/buildroot/package/libftdi1/0003-cmake-find-swig.patch similarity index 100% rename from buildroot/package/libftdi1/0004-cmake-find-swig.patch rename to buildroot/package/libftdi1/0003-cmake-find-swig.patch diff --git a/buildroot/package/libftdi1/0004-CMake-reorder-Python-detection.patch b/buildroot/package/libftdi1/0004-CMake-reorder-Python-detection.patch new file mode 100644 index 000000000..c6c2b28c4 --- /dev/null +++ b/buildroot/package/libftdi1/0004-CMake-reorder-Python-detection.patch @@ -0,0 +1,32 @@ +From 640c2b3c0c72d5194d422ff7dda086c4533fba00 Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Mon, 13 Jan 2020 14:08:44 +0100 +Subject: [PATCH] CMake: reorder Python detection + +PythonInterp should be detected before PythonLibs otherwise +CMake exits with the following message: + +Could NOT find PythonLibs (missing: PYTHON_LIBRARIES PYTHON_INCLUDE_DIRS) + +Signed-off-by: Yegor Yefremov +--- + python/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 90811ca..368bb7e 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -12,8 +12,8 @@ if ( PYTHON_BINDINGS ) + set ( SWIG_FOUND TRUE ) + endif () + endif () +- find_package ( PythonLibs ) + find_package ( PythonInterp ) ++ find_package ( PythonLibs ) + endif () + + if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) +-- +2.17.0 + diff --git a/buildroot/package/libftdi1/0005-swig-python-fix-unresolved-symbol-issue.patch b/buildroot/package/libftdi1/0005-swig-python-fix-unresolved-symbol-issue.patch new file mode 100644 index 000000000..bd13d24d2 --- /dev/null +++ b/buildroot/package/libftdi1/0005-swig-python-fix-unresolved-symbol-issue.patch @@ -0,0 +1,31 @@ +From e12e592e982fe71b2761da0de7b19e93f67ed22c Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Tue, 6 Aug 2019 13:42:06 +0200 +Subject: [PATCH] swig: python: fix unresolved symbol issue + +GCC later than 5.x produce _fdti1.so file with an undefined +symbol str2charp_size due to C99 inline semantics change. So +remove this keyword. + +Signed-off-by: Yegor Yefremov +[Backport from upstream 3eca5150db07262c1c6eb737e12149201f631d47] +--- + python/ftdi1.i | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python/ftdi1.i b/python/ftdi1.i +index 93793f8..0d150cb 100644 +--- a/python/ftdi1.i ++++ b/python/ftdi1.i +@@ -19,7 +19,7 @@ inline PyObject* charp2str(const char *v_, long len) + #endif + } + +-inline char * str2charp_size(PyObject* pyObj, int * size) ++char * str2charp_size(PyObject* pyObj, int * size) + { + char * v_ = 0; + #if PY_MAJOR_VERSION >= 3 +-- +2.17.0 + diff --git a/buildroot/package/libgdiplus/0003-gifcodec.c-Include-copy-of-GifQuantizeBuffer-functio.patch b/buildroot/package/libgdiplus/0003-gifcodec.c-Include-copy-of-GifQuantizeBuffer-functio.patch new file mode 100644 index 000000000..80e944f07 --- /dev/null +++ b/buildroot/package/libgdiplus/0003-gifcodec.c-Include-copy-of-GifQuantizeBuffer-functio.patch @@ -0,0 +1,414 @@ +From afde9145030ff4989f0d7933389c20244eaf8039 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= +Date: Thu, 1 Aug 2019 17:08:36 +0200 +Subject: [PATCH] gifcodec.c: Include copy of GifQuantizeBuffer function from + giflib (#575) + +It was removed upstream so we need to include a copy of it. +The upstream code is licensed as MIT. + +Fixes https://github.com/mono/libgdiplus/issues/546 + +Signed-off-by: Heiko Thiery +--- + src/gifcodec.c | 377 +++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 369 insertions(+), 8 deletions(-) + +diff --git a/src/gifcodec.c b/src/gifcodec.c +index 6f8dedb..29a9899 100644 +--- a/src/gifcodec.c ++++ b/src/gifcodec.c +@@ -40,6 +40,374 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0 + #include "gifcodec.h" + + ++/* START GifQuantizeBuffer copy from giflib ++ ++The giflib 5.2.0 release notes mention: ++ ++> The undocumented and deprecated GifQuantizeBuffer() entry point ++> has been moved to the util library to reduce libgif size and attack ++> surface. Applications needing this function are couraged to link the ++> util library or make their own copy. ++ ++Since the util library doesn't get installed in most distros we can't ++link against it and need to make our own copy called LibgdiplusGifQuantizeBuffer. ++This is taken from giflib 52b62de83d5facbbbde042b85bf3f61182e3bebd. ++ ++> The GIFLIB distribution is Copyright (c) 1997 Eric S. Raymond ++> ++> Permission is hereby granted, free of charge, to any person obtaining a copy ++> of this software and associated documentation files (the "Software"), to deal ++> in the Software without restriction, including without limitation the rights ++> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++> copies of the Software, and to permit persons to whom the Software is ++> furnished to do so, subject to the following conditions: ++> ++> The above copyright notice and this permission notice shall be included in ++> all copies or substantial portions of the Software. ++> ++> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++> THE SOFTWARE. ++ ++*/ ++ ++/***************************************************************************** ++ ++ quantize.c - quantize a high resolution image into lower one ++ ++ Based on: "Color Image Quantization for frame buffer Display", by ++ Paul Heckbert SIGGRAPH 1982 page 297-307. ++ ++ This doesn't really belong in the core library, was undocumented, ++ and was removed in 4.2. Then it turned out some client apps were ++ actually using it, so it was restored in 5.0. ++ ++SPDX-License-Identifier: MIT ++ ++******************************************************************************/ ++ ++#include ++#include ++#include "gif_lib.h" ++//#include "gif_lib_private.h" ++ ++//#define ABS(x) ((x) > 0 ? (x) : (-(x))) ++ ++#define COLOR_ARRAY_SIZE 32768 ++#define BITS_PER_PRIM_COLOR 5 ++#define MAX_PRIM_COLOR 0x1f ++ ++static int SortRGBAxis; ++ ++typedef struct QuantizedColorType { ++ GifByteType RGB[3]; ++ GifByteType NewColorIndex; ++ long Count; ++ struct QuantizedColorType *Pnext; ++} QuantizedColorType; ++ ++typedef struct NewColorMapType { ++ GifByteType RGBMin[3], RGBWidth[3]; ++ unsigned int NumEntries; /* # of QuantizedColorType in linked list below */ ++ unsigned long Count; /* Total number of pixels in all the entries */ ++ QuantizedColorType *QuantizedColors; ++} NewColorMapType; ++ ++static int SubdivColorMap(NewColorMapType * NewColorSubdiv, ++ unsigned int ColorMapSize, ++ unsigned int *NewColorMapSize); ++static int SortCmpRtn(const void *Entry1, const void *Entry2); ++ ++/****************************************************************************** ++ Quantize high resolution image into lower one. Input image consists of a ++ 2D array for each of the RGB colors with size Width by Height. There is no ++ Color map for the input. Output is a quantized image with 2D array of ++ indexes into the output color map. ++ Note input image can be 24 bits at the most (8 for red/green/blue) and ++ the output has 256 colors at the most (256 entries in the color map.). ++ ColorMapSize specifies size of color map up to 256 and will be updated to ++ real size before returning. ++ Also non of the parameter are allocated by this routine. ++ This function returns GIF_OK if successful, GIF_ERROR otherwise. ++******************************************************************************/ ++int ++LibgdiplusGifQuantizeBuffer(unsigned int Width, ++ unsigned int Height, ++ int *ColorMapSize, ++ GifByteType * RedInput, ++ GifByteType * GreenInput, ++ GifByteType * BlueInput, ++ GifByteType * OutputBuffer, ++ GifColorType * OutputColorMap) { ++ ++ unsigned int Index, NumOfEntries; ++ int i, j, MaxRGBError[3]; ++ unsigned int NewColorMapSize; ++ long Red, Green, Blue; ++ NewColorMapType NewColorSubdiv[256]; ++ QuantizedColorType *ColorArrayEntries, *QuantizedColor; ++ ++ ColorArrayEntries = (QuantizedColorType *)malloc( ++ sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE); ++ if (ColorArrayEntries == NULL) { ++ return GIF_ERROR; ++ } ++ ++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) { ++ ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR); ++ ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) & ++ MAX_PRIM_COLOR; ++ ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR; ++ ColorArrayEntries[i].Count = 0; ++ } ++ ++ /* Sample the colors and their distribution: */ ++ for (i = 0; i < (int)(Width * Height); i++) { ++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ (2 * BITS_PER_PRIM_COLOR)) + ++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ BITS_PER_PRIM_COLOR) + ++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); ++ ColorArrayEntries[Index].Count++; ++ } ++ ++ /* Put all the colors in the first entry of the color map, and call the ++ * recursive subdivision process. */ ++ for (i = 0; i < 256; i++) { ++ NewColorSubdiv[i].QuantizedColors = NULL; ++ NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0; ++ for (j = 0; j < 3; j++) { ++ NewColorSubdiv[i].RGBMin[j] = 0; ++ NewColorSubdiv[i].RGBWidth[j] = 255; ++ } ++ } ++ ++ /* Find the non empty entries in the color table and chain them: */ ++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) ++ if (ColorArrayEntries[i].Count > 0) ++ break; ++ QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i]; ++ NumOfEntries = 1; ++ while (++i < COLOR_ARRAY_SIZE) ++ if (ColorArrayEntries[i].Count > 0) { ++ QuantizedColor->Pnext = &ColorArrayEntries[i]; ++ QuantizedColor = &ColorArrayEntries[i]; ++ NumOfEntries++; ++ } ++ QuantizedColor->Pnext = NULL; ++ ++ NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */ ++ NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */ ++ NewColorMapSize = 1; ++ if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) != ++ GIF_OK) { ++ free((char *)ColorArrayEntries); ++ return GIF_ERROR; ++ } ++ if (NewColorMapSize < *ColorMapSize) { ++ /* And clear rest of color map: */ ++ for (i = NewColorMapSize; i < *ColorMapSize; i++) ++ OutputColorMap[i].Red = OutputColorMap[i].Green = ++ OutputColorMap[i].Blue = 0; ++ } ++ ++ /* Average the colors in each entry to be the color to be used in the ++ * output color map, and plug it into the output color map itself. */ ++ for (i = 0; i < NewColorMapSize; i++) { ++ if ((j = NewColorSubdiv[i].NumEntries) > 0) { ++ QuantizedColor = NewColorSubdiv[i].QuantizedColors; ++ Red = Green = Blue = 0; ++ while (QuantizedColor) { ++ QuantizedColor->NewColorIndex = i; ++ Red += QuantizedColor->RGB[0]; ++ Green += QuantizedColor->RGB[1]; ++ Blue += QuantizedColor->RGB[2]; ++ QuantizedColor = QuantizedColor->Pnext; ++ } ++ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j; ++ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j; ++ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j; ++ } ++ } ++ ++ /* Finally scan the input buffer again and put the mapped index in the ++ * output buffer. */ ++ MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0; ++ for (i = 0; i < (int)(Width * Height); i++) { ++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ (2 * BITS_PER_PRIM_COLOR)) + ++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ BITS_PER_PRIM_COLOR) + ++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); ++ Index = ColorArrayEntries[Index].NewColorIndex; ++ OutputBuffer[i] = Index; ++ if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i])) ++ MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]); ++ if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i])) ++ MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]); ++ if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i])) ++ MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]); ++ } ++ ++#ifdef DEBUG ++ fprintf(stderr, ++ "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n", ++ MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]); ++#endif /* DEBUG */ ++ ++ free((char *)ColorArrayEntries); ++ ++ *ColorMapSize = NewColorMapSize; ++ ++ return GIF_OK; ++} ++ ++/****************************************************************************** ++ Routine to subdivide the RGB space recursively using median cut in each ++ axes alternatingly until ColorMapSize different cubes exists. ++ The biggest cube in one dimension is subdivide unless it has only one entry. ++ Returns GIF_ERROR if failed, otherwise GIF_OK. ++*******************************************************************************/ ++static int ++SubdivColorMap(NewColorMapType * NewColorSubdiv, ++ unsigned int ColorMapSize, ++ unsigned int *NewColorMapSize) { ++ ++ unsigned int i, j, Index = 0; ++ QuantizedColorType *QuantizedColor, **SortArray; ++ ++ while (ColorMapSize > *NewColorMapSize) { ++ /* Find candidate for subdivision: */ ++ long Sum, Count; ++ int MaxSize = -1; ++ unsigned int NumEntries, MinColor, MaxColor; ++ for (i = 0; i < *NewColorMapSize; i++) { ++ for (j = 0; j < 3; j++) { ++ if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) && ++ (NewColorSubdiv[i].NumEntries > 1)) { ++ MaxSize = NewColorSubdiv[i].RGBWidth[j]; ++ Index = i; ++ SortRGBAxis = j; ++ } ++ } ++ } ++ ++ if (MaxSize == -1) ++ return GIF_OK; ++ ++ /* Split the entry Index into two along the axis SortRGBAxis: */ ++ ++ /* Sort all elements in that entry along the given axis and split at ++ * the median. */ ++ SortArray = (QuantizedColorType **)malloc( ++ sizeof(QuantizedColorType *) * ++ NewColorSubdiv[Index].NumEntries); ++ if (SortArray == NULL) ++ return GIF_ERROR; ++ for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors; ++ j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL; ++ j++, QuantizedColor = QuantizedColor->Pnext) ++ SortArray[j] = QuantizedColor; ++ ++ /* ++ * Because qsort isn't stable, this can produce differing ++ * results for the order of tuples depending on platform ++ * details of how qsort() is implemented. ++ * ++ * We mitigate this problem by sorting on all three axes rather ++ * than only the one specied by SortRGBAxis; that way the instability ++ * can only become an issue if there are multiple color indices ++ * referring to identical RGB tuples. Older versions of this ++ * sorted on only the one axis. ++ */ ++ qsort(SortArray, NewColorSubdiv[Index].NumEntries, ++ sizeof(QuantizedColorType *), SortCmpRtn); ++ ++ /* Relink the sorted list into one: */ ++ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++) ++ SortArray[j]->Pnext = SortArray[j + 1]; ++ SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL; ++ NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0]; ++ free((char *)SortArray); ++ ++ /* Now simply add the Counts until we have half of the Count: */ ++ Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count; ++ NumEntries = 1; ++ Count = QuantizedColor->Count; ++ while (QuantizedColor->Pnext != NULL && ++ (Sum -= QuantizedColor->Pnext->Count) >= 0 && ++ QuantizedColor->Pnext->Pnext != NULL) { ++ QuantizedColor = QuantizedColor->Pnext; ++ NumEntries++; ++ Count += QuantizedColor->Count; ++ } ++ /* Save the values of the last color of the first half, and first ++ * of the second half so we can update the Bounding Boxes later. ++ * Also as the colors are quantized and the BBoxes are full 0..255, ++ * they need to be rescaled. ++ */ ++ MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */ ++ /* coverity[var_deref_op] */ ++ MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */ ++ MaxColor <<= (8 - BITS_PER_PRIM_COLOR); ++ MinColor <<= (8 - BITS_PER_PRIM_COLOR); ++ ++ /* Partition right here: */ ++ NewColorSubdiv[*NewColorMapSize].QuantizedColors = ++ QuantizedColor->Pnext; ++ QuantizedColor->Pnext = NULL; ++ NewColorSubdiv[*NewColorMapSize].Count = Count; ++ NewColorSubdiv[Index].Count -= Count; ++ NewColorSubdiv[*NewColorMapSize].NumEntries = ++ NewColorSubdiv[Index].NumEntries - NumEntries; ++ NewColorSubdiv[Index].NumEntries = NumEntries; ++ for (j = 0; j < 3; j++) { ++ NewColorSubdiv[*NewColorMapSize].RGBMin[j] = ++ NewColorSubdiv[Index].RGBMin[j]; ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[j] = ++ NewColorSubdiv[Index].RGBWidth[j]; ++ } ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] = ++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] + ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor; ++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor; ++ ++ NewColorSubdiv[Index].RGBWidth[SortRGBAxis] = ++ MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis]; ++ ++ (*NewColorMapSize)++; ++ } ++ ++ return GIF_OK; ++} ++ ++/**************************************************************************** ++ Routine called by qsort to compare two entries. ++*****************************************************************************/ ++ ++static int ++SortCmpRtn(const void *Entry1, ++ const void *Entry2) { ++ QuantizedColorType *entry1 = (*((QuantizedColorType **) Entry1)); ++ QuantizedColorType *entry2 = (*((QuantizedColorType **) Entry2)); ++ ++ /* sort on all axes of the color space! */ ++ int hash1 = entry1->RGB[SortRGBAxis] * 256 * 256 ++ + entry1->RGB[(SortRGBAxis+1) % 3] * 256 ++ + entry1->RGB[(SortRGBAxis+2) % 3]; ++ int hash2 = entry2->RGB[SortRGBAxis] * 256 * 256 ++ + entry2->RGB[(SortRGBAxis+1) % 3] * 256 ++ + entry2->RGB[(SortRGBAxis+2) % 3]; ++ ++ return hash1 - hash2; ++} ++ ++/* END GifQuantizeBuffer copy from giflib */ ++ + /* Data structure used for callback */ + typedef struct + { +@@ -851,14 +1219,7 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) + v += 4; + } + } +- if ( +-#if GIFLIB_MAJOR >= 5 +- GifQuantizeBuffer( +-#else +- QuantizeBuffer( +-#endif +- bitmap_data->width, bitmap_data->height, &cmap_size, +- red, green, blue, pixbuf, cmap->Colors) == GIF_ERROR) { ++ if (LibgdiplusGifQuantizeBuffer(bitmap_data->width, bitmap_data->height, &cmap_size, red, green, blue, pixbuf, cmap->Colors) == GIF_ERROR) { + goto error; + } + } +-- +2.20.1 + diff --git a/buildroot/package/libgee/libgee.hash b/buildroot/package/libgee/libgee.hash index 77f39d6b6..e1861d514 100644 --- a/buildroot/package/libgee/libgee.hash +++ b/buildroot/package/libgee/libgee.hash @@ -1,5 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.1.sha256sum -sha256 bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630 libgee-0.20.1.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.2.sha256sum +sha256 9e035c4b755f46bfae70ba81cdcf8328b03f554373cec8c816e8b5680f85353c libgee-0.20.2.tar.xz # Hash for license file: sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/libgee/libgee.mk b/buildroot/package/libgee/libgee.mk index 264ba9894..fa4c46e73 100644 --- a/buildroot/package/libgee/libgee.mk +++ b/buildroot/package/libgee/libgee.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGEE_VERSION_MAJOR = 0.20 -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).1 +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).2 LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 diff --git a/buildroot/package/libgeotiff/0001-Use-pkg-config-for-libtiff-detection.patch b/buildroot/package/libgeotiff/0001-Use-pkg-config-for-libtiff-detection.patch new file mode 100644 index 000000000..e2ce26e97 --- /dev/null +++ b/buildroot/package/libgeotiff/0001-Use-pkg-config-for-libtiff-detection.patch @@ -0,0 +1,49 @@ +From 2fbae8298d7cc976d7c0f329fc26dafe57fb0fc4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 1 Apr 2019 08:04:39 +0200 +Subject: [PATCH] Use pkg-config for libtiff detection + +Using pkg-config allows proper behavior in static-only contexts: the +libtiff library might depend on libz and libjpeg. + +Signed-off-by: Thomas Petazzoni +[Patch retrieved (and slightly updated) from: +https://git.buildroot.net/buildroot/tree/package/libgeotiff/0001-use-pkg-config.patch] +Signed-off-by: Fabrice Fontaine +[Retrieved (and slightly updated) from: +https://github.com/OSGeo/libgeotiff/commit/2fbae8298d7cc976d7c0f329fc26dafe57fb0fc4] +--- + libgeotiff/configure.ac | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index aa38af4..c3395d5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -211,16 +211,18 @@ if test "$with_libtiff" != "" ; then + libgeotiff. Please upgrade or use an older version of libgeotiff.]),-lm) + LIBS="$LIBS_SAVED" + else +- AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes], +- AC_MSG_ERROR([You will need to substantially rewrite libxtiff to ++ PKG_CHECK_MODULES(LIBTIFF, libtiff-4, ++ [TIFF_INC="$LIBTIFF_CFLAGS" LIBS="$LIBS $LIBTIFF_LIBS" TIFF_CONFIG="yes"], ++ [AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes], ++ AC_MSG_ERROR([You will need to substantially rewrite libxtiff to + build libgeotiff without libtiff]),-lm) +- LIBS_SAVED="$LIBS" +- AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes], +- AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this version of ++ LIBS_SAVED="$LIBS" ++ AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes], ++ AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this version of + libgeotiff. Please upgrade libtiff or use an older version of libgeotiff.]),-lm) +- LIBS="$LIBS -ltiff" +- TIFF_INC= +- TIFF_CONFIG="yes" ++ LIBS="$LIBS -ltiff" ++ TIFF_INC= ++ TIFF_CONFIG="yes"]) + fi + + diff --git a/buildroot/package/libgeotiff/0001-use-pkg-config.patch b/buildroot/package/libgeotiff/0001-use-pkg-config.patch deleted file mode 100644 index a4b11f152..000000000 --- a/buildroot/package/libgeotiff/0001-use-pkg-config.patch +++ /dev/null @@ -1,79 +0,0 @@ -Use pkg-config for libtiff detection - -Using pkg-config allows proper behavior in static-only contexts: the -libtiff library might depend on libz and libjpeg. - -This patch also fixes a few other issues in the configure.ac script -that prevents autoreconf to work, or proper detection of the proj -library. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -196,39 +196,12 @@ - - TIFF_CONFIG="no" - --AC_ARG_WITH(libtiff, [ --with-libtiff=dir Use libtiff in directory dir],,) -- --if test "$with_libtiff" != "" ; then -- if test -f $with_libtiff/include/tiffio.h -a -d $with_libtiff/lib ; then -- LIBS="-L$with_libtiff/lib -ltiff $LIBS" -- TIFF_INC=-I$with_libtiff/include -- else -- LIBS="-L$with_libtiff -ltiff $LIBS" -- TIFF_INC=-I$with_libtiff -- fi -- LIBS_SAVED="$LIBS" -- AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes], -- AC_MSG_ERROR([failed to link with -ltiff to find TIFFOpen]),-lm) -- AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes], -- AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this version of --libgeotiff. Please upgrade or use an older version of libgeotiff.]),-lm) -- LIBS="$LIBS_SAVED" --else -- AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes], -- AC_MSG_ERROR([You will need to substantially rewrite libxtiff to --build libgeotiff without libtiff]),-lm) -- LIBS_SAVED="$LIBS" -- AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes], -- AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this version of --libgeotiff. Please upgrade libtiff or use an older version of libgeotiff.]),-lm) -- LIBS="$LIBS -ltiff" -- TIFF_INC= -- TIFF_CONFIG="yes" --fi -- -+PKG_CHECK_MODULES(LIBTIFF, libtiff-4) -+TIFF_INC="$LIBTIFF_CFLAGS" -+LIBS="$LIBS $LIBTIFF_LIBS" -+TIFF_CONFIG="yes" - - AC_SUBST([TIFF_INC]) --AC_SUBST([TIFF_PREFIX]) - AM_CONDITIONAL([TIFF_IS_CONFIG], [test ! x$TIFF_CONFIG = xno]) - - dnl -@@ -280,15 +253,16 @@ - PROJ_INC=-I$PROJ_INC - - AC_SUBST(PROJ_INC,$PROJ_INC) -- AC_DEFINE(HAVE_PROJECTS_H) -+ AC_DEFINE([HAVE_PROJECTS_H], [], [Whether proj library header is available]) - AC_DEFINE(HAVE_LIBPROJ) - AC_SUBST([HAVE_LIBPROJ]) - PROJ_CONFIG="yes" -- - else - AC_CHECK_LIB(proj,pj_init,,,-lm) - AC_CHECK_HEADERS(proj_api.h,,) -- PROJ_CONFIG="yes" -+ if "$ac_cv_lib_proj_pj_init" = "yes" -a "$ac_cv_header_proj_api_h" = "yes"; then -+ PROJ_CONFIG="yes" -+ fi - fi - - AM_CONDITIONAL([PROJ_IS_CONFIG], [test ! x$PROJ_CONFIG = xno]) diff --git a/buildroot/package/libgeotiff/0002-configure.ac-use-pkg-config-to-find-proj-dependency.patch b/buildroot/package/libgeotiff/0002-configure.ac-use-pkg-config-to-find-proj-dependency.patch new file mode 100644 index 000000000..faf409cd5 --- /dev/null +++ b/buildroot/package/libgeotiff/0002-configure.ac-use-pkg-config-to-find-proj-dependency.patch @@ -0,0 +1,37 @@ +From 33937e2861fda87dc314378bf87db2c766c37a6b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 9 Oct 2019 15:11:34 +0200 +Subject: [PATCH] configure.ac: use pkg-config to find proj dependency + +Use pkg-config to retrieve proj and its static dependencies such as +-lstdc++ + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OSGeo/libgeotiff/pull/24] +--- + libgeotiff/configure.ac | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/libgeotiff/configure.ac +index c3395d5..f7a8f28 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -246,9 +246,12 @@ if test "x$with_proj" = "xno" ; then + else + + if test "x$with_proj" = "xyes" -o "x$with_proj" = "x"; then +- ORIG_LIBS="$LIBS" +- LIBS="-lproj $ORIG_LIBS" +- AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,) ++ PKG_CHECK_MODULES(PROJ, proj, [LIBS="$LIBS $PROJ_LIBS" PROJ_FOUND=yes], [PROJ_FOUND=no]) ++ if test "$PROJ_FOUND" = "no"; then ++ ORIG_LIBS="$LIBS" ++ LIBS="-lproj $ORIG_LIBS" ++ AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,) ++ fi + if test "$PROJ_FOUND" = "no"; then + AC_CHECK_LIB(proj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,) + if test "$PROJ_FOUND" = "yes"; then +-- +2.23.0 + diff --git a/buildroot/package/libgeotiff/0002-fix-GEO_NORMALIZE_DISABLE_TOWGS84-define.patch b/buildroot/package/libgeotiff/0002-fix-GEO_NORMALIZE_DISABLE_TOWGS84-define.patch deleted file mode 100644 index a8a2d257c..000000000 --- a/buildroot/package/libgeotiff/0002-fix-GEO_NORMALIZE_DISABLE_TOWGS84-define.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix GEO_NORMALIZE_DISABLE_TOWGS84 definition - -Fix "missing template: GEO_NORMALIZE_DISABLE_TOWGS84" error by adding -a non-empty description of GEO_NORMALIZE_DISABLE_TOWGS84 in AC_DEFINE - -Signed-off-by: Fabrice Fontaine - -Index: libgeotiff/configure.ac -=================================================================== ---- libgeotiff/configure.ac (révision 2818) -+++ libgeotiff/configure.ac (copie de travail) -@@ -317,7 +317,7 @@ - AM_CONDITIONAL([CSV_IS_CONFIG], [test ! x$CSV_CONFIG = xno]) - - --AC_ARG_ENABLE(towgs84, [ --disable-towgs84 Disable WGS84 parameters for binary compatibility with pre-1.4.1], AC_DEFINE(GEO_NORMALIZE_DISABLE_TOWGS84)) -+AC_ARG_ENABLE(towgs84, [ --disable-towgs84 Disable WGS84 parameters for binary compatibility with pre-1.4.1], AC_DEFINE(GEO_NORMALIZE_DISABLE_TOWGS84, [], [Disable WGS84 parameters])) - - dnl ######################################################################### - dnl Doxygen settings diff --git a/buildroot/package/libgeotiff/0003-libgeotiff-configure.ac-do-not-check-for-C.patch b/buildroot/package/libgeotiff/0003-libgeotiff-configure.ac-do-not-check-for-C.patch deleted file mode 100644 index 68082dd02..000000000 --- a/buildroot/package/libgeotiff/0003-libgeotiff-configure.ac-do-not-check-for-C.patch +++ /dev/null @@ -1,65 +0,0 @@ -From edc9ec69b43c27955ee4f24db2e6808bb1a8974d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 Feb 2019 23:20:43 +0100 -Subject: [PATCH] libgeotiff/configure.ac: do not check for C++ - -Do not check for C++ compiler as libgeotiff is written in C otherwise -build will fail on toolchains without a working C++ compiler: - -checking how to run the C++ preprocessor... /lib/cpp -configure: error: in `/data/buildroot/buildroot-test/instance-1/output/build/libgeotiff-1.4.2': -configure: error: C++ preprocessor "/lib/cpp" fails sanity check - -Fixes: - - http://autobuild.buildroot.org/results/72f1c5c1b8fc337a1cff4b280abe99afd65f945b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/OSGeo/libgeotiff/pull/9] ---- - libgeotiff/configure.ac | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a334416..4ebbd6f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,8 +25,6 @@ dnl ######################################################################### - AM_INIT_AUTOMAKE - AM_MAINTAINER_MODE - AC_PROG_CC --AC_PROG_CXX --AC_PROG_CXXCPP - AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET -@@ -46,7 +44,6 @@ dnl ######################################################################### - m4_define([debug_default],[no]) - - CFLAGS="$CFLAGS" --CXXFLAGS="$CXXFLAGS" - - dnl We want to honor the users wishes with regard to linking. - LIBS="$LDFLAGS $LIBS" -@@ -82,11 +79,9 @@ AC_MSG_CHECKING([for debug enabled]) - - if test "x$enable_debug" = "xyes"; then - CFLAGS="$CFLAGS -g -DDEBUG -Wall" -- CXXFLAGS="$CXXFLAGS -g -DDEBUG -Wall" - AC_MSG_RESULT(yes) - else - CFLAGS="$CFLAGS -O3 -DNDEBUG" -- CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG" - AC_MSG_RESULT(no) - fi - -@@ -367,7 +362,6 @@ LOC_MSG() - LOC_MSG([ Version..................: ${RELEASE_VERSION}]) - LOC_MSG([ Installation directory...: ${prefix}]) - LOC_MSG([ C compiler...............: ${CC} ${CFLAGS}]) --LOC_MSG([ C++ compiler.............: ${CXX} ${CXXFLAGS}]) - - LOC_MSG([ Debugging support........: ${enable_debug}]) - LOC_MSG() --- -2.14.1 - diff --git a/buildroot/package/libgeotiff/Config.in b/buildroot/package/libgeotiff/Config.in index 530cd450b..7ed296fb2 100644 --- a/buildroot/package/libgeotiff/Config.in +++ b/buildroot/package/libgeotiff/Config.in @@ -1,8 +1,18 @@ config BR2_PACKAGE_LIBGEOTIFF bool "libgeotiff" + depends on BR2_INSTALL_LIBSTDCPP # proj + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # proj + depends on BR2_TOOLCHAIN_HAS_THREADS # proj + depends on BR2_USE_WCHAR # proj + select BR2_PACKAGE_PROJ select BR2_PACKAGE_TIFF help Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags. - http://geotiff.osgeo.org + https://github.com/OSGeo/libgeotiff + +comment "libgeotiff needs a toolchain w/ C++, gcc >= 4.7, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/buildroot/package/libgeotiff/libgeotiff.hash b/buildroot/package/libgeotiff/libgeotiff.hash index 08e8e0678..12d3b2a16 100644 --- a/buildroot/package/libgeotiff/libgeotiff.hash +++ b/buildroot/package/libgeotiff/libgeotiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b8510d9b968b5ee899282cdd5bef13fd02d5a4c19f664553f81e31127bc47265 libgeotiff-1.4.3.tar.gz -sha256 16b83cf7c3bbfd20bffa768b9bfdb16506ca50f5c140a9f3431e740b155359c1 LICENSE +sha256 f9e99733c170d11052f562bcd2c7cb4de53ed405f7acdde4f16195cd3ead612c libgeotiff-1.5.1.tar.gz +sha256 6a22340b8293c50a34ce8e95589489bd3ec65bcb8b93e61cbda3daaafe498375 LICENSE diff --git a/buildroot/package/libgeotiff/libgeotiff.mk b/buildroot/package/libgeotiff/libgeotiff.mk index a4606bc30..c196b804a 100644 --- a/buildroot/package/libgeotiff/libgeotiff.mk +++ b/buildroot/package/libgeotiff/libgeotiff.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBGEOTIFF_VERSION = 1.4.3 +LIBGEOTIFF_VERSION = 1.5.1 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff LIBGEOTIFF_LICENSE = X11-style, public domain LIBGEOTIFF_LICENSE_FILES = LICENSE -LIBGEOTIFF_DEPENDENCIES = tiff host-pkgconf +LIBGEOTIFF_DEPENDENCIES = proj tiff host-pkgconf LIBGEOTIFF_INSTALL_STAGING = YES +# We're patching configure.ac LIBGEOTIFF_AUTORECONF = YES ifeq ($(BR2_PACKAGE_ZLIB),y) @@ -26,11 +27,4 @@ else LIBGEOTIFF_CONF_OPTS += --without-jpeg endif -ifeq ($(BR2_PACKAGE_PROJ),y) -LIBGEOTIFF_DEPENDENCIES += proj -LIBGEOTIFF_CONF_OPTS += --with-proj=$(STAGING_DIR)/usr -else -LIBGEOTIFF_CONF_OPTS += --without-proj -endif - $(eval $(autotools-package)) diff --git a/buildroot/package/libgit2/libgit2.hash b/buildroot/package/libgit2/libgit2.hash index 8b3d57ead..d4912c032 100644 --- a/buildroot/package/libgit2/libgit2.hash +++ b/buildroot/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f6fd26378ff71bd7a4b17b576c82c774a2e9c2d6b74b24718a8fb29551e1c4a5 libgit2-0.27.10.tar.gz +sha256 30f3877469d09f2e4a21be933b4e2800560d16646028dd800744dc5f7fb0c749 libgit2-0.28.4.tar.gz sha256 d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813 COPYING diff --git a/buildroot/package/libgit2/libgit2.mk b/buildroot/package/libgit2/libgit2.mk index e797ca518..909fcb83f 100644 --- a/buildroot/package/libgit2/libgit2.mk +++ b/buildroot/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 0.27.10 +LIBGIT2_VERSION = 0.28.4 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = GPL-2.0 with linking exception LIBGIT2_LICENSE_FILES = COPYING @@ -41,11 +41,4 @@ else LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OFF endif -ifeq ($(BR2_PACKAGE_LIBCURL),y) -LIBGIT2_DEPENDENCIES += libcurl -LIBGIT2_CONF_OPTS += -DCURL=ON -else -LIBGIT2_CONF_OPTS += -DCURL=OFF -endif - $(eval $(cmake-package)) diff --git a/buildroot/package/libglew/libglew.hash b/buildroot/package/libglew/libglew.hash index 44684ffc8..2e1b1f3c3 100644 --- a/buildroot/package/libglew/libglew.hash +++ b/buildroot/package/libglew/libglew.hash @@ -1,5 +1,6 @@ -# From https://sourceforge.net/projects/glew/files/glew/2.0.0/ -sha1 6e15c84f7e1fad34cd3679f784a233744ddf048f glew-2.0.0.tgz -md5 2a2cd7c98f13854d2fcddae0d2b20411 glew-2.0.0.tgz +# From https://sourceforge.net/projects/glew/files/glew/2.1.0/ +sha1 18eca05460d0b61709fc115e632b6fe320718b44 glew-2.1.0.tgz +md5 b2ab12331033ddfaa50dc39345343980 glew-2.1.0.tgz # Locally computed: -sha256 c572c30a4e64689c342ba1624130ac98936d7af90c3103f9ce12b8a0c5736764 glew-2.0.0.tgz +sha256 04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95 glew-2.1.0.tgz +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff LICENSE.txt diff --git a/buildroot/package/libglew/libglew.mk b/buildroot/package/libglew/libglew.mk index 277a171b1..8a07170e9 100644 --- a/buildroot/package/libglew/libglew.mk +++ b/buildroot/package/libglew/libglew.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGLEW_VERSION = 2.0.0 +LIBGLEW_VERSION = 2.1.0 LIBGLEW_SOURCE = glew-$(LIBGLEW_VERSION).tgz LIBGLEW_SITE = http://sourceforge.net/projects/glew/files/glew/$(LIBGLEW_VERSION) LIBGLEW_LICENSE = BSD-3-Clause, MIT diff --git a/buildroot/package/libglfw/libglfw.hash b/buildroot/package/libglfw/libglfw.hash index 39d6c2613..6796b8136 100644 --- a/buildroot/package/libglfw/libglfw.hash +++ b/buildroot/package/libglfw/libglfw.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e10f0de1384d75e6fc210c53e91843f6110d6c4f3afbfb588130713c2f9d8fe8 libglfw-3.2.1.tar.gz -sha256 8d85c2fc8de8f3b8c0906e317a2d6423268ef4291a3682d94ac910f65389a441 COPYING.txt +sha256 81bf5fde487676a8af55cb317830703086bb534c53968d71936e7b48ee5a0f3e libglfw-3.3.tar.gz +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 LICENSE.md diff --git a/buildroot/package/libglfw/libglfw.mk b/buildroot/package/libglfw/libglfw.mk index b6dde2e9d..aac5b1799 100644 --- a/buildroot/package/libglfw/libglfw.mk +++ b/buildroot/package/libglfw/libglfw.mk @@ -4,13 +4,13 @@ # ################################################################################ -LIBGLFW_VERSION = 3.2.1 +LIBGLFW_VERSION = 3.3 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) LIBGLFW_INSTALL_STAGING = YES LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \ xlib_libXinerama xlib_libXrandr LIBGLFW_LICENSE = Zlib -LIBGLFW_LICENSE_FILES = COPYING.txt +LIBGLFW_LICENSE_FILES = LICENSE.md LIBGLFW_CONF_OPTS += \ -DGLFW_BUILD_EXAMPLES=OFF \ diff --git a/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch b/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch index 708188b2c..a47127524 100644 --- a/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch +++ b/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Fix compile time atomic detection Improved compile-time detection of atomic support in the compiler. -Upstream-Status: submitted -See : https://bugzilla.gnome.org/show_bug.cgi?id=752731 +Upstream-Status: Merged +See : https://gitlab.gnome.org/GNOME/glib/issues/1063 Signed-off-by: Brendan Heading -Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett --- glib/gthread-posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -18,7 +18,7 @@ diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c index 71a6b7b..d09d029 100644 --- a/glib/gthread-posix.c +++ b/glib/gthread-posix.c -@@ -65,7 +65,7 @@ +@@ -68,7 +68,7 @@ #endif /* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */ diff --git a/buildroot/package/libglib2/0002-allow-explicit-disabling-of-tests.patch b/buildroot/package/libglib2/0002-allow-explicit-disabling-of-tests.patch new file mode 100644 index 000000000..d6c62499c --- /dev/null +++ b/buildroot/package/libglib2/0002-allow-explicit-disabling-of-tests.patch @@ -0,0 +1,37 @@ +From cdccbc6ec36243463613cb32d7058c26c3c51e16 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Wed, 18 Sep 2019 09:50:00 -0700 +Subject: [PATCH] allow explicit disabling of tests + +Upstream won't build tests when cross-compiling. However; this means still +building the tests during a host build. Building the tests causes build +failures on older distributions such as CentOS 6 and Debian 7 because the +command `objcopy --add-symbol` is used when building the test +"test_resources2," which is not available with the older version of objcopy +provided by the distributions. + +Instead, remove the conditional checks which set build_tests and only check if +installed_tests_enabled is passed. + +Signed-off-by: Adam Duskett +Refresh for 2.62.2 +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 99806d0..3206603 100644 +--- a/meson.build ++++ b/meson.build +@@ -77,7 +77,7 @@ installed_tests_template = files('template.test.in') + installed_tests_template_tap = files('template-tap.test.in') + + # Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use) +-build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) or installed_tests_enabled ++build_tests = installed_tests_enabled + + add_project_arguments('-D_GNU_SOURCE', language: 'c') + +-- +2.23.0 + diff --git a/buildroot/package/libglib2/0002-disable-tests.patch b/buildroot/package/libglib2/0002-disable-tests.patch deleted file mode 100644 index 523ebb35a..000000000 --- a/buildroot/package/libglib2/0002-disable-tests.patch +++ /dev/null @@ -1,60 +0,0 @@ -From ee2d6609bce808ac72afdbf86db1a6e27c78171e Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 21 Jun 2017 16:37:54 -0400 -Subject: [PATCH] disable tests - -Disable tests, some of them need python and sometimes host-python -gets mixed with distro python leading to build failures. - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Adam Duskett ---- - Makefile.am | 2 +- - gio/Makefile.am | 2 +- - glib/Makefile.am | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 008ad58..007332d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,7 +6,7 @@ include $(top_srcdir)/glib.mk - - ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} - --SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests -+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs - DIST_SUBDIRS = $(SUBDIRS) build win32 - - bin_SCRIPTS = glib-gettextize -diff --git a/gio/Makefile.am b/gio/Makefile.am -index 67db1b7..78309b5 100644 ---- a/gio/Makefile.am -+++ b/gio/Makefile.am -@@ -244,7 +244,7 @@ platform_libadd += win32/libgiowin32.la - platform_deps += win32/libgiowin32.la - endif - --SUBDIRS += . tests -+SUBDIRS += . - - if HAVE_FAM - SUBDIRS += fam -diff --git a/glib/Makefile.am b/glib/Makefile.am -index d755853..61166e5 100644 ---- a/glib/Makefile.am -+++ b/glib/Makefile.am -@@ -33,8 +33,8 @@ else - MAYBE_PCRE = pcre - endif - --SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests --DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests -+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . -+DIST_SUBDIRS = libcharset gnulib pcre update-pcre - - AM_CPPFLAGS = \ - $(glib_INCLUDES) \ --- -2.9.4 - diff --git a/buildroot/package/libglib2/0003-gdbus-Avoid-printing-null-strings.patch b/buildroot/package/libglib2/0003-gdbus-Avoid-printing-null-strings.patch deleted file mode 100644 index 800d3609d..000000000 --- a/buildroot/package/libglib2/0003-gdbus-Avoid-printing-null-strings.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 79492bb914e419c54298ba6324e3d595e51c16c3 Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Tue, 29 Jan 2019 09:50:46 +0100 -Subject: [PATCH] gdbus: Avoid printing null strings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This mostly affects the 2.56 branch, but, given that GCC 9 is being -stricter about passing null string pointers to printf-like functions, it -might make sense to proactively fix such calls. - -gdbusauth.c: In function '_g_dbus_auth_run_server': -gdbusauth.c:1302:11: error: '%s' directive argument is null -[-Werror=format-overflow=] - 1302 | debug_print ("SERVER: WaitingForBegin, read '%s'", - line); - | - -gdbusmessage.c: In function ‘g_dbus_message_to_blob’: -gdbusmessage.c:2730:30: error: ‘%s’ directive argument is null [-Werror=format-overflow=] - 2730 | tupled_signature_str = g_strdup_printf ("(%s)", signature_str); - | - -Signed-off-by: Grzegorz Blach ---- - gio/gdbusauth.c | 2 +- - gio/gdbusmessage.c | 5 ++--- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c -index 1f8ea8057..752ec23fc 100644 ---- a/gio/gdbusauth.c -+++ b/gio/gdbusauth.c -@@ -1272,9 +1272,9 @@ _g_dbus_auth_run_server (GDBusAuth *auth, - &line_length, - cancellable, - error); -- debug_print ("SERVER: WaitingForBegin, read '%s'", line); - if (line == NULL) - goto out; -+ debug_print ("SERVER: WaitingForBegin, read '%s'", line); - if (g_strcmp0 (line, "BEGIN") == 0) - { - /* YAY, done! */ -diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c -index 3221b925d..3a1a1f9e9 100644 ---- a/gio/gdbusmessage.c -+++ b/gio/gdbusmessage.c -@@ -2731,7 +2731,6 @@ g_dbus_message_to_blob (GDBusMessage *message, - if (message->body != NULL) - { - gchar *tupled_signature_str; -- tupled_signature_str = g_strdup_printf ("(%s)", signature_str); - if (signature == NULL) - { - g_set_error (error, -@@ -2739,10 +2738,10 @@ g_dbus_message_to_blob (GDBusMessage *message, - G_IO_ERROR_INVALID_ARGUMENT, - _("Message body has signature “%s” but there is no signature header"), - signature_str); -- g_free (tupled_signature_str); - goto out; - } -- else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) -+ tupled_signature_str = g_strdup_printf ("(%s)", signature_str); -+ if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) - { - g_set_error (error, - G_IO_ERROR, --- -2.21.0 - diff --git a/buildroot/package/libglib2/0003-remove-cpp-requirement.patch b/buildroot/package/libglib2/0003-remove-cpp-requirement.patch new file mode 100644 index 000000000..d28f8ab81 --- /dev/null +++ b/buildroot/package/libglib2/0003-remove-cpp-requirement.patch @@ -0,0 +1,96 @@ +From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Mon, 16 Sep 2019 10:12:38 -0700 +Subject: [PATCH] remove cpp requirement + +The c++ test is necessary to ensure libglib doesn't accidentally use C++ +reserved keywords in public headers. Because this is just a test, it isn't +necessary to have a C++ compiler to build libglib2. + +Signed-off-by: Adam Duskett +Upstream status: Denied (Buildroot specific) +https://gitlab.gnome.org/GNOME/glib/issues/1748 +--- + glib/glibconfig.h.in | 1 - + meson.build | 18 +----------------- + tests/meson.build | 5 ----- + 3 files changed, 1 insertion(+), 23 deletions(-) + +diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in +index 7ef8c48..128e65d 100644 +--- a/glib/glibconfig.h.in ++++ b/glib/glibconfig.h.in +@@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; + @glib_vacopy@ + + @g_have_iso_c_varargs@ +-@g_have_iso_cxx_varargs@ + + /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi + * is passed ISO vararg support is turned off, and there is no work +diff --git a/meson.build b/meson.build +index 4bbf4c2..ac59f4e 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,4 +1,4 @@ +-project('glib', 'c', 'cpp', ++project('glib', 'c', + version : '2.62.4', + # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships + meson_version : '>= 0.49.2', +@@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', + ) + + cc = meson.get_compiler('c') +-cxx = meson.get_compiler('cpp') + + cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() + +@@ -1484,20 +1483,6 @@ if g_have_iso_c_varargs + #endif''') + endif + +-g_have_iso_cxx_varargs = cxx.compiles(''' +- void some_func (void) { +- int a(int p1, int p2, int p3); +- #define call_a(...) a(1,__VA_ARGS__) +- call_a(2,3); +- }''', name : 'ISO C99 varargs macros in C++') +- +-if g_have_iso_cxx_varargs +- glibconfig_conf.set('g_have_iso_cxx_varargs', ''' +-#ifdef __cplusplus +-# define G_HAVE_ISO_VARARGS 1 +-#endif''') +-endif +- + g_have_gnuc_varargs = cc.compiles(''' + void some_func (void) { + int a(int p1, int p2, int p3); +@@ -2095,7 +2080,6 @@ subdir('gobject') + subdir('gthread') + subdir('gmodule') + subdir('gio') +-subdir('fuzzing') + if build_tests + subdir('tests') + endif +diff --git a/tests/meson.build b/tests/meson.build +index e4ea226..7fd974c 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -56,11 +56,6 @@ tests = { + 'source': 'module-test.c', + 'c_args': ['-DMODULE_TYPE="plugin"'], + }, +- 'cxx-test' : { +- 'source' : 'cxx-test.cpp', +- 'include_directories' : gmoduleinc, +- 'dependencies' : [libgio_dep], +- }, + } + + test_extra_programs = { +-- +2.23.0 + diff --git a/buildroot/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/buildroot/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch new file mode 100644 index 000000000..b76dd76f2 --- /dev/null +++ b/buildroot/package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch @@ -0,0 +1,28 @@ +From 9e0f11a4981737f98bac93a22b6f2ff1a3887b63 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Tue, 9 Apr 2019 13:03:51 -0400 +Subject: [PATCH] Add '-Wno-format-nonliteral' to compiler arguments. + +This warning is a false positive on older versions of gcc. +See https://gitlab.gnome.org/GNOME/glib/issues/1744 for more details. + +Signed-off-by: Adam Duskett +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 3c615b7..7cae4e8 100644 +--- a/meson.build ++++ b/meson.build +@@ -366,6 +366,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' + '-Wno-cast-function-type', ++ '-Wno-format-nonliteral', + # Due to function casts through (void*) we cannot support -Wpedantic: + # https://wiki.gnome.org/Projects/GLib/CompilerRequirements#Function_pointer_conversions. + '-Wno-pedantic', + '-Werror=declaration-after-statement', + '-Werror=format=2', +-- +2.20.1 + diff --git a/buildroot/package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch b/buildroot/package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch deleted file mode 100644 index fa558e6db..000000000 --- a/buildroot/package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b9160d951b9af647b97766c57295ca4f45cf9521 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 3 Oct 2017 10:45:55 +0300 -Subject: [PATCH] Do not hardcode python path into various tools - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin -Fetch from: http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch?id=eef7883587acc933d6f34b559ec03ff84d18573b -Signed-off-by: David Owens ---- - gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +- - gobject/glib-genmarshal.in | 2 +- - gobject/glib-mkenums.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in -index 8050981..e693ef3 100644 ---- a/gio/gdbus-2.0/codegen/gdbus-codegen.in -+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env @PYTHON@ -+#!/usr/bin/env python - - # GDBus - GLib D-Bus Library - # -diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in -index 09e8408..b2f9d99 100755 ---- a/gobject/glib-genmarshal.in -+++ b/gobject/glib-genmarshal.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env @PYTHON@ -+#!/usr/bin/env python - - # pylint: disable=too-many-lines, missing-docstring, invalid-name - -diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in -index d4bfd11..051fce4 100755 ---- a/gobject/glib-mkenums.in -+++ b/gobject/glib-mkenums.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env @PYTHON@ -+#!/usr/bin/env python - - # If the code below looks horrible and unpythonic, do not panic. - # --- -2.14.1 - diff --git a/buildroot/package/libglib2/0005-gfile-Limit-access-to-files-when-copying.patch b/buildroot/package/libglib2/0005-gfile-Limit-access-to-files-when-copying.patch deleted file mode 100644 index 750767dfb..000000000 --- a/buildroot/package/libglib2/0005-gfile-Limit-access-to-files-when-copying.patch +++ /dev/null @@ -1,56 +0,0 @@ -From cf09035d361287dfadc93f09272ce68b4a9457ad Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -Date: Thu, 23 May 2019 10:41:53 +0200 -Subject: [PATCH] gfile: Limit access to files when copying - -file_copy_fallback creates new files with default permissions and -set the correct permissions after the operation is finished. This -might cause that the files can be accessible by more users during -the operation than expected. Use G_FILE_CREATE_PRIVATE for the new -files to limit access to those files. - -(cherry picked from commit d8f8f4d637ce43f8699ba94c9b7648beda0ca174) -Signed-off-by: Peter Korsgaard ---- - gio/gfile.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/gio/gfile.c b/gio/gfile.c -index a67aad383..ff313ebf8 100644 ---- a/gio/gfile.c -+++ b/gio/gfile.c -@@ -3279,12 +3279,12 @@ file_copy_fallback (GFile *source, - out = (GOutputStream*)_g_local_file_output_stream_replace (_g_local_file_get_filename (G_LOCAL_FILE (destination)), - FALSE, NULL, - flags & G_FILE_COPY_BACKUP, -- G_FILE_CREATE_REPLACE_DESTINATION, -- info, -+ G_FILE_CREATE_REPLACE_DESTINATION | -+ G_FILE_CREATE_PRIVATE, info, - cancellable, error); - else - out = (GOutputStream*)_g_local_file_output_stream_create (_g_local_file_get_filename (G_LOCAL_FILE (destination)), -- FALSE, 0, info, -+ FALSE, G_FILE_CREATE_PRIVATE, info, - cancellable, error); - } - else if (flags & G_FILE_COPY_OVERWRITE) -@@ -3292,12 +3292,13 @@ file_copy_fallback (GFile *source, - out = (GOutputStream *)g_file_replace (destination, - NULL, - flags & G_FILE_COPY_BACKUP, -- G_FILE_CREATE_REPLACE_DESTINATION, -+ G_FILE_CREATE_REPLACE_DESTINATION | -+ G_FILE_CREATE_PRIVATE, - cancellable, error); - } - else - { -- out = (GOutputStream *)g_file_create (destination, 0, cancellable, error); -+ out = (GOutputStream *)g_file_create (destination, G_FILE_CREATE_PRIVATE, cancellable, error); - } - - if (!out) --- -2.11.0 - diff --git a/buildroot/package/libglib2/Config.in b/buildroot/package/libglib2/Config.in index ea946ba05..31f3649c7 100644 --- a/buildroot/package/libglib2/Config.in +++ b/buildroot/package/libglib2/Config.in @@ -7,8 +7,6 @@ config BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE_UCP - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_ZLIB help Low-level core library that forms the basis of GTK+ and GNOME. diff --git a/buildroot/package/libglib2/libglib2.hash b/buildroot/package/libglib2/libglib2.hash index faa01ef56..e3478f06b 100644 --- a/buildroot/package/libglib2/libglib2.hash +++ b/buildroot/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.56/glib-2.56.4.sha256sum -sha256 27f703d125efb07f8a743666b580df0b4095c59fc8750e8890132c91d437504c glib-2.56.4.tar.xz +# https://download.gnome.org/sources/glib/2.62/glib-2.62.4.sha256sum +sha256 4c84030d77fa9712135dfa8036ad663925655ae95b1d19399b6200e869925bbc glib-2.62.4.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libglib2/libglib2.mk b/buildroot/package/libglib2/libglib2.mk index 63bfec32d..f00818f69 100644 --- a/buildroot/package/libglib2/libglib2.mk +++ b/buildroot/package/libglib2/libglib2.mk @@ -4,105 +4,35 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.56 +LIBGLIB2_VERSION_MAJOR = 2.62 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ LIBGLIB2_LICENSE_FILES = COPYING -# 0002-disable-tests.patch -LIBGLIB2_AUTORECONF = YES - LIBGLIB2_INSTALL_STAGING = YES -LIBGLIB2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install -LIBGLIB2_CONF_ENV = \ - ac_cv_func_posix_getpwuid_r=yes \ - glib_cv_stack_grows=no \ - glib_cv_uscore=no \ - ac_cv_func_strtod=yes \ - ac_fsusage_space=yes \ - fu_cv_sys_stat_statfs2_bsize=yes \ - ac_cv_func_closedir_void=no \ - ac_cv_func_getloadavg=no \ - ac_cv_lib_util_getloadavg=no \ - ac_cv_lib_getloadavg_getloadavg=no \ - ac_cv_func_getgroups=yes \ - ac_cv_func_getgroups_works=yes \ - ac_cv_func_chown_works=yes \ - ac_cv_have_decl_euidaccess=no \ - ac_cv_func_euidaccess=no \ - ac_cv_have_decl_strnlen=yes \ - ac_cv_func_strnlen_working=yes \ - ac_cv_func_lstat_dereferences_slashed_symlink=yes \ - ac_cv_func_lstat_empty_string_bug=no \ - ac_cv_func_stat_empty_string_bug=no \ - vb_cv_func_rename_trailing_slash_bug=no \ - ac_cv_have_decl_nanosleep=yes \ - jm_cv_func_nanosleep_works=yes \ - gl_cv_func_working_utimes=yes \ - ac_cv_func_utime_null=yes \ - jm_cv_func_svid_putenv=yes \ - ac_cv_func_getcwd_null=yes \ - ac_cv_func_getdelim=yes \ - ac_cv_func_mkstemp=yes \ - utils_cv_func_mkstemp_limitations=no \ - utils_cv_func_mkdir_trailing_slash_bug=no \ - jm_cv_func_gettimeofday_clobber=no \ - gl_cv_func_working_readdir=yes \ - jm_ac_cv_func_link_follows_symlink=no \ - utils_cv_localtime_cache=no \ - ac_cv_struct_st_mtim_nsec=no \ - gl_cv_func_tzset_clobber=no \ - gl_cv_func_getcwd_null=yes \ - gl_cv_func_getcwd_path_max=yes \ - ac_cv_func_fnmatch_gnu=yes \ - am_getline_needs_run_time_check=no \ - am_cv_func_working_getline=yes \ - gl_cv_func_mkdir_trailing_slash_bug=no \ - gl_cv_func_mkstemp_limitations=no \ - ac_cv_func_working_mktime=yes \ - jm_cv_func_working_re_compile_pattern=yes \ - ac_use_included_regex=no \ - gl_cv_c_restrict=no \ - ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/bin/glib-genmarshal \ - ac_cv_prog_F77=no \ - ac_cv_func_posix_getgrgid_r=no \ - glib_cv_long_long_format=ll \ - ac_cv_func_printf_unix98=yes \ - ac_cv_func_vsnprintf_c99=yes \ - ac_cv_func_newlocale=no \ - ac_cv_func_uselocale=no \ - ac_cv_func_strtod_l=no \ - ac_cv_func_strtoll_l=no \ - ac_cv_func_strtoull_l=no \ - gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) - -# old uClibc versions don't provide qsort_r -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) -LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no -else -LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes -endif +LIBGLIB2_CFLAGS = $(TARGET_CFLAGS) +LIBGLIB2_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) # glib/valgrind.h contains inline asm not compatible with thumb1 ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) -LIBGLIB2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +LIBGLIB2_CFLAGS += -marm endif HOST_LIBGLIB2_CONF_OPTS = \ - --disable-coverage \ - --disable-dtrace \ - --disable-fam \ - --disable-libelf \ - --disable-selinux \ - --disable-systemtap \ - --disable-xattr \ - --with-pcre=system + -Ddtrace=false \ + -Dfam=false \ + -Dselinux=disabled \ + -Dsystemtap=false \ + -Dxattr=false \ + -Dinternal_pcre=false \ + -Dinstalled_tests=false \ + -Doss_fuzz=disabled LIBGLIB2_DEPENDENCIES = \ host-pkgconf host-libglib2 \ - libffi pcre util-linux zlib $(TARGET_NLS_DEPENDENCIES) + libffi pcre zlib $(TARGET_NLS_DEPENDENCIES) HOST_LIBGLIB2_DEPENDENCIES = \ host-gettext \ @@ -117,31 +47,29 @@ HOST_LIBGLIB2_DEPENDENCIES = \ # ${libdir} would be prefixed by the sysroot by pkg-config, causing a # bogus installation path once combined with $(DESTDIR). LIBGLIB2_CONF_OPTS = \ - --with-pcre=system \ - --disable-compile-warnings \ - --with-gio-module-dir=/usr/lib/gio/modules + -Dinternal_pcre=false \ + -Dgio_module_dir=/usr/lib/gio/modules \ + -Dinstalled_tests=false \ + -Doss_fuzz=disabled ifneq ($(BR2_ENABLE_LOCALE),y) LIBGLIB2_DEPENDENCIES += libiconv endif ifeq ($(BR2_PACKAGE_ELFUTILS),y) -LIBGLIB2_CONF_OPTS += --enable-libelf LIBGLIB2_DEPENDENCIES += elfutils -else -LIBGLIB2_CONF_OPTS += --disable-libelf endif ifeq ($(BR2_PACKAGE_LIBICONV),y) -LIBGLIB2_CONF_OPTS += --with-libiconv=gnu +LIBGLIB2_CONF_OPTS += -Diconv=external LIBGLIB2_DEPENDENCIES += libiconv endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -LIBGLIB2_CONF_OPTS += --enable-selinux +LIBGLIB2_CONF_OPTS += -Dselinux=enabled LIBGLIB2_DEPENDENCIES += libselinux else -LIBGLIB2_CONF_OPTS += --disable-selinux +LIBGLIB2_CONF_OPTS += -Dselinux=disabled endif # Purge gdb-related files @@ -151,6 +79,13 @@ define LIBGLIB2_REMOVE_GDB_FILES endef endif +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) +LIBGLIB2_CONF_OPTS += -Dlibmount=true +LIBGLIB2_DEPENDENCIES += util-linux +else +LIBGLIB2_CONF_OPTS += -Dlibmount=false +endif + # Purge useless binaries from target define LIBGLIB2_REMOVE_DEV_FILES rm -rf $(TARGET_DIR)/usr/lib/glib-2.0 @@ -161,6 +96,17 @@ endef LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_DEV_FILES +# Newer versions of libglib2 prefix glib-genmarshal, gobject-query, +# glib-mkenums, glib_compile_schemas, glib_compile_resources and gdbus-codegen +# with ${bindir}. Unfortunately, this will resolve to the host systems /bin/ +# directory, which will cause compilation issues if the host does not have these +# programs. By removing the ${bindir}/ prefix, these programs are resolved in +# PATH instead. +define LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE + $(SED) 's%$${bindir}/%%g' $(addprefix $(STAGING_DIR)/usr/lib/pkgconfig/, glib-2.0.pc gio-2.0.pc) +endef +LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE + # Remove schema sources/DTDs, we use staging ones to compile them. # Do so at target finalization since other packages install additional # ones and we want to deal with it in a single place. @@ -181,7 +127,7 @@ endef LIBGLIB2_TARGET_FINALIZE_HOOKS += LIBGLIB2_REMOVE_TARGET_SCHEMAS LIBGLIB2_TARGET_FINALIZE_HOOKS += LIBGLIB2_COMPILE_SCHEMAS -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) LIBGLIB2_HOST_BINARY = $(HOST_DIR)/bin/glib-genmarshal diff --git a/buildroot/package/libglu/libglu.hash b/buildroot/package/libglu/libglu.hash index 468787864..b0202a133 100644 --- a/buildroot/package/libglu/libglu.hash +++ b/buildroot/package/libglu/libglu.hash @@ -1,3 +1,7 @@ +# From https://lists.freedesktop.org/archives/mesa-announce/2019-July/000530.html +md5 151aef599b8259efe9acd599c96ea2a3 glu-9.0.1.tar.xz +sha1 b6ffef562ba55d3f80146d4238589cb9b1de66f5 glu-9.0.1.tar.xz +sha256 fb5a4c2dd6ba6d1c21ab7c05129b0769544e1d68e1e3b0ffecb18e73c93055bc glu-9.0.1.tar.xz +sha512 8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018 glu-9.0.1.tar.xz # locally computed -sha256 3d19cca9b26ec4048dd22e3d294acd43e080a3205a29ff47765bd514571ea8f9 glu-9.0.0.tar.gz sha256 84187ce0fd0153769675cb7f3301583eb27393f66b57c5604999a1d805a9184c include/GL/glu.h diff --git a/buildroot/package/libglu/libglu.mk b/buildroot/package/libglu/libglu.mk index 604045c22..e18c7f149 100644 --- a/buildroot/package/libglu/libglu.mk +++ b/buildroot/package/libglu/libglu.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBGLU_VERSION = 9.0.0 -LIBGLU_SITE = http://cgit.freedesktop.org/mesa/glu/snapshot -LIBGLU_SOURCE = glu-$(LIBGLU_VERSION).tar.gz +LIBGLU_VERSION = 9.0.1 +LIBGLU_SITE = https://mesa.freedesktop.org/archive/glu +LIBGLU_SOURCE = glu-$(LIBGLU_VERSION).tar.xz LIBGLU_LICENSE = SGI-B-2.0 LIBGLU_LICENSE_FILES = include/GL/glu.h LIBGLU_INSTALL_STAGING = YES -# upstream does not distribute a autoconf'ed configure script -LIBGLU_AUTORECONF = YES LIBGLU_DEPENDENCIES = libgl host-pkgconf $(eval $(autotools-package)) diff --git a/buildroot/package/libgpg-error/0001-gawk5-support.patch b/buildroot/package/libgpg-error/0001-gawk5-support.patch deleted file mode 100644 index 09d114c45..000000000 --- a/buildroot/package/libgpg-error/0001-gawk5-support.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - -Downloaded from -https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch - -Signed-off-by: Bernd Kuhls --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk -index ae29043..9a1fc18 100644 ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/Makefile.am b/src/Makefile.am -index ce1b882..f2590cb 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - -diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk -index 46d436c..e9c857c 100644 ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk -index a771a73..4578e29 100644 ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk -index ea58503..188f7a4 100644 ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk -index f79df66..15b1aad 100644 ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk -index c9de9c1..285e45f 100644 ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - --- -2.21.0 - diff --git a/buildroot/package/libgpg-error/Config.in b/buildroot/package/libgpg-error/Config.in index dbb554989..415cd015c 100644 --- a/buildroot/package/libgpg-error/Config.in +++ b/buildroot/package/libgpg-error/Config.in @@ -7,9 +7,9 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS BR2_mipsel || BR2_mips64 || BR2_mips64el || \ BR2_m68k || BR2_nios2 || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_RISCV_64 || \ - BR2_sh4 || BR2_sh4eb || BR2_sh4a || \ - BR2_sh4aeb || BR2_sparc || BR2_sparc64 || \ - BR2_x86_64 + BR2_RISCV_32 || BR2_sh4 || BR2_sh4eb || \ + BR2_sh4a || BR2_sh4aeb || BR2_sparc || \ + BR2_sparc64 || BR2_x86_64 config BR2_PACKAGE_LIBGPG_ERROR bool "libgpg-error" @@ -40,6 +40,8 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG if BR2_powerpc default "powerpc64-unknown-linux-gnu" \ if BR2_powerpc64 || BR2_powerpc64le + default "riscv32-unknown-linux-gnu" \ + if BR2_RISCV_32 default "riscv64-unknown-linux-gnu" \ if BR2_RISCV_64 default "sh4-unknown-linux-gnu" \ diff --git a/buildroot/package/libgpg-error/libgpg-error.hash b/buildroot/package/libgpg-error/libgpg-error.hash index b18ab7e6b..05c46d6d4 100644 --- a/buildroot/package/libgpg-error/libgpg-error.hash +++ b/buildroot/package/libgpg-error/libgpg-error.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.33.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.37.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 5d38826656e746c936e7742d9cde072b50baa3c4c49daa168a56813612bf03ff libgpg-error-1.33.tar.bz2 +sha256 b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763 libgpg-error-1.37.tar.bz2 # Locally calculated -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/buildroot/package/libgpg-error/libgpg-error.mk b/buildroot/package/libgpg-error/libgpg-error.mk index a34c85bff..6281faa66 100644 --- a/buildroot/package/libgpg-error/libgpg-error.mk +++ b/buildroot/package/libgpg-error/libgpg-error.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.33 +LIBGPG_ERROR_VERSION = 1.37 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB LIBGPG_ERROR_INSTALL_STAGING = YES -# 0001-gawk5-support.patch -LIBGPG_ERROR_AUTORECONF = YES LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LIBGPG_ERROR_CONF_OPTS = --disable-tests \ diff --git a/buildroot/package/libgpgme/libgpgme.hash b/buildroot/package/libgpgme/libgpgme.hash index 1e61fbd83..6ed6a3625 100644 --- a/buildroot/package/libgpgme/libgpgme.hash +++ b/buildroot/package/libgpgme/libgpgme.hash @@ -1,8 +1,6 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q4/000429.html -sha1 6f1828fcd7de4366ca063e57f35e4ab24bc91baf gpgme-1.12.0.tar.bz2 # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.12.0.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.13.1.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 b4dc951c3743a60e2e120a77892e9e864fb936b2e58e7c77e8581f4d050e8cd8 gpgme-1.12.0.tar.bz2 +sha256 c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46 gpgme-1.13.1.tar.bz2 # Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER diff --git a/buildroot/package/libgpgme/libgpgme.mk b/buildroot/package/libgpgme/libgpgme.mk index 85450c83d..1951cc667 100644 --- a/buildroot/package/libgpgme/libgpgme.mk +++ b/buildroot/package/libgpgme/libgpgme.mk @@ -4,16 +4,21 @@ # ################################################################################ -LIBGPGME_VERSION = 1.12.0 +LIBGPGME_VERSION = 1.13.1 LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPL-2.1+ LIBGPGME_LICENSE_FILES = COPYING.LESSER LIBGPGME_INSTALL_STAGING = YES LIBGPGME_DEPENDENCIES = libassuan libgpg-error -LIBGPGME_LANGUAGE_BINDINGS = cl LIBGPGME_CONFIG_SCRIPTS = gpgme-config +LIBGPGME_LANGUAGE_BINDINGS = cl +# C++ bindings require a C++11 capable gcc, and -Wsuggest-override support +ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_TOOLCHAIN_GCC_AT_LEAST_5),yy) +LIBGPGME_LANGUAGE_BINDINGS += cpp +endif + LIBGPGME_CONF_OPTS = \ --with-gpg-error-prefix=$(STAGING_DIR)/usr \ --with-libassuan-prefix=$(STAGING_DIR)/usr \ @@ -21,12 +26,7 @@ LIBGPGME_CONF_OPTS = \ --disable-gpgconf-test \ --disable-g13-test \ --disable-gpg-test \ - --enable-languages=$(LIBGPGME_LANGUAGE_BINDINGS) - -# C++ bindings require a C++11 capable gcc -ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),yy) -LIBGPGME_LANGUAGE_BINDINGS := $(LIBGPGME_LANGUAGE_BINDINGS),cpp -endif + --enable-languages=$(subst $(space),$(comma),$(LIBGPGME_LANGUAGE_BINDINGS)) # Handle argp-standalone or it errors out during build ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) diff --git a/buildroot/package/libgphoto2/libgphoto2.hash b/buildroot/package/libgphoto2/libgphoto2.hash index e0590df89..0d965da0f 100644 --- a/buildroot/package/libgphoto2/libgphoto2.hash +++ b/buildroot/package/libgphoto2/libgphoto2.hash @@ -1,7 +1,7 @@ -# https://sourceforge.net/projects/gphoto/files/libgphoto/2.5.17/ -md5 ae78e7a7936a6962c3a22b256bee1869 libgphoto2-2.5.17.tar.bz2 -sha1 b55167bbb73518c5b7f67f90e619c46d05005c7d libgphoto2-2.5.17.tar.bz2 +# https://sourceforge.net/projects/gphoto/files/libgphoto/2.5.23/ +md5 bf052ce815e607dc781c5b0f3c5ca5c0 libgphoto2-2.5.23.tar.bz2 +sha1 01f91d2b5d2aef7e80ab846fea4d5eb5cc67ed79 libgphoto2-2.5.23.tar.bz2 # Locally calculated hash -sha256 417464f0a313fa937e8a71cdf18a371cf01e750830195cd63ae31da0d092b555 libgphoto2-2.5.17.tar.bz2 +sha256 d8af23364aa40fd8607f7e073df74e7ace05582f4ba13f1724d12d3c97e8852d libgphoto2-2.5.23.tar.bz2 sha256 ebc385a0b1d477be5177ed6d9129557aa59a3ad0f26ebe7dd97ee942a0fb68ee COPYING diff --git a/buildroot/package/libgphoto2/libgphoto2.mk b/buildroot/package/libgphoto2/libgphoto2.mk index 2828fcb36..63e6a8775 100644 --- a/buildroot/package/libgphoto2/libgphoto2.mk +++ b/buildroot/package/libgphoto2/libgphoto2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPHOTO2_VERSION = 2.5.17 +LIBGPHOTO2_VERSION = 2.5.23 LIBGPHOTO2_SOURCE = libgphoto2-$(LIBGPHOTO2_VERSION).tar.bz2 # Project is maintained on github but github tarball doesn't have # configure, so use tarballs from SourceForge diff --git a/buildroot/package/libgpiod/libgpiod.hash b/buildroot/package/libgpiod/libgpiod.hash index e68ebdb8c..f0009a751 100644 --- a/buildroot/package/libgpiod/libgpiod.hash +++ b/buildroot/package/libgpiod/libgpiod.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 736d8b511ad247c2acb01b592f2bbe5e757e14e1d8347b2d80683081ab4b31b8 libgpiod-1.2.1.tar.xz +sha256 21ae8fd1f8dafc2eb2ba50e652390cf533d21351419a7426255895cb52e21b1c libgpiod-1.4.1.tar.xz # Hash for license file sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING diff --git a/buildroot/package/libgpiod/libgpiod.mk b/buildroot/package/libgpiod/libgpiod.mk index c46ffa871..2474ab90a 100644 --- a/buildroot/package/libgpiod/libgpiod.mk +++ b/buildroot/package/libgpiod/libgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPIOD_VERSION = 1.2.1 +LIBGPIOD_VERSION = 1.4.1 LIBGPIOD_SOURCE = libgpiod-$(LIBGPIOD_VERSION).tar.xz LIBGPIOD_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libgsm/libgsm.hash b/buildroot/package/libgsm/libgsm.hash index 523e629dc..32e20c8f4 100644 --- a/buildroot/package/libgsm/libgsm.hash +++ b/buildroot/package/libgsm/libgsm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 855a57d1694941ddf3c73cb79b8d0b3891e9c9e7870b4981613b734e1ad07601 gsm-1.0.17.tar.gz +sha256 04f68087c3348bf156b78d59f4d8aff545da7f6e14f33be8f47d33f4efae2a10 gsm-1.0.18.tar.gz sha256 81c68a3374937ed9b5e4929c709e81a2c4b35b5d1f450ecf8c473e2daea46ff6 COPYRIGHT diff --git a/buildroot/package/libgsm/libgsm.mk b/buildroot/package/libgsm/libgsm.mk index 0add45c5e..b9ae7d3ee 100644 --- a/buildroot/package/libgsm/libgsm.mk +++ b/buildroot/package/libgsm/libgsm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGSM_VERSION = 1.0.17 +LIBGSM_VERSION = 1.0.18 LIBGSM_SOURCE = gsm-$(LIBGSM_VERSION).tar.gz LIBGSM_SITE = http://www.quut.com/gsm LIBGSM_LICENSE = gsm diff --git a/buildroot/package/libgtk2/Config.in b/buildroot/package/libgtk2/Config.in index aa297d71e..7c5762a58 100644 --- a/buildroot/package/libgtk2/Config.in +++ b/buildroot/package/libgtk2/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz select BR2_PACKAGE_ATK select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS @@ -33,9 +34,10 @@ config BR2_PACKAGE_LIBGTK2_DEMO endif -comment "libgtk2 needs a toolchain w/ wchar, threads, C++" +comment "libgtk2 needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_XORG7 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libgtk3/Config.in b/buildroot/package/libgtk3/Config.in index 12e64707b..6b8f5abff 100644 --- a/buildroot/package/libgtk3/Config.in +++ b/buildroot/package/libgtk3/Config.in @@ -1,7 +1,8 @@ -comment "libgtk3 needs a toolchain w/ wchar, threads, C++" +comment "libgtk3 needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_TOOLCHAIN_HAS_THREADS comment "libgtk3 needs an OpenGL or an OpenGL-EGL/wayland backend" @@ -17,6 +18,7 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_ATK diff --git a/buildroot/package/libgtk3/libgtk3.hash b/buildroot/package/libgtk3/libgtk3.hash index b7a89901d..dd902624c 100644 --- a/buildroot/package/libgtk3/libgtk3.hash +++ b/buildroot/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.30.sha256sum -sha256 a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567 gtk+-3.22.30.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.24/gtk+-3.24.12.sha256sum +sha256 1384eba5614fed160044ae0d32369e3df7b4f517b03f4b1f24d383e528f4be83 gtk+-3.24.12.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/buildroot/package/libgtk3/libgtk3.mk b/buildroot/package/libgtk3/libgtk3.mk index b9adc673f..fc131132f 100644 --- a/buildroot/package/libgtk3/libgtk3.mk +++ b/buildroot/package/libgtk3/libgtk3.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGTK3_VERSION_MAJOR = 3.22 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).30 +LIBGTK3_VERSION_MAJOR = 3.24 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).12 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/libgudev/libgudev.hash b/buildroot/package/libgudev/libgudev.hash index 138ae93d7..bee394601 100644 --- a/buildroot/package/libgudev/libgudev.hash +++ b/buildroot/package/libgudev/libgudev.hash @@ -1,5 +1,5 @@ -# From: http://ftp.gnome.org/pub/GNOME/sources/libgudev/232/libgudev-232.sha256sum -sha256 ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860 libgudev-232.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/libgudev/233/libgudev-233.sha256sum +sha256 587c4970eb23f4e2deee2cb1fb7838c94a78c578f41ce12cac0a3f4a80dabb03 libgudev-233.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libgudev/libgudev.mk b/buildroot/package/libgudev/libgudev.mk index 50432c461..63d592f9a 100644 --- a/buildroot/package/libgudev/libgudev.mk +++ b/buildroot/package/libgudev/libgudev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGUDEV_VERSION = 232 +LIBGUDEV_VERSION = 233 LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz LIBGUDEV_SITE = http://ftp.gnome.org/pub/GNOME/sources/libgudev/$(LIBGUDEV_VERSION) LIBGUDEV_INSTALL_STAGING = YES diff --git a/buildroot/package/libhdhomerun/libhdhomerun.hash b/buildroot/package/libhdhomerun/libhdhomerun.hash index b7ad5b52e..8b45486a1 100644 --- a/buildroot/package/libhdhomerun/libhdhomerun.hash +++ b/buildroot/package/libhdhomerun/libhdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 437888b27206f526827ee7a4c57c1c167a36483b0445232e07fb7bb7ee854b42 libhdhomerun_20180817.tgz +sha256 9a60f663b00de5f820bdb85806662e25f22da248b14942e33a8b43a0331f855a libhdhomerun_20190621.tgz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/buildroot/package/libhdhomerun/libhdhomerun.mk b/buildroot/package/libhdhomerun/libhdhomerun.mk index 96be54a78..8281b2462 100644 --- a/buildroot/package/libhdhomerun/libhdhomerun.mk +++ b/buildroot/package/libhdhomerun/libhdhomerun.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHDHOMERUN_VERSION = 20180817 +LIBHDHOMERUN_VERSION = 20190621 LIBHDHOMERUN_SOURCE = libhdhomerun_$(LIBHDHOMERUN_VERSION).tgz LIBHDHOMERUN_SITE = http://download.silicondust.com/hdhomerun LIBHDHOMERUN_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libhtp/0001-fix-build-without-GNU-libiconv.patch b/buildroot/package/libhtp/0001-fix-build-without-GNU-libiconv.patch new file mode 100644 index 000000000..8f6cddf2d --- /dev/null +++ b/buildroot/package/libhtp/0001-fix-build-without-GNU-libiconv.patch @@ -0,0 +1,60 @@ +From 1531a8e9b91b567979a2a0d7fd6a4c2e9126b01c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 6 Mar 2019 23:06:54 +0100 +Subject: [PATCH] fix build without GNU libiconv + +iconvctl is only defined in GNU libiconv so check for the availability +of this function before using it + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OISF/libhtp/pull/193] +--- + configure.ac | 18 ++++++++++++++++++ + htp/htp_transcoder.c | 2 +- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7f0a58d..388ec7b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -155,6 +155,24 @@ sinclude(m4/lib-link.m4) + sinclude(m4/lib-prefix.m4) + AM_ICONV + ++# iconvctl is not standard, it is defined only in GNU libiconv ++AC_MSG_CHECKING(for iconvctl) ++TMPLIBS="${LIBS}" ++LIBS="${LIBS} ${LIBICONV}" ++ ++AC_TRY_LINK([#include ++ #include ], ++ [int iconv_param = 0; ++ iconv_t cd = iconv_open("",""); ++ iconvctl(cd, ICONV_SET_DISCARD_ILSEQ, &iconv_param); ++ iconv_close(cd);], ++ [ac_cv_func_iconvctl=yes]) ++AC_MSG_RESULT($ac_cv_func_iconvctl) ++if test "$ac_cv_func_iconvctl" == yes; then ++ AC_DEFINE(HAVE_ICONVCTL,1,"Define to 1 if you have the `iconvctl' function.") ++fi ++LIBS="${TMPLIBS}" ++ + dnl ----------------------------------------------- + dnl Check and enable the GCC opts we want to use. + dnl We may need to add more checks +diff --git a/htp/htp_transcoder.c b/htp/htp_transcoder.c +index 57ff74c..d8e8280 100644 +--- a/htp/htp_transcoder.c ++++ b/htp/htp_transcoder.c +@@ -64,7 +64,7 @@ int htp_transcode_params(htp_connp_t *connp, htp_table_t **params, int destroy_o + return HTP_ERROR; + } + +- #if (_LIBICONV_VERSION >= 0x0108) ++ #if (_LIBICONV_VERSION >= 0x0108 && HAVE_ICONVCTL) + int iconv_param = 0; + iconvctl(cd, ICONV_SET_TRANSLITERATE, &iconv_param); + iconv_param = 1; +-- +2.14.1 + diff --git a/buildroot/package/libhtp/0002-htp.pc.in-add-lz-to-Libs.private.patch b/buildroot/package/libhtp/0002-htp.pc.in-add-lz-to-Libs.private.patch new file mode 100644 index 000000000..f79a9ebb3 --- /dev/null +++ b/buildroot/package/libhtp/0002-htp.pc.in-add-lz-to-Libs.private.patch @@ -0,0 +1,29 @@ +From 39e534ab696157b244ec226d649c789dcf423e42 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 24 Apr 2019 20:48:57 +0200 +Subject: [PATCH] htp.pc.in: add -lz to Libs.private + +zlib is a mandatory dependency so add it to Libs.private otherwise +static linking of packages linking with htp (e.g. suricata) will fail. + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + htp.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/htp.pc.in b/htp.pc.in +index 2fec995..9b1a6cc 100644 +--- a/htp.pc.in ++++ b/htp.pc.in +@@ -7,6 +7,6 @@ Name: @PACKAGE_NAME@ + Description: A security-aware HTTP parser, designed for use in IDS/IPS and WAF products. + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lhtp +-Libs.private: @LIBICONV@ ++Libs.private: -lz @LIBICONV@ + Cflags: -I${includedir} -I${libdir}/htp/include + +-- +2.20.1 + diff --git a/buildroot/package/libhtp/Config.in b/buildroot/package/libhtp/Config.in new file mode 100644 index 000000000..98b9e2ade --- /dev/null +++ b/buildroot/package/libhtp/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBHTP + bool "libhtp" + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_ZLIB + help + LibHTP is a security-aware parser for the HTTP protocol and + the related bits and pieces. + + https://github.com/OISF/libhtp diff --git a/buildroot/package/libhtp/libhtp.hash b/buildroot/package/libhtp/libhtp.hash new file mode 100644 index 000000000..b3775c3ad --- /dev/null +++ b/buildroot/package/libhtp/libhtp.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 a6a6f3b3f1fb6e8b8a1dae02db8a0090c438f0d057102dd8e52208224868c4e4 libhtp-0.5.32.tar.gz +sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE diff --git a/buildroot/package/libhtp/libhtp.mk b/buildroot/package/libhtp/libhtp.mk new file mode 100644 index 000000000..577b70095 --- /dev/null +++ b/buildroot/package/libhtp/libhtp.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# libhtp +# +################################################################################ + +LIBHTP_VERSION = 0.5.32 +LIBHTP_SITE = $(call github,OISF,libhtp,$(LIBHTP_VERSION)) +LIBHTP_LICENSE = BSD-3-Clause +LIBHTP_LICENSE_FILES = LICENSE +LIBHTP_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ + zlib +LIBHTP_INSTALL_STAGING = YES +# From git +LIBHTP_AUTORECONF = YES + +# Let our gcc/wrapper handle SSP +LIBHTP_CONF_ENV = NO_STACK_PROTECTOR=true + +$(eval $(autotools-package)) diff --git a/buildroot/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch b/buildroot/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch deleted file mode 100644 index 70f16f662..000000000 --- a/buildroot/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 384917321c45e492b0ca7aaa94d4b15324aef95d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 28 Aug 2015 19:02:11 +0200 -Subject: [PATCH] Use -f option when calling ln at install time - -This allows "make install; make install" to work properly. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Renaud AUBIN ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 6cf63bd..c182e5c 100644 ---- a/Makefile -+++ b/Makefile -@@ -133,14 +133,14 @@ tags: http_parser.c http_parser.h test.c - install: library - $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h - $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) -- ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) -- ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) -+ ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) -+ ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) - - install-strip: library - $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h - $(INSTALL) -D -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) -- ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) -- ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) -+ ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) -+ ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) - - uninstall: - rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h --- -2.6.2 - diff --git a/buildroot/package/libhttpparser/libhttpparser.hash b/buildroot/package/libhttpparser/libhttpparser.hash index b7df9ca60..4634b0662 100644 --- a/buildroot/package/libhttpparser/libhttpparser.hash +++ b/buildroot/package/libhttpparser/libhttpparser.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ef26268c54c8084d17654ba2ed5140bffeffd2a040a895ffb22a6cca3f6c613f libhttpparser-v2.9.0.tar.gz +sha256 8fa0ab8770fd8425a9b431fdbf91623c4d7a9cdb842b9339289bd2b0b01b0d3d libhttpparser-2.9.3.tar.gz sha256 79e6ba8b687cb54786207342b9b6fcee0ac10218453ed9009b84d949b2233cc0 LICENSE-MIT diff --git a/buildroot/package/libhttpparser/libhttpparser.mk b/buildroot/package/libhttpparser/libhttpparser.mk index 8c0afe280..d7b690749 100644 --- a/buildroot/package/libhttpparser/libhttpparser.mk +++ b/buildroot/package/libhttpparser/libhttpparser.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBHTTPPARSER_VERSION = v2.9.0 -LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,$(LIBHTTPPARSER_VERSION)) +LIBHTTPPARSER_VERSION = 2.9.3 +LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,v$(LIBHTTPPARSER_VERSION)) LIBHTTPPARSER_INSTALL_STAGING = YES LIBHTTPPARSER_LICENSE = MIT LIBHTTPPARSER_LICENSE_FILES = LICENSE-MIT diff --git a/buildroot/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch b/buildroot/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch new file mode 100644 index 000000000..74ca58bb3 --- /dev/null +++ b/buildroot/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch @@ -0,0 +1,27 @@ +From 2bc7cf0beb6b8a124c1c7360c4fb5279e8763f07 Mon Sep 17 00:00:00 2001 +From: Sebastiano Merlino +Date: Sat, 8 Jun 2019 15:36:06 -0700 +Subject: [PATCH] Fix lib expectations in libhttpserver.pc.in + +Signed-off-by: Stephan Hoffmann +--- +Patch status: upstream commit 458d16b922304006fe418897044e14 + + libhttpserver.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libhttpserver.pc.in b/libhttpserver.pc.in +index 36355ee..55f7c0e 100644 +--- a/libhttpserver.pc.in ++++ b/libhttpserver.pc.in +@@ -8,6 +8,6 @@ Description: A C++ library for creating an embedded Rest HTTP server + Version: @VERSION@ + Requires: libmicrohttpd >= 0.9.37 + Conflicts: +-Libs: -L${libdir} -lmicrohttpd ++Libs: -L${libdir} -lhttpserver + Libs.private: @LHT_LIBDEPS@ + Cflags: -I${includedir} -I${includedir}/httpserver +-- +2.17.1 + diff --git a/buildroot/package/libhttpserver/Config.in b/buildroot/package/libhttpserver/Config.in new file mode 100644 index 000000000..03715d056 --- /dev/null +++ b/buildroot/package/libhttpserver/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LIBHTTPSERVER + bool "libhttpserver" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBMICROHTTPD + help + libhttpserver is a C++ library for building high performance + RESTfuls web servers. libhttpserver is built upon + libmicrohttpd to provide a simple API for developers to + create HTTP services in C++. + + https://github.com/etr/libhttpserver + +comment "libhttpserver needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libhttpserver/libhttpserver.hash b/buildroot/package/libhttpserver/libhttpserver.hash new file mode 100644 index 000000000..0333aabba --- /dev/null +++ b/buildroot/package/libhttpserver/libhttpserver.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 778fa0aec199bf8737b2d540c2563a694c18957329f9885e372f7aaafb838351 libhttpserver-0.17.5.tar.gz +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LESSER diff --git a/buildroot/package/libhttpserver/libhttpserver.mk b/buildroot/package/libhttpserver/libhttpserver.mk new file mode 100644 index 000000000..1fd76519f --- /dev/null +++ b/buildroot/package/libhttpserver/libhttpserver.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libhttpserver +# +################################################################################ + +LIBHTTPSERVER_VERSION = 0.17.5 +LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION)) +LIBHTTPSERVER_LICENSE = LGPL-2.1+ +LIBHTTPSERVER_LICENSE_FILES = COPYING.LESSER +LIBHTTPSERVER_INSTALL_STAGING = YES +LIBHTTPSERVER_CONF_OPTS = --enable-same-directory-build +LIBHTTPSERVER_AUTORECONF = YES +LIBHTTPSERVER_DEPENDENCIES = libmicrohttpd + +$(eval $(autotools-package)) diff --git a/buildroot/package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch b/buildroot/package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch new file mode 100644 index 000000000..0d74835e4 --- /dev/null +++ b/buildroot/package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch @@ -0,0 +1,27 @@ +From 6b9438d746cec6e4e632d78c5244f4be6314d1c9 Mon Sep 17 00:00:00 2001 +From: Allen Winter +Date: Sun, 28 May 2017 12:51:10 -0400 +Subject: [PATCH] icaltypes.c - icalreqstattype_from_string(), copy the + reqstattype's debug string into its own memory in the ring buffer. + +Issue#253 +Signed-off-by: Fabrice Fontaine +[Retrieved (and backported) from: +https://github.com/libical/libical/commit/6b9438d746cec6e4e632d78c5244f4be6314d1c9] +--- + src/libical/icaltypes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libical/icaltypes.c b/src/libical/icaltypes.c +index 70c50d29..85c33545 100644 +--- a/src/libical/icaltypes.c ++++ b/src/libical/icaltypes.c +@@ -140,7 +140,7 @@ struct icalreqstattype icalreqstattype_from_string(const char *str) + + p2 = strchr(p1+1,';'); + if (p2 != 0 && *p2 != 0){ +- stat.debug = p2+1; ++ stat.debug = icalmemory_tmp_copy(p2+1); + } + + return stat; diff --git a/buildroot/package/libical/libical.mk b/buildroot/package/libical/libical.mk index 7125aa8b1..f9a266026 100644 --- a/buildroot/package/libical/libical.mk +++ b/buildroot/package/libical/libical.mk @@ -10,6 +10,9 @@ LIBICAL_INSTALL_STAGING = YES LIBICAL_LICENSE = MPL-1.0 or LGPL-2.1 LIBICAL_LICENSE_FILES = LICENSE +# 0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch +LIBICAL_IGNORE_CVES += CVE-2016-9584 + # building without this option is broken, it is used by # Gentoo/alpinelinux as well LIBICAL_CONF_OPTS = -DSHARED_ONLY=true diff --git a/buildroot/package/libiconv/Config.in b/buildroot/package/libiconv/Config.in index ee4fd6201..c08a844b0 100644 --- a/buildroot/package/libiconv/Config.in +++ b/buildroot/package/libiconv/Config.in @@ -5,3 +5,25 @@ config BR2_PACKAGE_LIBICONV unicode conversion library http://ftp.gnu.org/pub/gnu/libiconv + +if BR2_PACKAGE_LIBICONV + +config BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS + bool "extra encodings" + help + Provide support for a few extra encodings: + + European languages + CP{437,737,775,852,853,855,857,858,860,861,863,865,869,1125} + Semitic languages + CP864 + Japanese + EUC-JISX0213, Shift_JISX0213, ISO-2022-JP-3 + Chinese + BIG5-2003 (experimental) + Turkmen + TDS565 + Platform specifics + ATARIST, RISCOS-LATIN1 + +endif diff --git a/buildroot/package/libiconv/libiconv.mk b/buildroot/package/libiconv/libiconv.mk index 9a8133612..ec79a5d73 100644 --- a/buildroot/package/libiconv/libiconv.mk +++ b/buildroot/package/libiconv/libiconv.mk @@ -10,6 +10,10 @@ LIBICONV_INSTALL_STAGING = YES LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPL-2.0+ (library) LIBICONV_LICENSE_FILES = COPYING COPYING.LIB +ifeq ($(BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS),y) +LIBICONV_CONF_OPTS = --enable-extra-encodings +endif + # Don't build the preloadable library, as we don't need it (it's only # for LD_PRELOAD to replace glibc's iconv, but we never build libiconv # when glibc is used). And it causes problems for static only builds. diff --git a/buildroot/package/libidn2/libidn2.hash b/buildroot/package/libidn2/libidn2.hash index 300cedb47..2d2fcdfd1 100644 --- a/buildroot/package/libidn2/libidn2.hash +++ b/buildroot/package/libidn2/libidn2.hash @@ -1,5 +1,5 @@ # Calculated locally after checking signature -sha256 032398dbaa9537af43f51a8d94e967e3718848547b1b2a4eb3138b20cad11d32 libidn2-2.1.0.tar.gz +sha256 e1cb1db3d2e249a6a3eb6f0946777c2e892d5c5dc7bd91c74394fc3a01cab8b5 libidn2-2.3.0.tar.gz # Hash for license files: sha256 73483f797a83373fca1b968c11785b98c4fc4803cdc7d3210811ca8b075d6d76 COPYING diff --git a/buildroot/package/libidn2/libidn2.mk b/buildroot/package/libidn2/libidn2.mk index 7112553fe..3f87b9bb8 100644 --- a/buildroot/package/libidn2/libidn2.mk +++ b/buildroot/package/libidn2/libidn2.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBIDN2_VERSION = 2.1.0 +LIBIDN2_VERSION = 2.3.0 LIBIDN2_SITE = $(BR2_GNU_MIRROR)/libidn -LIBIDN2_LICENSE := GPL-2.0+ or LGPL-3.0+ (library) +LIBIDN2_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) LIBIDN2_LICENSE_FILES = COPYING COPYINGv2 COPYING.LESSERv3 COPYING.unicode LIBIDN2_DEPENDENCIES = \ host-pkgconf \ @@ -24,7 +24,7 @@ define LIBIDN2_REMOVE_BINARY endef LIBIDN2_POST_INSTALL_TARGET_HOOKS += LIBIDN2_REMOVE_BINARY else -LIBIDN2_LICENSE := $(LIBIDN2_LICENSE), GPL-3.0+ (program) +LIBIDN2_LICENSE += , GPL-3.0+ (program) endif $(eval $(autotools-package)) diff --git a/buildroot/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch b/buildroot/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch new file mode 100644 index 000000000..a02bb6055 --- /dev/null +++ b/buildroot/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch @@ -0,0 +1,44 @@ +From 5090603d01779bb1717fb0c50953330e8770550f Mon Sep 17 00:00:00 2001 +From: Pierre-Jean Texier +Date: Sun, 23 Jun 2019 14:11:37 +0200 +Subject: [PATCH] fix install of binaries with a static only library + +Define CMAKE_INSTALL_RPATH only if ENABLE_SHARED is set otherwise the +following issue occured: + +CMake Error at iiod/cmake_install.cmake:45 (file): + file RPATH_CHANGE could not write new RPATH: + + /usr/lib + + to the file: + + /home/pjtexier//usr/sbin/iiod + + No valid ELF RPATH or RUNPATH entry exists in the file; File does not have + a valid ELF identification. +Call Stack (most recent call first): + cmake_install.cmake:50 (include) + +Signed-off-by: Pierre-Jean Texier +[Upstream status: https://github.com/analogdevicesinc/libiio/pull/283] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d9b7ea1..634e553 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,7 +15,7 @@ endif() + + set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBIIO_VERSION_MAJOR}-doc)") + include(GNUInstallDirs) +-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") ++if(ENABLE_SHARED AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + endif() +-- +2.7.4 + diff --git a/buildroot/package/libiio/libiio.hash b/buildroot/package/libiio/libiio.hash index 800b2ee8f..34c314427 100644 --- a/buildroot/package/libiio/libiio.hash +++ b/buildroot/package/libiio/libiio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a729f8ff48137ad271a3e2951f322b35c1bf2ec075b488d75c8bd071c693fd19 libiio-0.15.tar.gz +sha256 bc2c5299974b65cfe9aa4a06d8c74d7651594e026bce416db48a2c5aa7ba2554 libiio-0.18.tar.gz sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b COPYING.txt diff --git a/buildroot/package/libiio/libiio.mk b/buildroot/package/libiio/libiio.mk index 2371a7106..8c8f79bd7 100644 --- a/buildroot/package/libiio/libiio.mk +++ b/buildroot/package/libiio/libiio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIIO_VERSION = 0.15 +LIBIIO_VERSION = 0.18 LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION)) LIBIIO_INSTALL_STAGING = YES LIBIIO_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libimxvpuapi/libimxvpuapi.mk b/buildroot/package/libimxvpuapi/libimxvpuapi.mk index bcabbf387..a2a3b2110 100644 --- a/buildroot/package/libimxvpuapi/libimxvpuapi.mk +++ b/buildroot/package/libimxvpuapi/libimxvpuapi.mk @@ -10,5 +10,6 @@ LIBIMXVPUAPI_LICENSE = LGPL-2.1+ LIBIMXVPUAPI_LICENSE_FILES = LICENSE LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python imx-vpu LIBIMXVPUAPI_INSTALL_STAGING = YES +LIBIMXVPUAPI_NEEDS_EXTERNAL_WAF = YES $(eval $(waf-package)) diff --git a/buildroot/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch b/buildroot/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch deleted file mode 100644 index c9a0652e4..000000000 --- a/buildroot/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 57383dc900e76e65ce5e5dc95f776e086100344d Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sat, 12 Jan 2019 10:22:38 +0100 -Subject: [PATCH] meson.build: enable CPP include check only in case CPP - compiler is available - -Drop hard meson C++/CPP dependency, only needed for the build-time -header inclusion test, build the test only in case C++/CPP compiler -is available. - -Signed-off-by: Peter Seiderer ---- - meson.build | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/meson.build b/meson.build -index a9c7c185..8183822e 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,4 @@ --project('libinput', 'c', 'cpp', -+project('libinput', 'c', - version : '1.12.5', - license : 'MIT/Expat', - default_options : [ 'c_std=gnu99', 'warning_level=2' ], -@@ -641,12 +641,14 @@ executable('test-build-linker', - include_directories : [includes_src, includes_include], - dependencies : [ dep_libinput, dep_libinput_util ], - install : false) --# test including from C++ --executable('test-build-cxx', -- 'test/build-cxx.cc', -- dependencies : [dep_udev], -- include_directories : [includes_src, includes_include], -- install : false) -+# test including from C++ (in case CPP compiler is available) -+if add_languages('cpp', required: false) -+ executable('test-build-cxx', -+ 'test/build-cxx.cc', -+ dependencies : [dep_udev], -+ include_directories : [includes_src, includes_include], -+ install : false) -+endif - - # This is the test suite runner, we allow disabling that one because of - # dependencies --- -2.20.1 - diff --git a/buildroot/package/libinput/Config.in b/buildroot/package/libinput/Config.in index f7793df84..14e4e70f9 100644 --- a/buildroot/package/libinput/Config.in +++ b/buildroot/package/libinput/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBINPUT bool "libinput" - depends on BR2_ENABLE_LOCALE depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_LIBEVDEV select BR2_PACKAGE_MTDEV @@ -14,5 +13,5 @@ config BR2_PACKAGE_LIBINPUT http://freedesktop.org/wiki/Software/libinput/ -comment "libinput needs udev /dev management and a toolchain w/ locale" - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_ENABLE_LOCALE +comment "libinput needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV diff --git a/buildroot/package/libinput/libinput.hash b/buildroot/package/libinput/libinput.hash index 3ca3fd677..ee6416e3b 100644 --- a/buildroot/package/libinput/libinput.hash +++ b/buildroot/package/libinput/libinput.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2019-January/039804.html -md5 40dcc044443c9314537f605b6f30bf17 libinput-1.12.5.tar.xz -sha1 7c0b75e8cf2f1747fb8ae69300acabd46f7a7f0d libinput-1.12.5.tar.xz -sha256 7d4b6831010ef3bf69df4b41170047fa4325edef8ff5d2d28e78281af0687123 libinput-1.12.5.tar.xz -sha512 9365b91b3ac2c4ff0f9927913242afac7677979682dd7b541001b13d09d7982acd854f6d348101cfa4b0854c6a92b4c683f62593a97870e32ae3d607eaeae3ff libinput-1.12.5.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2020-March/041332.html +md5 76c5cb1a55f5098ed353ae7d4e054c50 libinput-1.15.4.tar.xz +sha1 43740a5fec3f6d474906173cc01ff3d73d935d2f libinput-1.15.4.tar.xz +sha256 9c8b6846d94e374ee4bdb32634e4ac4aa318afc31f9a58fcb545cd3095c745c1 libinput-1.15.4.tar.xz +sha512 4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80 libinput-1.15.4.tar.xz # License files -sha256 70d5b1dfe5a9c50a1f2ea91b1c2b1c85d876c5c92339585edbb85cf69e945e14 COPYING +sha256 70d5b1dfe5a9c50a1f2ea91b1c2b1c85d876c5c92339585edbb85cf69e945e14 COPYING diff --git a/buildroot/package/libinput/libinput.mk b/buildroot/package/libinput/libinput.mk index bc4cc8982..5e2ee696b 100644 --- a/buildroot/package/libinput/libinput.mk +++ b/buildroot/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.12.5 +LIBINPUT_VERSION = 1.15.4 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev diff --git a/buildroot/package/libiqrf/libiqrf.hash b/buildroot/package/libiqrf/libiqrf.hash index 12d526c83..b7f3b9bf2 100644 --- a/buildroot/package/libiqrf/libiqrf.hash +++ b/buildroot/package/libiqrf/libiqrf.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8111031dd9dd6093a1927eb32dd7476fe22cfee9190043aa8e4c88003c104b16 libiqrf-v0.1.2.tar.gz +sha256 8111031dd9dd6093a1927eb32dd7476fe22cfee9190043aa8e4c88003c104b16 libiqrf-0.1.2.tar.gz diff --git a/buildroot/package/libiqrf/libiqrf.mk b/buildroot/package/libiqrf/libiqrf.mk index f403a5e36..cd03373de 100644 --- a/buildroot/package/libiqrf/libiqrf.mk +++ b/buildroot/package/libiqrf/libiqrf.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBIQRF_VERSION = v0.1.2 -LIBIQRF_SITE = $(call github,nandra,libiqrf,$(LIBIQRF_VERSION)) +LIBIQRF_VERSION = 0.1.2 +LIBIQRF_SITE = $(call github,nandra,libiqrf,v$(LIBIQRF_VERSION)) LIBIQRF_INSTALL_STAGING = YES LIBIQRF_DEPENDENCIES = libusb LIBIQRF_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libiscsi/0001-Do-not-use-I-usr-include.-This-is-unsafe-when-cross-compiling.patch b/buildroot/package/libiscsi/0001-Do-not-use-I-usr-include.-This-is-unsafe-when-cross-compiling.patch deleted file mode 100644 index dc047ef49..000000000 --- a/buildroot/package/libiscsi/0001-Do-not-use-I-usr-include.-This-is-unsafe-when-cross-compiling.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f27bdf64f0c375352ca42928071a9178a5a04c46 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Sun, 16 Oct 2016 10:53:13 +0100 -Subject: [PATCH] Do not use -I/usr/include. This is unsafe when cross-compiling. - -Upstream status: PR sent (https://github.com/sahlberg/libiscsi/pull/219) - -Signed-off-by: Vicente Olivert Riera ---- - examples/Makefile.am | 2 +- - lib/Makefile.am | 2 +- - tests/Makefile.am | 2 +- - utils/Makefile.am | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/examples/Makefile.am b/examples/Makefile.am -index 0de0b1f..42ad818 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -1,6 +1,6 @@ - AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" --AM_CFLAGS=$(WARN_CFLAGS) -I/usr/include -+AM_CFLAGS=$(WARN_CFLAGS) - LDADD = ../lib/libiscsi.la - - noinst_PROGRAMS = iscsiclient iscsi-dd -diff --git a/lib/Makefile.am b/lib/Makefile.am -index d612fb7..47ffc33 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -29,7 +29,7 @@ libiscsi_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \ - "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" - --AM_CFLAGS=$(WARN_CFLAGS) -I/usr/include -+AM_CFLAGS=$(WARN_CFLAGS) - - dist_noinst_DATA = libiscsi.syms libiscsi.def - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 9d699fc..b4cbf21 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1,6 +1,6 @@ - AM_CPPFLAGS = -I../include "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" --AM_CFLAGS = $(WARN_CFLAGS) -I/usr/include -+AM_CFLAGS = $(WARN_CFLAGS) - LDADD = ../lib/libiscsi.la - - noinst_PROGRAMS = prog_reconnect prog_reconnect_timeout prog_noop_reply \ -diff --git a/utils/Makefile.am b/utils/Makefile.am -index 657ca9d..bde1c81 100644 ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -1,6 +1,6 @@ - AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" --AM_CFLAGS = $(WARN_CFLAGS) -I/usr/include -+AM_CFLAGS = $(WARN_CFLAGS) - LDADD = ../lib/libiscsi.la - - bin_PROGRAMS = iscsi-inq iscsi-ls iscsi-perf iscsi-readcapacity16 \ --- -2.10.0 - diff --git a/buildroot/package/libiscsi/0002-avoid-truncation-when-logging-message-that-includes-target-name.patch b/buildroot/package/libiscsi/0002-avoid-truncation-when-logging-message-that-includes-target-name.patch deleted file mode 100644 index 1334a8352..000000000 --- a/buildroot/package/libiscsi/0002-avoid-truncation-when-logging-message-that-includes-target-name.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bffafc1c3003c2ee05d28eaa345e5854bc36014d Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Mon, 1 Oct 2018 14:16:14 +0200 -Subject: [PATCH] avoid truncation when logging message that includes target - name - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/sahlberg/libiscsi/commit/bffafc1c3003c2ee05d28eaa345e5854bc36014d] ---- - lib/logging.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/logging.c b/lib/logging.c -index be518fc5..61c74407 100644 ---- a/lib/logging.c -+++ b/lib/logging.c -@@ -73,9 +73,9 @@ iscsi_log_message(struct iscsi_context *iscsi, int level, const char *format, .. - } - - if (iscsi->target_name[0]) { -- static char message2[1024]; -+ static char message2[1282]; - -- snprintf(message2, 1024, "%s [%s]", message, iscsi->target_name); -+ snprintf(message2, 1282, "%s [%s]", message, iscsi->target_name); - iscsi->log_fn(level, message2); - } - else diff --git a/buildroot/package/libiscsi/0003-avoid-fallthrough.patch b/buildroot/package/libiscsi/0003-avoid-fallthrough.patch deleted file mode 100644 index 94f653a99..000000000 --- a/buildroot/package/libiscsi/0003-avoid-fallthrough.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 679d0abe7c142df178a907397551c4d9695cc667 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Mon, 1 Oct 2018 14:14:24 +0200 -Subject: [PATCH] avoid fallthrough - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/sahlberg/libiscsi/commit/679d0abe7c142df178a907397551c4d9695cc667] ---- - lib/scsi-lowlevel.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/scsi-lowlevel.c b/lib/scsi-lowlevel.c -index 5ddd709c..747ce0c4 100644 ---- a/lib/scsi-lowlevel.c -+++ b/lib/scsi-lowlevel.c -@@ -1086,6 +1086,7 @@ scsi_maintenancein_datain_getfullsize(struct scsi_task *task) - (task_get_uint8(task, 1) & 0x80) ? 12 : 0 + - task_get_uint16(task, 2); - } -+ return -1; - default: - return -1; - } diff --git a/buildroot/package/libiscsi/Config.in b/buildroot/package/libiscsi/Config.in index 8e588c9ef..932f85785 100644 --- a/buildroot/package/libiscsi/Config.in +++ b/buildroot/package/libiscsi/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBISCSI bool "libiscsi" + depends on BR2_TOOLCHAIN_HAS_THREADS help Libiscsi is a client-side library to implement the iSCSI protocol that can be used to access resource of an iSCSI @@ -10,3 +11,6 @@ config BR2_PACKAGE_LIBISCSI for simpler applications. https://github.com/sahlberg/libiscsi + +comment "libiscsi needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libiscsi/libiscsi.hash b/buildroot/package/libiscsi/libiscsi.hash index 0688f2dd2..b70bb423d 100644 --- a/buildroot/package/libiscsi/libiscsi.hash +++ b/buildroot/package/libiscsi/libiscsi.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 464d104e12533dc11f0dd7662cbc2f01c132f94aa4f5bd519e3413ef485830e8 libiscsi-1.18.0.tar.gz +sha256 c7848ac722c8361d5064654bc6e926c2be61ef11dd3875020a63931836d806df libiscsi-1.19.0.tar.gz sha256 88e3eccc48722b2a0eaff456dda94b8e8e123848d01f631969bec8e3c6c6eb85 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENCE-GPL-2.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt diff --git a/buildroot/package/libiscsi/libiscsi.mk b/buildroot/package/libiscsi/libiscsi.mk index 2b26a1427..c8b6ddd12 100644 --- a/buildroot/package/libiscsi/libiscsi.mk +++ b/buildroot/package/libiscsi/libiscsi.mk @@ -4,23 +4,14 @@ # ################################################################################ -LIBISCSI_VERSION = 1.18.0 +LIBISCSI_VERSION = 1.19.0 LIBISCSI_SITE = $(call github,sahlberg,libiscsi,$(LIBISCSI_VERSION)) LIBISCSI_LICENSE = GPL-2.0+, LGPL-2.1+ LIBISCSI_LICENSE_FILES = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt LIBISCSI_INSTALL_STAGING = YES LIBISCSI_AUTORECONF = YES -ifeq ($(BR2_PACKAGE_CUNIT),y) -LIBISCSI_DEPENDENCIES += cunit -endif - -LIBISCSI_CONF_OPTS = --disable-werror --disable-manpages - -# We need to create the m4 directory to make autoreconf work properly. -define LIBISCSI_CREATE_M4_DIR - mkdir -p $(@D)/m4 -endef -LIBISCSI_POST_PATCH_HOOKS += LIBISCSI_CREATE_M4_DIR +LIBISCSI_CONF_OPTS = --disable-examples --disable-werror --disable-manpages \ + --disable-test-tool --disable-tests $(eval $(autotools-package)) diff --git a/buildroot/package/libite/libite.hash b/buildroot/package/libite/libite.hash index aac01fd36..db3f6232b 100644 --- a/buildroot/package/libite/libite.hash +++ b/buildroot/package/libite/libite.hash @@ -1,5 +1,7 @@ +# From https://github.com/troglobit/libite/releases/download/v2.1.0/libite-2.1.0.tar.xz.md5 +md5 701aa509f27ee35156bc53601e69fa74 libite-2.1.0.tar.xz # Locally calculated -sha256 bd5d08066f3e53cc8967beb6f0620286aad7a24d49fb730caa1c6d09a26bb705 libite-v2.0.2.tar.gz +sha256 cf56e720146243749e0af5763d4a84eef738e20f2bef2d867497fefc39dee991 libite-2.1.0.tar.xz sha256 0e97ab27b60e20a7ddb8e9638189ad159124e51d2c12e12735b05423df224da5 LICENSE sha256 9e0fb98d251dddf5ba81a355f6b4d89835ec53bc5d7f5fcd2c866b54ec5ccec8 src/chomp.c sha256 a7d29c148e057fae11a87febc3a51970a26433c35a08fc710be689394442d32d src/pidfile.c diff --git a/buildroot/package/libite/libite.mk b/buildroot/package/libite/libite.mk index bcda5f3f0..c598da1b4 100644 --- a/buildroot/package/libite/libite.mk +++ b/buildroot/package/libite/libite.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBITE_VERSION = v2.0.2 -LIBITE_SITE = $(call github,troglobit,libite,$(LIBITE_VERSION)) +LIBITE_VERSION = 2.1.0 +LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz +LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION) LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause LIBITE_LICENSE_FILES = LICENSE src/chomp.c src/pidfile.c LIBITE_INSTALL_STAGING = YES -LIBITE_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/libjpeg/libjpeg.hash b/buildroot/package/libjpeg/libjpeg.hash index 7d47f550c..4f0a677d0 100644 --- a/buildroot/package/libjpeg/libjpeg.hash +++ b/buildroot/package/libjpeg/libjpeg.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 650250979303a649e21f87b5ccd02672af1ea6954b911342ea491f351ceb7122 jpegsrc.v9c.tar.gz -sha256 31f366acfb6259456d9046eb7f16875e387f8bf029d37ac4c4397bf63f22fd6b README +sha256 99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32 jpegsrc.v9d.tar.gz +sha256 3dc4e4a145c907a96bd6a0e40be3f722fecf061951909143cdff5365cba9c78c README diff --git a/buildroot/package/libjpeg/libjpeg.mk b/buildroot/package/libjpeg/libjpeg.mk index ab09881fc..b855344f3 100644 --- a/buildroot/package/libjpeg/libjpeg.mk +++ b/buildroot/package/libjpeg/libjpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJPEG_VERSION = 9c +LIBJPEG_VERSION = 9d LIBJPEG_SITE = http://www.ijg.org/files LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG diff --git a/buildroot/package/libkcapi/0001-apps-kcapi-hasher.c-fix-build-with-gcc-8.2.x.patch b/buildroot/package/libkcapi/0001-apps-kcapi-hasher.c-fix-build-with-gcc-8.2.x.patch deleted file mode 100644 index a4c352d30..000000000 --- a/buildroot/package/libkcapi/0001-apps-kcapi-hasher.c-fix-build-with-gcc-8.2.x.patch +++ /dev/null @@ -1,54 +0,0 @@ -From dcb02c1639c2ff05938c01eaa41286a2e2f8d698 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 20 Jan 2019 20:04:13 +0100 -Subject: [PATCH] apps/kcapi-hasher.c: fix build with gcc 8.2.x - -Fixes: - - http://autobuild.buildroot.org/results/8355bc42238e885f7f11ed3d9d37fc55ebdead2b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/smuellerDD/libkcapi/pull/76] ---- - apps/kcapi-hasher.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/apps/kcapi-hasher.c b/apps/kcapi-hasher.c -index d6be685..7172b12 100644 ---- a/apps/kcapi-hasher.c -+++ b/apps/kcapi-hasher.c -@@ -357,16 +357,20 @@ out: - } - - /* -- * GCC v8.1.0 introduced -Wstringop-truncation but it is not smart enough to -- * find that cursor string will be NULL-terminated after all paste() calls and -- * warns with: -+ * GCC v8.1.0 introduced -Wstringop-truncation and GCC v8.2.0 introduced -+ * -Wstringop-overflow but it is not smart enough to find that cursor string -+ * will be NULL-terminated after all paste() calls and warns with: - * error: 'strncpy' destination unchanged after copying no bytes [-Werror=stringop-truncation] - * error: 'strncpy' output truncated before terminating nul copying 5 bytes from a string of the same length [-Werror=stringop-truncation] -+ * error: 'strncpy' specified bound depends on the length of the source argument [-Werror=stringop-overflow=] - */ - #pragma GCC diagnostic push - #if GCC_VERSION >= 80100 - #pragma GCC diagnostic ignored "-Wstringop-truncation" - #endif -+#if GCC_VERSION >= 80200 -+#pragma GCC diagnostic ignored "-Wstringop-overflow" -+#endif - static char *paste(char *dst, const char *src, size_t size) - { - strncpy(dst, src, size); -@@ -417,7 +421,7 @@ static char *get_hmac_file(const char *filename, const char *checkdir) - strncpy(cursor, "\0", 1); - return checkfile; - } --#pragma GCC diagnostic pop /* -Wstringop-truncation */ -+#pragma GCC diagnostic pop /* -Wstringop-truncation -Wstringop-overflow */ - - static int hash_files(const struct hash_params *params, - char *filenames[], uint32_t files, --- -2.14.1 - diff --git a/buildroot/package/libkcapi/Config.in b/buildroot/package/libkcapi/Config.in index 1dbcdc381..8243f6b73 100644 --- a/buildroot/package/libkcapi/Config.in +++ b/buildroot/package/libkcapi/Config.in @@ -8,6 +8,9 @@ config BR2_PACKAGE_LIBKCAPI if BR2_PACKAGE_LIBKCAPI +config BR2_PACKAGE_LIBKCAPI_ENCAPP + bool "build enc application" + config BR2_PACKAGE_LIBKCAPI_HASHER bool "build hasher application" depends on !BR2_STATIC_LIBS # dlfcn.h diff --git a/buildroot/package/libkcapi/libkcapi.hash b/buildroot/package/libkcapi/libkcapi.hash index a9b42bf6e..b3c2c749c 100644 --- a/buildroot/package/libkcapi/libkcapi.hash +++ b/buildroot/package/libkcapi/libkcapi.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9197f35aca270f97c544fe94dab379b44a2879a07eb78acd5d02c55924902763 libkcapi-1.1.4.tar.xz +sha256 8a08dcbb4d05ede4357cdc9d61c7f2a7f2cd96b7ce2eb41b28e45b2e378267ad libkcapi-1.1.5.tar.xz sha256 c6b8402a68999b0f84560ab43cdf60f9ff33c4a9a8ced6a40db9d3b787ba5b4a COPYING sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING.gplv2 sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.bsd diff --git a/buildroot/package/libkcapi/libkcapi.mk b/buildroot/package/libkcapi/libkcapi.mk index 48d34ffc4..60b3f9438 100644 --- a/buildroot/package/libkcapi/libkcapi.mk +++ b/buildroot/package/libkcapi/libkcapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKCAPI_VERSION = 1.1.4 +LIBKCAPI_VERSION = 1.1.5 LIBKCAPI_SOURCE = libkcapi-$(LIBKCAPI_VERSION).tar.xz LIBKCAPI_SITE = http://www.chronox.de/libkcapi LIBKCAPI_AUTORECONF = YES @@ -16,6 +16,12 @@ LIBKCAPI_CONF_ENV = \ ac_cv_path_DB2PS="" \ ac_cv_path_XMLTO="" +ifeq ($(BR2_PACKAGE_LIBKCAPI_ENCAPP),y) +LIBKCAPI_CONF_OPTS += --enable-kcapi-encapp +else +LIBKCAPI_CONF_OPTS += --disable-kcapi-encapp +endif + ifeq ($(BR2_PACKAGE_LIBKCAPI_HASHER),y) LIBKCAPI_CONF_OPTS += --enable-kcapi-hasher else diff --git a/buildroot/package/libkrb5/libkrb5.hash b/buildroot/package/libkrb5/libkrb5.hash index 733c6c9d6..aa7c3a377 100644 --- a/buildroot/package/libkrb5/libkrb5.hash +++ b/buildroot/package/libkrb5/libkrb5.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 9f721e1fe593c219174740c71de514c7228a97d23eb7be7597b2ae14e487f027 krb5-1.16.2.tar.gz +sha256 5a6e2284a53de5702d3dc2be3b9339c963f9b5397d3fbbc53beb249380a781f5 krb5-1.17.tar.gz # Hash for license file: -sha256 58534f00ed877fd32936fcab094f49d399aeef7716393204d8028c4b89050c82 NOTICE +sha256 5149ea464bde245388d313309539e142156d371788ae57bbd4feb223757f6da1 NOTICE diff --git a/buildroot/package/libkrb5/libkrb5.mk b/buildroot/package/libkrb5/libkrb5.mk index 38b39ffd6..44a20b370 100644 --- a/buildroot/package/libkrb5/libkrb5.mk +++ b/buildroot/package/libkrb5/libkrb5.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBKRB5_VERSION_MAJOR = 1.16 -LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).2 +LIBKRB5_VERSION_MAJOR = 1.17 +LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR) LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION_MAJOR) LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz LIBKRB5_SUBDIR = src diff --git a/buildroot/package/libldns/libldns.hash b/buildroot/package/libldns/libldns.hash index f20bb4be5..c8fb39d47 100644 --- a/buildroot/package/libldns/libldns.hash +++ b/buildroot/package/libldns/libldns.hash @@ -1,7 +1,7 @@ -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz.sha1 -sha1 ceeeccf8a27e61a854762737f6ee02f44662c1b8 ldns-1.7.0.tar.gz -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz.sha256 -sha256 c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc ldns-1.7.0.tar.gz +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha1 +sha1 d075a08972c0f573101fb4a6250471daaa53cb3e ldns-1.7.1.tar.gz +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz.sha256 +sha256 8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229 ldns-1.7.1.tar.gz # Hash for license file: sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE diff --git a/buildroot/package/libldns/libldns.mk b/buildroot/package/libldns/libldns.mk index d3c89bb6b..75159389d 100644 --- a/buildroot/package/libldns/libldns.mk +++ b/buildroot/package/libldns/libldns.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLDNS_VERSION = 1.7.0 +LIBLDNS_VERSION = 1.7.1 LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns LIBLDNS_LICENSE = BSD-3-Clause diff --git a/buildroot/package/liblinear/liblinear.hash b/buildroot/package/liblinear/liblinear.hash index 9644bc02d..4430d2998 100644 --- a/buildroot/package/liblinear/liblinear.hash +++ b/buildroot/package/liblinear/liblinear.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3f9fef20e76267bed1b817c9dc96d561ab5ee487828109bd44ed268fbf42048f liblinear-2.20.tar.gz -sha256 2ad9363447d0afeca34d53619163cffd502ec172bdb44d8d112c7acb99ae2558 COPYRIGHT +sha256 881c7039c6cf93119c781fb56263de91617b3eca8c3951f2c19a3797de95c6ac liblinear-2.30.tar.gz +sha256 c366abf1cb3a003d8c6e6d9c111a23c432db1d001294f88d479b70b60d7c0af2 COPYRIGHT diff --git a/buildroot/package/liblinear/liblinear.mk b/buildroot/package/liblinear/liblinear.mk index e1a0d1090..2d0fd0013 100644 --- a/buildroot/package/liblinear/liblinear.mk +++ b/buildroot/package/liblinear/liblinear.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLINEAR_VERSION = 2.20 +LIBLINEAR_VERSION = 2.30 LIBLINEAR_SITE = http://www.csie.ntu.edu.tw/~cjlin/liblinear LIBLINEAR_LICENSE = BSD-3-Clause LIBLINEAR_LICENSE_FILES = COPYRIGHT diff --git a/buildroot/package/liblo/0001-server-use-correct-poll.h-header.patch b/buildroot/package/liblo/0001-server-use-correct-poll.h-header.patch deleted file mode 100644 index 04c044553..000000000 --- a/buildroot/package/liblo/0001-server-use-correct-poll.h-header.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d59f2e6f42a9e4f8a9184d7ed75546f47dc50123 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 8 Apr 2018 11:09:02 +0200 -Subject: [PATCH] server: use correct poll.h header - -Fixes build with the musl C library: - http://autobuild.buildroot.net/results/000a46954d0c6d3dbc4b4634a0d3a3c955fac679 - -Signed-off-by: "Yann E. MORIN" ---- -Upstream status: - PR sent: https://github.com/radarsat1/liblo/pull/66 ---- - src/server.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/server.c b/src/server.c -index 01fa08f..11c62d2 100644 ---- a/src/server.c -+++ b/src/server.c -@@ -51,7 +51,7 @@ - #include - #include - #ifdef HAVE_POLL --#include -+#include - #endif - #include - #include --- -2.14.1 - diff --git a/buildroot/package/liblo/0002-src-server.c-fix-stringop-truncation-error.patch b/buildroot/package/liblo/0002-src-server.c-fix-stringop-truncation-error.patch deleted file mode 100644 index 3f3bf86cc..000000000 --- a/buildroot/package/liblo/0002-src-server.c-fix-stringop-truncation-error.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c1b2fbd8d96d9b668a0b5e3c49c75c13cfe7d4ba Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 15 Dec 2018 21:55:08 +0100 -Subject: [PATCH] src/server.c: fix stringop-truncation error - -Fixes: - - http://autobuild.buildroot.org/results/62896bd6a1a30facaffd07a7a763831996dc8ea0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/radarsat1/liblo/pull/70] ---- - src/server.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/server.c b/src/server.c -index 6d1a9de..72aecc9 100644 ---- a/src/server.c -+++ b/src/server.c -@@ -377,7 +377,7 @@ void lo_server_resolve_hostname(lo_server s) - gethostname(hostname, sizeof(hostname)); - he = gethostbyname(hostname); - if (he) { -- strncpy(hostname, he->h_name, sizeof(hostname)); -+ strncpy(hostname, he->h_name, sizeof(hostname) - 1); - } - } - --- -2.14.1 - diff --git a/buildroot/package/liblo/liblo.hash b/buildroot/package/liblo/liblo.hash index fe61f82e6..049ab8074 100644 --- a/buildroot/package/liblo/liblo.hash +++ b/buildroot/package/liblo/liblo.hash @@ -1,6 +1,7 @@ -# From http://sourceforge.net/projects/liblo/files/liblo/0.29/ -sha1 6aa69456787d3d6ef915281b4a0f8f2c79548ce3 liblo-0.29.tar.gz -md5 b0e70bc0fb2254addf94adddf85cffd3 liblo-0.29.tar.gz +# From http://sourceforge.net/projects/liblo/files/liblo/0.30/ +sha1 152a3260d186f111a71508dc0ed709984960f130 liblo-0.30.tar.gz +md5 fa1a9d45f86fc18fb54019f670ff2262 liblo-0.30.tar.gz # Locally computed +sha256 30a7c9de49a25ed7f2425a7a7415f5b14739def62431423d3419ea26fb978d1b liblo-0.30.tar.gz sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/liblo/liblo.mk b/buildroot/package/liblo/liblo.mk index e28e52803..69918186d 100644 --- a/buildroot/package/liblo/liblo.mk +++ b/buildroot/package/liblo/liblo.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLO_VERSION = 0.29 +LIBLO_VERSION = 0.30 LIBLO_SITE = http://downloads.sourceforge.net/project/liblo/liblo/$(LIBLO_VERSION) LIBLO_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/liblockfile/liblockfile.hash b/buildroot/package/liblockfile/liblockfile.hash index 4421673b9..881ad992a 100644 --- a/buildroot/package/liblockfile/liblockfile.hash +++ b/buildroot/package/liblockfile/liblockfile.hash @@ -1,3 +1,5 @@ # From http://snapshot.debian.org/archive/debian/20151026T153523Z/pool/main/libl/liblockfile/liblockfile_1.09-6.dsc -sha256 16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f liblockfile_1.09.orig.tar.gz -sha256 d45eacb7c637c16d03c777c55989d98da494ae9584a0783fe6dbf0db60fa290f liblockfile_1.09-6.debian.tar.bz2 +sha256 16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f liblockfile_1.09.orig.tar.gz +sha256 d45eacb7c637c16d03c777c55989d98da494ae9584a0783fe6dbf0db60fa290f liblockfile_1.09-6.debian.tar.bz2 +# Locally computed +sha256 5fffcc11f94a05a7cff02ff792407737eb1cba840767cc1a71b67fbb19695dd3 COPYRIGHT diff --git a/buildroot/package/liblog4c-localtime/liblog4c-localtime.hash b/buildroot/package/liblog4c-localtime/liblog4c-localtime.hash index c638d7325..d14b79594 100644 --- a/buildroot/package/liblog4c-localtime/liblog4c-localtime.hash +++ b/buildroot/package/liblog4c-localtime/liblog4c-localtime.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a1f68d8251509c0171f8bfea42f9e2a5255a4185f7dcbe67f584aa09709b2496 liblog4c-localtime-v1.0.tar.gz +sha256 a1f68d8251509c0171f8bfea42f9e2a5255a4185f7dcbe67f584aa09709b2496 liblog4c-localtime-1.0.tar.gz sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/buildroot/package/liblog4c-localtime/liblog4c-localtime.mk b/buildroot/package/liblog4c-localtime/liblog4c-localtime.mk index fba0d4faa..4ec390d73 100644 --- a/buildroot/package/liblog4c-localtime/liblog4c-localtime.mk +++ b/buildroot/package/liblog4c-localtime/liblog4c-localtime.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBLOG4C_LOCALTIME_VERSION = v1.0 -LIBLOG4C_LOCALTIME_SITE = $(call github,rcmadruga,log4c-localtime,$(LIBLOG4C_LOCALTIME_VERSION)) +LIBLOG4C_LOCALTIME_VERSION = 1.0 +LIBLOG4C_LOCALTIME_SITE = $(call github,rcmadruga,log4c-localtime,v$(LIBLOG4C_LOCALTIME_VERSION)) LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES LIBLOG4C_LOCALTIME_CONF_OPTS = --disable-expattest LIBLOG4C_LOCALTIME_DEPENDENCIES = expat diff --git a/buildroot/package/libmad/libmad.mk b/buildroot/package/libmad/libmad.mk index 108c4f641..b1c9cee5a 100644 --- a/buildroot/package/libmad/libmad.mk +++ b/buildroot/package/libmad/libmad.mk @@ -7,7 +7,6 @@ LIBMAD_VERSION = 0.15.1b LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION) LIBMAD_INSTALL_STAGING = YES -LIBMAD_LIBTOOL_PATCH = NO LIBMAD_LICENSE = GPL-2.0+ LIBMAD_LICENSE_FILES = COPYING LIBMAD_PATCH = \ diff --git a/buildroot/package/libmatroska/libmatroska.hash b/buildroot/package/libmatroska/libmatroska.hash index e42a9b282..827f08921 100644 --- a/buildroot/package/libmatroska/libmatroska.hash +++ b/buildroot/package/libmatroska/libmatroska.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 38a61dd5d87c070928b5deb3922b63b2b83c09e2e4a10f9393eecb6afa9795c8 libmatroska-1.4.9.tar.xz +sha256 0ac6debfbf781d47f001b830aaf9be9dfbcefd13bcfb80ca5efc1c04b4a3c962 libmatroska-1.5.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL diff --git a/buildroot/package/libmatroska/libmatroska.mk b/buildroot/package/libmatroska/libmatroska.mk index b8d0d84d3..7b7c5f03e 100644 --- a/buildroot/package/libmatroska/libmatroska.mk +++ b/buildroot/package/libmatroska/libmatroska.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMATROSKA_VERSION = 1.4.9 +LIBMATROSKA_VERSION = 1.5.2 LIBMATROSKA_SOURCE = libmatroska-$(LIBMATROSKA_VERSION).tar.xz LIBMATROSKA_SITE = http://dl.matroska.org/downloads/libmatroska LIBMATROSKA_INSTALL_STAGING = YES diff --git a/buildroot/package/libmaxminddb/0001-Add-disable-binaries.patch b/buildroot/package/libmaxminddb/0001-Add-disable-binaries.patch deleted file mode 100644 index 0053cace7..000000000 --- a/buildroot/package/libmaxminddb/0001-Add-disable-binaries.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 501f85fa729d08b90f0e1ff6f9378a0864f722a7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 2 Feb 2018 13:19:18 +0100 -Subject: [PATCH] Add --disable-binaries - -mmdblookup now depends on pthread.h which can be disabled on some -toolchains so add an option to be able to compile libmaxminddb without -this binary - -Signed-off-by: Fabrice Fontaine ---- - Makefile.am | 6 +++++- - configure.ac | 6 ++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index cebcd31..cfbfd77 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4,8 +4,12 @@ include_HEADERS = include/maxminddb.h - nodist_include_HEADERS = include/maxminddb_config.h - - SUBDIRS = \ -- src \ -+ src -+ -+if BINARIES -+SUBDIRS += \ - bin -+endif - - if TESTS - SUBDIRS += \ -diff --git a/configure.ac b/configure.ac -index c494746..4d1beb4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -119,6 +119,12 @@ AC_ARG_ENABLE( - esac],[debug=false]) - AM_CONDITIONAL([DEBUG], [test x$debug = xtrue]) - -+AC_ARG_ENABLE([binaries], -+ AS_HELP_STRING([--enable-binaries], [Compilation of binaries code]), -+ [enable_binaries=${enableval}], -+ [enable_binaries=yes]) -+AM_CONDITIONAL([BINARIES], [test "${enable_binaries}" = "yes"]) -+ - AC_ARG_ENABLE([tests], - AS_HELP_STRING([--enable-tests], [Compilation of tests code]), - [enable_tests=${enableval}], --- -2.7.4 - diff --git a/buildroot/package/libmaxminddb/libmaxminddb.hash b/buildroot/package/libmaxminddb/libmaxminddb.hash index 073458a35..a3ca682c2 100644 --- a/buildroot/package/libmaxminddb/libmaxminddb.hash +++ b/buildroot/package/libmaxminddb/libmaxminddb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c0785521c7e5515f1169db90ed6e51bc2a5a000377d0fbad87e4d5a791a6e364 libmaxminddb-1.3.2.tar.gz +sha256 dd582aa971be23dee960ec33c67fb5fd38affba508e6f00ea75959dbd5aad156 libmaxminddb-1.4.2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/libmaxminddb/libmaxminddb.mk b/buildroot/package/libmaxminddb/libmaxminddb.mk index 25d4d3378..18e2eaee7 100644 --- a/buildroot/package/libmaxminddb/libmaxminddb.mk +++ b/buildroot/package/libmaxminddb/libmaxminddb.mk @@ -4,13 +4,12 @@ # ################################################################################ -LIBMAXMINDDB_VERSION = 1.3.2 -LIBMAXMINDDB_SITE = $(call github,maxmind,libmaxminddb,$(LIBMAXMINDDB_VERSION)) +LIBMAXMINDDB_VERSION = 1.4.2 +LIBMAXMINDDB_SITE = \ + https://github.com/maxmind/libmaxminddb/releases/download/$(LIBMAXMINDDB_VERSION) LIBMAXMINDDB_INSTALL_STAGING = YES LIBMAXMINDDB_LICENSE = Apache-2.0 LIBMAXMINDDB_LICENSE_FILES = LICENSE -# Fetched from Github, with no configure script -LIBMAXMINDDB_AUTORECONF = YES LIBMAXMINDDB_CONF_OPTS = --disable-tests # mmdblookup binary depends on pthreads diff --git a/buildroot/package/libmbim/libmbim.hash b/buildroot/package/libmbim/libmbim.hash index 9e8629f34..bbf2c63af 100644 --- a/buildroot/package/libmbim/libmbim.hash +++ b/buildroot/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 6cf40128d83d087946a7d8577e735526202e034d52f90047735329609097b282 libmbim-1.18.0.tar.xz +sha256 ac2708a409b09f1f6f1786a8a9e39c36619aa8d6f285ea943daa7a48ea36d3e8 libmbim-1.20.4.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/libmbim/libmbim.mk b/buildroot/package/libmbim/libmbim.mk index 748d21553..dc5c9a59d 100644 --- a/buildroot/package/libmbim/libmbim.mk +++ b/buildroot/package/libmbim/libmbim.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMBIM_VERSION = 1.18.0 +LIBMBIM_VERSION = 1.20.4 LIBMBIM_SITE = https://www.freedesktop.org/software/libmbim LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) diff --git a/buildroot/package/libmicrohttpd/libmicrohttpd.hash b/buildroot/package/libmicrohttpd/libmicrohttpd.hash index d54d2bbc1..0fc451fcd 100644 --- a/buildroot/package/libmicrohttpd/libmicrohttpd.hash +++ b/buildroot/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cd0e5d3f95a9e55ef7cdf4d0530e997ba00b8411af9149d9287db785d729c471 libmicrohttpd-0.9.60.tar.gz -sha256 70e12e2a60151b9ed1a4c94a5ffeb99cd086fa94542b5a92fec581506e8d3121 COPYING +sha256 90d0a3d396f96f9bc41eb0f7e8187796049285fabef82604acd4879590977307 libmicrohttpd-0.9.70.tar.gz +sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING diff --git a/buildroot/package/libmicrohttpd/libmicrohttpd.mk b/buildroot/package/libmicrohttpd/libmicrohttpd.mk index fd7c37085..f47d7ec21 100644 --- a/buildroot/package/libmicrohttpd/libmicrohttpd.mk +++ b/buildroot/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.60 +LIBMICROHTTPD_VERSION = 0.9.70 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES diff --git a/buildroot/package/libmodbus/libmodbus.hash b/buildroot/package/libmodbus/libmodbus.hash index 2d65e28a3..2931f3f3d 100644 --- a/buildroot/package/libmodbus/libmodbus.hash +++ b/buildroot/package/libmodbus/libmodbus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c8c862b0e9a7ba699a49bc98f62bdffdfafd53a5716c0e162696b4bf108d3637 libmodbus-3.1.4.tar.gz +sha256 d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16 libmodbus-3.1.6.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/buildroot/package/libmodbus/libmodbus.mk b/buildroot/package/libmodbus/libmodbus.mk index e5a6c6385..584ac7505 100644 --- a/buildroot/package/libmodbus/libmodbus.mk +++ b/buildroot/package/libmodbus/libmodbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODBUS_VERSION = 3.1.4 +LIBMODBUS_VERSION = 3.1.6 LIBMODBUS_SITE = http://libmodbus.org/releases LIBMODBUS_LICENSE = LGPL-2.1+ LIBMODBUS_LICENSE_FILES = COPYING.LESSER diff --git a/buildroot/package/libmodsecurity/0001-Fail-when-CANONICAL_HOST-cannot-be-determined.patch b/buildroot/package/libmodsecurity/0001-Fail-when-CANONICAL_HOST-cannot-be-determined.patch new file mode 100644 index 000000000..ab00a14e2 --- /dev/null +++ b/buildroot/package/libmodsecurity/0001-Fail-when-CANONICAL_HOST-cannot-be-determined.patch @@ -0,0 +1,31 @@ +From 0832208360aab69fbaec76225db67801840a33fe Mon Sep 17 00:00:00 2001 +From: Frank Vanbever +Date: Fri, 10 Jan 2020 11:14:43 +0100 +Subject: [PATCH] Fail when CANONICAL_HOST cannot be determined + +When the CANONICAL_HOST is unknown the configure script exits +with exit code 0 even though no makefile was produced. + +Upstream: https://github.com/SpiderLabs/ModSecurity/pull/2235 + +Signed-off-by: Frank Vanbever +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 95e48843..5e6971f4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -193,7 +193,7 @@ case $host in + ;; + *) + echo "Unknown CANONICAL_HOST $host" +- exit ++ exit 1 + ;; + esac + +-- +2.20.1 + diff --git a/buildroot/package/libmodsecurity/0002-test-for-uClinux-in-configure-script.patch b/buildroot/package/libmodsecurity/0002-test-for-uClinux-in-configure-script.patch new file mode 100644 index 000000000..ccd96fea9 --- /dev/null +++ b/buildroot/package/libmodsecurity/0002-test-for-uClinux-in-configure-script.patch @@ -0,0 +1,28 @@ +From 13c505e30474c919ed9ae552e459769c456da21e Mon Sep 17 00:00:00 2001 +From: Frank Vanbever +Date: Fri, 10 Jan 2020 11:24:43 +0100 +Subject: [PATCH] test for uClinux in configure script + +Upstream: https://github.com/SpiderLabs/ModSecurity/pull/2235 + +Signed-off-by: Frank Vanbever +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5e6971f4..51d38071 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -156,7 +156,7 @@ case $host in + AC_DEFINE([MACOSX], [1], [Define if the operating system is Macintosh OSX]) + PLATFORM="MacOSX" + ;; +- *-*-linux*) ++ *-*-linux* | *-*uclinux*) + echo "Checking platform... Identified as Linux" + AC_DEFINE([LINUX], [1], [Define if the operating system is LINUX]) + PLATFORM="Linux" +-- +2.20.1 + diff --git a/buildroot/package/libmodsecurity/Config.in b/buildroot/package/libmodsecurity/Config.in new file mode 100644 index 000000000..ea58c6d0e --- /dev/null +++ b/buildroot/package/libmodsecurity/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_LIBMODSECURITY + bool "libmodsecurity" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_PCRE + help + Libmodsecurity is one component of the ModSecurity + v3 project. The library codebase serves as an + interface to ModSecurity Connectors taking in web + traffic and applying traditional ModSecurity + processing. In general, it provides the capability + to load/interpret rules written in the ModSecurity + SecRules format and apply them to HTTP content + provided by your application via Connectors. + + https://github.com/SpiderLabs/ModSecurity + +comment "libmodsecurity needs a toolchain w/ C++, dynamic library, threads" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libmodsecurity/libmodsecurity.hash b/buildroot/package/libmodsecurity/libmodsecurity.hash new file mode 100644 index 000000000..ddce3ef9c --- /dev/null +++ b/buildroot/package/libmodsecurity/libmodsecurity.hash @@ -0,0 +1,4 @@ +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.4/modsecurity-v3.0.4.tar.gz.sha256 +sha256 b4231177dd80b4e076b228e57d498670113b69d445bab86db25f65346c24db22 modsecurity-v3.0.4.tar.gz +# Localy calculated +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/buildroot/package/libmodsecurity/libmodsecurity.mk b/buildroot/package/libmodsecurity/libmodsecurity.mk new file mode 100644 index 000000000..063f969fc --- /dev/null +++ b/buildroot/package/libmodsecurity/libmodsecurity.mk @@ -0,0 +1,56 @@ +################################################################################ +# +# libmodsecurity +# +################################################################################ + +LIBMODSECURITY_VERSION = 3.0.4 +LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz +LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) +LIBMODSECURITY_INSTALL_STAGING = YES +LIBMODSECURITY_LICENSE = Apache-2.0 +LIBMODSECURITY_LICENSE_FILES = LICENSE +# 0002-test-for-uClinux-in-configure-script.patch +LIBMODSECURITY_AUTORECONF = YES +# libinjection uses AC_CHECK_FILE, not available in cross-compile +LIBMODSECURITY_CONF_ENV = \ + ac_cv_file_others_libinjection_src_libinjection_html5_c=yes + +LIBMODSECURITY_DEPENDENCIES = pcre +LIBMODSECURITY_CONF_OPTS = \ + --with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \ + --disable-examples \ + --without-lmdb \ + --without-ssdeep \ + --without-lua \ + --without-yajl + +ifeq ($(BR2_PACKAGE_LIBXML2),y) +LIBMODSECURITY_DEPENDENCIES += libxml2 +LIBMODSECURITY_CONF_OPTS += --with-libxml="$(STAGING_DIR)/usr/bin/xml2-config" +else +LIBMODSECURITY_CONF_OPTS += --without-libxml +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +LIBMODSECURITY_DEPENDENCIES += libcurl +LIBMODSECURITY_CONF_OPTS += --with-curl="$(STAGING_DIR)/usr/bin/curl-config" +else +LIBMODSECURITY_CONF_OPTS += --without-curl +endif + +ifeq ($(BR2_PACKAGE_GEOIP),y) +LIBMODSECURITY_DEPENDENCIES += geoip +LIBMODSECURITY_CONF_OPTS += --with-geoip +else +LIBMODSECURITY_CONF_OPTS += --without-geoip +endif + +ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) +LIBMODSECURITY_DEPENDENCIES += libmaxminddb +LIBMODSECURITY_CONF_OPTS += --with-maxmind +else +LIBMODSECURITY_CONF_OPTS += --without-maxmind +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/libmpdclient/libmpdclient.hash b/buildroot/package/libmpdclient/libmpdclient.hash index f268e876e..e4456f125 100644 --- a/buildroot/package/libmpdclient/libmpdclient.hash +++ b/buildroot/package/libmpdclient/libmpdclient.hash @@ -1,3 +1,3 @@ -# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.16.tar.xz.sig, sha256 locally computed -sha256 fa6bdab67c0e0490302b38f00c27b4959735c3ec8aef7a88327adb1407654464 libmpdclient-2.16.tar.xz +# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.18.tar.xz.sig, sha256 locally computed +sha256 4cb01e1f567e0169aca94875fb6e1200e7f5ce35b63a4df768ec1591fb1081fa libmpdclient-2.18.tar.xz sha256 9574c3b0a9c31723cc3d5f32af4655a015fff5ec6ec8115b7906cd7d9623cf32 COPYING diff --git a/buildroot/package/libmpdclient/libmpdclient.mk b/buildroot/package/libmpdclient/libmpdclient.mk index dc206c721..6e7c5a45a 100644 --- a/buildroot/package/libmpdclient/libmpdclient.mk +++ b/buildroot/package/libmpdclient/libmpdclient.mk @@ -5,7 +5,7 @@ ################################################################################ LIBMPDCLIENT_VERSION_MAJOR = 2 -LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).16 +LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).18 LIBMPDCLIENT_SOURCE = libmpdclient-$(LIBMPDCLIENT_VERSION).tar.xz LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_VERSION_MAJOR) LIBMPDCLIENT_INSTALL_STAGING = YES diff --git a/buildroot/package/libndp/libndp.hash b/buildroot/package/libndp/libndp.hash index 1861e0b4d..8d4b6ef52 100644 --- a/buildroot/package/libndp/libndp.hash +++ b/buildroot/package/libndp/libndp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 565d6c4167f83ec697c762ea002f23e8f0b00828d0749b1ce928f068543e5aad libndp-v1.6.tar.gz +sha256 44be73630ee785ed9f571f9aaaeba0e1d375fa337fd841270034c813b5b0e6fd libndp-1.7.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libndp/libndp.mk b/buildroot/package/libndp/libndp.mk index 3fd8ac7bf..3783eb135 100644 --- a/buildroot/package/libndp/libndp.mk +++ b/buildroot/package/libndp/libndp.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNDP_VERSION = v1.6 -LIBNDP_SITE = $(call github,jpirko,libndp,$(LIBNDP_VERSION)) +LIBNDP_VERSION = 1.7 +LIBNDP_SITE = $(call github,jpirko,libndp,v$(LIBNDP_VERSION)) LIBNDP_LICENSE = LGPL-2.1+ LIBNDP_LICENSE_FILES = COPYING LIBNDP_AUTORECONF = YES diff --git a/buildroot/package/libnet/libnet.hash b/buildroot/package/libnet/libnet.hash index dd3349082..9f62aeda6 100644 --- a/buildroot/package/libnet/libnet.hash +++ b/buildroot/package/libnet/libnet.hash @@ -1,3 +1,5 @@ # From https://sourceforge.net/projects/libnet-dev/files/ sha1 dffff71c325584fdcf99b80567b60f8ad985e34c libnet-1.1.6.tar.gz md5 710296fe424a49344e5fcc0d09e53317 libnet-1.1.6.tar.gz +# Locally computed +sha256 961355c8bac6de11ecb8f634111986712e80a88272c0bb0954fd1810e6f47cab doc/COPYING diff --git a/buildroot/package/libnetconf2/Config.in b/buildroot/package/libnetconf2/Config.in new file mode 100644 index 000000000..0a735b5ed --- /dev/null +++ b/buildroot/package/libnetconf2/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LIBNETCONF2 + bool "libnetconf2" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_USE_MMU + select BR2_PACKAGE_LIBYANG + help + libnetconf2 is a NETCONF library in C intended for building + NETCONF clients and servers. + + https://github.com/CESNET/libnetconf2 + +comment "libnetconf2 needs a toolchain w/ threads, dynamic libraray" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libnetconf2/libnetconf2.hash b/buildroot/package/libnetconf2/libnetconf2.hash new file mode 100644 index 000000000..5cd9b9906 --- /dev/null +++ b/buildroot/package/libnetconf2/libnetconf2.hash @@ -0,0 +1,2 @@ +sha256 38e780cdd0135e9c7fe44b5190a1acc8c33cb28aa395c329893b019a57b1f783 libnetconf2-1.1.3.tar.gz +sha256 085122ea91161812dda9cd2f42d8c50ecc3a48cc1a4f15044d86cfc5aa887577 LICENSE diff --git a/buildroot/package/libnetconf2/libnetconf2.mk b/buildroot/package/libnetconf2/libnetconf2.mk new file mode 100644 index 000000000..bd25c69e0 --- /dev/null +++ b/buildroot/package/libnetconf2/libnetconf2.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# libnetconf2 +# +################################################################################ + +LIBNETCONF2_VERSION = 1.1.3 +LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) +LIBNETCONF2_INSTALL_STAGING = YES +LIBNETCONF2_LICENSE = BSD-3-Clause +LIBNETCONF2_LICENSE_FILES = LICENSE +LIBNETCONF2_DEPENDENCIES = libyang +HOST_LIBNETCONF2_DEPENDENCIES = host-libyang + +LIBNETCONF2_CONF_OPTS = \ + -DENABLE_BUILD_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF + +ifeq ($(BR2_PACKAGE_LIBSSH_SERVER), y) +LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=ON +LIBNETCONF2_DEPENDENCIES += libssh +else +LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENSSL), y) +LIBNETCONF2_CONF_OPTS += -DENABLE_TLS=ON +LIBNETCONF2_DEPENDENCIES += openssl +else +LIBNETCONF2_CONF_OPTS += -DENABLE_TLS=OFF +endif + +HOST_LIBNETCONF2_CONF_OPTS = \ + -DENABLE_BUILD_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF \ + -DENABLE_SSH=OFF \ + -DENABLE_TLS=OFF + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/buildroot/package/libnfc/Config.in b/buildroot/package/libnfc/Config.in index c8fe25145..14084dc88 100644 --- a/buildroot/package/libnfc/Config.in +++ b/buildroot/package/libnfc/Config.in @@ -1,8 +1,5 @@ config BR2_PACKAGE_LIBNFC bool "libnfc" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT help Public platform independent Near Field Communication (NFC) library. @@ -11,11 +8,70 @@ config BR2_PACKAGE_LIBNFC if BR2_PACKAGE_LIBNFC +config BR2_PACKAGE_LIBNFC_ACR122_PCSC + bool "acr122_pcsc driver" + depends on BR2_TOOLCHAIN_HAS_THREADS # pcsc-lite + depends on BR2_USE_MMU # pcsc-lite + depends on !BR2_STATIC_LIBS # pcsc-lite + select BR2_PACKAGE_PCSC_LITE + help + support for acr112_pcsc driver + +comment "acr122_pcsc driver needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +config BR2_PACKAGE_LIBNFC_ACR122_USB + bool "acr122_usb driver" + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_LIBUSB_COMPAT + help + support for acr122_usb driver + +comment "acr122_usb driver needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_LIBNFC_ACR122S + bool "acr122s driver" + help + support for acr122s driver + +config BR2_PACKAGE_LIBNFC_ARYGON + bool "arygon driver" + default y + help + support for arygon driver + +config BR2_PACKAGE_LIBNFC_PN532_I2C + bool "pn532_i2c driver" + help + support for pn532_i2c driver + +config BR2_PACKAGE_LIBNFC_PN532_SPI + bool "pn532_spi driver" + help + support for pn532_spi driver + +config BR2_PACKAGE_LIBNFC_PN532_UART + bool "pn532_uart driver" + help + support for pn532_uart driver + +config BR2_PACKAGE_LIBNFC_PN53X_USB + bool "pn53x_usb driver" + default y + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_LIBUSB_COMPAT + help + support for pn53x_usb driver + +comment "pn53x_usb driver needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_LIBNFC_EXAMPLES bool "build libnfc examples" select BR2_PACKAGE_READLINE endif - -comment "libnfc needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libnfc/libnfc.mk b/buildroot/package/libnfc/libnfc.mk index b13fd69d8..ca8700484 100644 --- a/buildroot/package/libnfc/libnfc.mk +++ b/buildroot/package/libnfc/libnfc.mk @@ -12,10 +12,46 @@ LIBNFC_LICENSE_FILES = COPYING LIBNFC_AUTORECONF = YES LIBNFC_INSTALL_STAGING = YES -LIBNFC_DEPENDENCIES = host-pkgconf libusb libusb-compat +LIBNFC_DEPENDENCIES = host-pkgconf # N.B. The acr122 driver requires pcsc-lite. -LIBNFC_CONF_OPTS = --with-drivers=arygon,pn53x_usb +ifeq ($(BR2_PACKAGE_LIBNFC_ACR122_PCSC),y) +LIBNFC_DRIVER_LIST += acr122_pcsc +LIBNFC_DEPENDENCIES += pcsc-lite +endif + +ifeq ($(BR2_PACKAGE_LIBNFC_ACR122_USB),y) +LIBNFC_DRIVER_LIST += acr122_usb +LIBNFC_DEPENDENCIES += libusb libusb-compat +endif + +ifeq ($(BR2_PACKAGE_LIBNFC_ACR122S),y) +LIBNFC_DRIVER_LIST += acr122s +endif + +ifeq ($(BR2_PACKAGE_LIBNFC_ARYGON),y) +LIBNFC_DRIVER_LIST += arygon +endif + +ifeq ($(BR2_PACKAGE_LIBNFC_PN532_I2C),y) +LIBNFC_DRIVER_LIST += pn532_i2c +endif + +ifeq ($(BR2_PACKAGE_LIBNFC_PN532_SPI),y) +LIBNFC_DRIVER_LIST += pn532_spi +endif + +ifeq ($(BR2_PACKAGE_LIBNFC_PN532_UART),y) +LIBNFC_DRIVER_LIST += pn532_uart +endif + +ifeq ($(BR2_PACKAGE_LIBNFC_PN53X_USB),y) +LIBNFC_DRIVER_LIST += pn53x_usb +LIBNFC_DEPENDENCIES += libusb libusb-compat +endif + +LIBNFC_CONF_OPTS = \ + --with-drivers=$(subst $(space),$(comma),$(strip $(LIBNFC_DRIVER_LIST))) ifeq ($(BR2_PACKAGE_LIBNFC_EXAMPLES),y) LIBNFC_CONF_OPTS += --enable-example diff --git a/buildroot/package/libnfs/0002-libnfs.c-include-time.h-in-libnfs.c.patch b/buildroot/package/libnfs/0002-libnfs.c-include-time.h-in-libnfs.c.patch deleted file mode 100644 index 34e584017..000000000 --- a/buildroot/package/libnfs/0002-libnfs.c-include-time.h-in-libnfs.c.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b56bd3d99f67a3273fec3c0c5d9560413465a1db Mon Sep 17 00:00:00 2001 -From: Anna Lyons -Date: Thu, 12 Jul 2018 17:45:23 +1000 -Subject: [PATCH] libnfs.c: include in libnfs.c -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -time() is used in this file, which is from time.h. Fixes a warning. - -Note, that building with musl breaks otherwise, as it is more strict regarding -missing header inclusions. - -Backported from: 794a29f01f8e5961adc5c79d5ba5ac1062877e6c - -Signed-off-by: Jörg Krause ---- - lib/libnfs.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/libnfs.c b/lib/libnfs.c -index d89d84d..43c17b9 100755 ---- a/lib/libnfs.c -+++ b/lib/libnfs.c -@@ -70,6 +70,7 @@ - #include - #include - #include -+#include - #include "slist.h" - #include "libnfs.h" - #include "libnfs-raw.h" --- -2.19.1 - diff --git a/buildroot/package/libnfs/libnfs.hash b/buildroot/package/libnfs/libnfs.hash index 0e4dc6fbc..bb92ebe69 100644 --- a/buildroot/package/libnfs/libnfs.hash +++ b/buildroot/package/libnfs/libnfs.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 445d92c5fc55e4a5b115e358e60486cf8f87ee50e0103d46a02e7fb4618566a5 libnfs-libnfs-3.0.0.tar.gz +sha256 6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d libnfs-4.0.0.tar.gz sha256 edd960c0142b8ada98b43b6396b78f4e557b0bc70ac601a51e397ad04070e2c5 COPYING sha256 d9406ced95457941032aa11d04623b8ab71f2827a3395ebef137aec475be35b1 LICENCE-BSD.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt diff --git a/buildroot/package/libnfs/libnfs.mk b/buildroot/package/libnfs/libnfs.mk index 3a84e0aaf..5f950b5cd 100644 --- a/buildroot/package/libnfs/libnfs.mk +++ b/buildroot/package/libnfs/libnfs.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNFS_VERSION = libnfs-3.0.0 -LIBNFS_SITE = $(call github,sahlberg,libnfs,$(LIBNFS_VERSION)) +LIBNFS_VERSION = 4.0.0 +LIBNFS_SITE = $(call github,sahlberg,libnfs,libnfs-$(LIBNFS_VERSION)) LIBNFS_INSTALL_STAGING = YES LIBNFS_AUTORECONF = YES LIBNFS_LICENSE = LGPL-2.1+ (library), BSD-2-Clause (protocol, .x files), GPL-3.0+ (examples) diff --git a/buildroot/package/libnftnl/0001-Add-Libs.private-field-to-libnftnl.pc.patch b/buildroot/package/libnftnl/0001-Add-Libs.private-field-to-libnftnl.pc.patch deleted file mode 100644 index ce3e9500e..000000000 --- a/buildroot/package/libnftnl/0001-Add-Libs.private-field-to-libnftnl.pc.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d89fca062ba966332b573673fdd5c4cf01c3e2f5 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 29 Dec 2014 15:32:08 +0100 -Subject: [PATCH 2/2] Add Libs.private field to libnftnl.pc - -Static linking userspace programs such as nftables against libnftnl -currently doesn't work out of the box, because libnftnl is linked -against libmnl, but this isn't expressed in libnftnl pkg-config -file: - - CCLD nft -[...]/bfin-buildroot-uclinux-uclibc/sysroot/usr/lib/libnftnl.a(table.o): In function `_nft_table_nlmsg_parse': -table.c:(.text+0x480): undefined reference to `_mnl_attr_parse' -table.c:(.text+0x492): undefined reference to `_mnl_attr_get_str' -table.c:(.text+0x4a8): undefined reference to `_mnl_attr_get_u32' -table.c:(.text+0x4ca): undefined reference to `_mnl_attr_get_u32' -[...] - -The Libs.private field is specifically designed for such usage: - -From pkg-config documentation: - - Libs.private: - - This line should list any private libraries in use. Private - libraries are libraries which are not exposed through your - library, but are needed in the case of static linking. - -Therefore, this patch adds a reference to libmnl in the Libs.private -field of libnftnl pkg-config file. - -Signed-off-by: Thomas Petazzoni ---- - libnftnl.pc.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libnftnl.pc.in b/libnftnl.pc.in -index fd5cc6a..7fef921 100644 ---- a/libnftnl.pc.in -+++ b/libnftnl.pc.in -@@ -12,4 +12,5 @@ Version: @VERSION@ - Requires: - Conflicts: - Libs: -L${libdir} -lnftnl -+Libs.private: @LIBMNL_LIBS@ - Cflags: -I${includedir} --- -2.1.0 - diff --git a/buildroot/package/libnftnl/libnftnl.hash b/buildroot/package/libnftnl/libnftnl.hash index 64bd07a23..4d2eb0ef0 100644 --- a/buildroot/package/libnftnl/libnftnl.hash +++ b/buildroot/package/libnftnl/libnftnl.hash @@ -1,3 +1,3 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html -sha256 22dd97d3b06ae8c67499506e2bfd6803ce116479076ec3700e7a4c7cd9fcba0f libnftnl-1.1.3.tar.bz2 +sha256 66de4d05227c0a1a731c369b193010d18a05b1185c2735211e0ecf658eeb14f3 libnftnl-1.1.5.tar.bz2 sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/buildroot/package/libnftnl/libnftnl.mk b/buildroot/package/libnftnl/libnftnl.mk index a3fba488c..ac780bd8d 100644 --- a/buildroot/package/libnftnl/libnftnl.mk +++ b/buildroot/package/libnftnl/libnftnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.1.3 +LIBNFTNL_VERSION = 1.1.5 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 LIBNFTNL_LICENSE = GPL-2.0+ diff --git a/buildroot/package/libnice/Config.in b/buildroot/package/libnice/Config.in index af8e81461..1f62c0b5c 100644 --- a/buildroot/package/libnice/Config.in +++ b/buildroot/package/libnice/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBNICE depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS select BR2_PACKAGE_LIBGLIB2 help Libnice is an implementation of the IETF's Interactive diff --git a/buildroot/package/libnice/libnice.hash b/buildroot/package/libnice/libnice.hash index 3c1f0d845..61be9517e 100644 --- a/buildroot/package/libnice/libnice.hash +++ b/buildroot/package/libnice/libnice.hash @@ -1,5 +1,5 @@ # Locally computed after checking pgp signature -sha256 be120ba95d4490436f0da077ffa8f767bf727b82decf2bf499e39becc027809c libnice-0.1.14.tar.gz +sha256 06b678066f94dde595a4291588ed27acd085ee73775b8c4e8399e28c01eeefdf libnice-0.1.16.tar.gz # Hash for license files: sha256 9246b2ee8b1db30cf03d5d9719ad8bb5edce1cadc85f8cfef319c23d24d950b5 COPYING diff --git a/buildroot/package/libnice/libnice.mk b/buildroot/package/libnice/libnice.mk index 49c29f9a6..8cbf00352 100644 --- a/buildroot/package/libnice/libnice.mk +++ b/buildroot/package/libnice/libnice.mk @@ -4,18 +4,22 @@ # ################################################################################ -LIBNICE_VERSION = 0.1.14 +LIBNICE_VERSION = 0.1.16 LIBNICE_SITE = http://nice.freedesktop.org/releases LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL -LIBNICE_DEPENDENCIES = gnutls libglib2 host-pkgconf +LIBNICE_DEPENDENCIES = libglib2 host-pkgconf LIBNICE_INSTALL_STAGING = YES +LIBNICE_CONF_OPTS = --without-gstreamer-0.10 -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y) -LIBNICE_CONF_OPTS += --with-gstreamer-0.10 -LIBNICE_DEPENDENCIES += gst-plugins-base +ifeq ($(BR2_PACKAGE_GNUTLS),y) +LIBNICE_CONF_OPTS += --with-crypto-library=gnutls +LIBNICE_DEPENDENCIES += gnutls else -LIBNICE_CONF_OPTS += --without-gstreamer-0.10 +LIBNICE_CONF_OPTS += \ + --with-crypto-library=openssl \ + --with-openssl=$(STAGING_DIR)/usr +LIBNICE_DEPENDENCIES += openssl endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) diff --git a/buildroot/package/libnl/libnl.hash b/buildroot/package/libnl/libnl.hash index b9c626043..d7cd5c953 100644 --- a/buildroot/package/libnl/libnl.hash +++ b/buildroot/package/libnl/libnl.hash @@ -1,4 +1,6 @@ -# 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 +# From https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz.md5sum +md5 74ba57b1b1d6f9f92268aa8141d8e8e4 libnl-3.5.0.tar.gz +# From https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz.sha256sum +sha256 352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa libnl-3.5.0.tar.gz # Locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libnl/libnl.mk b/buildroot/package/libnl/libnl.mk index 397910c4a..795dfc231 100644 --- a/buildroot/package/libnl/libnl.mk +++ b/buildroot/package/libnl/libnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNL_VERSION = 3.4.0 +LIBNL_VERSION = 3.5.0 LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION)) LIBNL_LICENSE = LGPL-2.1+ LIBNL_LICENSE_FILES = COPYING diff --git a/buildroot/package/libnspr/0001-nios2.patch b/buildroot/package/libnspr/0001-nios2.patch deleted file mode 100644 index 52fbbfddd..000000000 --- a/buildroot/package/libnspr/0001-nios2.patch +++ /dev/null @@ -1,76 +0,0 @@ -Bug 1578360 - Add Nios-II support - -[Gustavo: update for nspr 4.10.9] -Signed-off-by: Ezequiel Garcia -[Fabrice: update for nspr 4.20] -Signed-off-by: Fabrice Fontaine -[Giulio: update for nspr 4.22] -Signed-off-by: Giulio Benetti - -diff -r 3af4891397ab -r 8487beb203e9 nspr/pr/include/md/_linux.cfg ---- a/nspr/pr/include/md/_linux.cfg Mon Aug 19 16:17:52 2019 +0200 -+++ b/nspr/pr/include/md/_linux.cfg Tue Sep 03 11:25:11 2019 +0200 -@@ -1157,6 +1157,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__nios2__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" -diff -r 3af4891397ab -r 8487beb203e9 nspr/pr/include/md/_linux.h ---- a/nspr/pr/include/md/_linux.h Mon Aug 19 16:17:52 2019 +0200 -+++ b/nspr/pr/include/md/_linux.h Tue Sep 03 11:25:11 2019 +0200 -@@ -63,6 +63,8 @@ - #define _PR_SI_ARCHITECTURE "riscv64" - #elif defined(__arc__) - #define _PR_SI_ARCHITECTURE "arc" -+#elif defined(__nios2__) -+#define _PR_SI_ARCHITECTURE "nios2" - #else - #error "Unknown CPU architecture" - #endif diff --git a/buildroot/package/libnspr/0002-microblaze.patch b/buildroot/package/libnspr/0002-microblaze.patch deleted file mode 100644 index 6558882bd..000000000 --- a/buildroot/package/libnspr/0002-microblaze.patch +++ /dev/null @@ -1,81 +0,0 @@ -Bug 1578363 - Add Microblaze support - -[Gustavo: update for nspr 4.10.9] -Signed-off-by: Spenser Gilliland -[Fabrice: update for nspr 4.20] -Signed-off-by: Fabrice Fontaine -[Giulio: update for nspr 4.22] -Signed-off-by: Giulio Benetti - -diff -r 8487beb203e9 -r ab7d5c504daf nspr/pr/include/md/_linux.cfg ---- a/nspr/pr/include/md/_linux.cfg Tue Sep 03 11:25:11 2019 +0200 -+++ b/nspr/pr/include/md/_linux.cfg Tue Sep 03 11:33:15 2019 +0200 -@@ -1202,6 +1202,56 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__microblaze__) -+ -+#if defined(__BIG_ENDIAN__) -+#define IS_BIG_ENDIAN 1 -+#undef IS_LITTLE_ENDIAN -+#else -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#endif -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" -diff -r 8487beb203e9 -r ab7d5c504daf nspr/pr/include/md/_linux.h ---- a/nspr/pr/include/md/_linux.h Tue Sep 03 11:25:11 2019 +0200 -+++ b/nspr/pr/include/md/_linux.h Tue Sep 03 11:33:15 2019 +0200 -@@ -65,6 +65,8 @@ - #define _PR_SI_ARCHITECTURE "arc" - #elif defined(__nios2__) - #define _PR_SI_ARCHITECTURE "nios2" -+#elif defined(__microblaze__) -+#define _PR_SI_ARCHITECTURE "microblaze" - #else - #error "Unknown CPU architecture" - #endif diff --git a/buildroot/package/libnspr/0003-nds32.patch b/buildroot/package/libnspr/0003-nds32.patch deleted file mode 100644 index 49d0d81ac..000000000 --- a/buildroot/package/libnspr/0003-nds32.patch +++ /dev/null @@ -1,73 +0,0 @@ -Bug 1578364 - Add Nds32 support - -Signed-off-by: Nylon Chen -[Giulio: update for nspr 4.22] -Signed-off-by: Giulio Benetti - -diff -r ab7d5c504daf -r d212d80704a2 nspr/pr/include/md/_linux.cfg ---- a/nspr/pr/include/md/_linux.cfg Tue Sep 03 11:33:15 2019 +0200 -+++ b/nspr/pr/include/md/_linux.cfg Tue Sep 03 11:36:05 2019 +0200 -@@ -1252,6 +1252,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__nds32__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" -diff -r ab7d5c504daf -r d212d80704a2 nspr/pr/include/md/_linux.h ---- a/nspr/pr/include/md/_linux.h Tue Sep 03 11:33:15 2019 +0200 -+++ b/nspr/pr/include/md/_linux.h Tue Sep 03 11:36:05 2019 +0200 -@@ -67,6 +67,8 @@ - #define _PR_SI_ARCHITECTURE "nios2" - #elif defined(__microblaze__) - #define _PR_SI_ARCHITECTURE "microblaze" -+#elif defined(__nds32__) -+#define _PR_SI_ARCHITECTURE "nds32" - #else - #error "Unknown CPU architecture" - #endif diff --git a/buildroot/package/libnspr/Config.in b/buildroot/package/libnspr/Config.in index 1d9515524..c1be7151e 100644 --- a/buildroot/package/libnspr/Config.in +++ b/buildroot/package/libnspr/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT def_bool y - depends on !BR2_arc && !BR2_xtensa if BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT diff --git a/buildroot/package/libnspr/libnspr.hash b/buildroot/package/libnspr/libnspr.hash index 0317f20b1..cdbf6ce69 100644 --- a/buildroot/package/libnspr/libnspr.hash +++ b/buildroot/package/libnspr/libnspr.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/nspr/releases/v4.20/src/SHA256SUMS -sha256 4b9d821037faf5723da901515ed9cac8b23ef1ea3729022259777393453477a4 nspr-4.23.tar.gz +# From https://ftp.mozilla.org/pub/nspr/releases/v4.25/src/SHA256SUMS +sha256 0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256 nspr-4.25.tar.gz # Locally calculated sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE diff --git a/buildroot/package/libnspr/libnspr.mk b/buildroot/package/libnspr/libnspr.mk index f21f69a74..857052d8c 100644 --- a/buildroot/package/libnspr/libnspr.mk +++ b/buildroot/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.23 +LIBNSPR_VERSION = 4.25 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src LIBNSPR_SUBDIR = nspr diff --git a/buildroot/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch b/buildroot/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch new file mode 100644 index 000000000..132538776 --- /dev/null +++ b/buildroot/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch @@ -0,0 +1,51 @@ +From d9c7cbb3660d8a2da9ce42e4d1b58642a256a91a Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Sun, 9 Feb 2020 10:15:16 +0100 +Subject: [PATCH] Bug 1614183 - Check if PPC __has_include() + +Some build environment doesn't provide and this causes +build failure, so let's check if that header exists by using +__has_include() helper. + +Signed-off-by: Giulio Benetti +--- + nss/lib/freebl/blinit.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/nss/lib/freebl/blinit.c b/nss/lib/freebl/blinit.c +index 7e8adfc64..d4921aaee 100644 +--- a/nss/lib/freebl/blinit.c ++++ b/nss/lib/freebl/blinit.c +@@ -431,8 +431,14 @@ ppc_crypto_support() + + #if defined(__powerpc__) + ++#ifndef __has_include ++#define __has_include(x) 0 ++#endif ++ + #if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD__ >= 12) ++#if __has_include() + #include ++#endif + #elif (defined(__FreeBSD__) && __FreeBSD__ < 12) + #include + #endif +@@ -449,10 +455,14 @@ CheckPPCSupport() + + unsigned long hwcaps = 0; + #if defined(__linux__) ++#if __has_include() + hwcaps = getauxval(AT_HWCAP2); ++#endif + #elif defined(__FreeBSD__) + #if __FreeBSD__ >= 12 ++#if __has_include() + elf_aux_info(AT_HWCAP2, &hwcaps, sizeof(hwcaps)); ++#endif + #else + size_t len = sizeof(hwcaps); + sysctlbyname("hw.cpu_features2", &hwcaps, &len, NULL, 0); +-- +2.20.1 + diff --git a/buildroot/package/libnss/0001-fix-uclibc-build.patch b/buildroot/package/libnss/0001-fix-uclibc-build.patch deleted file mode 100644 index a9e84c264..000000000 --- a/buildroot/package/libnss/0001-fix-uclibc-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix build with uClibc-ng - -The elf.h header in uClibc-ng is missing the AT_HWCAP2 definition. Add it in -the code. - -Signed-off-by: Baruch Siach ---- -Upstream status: Not upstreamable; uClibc needs to update elf.h - -diff -Nuar nss-3.38.orig/nss/lib/freebl/blinit.c nss-3.38/nss/lib/freebl/blinit.c ---- nss-3.38.orig/nss/lib/freebl/blinit.c 2018-06-21 12:24:45.000000000 +0300 -+++ nss-3.38/nss/lib/freebl/blinit.c 2018-06-26 13:13:55.636434720 +0300 -@@ -100,6 +100,9 @@ - defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__) - #include - extern unsigned long getauxval(unsigned long type) __attribute__((weak)); -+#ifndef AT_HWCAP2 -+#define AT_HWCAP2 26 -+#endif - #else - static unsigned long (*getauxval)(unsigned long) = NULL; - #define AT_HWCAP2 0 diff --git a/buildroot/package/libnss/0002-add-zlib-include-dir-variable.patch b/buildroot/package/libnss/0002-add-zlib-include-dir-variable.patch deleted file mode 100644 index cd0bdeec3..000000000 --- a/buildroot/package/libnss/0002-add-zlib-include-dir-variable.patch +++ /dev/null @@ -1,49 +0,0 @@ -Add ZLIB_INCLUDE_DIR variable - -On Linux platform[1], the build system forces to use zlib from the -system instead of compiling the one located intree. - -The following error is raised when the zlib header is installed -somewhere else than in the default system include path: - - ssl3con.c:39:18: fatal error: zlib.h: No such file or directory - #include "zlib.h" - -The same trick setup for sqlite include directory is reproduced for -zlib. The build system disallows in any manner to give arguments to the -compiler explicity. - -The variable ZLIB_INCLUDE_DIR point to the directory where the zlib -header is located. - -[1]: https://hg.mozilla.org/projects/nss/file/NSS_3_33_BRANCH/coreconf/Linux.mk#l180 -[2]: https://hg.mozilla.org/projects/nss/file/NSS_3_33_BRANCH/lib/softoken/manifest.mn#l17 - -Signed-off-by: Gaël PORTAY - ---- libnss-3.33.orig/nss/lib/ssl/manifest.mn 2017-09-20 02:47:27.000000000 -0400 -+++ libnss-3.33/nss/lib/ssl/manifest.mn 2018-02-16 16:45:41.512709898 -0500 -@@ -6,6 +6,10 @@ - - # DEFINES = -DTRACE - -+ifdef ZLIB_INCLUDE_DIR -+INCLUDES += -I$(ZLIB_INCLUDE_DIR) -+endif -+ - EXPORTS = \ - ssl.h \ - sslt.h \ ---- host-libnss-3.33.orig/nss/cmd/signtool/manifest.mn.orig 2018-02-16 17:08:58.474777871 -0500 -+++ host-libnss-3.33/nss/cmd/signtool/manifest.mn 2018-02-16 17:09:22.603710963 -0500 -@@ -6,6 +6,10 @@ - - MODULE = nss - -+ifdef ZLIB_INCLUDE_DIR -+INCLUDES += -I$(ZLIB_INCLUDE_DIR) -+endif -+ - EXPORTS = - - CSRCS = signtool.c \ diff --git a/buildroot/package/libnss/0003-Bug-1590676-Fix-build-if-arm-doesn-t-support-NEON.patch b/buildroot/package/libnss/0003-Bug-1590676-Fix-build-if-arm-doesn-t-support-NEON.patch deleted file mode 100644 index 467a1dc47..000000000 --- a/buildroot/package/libnss/0003-Bug-1590676-Fix-build-if-arm-doesn-t-support-NEON.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c915be634cbfb90eb7880ec9efbdba9b98c6d4c1 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 23 Oct 2019 11:47:03 +0200 -Subject: [PATCH] Bug 1590676 - Fix build if arm doesn't support NEON - -At the moment NSS assumes that ARM supports NEON extension but this is -not true and leads to build failure on ARM without NEON extension. -Add check to assure USE_HW_AES is not defined if ARM without NEON -extension is used. - -Signed-off-by: Giulio Benetti ---- - nss/lib/freebl/aes-armv8.c | 5 +++-- - nss/lib/freebl/rijndael.c | 3 ++- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/nss/lib/freebl/aes-armv8.c b/nss/lib/freebl/aes-armv8.c -index 40d5e2d34..057d1aed3 100644 ---- a/nss/lib/freebl/aes-armv8.c -+++ b/nss/lib/freebl/aes-armv8.c -@@ -5,9 +5,10 @@ - #include "secerr.h" - #include "rijndael.h" - --#if (defined(__clang__) || \ -+#if ((defined(__clang__) || \ - (defined(__GNUC__) && defined(__GNUC_MINOR__) && \ -- (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 8)))) -+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 8)))) && \ -+ (defined(__ARM_NEON) || defined(__ARM_NEON__))) - - #ifndef __ARM_FEATURE_CRYPTO - #error "Compiler option is invalid" -diff --git a/nss/lib/freebl/rijndael.c b/nss/lib/freebl/rijndael.c -index 26bd58ee0..6d77d942d 100644 ---- a/nss/lib/freebl/rijndael.c -+++ b/nss/lib/freebl/rijndael.c -@@ -20,7 +20,8 @@ - #include "gcm.h" - #include "mpi.h" - --#if !defined(IS_LITTLE_ENDIAN) && !defined(NSS_X86_OR_X64) -+#if (!defined(IS_LITTLE_ENDIAN) && !defined(NSS_X86_OR_X64)) || \ -+ (defined(__arm__) && !defined(__ARM_NEON) && !defined(__ARM_NEON__)) - // not test yet on big endian platform of arm - #undef USE_HW_AES - #endif --- -2.20.1 - diff --git a/buildroot/package/libnss/Config.in b/buildroot/package/libnss/Config.in index 34ddb91df..2dd019723 100644 --- a/buildroot/package/libnss/Config.in +++ b/buildroot/package/libnss/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBNSS depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 select BR2_PACKAGE_LIBNSPR select BR2_PACKAGE_SQLITE select BR2_PACKAGE_ZLIB @@ -16,9 +15,18 @@ config BR2_PACKAGE_LIBNSS http://www.mozilla.org/projects/security/pki/nss/ +if BR2_PACKAGE_LIBNSS + +config BR2_PACKAGE_LIBNSS_ARCH + string + default "aarch64" if BR2_aarch64_be + default "ppc" if BR2_powerpc + default "ppc64" if BR2_powerpc64 + default "ppc64le" if BR2_powerpc64le + default BR2_ARCH + +endif + comment "libnss needs a toolchain w/ threads, dynamic library" depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -comment "libnss needs a toolchain not affected by GCC bug 85862" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 diff --git a/buildroot/package/libnss/libnss.hash b/buildroot/package/libnss/libnss.hash index 518d95d84..f4a6d74ee 100644 --- a/buildroot/package/libnss/libnss.hash +++ b/buildroot/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_46_1_RTM/src/SHA256SUMS -sha256 1ae3d1cb1de345b258788f2ef6b10a460068034c3fd64f42427a183d8342a6fb nss-3.47.1.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_50_RTM/src/SHA256SUMS +sha256 185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7 nss-3.50.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/buildroot/package/libnss/libnss.mk b/buildroot/package/libnss/libnss.mk index cf11deaf9..e439150ec 100644 --- a/buildroot/package/libnss/libnss.mk +++ b/buildroot/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.47.1 +LIBNSS_VERSION = 3.50 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist @@ -13,9 +13,15 @@ LIBNSS_DEPENDENCIES = libnspr sqlite zlib LIBNSS_LICENSE = MPL-2.0 LIBNSS_LICENSE_FILES = nss/COPYING +LIBNSS_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85862),y) +LIBNSS_CFLAGS += -O0 +endif + # Need to pass down TARGET_CFLAGS and TARGET_LDFLAGS define LIBNSS_FIXUP_LINUX_MK - echo 'OS_CFLAGS += $(TARGET_CFLAGS)' >> $(@D)/nss/coreconf/Linux.mk + echo 'OS_CFLAGS += $(LIBNSS_CFLAGS)' >> $(@D)/nss/coreconf/Linux.mk echo 'LDFLAGS += $(TARGET_LDFLAGS)' >> $(@D)/nss/coreconf/Linux.mk endef @@ -31,12 +37,6 @@ endef LIBNSS_PRE_CONFIGURE_HOOKS += LIBNSS_DROP_GC_SECTIONS endif -ifeq ($(BR2_aarch64_be),y) -LIBNSS_ARCH = aarch64 -else -LIBNSS_ARCH = $(ARCH) -endif - LIBNSS_BUILD_VARS = \ MOZILLA_CLIENT=1 \ NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \ @@ -47,13 +47,12 @@ LIBNSS_BUILD_VARS = \ NATIVE_CC="$(HOSTCC)" \ OS_ARCH="Linux" \ OS_RELEASE="2.6" \ - OS_TEST="$(LIBNSS_ARCH)" \ + OS_TEST=$(BR2_PACKAGE_LIBNSS_ARCH) \ NSS_ENABLE_WERROR=0 -# #pragma usage needs gcc >= 4.8 -# See https://bugzilla.mozilla.org/show_bug.cgi?id=1226179 -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),) -LIBNSS_BUILD_VARS += NSS_ENABLE_WERROR=0 +ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),) +# Disable Altivec if not supported +LIBNSS_BUILD_VARS += NSS_DISABLE_ALTIVEC=1 endif ifeq ($(BR2_ARCH_IS_64),y) @@ -74,7 +73,7 @@ define LIBNSS_BUILD_CMDS SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ - $(LIBNSS_BUILD_VARS) NATIVE_FLAGS="$(HOST_CFLAGS)" + $(LIBNSS_BUILD_VARS) NATIVE_FLAGS="$(HOST_CFLAGS) -DLINUX" endef define LIBNSS_INSTALL_STAGING_CMDS diff --git a/buildroot/package/libogg/libogg.hash b/buildroot/package/libogg/libogg.hash index d6962a55e..5d95c85d3 100644 --- a/buildroot/package/libogg/libogg.hash +++ b/buildroot/package/libogg/libogg.hash @@ -1,5 +1,7 @@ # From: http://www.xiph.org/downloads/ -sha256 4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08 libogg-1.3.3.tar.xz +md5 eadef24aad6e3e8379ba0d14971fd64a libogg-1.3.4.tar.xz +sha1 f07499a35566aa62affb5ca989f62eed5b8092c3 libogg-1.3.4.tar.xz +sha256 c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe libogg-1.3.4.tar.xz # Hash for license file: sha256 d2ab5758336489da61c12cc5bb757da5339c4ae9001f9bb0562b4370249af814 COPYING diff --git a/buildroot/package/libogg/libogg.mk b/buildroot/package/libogg/libogg.mk index 4c97e9a91..08e5f87b7 100644 --- a/buildroot/package/libogg/libogg.mk +++ b/buildroot/package/libogg/libogg.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOGG_VERSION = 1.3.3 +LIBOGG_VERSION = 1.3.4 LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.xz LIBOGG_SITE = http://downloads.xiph.org/releases/ogg LIBOGG_LICENSE = BSD-3-Clause diff --git a/buildroot/package/libolm/Config.in b/buildroot/package/libolm/Config.in new file mode 100644 index 000000000..a863216d5 --- /dev/null +++ b/buildroot/package/libolm/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBOLM + bool "libolm" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + libolm is an implementation of the Double Ratchet + cryptographic ratchet in C++ + + https://gitlab.matrix.org/matrix-org/olm + +comment "libolm needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/libolm/libolm.hash b/buildroot/package/libolm/libolm.hash new file mode 100644 index 000000000..613dda354 --- /dev/null +++ b/buildroot/package/libolm/libolm.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 1ca9926ce71d778fb7352d1ee77513194db8c7f49c0d69d38ac49ec3bafcea38 olm-3.1.4.tar.gz +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/buildroot/package/libolm/libolm.mk b/buildroot/package/libolm/libolm.mk new file mode 100644 index 000000000..78ee05b3c --- /dev/null +++ b/buildroot/package/libolm/libolm.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libolm +# +################################################################################ + +LIBOLM_VERSION = 3.1.4 +LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz +LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) +LIBOLM_LICENSE = Apache-2.0 +LIBOLM_LICENSE_FILES = LICENSE +LIBOLM_INSTALL_STAGING = YES + +LIBOLM_CONF_OPTS = -DOLM_TESTS=OFF + +$(eval $(cmake-package)) diff --git a/buildroot/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch b/buildroot/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch new file mode 100644 index 000000000..3758cd668 --- /dev/null +++ b/buildroot/package/libopenh264/0001-Add-USE_STACK_PROTECTOR-option.patch @@ -0,0 +1,100 @@ +From 1e7435751c055723b7103dd1d5bb68530e1a2678 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 8 Oct 2019 20:18:18 +0200 +Subject: [PATCH] Add USE_STACK_PROTECTOR option + +-fstack-protector-all is not supported on all linux toolchains so add an +option to disable it (and enable it by default to keep current behavior) + +Fixes: + - http://autobuild.buildroot.org/results/377818cf8c1f2632cabdccb32bf4e7f06c0fdbbd + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/cisco/openh264/pull/3175] +--- + Makefile | 1 + + build/platform-android.mk | 5 ++++- + build/platform-bsd.mk | 5 ++++- + build/platform-darwin.mk | 5 ++++- + build/platform-linux.mk | 5 ++++- + 5 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 74ff029d..c2061f6a 100644 +--- a/Makefile ++++ b/Makefile +@@ -34,6 +34,7 @@ GTEST_VER=release-1.8.1 + CCASFLAGS=$(CFLAGS) + STATIC_LDFLAGS=-lstdc++ + STRIP ?= strip ++USE_STACK_PROTECTOR = Yes + + SHAREDLIB_MAJORVERSION=5 + FULL_VERSION := 2.0.0 +diff --git a/build/platform-android.mk b/build/platform-android.mk +index 6f6ce347..06534301 100644 +--- a/build/platform-android.mk ++++ b/build/platform-android.mk +@@ -44,7 +44,10 @@ SYSROOT = $(NDKROOT)/platforms/android-$(NDKLEVEL)/arch-$(ARCH) + CXX = $(TOOLCHAINPREFIX)g++ + CC = $(TOOLCHAINPREFIX)gcc + AR = $(TOOLCHAINPREFIX)ar +-CFLAGS += -DANDROID_NDK -fpic --sysroot=$(SYSROOT) -MMD -MP -fstack-protector-all ++CFLAGS += -DANDROID_NDK -fpic --sysroot=$(SYSROOT) -MMD -MP ++ifeq ($(USE_STACK_PROTECTOR), Yes) ++CFLAGS +=-fstack-protector-all ++endif + CFLAGS += -isystem $(NDKROOT)/sysroot/usr/include -isystem $(NDKROOT)/sysroot/usr/include/$(TOOLCHAIN_NAME) -D__ANDROID_API__=$(NDKLEVEL) + CXXFLAGS += -fno-rtti -fno-exceptions + LDFLAGS += --sysroot=$(SYSROOT) +diff --git a/build/platform-bsd.mk b/build/platform-bsd.mk +index e60d2cc0..2e0bf2cc 100644 +--- a/build/platform-bsd.mk ++++ b/build/platform-bsd.mk +@@ -3,7 +3,10 @@ SHAREDLIBSUFFIX = so + SHAREDLIBSUFFIXFULLVER=$(SHAREDLIBSUFFIX).$(FULL_VERSION) + SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIBSUFFIX).$(SHAREDLIB_MAJORVERSION) + SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) +-CFLAGS += -fPIC -fstack-protector-all ++CFLAGS += -fPIC ++ifeq ($(USE_STACK_PROTECTOR), Yes) ++CFLAGS += -fstack-protector-all ++endif + LDFLAGS += -lpthread + STATIC_LDFLAGS += -lpthread -lm + ifeq ($(ASM_ARCH), x86) +diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk +index 6c7b2443..718c8e2f 100644 +--- a/build/platform-darwin.mk ++++ b/build/platform-darwin.mk +@@ -10,7 +10,10 @@ SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \ + $(SHAREDLIB_DIR)/$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) + SHARED = -dynamiclib + SHARED += -current_version $(CURRENT_VERSION) -compatibility_version $(COMPATIBILITY_VERSION) +-CFLAGS += -Wall -fPIC -MMD -MP -fstack-protector-all ++CFLAGS += -Wall -fPIC -MMD -MP ++ifeq ($(USE_STACK_PROTECTOR), Yes) ++CFLAGS += -fstack-protector-all ++endif + ifeq ($(ASM_ARCH), x86) + ASMFLAGS += -DPREFIX + ifeq ($(ARCH), x86_64) +diff --git a/build/platform-linux.mk b/build/platform-linux.mk +index 44fe2424..b5c006b2 100644 +--- a/build/platform-linux.mk ++++ b/build/platform-linux.mk +@@ -3,7 +3,10 @@ SHAREDLIBSUFFIX = so + SHAREDLIBSUFFIXFULLVER=$(SHAREDLIBSUFFIX).$(FULL_VERSION) + SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIBSUFFIX).$(SHAREDLIB_MAJORVERSION) + SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) +-CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP -fstack-protector-all ++CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP ++ifeq ($(USE_STACK_PROTECTOR), Yes) ++CFLAGS += -fstack-protector-all ++endif + LDFLAGS += -lpthread + STATIC_LDFLAGS += -lpthread -lm + AR_OPTS = crD $@ +-- +2.23.0 + diff --git a/buildroot/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch b/buildroot/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch new file mode 100644 index 000000000..895a97e93 --- /dev/null +++ b/buildroot/package/libopenh264/0002-Adjust-the-mmi-msa-detection-m.patch @@ -0,0 +1,385 @@ +From 576b64d6a4253f900d4846503df55dba051063ab Mon Sep 17 00:00:00 2001 +From: gxw +Date: Tue, 22 Oct 2019 19:20:19 +0800 +Subject: [PATCH] Adjust the mmi/msa detection mode for mips platform. + +Using mips-simd-check.sh to test the current compiler support mmi/msa +or not before make. If supported, enable mmi/msa. +According to the model name in /proc/cpuinfo to test the current +cpu support mmi/msa or not for runtime detection. +Now We can use the following make instructions on mips platform: +1. make (automatic detection mmi/msa) +2. make ENABLE_MMI=No (disable mmi) +3. make ENABLE_MSA=No (disable msa) +4. make ENABLE_MMI=No ENABLE_MSA=No (disable mmi and msa) + +Change-Id: Ibd348ebc11912d7fca1b548c76838675d69b7c40 + +Downloaded from upstream PR: +https://github.com/cisco/openh264/pull/3175 + +Signed-off-by: gxw +[Bernd: rebased on top of patch 0001] +Signed-off-by: Bernd Kuhls +--- + Makefile | 2 ++ + build/arch.mk | 18 ++++++++++++---- + build/mips-simd-check.sh | 32 +++++++++++++++++++++++++++ + build/mktargets.py | 43 ++++++++++++++++++++++++++----------- + codec/common/inc/cpu_core.h | 1 + + codec/common/src/cpu.cpp | 37 +++++++++++++++++++++++++------ + codec/common/targets.mk | 18 ++++++++++++---- + codec/decoder/targets.mk | 18 ++++++++++++---- + codec/encoder/targets.mk | 18 ++++++++++++---- + codec/processing/targets.mk | 18 ++++++++++++---- + 10 files changed, 166 insertions(+), 39 deletions(-) + create mode 100755 build/mips-simd-check.sh + +diff --git a/Makefile b/Makefile +index 74ff029d9..65d13630b 100644 +--- a/Makefile ++++ b/Makefile +@@ -35,6 +35,8 @@ GTEST_VER=release-1.8.1 + STATIC_LDFLAGS=-lstdc++ + STRIP ?= strip + USE_STACK_PROTECTOR = Yes ++ENABLE_MMI=Yes ++ENABLE_MSA=Yes + + SHAREDLIB_MAJORVERSION=5 + FULL_VERSION := 2.0.0 +diff --git a/build/arch.mk b/build/arch.mk +index 8ac3e70a5..555e4afec 100644 +--- a/build/arch.mk ++++ b/build/arch.mk +@@ -30,14 +30,24 @@ CFLAGS += -DHAVE_NEON_AARCH64 + endif + endif + +-#for loongson ++#for mips + ifneq ($(filter mips mips64, $(ARCH)),) + ifeq ($(USE_ASM), Yes) + ASM_ARCH = mips + ASMFLAGS += -I$(SRC_PATH)codec/common/mips/ +-LOONGSON3A = $(shell g++ -dM -E - < /dev/null | grep '_MIPS_TUNE ' | cut -f 3 -d " ") +-ifeq ($(LOONGSON3A), "loongson3a") +-CFLAGS += -DHAVE_MMI ++#mmi ++ifeq ($(ENABLE_MMI), Yes) ++ENABLE_MMI = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) mmi) ++ifeq ($(ENABLE_MMI), Yes) ++CFLAGS += -march=loongson3a -DHAVE_MMI ++endif ++endif ++#msa ++ifeq ($(ENABLE_MSA), Yes) ++ENABLE_MSA = $(shell $(SRC_PATH)build/mips-simd-check.sh $(CC) msa) ++ifeq ($(ENABLE_MSA), Yes) ++CFLAGS += -mmsa -DHAVE_MSA ++endif + endif + endif + endif +diff --git a/build/mips-simd-check.sh b/build/mips-simd-check.sh +new file mode 100755 +index 000000000..cbc29e3d3 +--- /dev/null ++++ b/build/mips-simd-check.sh +@@ -0,0 +1,32 @@ ++#!/bin/bash ++#********************************************************************************** ++# This script is using in build/arch.mk for mips to detect the simd instructions: ++# mmi, msa (maybe more in the future). ++# ++# --usage: ++# ./mips-simd-check.sh $(CC) mmi ++# or ./mips-simd-check.sh $(CC) msa ++# ++# date: 10/17/2019 Created ++#********************************************************************************** ++ ++TMPC=$(mktemp test.XXXXXX.c) ++TMPO=$(mktemp test.XXXXXX.o) ++if [ $2 == "mmi" ] ++then ++ echo "void main(void){ __asm__ volatile(\"punpcklhw \$f0, \$f0, \$f0\"); }" > $TMPC ++ $1 -march=loongson3a $TMPC -o $TMPO &> /dev/null ++ if test -s $TMPO ++ then ++ echo "Yes" ++ fi ++elif [ $2 == "msa" ] ++then ++ echo "void main(void){ __asm__ volatile(\"addvi.b \$w0, \$w1, 1\"); }" > $TMPC ++ $1 -mmsa $TMPC -o $TMPO &> /dev/null ++ if test -s $TMPO ++ then ++ echo "Yes" ++ fi ++fi ++rm -f $TMPC $TMPO +diff --git a/build/mktargets.py b/build/mktargets.py +index 593280c09..518909d3d 100755 +--- a/build/mktargets.py ++++ b/build/mktargets.py +@@ -119,9 +119,9 @@ def find_sources(): + armfiles.append(file) + mipsfiles = [] + for file in cfiles: +- c = file.split('/') +- if 'mips' in c: +- mipsfiles.append(file) ++ c = file.split('/') ++ if 'mips' in c: ++ mipsfiles.append(file) + cfiles = [x for x in cfiles if x not in mipsfiles] + + +@@ -181,15 +181,34 @@ def find_sources(): + f.write("OBJS += $(%s_OBJSARM64)\n\n"%(PREFIX)) + + if len(mipsfiles) > 0: +- f.write("%s_ASM_MIPS_SRCS=\\\n"%(PREFIX)) +- for c in mipsfiles: +- f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c)) +- f.write("\n") +- f.write("%s_OBJSMIPS += $(%s_ASM_MIPS_SRCS:.c=.$(OBJ))\n"%(PREFIX, PREFIX)) +- f.write("ifeq ($(ASM_ARCH), mips)\n") +- f.write("%s_OBJS += $(%s_OBJSMIPS)\n"%(PREFIX,PREFIX)) +- f.write("endif\n") +- f.write("OBJS += $(%s_OBJSMIPS)\n\n"%(PREFIX)) ++ mmifiles = [] ++ for file in mipsfiles: ++ if '_mmi' in file: ++ mmifiles.append(file) ++ f.write("%s_ASM_MIPS_MMI_SRCS=\\\n"%(PREFIX)) ++ for c in mmifiles: ++ f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c)) ++ f.write("\n") ++ f.write("%s_OBJSMIPS_MMI += $(%s_ASM_MIPS_MMI_SRCS:.c=.$(OBJ))\n\n"%(PREFIX, PREFIX)) ++ msafiles = [] ++ for file in mipsfiles: ++ if '_msa' in file: ++ msafiles.append(file) ++ f.write("%s_ASM_MIPS_MSA_SRCS=\\\n"%(PREFIX)) ++ for c in msafiles: ++ f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c)) ++ f.write("\n") ++ f.write("%s_OBJSMIPS_MSA += $(%s_ASM_MIPS_MSA_SRCS:.c=.$(OBJ))\n"%(PREFIX, PREFIX)) ++ f.write("ifeq ($(ASM_ARCH), mips)\n") ++ f.write("ifeq ($(ENABLE_MMI), Yes)\n") ++ f.write("%s_OBJS += $(%s_OBJSMIPS_MMI)\n"%(PREFIX,PREFIX)) ++ f.write("endif\n") ++ f.write("ifeq ($(ENABLE_MSA), Yes)\n") ++ f.write("%s_OBJS += $(%s_OBJSMIPS_MSA)\n"%(PREFIX,PREFIX)) ++ f.write("endif\n") ++ f.write("endif\n") ++ f.write("OBJS += $(%s_OBJSMIPS_MMI)\n"%(PREFIX)) ++ f.write("OBJS += $(%s_OBJSMIPS_MSA)\n\n"%(PREFIX)) + + f.write("OBJS += $(%s_OBJS)\n\n"%(PREFIX)) + write_cpp_rule_pattern(f) +diff --git a/codec/common/inc/cpu_core.h b/codec/common/inc/cpu_core.h +index e5906c62b..f25787b04 100644 +--- a/codec/common/inc/cpu_core.h ++++ b/codec/common/inc/cpu_core.h +@@ -86,6 +86,7 @@ + + /* For loongson */ + #define WELS_CPU_MMI 0x00000001 /* mmi */ ++#define WELS_CPU_MSA 0x00000002 /* msa */ + + /* + * Interfaces for CPU core feature detection as below +diff --git a/codec/common/src/cpu.cpp b/codec/common/src/cpu.cpp +index a39fd0645..94bb2d5d3 100644 +--- a/codec/common/src/cpu.cpp ++++ b/codec/common/src/cpu.cpp +@@ -309,12 +309,37 @@ uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) { + + #elif defined(mips) + /* for loongson */ ++static uint32_t get_cpu_flags_from_cpuinfo(void) ++{ ++ uint32_t flags = 0; ++ ++# ifdef __linux__ ++ FILE* fp = fopen("/proc/cpuinfo", "r"); ++ if (!fp) ++ return flags; ++ ++ char buf[200]; ++ memset(buf, 0, sizeof(buf)); ++ while (fgets(buf, sizeof(buf), fp)) { ++ if (!strncmp(buf, "model name", strlen("model name"))) { ++ if (strstr(buf, "3A4000")) { ++ flags |= WELS_CPU_MSA | WELS_CPU_MMI; ++ } else if (strstr(buf, "2K1000")) { ++ flags |= WELS_CPU_MSA | WELS_CPU_MMI; ++ } else if (strstr(buf, "Loongson-3A") || strstr(buf, "Loongson-3B")) { ++ flags |= WELS_CPU_MMI; ++ } ++ break; ++ } ++ } ++ fclose(fp); ++# endif ++ ++ return flags; ++} ++ + uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) { +-#if defined(HAVE_MMI) +- return WELS_CPU_MMI; +-#else +- return 0; +-#endif ++ return get_cpu_flags_from_cpuinfo(); + } + + #else /* Neither X86_ASM, HAVE_NEON, HAVE_NEON_AARCH64 nor mips */ +@@ -324,5 +349,3 @@ uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) { + } + + #endif +- +- +diff --git a/codec/common/targets.mk b/codec/common/targets.mk +index 96843cd9d..f2cd192fd 100644 +--- a/codec/common/targets.mk ++++ b/codec/common/targets.mk +@@ -66,18 +66,28 @@ COMMON_OBJS += $(COMMON_OBJSARM64) + endif + OBJS += $(COMMON_OBJSARM64) + +-COMMON_ASM_MIPS_SRCS=\ ++COMMON_ASM_MIPS_MMI_SRCS=\ + $(COMMON_SRCDIR)/mips/copy_mb_mmi.c\ + $(COMMON_SRCDIR)/mips/deblock_mmi.c\ + $(COMMON_SRCDIR)/mips/expand_picture_mmi.c\ + $(COMMON_SRCDIR)/mips/intra_pred_com_mmi.c\ + $(COMMON_SRCDIR)/mips/satd_sad_mmi.c\ + +-COMMON_OBJSMIPS += $(COMMON_ASM_MIPS_SRCS:.c=.$(OBJ)) ++COMMON_OBJSMIPS_MMI += $(COMMON_ASM_MIPS_MMI_SRCS:.c=.$(OBJ)) ++ ++COMMON_ASM_MIPS_MSA_SRCS=\ ++ ++COMMON_OBJSMIPS_MSA += $(COMMON_ASM_MIPS_MSA_SRCS:.c=.$(OBJ)) + ifeq ($(ASM_ARCH), mips) +-COMMON_OBJS += $(COMMON_OBJSMIPS) ++ifeq ($(ENABLE_MMI), Yes) ++COMMON_OBJS += $(COMMON_OBJSMIPS_MMI) ++endif ++ifeq ($(ENABLE_MSA), Yes) ++COMMON_OBJS += $(COMMON_OBJSMIPS_MSA) ++endif + endif +-OBJS += $(COMMON_OBJSMIPS) ++OBJS += $(COMMON_OBJSMIPS_MMI) ++OBJS += $(COMMON_OBJSMIPS_MSA) + + OBJS += $(COMMON_OBJS) + +diff --git a/codec/decoder/targets.mk b/codec/decoder/targets.mk +index c01618411..88dc5afb1 100644 +--- a/codec/decoder/targets.mk ++++ b/codec/decoder/targets.mk +@@ -57,14 +57,24 @@ DECODER_OBJS += $(DECODER_OBJSARM64) + endif + OBJS += $(DECODER_OBJSARM64) + +-DECODER_ASM_MIPS_SRCS=\ ++DECODER_ASM_MIPS_MMI_SRCS=\ + $(DECODER_SRCDIR)/core/mips/dct_mmi.c\ + +-DECODER_OBJSMIPS += $(DECODER_ASM_MIPS_SRCS:.c=.$(OBJ)) ++DECODER_OBJSMIPS_MMI += $(DECODER_ASM_MIPS_MMI_SRCS:.c=.$(OBJ)) ++ ++DECODER_ASM_MIPS_MSA_SRCS=\ ++ ++DECODER_OBJSMIPS_MSA += $(DECODER_ASM_MIPS_MSA_SRCS:.c=.$(OBJ)) + ifeq ($(ASM_ARCH), mips) +-DECODER_OBJS += $(DECODER_OBJSMIPS) ++ifeq ($(ENABLE_MMI), Yes) ++DECODER_OBJS += $(DECODER_OBJSMIPS_MMI) ++endif ++ifeq ($(ENABLE_MSA), Yes) ++DECODER_OBJS += $(DECODER_OBJSMIPS_MSA) ++endif + endif +-OBJS += $(DECODER_OBJSMIPS) ++OBJS += $(DECODER_OBJSMIPS_MMI) ++OBJS += $(DECODER_OBJSMIPS_MSA) + + OBJS += $(DECODER_OBJS) + +diff --git a/codec/encoder/targets.mk b/codec/encoder/targets.mk +index 1f053280e..4fb2e690e 100644 +--- a/codec/encoder/targets.mk ++++ b/codec/encoder/targets.mk +@@ -82,16 +82,26 @@ ENCODER_OBJS += $(ENCODER_OBJSARM64) + endif + OBJS += $(ENCODER_OBJSARM64) + +-ENCODER_ASM_MIPS_SRCS=\ ++ENCODER_ASM_MIPS_MMI_SRCS=\ + $(ENCODER_SRCDIR)/core/mips/dct_mmi.c\ + $(ENCODER_SRCDIR)/core/mips/quant_mmi.c\ + $(ENCODER_SRCDIR)/core/mips/score_mmi.c\ + +-ENCODER_OBJSMIPS += $(ENCODER_ASM_MIPS_SRCS:.c=.$(OBJ)) ++ENCODER_OBJSMIPS_MMI += $(ENCODER_ASM_MIPS_MMI_SRCS:.c=.$(OBJ)) ++ ++ENCODER_ASM_MIPS_MSA_SRCS=\ ++ ++ENCODER_OBJSMIPS_MSA += $(ENCODER_ASM_MIPS_MSA_SRCS:.c=.$(OBJ)) + ifeq ($(ASM_ARCH), mips) +-ENCODER_OBJS += $(ENCODER_OBJSMIPS) ++ifeq ($(ENABLE_MMI), Yes) ++ENCODER_OBJS += $(ENCODER_OBJSMIPS_MMI) ++endif ++ifeq ($(ENABLE_MSA), Yes) ++ENCODER_OBJS += $(ENCODER_OBJSMIPS_MSA) ++endif + endif +-OBJS += $(ENCODER_OBJSMIPS) ++OBJS += $(ENCODER_OBJSMIPS_MMI) ++OBJS += $(ENCODER_OBJSMIPS_MSA) + + OBJS += $(ENCODER_OBJS) + +diff --git a/codec/processing/targets.mk b/codec/processing/targets.mk +index 300de2d80..0f8873335 100644 +--- a/codec/processing/targets.mk ++++ b/codec/processing/targets.mk +@@ -58,14 +58,24 @@ PROCESSING_OBJS += $(PROCESSING_OBJSARM64) + endif + OBJS += $(PROCESSING_OBJSARM64) + +-PROCESSING_ASM_MIPS_SRCS=\ ++PROCESSING_ASM_MIPS_MMI_SRCS=\ + $(PROCESSING_SRCDIR)/src/mips/vaa_mmi.c\ + +-PROCESSING_OBJSMIPS += $(PROCESSING_ASM_MIPS_SRCS:.c=.$(OBJ)) ++PROCESSING_OBJSMIPS_MMI += $(PROCESSING_ASM_MIPS_MMI_SRCS:.c=.$(OBJ)) ++ ++PROCESSING_ASM_MIPS_MSA_SRCS=\ ++ ++PROCESSING_OBJSMIPS_MSA += $(PROCESSING_ASM_MIPS_MSA_SRCS:.c=.$(OBJ)) + ifeq ($(ASM_ARCH), mips) +-PROCESSING_OBJS += $(PROCESSING_OBJSMIPS) ++ifeq ($(ENABLE_MMI), Yes) ++PROCESSING_OBJS += $(PROCESSING_OBJSMIPS_MMI) ++endif ++ifeq ($(ENABLE_MSA), Yes) ++PROCESSING_OBJS += $(PROCESSING_OBJSMIPS_MSA) ++endif + endif +-OBJS += $(PROCESSING_OBJSMIPS) ++OBJS += $(PROCESSING_OBJSMIPS_MMI) ++OBJS += $(PROCESSING_OBJSMIPS_MSA) + + OBJS += $(PROCESSING_OBJS) + diff --git a/buildroot/package/libopenh264/libopenh264.hash b/buildroot/package/libopenh264/libopenh264.hash index b9cd9ed53..fdb03d2f7 100644 --- a/buildroot/package/libopenh264/libopenh264.hash +++ b/buildroot/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9c07c38d7de00046c9c52b12c76a2af7648b70d05bd5460c8b67f6895738653f libopenh264-v1.7.0.tar.gz +sha256 73c35f80cc487560d11ecabb6d31ad828bd2f59d412f9cd726cc26bfaf4561fd libopenh264-2.0.0.tar.gz sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/buildroot/package/libopenh264/libopenh264.mk b/buildroot/package/libopenh264/libopenh264.mk index 233e7971f..307dbc589 100644 --- a/buildroot/package/libopenh264/libopenh264.mk +++ b/buildroot/package/libopenh264/libopenh264.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBOPENH264_VERSION = v1.7.0 -LIBOPENH264_SITE = $(call github,cisco,openh264,$(LIBOPENH264_VERSION)) +LIBOPENH264_VERSION = 2.0.0 +LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE LIBOPENH264_INSTALL_STAGING = YES @@ -30,7 +30,8 @@ endif # architecture don't need it. LIBOPENH264_MAKE_OPTS = \ ARCH=$(LIBOPENH264_ARCH) \ - ENABLE64BIT=$(if $(BR2_x86_64),Yes,No) + ENABLE64BIT=$(if $(BR2_x86_64),Yes,No) \ + USE_STACK_PROTECTOR=No define LIBOPENH264_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ diff --git a/buildroot/package/libopenssl/Config.in b/buildroot/package/libopenssl/Config.in new file mode 100644 index 000000000..881518d1c --- /dev/null +++ b/buildroot/package/libopenssl/Config.in @@ -0,0 +1,47 @@ +if BR2_PACKAGE_LIBOPENSSL + +# 4xx PowerPC cores seem to have trouble with openssl's ASM +# optimizations +config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH_LINUX_PPC + bool + default y if BR2_powerpc + depends on !BR2_powerpc_401 + depends on !BR2_powerpc_403 + depends on !BR2_powerpc_405 + depends on !BR2_powerpc_405fp + depends on !BR2_powerpc_440 + depends on !BR2_powerpc_440fp + +config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH + string + # Use "gcc" minimalistic target to disable DSO + # no-asm is needed with generic architectures such as gcc, see + # https://github.com/openssl/openssl/issues/9839 + default "gcc no-asm" if BR2_STATIC_LIBS + # Doesn't work for thumb-only (Cortex-M?) + default "linux-armv4" if BR2_ARM_CPU_HAS_ARM + default "linux-aarch64" if BR2_aarch64 + default "linux-ppc" if BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH_LINUX_PPC + default "linux-ppc64" if BR2_powerpc64 + default "linux-ppc64le" if BR2_powerpc64le + default "linux-x86" if BR2_i386 + default "linux-x86_64" if BR2_x86_64 + # no-asm is needed with generic architectures such as + # linux-generic{32,64}, see + # https://github.com/openssl/openssl/issues/9839 + default "linux-generic64 no-asm" if BR2_ARCH_IS_64 + default "linux-generic32 no-asm" + +config BR2_PACKAGE_LIBOPENSSL_BIN + bool "openssl binary" + help + Install the openssl binary and the associated helper scripts + to the target file system. This is a command line tool for + doing various cryptographic stuff. + +config BR2_PACKAGE_LIBOPENSSL_ENGINES + bool "openssl additional engines" + help + Install additional encryption engine libraries. + +endif # BR2_PACKAGE_LIBOPENSSL diff --git a/buildroot/package/libopenssl/libopenssl.hash b/buildroot/package/libopenssl/libopenssl.hash index 1b239fbee..3becd790a 100644 --- a/buildroot/package/libopenssl/libopenssl.hash +++ b/buildroot/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ # From https://www.openssl.org/source/openssl-1.1.1d.tar.gz.sha256 -sha256 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2 openssl-1.1.1d.tar.gz +sha256 186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 openssl-1.1.1f.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/buildroot/package/libopenssl/libopenssl.mk b/buildroot/package/libopenssl/libopenssl.mk index a1bbf9a90..4639c63fa 100644 --- a/buildroot/package/libopenssl/libopenssl.mk +++ b/buildroot/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1d +LIBOPENSSL_VERSION = 1.1.1f LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay @@ -12,9 +12,7 @@ LIBOPENSSL_LICENSE_FILES = LICENSE LIBOPENSSL_INSTALL_STAGING = YES LIBOPENSSL_DEPENDENCIES = zlib HOST_LIBOPENSSL_DEPENDENCIES = host-zlib -# no-asm is needed with generic architectures such as linux-generic32, see -# https://github.com/openssl/openssl/issues/9839 -LIBOPENSSL_TARGET_ARCH = linux-generic32 no-asm +LIBOPENSSL_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH)) LIBOPENSSL_CFLAGS = $(TARGET_CFLAGS) LIBOPENSSL_PROVIDES = openssl @@ -55,37 +53,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_UCONTEXT),) LIBOPENSSL_CFLAGS += -DOPENSSL_NO_ASYNC endif -ifeq ($(BR2_STATIC_LIBS),y) -# Use "gcc" minimalistic target to disable DSO -# no-asm is needed with generic architectures such as gcc, see -# https://github.com/openssl/openssl/issues/9839 -LIBOPENSSL_TARGET_ARCH = gcc no-asm -else -# Some architectures are optimized in OpenSSL -# Doesn't work for thumb-only (Cortex-M?) -ifeq ($(BR2_ARM_CPU_HAS_ARM),y) -LIBOPENSSL_TARGET_ARCH = linux-armv4 -endif -ifeq ($(ARCH),aarch64) -LIBOPENSSL_TARGET_ARCH = linux-aarch64 -endif -ifeq ($(ARCH),powerpc) -# 4xx cores seem to have trouble with openssl's ASM optimizations -ifeq ($(BR2_powerpc_401)$(BR2_powerpc_403)$(BR2_powerpc_405)$(BR2_powerpc_405fp)$(BR2_powerpc_440)$(BR2_powerpc_440fp),) -LIBOPENSSL_TARGET_ARCH = linux-ppc -endif -endif -ifeq ($(ARCH),powerpc64) -LIBOPENSSL_TARGET_ARCH = linux-ppc64 -endif -ifeq ($(ARCH),powerpc64le) -LIBOPENSSL_TARGET_ARCH = linux-ppc64le -endif -ifeq ($(ARCH),x86_64) -LIBOPENSSL_TARGET_ARCH = linux-x86_64 -endif -endif - define HOST_LIBOPENSSL_CONFIGURE_CMDS (cd $(@D); \ $(HOST_CONFIGURE_OPTS) \ diff --git a/buildroot/package/libostree/libostree.hash b/buildroot/package/libostree/libostree.hash index ddd15b509..374f278f4 100644 --- a/buildroot/package/libostree/libostree.hash +++ b/buildroot/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f263cfed75dcc9e312a874d28241e7143d8a0d8c774938f2165327bae67dbe06 libostree-2018.9.1.tar.xz +sha256 5482b8fc179c6d2861acb176a1c379e4d02f709bffa92e63f5360f65e57219ae libostree-2019.6.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/buildroot/package/libostree/libostree.mk b/buildroot/package/libostree/libostree.mk index e8cdd64d6..bdbe6b5ab 100644 --- a/buildroot/package/libostree/libostree.mk +++ b/buildroot/package/libostree/libostree.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBOSTREE_VERSION_MAJOR = 2018.9 -LIBOSTREE_VERSION= $(LIBOSTREE_VERSION_MAJOR).1 +LIBOSTREE_VERSION_MAJOR = 2019.6 +LIBOSTREE_VERSION= $(LIBOSTREE_VERSION_MAJOR) LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION_MAJOR) diff --git a/buildroot/package/libp11/Config.in b/buildroot/package/libp11/Config.in new file mode 100644 index 000000000..4d7ff5689 --- /dev/null +++ b/buildroot/package/libp11/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBP11 + bool "libp11" + depends on !BR2_STATIC_LIBS # dlopen + select BR2_PACKAGE_OPENSSL + help + OpenSSL engine for PKCS#11 modules. Part of the OpenSC + project. + + https://github.com/OpenSC/OpenSC/wiki + +comment "libp11 needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/libp11/Config.in.host b/buildroot/package/libp11/Config.in.host new file mode 100644 index 000000000..8da081f86 --- /dev/null +++ b/buildroot/package/libp11/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_LIBP11 + bool "host libp11" + help + OpenSSL engine for PKCS#11 modules. Part of the OpenSC + project. + + https://github.com/OpenSC/OpenSC/wiki diff --git a/buildroot/package/libp11/libp11.hash b/buildroot/package/libp11/libp11.hash new file mode 100644 index 000000000..bba5c770a --- /dev/null +++ b/buildroot/package/libp11/libp11.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 639ea43c3341e267214b712e1e5e12397fd2d350899e673dd1220f3c6b8e3db4 libp11-0.4.10.tar.gz +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING diff --git a/buildroot/package/libp11/libp11.mk b/buildroot/package/libp11/libp11.mk new file mode 100644 index 000000000..90c582571 --- /dev/null +++ b/buildroot/package/libp11/libp11.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# libp11 +# +################################################################################ + +LIBP11_VERSION = 0.4.10 +LIBP11_SITE = https://github.com/OpenSC/libp11/releases/download/libp11-$(LIBP11_VERSION) +LIBP11_DEPENDENCIES = openssl host-pkgconf +LIBP11_INSTALL_STAGING = YES +LIBP11_LICENSE = LGPL-2.1+ +LIBP11_LICENSE_FILES = COPYING + +# pkg-config returns a libcrypto enginesdir prefixed with the sysroot, +# so let's rip it out. +LIBP11_CONF_OPTS = \ + --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable enginesdir libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` + +ifeq ($(BR2_PACKAGE_P11_KIT),y) +LIBP11_CONF_OPTS += --with-pkcs11-module=/usr/lib/p11-kit-proxy.so +endif + +HOST_LIBP11_DEPENDENCIES = host-pkgconf host-openssl + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/libpagekite/0001-configure.ac-fix-handling-of-with.patch b/buildroot/package/libpagekite/0001-configure.ac-fix-handling-of-with.patch deleted file mode 100644 index 342b7d50a..000000000 --- a/buildroot/package/libpagekite/0001-configure.ac-fix-handling-of-with.patch +++ /dev/null @@ -1,76 +0,0 @@ -From dbb7ea56148949412b18770967022455f3e5cb63 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Fri, 16 Feb 2018 11:45:21 +0100 -Subject: [PATCH] configure.ac: fix handling of --with-* - -The 'action-if-given' argument of AC_ARG_WITH is executed whenever the ---with- or --without- option is given. Setting e.g. with_tests=yes in -that branch causes the argument '--without-tests' to *enable* the tests -instead of disabling them. - -In most cases, the third and fourth argument can simply be skipped -since they are optional. We only need them in the cases where we use a -different variable than with_foo, or where we want to default to yes -instead of defaulting to empty. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) - -Upstream status: pull request sent: - https://github.com/pagekite/libpagekite/pull/49 ---- - configure.ac | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index aa4eb9c..130752a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -34,18 +34,15 @@ AC_ARG_WITH(openssl,[ --with-openssl=DIR Use optional openssl libs and inclu - - AC_ARG_WITH(tests, - [AS_HELP_STRING([--with-tests], -- [Compile libpagekite unit tests])], -- [with_tests=yes], []) -+ [Compile libpagekite unit tests])]) - - AC_ARG_WITH(debug-traces, - [AS_HELP_STRING([--with-debug-traces], -- [Compile libpagekite debug function traces])], -- [with_debug_traces=yes], []) -+ [Compile libpagekite debug function traces])]) - - AC_ARG_WITH(debug-canaries, - [AS_HELP_STRING([--with-debug-canaries], -- [Compile libpagekite debug memory canaries])], -- [with_debug_canaries=yes], []) -+ [Compile libpagekite debug memory canaries])]) - - AC_ARG_WITH(lua, - [AS_HELP_STRING([--without-lua], -@@ -55,7 +52,7 @@ AC_ARG_WITH(lua, - AC_ARG_WITH(os-libev, - [AS_HELP_STRING([--without-os-libev], - [Use embedded libev, not the OS-provided library])], -- [use_libev=no], []) -+ [use_libev="$withval"], []) - - AC_ARG_WITH(ipv6, - [AS_HELP_STRING([--without-ipv6], -@@ -70,12 +67,12 @@ AC_ARG_WITH(java, - AC_ARG_WITH(agpl-relay, - [AS_HELP_STRING([--with-agpl-relay], - [Compile libpagekite relay support (AGPLv3 code)])], -- [with_relay=yes], [with_relay=no]) -+ [with_relay="$withval"], [with_relay=no]) - - AC_ARG_WITH(ds-logfmt, - [AS_HELP_STRING([--with-ds-logfmt], - [Compile libpagekite with DigitalSTROM log format.])], -- [with_ds_logfmt=yes], [with_ds_logfmt=no]) -+ [with_ds_logfmt="$withval"], [with_ds_logfmt=no]) - - - # Checks for programs. --- -2.15.1 - diff --git a/buildroot/package/libpagekite/0002-configure.ac-use-AS_HELP_STRING-for-with-openssl.patch b/buildroot/package/libpagekite/0002-configure.ac-use-AS_HELP_STRING-for-with-openssl.patch deleted file mode 100644 index f72127b11..000000000 --- a/buildroot/package/libpagekite/0002-configure.ac-use-AS_HELP_STRING-for-with-openssl.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cb20efae0e2ca86dd48c603b61d9c20225ebcd3d Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Fri, 16 Feb 2018 12:06:28 +0100 -Subject: [PATCH] configure.ac: use AS_HELP_STRING for --with-openssl - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 130752a..4874c0b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,7 +17,9 @@ use_openssl="yes" - use_libev="yes" - - specialssldir="" --AC_ARG_WITH(openssl,[ --with-openssl=DIR Use optional openssl libs and includes from [DIR]/lib/ and [DIR]/include/openssl/], -+AC_ARG_WITH(openssl, -+ [AS_HELP_STRING([--with-openssl=DIR], -+ [Use optional openssl libs and includes from [DIR]/lib/ and [DIR]/include/openssl/])], - [ case "$with_openssl" in - yes) - ;; --- -2.15.1 - diff --git a/buildroot/package/libpagekite/0003-configure.ac-use-pkg-config-for-openssl.patch b/buildroot/package/libpagekite/0003-configure.ac-use-pkg-config-for-openssl.patch deleted file mode 100644 index b615d302b..000000000 --- a/buildroot/package/libpagekite/0003-configure.ac-use-pkg-config-for-openssl.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 6a8b5ee14acee6c258bbaeb8b148ee0dd0d62d3d Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Fri, 16 Feb 2018 15:36:59 +0100 -Subject: [PATCH] configure.ac: use pkg-config for openssl - -It is better to use pkg-config to detect openssl if that is possible. -pkg-config will add e.g. -lz and -ldl when needed. If pkg-config -fails, fall back to the old approach of detecting headers and libs. -Some of the additional openssl support (e.g. adding -ldl) is moved -inside the non-pkg-config path. - -Since AC_CHECK_LIBS adds the library found to LIBS, do the same in -the pkg-config case. Normally the Makefile.am should instead use -OPENSSL_LIBS where needed, but this is not done consistently. - -When --with-openssl=DIR is given, still perform the test (both with -pkg-config and by checking headers and libs). I.e., remove -$specialssldir. - -While we're at it, simplify the headers checks by merging them into a -single AC_CHECK_HEADERS. - -Note that it is (still) not an error when openssl is not found, -although the build will then fail. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - configure.ac | 67 ++++++++++++++++++++++-------------------------------------- - 1 file changed, 24 insertions(+), 43 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4874c0b..ccab9f4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16,7 +16,6 @@ AC_CANONICAL_HOST - use_openssl="yes" - use_libev="yes" - --specialssldir="" - AC_ARG_WITH(openssl, - [AS_HELP_STRING([--with-openssl=DIR], - [Use optional openssl libs and includes from [DIR]/lib/ and [DIR]/include/openssl/])], -@@ -27,7 +26,6 @@ AC_ARG_WITH(openssl, - use_openssl="no" - ;; - *) -- specialssldir="$with_openssl" - LDFLAGS="$LDFLAGS -L$with_openssl/lib" - CPPFLAGS="-I$with_openssl/include $CPPFLAGS" - ;; -@@ -139,59 +137,42 @@ AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK - AC_FUNC_REALLOC - AC_CHECK_FUNCS([clock_gettime dup2 gethostbyname gettimeofday inet_ntoa malloc memmove memset select socket strcasecmp strchr strdup strerror strncasecmp strrchr uname sched_yield pthread_yield pthread_yield_np]) - --# OpenSSL requires dlopen on some platforms --AC_SEARCH_LIBS(dlopen, dl) -- - # If they didn't specify it, we try to find it --if test "$use_openssl" = "yes" -a -z "$specialssldir" ; then -- AC_CHECK_HEADER(openssl/ssl.h,, -+if test "$use_openssl" = "yes" ; then -+ # First try pkg-config; fall back to headers/libs check -+ PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.0], -+ [LIBS="$OPENSSL_LIBS $LIBS"], -+ [AC_CHECK_HEADERS([openssl/ssl.h openssl/err.h openssl/rand.h],, - [ use_openssl="no" -- AC_MSG_WARN([Failed to find openssl/ssl.h so OpenSSL will not be used. -- If it is installed you can try the --with-openssl=DIR argument]) ]) -- -- if test "$use_openssl" = "yes"; then -- AC_CHECK_HEADER(openssl/err.h,, -- [ use_openssl="no" -- AC_MSG_WARN([Failed to find openssl/err.h so OpenSSL will not be used. -- If it is installed you can try the --with-openssl=DIR argument]) ]) -- fi -- -- if test "$use_openssl" = "yes"; then -- AC_CHECK_HEADER(openssl/rand.h,, -- [ use_openssl="no" -- AC_MSG_WARN([Failed to find openssl/rand.h so OpenSSL will not be used. -- If it is installed you can try the --with-openssl=DIR argument]) ]) -- fi -- -- if test "$use_openssl" = "yes"; then -- AC_CHECK_LIB(crypto, BIO_int_ctrl, -- [], -- [ use_openssl="no" -- AC_MSG_WARN([Failed to find libcrypto so OpenSSL will not be used. -- If it is installed you can try the --with-openssl=DIR argument]) ]) -- fi -- -- if test "$use_openssl" = "yes"; then -- AC_CHECK_LIB(ssl, SSL_new, -- [], -- [ use_openssl="no" -- AC_MSG_WARN([Failed to find libssl so OpenSSL will not be used. -+ AC_MSG_WARN([Failed to find openssl headers so OpenSSL will not be used. - If it is installed you can try the --with-openssl=DIR argument]) ]) -- fi -+ if test "$use_openssl" = "yes"; then -+ AC_CHECK_LIB(crypto, BIO_int_ctrl, [], -+ [ use_openssl="no" -+ AC_MSG_WARN([Failed to find libcrypto so OpenSSL will not be used. -+If it is installed you can try the --with-openssl=DIR argument]) ]) -+ fi -+ if test "$use_openssl" = "yes"; then -+ AC_CHECK_LIB(ssl, SSL_new, [], -+ [ use_openssl="no" -+ AC_MSG_WARN([Failed to find libssl so OpenSSL will not be used. -+If it is installed you can try the --with-openssl=DIR argument]) ]) -+ fi -+ if test "$use_openssl" = "yes"; then -+ # OpenSSL requires dlopen on some platforms -+ AC_SEARCH_LIBS(dlopen, dl) -+ OPENSSL_LIBS="-lssl -lcrypto" -+ fi]) - fi - --OPENSSL_CFLAGS="" --OPENSSL_LIBS="" - if test "$use_openssl" = "yes"; then - AC_DEFINE([HAVE_OPENSSL], [1], [Define to 1 if you have OpenSSL.]) -- OPENSSL_LIBS="-lssl -lcrypto" - # Define in Makefile also. - HAVE_OPENSSL=yes -- AC_SUBST(HAVE_OPENSSL) - fi - AC_SUBST([OPENSSL_CFLAGS]) - AC_SUBST([OPENSSL_LIBS]) -- -+AC_SUBST([HAVE_OPENSSL]) - - - LIBEV_CFLAGS="" --- -2.15.1 - diff --git a/buildroot/package/libpagekite/libpagekite.hash b/buildroot/package/libpagekite/libpagekite.hash index 262adc7aa..8716b991c 100644 --- a/buildroot/package/libpagekite/libpagekite.hash +++ b/buildroot/package/libpagekite/libpagekite.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 df95bfe95c04b6908e835e13444c1c1883765926f1265e0d2223c42d3c59a4c2 libpagekite-v0.91.171102.tar.gz +sha256 c812815aae6f100212b7d6f662370a0634151fabb59f028126a59c4083a6d26d libpagekite-0.91.190530.tar.gz # License files, locally calculated sha256 ba443b9c9d4273d06aae3e147e9ad1ec199cc9c23455f486a039536d47f57eed doc/COPYING.md diff --git a/buildroot/package/libpagekite/libpagekite.mk b/buildroot/package/libpagekite/libpagekite.mk index 2c143ba02..60b62f5cf 100644 --- a/buildroot/package/libpagekite/libpagekite.mk +++ b/buildroot/package/libpagekite/libpagekite.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBPAGEKITE_VERSION = v0.91.171102 -LIBPAGEKITE_SITE = $(call github,pagekite,libpagekite,$(LIBPAGEKITE_VERSION)) +LIBPAGEKITE_VERSION = 0.91.190530 +LIBPAGEKITE_SITE = $(call github,pagekite,libpagekite,v$(LIBPAGEKITE_VERSION)) # pkrelay is AGPL-3.0+ but is not built LIBPAGEKITE_LICENSE = Apache-2.0 or AGPL-3.0+ @@ -15,7 +15,6 @@ LIBPAGEKITE_DEPENDENCIES = host-pkgconf libev openssl LIBPAGEKITE_INSTALL_STAGING = YES # Sources from git, no configure included -# 0001-configure.ac-fix-handling-of-with-os-libev.patch touches configure.ac LIBPAGEKITE_AUTORECONF = YES LIBPAGEKITE_CONF_OPTS = \ diff --git a/buildroot/package/libpam-nfc/Config.in b/buildroot/package/libpam-nfc/Config.in new file mode 100644 index 000000000..ce3a3eeb1 --- /dev/null +++ b/buildroot/package/libpam-nfc/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBPAM_NFC + bool "libpam-nfc" + select BR2_PACKAGE_LIBNFC + help + NFC-based PAM authentification module. + + https://github.com/nfc-tools/pam_nfc diff --git a/buildroot/package/libpam-nfc/libpam-nfc.hash b/buildroot/package/libpam-nfc/libpam-nfc.hash new file mode 100644 index 000000000..27896ef4b --- /dev/null +++ b/buildroot/package/libpam-nfc/libpam-nfc.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 f44273944f1ecc78b10b65147328860836b60fe4bb8c39819e32199f2870d48b libpam-nfc-bb762e0e649195110e015ffb605c4375e927c437.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/libpam-nfc/libpam-nfc.mk b/buildroot/package/libpam-nfc/libpam-nfc.mk new file mode 100644 index 000000000..d4f6d446c --- /dev/null +++ b/buildroot/package/libpam-nfc/libpam-nfc.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# libpam-nfc +# +################################################################################ + +LIBPAM_NFC_VERSION = bb762e0e649195110e015ffb605c4375e927c437 +LIBPAM_NFC_SITE = $(call github,nfc-tools,pam_nfc,$(LIBPAM_NFC_VERSION)) +LIBPAM_NFC_LICENSE = GPL-2.0 +LIBPAM_NFC_LICENSE_FILES = COPYING +LIBPAM_NFC_DEPENDENCIES = linux-pam libnfc +# Fetching from github, we need to generate the configure script +LIBPAM_NFC_AUTORECONF = YES +LIBPAM_NFC_INSTALL_STAGING = YES + +LIBPAM_NFC_CONF_OPTS = \ + --with-pam-dir=/lib/security + +# libpam breaks with parallel build, but is very fast to build. +LIBPAM_NFC_MAKE = $(MAKE1) + +$(eval $(autotools-package)) diff --git a/buildroot/package/libpam-tacplus/0001-Fix-getrandom-call-in-magic.c.patch b/buildroot/package/libpam-tacplus/0001-Fix-getrandom-call-in-magic.c.patch deleted file mode 100644 index bde717f3f..000000000 --- a/buildroot/package/libpam-tacplus/0001-Fix-getrandom-call-in-magic.c.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5b49ec03b165b8d7c69e196bf1c2780274fbe1ee Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 20 May 2018 15:47:33 +0200 -Subject: [PATCH] Fix getrandom call in magic.c - -_GNU_SOURCE must be defined before any includes to be able to use -getrandom - -Signed-off-by: Fabrice Fontaine - -[Upstream status: https://github.com/jeroennijhof/pam_tacplus/pull/118] ---- - libtac/lib/magic.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libtac/lib/magic.c b/libtac/lib/magic.c -index 97aa035..a9cbe86 100644 ---- a/libtac/lib/magic.c -+++ b/libtac/lib/magic.c -@@ -18,6 +18,7 @@ - * See `CHANGES' file for revision history. - */ - -+#define _GNU_SOURCE - #include - #include - #include --- -2.14.1 - diff --git a/buildroot/package/libpam-tacplus/0001-libtac-lib-magic.c-fix-build-on-uclibc.patch b/buildroot/package/libpam-tacplus/0001-libtac-lib-magic.c-fix-build-on-uclibc.patch new file mode 100644 index 000000000..8cdbba450 --- /dev/null +++ b/buildroot/package/libpam-tacplus/0001-libtac-lib-magic.c-fix-build-on-uclibc.patch @@ -0,0 +1,52 @@ +From b2af0aca53d696e6dad17d8a0351d233d1dd1200 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 22 Jan 2020 20:51:59 +0100 +Subject: [PATCH] libtac/lib/magic.c: fix build on uclibc + +Commit 7e990f9db6d8805d369876f45964df87efad9e08 replaced _GNU_SOURCE by +AC_SYSTEM_EXTENSIONS. This is fine but then config.h must be included +before system includes otherwise build fails with uclibc on: + +libtac/lib/magic.c: In function 'magic': +libtac/lib/magic.c:70:11: error: implicit declaration of function 'getrandom' [-Werror=implicit-function-declaration] + ret = getrandom(&num, sizeof(num), GRND_NONBLOCK); + ^ + +Fixes: + - http://autobuild.buildroot.org/results/05c67484136f3bb433ce7fc47b2ce01167048cc2 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/kravietz/pam_tacplus/pull/137] +--- + libtac/lib/magic.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libtac/lib/magic.c b/libtac/lib/magic.c +index 9df5e3f..e13a483 100644 +--- a/libtac/lib/magic.c ++++ b/libtac/lib/magic.c +@@ -18,6 +18,10 @@ + * See `CHANGES' file for revision history. + */ + ++#ifdef HAVE_CONFIG_H ++ #include "config.h" ++#endif ++ + #include + #include + #include +@@ -27,10 +31,6 @@ + #include + #include + +-#ifdef HAVE_CONFIG_H +- #include "config.h" +-#endif +- + #include "magic.h" + + #ifdef _MSC_VER +-- +2.24.1 + diff --git a/buildroot/package/libpam-tacplus/0002-Fix-compilation-of-tacc.c-with-GCC-8.patch b/buildroot/package/libpam-tacplus/0002-Fix-compilation-of-tacc.c-with-GCC-8.patch deleted file mode 100644 index 2f87b9276..000000000 --- a/buildroot/package/libpam-tacplus/0002-Fix-compilation-of-tacc.c-with-GCC-8.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4c9635b03d0acf140f65004be9d4822297ee5a35 Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Mon, 10 Dec 2018 17:27:16 -0200 -Subject: [PATCH] Fix compilation of tacc.c with GCC 8 - -GCC 8 demands that the size of the string copied by strncpy be smaller -than the size of the destination to keep space for the trailibg '\0': - -tacc.c:378:3: error: 'strncpy' specified bound 4 equals destination size [-Werror=stringop-truncation] - strncpy(utmpx.ut_id, tty + C_STRLEN("tty"), sizeof(utmpx.ut_id)); - -Ensure that no more than sizeof(utmpx.ut_id) - 1 characters are copied -and that a trailing '\0' is stored. - -Fixes: - http://autobuild.buildroot.net/results/da6d150e470046c03c5f7463de045604e15e4a30/ - -Signed-off-by: Carlos Santos ---- - tacc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tacc.c b/tacc.c -index f61e2d7..3c1a40c 100644 ---- a/tacc.c -+++ b/tacc.c -@@ -375,7 +375,8 @@ int main(int argc, char **argv) { - utmpx.ut_type = USER_PROCESS; - utmpx.ut_pid = getpid(); - xstrcpy(utmpx.ut_line, tty, sizeof(utmpx.ut_line)); -- strncpy(utmpx.ut_id, tty + C_STRLEN("tty"), sizeof(utmpx.ut_id)); -+ strncpy(utmpx.ut_id, tty + C_STRLEN("tty"), sizeof(utmpx.ut_id) - 1); -+ utmpx.ut_id[sizeof(utmpx.ut_id) - 1] = '\0'; - xstrcpy(utmpx.ut_host, "dialup", sizeof(utmpx.ut_host)); - utmpx.ut_tv.tv_sec = tv.tv_sec; - utmpx.ut_tv.tv_usec = tv.tv_usec; --- -2.14.5 - diff --git a/buildroot/package/libpam-tacplus/libpam-tacplus.hash b/buildroot/package/libpam-tacplus/libpam-tacplus.hash index ba014347e..b1cd053f1 100644 --- a/buildroot/package/libpam-tacplus/libpam-tacplus.hash +++ b/buildroot/package/libpam-tacplus/libpam-tacplus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6e1ce4e3194a4d7823a0f0b352485d5028790e4a0974b9a9619f71b07f79a5fa libpam-tacplus-v1.5.0-beta.2.tar.gz +sha256 82f204b949b2a55d0711b314c6e3b213bd1c0c1ee0d9ba15680570db22bff2d8 libpam-tacplus-1.5.1.tar.gz sha256 b2b961f07e97c4fb78074276da304ea36b85dc299aae5efb79080cedaea3d5ac COPYING diff --git a/buildroot/package/libpam-tacplus/libpam-tacplus.mk b/buildroot/package/libpam-tacplus/libpam-tacplus.mk index eebe297f7..fd2b4f9a3 100644 --- a/buildroot/package/libpam-tacplus/libpam-tacplus.mk +++ b/buildroot/package/libpam-tacplus/libpam-tacplus.mk @@ -4,17 +4,17 @@ # ################################################################################ -LIBPAM_TACPLUS_VERSION = v1.5.0-beta.2 -LIBPAM_TACPLUS_SITE = $(call github,jeroennijhof,pam_tacplus,$(LIBPAM_TACPLUS_VERSION)) +LIBPAM_TACPLUS_VERSION = 1.5.1 +LIBPAM_TACPLUS_SITE = $(call github,jeroennijhof,pam_tacplus,v$(LIBPAM_TACPLUS_VERSION)) LIBPAM_TACPLUS_LICENSE = GPL-2.0+ LIBPAM_TACPLUS_LICENSE_FILES = COPYING -LIBPAM_TACPLUS_DEPENDENCIES = linux-pam +LIBPAM_TACPLUS_DEPENDENCIES = \ + linux-pam \ + $(if $(BR2_PACKAGE_OPENSSL),openssl) # Fetching from github, we need to generate the configure script LIBPAM_TACPLUS_AUTORECONF = YES LIBPAM_TACPLUS_INSTALL_STAGING = YES LIBPAM_TACPLUS_CONF_ENV = \ ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) -LIBPAM_TACPLUS_CONF_OPTS = \ - --enable-pamdir=/lib/security $(eval $(autotools-package)) diff --git a/buildroot/package/libpcap/Config.in b/buildroot/package/libpcap/Config.in index 74429f209..a5f64bdc8 100644 --- a/buildroot/package/libpcap/Config.in +++ b/buildroot/package/libpcap/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBPCAP bool "libpcap" select BR2_PACKAGE_BLUEZ5_UTILS_HEADERS if BR2_PACKAGE_BLUEZ5_UTILS - select BR2_PACKAGE_ZLIB help A system-independent library for user-level network packet capture. diff --git a/buildroot/package/libpcap/libpcap.mk b/buildroot/package/libpcap/libpcap.mk index 476183555..881a109a0 100644 --- a/buildroot/package/libpcap/libpcap.mk +++ b/buildroot/package/libpcap/libpcap.mk @@ -9,7 +9,7 @@ LIBPCAP_SITE = http://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE_FILES = LICENSE LIBPCAP_INSTALL_STAGING = YES -LIBPCAP_DEPENDENCIES = zlib host-flex host-bison +LIBPCAP_DEPENDENCIES = host-flex host-bison LIBPCAP_CONF_ENV = \ ac_cv_header_linux_wireless_h=yes \ diff --git a/buildroot/package/libpciaccess/0001-musl-arm.patch b/buildroot/package/libpciaccess/0001-musl-arm.patch deleted file mode 100644 index 0077f451b..000000000 --- a/buildroot/package/libpciaccess/0001-musl-arm.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix musl build - -Inspired by http://patchwork.openembedded.org/patch/111661/ -"inb/outb are implemented for ARM on glibc but not on linux in general -therefore the conditional has to reflect that" - -Signed-off-by: Bernd Kuhls - -diff -uNr libpciaccess-0.13.4.org/src/linux_sysfs.c libpciaccess-0.13.4/src/linux_sysfs.c ---- libpciaccess-0.13.4.org/src/linux_sysfs.c 2015-05-01 06:44:47.000000000 +0200 -+++ libpciaccess-0.13.4/src/linux_sysfs.c 2016-01-24 15:27:57.141562678 +0100 -@@ -49,7 +49,7 @@ - #include - #include - --#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) -+#if defined(__i386__) || defined(__x86_64__) - #include - #else - #define inb(x) -1 diff --git a/buildroot/package/libpciaccess/libpciaccess.hash b/buildroot/package/libpciaccess/libpciaccess.hash index 651f0462b..23823bb07 100644 --- a/buildroot/package/libpciaccess/libpciaccess.hash +++ b/buildroot/package/libpciaccess/libpciaccess.hash @@ -1,8 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-October/002817.html -md5 8f436e151d5106a9cfaa71857a066d33 libpciaccess-0.14.tar.bz2 -sha1 f70a958bf4e744cb4ee93be64e9bc52ac05cdaeb libpciaccess-0.14.tar.bz2 -sha256 3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4 libpciaccess-0.14.tar.bz2 -sha512 bf40214dfd22f2a223f7c948566e6eaa4bfed60116e71b3eb19f6fe7ab2c4546649eb0416c06d5983e476ea5e27de036936646eb5f800ea97763b6d1f1976f4b libpciaccess-0.14.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2019-July/003014.html +md5 b34e2cbdd6aa8f9cc3fa613fd401a6d6 libpciaccess-0.16.tar.bz2 +sha1 ffaa13f2df5f822da1089b55223b217c142ef919 libpciaccess-0.16.tar.bz2 +sha256 214c9d0d884fdd7375ec8da8dcb91a8d3169f263294c9a90c575bf1938b9f489 libpciaccess-0.16.tar.bz2 +sha512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1 libpciaccess-0.16.tar.bz2 # Hash for license file: sha256 47012fd746980d1712ac4f3841ab6164bda1d2b84880760e45dbe1e1dc07f608 COPYING diff --git a/buildroot/package/libpciaccess/libpciaccess.mk b/buildroot/package/libpciaccess/libpciaccess.mk index 93b5fc7ac..d9a3a4e48 100644 --- a/buildroot/package/libpciaccess/libpciaccess.mk +++ b/buildroot/package/libpciaccess/libpciaccess.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPCIACCESS_VERSION = 0.14 +LIBPCIACCESS_VERSION = 0.16 LIBPCIACCESS_SOURCE = libpciaccess-$(LIBPCIACCESS_VERSION).tar.bz2 LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib LIBPCIACCESS_LICENSE = MIT diff --git a/buildroot/package/libpfm4/libpfm4.hash b/buildroot/package/libpfm4/libpfm4.hash index 20671fb6e..2c1442dd1 100644 --- a/buildroot/package/libpfm4/libpfm4.hash +++ b/buildroot/package/libpfm4/libpfm4.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/perfmon2/files/libpfm4/: -sha1 3a7b556e0778fd76e9e7abb06e5d4d2599ffbefc libpfm-4.9.0.tar.gz -md5 42ad4a2e5b8e1f015310db8535739c73 libpfm-4.9.0.tar.gz +sha1 78599e1668142f48c24afb1f79ca00a89df51b65 libpfm-4.10.1.tar.gz +md5 d8f66cb9bfa7e1434434e0de6409db5b libpfm-4.10.1.tar.gz # Locally calculated -sha256 db0fbe8ee28fd9beeb5d3e80b7cb3b104debcf6a9fcf5cb8b882f0662c79e4e2 libpfm-4.9.0.tar.gz +sha256 c61c575378b5c17ccfc5806761e4038828610de76e2e34fac9f7fa73ba844b49 libpfm-4.10.1.tar.gz sha256 beef323d68fc5db9c67b20e8e9de7ccde371d20cdbcdd686804055b18b926d90 COPYING diff --git a/buildroot/package/libpfm4/libpfm4.mk b/buildroot/package/libpfm4/libpfm4.mk index 88632f478..cc89d4422 100644 --- a/buildroot/package/libpfm4/libpfm4.mk +++ b/buildroot/package/libpfm4/libpfm4.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPFM4_VERSION = 4.9.0 +LIBPFM4_VERSION = 4.10.1 LIBPFM4_SOURCE = libpfm-$(LIBPFM4_VERSION).tar.gz LIBPFM4_SITE = http://downloads.sourceforge.net/project/perfmon2/libpfm4 LIBPFM4_LICENSE = libpfm4 license diff --git a/buildroot/package/libpjsip/0001-Fixed-possible-function-name-clash.patch b/buildroot/package/libpjsip/0001-Fixed-possible-function-name-clash.patch deleted file mode 100644 index 435b0eab5..000000000 --- a/buildroot/package/libpjsip/0001-Fixed-possible-function-name-clash.patch +++ /dev/null @@ -1,26 +0,0 @@ -Re #2059 (misc): Fixed possible function name clash with md5 due to non-static function. - -Backported from: https://trac.pjsip.org/repos/changeset/5688 -Signed-off-by: Luca Ceresoli - -Index: pjlib-util/src/pjlib-util/md5.c -=================================================================== -diff --git a/pjproject/pjlib-util/src/pjlib-util/md5.c b/pjproject/pjlib-util/src/pjlib-util/md5.c ---- a/pjlib-util/src/pjlib-util/md5.c (revision 5687) -+++ b/pjlib-util/src/pjlib-util/md5.c (revision 5688) -@@ -29,13 +29,13 @@ - #ifndef HIGHFIRST - #define byteReverse(buf, len) /* Nothing */ - #else --void byteReverse(unsigned char *buf, unsigned longs); -+static void byteReverse(unsigned char *buf, unsigned longs); - - #ifndef ASM_MD5 - /* - * Note: this code is harmless on little-endian machines. - */ --void byteReverse(unsigned char *buf, unsigned longs) -+static void byteReverse(unsigned char *buf, unsigned longs) - { - pj_uint32_t t; - do { diff --git a/buildroot/package/libpjsip/libpjsip.hash b/buildroot/package/libpjsip/libpjsip.hash index 36c2ea128..bcf46ea5f 100644 --- a/buildroot/package/libpjsip/libpjsip.hash +++ b/buildroot/package/libpjsip/libpjsip.hash @@ -1,6 +1,6 @@ -# From http://www.pjsip.org/release/2.7.2/MD5SUM.TXT -md5 fa3f0bc098c4bff48ddd92db1c016a7a pjproject-2.7.2.tar.bz2 +# From https://www.pjsip.org/release/2.9/MD5SUM.TXT +md5 66757078e7bd7cf316acb0425c2fdd6f pjproject-2.9.tar.bz2 # Locally computed -sha256 9c2c828abab7626edf18e04b041ef274bfaa86f99adf2c25ff56f1509e813772 pjproject-2.7.2.tar.bz2 +sha256 d185ef7855c8ec07191dde92f54b65a7a4b7a6f7bf8c46f7af35ceeb1da2a636 pjproject-2.9.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/libpjsip/libpjsip.mk b/buildroot/package/libpjsip/libpjsip.mk index 22b922586..447f76be7 100644 --- a/buildroot/package/libpjsip/libpjsip.mk +++ b/buildroot/package/libpjsip/libpjsip.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.7.2 +LIBPJSIP_VERSION = 2.9 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.bz2 -LIBPJSIP_SITE = http://www.pjsip.org/release/$(LIBPJSIP_VERSION) +LIBPJSIP_SITE = https://www.pjsip.org/release/$(LIBPJSIP_VERSION) LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING @@ -25,25 +25,14 @@ LIBPJSIP_CONF_ENV = \ CFLAGS="$(LIBPJSIP_CFLAGS)" LIBPJSIP_CONF_OPTS = \ - --disable-sound \ --disable-resample \ - --disable-video \ - --disable-opencore-amr \ --disable-g7221-codec \ --disable-ilbc-codec \ --disable-libwebrtc \ - --disable-opus \ - --disable-oss \ --disable-ext-sound \ --disable-g711-codec \ --disable-l16-codec \ --disable-g722-codec \ - --disable-libsamplerate \ - --disable-sdl \ - --disable-ffmpeg \ - --disable-v4l2 \ - --disable-openh264 \ - --disable-libyuv \ --disable-ipp \ --disable-silk \ --with-external-srtp @@ -53,6 +42,27 @@ LIBPJSIP_CONF_OPTS = \ # so we want to use it. LIBPJSIP_CONF_OPTS += --enable-epoll +ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER),y) +LIBPJSIP_DEPENDENCIES += alsa-lib +LIBPJSIP_CONF_OPTS += --enable-sound +else +LIBPJSIP_CONF_OPTS += --disable-sound +endif + +ifeq ($(BR2_PACKAGE_BCG729),y) +LIBPJSIP_DEPENDENCIES += bcg729 +LIBPJSIP_CONF_OPTS += --with-bcg729=$(STAGING_DIR)/usr +else +LIBPJSIP_CONF_OPTS += --disable-bcg729 +endif + +ifeq ($(BR2_PACKAGE_FFMPEG),y) +LIBPJSIP_DEPENDENCIES += ffmpeg +LIBPJSIP_CONF_OPTS += --with-ffmpeg=$(STAGING_DIR)/usr +else +LIBPJSIP_CONF_OPTS += --disable-ffmpeg +endif + ifeq ($(BR2_PACKAGE_LIBGSM),y) LIBPJSIP_CONF_OPTS += \ --enable-gsm-codec \ @@ -63,13 +73,74 @@ LIBPJSIP_CONF_OPTS += \ --disable-gsm-codec endif +ifeq ($(BR2_PACKAGE_LIBOPENH264),y) +LIBPJSIP_DEPENDENCIES += libopenh264 +LIBPJSIP_CONF_OPTS += --with-openh264=$(STAGING_DIR)/usr +else +LIBPJSIP_CONF_OPTS += --disable-openh264 +endif + ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) LIBPJSIP_DEPENDENCIES += libopenssl LIBPJSIP_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr +else ifeq ($(BR2_PACKAGE_GNUTLS),y) +LIBPJSIP_DEPENDENCIES += gnutls +LIBPJSIP_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr else LIBPJSIP_CONF_OPTS += --disable-ssl endif +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) +LIBPJSIP_DEPENDENCIES += libsamplerate +LIBPJSIP_CONF_OPTS += --enable-libsamplerate +else +LIBPJSIP_CONF_OPTS += --disable-libsamplerate +endif + +ifeq ($(BR2_PACKAGE_LIBV4L),y) +# --enable-v4l2 is broken (check for libv4l2 will be omitted) +LIBPJSIP_DEPENDENCIES += libv4l +else +LIBPJSIP_CONF_OPTS += --disable-v4l2 +endif + +ifeq ($(BR2_PACKAGE_LIBYUV),y) +LIBPJSIP_DEPENDENCIES += libyuv +LIBPJSIP_CONF_OPTS += \ + --enable-libyuv \ + --with-external-yuv +else +LIBPJSIP_CONF_OPTS += --disable-libyuv +endif + +ifeq ($(BR2_PACKAGE_OPENCORE_AMR),y) +LIBPJSIP_DEPENDENCIES += opencore-amr +LIBPJSIP_CONF_OPTS += --with-opencore-amr=$(STAGING_DIR)/usr +else +LIBPJSIP_CONF_OPTS += --disable-opencore-amr +endif + +ifeq ($(BR2_PACKAGE_OPUS),y) +LIBPJSIP_DEPENDENCIES += opus +LIBPJSIP_CONF_OPTS += --with-opus=$(STAGING_DIR)/usr +else +LIBPJSIP_CONF_OPTS += --disable-opus +endif + +ifeq ($(BR2_PACKAGE_PORTAUDIO),y) +LIBPJSIP_DEPENDENCIES += portaudio +LIBPJSIP_CONF_OPTS += --with-external-pa +else +LIBPJSIP_CONF_OPTS += --without-external-pa +endif + +ifeq ($(BR2_PACKAGE_SDL2),y) +LIBPJSIP_DEPENDENCIES += sdl2 +LIBPJSIP_CONF_OPTS += --with-sdl=$(STAGING_DIR)/usr +else +LIBPJSIP_CONF_OPTS += --disable-sdl +endif + ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy) LIBPJSIP_CONF_OPTS += \ --enable-speex-aec \ diff --git a/buildroot/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch b/buildroot/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch deleted file mode 100644 index d487fd942..000000000 --- a/buildroot/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 01b5478638c705af29f09ad4ed70289f70a21dcf Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 6 Feb 2017 14:04:47 +0100 -Subject: [PATCH] p8-platform-config: fix lookup paths - -Use the proper methods to find the headers and the library. - -Signed-off-by: Samuel Martin -Signed-off-by: "Yann E. MORIN" ---- - p8-platform-config.cmake.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in -index 47f30f1..f59418d 100644 ---- a/p8-platform-config.cmake.in -+++ b/p8-platform-config.cmake.in -@@ -10,7 +10,7 @@ - # - # propagate these properties from one build system to the other - set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@") --set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) -+find_path (p8-platform_INCLUDE_DIRS p8-platform/os.h) - set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") - set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@") - set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") -@@ -19,7 +19,7 @@ set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") - if(WIN32) - set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") - else(WIN32) -- set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") -+ find_library (p8-platform_LIBRARY p8-platform) - endif(WIN32) - set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@") - mark_as_advanced (p8-platform_LIBRARY) --- -2.7.4 - diff --git a/buildroot/package/libplatform/libplatform.hash b/buildroot/package/libplatform/libplatform.hash index 5162b43fa..09f9dadb1 100644 --- a/buildroot/package/libplatform/libplatform.hash +++ b/buildroot/package/libplatform/libplatform.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 dd07bea9cb5676220586e772f09eab51f1093e5ef0faadee80f7c0e99f5f6c1c libplatform-2d90f98620e25f47702c9e848380c0d93f29462b.tar.gz +sha256 94dba139066a332d048486f817736e4cf4962393c9f892d2c7dd40d9d69ca788 libplatform-1eb12b1b1efa6747c1e190964854e9e267e3a1e2.tar.gz +sha256 80fc66febbb2393c9d518e3eefa4ad9aae15a9b6a84174c0e443ea79eeea5131 src/os.h diff --git a/buildroot/package/libplatform/libplatform.mk b/buildroot/package/libplatform/libplatform.mk index c805af2e1..0a4c49296 100644 --- a/buildroot/package/libplatform/libplatform.mk +++ b/buildroot/package/libplatform/libplatform.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPLATFORM_VERSION = 2d90f98620e25f47702c9e848380c0d93f29462b +LIBPLATFORM_VERSION = 1eb12b1b1efa6747c1e190964854e9e267e3a1e2 LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION)) LIBPLATFORM_LICENSE = GPL-2.0+ LIBPLATFORM_LICENSE_FILES = src/os.h diff --git a/buildroot/package/libplayer/0001-add-fpic.patch b/buildroot/package/libplayer/0001-add-fpic.patch deleted file mode 100644 index e4b227f91..000000000 --- a/buildroot/package/libplayer/0001-add-fpic.patch +++ /dev/null @@ -1,18 +0,0 @@ -Add -fPIC to CFLAGS - --fPIC is needed to build shared library code. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -9,6 +9,7 @@ - SHARED_LIBNAME_VERSION = $(SHARED_LIBNAME).$(VERSION) - SHARED_LIBNAME_MAJOR = $(SHARED_LIBNAME).$(shell echo $(VERSION) | cut -f1 -d.) - SHARED_LIBNAME_FLAGS = -shared -Wl,-soname,$(SHARED_LIBNAME_MAJOR) -+CFLAGS = -fPIC - - ifeq ($(BUILD_STATIC),yes) - BUILD_RULES += lib_static diff --git a/buildroot/package/libplayer/0002-fix-configure-cflags.patch b/buildroot/package/libplayer/0002-fix-configure-cflags.patch deleted file mode 100644 index 186afd562..000000000 --- a/buildroot/package/libplayer/0002-fix-configure-cflags.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Arnout Vandecappelle (Essensium/Mind) -Subject: [PATCH] libplayer: Fix handling of cflags in configure. - -The cflags returned by pkg-config or another config script may consist -of several arguments for the compiler. These should not be quoted together -into a single argument. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- -Sent upstream to devel@geexbox.org on July 11, 2012. ---- -diff -rup libplayer-2.0.1.orig/configure libplayer-2.0.1/configure ---- libplayer-2.0.1.orig/configure 2010-10-03 19:26:11.000000000 +0200 -+++ libplayer-2.0.1/configure 2012-07-10 23:33:02.783701852 +0200 -@@ -342,7 +342,7 @@ check_libconfig(){ - err=1 - if `which "$config" 1>/dev/null 2>&1`; then - cflags=`$config $ccflags` -- [ -n "$cflags" ] && check_cflags "$cflags" -+ [ -n "$cflags" ] && check_cflags $cflags - libs=`$config $clibs` - if [ -n "$libs" ]; then - temp_extralibs "$libs" -@@ -364,7 +364,7 @@ check_libconfig_exists(){ - err=1 - if `which "$config" 1>/dev/null 2>&1`; then - cflags=`$config $ccflags` -- [ -n "$cflags" ] && temp_cflags "$cflags" -+ [ -n "$cflags" ] && temp_cflags $cflags - libs=`$config $clibs` - if [ -n "$libs" ]; then - temp_extralibs "$libs" -@@ -386,7 +386,7 @@ check_pkgconfig(){ - err=1 - if `which pkg-config 1>/dev/null 2>&1`; then - cflags=`pkg-config $pkg $ccflags` -- [ -n "$cflags" ] && check_cflags "$cflags" -+ [ -n "$cflags" ] && check_cflags $cflags - libs=`pkg-config $pkg $clibs` - if [ -n "$libs" ]; then - temp_extralibs "$libs" diff --git a/buildroot/package/libplayer/Config.in b/buildroot/package/libplayer/Config.in deleted file mode 100644 index 3cad68324..000000000 --- a/buildroot/package/libplayer/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_PACKAGE_LIBPLAYER - bool "libplayer" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - libplayer provides a generic A/V API that relies on various - multimedia player for Linux systems. It currently supports - MPlayer, xine VLC and GStreamer only - - http://libplayer.geexbox.org/ - -if BR2_PACKAGE_LIBPLAYER - -config BR2_PACKAGE_LIBPLAYER_GSTREAMER - bool "gstreamer backend" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on !BR2_STATIC_LIBS # gstreamer - select BR2_PACKAGE_GSTREAMER - -comment "gstreamer backend needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS -endif - -comment "libplayer needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libplayer/libplayer.hash b/buildroot/package/libplayer/libplayer.hash deleted file mode 100644 index 6f131433b..000000000 --- a/buildroot/package/libplayer/libplayer.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 aa5eeb54f773bc9cad2733e4a0b5870208fc7f75024515ea87e55f64653e9d65 libplayer-2.0.1.tar.bz2 diff --git a/buildroot/package/libplayer/libplayer.mk b/buildroot/package/libplayer/libplayer.mk deleted file mode 100644 index 8d139cea0..000000000 --- a/buildroot/package/libplayer/libplayer.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# libplayer -# -################################################################################ - -LIBPLAYER_VERSION = 2.0.1 -LIBPLAYER_SITE = http://libplayer.geexbox.org/releases -LIBPLAYER_SOURCE = libplayer-$(LIBPLAYER_VERSION).tar.bz2 -LIBPLAYER_LICENSE = LGPL-2.1+ -LIBPLAYER_LICENSE_FILES = COPYING - -# When passing the standard buildroot configure arguments, the configure script -# breaks on --target and --host options. Thus we need to define a configure cmd -# ourselves. -define LIBPLAYER_CONFIGURE_CMDS - (cd $(@D) && rm -rf config.cache && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --prefix=/usr \ - --cross-compile \ - --disable-mplayer \ - $(SHARED_STATIC_LIBS_OPTS) \ - $(LIBPLAYER_CONF_OPTS) \ - ) -endef - -ifeq ($(BR2_PACKAGE_LIBPLAYER_GSTREAMER),y) -LIBPLAYER_DEPENDENCIES += gstreamer -LIBPLAYER_CONF_OPTS += --enable-gstreamer -else -LIBPLAYER_CONF_OPTS += --disable-gstreamer -endif - -$(eval $(autotools-package)) diff --git a/buildroot/package/libplist/libplist.hash b/buildroot/package/libplist/libplist.hash index 63c251506..9934ad05e 100644 --- a/buildroot/package/libplist/libplist.hash +++ b/buildroot/package/libplist/libplist.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 3a7e9694c2d9a85174ba1fa92417cfabaea7f6d19631e544948dc7e17e82f602 libplist-2.0.0.tar.bz2 +sha256 4b33f9af3f9208d54a3c3e1a8c149932513f451c98d1dd696fe42c06e30b7f03 libplist-2.1.0.tar.gz +sha256 7619c753cac95d4740220223bde48a032606fcaccde5e546f9bc444c81ab356d COPYING +sha256 7619c753cac95d4740220223bde48a032606fcaccde5e546f9bc444c81ab356d COPYING diff --git a/buildroot/package/libplist/libplist.mk b/buildroot/package/libplist/libplist.mk index 09fc8168e..d07fb5dd2 100644 --- a/buildroot/package/libplist/libplist.mk +++ b/buildroot/package/libplist/libplist.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBPLIST_VERSION = 2.0.0 -LIBPLIST_SOURCE = libplist-$(LIBPLIST_VERSION).tar.bz2 -LIBPLIST_SITE = http://www.libimobiledevice.org/downloads +LIBPLIST_VERSION = 2.1.0 +LIBPLIST_SITE = $(call github,libimobiledevice,libplist,$(LIBPLIST_VERSION)) LIBPLIST_INSTALL_STAGING = YES LIBPLIST_LICENSE = LGPL-2.1+ LIBPLIST_LICENSE_FILES = COPYING +# github tarball does not include configure +LIBPLIST_AUTORECONF = YES # Disable building Python bindings, because it requires host-cython, which # is not packaged in Buildroot at all. diff --git a/buildroot/package/libpqxx/Config.in b/buildroot/package/libpqxx/Config.in index 9553d7903..d06451d79 100644 --- a/buildroot/package/libpqxx/Config.in +++ b/buildroot/package/libpqxx/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBPQXX bool "libpqxx" depends on BR2_PACKAGE_POSTGRESQL depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_INSTALL_LIBSTDCPP help libpqxx is the official C++ client API for PostgreSQL, the @@ -10,8 +10,8 @@ config BR2_PACKAGE_LIBPQXX http://pqxx.org/development/libpqxx/ -comment "libpqxx needs toolchain w/ C++, gcc >= 4.8, threads" +comment "libpqxx needs toolchain w/ C++, gcc >= 4.9, threads" depends on BR2_PACKAGE_POSTGRESQL depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libpqxx/libpqxx.hash b/buildroot/package/libpqxx/libpqxx.hash index b04e3c319..8e3164937 100644 --- a/buildroot/package/libpqxx/libpqxx.hash +++ b/buildroot/package/libpqxx/libpqxx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 36fcf8439ac7f7cc68b21e95b20e921ece4487cda1cc1d09b798a84e7cb3a4b7 libpqxx-6.2.5.tar.gz -sha256 9e1c78fa302e4e9738bf3315b130429035c03fcb0f046531ccd977cb474f6b31 COPYING +sha256 86921fdb0fe54495a79d5af2c96f2c771098c31e9b352d0834230fd2799ad362 libpqxx-6.4.5.tar.gz +sha256 36c48c1ca1b0a68639d919196b5d92c971858ad8e24da24385ba1c65cc5eac38 COPYING diff --git a/buildroot/package/libpqxx/libpqxx.mk b/buildroot/package/libpqxx/libpqxx.mk index 9e0f84db8..9de7df3ed 100644 --- a/buildroot/package/libpqxx/libpqxx.mk +++ b/buildroot/package/libpqxx/libpqxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPQXX_VERSION = 6.2.5 +LIBPQXX_VERSION = 6.4.5 LIBPQXX_SITE = $(call github,jtv,libpqxx,$(LIBPQXX_VERSION)) LIBPQXX_INSTALL_STAGING = YES LIBPQXX_DEPENDENCIES = postgresql diff --git a/buildroot/package/libpthread-stubs/libpthread-stubs.hash b/buildroot/package/libpthread-stubs/libpthread-stubs.hash index b6e38e8e7..fb33618be 100644 --- a/buildroot/package/libpthread-stubs/libpthread-stubs.hash +++ b/buildroot/package/libpthread-stubs/libpthread-stubs.hash @@ -1,2 +1,3 @@ # Locally computed sha256 e4d05911a3165d3b18321cc067fdd2f023f06436e391c6a28dff618a78d2e733 libpthread-stubs-0.4.tar.bz2 +sha256 78c20706e799f2b8f445e71d3d2ade6ba23b3388fd6cbeed7d71796623febde8 COPYING diff --git a/buildroot/package/libpthsem/libpthsem.hash b/buildroot/package/libpthsem/libpthsem.hash index b6aa2b87c..9da4b8827 100644 --- a/buildroot/package/libpthsem/libpthsem.hash +++ b/buildroot/package/libpthsem/libpthsem.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 4024cafdd5d4bce2b1778a6be5491222c3f6e7ef1e43971264c451c0012c5c01 pthsem_2.0.8.tar.gz +sha256 4024cafdd5d4bce2b1778a6be5491222c3f6e7ef1e43971264c451c0012c5c01 pthsem_2.0.8.tar.gz +sha256 f1b95d3728077d1a3efe7fc17928b1953b1224f6caf9c528e30e570158b7520d COPYING diff --git a/buildroot/package/libpwquality/libpwquality.hash b/buildroot/package/libpwquality/libpwquality.hash index 97490f818..b63501fa1 100644 --- a/buildroot/package/libpwquality/libpwquality.hash +++ b/buildroot/package/libpwquality/libpwquality.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b libpwquality-1.4.0.tar.bz2 +sha256 a97d72b5c56b7e279c6e86dad70c1493ea5796f00a596fb9f3173b96f9bf5e46 libpwquality-1.4.1.tar.bz2 sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING diff --git a/buildroot/package/libpwquality/libpwquality.mk b/buildroot/package/libpwquality/libpwquality.mk index 59b0e955f..bddafd59c 100644 --- a/buildroot/package/libpwquality/libpwquality.mk +++ b/buildroot/package/libpwquality/libpwquality.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPWQUALITY_VERSION = 1.4.0 +LIBPWQUALITY_VERSION = 1.4.1 LIBPWQUALITY_SOURCE = libpwquality-$(LIBPWQUALITY_VERSION).tar.bz2 LIBPWQUALITY_SITE = https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$(LIBPWQUALITY_VERSION) LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ diff --git a/buildroot/package/libqmi/0001-musl-compat-canonicalize_file_name.patch b/buildroot/package/libqmi/0001-musl-compat-canonicalize_file_name.patch deleted file mode 100644 index 3ae1c2eb4..000000000 --- a/buildroot/package/libqmi/0001-musl-compat-canonicalize_file_name.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 8f6181b6f8dd82aa1ab1288cc7f2fd05d4a2519f Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Mon, 1 May 2017 19:55:07 -0500 -Subject: [PATCH] musl compat canonicalize_file_name() - -Adds an equivalent of canonicalize_file_name -using realpath(). - -Bug report (origin of this patch): -https://bugs.freedesktop.org/show_bug.cgi?id=99944 - -Bug report has been updated with suggestion to not use inline. - -Signed-off-by: Matthew Weber ---- - configure.ac | 2 ++ - src/libqmi-glib/qmi-utils.c | 15 +++++++++++++++ - 2 files changed, 17 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c56fa3e..d835db4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -80,6 +80,8 @@ AC_SUBST(GLIB_LIBS) - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - AC_SUBST(GLIB_MKENUMS) - -+AC_CHECK_FUNCS([canonicalize_file_name]) -+ - dnl qmi-firmware-update is optional, enabled by default - AC_ARG_ENABLE([firmware-update], - AS_HELP_STRING([--enable-firmware-update], -diff --git a/src/libqmi-glib/qmi-utils.c b/src/libqmi-glib/qmi-utils.c -index 29e5f22..26aff9e 100644 ---- a/src/libqmi-glib/qmi-utils.c -+++ b/src/libqmi-glib/qmi-utils.c -@@ -34,6 +34,21 @@ - #include "qmi-utils.h" - #include "qmi-error-types.h" - -+#ifndef HAVE_CANONICALIZE_FILE_NAME -+#include -+static char * canonicalize_file_name(const char *path) -+{ -+ char buf[PATH_MAX] = { }; -+ -+ snprintf(buf, sizeof(buf) - 1, "%s", path); -+ -+ if (!realpath(path, buf)) -+ return NULL; -+ -+ return strdup(buf); -+} -+#endif -+ - /** - * SECTION:qmi-utils - * @title: Common utilities --- -1.9.1 - diff --git a/buildroot/package/libqmi/libqmi.hash b/buildroot/package/libqmi/libqmi.hash index 0c27451ec..ce9672115 100644 --- a/buildroot/package/libqmi/libqmi.hash +++ b/buildroot/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 21c198b481f1617bb7edb1960d823569de3e38b269dbf513af1b56048cafaa17 libqmi-1.22.0.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 0316badec92ff32f51fe6278e6046968d2272a26608995deedd8e4afb563918a libqmi-1.24.4.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/libqmi/libqmi.mk b/buildroot/package/libqmi/libqmi.mk index 319c2362b..7e89d4a1a 100644 --- a/buildroot/package/libqmi/libqmi.mk +++ b/buildroot/package/libqmi/libqmi.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBQMI_VERSION = 1.22.0 +LIBQMI_VERSION = 1.24.4 LIBQMI_SITE = http://www.freedesktop.org/software/libqmi LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB LIBQMI_INSTALL_STAGING = YES -# 0001-musl-compat-canonicalize_file_name.patch -LIBQMI_AUTORECONF = YES LIBQMI_DEPENDENCIES = libglib2 diff --git a/buildroot/package/libqrencode/libqrencode.hash b/buildroot/package/libqrencode/libqrencode.hash index 141841313..d8584c8ac 100644 --- a/buildroot/package/libqrencode/libqrencode.hash +++ b/buildroot/package/libqrencode/libqrencode.hash @@ -1,5 +1,5 @@ -# From http://fukuchi.org/works/qrencode/qrencode-4.0.0.tar.gz.sha -sha512 fdbcee3ef90abf780dcbe495cef3e6ac5449a4a0aaa87d1a1a4f71d97fe6d96974d8132f7e227133cddb5ab73600e968821634752fc0d75113ca0959aae9a5d0 qrencode-4.0.0.tar.gz +# From http://fukuchi.org/works/qrencode/qrencode-4.0.2.tar.gz.sha +sha512 c3e3834574ec059a4b571427b29d6f5f26bd806fd7498b9bba778f4eceab6ebe5733eef0f3c4f6af91eb3f2e9310f93f6d7b337c28e85c72db7e59bd79be77a9 qrencode-4.0.2.tar.gz # Hash for license file: sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/buildroot/package/libqrencode/libqrencode.mk b/buildroot/package/libqrencode/libqrencode.mk index 62ca2ed11..669c4193b 100644 --- a/buildroot/package/libqrencode/libqrencode.mk +++ b/buildroot/package/libqrencode/libqrencode.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQRENCODE_VERSION = 4.0.0 +LIBQRENCODE_VERSION = 4.0.2 LIBQRENCODE_SOURCE = qrencode-$(LIBQRENCODE_VERSION).tar.gz LIBQRENCODE_SITE = http://fukuchi.org/works/qrencode LIBQRENCODE_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/libraw/libraw.hash b/buildroot/package/libraw/libraw.hash index 643a2109b..3337396f5 100644 --- a/buildroot/package/libraw/libraw.hash +++ b/buildroot/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 400d47969292291d297873a06fb0535ccce70728117463927ddd9452aa849644 LibRaw-0.19.2.tar.gz +sha256 40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5 LibRaw-0.19.5.tar.gz sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL -sha256 eee0055723d3483ef3ee7920e2178177b14a334c2a622be4101bcfb05d21407e README.md +sha256 ed971b7f1f57fd8e7d28419ff7749cfe0f296e701687756e798a69555fd76646 README.md diff --git a/buildroot/package/libraw/libraw.mk b/buildroot/package/libraw/libraw.mk index 0d95207b7..9a647f8d5 100644 --- a/buildroot/package/libraw/libraw.mk +++ b/buildroot/package/libraw/libraw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRAW_VERSION = 0.19.2 +LIBRAW_VERSION = 0.19.5 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES diff --git a/buildroot/package/libreplaygain/libreplaygain.hash b/buildroot/package/libreplaygain/libreplaygain.hash index 7a6109805..63e5dca57 100644 --- a/buildroot/package/libreplaygain/libreplaygain.hash +++ b/buildroot/package/libreplaygain/libreplaygain.hash @@ -1,4 +1,6 @@ # From https://www.musepack.net/index.php?pg=src md5 e27b3b1249b7fbae92d656d9e3d26633 libreplaygain_r475.tar.gz # Calculated based on the hash above -sha256 8258bf785547ac2cda43bb195e07522f0a3682f55abe97753c974609ec232482 libreplaygain_r475.tar.gz +sha256 8258bf785547ac2cda43bb195e07522f0a3682f55abe97753c974609ec232482 libreplaygain_r475.tar.gz +# Locally computed +sha256 511e7b63ce6530b93932d19da3471a6672586339bc131b2699ad4e9b0ee6c9bb src/gain_analysis.c diff --git a/buildroot/package/libressl/0001-remove-test-z-DESTDIR-from-ltmain.patch b/buildroot/package/libressl/0001-remove-test-z-DESTDIR-from-ltmain.patch deleted file mode 100644 index 901a48ca9..000000000 --- a/buildroot/package/libressl/0001-remove-test-z-DESTDIR-from-ltmain.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4317d43d74996ad7ec3270b1e786e91a19312309 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Sat, 24 Jun 2017 13:08:57 -0400 -Subject: [PATCH] remove test -z "$DESTDIR" from ltmain.sh. - -Without this patch, buildroot-libtool-v2.4.patch will fail to apply. - -Signed-off-by: Adam Duskett ---- - ltmain.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ltmain.sh b/ltmain.sh -index 5d29bd6..6c90601 100644 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -6658,7 +6658,7 @@ func_mode_link () - *) - if test "$installed" = no; then - func_append notinst_deplibs " $lib" -- test -z "$DESTDIR" && need_relink=yes -+ need_relink=yes - fi - ;; - esac --- -2.9.4 - diff --git a/buildroot/package/libressl/Config.in b/buildroot/package/libressl/Config.in new file mode 100644 index 000000000..600829cb9 --- /dev/null +++ b/buildroot/package/libressl/Config.in @@ -0,0 +1,9 @@ +if BR2_PACKAGE_LIBRESSL + +config BR2_PACKAGE_LIBRESSL_BIN + bool "openssl binary" + help + Install the openssl binary to the target file system. This is + a command line tool for doing various cryptographic stuff. + +endif diff --git a/buildroot/package/libressl/libressl.hash b/buildroot/package/libressl/libressl.hash index a98f34467..fcecc2b43 100644 --- a/buildroot/package/libressl/libressl.hash +++ b/buildroot/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 9b640b13047182761a99ce3e4f000be9687566e0828b4a72709e9e6a3ef98477 libressl-2.8.3.tar.gz +sha256 df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e libressl-3.0.2.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/buildroot/package/libressl/libressl.mk b/buildroot/package/libressl/libressl.mk index e02ab9026..c2491bb3a 100644 --- a/buildroot/package/libressl/libressl.mk +++ b/buildroot/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 2.8.3 +LIBRESSL_VERSION = 3.0.2 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING @@ -17,4 +17,4 @@ endef LIBRESSL_POST_INSTALL_TARGET_HOOKS += LIBRESSL_REMOVE_BIN endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/buildroot/package/libroxml/libroxml.hash b/buildroot/package/libroxml/libroxml.hash index 897030ed7..2e01a5498 100644 --- a/buildroot/package/libroxml/libroxml.hash +++ b/buildroot/package/libroxml/libroxml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b55fd616a2be4e9747173b8dfa4bbab64f5ddfafd7d7a529aa91ab7755bc0ce6 libroxml-3.0.1.tar.gz +sha256 ed6d68d1bceabf98e5e76907411e2e4d93b2dbd48479ab41dede851f59dad6a3 libroxml-3.0.2.tar.gz sha256 fe11466c265ad0a6c3896ea113af9403c0a8372b1fdd78712db64f0f1bac6387 License.txt diff --git a/buildroot/package/libroxml/libroxml.mk b/buildroot/package/libroxml/libroxml.mk index fef3c2795..7e2488aea 100644 --- a/buildroot/package/libroxml/libroxml.mk +++ b/buildroot/package/libroxml/libroxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBROXML_VERSION = 3.0.1 +LIBROXML_VERSION = 3.0.2 LIBROXML_SITE = http://download.libroxml.net/pool/v3.x LIBROXML_INSTALL_STAGING = YES LIBROXML_LICENSE = LGPL-2.1+ with static link exception diff --git a/buildroot/package/librsvg/Config.in b/buildroot/package/librsvg/Config.in index ffb0287db..735bf6125 100644 --- a/buildroot/package/librsvg/Config.in +++ b/buildroot/package/librsvg/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBRSVG depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_GDK_PIXBUF @@ -18,7 +19,9 @@ config BR2_PACKAGE_LIBRSVG https://wiki.gnome.org/Projects/LibRsvg -comment "librsvg needs a toolchain w/ wchar, threads, C++" +comment "librsvg needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/librsvg/librsvg.hash b/buildroot/package/librsvg/librsvg.hash index 6f4b07423..366d9b0db 100644 --- a/buildroot/package/librsvg/librsvg.hash +++ b/buildroot/package/librsvg/librsvg.hash @@ -1,2 +1,4 @@ # From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/librsvg-2.40.20.sha256sum sha256 cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b librsvg-2.40.20.tar.xz +# Locally computed +sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING.LIB diff --git a/buildroot/package/librsync/0001-CMakeLists-fix-build-with-old-compilers.patch b/buildroot/package/librsync/0001-CMakeLists-fix-build-with-old-compilers.patch new file mode 100644 index 000000000..76598c21f --- /dev/null +++ b/buildroot/package/librsync/0001-CMakeLists-fix-build-with-old-compilers.patch @@ -0,0 +1,39 @@ +From 77b78e01f83b65f3c38941f54f71beaaddcb6fc1 Mon Sep 17 00:00:00 2001 +From: Pierre-Jean Texier +Date: Sat, 23 Nov 2019 16:51:46 +0100 +Subject: [PATCH] CMakeLists: fix build with old compilers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The librsync code uses some C99 constructs, but old compilers such +as gcc 4.7 don't default to -std=c99. This commit makes sure librsync +is built with -std=gnu99. + +Fixes: + +src/rabinkarp.h:82:5: error: ‘for’ loop initial declarations are only allowed in C99 or C11 mode + for (size_t i = len; i; i--) { + ^ +src/rabinkarp.h:82:5: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code + +Signed-off-by: Pierre-Jean Texier +[Upstream status: https://github.com/librsync/librsync/pull/181] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f810061..794d9c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,7 +149,7 @@ if (CMAKE_C_COMPILER_ID MATCHES "(Clang|Gnu|GNU)") + # TODO: Set for MSVC and other compilers. + # TODO: Set -Werror when the build is clean. + +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=gnu99") + endif() + + site_name(BUILD_HOSTNAME) diff --git a/buildroot/package/librsync/0002-cmake-FindPOPT.cmake-Add-PkgConfig-support.patch b/buildroot/package/librsync/0002-cmake-FindPOPT.cmake-Add-PkgConfig-support.patch new file mode 100644 index 000000000..1c8a332ab --- /dev/null +++ b/buildroot/package/librsync/0002-cmake-FindPOPT.cmake-Add-PkgConfig-support.patch @@ -0,0 +1,67 @@ +From f5a131ab66fec23d0c79b55fc3907603b094deb9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 31 Dec 2019 18:13:29 +0100 +Subject: [PATCH] cmake/FindPOPT.cmake: Add PkgConfig support + +Add PkgConfig support to retrieve popt dependencies otherwise static +build can fail if popt has been linked with iconv: + +[100%] Linking C executable rdiff +/home/buildroot/autobuild/instance-2/output-1/per-package/librsync/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/8.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/per-package/librsync/host/powerpc-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': +poptint.c:(.text+0x34c): undefined reference to `libiconv_open + +Fixes: + - http://autobuild.buildroot.org/results/896e8e3efbedad90d66ae8c4e1e50f16206cab49 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/librsync/librsync/pull/186] +--- + cmake/FindPOPT.cmake | 29 ++++++++++++++++++----------- + 1 file changed, 18 insertions(+), 11 deletions(-) + +diff --git a/cmake/FindPOPT.cmake b/cmake/FindPOPT.cmake +index 1ca452a..87b3e95 100644 +--- a/cmake/FindPOPT.cmake ++++ b/cmake/FindPOPT.cmake +@@ -42,20 +42,27 @@ if (NOT POPT_FOUND) + endif (NOT POPT_ROOT_DIR) + + ##_____________________________________________________________________________ +- ## Check for the header files ++ ## Check with PkgConfig (to retrieve static dependencies such as iconv) ++ find_package(PkgConfig QUIET) ++ pkg_search_module (POPT QUIET popt) ++ if (NOT POPT_FOUND) + +- find_path (POPT_INCLUDE_DIRS popt.h +- HINTS ${POPT_ROOT_DIR} ${CMAKE_INSTALL_PREFIX} $ENV{programfiles}\\GnuWin32 $ENV{programfiles32}\\GnuWin32 +- PATH_SUFFIXES include +- ) ++ ##_____________________________________________________________________________ ++ ## Check for the header files + +- ##_____________________________________________________________________________ +- ## Check for the library ++ find_path (POPT_INCLUDE_DIRS popt.h ++ HINTS ${POPT_ROOT_DIR} ${CMAKE_INSTALL_PREFIX} $ENV{programfiles}\\GnuWin32 $ENV{programfiles32}\\GnuWin32 ++ PATH_SUFFIXES include ++ ) + +- find_library (POPT_LIBRARIES popt +- HINTS ${POPT_ROOT_DIR} ${CMAKE_INSTALL_PREFIX} $ENV{programfiles}\\GnuWin32 $ENV{programfiles32}\\GnuWin32 +- PATH_SUFFIXES lib +- ) ++ ##_____________________________________________________________________________ ++ ## Check for the library ++ ++ find_library (POPT_LIBRARIES popt ++ HINTS ${POPT_ROOT_DIR} ${CMAKE_INSTALL_PREFIX} $ENV{programfiles}\\GnuWin32 $ENV{programfiles32}\\GnuWin32 ++ PATH_SUFFIXES lib ++ ) ++ endif (POPT_FOUND) + + ##_____________________________________________________________________________ + ## Actions taken when all components have been found +-- +2.24.0 + diff --git a/buildroot/package/librsync/Config.in b/buildroot/package/librsync/Config.in index 6957ddcc0..652f0cb27 100644 --- a/buildroot/package/librsync/Config.in +++ b/buildroot/package/librsync/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBRSYNC bool "librsync" - depends on !BR2_STATIC_LIBS select BR2_PACKAGE_ZLIB select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_POPT @@ -10,6 +9,3 @@ config BR2_PACKAGE_LIBRSYNC rsync utility and is used in rproxy. https://github.com/librsync/librsync - -comment "librsync needs a toolchain w/ dynamic library support" - depends on BR2_STATIC_LIBS diff --git a/buildroot/package/librsync/librsync.hash b/buildroot/package/librsync/librsync.hash index 63e14b105..d00e5cd33 100644 --- a/buildroot/package/librsync/librsync.hash +++ b/buildroot/package/librsync/librsync.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e67b9520ee84f7239be6e948795803bd95495091cc00bf6d0e8c6976032a4af1 librsync-v2.0.2.tar.gz +sha256 b5ab8e2092b82b7d7bb9c1dd52e6a77083a89f8ad9b9309da611f490d0b49a71 librsync-2.2.1.tar.gz sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/buildroot/package/librsync/librsync.mk b/buildroot/package/librsync/librsync.mk index 3b38e0a27..bf0785b42 100644 --- a/buildroot/package/librsync/librsync.mk +++ b/buildroot/package/librsync/librsync.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBRSYNC_VERSION = v2.0.2 -LIBRSYNC_SITE = $(call github,librsync,librsync,$(LIBRSYNC_VERSION)) +LIBRSYNC_VERSION = 2.2.1 +LIBRSYNC_SITE = $(call github,librsync,librsync,v$(LIBRSYNC_VERSION)) LIBRSYNC_LICENSE = LGPL-2.1+ LIBRSYNC_LICENSE_FILES = COPYING LIBRSYNC_INSTALL_STAGING = YES -LIBRSYNC_DEPENDENCIES = zlib bzip2 popt +LIBRSYNC_DEPENDENCIES = host-pkgconf zlib bzip2 popt $(eval $(cmake-package)) diff --git a/buildroot/package/librtas/librtas.hash b/buildroot/package/librtas/librtas.hash index 0f3d90222..086d0d7cb 100644 --- a/buildroot/package/librtas/librtas.hash +++ b/buildroot/package/librtas/librtas.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a79fd9cdb2f03e7401027fb80a07f14e29b86cc2d363126d527b211fea85d025 librtas-v2.0.1.tar.gz +sha256 a79fd9cdb2f03e7401027fb80a07f14e29b86cc2d363126d527b211fea85d025 librtas-2.0.1.tar.gz sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING.LESSER diff --git a/buildroot/package/librtas/librtas.mk b/buildroot/package/librtas/librtas.mk index f89394a6a..48c8d0143 100644 --- a/buildroot/package/librtas/librtas.mk +++ b/buildroot/package/librtas/librtas.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBRTAS_VERSION = v2.0.1 -LIBRTAS_SITE = $(call github,ibm-power-utilities,librtas,$(LIBRTAS_VERSION)) +LIBRTAS_VERSION = 2.0.1 +LIBRTAS_SITE = $(call github,ibm-power-utilities,librtas,v$(LIBRTAS_VERSION)) LIBRTAS_LICENSE = LGPL-2.1+ LIBRTAS_LICENSE_FILES = COPYING.LESSER LIBRTAS_INSTALL_STAGING = YES diff --git a/buildroot/package/libsamplerate/libsamplerate.hash b/buildroot/package/libsamplerate/libsamplerate.hash index a303f0bcf..73722563e 100644 --- a/buildroot/package/libsamplerate/libsamplerate.hash +++ b/buildroot/package/libsamplerate/libsamplerate.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature sha256 0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1 libsamplerate-0.1.9.tar.gz +# Locally computed +sha256 2c1f76ce2effdddb425018405d5690c0b1ab4e6976e35296b0a6db65c5e1a55d COPYING diff --git a/buildroot/package/libscrypt/libscrypt.hash b/buildroot/package/libscrypt/libscrypt.hash index bf3f44119..fda63d1c0 100644 --- a/buildroot/package/libscrypt/libscrypt.hash +++ b/buildroot/package/libscrypt/libscrypt.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 libscrypt-v1.21.tar.gz +sha256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 libscrypt-1.21.tar.gz +sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE diff --git a/buildroot/package/libscrypt/libscrypt.mk b/buildroot/package/libscrypt/libscrypt.mk index 6086ea95c..fa89ed31b 100644 --- a/buildroot/package/libscrypt/libscrypt.mk +++ b/buildroot/package/libscrypt/libscrypt.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSCRYPT_VERSION = v1.21 -LIBSCRYPT_SITE = $(call github,technion,libscrypt,$(LIBSCRYPT_VERSION)) +LIBSCRYPT_VERSION = 1.21 +LIBSCRYPT_SITE = $(call github,technion,libscrypt,v$(LIBSCRYPT_VERSION)) LIBSCRYPT_LICENSE = BSD-2-Clause LIBSCRYPT_LICENSE_FILES = LICENSE LIBSCRYPT_INSTALL_STAGING = YES diff --git a/buildroot/package/libsecret/libsecret.hash b/buildroot/package/libsecret/libsecret.hash index 808b1741f..00fdfd06f 100644 --- a/buildroot/package/libsecret/libsecret.hash +++ b/buildroot/package/libsecret/libsecret.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.18/libsecret-0.18.6.sha256sum -sha256 5efbc890ba41a323ffe0599cd260fd12bd8eb62a04aa1bd1b2762575d253d66f libsecret-0.18.6.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.18/libsecret-0.18.8.sha256sum +sha256 3bfa889d260e0dbabcf5b9967f2aae12edcd2ddc9adc365de7a5cc840c311d15 libsecret-0.18.8.tar.xz # Hash for license file: sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING diff --git a/buildroot/package/libsecret/libsecret.mk b/buildroot/package/libsecret/libsecret.mk index f5879fbf4..c699e16d9 100644 --- a/buildroot/package/libsecret/libsecret.mk +++ b/buildroot/package/libsecret/libsecret.mk @@ -5,11 +5,11 @@ ################################################################################ LIBSECRET_VERSION_MAJOR = 0.18 -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).6 +LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).8 LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz LIBSECRET_INSTALL_STAGING = YES -LIBSECRET_DEPENDENCIES = libglib2 host-intltool $(TARGET_NLS_DEPENDENCIES) +LIBSECRET_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) LIBSECRET_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) LIBSECRET_CONF_OPTS = \ --disable-manpages \ diff --git a/buildroot/package/libselinux/0002-revert-ln-relative.patch b/buildroot/package/libselinux/0002-revert-ln-relative.patch deleted file mode 100644 index f7beab269..000000000 --- a/buildroot/package/libselinux/0002-revert-ln-relative.patch +++ /dev/null @@ -1,26 +0,0 @@ -Makefile: revert libselinux: use ln --relative to create .so symlinks - -This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998 - -ln --relative is too recent to be available in all distributions, -especially enterprise-grade distros that can stick around as long as -they are maintained (up to 10 years in some cases?). - -For the sake of Buildroot, revert the upstream patch. - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: Fabrice Fontaine -[Update for 2.8 (with assumption that SHLIBDIR=LIBDIR)] - -diff -durNw libselinux-2.7.orig/src/Makefile libselinux-2.7/src/Makefile ---- libselinux-2.7.orig/src/Makefile 2018-01-15 20:53:50.168525700 +0100 -+++ libselinux-2.7/src/Makefile 2018-01-15 20:55:27.061858005 +0100 -@@ -181,7 +181,7 @@ - install -m 755 $(LIBSO) $(DESTDIR)$(SHLIBDIR) - test -d $(DESTDIR)$(LIBDIR)/pkgconfig || install -m 755 -d $(DESTDIR)$(LIBDIR)/pkgconfig - install -m 644 $(LIBPC) $(DESTDIR)$(LIBDIR)/pkgconfig -- ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) -+ cd $(DESTDIR)$(LIBDIR) && ln -sf $(LIBSO) $(TARGET) - - install-pywrap: pywrap - test -d $(DESTDIR)$(PYTHONLIBDIR)/selinux || install -m 755 -d $(DESTDIR)$(PYTHONLIBDIR)/selinux diff --git a/buildroot/package/libselinux/0003-Fix-build-break-around-__atomic_-with-GCC-4.7.patch b/buildroot/package/libselinux/0003-Fix-build-break-around-__atomic_-with-GCC-4.7.patch deleted file mode 100644 index 88e3a7933..000000000 --- a/buildroot/package/libselinux/0003-Fix-build-break-around-__atomic_-with-GCC-4.7.patch +++ /dev/null @@ -1,70 +0,0 @@ -From abe76789f8e7ce61b357f693eaed5b28feab5ce2 Mon Sep 17 00:00:00 2001 -From: Hollis Blanchard -Date: Mon, 13 Aug 2018 12:11:33 -0700 -Subject: [PATCH] Fix build break around __atomic_*() with GCC<4.7 - -The __atomic_* GCC primitives were introduced in GCC 4.7, but Red Hat -Enterprise Linux 6.x (for example) provides GCC 4.4. Tweak the current code to -use the (most conservative) __sync_synchronize() primitive provided by those -older GCC versions. - -(Really, no __atomic or __sync operations are needed here at all, since POSIX -4.12 "Memory Synchronization" says pthread_mutex_lock() and -pthread_mutex_unlock() "synchronize memory with respect to other threads"...) - -Signed-off-by: Hollis Blanchard ---- - src/label_file.h | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/src/label_file.h b/src/label_file.h -index 2fa85474..47859baf 100644 ---- a/src/label_file.h -+++ b/src/label_file.h -@@ -351,8 +351,14 @@ static inline int compile_regex(struct saved_data *data, struct spec *spec, - * init_routine does not take a parameter, it's not possible - * to use, so we generate the same effect with atomics and a - * mutex */ -+#ifdef __ATOMIC_RELAXED - regex_compiled = - __atomic_load_n(&spec->regex_compiled, __ATOMIC_ACQUIRE); -+#else -+ /* GCC <4.7 */ -+ __sync_synchronize(); -+ regex_compiled = spec->regex_compiled; -+#endif - if (regex_compiled) { - return 0; /* already done */ - } -@@ -360,8 +366,14 @@ static inline int compile_regex(struct saved_data *data, struct spec *spec, - __pthread_mutex_lock(&spec->regex_lock); - /* Check if another thread compiled the regex while we waited - * on the mutex */ -+#ifdef __ATOMIC_RELAXED - regex_compiled = - __atomic_load_n(&spec->regex_compiled, __ATOMIC_ACQUIRE); -+#else -+ /* GCC <4.7 */ -+ __sync_synchronize(); -+ regex_compiled = spec->regex_compiled; -+#endif - if (regex_compiled) { - __pthread_mutex_unlock(&spec->regex_lock); - return 0; -@@ -404,7 +416,13 @@ static inline int compile_regex(struct saved_data *data, struct spec *spec, - } - - /* Done. */ -+#ifdef __ATOMIC_RELAXED - __atomic_store_n(&spec->regex_compiled, true, __ATOMIC_RELEASE); -+#else -+ /* GCC <4.7 */ -+ spec->regex_compiled = true; -+ __sync_synchronize(); -+#endif - __pthread_mutex_unlock(&spec->regex_lock); - return 0; - } --- -2.13.0 - diff --git a/buildroot/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch b/buildroot/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch new file mode 100644 index 000000000..b1727af45 --- /dev/null +++ b/buildroot/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch @@ -0,0 +1,207 @@ +From 89c296e7e9219f54c74f8c3f42940100cbcac962 Mon Sep 17 00:00:00 2001 +From: Petr Lautrbach +Date: Fri, 7 Jun 2019 17:35:44 +0200 +Subject: [PATCH] libselinux: Use Python distutils to install SELinux python + bindings + +Follow officially documented way how to build C extension modules using +distutils - https://docs.python.org/3.8/extending/building.html#building + +Fixes: + +- selinux python module fails to load when it's built using SWIG-4.0: + +>>> import selinux +Traceback (most recent call last): + File "", line 1, in + File "/usr/lib64/python3.7/site-packages/selinux/__init__.py", line 13, in + from . import _selinux +ImportError: cannot import name '_selinux' from 'selinux' (/usr/lib64/python3.7/site-packages/selinux/__init__.py) + +SWIG-4.0 changed (again?) its behavior so that it uses: from . import _selinux +which looks for _selinux module in the same directory as where __init__.py is - +$(PYLIBDIR)/site-packages/selinux. But _selinux module is installed into +$(PYLIBDIR)/site-packages/ since a9604c30a5e2f ("libselinux: Change the location +of _selinux.so"). + +- audit2why python module fails to build with Python 3.8 + +cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -DOVERRIDE_GETTID=0 -I../include -D_GNU_SOURCE -DDISABLE_RPM -DNO_ANDROID_BACKEND -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8 -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -L. -shared -o python-3.8audit2why.so python-3.8audit2why.lo -lselinux -l:libsepol.a -Wl,-soname,audit2why.so,--version-script=audit2why.map,-z,defs +/usr/bin/ld: python-3.8audit2why.lo: in function `finish': +/builddir/build/BUILD/libselinux-2.9/src/audit2why.c:166: undefined reference to `PyArg_ParseTuple' +/usr/bin/ld: python-3.8audit2why.lo: in function `_Py_INCREF': +/usr/include/python3.8/object.h:449: undefined reference to `_Py_NoneStruct' +/usr/bin/ld: /usr/include/python3.8/object.h:449: undefined reference to `_Py_NoneStruct' +/usr/bin/ld: python-3.8audit2why.lo: in function `check_booleans': +/builddir/build/BUILD/libselinux-2.9/src/audit2why.c:84: undefined reference to `PyExc_RuntimeError' +... + +It's related to the following Python change +https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + +Python distutils adds correct link options automatically. + +- selinux python module doesn't provide any Python metadata + +When selinux python module was built manually, it didn't provide any metadata. +distutils takes care about that so that selinux Python module is visible for +pip: + +$ pip3 list | grep selinux +selinux 2.9 + +Signed-off-by: Petr Lautrbach +[Upstream: commit 2efa06857575e4118e91ca250b6b92da68b130d5] +Signed-off-by: Thomas Petazzoni +--- + src/.gitignore | 2 +- + src/Makefile | 36 ++++++++---------------------------- + src/setup.py | 24 ++++++++++++++++++++++++ + 3 files changed, 33 insertions(+), 29 deletions(-) + create mode 100644 libselinux/src/setup.py + +diff --git a/src/.gitignore b/src/.gitignore +index 4dcc3b3b..428afe5a 100644 +--- a/src/.gitignore ++++ b/src/.gitignore +@@ -1,4 +1,4 @@ + selinux.py +-selinuxswig_wrap.c ++selinuxswig_python_wrap.c + selinuxswig_python_exception.i + selinuxswig_ruby_wrap.c +diff --git a/src/Makefile b/src/Makefile +index e9ed0383..2b1696a0 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -36,7 +36,7 @@ TARGET=libselinux.so + LIBPC=libselinux.pc + SWIGIF= selinuxswig_python.i selinuxswig_python_exception.i + SWIGRUBYIF= selinuxswig_ruby.i +-SWIGCOUT= selinuxswig_wrap.c ++SWIGCOUT= selinuxswig_python_wrap.c + SWIGPYOUT= selinux.py + SWIGRUBYCOUT= selinuxswig_ruby_wrap.c + SWIGLOBJ:= $(patsubst %.c,$(PYPREFIX)%.lo,$(SWIGCOUT)) +@@ -55,7 +55,7 @@ ifeq ($(LIBSEPOLA),) + LDLIBS_LIBSEPOLA := -l:libsepol.a + endif + +-GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) selinuxswig_python_exception.i ++GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) $(SWIGCOUT) selinuxswig_python_exception.i + SRCS= $(filter-out $(GENERATED) audit2why.c, $(sort $(wildcard *.c))) + + MAX_STACK_SIZE=32768 +@@ -125,25 +125,18 @@ DISABLE_FLAGS+= -DNO_ANDROID_BACKEND + SRCS:= $(filter-out label_backends_android.c, $(SRCS)) + endif + +-SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ $(DISABLE_FLAGS) +- + SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS) + + all: $(LIBA) $(LIBSO) $(LIBPC) + +-pywrap: all $(SWIGFILES) $(AUDIT2WHYSO) ++pywrap: all selinuxswig_python_exception.i ++ CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext -I $(DESTDIR)$(INCLUDEDIR) -L $(DESTDIR)$(LIBDIR) + + rubywrap: all $(SWIGRUBYSO) + +-$(SWIGLOBJ): $(SWIGCOUT) +- $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(PYINC) -fPIC -DSHARED -c -o $@ $< +- + $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) + $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< + +-$(SWIGSO): $(SWIGLOBJ) +- $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $< -lselinux $(PYLIBS) +- + $(SWIGRUBYSO): $(SWIGRUBYLOBJ) + $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(RUBYLIBS) + +@@ -161,29 +154,15 @@ $(LIBPC): $(LIBPC).in ../VERSION + selinuxswig_python_exception.i: ../include/selinux/selinux.h + bash -e exception.sh > $@ || (rm -f $@ ; false) + +-$(AUDIT2WHYLOBJ): audit2why.c +- $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< +- +-$(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) $(LIBSEPOLA) +- $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(LDLIBS_LIBSEPOLA) $(PYLIBS) -Wl,-soname,audit2why.so,--version-script=audit2why.map,-z,defs +- + %.o: %.c policy.h + $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $< + + %.lo: %.c policy.h + $(CC) $(CFLAGS) -fPIC -DSHARED -c -o $@ $< + +-$(SWIGCOUT): $(SWIGIF) +- $(SWIG) $< +- +-$(SWIGPYOUT): $(SWIGCOUT) +- + $(SWIGRUBYCOUT): $(SWIGRUBYIF) + $(SWIGRUBY) $< + +-swigify: $(SWIGIF) +- $(SWIG) $< +- + install: all + test -d $(DESTDIR)$(LIBDIR) || install -m 755 -d $(DESTDIR)$(LIBDIR) + install -m 644 $(LIBA) $(DESTDIR)$(LIBDIR) +@@ -194,10 +173,9 @@ install: all + ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) + + install-pywrap: pywrap +- test -d $(DESTDIR)$(PYTHONLIBDIR)/selinux || install -m 755 -d $(DESTDIR)$(PYTHONLIBDIR)/selinux +- install -m 755 $(SWIGSO) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) +- install -m 755 $(AUDIT2WHYSO) $(DESTDIR)$(PYTHONLIBDIR)/selinux/audit2why$(PYCEXT) ++ $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` + install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py ++ ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) + + install-rubywrap: rubywrap + test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) +@@ -208,6 +186,8 @@ relabel: + + clean-pywrap: + -rm -f $(SWIGLOBJ) $(SWIGSO) $(AUDIT2WHYLOBJ) $(AUDIT2WHYSO) ++ $(PYTHON) setup.py clean ++ -rm -rf build *~ \#* *pyc .#* + + clean-rubywrap: + -rm -f $(SWIGRUBYLOBJ) $(SWIGRUBYSO) +diff --git a/src/setup.py b/src/setup.py +new file mode 100644 +index 00000000..4dc03f55 +--- /dev/null ++++ b/src/setup.py +@@ -0,0 +1,24 @@ ++#!/usr/bin/python3 ++ ++from distutils.core import Extension, setup ++ ++setup( ++ name="selinux", ++ version="2.9", ++ description="SELinux python 3 bindings", ++ author="SELinux Project", ++ author_email="selinux@vger.kernel.org", ++ ext_modules=[ ++ Extension('selinux._selinux', ++ sources=['selinuxswig_python.i'], ++ include_dirs=['../include'], ++ library_dirs=['.'], ++ libraries=['selinux']), ++ Extension('selinux.audit2why', ++ sources=['audit2why.c'], ++ include_dirs=['../include'], ++ library_dirs=['.'], ++ libraries=['selinux'], ++ extra_link_args=['-l:libsepol.a', '-Wl,--version-script=audit2why.map']) ++ ], ++) +-- +2.21.0 + diff --git a/buildroot/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch b/buildroot/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch new file mode 100644 index 000000000..4c568d338 --- /dev/null +++ b/buildroot/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch @@ -0,0 +1,34 @@ +From 4b1568bce5bbdc7bf76a4bbf1066ba7e7b84649f Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 25 Oct 2019 11:45:04 +0200 +Subject: [PATCH] src/Makefile: don't pass bogus -I and -L to python setup.py + build_ext + +Using $(DESTDIR) during the build does not follow the normal/standard +semantic of DESTDIR: it is normally only needed during the +installation. Therefore, a lot of build systems/environments don't +pass any DESTDIR at build time, which causes setup.py to be called +with -I /usr/include -L /usr/lib, which breaks cross-compilation. + +[Upstream: https://github.com/SELinuxProject/selinux/pull/183] +Signed-off-by: Thomas Petazzoni +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 2b1696a0..3b8bad81 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -130,7 +130,7 @@ SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS) + all: $(LIBA) $(LIBSO) $(LIBPC) + + pywrap: all selinuxswig_python_exception.i +- CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext -I $(DESTDIR)$(INCLUDEDIR) -L $(DESTDIR)$(LIBDIR) ++ CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext + + rubywrap: all $(SWIGRUBYSO) + +-- +2.21.0 + diff --git a/buildroot/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/buildroot/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch new file mode 100644 index 000000000..c960e1db7 --- /dev/null +++ b/buildroot/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch @@ -0,0 +1,47 @@ +From 0d4da8093bc2ef92b7c6f7fd1f4804f6ebc6cb56 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 25 Oct 2019 13:37:14 +0200 +Subject: [PATCH] Do not use PYCEXT, and rely on the installed file name + +PYCEXT is computed by asking the Python intrepreter what is the +file extension used for native Python modules. + +Unfortunately, when cross-compiling, the host Python doesn't give the +proper result: it gives the result matching the build machine, and not +the target machine. Due to this, the symlink has an incorrect name, +and doesn't point to the .so file that was actually built/installed. + +To address this and keep things simple, this patch just changes the ln +invocation to rely on the name of the _selinux*.so Python module that +was installed. + +[Upstream: https://github.com/SELinuxProject/selinux/pull/184] +Signed-off-by: Thomas Petazzoni +--- + src/Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 799df2b0..95684ed7 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -15,7 +15,6 @@ INCLUDEDIR ?= $(PREFIX)/include + PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX)) + PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX)) + PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(plat_specific=1, prefix='$(PREFIX)'))") +-PYCEXT ?= $(shell $(PYTHON) -c 'import imp;print([s for s,m,t in imp.get_suffixes() if t == imp.C_EXTENSION][0])') + RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') + RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') + RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') +@@ -175,7 +174,7 @@ install: all + install-pywrap: pywrap + $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` + install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py +- ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) ++ ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux*.so $(DESTDIR)$(PYTHONLIBDIR)/ + + install-rubywrap: rubywrap + test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) +-- +2.21.0 + diff --git a/buildroot/package/libselinux/Config.in b/buildroot/package/libselinux/Config.in index 6be816db7..62070c8d5 100644 --- a/buildroot/package/libselinux/Config.in +++ b/buildroot/package/libselinux/Config.in @@ -2,12 +2,9 @@ config BR2_PACKAGE_LIBSELINUX bool "libselinux" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - # Uses , not available in musl or uClibc - depends on BR2_TOOLCHAIN_USES_GLIBC - # Toolchain issue: "fixup not contained within frag" - depends on !BR2_arc select BR2_PACKAGE_LIBSEPOL select BR2_PACKAGE_PCRE + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC help libselinux is the runtime SELinux library that provides interfaces (e.g. library functions for the SELinux kernel @@ -19,7 +16,5 @@ config BR2_PACKAGE_LIBSELINUX http://selinuxproject.org/page/Main_Page -comment "libselinux needs a glibc toolchain w/ threads, dynamic library" - depends on !BR2_arc - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_USES_GLIBC +comment "libselinux needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/libselinux/libselinux.hash b/buildroot/package/libselinux/libselinux.hash index fb8e35043..ed61ea8bd 100644 --- a/buildroot/package/libselinux/libselinux.hash +++ b/buildroot/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 31db96ec7643ce10912b3c3f98506a08a9116dcfe151855fd349c3fda96187e1 libselinux-2.8.tar.gz +sha256 1bccc8873e449587d9a2b2cf253de9b89a8291b9fbc7c59393ca9e5f5f4d2693 libselinux-2.9.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/buildroot/package/libselinux/libselinux.mk b/buildroot/package/libselinux/libselinux.mk index b09634740..1461e3453 100644 --- a/buildroot/package/libselinux/libselinux.mk +++ b/buildroot/package/libselinux/libselinux.mk @@ -4,42 +4,41 @@ # ################################################################################ -LIBSELINUX_VERSION = 2.8 -LIBSELINUX_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524 +LIBSELINUX_VERSION = 2.9 +LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE -LIBSELINUX_DEPENDENCIES = libsepol pcre +LIBSELINUX_DEPENDENCIES = $(BR2_COREUTILS_HOST_DEPENDENCY) libsepol pcre LIBSELINUX_INSTALL_STAGING = YES -# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc 2.22. # Set SHLIBDIR to /usr/lib so it has the same value than LIBDIR, as a result # we won't have to use a relative path in 0002-revert-ln-relative.patch LIBSELINUX_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ - LDFLAGS="$(TARGET_LDFLAGS) -lpcre -lpthread" \ ARCH=$(KERNEL_ARCH) \ SHLIBDIR=/usr/lib LIBSELINUX_MAKE_INSTALL_TARGETS = install +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +LIBSELINUX_DEPENDENCIES += musl-fts +LIBSELINUX_MAKE_OPTS += FTS_LDLIBS=-lfts +endif + ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBSELINUX_DEPENDENCIES += python3 host-swig -LIBSELINUX_PYINC = -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) else ifeq ($(BR2_PACKAGE_PYTHON),y) LIBSELINUX_DEPENDENCIES += python host-swig -LIBSELINUX_PYINC = -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR) endif LIBSELINUX_MAKE_OPTS += \ - PYINC="$(LIBSELINUX_PYINC)" \ - PYSITEDIR=$(TARGET_DIR)/usr/lib/$(LIBSELINUX_PYLIBVER)/site-packages \ - SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/" + $(PKG_PYTHON_DISTUTILS_ENV) \ + PYTHON=$(LIBSELINUX_PYLIBVER) LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap @@ -52,6 +51,14 @@ define LIBSELINUX_BUILD_PYTHON_BINDINGS endef endif # python || python3 +# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc +# 2.22. We set CFLAGS and LDFLAGS here because we want to win over the +# CFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_DISTUTILS_ENV) +# when the python binding is enabled. +LIBSELINUX_MAKE_OPTS += \ + CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ + LDFLAGS="$(TARGET_LDFLAGS) -lpcre -lpthread" + define LIBSELINUX_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(LIBSELINUX_MAKE_OPTS) all @@ -66,7 +73,8 @@ endef define LIBSELINUX_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install + $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(TARGET_DIR) \ + $(LIBSELINUX_MAKE_INSTALL_TARGETS) # Create the selinuxfs mount point if [ ! -d "$(TARGET_DIR)/selinux" ]; then mkdir $(TARGET_DIR)/selinux; fi if ! grep -q "selinuxfs" $(TARGET_DIR)/etc/fstab; then \ @@ -78,11 +86,9 @@ HOST_LIBSELINUX_DEPENDENCIES = \ ifeq ($(BR2_PACKAGE_PYTHON3),y) HOST_LIBSELINUX_DEPENDENCIES += host-python3 -HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)m/ HOST_LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) else HOST_LIBSELINUX_DEPENDENCIES += host-python -HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/include/python$(PYTHON_VERSION_MAJOR)/ HOST_LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR) endif @@ -91,9 +97,8 @@ HOST_LIBSELINUX_MAKE_OPTS = \ PREFIX=$(HOST_DIR) \ SHLIBDIR=$(HOST_DIR)/lib \ LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \ - PYINC="$(HOST_LIBSELINUX_PYINC)" \ - PYSITEDIR="$(HOST_DIR)/lib/$(HOST_LIBSELINUX_PYLIBVER)/site-packages" \ - SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/" + $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ + PYTHON=$(HOST_LIBSELINUX_PYLIBVER) define HOST_LIBSELINUX_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \ diff --git a/buildroot/package/libsemanage/Config.in b/buildroot/package/libsemanage/Config.in index 7ee9c3860..3c7050ee5 100644 --- a/buildroot/package/libsemanage/Config.in +++ b/buildroot/package/libsemanage/Config.in @@ -3,14 +3,8 @@ config BR2_PACKAGE_LIBSEMANAGE depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - # - libselinux needs fts.h (not available in uClibc/musl) - # - libsemanage itself needs getpwent_r() not available in musl - # - audit is not available on musl - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on !BR2_arc select BR2_PACKAGE_AUDIT select BR2_PACKAGE_LIBSELINUX - select BR2_PACKAGE_USTR select BR2_PACKAGE_BZIP2 help libsemanage is the policy management library. It uses @@ -23,8 +17,6 @@ config BR2_PACKAGE_LIBSEMANAGE http://selinuxproject.org/page/Main_Page -comment "libsemanage needs a glibc toolchain w/ threads, dynamic library" - depends on !BR2_arc +comment "libsemanage needs a toolchain w/ threads, dynamic library" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/libsemanage/libsemanage.hash b/buildroot/package/libsemanage/libsemanage.hash index 531551400..871ed192c 100644 --- a/buildroot/package/libsemanage/libsemanage.hash +++ b/buildroot/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 1c0de8d2c51e5460926c21e371105c84a39087dfd8f8e9f0cc1d017e4cbea8e2 libsemanage-2.8.tar.gz +sha256 2576349d344492e73b468059767268dec1dabd8c35f3c7222c3ec2448737bc1c libsemanage-2.9.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/libsemanage/libsemanage.mk b/buildroot/package/libsemanage/libsemanage.mk index bbde50f49..fd9034604 100644 --- a/buildroot/package/libsemanage/libsemanage.mk +++ b/buildroot/package/libsemanage/libsemanage.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 2.8 -LIBSEMANAGE_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524 +LIBSEMANAGE_VERSION = 2.9 +LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING -LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux ustr bzip2 +LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux bzip2 LIBSEMANAGE_INSTALL_STAGING = YES LIBSEMANAGE_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) @@ -25,8 +25,13 @@ define LIBSEMANAGE_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install endef -HOST_LIBSEMANAGE_DEPENDENCIES = host-bison host-audit host-libsepol host-libselinux \ - host-ustr host-bzip2 host-swig +HOST_LIBSEMANAGE_DEPENDENCIES = \ + host-bison \ + host-audit \ + host-libsepol \ + host-libselinux \ + host-bzip2 \ + host-swig HOST_LIBSEMANAGE_MAKE_OPTS += \ $(HOST_CONFIGURE_OPTS) \ @@ -37,7 +42,7 @@ HOST_LIBSEMANAGE_MAKE_OPTS += \ ifeq ($(BR2_PACKAGE_PYTHON3),y) HOST_LIBSEMANAGE_DEPENDENCIES += host-python3 HOST_LIBSEMANAGE_MAKE_OPTS += \ - PYINC="-I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)m/" \ + PYINC="-I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)/" \ PYTHONLIBDIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/" \ PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" else diff --git a/buildroot/package/libsepol/0001-support-static-only.patch b/buildroot/package/libsepol/0001-support-static-only.patch index f475dcad1..b3eb608f7 100644 --- a/buildroot/package/libsepol/0001-support-static-only.patch +++ b/buildroot/package/libsepol/0001-support-static-only.patch @@ -1,5 +1,5 @@ From 2140db697c7f1da2a0a3f7bbcb14c1a0dade84e5 Mon Sep 17 00:00:00 2001 -From: Adam Duskett +From: Adam Duskett Date: Mon, 9 Oct 2017 16:28:12 -0400 Subject: [PATCH] Add support for static-only build @@ -10,7 +10,7 @@ libraries. It allows to support cases where the target architecture does not have support for shared libraries. Signed-off-by: Thomas Petazzoni -Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett Signed-off-by: Fabrice Fontaine [Update for 2.8] --- diff --git a/buildroot/package/libsepol/0002-revert-ln-relative.patch b/buildroot/package/libsepol/0002-revert-ln-relative.patch deleted file mode 100644 index acac908be..000000000 --- a/buildroot/package/libsepol/0002-revert-ln-relative.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 16b2b0e21e10727065042a1baabd1a887757c65c Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Mon, 9 Oct 2017 16:29:36 -0400 -Subject: [PATCH] Makefile: revert libsepol: use ln --relative to create .so symlinks - -This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998 - -ln --relative is too recent to be available in all distributions, -especially enterprise-grade distros that can stick around as long as -they are maintained (up to 10 years in some cases?). - -For the sake of Buildroot, revert the upstream patch. - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: Fabrice Fontaine -[Update for 2.8 (with assumption that SHLIBDIR=LIBDIR)] - -diff -durNw libsepol-2.7.orig/src/Makefile libsepol-2.7/src/Makefile ---- libsepol-2.7.orig/src/Makefile 2018-01-15 21:37:12.821831315 +0100 -+++ libsepol-2.7/src/Makefile 2018-01-15 21:38:03.838497434 +0100 -@@ -92,7 +92,7 @@ - endif - test -d $(DESTDIR)$(LIBDIR)/pkgconfig || install -m 755 -d $(DESTDIR)$(LIBDIR)/pkgconfig - install -m 644 $(LIBPC) $(DESTDIR)$(LIBDIR)/pkgconfig -- $(LN) -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) -+ cd $(DESTDIR)$(LIBDIR) && ln -sf $(LIBSO) $(TARGET) - - relabel: - /sbin/restorecon $(LIBINSTALL)/$(LIBSO) diff --git a/buildroot/package/libsepol/Config.in b/buildroot/package/libsepol/Config.in index cfa923e45..21d4d7865 100644 --- a/buildroot/package/libsepol/Config.in +++ b/buildroot/package/libsepol/Config.in @@ -7,5 +7,29 @@ config BR2_PACKAGE_LIBSEPOL http://selinuxproject.org/page/Main_Page +if BR2_PACKAGE_LIBSEPOL + +config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION + int "Policy version" + default 31 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 + default 30 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 + default 29 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 + default 28 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 + default 26 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_2_6 + default 25 + help + The maximum SELinux policy version your kernel supports. + + Here's a handy table to help you choose: + kernel version SElinux policy max version + <= 2.6.x 25 + > 2.6 <= 3.5 26 + > 3.5 <= 3.14 28 (27 and 28 were added at the same time) + > 3.14 <= 4.3 29 + > 4.3 <= 4.13 30 + > 4.13 31 + +endif + comment "libsepol needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libsepol/libsepol.hash b/buildroot/package/libsepol/libsepol.hash index 599133c11..83eb63213 100644 --- a/buildroot/package/libsepol/libsepol.hash +++ b/buildroot/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 3ad6916a8352bef0bad49acc8037a5f5b48c56f94e4cb4e1959ca475fa9d24d6 libsepol-2.8.tar.gz +sha256 a34b12b038d121e3e459b1cbaca3c9202e983137819c16baf63658390e3f1d5d libsepol-2.9.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/libsepol/libsepol.mk b/buildroot/package/libsepol/libsepol.mk index a1e383685..62b0744aa 100644 --- a/buildroot/package/libsepol/libsepol.mk +++ b/buildroot/package/libsepol/libsepol.mk @@ -4,14 +4,14 @@ # ################################################################################ -LIBSEPOL_VERSION = 2.8 -LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524 +LIBSEPOL_VERSION = 2.9 +LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING LIBSEPOL_INSTALL_STAGING = YES LIBSEPOL_DEPENDENCIES = host-flex -HOST_LIBSEPOL_DEPENDENCIES = host-flex +HOST_LIBSEPOL_DEPENDENCIES = $(BR2_COREUTILS_HOST_DEPENDENCY) host-flex LIBSEPOL_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS) diff --git a/buildroot/package/libserial/libserial.hash b/buildroot/package/libserial/libserial.hash index e82809c71..30005e39a 100644 --- a/buildroot/package/libserial/libserial.hash +++ b/buildroot/package/libserial/libserial.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 063142d6bfe08898316e9a6055f2ddeedef56de06f7cfc8dcdfecc6efabf4bdd libserial-v1.0.0.tar.gz +sha256 063142d6bfe08898316e9a6055f2ddeedef56de06f7cfc8dcdfecc6efabf4bdd libserial-1.0.0.tar.gz sha256 c42fdfe17c192cfdb900e22d40ef246db1b473f99165e405eda62b41be27f4bf LICENSE.txt diff --git a/buildroot/package/libserial/libserial.mk b/buildroot/package/libserial/libserial.mk index 8da7d1cdd..bac0382ba 100644 --- a/buildroot/package/libserial/libserial.mk +++ b/buildroot/package/libserial/libserial.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSERIAL_VERSION = v1.0.0 -LIBSERIAL_SITE = $(call github,crayzeewulf,libserial,$(LIBSERIAL_VERSION)) +LIBSERIAL_VERSION = 1.0.0 +LIBSERIAL_SITE = $(call github,crayzeewulf,libserial,v$(LIBSERIAL_VERSION)) LIBSERIAL_INSTALL_STAGING = YES LIBSERIAL_LICENSE = BSD-3-Clause LIBSERIAL_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/libserialport/libserialport.hash b/buildroot/package/libserialport/libserialport.hash index f2619029a..39f0c8f1f 100644 --- a/buildroot/package/libserialport/libserialport.hash +++ b/buildroot/package/libserialport/libserialport.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d libserialport-0.1.1.tar.gz +sha256 4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d libserialport-0.1.1.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/buildroot/package/libsexy/libsexy.hash b/buildroot/package/libsexy/libsexy.hash index 78b1a8265..6f47e8ba7 100644 --- a/buildroot/package/libsexy/libsexy.hash +++ b/buildroot/package/libsexy/libsexy.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e libsexy-0.1.11.tar.gz +sha256 8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e libsexy-0.1.11.tar.gz +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/buildroot/package/libsha1/libsha1.hash b/buildroot/package/libsha1/libsha1.hash index 6d597abff..5a2b0ed13 100644 --- a/buildroot/package/libsha1/libsha1.hash +++ b/buildroot/package/libsha1/libsha1.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 ef4c75007ac41c3dc09e0225943c789ba2b9c632a6cd7b548e0519477ac2f768 libsha1-0.3.tar.gz +sha256 4c387926596bfeacc5b72ebeb96ab36c299a07568e18592c727a6c11dd512c20 COPYING diff --git a/buildroot/package/libshairplay/libshairplay.hash b/buildroot/package/libshairplay/libshairplay.hash index 19261f98b..9b12b5a55 100644 --- a/buildroot/package/libshairplay/libshairplay.hash +++ b/buildroot/package/libshairplay/libshairplay.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 49ac0e0470ec6367f720c7b79a09165138f57b60f5949a2d9c38be5823d13294 libshairplay-ce80e005908f41d0e6fde1c4a21e9cb8ee54007b.tar.gz +sha256 49ac0e0470ec6367f720c7b79a09165138f57b60f5949a2d9c38be5823d13294 libshairplay-ce80e005908f41d0e6fde1c4a21e9cb8ee54007b.tar.gz +sha256 0ac7d61c52aff5717c02250ca0adf0ef35019e2c0838a3479b8fce597aea6fde LICENSE diff --git a/buildroot/package/libshout/0001-Fix-THEORA-SPEEX-_LDFLAGS-typo.patch b/buildroot/package/libshout/0001-Fix-THEORA-SPEEX-_LDFLAGS-typo.patch deleted file mode 100644 index 4d173c51e..000000000 --- a/buildroot/package/libshout/0001-Fix-THEORA-SPEEX-_LDFLAGS-typo.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d96a3cafeebeb80b4796bacbe0e6da0bbd3ee48e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sun, 28 Aug 2016 00:39:55 +0200 -Subject: [PATCH 1/2] Fix {THEORA,SPEEX}_LDFLAGS typo -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Needed to properly link against libshout, otherwise the build fails with: - - error: LDFLAGS: No such file or directory - -Upstream status: pending -https://github.com/xiph/Icecast-libshout/pull/4 - -Signed-off-by: Jörg Krause ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 87a7f55..85f18ad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -134,7 +134,7 @@ PKG_CHECK_MODULES(THEORA, theora, [ - ]) - fi - XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$THEORA_CFLAGS]) --XIPH_VAR_PREPEND([XIPH_LIBS],[$THEORA LDFLAGS $THEORA_LIBS]) -+XIPH_VAR_PREPEND([XIPH_LIBS],[$THEORA_LDFLAGS $THEORA_LIBS]) - AM_CONDITIONAL([HAVE_THEORA], [test -n "$THEORA_LIBS"]) - if test -n "$THEORA_LIBS" - then -@@ -153,7 +153,7 @@ PKG_CHECK_MODULES(SPEEX, speex, [ - ]) - fi - XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$SPEEX_CFLAGS]) --XIPH_VAR_PREPEND([XIPH_LIBS],[$SPEEX LDFLAGS $SPEEX_LIBS]) -+XIPH_VAR_PREPEND([XIPH_LIBS],[$SPEEX_LDFLAGS $SPEEX_LIBS]) - AM_CONDITIONAL([HAVE_SPEEX], [test -n "$SPEEX_LIBS"]) - if test -n "$SPEEX_LIBS" - then --- -2.9.3 - diff --git a/buildroot/package/libshout/0002-Make-sure-SHOUT_REQUIRES-contains-OpenSSL.patch b/buildroot/package/libshout/0002-Make-sure-SHOUT_REQUIRES-contains-OpenSSL.patch deleted file mode 100644 index 08d7fa917..000000000 --- a/buildroot/package/libshout/0002-Make-sure-SHOUT_REQUIRES-contains-OpenSSL.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 69774132422af1d017008eb5daed8e2099d2fa0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 31 Aug 2016 21:55:51 +0200 -Subject: [PATCH 2/2] Make sure @SHOUT_REQUIRES@ contains OpenSSL -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Static linking userspace programs such as mpd against libshout -currently doesn't work out of the box, because libshout is linked -against libssl, but this isn't expressed in libshouts pkg-config -file: - -``` -/usr/lib/libshout.a(tls.o): In function `tls_check_cert': -tls.c:(.text+0x10): undefined reference to `SSL_get_peer_certificate' -tls.c:(.text+0x24): undefined reference to `SSL_get_verify_result' -tls.c:(.text+0x4c): undefined reference to `X509_get_subject_name' -tls.c:(.text+0x60): undefined reference to `X509_NAME_get_text_by_NID' -tls.c:(.text+0x118): undefined reference to `X509_NAME_get_entry' -tls.c:(.text+0x11c): undefined reference to `X509_NAME_ENTRY_get_data' -tls.c:(.text+0x120): undefined reference to `ASN1_STRING_length' -tls.c:(.text+0x148): undefined reference to `X509_free' -tls.c:(.text+0x178): undefined reference to `X509_NAME_get_index_by_NID' -``` - -Since OpenSSL installs its own .pc files, make sure that @SHOUT_REQUIRES@ -contains `ssl`. - -Upstream status: pending -https://github.com/xiph/Icecast-libshout/pull/5 - -Signed-off-by: Jörg Krause ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 85f18ad..2b9c505 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -197,6 +197,10 @@ XIPH_PATH_OPENSSL([ - ]) - AC_SUBST([SHOUT_TLS]) - AM_CONDITIONAL([HAVE_TLS], [test -n "$OPENSSL_LIBS"]) -+if test "$SHOUT_TLS" = "1" -+then -+ SHOUT_REQUIRES="$SHOUT_REQUIRES, libssl" -+fi - - SHOUT_VERSION="$VERSION" - SHOUT_CPPFLAGS="-I$shout_includedir $VORBIS_CFLAGS $PTHREAD_CPPFLAGS" --- -2.9.3 - diff --git a/buildroot/package/libshout/0003-libshout-tls-compile-with-OpenSSL-1.1.0.patch b/buildroot/package/libshout/0003-libshout-tls-compile-with-OpenSSL-1.1.0.patch deleted file mode 100644 index 49b71501e..000000000 --- a/buildroot/package/libshout/0003-libshout-tls-compile-with-OpenSSL-1.1.0.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 01fafc449f0de56743d08e7976933c49e2915bfa Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior -Date: Wed, 15 Nov 2017 12:46:25 +0000 -Subject: [PATCH] tls: compile with OpenSSL 1.1.0 - -The init functions are not longer required in OpenSSL 1.1 so I dropped -them. - -TLSv1_client_method() should not be used because it enables only the -TLSv1.0 protocol. Better is to use SSLv23_client_method() which enable -all the protocols including TLSv1.2. With this functions SSLv2 and SSLv3 -is theoretically possible but as of today those protocols are usually -build-time disabled. -To avoid all this OpenSSL 1.1 provides TLS_client_method() which is aim -to provide to highest TLS protocol version (same as -SSLv23_client_method() but it is deprecated in 1.1). - -Signed-off-by: Sebastian Andrzej Siewior -Signed-off-by: Patrick Havelange ---- - src/tls.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/tls.c b/src/tls.c -index 4562c7327077..e0e5c1a5f079 100644 ---- a/src/tls.c -+++ b/src/tls.c -@@ -24,6 +24,7 @@ - #endif - - #include -+#include - #include "shout_private.h" - - #ifndef XXX_HAVE_X509_check_host -@@ -61,14 +62,17 @@ shout_tls_t *shout_tls_new(shout_t *self, sock_t socket) - - static inline int tls_setup(shout_tls_t *tls) - { -- SSL_METHOD *meth; -- -+ const SSL_METHOD *meth; -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - SSL_library_init(); - SSL_load_error_strings(); - SSLeay_add_all_algorithms(); -- SSLeay_add_ssl_algorithms(); -+ SSLeay_add_ssl_algorithms(); - -- meth = TLSv1_client_method(); -+ meth = SSLv23_client_method(); -+#else -+ meth = TLS_client_method(); -+#endif - if (!meth) - goto error; - --- -2.15.0 diff --git a/buildroot/package/libshout/libshout.hash b/buildroot/package/libshout/libshout.hash index 5b3ae2d44..06702891c 100644 --- a/buildroot/package/libshout/libshout.hash +++ b/buildroot/package/libshout/libshout.hash @@ -1,3 +1,5 @@ -# From https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libshout/Manifest -# hash from http://downloads.xiph.org/releases/libshout/SHA256SUMS is wrong! -sha256 f3acb8dec26f2dbf6df778888e0e429a4ce9378a9d461b02a7ccbf2991bbf24d libshout-2.4.1.tar.gz +# From https://downloads.xiph.org/releases/libshout/SHA256SUMS +sha256 0d8af55d1141bf90710bcd41a768c9cc5adb251502a0af1dd22c8da215d40dfe libshout-2.4.3.tar.gz + +# Hash for license file +sha256 7a4436f9ec37603356791c87de3bc444989befd2682d29efb3d97604e04c1852 COPYING diff --git a/buildroot/package/libshout/libshout.mk b/buildroot/package/libshout/libshout.mk index 375ce05b4..6537a1fea 100644 --- a/buildroot/package/libshout/libshout.mk +++ b/buildroot/package/libshout/libshout.mk @@ -4,15 +4,13 @@ # ################################################################################ -LIBSHOUT_VERSION = 2.4.1 +LIBSHOUT_VERSION = 2.4.3 LIBSHOUT_SITE = https://downloads.xiph.org/releases/libshout LIBSHOUT_LICENSE = LGPL-2.0+ LIBSHOUT_LICENSE_FILES = COPYING LIBSHOUT_INSTALL_STAGING = YES LIBSHOUT_DEPENDENCIES = host-pkgconf libogg libvorbis - -# patching configure.ac -LIBSHOUT_AUTORECONF = YES +LIBSHOUT_CONF_OPTS = --disable-examples ifeq ($(BR2_PACKAGE_LIBTHEORA),y) LIBSHOUT_CONF_OPTS += --enable-theora diff --git a/buildroot/package/libsidplay2/libsidplay2.hash b/buildroot/package/libsidplay2/libsidplay2.hash index 1b45cb878..5342135ad 100644 --- a/buildroot/package/libsidplay2/libsidplay2.hash +++ b/buildroot/package/libsidplay2/libsidplay2.hash @@ -1,2 +1,4 @@ # From http://sourceforge.net/projects/sidplay2/files/sidplay2/sidplay-libs-2.1.1/ sha1 8af6350866edc30b0d331e075fa97292f6f645a5 sidplay-libs-2.1.1.tar.gz +# Locally computed +sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf libsidplay/COPYING diff --git a/buildroot/package/libsigc/libsigc.hash b/buildroot/package/libsigc/libsigc.hash index a630534e8..bc3880f7c 100644 --- a/buildroot/package/libsigc/libsigc.hash +++ b/buildroot/package/libsigc/libsigc.hash @@ -1,2 +1,5 @@ # From http://ftp.gnome.org/pub/gnome/sources/libsigc++/2.10/libsigc++-2.10.0.sha256sum sha256 f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81 libsigc++-2.10.0.tar.xz + +# Locally calculated +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/buildroot/package/libsigrok/Config.in b/buildroot/package/libsigrok/Config.in index a4b9f6656..69531e621 100644 --- a/buildroot/package/libsigrok/Config.in +++ b/buildroot/package/libsigrok/Config.in @@ -26,13 +26,16 @@ config BR2_PACKAGE_LIBSIGROKCXX bool "build C++ bindings" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # glibmm + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-doxygen select BR2_PACKAGE_GLIBMM + select BR2_PACKAGE_HOST_DOXYGEN help Build libsigrok C++ bindings as well. -comment "C++ bindings need a toolchain w/ C++, gcc >= 4.9" +comment "C++ bindings need a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 endif diff --git a/buildroot/package/libsigrok/libsigrok.hash b/buildroot/package/libsigrok/libsigrok.hash index e5ab5d973..0898a2fba 100644 --- a/buildroot/package/libsigrok/libsigrok.hash +++ b/buildroot/package/libsigrok/libsigrok.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e40fde7af98d29e922e9d3cbe0a6c0569889153fc31e47b8b1afe4d846292b9c libsigrok-0.5.1.tar.gz +sha256 4d341f90b6220d3e8cb251dacf726c41165285612248f2c52d15df4590a1ce3c libsigrok-0.5.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/libsigrok/libsigrok.mk b/buildroot/package/libsigrok/libsigrok.mk index aa79191e9..8e7c355fd 100644 --- a/buildroot/package/libsigrok/libsigrok.mk +++ b/buildroot/package/libsigrok/libsigrok.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSIGROK_VERSION = 0.5.1 +LIBSIGROK_VERSION = 0.5.2 LIBSIGROK_SITE = http://sigrok.org/download/source/libsigrok LIBSIGROK_LICENSE = GPL-3.0+ LIBSIGROK_LICENSE_FILES = COPYING @@ -12,6 +12,20 @@ LIBSIGROK_INSTALL_STAGING = YES LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf LIBSIGROK_CONF_OPTS = --disable-java --disable-python +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) +LIBSIGROK_CONF_OPTS += --with-libbluez +LIBSIGROK_DEPENDENCIES += bluez5_utils +else +LIBSIGROK_CONF_OPTS += --without-libbluez +endif + +ifeq ($(BR2_PACKAGE_HIDAPI),y) +LIBSIGROK_CONF_OPTS += --with-libhidapi +LIBSIGROK_DEPENDENCIES += hidapi +else +LIBSIGROK_CONF_OPTS += --without-libhidapi +endif + ifeq ($(BR2_PACKAGE_LIBSERIALPORT),y) LIBSIGROK_CONF_OPTS += --with-libserialport LIBSIGROK_DEPENDENCIES += libserialport @@ -39,9 +53,8 @@ endif ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y) LIBSIGROK_CONF_OPTS += --enable-cxx -LIBSIGROK_AUTORECONF_OPTS += -I $(HOST_DIR)/share/autoconf-archive +# host-doxygen is used by C++ bindings to parse libsigrok symbols LIBSIGROK_DEPENDENCIES += \ - host-autoconf-archive \ glibmm \ host-doxygen \ $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) diff --git a/buildroot/package/libsigrokdecode/libsigrokdecode.hash b/buildroot/package/libsigrokdecode/libsigrokdecode.hash index e6eb4a080..44e03ad37 100644 --- a/buildroot/package/libsigrokdecode/libsigrokdecode.hash +++ b/buildroot/package/libsigrokdecode/libsigrokdecode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e08d9e797c54eccf3144da631b6e5f1498ac531e51520428df537a1da82583f0 libsigrokdecode-0.5.2.tar.gz +sha256 c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0 libsigrokdecode-0.5.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/libsigrokdecode/libsigrokdecode.mk b/buildroot/package/libsigrokdecode/libsigrokdecode.mk index f509fbdf7..8c9488784 100644 --- a/buildroot/package/libsigrokdecode/libsigrokdecode.mk +++ b/buildroot/package/libsigrokdecode/libsigrokdecode.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSIGROKDECODE_VERSION = 0.5.2 +LIBSIGROKDECODE_VERSION = 0.5.3 LIBSIGROKDECODE_SITE = http://sigrok.org/download/source/libsigrokdecode LIBSIGROKDECODE_LICENSE = GPL-3.0+ LIBSIGROKDECODE_LICENSE_FILES = COPYING diff --git a/buildroot/package/libsigsegv/0003-Improve-support-for-Linux-nds32.patch b/buildroot/package/libsigsegv/0003-Improve-support-for-Linux-nds32.patch new file mode 100644 index 000000000..90dcfacc1 --- /dev/null +++ b/buildroot/package/libsigsegv/0003-Improve-support-for-Linux-nds32.patch @@ -0,0 +1,76 @@ +From ef0890d6bd6a3252fd99392705bbda39956b6b8f Mon Sep 17 00:00:00 2001 +From: Nylon Chen +Date: Fri, 26 Apr 2019 15:55:22 +0800 +Subject: [PATCH] Improve support for Linux/nds32. + +Signed-off-by:Nylon Chen +--- + configure.ac | 3 +++ + src/Makefile.am | 1 + + src/fault-linux-nds32.h | 28 ++++++++++++++++++++++++++++ + 3 files changed, 32 insertions(+) + create mode 100644 src/fault-linux-nds32.h + +diff --git a/configure.ac b/configure.ac +index 22b8eff..e44d573 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -425,6 +425,9 @@ if test -z "$CFG_FAULT" && test "$sv_cv_fault_posix" = yes; then + mips*) + CFG_FAULT=fault-linux-mips.h + ;; ++ nds32*) ++ CFG_FAULT=fault-linux-nds32.h ++ ;; + powerpc* | rs6000) + CFG_FAULT=fault-linux-powerpc.h + ;; +diff --git a/src/Makefile.am b/src/Makefile.am +index 9a9982f..8910be8 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -41,6 +41,7 @@ noinst_HEADERS = \ + fault-linux-ia64.h fault-linux-ia64-old.h \ + fault-linux-m68k.h fault-linux-m68k-old.h fault-linux-m68k-old.c \ + fault-linux-mips.h fault-linux-mips-old.h \ ++ fault-linux-nds32.h \ + fault-linux-powerpc.h fault-linux-powerpc-old.h \ + fault-linux-riscv64.h \ + fault-linux-s390.h fault-linux-s390-old.h \ +diff --git a/src/fault-linux-nds32.h b/src/fault-linux-nds32.h +new file mode 100644 +index 0000000..3a5a47f +--- /dev/null ++++ b/src/fault-linux-nds32.h +@@ -0,0 +1,28 @@ ++/* Fault handler information. Andse NDS32 32-bit version. ++ Copyright (C) 2018 Nylon Chen ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software Foundation, ++ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ ++ ++#include "fault-posix-ucontext.h" ++ ++/* See glibc/sysdeps/unix/sysv/linux/nds32/sys/ucontext.h ++ and the definition of GET_STACK in ++ glibc/sysdeps/unix/sysv/linux/nds32/sigcontextinfo.h. ++ Note that the 'mcontext_t' defined in ++ glibc/sysdeps/unix/sysv/linux/arm/nds32/ucontext.h ++ and the 'struct sigcontext' defined in ++*/ ++ ++#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.nds32_sp +-- +2.18.0 + diff --git a/buildroot/package/libsigsegv/0004-m4-stack-direction-NDS32-stack-grows-downward.patch b/buildroot/package/libsigsegv/0004-m4-stack-direction-NDS32-stack-grows-downward.patch new file mode 100644 index 000000000..36a23aa67 --- /dev/null +++ b/buildroot/package/libsigsegv/0004-m4-stack-direction-NDS32-stack-grows-downward.patch @@ -0,0 +1,25 @@ +From 55600de29790051671a411d8f2d99ecc3c65ae13 Mon Sep 17 00:00:00 2001 +From: Nylon Chen +Date: Fri, 26 Apr 2019 15:56:39 +0800 +Subject: [PATCH] m4/stack-direction: NDS32 stack grows downward + +Signed-off-by: Nylon Chen +--- + m4/stack-direction.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 +index ffd4bce..a7df7ea 100644 +--- a/m4/stack-direction.m4 ++++ b/m4/stack-direction.m4 +@@ -39,6 +39,7 @@ AC_DEFUN([SV_STACK_DIRECTION], + mn10200 | \ + mn10300 | \ + nios2 | \ ++ nds32* | \ + ns32k | \ + pdp11 | \ + pj* | \ +-- +2.18.0 + diff --git a/buildroot/package/libsigsegv/libsigsegv.mk b/buildroot/package/libsigsegv/libsigsegv.mk index 7ca39dbe4..28c061dd7 100644 --- a/buildroot/package/libsigsegv/libsigsegv.mk +++ b/buildroot/package/libsigsegv/libsigsegv.mk @@ -12,6 +12,8 @@ LIBSIGSEGV_LICENSE = GPL-2.0+ LIBSIGSEGV_LICENSE_FILES = COPYING # 0001-Improve-support-for-Linux-RISC-V.patch # 0002-m4-stack-direction-RISC-V-stack-grows-downward.patch +# 0003-Improve-support-for-Linux-nds32.patch +# 0004-m4-stack-direction-NDS32-stack-grows-downward.patch LIBSIGSEGV_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/libsilk/libsilk.hash b/buildroot/package/libsilk/libsilk.hash index 2eab1c0db..6042096d8 100644 --- a/buildroot/package/libsilk/libsilk.hash +++ b/buildroot/package/libsilk/libsilk.hash @@ -1,2 +1,3 @@ # Locally computed sha256 01de52aa123f7bd20e500a076046f6b30d55f8e98c4029ab424bc51c46d7083d libsilk-4268a02240c35c6055b0f237c46b09b2dcf79e45.tar.gz +sha256 62a5963f034024665641f4a9888b208f1e39aa7e29e87c9634fdcf07d3073baf COPYING diff --git a/buildroot/package/libsndfile/0004-src-wav.c-Fix-heap-read-overflow.patch b/buildroot/package/libsndfile/0004-src-wav.c-Fix-heap-read-overflow.patch new file mode 100644 index 000000000..2e730ca3f --- /dev/null +++ b/buildroot/package/libsndfile/0004-src-wav.c-Fix-heap-read-overflow.patch @@ -0,0 +1,35 @@ +From 42132c543358cee9f7c3e9e9b15bb6c1063a608e Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo +Date: Tue, 1 Jan 2019 20:11:46 +1100 +Subject: [PATCH] src/wav.c: Fix heap read overflow + +This is CVE-2018-19758. + +Closes: https://github.com/erikd/libsndfile/issues/435 +[Retrieved (and backported) from: +https://github.com/erikd/libsndfile/commit/42132c543358cee9f7c3e9e9b15bb6c1063a608e] +Signed-off-by: Fabrice Fontaine +--- + src/wav.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/wav.c b/src/wav.c +index 9d71aadb..5c825f2a 100644 +--- a/src/wav.c ++++ b/src/wav.c +@@ -1,5 +1,5 @@ + /* +-** Copyright (C) 1999-2016 Erik de Castro Lopo ++** Copyright (C) 1999-2019 Erik de Castro Lopo + ** Copyright (C) 2004-2005 David Viens + ** + ** This program is free software; you can redistribute it and/or modify +@@ -1146,6 +1146,8 @@ wav_write_header (SF_PRIVATE *psf, int calc_length) + psf_binheader_writef (psf, "44", BHW4 (0), BHW4 (0)) ; /* SMTPE format */ + psf_binheader_writef (psf, "44", BHW4 (psf->instrument->loop_count), BHW4 (0)) ; + ++ /* Loop count is signed 16 bit number so we limit it range to something sensible. */ ++ psf->instrument->loop_count &= 0x7fff ; + for (tmp = 0 ; tmp < psf->instrument->loop_count ; tmp++) + { int type ; + diff --git a/buildroot/package/libsndfile/0005-wav_write_header-don-t-read-past-the-array-end.patch b/buildroot/package/libsndfile/0005-wav_write_header-don-t-read-past-the-array-end.patch new file mode 100644 index 000000000..e95851780 --- /dev/null +++ b/buildroot/package/libsndfile/0005-wav_write_header-don-t-read-past-the-array-end.patch @@ -0,0 +1,33 @@ +From 6d7ce94c020cc720a6b28719d1a7879181790008 Mon Sep 17 00:00:00 2001 +From: Emilio Pozuelo Monfort +Date: Tue, 5 Mar 2019 11:27:17 +0100 +Subject: [PATCH] wav_write_header: don't read past the array end + +If loop_count is bigger than the array, truncate it to the array +length (and not to 32k). + +CVE-2019-3832 +[Retrieved from: +https://github.com/erikd/libsndfile/commit/6d7ce94c020cc720a6b28719d1a7879181790008] +Signed-off-by: Fabrice Fontaine +--- + src/wav.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/wav.c b/src/wav.c +index 5c825f2a..104bd0a7 100644 +--- a/src/wav.c ++++ b/src/wav.c +@@ -1146,8 +1146,10 @@ wav_write_header (SF_PRIVATE *psf, int calc_length) + psf_binheader_writef (psf, "44", BHW4 (0), BHW4 (0)) ; /* SMTPE format */ + psf_binheader_writef (psf, "44", BHW4 (psf->instrument->loop_count), BHW4 (0)) ; + +- /* Loop count is signed 16 bit number so we limit it range to something sensible. */ +- psf->instrument->loop_count &= 0x7fff ; ++ /* Make sure we don't read past the loops array end. */ ++ if (psf->instrument->loop_count > ARRAY_LEN (psf->instrument->loops)) ++ psf->instrument->loop_count = ARRAY_LEN (psf->instrument->loops) ; ++ + for (tmp = 0 ; tmp < psf->instrument->loop_count ; tmp++) + { int type ; + diff --git a/buildroot/package/libsndfile/0006-src-aiff.c-Fix-a-buffer-read-overflow.patch b/buildroot/package/libsndfile/0006-src-aiff.c-Fix-a-buffer-read-overflow.patch new file mode 100644 index 000000000..68b9e8ed6 --- /dev/null +++ b/buildroot/package/libsndfile/0006-src-aiff.c-Fix-a-buffer-read-overflow.patch @@ -0,0 +1,29 @@ +From f833c53cb596e9e1792949f762e0b33661822748 Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo +Date: Tue, 23 May 2017 20:15:24 +1000 +Subject: [PATCH] src/aiff.c: Fix a buffer read overflow + +Secunia Advisory SA76717. + +Found by: Laurent Delosieres, Secunia Research at Flexera Software + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/erikd/libsndfile/commit/f833c53cb596e9e1792949f762e0b33661822748] +--- + src/aiff.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/aiff.c b/src/aiff.c +index 5b5f9f53..45864b76 100644 +--- a/src/aiff.c ++++ b/src/aiff.c +@@ -1759,7 +1759,7 @@ aiff_read_chanmap (SF_PRIVATE * psf, unsigned dword) + psf_binheader_readf (psf, "j", dword - bytesread) ; + + if (map_info->channel_map != NULL) +- { size_t chanmap_size = psf->sf.channels * sizeof (psf->channel_map [0]) ; ++ { size_t chanmap_size = SF_MIN (psf->sf.channels, layout_tag & 0xffff) * sizeof (psf->channel_map [0]) ; + + free (psf->channel_map) ; + diff --git a/buildroot/package/libsndfile/0007-FLAC-Fix-a-buffer-read-overrun.patch b/buildroot/package/libsndfile/0007-FLAC-Fix-a-buffer-read-overrun.patch new file mode 100644 index 000000000..b000143b7 --- /dev/null +++ b/buildroot/package/libsndfile/0007-FLAC-Fix-a-buffer-read-overrun.patch @@ -0,0 +1,68 @@ +From fd0484aba8e51d16af1e3a880f9b8b857b385eb3 Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo +Date: Wed, 12 Apr 2017 19:45:30 +1000 +Subject: [PATCH] FLAC: Fix a buffer read overrun + +Buffer read overrun occurs when reading a FLAC file that switches +from 2 channels to one channel mid-stream. Only option is to +abort the read. + +Closes: https://github.com/erikd/libsndfile/issues/230 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3] +--- + src/common.h | 1 + + src/flac.c | 13 +++++++++++++ + src/sndfile.c | 1 + + 3 files changed, 15 insertions(+) + +diff --git a/src/common.h b/src/common.h +index 0bd810c3..e2669b6a 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -725,6 +725,7 @@ enum + SFE_FLAC_INIT_DECODER, + SFE_FLAC_LOST_SYNC, + SFE_FLAC_BAD_SAMPLE_RATE, ++ SFE_FLAC_CHANNEL_COUNT_CHANGED, + SFE_FLAC_UNKOWN_ERROR, + + SFE_WVE_NOT_WVE, +diff --git a/src/flac.c b/src/flac.c +index 84de0e26..986a7b8f 100644 +--- a/src/flac.c ++++ b/src/flac.c +@@ -434,6 +434,19 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_ + + switch (metadata->type) + { case FLAC__METADATA_TYPE_STREAMINFO : ++ if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels) ++ { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n" ++ "Nothing to be but to error out.\n" , ++ psf->sf.channels, metadata->data.stream_info.channels) ; ++ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; ++ return ; ++ } ; ++ ++ if (psf->sf.channels > 0 && psf->sf.samplerate != (int) metadata->data.stream_info.sample_rate) ++ { psf_log_printf (psf, "Warning: FLAC stream changed sample rates from %d to %d.\n" ++ "Carrying on as if nothing happened.", ++ psf->sf.samplerate, metadata->data.stream_info.sample_rate) ; ++ } ; + psf->sf.channels = metadata->data.stream_info.channels ; + psf->sf.samplerate = metadata->data.stream_info.sample_rate ; + psf->sf.frames = metadata->data.stream_info.total_samples ; +diff --git a/src/sndfile.c b/src/sndfile.c +index 41875610..e2a87be8 100644 +--- a/src/sndfile.c ++++ b/src/sndfile.c +@@ -245,6 +245,7 @@ ErrorStruct SndfileErrors [] = + { SFE_FLAC_INIT_DECODER , "Error : problem with initialization of the flac decoder." }, + { SFE_FLAC_LOST_SYNC , "Error : flac decoder lost sync." }, + { SFE_FLAC_BAD_SAMPLE_RATE, "Error : flac does not support this sample rate." }, ++ { SFE_FLAC_CHANNEL_COUNT_CHANGED, "Error : flac channel changed mid stream." }, + { SFE_FLAC_UNKOWN_ERROR , "Error : unknown error in flac decoder." }, + + { SFE_WVE_NOT_WVE , "Error : not a WVE file." }, diff --git a/buildroot/package/libsndfile/0008-src-flac.c-Fix-a-buffer-read-overflow.patch b/buildroot/package/libsndfile/0008-src-flac.c-Fix-a-buffer-read-overflow.patch new file mode 100644 index 000000000..f716e2686 --- /dev/null +++ b/buildroot/package/libsndfile/0008-src-flac.c-Fix-a-buffer-read-overflow.patch @@ -0,0 +1,54 @@ +From ef1dbb2df1c0e741486646de40bd638a9c4cd808 Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo +Date: Fri, 14 Apr 2017 15:19:16 +1000 +Subject: [PATCH] src/flac.c: Fix a buffer read overflow + +A file (generated by a fuzzer) which increased the number of channels +from one frame to the next could cause a read beyond the end of the +buffer provided by libFLAC. Only option is to abort the read. + +Closes: https://github.com/erikd/libsndfile/issues/231 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808] +--- + src/flac.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/flac.c b/src/flac.c +index 5a4f8c21..e4f9aaa0 100644 +--- a/src/flac.c ++++ b/src/flac.c +@@ -169,6 +169,14 @@ flac_buffer_copy (SF_PRIVATE *psf) + const int32_t* const *buffer = pflac->wbuffer ; + unsigned i = 0, j, offset, channels, len ; + ++ if (psf->sf.channels != (int) frame->header.channels) ++ { psf_log_printf (psf, "Error: FLAC frame changed from %d to %d channels\n" ++ "Nothing to do but to error out.\n" , ++ psf->sf.channels, frame->header.channels) ; ++ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; ++ return 0 ; ++ } ; ++ + /* + ** frame->header.blocksize is variable and we're using a constant blocksize + ** of FLAC__MAX_BLOCK_SIZE. +@@ -202,7 +210,6 @@ flac_buffer_copy (SF_PRIVATE *psf) + return 0 ; + } ; + +- + len = SF_MIN (pflac->len, frame->header.blocksize) ; + + if (pflac->remain % channels != 0) +@@ -436,7 +443,7 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_ + { case FLAC__METADATA_TYPE_STREAMINFO : + if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels) + { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n" +- "Nothing to be but to error out.\n" , ++ "Nothing to do but to error out.\n" , + psf->sf.channels, metadata->data.stream_info.channels) ; + psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; + return ; diff --git a/buildroot/package/libsndfile/0009-src-flac-c-Fix-another-memory-leak.patch b/buildroot/package/libsndfile/0009-src-flac-c-Fix-another-memory-leak.patch new file mode 100644 index 000000000..788b9b518 --- /dev/null +++ b/buildroot/package/libsndfile/0009-src-flac-c-Fix-another-memory-leak.patch @@ -0,0 +1,32 @@ +From cd7da8dbf6ee4310d21d9e44b385d6797160d9e8 Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo +Date: Wed, 12 Apr 2017 20:19:34 +1000 +Subject: [PATCH] src/flac.c: Fix another memory leak + +When the FLAC decoder was passed a malformed file, the associated +`FLAC__StreamDecoder` object was not getting released. + +Closes: https://github.com/erikd/libsndfile/issues/233 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/erikd/libsndfile/commit/cd7da8dbf6ee4310d21d9e44b385d6797160d9e8] +--- + src/flac.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/flac.c b/src/flac.c +index 986a7b8f..5a4f8c21 100644 +--- a/src/flac.c ++++ b/src/flac.c +@@ -841,7 +841,9 @@ flac_read_header (SF_PRIVATE *psf) + + psf_log_printf (psf, "End\n") ; + +- if (psf->error == 0) ++ if (psf->error != 0) ++ FLAC__stream_decoder_delete (pflac->fsd) ; ++ else + { FLAC__uint64 position ; + + FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ; diff --git a/buildroot/package/libsndfile/0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch b/buildroot/package/libsndfile/0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch new file mode 100644 index 000000000..91aa36c9d --- /dev/null +++ b/buildroot/package/libsndfile/0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch @@ -0,0 +1,92 @@ +From cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= +Date: Wed, 14 Jun 2017 12:25:40 +0200 +Subject: [PATCH] src/common.c: Fix heap buffer overflows when writing strings + in binheader + +Fixes the following problems: + 1. Case 's' only enlarges the buffer by 16 bytes instead of size bytes. + 2. psf_binheader_writef() enlarges the header buffer (if needed) prior to the + big switch statement by an amount (16 bytes) which is enough for all cases + where only a single value gets added. Cases 's', 'S', 'p' however + additionally write an arbitrary length block of data and again enlarge the + buffer to the required amount. However, the required space calculation does + not take into account the size of the length field which gets output before + the data. + 3. Buffer size requirement calculation in case 'S' does not account for the + padding byte ("size += (size & 1) ;" happens after the calculation which + uses "size"). + 4. Case 'S' can overrun the header buffer by 1 byte when no padding is + involved + ("memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + 1) ;" while + the buffer is only guaranteed to have "size" space available). + 5. "psf->header.ptr [psf->header.indx] = 0 ;" in case 'S' always writes 1 byte + beyond the space which is guaranteed to be allocated in the header buffer. + 6. Case 's' can overrun the provided source string by 1 byte if padding is + involved ("memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ;" + where "size" is "strlen (strptr) + 1" (which includes the 0 terminator, + plus optionally another 1 which is padding and not guaranteed to be + readable via the source string pointer). + +Closes: https://github.com/erikd/libsndfile/issues/292 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/erikd/libsndfile/commit/cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8] +--- + src/common.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/src/common.c b/src/common.c +index 1a6204ca..6b2a2ee9 100644 +--- a/src/common.c ++++ b/src/common.c +@@ -681,16 +681,16 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) + /* Write a C string (guaranteed to have a zero terminator). */ + strptr = va_arg (argptr, char *) ; + size = strlen (strptr) + 1 ; +- size += (size & 1) ; + +- if (psf->header.indx + (sf_count_t) size >= psf->header.len && psf_bump_header_allocation (psf, 16)) ++ if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1))) + return count ; + + if (psf->rwf_endian == SF_ENDIAN_BIG) +- header_put_be_int (psf, size) ; ++ header_put_be_int (psf, size + (size & 1)) ; + else +- header_put_le_int (psf, size) ; ++ header_put_le_int (psf, size + (size & 1)) ; + memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ; ++ size += (size & 1) ; + psf->header.indx += size ; + psf->header.ptr [psf->header.indx - 1] = 0 ; + count += 4 + size ; +@@ -703,16 +703,15 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) + */ + strptr = va_arg (argptr, char *) ; + size = strlen (strptr) ; +- if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size)) ++ if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1))) + return count ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + header_put_be_int (psf, size) ; + else + header_put_le_int (psf, size) ; +- memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + 1) ; ++ memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + (size & 1)) ; + size += (size & 1) ; + psf->header.indx += size ; +- psf->header.ptr [psf->header.indx] = 0 ; + count += 4 + size ; + break ; + +@@ -724,7 +723,7 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...) + size = (size & 1) ? size : size + 1 ; + size = (size > 254) ? 254 : size ; + +- if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size)) ++ if (psf->header.indx + 1 + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, 1 + size)) + return count ; + + header_put_byte (psf, size) ; diff --git a/buildroot/package/libsndfile/libsndfile.hash b/buildroot/package/libsndfile/libsndfile.hash index 31500cd97..c744a7675 100644 --- a/buildroot/package/libsndfile/libsndfile.hash +++ b/buildroot/package/libsndfile/libsndfile.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature sha256 1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9 libsndfile-1.0.28.tar.gz +# Locally calculated +sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING diff --git a/buildroot/package/libsndfile/libsndfile.mk b/buildroot/package/libsndfile/libsndfile.mk index 22909ffb6..7d1dca059 100644 --- a/buildroot/package/libsndfile/libsndfile.mk +++ b/buildroot/package/libsndfile/libsndfile.mk @@ -10,6 +10,31 @@ LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPL-2.1+ LIBSNDFILE_LICENSE_FILES = COPYING +# 0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch +LIBSNDFILE_IGNORE_CVES += CVE-2017-14634 +# 0002-Check-MAX_CHANNELS-in-sndfile-deinterleave.patch +LIBSNDFILE_IGNORE_CVES += CVE-2018-13139 CVE-2018-19432 +# 0003-a-ulaw-fix-multiple-buffer-overflows-432.patch +LIBSNDFILE_IGNORE_CVES += \ + CVE-2017-14245 CVE-2017-14246 CVE-2017-17456 CVE-2017-17457 \ + CVE-2018-19661 CVE-2018-19662 +# disputed, https://github.com/erikd/libsndfile/issues/398 +LIBSNDFILE_IGNORE_CVES += CVE-2018-13419 +# 0004-src-wav.c-Fix-heap-read-overflow.patch +LIBSNDFILE_IGNORE_CVES += CVE-2018-19758 +# 0005-wav_write_header-don-t-read-past-the-array-end.patch +LIBSNDFILE_IGNORE_CVES += CVE-2019-3832 +# 0006-src-aiff.c-Fix-a-buffer-read-overflow.patch +LIBSNDFILE_IGNORE_CVES += CVE-2017-6892 +# 0007-FLAC-Fix-a-buffer-read-overrun.patch +LIBSNDFILE_IGNORE_CVES += CVE-2017-8361 +# 0008-src-flac.c-Fix-a-buffer-read-overflow.patch +LIBSNDFILE_IGNORE_CVES += CVE-2017-8362 CVE-2017-8365 +# 0009-src-flac-c-Fix-another-memory-leak.patch +LIBSNDFILE_IGNORE_CVES += CVE-2017-8363 +# 0010-src-common-c-Fix-heap-buffer-overflows-when-writing-strings-in.patch +LIBSNDFILE_IGNORE_CVES += CVE-2017-12562 + LIBSNDFILE_CONF_OPTS = \ --disable-sqlite \ --disable-alsa \ diff --git a/buildroot/package/libsoc/libsoc.hash b/buildroot/package/libsoc/libsoc.hash index 77f2fad79..2e7c82953 100644 --- a/buildroot/package/libsoc/libsoc.hash +++ b/buildroot/package/libsoc/libsoc.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 8df626bde365b94a805e1c323104c63a7429ec64c9df815cd1d9b9c4b317e066 libsoc-0.8.2.tar.gz +sha256 782dafc98788c358fb20e530c8fde3186cdb60f5e18fe6d348fe84ee9f65ddb0 LICENCE diff --git a/buildroot/package/libsocketcan/libsocketcan.hash b/buildroot/package/libsocketcan/libsocketcan.hash index 2546c66cf..7e40493fb 100644 --- a/buildroot/package/libsocketcan/libsocketcan.hash +++ b/buildroot/package/libsocketcan/libsocketcan.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 3c83e386c3fa7673141658472ae0b0e2a9f5849bf52fd9f7b22b04fd98ec7b6e libsocketcan-0.0.10.tar.bz2 +sha256 28923f47b3f3191ff966866aa45823325b6e3b4fce72f056e5d87d64e4d6699d libsocketcan-0.0.11.tar.bz2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE diff --git a/buildroot/package/libsocketcan/libsocketcan.mk b/buildroot/package/libsocketcan/libsocketcan.mk index 31ed0d39a..dca8ede6e 100644 --- a/buildroot/package/libsocketcan/libsocketcan.mk +++ b/buildroot/package/libsocketcan/libsocketcan.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBSOCKETCAN_VERSION = 0.0.10 +LIBSOCKETCAN_VERSION = 0.0.11 LIBSOCKETCAN_SITE = http://www.pengutronix.de/software/libsocketcan/download LIBSOCKETCAN_SOURCE = libsocketcan-$(LIBSOCKETCAN_VERSION).tar.bz2 LIBSOCKETCAN_INSTALL_STAGING = YES LIBSOCKETCAN_LICENSE = LGPL-2.1+ +LIBSOCKETCAN_LICENSE_FILES = LICENSE $(eval $(autotools-package)) diff --git a/buildroot/package/libsodium/Config.in b/buildroot/package/libsodium/Config.in index 47b9bb350..518b0532e 100644 --- a/buildroot/package/libsodium/Config.in +++ b/buildroot/package/libsodium/Config.in @@ -4,3 +4,15 @@ config BR2_PACKAGE_LIBSODIUM A modern and easy-to-use crypto library. http://libsodium.org/ + +if BR2_PACKAGE_LIBSODIUM + +config BR2_PACKAGE_LIBSODIUM_FULL + bool "all functions" + default y + help + Build all seldom used and obsolete functions. Without + this option, only the minimal set of normally used + functions is built. + +endif diff --git a/buildroot/package/libsodium/libsodium.hash b/buildroot/package/libsodium/libsodium.hash index 5cc076364..bc7b02d64 100644 --- a/buildroot/package/libsodium/libsodium.hash +++ b/buildroot/package/libsodium/libsodium.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature -# https://download.libsodium.org/libsodium/releases/libsodium-1.0.16.tar.gz.sig -sha256 eeadc7e1e1bcef09680fb4837d448fbdf57224978f865ac1c16745868fbd0533 libsodium-1.0.16.tar.gz -sha256 6faf327c97dca6da69acefc6d3969d7bffb70a24f0707874870fdcfd6b0acf58 LICENSE +# Locally calculated after checking Minisign signature +# https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz.minisig +sha256 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 libsodium-1.0.18.tar.gz +sha256 dea1855c9809f3faf22aa4a1fba20ec8af5a5587f23115012e5b98279cedc4af LICENSE diff --git a/buildroot/package/libsodium/libsodium.mk b/buildroot/package/libsodium/libsodium.mk index ffdd1717b..a8e0f7914 100644 --- a/buildroot/package/libsodium/libsodium.mk +++ b/buildroot/package/libsodium/libsodium.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSODIUM_VERSION = 1.0.16 -LIBSODIUM_SITE = https://github.com/jedisct1/libsodium/releases/download/$(LIBSODIUM_VERSION) +LIBSODIUM_VERSION = 1.0.18 +LIBSODIUM_SITE = https://download.libsodium.org/libsodium/releases LIBSODIUM_LICENSE = ISC LIBSODIUM_LICENSE_FILES = LICENSE LIBSODIUM_INSTALL_STAGING = YES @@ -14,5 +14,11 @@ ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) LIBSODIUM_CONF_OPTS += --disable-pie endif +ifeq ($(BR2_PACKAGE_LIBSODIUM_FULL),y) +LIBSODIUM_CONF_OPTS += --disable-minimal +else +LIBSODIUM_CONF_OPTS += --enable-minimal +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/libsoil/libsoil.hash b/buildroot/package/libsoil/libsoil.hash index 175569b9f..2596cd6b4 100644 --- a/buildroot/package/libsoil/libsoil.hash +++ b/buildroot/package/libsoil/libsoil.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 a2305b8d64f6d636e36d669bbdb0ca5445d1345c754b3d61d3f037dad2e5f701 soil.zip +sha256 a2305b8d64f6d636e36d669bbdb0ca5445d1345c754b3d61d3f037dad2e5f701 soil.zip +sha256 a53f0508cafb544aa0b11c241c1000055bd9d827d19712f4de08898e36f29728 src/stb_image_aug.c +sha256 449ba815b6f610660515246d029f5d08b45178fe8f9f9f520939edad85a7935e src/image_helper.c diff --git a/buildroot/package/libsoundtouch/libsoundtouch.hash b/buildroot/package/libsoundtouch/libsoundtouch.hash index af0c36283..a79e62f03 100644 --- a/buildroot/package/libsoundtouch/libsoundtouch.hash +++ b/buildroot/package/libsoundtouch/libsoundtouch.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 c805e7a72b7758a8986b71e73d2f94a8c79c66c1246fa2af1743c4282702e096 libsoundtouch-010a91a59071c7fefd316fca62c0d980ec85b4b1.tar.gz +sha256 c805e7a72b7758a8986b71e73d2f94a8c79c66c1246fa2af1743c4282702e096 libsoundtouch-010a91a59071c7fefd316fca62c0d980ec85b4b1.tar.gz +sha256 9c6a15d7433078e4c0d3cb9820f172bbf0bf829e7648d719dc85c1429815519b COPYING.TXT diff --git a/buildroot/package/libsoundtouch/libsoundtouch.mk b/buildroot/package/libsoundtouch/libsoundtouch.mk index c4ac930be..fcc2332fa 100644 --- a/buildroot/package/libsoundtouch/libsoundtouch.mk +++ b/buildroot/package/libsoundtouch/libsoundtouch.mk @@ -12,9 +12,4 @@ LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT LIBSOUNDTOUCH_AUTORECONF = YES LIBSOUNDTOUCH_INSTALL_STAGING = YES -define LIBSOUNDTOUCH_CREATE_CONFIG_M4 - mkdir -p $(@D)/config/m4 -endef -LIBSOUNDTOUCH_POST_PATCH_HOOKS += LIBSOUNDTOUCH_CREATE_CONFIG_M4 - $(eval $(autotools-package)) diff --git a/buildroot/package/libsoup/Config.in b/buildroot/package/libsoup/Config.in index 599f9594d..f6f8fde96 100644 --- a/buildroot/package/libsoup/Config.in +++ b/buildroot/package/libsoup/Config.in @@ -22,7 +22,7 @@ config BR2_PACKAGE_LIBSOUP_GNOME config BR2_PACKAGE_LIBSOUP_SSL bool "https support" - depends on !BR2_STATIC_LIBS # gnutls + depends on !BR2_STATIC_LIBS # glib-networking, gnutls select BR2_PACKAGE_GLIB_NETWORKING select BR2_PACKAGE_GNUTLS help diff --git a/buildroot/package/libspatialindex/0001-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch b/buildroot/package/libspatialindex/0001-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch new file mode 100644 index 000000000..3316a3825 --- /dev/null +++ b/buildroot/package/libspatialindex/0001-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch @@ -0,0 +1,35 @@ +From 2333cd804e33e67567b656b847094cd9a8c8fbbf Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 22 Sep 2019 20:58:19 +0200 +Subject: [PATCH] CMakeLists.txt: don't force the build of a shared library + +Building a shared library doesn't work on all platforms, so instead, +let CMake rely on the standard BUILD_SHARED_LIBS variable to decide +whether a static or shared library should be built. + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://github.com/libspatialindex/libspatialindex/pull/158] +--- + src/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e6b733b..f8a4980 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -194,9 +194,9 @@ if (NOT WITH_STATIC_LASZIP) + endif() + endif() + +-add_library(${SIDX_LIB_NAME} SHARED ${SIDX_SOURCES}) ++add_library(${SIDX_LIB_NAME} ${SIDX_SOURCES}) + +-add_library(${SIDX_C_LIB_NAME} SHARED ${SIDX_CAPI_CPP}) ++add_library(${SIDX_C_LIB_NAME} ${SIDX_CAPI_CPP}) + + target_link_libraries(${SIDX_C_LIB_NAME} + ${SIDX_LIB_NAME} +-- +2.23.0 + diff --git a/buildroot/package/libspatialindex/0001-configure.ac-do-not-force-O2.patch b/buildroot/package/libspatialindex/0001-configure.ac-do-not-force-O2.patch deleted file mode 100644 index c078e713e..000000000 --- a/buildroot/package/libspatialindex/0001-configure.ac-do-not-force-O2.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7472764fe19cb3eea77f21cc2859859b8ac62085 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 14 Aug 2017 23:36:36 +0200 -Subject: [PATCH] configure.ac: do not force -O2 - -The user may want to provide its own set of optimization flags, and -therefore forcing -O2 should not be done. - -Signed-off-by: Thomas Petazzoni -Submitted-upstream: https://github.com/libspatialindex/libspatialindex/pull/101 ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index dc5e49f..2e2aa68 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -53,7 +53,7 @@ if test "x$enable_debug" = "xyes"; then - CXXFLAGS="$CXXFLAGS -g -DDEBUG" - AC_MSG_RESULT(checking wether debug information is enabled... yes) - else -- CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG" -+ CXXFLAGS="$CXXFLAGS -DNDEBUG" - AC_MSG_RESULT(checking wether debug information is enabled... no) - fi - --- -2.9.4 - diff --git a/buildroot/package/libspatialindex/Config.in b/buildroot/package/libspatialindex/Config.in index 0d066f641..e9d925dc0 100644 --- a/buildroot/package/libspatialindex/Config.in +++ b/buildroot/package/libspatialindex/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBSPATIALINDEX bool "libspatialindex" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 help The purpose of libspatialindex is to provide: @@ -26,5 +27,5 @@ config BR2_PACKAGE_LIBSPATIALINDEX https://libspatialindex.github.io -comment "libspatialindex needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "libspatialindex needs a toolchain w/ C++, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/buildroot/package/libspatialindex/libspatialindex.hash b/buildroot/package/libspatialindex/libspatialindex.hash index 3aa636d35..4eda28237 100644 --- a/buildroot/package/libspatialindex/libspatialindex.hash +++ b/buildroot/package/libspatialindex/libspatialindex.hash @@ -1,4 +1,5 @@ -# From http://download.osgeo.org/libspatialindex/spatialindex-src-1.8.5.tar.bz2.md5 -md5 3303c47fd85aa17e64ef52ebec212762 spatialindex-src-1.8.5.tar.bz2 -# Locally computed -sha256 31ec0a9305c3bd6b4ad60a5261cba5402366dd7d1969a8846099717778e9a50a spatialindex-src-1.8.5.tar.bz2 +# From https://github.com/libspatialindex/libspatialindex/releases/download/1.9.0/spatialindex-src-1.9.0.tar.bz2.sha512sum +sha512 dbf9601c878f245899d7336347674e96e8eeb715ec33a36ade44f3cc821c1dca7995cb09197a382bfd97da75c38f37b04f4d8f81ffbf38fef65fff82c5d1d2f3 spatialindex-src-1.9.0.tar.bz2 + +# Hash for license file +sha256 b63ebfaca9d7ce582580f3e11acabc9d2e37c46ce234533f7fa8a6c7278898a0 COPYING diff --git a/buildroot/package/libspatialindex/libspatialindex.mk b/buildroot/package/libspatialindex/libspatialindex.mk index 3a558dfc7..57088a2e1 100644 --- a/buildroot/package/libspatialindex/libspatialindex.mk +++ b/buildroot/package/libspatialindex/libspatialindex.mk @@ -4,23 +4,21 @@ # ################################################################################ -LIBSPATIALINDEX_VERSION = 1.8.5 -LIBSPATIALINDEX_SITE = http://download.osgeo.org/libspatialindex +LIBSPATIALINDEX_VERSION = 1.9.0 +LIBSPATIALINDEX_SITE = \ + https://github.com/libspatialindex/libspatialindex/releases/download/$(LIBSPATIALINDEX_VERSION) LIBSPATIALINDEX_SOURCE = spatialindex-src-$(LIBSPATIALINDEX_VERSION).tar.bz2 LIBSPATIALINDEX_INSTALL_STAGING = YES LIBSPATIALINDEX_LICENSE = MIT LIBSPATIALINDEX_LICENSE_FILES = COPYING -# 0001-configure.ac-do-not-force-O2.patch -LIBSPATIALINDEX_AUTORECONF = YES - LIBSPATIALINDEX_CXXFLAGS = $(TARGET_CXXFLAGS) -LIBSPATIALINDEX_CONF_ENV = CXXFLAGS="$(LIBSPATIALINDEX_CXXFLAGS)" +LIBSPATIALINDEX_CONF_OPTS = \ + -DSIDX_BUILD_TESTS=OFF \ + -DCMAKE_CXX_FLAGS="$(LIBSPATIALINDEX_CXXFLAGS)" -# Workaround gcc ICE -# (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68485) -ifeq ($(BR2_microblaze),y) +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) LIBSPATIALINDEX_CXXFLAGS += -O0 endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/buildroot/package/libsrtp/libsrtp.hash b/buildroot/package/libsrtp/libsrtp.hash index 1a88673c8..d4b7b54d0 100644 --- a/buildroot/package/libsrtp/libsrtp.hash +++ b/buildroot/package/libsrtp/libsrtp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 44fd7497bce78767e96b54a11bca520adb2ad32effd515f04bce602b60a1a50b libsrtp-v2.2.0.tar.gz +sha256 44fd7497bce78767e96b54a11bca520adb2ad32effd515f04bce602b60a1a50b libsrtp-2.2.0.tar.gz sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE diff --git a/buildroot/package/libsrtp/libsrtp.mk b/buildroot/package/libsrtp/libsrtp.mk index 8af463928..f816f4c3e 100644 --- a/buildroot/package/libsrtp/libsrtp.mk +++ b/buildroot/package/libsrtp/libsrtp.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSRTP_VERSION = v2.2.0 -LIBSRTP_SITE = $(call github,cisco,libsrtp,$(LIBSRTP_VERSION)) +LIBSRTP_VERSION = 2.2.0 +LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause LIBSRTP_LICENSE_FILES = LICENSE diff --git a/buildroot/package/libssh/Config.in b/buildroot/package/libssh/Config.in index 3dbfa7d56..cde73a0d8 100644 --- a/buildroot/package/libssh/Config.in +++ b/buildroot/package/libssh/Config.in @@ -3,8 +3,7 @@ config BR2_PACKAGE_LIBSSH depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS - # Either OpenSSL or libgcrypt are mandatory - select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_MBEDTLS || BR2_PACKAGE_LIBGCRYPT) help libssh is a multiplatform C library implementing the SSHv2 and SSHv1 protocol on client and server side. With libssh, @@ -13,6 +12,34 @@ config BR2_PACKAGE_LIBSSH http://www.libssh.org/ +if BR2_PACKAGE_LIBSSH + +config BR2_PACKAGE_LIBSSH_SERVER + bool "server" + help + Enable libssh server support + +choice + prompt "Crypto Backend" + help + Select crypto library to be used in libssh. + +config BR2_PACKAGE_LIBSSH_MBEDTLS + bool "mbedtls" + depends on BR2_PACKAGE_MBEDTLS + +config BR2_PACKAGE_LIBSSH_LIBGCRYPT + bool "gcrypt" + depends on BR2_PACKAGE_LIBGCRYPT + +config BR2_PACKAGE_LIBSSH_OPENSSL + bool "openssl" + depends on BR2_PACKAGE_OPENSSL + +endchoice + +endif + comment "libssh needs a toolchain w/ dynamic library, threads" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libssh/libssh.mk b/buildroot/package/libssh/libssh.mk index ce0defa47..52517a5dd 100644 --- a/buildroot/package/libssh/libssh.mk +++ b/buildroot/package/libssh/libssh.mk @@ -14,12 +14,17 @@ LIBSSH_INSTALL_STAGING = YES LIBSSH_SUPPORTS_IN_SOURCE_BUILD = NO LIBSSH_CONF_OPTS = \ -DWITH_STACK_PROTECTOR=OFF \ - -DWITH_SERVER=OFF \ -DWITH_EXAMPLES=OFF # cmake older than 3.10 require this to avoid try_run() in FindThreads LIBSSH_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF +ifeq ($(BR2_PACKAGE_LIBSSH_SERVER),y) +LIBSSH_CONF_OPTS += -DWITH_SERVER=ON +else +LIBSSH_CONF_OPTS += -DWITH_SERVER=OFF +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) LIBSSH_CONF_OPTS += -DWITH_ZLIB=ON LIBSSH_DEPENDENCIES += zlib @@ -27,13 +32,13 @@ else LIBSSH_CONF_OPTS += -DWITH_ZLIB=OFF endif -# Dependency is either on libgcrypt or openssl, guaranteed in Config.in. -# Favour libgcrypt. -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +ifeq ($(BR2_PACKAGE_LIBSSH_MBEDTLS),y) +LIBSSH_CONF_OPTS += -DWITH_MBEDTLS=ON +LIBSSH_DEPENDENCIES += mbedtls +else ifeq ($(BR2_PACKAGE_LIBSSH_LIBGCRYPT),y) LIBSSH_CONF_OPTS += -DWITH_GCRYPT=ON LIBSSH_DEPENDENCIES += libgcrypt -else -LIBSSH_CONF_OPTS += -DWITH_GCRYPT=OFF +else ifeq ($(BR2_PACKAGE_LIBSSH_OPENSSL),y) LIBSSH_DEPENDENCIES += openssl endif diff --git a/buildroot/package/libssh2/0003-packet-c-improve-message-parsing.patch b/buildroot/package/libssh2/0003-packet-c-improve-message-parsing.patch new file mode 100644 index 000000000..2b7352002 --- /dev/null +++ b/buildroot/package/libssh2/0003-packet-c-improve-message-parsing.patch @@ -0,0 +1,127 @@ +From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001 +From: Will Cosgrove +Date: Fri, 30 Aug 2019 09:57:38 -0700 +Subject: [PATCH] packet.c: improve message parsing (#402) + +* packet.c: improve parsing of packets + +file: packet.c + +notes: +Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST. +[Retrieved from: +https://github.com/libssh2/libssh2/commit/dedcbd106f8e52d5586b0205bc7677e4c9868f9c] +Signed-off-by: Fabrice Fontaine +--- + src/packet.c | 68 ++++++++++++++++++++++------------------------------ + 1 file changed, 29 insertions(+), 39 deletions(-) + +diff --git a/src/packet.c b/src/packet.c +index 38ab6294..2e01bfc5 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + size_t datalen, int macstate) + { + int rc = 0; +- char *message = NULL; +- char *language = NULL; ++ unsigned char *message = NULL; ++ unsigned char *language = NULL; + size_t message_len = 0; + size_t language_len = 0; + LIBSSH2_CHANNEL *channelp = NULL; +@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + + case SSH_MSG_DISCONNECT: + if(datalen >= 5) { +- size_t reason = _libssh2_ntohu32(data + 1); ++ uint32_t reason = 0; ++ struct string_buf buf; ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr++; /* advance past type */ + +- if(datalen >= 9) { +- message_len = _libssh2_ntohu32(data + 5); ++ _libssh2_get_u32(&buf, &reason); ++ _libssh2_get_string(&buf, &message, &message_len); ++ _libssh2_get_string(&buf, &language, &language_len); + +- if(message_len < datalen-13) { +- /* 9 = packet_type(1) + reason(4) + message_len(4) */ +- message = (char *) data + 9; +- +- language_len = +- _libssh2_ntohu32(data + 9 + message_len); +- language = (char *) data + 9 + message_len + 4; +- +- if(language_len > (datalen-13-message_len)) { +- /* bad input, clear info */ +- language = message = NULL; +- language_len = message_len = 0; +- } +- } +- else +- /* bad size, clear it */ +- message_len = 0; +- } + if(session->ssh_msg_disconnect) { +- LIBSSH2_DISCONNECT(session, reason, message, +- message_len, language, language_len); ++ LIBSSH2_DISCONNECT(session, reason, (const char *)message, ++ message_len, (const char *)language, ++ language_len); + } ++ + _libssh2_debug(session, LIBSSH2_TRACE_TRANS, + "Disconnect(%d): %s(%s)", reason, + message, language); +@@ -539,24 +529,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + int always_display = data[1]; + + if(datalen >= 6) { +- message_len = _libssh2_ntohu32(data + 2); +- +- if(message_len <= (datalen - 10)) { +- /* 6 = packet_type(1) + display(1) + message_len(4) */ +- message = (char *) data + 6; +- language_len = _libssh2_ntohu32(data + 6 + +- message_len); +- +- if(language_len <= (datalen - 10 - message_len)) +- language = (char *) data + 10 + message_len; +- } ++ struct string_buf buf; ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr += 2; /* advance past type & always display */ ++ ++ _libssh2_get_string(&buf, &message, &message_len); ++ _libssh2_get_string(&buf, &language, &language_len); + } + + if(session->ssh_msg_debug) { +- LIBSSH2_DEBUG(session, always_display, message, +- message_len, language, language_len); ++ LIBSSH2_DEBUG(session, always_display, ++ (const char *)message, ++ message_len, (const char *)language, ++ language_len); + } + } ++ + /* + * _libssh2_debug will actually truncate this for us so + * that it's not an inordinate about of data +@@ -579,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + uint32_t len = 0; + unsigned char want_reply = 0; + len = _libssh2_ntohu32(data + 1); +- if(datalen >= (6 + len)) { ++ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { + want_reply = data[5 + len]; + _libssh2_debug(session, + LIBSSH2_TRACE_CONN, diff --git a/buildroot/package/libssh2/libssh2.mk b/buildroot/package/libssh2/libssh2.mk index bd8517dac..3819c1aa3 100644 --- a/buildroot/package/libssh2/libssh2.mk +++ b/buildroot/package/libssh2/libssh2.mk @@ -11,6 +11,9 @@ LIBSSH2_LICENSE_FILES = COPYING LIBSSH2_INSTALL_STAGING = YES LIBSSH2_CONF_OPTS = --disable-examples-build +# 0003-packet-c-improve-message-parsing.patch +LIBSSH2_IGNORE_CVES += CVE-2019-17498 + # building from a git clone LIBSSH2_AUTORECONF = YES diff --git a/buildroot/package/libsvg-cairo/libsvg-cairo.hash b/buildroot/package/libsvg-cairo/libsvg-cairo.hash index fba96def7..7240ee57b 100644 --- a/buildroot/package/libsvg-cairo/libsvg-cairo.hash +++ b/buildroot/package/libsvg-cairo/libsvg-cairo.hash @@ -2,4 +2,5 @@ md5 d79da7b3a60ad8c8e4b902c9b3563047 libsvg-cairo-0.1.6.tar.gz # Locally calculated -sha256 a380be6a78ec2938100ce904363815a94068fca372c666b8cc82aa8711a0215c libsvg-cairo-0.1.6.tar.gz +sha256 a380be6a78ec2938100ce904363815a94068fca372c666b8cc82aa8711a0215c libsvg-cairo-0.1.6.tar.gz +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING diff --git a/buildroot/package/libsvg/libsvg.hash b/buildroot/package/libsvg/libsvg.hash index c5008491f..c314c5801 100644 --- a/buildroot/package/libsvg/libsvg.hash +++ b/buildroot/package/libsvg/libsvg.hash @@ -2,4 +2,5 @@ md5 ce0715e3013f78506795fba16e8455d3 libsvg-0.1.4.tar.gz # Locally calculated -sha256 4c3bf9292e676a72b12338691be64d0f38cd7f2ea5e8b67fbbf45f1ed404bc8f libsvg-0.1.4.tar.gz +sha256 4c3bf9292e676a72b12338691be64d0f38cd7f2ea5e8b67fbbf45f1ed404bc8f libsvg-0.1.4.tar.gz +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/libsvgtiny/0003-Remove-Werror.patch b/buildroot/package/libsvgtiny/0002-Remove-Werror.patch similarity index 100% rename from buildroot/package/libsvgtiny/0003-Remove-Werror.patch rename to buildroot/package/libsvgtiny/0002-Remove-Werror.patch diff --git a/buildroot/package/libsvgtiny/0002-create-builddir.patch b/buildroot/package/libsvgtiny/0002-create-builddir.patch deleted file mode 100644 index a404d86bc..000000000 --- a/buildroot/package/libsvgtiny/0002-create-builddir.patch +++ /dev/null @@ -1,15 +0,0 @@ -svgtiny: create BUILDDIR before $(BUILDDIR)/src_colors.c - -Signed-off-by: Max Filippov ---- ---- libsvgtiny-12121/src/Makefile.orig 2014-06-17 15:30:21.765311434 +0400 -+++ libsvgtiny-12121/src/Makefile 2014-06-17 15:29:56.569909931 +0400 -@@ -3,7 +3,7 @@ - - SOURCES := $(SOURCES) $(BUILDDIR)/src_colors.c - --$(BUILDDIR)/src_colors.c: src/colors.gperf -+$(BUILDDIR)/src_colors.c: src/colors.gperf $(BUILDDIR)/stamp - $(VQ)$(ECHO) " GPERF: $<" - $(Q)gperf --output-file=$@.tmp $< - # Hack for GCC 4.2 compatibility (gperf 3.0.4 solves this properly) diff --git a/buildroot/package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch b/buildroot/package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch new file mode 100644 index 000000000..9285477d2 --- /dev/null +++ b/buildroot/package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch @@ -0,0 +1,36 @@ +From 21b4836ac9d6c6725590a925daa5d17eda9843e9 Mon Sep 17 00:00:00 2001 +From: Daniel Silverstone +Date: Sat, 26 Apr 2014 16:24:54 +0100 +Subject: Hopefully silence warnings about inlines and non inlines calling one + another. + +[Retrieved from: +https://source.netsurf-browser.org/libsvgtiny.git/commit/src?id=21b4836ac9d6c6725590a925daa5d17eda9843e9] +Signed-off-by: Fabrice Fontaine +--- + src/colors.gperf | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/colors.gperf b/src/colors.gperf +index 89152d2..96d5b9e 100644 +--- a/src/colors.gperf ++++ b/src/colors.gperf +@@ -16,6 +16,15 @@ + #include + #include "svgtiny.h" + #include "svgtiny_internal.h" ++ ++/* This unusual define shennanigan is to try and prevent the gperf ++ * generated function from being inlined. This is pointless given ++ * it (a) is in a separate .c file and (b) has external linkage. ++ */ ++#ifdef __inline ++#undef __inline ++#define __inline ++#endif + %} + + struct svgtiny_named_color; +-- +cgit v1.2.1 + diff --git a/buildroot/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch b/buildroot/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch new file mode 100644 index 000000000..c17426ff0 --- /dev/null +++ b/buildroot/package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch @@ -0,0 +1,97 @@ +From 4390f1c84e8fee51fc22468821e6fc158e783053 Mon Sep 17 00:00:00 2001 +From: Michael Drake +Date: Thu, 20 Apr 2017 10:51:07 +0100 +Subject: Build: Include gperf-generated code directly. + +Previously we built the generated code separatly and then linked to +it. However, this caused problems with certain compilers and gperf +versions. This change includes the generated code directly in +svgtiny.c instead, which is the only place its used. + +[Retrieved from: +https://source.netsurf-browser.org/libsvgtiny.git/commit/src?id=4390f1c84e8fee51fc22468821e6fc158e783053] +Signed-off-by: Fabrice Fontaine +--- + src/Makefile | 13 +++++++------ + src/colors.gperf | 8 -------- + src/svgtiny.c | 3 +++ + src/svgtiny_internal.h | 5 ----- + 4 files changed, 10 insertions(+), 19 deletions(-) + +(limited to 'src') + +diff --git a/src/Makefile b/src/Makefile +index a979720..fb8a72f 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,13 +1,14 @@ + # Sources + DIR_SOURCES := svgtiny.c svgtiny_gradient.c svgtiny_list.c + +-SOURCES := $(SOURCES) $(BUILDDIR)/src_colors.c ++SOURCES := $(SOURCES) + +-$(BUILDDIR)/src_colors.c: src/colors.gperf ++$(DIR)autogenerated_colors.c: src/colors.gperf + $(VQ)$(ECHO) " GPERF: $<" +- $(Q)gperf --output-file=$@.tmp $< +-# Hack for GCC 4.2 compatibility (gperf 3.0.4 solves this properly) +- $(Q)$(SED) -e 's/#ifdef __GNUC_STDC_INLINE__/#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__/' $@.tmp >$@ +- $(Q)$(RM) $@.tmp ++ $(Q)gperf --output-file=$@ $< ++ ++PRE_TARGETS := $(DIR)autogenerated_colors.c ++ ++CLEAN_ITEMS := $(DIR)autogenerated_colors.c + + include $(NSBUILD)/Makefile.subdir +diff --git a/src/colors.gperf b/src/colors.gperf +index 96d5b9e..a836787 100644 +--- a/src/colors.gperf ++++ b/src/colors.gperf +@@ -17,14 +17,6 @@ + #include "svgtiny.h" + #include "svgtiny_internal.h" + +-/* This unusual define shennanigan is to try and prevent the gperf +- * generated function from being inlined. This is pointless given +- * it (a) is in a separate .c file and (b) has external linkage. +- */ +-#ifdef __inline +-#undef __inline +-#define __inline +-#endif + %} + + struct svgtiny_named_color; +diff --git a/src/svgtiny.c b/src/svgtiny.c +index 4661a58..bbefb88 100644 +--- a/src/svgtiny.c ++++ b/src/svgtiny.c +@@ -20,6 +20,9 @@ + #include "svgtiny.h" + #include "svgtiny_internal.h" + ++/* Source file generated by `gperf`. */ ++#include "autogenerated_colors.c" ++ + #ifndef M_PI + #define M_PI 3.14159265358979323846 + #endif +diff --git a/src/svgtiny_internal.h b/src/svgtiny_internal.h +index 158d230..6bf5d64 100644 +--- a/src/svgtiny_internal.h ++++ b/src/svgtiny_internal.h +@@ -102,9 +102,4 @@ void *svgtiny_list_get(struct svgtiny_list *list, + void *svgtiny_list_push(struct svgtiny_list *list); + void svgtiny_list_free(struct svgtiny_list *list); + +-/* colors.gperf */ +-const struct svgtiny_named_color * +- svgtiny_color_lookup(register const char *str, +- register unsigned int len); +- + #endif +-- +cgit v1.2.1 + diff --git a/buildroot/package/libsvgtiny/libsvgtiny.mk b/buildroot/package/libsvgtiny/libsvgtiny.mk index fe7dc0a6d..55ce4327f 100644 --- a/buildroot/package/libsvgtiny/libsvgtiny.mk +++ b/buildroot/package/libsvgtiny/libsvgtiny.mk @@ -12,8 +12,6 @@ LIBSVGTINY_DEPENDENCIES = \ libxml2 host-gperf host-pkgconf host-netsurf-buildsystem LIBSVGTINY_LICENSE = MIT LIBSVGTINY_LICENSE_FILES = README -# Package does not build in parallel due to improper make rules -LIBSVGTINY_MAKE = $(MAKE1) # The libsvgtiny build system cannot build both the shared and static # libraries. So when the Buildroot configuration requests to build @@ -28,20 +26,21 @@ define LIBSVGTINY_CONFIGURE_CMDS ln -sf $(HOST_DIR)/share/netsurf-buildsystem $(@D)/build endef +# Use $(MAKE1) since parallel build fails define LIBSVGTINY_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=/usr \ + $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) PREFIX=/usr \ COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) endef define LIBSVGTINY_INSTALL_STAGING_CMDS $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) \ + $(MAKE1) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) \ COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) install endef define LIBSVGTINY_INSTALL_TARGET_CMDS $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) \ + $(MAKE1) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) \ COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) install endef diff --git a/buildroot/package/libsysfs/libsysfs.hash b/buildroot/package/libsysfs/libsysfs.hash index c419ed95d..5d32300ad 100644 --- a/buildroot/package/libsysfs/libsysfs.hash +++ b/buildroot/package/libsysfs/libsysfs.hash @@ -1,2 +1,4 @@ # Locally computed: sha256 e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a sysfsutils-2.1.0.tar.gz +sha256 88ced477f0659c5a4df22df3b65de2f12ea3a9c7b5e4750fdc757bc11e97aa79 cmd/GPL +sha256 4eb1c0ea980e7e4c7fac34e025be0423f5e7ca7df501e1da7ef31f32f14d6cf9 lib/LGPL diff --git a/buildroot/package/libtasn1/libtasn1.hash b/buildroot/package/libtasn1/libtasn1.hash index 9ed7a7a42..e25e18abf 100644 --- a/buildroot/package/libtasn1/libtasn1.hash +++ b/buildroot/package/libtasn1/libtasn1.hash @@ -1,6 +1,7 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.13.tar.gz.sig -sha256 7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca libtasn1-4.13.tar.gz +# https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.14.tar.gz.sig +sha256 9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08 libtasn1-4.14.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 7446831f659f7ebfd8d497acc7f05dfa8e31c6cb6ba1b45df33d4895ab80f5a6 LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 doc/COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/buildroot/package/libtasn1/libtasn1.mk b/buildroot/package/libtasn1/libtasn1.mk index f14d57abd..50afc4cdf 100644 --- a/buildroot/package/libtasn1/libtasn1.mk +++ b/buildroot/package/libtasn1/libtasn1.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBTASN1_VERSION = 4.13 +LIBTASN1_VERSION = 4.14 LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1 LIBTASN1_DEPENDENCIES = host-bison LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPL-2.1+ (library) -LIBTASN1_LICENSE_FILES = COPYING COPYING.LIB +LIBTASN1_LICENSE_FILES = LICENSE doc/COPYING doc/COPYING.LESSER LIBTASN1_INSTALL_STAGING = YES # 'missing' fallback logic botched so disable it completely LIBTASN1_CONF_ENV = MAKEINFO="true" diff --git a/buildroot/package/libtelnet/0001-fix-compilation-without-zlib.patch b/buildroot/package/libtelnet/0001-fix-compilation-without-zlib.patch new file mode 100644 index 000000000..6b793e8f1 --- /dev/null +++ b/buildroot/package/libtelnet/0001-fix-compilation-without-zlib.patch @@ -0,0 +1,42 @@ +From 1670ca128118be1d914fc89223e94c4cff1bbf03 Mon Sep 17 00:00:00 2001 +From: Jan Heylen +Date: Wed, 25 Oct 2017 06:45:49 +0200 +Subject: [PATCH] Fix compilation without zlib + +libtelnet source code uses '#if defived(HAVE_ZLIB)' as conditional flag for +optional compression support. But the configure(.ac) script does not play well +with this: it will define 'HAVE_ZLIB' to either 1 (zlib present) or 0 +(zlib not present). For the C preprocessor, both cases mean 'defined'. + +As a result, compilation will fail when trying to include zlib.h, which is +missing. + +Signed-off-by: Jan Heylen +Signed-off-by: Thomas De Schampheleire +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Upstream-status: upstream has changed to cmake iso autotools (but not yet +released) [1] and a pull request exists to fix several issues with that, +including correct handling of zlib detection [2]. + +[1] https://github.com/seanmiddleditch/libtelnet/commit/4860d10da44929554895c0ef83274f38de68e958 +[2] https://github.com/seanmiddleditch/libtelnet/pull/54 + +diff --git a/configure.ac b/configure.ac +index 021b48f..c4dac8b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -33,7 +33,7 @@ AC_HEADER_STDC + PKG_CHECK_MODULES([zlib], + [zlib], + [AC_DEFINE([HAVE_ZLIB], [1], [Define to 1 if you have zlib.])], +- [AC_DEFINE([HAVE_ZLIB], [0], [Define to 1 if you have zlib.])]) ++ [AC_MSG_NOTICE([not enabling zlib support])]) + + # Checks for header files. + +-- +2.7.4 + diff --git a/buildroot/package/libtelnet/Config.in b/buildroot/package/libtelnet/Config.in new file mode 100644 index 000000000..59456a328 --- /dev/null +++ b/buildroot/package/libtelnet/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBTELNET + bool "libtelnet" + help + libtelnet provides safe and correct handling of the core + TELNET protocol. In addition to the base TELNET protocol, + libtelnet also implements the Q method of TELNET option + negotiation. libtelnet can be used for writing servers, + clients, or proxies. + + https://github.com/seanmiddleditch/libtelnet diff --git a/buildroot/package/libtelnet/libtelnet.hash b/buildroot/package/libtelnet/libtelnet.hash new file mode 100644 index 000000000..afbb29e4f --- /dev/null +++ b/buildroot/package/libtelnet/libtelnet.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 d2f01a9dc0cc01777844b6d27f0f836dad9a4b9a32a31c7bbde0762480262f25 libtelnet-0.23.tar.gz +sha256 b1faf309467bc1d0aab9b42d6e86a614e78f8fe3580e289966b5b9f9a8f94d99 COPYING diff --git a/buildroot/package/libtelnet/libtelnet.mk b/buildroot/package/libtelnet/libtelnet.mk new file mode 100644 index 000000000..863d7a616 --- /dev/null +++ b/buildroot/package/libtelnet/libtelnet.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# libtelnet +# +################################################################################ + +LIBTELNET_VERSION = 0.23 +LIBTELNET_SITE = https://github.com/seanmiddleditch/libtelnet/releases/download/$(LIBTELNET_VERSION) +LIBTELNET_INSTALL_STAGING = YES +LIBTELNET_CONF_OPTS = --disable-util +LIBTELNET_DEPENDENCIES = host-pkgconf +LIBTELNET_LICENSE = Public domain +LIBTELNET_LICENSE_FILES = COPYING + +# for 0001-fix-compilation-without-zlib.patch +LIBTELNET_AUTORECONF = YES + +$(eval $(autotools-package)) diff --git a/buildroot/package/libtheora/libtheora.hash b/buildroot/package/libtheora/libtheora.hash index daf245570..45376ddaa 100644 --- a/buildroot/package/libtheora/libtheora.hash +++ b/buildroot/package/libtheora/libtheora.hash @@ -1,2 +1,6 @@ # From http://downloads.xiph.org/releases/theora/SHA256SUMS sha256 f36da409947aa2b3dcc6af0a8c2e3144bc19db2ed547d64e9171c59c66561c61 libtheora-1.1.1.tar.xz + +# Locally calculated +sha256 8417fad7da775735564e209484a2e011e0fa201e94f01fdbee6e4977e478e6fc COPYING +sha256 654a0238f789f4435c4818f50005b141d013c5a09a31d861efc1d0d67ba975a4 LICENSE diff --git a/buildroot/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch b/buildroot/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch index eb1bef3dc..101a779ad 100644 --- a/buildroot/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch +++ b/buildroot/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch @@ -1,7 +1,7 @@ -From 15adb318818f5d0ac609ef2b87643dd760487cb6 Mon Sep 17 00:00:00 2001 +From cb30579c9195ae29c82545c934e0bd9677262bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 20 Jul 2015 20:30:11 +0200 -Subject: [PATCH 1/1] Disable parts of TIRPC requiring NIS support +Date: Fri, 20 Dec 2019 17:58:17 +0100 +Subject: [PATCH] Disable parts of TIRPC requiring NIS support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,24 +15,26 @@ Signed-off-by: Jörg Krause Signed-off-by: Peter Rosin [bernd.kuhls@t-online.de: update for 1.0.2] Signed-off-by: Bernd Kuhls +[pvorel: update for 1.2.5] +Signed-off-by: Petr Vorel --- src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 6cc567a..9834f9a 100644 +index b2d5436..864f984 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -24,7 +24,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln +@@ -24,7 +24,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \ + rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ - svc_auth_des.c \ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c -+ auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c +- auth_time.c debug.c ++ debug.c - ## XDR - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c -@@ -41,8 +41,8 @@ if GSS + if AUTHDES + libtirpc_la_SOURCES += auth_des.c authdes_prot.c des_crypt.c des_impl.c des_soft.c svc_auth_des.c +@@ -45,8 +45,8 @@ if GSS libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) endif @@ -44,5 +46,5 @@ index 6cc567a..9834f9a 100644 CLEANFILES = cscope.* *~ DISTCLEANFILES = Makefile.in -- -2.4.6 +2.24.0 diff --git a/buildroot/package/libtirpc/0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch b/buildroot/package/libtirpc/0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch deleted file mode 100644 index 51229a024..000000000 --- a/buildroot/package/libtirpc/0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7aa1fe6a0f9280571117c30c03c2cc521cd86ec3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 23 Jun 2012 21:58:07 +0200 -Subject: [PATCH] uClibc without RPC support and musl does not install rpcent.h - -Signed-off-by: Thomas Petazzoni -[yann.morin.1998@free.fr: update for 0.3.1] -Signed-off-by: "Yann E. MORIN" -[joerg.krause@embedded.rocks: musl fix] -Signed-off-by: Jörg Krause -[bernd.kuhls@t-online.de: update for 1.0.2] -Signed-off-by: Bernd Kuhls ---- - tirpc/rpc/rpcent.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h -index 147f909..4a58180 100644 ---- a/tirpc/rpc/rpcent.h -+++ b/tirpc/rpc/rpcent.h -@@ -48,8 +48,9 @@ - extern "C" { - #endif - --/* These are defined in /usr/include/rpc/netdb.h */ --#if !defined(__GLIBC__) || defined(__UCLIBC__) -+/* These are defined in /usr/include/rpc/netdb.h, unless we are using -+ the C library without RPC support. */ -+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__) - struct rpcent { - char *r_name; /* name of server for this rpc program */ - char **r_aliases; /* alias list */ --- -1.9.1 - diff --git a/buildroot/package/libtirpc/0005-Disable-DES-authentification-support.patch b/buildroot/package/libtirpc/0005-Disable-DES-authentification-support.patch deleted file mode 100644 index 0c6547240..000000000 --- a/buildroot/package/libtirpc/0005-Disable-DES-authentification-support.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 79975eb4104667be85abd06874c258438826b674 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Fri, 24 Jul 2015 14:45:52 +0200 -Subject: [PATCH] Disable DES authentification support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -uClibc and musl does not provide DES authentication. - -Signed-off-by: Jörg Krause -[peda@axentia.se: update for 1.0.1] -Signed-off-by: Peter Rosin -[bernd.kuhls@t-online.de: update for 1.0.2] -Signed-off-by: Bernd Kuhls ---- - src/Makefile.am | 2 +- - src/rpc_soc.c | 32 -------------------------------- - 2 files changed, 1 insertion(+), 33 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 960a522..3a88e31 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -22,9 +22,8 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln - pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \ - rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ - rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ -- svc_auth_des.c \ - svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c -+ debug.c - - ## XDR - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c -diff --git a/src/svc_auth.c b/src/svc_auth.c ---- a/src/svc_auth.c -+++ b/src/svc_auth.c -@@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch) - case AUTH_SHORT: - dummy = _svcauth_short(rqst, msg); - return (dummy); -- case AUTH_DES: -- dummy = _svcauth_des(rqst, msg); -- return (dummy); - #ifdef HAVE_RPCSEC_GSS - case RPCSEC_GSS: - dummy = _svcauth_gss(rqst, msg, no_dispatch); -diff --git a/src/rpc_soc.c b/src/rpc_soc.c -index e146ed4..161a1ec 100644 ---- a/src/rpc_soc.c -+++ b/src/rpc_soc.c -@@ -522,86 +521,6 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult) - } - - /* -- * Create the client des authentication object. Obsoleted by -- * authdes_seccreate(). -- */ --AUTH * --authdes_create(servername, window, syncaddr, ckey) -- char *servername; /* network name of server */ -- u_int window; /* time to live */ -- struct sockaddr *syncaddr; /* optional hostaddr to sync with */ -- des_block *ckey; /* optional conversation key to use */ --{ -- AUTH *nauth; -- char hostname[NI_MAXHOST]; -- -- if (syncaddr) { -- /* -- * Change addr to hostname, because that is the way -- * new interface takes it. -- */ -- switch (syncaddr->sa_family) { -- case AF_INET: -- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname, -- sizeof hostname, NULL, 0, 0) != 0) -- goto fallback; -- break; -- case AF_INET6: -- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in6), hostname, -- sizeof hostname, NULL, 0, 0) != 0) -- goto fallback; -- break; -- default: -- goto fallback; -- } -- nauth = authdes_seccreate(servername, window, hostname, ckey); -- return (nauth); -- } --fallback: -- return authdes_seccreate(servername, window, NULL, ckey); --} -- --/* -- * Create the client des authentication object. Obsoleted by -- * authdes_pk_seccreate(). -- */ --extern AUTH *authdes_pk_seccreate(const char *, netobj *, u_int, const char *, -- const des_block *, nis_server *); -- --AUTH * --authdes_pk_create(servername, pkey, window, syncaddr, ckey) -- char *servername; /* network name of server */ -- netobj *pkey; /* public key */ -- u_int window; /* time to live */ -- struct sockaddr *syncaddr; /* optional hostaddr to sync with */ -- des_block *ckey; /* optional conversation key to use */ --{ -- AUTH *nauth; -- char hostname[NI_MAXHOST]; -- -- if (syncaddr) { -- /* -- * Change addr to hostname, because that is the way -- * new interface takes it. -- */ -- switch (syncaddr->sa_family) { -- case AF_INET: -- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname, -- sizeof hostname, NULL, 0, 0) != 0) -- goto fallback; -- break; -- default: -- goto fallback; -- } -- nauth = authdes_pk_seccreate(servername, pkey, window, hostname, ckey, NULL); -- return (nauth); -- } --fallback: -- return authdes_pk_seccreate(servername, pkey, window, NULL, ckey, NULL); --} -- -- --/* - * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() - */ - CLIENT * --- -2.4.6 - diff --git a/buildroot/package/libtirpc/0006-rpc-types.h-fix-musl-build.patch b/buildroot/package/libtirpc/0006-rpc-types.h-fix-musl-build.patch deleted file mode 100644 index d4bcd8099..000000000 --- a/buildroot/package/libtirpc/0006-rpc-types.h-fix-musl-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 238f0a870f577e8fffd92820e1c1a88d4fc6d35f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 10 Jun 2018 19:48:21 +0200 -Subject: [PATCH] rpc/types.h: fix musl build - -Don't redefine existing typedef (u_char, u_long, ...) on musl - -Fixes: - - http://autobuild.buildroot.net/results/dbc07e383605a84eb19a2fd1899668612212518a - -Signed-off-by: Fabrice Fontaine ---- - tirpc/rpc/types.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tirpc/rpc/types.h b/tirpc/rpc/types.h -index f069efa..0153a5c 100644 ---- a/tirpc/rpc/types.h -+++ b/tirpc/rpc/types.h -@@ -66,7 +66,7 @@ typedef int32_t rpc_inline_t; - #define mem_free(ptr, bsize) free(ptr) - - --#if defined __APPLE_CC__ || defined __FreeBSD__ -+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined (__GLIBC__) - # define __u_char_defined - # define __daddr_t_defined - #endif --- -2.14.1 - diff --git a/buildroot/package/libtirpc/libtirpc.hash b/buildroot/package/libtirpc/libtirpc.hash index eacc94d1d..a7907dc7b 100644 --- a/buildroot/package/libtirpc/libtirpc.hash +++ b/buildroot/package/libtirpc/libtirpc.hash @@ -1,5 +1,5 @@ # From sourceforge's info on download page: -sha1 d85717035cb9bd6c45557a1eb1351d3af9a69ff7 libtirpc-1.1.4.tar.bz2 +sha1 ab80619b214d93e5cfbf22a0d01e1ee06d434326 libtirpc-1.2.5.tar.bz2 # Locally computed -sha256 2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d libtirpc-1.1.4.tar.bz2 +sha256 f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca libtirpc-1.2.5.tar.bz2 sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING diff --git a/buildroot/package/libtirpc/libtirpc.mk b/buildroot/package/libtirpc/libtirpc.mk index 1e1905b71..879b21e66 100644 --- a/buildroot/package/libtirpc/libtirpc.mk +++ b/buildroot/package/libtirpc/libtirpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.1.4 +LIBTIRPC_VERSION = 1.2.5 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause diff --git a/buildroot/package/libtomcrypt/libtomcrypt.mk b/buildroot/package/libtomcrypt/libtomcrypt.mk index 583bcb15f..c2f1babb4 100644 --- a/buildroot/package/libtomcrypt/libtomcrypt.mk +++ b/buildroot/package/libtomcrypt/libtomcrypt.mk @@ -13,6 +13,9 @@ LIBTOMCRYPT_INSTALL_STAGING = YES LIBTOMCRYPT_INSTALL_TARGET = NO # only static library LIBTOMCRYPT_DEPENDENCIES = libtommath +# 0001-fix-CVE-2019-17362.patch +LIBTOMCRYPT_IGNORE_CVES += CVE-2019-17362 + LIBTOMCRYPT_CFLAGS = -I./src/headers $(TARGET_CFLAGS) -DLTC_SOURCE -DLTM_DESC define LIBTOMCRYPT_BUILD_CMDS diff --git a/buildroot/package/libtool/libtool.hash b/buildroot/package/libtool/libtool.hash index dd34c0d74..e2adfa189 100644 --- a/buildroot/package/libtool/libtool.hash +++ b/buildroot/package/libtool/libtool.hash @@ -2,3 +2,4 @@ sha256 7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f libtool-2.4.6.tar.xz # License files, locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libltdl/COPYING.LIB diff --git a/buildroot/package/libtorrent-rasterbar/Config.in b/buildroot/package/libtorrent-rasterbar/Config.in index 6c5508594..b2508b8b7 100644 --- a/buildroot/package/libtorrent-rasterbar/Config.in +++ b/buildroot/package/libtorrent-rasterbar/Config.in @@ -1,20 +1,24 @@ -comment "libtorrent-rasterbar needs a toolchain w/ C++, threads, wchar, gcc >= 4.8" +comment "libtorrent-rasterbar needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_HOST_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + +comment "libtorrent-rasterbar needs exception_ptr" + depends on BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 config BR2_PACKAGE_LIBTORRENT_RASTERBAR bool "libtorrent-rasterbar" depends on BR2_INSTALL_LIBSTDCPP # boost - depends on BR2_HOST_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK depends on BR2_USE_WCHAR # boost + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_SYSTEM - select BR2_PACKAGE_BOOST_RANDOM select BR2_PACKAGE_OPENSSL help libtorrent is a feature complete C++ bittorrent implementation diff --git a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash index e38c0f4f1..78dbdf8ae 100644 --- a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash +++ b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7c23deba7fa279825642307587609d51c9935ac7606e0ef2f2d0ba10728b5847 libtorrent-rasterbar-1.1.11.tar.gz -sha256 f3a5dd1558cce616b12edad521427ec8976ce2bb0af33f7f359cfa648bf55ad8 COPYING +sha256 8759bddb589006ee164438588adaf007325b3bcaf6ae4c64d87a2b914409c680 libtorrent-rasterbar-1.2.4.tar.gz +sha256 f3a5dd1558cce616b12edad521427ec8976ce2bb0af33f7f359cfa648bf55ad8 COPYING diff --git a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk index 24bd011ae..5b80e9923 100644 --- a/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk +++ b/buildroot/package/libtorrent-rasterbar/libtorrent-rasterbar.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBTORRENT_RASTERBAR_VERSION = 1.1.11 -LIBTORRENT_RASTERBAR_SITE = https://github.com/arvidn/libtorrent/releases/download/libtorrent_$(subst .,_,$(LIBTORRENT_RASTERBAR_VERSION)) +LIBTORRENT_RASTERBAR_VERSION = 1.2.4 +LIBTORRENT_RASTERBAR_SITE = https://github.com/arvidn/libtorrent/releases/download/libtorrent-$(subst .,_,$(LIBTORRENT_RASTERBAR_VERSION)) LIBTORRENT_RASTERBAR_LICENSE = BSD-3-Clause LIBTORRENT_RASTERBAR_LICENSE_FILES = COPYING LIBTORRENT_RASTERBAR_DEPENDENCIES = host-pkgconf boost openssl @@ -13,7 +13,19 @@ LIBTORRENT_RASTERBAR_INSTALL_STAGING = YES LIBTORRENT_RASTERBAR_CONF_OPTS = \ --with-boost-libdir=$(STAGING_DIR)/usr/lib \ --disable-invariant-checks -LIBTORRENT_RASTERBAR_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +LIBTORRENT_RASTERBAR_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11 + +# Internal error, aborting at dwarf2cfi.c:2802 in connect_traces +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 +ifeq ($(BR2_m68k_cf),y) +LIBTORRENT_RASTERBAR_CXXFLAGS += -fno-defer-pop +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +LIBTORRENT_RASTERBAR_CXXFLAGS += -O0 +endif + +LIBTORRENT_RASTERBAR_CONF_OPTS += CXXFLAGS="$(LIBTORRENT_RASTERBAR_CXXFLAGS)" ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y) LIBTORRENT_RASTERBAR_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) diff --git a/buildroot/package/libtorrent/0001-Fix-cross-compilation-based-on-OpenWRT-patch.patch b/buildroot/package/libtorrent/0001-Fix-cross-compilation-based-on-OpenWRT-patch.patch deleted file mode 100644 index ba0c6127a..000000000 --- a/buildroot/package/libtorrent/0001-Fix-cross-compilation-based-on-OpenWRT-patch.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c99179777d8f4cf69c51378b91ae580c49cb57a2 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Mon, 5 Oct 2015 00:40:25 +0100 -Subject: [PATCH] Fix cross compilation, based on OpenWRT patch. - -[Vincent: tweak the patch for version 0.13.6] -[Bernd: tweak the patch for version 0.13.7] - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Vicente Olivert Riera -Signed-off-by: Bernd Kuhls ---- - scripts/checks.m4 | 2 +- - scripts/common.m4 | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/checks.m4 b/scripts/checks.m4 -index 8d77fc5e..c446995b 100644 ---- a/scripts/checks.m4 -+++ b/scripts/checks.m4 -@@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ - AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ - AC_MSG_CHECKING(whether kqueue supports pipes and ptys) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - #include - #include -diff --git a/scripts/common.m4 b/scripts/common.m4 -index ff023928..932b205c 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses the stuff defined by the system. - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], -@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { - char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; --- -2.14.4 - diff --git a/buildroot/package/libtorrent/0002-Added-support-for-openssl-1.1.patch b/buildroot/package/libtorrent/0002-Added-support-for-openssl-1.1.patch deleted file mode 100644 index 463c8ac9b..000000000 --- a/buildroot/package/libtorrent/0002-Added-support-for-openssl-1.1.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 9af3be81c75b44415a6e7efe19f8f89d55091f84 Mon Sep 17 00:00:00 2001 -From: rakshasa -Date: Tue, 20 Dec 2016 19:51:02 +0900 -Subject: [PATCH] Added support for openssl 1.1. - -Downloaded from upstream commit -https://github.com/rakshasa/libtorrent/commit/7b29b6bd2547e72e22b9b7981df27092842d2a10 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 4 ++++ - src/utils/diffie_hellman.cc | 36 ++++++++++++++++++++++++++++++++++-- - 2 files changed, 38 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5b1ea237..b885714d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,12 +71,15 @@ AC_ARG_ENABLE(openssl, - [ --disable-openssl Don't use OpenSSL's SHA1 implementation.], - [ - if test "$enableval" = "yes"; then -+dnl move to scripts. - PKG_CHECK_MODULES(OPENSSL, libcrypto, - CXXFLAGS="$CXXFLAGS $OPENSSL_CFLAGS"; - LIBS="$LIBS $OPENSSL_LIBS") - - AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.) - AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.) -+ AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)]) -+ - else - AC_DEFINE(USE_NSS_SHA, 1, Using Mozilla's SHA1 implementation.) - fi -@@ -87,6 +90,7 @@ AC_ARG_ENABLE(openssl, - - AC_DEFINE(USE_OPENSSL, 1, Using OpenSSL.) - AC_DEFINE(USE_OPENSSL_SHA, 1, Using OpenSSL's SHA1 implementation.) -+ AC_CHECK_LIB([crypto], [DH_set0_pqg], [AC_DEFINE(USE_OPENSSL_1_1, 1, Using OpenSSL 1.1.)]) - ] - ) - -diff --git a/src/utils/diffie_hellman.cc b/src/utils/diffie_hellman.cc -index aa653d45..7ec13165 100644 ---- a/src/utils/diffie_hellman.cc -+++ b/src/utils/diffie_hellman.cc -@@ -54,11 +54,23 @@ DiffieHellman::DiffieHellman(const unsigned char *prime, int primeLength, - m_secret(NULL), m_size(0) { - - #ifdef USE_OPENSSL -+ - m_dh = DH_new(); -+ -+#ifdef USE_OPENSSL_1_1 -+ BIGNUM * const dh_p = BN_bin2bn(prime, primeLength, NULL); -+ BIGNUM * const dh_g = BN_bin2bn(generator, generatorLength, NULL); -+ -+ if (dh_p == NULL || dh_g == NULL || -+ !DH_set0_pqg(m_dh, dh_p, NULL, dh_g)) -+ throw internal_error("Could not generate Diffie-Hellman parameters"); -+#else - m_dh->p = BN_bin2bn(prime, primeLength, NULL); - m_dh->g = BN_bin2bn(generator, generatorLength, NULL); -+#endif - - DH_generate_key(m_dh); -+ - #else - throw internal_error("Compiled without encryption support."); - #endif -@@ -74,7 +86,19 @@ DiffieHellman::~DiffieHellman() { - bool - DiffieHellman::is_valid() const { - #ifdef USE_OPENSSL -+ if (m_dh == NULL) -+ return false; -+ -+#ifdef USE_OPENSSL_1_1 -+ const BIGNUM *pub_key; -+ -+ DH_get0_key(m_dh, &pub_key, NULL); -+ -+ return pub_key != NULL; -+#else - return m_dh != NULL && m_dh->pub_key != NULL; -+#endif -+ - #else - return false; - #endif -@@ -103,8 +127,16 @@ DiffieHellman::store_pub_key(unsigned char* dest, unsigned int length) { - #ifdef USE_OPENSSL - std::memset(dest, 0, length); - -- if ((int)length >= BN_num_bytes(m_dh->pub_key)) -- BN_bn2bin(m_dh->pub_key, dest + length - BN_num_bytes(m_dh->pub_key)); -+ const BIGNUM *pub_key; -+ -+#ifdef USE_OPENSSL_1_1 -+ DH_get0_key(m_dh, &pub_key, NULL); -+#else -+ pub_key = m_dh->pub_key; -+#endif -+ -+ if ((int)length >= BN_num_bytes(pub_key)) -+ BN_bn2bin(pub_key, dest + length - BN_num_bytes(pub_key)); - #endif - } - --- -2.14.4 - diff --git a/buildroot/package/libtorrent/libtorrent.hash b/buildroot/package/libtorrent/libtorrent.hash index 8e0bc1caa..3a4fe89a4 100644 --- a/buildroot/package/libtorrent/libtorrent.hash +++ b/buildroot/package/libtorrent/libtorrent.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c738f60f4d7b6879cd2745fb4310bf24c9287219c1fd619706a9d5499ca7ecc1 libtorrent-0.13.7.tar.gz +sha256 ed115a28f4ae8cfcd33b94a597c076ca74fd549867a26e4fac9505c27288e983 libtorrent-0.13.8.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/libtorrent/libtorrent.mk b/buildroot/package/libtorrent/libtorrent.mk index de964b45a..c8310cab6 100644 --- a/buildroot/package/libtorrent/libtorrent.mk +++ b/buildroot/package/libtorrent/libtorrent.mk @@ -4,14 +4,13 @@ # ################################################################################ -LIBTORRENT_VERSION = 0.13.7 +LIBTORRENT_VERSION = 0.13.8 LIBTORRENT_SITE = http://rtorrent.net/downloads LIBTORRENT_DEPENDENCIES = host-pkgconf zlib LIBTORRENT_CONF_OPTS = --enable-aligned \ --disable-instrumentation \ --with-zlib=$(STAGING_DIR)/usr LIBTORRENT_INSTALL_STAGING = YES -LIBTORRENT_AUTORECONF = YES LIBTORRENT_LICENSE = GPL-2.0 LIBTORRENT_LICENSE_FILES = COPYING diff --git a/buildroot/package/libtpl/libtpl.hash b/buildroot/package/libtpl/libtpl.hash index 7df62f204..74ca68fb9 100644 --- a/buildroot/package/libtpl/libtpl.hash +++ b/buildroot/package/libtpl/libtpl.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 0b3750bf62f56be4c42f83c89d8449b24f1c5f1605a104801d70f2f3c06fb2ff libtpl-v1.6.1.tar.gz +sha256 0b3750bf62f56be4c42f83c89d8449b24f1c5f1605a104801d70f2f3c06fb2ff libtpl-1.6.1.tar.gz +sha256 8554ddb5779f1ad2f3ea6db1d0df622e63fca11f44bfc3c8b3c207ea0482c746 LICENSE diff --git a/buildroot/package/libtpl/libtpl.mk b/buildroot/package/libtpl/libtpl.mk index ed3bfb57b..ead87a6b6 100644 --- a/buildroot/package/libtpl/libtpl.mk +++ b/buildroot/package/libtpl/libtpl.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBTPL_VERSION = v1.6.1 -LIBTPL_SITE = $(call github,troydhanson,tpl,$(LIBTPL_VERSION)) +LIBTPL_VERSION = 1.6.1 +LIBTPL_SITE = $(call github,troydhanson,tpl,v$(LIBTPL_VERSION)) LIBTPL_INSTALL_STAGING = YES LIBTPL_LICENSE = BSD-like LIBTPL_LICENSE_FILES = LICENSE diff --git a/buildroot/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch b/buildroot/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch new file mode 100644 index 000000000..c1196d615 --- /dev/null +++ b/buildroot/package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch @@ -0,0 +1,46 @@ +From 5448ca9d92f7fa197060323a82a5f060ce7c31e7 Mon Sep 17 00:00:00 2001 +From: Pierre-Jean Texier +Date: Wed, 22 May 2019 10:26:27 +0200 +Subject: [PATCH] src/CMakeLists.txt: do not force the build of a shared + library + +By definition, projects using CMake which can build either static or shared +libraries use a BUILD_SHARED_LIBS flag to allow selecting between both. +So, let CMake rely on the standard BUILD_SHARED_LIBS variable to decide +whether a static or shared library should be built. + +however, we can control the behaviour as follows: + + $. cmake -DBUILD_SHARED_LIBS=OFF ... + + $. cmake -DBUILS_SHARED_LIBS=ON ... + +With Yocto/OE, just add the following option into the libubootenv recipe : + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON" + +Signed-off-by: Pierre-Jean Texier +[Upstream status: http://patchwork.ozlabs.org/patch/1103437/] +--- + src/CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 051732b..c5f6dcb 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -10,10 +10,9 @@ SET(include_HEADERS + libuboot.h + ) + +-add_library(ubootenv SHARED ${libubootenv_SOURCES} ${include_HEADERS}) ++add_library(ubootenv ${libubootenv_SOURCES} ${include_HEADERS}) + SET_TARGET_PROPERTIES(ubootenv PROPERTIES SOVERSION ${SOVERSION}) + +-ADD_LIBRARY(ubootenv_static STATIC ${libubootenv_SOURCES} ${include_HEADERS}) + add_executable(fw_printenv fw_printenv.c) + add_executable(fw_setenv fw_setenv.c) + target_link_libraries(fw_printenv ubootenv z) +-- +2.7.4 + diff --git a/buildroot/package/libubootenv/Config.in b/buildroot/package/libubootenv/Config.in new file mode 100644 index 000000000..9be52c452 --- /dev/null +++ b/buildroot/package/libubootenv/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBUBOOTENV + bool "libubootenv" + select BR2_PACKAGE_ZLIB + help + libubootenv is a library that provides a hardware independent + way to access to U-Boot environment. + + The package provides the fw_printenv / fw_setenv utilities, + new tools build from the library and not from U-Boot. + + https://github.com/sbabic/libubootenv/ diff --git a/buildroot/package/libubootenv/libubootenv.hash b/buildroot/package/libubootenv/libubootenv.hash new file mode 100644 index 000000000..bde2ac30e --- /dev/null +++ b/buildroot/package/libubootenv/libubootenv.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 332c45d46401f1859f0781fd0fd316bb1c251264674677c26a4d9b9e1c592719 libubootenv-879c0731fa0725785b9fa4499bbf6aacd04ee4c2.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt diff --git a/buildroot/package/libubootenv/libubootenv.mk b/buildroot/package/libubootenv/libubootenv.mk new file mode 100644 index 000000000..99cbd0da2 --- /dev/null +++ b/buildroot/package/libubootenv/libubootenv.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# libubootenv +# +################################################################################ + +LIBUBOOTENV_VERSION = 879c0731fa0725785b9fa4499bbf6aacd04ee4c2 +LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,$(LIBUBOOTENV_VERSION)) +LIBUBOOTENV_LICENSE = LGPL-2.1 +LIBUBOOTENV_LICENSE_FILES = Licenses/lgpl-2.1.txt +LIBUBOOTENV_INSTALL_STAGING = YES +LIBUBOOTENV_DEPENDENCIES = zlib + +$(eval $(cmake-package)) diff --git a/buildroot/package/libuci/libuci.mk b/buildroot/package/libuci/libuci.mk index 642238c2e..55afd53c1 100644 --- a/buildroot/package/libuci/libuci.mk +++ b/buildroot/package/libuci/libuci.mk @@ -15,7 +15,7 @@ LIBUCI_DEPENDENCIES += lua LIBUCI_CONF_OPTS += -DBUILD_LUA=ON \ -DLUAPATH=/usr/lib/lua/5.1 \ -DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include -LIBUCI_LICENSE := $(LIBUCI_LICENSE), GPL-2.0 (lua bindings) +LIBUCI_LICENSE += , GPL-2.0 (lua bindings) else LIBUCI_CONF_OPTS += -DBUILD_LUA=OFF endif diff --git a/buildroot/package/libuecc/libuecc.hash b/buildroot/package/libuecc/libuecc.hash index 67eb5eb57..bfc9aaf39 100644 --- a/buildroot/package/libuecc/libuecc.hash +++ b/buildroot/package/libuecc/libuecc.hash @@ -2,3 +2,4 @@ md5 5cd543cb8e7bce83a22c07a0579c95a1 libuecc-7.tar.xz # computed locally sha256 b94aef08eab5359d0facaa7ead2ce81b193eef0c61379d9835213ebc0a46257a libuecc-7.tar.xz +sha256 ec4d9fcc3a37a7998a9ea4decf38f4c0c91a44fd05bb17638c52fe16f2b12e23 COPYRIGHT diff --git a/buildroot/package/libuio/libuio.hash b/buildroot/package/libuio/libuio.hash index ce2f86ee1..54fb02b11 100644 --- a/buildroot/package/libuio/libuio.hash +++ b/buildroot/package/libuio/libuio.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1494375bd493ef1a1b868ce2cbc7d29f3f9f692c21f70689eae28566e56f2c15 libuio-ca28ff0f69d89a789a47552c72db5a43d280710b.tar.gz +sha256 1494375bd493ef1a1b868ce2cbc7d29f3f9f692c21f70689eae28566e56f2c15 libuio-ca28ff0f69d89a789a47552c72db5a43d280710b.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libump/Config.in b/buildroot/package/libump/Config.in deleted file mode 100644 index 696ccf3b1..000000000 --- a/buildroot/package/libump/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBUMP - bool "libump" - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_arm - help - The ARMs Universal Memory Provider userspace library. - This library is a requirement for ARMs binary Mali driver. - - http://github.com/linux-sunxi/libump - -comment "libump needs a glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/buildroot/package/libump/libump.hash b/buildroot/package/libump/libump.hash deleted file mode 100644 index 5d2ad2eb3..000000000 --- a/buildroot/package/libump/libump.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 745bbb3e6a6b2b1d8caec75d2f2e884691ceefa5c2be0480baed31dba66cf450 libump-ec0680628744f30b8fac35e41a7bd8e23e59c39f.tar.gz diff --git a/buildroot/package/libump/libump.mk b/buildroot/package/libump/libump.mk deleted file mode 100644 index 65012ffd1..000000000 --- a/buildroot/package/libump/libump.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# libump -# -################################################################################ - -LIBUMP_VERSION = ec0680628744f30b8fac35e41a7bd8e23e59c39f -LIBUMP_SITE = $(call github,linux-sunxi,libump,$(LIBUMP_VERSION)) -LIBUMP_LICENSE = Apache-2.0 -LIBUMP_AUTORECONF = YES -LIBUMP_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/buildroot/package/libunwind/0002-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/buildroot/package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch similarity index 100% rename from buildroot/package/libunwind/0002-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch rename to buildroot/package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch diff --git a/buildroot/package/libunwind/0001-add-disable-tests-option.patch b/buildroot/package/libunwind/0001-add-disable-tests-option.patch deleted file mode 100644 index 72a168615..000000000 --- a/buildroot/package/libunwind/0001-add-disable-tests-option.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 208a430bcbab7d63a4c04242f13c4740e0246a56 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=9A=D0=BE=D1=80=D0=BE=D0=BB=D0=B5=D0=B2=20=D0=A1=D0=B5?= - =?UTF-8?q?=D1=80=D0=B3=D0=B5=D0=B9?= -Date: Wed, 11 May 2016 22:48:55 +0300 -Subject: [PATCH] add --disable-tests option - -Allows to skip tests build. - -Backported from upstream master branch: -https://github.com/libunwind/libunwind/commit/208a430bcbab7d63a4c04242f13c4740e0246a56 - -Signed-off-by: Bernd Kuhls ---- - Makefile.am | 6 +++++- - configure.ac | 13 +++++++++++-- - 2 files changed, 16 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6a3ed9e..0c29b3e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -42,7 +42,11 @@ endif - - nodist_include_HEADERS = include/libunwind-common.h - --SUBDIRS = src tests -+SUBDIRS = src -+ -+if CONFIG_TESTS -+SUBDIRS += tests -+endif - - if CONFIG_DOCS - SUBDIRS += doc -diff --git a/configure.ac b/configure.ac -index 863fb8f..6c46cf3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -129,6 +129,10 @@ AC_ARG_ENABLE(documentation, - AS_HELP_STRING([--disable-documentation],[Disable generating the man pages]),, - [enable_documentation=yes]) - -+AC_ARG_ENABLE(tests, -+ AS_HELP_STRING([--disable-tests],[Disable tests build]),, -+ [enable_tests=yes]) -+ - AC_MSG_CHECKING([if we should build libunwind-setjmp]) - AC_MSG_RESULT([$enable_setjmp]) - -@@ -396,8 +400,13 @@ if test "x$enable_documentation" = "xyes"; then - AC_CONFIG_FILES(doc/Makefile doc/common.tex) - fi - --AC_CONFIG_FILES(Makefile src/Makefile tests/Makefile tests/check-namespace.sh -- include/libunwind-common.h -+AM_CONDITIONAL([CONFIG_TESTS], [test x$enable_tests = xyes]) -+if test "x$enable_tests" = "xyes"; then -+ AC_CONFIG_FILES(tests/Makefile tests/check-namespace.sh) -+fi -+ -+AC_CONFIG_FILES(Makefile src/Makefile -+ include/libunwind-common.h - include/libunwind.h include/tdep/libunwind_i.h) - AC_CONFIG_FILES(src/unwind/libunwind.pc src/coredump/libunwind-coredump.pc - src/ptrace/libunwind-ptrace.pc src/setjmp/libunwind-setjmp.pc --- -2.11.0 - diff --git a/buildroot/package/libunwind/0003-Fix-compilation-of-tests-on-alpine-linux-musl-libc.patch b/buildroot/package/libunwind/0003-Fix-compilation-of-tests-on-alpine-linux-musl-libc.patch deleted file mode 100644 index 411b40d10..000000000 --- a/buildroot/package/libunwind/0003-Fix-compilation-of-tests-on-alpine-linux-musl-libc.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 5dcb7cd3cb63bf8a3a5f7531d10f937053930a25 Mon Sep 17 00:00:00 2001 -From: Tony Kelman -Date: Sun, 31 Jan 2016 08:31:04 +0000 -Subject: [PATCH] Fix compilation of tests on alpine linux (musl libc) - -If we don't link to libexecinfo, as detected by the -AC_SEARCH_LIBS(backtrace, execinfo) configure probe, we get - -``` -test-coredump-unwind.o: In function `handle_sigsegv': -/home/libunwind/tests/test-coredump-unwind.c:246: undefined reference to -`backtrace_symbols_fd' -collect2: error: ld returned 1 exit status -Makefile:1187: recipe for target 'test-coredump-unwind' failed -``` - -and - -``` -Gtest-init.o: In function `do_backtrace()': -Gtest-init.cxx:(.text+0x2f): undefined reference to `_Ux86_64_getcontext' -Gtest-init.cxx:(.text+0x48): undefined reference to `_Ux86_64_init_local' -Gtest-init.cxx:(.text+0x63): undefined reference to `_Ux86_64_get_reg' -Gtest-init.cxx:(.text+0x96): undefined reference to `_Ux86_64_get_proc_name' -Gtest-init.cxx:(.text+0x171): undefined reference to `_Ux86_64_step' -collect2: error: ld returned 1 exit status -Makefile:1063: recipe for target 'Gtest-init' failed -``` - -There are 2 XFAIL and 6 FAIL tests, but it's a start - -Backported from upstream master branch: -https://github.com/libunwind/libunwind/commit/5dcb7cd3cb63bf8a3a5f7531d10f937053930a25 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 5 +++++ - tests/Makefile.am | 4 ++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6c46cf3..21bae90 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -373,6 +373,10 @@ old_LIBS="$LIBS" - LIBS="" - AC_SEARCH_LIBS(backtrace, execinfo) - LIBS="$old_LIBS" -+case "$ac_cv_search_backtrace" in -+ -l*) BACKTRACELIB=$ac_cv_search_backtrace;; -+ *) BACKTRACELIB="";; -+esac - - AC_SUBST(build_arch) - AC_SUBST(target_os) -@@ -388,6 +392,7 @@ AC_SUBST(PKG_MAINTAINER) - AC_SUBST(enable_cxx_exceptions) - AC_SUBST(enable_debug_frame) - AC_SUBST(DLLIB) -+AC_SUBST(BACKTRACELIB) - - AC_PATH_PROG([LATEX2MAN],[latex2man]) - if test "x$LATEX2MAN" = "x"; then -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 0a74881..cd3e589 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -179,7 +179,7 @@ Gtest_bt_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) - Gtest_concurrent_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) -lpthread - Gtest_dyn1_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) - Gtest_exc_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) --Gtest_init_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) -+Gtest_init_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) @BACKTRACELIB@ - Gtest_resume_sig_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) - Gtest_resume_sig_rt_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) - Gperf_simple_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) -@@ -203,7 +203,7 @@ test_setjmp_LDADD = $(LIBUNWIND_setjmp) - ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp) - - if BUILD_COREDUMP --test_coredump_unwind_LDADD = $(LIBUNWIND_coredump) $(LIBUNWIND) -+test_coredump_unwind_LDADD = $(LIBUNWIND_coredump) $(LIBUNWIND) @BACKTRACELIB@ - endif - - Gia64_test_nat_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) --- -2.11.0 - diff --git a/buildroot/package/libunwind/0004-libunwind-arm-fix-build-failure-due-to-asm.patch b/buildroot/package/libunwind/0004-libunwind-arm-fix-build-failure-due-to-asm.patch deleted file mode 100644 index cfd0c5501..000000000 --- a/buildroot/package/libunwind/0004-libunwind-arm-fix-build-failure-due-to-asm.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c7ab998ec52b09d61ec3c0ea62aa07cd26077ea3 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 3 Jul 2017 14:43:02 +0200 -Subject: [PATCH] libunwind-arm: fix build failure due to asm() - -The gcc documentation [1] suggest to use __asm__ instead of asm. - -Fixes: -http://autobuild.buildroot.net/results/3ef/3efe156b6494e4392b6c31de447ee2c72acc1a53 - -[1] https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords - -Signed-off-by: Romain Naour -Cc: Bernd Kuhls ---- - include/libunwind-arm.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/libunwind-arm.h b/include/libunwind-arm.h -index f208487..1c856fa 100644 ---- a/include/libunwind-arm.h -+++ b/include/libunwind-arm.h -@@ -265,7 +265,7 @@ unw_tdep_context_t; - #ifndef __thumb__ - #define unw_tdep_getcontext(uc) (({ \ - unw_tdep_context_t *unw_ctx = (uc); \ -- register unsigned long *unw_base asm ("r0") = unw_ctx->regs; \ -+ register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs; \ - __asm__ __volatile__ ( \ - "stmia %[base], {r0-r15}" \ - : : [base] "r" (unw_base) : "memory"); \ -@@ -273,7 +273,7 @@ unw_tdep_context_t; - #else /* __thumb__ */ - #define unw_tdep_getcontext(uc) (({ \ - unw_tdep_context_t *unw_ctx = (uc); \ -- register unsigned long *unw_base asm ("r0") = unw_ctx->regs; \ -+ register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs; \ - __asm__ __volatile__ ( \ - ".align 2\nbx pc\nnop\n.code 32\n" \ - "stmia %[base], {r0-r15}\n" \ --- -2.9.4 - diff --git a/buildroot/package/libunwind/libunwind.hash b/buildroot/package/libunwind/libunwind.hash index 2f6c8ec79..c8d44b44a 100644 --- a/buildroot/package/libunwind/libunwind.hash +++ b/buildroot/package/libunwind/libunwind.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb libunwind-1.2.1.tar.gz +sha256 43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8 libunwind-1.3.1.tar.gz + +# Hash for license file +sha256 6a0dbbdaec2b3136b7bf045586f4212bdf74e7af688bf9dfe9154607cf5ec156 COPYING diff --git a/buildroot/package/libunwind/libunwind.mk b/buildroot/package/libunwind/libunwind.mk index 7469b789e..26deaa5f0 100644 --- a/buildroot/package/libunwind/libunwind.mk +++ b/buildroot/package/libunwind/libunwind.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNWIND_VERSION = 1.2.1 +LIBUNWIND_VERSION = 1.3.1 LIBUNWIND_SITE = http://download.savannah.gnu.org/releases/libunwind LIBUNWIND_INSTALL_STAGING = YES LIBUNWIND_LICENSE_FILES = COPYING diff --git a/buildroot/package/libupnp18/0001-configure.ac-fix-build-with-openssl.patch b/buildroot/package/libupnp18/0001-configure.ac-fix-build-with-openssl.patch deleted file mode 100644 index 6a09821da..000000000 --- a/buildroot/package/libupnp18/0001-configure.ac-fix-build-with-openssl.patch +++ /dev/null @@ -1,51 +0,0 @@ -From c70d326f3ae88aa2dca903fb17a1f18d3b45a2ca Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 8 Feb 2019 16:45:32 +0100 -Subject: [PATCH] configure.ac: fix build with openssl - -- Add a call to PKG_CHECK_MODULES to get openssl libraries and its - dependencies if openssl support is enabled -- Add OPENSSL_LIBS to libupnp.pc.in so that applications linking with - pupnp (such as mpd) will be able to retrieve openssl libraries - -Fixes: - - http://autobuild.buildroot.org/results/a4148e516070b79816769f3443fc24d6d8192073 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/mrjimenez/pupnp/pull/105] ---- - configure.ac | 5 +++++ - libupnp.pc.in | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 670d363..190b30c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -722,6 +722,11 @@ AC_COMPILE_IFELSE( - AC_MSG_ERROR([pthread_rwlock_t not available])])]) - echo "-------------------------------------------------------------------------------" - -+if test "x$enable_open_ssl" = xyes ; then -+ PKG_CHECK_MODULES(OPENSSL, libssl, -+ [LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_CFLAGS"], -+ [AC_MSG_ERROR([openssl not found])]) -+fi - - AC_CONFIG_FILES([ - Makefile -diff --git a/libupnp.pc.in b/libupnp.pc.in -index bd2d7b3..54cba90 100644 ---- a/libupnp.pc.in -+++ b/libupnp.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libupnp - Description: Linux SDK for UPnP Devices - Version: @VERSION@ --Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lixml -+Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lixml @OPENSSL_LIBS@ - Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp - --- -2.14.1 - diff --git a/buildroot/package/libupnp18/0002-Do-not-try-to-detach-detached-thread-the-result-is-u.patch b/buildroot/package/libupnp18/0002-Do-not-try-to-detach-detached-thread-the-result-is-u.patch deleted file mode 100644 index 601ea89be..000000000 --- a/buildroot/package/libupnp18/0002-Do-not-try-to-detach-detached-thread-the-result-is-u.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 04b454f693d0c71336252380d08f1d02967e133e Mon Sep 17 00:00:00 2001 -From: Jean-Francois Dockes -Date: Sun, 27 Jan 2019 10:44:17 +0100 -Subject: [PATCH] Do not try to detach detached thread, the result is - undefined. Fixes issue #102 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes runtime crash with musl 1.1.20+. The problem is that libupnp is -calling pthread_detach() on a thread which was created in the detached state. - -Backported from: 04b454f693d0c71336252380d08f1d02967e133e - -(cherry picked from commit 386b7ed79146ecf7a3bba49f48cb8f41a9b49170) -Signed-off-by: Jörg Krause ---- - upnp/src/threadutil/ThreadPool.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/upnp/src/threadutil/ThreadPool.c b/upnp/src/threadutil/ThreadPool.c -index d272907..5e590ed 100644 ---- a/upnp/src/threadutil/ThreadPool.c -+++ b/upnp/src/threadutil/ThreadPool.c -@@ -651,11 +651,6 @@ static int CreateWorker( - rc = ithread_create(&temp, &attr, WorkerThread, tp); - ithread_attr_destroy(&attr); - if (rc == 0) { -- rc = ithread_detach(temp); -- /* ithread_detach will return EINVAL if thread has been -- successfully detached by ithread_create */ -- if (rc == EINVAL) -- rc = 0; - tp->pendingWorkerThreadStart = 1; - /* wait until the new worker thread starts */ - while (tp->pendingWorkerThreadStart) { --- -2.21.0 - diff --git a/buildroot/package/libupnp18/libupnp18.hash b/buildroot/package/libupnp18/libupnp18.hash index c32ebef73..68aee9ba6 100644 --- a/buildroot/package/libupnp18/libupnp18.hash +++ b/buildroot/package/libupnp18/libupnp18.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/pupnp/files/pupnp/libupnp-1.8.4/libupnp-1.8.4.tar.bz2.sha1 -sha1 93e7b3c94cf53eb59533b4b7b137ef5cc651e28b libupnp-1.8.4.tar.bz2 +# From https://sourceforge.net/projects/pupnp/files/pupnp/libupnp-1.8.6/libupnp-1.8.6.tar.bz2.sha1 +sha1 6132a949d7536dac835172609d1def1e7f2bd232 libupnp-1.8.6.tar.bz2 # Locally computed: -sha256 188d3f786d92fe14191f17634d2d87847eee7d2b568a5257ea23262fec9973d6 libupnp-1.8.4.tar.bz2 +sha256 65faf240f8ccee50cc0e7fe7fb21dcd79f743fc227a9b652b091f50f6956c2c7 libupnp-1.8.6.tar.bz2 sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/buildroot/package/libupnp18/libupnp18.mk b/buildroot/package/libupnp18/libupnp18.mk index 35e8dc4a4..f73c65683 100644 --- a/buildroot/package/libupnp18/libupnp18.mk +++ b/buildroot/package/libupnp18/libupnp18.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP18_VERSION = 1.8.4 +LIBUPNP18_VERSION = 1.8.6 LIBUPNP18_SOURCE = libupnp-$(LIBUPNP18_VERSION).tar.bz2 LIBUPNP18_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libupnp-$(LIBUPNP18_VERSION) LIBUPNP18_CONF_ENV = ac_cv_lib_compat_ftime=no @@ -12,8 +12,9 @@ LIBUPNP18_INSTALL_STAGING = YES LIBUPNP18_LICENSE = BSD-3-Clause LIBUPNP18_LICENSE_FILES = COPYING LIBUPNP18_DEPENDENCIES = host-pkgconf -# We're patching configure.ac -LIBUPNP18_AUTORECONF = YES + +# Bind the internal miniserver socket with reuseaddr to allow clean restarts. +LIBUPNP18_CONF_OPTS += --enable-reuseaddr ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBUPNP18_CONF_OPTS += --enable-open-ssl diff --git a/buildroot/package/libupnpp/libupnpp.hash b/buildroot/package/libupnpp/libupnpp.hash index f08c3a4f2..993dbc89a 100644 --- a/buildroot/package/libupnpp/libupnpp.hash +++ b/buildroot/package/libupnpp/libupnpp.hash @@ -1,5 +1,5 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.17.0.tar.gz.sha256 -sha256 7035dda48207c254cbd8cd64e4e679a9e5f085a35d28c19bc2ddeba0deaff58b libupnpp-0.17.0.tar.gz +# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.17.2.tar.gz.sha256 +sha256 5abaaf353a1e9c3482d61ef2627b650285d59f27c1ee60d35b8951952261374f libupnpp-0.17.2.tar.gz # Hash for license file: sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING diff --git a/buildroot/package/libupnpp/libupnpp.mk b/buildroot/package/libupnpp/libupnpp.mk index 3619050f1..c9c103d9b 100644 --- a/buildroot/package/libupnpp/libupnpp.mk +++ b/buildroot/package/libupnpp/libupnpp.mk @@ -4,20 +4,12 @@ # ################################################################################ -LIBUPNPP_VERSION = 0.17.0 +LIBUPNPP_VERSION = 0.17.2 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBUPNPP_LICENSE = LGPL-2.1+ LIBUPNPP_LICENSE_FILES = COPYING LIBUPNPP_INSTALL_STAGING = YES -LIBUPNPP_DEPENDENCIES = expat libcurl \ +LIBUPNPP_DEPENDENCIES = host-pkgconf expat libcurl \ $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18) -# configure script fails to link against the dependencies of libupnp -# and libcurl causing detection to fail when statically linking -ifeq ($(BR2_STATIC_LIBS),y) -LIBUPNPP_DEPENDENCIES += host-pkgconf -LIBUPNPP_CONF_ENV += \ - LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libupnp libcurl`" -endif - $(eval $(autotools-package)) diff --git a/buildroot/package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch b/buildroot/package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch index 585abc032..658e1721f 100644 --- a/buildroot/package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch +++ b/buildroot/package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch @@ -12,13 +12,13 @@ Signed-off-by: Samuel Martin urcu/compiler.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -diff --git a/urcu/compiler.h b/urcu/compiler.h +diff --git a/include/urcu/compiler.h b/include/urcu/compiler.h index 1e30903..56115f1 100644 ---- a/urcu/compiler.h -+++ b/urcu/compiler.h +--- a/include/urcu/compiler.h ++++ b/include/urcu/compiler.h @@ -118,10 +118,17 @@ + __GNUC_PATCHLEVEL__) - + /* + * Official gcc releases from 4.8.0 to 4.8.2 have the following bug, + * however, many arm toolchain providers have the included the fix for @@ -35,6 +35,6 @@ index 1e30903..56115f1 100644 # error Your gcc version produces clobbered frame accesses # endif # endif --- +-- 1.9.0 diff --git a/buildroot/package/liburcu/Config.in b/buildroot/package/liburcu/Config.in index 2598181ad..7d2964208 100644 --- a/buildroot/package/liburcu/Config.in +++ b/buildroot/package/liburcu/Config.in @@ -1,7 +1,10 @@ config BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS bool default y - depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64 + depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be || \ + BR2_i386 || BR2_mips || BR2_mips64 || BR2_mipsel || \ + BR2_mips64el || BR2_nios2 || BR2_powerpc || BR2_powerpc64 || \ + BR2_powerpc64le || BR2_riscv || BR2_sparc64 || BR2_x86_64 depends on BR2_USE_MMU # fork() in test config BR2_PACKAGE_LIBURCU diff --git a/buildroot/package/liburcu/liburcu.hash b/buildroot/package/liburcu/liburcu.hash index 5866d805c..5c2f7e52a 100644 --- a/buildroot/package/liburcu/liburcu.hash +++ b/buildroot/package/liburcu/liburcu.hash @@ -1,4 +1,8 @@ -# http://www.lttng.org/files/urcu/userspace-rcu-0.9.2.tar.bz2.sha1 -sha1 61d1d0d1b955c7a67a7253317647304d04b400a0 userspace-rcu-0.9.2.tar.bz2 -# Locally generated -sha256 8f7fa313b1e0a3f742cea24ce63a39c0efe63e615a769e2961e55bd2663ecaa3 userspace-rcu-0.9.2.tar.bz2 +# http://www.lttng.org/files/urcu/userspace-rcu-0.11.1.tar.bz2.sha256 +sha256 92b9971bf3f1c443edd6c09e7bf5ff3b43531e778841f16377a812c8feeb3350 userspace-rcu-0.11.1.tar.bz2 + +# Hash for license files +sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt +sha256 8ef8121eddd2fc0779d94331a1d0f1ead9c796343d845e564cd8c8c4ae3d6f6e lgpl-relicensing.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt +sha256 e8c070cb093be4b2eaf938a5f1c11621163b2d9cfa2790460cf925d81e442fa7 LICENSE diff --git a/buildroot/package/liburcu/liburcu.mk b/buildroot/package/liburcu/liburcu.mk index d8579f6c2..217e90a1b 100644 --- a/buildroot/package/liburcu/liburcu.mk +++ b/buildroot/package/liburcu/liburcu.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURCU_VERSION = 0.9.2 +LIBURCU_VERSION = 0.11.1 LIBURCU_SITE = http://lttng.org/files/urcu LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files) diff --git a/buildroot/package/liburiparser/0001-CMakeLists.txt-fix-build-without-C.patch b/buildroot/package/liburiparser/0001-CMakeLists.txt-fix-build-without-C.patch new file mode 100644 index 000000000..9f5e88989 --- /dev/null +++ b/buildroot/package/liburiparser/0001-CMakeLists.txt-fix-build-without-C.patch @@ -0,0 +1,33 @@ +From 0e385a6b747e967b6724ef3ded944c7da3b16f79 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 1 May 2019 11:18:29 +0200 +Subject: [PATCH] CMakeLists.txt: fix build without C++ + +Specify that uriparser is a C project (C++ is needed only for the test +runner) otherwise build will fail if no C++ compiler is found by cmake + +Fixes: + - http://autobuild.buildroot.org/results/1e191676f28905a81de6282e07978aa5d4f02039 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/uriparser/uriparser/pull/69] +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ceb79e0..40d3b20 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,6 +39,8 @@ cmake_minimum_required(VERSION 3.3) + project(uriparser + VERSION + 0.9.3 ++ LANGUAGES ++ C + ) + + # See https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +-- +2.20.1 + diff --git a/buildroot/package/liburiparser/liburiparser.hash b/buildroot/package/liburiparser/liburiparser.hash index bbdb37329..4216f1f17 100644 --- a/buildroot/package/liburiparser/liburiparser.hash +++ b/buildroot/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 75248f3de3b7b13c8c9735ff7b86ebe72cbb8ad043291517d7d53488e0893abe uriparser-0.9.1.tar.bz2 +sha256 28af4adb05e811192ab5f04566bebc5ebf1c30d9ec19138f944963d52419e28f uriparser-0.9.3.tar.bz2 sha256 ee90029e62d11f48faa59360d15c3ad8e7c094c74cc25b055716d92340da561f COPYING diff --git a/buildroot/package/liburiparser/liburiparser.mk b/buildroot/package/liburiparser/liburiparser.mk index 529f70190..4a68814e0 100644 --- a/buildroot/package/liburiparser/liburiparser.mk +++ b/buildroot/package/liburiparser/liburiparser.mk @@ -4,16 +4,22 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.1 +LIBURIPARSER_VERSION = 0.9.3 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause LIBURIPARSER_LICENSE_FILES = COPYING LIBURIPARSER_INSTALL_STAGING = YES -LIBURIPARSER_CONF_OPTS = --disable-test +LIBURIPARSER_CONF_OPTS = -DURIPARSER_BUILD_DOCS=OFF -DURIPARSER_BUILD_TESTS=OFF -ifeq ($(BR2_USE_WCHAR),) -LIBURIPARSER_CONF_OPTS += --disable-wchar_t +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBURIPARSER_CONF_OPTS += -DBUILD_SHARED_LIBS=ON +else +LIBURIPARSER_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF endif -$(eval $(autotools-package)) +ifeq ($(BR2_USE_WCHAR),) +LIBURIPARSER_CONF_OPTS += -DURIPARSER_BUILD_WCHAR_T=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/libusb-compat/libusb-compat.hash b/buildroot/package/libusb-compat/libusb-compat.hash index c01eee532..26c3a80eb 100644 --- a/buildroot/package/libusb-compat/libusb-compat.hash +++ b/buildroot/package/libusb-compat/libusb-compat.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a libusb-compat-0.1.5.tar.bz2 +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/libusb/0001-configure.ac-fix-detection-of-clock_gettime-library.patch b/buildroot/package/libusb/0001-configure.ac-fix-detection-of-clock_gettime-library.patch deleted file mode 100644 index 89b89bb59..000000000 --- a/buildroot/package/libusb/0001-configure.ac-fix-detection-of-clock_gettime-library.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7cc67ed294ad8566f2877d6f71649f1bd36f69a4 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 5 Jun 2018 14:22:21 +0300 -Subject: [PATCH] configure.ac: fix detection of clock_gettime library - -glibc before 2.17 requires link with librt for clock_gettime(). The -AC_SEARCH_LIBS check in configure.ac should detect this dependency. -Unfortunately commit cb77a25e51 (configure.ac: Remove obsolete AC_ERROR -and make formatting consistent) inadvertently renamed to clock_gettime2, -thus breaking librt detection. - -Restore the correct clock_gettime() name. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/libusb/libusb/pull/439 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 5b16c6825d4b..63590d1351a4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -107,7 +107,7 @@ case $backend in - linux) - AC_DEFINE(OS_LINUX, 1, [Linux backend]) - AC_SUBST(OS_LINUX) -- AC_SEARCH_LIBS([clock_gettime2], [rt], [], [], [-pthread]) -+ AC_SEARCH_LIBS([clock_gettime], [rt], [], [], [-pthread]) - AC_ARG_ENABLE([udev], - [AC_HELP_STRING([--enable-udev], [use udev for device enumeration and hotplug support (recommended) [default=yes]])], - [], [enable_udev=yes]) --- -2.17.1 - diff --git a/buildroot/package/libusb/libusb.hash b/buildroot/package/libusb/libusb.hash index 7e9d2a2ad..272dfb087 100644 --- a/buildroot/package/libusb/libusb.hash +++ b/buildroot/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157 libusb-1.0.22.tar.bz2 +sha256 db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d libusb-1.0.23.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/libusb/libusb.mk b/buildroot/package/libusb/libusb.mk index fe38a1d2d..ddc6b27b6 100644 --- a/buildroot/package/libusb/libusb.mk +++ b/buildroot/package/libusb/libusb.mk @@ -5,15 +5,13 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).22 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).23 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ LIBUSB_LICENSE_FILES = COPYING LIBUSB_DEPENDENCIES = host-pkgconf LIBUSB_INSTALL_STAGING = YES -# Patching configure.ac -LIBUSB_AUTORECONF = YES # Avoid the discovery of udev for the host variant HOST_LIBUSB_CONF_OPTS = --disable-udev diff --git a/buildroot/package/libusbgx/libusbgx.hash b/buildroot/package/libusbgx/libusbgx.hash index 107123ae1..dd43ec7b9 100644 --- a/buildroot/package/libusbgx/libusbgx.hash +++ b/buildroot/package/libusbgx/libusbgx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 b15abc89a0ef82c6a650cc1d58b5ba50f7ce076db392add84caabcd86c608ee2 libusbgx-libusbgx-v0.2.0.tar.gz +sha256 b15abc89a0ef82c6a650cc1d58b5ba50f7ce076db392add84caabcd86c608ee2 libusbgx-0.2.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/buildroot/package/libusbgx/libusbgx.mk b/buildroot/package/libusbgx/libusbgx.mk index e7c082f9f..516ad2597 100644 --- a/buildroot/package/libusbgx/libusbgx.mk +++ b/buildroot/package/libusbgx/libusbgx.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBUSBGX_VERSION = libusbgx-v0.2.0 -LIBUSBGX_SITE = $(call github,libusbgx,libusbgx,$(LIBUSBGX_VERSION)) +LIBUSBGX_VERSION = 0.2.0 +LIBUSBGX_SITE = $(call github,libusbgx,libusbgx,libusbgx-v$(LIBUSBGX_VERSION)) LIBUSBGX_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) LIBUSBGX_LICENSE_FILES = COPYING COPYING.LGPL LIBUSBGX_DEPENDENCIES = host-pkgconf libconfig diff --git a/buildroot/package/libuv/libuv.hash b/buildroot/package/libuv/libuv.hash index 8f11743b5..923cd1cb3 100644 --- a/buildroot/package/libuv/libuv.hash +++ b/buildroot/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ce3036d444c3fb4f9a9e2994bec1f4fa07872b01456998b422ce918fdc55c254 libuv-v1.25.0.tar.gz +sha256 e3e0105c9b26e181e0547607cb6893462beb0c652674c3795766b2e5555288b3 libuv-1.34.1.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/buildroot/package/libuv/libuv.mk b/buildroot/package/libuv/libuv.mk index fec6659ed..d7160d1e0 100644 --- a/buildroot/package/libuv/libuv.mk +++ b/buildroot/package/libuv/libuv.mk @@ -4,8 +4,10 @@ # ################################################################################ -LIBUV_VERSION = v1.25.0 -LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) +# When bumping libuv, check if a new version of uvw is available +# and bump it too. +LIBUV_VERSION = 1.34.1 +LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES LIBUV_AUTORECONF = YES diff --git a/buildroot/package/libv4l/0001-fixup-lfs-mismatch-in-preload-libraries.patch b/buildroot/package/libv4l/0001-fixup-lfs-mismatch-in-preload-libraries.patch deleted file mode 100644 index f23eb7a35..000000000 --- a/buildroot/package/libv4l/0001-fixup-lfs-mismatch-in-preload-libraries.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e5952b043a71fe83fbc392e498e8f77774fca0d8 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sat, 28 Jun 2014 09:32:53 -0300 -Subject: [PATCH] fixup lfs mismatch in preload libraries - -Ensure that the lfs variants are not transparently used instead of the !lfs -ones so both can be wrapped, independently of any custom CFLAGS/CPPFLAGS. - -Signed-off-by: Peter Korsgaard ---- - lib/libv4l1/v4l1compat.c | 3 +++ - lib/libv4l2/v4l2convert.c | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/lib/libv4l1/v4l1compat.c b/lib/libv4l1/v4l1compat.c -index e328288..70eb74f 100644 ---- a/lib/libv4l1/v4l1compat.c -+++ b/lib/libv4l1/v4l1compat.c -@@ -19,6 +19,9 @@ - # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA - */ - -+/* ensure we see *64 variants and they aren't transparently used */ -+#undef _LARGEFILE_SOURCE -+#undef _FILE_OFFSET_BITS - #define _LARGEFILE64_SOURCE 1 - - #include -diff --git a/lib/libv4l2/v4l2convert.c b/lib/libv4l2/v4l2convert.c -index 9b46ab8..bc41056 100644 ---- a/lib/libv4l2/v4l2convert.c -+++ b/lib/libv4l2/v4l2convert.c -@@ -23,6 +23,9 @@ - /* prevent GCC 4.7 inlining error */ - #undef _FORTIFY_SOURCE - -+/* ensure we see *64 variants and they aren't transparently used */ -+#undef _LARGEFILE_SOURCE -+#undef _FILE_OFFSET_BITS - #define _LARGEFILE64_SOURCE 1 - - #include --- -1.9.1 diff --git a/buildroot/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch b/buildroot/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch new file mode 100644 index 000000000..238f8fc37 --- /dev/null +++ b/buildroot/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch @@ -0,0 +1,68 @@ +From baba68cdcb44fc11d0ba8ce2c13eb5b06bbd9b33 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Wed, 30 Oct 2019 07:15:23 +0100 +Subject: [PATCH] keymap.h: add missing includes to fix musl build + +Needed to fix these build errors: + +In file included from keymap.c:13:0: +keymap.h:23:2: error: unknown type name 'u_int32_t' + u_int32_t scancode; + +keymap.h:36:1: error: unknown type name 'error_t' + error_t parse_keymap(char *fname, struct keymap **keymap, bool verbose); + +Signed-off-by: Bernd Kuhls +--- +Patch was not sent upstream due to broken mailing list setup: + +: host vger.kernel.org[209.132.180.67] said: 553 + 5.7.1 Hello [xx.xx.xx.xx], for your MAIL FROM address + policy analysis reported: Your address is not + liked source for email (in reply to MAIL FROM command) + +Hello [xx.xx.xx.xx], for your MAIL FROM address + policy analysis reported: Your address is not liked source for email + + utils/common/keymap.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/utils/common/keymap.h b/utils/common/keymap.h +index f2b29632..bb1edce9 100644 +--- a/utils/common/keymap.h ++++ b/utils/common/keymap.h +@@ -1,4 +1,8 @@ + /* SPDX-License-Identifier: GPL-2.0 */ ++ ++#include ++#include ++ + #ifndef __KEYMAP_H + #define __KEYMAP_H + +diff -uNr v4l-utils-1.18.0.orig/utils/ir-ctl/keymap.h v4l-utils-1.18.0/utils/ir-ctl/keymap.h +--- v4l-utils-1.18.0.orig/utils/ir-ctl/keymap.h 2019-09-22 11:22:54.000000000 +0200 ++++ v4l-utils-1.18.0/utils/ir-ctl/keymap.h 2019-10-30 07:06:18.250548011 +0100 +@@ -1,4 +1,8 @@ + /* SPDX-License-Identifier: GPL-2.0 */ ++ ++#include ++#include ++ + #ifndef __KEYMAP_H + #define __KEYMAP_H + +diff -uNr v4l-utils-1.18.0.orig/utils/keytable/keymap.h v4l-utils-1.18.0/utils/keytable/keymap.h +--- v4l-utils-1.18.0.orig/utils/keytable/keymap.h 2019-09-22 11:22:54.000000000 +0200 ++++ v4l-utils-1.18.0/utils/keytable/keymap.h 2019-10-30 07:06:56.218816126 +0100 +@@ -1,4 +1,8 @@ + /* SPDX-License-Identifier: GPL-2.0 */ ++ ++#include ++#include ++ + #ifndef __KEYMAP_H + #define __KEYMAP_H + +-- +2.20.1 diff --git a/buildroot/package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch b/buildroot/package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch deleted file mode 100644 index 656008b70..000000000 --- a/buildroot/package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 663b7be9d27c979c914011a3ce707e227987bc59 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sat, 3 Feb 2018 22:47:18 +0100 -Subject: [PATCH] keytable: fix EVIOCSCLOCKID related compile failure - -Fixes: - - keytable.c: In function 'test_event': - keytable.c:1351:12: error: 'EVIOCSCLOCKID' undeclared (first use in this function) - ioctl(fd, EVIOCSCLOCKID, &mode); - ^~~~~~~~~~~~~ - -Signed-off-by: Peter Seiderer ---- - utils/keytable/keytable.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c -index 34a1522e..925eab00 100644 ---- a/utils/keytable/keytable.c -+++ b/utils/keytable/keytable.c -@@ -55,6 +55,10 @@ struct input_keymap_entry_v2 { - u_int8_t scancode[32]; - }; - -+#ifndef EVIOCSCLOCKID -+#define EVIOCSCLOCKID _IOW('E', 0xa0, int) -+#endif -+ - #ifndef EVIOCGKEYCODE_V2 - #define EVIOCGKEYCODE_V2 _IOR('E', 0x04, struct input_keymap_entry_v2) - #define EVIOCSKEYCODE_V2 _IOW('E', 0x04, struct input_keymap_entry_v2) --- -2.16.1 - diff --git a/buildroot/package/libv4l/0003-Build-sdlcam-only-if-jpeg-is-enabled.patch b/buildroot/package/libv4l/0003-Build-sdlcam-only-if-jpeg-is-enabled.patch deleted file mode 100644 index 4c4365f90..000000000 --- a/buildroot/package/libv4l/0003-Build-sdlcam-only-if-jpeg-is-enabled.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5c407e130f8d0416f91f5a12bcdc2709f00dda65 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 29 Jun 2018 21:15:10 +0200 -Subject: [PATCH] Build sdlcam only if jpeg is enabled - -Fixes: - - http://autobuild.buildroot.net/results/1eded8b44cc369550566c6ce0b3c042f1aec8d44 - -Signed-off-by: Fabrice Fontaine ---- - contrib/test/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am -index 0188fe21..c7c38e7a 100644 ---- a/contrib/test/Makefile.am -+++ b/contrib/test/Makefile.am -@@ -17,8 +17,10 @@ noinst_PROGRAMS += v4l2gl - endif - - if HAVE_SDL -+if HAVE_JPEG - noinst_PROGRAMS += sdlcam - endif -+endif - - driver_test_SOURCES = driver-test.c - driver_test_LDADD = ../../utils/libv4l2util/libv4l2util.la --- -2.14.1 - diff --git a/buildroot/package/libv4l/0004-v4l2-compliance-needs-fork.patch b/buildroot/package/libv4l/0004-v4l2-compliance-needs-fork.patch deleted file mode 100644 index d29a05952..000000000 --- a/buildroot/package/libv4l/0004-v4l2-compliance-needs-fork.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 21d7082c635433176aebcd9d6f0177edb059f41f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 17 Nov 2018 21:26:57 +0100 -Subject: [PATCH] v4l2-compliance needs fork - -v4l2-compliance uses fork, since -https://git.linuxtv.org/v4l-utils.git/commit/utils/v4l2-compliance/?id=79d98edd1a27233667a6bc38d3d7f8958c2ec02c - -So don't build it if fork is not available - -Fixes: - - http://autobuild.buildroot.org/results/447d792ce21c0e33a36ca9384fee46e099435ed8 - -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 5 ++++- - utils/Makefile.am | 6 +++++- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5cc34c24..52ea5c6d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -478,7 +478,8 @@ AM_CONDITIONAL([WITH_QTGL], [test x${qt_pkgconfig_gl} = xtrue]) - AM_CONDITIONAL([WITH_GCONV], [test x$enable_gconv = xyes -a x$enable_shared == xyes -a x$with_gconvdir != x -a -f $with_gconvdir/gconv-modules]) - AM_CONDITIONAL([WITH_V4L2_CTL_LIBV4L], [test x${enable_v4l2_ctl_libv4l} != xno]) - AM_CONDITIONAL([WITH_V4L2_CTL_STREAM_TO], [test x${enable_v4l2_ctl_stream_to} != xno]) --AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_LIBV4L], [test x${enable_v4l2_compliance_libv4l} != xno]) -+AM_CONDITIONAL([WITH_V4L2_COMPLIANCE], [test x$ac_cv_func_fork = xyes]) -+AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_LIBV4L], [test x$ac_cv_func_fork = xyes -a x${enable_v4l2_compliance_libv4l} != xno]) - AM_CONDITIONAL([WITH_BPF], [test x$enable_bpf != xno -a x$libelf_pkgconfig = xyes -a x$CLANG = xclang]) - - # append -static to libtool compile and link command to enforce static libs -@@ -509,6 +510,7 @@ AM_COND_IF([WITH_V4L_PLUGINS], [USE_V4L_PLUGINS="yes" - AM_COND_IF([WITH_V4L_WRAPPERS], [USE_V4L_WRAPPERS="yes"], [USE_V4L_WRAPPERS="no"]) - AM_COND_IF([WITH_GCONV], [USE_GCONV="yes"], [USE_GCONV="no"]) - AM_COND_IF([WITH_V4L2_CTL_LIBV4L], [USE_V4L2_CTL_LIBV4L="yes"], [USE_V4L2_CTL_LIBV4L="no"]) -+AM_COND_IF([WITH_V4L2_COMPLIANCE], [USE_V4L2_COMPLIANCE="yes"], [USE_V4L2_COMPLIANCE="no"]) - AM_COND_IF([WITH_V4L2_COMPLIANCE_LIBV4L], [USE_V4L2_COMPLIANCE_LIBV4L="yes"], [USE_V4L2_COMPLIANCE_LIBV4L="no"]) - AM_COND_IF([WITH_BPF], [USE_BPF="yes" - AC_DEFINE([HAVE_BPF], [1], [BPF IR decoder support enabled])], -@@ -556,6 +558,7 @@ compile time options summary - qv4l2 : $USE_QV4L2 - qvidcap : $USE_QVIDCAP - v4l2-ctl uses libv4l : $USE_V4L2_CTL_LIBV4L -+ v4l2-compliance : $USE_V4L2_COMPLIANCE - v4l2-compliance uses libv4l: $USE_V4L2_COMPLIANCE_LIBV4L - BPF IR Decoders: : $USE_BPF - EOF -diff --git a/utils/Makefile.am b/utils/Makefile.am -index 2d507028..9c29926a 100644 ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -6,7 +6,6 @@ SUBDIRS = \ - cx18-ctl \ - keytable \ - media-ctl \ -- v4l2-compliance \ - v4l2-ctl \ - v4l2-dbg \ - v4l2-sysfs-path \ -@@ -20,6 +19,11 @@ SUBDIRS += \ - dvb - endif - -+if WITH_V4L2_COMPLIANCE -+SUBDIRS += \ -+ v4l2-compliance -+endif -+ - if WITH_QV4L2 - SUBDIRS += qv4l2 - endif --- -2.17.1 - diff --git a/buildroot/package/libv4l/libv4l.hash b/buildroot/package/libv4l/libv4l.hash index 231a471b9..5b29d7d65 100644 --- a/buildroot/package/libv4l/libv4l.hash +++ b/buildroot/package/libv4l/libv4l.hash @@ -1,7 +1,9 @@ # Locally calculated after checking signature -# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.3.tar.bz2.asc -sha256 7c5c0d49c130cf65d384f28e9f3a53c5f7d17bf18740c48c40810e0fbbed5b54 v4l-utils-1.16.3.tar.bz2 +# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.18.0.tar.bz2.asc +# with key 05D0169C26E41593418129DF199A64FADFB500FF +sha256 6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d v4l-utils-1.18.0.tar.bz2 + # Locally calculated sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 COPYING.libv4l -sha256 37d0f2c8dc3f267d864cb39d54f82c5092a599beb29cb5caa96d50d27e069a44 lib/libv4l1/libv4l1-kernelcode-license.txt +sha256 34229b5aadfb768d0d083987cba54203a920904a3ec8320823c6125b9831acd1 lib/libv4l1/libv4l1-kernelcode-license.txt diff --git a/buildroot/package/libv4l/libv4l.mk b/buildroot/package/libv4l/libv4l.mk index fe1ffbcf5..a3bf09922 100644 --- a/buildroot/package/libv4l/libv4l.mk +++ b/buildroot/package/libv4l/libv4l.mk @@ -4,13 +4,13 @@ # ################################################################################ -LIBV4L_VERSION = 1.16.3 +LIBV4L_VERSION = 1.18.0 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES LIBV4L_DEPENDENCIES = host-pkgconf LIBV4L_CONF_OPTS = --disable-doxygen-doc --disable-qvidcap -# We're patching contrib/test/Makefile.am +# needed to get utils/qv4l link flags right LIBV4L_AUTORECONF = YES # add host-gettext for AM_ICONV macro LIBV4L_DEPENDENCIES += host-gettext diff --git a/buildroot/package/libva-intel-driver/0001-Check-the-interface-from-libva-first.patch b/buildroot/package/libva-intel-driver/0001-Check-the-interface-from-libva-first.patch deleted file mode 100644 index 81591fbbd..000000000 --- a/buildroot/package/libva-intel-driver/0001-Check-the-interface-from-libva-first.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 3db0c4838fe30fcee5beb8b31ca67d5cf7d77fb3 Mon Sep 17 00:00:00 2001 -From: Haihao Xiang -Date: Fri, 7 Dec 2018 13:31:43 +0800 -Subject: [PATCH 1/1] Check the interface from libva first - -This fixes https://github.com/intel/intel-vaapi-driver/issues/419 - -Signed-off-by: Haihao Xiang -[james.hilliard1@gmail.com: backport from upstream commit -f139dafa59172d40543f2ec469a035d3de9fdc6a] -Signed-off-by: James Hilliard ---- - src/i965_output_wayland.c | 27 ++++++++++++++++----------- - 1 file changed, 16 insertions(+), 11 deletions(-) - -diff --git a/src/i965_output_wayland.c b/src/i965_output_wayland.c -index 122db95..a637552 100644 ---- a/src/i965_output_wayland.c -+++ b/src/i965_output_wayland.c -@@ -397,6 +397,7 @@ i965_output_wayland_init(VADriverContextP ctx) - struct i965_driver_data * const i965 = i965_driver_data(ctx); - struct dso_handle *dso_handle; - struct wl_vtable *wl_vtable; -+ struct VADriverVTableWayland * const vtable = ctx->vtable_wayland; - - static const struct dso_symbol libegl_symbols[] = { - { -@@ -465,25 +466,29 @@ i965_output_wayland_init(VADriverContextP ctx) - if (!i965->wl_output) - goto error; - -- i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME); -- if (!i965->wl_output->libegl_handle) { -- i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK); -- if (!i965->wl_output->libegl_handle) -+ wl_vtable = &i965->wl_output->vtable; -+ -+ if (vtable->wl_interface) -+ wl_vtable->drm_interface = vtable->wl_interface; -+ else { -+ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME); -+ if (!i965->wl_output->libegl_handle) { -+ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK); -+ if (!i965->wl_output->libegl_handle) -+ goto error; -+ } -+ -+ dso_handle = i965->wl_output->libegl_handle; -+ if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), -+ libegl_symbols)) - goto error; - } - -- dso_handle = i965->wl_output->libegl_handle; -- wl_vtable = &i965->wl_output->vtable; -- if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), -- libegl_symbols)) -- goto error; -- - i965->wl_output->libwl_client_handle = dso_open(LIBWAYLAND_CLIENT_NAME); - if (!i965->wl_output->libwl_client_handle) - goto error; - - dso_handle = i965->wl_output->libwl_client_handle; -- wl_vtable = &i965->wl_output->vtable; - if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), - libwl_client_symbols)) - goto error; --- -2.7.4 - diff --git a/buildroot/package/libva-intel-driver/libva-intel-driver.hash b/buildroot/package/libva-intel-driver/libva-intel-driver.hash index 8c01271ae..555aa9473 100644 --- a/buildroot/package/libva-intel-driver/libva-intel-driver.hash +++ b/buildroot/package/libva-intel-driver/libva-intel-driver.hash @@ -1,5 +1,5 @@ # From https://github.com/intel/intel-vaapi-driver/releases -sha1 89096f99da753ac5858304e6c17f5dd9e7581d5b intel-vaapi-driver-2.3.0.tar.bz2 +sha1 5f805f6a040f5beab6693d11765618cc92d2076b intel-vaapi-driver-2.4.0.tar.bz2 # Locally computed -sha256 5c2e5deab024a0a6ae81dfe77ef455542a88d824eda7bfd07684337407ecdfe3 intel-vaapi-driver-2.3.0.tar.bz2 +sha256 71e2ddd985af6b221389db1018c4e8ca27a7f939fb51dcdf49d0efcb5ff3d089 intel-vaapi-driver-2.4.0.tar.bz2 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/buildroot/package/libva-intel-driver/libva-intel-driver.mk b/buildroot/package/libva-intel-driver/libva-intel-driver.mk index 76cdfee38..1cf113c40 100644 --- a/buildroot/package/libva-intel-driver/libva-intel-driver.mk +++ b/buildroot/package/libva-intel-driver/libva-intel-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_INTEL_DRIVER_VERSION = 2.3.0 +LIBVA_INTEL_DRIVER_VERSION = 2.4.0 LIBVA_INTEL_DRIVER_SOURCE = intel-vaapi-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2 LIBVA_INTEL_DRIVER_SITE = \ https://github.com/intel/intel-vaapi-driver/releases/download/$(LIBVA_INTEL_DRIVER_VERSION) diff --git a/buildroot/package/libva-utils/0001-check-ssp.patch b/buildroot/package/libva-utils/0001-check-ssp.patch deleted file mode 100644 index 11c1ded79..000000000 --- a/buildroot/package/libva-utils/0001-check-ssp.patch +++ /dev/null @@ -1,145 +0,0 @@ -From bdcf4d90f618f497311c348f984e005924cb3def Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 29 Jul 2018 20:58:06 +0200 -Subject: [PATCH] Check for -fstack-protector - -Not all toolchains provide support for -fstack-protector. This patch -provides a configure check to avoid build errors like - -/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp_nonshared -/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp - -Patch sent upstream as PR 125. - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 16 ++++++++++++++++ - decode/Makefile.am | 5 ++++- - encode/Makefile.am | 5 ++++- - putsurface/Makefile.am | 5 ++++- - vainfo/Makefile.am | 5 ++++- - videoprocess/Makefile.am | 5 ++++- - 6 files changed, 36 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index be2e00d..cfa508a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -129,6 +129,22 @@ if test "$ac_cv_have_gnuc_visibility_attribute" = "yes"; then - [Defined to 1 if GCC visibility attribute is supported]) - fi - -+# Check for -fstack-protector -+ssp_cc=yes -+if test "X$CC-cc" != "X"; then -+ AC_MSG_CHECKING([whether ${CC-cc} accepts -fstack-protector]) -+ ssp_old_cflags="$CFLAGS" -+ CFLAGS="$CFLAGS -fstack-protector" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[alloca(100);]])], [], [ssp_cc=no]) -+ AC_MSG_RESULT([$ssp_cc]) -+ if test "X$ssp_cc" = "Xno"; then -+ CFLAGS="$ssp_old_cflags" -+ else -+ AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.]) -+ fi -+fi -+AM_CONDITIONAL(USE_SSP, test "$ssp_cc" = "yes") -+ - # Check for DRM (mandatory) - LIBDRM_VERSION=libdrm_version - PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION]) -diff --git a/decode/Makefile.am b/decode/Makefile.am -index febc50d..8ea9252 100644 ---- a/decode/Makefile.am -+++ b/decode/Makefile.am -@@ -24,11 +24,14 @@ bin_PROGRAMS = mpeg2vldemo loadjpeg - - AM_CPPFLAGS = \ - -Wall \ -- -fstack-protector \ - $(LIBVA_CFLAGS) \ - -I$(top_srcdir)/common \ - $(NULL) - -+if USE_SSP -+AM_CPPFLAGS += -fstack-protector -+endif -+ - TEST_LIBS = \ - $(LIBVA_LIBS) \ - $(top_builddir)/common/libva-display.la \ -diff --git a/encode/Makefile.am b/encode/Makefile.am -index 8298b39..c107007 100644 ---- a/encode/Makefile.am -+++ b/encode/Makefile.am -@@ -25,10 +25,13 @@ noinst_PROGRAMS = svctenc - - AM_CPPFLAGS = \ - -Wall \ -- -fstack-protector \ - $(LIBVA_CFLAGS) \ - $(NULL) - -+if USE_SSP -+AM_CPPFLAGS += -fstack-protector -+endif -+ - h264encode_SOURCES = h264encode.c - h264encode_CFLAGS = -I$(top_srcdir)/common -g - h264encode_LDADD = \ -diff --git a/putsurface/Makefile.am b/putsurface/Makefile.am -index e7b62a1..10ae63e 100644 ---- a/putsurface/Makefile.am -+++ b/putsurface/Makefile.am -@@ -26,9 +26,12 @@ TEST_CFLAGS = \ - $(LIBVA_CFLAGS) \ - -I$(top_srcdir)/common \ - -Wall \ -- -fstack-protector \ - $(NULL) - -+if USE_SSP -+TEST_CFLAGS += -fstack-protector -+endif -+ - TEST_LIBS = \ - $(LIBVA_LIBS) \ - $(top_builddir)/common/libva-display.la \ -diff --git a/vainfo/Makefile.am b/vainfo/Makefile.am -index aff201f..e59f466 100644 ---- a/vainfo/Makefile.am -+++ b/vainfo/Makefile.am -@@ -27,9 +27,12 @@ vainfo_cflags = \ - $(LIBVA_CFLAGS) \ - -DLIBVA_VERSION_S="\"$(LIBVA_VERSION)\"" \ - -Wall \ -- -fstack-protector \ - $(NULL) - -+if USE_SSP -+vainfo_cflags += -fstack-protector -+endif -+ - vainfo_libs = \ - $(LIBVA_LIBS) \ - $(top_builddir)/common/libva-display.la \ -diff --git a/videoprocess/Makefile.am b/videoprocess/Makefile.am -index eb79bc3..448da7d 100644 ---- a/videoprocess/Makefile.am -+++ b/videoprocess/Makefile.am -@@ -24,11 +24,14 @@ bin_PROGRAMS = vavpp - - AM_CPPFLAGS = \ - -Wall \ -- -fstack-protector \ - $(LIBVA_CFLAGS) \ - -I$(top_srcdir)/common \ - $(NULL) - -+if USE_SSP -+AM_CPPFLAGS += -fstack-protector -+endif -+ - TEST_LIBS = \ - $(LIBVA_LIBS) \ - $(top_builddir)/common/libva-display.la \ diff --git a/buildroot/package/libva-utils/0001-fix-build-without-x11.patch b/buildroot/package/libva-utils/0001-fix-build-without-x11.patch new file mode 100644 index 000000000..0cb5030d7 --- /dev/null +++ b/buildroot/package/libva-utils/0001-fix-build-without-x11.patch @@ -0,0 +1,33 @@ +From 0d033c074b63ab0ef0798128b94b364ce33da93a Mon Sep 17 00:00:00 2001 +From: Ed Baker +Date: Wed, 8 Jan 2020 13:43:38 -0700 +Subject: [PATCH] Ifdef va_x11 in VP sample for usrptr + +When updating libva-utils from 2.4.0 to 2.6.0 in Chrome OS I bumped into +the following error: +portage/media-video/libva-utils-2.6.0-r1/work/libva-utils-2.6.0/videoprocess/vppscaling_n_out_usrptr.cpp:41:10: fatal error: + 'va/va_x11.h' file not found + +Downloaded from upstream PR: +https://github.com/intel/libva-utils/pull/185 + +Signed-off-by: Bernd Kuhls +Signed-off-by: Edward Baker +--- + videoprocess/vppscaling_n_out_usrptr.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/videoprocess/vppscaling_n_out_usrptr.cpp b/videoprocess/vppscaling_n_out_usrptr.cpp +index 4a3a222..a853442 100644 +--- a/videoprocess/vppscaling_n_out_usrptr.cpp ++++ b/videoprocess/vppscaling_n_out_usrptr.cpp +@@ -38,7 +38,9 @@ + #include + #include + #include "va_display.h" ++#if 0 + #include ++#endif + + #define MAX_LEN 1024 + diff --git a/buildroot/package/libva-utils/0002-Fix-build-failure-when-x11-support-is-disabled.patch b/buildroot/package/libva-utils/0002-Fix-build-failure-when-x11-support-is-disabled.patch deleted file mode 100644 index b14b662ab..000000000 --- a/buildroot/package/libva-utils/0002-Fix-build-failure-when-x11-support-is-disabled.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ad66d3c202eb72ac5808f13a0489ac836dc55aac Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 11 Feb 2019 20:31:42 +0100 -Subject: [PATCH] Fix build failure when x11 support is disabled - -Patch suggested on upstream bug tracker: -https://github.com/intel/libva-utils/issues/150#issuecomment-462059528 - -Signed-off-by: Bernd Kuhls ---- - Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index d28175a..12da79e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -24,10 +24,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - - AUTOMAKE_OPTIONS = foreign - --SUBDIRS = common decode encode vainfo videoprocess vendor/intel vendor/intel/sfcsample -+SUBDIRS = common decode encode vainfo videoprocess vendor/intel - - if USE_X11 --SUBDIRS += putsurface -+SUBDIRS += putsurface vendor/intel/sfcsample - else - if USE_WAYLAND - SUBDIRS += putsurface --- -2.20.1 - diff --git a/buildroot/package/libva-utils/libva-utils.hash b/buildroot/package/libva-utils/libva-utils.hash index 4bd015002..881b56fca 100644 --- a/buildroot/package/libva-utils/libva-utils.hash +++ b/buildroot/package/libva-utils/libva-utils.hash @@ -1,5 +1,5 @@ -# From https://github.com/intel/libva-utils/releases -sha1 98121e21dd3c679d06b1068a1b5f32246533099b libva-utils-2.4.0.tar.bz2 +# From https://github.com/intel/libva-utils/releases/download/2.6.0/libva-utils-2.6.0.tar.bz2.sha1sum +sha1 ef6f9abe8954ec94bae0ea3bc82ffd1fa4fc5735 libva-utils-2.6.0.tar.bz2 # Locally computed -sha256 5b7d1954b40fcb2c0544be20125c71a0852049715ab85a3e8aba60434a40c6b3 libva-utils-2.4.0.tar.bz2 +sha256 2249b5d08bffc3862bbdcc9a6a4827afd504330b8d101564d39fe1a1e7adc426 libva-utils-2.6.0.tar.bz2 sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/buildroot/package/libva-utils/libva-utils.mk b/buildroot/package/libva-utils/libva-utils.mk index be857bb4f..ad9acb229 100644 --- a/buildroot/package/libva-utils/libva-utils.mk +++ b/buildroot/package/libva-utils/libva-utils.mk @@ -4,20 +4,11 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.4.0 +LIBVA_UTILS_VERSION = 2.6.0 LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2 LIBVA_UTILS_SITE = https://github.com/intel/libva-utils/releases/download/$(LIBVA_UTILS_VERSION) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING -# 0001-check-ssp.patch -# 0002-Fix-build-failure-when-x11-support-is-disabled.patch -LIBVA_UTILS_AUTORECONF = YES LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva -define LIBVA_UTILS_CREATE_M4_DIR - @mkdir -p $(@D)/m4 -endef - -LIBVA_UTILS_POST_EXTRACT_HOOKS += LIBVA_UTILS_CREATE_M4_DIR - $(eval $(autotools-package)) diff --git a/buildroot/package/libva/libva.hash b/buildroot/package/libva/libva.hash index 06b7de576..8edacf128 100644 --- a/buildroot/package/libva/libva.hash +++ b/buildroot/package/libva/libva.hash @@ -1,5 +1,5 @@ -# From https://github.com/intel/libva/releases/download/2.4.0/libva-2.4.0.tar.bz2.sha1sum -sha1 2e7b69ebb615d039b9253d4708eeec889b812dbf libva-2.4.0.tar.bz2 +# From https://github.com/intel/libva/releases/download/2.6.1/libva-2.6.1.tar.bz2.sha1sum +sha1 6b218e5622174a37fd0cfd8777b10717c95bd20e libva-2.6.1.tar.bz2 # Locally computed -sha256 99263056c21593a26f2ece812aee6fe60142b49e6cd46cb33c8dddf18fc19391 libva-2.4.0.tar.bz2 +sha256 6c57eb642d828af2411aa38f55dc10111e8c98976dbab8fd62e48629401eaea5 libva-2.6.1.tar.bz2 sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/buildroot/package/libva/libva.mk b/buildroot/package/libva/libva.mk index 8a21c11b6..5e9bedbbd 100644 --- a/buildroot/package/libva/libva.mk +++ b/buildroot/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.4.0 +LIBVA_VERSION = 2.6.1 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) LIBVA_LICENSE = MIT @@ -20,8 +20,8 @@ LIBVA_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_XORG7),y) LIBVA_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes LIBVA_CONF_OPTS += --enable-x11 -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) -LIBVA_DEPENDENCIES += mesa3d +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +LIBVA_DEPENDENCIES += libgl LIBVA_CONF_OPTS += --enable-glx endif else diff --git a/buildroot/package/libvdpau/0001-missing-configh-include.patch b/buildroot/package/libvdpau/0001-missing-configh-include.patch deleted file mode 100644 index f96c6fa7b..000000000 --- a/buildroot/package/libvdpau/0001-missing-configh-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Rico Tzschichholz -Date: Tue, 1 Sep 2015 10:45:11 +0200 -Subject: mesa_dri2: Add missing include of config.h to define _GNU_SOURCE - -Fix build with -Wimplicit-function-declaration while secure_getenv() is -guarded by __USE_GNU. - -Reviewed-by: Aaron Plattner -Tested-by: Stefan Dirsch -(cherry picked from commit 1cda354bdfd0c9ca107293b84b52f4464fdbedcc) -Signed-off-by: Damien Lanson ---- - src/mesa_dri2.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/mesa_dri2.c b/src/mesa_dri2.c -index 51e8794..420ccee 100644 ---- a/src/mesa_dri2.c -+++ b/src/mesa_dri2.c -@@ -33,6 +33,9 @@ - * and José Hiram Soltren (jsoltren@nvidia.com) - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #define NEED_REPLIES - #include diff --git a/buildroot/package/libvdpau/0002-link-with-libx11.patch b/buildroot/package/libvdpau/0002-link-with-libx11.patch deleted file mode 100644 index cfb39731c..000000000 --- a/buildroot/package/libvdpau/0002-link-with-libx11.patch +++ /dev/null @@ -1,33 +0,0 @@ -Subject: Link libvdpao with libX11 since it uses symbols from it -Author: Russ Allbery -Forwarded: no - -libvdpau uses the symbols: - - _XEatData - _XReply - _XFlush - _XReadPad - XFree - -which are provided by libX11, but wasn't linking with it directly, resulting -in warnings during the package build (and possibly errors later with better -linkers). - -[Patch taken from -https://anonscm.debian.org/cgit/pkg-nvidia/libvdpau.git/tree/debian/patches/link-with-libx11.patch.] - -Signed-off-by: Damien Lanson - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -22,7 +22,8 @@ endif - libvdpau_la_LIBADD = \ - $(DLOPEN_LIBS) \ - $(PTHREAD_LIBS) \ -- $(XEXT_LIBS) -+ $(XEXT_LIBS) \ -+ $(X11_LIBS) - - libvdpau_la_LDFLAGS = -version-info 1:0:0 -no-undefined - diff --git a/buildroot/package/libvdpau/0003-vdpau-module-searchpath.patch b/buildroot/package/libvdpau/0003-vdpau-module-searchpath.patch deleted file mode 100644 index bd835153d..000000000 --- a/buildroot/package/libvdpau/0003-vdpau-module-searchpath.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Andreas Beckmann -Subject: search the vdpau module in multiple directories - start searching the vdpau module in ${ORIGIN}/vdpau, then the MODULEDIR and - finally fall back to /usr/lib/vdpau - -[Patch taken from -https://anonscm.debian.org/cgit/pkg-nvidia/libvdpau.git/tree/debian/patches/vdpau-module-searchpath.patch.] - -Signed-off-by: Damien Lanson - ---- a/src/vdpau_wrapper.c -+++ b/src/vdpau_wrapper.c -@@ -103,6 +103,13 @@ static char * _vdp_get_driver_name_from_ - return driver_name; - } - -+static char const * _vdpau_module_search_paths[] = { -+ "${ORIGIN}/vdpau", -+ VDPAU_MODULEDIR, -+ "/usr/lib/vdpau", -+ NULL -+}; -+ - static VdpStatus _vdp_open_driver( - Display * display, - int screen) -@@ -117,6 +127,7 @@ static VdpStatus _vdp_open_driver( - char vdpau_driver_lib[PATH_MAX]; - char const * vdpau_trace; - char const * func_name; -+ char const ** module_path; - - vdpau_driver = secure_getenv("VDPAU_DRIVER"); - if (vdpau_driver) { -@@ -138,9 +146,11 @@ static VdpStatus _vdp_open_driver( - - /* Fallback to VDPAU_MODULEDIR when VDPAU_DRIVER_PATH is not set, - * or if we fail to create the driver path/dlopen the library. */ -- if (!_vdp_driver_dll) { -+ for (module_path = _vdpau_module_search_paths; -+ !_vdp_driver_dll && *module_path; -+ ++module_path) { - if (snprintf(vdpau_driver_lib, sizeof(vdpau_driver_lib), -- DRIVER_LIB_FORMAT, VDPAU_MODULEDIR, vdpau_driver) >= -+ DRIVER_LIB_FORMAT, *module_path, vdpau_driver) >= - sizeof(vdpau_driver_lib)) { - fprintf(stderr, "Failed to construct driver path: path too long\n"); - } diff --git a/buildroot/package/libvdpau/libvdpau.hash b/buildroot/package/libvdpau/libvdpau.hash index 55dc6a7e8..0833d41bf 100644 --- a/buildroot/package/libvdpau/libvdpau.hash +++ b/buildroot/package/libvdpau/libvdpau.hash @@ -1,4 +1,5 @@ -# From https://lists.freedesktop.org/archives/xorg-announce/2015-August/002630.html -md5 2fa0b05a4f4d06791eec83bc9c854d14 libvdpau-1.1.1.tar.bz2 -sha1 86516e2a962fd34f65d49115d6ddf15fd912f579 libvdpau-1.1.1.tar.bz2 -sha256 857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736 libvdpau-1.1.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-August/003021.html +sha256 b5a52eeac9417edbc396f26c40591ba5df0cd18285f68d84614ef8f06196e50e libvdpau-1.3.tar.bz2 +sha512 c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330 libvdpau-1.3.tar.bz2 +# Locally computed +sha256 ce4af7294872ff07f6e82ae5f1f5eba926215b1e2fb6d55d64759de082458d61 COPYING diff --git a/buildroot/package/libvdpau/libvdpau.mk b/buildroot/package/libvdpau/libvdpau.mk index 93446dbf2..63aecaf74 100644 --- a/buildroot/package/libvdpau/libvdpau.mk +++ b/buildroot/package/libvdpau/libvdpau.mk @@ -4,25 +4,25 @@ # ################################################################################ -LIBVDPAU_VERSION = 1.1.1 +LIBVDPAU_VERSION = 1.3 LIBVDPAU_SOURCE = libvdpau-$(LIBVDPAU_VERSION).tar.bz2 -LIBVDPAU_SITE = http://people.freedesktop.org/~aplattner/vdpau +LIBVDPAU_SITE = \ + https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/$(LIBVDPAU_VERSION) LIBVDPAU_LICENSE = MIT LIBVDPAU_LICENSE_FILES = COPYING LIBVDPAU_INSTALL_STAGING = YES -# autoreconf for patch 0002-link-with-libx11.patch -LIBVDPAU_AUTORECONF = YES - LIBVDPAU_DEPENDENCIES = host-pkgconf xlib_libX11 xlib_libXext -LIBVDPAU_CONF_OPTS = --with-module-dir=/usr/lib/vdpau +LIBVDPAU_CONF_OPTS = \ + -Ddocumentation=false \ + -Dmoduledir=/usr/lib/vdpau ifeq ($(BR2_PACKAGE_XORGPROTO),y) LIBVDPAU_DEPENDENCIES += xorgproto -LIBVDPAU_CONF_OPTS += --enable-dri2 +LIBVDPAU_CONF_OPTS += -Ddri2=true else -LIBVDPAU_CONF_OPTS += --disable-dri2 +LIBVDPAU_CONF_OPTS += -Ddri2=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/libvips/0001-fix-no-gtk-doc.patch b/buildroot/package/libvips/0001-fix-no-gtk-doc.patch deleted file mode 100644 index bfaf7c345..000000000 --- a/buildroot/package/libvips/0001-fix-no-gtk-doc.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a3d47be3b6bed845af5e1aa87ca2da2b1e840cbb Mon Sep 17 00:00:00 2001 -From: Pieter De Gendt -Date: Thu, 29 Jan 2015 12:25:35 +0100 -Subject: [PATCH] Same patch as for systemd in commit - http://git.buildroot.net/buildroot/commit/?id=7144f2f04b70553 - -Fix deactivation of gtk-doc - -The tarball contains the Makefile for building documentation with gtk-doc, -Unfortunately the AM_CONDITIONAL variable is not the correct one, which -results in an error when running autoreconf. - -This patch fixes this issue. - -Signed-off-by: Pieter De Gendt ---- - doc/reference/gtk-doc.make | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/reference/gtk-doc.make b/doc/reference/gtk-doc.make -index e791656..786803e 100644 ---- a/doc/reference/gtk-doc.make -+++ b/doc/reference/gtk-doc.make -@@ -267,7 +267,7 @@ uninstall-local: - # - # Require gtk-doc when making dist - # --if HAVE_GTK_DOC -+if ENABLE_GTK_DOC - dist-check-gtkdoc: docs - else - dist-check-gtkdoc: --- -2.2.2 - diff --git a/buildroot/package/libvips/Config.in b/buildroot/package/libvips/Config.in index e16e5277c..70d01f0e3 100644 --- a/buildroot/package/libvips/Config.in +++ b/buildroot/package/libvips/Config.in @@ -6,8 +6,8 @@ config BR2_PACKAGE_LIBVIPS # C++ support is required to build libvips # https://github.com/jcupitt/libvips/issues/231 depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBXML2 help libvips is a 2D image processing library. Compared to similar libraries, libvips runs quickly and uses little diff --git a/buildroot/package/libvips/libvips.hash b/buildroot/package/libvips/libvips.hash index 18c1ae80f..ba40e6dbb 100644 --- a/buildroot/package/libvips/libvips.hash +++ b/buildroot/package/libvips/libvips.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 45961855e21c8d5f0983d05bb79a6f3c2427dc6eed8e3ac68c0f62759b8612c6 vips-7.42.2.tar.gz +sha256 c5e4dd5a5c6a777c129037d19ca606769b3f1d405fcc9c8eeda906a61491f790 vips-8.8.3.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libvips/libvips.mk b/buildroot/package/libvips/libvips.mk index 72fcf6003..001a148a7 100644 --- a/buildroot/package/libvips/libvips.mk +++ b/buildroot/package/libvips/libvips.mk @@ -4,14 +4,11 @@ # ################################################################################ -LIBVIPS_VERSION_MAJOR = 7.42 -LIBVIPS_VERSION = $(LIBVIPS_VERSION_MAJOR).2 +LIBVIPS_VERSION = 8.8.3 LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz -LIBVIPS_SITE = http://www.vips.ecs.soton.ac.uk/supported/$(LIBVIPS_VERSION_MAJOR) +LIBVIPS_SITE = https://github.com/libvips/libvips/releases/download/v$(LIBVIPS_VERSION) LIBVIPS_LICENSE = LGPL-2.1+ LIBVIPS_LICENSE_FILES = COPYING -# We're patching gtk-doc.make, so need to autoreconf -LIBVIPS_AUTORECONF = YES # Sparc64 compile fails, for all optimization levels except -O0. To # fix the problem, use -O0 with no optimization instead. Bug reported @@ -41,12 +38,8 @@ LIBVIPS_CONF_OPTS = \ --without-python LIBVIPS_INSTALL_STAGING = YES LIBVIPS_DEPENDENCIES = \ - host-pkgconf libglib2 \ - libxml2 $(TARGET_NLS_DEPENDENCIES) - -# --disable-cxx is broken upstream -# https://github.com/jcupitt/libvips/issues/231 -LIBVIPS_CONF_OPTS += --enable-cxx + host-pkgconf expat libglib2 \ + $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_JPEG),y) LIBVIPS_CONF_OPTS += --with-jpeg diff --git a/buildroot/package/libvncserver/0001-CMakeLists.txt-fix-build-without-C.patch b/buildroot/package/libvncserver/0001-CMakeLists.txt-fix-build-without-C.patch new file mode 100644 index 000000000..591c97fd6 --- /dev/null +++ b/buildroot/package/libvncserver/0001-CMakeLists.txt-fix-build-without-C.patch @@ -0,0 +1,33 @@ +From 868f0a9fa60bb45ee6cf762f323c5b3964b2ee69 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 23 Jun 2019 10:18:59 +0200 +Subject: [PATCH] CMakeLists.txt: fix build without C++ + +Specify that libvncserver is a C project file otherwise build will fail +if no C++ compiler is found by cmake + +Fixes: + - http://autobuild.buildroot.org/results/16aaa4e86a2dbf1acf95f10d5131b0f7b8a3d61a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/LibVNC/libvncserver/pull/317] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0d3b4dc..ad609ae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.4) + cmake_policy(SET CMP0037 NEW) + +-project(LibVNCServer) ++project(LibVNCServer C) + include(CheckFunctionExists) + include(CheckSymbolExists) + include(CheckIncludeFile) +-- +2.20.1 + diff --git a/buildroot/package/libvncserver/0001-Limit-client-cut-text-length-to-1-MB.patch b/buildroot/package/libvncserver/0001-Limit-client-cut-text-length-to-1-MB.patch deleted file mode 100644 index 84a537640..000000000 --- a/buildroot/package/libvncserver/0001-Limit-client-cut-text-length-to-1-MB.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 28afb6c537dc82ba04d5f245b15ca7205c6dbb9c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 26 Feb 2018 13:48:00 +0100 -Subject: [PATCH] Limit client cut text length to 1 MB - -This patch constrains a client cut text length to 1 MB. Otherwise -a client could make server allocate 2 GB of memory and that seems to -be to much to classify it as a denial of service. - -The limit also prevents from an integer overflow followed by copying -an uninitilized memory when processing msg.cct.length value larger -than SIZE_MAX or INT_MAX - sz_rfbClientCutTextMsg. - -This patch also corrects accepting length value of zero (malloc(0) is -interpreted on differnet systems differently). - -CVE-2018-7225 - - -Signed-off-by: Peter Korsgaard ---- - libvncserver/rfbserver.c | 20 +++++++++++++++++++- - 1 file changed, 19 insertions(+), 1 deletion(-) - -diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c -index 116c488..4fc4d9d 100644 ---- a/libvncserver/rfbserver.c -+++ b/libvncserver/rfbserver.c -@@ -88,6 +88,8 @@ - #include - /* strftime() */ - #include -+/* PRIu32 */ -+#include - - #ifdef LIBVNCSERVER_WITH_WEBSOCKETS - #include "rfbssl.h" -@@ -2575,7 +2577,23 @@ rfbProcessClientNormalMessage(rfbClientPtr cl) - - msg.cct.length = Swap32IfLE(msg.cct.length); - -- str = (char *)malloc(msg.cct.length); -+ /* uint32_t input is passed to malloc()'s size_t argument, -+ * to rfbReadExact()'s int argument, to rfbStatRecordMessageRcvd()'s int -+ * argument increased of sz_rfbClientCutTextMsg, and to setXCutText()'s int -+ * argument. Here we impose a limit of 1 MB so that the value fits -+ * into all of the types to prevent from misinterpretation and thus -+ * from accessing uninitialized memory (CVE-2018-7225) and also to -+ * prevent from a denial-of-service by allocating to much memory in -+ * the server. */ -+ if (msg.cct.length > 1<<20) { -+ rfbLog("rfbClientCutText: too big cut text length requested: %" PRIu32 "\n", -+ msg.cct.length); -+ rfbCloseClient(cl); -+ return; -+ } -+ -+ /* Allow zero-length client cut text. */ -+ str = (char *)calloc(msg.cct.length ? msg.cct.length : 1, 1); - if (str == NULL) { - rfbLogPerror("rfbProcessClientNormalMessage: not enough memory"); - rfbCloseClient(cl); --- -2.11.0 - diff --git a/buildroot/package/libvncserver/0002-libvnc-client-server-.pc.cmakein-remove-zlib.patch b/buildroot/package/libvncserver/0002-libvnc-client-server-.pc.cmakein-remove-zlib.patch new file mode 100644 index 000000000..7941a9888 --- /dev/null +++ b/buildroot/package/libvncserver/0002-libvnc-client-server-.pc.cmakein-remove-zlib.patch @@ -0,0 +1,45 @@ +From 5abd95b65fe5ec24749164338a9718ecce19e240 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 28 Feb 2020 10:29:58 +0100 +Subject: [PATCH] libvnc{client,server}.pc.cmakein: remove zlib + +Remove zlib from Requires.private as libvnc can be built without zlib +thanks to WITH_LIB, zlib will be added to Libs.private thanks to +PRIVATE_LIBS + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/LibVNC/libvncserver/pull/377] +--- + libvncclient.pc.cmakein | 2 +- + libvncserver.pc.cmakein | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libvncclient.pc.cmakein b/libvncclient.pc.cmakein +index 336e73f..ceeda39 100644 +--- a/libvncclient.pc.cmakein ++++ b/libvncclient.pc.cmakein +@@ -7,7 +7,7 @@ Name: LibVNCClient + Description: A library for easy implementation of a VNC client. + Version: @LibVNCServer_VERSION@ + Requires: +-Requires.private: zlib ++Requires.private: + Libs: -L${libdir} -lvncclient + Libs.private: @PRIVATE_LIBS@ + Cflags: -I${includedir} +diff --git a/libvncserver.pc.cmakein b/libvncserver.pc.cmakein +index dfcec9d..33ec668 100644 +--- a/libvncserver.pc.cmakein ++++ b/libvncserver.pc.cmakein +@@ -7,7 +7,7 @@ Name: LibVNCServer + Description: A library for easy implementation of a VNC server. + Version: @LibVNCServer_VERSION@ + Requires: +-Requires.private: zlib ++Requires.private: + Libs: -L${libdir} -lvncserver + Libs.private: @PRIVATE_LIBS@ + Cflags: -I${includedir} +-- +2.25.0 + diff --git a/buildroot/package/libvncserver/0003-Limit-lenght-to-INT_MAX-bytes-in-rfbProcessFileTransferReadBuffer.patch b/buildroot/package/libvncserver/0003-Limit-lenght-to-INT_MAX-bytes-in-rfbProcessFileTransferReadBuffer.patch new file mode 100644 index 000000000..7461f11f8 --- /dev/null +++ b/buildroot/package/libvncserver/0003-Limit-lenght-to-INT_MAX-bytes-in-rfbProcessFileTransferReadBuffer.patch @@ -0,0 +1,47 @@ +From 09e8fc02f59f16e2583b34fe1a270c238bd9ffec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 7 Jan 2019 10:40:01 +0100 +Subject: [PATCH] Limit lenght to INT_MAX bytes in + rfbProcessFileTransferReadBuffer() + +This ammends 15bb719c03cc70f14c36a843dcb16ed69b405707 fix for a heap +out-of-bound write access in rfbProcessFileTransferReadBuffer() when +reading a transfered file content in a server. The former fix did not +work on platforms with a 32-bit int type (expected by rfbReadExact()). + +CVE-2018-15127 + + +[Retrieved from: +https://github.com/LibVNC/libvncserver/commit/09e8fc02f59f16e2583b34fe1a270c238bd9ffec] +Signed-off-by: Fabrice Fontaine +--- + libvncserver/rfbserver.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c +index 7af84906..f2edbeea 100644 +--- a/libvncserver/rfbserver.c ++++ b/libvncserver/rfbserver.c +@@ -88,6 +88,8 @@ + #include + /* strftime() */ + #include ++/* INT_MAX */ ++#include + + #ifdef LIBVNCSERVER_WITH_WEBSOCKETS + #include "rfbssl.h" +@@ -1472,8 +1474,11 @@ char *rfbProcessFileTransferReadBuffer(rfbClientPtr cl, uint32_t length) + 0XFFFFFFFF, i.e. SIZE_MAX for 32-bit systems. On 64-bit systems, a length of 0XFFFFFFFF + will safely be allocated since this check will never trigger and malloc() can digest length+1 + without problems as length is a uint32_t. ++ We also later pass length to rfbReadExact() that expects a signed int type and ++ that might wrap on platforms with a 32-bit int type if length is bigger ++ than 0X7FFFFFFF. + */ +- if(length == SIZE_MAX) { ++ if(length == SIZE_MAX || length > INT_MAX) { + rfbErr("rfbProcessFileTransferReadBuffer: too big file transfer length requested: %u", (unsigned int)length); + rfbCloseClient(cl); + return NULL; diff --git a/buildroot/package/libvncserver/0004-rfbserver-don-t-leak-stack-memory-to-the-remote.patch b/buildroot/package/libvncserver/0004-rfbserver-don-t-leak-stack-memory-to-the-remote.patch new file mode 100644 index 000000000..056b940cd --- /dev/null +++ b/buildroot/package/libvncserver/0004-rfbserver-don-t-leak-stack-memory-to-the-remote.patch @@ -0,0 +1,26 @@ +From d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a Mon Sep 17 00:00:00 2001 +From: Christian Beier +Date: Mon, 19 Aug 2019 22:32:25 +0200 +Subject: [PATCH] rfbserver: don't leak stack memory to the remote + +Thanks go to Pavel Cheremushkin of Kaspersky for reporting. +[Retrieved from: +https://github.com/LibVNC/libvncserver/commit/d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a] +Signed-off-by: Fabrice Fontaine +--- + libvncserver/rfbserver.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c +index 3bacc891..310e5487 100644 +--- a/libvncserver/rfbserver.c ++++ b/libvncserver/rfbserver.c +@@ -3724,6 +3724,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len) + rfbServerCutTextMsg sct; + rfbClientIteratorPtr iterator; + ++ memset((char *)&sct, 0, sizeof(sct)); ++ + iterator = rfbGetClientIterator(rfbScreen); + while ((cl = rfbClientIteratorNext(iterator)) != NULL) { + sct.type = rfbServerCutText; diff --git a/buildroot/package/libvncserver/0005-CMakeLists.txt-don-t-build-tight.c-without-png-or-zl.patch b/buildroot/package/libvncserver/0005-CMakeLists.txt-don-t-build-tight.c-without-png-or-zl.patch new file mode 100644 index 000000000..c357f8b3d --- /dev/null +++ b/buildroot/package/libvncserver/0005-CMakeLists.txt-don-t-build-tight.c-without-png-or-zl.patch @@ -0,0 +1,54 @@ +From 8f58a9d9f35e6b893b54b399be357bc789f6e630 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 Mar 2020 10:36:57 +0100 +Subject: [PATCH] CMakeLists.txt: don't build tight.c without png or zlib + +If the user enables JPEG and disable PNG and ZLIB, build will fail on: + +[ 42%] Building C object CMakeFiles/vncserver.dir/libvncserver/ws_decode.c.o +/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c: In function 'rfbSendRectEncodingTight': +/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c:276:7: error: 'struct _rfbClientRec' has no member named 'tightEncoding' + cl->tightEncoding = rfbEncodingTight; + ^~ +/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c: In function 'rfbSendRectEncodingTightPng': +/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c:287:7: error: 'struct _rfbClientRec' has no member named 'tightEncoding' + cl->tightEncoding = rfbEncodingTightPng; + ^~ +/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c: In function 'SendRectEncodingTight': +/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c:307:23: error: 'struct _rfbClientRec' has no member named 'tightCompressLevel' + compressLevel = cl->tightCompressLevel; + ^~ +/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c:308:22: error: 'struct _rfbClientRec' has no member named 'turboQualityLevel' + qualityLevel = cl->turboQualityLevel; + ^~ +/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c:309:22: error: 'struct _rfbClientRec' has no member named 'turboSubsampLevel' + subsampLevel = cl->turboSubsampLevel; + ^~ + +Fixes: + - http://autobuild.buildroot.org/results/bcc701055dd5876005fa6f78f38500399394cd75 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/LibVNC/libvncserver/pull/380] +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2a2cb15..b8bc9e2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -425,7 +425,9 @@ endif() + if(JPEG_FOUND) + add_definitions(-DLIBVNCSERVER_HAVE_LIBJPEG) + include_directories(${JPEG_INCLUDE_DIR}) +- set(TIGHT_C ${LIBVNCSERVER_DIR}/tight.c ${COMMON_DIR}/turbojpeg.c) ++ if(PNG_FOUND OR ZLIB_FOUND) ++ set(TIGHT_C ${LIBVNCSERVER_DIR}/tight.c ${COMMON_DIR}/turbojpeg.c) ++ endif(PNG_FOUND OR ZLIB_FOUND) + endif(JPEG_FOUND) + + if(PNG_FOUND) +-- +2.25.0 + diff --git a/buildroot/package/libvncserver/Config.in b/buildroot/package/libvncserver/Config.in index d5fac82e8..2d5bf8a18 100644 --- a/buildroot/package/libvncserver/Config.in +++ b/buildroot/package/libvncserver/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_LIBVNCSERVER depends on BR2_USE_MMU # VNCommand.c uses fork() # binutils issue (bad expression) depends on !BR2_nios2 + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LZO help libvncserver is a VNC server/client library. @@ -21,3 +23,8 @@ config BR2_PACKAGE_LIBVNCSERVER_TIGHTPNG http://wiki.qemu.org/VNC_Tight_PNG endif + +comment "libvncserver needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on !BR2_nios + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/libvncserver/libvncserver.hash b/buildroot/package/libvncserver/libvncserver.hash index 8d994e4b6..d98d78d76 100644 --- a/buildroot/package/libvncserver/libvncserver.hash +++ b/buildroot/package/libvncserver/libvncserver.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 193d630372722a532136fd25c5326b2ca1a636cbb8bf9bb115ef869c804d2894 LibVNCServer-0.9.11.tar.gz +sha256 33cbbb4e15bb390f723c311b323cef4a43bcf781984f92d92adda3243a116136 LibVNCServer-0.9.12.tar.gz +sha256 4d23c8c814e5baf007d854f01d8502e77dc56a41144934e003fb32c4e052d20f COPYING diff --git a/buildroot/package/libvncserver/libvncserver.mk b/buildroot/package/libvncserver/libvncserver.mk index 8063570d9..5b8648fa6 100644 --- a/buildroot/package/libvncserver/libvncserver.mk +++ b/buildroot/package/libvncserver/libvncserver.mk @@ -4,66 +4,80 @@ # ################################################################################ -LIBVNCSERVER_VERSION = 0.9.11 +LIBVNCSERVER_VERSION = 0.9.12 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_LICENSE = GPL-2.0+ LIBVNCSERVER_LICENSE_FILES = COPYING LIBVNCSERVER_INSTALL_STAGING = YES -LIBVNCSERVER_CONFIG_SCRIPTS = libvncserver-config -LIBVNCSERVER_DEPENDENCIES = host-pkgconf +LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo +LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON -# Upstream decided to remove generated autotools files from the -# tarball, so we need to generate them. -LIBVNCSERVER_AUTORECONF = YES +# 0003-Limit-lenght-to-INT_MAX-bytes-in-rfbProcessFileTransferReadBuffer.patch +LIBVNCSERVER_IGNORE_CVES += CVE-2018-20750 -# libvncserver does not get along with newer libva versions -# https://github.com/LibVNC/libvncserver/issues/11 -LIBVNCSERVER_CONF_OPTS += --without-libva +# 0004-rfbserver-don-t-leak-stack-memory-to-the-remote.patch +LIBVNCSERVER_IGNORE_CVES += CVE-2019-15681 # only used for examples -LIBVNCSERVER_CONF_OPTS += --with-sdl-config=/bin/false +LIBVNCSERVER_CONF_OPTS += \ + -DWITH_FFMPEG=OFF \ + -DWITH_SDL=OFF ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBVNCSERVER_CONF_OPTS += --without-pthread +LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=ON +else +LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=OFF endif # openssl supports needs NPTL thread support ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS_NPTL),yy) +LIBVNCSERVER_CONF_OPTS += -DWITH_OPENSSL=ON LIBVNCSERVER_DEPENDENCIES += openssl else -LIBVNCSERVER_CONF_OPTS += --without-crypto --without-ssl +LIBVNCSERVER_CONF_OPTS += -DWITH_OPENSSL=OFF endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -LIBVNCSERVER_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config +LIBVNCSERVER_CONF_OPTS += -DWITH_GCRYPT=ON LIBVNCSERVER_DEPENDENCIES += libgcrypt else -LIBVNCSERVER_CONF_OPTS += --without-gcrypt +LIBVNCSERVER_CONF_OPTS += -DWITH_GCRYPT=OFF endif ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy) -LIBVNCSERVER_DEPENDENCIES += gnutls host-pkgconf +LIBVNCSERVER_CONF_OPTS += -DWITH_GNUTLS=ON +LIBVNCSERVER_DEPENDENCIES += gnutls else -LIBVNCSERVER_CONF_OPTS += --without-gnutls +LIBVNCSERVER_CONF_OPTS += -DWITH_GNUTLS=OFF endif ifeq ($(BR2_PACKAGE_JPEG),y) +LIBVNCSERVER_CONF_OPTS += -DWITH_JPEG=ON LIBVNCSERVER_DEPENDENCIES += jpeg else -LIBVNCSERVER_CONF_OPTS += --without-jpeg +LIBVNCSERVER_CONF_OPTS += -DWITH_JPEG=OFF endif ifeq ($(BR2_PACKAGE_LIBPNG),y) +LIBVNCSERVER_CONF_OPTS += -DWITH_PNG=ON LIBVNCSERVER_DEPENDENCIES += libpng else -LIBVNCSERVER_CONF_OPTS += --without-png +LIBVNCSERVER_CONF_OPTS += -DWITH_PNG=OFF +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +LIBVNCSERVER_CONF_OPTS += -DWITH_SYSTEMD=ON +LIBVNCSERVER_DEPENDENCIES += systemd +else +LIBVNCSERVER_CONF_OPTS += -DWITH_SYSTEMD=OFF endif ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBVNCSERVER_CONF_OPTS += -DWITH_ZLIB=ON LIBVNCSERVER_DEPENDENCIES += zlib else -LIBVNCSERVER_CONF_OPTS += --without-zlib +LIBVNCSERVER_CONF_OPTS += -DWITH_ZLIB=OFF endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/buildroot/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch b/buildroot/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch index e84f3d479..94dc4c614 100644 --- a/buildroot/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch +++ b/buildroot/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch @@ -4,11 +4,14 @@ Subject: CVE-2017-14160: fix bounds check on very low sample rates. X-Git-Url: https://git.xiph.org/?p=vorbis.git;a=commitdiff_plain;h=018ca26dece618457dd13585cad52941193c4a25 CVE-2017-14160: fix bounds check on very low sample rates. +CVE-2018-10393: Out-of-bounds Read Downloaded from upstream commit https://git.xiph.org/?p=vorbis.git;a=commitdiff;h=018ca26dece618457dd13585cad52941193c4a25 Signed-off-by: Bernd Kuhls +[yann.morin.1998@free.fr: also fixes CVE-2018-10393] +Signed-off-by: Yann E. MORIN --- diff --git a/lib/psy.c b/lib/psy.c diff --git a/buildroot/package/libvorbis/0002-Sanity-check-number-of-channels-in-setup.patch b/buildroot/package/libvorbis/0002-Sanity-check-number-of-channels-in-setup.patch new file mode 100644 index 000000000..1208839a2 --- /dev/null +++ b/buildroot/package/libvorbis/0002-Sanity-check-number-of-channels-in-setup.patch @@ -0,0 +1,28 @@ +From 112d3bd0aaacad51305e1464d4b381dabad0e88b Mon Sep 17 00:00:00 2001 +From: Thomas Daede +Date: Thu, 17 May 2018 16:19:19 -0700 +Subject: [PATCH] Sanity check number of channels in setup. + +Fixes #2335. +[Retrieved from: +https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaacad51305e1464d4b381dabad0e88b] +Signed-off-by: Fabrice Fontaine +--- + lib/vorbisenc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c +index 4fc7b62..64a51b5 100644 +--- a/lib/vorbisenc.c ++++ b/lib/vorbisenc.c +@@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info *vi){ + highlevel_encode_setup *hi=&ci->hi; + + if(ci==NULL)return(OV_EINVAL); ++ if(vi->channels<1||vi->channels>255)return(OV_EINVAL); + if(!hi->impulse_block_p)i0=1; + + /* too low/high an ATH floater is nonsensical, but doesn't break anything */ +-- +2.24.1 + diff --git a/buildroot/package/libvorbis/libvorbis.mk b/buildroot/package/libvorbis/libvorbis.mk index ae2c1efff..708f3364e 100644 --- a/buildroot/package/libvorbis/libvorbis.mk +++ b/buildroot/package/libvorbis/libvorbis.mk @@ -13,4 +13,10 @@ LIBVORBIS_DEPENDENCIES = host-pkgconf libogg LIBVORBIS_LICENSE = BSD-3-Clause LIBVORBIS_LICENSE_FILES = COPYING +# 0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch +LIBVORBIS_IGNORE_CVES += CVE-2018-10393 + +# 0002-Sanity-check-number-of-channels-in-setup.patch +LIBVORBIS_IGNORE_CVES += CVE-2018-10392 + $(eval $(autotools-package)) diff --git a/buildroot/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch b/buildroot/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch index e17ff7171..12960a626 100644 --- a/buildroot/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch +++ b/buildroot/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch @@ -16,7 +16,7 @@ index c14f288..82df745 100644 --- a/vpx_mem/vpx_mem.h +++ b/vpx_mem/vpx_mem.h @@ -12,9 +12,6 @@ - #define VPX_MEM_VPX_MEM_H_ + #define VPX_VPX_MEM_VPX_MEM_H_ #include "vpx_config.h" -#if defined(__uClinux__) diff --git a/buildroot/package/libvpx/libvpx.hash b/buildroot/package/libvpx/libvpx.hash index 1397b62f7..b75cd8d47 100644 --- a/buildroot/package/libvpx/libvpx.hash +++ b/buildroot/package/libvpx/libvpx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238 libvpx-v1.7.0.tar.gz +sha256 8735d9fcd1a781ae6917f28f239a8aa358ce4864ba113ea18af4bb2dc8b474ac libvpx-1.8.2.tar.gz sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 LICENSE sha256 cc3273e0694ea5896145e0677699b53471b03ea43021ddc50e7923fbb9f5023c PATENTS diff --git a/buildroot/package/libvpx/libvpx.mk b/buildroot/package/libvpx/libvpx.mk index 0f867eb2a..689ad6f05 100644 --- a/buildroot/package/libvpx/libvpx.mk +++ b/buildroot/package/libvpx/libvpx.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBVPX_VERSION = v1.7.0 -LIBVPX_SITE = $(call github,webmproject,libvpx,$(LIBVPX_VERSION)) +LIBVPX_VERSION = 1.8.2 +LIBVPX_SITE = $(call github,webmproject,libvpx,v$(LIBVPX_VERSION)) LIBVPX_LICENSE = BSD-3-Clause LIBVPX_LICENSE_FILES = LICENSE PATENTS LIBVPX_INSTALL_STAGING = YES diff --git a/buildroot/package/libwebsock/libwebsock.hash b/buildroot/package/libwebsock/libwebsock.hash index b94b73810..11b4f55f0 100644 --- a/buildroot/package/libwebsock/libwebsock.hash +++ b/buildroot/package/libwebsock/libwebsock.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 34cf8376446e2371c9af47394043a30dc16af7ed5437d56bc6135c5dfda9ed22 libwebsock-3c1615eeadb0b582b63851073bfe3e5132f31ebc.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.lesser diff --git a/buildroot/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch b/buildroot/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch new file mode 100644 index 000000000..868685d39 --- /dev/null +++ b/buildroot/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch @@ -0,0 +1,34 @@ +From 5f8134cfe5e7b90a8ce07d27ae737dcc54b523b3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 16 Oct 2019 20:09:13 +0200 +Subject: [PATCH] CMakeLists.txt: fix static build with openssl + +openssl can depends on -latomic so use pkg-config (if available) to +retrieve these static dependencies otherwise build will fail because +HMAC_CTX_new test will return a wrong result + +Fixes: + - http://autobuild.buildroot.org/results/65d0528b208c0a470264f7e2433be89425971dd7 + +Signed-off-by: Fabrice Fontaine +[Retrieved (and backported) from: +https://github.com/warmcat/libwebsockets/commit/5f8134cfe5e7b90a8ce07d27ae737dcc54b523b3] +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2693ac56a..888f65e83 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1803,7 +1803,10 @@ if (LWS_WITH_SSL) + if (NOT OPENSSL_FOUND AND NOT LWS_WITH_BORINGSSL) + # TODO: Add support for STATIC also. + if (NOT LWS_WITH_ESP32) ++ find_package(PkgConfig QUIET) ++ pkg_check_modules(PC_OPENSSL openssl QUIET) + find_package(OpenSSL REQUIRED) ++ list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES}) + endif() + set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}") + endif() diff --git a/buildroot/package/libwebsockets/libwebsockets.hash b/buildroot/package/libwebsockets/libwebsockets.hash index ea7c8ca6b..ca0c1db2d 100644 --- a/buildroot/package/libwebsockets/libwebsockets.hash +++ b/buildroot/package/libwebsockets/libwebsockets.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 73012d7fcf428dedccc816e83a63a01462e27819d5537b8e0d0c7264bfacfad6 libwebsockets-v2.4.2.tar.gz -sha256 078fbbbeab357fc6d4f8090e95e9022fa4cb9eac1efd77b2f1387e9ccc51917a LICENSE +sha256 166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c libwebsockets-3.2.2.tar.gz +sha256 4d092cd5e062c5ab0cf6408963d74619b5baf1571344410be6aa5bcef512eb70 LICENSE diff --git a/buildroot/package/libwebsockets/libwebsockets.mk b/buildroot/package/libwebsockets/libwebsockets.mk index 81e398bed..dedd03347 100644 --- a/buildroot/package/libwebsockets/libwebsockets.mk +++ b/buildroot/package/libwebsockets/libwebsockets.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = v2.4.2 -LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,$(LIBWEBSOCKETS_VERSION)) +LIBWEBSOCKETS_VERSION = 3.2.2 +LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) LIBWEBSOCKETS_LICENSE = LGPL-2.1 with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE LIBWEBSOCKETS_DEPENDENCIES = zlib @@ -30,16 +30,18 @@ endif ifeq ($(BR2_PACKAGE_LIBEV),y) LIBWEBSOCKETS_DEPENDENCIES += libev -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=ON -else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBEVENT),y) +LIBWEBSOCKETS_CONF_OPTS += \ + -DLWS_WITH_LIBEV=ON \ + -DLWS_WITH_LIBEVENT=OFF +else ifeq ($(BR2_PACKAGE_LIBEVENT),y) LIBWEBSOCKETS_DEPENDENCIES += libevent -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEVENT=ON +LIBWEBSOCKETS_CONF_OPTS += \ + -DLWS_WITH_LIBEV=OFF \ + -DLWS_WITH_LIBEVENT=ON else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEVENT=OFF +LIBWEBSOCKETS_CONF_OPTS += \ + -DLWS_WITH_LIBEV=OFF \ + -DLWS_WITH_LIBEVENT=OFF endif ifeq ($(BR2_PACKAGE_LIBUV),y) diff --git a/buildroot/package/libwpe/Config.in b/buildroot/package/libwpe/Config.in new file mode 100644 index 000000000..c11c85398 --- /dev/null +++ b/buildroot/package/libwpe/Config.in @@ -0,0 +1,13 @@ +comment "libwpe needs a toolchain w/ C++, dynamic library and an OpenEGL-capable backend" + depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS + +config BR2_PACKAGE_LIBWPE + bool "libwpe" + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_LIBXKBCOMMON + help + Base library for the WPE WebKit port. + + https://wpewebkit.org/ diff --git a/buildroot/package/libwpe/libwpe.hash b/buildroot/package/libwpe/libwpe.hash new file mode 100644 index 000000000..0a616a31c --- /dev/null +++ b/buildroot/package/libwpe/libwpe.hash @@ -0,0 +1,7 @@ +# From https://wpewebkit.org/releases/libwpe-1.4.0.1.tar.xz.sums +md5 1d4d38413ee0d0043f74d0445cab906f libwpe-1.4.0.1.tar.xz +sha1 a41480a0a85cfa11b3f87f801b7c37bc3410e060 libwpe-1.4.0.1.tar.xz +sha256 09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b libwpe-1.4.0.1.tar.xz + +# Hashes for license files: +sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/buildroot/package/libwpe/libwpe.mk b/buildroot/package/libwpe/libwpe.mk new file mode 100644 index 000000000..09518ce9b --- /dev/null +++ b/buildroot/package/libwpe/libwpe.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# libwpe +# +################################################################################ + +LIBWPE_VERSION = 1.4.0.1 +LIBWPE_SITE = https://wpewebkit.org/releases +LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz +LIBWPE_INSTALL_STAGING = YES +LIBWPE_LICENSE = BSD-2-Clause +LIBWPE_LICENSE_FILES = COPYING +LIBWPE_DEPENDENCIES = libegl libxkbcommon + +# Workaround for https://github.com/raspberrypi/userland/issues/316 +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +LIBWPE_CONF_OPTS += \ + -DCMAKE_C_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE' \ + -DCMAKE_CXX_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE' +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/libxkbcommon/libxkbcommon.hash b/buildroot/package/libxkbcommon/libxkbcommon.hash index 67ae4b592..c734f3ad9 100644 --- a/buildroot/package/libxkbcommon/libxkbcommon.hash +++ b/buildroot/package/libxkbcommon/libxkbcommon.hash @@ -1,5 +1,7 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2018-August/039243.html -sha256 7ab8c4b3403d89d01898066b72cb6069bddeb5af94905a65368f671a026ed58c libxkbcommon-0.8.2.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2019-February/040102.html +md5 3c4409058dfd203f641a563358e0187d libxkbcommon-0.8.4.tar.xz +sha1 0ce9df42239d451f61b2112c6ba8d0a1a0879009 libxkbcommon-0.8.4.tar.xz +sha256 60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b libxkbcommon-0.8.4.tar.xz # License file: sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE diff --git a/buildroot/package/libxkbcommon/libxkbcommon.mk b/buildroot/package/libxkbcommon/libxkbcommon.mk index 2045d9638..1f54de426 100644 --- a/buildroot/package/libxkbcommon/libxkbcommon.mk +++ b/buildroot/package/libxkbcommon/libxkbcommon.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 0.8.2 +LIBXKBCOMMON_VERSION = 0.8.4 LIBXKBCOMMON_SITE = http://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 diff --git a/buildroot/package/libxml-parser-perl/libxml-parser-perl.hash b/buildroot/package/libxml-parser-perl/libxml-parser-perl.hash index d8e0df5a2..7aeec70b9 100644 --- a/buildroot/package/libxml-parser-perl/libxml-parser-perl.hash +++ b/buildroot/package/libxml-parser-perl/libxml-parser-perl.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216 XML-Parser-2.44.tar.gz +sha256 d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d XML-Parser-2.46.tar.gz +sha256 6a2e768443ed00f09d3d4bc4dd14451035eac13c6864d68d8e2f76edf5a044f2 README diff --git a/buildroot/package/libxml-parser-perl/libxml-parser-perl.mk b/buildroot/package/libxml-parser-perl/libxml-parser-perl.mk index 514c457d5..fcde5fc93 100644 --- a/buildroot/package/libxml-parser-perl/libxml-parser-perl.mk +++ b/buildroot/package/libxml-parser-perl/libxml-parser-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXML_PARSER_PERL_VERSION = 2.44 +LIBXML_PARSER_PERL_VERSION = 2.46 LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz LIBXML_PARSER_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat diff --git a/buildroot/package/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch b/buildroot/package/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch new file mode 100644 index 000000000..a79adc3f8 --- /dev/null +++ b/buildroot/package/libxml2/0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch @@ -0,0 +1,36 @@ +From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Thu, 12 Dec 2019 17:30:55 +0800 +Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities + +When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef +return NULL which cause a infinite loop in xmlStringLenDecodeEntities + +Found with libFuzzer. + +Fixes CVE-2020-7595: xmlStringLenDecodeEntities in parser.c in libxml2 +2.9.10 has an infinite loop in a certain end-of-file situation. + +Signed-off-by: Zhipeng Xie +Signed-off-by: Peter Korsgaard +--- + parser.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/parser.c b/parser.c +index d1c31963..a34bb6cd 100644 +--- a/parser.c ++++ b/parser.c +@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + else + c = 0; + while ((c != 0) && (c != end) && /* non input consuming loop */ +- (c != end2) && (c != end3)) { ++ (c != end2) && (c != end3) && ++ (ctxt->instate != XML_PARSER_EOF)) { + + if (c == 0) break; + if ((c == '&') && (str[1] == '#')) { +-- +2.20.1 + diff --git a/buildroot/package/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch b/buildroot/package/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch new file mode 100644 index 000000000..2aeddf677 --- /dev/null +++ b/buildroot/package/libxml2/0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch @@ -0,0 +1,35 @@ +From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001 +From: Zhipeng Xie +Date: Tue, 20 Aug 2019 16:33:06 +0800 +Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream + +When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun +alloc a new schema for ctxt->schema and set vctxt->xsiAssemble +to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize +vctxt->xsiAssemble to 0 again which cause the alloced schema +can not be freed anymore. + +Found with libFuzzer. + +Signed-off-by: Zhipeng Xie +[import into Buildroot] +Signed-off-by: Thomas De Schampheleire +--- + xmlschemas.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 301c8449..39d92182 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { + vctxt->nberrors = 0; + vctxt->depth = -1; + vctxt->skipDepth = -1; +- vctxt->xsiAssemble = 0; + vctxt->hasKeyrefs = 0; + #ifdef ENABLE_IDC_NODE_TABLES_TEST + vctxt->createIDCNodeTables = 1; +-- +2.24.1 + diff --git a/buildroot/package/libxml2/libxml2.hash b/buildroot/package/libxml2/libxml2.hash index ce8f5ef7f..d890713a7 100644 --- a/buildroot/package/libxml2/libxml2.hash +++ b/buildroot/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871 libxml2-2.9.9.tar.gz +sha256 aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f libxml2-2.9.10.tar.gz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING diff --git a/buildroot/package/libxml2/libxml2.mk b/buildroot/package/libxml2/libxml2.mk index f4b4de090..ea6a8c1f6 100644 --- a/buildroot/package/libxml2/libxml2.mk +++ b/buildroot/package/libxml2/libxml2.mk @@ -4,11 +4,15 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.9 +LIBXML2_VERSION = 2.9.10 LIBXML2_SITE = http://xmlsoft.org/sources LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = COPYING +# 0001-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch +LIBXML2_IGNORE_CVES += CVE-2020-7595 +# 0002-Fix-memory-leak-in-xmlSchemaValidateStream.patch +LIBXML2_IGNORE_CVES += CVE-2019-20388 LIBXML2_CONFIG_SCRIPTS = xml2-config # relocation truncated to fit: R_68K_GOT16O diff --git a/buildroot/package/libxmlpp/Config.in b/buildroot/package/libxmlpp/Config.in index 724458684..3249a8439 100644 --- a/buildroot/package/libxmlpp/Config.in +++ b/buildroot/package/libxmlpp/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_LIBXMLPP help libxml++ is a C++ wrapper for the libxml XML parser library. - http://libxmlplusplus.sourceforge.net/ + https://libxmlplusplus.github.io/libxmlplusplus/ comment "libxml++ needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ diff --git a/buildroot/package/libxmlpp/libxmlpp.hash b/buildroot/package/libxmlpp/libxmlpp.hash index cc5247a11..7a59880e7 100644 --- a/buildroot/package/libxmlpp/libxmlpp.hash +++ b/buildroot/package/libxmlpp/libxmlpp.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libxml++/3.0/libxml++-3.0.1.sha256sum -sha256 19dc8d21751806c015179bc0b83f978e65c878724501bfc0b6c1bcead29971a6 libxml++-3.0.1.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/libxml++/3.2/libxml++-3.2.0.sha256sum +sha256 b786fae7fd7820d356698069a787d107995c3efcbef50d8f4efd3766ab768e4f libxml++-3.2.0.tar.xz # Hash for license file -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/buildroot/package/libxmlpp/libxmlpp.mk b/buildroot/package/libxmlpp/libxmlpp.mk index 14a3d97a8..98cba2a5a 100644 --- a/buildroot/package/libxmlpp/libxmlpp.mk +++ b/buildroot/package/libxmlpp/libxmlpp.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBXMLPP_VERSION_MAJOR = 3.0 -LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).1 +LIBXMLPP_VERSION_MAJOR = 3.2 +LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).0 LIBXMLPP_LICENSE = LGPL-2.1 (library), LGPL-2.0+ (examples) LIBXMLPP_LICENSE_FILES = COPYING LIBXMLPP_SOURCE = libxml++-$(LIBXMLPP_VERSION).tar.xz diff --git a/buildroot/package/libxmlrpc/libxmlrpc.mk b/buildroot/package/libxmlrpc/libxmlrpc.mk index 90791bd67..54db9f1f8 100644 --- a/buildroot/package/libxmlrpc/libxmlrpc.mk +++ b/buildroot/package/libxmlrpc/libxmlrpc.mk @@ -16,7 +16,7 @@ LIBXMLRPC_MAKE = $(MAKE1) # Using autoconf, not automake, so we cannot use AUTORECONF = YES. define LIBXMLRPC_RUN_AUTOCONF - cd $(@D); $(HOST_DIR)/bin/autoconf + cd $(@D); $(AUTOCONF) endef LIBXMLRPC_PRE_CONFIGURE_HOOKS += LIBXMLRPC_RUN_AUTOCONF diff --git a/buildroot/package/libxslt/0001-Fix-security-framework-bypass.patch b/buildroot/package/libxslt/0001-Fix-security-framework-bypass.patch deleted file mode 100644 index 16700362b..000000000 --- a/buildroot/package/libxslt/0001-Fix-security-framework-bypass.patch +++ /dev/null @@ -1,122 +0,0 @@ -From e03553605b45c88f0b4b2980adfbbb8f6fca2fd6 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Sun, 24 Mar 2019 09:51:39 +0100 -Subject: [PATCH] Fix security framework bypass - -xsltCheckRead and xsltCheckWrite return -1 in case of error but callers -don't check for this condition and allow access. With a specially -crafted URL, xsltCheckRead could be tricked into returning an error -because of a supposedly invalid URL that would still be loaded -succesfully later on. - -Fixes #12. - -Thanks to Felix Wilhelm for the report. - -Signed-off-by: Peter Korsgaard ---- - libxslt/documents.c | 18 ++++++++++-------- - libxslt/imports.c | 9 +++++---- - libxslt/transform.c | 9 +++++---- - libxslt/xslt.c | 9 +++++---- - 4 files changed, 25 insertions(+), 20 deletions(-) - -diff --git a/libxslt/documents.c b/libxslt/documents.c -index 3f3a7312..4aad11bb 100644 ---- a/libxslt/documents.c -+++ b/libxslt/documents.c -@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const xmlChar *URI) { - int res; - - res = xsltCheckRead(ctxt->sec, ctxt, URI); -- if (res == 0) { -- xsltTransformError(ctxt, NULL, NULL, -- "xsltLoadDocument: read rights for %s denied\n", -- URI); -+ if (res <= 0) { -+ if (res == 0) -+ xsltTransformError(ctxt, NULL, NULL, -+ "xsltLoadDocument: read rights for %s denied\n", -+ URI); - return(NULL); - } - } -@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const xmlChar *URI) { - int res; - - res = xsltCheckRead(sec, NULL, URI); -- if (res == 0) { -- xsltTransformError(NULL, NULL, NULL, -- "xsltLoadStyleDocument: read rights for %s denied\n", -- URI); -+ if (res <= 0) { -+ if (res == 0) -+ xsltTransformError(NULL, NULL, NULL, -+ "xsltLoadStyleDocument: read rights for %s denied\n", -+ URI); - return(NULL); - } - } -diff --git a/libxslt/imports.c b/libxslt/imports.c -index 874870cc..3783b247 100644 ---- a/libxslt/imports.c -+++ b/libxslt/imports.c -@@ -130,10 +130,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, xmlNodePtr cur) { - int secres; - - secres = xsltCheckRead(sec, NULL, URI); -- if (secres == 0) { -- xsltTransformError(NULL, NULL, NULL, -- "xsl:import: read rights for %s denied\n", -- URI); -+ if (secres <= 0) { -+ if (secres == 0) -+ xsltTransformError(NULL, NULL, NULL, -+ "xsl:import: read rights for %s denied\n", -+ URI); - goto error; - } - } -diff --git a/libxslt/transform.c b/libxslt/transform.c -index 13793914..0636dbd0 100644 ---- a/libxslt/transform.c -+++ b/libxslt/transform.c -@@ -3493,10 +3493,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNodePtr node, - */ - if (ctxt->sec != NULL) { - ret = xsltCheckWrite(ctxt->sec, ctxt, filename); -- if (ret == 0) { -- xsltTransformError(ctxt, NULL, inst, -- "xsltDocumentElem: write rights for %s denied\n", -- filename); -+ if (ret <= 0) { -+ if (ret == 0) -+ xsltTransformError(ctxt, NULL, inst, -+ "xsltDocumentElem: write rights for %s denied\n", -+ filename); - xmlFree(URL); - xmlFree(filename); - return; -diff --git a/libxslt/xslt.c b/libxslt/xslt.c -index 780a5ad7..a234eb79 100644 ---- a/libxslt/xslt.c -+++ b/libxslt/xslt.c -@@ -6763,10 +6763,11 @@ xsltParseStylesheetFile(const xmlChar* filename) { - int res; - - res = xsltCheckRead(sec, NULL, filename); -- if (res == 0) { -- xsltTransformError(NULL, NULL, NULL, -- "xsltParseStylesheetFile: read rights for %s denied\n", -- filename); -+ if (res <= 0) { -+ if (res == 0) -+ xsltTransformError(NULL, NULL, NULL, -+ "xsltParseStylesheetFile: read rights for %s denied\n", -+ filename); - return(NULL); - } - } --- -2.11.0 - diff --git a/buildroot/package/libxslt/libxslt.hash b/buildroot/package/libxslt/libxslt.hash index f28150b71..25aa30839 100644 --- a/buildroot/package/libxslt/libxslt.hash +++ b/buildroot/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460 libxslt-1.1.32.tar.gz +sha256 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f libxslt-1.1.34.tar.gz # Hash for license file: sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/buildroot/package/libxslt/libxslt.mk b/buildroot/package/libxslt/libxslt.mk index 4632301b1..2f37f303a 100644 --- a/buildroot/package/libxslt/libxslt.mk +++ b/buildroot/package/libxslt/libxslt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.32 +LIBXSLT_VERSION = 1.1.34 LIBXSLT_SITE = http://xmlsoft.org/sources LIBXSLT_INSTALL_STAGING = YES LIBXSLT_LICENSE = MIT diff --git a/buildroot/package/libyaml/libyaml.hash b/buildroot/package/libyaml/libyaml.hash index afc014dfb..49693b507 100644 --- a/buildroot/package/libyaml/libyaml.hash +++ b/buildroot/package/libyaml/libyaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 78281145641a080fb32d6e7a87b9c0664d611dcb4d542e90baf731f51cbb59cd yaml-0.2.1.tar.gz -sha256 bfcb6a7dfbfd30e0ccc8bb34ab712bd1568586ad8c5b078ccae443b04e79749e LICENSE +sha256 4a9100ab61047fd9bd395bcef3ce5403365cafd55c1e0d0299cde14958e47be9 yaml-0.2.2.tar.gz +sha256 a2adb9c959b797494a0ef80bdf60e22db2749ee3e0c0908556e3eb548f967c56 LICENSE diff --git a/buildroot/package/libyaml/libyaml.mk b/buildroot/package/libyaml/libyaml.mk index dc7368a16..1ba069a1b 100644 --- a/buildroot/package/libyaml/libyaml.mk +++ b/buildroot/package/libyaml/libyaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYAML_VERSION = 0.2.1 +LIBYAML_VERSION = 0.2.2 LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz LIBYAML_SITE = http://pyyaml.org/download/libyaml LIBYAML_INSTALL_STAGING = YES diff --git a/buildroot/package/libyang/Config.in b/buildroot/package/libyang/Config.in new file mode 100644 index 000000000..fec1160a6 --- /dev/null +++ b/buildroot/package/libyang/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_LIBYANG + bool "libyang" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE_UCP + help + Libyang is YANG data modeling language parser and toolkit + written (and providing API) in C. + + https://github.com/CESNET/libyang + +comment "libyang needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/libyang/libyang.hash b/buildroot/package/libyang/libyang.hash new file mode 100644 index 000000000..c5426042b --- /dev/null +++ b/buildroot/package/libyang/libyang.hash @@ -0,0 +1,2 @@ +sha256 1686a381a8cce775102e60c8eb93f7ba64c6d4ae10591fc05d9f969a07815f60 libyang-1.0.109.tar.gz +sha256 f942fe693e03e4e3ff67a351c00dc8f468a042e0d7273b0aa6bc53060b568112 LICENSE diff --git a/buildroot/package/libyang/libyang.mk b/buildroot/package/libyang/libyang.mk new file mode 100644 index 000000000..648ffeb6a --- /dev/null +++ b/buildroot/package/libyang/libyang.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# libyang +# +################################################################################ + +LIBYANG_VERSION = 1.0.109 +LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) +LIBYANG_LICENSE = BSD-3-Clause +LIBYANG_LICENSE_FILES = LICENSE +LIBYANG_INSTALL_STAGING = YES +LIBYANG_SUPPORTS_IN_SOURCE_BUILD = NO +LIBYANG_DEPENDENCIES = pcre +HOST_LIBYANG_DEPENDENCIES = host-pcre + +LIBYANG_CONF_OPTS = \ + -DENABLE_VALGRIND_TESTS=OFF \ + -DGEN_PYTHON_BINDINGS=OFF + +HOST_LIBYANG_CONF_OPTS = \ + -DENABLE_VALGRIND_TESTS=OFF \ + -DGEN_PYTHON_BINDINGS=OFF + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/buildroot/package/libyuv/0002-aarch64.patch b/buildroot/package/libyuv/0002-aarch64.patch deleted file mode 100644 index c783cffe8..000000000 --- a/buildroot/package/libyuv/0002-aarch64.patch +++ /dev/null @@ -1,36 +0,0 @@ -Add missing source files for aarch64. - -Signed-off-by: Bernd Kuhls - -diff -uNr libyuv-1ebf86795cb213a37f06eb1ef3713cff080568ea.org/CMakeLists.txt libyuv-1ebf86795cb213a37f06eb1ef3713cff080568ea/CMakeLists.txt ---- libyuv-1ebf86795cb213a37f06eb1ef3713cff080568ea.org/CMakeLists.txt 2015-06-20 00:04:06.000000000 +0200 -+++ libyuv-1ebf86795cb213a37f06eb1ef3713cff080568ea/CMakeLists.txt 2015-09-07 19:29:42.898034988 +0200 -@@ -14,6 +14,7 @@ - ${ly_src_dir}/compare.cc - ${ly_src_dir}/compare_common.cc - ${ly_src_dir}/compare_neon.cc -+ ${ly_src_dir}/compare_neon64.cc - ${ly_src_dir}/compare_gcc.cc - ${ly_src_dir}/compare_win.cc - ${ly_src_dir}/convert.cc -@@ -31,10 +32,12 @@ - ${ly_src_dir}/rotate_argb.cc - ${ly_src_dir}/rotate_mips.cc - ${ly_src_dir}/rotate_neon.cc -+ ${ly_src_dir}/rotate_neon64.cc - ${ly_src_dir}/row_any.cc - ${ly_src_dir}/row_common.cc - ${ly_src_dir}/row_mips.cc - ${ly_src_dir}/row_neon.cc -+ ${ly_src_dir}/row_neon64.cc - ${ly_src_dir}/row_gcc.cc - ${ly_src_dir}/row_win.cc - ${ly_src_dir}/scale.cc -@@ -43,6 +46,7 @@ - ${ly_src_dir}/scale_common.cc - ${ly_src_dir}/scale_mips.cc - ${ly_src_dir}/scale_neon.cc -+ ${ly_src_dir}/scale_neon64.cc - ${ly_src_dir}/scale_gcc.cc - ${ly_src_dir}/scale_win.cc - ${ly_src_dir}/video_common.cc diff --git a/buildroot/package/libyuv/libyuv.hash b/buildroot/package/libyuv/libyuv.hash index 0361ce6ee..e0d4e57e1 100644 --- a/buildroot/package/libyuv/libyuv.hash +++ b/buildroot/package/libyuv/libyuv.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 ec31df87fc42153723e9ca65a6d71b0993504c3de5f925e79464c93b7ef66094 libyuv-1ebf86795cb213a37f06eb1ef3713cff080568ea.tar.gz +sha256 395075bed7e048f5f7d4fe9cb9255ce0afcee3f8f093741a7af1a2b1c579d089 libyuv-413a8d8041f1cc5a350a47c0d81cc721e64f9fd0.tar.gz +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f LICENSE diff --git a/buildroot/package/libyuv/libyuv.mk b/buildroot/package/libyuv/libyuv.mk index 1abe12632..b3843cec8 100644 --- a/buildroot/package/libyuv/libyuv.mk +++ b/buildroot/package/libyuv/libyuv.mk @@ -4,11 +4,8 @@ # ################################################################################ -LIBYUV_VERSION = 1ebf86795cb213a37f06eb1ef3713cff080568ea -# we use the FreeSwitch fork because there is currently no alternative -# for https://chromium.googlesource.com/libyuv/libyuv which will be -# deactivated in 2015. -LIBYUV_SITE = https://freeswitch.org/stash/scm/sd/libyuv.git +LIBYUV_VERSION = 413a8d8041f1cc5a350a47c0d81cc721e64f9fd0 +LIBYUV_SITE = https://chromium.googlesource.com/libyuv/libyuv LIBYUV_SITE_METHOD = git LIBYUV_LICENSE = BSD-3-Clause LIBYUV_LICENSE_FILES = LICENSE diff --git a/buildroot/package/libzip/Config.in b/buildroot/package/libzip/Config.in index f69dd0d4d..c6ddabe6b 100644 --- a/buildroot/package/libzip/Config.in +++ b/buildroot/package/libzip/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBZIP bool "libzip" depends on !BR2_STATIC_LIBS # dlsym() + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_ZLIB help C library for reading, creating, and modifying zip archives. diff --git a/buildroot/package/libzip/libzip.hash b/buildroot/package/libzip/libzip.hash index e9ed4717c..eb11b526f 100644 --- a/buildroot/package/libzip/libzip.hash +++ b/buildroot/package/libzip/libzip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 04ea35b6956c7b3453f1ed3f3fe40e3ddae1f43931089124579e8384e79ed372 libzip-1.5.1.tar.xz +sha256 b3de4d4bd49a01e0cab3507fc163f88e1651695b6b9cb25ad174dbe319d4a3b4 libzip-1.5.2.tar.xz sha256 04464e729973cf58189051e7a3e8bca2acce9a1058c735e9e2eb1fdbe0fbbf50 LICENSE diff --git a/buildroot/package/libzip/libzip.mk b/buildroot/package/libzip/libzip.mk index 20c04122e..a312dd90d 100644 --- a/buildroot/package/libzip/libzip.mk +++ b/buildroot/package/libzip/libzip.mk @@ -4,13 +4,14 @@ # ################################################################################ -LIBZIP_VERSION = 1.5.1 +LIBZIP_VERSION = 1.5.2 LIBZIP_SITE = http://www.nih.at/libzip LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz LIBZIP_LICENSE = BSD-3-Clause LIBZIP_LICENSE_FILES = LICENSE LIBZIP_INSTALL_STAGING = YES LIBZIP_DEPENDENCIES = zlib +HOST_LIBZIP_DEPENDENCIES = host-zlib ifeq ($(BR2_PACKAGE_BZIP2),y) LIBZIP_DEPENDENCIES += bzip2 @@ -32,4 +33,10 @@ else LIBZIP_CONF_OPTS += -DENABLE_OPENSSL=OFF endif +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +LIBZIP_DEPENDENCIES += musl-fts +LIBZIP_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lfts +endif + $(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/buildroot/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch b/buildroot/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch new file mode 100644 index 000000000..fb5299c25 --- /dev/null +++ b/buildroot/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch @@ -0,0 +1,38 @@ +From 604c931bc673c507254a84c0f423c9ec8ce6e3a1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 10 Oct 2019 20:36:46 +0200 +Subject: [PATCH] include/Makefile.am: don't install lightning.h twice + +Commit 17164ed32d8f3530153b9cad67a4399c65f24512 added lightning.h to +nodist_include_HEADERS without removing it from include_HEADERS + +This raises the following error on one of the buildroot autobuilders: +/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include' +/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include' +/usr/bin/install: cannot create regular file `/home/test/autobuild/run/instance-3/output-1/target/usr/include/lightning.h': File exists + +Fix this by removing lightning.h from include_HEADERS + +Fixes: + - http://autobuild.buildroot.org/results/05ebc75598627d2a08e08e194f51cb8464f97b95 + +Signed-off-by: Fabrice Fontaine +--- + include/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/include/Makefile.am b/include/Makefile.am +index e754dd3..8f91594 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -14,7 +14,6 @@ + # License for more details. + # + +-include_HEADERS = lightning.h + SUBDIRS = \ + lightning + +-- +2.23.0 + diff --git a/buildroot/package/lightning/Config.in b/buildroot/package/lightning/Config.in index 79f7f86fb..a0542edce 100644 --- a/buildroot/package/lightning/Config.in +++ b/buildroot/package/lightning/Config.in @@ -1,12 +1,12 @@ comment "lightning needs a toolchain w/ dynamic library" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ - BR2_mipsel || BR2_arm || BR2_powerpc + BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 depends on BR2_STATIC_LIBS config BR2_PACKAGE_LIGHTNING bool "lightning" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ - BR2_mipsel || BR2_arm || BR2_powerpc + BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 depends on !BR2_STATIC_LIBS help GNU lightning is a library that generates diff --git a/buildroot/package/lightning/lightning.hash b/buildroot/package/lightning/lightning.hash index 8e78ef4f8..bd20c85cb 100644 --- a/buildroot/package/lightning/lightning.hash +++ b/buildroot/package/lightning/lightning.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9b289ed1c977602f9282da507db2e980dcfb5207ee8bd2501536a6852a157a69 lightning-2.1.2.tar.gz +sha256 ed856b866dc6f68678dc1151579118fab1c65fad687cf847fc2d94ca045efdc9 lightning-2.1.3.tar.gz sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/buildroot/package/lightning/lightning.mk b/buildroot/package/lightning/lightning.mk index b93946146..3bd17bef5 100644 --- a/buildroot/package/lightning/lightning.mk +++ b/buildroot/package/lightning/lightning.mk @@ -4,11 +4,13 @@ # ################################################################################ -LIGHTNING_VERSION = 2.1.2 +LIGHTNING_VERSION = 2.1.3 LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning LIGHTNING_LICENSE = LGPL-3.0+ LIGHTNING_LICENSE_FILES = COPYING.LESSER LIGHTNING_INSTALL_STAGING = YES +# We're patching include/Makefile.am +LIGHTNING_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIGHTNING_DISASSEMBLER),y) LIGHTNING_DEPENDENCIES += binutils zlib diff --git a/buildroot/package/lighttpd/lighttpd.hash b/buildroot/package/lighttpd/lighttpd.hash index 926de33ef..7f20bf9dc 100644 --- a/buildroot/package/lighttpd/lighttpd.hash +++ b/buildroot/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.53.sha256sum -sha256 3bdfce1cf3e9650a556a8c26fb15342c5717c63f530c54693db632b0371dcb78 lighttpd-1.4.53.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.55.sha256sum +sha256 6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927 lighttpd-1.4.55.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/buildroot/package/lighttpd/lighttpd.mk b/buildroot/package/lighttpd/lighttpd.mk index f50a4af93..7181465c6 100644 --- a/buildroot/package/lighttpd/lighttpd.mk +++ b/buildroot/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).53 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).55 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -99,12 +99,6 @@ endef define LIGHTTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/doc/systemd/lighttpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/lighttpd.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/lighttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lighttpd.service - $(INSTALL) -D -m 644 package/lighttpd/lighttpd_tmpfiles.conf \ $(TARGET_DIR)/usr/lib/tmpfiles.d/lighttpd.conf endef diff --git a/buildroot/package/linenoise/linenoise.hash b/buildroot/package/linenoise/linenoise.hash index 7837bc68f..a1cabd9ef 100644 --- a/buildroot/package/linenoise/linenoise.hash +++ b/buildroot/package/linenoise/linenoise.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 f5054a4fe120d43d85427cf58af93e56b9bb80389d507a9bec9b75531a340014 linenoise-1.0.tar.gz +sha256 f5054a4fe120d43d85427cf58af93e56b9bb80389d507a9bec9b75531a340014 linenoise-1.0.tar.gz +sha256 efe1692aa5b869edaa0ac88f95eb0276c1125304ffc636a299db3ebbab47f62b LICENSE diff --git a/buildroot/package/linknx/0001-Link-with-libiconv-if-needed.patch b/buildroot/package/linknx/0001-Link-with-libiconv-if-needed.patch new file mode 100644 index 000000000..81b1fb792 --- /dev/null +++ b/buildroot/package/linknx/0001-Link-with-libiconv-if-needed.patch @@ -0,0 +1,30 @@ +From 87373f6c2b48619bb11e566e5eb16ea49d47beb7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 19 Apr 2019 17:07:10 +0200 +Subject: [PATCH] Link with libiconv if needed + +Commit 2cc3a93dcf2703b3b418e0a99975f556354fb1b1 added an include to +iconv which can be provided by libiconv so search and link for it if +needed + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/linknx/linknx/pull/41] +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 22f242c..779fd6f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,6 +15,7 @@ AC_CHECK_HEADER(argp.h,,[AC_MSG_ERROR([argp_parse not found])]) + AC_SEARCH_LIBS(argp_parse,argp,,[AC_MSG_ERROR([argp_parse not found])]) + + # Checks for libraries. ++AC_SEARCH_LIBS(libiconv_open,iconv) + LIBCURL_CHECK_CONFIG([yes], [7.14.0]) + + # Checks for header files. +-- +2.20.1 + diff --git a/buildroot/package/linknx/0001-src-suncalc.cpp-fix-build-with-gcc-6.x.patch b/buildroot/package/linknx/0001-src-suncalc.cpp-fix-build-with-gcc-6.x.patch deleted file mode 100644 index d204a0226..000000000 --- a/buildroot/package/linknx/0001-src-suncalc.cpp-fix-build-with-gcc-6.x.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ff52cf04c6fa8b3352544447abf429bfa6000dc8 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 20 Aug 2016 12:13:04 +0200 -Subject: [PATCH] src/suncalc.cpp: fix build with gcc 6.x - -src/suncalc.cpp currently includes , but this causes a build -failure with gcc 6.x, and should be used instead. The build -failure is: - -/home/test/autobuild/run/instance-0/output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.1.1/cmath:101:37: error: '__is_integer' was not declared in this scope - typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, - ^~~~~~~~~~~~ - -Signed-off-by: Thomas Petazzoni ---- - src/suncalc.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/suncalc.cpp b/src/suncalc.cpp -index ea2366a..b553f96 100644 ---- a/src/suncalc.cpp -+++ b/src/suncalc.cpp -@@ -22,6 +22,8 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include -+ - #include "suncalc.h" - #include "services.h" - -@@ -44,7 +46,6 @@ Released to the public domain by Paul Schlyter, December 1992 - - - #include --#include - #include - #include - #include --- -2.7.4 - diff --git a/buildroot/package/linknx/0002-configure.ac-always-define-CPPUNIT.patch b/buildroot/package/linknx/0002-configure.ac-always-define-CPPUNIT.patch new file mode 100644 index 000000000..158bad9e9 --- /dev/null +++ b/buildroot/package/linknx/0002-configure.ac-always-define-CPPUNIT.patch @@ -0,0 +1,34 @@ +From 1b4a770af42f7d33ad174524b94ea4d2fc7133da Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Apr 2019 19:31:50 +0200 +Subject: [PATCH] configure.ac: always define CPPUNIT + +Fixes: + - http://autobuild.buildroot.org/results/4b042b7e18425690ec26b4977865516bedcb9edb + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/linknx/linknx/pull/42] +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 779fd6f..51d8ae6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -145,8 +145,11 @@ if test x"$WITH_CPPUNIT" != xno; then + AC_DEFINE([HAVE_CPPUNIT], [1], [cppunit]) + AC_SUBST(CPPUNIT_CFLAGS) + AC_SUBST(CPPUNIT_LIBS) +- ]) ++ AM_CONDITIONAL([CPPUNIT], true) ++ ],[AM_CONDITIONAL([CPPUNIT], false)]) + fi ++else ++ AM_CONDITIONAL([CPPUNIT], false) + fi + + dnl ######################################################################### +-- +2.20.1 + diff --git a/buildroot/package/linknx/0003-src-Makefile.am-fix-linking-with-log4cpp.patch b/buildroot/package/linknx/0003-src-Makefile.am-fix-linking-with-log4cpp.patch new file mode 100644 index 000000000..253c1f6f2 --- /dev/null +++ b/buildroot/package/linknx/0003-src-Makefile.am-fix-linking-with-log4cpp.patch @@ -0,0 +1,39 @@ +From b4595154e84e21abdc0c89f937c410cf8280991c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 May 2019 22:14:43 +0200 +Subject: [PATCH] src/Makefile.am: fix linking with log4cpp + +linknx fails to build with log4cpp because LOG4CPP_CFLAGS (which +contains -pthread) is added to AM_CPPFLAGS (which is not used at link +time) instead of AM_CXXFLAGS: + +/home/buildroot/autobuild/instance-0/output/host/bin/mipsel-linux-g++ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -o linknx linknx.o logger.o ruleserver.o objectcontroller.o eibclient.o threads.o timermanager.o persistentstorage.o xmlserver.o smsgateway.o emailgateway.o knxconnection.o services.o suncalc.o luacondition.o ioport.o ../ticpp/libticpp.a -L/home/buildroot/autobuild/instance-0/output/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib -lpthsem -L/home/buildroot/autobuild/instance-0/output/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/lib -llog4cpp -lm +/home/buildroot/autobuild/instance-0/output/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib/liblog4cpp.so: undefined reference to `pthread_key_create' + +So move LOG4CPP_CFLAGS to AM_CXXFLAGS + +Fixes: + - http://autobuild.buildroot.org/results/1863f8f27041bc15ca68e786ba3b8e4764c40574 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 6a4f493..92d147c 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -6,6 +6,7 @@ else + B64_CFLAGS= + B64_LIBS= + endif +-AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LOG4CPP_CFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS) ++AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS) ++AM_CXXFLAGS=$(LOG4CPP_CFLAGS) + linknx_LDADD=$(top_srcdir)/ticpp/libticpp.a $(B64_LIBS) $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) $(MYSQL_LIBS) $(ESMTP_LIBS) -lm + linknx_SOURCES=linknx.cpp logger.cpp ruleserver.cpp objectcontroller.cpp eibclient.c threads.cpp timermanager.cpp persistentstorage.cpp xmlserver.cpp smsgateway.cpp emailgateway.cpp knxconnection.cpp services.cpp suncalc.cpp luacondition.cpp ioport.cpp ruleserver.h objectcontroller.h threads.h timermanager.h persistentstorage.h xmlserver.h smsgateway.h emailgateway.h knxconnection.h services.h suncalc.h luacondition.h ioport.h logger.h +-- +2.20.1 + diff --git a/buildroot/package/linknx/Config.in b/buildroot/package/linknx/Config.in index 97fdaff9c..3b62ce2f9 100644 --- a/buildroot/package/linknx/Config.in +++ b/buildroot/package/linknx/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LINKNX select BR2_PACKAGE_LIBPTHSEM select BR2_PACKAGE_ARGP_STANDALONE \ if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Linknx is an automation platform providing high level functionalities to EIB/KNX installation. diff --git a/buildroot/package/linknx/linknx.hash b/buildroot/package/linknx/linknx.hash index 312e43bfd..79113e6e7 100644 --- a/buildroot/package/linknx/linknx.hash +++ b/buildroot/package/linknx/linknx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 635b8fbd3477fd7d85a95955b93f327cd5a389db80dc18cdae04de19a3a8a972 linknx-0.0.1.33.tar.gz +sha256 3c3aaf8c409538153b15f5fb975a4485e58c4820cfea289a3f20777ba69782ab linknx-0.0.1.37.tar.gz sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad LICENSE diff --git a/buildroot/package/linknx/linknx.mk b/buildroot/package/linknx/linknx.mk index 5801eb5f8..c75f0655d 100644 --- a/buildroot/package/linknx/linknx.mk +++ b/buildroot/package/linknx/linknx.mk @@ -4,19 +4,24 @@ # ################################################################################ -LINKNX_VERSION = 0.0.1.33 +LINKNX_VERSION = 0.0.1.37 LINKNX_SITE = $(call github,linknx,linknx,$(LINKNX_VERSION)) LINKNX_LICENSE = GPL-2.0+ LINKNX_LICENSE_FILES = LICENSE LINKNX_INSTALL_STAGING = YES +# We're patching configure.ac +LINKNX_AUTORECONF = YES LINKNX_CONF_OPTS = \ - --without-log4cpp \ + --without-cppunit \ --without-pth-test \ --with-pth=$(STAGING_DIR)/usr \ --disable-smtp -LINKNX_DEPENDENCIES = libpthsem \ - $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) +LINKNX_DEPENDENCIES = \ + host-pkgconf \ + libpthsem \ + $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) ifeq ($(BR2_PACKAGE_LIBCURL),y) LINKNX_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr @@ -25,6 +30,13 @@ else LINKNX_CONF_OPTS += --without-libcurl endif +ifeq ($(BR2_PACKAGE_LOG4CPP),y) +LINKNX_CONF_OPTS += --with-log4cpp +LINKNX_DEPENDENCIES += log4cpp +else +LINKNX_CONF_OPTS += --without-log4cpp +endif + ifeq ($(BR2_PACKAGE_LUA),y) LINKNX_CONF_OPTS += --with-lua LINKNX_DEPENDENCIES += lua diff --git a/buildroot/package/links/links.hash b/buildroot/package/links/links.hash index a63af4c80..a23adc087 100644 --- a/buildroot/package/links/links.hash +++ b/buildroot/package/links/links.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 f70d0678ef1c5550953bdc27b12e72d5de86e53b05dd59b0fc7f07c507f244b8 links-2.14.tar.bz2 +sha256 4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424 links-2.20.2.tar.bz2 +sha256 92deeb70791366630095d4e0714fe37d6e2bd5db0e6ef498ebb8de328f45b253 COPYING diff --git a/buildroot/package/links/links.mk b/buildroot/package/links/links.mk index 651a089fd..228a8ed0e 100644 --- a/buildroot/package/links/links.mk +++ b/buildroot/package/links/links.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINKS_VERSION = 2.14 +LINKS_VERSION = 2.20.2 LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2 LINKS_SITE = http://links.twibright.com/download LINKS_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/linphone/linphone.hash b/buildroot/package/linphone/linphone.hash index 9ed9d37f7..e5b9015ae 100644 --- a/buildroot/package/linphone/linphone.hash +++ b/buildroot/package/linphone/linphone.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 05ba81223e9378c3bce8d33080213b9925af49bd9623cd9004eb3dd22ca9d2a0 linphone-3.6.1.tar.gz +sha256 05ba81223e9378c3bce8d33080213b9925af49bd9623cd9004eb3dd22ca9d2a0 linphone-3.6.1.tar.gz +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/linux-backports/linux-backports.hash b/buildroot/package/linux-backports/linux-backports.hash index 38f39b98d..f39bc2ed2 100644 --- a/buildroot/package/linux-backports/linux-backports.hash +++ b/buildroot/package/linux-backports/linux-backports.hash @@ -1,2 +1,4 @@ # From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v4.4.2/sha256sums.asc -sha256 a979e194c2ed9fdfca092a448e626d85c5af0e4de5ad993c0967afd15af01285 backports-4.4.2-1.tar.xz +sha256 a979e194c2ed9fdfca092a448e626d85c5af0e4de5ad993c0967afd15af01285 backports-4.4.2-1.tar.xz +# Locally computed +sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/buildroot/package/linux-firmware/Config.in b/buildroot/package/linux-firmware/Config.in index 8e3be238a..54c617c9a 100644 --- a/buildroot/package/linux-firmware/Config.in +++ b/buildroot/package/linux-firmware/Config.in @@ -60,11 +60,26 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IBT Firmware files for Intel 3160/7260/7265/8260/8265 Wireless bluetooth support. +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650 + bool "MediaTek MT7650" + help + Firmware files for MediaTek MT7650 bluetooth support + config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT bool "Qualcomm Atheros Rome 6174A Bluetooth" help Firmware files for QCA Rome 6174A bluetooth support. +config BR2_PACKAGE_LINUX_FIRMWARE_AR3011 + bool "Qualcomm Atheros 3011" + help + Firmware files for Atheros bluetooth chipset AR3011. + +config BR2_PACKAGE_LINUX_FIRMWARE_AR3012_USB + bool "Qualcomm Atheros 3012 (USB)" + help + Firmware files for Atheros bluetooth chipset AR3012 on USB. + config BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560 bool "TI CC2560" help @@ -208,6 +223,22 @@ config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688 help Firmware files for the Marvell SD8688 module +config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_USB8388_V9 + bool "Libertas USB 8388 v9" + help + Firmware files (version 9) for the Marvell USB8388 module + +config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_USB8388_OLPC + bool "Libertas USB 8388 OLPC" + help + Firmware files (OLPC mesh capable version) for the Marvell + USB8388 module. + +config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_USB_THINFIRM + bool "Libertas USB Thin Firmware" + help + Firmware files (soft MAC) for the Marvell USB modules + config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787 bool "Marvell Wifi-Ex 8787 SDIO" help @@ -253,6 +284,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U help MediaTek MT7601U +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT76X2E + bool "MediaTek MT76x2e" + help + MediaTek MT76x2e + config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174 bool "Qualcomm Atheros 6174" help diff --git a/buildroot/package/linux-firmware/linux-firmware.hash b/buildroot/package/linux-firmware/linux-firmware.hash index b44934893..b7c975395 100644 --- a/buildroot/package/linux-firmware/linux-firmware.hash +++ b/buildroot/package/linux-firmware/linux-firmware.hash @@ -1,8 +1,8 @@ # Locally calculated -sha256 5c636765fd1ac638176893feccfd4a4854f59fc3d01b38f3ccdbb89bd5bb6ef1 linux-firmware-1baa34868b2c0a004dc595b20678145e3fff83e7.tar.gz +sha256 270f4b2dd89feb6ed7d9e166bb1677f27d8f93da9d95312e6d188b0e1efaba73 linux-firmware-20190717.tar.gz sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis -sha256 4b3ea5d5a03c0db81bee0bcb14b30d75b30ef568597bb5be7d4dee57f434265f LICENSE.amdgpu -sha256 38f2037aa14631b4b29826d7a99379613c41a97064d1defdee30a7a022138b20 LICENCE.Marvell +sha256 ac7c42c8331ef69221039f770193a2120bc67c7bba357e51a5b3f557bca0037c LICENSE.amdgpu +sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt sha256 8ce5c6ea0542bf4aac31fc3ae16a39792ad22d0eae4543063fac56fb3380f021 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt @@ -21,12 +21,13 @@ sha256 106bef96470001e877fcf7ba0337fa6766a317650eb47fcaeb743eeebd62c4ff LICENCE. sha256 8ea9f4aee5f53ad877041ff089e8c95d34d615ce19a3111e5e1ea70d990ed7ff LICENCE.xc4000 sha256 30ec8a66503dc73f83937564ae70ca23aa03259e64727ff4195b5b6f695e782f LICENCE.xc5000 sha256 f8822049f32fef2e90a197bd8cf259f476db75d549456bdca8567616a9c07ace LICENCE.xc5000c +sha256 a064cbf83e10d72579d236a1e36032681adb8e442943ff75b57020a82992a5ed LICENSE.QualcommAtheros_ar3k sha256 337a55102138d7baa143ee4a4c6c91693e0113fece35d380b2a12109e8c23b3f LICENSE.QualcommAtheros_ath10k sha256 630fd46c95d3ac6544590c2265ba7348fbc930fb386261a1c04dcd9f403645b8 LICENSE.dib0700 sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENSE.i915 sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 9b873499a822762177a7a02d2a3ead9fdf0d514c0f9899fb16a2d22ed99f4acc WHENCE +sha256 440c2ed4fba90edb52847f1550ff33fbfb36f61688eecced84c22dfc247f31e9 WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/buildroot/package/linux-firmware/linux-firmware.mk b/buildroot/package/linux-firmware/linux-firmware.mk index 6453c4022..82776cc28 100644 --- a/buildroot/package/linux-firmware/linux-firmware.mk +++ b/buildroot/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 1baa34868b2c0a004dc595b20678145e3fff83e7 +LINUX_FIRMWARE_VERSION = 20190717 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git LINUX_FIRMWARE_SITE_METHOD = git @@ -120,6 +120,37 @@ LINUX_FIRMWARE_FILES += \ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif +# ar3011 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_AR3011),y) +LINUX_FIRMWARE_FILES += ath3k-1.fw +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware +endif + +# ar3012 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_AR3012_USB),y) +LINUX_FIRMWARE_FILES += \ + ar3k/AthrBT_0x01020001.dfu \ + ar3k/ramps_0x01020001_26.dfu \ + ar3k/AthrBT_0x01020200.dfu \ + ar3k/ramps_0x01020200_26.dfu \ + ar3k/ramps_0x01020200_40.dfu \ + ar3k/AthrBT_0x31010000.dfu \ + ar3k/ramps_0x31010000_40.dfu \ + ar3k/AthrBT_0x11020000.dfu \ + ar3k/ramps_0x11020000_40.dfu \ + ar3k/ramps_0x01020201_26.dfu \ + ar3k/ramps_0x01020201_40.dfu \ + ar3k/AthrBT_0x41020000.dfu \ + ar3k/ramps_0x41020000_40.dfu \ + ar3k/AthrBT_0x11020100.dfu \ + ar3k/ramps_0x11020100_40.dfu \ + ar3k/AthrBT_0x31010100.dfu \ + ar3k/ramps_0x31010100_40.dfu \ + ar3k/AthrBT_0x01020201.dfu +LINUX_FIRMWARE_ALL_LICENSE_FILES += \ + LICENCE.atheros_firmware LICENSE.QualcommAtheros_ar3k +endif + # ar6002 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002),y) LINUX_FIRMWARE_FILES += ath6k/AR6002 @@ -195,6 +226,24 @@ LINUX_FIRMWARE_FILES += mrvl/sd8688.bin mrvl/sd8688_helper.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell endif +# usb8388 v9 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_USB8388_V9),y) +LINUX_FIRMWARE_FILES += libertas/usb8388_v9.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell +endif + +# usb8388 olpc +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_USB8388_OLPC),y) +LINUX_FIRMWARE_FILES += libertas/usb8388_olpc.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell +endif + +# lbtf usb +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_USB_THINFIRM),y) +LINUX_FIRMWARE_FILES += lbtf_usb.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell +endif + # sd8787 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787),y) LINUX_FIRMWARE_FILES += mrvl/sd8787_uapsta.bin @@ -249,6 +298,18 @@ LINUX_FIRMWARE_FILES += mt7601u.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware endif +# MT7650 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650),y) +LINUX_FIRMWARE_FILES += mt7650.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware +endif + +# MT76x2e +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT76X2E),y) +LINUX_FIRMWARE_FILES += mt7662.bin mt7662_rom_patch.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware +endif + # qca6174 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174),y) LINUX_FIRMWARE_FILES += ath10k/QCA6174 @@ -495,7 +556,10 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qla2xxx endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_REDPINE_RS9113),y) -LINUX_FIRMWARE_FILES += rsi/rs9113_wlan_qspi.rps +LINUX_FIRMWARE_FILES += \ + rsi/rs9113_ap_bt_dual_mode.rps \ + rsi/rs9113_wlan_bt_dual_mode.rps \ + rsi/rs9113_wlan_qspi.rps # No license file; the license is in the file WHENCE # which is installed unconditionally endif diff --git a/buildroot/package/linux-fusion/linux-fusion.hash b/buildroot/package/linux-fusion/linux-fusion.hash index 4bf288d15..8a90afe2a 100644 --- a/buildroot/package/linux-fusion/linux-fusion.hash +++ b/buildroot/package/linux-fusion/linux-fusion.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 c3c71af364ef774c70d3f6fbc32d14bc786d915df633d6fe733e1fde84ad6e99 linux-fusion-9.0.3.tar.xz +sha256 c3c71af364ef774c70d3f6fbc32d14bc786d915df633d6fe733e1fde84ad6e99 linux-fusion-9.0.3.tar.xz +sha256 51bc14bdef3a064383702e638515824986e5a746de236d46ee904ea15312a198 debian/copyright diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host index 485f67e5a..fde769e6a 100644 --- a/buildroot/package/linux-headers/Config.in.host +++ b/buildroot/package/linux-headers/Config.in.host @@ -6,9 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - # We are intentionally staying at 4.19 for the next Buildroot - # LTS release (2019.02) - default BR2_KERNEL_HEADERS_4_19 + default BR2_KERNEL_HEADERS_5_4 help Select the kernel version to get headers from. @@ -27,29 +25,35 @@ choice config BR2_KERNEL_HEADERS_AS_KERNEL bool "Same as kernel being built" depends on BR2_LINUX_KERNEL + select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION config BR2_KERNEL_HEADERS_4_4 bool "Linux 4.4.x kernel headers" depends on !BR2_riscv + depends on !BR2_csky select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 config BR2_KERNEL_HEADERS_4_9 bool "Linux 4.9.x kernel headers" depends on !BR2_riscv + depends on !BR2_csky select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 config BR2_KERNEL_HEADERS_4_14 bool "Linux 4.14.x kernel headers" depends on !BR2_riscv + depends on !BR2_csky select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 config BR2_KERNEL_HEADERS_4_19 bool "Linux 4.19.x kernel headers" + depends on !BR2_csky select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 -config BR2_KERNEL_HEADERS_4_20 - bool "Linux 4.20.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 +config BR2_KERNEL_HEADERS_5_4 + bool "Linux 5.4.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" @@ -81,6 +85,10 @@ config BR2_KERNEL_HEADERS_CUSTOM_GIT endchoice +# Select this for the latest kernel headers version (for license hashes) +config BR2_KERNEL_HEADERS_LATEST + bool + config BR2_DEFAULT_KERNEL_VERSION string "linux version" depends on BR2_KERNEL_HEADERS_VERSION @@ -116,10 +124,29 @@ choice This is used to hide/show some packages that have strict requirements on the version of kernel headers. + If your kernel headers are more recent than the latest version + in the choice, then select the latest version. + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4 - bool "5.4.x" + bool "5.4.x or later" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3 + bool "5.3.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_2 + bool "5.2.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1 + bool "5.1.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0 + bool "5.0.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20 bool "4.20.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 @@ -291,11 +318,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.208" if BR2_KERNEL_HEADERS_4_4 - default "4.9.208" if BR2_KERNEL_HEADERS_4_9 - default "4.14.163" if BR2_KERNEL_HEADERS_4_14 - default "4.19.94" if BR2_KERNEL_HEADERS_4_19 - default "4.20.17" if BR2_KERNEL_HEADERS_4_20 + default "4.4.218" if BR2_KERNEL_HEADERS_4_4 + default "4.9.218" if BR2_KERNEL_HEADERS_4_9 + default "4.14.175" if BR2_KERNEL_HEADERS_4_14 + default "4.19.114" if BR2_KERNEL_HEADERS_4_19 + default "5.4.31" if BR2_KERNEL_HEADERS_5_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/buildroot/package/linux-headers/linux-headers.mk b/buildroot/package/linux-headers/linux-headers.mk index 676c8c44e..80a077537 100644 --- a/buildroot/package/linux-headers/linux-headers.mk +++ b/buildroot/package/linux-headers/linux-headers.mk @@ -91,7 +91,12 @@ endif LINUX_HEADERS_DL_SUBDIR = linux LINUX_HEADERS_LICENSE = GPL-2.0 -LINUX_HEADERS_LICENSE_FILES = COPYING +ifeq ($(BR2_KERNEL_HEADERS_LATEST),y) +LINUX_HEADERS_LICENSE_FILES = \ + COPYING \ + LICENSES/preferred/GPL-2.0 \ + LICENSES/exceptions/Linux-syscall-note +endif LINUX_HEADERS_INSTALL_STAGING = YES @@ -131,11 +136,14 @@ define LINUX_HEADERS_INSTALL_STAGING_CMDS endef ifeq ($(BR2_KERNEL_HEADERS_VERSION)$(BR2_KERNEL_HEADERS_AS_KERNEL)$(BR2_KERNEL_HEADERS_CUSTOM_TARBALL)$(BR2_KERNEL_HEADERS_CUSTOM_GIT),y) +# In this case, we must always do a 'loose' test, because they are all +# custom versions which may be later than what we know right now. define LINUX_HEADERS_CHECK_VERSION $(call check_kernel_headers_version,\ $(BUILD_DIR),\ $(STAGING_DIR),\ - $(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST))) + $(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)),\ + loose) endef LINUX_HEADERS_POST_INSTALL_STAGING_HOOKS += LINUX_HEADERS_CHECK_VERSION endif diff --git a/buildroot/package/linux-pam/0002-Conditionally-compile-per-ruserok-availability.patch b/buildroot/package/linux-pam/0002-Conditionally-compile-per-ruserok-availability.patch deleted file mode 100644 index cec642d84..000000000 --- a/buildroot/package/linux-pam/0002-Conditionally-compile-per-ruserok-availability.patch +++ /dev/null @@ -1,49 +0,0 @@ -ruserok is not available/functional in uclibc, provide conditions -for compilation where needed. - -Patch originally by Dmitry Golubovsky - -porting to linux-pam 1.2.1. - -Signed-off-by: Brendan Heading - -Upstream-status: pending - ---- - configure.ac | 2 +- - modules/pam_rhosts/pam_rhosts.c | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 08e4530..fd2fd23 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -542,7 +542,7 @@ AC_CHECK_FUNCS(fseeko getdomainname gethostname gettimeofday lckpwdf mkdir selec - AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname) - AC_CHECK_FUNCS(getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r) - AC_CHECK_FUNCS(getgrouplist getline getdelim) --AC_CHECK_FUNCS(inet_ntop inet_pton innetgr ruserok_af) -+AC_CHECK_FUNCS(inet_ntop inet_pton innetgr ruserok_af ruserok) - - AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no]) - AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes]) -diff --git a/modules/pam_rhosts/pam_rhosts.c b/modules/pam_rhosts/pam_rhosts.c -index bc9e76f..909db29 100644 ---- a/modules/pam_rhosts/pam_rhosts.c -+++ b/modules/pam_rhosts/pam_rhosts.c -@@ -114,8 +114,12 @@ int pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, - #ifdef HAVE_RUSEROK_AF - retval = ruserok_af (rhost, as_root, ruser, luser, PF_UNSPEC); - #else -+ #ifdef HAVE_RUSEROK - retval = ruserok (rhost, as_root, ruser, luser); --#endif -+ #else -+ retval = -1; -+ #endif /* HAVE_RUSEROK */ -+#endif /*HAVE_RUSEROK_AF */ - if (retval != 0) { - if (!opt_silent || opt_debug) - pam_syslog(pamh, LOG_WARNING, "denied access to %s@%s as %s", --- -2.4.3 - diff --git a/buildroot/package/linux-pam/0002-build-ignore-pam_rhosts-if-neither-ruserok-nor-ruserok_af-is-available.patch b/buildroot/package/linux-pam/0002-build-ignore-pam_rhosts-if-neither-ruserok-nor-ruserok_af-is-available.patch new file mode 100644 index 000000000..8e9710c79 --- /dev/null +++ b/buildroot/package/linux-pam/0002-build-ignore-pam_rhosts-if-neither-ruserok-nor-ruserok_af-is-available.patch @@ -0,0 +1,77 @@ +From 1d1d3b59af50c40efcc74f9c3f37b446a921e83e Mon Sep 17 00:00:00 2001 +From: Yousong Zhou +Date: Wed, 17 Jun 2015 18:19:23 +0800 +Subject: [PATCH] build: ignore pam_rhosts if neither ruserok nor ruserok_af is + available. + +* configure.ac: check for ruserok and ruserok_af +* modules/Makefile.am: ignore pam_rhosts/ if it's disabled +* modules/pam_rhosts/pam_rhosts.c: include stdlib.h for malloc and free + +Signed-off-by: Yousong Zhou +[Retrieved from: +https://github.com/linux-pam/linux-pam/commit/1d1d3b59af50c40efcc74f9c3f37b446a921e83e] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 5 ++++- + modules/Makefile.am | 11 ++++++++--- + modules/pam_rhosts/pam_rhosts.c | 1 + + 3 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3012ceb5..69748614 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -532,7 +532,10 @@ AC_CHECK_FUNCS(fseeko getdomainname gethostname gettimeofday lckpwdf mkdir selec + AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname) + AC_CHECK_FUNCS(getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r) + AC_CHECK_FUNCS(getgrouplist getline getdelim) +-AC_CHECK_FUNCS(inet_ntop inet_pton innetgr ruserok_af) ++AC_CHECK_FUNCS(inet_ntop inet_pton innetgr) ++AC_CHECK_FUNCS([ruserok_af ruserok], [break]) ++ ++AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes -o "$ac_cv_func_ruserok" = yes]) + + AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no]) + AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes]) +diff --git a/modules/Makefile.am b/modules/Makefile.am +index 0c80cea9..9ad26a9b 100644 +--- a/modules/Makefile.am ++++ b/modules/Makefile.am +@@ -2,16 +2,21 @@ + # Copyright (c) 2005, 2006, 2008 Thorsten Kukuk + # + +-SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \ ++if COND_BUILD_PAM_RHOSTS ++ MAYBE_PAM_RHOSTS = pam_rhosts ++endif ++ ++SUBDIRS := pam_access pam_cracklib pam_debug pam_deny pam_echo \ + pam_env pam_exec pam_faildelay pam_filter pam_ftp \ + pam_group pam_issue pam_keyinit pam_lastlog pam_limits \ + pam_listfile pam_localuser pam_loginuid pam_mail \ + pam_mkhomedir pam_motd pam_namespace pam_nologin \ +- pam_permit pam_pwhistory pam_rhosts pam_rootok pam_securetty \ ++ pam_permit pam_pwhistory pam_rootok pam_securetty \ + pam_selinux pam_sepermit pam_shells pam_stress \ + pam_succeed_if pam_tally pam_tally2 pam_time pam_timestamp \ + pam_tty_audit pam_umask \ +- pam_unix pam_userdb pam_warn pam_wheel pam_xauth ++ pam_unix pam_userdb pam_warn pam_wheel pam_xauth \ ++ $(MAYBE_PAM_RHOSTS) + + CLEANFILES = *~ + +diff --git a/modules/pam_rhosts/pam_rhosts.c b/modules/pam_rhosts/pam_rhosts.c +index ed98d630..60c9e854 100644 +--- a/modules/pam_rhosts/pam_rhosts.c ++++ b/modules/pam_rhosts/pam_rhosts.c +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + #include + + #define PAM_SM_AUTH /* only defines this management group */ diff --git a/buildroot/package/linux-pam/linux-pam.hash b/buildroot/package/linux-pam/linux-pam.hash index 183bcca40..cfe58ce28 100644 --- a/buildroot/package/linux-pam/linux-pam.hash +++ b/buildroot/package/linux-pam/linux-pam.hash @@ -1,4 +1,6 @@ # Locally computed hashes after checking signature at # https://github.com/linux-pam/linux-pam/releases/download/v1.3.1/Linux-PAM-1.3.1.tar.xz.asc # signed with the key 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB -sha256 eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db Linux-PAM-1.3.1.tar.xz +sha256 eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db Linux-PAM-1.3.1.tar.xz +# Locally computed +sha256 133d98e7a2ab3ffd330b4debb0bfc10fea21e4b2b5a5b09de2e924293be5ff08 Copyright diff --git a/buildroot/package/linux-serial-test/Config.in b/buildroot/package/linux-serial-test/Config.in new file mode 100644 index 000000000..9ba4badc9 --- /dev/null +++ b/buildroot/package/linux-serial-test/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LINUX_SERIAL_TEST + bool "linux-serial-test" + help + Serial port test utility. + + https://github.com/cbrake/linux-serial-test diff --git a/buildroot/package/linux-serial-test/linux-serial-test.hash b/buildroot/package/linux-serial-test/linux-serial-test.hash new file mode 100644 index 000000000..5cbf00a7e --- /dev/null +++ b/buildroot/package/linux-serial-test/linux-serial-test.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 bfc25088e960c18e151f978b13d893dbee9a3e377e062bd56caab1bd409e4dcb linux-serial-test-13bea838f2a7573d2a68a6d95fc9d1f153b580be.tar.gz +sha256 a2a6760c2c6fa779a635e4a7ad00f668862ebcadb2a8a57d16662543e103e08c LICENSES/MIT diff --git a/buildroot/package/linux-serial-test/linux-serial-test.mk b/buildroot/package/linux-serial-test/linux-serial-test.mk new file mode 100644 index 000000000..b0f5fe4eb --- /dev/null +++ b/buildroot/package/linux-serial-test/linux-serial-test.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# linux-serial-test +# +################################################################################ + +LINUX_SERIAL_TEST_VERSION = 13bea838f2a7573d2a68a6d95fc9d1f153b580be +LINUX_SERIAL_TEST_SITE = $(call github,cbrake,linux-serial-test,$(LINUX_SERIAL_TEST_VERSION)) +LINUX_SERIAL_TEST_LICENSE = MIT +LINUX_SERIAL_TEST_LICENSE_FILES = LICENSES/MIT + +$(eval $(cmake-package)) diff --git a/buildroot/package/linux-syscall-support/linux-syscall-support.hash b/buildroot/package/linux-syscall-support/linux-syscall-support.hash index 30925522f..2371dffb1 100644 --- a/buildroot/package/linux-syscall-support/linux-syscall-support.hash +++ b/buildroot/package/linux-syscall-support/linux-syscall-support.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 e5088b81011e30b567b6bde6bb7c22ad529c4ee8890cc5e93d58b21f2c4df56a linux-syscall-support-3f6478ac95edf86cd3da300c2c0d34a438f5dbeb.tar.gz +sha256 e5088b81011e30b567b6bde6bb7c22ad529c4ee8890cc5e93d58b21f2c4df56a linux-syscall-support-3f6478ac95edf86cd3da300c2c0d34a438f5dbeb.tar.gz +sha256 4c1fc9acc9f3867e5c81b5d5f57c52fb9a932662bd4e2e5e43b3fe95390035f5 linux_syscall_support.h diff --git a/buildroot/package/linux-tools/Config.in b/buildroot/package/linux-tools/Config.in index ab8cc3891..ceb58c668 100644 --- a/buildroot/package/linux-tools/Config.in +++ b/buildroot/package/linux-tools/Config.in @@ -116,4 +116,42 @@ config BR2_PACKAGE_LINUX_TOOLS_TMON tmon is a terminal-based tool (using curses) that allows the user to access thermal information about the system. +config BR2_PACKAGE_LINUX_TOOLS_HV + bool "hv" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_LINUX_TOOLS + select BR2_PACKAGE_LINUX_TOOLS_HV_KVP_DAEMON if !BR2_PACKAGE_LINUX_TOOLS_HV_HAS_ONE + help + Microsoft HyperV integration services + + Relevant kernel configuration options: CONFIG_HYPERV, + CONFIG_HYPERV_UTILS. + +if BR2_PACKAGE_LINUX_TOOLS_HV + +config BR2_PACKAGE_LINUX_TOOLS_HV_HAS_ONE + bool + +config BR2_PACKAGE_LINUX_TOOLS_HV_KVP_DAEMON + bool "hypervkvpd (hv_kvp_daemon)" + help + HyperV uses hypervkvpd (Key/Value Pair daemon) to retrieve + status information from your virtualized guest OS + +config BR2_PACKAGE_LINUX_TOOLS_HV_FCOPY_DAEMON + bool "hypervfcopyd (hv_fcopy_daemon)" + select BR2_PACKAGE_LINUX_TOOLS_HV_HAS_ONE + help + HyperV uses hypervfcopyd (File Copy daemon) to easily transfer + files to and from your virtualized guest OS + +config BR2_PACKAGE_LINUX_TOOLS_HV_VSS_DAEMON + bool "hypervvssd (hv_vss_daemon)" + select BR2_PACKAGE_LINUX_TOOLS_HV_HAS_ONE + help + HyperV uses hypervvssd (Volume Snapshot Service daemon) to + freeze your filesystems during snapshots and backups + +endif # BR2_PACKAGE_LINUX_TOOLS_HV + endmenu diff --git a/buildroot/package/linux-tools/S10hyperv b/buildroot/package/linux-tools/S10hyperv new file mode 100644 index 000000000..ec934bc97 --- /dev/null +++ b/buildroot/package/linux-tools/S10hyperv @@ -0,0 +1,66 @@ +#!/bin/sh + +PROGS="@PROGS@" +PIDDIR="/var/run" + +# shellcheck source=/dev/null +[ -r "/etc/default/hyperv" ] && . "/etc/default/hyperv" + +start_one() { + printf 'Starting %s: ' "$1" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -b -m -S -q -p "$PIDDIR/$1.pid" -x "/sbin/$1" -- -n + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return $status +} + +start() { + # shellcheck disable=SC2086 # we need the word splitting + for prog in ${PROGS}; do + start_one "${prog}" || ret=$? + done + return $ret +} + +stop_one() { + printf 'Stopping %s: ' "$1" + start-stop-daemon -K -q -p "$PIDDIR/$1.pid" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDDIR/$1.pid" + echo "OK" + else + echo "FAIL" + fi + return $status +} + +stop() { + # shellcheck disable=SC2086 # we need the word splitting + for prog in ${PROGS}; do + stop_one "${prog}" || ret=$? + done + return $ret +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/linux-tools/hypervfcopyd.service b/buildroot/package/linux-tools/hypervfcopyd.service new file mode 100644 index 000000000..c43fc1bc8 --- /dev/null +++ b/buildroot/package/linux-tools/hypervfcopyd.service @@ -0,0 +1,11 @@ +[Unit] +Description=HyperV FCopy daemon +After=syslog.target +ConditionVirtualization=microsoft + +[Service] +Type=simple +ExecStart=/usr/sbin/hypervfcopyd -n + +[Install] +WantedBy=multi-user.target diff --git a/buildroot/package/linux-tools/hypervkvpd.service b/buildroot/package/linux-tools/hypervkvpd.service new file mode 100644 index 000000000..6ed630278 --- /dev/null +++ b/buildroot/package/linux-tools/hypervkvpd.service @@ -0,0 +1,11 @@ +[Unit] +Description=HyperV KVP daemon +After=syslog.target +ConditionVirtualization=microsoft + +[Service] +Type=simple +ExecStart=/usr/sbin/hypervkvpd -n + +[Install] +WantedBy=multi-user.target diff --git a/buildroot/package/linux-tools/hypervvssd.service b/buildroot/package/linux-tools/hypervvssd.service new file mode 100644 index 000000000..3fd80029c --- /dev/null +++ b/buildroot/package/linux-tools/hypervvssd.service @@ -0,0 +1,11 @@ +[Unit] +Description=HyperV VSS daemon +After=syslog.target +ConditionVirtualization=microsoft + +[Service] +Type=simple +ExecStart=/usr/sbin/hypervvssd -n + +[Install] +WantedBy=multi-user.target diff --git a/buildroot/package/linux-tools/linux-tool-hv.mk.in b/buildroot/package/linux-tools/linux-tool-hv.mk.in new file mode 100644 index 000000000..e638fecfc --- /dev/null +++ b/buildroot/package/linux-tools/linux-tool-hv.mk.in @@ -0,0 +1,61 @@ +################################################################################ +# +# hv_fcopy_daemon +# +################################################################################ + +LINUX_TOOLS += hv + +# The programs to build, as known by the kernel: +HV_PROGS_$(BR2_PACKAGE_LINUX_TOOLS_HV_KVP_DAEMON) += hv_kvp_daemon +HV_PROGS_$(BR2_PACKAGE_LINUX_TOOLS_HV_FCOPY_DAEMON) += hv_fcopy_daemon +HV_PROGS_$(BR2_PACKAGE_LINUX_TOOLS_HV_VSS_DAEMON) += hv_vss_daemon + +# Give each tools the name most distros install them as: +HV_hv_kvp_daemon = hypervkvpd +HV_hv_fcopy_daemon = hypervfcopyd +HV_hv_vss_daemon = hypervvssd + +HV_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(filter-out -g%,$(TARGET_CFLAGS))" + +define HV_BUILD_CMDS + $(Q)for prog in $(HV_PROGS_y); do \ + if test ! -f $(LINUX_DIR)/tools/hv/$${prog}.c ; then \ + printf "Your kernel version is too old and does not have the HyperV %s tool." "$${prog}" ; \ + exit 1 ; \ + fi; \ + done + + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/hv \ + $(HV_MAKE_OPTS) \ + $(HV_PROGS_y) +endef + +ifeq ($(BR2_PACKAGE_LINUX_TOOLS_HV_KVP_DAEMON),y) +define HV_KVP_HELPER + @mkdir -p $(TARGET_DIR)/usr/libexec/hypervkvpd + $(Q)ln -sf /bin/true $(TARGET_DIR)/usr/libexec/hypervkvpd/hv_set_ifconfig +endef +endif + +define HV_INSTALL_TARGET_CMDS + $(foreach prog,$(HV_PROGS_y), \ + $(INSTALL) -m 0755 -D $(LINUX_DIR)/tools/hv/$(prog) \ + $(TARGET_DIR)/usr/sbin/$(HV_$(prog)) + ) + $(HV_KVP_HELPER) +endef + +define HV_INSTALL_INIT_SYSTEMD + $(foreach prog,$(HV_PROGS_y), \ + $(INSTALL) -m 0644 -D package/linux-tools/$(HV_$(prog)).service \ + $(TARGET_DIR)/usr/lib/systemd/system/$(HV_$(prog)).service + ) +endef + +define HV_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/linux-tools/S10hyperv \ + $(TARGET_DIR)/etc/init.d/S10hyperv + $(SED) 's/@PROGS@/$(foreach prog,$(HV_PROGS_y),$(HV_$(prog)))/' \ + $(TARGET_DIR)/etc/init.d/S10hyperv +endef diff --git a/buildroot/package/linux-tools/linux-tool-perf.mk.in b/buildroot/package/linux-tools/linux-tool-perf.mk.in index 80e00c3c5..7106b622c 100644 --- a/buildroot/package/linux-tools/linux-tool-perf.mk.in +++ b/buildroot/package/linux-tools/linux-tool-perf.mk.in @@ -82,6 +82,18 @@ else PERF_MAKE_FLAGS += NO_LIBELF=1 NO_DWARF=1 endif +ifeq ($(BR2_PACKAGE_BINUTILS),y) +PERF_DEPENDENCIES += binutils +else +PERF_MAKE_FLAGS += NO_DEMANGLE=1 +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +PERF_DEPENDENCIES += openssl +else +PERF_MAKE_FLAGS += NO_LIBCRYPTO=1 +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) PERF_DEPENDENCIES += zlib else diff --git a/buildroot/package/linux-tools/linux-tools.mk b/buildroot/package/linux-tools/linux-tools.mk index ac4da59b1..65d9e850e 100644 --- a/buildroot/package/linux-tools/linux-tools.mk +++ b/buildroot/package/linux-tools/linux-tools.mk @@ -42,4 +42,26 @@ LINUX_TOOLS_POST_INSTALL_TARGET_HOOKS += $(foreach tool,$(LINUX_TOOLS),\ $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ $(call UPPERCASE,$(tool))_INSTALL_TARGET_CMDS)) +define LINUX_TOOLS_INSTALL_INIT_SYSTEMD + $(foreach tool,$(LINUX_TOOLS),\ + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSTEMD)) + ) +endef + +define LINUX_TOOLS_INSTALL_INIT_SYSV + $(foreach tool,$(LINUX_TOOLS),\ + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSV)) + ) +endef + +define LINUX_TOOLS_INSTALL_INIT_OPENRC + $(foreach tool,$(LINUX_TOOLS),\ + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $(or $($(call UPPERCASE,$(tool))_INSTALL_INIT_OPENRC),\ + $($(call UPPERCASE,$(tool))_INSTALL_INIT_SYSV))) + ) +endef + $(eval $(generic-package)) diff --git a/buildroot/package/linux-zigbee/linux-zigbee.hash b/buildroot/package/linux-zigbee/linux-zigbee.hash new file mode 100644 index 000000000..f33703885 --- /dev/null +++ b/buildroot/package/linux-zigbee/linux-zigbee.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 92fbefdf18d45147c2b78ca2ce2d899d4d1da5a3391a4ff6c51a5b14c6d6f87c lowpan-tools-0.3.1.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/linux-zigbee/linux-zigbee.mk b/buildroot/package/linux-zigbee/linux-zigbee.mk index 8d3248f2e..53089e160 100644 --- a/buildroot/package/linux-zigbee/linux-zigbee.mk +++ b/buildroot/package/linux-zigbee/linux-zigbee.mk @@ -4,8 +4,10 @@ # ################################################################################ -LINUX_ZIGBEE_VERSION = v0.3.1 -LINUX_ZIGBEE_SITE = git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee/linux-zigbee +LINUX_ZIGBEE_VERSION = 0.3.1 +LINUX_ZIGBEE_SOURCE = lowpan-tools-$(LINUX_ZIGBEE_VERSION).tar.gz +LINUX_ZIGBEE_SITE = \ + http://downloads.sourceforge.net/project/linux-zigbee/linux-zigbee-sources/$(LINUX_ZIGBEE_VERSION) LINUX_ZIGBEE_LICENSE = GPL-2.0 LINUX_ZIGBEE_LICENSE_FILES = COPYING LINUX_ZIGBEE_DEPENDENCIES = libnl host-pkgconf host-flex host-bison diff --git a/buildroot/package/linuxconsoletools/0002-sdl-config.patch b/buildroot/package/linuxconsoletools/0002-sdl-config.patch deleted file mode 100644 index c19c274a8..000000000 --- a/buildroot/package/linuxconsoletools/0002-sdl-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -Specify sdl-config to use instead of using host sdl-config. - -Signed-off-by: Koen Martens - -diff -Naur a/utils/Makefile b/utils/Makefile ---- a/utils/Makefile 2017-06-16 18:48:28.402824790 +0200 -+++ b/utils/Makefile 2017-06-16 18:48:53.898696647 +0200 -@@ -69,10 +69,10 @@ - $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) -lm -o $@ - - ffmvforce.o: ffmvforce.c -- $(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `sdl-config --cflags` -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `${SDL_CONFIG} --cflags` - - ffmvforce: ffmvforce.o -- $(CC) $^ -o $@ $(LDFLAGS) -g -lm `sdl-config --libs` -+ $(CC) $^ -o $@ $(LDFLAGS) -g -lm `${SDL_CONFIG} --libs` - - axbtnmap.o: axbtnmap.c axbtnmap.h - diff --git a/buildroot/package/linuxconsoletools/Config.in b/buildroot/package/linuxconsoletools/Config.in index 76150278a..614099fde 100644 --- a/buildroot/package/linuxconsoletools/Config.in +++ b/buildroot/package/linuxconsoletools/Config.in @@ -28,9 +28,13 @@ config BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK config BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK bool "force-feedback utilities" - select BR2_PACKAGE_SDL + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_SDL2 help Build force-feedback driver utilities (fftest, ffmvforce, ffset, ffcfstress). +comment "force-feedback utilities need a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + endif diff --git a/buildroot/package/linuxconsoletools/linuxconsoletools.hash b/buildroot/package/linuxconsoletools/linuxconsoletools.hash index 756c9f434..caacf70e4 100644 --- a/buildroot/package/linuxconsoletools/linuxconsoletools.hash +++ b/buildroot/package/linuxconsoletools/linuxconsoletools.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 ced2efed00b67b45f82eddc69be07385835d558f658016315ac621fe2eaa8146 linuxconsoletools-1.6.0.tar.bz2 +sha256 95d112f06393806116341d593bda002c8bc44119c1538407623268fed90d8c34 linuxconsoletools-1.7.0.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/linuxconsoletools/linuxconsoletools.mk b/buildroot/package/linuxconsoletools/linuxconsoletools.mk index 82ff4c313..f26d874d9 100644 --- a/buildroot/package/linuxconsoletools/linuxconsoletools.mk +++ b/buildroot/package/linuxconsoletools/linuxconsoletools.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUXCONSOLETOOLS_VERSION = 1.6.0 +LINUXCONSOLETOOLS_VERSION = 1.7.0 LINUXCONSOLETOOLS_SOURCE = linuxconsoletools-$(LINUXCONSOLETOOLS_VERSION).tar.bz2 LINUXCONSOLETOOLS_SITE = https://downloads.sourceforge.net/project/linuxconsole LINUXCONSOLETOOLS_LICENSE = GPL-2.0+ @@ -21,8 +21,8 @@ endif ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK),y) LINUXCONSOLETOOLS_MAKE_OPTS += \ ENABLE_FORCEFEEDBACK=1 \ - SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config -LINUXCONSOLETOOLS_DEPENDENCIES += sdl + CFLAGS="$(TARGET_CFLAGS) -std=gnu99" +LINUXCONSOLETOOLS_DEPENDENCIES += sdl2 host-pkgconf endif define LINUXCONSOLETOOLS_BUILD_CMDS diff --git a/buildroot/package/linuxptp/linuxptp-system-clock.service b/buildroot/package/linuxptp/linuxptp-system-clock.service index a4436a34a..57beec457 100644 --- a/buildroot/package/linuxptp/linuxptp-system-clock.service +++ b/buildroot/package/linuxptp/linuxptp-system-clock.service @@ -8,4 +8,3 @@ Restart=always [Install] WantedBy=multi-user.target -WantedBy=linuxptp.service diff --git a/buildroot/package/linuxptp/linuxptp.mk b/buildroot/package/linuxptp/linuxptp.mk index c304ff6d6..97e4af7be 100644 --- a/buildroot/package/linuxptp/linuxptp.mk +++ b/buildroot/package/linuxptp/linuxptp.mk @@ -42,9 +42,6 @@ define LINUXPTP_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/linuxptp.service $(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/linuxptp-system-clock.service \ $(TARGET_DIR)/usr/lib/systemd/system/linuxptp-system-clock.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/linuxptp.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/linuxptp.service endef $(eval $(generic-package)) diff --git a/buildroot/package/liquid-dsp/liquid-dsp.hash b/buildroot/package/liquid-dsp/liquid-dsp.hash index ecee47447..31bcd6876 100644 --- a/buildroot/package/liquid-dsp/liquid-dsp.hash +++ b/buildroot/package/liquid-dsp/liquid-dsp.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 b136343d644bc1441f7854f2d292bfa054e8d040c0b745879b205f6836dca0f0 liquid-dsp-v1.3.0.tar.gz +sha256 85093624ef9cb90ead64c836d2f42690197edace1a86257d6524c4e4dc870483 liquid-dsp-1.3.2.tar.gz +sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE diff --git a/buildroot/package/liquid-dsp/liquid-dsp.mk b/buildroot/package/liquid-dsp/liquid-dsp.mk index 64c403e87..9745893b7 100644 --- a/buildroot/package/liquid-dsp/liquid-dsp.mk +++ b/buildroot/package/liquid-dsp/liquid-dsp.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIQUID_DSP_VERSION = v1.3.0 -LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,$(LIQUID_DSP_VERSION)) +LIQUID_DSP_VERSION = 1.3.2 +LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,v$(LIQUID_DSP_VERSION)) LIQUID_DSP_LICENSE = MIT LIQUID_DSP_LICENSE_FILES = LICENSE LIQUID_DSP_INSTALL_STAGING = YES diff --git a/buildroot/package/lirc-tools/lirc-tools.hash b/buildroot/package/lirc-tools/lirc-tools.hash index ed5ecfde9..8d9a79d2d 100644 --- a/buildroot/package/lirc-tools/lirc-tools.hash +++ b/buildroot/package/lirc-tools/lirc-tools.hash @@ -2,4 +2,5 @@ sha1 9d6f6d18ac566a96ef4ca1d6909a4e8bc517d48a lirc-0.10.1.tar.bz2 md5 86c3f8e4efaba10571addb8313d1e040 lirc-0.10.1.tar.bz2 # Locally computed -sha256 8b753c60df2a7f5dcda2db72c38e448ca300c3b4f6000c1501fcb0bd5df414f2 lirc-0.10.1.tar.bz2 +sha256 8b753c60df2a7f5dcda2db72c38e448ca300c3b4f6000c1501fcb0bd5df414f2 lirc-0.10.1.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/lite/lite.hash b/buildroot/package/lite/lite.hash index 9da6b4b6e..13a494b71 100644 --- a/buildroot/package/lite/lite.hash +++ b/buildroot/package/lite/lite.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1b784cf595c3d5313e3705db210119f77d48826dbc7fcf6328af83a1270c2264 LiTE-0.8.10.tar.gz +sha256 1b784cf595c3d5313e3705db210119f77d48826dbc7fcf6328af83a1270c2264 LiTE-0.8.10.tar.gz +sha256 512d2d21b6b3384ba64781abb0208a1b87740bc31e2df48e2b206ddb7e4d5779 COPYING diff --git a/buildroot/package/live555/live555.hash b/buildroot/package/live555/live555.hash index f8e5b5e68..f5df69f24 100644 --- a/buildroot/package/live555/live555.hash +++ b/buildroot/package/live555/live555.hash @@ -1,3 +1,5 @@ +# From http://www.live555.com/liveMedia/public/live555-latest-md5.txt +md5 12e105c8fef9d34658d68367dc26a3d9 live.2019.09.30.tar.gz # Locally generated -sha256 0bd0c26d980425d9a419d835193e292a08a968f175da1902da4b495f126d5abd live.2019.03.06.tar.gz +sha256 ef44f48a84324525cebc2081dd2d0f1e908f2d0a79d9d30dd41967e142dfb06b live.2019.09.30.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/live555/live555.mk b/buildroot/package/live555/live555.mk index 250eea236..cbe1c1bc0 100644 --- a/buildroot/package/live555/live555.mk +++ b/buildroot/package/live555/live555.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIVE555_VERSION = 2019.03.06 +LIVE555_VERSION = 2019.09.30 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz -LIVE555_SITE = http://www.live555.com +LIVE555_SITE = http://www.live555.com/liveMedia/public LIVE555_LICENSE = LGPL-2.1+ LIVE555_LICENSE_FILES = COPYING LIVE555_INSTALL_STAGING = YES diff --git a/buildroot/package/ljsyscall/ljsyscall.hash b/buildroot/package/ljsyscall/ljsyscall.hash index 114aa8420..6fd7f6a51 100644 --- a/buildroot/package/ljsyscall/ljsyscall.hash +++ b/buildroot/package/ljsyscall/ljsyscall.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 6e29503609bd966fed33dec1a1571b36bbdbc37bf1a828af6722ed0ead192ff1 ljsyscall-v0.12.tar.gz +sha256 6e29503609bd966fed33dec1a1571b36bbdbc37bf1a828af6722ed0ead192ff1 ljsyscall-0.12.tar.gz +sha256 c8e21d8e74afbe26c2c8e69b42327d3b48e602117f9ef7b22c31ddca6f46b1f2 COPYRIGHT diff --git a/buildroot/package/ljsyscall/ljsyscall.mk b/buildroot/package/ljsyscall/ljsyscall.mk index 45e9e82b8..12dfbcb4a 100644 --- a/buildroot/package/ljsyscall/ljsyscall.mk +++ b/buildroot/package/ljsyscall/ljsyscall.mk @@ -4,8 +4,8 @@ # ################################################################################ -LJSYSCALL_VERSION = v0.12 -LJSYSCALL_SITE = $(call github,justincormack,ljsyscall,$(LJSYSCALL_VERSION)) +LJSYSCALL_VERSION = 0.12 +LJSYSCALL_SITE = $(call github,justincormack,ljsyscall,v$(LJSYSCALL_VERSION)) LJSYSCALL_LICENSE = MIT LJSYSCALL_LICENSE_FILES = COPYRIGHT @@ -18,6 +18,8 @@ else ifeq ($(BR2_powerpc),y) LJSYSCALL_ARCH = ppc else ifeq ($(BR2_arm)$(BR2_armeb),y) LJSYSCALL_ARCH = arm +else ifeq ($(BR2_aarch64),y) +LJSYSCALL_ARCH = arm64 else ifeq ($(BR2_mips)$(BR2_mipsel),y) LJSYSCALL_ARCH = mips else diff --git a/buildroot/package/lksctp-tools/lksctp-tools.hash b/buildroot/package/lksctp-tools/lksctp-tools.hash index 0ecc8ff0e..7c8ef6046 100644 --- a/buildroot/package/lksctp-tools/lksctp-tools.hash +++ b/buildroot/package/lksctp-tools/lksctp-tools.hash @@ -1,3 +1,6 @@ # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz +# Locally computed +sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib +sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING diff --git a/buildroot/package/lld/Config.in.host b/buildroot/package/lld/Config.in.host new file mode 100644 index 000000000..f016f3445 --- /dev/null +++ b/buildroot/package/lld/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_LLD + bool "host lld" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm + help + LLD is a linker from the LLVM project that is a drop-in + replacement for system linkers, and runs much faster than + them. It also provides features that are useful for + toolchain developers. + + https://lld.llvm.org/ diff --git a/buildroot/package/lld/lld.hash b/buildroot/package/lld/lld.hash new file mode 100644 index 000000000..2144cc566 --- /dev/null +++ b/buildroot/package/lld/lld.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 86262bad3e2fd784ba8c5e2158d7aa36f12b85f2515e95bc81d65d75bb9b0c82 lld-9.0.1.src.tar.xz +sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT diff --git a/buildroot/package/lld/lld.mk b/buildroot/package/lld/lld.mk new file mode 100644 index 000000000..ea09c5d34 --- /dev/null +++ b/buildroot/package/lld/lld.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# lld +# +################################################################################ + +# LLVM, Clang and lld should be version bumped together +LLD_VERSION = 9.0.1 +LLD_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLD_VERSION) +LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz +LLD_LICENSE = Apache-2.0 with exceptions +LLD_LICENSE_FILES = LICENSE.TXT +LLD_SUPPORTS_IN_SOURCE_BUILD = NO +HOST_LLD_DEPENDENCIES = host-llvm + +# LLVM > 9.0 will soon require C++14 support, building llvm <= 9.0 using a +# toolchain using gcc < 5.1 gives an error but actually still works. Setting +# this option makes it still build with gcc >= 4.8. +# https://reviews.llvm.org/D57264 +HOST_LLD_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON + +# GCC looks for tools in a different path from LLD's default installation path +define HOST_LLD_CREATE_SYMLINKS + mkdir -p $(HOST_DIR)/$(GNU_TARGET_NAME)/bin + ln -sf $(HOST_DIR)/bin/lld $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/lld + ln -sf $(HOST_DIR)/bin/lld $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/ld.lld +endef + +HOST_LLD_POST_INSTALL_HOOKS += HOST_LLD_CREATE_SYMLINKS + +$(eval $(host-cmake-package)) diff --git a/buildroot/package/lldpd/0001-build-ability-to-disable-libbsd-with-without-libbsd.patch b/buildroot/package/lldpd/0001-build-ability-to-disable-libbsd-with-without-libbsd.patch deleted file mode 100644 index 7301ac636..000000000 --- a/buildroot/package/lldpd/0001-build-ability-to-disable-libbsd-with-without-libbsd.patch +++ /dev/null @@ -1,106 +0,0 @@ -From ff3dcc4ad71c1105bd8ea11afe7e07efd48c038d Mon Sep 17 00:00:00 2001 -From: Vincent Bernat -Date: Tue, 25 Sep 2018 10:57:49 +0200 -Subject: [PATCH] build: ability to disable libbsd with --without-libbsd - -This is useful when user wants to ensure reproducibility of the build -whatever libbsd is present or not. - -Signed-off-by: Trent Piepho ---- - configure.ac | 59 +++++++++++++++++++++++++++++++++++++++-------------------- - src/marshal.h | 1 + - 2 files changed, 40 insertions(+), 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9b40473..589cd96 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -173,26 +173,44 @@ AC_FUNC_REALLOC - AC_FUNC_FORK - - # Some functions can be in libbsd --PKG_CHECK_MODULES([libbsd], [libbsd-overlay], [ -- _save_CFLAGS="$CFLAGS" -- _save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $libbsd_CFLAGS" -- LIBS="$LIBS $libbsd_LIBS" -- AC_MSG_CHECKING([if libbsd can be linked correctly]) -- AC_TRY_LINK([ --@%:@include --@%:@include --],[], -- [ -- AC_MSG_RESULT(yes) -- LLDP_CFLAGS="$LLDP_CFLAGS $libbsd_CFLAGS" -- LLDP_LDFLAGS="$LLDP_LDFLAGS $libbsd_LIBS" -- ],[ -- AC_MSG_RESULT(no) -- CFLAGS="$_save_CFLAGS" -- LIBS="$_save_LIBS" -- ]) --], [:]) -+AC_ARG_WITH([libbsd], -+ AS_HELP_STRING( -+ [--with-libbsd], -+ [Use libbsd @<:@default=auto@:>@]), -+ [], -+ [with_libbsd=auto]) -+if test x"$with_libbsd" != x"no"; then -+ PKG_CHECK_MODULES([libbsd], [libbsd-overlay], [ -+ _save_CFLAGS="$CFLAGS" -+ _save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $libbsd_CFLAGS" -+ LIBS="$LIBS $libbsd_LIBS" -+ AC_MSG_CHECKING([if libbsd can be linked correctly]) -+ AC_TRY_LINK([ -+ @%:@include -+ @%:@include -+ ],[], -+ [ -+ AC_MSG_RESULT(yes) -+ LLDP_CFLAGS="$LLDP_CFLAGS $libbsd_CFLAGS" -+ LLDP_LDFLAGS="$LLDP_LDFLAGS $libbsd_LIBS" -+ with_libbsd=yes -+ ],[ -+ AC_MSG_RESULT(no) -+ CFLAGS="$_save_CFLAGS" -+ LIBS="$_save_LIBS" -+ if test x"$with_libbsd" = x"yes"; then -+ AC_MSG_FAILURE([*** no libbsd support found]) -+ fi -+ with_libbsd=no -+ ]) -+ ], [ -+ if test x"$with_libbsd" = x"yes"; then -+ AC_MSG_FAILURE([*** no libbsd support found]) -+ fi -+ with_libbsd=no -+ ]) -+fi - - # setproctitle may have an _init function - AC_REPLACE_FUNCS([setproctitle]) -@@ -412,6 +430,7 @@ cat < -+#include - #include - - struct marshal_info; --- -2.14.4 - diff --git a/buildroot/package/lldpd/lldpd.hash b/buildroot/package/lldpd/lldpd.hash index 1c0e38099..c12e00478 100644 --- a/buildroot/package/lldpd/lldpd.hash +++ b/buildroot/package/lldpd/lldpd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 450b622aac7ae1758f1ef82f3b7b94ec47f2ff33abfb0e6ac82555b9ee55f151 lldpd-1.0.1.tar.gz +sha256 5319bc032fabf1008d5d91e280276aa7f1bbfbb70129d8526cd4526d7c22724f lldpd-1.0.4.tar.gz sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE diff --git a/buildroot/package/lldpd/lldpd.mk b/buildroot/package/lldpd/lldpd.mk index 506b6f136..264323a87 100644 --- a/buildroot/package/lldpd/lldpd.mk +++ b/buildroot/package/lldpd/lldpd.mk @@ -4,21 +4,16 @@ # ################################################################################ -LLDPD_VERSION = 1.0.1 +LLDPD_VERSION = 1.0.4 LLDPD_SITE = http://media.luffy.cx/files/lldpd -LLDPD_DEPENDENCIES = host-pkgconf libevent +LLDPD_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_CHECK),check) \ + host-pkgconf \ + $(if $(BR2_PACKAGE_LIBCAP),libcap) \ + libevent \ + $(if $(BR2_PACKAGE_VALGRIND),valgrind) LLDPD_LICENSE = ISC LLDPD_LICENSE_FILES = LICENSE -# 0002-configure-do-not-check-for-libbsd.patch / 0003-configure-remove-check-on-CXX-compiler.patch -LLDPD_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_CHECK),y) -LLDPD_DEPENDENCIES += check -endif - -ifeq ($(BR2_PACKAGE_VALGRIND),y) -LLDPD_DEPENDENCIES += valgrind -endif # Detection of c99 support in configure fails without WCHAR. To enable # automatic detection of c99 support by configure, we need to enable @@ -29,8 +24,6 @@ LLDPD_CONF_ENV = ac_cv_prog_cc_c99=-std=gnu99 LLDPD_CONF_OPTS = \ --without-embedded-libevent \ - --without-snmp \ - --without-xml \ --without-seccomp \ --without-libbsd \ --disable-hardening \ @@ -44,6 +37,22 @@ LLDPD_CONF_OPTS = \ $(if $(BR2_PACKAGE_LLDPD_DOT3),--enable-dot3,--disable-dot3) \ $(if $(BR2_PACKAGE_LLDPD_CUSTOM_TLV),--enable-custom,--disable-custom) +ifeq ($(BR2_PACKAGE_LIBXML2),y) +LLDPD_CONF_OPTS += --with-xml +LLDPD_DEPENDENCIES += libxml2 +else +LLDPD_CONF_OPTS += --without-xml +endif + +ifeq ($(BR2_PACKAGE_NETSNMP),y) +LLDPD_CONF_OPTS += --with-snmp +LLDPD_DEPENDENCIES += netsnmp +LLDPD_CONF_ENV += \ + ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config +else +LLDPD_CONF_OPTS += --without-snmp +endif + ifeq ($(BR2_PACKAGE_READLINE),y) LLDPD_CONF_OPTS += --with-readline LLDPD_DEPENDENCIES += readline @@ -56,10 +65,4 @@ define LLDPD_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S60lldpd endef -define LLDPD_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/lldpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lldpd.service -endef - $(eval $(autotools-package)) diff --git a/buildroot/package/llvm/Config.in b/buildroot/package/llvm/Config.in index 83e94660e..1d21d879d 100644 --- a/buildroot/package/llvm/Config.in +++ b/buildroot/package/llvm/Config.in @@ -14,7 +14,6 @@ config BR2_PACKAGE_LLVM_TARGET_ARCH config BR2_PACKAGE_LLVM bool "llvm" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_HOST_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP @@ -35,12 +34,25 @@ config BR2_PACKAGE_LLVM_AMDGPU Build AMDGPU target. Select this option if you are going to install mesa3d with llvm and use Gallium Radeon driver. +config BR2_PACKAGE_LLVM_RTTI + bool "enable rtti" + help + Build LLVM with run-time type information. LLVM can be built + without rtti, but turning it off changes the ABI of C++ + programs. + + This features is needed to build the Gallium Nouveau driver + or the Clover OpenCL state tracker when llvm support is + enabled. + + https://llvm.org/docs/HowToSetUpLLVMStyleRTTI.html + endif -comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, host gcc >= 4.8, dynamic library" +comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "llvm needs a toolchain not affected by GCC bug 64735" diff --git a/buildroot/package/llvm/llvm.hash b/buildroot/package/llvm/llvm.hash index 531361ae1..6bf275577 100644 --- a/buildroot/package/llvm/llvm.hash +++ b/buildroot/package/llvm/llvm.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 a38dfc4db47102ec79dcc2aa61e93722c5f6f06f0a961073bd84b78fb949419b llvm-7.0.1.src.tar.xz -sha256 0303dfeaac87b80d2d1e543aa38d5be77b0eac93c3d04fe7e3c8eaa71a778667 LICENSE.TXT +sha256 00a1ee1f389f81e9979f3a640a01c431b3021de0d42278f6508391a2f0b81c9a llvm-9.0.1.src.tar.xz +sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT diff --git a/buildroot/package/llvm/llvm.mk b/buildroot/package/llvm/llvm.mk index 952f678ee..f1034f036 100644 --- a/buildroot/package/llvm/llvm.mk +++ b/buildroot/package/llvm/llvm.mk @@ -4,19 +4,26 @@ # ################################################################################ -LLVM_VERSION = 7.0.1 -LLVM_SITE = http://llvm.org/releases/$(LLVM_VERSION) +# LLVM, Clang and lld should be version bumped together +LLVM_VERSION = 9.0.1 +LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VERSION) LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz -LLVM_LICENSE = NCSA +LLVM_LICENSE = Apache-2.0 with exceptions LLVM_LICENSE_FILES = LICENSE.TXT LLVM_SUPPORTS_IN_SOURCE_BUILD = NO LLVM_INSTALL_STAGING = YES -# http://llvm.org/docs/GettingStarted.html#software -# host-python: Python interpreter 2.7 or newer is required for builds and testing. -HOST_LLVM_DEPENDENCIES = host-python +# LLVM >= 9.0 can use python3 to build. +HOST_LLVM_DEPENDENCIES = host-python3 LLVM_DEPENDENCIES = host-llvm +# LLVM >= 9.0 will soon require C++14 support, building llvm 8.x using a +# toolchain using gcc < 5.1 gives an error but actually still works. Setting +# this option makes it still build with gcc >= 4.8. +# https://reviews.llvm.org/D57264 +HOST_LLVM_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON +LLVM_CONF_OPTS += -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON + # Don't build clang libcxx libcxxabi lldb compiler-rt lld polly as llvm subprojects # This flag assumes that projects are checked out side-by-side and not nested HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_PROJECTS="" @@ -125,6 +132,15 @@ HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_ZLIB=ON HOST_LLVM_DEPENDENCIES += host-zlib LLVM_CONF_OPTS += -DLLVM_ENABLE_ZLIB=OFF +# libxml2 can be disabled as it is used for LLVM Windows builds where COFF +# files include manifest info +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_LIBXML2=OFF +LLVM_CONF_OPTS += -DLLVM_ENABLE_LIBXML2=OFF + +# Disable optional Z3Prover since there is no such package in Buildroot. +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_Z3_SOLVER=OFF +LLVM_CONF_OPTS += -DLLVM_ENABLE_Z3_SOLVER=OFF + # We don't use llvm for static only build, so enable PIC HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_PIC=ON LLVM_CONF_OPTS += -DLLVM_ENABLE_PIC=ON @@ -177,7 +193,8 @@ LLVM_CONF_OPTS += -DLLVM_HOST_TRIPLE=$(GNU_TARGET_NAME) # check preventively. Building the Go and OCaml bindings is yet unsupported. HOST_LLVM_CONF_OPTS += \ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND \ - -DOCAMLFIND=OCAMLFIND-NOTFOUND + -DOCAMLFIND=OCAMLFIND-NOTFOUND \ + -DLLVM_ENABLE_BINDINGS=OFF # Builds a release host tablegen that gets used during the LLVM build. HOST_LLVM_CONF_OPTS += -DLLVM_OPTIMIZED_TABLEGEN=ON @@ -203,6 +220,14 @@ LLVM_CONF_OPTS += \ -DLLVM_INCLUDE_TOOLS=ON \ -DLLVM_BUILD_TOOLS=OFF +ifeq ($(BR2_PACKAGE_LLVM_RTTI),y) +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_RTTI=ON +LLVM_CONF_OPTS += -DLLVM_ENABLE_RTTI=ON +else +HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_RTTI=OFF +LLVM_CONF_OPTS += -DLLVM_ENABLE_RTTI=OFF +endif + # Compiler-rt not in the source tree. # llvm runtime libraries are not in the source tree. # Polly is not in the source tree. diff --git a/buildroot/package/lm-sensors/lm-sensors.hash b/buildroot/package/lm-sensors/lm-sensors.hash index 40728252b..d41af2745 100644 --- a/buildroot/package/lm-sensors/lm-sensors.hash +++ b/buildroot/package/lm-sensors/lm-sensors.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 f671c1d63a4cd8581b3a4a775fd7864a740b15ad046fe92038bcff5c5134d7e0 lm-sensors-V3-5-0.tar.gz +sha256 f671c1d63a4cd8581b3a4a775fd7864a740b15ad046fe92038bcff5c5134d7e0 lm-sensors-3-5-0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/buildroot/package/lm-sensors/lm-sensors.mk b/buildroot/package/lm-sensors/lm-sensors.mk index cebfcdf42..f8059be47 100644 --- a/buildroot/package/lm-sensors/lm-sensors.mk +++ b/buildroot/package/lm-sensors/lm-sensors.mk @@ -4,8 +4,8 @@ # ################################################################################ -LM_SENSORS_VERSION = V3-5-0 -LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,$(LM_SENSORS_VERSION)) +LM_SENSORS_VERSION = 3-5-0 +LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION)) LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs) diff --git a/buildroot/package/lmbench/lmbench.hash b/buildroot/package/lmbench/lmbench.hash index b7aaa6ae5..25c150f4d 100644 --- a/buildroot/package/lmbench/lmbench.hash +++ b/buildroot/package/lmbench/lmbench.hash @@ -1,2 +1,4 @@ # Locally computed: sha256 cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551 lmbench-3.0-a9.tgz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 3be7a155efa448db90071a95fbf81796f8f90edf9204f0463cfd23402dc90a72 COPYING-2 diff --git a/buildroot/package/localedef/0001-Don-t-include-xlocale.h.patch b/buildroot/package/localedef/0001-Don-t-include-xlocale.h.patch deleted file mode 100644 index 9a6c2f8e9..000000000 --- a/buildroot/package/localedef/0001-Don-t-include-xlocale.h.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Bernhard Walle -Date: Mon, 2 Oct 2017 16:55:23 +0200 -Subject: [PATCH] Don't include - -This header has been removed in glibc 2.26: - -https://abi-laboratory.pro/tracker/changelog/glibc/2.26/log.html - ------------------------- >8 ------------------------ -* The nonstandard header has been removed. Most programs should - use instead. If you have a specific need for the definition of - locale_t with no other declarations, please contact - libc-alpha@sourceware.org and explain. ------------------------- 8< ------------------------ - -Signed-off-by: Bernhard Walle - -Upstream: https://git.pengutronix.de/cgit/ptxdist/tree/patches/localedef-eglibc-2.14.1-r17443-ptx1/0003-Don-t-include-xlocale.h.patch -Signed-off-by: Peter Seiderer ---- - eglibc/locale/langinfo.h | 2 +- - eglibc/locale/locale.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/eglibc/locale/langinfo.h b/eglibc/locale/langinfo.h -index 0a5336507196..76707a4584c1 100644 ---- a/eglibc/locale/langinfo.h -+++ b/eglibc/locale/langinfo.h -@@ -589,7 +589,7 @@ extern char *nl_langinfo (nl_item __item) __THROW; - more information. */ - - /* Get locale datatype definition. */ --# include -+# include - - /* Just like nl_langinfo but get the information from the locale object L. */ - extern char *nl_langinfo_l (nl_item __item, __locale_t __l); -diff --git a/eglibc/locale/locale.h b/eglibc/locale/locale.h -index 2aa19e76acb2..18be711a2d40 100644 ---- a/eglibc/locale/locale.h -+++ b/eglibc/locale/locale.h -@@ -143,7 +143,7 @@ __END_NAMESPACE_STD - This is a proof-of-concept implementation. */ - - /* Get locale datatype definition. */ --# include -+# include_next - - /* Return a reference to a data structure representing a set of locale - datasets. Unlike for the CATEGORY parameter for `setlocale' the diff --git a/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0001-HACK-only-build-and-install-localedef.patch b/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0001-HACK-only-build-and-install-localedef.patch new file mode 100644 index 000000000..d327008c1 --- /dev/null +++ b/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0001-HACK-only-build-and-install-localedef.patch @@ -0,0 +1,65 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Olbrich +Date: Mon, 21 May 2018 16:45:02 +0200 +Subject: [PATCH] HACK: only build and install localedef + +Signed-off-by: Michael Olbrich + +Upstream: https://git.pengutronix.de/cgit/ptxdist/plain/patches/localedef-glibc-2.27/0001-HACK-only-build-and-install-localedef.patch?id=47116f66f411d4dadfce42c2fdd6d41b351ccfd4 +Signed-off-by: Peter Seiderer +--- + Rules | 14 ++++++++++---- + locale/Makefile | 6 +++--- + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/Rules b/Rules +index 16afa6acaa..6c208db788 100644 +--- a/Rules ++++ b/Rules +@@ -190,10 +190,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \ + $(binaries-all-notests)) + + ifneq "$(strip $(binaries-shared-notests))" "" +-$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o \ +- $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \ +- $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit) +- $(+link) ++$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o ++ $(CC) -o $@ \ ++ $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ ++ $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \ ++ $(filter-out $(addprefix $(csu-objpfx),start.o \ ++ $(start-installed-name))\ ++ $(+preinit) \ ++ $(link-extra-libs) \ ++ $(common-objpfx)libc% $(+postinit),$^) \ ++ $(link-extra-libs) + endif + + ifneq "$(strip $(binaries-shared-tests))" "" +diff --git a/locale/Makefile b/locale/Makefile +index 764e751c36..c28322d71f 100644 +--- a/locale/Makefile ++++ b/locale/Makefile +@@ -32,15 +32,15 @@ categories = ctype messages monetary numeric time paper name \ + address telephone measurement identification collate + aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ + xlocale localename global-locale coll-lookup +-others = localedef locale ++others = localedef + #others-static = localedef locale +-install-bin = localedef locale ++install-bin = localedef + extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \ + $(locale-modules:=.o) $(lib-modules:=.o) + generated += C-translit.h + before-compile += $(objpfx)C-translit.h + +-extra-libs = libBrokenLocale ++#extra-libs = libBrokenLocale + extra-libs-others = $(extra-libs) + + libBrokenLocale-routines = broken_cur_max +-- +2.21.0 + diff --git a/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch new file mode 100644 index 000000000..a6e87cc31 --- /dev/null +++ b/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch @@ -0,0 +1,64 @@ +From 313e04bfbd281f9b46fdde097aacb59d501820a3 Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Thu, 6 Feb 2020 14:36:21 -0600 +Subject: [PATCH] relax dependency on GCC to 4.8 and binutils to 2.24 + +The glibc package has been updating the toolchain version +dependency since 2.28.x. The dependencies don't currently +apply to the localedef build of the package, so this +patchset relaxes the restriction such that builds can still +occur on older host machines. + +Here's a related post from 2018 for a similar patchset. +http://lists.busybox.net/pipermail/buildroot/2018-December/237949.html + +Timeline of relevant commits that adjust the dependency upstream. +GCC 4.9+ + https://sourceware.org/git/?p=glibc.git;a=commit;h=4add86749a31f302674599b69d2eea691d69341a +Binutils 2.25+ + https://sourceware.org/git/?p=glibc.git;a=commit;h=073e8fa7739ed453d6854b834f290c263a6cdb9f + https://sourceware.org/git/?p=glibc.git;a=commit;h=b4396163aa8666f970aaf43eaca25f3a92b18c1b +GCC 5+ + https://sourceware.org/git/?p=glibc.git;a=commit;h=192963be49678b48f60218f1f794991cdd9fe472 +GCC 6.2+ + https://sourceware.org/git/?p=glibc.git;a=commit;h=4dcbbc3b28aaeafe23e1a30db84055aa6f6fa987 + +Signed-off-by: Matthew Weber +--- + configure | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index 6d26b824..9ac2e5e9 100755 +--- a/configure ++++ b/configure +@@ -4601,7 +4601,7 @@ $as_echo_n "checking version of $AS... " >&6; } + ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 2.1[0-9][0-9]*|2.2[5-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) ++ 2.1[0-9][0-9]*|2.2[4-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +@@ -4731,7 +4731,7 @@ $as_echo_n "checking version of $LD... " >&6; } + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 2.1[0-9][0-9]*|2.2[5-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) ++ 2.1[0-9][0-9]*|2.2[4-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +@@ -5140,7 +5140,7 @@ int + main () + { + +-#if !defined __GNUC__ || __GNUC__ < 6 || (__GNUC__ == 6 && __GNUC_MINOR__ < 2) ++#if !defined __GNUC__ || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) + #error insufficient compiler + #endif + ; +-- +2.18.0 + diff --git a/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0003-localedef-Use-initializer-for-flexible-array-member-.patch b/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0003-localedef-Use-initializer-for-flexible-array-member-.patch new file mode 100644 index 000000000..93547e08f --- /dev/null +++ b/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0003-localedef-Use-initializer-for-flexible-array-member-.patch @@ -0,0 +1,81 @@ +From 6fea0a8e33760258c4baa5d0a6f3a145897427fe Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Tue, 3 Sep 2019 14:01:39 +0200 +Subject: [PATCH] localedef: Use initializer for flexible array member [BZ + #24950] + +struct charseq used a zero-length array instead of a flexible array +member. This required a strange construct to initialize struct +charseq objects, and GCC 10 warns about that: + +cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] +In file included from programs/repertoire.h:24, + from programs/localedef.h:32, + from programs/ld-ctype.c:35: +programs/charmap.h:63:17: note: destination object declared here + 63 | unsigned char bytes[0]; + | ^~~~~ +cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] +programs/charmap.h:63:17: note: destination object declared here +cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] +programs/charmap.h:63:17: note: destination object declared here +cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] +programs/charmap.h:63:17: note: destination object declared here + +The change makes the object physically const, but it is not expected +to be modified. + +[Upstream: https://sourceware.org/git/?p=glibc.git;a=patch;h=1471fa556afb428c4a4c46cf5543a4101d5bcf91] +[Dropped confliciting ChangeLog part] +Signed-off-by: Peter Seiderer +--- + locale/programs/charmap.h | 2 +- + locale/programs/ld-ctype.c | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/locale/programs/charmap.h b/locale/programs/charmap.h +index 870a9e95..70db330d 100644 +--- a/locale/programs/charmap.h ++++ b/locale/programs/charmap.h +@@ -60,7 +60,7 @@ struct charseq + const char *name; + uint32_t ucs4; + int nbytes; +- unsigned char bytes[0]; ++ unsigned char bytes[]; + }; + + +diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c +index cfc9c43f..9123f64a 100644 +--- a/locale/programs/ld-ctype.c ++++ b/locale/programs/ld-ctype.c +@@ -842,8 +842,6 @@ no input digits defined and none of the standard names in the charmap")); + for (cnt = 0; cnt < 10; ++cnt) + if (ctype->mboutdigits[cnt] == NULL) + { +- static struct charseq replace[2]; +- + if (!warned) + { + record_error (0, 0, _("\ +@@ -851,10 +849,12 @@ not all characters used in `outdigit' are available in the charmap")); + warned = 1; + } + +- replace[0].nbytes = 1; +- replace[0].bytes[0] = '?'; +- replace[0].bytes[1] = '\0'; +- ctype->mboutdigits[cnt] = &replace[0]; ++ static const struct charseq replace = ++ { ++ .nbytes = 1, ++ .bytes = "?", ++ }; ++ ctype->mboutdigits[cnt] = (struct charseq *) &replace; + } + + warned = 0; +-- +2.26.0 + diff --git a/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/localedef.hash b/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/localedef.hash new file mode 100644 index 000000000..4283ea04b --- /dev/null +++ b/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/localedef.hash @@ -0,0 +1,7 @@ +# Locally calculated (fetched from Github) +sha256 fe1ca8099bc2cda997d8a585f1a512e59df56c52c9c7363a4058da2725c8f4a9 glibc-2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91.tar.gz + +# Hashes for license files +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES diff --git a/buildroot/package/localedef/localedef.hash b/buildroot/package/localedef/localedef.hash index ee14fb16b..5316f03b1 100644 --- a/buildroot/package/localedef/localedef.hash +++ b/buildroot/package/localedef/localedef.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 9a60f7cdab6fb39adf23a12102f2d950d5f07f0cd7e51e85ec327e07440a79c6 localedef-eglibc-2.14.1-r17443-ptx1.tar.bz2 +# This hash file is not used; instead, update the +# hash files in the per-version sub-directories. diff --git a/buildroot/package/localedef/localedef.mk b/buildroot/package/localedef/localedef.mk index 11d9ba384..1093e106f 100644 --- a/buildroot/package/localedef/localedef.mk +++ b/buildroot/package/localedef/localedef.mk @@ -4,19 +4,52 @@ # ################################################################################ -LOCALEDEF_VERSION = 2.14.1-r17443-ptx1 -LOCALEDEF_SOURCE = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2 -LOCALEDEF_SITE = http://www.pengutronix.de/software/ptxdist/temporary-src +# Use the same VERSION and SITE as target glibc +# As in glibc.mk, generate version string using: +# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- +LOCALEDEF_VERSION = 2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91 +LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz +LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) +HOST_LOCALEDEF_DL_SUBDIR = glibc -HOST_LOCALEDEF_CONF_OPTS += \ - --prefix=/usr \ - --with-glibc=./eglibc +HOST_LOCALEDEF_DEPENDENCIES = \ + $(BR2_MAKE_HOST_DEPENDENCY) \ + host-bison \ + host-gawk -HOST_LOCALEDEF_CONF_ENV = CFLAGS="$(HOST_CFLAGS) -fgnu89-inline" +HOST_LOCALEDEF_CONF_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)" -# The makefile does not implement an install target +# Even though we use the autotools-package infrastructure, we have to override +# the default configure commands for since we have to build out-of-tree, but we +# can't use the same 'symbolic link to configure' used with the gcc packages. +define HOST_LOCALEDEF_CONFIGURE_CMDS + mkdir -p $(@D)/build + # Do the configuration + (cd $(@D)/build; \ + $(HOST_LOCALEDEF_CONF_ENV) \ + $(HOST_CONFIGURE_OPTS) \ + $(SHELL) $(@D)/configure \ + libc_cv_forced_unwind=yes \ + libc_cv_ssp=no \ + --target=$(GNU_HOST_NAME) \ + --host=$(GNU_HOST_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --with-pkgversion="Buildroot" \ + --without-cvs \ + --disable-profile \ + --without-gd \ + --enable-obsolete-rpc) +endef + +define HOST_LOCALEDEF_BUILD_CMDS + $(HOST_MAKE_ENV) $(BR2_MAKE1) $(HOST_LOCALEDEF_MAKE_OPTS) \ + -C $(@D)/build locale/others +endef + +# The makefile does not implement an install target for localedef define HOST_LOCALEDEF_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/localedef $(HOST_DIR)/bin/localedef + $(INSTALL) -D -m 0755 $(@D)/build/locale/localedef $(HOST_DIR)/bin/localedef endef $(eval $(host-autotools-package)) diff --git a/buildroot/package/lockdev/lockdev.hash b/buildroot/package/lockdev/lockdev.hash index bb055e4ad..e32466dfe 100644 --- a/buildroot/package/lockdev/lockdev.hash +++ b/buildroot/package/lockdev/lockdev.hash @@ -1,3 +1,5 @@ # From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_1.0.3-1.6.dsc -sha256 ccae635d7ac3fdd50897eceb250872b3d9a191d298f213e7f0c836910d869f82 lockdev_1.0.3.orig.tar.gz -sha256 a5405c6ee5e97e45eeb1c81330a7e9f444a58bda5e6771fa30007516c115007e lockdev_1.0.3-1.6.diff.gz +sha256 ccae635d7ac3fdd50897eceb250872b3d9a191d298f213e7f0c836910d869f82 lockdev_1.0.3.orig.tar.gz +sha256 a5405c6ee5e97e45eeb1c81330a7e9f444a58bda5e6771fa30007516c115007e lockdev_1.0.3-1.6.diff.gz +# Locally calculated +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 LICENSE diff --git a/buildroot/package/lockfile-progs/lockfile-progs.hash b/buildroot/package/lockfile-progs/lockfile-progs.hash index e628f0cc1..fc3d4b68b 100644 --- a/buildroot/package/lockfile-progs/lockfile-progs.hash +++ b/buildroot/package/lockfile-progs/lockfile-progs.hash @@ -1,2 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockfile-progs/lockfile-progs_0.1.17.dsc -sha256 03fb05d25499532f497775b1747b61fa6beebf12d3bcc951e125349ae166c511 lockfile-progs_0.1.17.tar.gz +# From https://snapshot.debian.org/archive/debian/20180903T205652Z/pool/main/l/lockfile-progs/lockfile-progs_0.1.18.tar.gz +sha256 a42995a4b97e6188efc90fcc1a761163c4b2cff5c81b936f85c84301ddb05ce6 lockfile-progs_0.1.18.tar.gz + +# Hash for license file +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/buildroot/package/lockfile-progs/lockfile-progs.mk b/buildroot/package/lockfile-progs/lockfile-progs.mk index ed192f102..d2f8f6118 100644 --- a/buildroot/package/lockfile-progs/lockfile-progs.mk +++ b/buildroot/package/lockfile-progs/lockfile-progs.mk @@ -4,9 +4,9 @@ # ################################################################################ -LOCKFILE_PROGS_VERSION = 0.1.17 +LOCKFILE_PROGS_VERSION = 0.1.18 LOCKFILE_PROGS_SOURCE = lockfile-progs_$(LOCKFILE_PROGS_VERSION).tar.gz -LOCKFILE_PROGS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockfile-progs +LOCKFILE_PROGS_SITE = http://snapshot.debian.org/archive/debian/20180903T205652Z/pool/main/l/lockfile-progs LOCKFILE_PROGS_DEPENDENCIES = liblockfile LOCKFILE_PROGS_LICENSE = GPL-2.0 LOCKFILE_PROGS_LICENSE_FILES = COPYING diff --git a/buildroot/package/log4cplus/0001-configure-ac-check-for-libraries-in-C-mode.patch b/buildroot/package/log4cplus/0001-configure-ac-check-for-libraries-in-C-mode.patch new file mode 100644 index 000000000..6226a6210 --- /dev/null +++ b/buildroot/package/log4cplus/0001-configure-ac-check-for-libraries-in-C-mode.patch @@ -0,0 +1,62 @@ +From 4446516eb4fc8613d26669f5683f9d5d7c36ee67 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Wed, 18 Dec 2019 21:26:58 +0100 +Subject: [PATCH] configure.ac: check for libraries in C mode + +Fixes check for libraries failures, e.g. (from config.log): + + arc-buildroot-linux-uclibc-g++ -o conftest -Os -Wall -fdiagnostics-show-caret -ftrack-macro-expansion -fdiagnostics-color=auto -Wextra -pedantic -Wstrict-aliasing -Wstrict-overflow -Woverloaded-virtual -Wold-style-cast -Wc++14-compat -Wundef -Wshadow -Wformat -Wnoexcept -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wno-variadic-macros -fvisibility=hidden conftest.cpp -latomic + conftest.cpp:28:6: error: new declaration 'char __atomic_fetch_and_4()' ambiguates built-in declaration 'unsigned int __atomic_fetch_and_4(volatile void*, unsigned int, int)' [-fpermissive] + 28 | char __atomic_fetch_and_4 (); + | ^~~~~~~~~~~~~~~~~~~~ + conftest.cpp: In function 'int main()': + conftest.cpp:32:30: error: too few arguments to function 'unsigned int __atomic_fetch_and_4(volatile void*, unsigned int, int)' + 32 | return __atomic_fetch_and_4 (); + | ^ + +Resulting in: + + checking for library containing __atomic_fetch_and_4... no + +instead (after the fix applied): + + checking for library containing __atomic_fetch_and_4... -latomic + +Signed-off-by: Peter Seiderer +[Retrieved from: +https://github.com/log4cplus/log4cplus/commit/4446516eb4fc8613d26669f5683f9d5d7c36ee67] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 72fbd870a..64eff1936 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -412,6 +412,7 @@ LOG4CPLUS_DEFINE_MACRO_IF([LOG4CPLUS_HAVE_VAR_ATTRIBUTE_INIT_PRIORITY], + + dnl Checks for libraries. + ++AC_LANG_PUSH([C]) + AC_SEARCH_LIBS([__atomic_fetch_and_4], [atomic]) + AC_SEARCH_LIBS([strerror], [cposix]) + dnl On some systems libcompat exists only as a static library which +@@ -422,6 +423,7 @@ AC_SEARCH_LIBS([setsockopt], [socket network net]) + AS_IF([test "x$with_iconv" = "xyes"], + [AC_SEARCH_LIBS([iconv_open], [iconv], [], + [AC_SEARCH_LIBS([libiconv_open], [iconv])])]) ++AC_LANG_POP([C]) + + dnl Windows/MinGW specific. + +@@ -497,7 +499,9 @@ dnl Multi threaded library. + AS_VAR_APPEND([LIBS], [" $PTHREAD_LIBS"]) + + dnl required on HP-UX ++ AC_LANG_PUSH([C]) + AC_SEARCH_LIBS([sem_init], [rt]) ++ AC_LANG_POP([C]) + + AS_CASE([$ax_cv_cxx_compiler_vendor], + [gnu|clang], diff --git a/buildroot/package/log4cplus/log4cplus.hash b/buildroot/package/log4cplus/log4cplus.hash index 9bea814d6..43ff401da 100644 --- a/buildroot/package/log4cplus/log4cplus.hash +++ b/buildroot/package/log4cplus/log4cplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8ff4055be749f17f3648694bd5778bfd86d33158cceaa616a50c0299d6035b41 log4cplus-2.0.2.tar.xz +sha256 6046f0867ce4734f298418c7b7db0d35c27403090bb751d98e6e76aa4935f1af log4cplus-2.0.5.tar.xz sha256 91d7e42ff80e74c4c94e5ad353375fa0358cd0abbf43f5fe957097cdbd4e2c4d LICENSE diff --git a/buildroot/package/log4cplus/log4cplus.mk b/buildroot/package/log4cplus/log4cplus.mk index 82fc7135f..8a613efae 100644 --- a/buildroot/package/log4cplus/log4cplus.mk +++ b/buildroot/package/log4cplus/log4cplus.mk @@ -4,12 +4,20 @@ # ################################################################################ -LOG4CPLUS_VERSION = 2.0.2 +LOG4CPLUS_VERSION = 2.0.5 LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION) LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) LOG4CPLUS_LICENSE_FILES = LICENSE LOG4CPLUS_INSTALL_STAGING = YES +# We're patching configure.ac +LOG4CPLUS_AUTORECONF = YES + +ifeq ($(BR2_GCC_ENABLE_LTO),y) +LOG4CPLUS_CONF_OPTS += --enable-lto +else +LOG4CPLUS_CONF_OPTS += --disable-lto +endif ifeq ($(BR2_PACKAGE_QT5BASE),y) LOG4CPLUS_DEPENDENCIES += host-pkgconf qt5base @@ -18,8 +26,4 @@ else LOG4CPLUS_CONF_OPTS += --without-qt5 endif -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -LOG4CPLUS_CONF_ENV += LIBS='-latomic' -endif - $(eval $(autotools-package)) diff --git a/buildroot/package/log4cpp/log4cpp.hash b/buildroot/package/log4cpp/log4cpp.hash index fd7398807..f79aabee9 100644 --- a/buildroot/package/log4cpp/log4cpp.hash +++ b/buildroot/package/log4cpp/log4cpp.hash @@ -3,3 +3,4 @@ md5 b9e2cee932da987212f2c74b767b4d8b log4cpp-1.1.3.tar.gz sha1 74f0fea7931dc1bc4e5cd34a6318cd2a51322041 log4cpp-1.1.3.tar.gz # Locally computed sha256 2cbbea55a5d6895c9f0116a9a9ce3afb86df383cd05c9d6c1a4238e5e5c8f51d log4cpp-1.1.3.tar.gz +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 log4cpp/COPYING diff --git a/buildroot/package/log4cxx/log4cxx.hash b/buildroot/package/log4cxx/log4cxx.hash index 469d99af0..90fa2e73d 100644 --- a/buildroot/package/log4cxx/log4cxx.hash +++ b/buildroot/package/log4cxx/log4cxx.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c apache-log4cxx-0.10.0.tar.gz +sha256 0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c apache-log4cxx-0.10.0.tar.gz +# Locally computed +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/logrotate/logrotate.hash b/buildroot/package/logrotate/logrotate.hash index bebbd7465..6da14797f 100644 --- a/buildroot/package/logrotate/logrotate.hash +++ b/buildroot/package/logrotate/logrotate.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fb1ff8502e7ae4aedaa3d0da8d3740a6a0f44b72e34666af724e9094b166c942 logrotate-3.13.0.tar.gz +sha256 a7b20f5184c9598c36546f9200d3bd616d561478a0423ab8074e97a1cd7b1c25 logrotate-3.15.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/logrotate/logrotate.mk b/buildroot/package/logrotate/logrotate.mk index c2c488564..831e23935 100644 --- a/buildroot/package/logrotate/logrotate.mk +++ b/buildroot/package/logrotate/logrotate.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOGROTATE_VERSION = 3.13.0 +LOGROTATE_VERSION = 3.15.1 LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION)) LOGROTATE_LICENSE = GPL-2.0+ LOGROTATE_LICENSE_FILES = COPYING diff --git a/buildroot/package/lpc3250loader/lpc3250loader.hash b/buildroot/package/lpc3250loader/lpc3250loader.hash index 4f9dbc4e0..9a27863b2 100644 --- a/buildroot/package/lpc3250loader/lpc3250loader.hash +++ b/buildroot/package/lpc3250loader/lpc3250loader.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 267de7541c92e5b007b93c660a41188976d531a3757f4ffd9b7142d3994da7d1 lpc3250loader-1.0.tar.gz +sha256 267de7541c92e5b007b93c660a41188976d531a3757f4ffd9b7142d3994da7d1 lpc3250loader-1.0.tar.gz +sha256 9a817497240e8e92f09ccfec7568a74673dc30ec008b541c8706663677b4e7a9 LPC3250loader.py diff --git a/buildroot/package/lpeg/lpeg.hash b/buildroot/package/lpeg/lpeg.hash index da38cc875..7a20f063f 100644 --- a/buildroot/package/lpeg/lpeg.hash +++ b/buildroot/package/lpeg/lpeg.hash @@ -1,2 +1,2 @@ # computed by luarocks/buildroot -sha256 149be31e0155c4694f77ea7264d9b398dd134eca0d00ff03358d91a6cfb2ea9d lpeg-1.0.1-1.src.rock +sha256 e0d0d687897f06588558168eeb1902ac41a11edd1b58f1aa61b99d0ea0abbfbc lpeg-1.0.2-1.src.rock diff --git a/buildroot/package/lpeg/lpeg.mk b/buildroot/package/lpeg/lpeg.mk index 1541f33cc..cdb2e81a5 100644 --- a/buildroot/package/lpeg/lpeg.mk +++ b/buildroot/package/lpeg/lpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -LPEG_VERSION = 1.0.1-1 +LPEG_VERSION = 1.0.2-1 LPEG_LICENSE = MIT $(eval $(luarocks-package)) diff --git a/buildroot/package/lrandom/lrandom.hash b/buildroot/package/lrandom/lrandom.hash index ce59268bb..111635e50 100644 --- a/buildroot/package/lrandom/lrandom.hash +++ b/buildroot/package/lrandom/lrandom.hash @@ -1,3 +1,2 @@ # computed by luarocks/buildroot -sha256 96fbc56beb0efca20253301915e14ba25150e2b09541ea7a3570e0def624b196 lrandom-20120430.51-1.src.rock -sha256 480a6cf11caaba99290ff30cd6e854ac9dce61e38b9d9caf5498165f7fb93454 lrandom-20120430.52-1.src.rock +sha256 9b77af41202feb38b09cb4a99cd49680ea9dbc9df3e640f801be378dd286eab8 lrandom-20180729-1.src.rock diff --git a/buildroot/package/lrandom/lrandom.mk b/buildroot/package/lrandom/lrandom.mk index 2fe5fdb5a..c78e15ff2 100644 --- a/buildroot/package/lrandom/lrandom.mk +++ b/buildroot/package/lrandom/lrandom.mk @@ -4,12 +4,8 @@ # ################################################################################ -ifeq ($(BR2_PACKAGE_LUA_5_3),y) -LRANDOM_VERSION = 20120430.52-1 -else -LRANDOM_VERSION = 20120430.51-1 -endif -LRANDOM_SUBDIR = random -LRANDOM_LICENSE = Public domain +LRANDOM_VERSION = 20180729-1 +LRANDOM_SUBDIR = lrandom-100 +LRANDOM_LICENSE = MIT $(eval $(luarocks-package)) diff --git a/buildroot/package/lrzip/0001-missing-stdarg.patch b/buildroot/package/lrzip/0001-missing-stdarg.patch new file mode 100644 index 000000000..9ce0117a3 --- /dev/null +++ b/buildroot/package/lrzip/0001-missing-stdarg.patch @@ -0,0 +1,26 @@ +From 5ae1754025315d85fac11cb4eb2474789ee6475e Mon Sep 17 00:00:00 2001 +From: Sam Lancia +Date: Sat, 7 Sep 2019 20:54:29 +0100 +Subject: [PATCH] Lrzip.h: add missing header for va_list on some platforms + +Signed-off-by: Sam Lancia +--- + Lrzip.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Lrzip.h b/Lrzip.h +index 29bc2a9..8934c59 100644 +--- a/Lrzip.h ++++ b/Lrzip.h +@@ -20,6 +20,7 @@ + #ifndef LIBLRZIP_H + #define LIBLRZIP_H + ++#include + #include + #include + #ifdef _WIN32 +-- +2.17.1 + + diff --git a/buildroot/package/lrzip/Config.in b/buildroot/package/lrzip/Config.in new file mode 100644 index 000000000..885b84dbb --- /dev/null +++ b/buildroot/package/lrzip/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_LRZIP + bool "lrzip" + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LZO + select BR2_PACKAGE_BZIP2 + help + A compression utility that excels at compressing large files + (usually > 10-50 MB). Larger files and/or more free RAM means + that the utility will be able to more effectively compress + your files (ie: faster / smaller size), especially if the + filesize(s) exceed 100 MB. You can either choose to optimise + for speed (fast compression / decompression) or size, + but not both. + + https://github.com/ckolivas/lrzip + +comment "lrzip needs a toolchain w/ wchar, threads, C++" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/lrzip/lrzip.hash b/buildroot/package/lrzip/lrzip.hash new file mode 100644 index 000000000..bdf63f0ed --- /dev/null +++ b/buildroot/package/lrzip/lrzip.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 10315c20d5a47590e7220c210735ba169677824d5672509266682eccec84d952 lrzip-0.631.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/lrzip/lrzip.mk b/buildroot/package/lrzip/lrzip.mk new file mode 100644 index 000000000..24edc847d --- /dev/null +++ b/buildroot/package/lrzip/lrzip.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# lrzip +# +################################################################################ + +LRZIP_VERSION = 0.631 +LRZIP_SITE = $(call github,ckolivas,lrzip,v$(LRZIP_VERSION)) +LRZIP_AUTORECONF = YES +LRZIP_LICENSE = GPL-2.0+ +LRZIP_LICENSE_FILES = COPYING +LRZIP_DEPENDENCIES = zlib lzo bzip2 + +$(eval $(autotools-package)) diff --git a/buildroot/package/lrzsz/lrzsz.hash b/buildroot/package/lrzsz/lrzsz.hash index 932832d58..cd8dd6f48 100644 --- a/buildroot/package/lrzsz/lrzsz.hash +++ b/buildroot/package/lrzsz/lrzsz.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 lrzsz-0.12.20.tar.gz +sha256 c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 lrzsz-0.12.20.tar.gz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/buildroot/package/lshw/lshw.hash b/buildroot/package/lshw/lshw.hash index 0694229cf..a8352d428 100644 --- a/buildroot/package/lshw/lshw.hash +++ b/buildroot/package/lshw/lshw.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f lshw-B.02.18.tar.gz +sha256 ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f lshw-B.02.18.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/lshw/lshw.mk b/buildroot/package/lshw/lshw.mk index 4195c073e..3e8cee2e2 100644 --- a/buildroot/package/lshw/lshw.mk +++ b/buildroot/package/lshw/lshw.mk @@ -4,8 +4,9 @@ # ################################################################################ -LSHW_VERSION = B.02.18 +LSHW_VERSION = 02.18 LSHW_SITE = http://ezix.org/software/files +LSHW_SOURCE = lshw-B.$(LSHW_VERSION).tar.gz LSHW_LICENSE = GPL-2.0 LSHW_LICENSE_FILES = COPYING diff --git a/buildroot/package/lsof/0002-noportmap.patch b/buildroot/package/lsof/0002-noportmap.patch deleted file mode 100644 index 984e0d8ea..000000000 --- a/buildroot/package/lsof/0002-noportmap.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/print.c 2006-08-23 13:37:43.000000000 -0600 -+++ b/print.c 2006-08-23 13:38:29.000000000 -0600 -@@ -148,6 +148,7 @@ - static void - fill_portmap() - { -+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_RPC__) - char buf[128], *cp, *nm; - CLIENT *c; - int h, port, pr; -@@ -266,6 +267,7 @@ - Pth[pr][h] = pt; - } - clnt_destroy(c); -+#endif - } - - diff --git a/buildroot/package/lsof/0004-remove-susvlegacy-funcs.patch b/buildroot/package/lsof/0002-remove-susvlegacy-funcs.patch similarity index 100% rename from buildroot/package/lsof/0004-remove-susvlegacy-funcs.patch rename to buildroot/package/lsof/0002-remove-susvlegacy-funcs.patch diff --git a/buildroot/package/lsof/Config.in b/buildroot/package/lsof/Config.in index c27cc8160..48ceb39a9 100644 --- a/buildroot/package/lsof/Config.in +++ b/buildroot/package/lsof/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_LSOF The lsof tool lists information about files opened by processes. - http://people.freebsd.org/~abe/ + https://github.com/lsof-org/lsof diff --git a/buildroot/package/lsof/lsof.hash b/buildroot/package/lsof/lsof.hash index ccb737153..c7432ffbe 100644 --- a/buildroot/package/lsof/lsof.hash +++ b/buildroot/package/lsof/lsof.hash @@ -1,7 +1,3 @@ -# From http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/CHECKSUMS_4.91 -md5 148ed410cb52e08c2adc0c60f480f11f lsof_4.91.tar.bz2 -# Locally calculated after checking pgp signature -# http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.91.tar.bz2.sig -# with (old, weak) key 40BD3D55 -sha256 c9da946a525fbf82ff80090b6d1879c38df090556f3fe0e6d782cb44172450a3 lsof_4.91.tar.bz2 +# Locally calculated +sha256 3df912bd966fc24dc73ddea3e36a61d79270b21b085936a4caabca56e5b486a2 lsof-4.93.2.tar.gz sha256 32a728188b19bf86917659d904ab29d0a294b4506e1c98b8b7f1c70ab4975fe1 dialects/linux/dproto.h diff --git a/buildroot/package/lsof/lsof.mk b/buildroot/package/lsof/lsof.mk index 58a2d8ef1..6aa829c2c 100644 --- a/buildroot/package/lsof/lsof.mk +++ b/buildroot/package/lsof/lsof.mk @@ -4,15 +4,17 @@ # ################################################################################ -LSOF_VERSION = 4.91 -LSOF_SOURCE = lsof_$(LSOF_VERSION).tar.bz2 -# Use http mirror since master ftp site access is very draconian -LSOF_SITE = http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof +LSOF_VERSION = 4.93.2 +LSOF_SITE = $(call github,lsof-org,lsof,$(LSOF_VERSION)) LSOF_LICENSE = lsof license # License is repeated in each file, this is a relatively small one. # It is also defined in 00README, but that contains a lot of other cruft. LSOF_LICENSE_FILES = dialects/linux/dproto.h +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +LSOF_DEPENDENCIES += libtirpc +endif + ifeq ($(BR2_USE_WCHAR),) define LSOF_CONFIGURE_WCHAR_FIXUPS $(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' \ @@ -27,18 +29,12 @@ define LSOF_CONFIGURE_LOCALE_FIXUPS endef endif -# The .tar.bz2 contains another .tar, which contains the source code. -define LSOF_EXTRACT_CMDS - $(call suitable-extractor,$(LSOF_SOURCE)) $(LSOF_DL_DIR)/$(LSOF_SOURCE) | \ - $(TAR) -O $(TAR_OPTIONS) - lsof_$(LSOF_VERSION)/lsof_$(LSOF_VERSION)_src.tar | \ - $(TAR) --strip-components=1 -C $(LSOF_DIR) $(TAR_OPTIONS) - -endef - define LSOF_CONFIGURE_CMDS (cd $(@D) ; \ echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" \ LSOF_INCLUDE="$(STAGING_DIR)/usr/include" LSOF_CFLAGS_OVERRIDE=1 \ - LINUX_CLIB=-DGLIBCV=2 ./Configure linux) + LINUX_CLIB=-DGLIBCV=2 LSOF_CFGL="$(TARGET_LDFLAGS)" \ + ./Configure linux) $(LSOF_CONFIGURE_WCHAR_FIXUPS) $(LSOF_CONFIGURE_LOCALE_FIXUPS) endef diff --git a/buildroot/package/lsuio/lsuio.hash b/buildroot/package/lsuio/lsuio.hash index d6077af2d..2df6d074f 100644 --- a/buildroot/package/lsuio/lsuio.hash +++ b/buildroot/package/lsuio/lsuio.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c88b3850248b2d3419e025abd7b9b0991c8bd33a2d4983f9608408a29900bfb5 lsuio-0.2.0.tar.gz +sha256 c88b3850248b2d3419e025abd7b9b0991c8bd33a2d4983f9608408a29900bfb5 lsuio-0.2.0.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/ltp-testsuite/0001-rpc-tirpc-disable-tirpc_auth_authdes_-create-tests.patch b/buildroot/package/ltp-testsuite/0001-rpc-tirpc-disable-tirpc_auth_authdes_-create-tests.patch deleted file mode 100644 index 6fe2d6e72..000000000 --- a/buildroot/package/ltp-testsuite/0001-rpc-tirpc-disable-tirpc_auth_authdes_-create-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9bbadb7ece1b068465279e7248b3439d443054a6 Mon Sep 17 00:00:00 2001 -From: Erico Nunes -Date: Fri, 30 Sep 2016 17:43:08 +0200 -Subject: [PATCH] rpc-tirpc: disable tirpc_auth_authdes_*create tests - -Due to Buildroot patch 0005-Disable-DES-authentification-support.patch on -libtirpc, this library is built without method authdes_create. Any code -that uses this library, like the rpc-tirpc testsuite, thus fails to link. - -In the context of Buildroot, instead of disabling ltp-testsuite entirely, -just disable the problematic tests. - -Upstream-status: not applicable -Signed-off-by: Thomas De Schampheleire -[Erico: Rebase for ltp 20160920] -Signed-off-by: Erico Nunes ---- - testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile -index 45bc8a6..c04a088 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile -@@ -19,4 +19,8 @@ - top_srcdir ?= ../../../../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+FILTER_OUT_DIRS += tirpc_auth_authdes_seccreate \ -+ tirpc_auth_authdes_create -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk --- -2.7.4 - diff --git a/buildroot/package/ltp-testsuite/Config.in b/buildroot/package/ltp-testsuite/Config.in index 711c859e6..32e1b6ad7 100644 --- a/buildroot/package/ltp-testsuite/Config.in +++ b/buildroot/package/ltp-testsuite/Config.in @@ -12,15 +12,15 @@ config BR2_PACKAGE_LTP_TESTSUITE bool "ltp-testsuite" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC help The Linux Test Project provides a huge testsuite for Linux. http://linux-test-project.github.io -comment "ltp-testsuite needs a glibc or uClibc toolchain w/ NPTL" +comment "ltp-testsuite needs a toolchain w/ NPTL" depends on BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/buildroot/package/ltp-testsuite/ltp-testsuite.hash b/buildroot/package/ltp-testsuite/ltp-testsuite.hash index ba0dcbe7e..4f373c0ce 100644 --- a/buildroot/package/ltp-testsuite/ltp-testsuite.hash +++ b/buildroot/package/ltp-testsuite/ltp-testsuite.hash @@ -1,2 +1,4 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20190115/ltp-full-20190115.tar.xz.sha1 -sha1 d87e2f96dc628f927e98ecba2e9dae581fc115b4 ltp-full-20190115.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20200120/ltp-full-20200120.tar.xz.sha1 +sha1 8f622383907e2e64e60b69fd305fecb34311d6b6 ltp-full-20200120.tar.xz +# Locally computed +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/ltp-testsuite/ltp-testsuite.mk b/buildroot/package/ltp-testsuite/ltp-testsuite.mk index ebc386d0c..88b2e8829 100644 --- a/buildroot/package/ltp-testsuite/ltp-testsuite.mk +++ b/buildroot/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20190115 +LTP_TESTSUITE_VERSION = 20200120 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+ @@ -51,22 +51,52 @@ LTP_TESTSUITE_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" LTP_TESTSUITE_LIBS += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`" endif +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +LTP_TESTSUITE_DEPENDENCIES += musl-fts +LTP_TESTSUITE_LIBS += -lfts +endif + LTP_TESTSUITE_CONF_ENV += \ CFLAGS="$(LTP_TESTSUITE_CFLAGS)" \ CPPFLAGS="$(LTP_TESTSUITE_CPPFLAGS)" \ LIBS="$(LTP_TESTSUITE_LIBS)" \ SYSROOT="$(STAGING_DIR)" -# Requires uClibc fts and bessel support, normally not enabled +# uclibc: bessel support normally not enabled ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -define LTP_TESTSUITE_REMOVE_UNSUPPORTED - rm -rf $(@D)/testcases/kernel/controllers/cpuset/ - rm -rf $(@D)/testcases/misc/math/float/bessel/ - rm -f $(@D)/testcases/misc/math/float/float_bessel.c -endef -LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_UNSUPPORTED +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ + testcases/misc/math/float/bessel/ \ + testcases/misc/math/float/float_bessel.c +else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ + testcases/kernel/pty/pty01.c \ + testcases/kernel/pty/pty02.c \ + testcases/kernel/pty/ptem01.c \ + testcases/kernel/sched/process_stress/process.c \ + testcases/kernel/syscalls/accept4/accept4_01.c \ + testcases/kernel/syscalls/confstr/confstr01.c \ + testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \ + testcases/kernel/syscalls/getcontext/getcontext01.c \ + testcases/kernel/syscalls/getdents/getdents01.c \ + testcases/kernel/syscalls/getdents/getdents02.c \ + testcases/kernel/syscalls/ioctl/ioctl01.c \ + testcases/kernel/syscalls/ioctl/ioctl02.c \ + testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c \ + testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c \ + testcases/kernel/syscalls/timer_create/timer_create01.c \ + testcases/kernel/syscalls/timer_create/timer_create03.c \ + testcases/misc/crash/crash01.c \ + utils/benchmark/ebizzy-0.3 endif +define LTP_TESTSUITE_REMOVE_UNSUPPORTED_TESTCASES + $(foreach f,$(LTP_TESTSUITE_UNSUPPORTED_TEST_CASES), + rm -rf $(@D)/$(f) + ) +endef + +LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_UNSUPPORTED_TESTCASES + # ldd command build system tries to build a shared library unconditionally. ifeq ($(BR2_STATIC_LIBS),y) define LTP_TESTSUITE_REMOVE_LDD diff --git a/buildroot/package/ltrace/ltrace.hash b/buildroot/package/ltrace/ltrace.hash index 58a9c6d2a..f795f53bf 100644 --- a/buildroot/package/ltrace/ltrace.hash +++ b/buildroot/package/ltrace/ltrace.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 894333bb7d347066c4e398d9f4a202af5f2faf80754905dd0e6a2259695baba0 ltrace-c22d359433b333937ee3d803450dc41998115685.tar.gz +sha256 894333bb7d347066c4e398d9f4a202af5f2faf80754905dd0e6a2259695baba0 ltrace-c22d359433b333937ee3d803450dc41998115685.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/ltrace/ltrace.mk b/buildroot/package/ltrace/ltrace.mk index 6dfbb58c3..b71215e43 100644 --- a/buildroot/package/ltrace/ltrace.mk +++ b/buildroot/package/ltrace/ltrace.mk @@ -12,11 +12,6 @@ LTRACE_LICENSE = GPL-2.0 LTRACE_LICENSE_FILES = COPYING LTRACE_AUTORECONF = YES -define LTRACE_CREATE_CONFIG_M4 - mkdir -p $(@D)/config/m4 -endef -LTRACE_POST_PATCH_HOOKS += LTRACE_CREATE_CONFIG_M4 - # ltrace can use libunwind only if libc has backtrace() support # We don't normally do so for uClibc and we can't know if it's external # Also ltrace with libunwind support is broken for MIPS so we disable it diff --git a/buildroot/package/ltris/ltris.hash b/buildroot/package/ltris/ltris.hash index 5c0fcde7a..25fc04c6c 100644 --- a/buildroot/package/ltris/ltris.hash +++ b/buildroot/package/ltris/ltris.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 8f6a9e7719d22004aee153db29ffd9ca41c7a6cd87fc791591994eecc2e625a1 ltris-1.0.19.tar.gz +sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/buildroot/package/lttng-babeltrace/0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch b/buildroot/package/lttng-babeltrace/0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch deleted file mode 100644 index b16781419..000000000 --- a/buildroot/package/lttng-babeltrace/0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 697ab0905c59561562dc52cd3b925781e07814f3 Mon Sep 17 00:00:00 2001 -From: Philippe Proulx -Date: Wed, 2 Nov 2016 01:40:12 -0400 -Subject: [PATCH] m4/ax_lib_elfutils.m4: add cache variable - -This patch adds an autoconf cache variable to override the -AC_RUN_IFELSE() test result when cross-compiling. - -Signed-off-by: Philippe Proulx -[Philippe: grabbed from this pull request: - https://github.com/efficios/babeltrace/pull/52 -] ---- - m4/ax_lib_elfutils.m4 | 32 +++++++++++++++++--------------- - 1 file changed, 17 insertions(+), 15 deletions(-) - -diff --git a/m4/ax_lib_elfutils.m4 b/m4/ax_lib_elfutils.m4 -index fcfe06b..f4fcb0d 100644 ---- a/m4/ax_lib_elfutils.m4 -+++ b/m4/ax_lib_elfutils.m4 -@@ -21,7 +21,9 @@ - # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - # - # Check the currently installed version of elfutils by using the --# _ELFUTILS_PREREQ macro defined in elfutils/version.h. -+# `_ELFUTILS_PREREQ` macro defined in . -+# -+# The cache variable for this test is `bt_cv_lib_elfutils`. - # - # AX_LIB_ELFUTILS(MAJOR_VERSION, MINOR_VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) - # --------------------------------------------------------------------------- -@@ -29,7 +31,6 @@ AC_DEFUN([AX_LIB_ELFUTILS], [ - m4_pushdef([major_version], [$1]) - m4_pushdef([minor_version], [$2]) - -- AC_MSG_CHECKING([for elfutils version >= major_version.minor_version]) - m4_if([$#], 3, [ - m4_pushdef([true_action], [$3]) - ], [ -@@ -43,20 +44,21 @@ AC_DEFUN([AX_LIB_ELFUTILS], [ - AC_MSG_ERROR(elfutils >= major_version.minor_version is required)]) - ]) - -- AC_RUN_IFELSE([ -- AC_LANG_SOURCE([ -- #include -- #include -+ AC_CACHE_CHECK( -+ [for elfutils version >= major_version.minor_version], -+ [bt_cv_lib_elfutils], [ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ #include -+ #include -+ -+ int main(void) { -+ return _ELFUTILS_PREREQ(major_version, minor_version) ? EXIT_SUCCESS : EXIT_FAILURE; -+ } -+ ])], [bt_cv_lib_elfutils=yes], [bt_cv_lib_elfutils=no]) -+ ] -+ ) - -- int main(void) { -- return _ELFUTILS_PREREQ(major_version, minor_version) ? EXIT_SUCCESS : EXIT_FAILURE; -- } -- ]) -- ], -- echo yes -- true_action, -- echo no -- false_action) -+ AS_IF([test "x$bt_cv_lib_elfutils" = "xyes"], [true_action], [false_action]) - - m4_popdef([false_action]) - m4_popdef([true_action]) --- -2.9.3 - diff --git a/buildroot/package/lttng-babeltrace/lttng-babeltrace.hash b/buildroot/package/lttng-babeltrace/lttng-babeltrace.hash index fafcd5e5d..7c114ac7e 100644 --- a/buildroot/package/lttng-babeltrace/lttng-babeltrace.hash +++ b/buildroot/package/lttng-babeltrace/lttng-babeltrace.hash @@ -1,3 +1,7 @@ -# From http://www.efficios.com/files/babeltrace/babeltrace-1.5.2.tar.bz2.{md5,sha1} -md5 1176e7f69e128112d5f29fefec39c6ce babeltrace-1.5.2.tar.bz2 -sha1 3316e8311ebbc9e8642ed399208c1846a6f0e0c3 babeltrace-1.5.2.tar.bz2 +# From http://www.efficios.com/files/babeltrace/babeltrace-1.5.7.tar.bz2.sha256 +sha256 215331e025ffd39c665a34231b9429180e48aca78f79fb972d0bf1322d2b807b babeltrace-1.5.7.tar.bz2 + +# Hash for license files +sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt +sha256 12d4222ac628fe4092cba8ed90bc5227a4dedd0b94973273cecbc393325bf1c2 LICENSE diff --git a/buildroot/package/lttng-babeltrace/lttng-babeltrace.mk b/buildroot/package/lttng-babeltrace/lttng-babeltrace.mk index cfd67de6c..363d7f5b1 100644 --- a/buildroot/package/lttng-babeltrace/lttng-babeltrace.mk +++ b/buildroot/package/lttng-babeltrace/lttng-babeltrace.mk @@ -5,7 +5,7 @@ ################################################################################ LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace -LTTNG_BABELTRACE_VERSION = 1.5.2 +LTTNG_BABELTRACE_VERSION = 1.5.7 LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 LTTNG_BABELTRACE_LICENSE = MIT, LGPL-2.1 (include/babeltrace/list.h), GPL-2.0 (test code) LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE @@ -17,7 +17,7 @@ HOST_LTTNG_BABELTRACE_DEPENDENCIES = \ host-popt host-util-linux host-libglib2 host-pkgconf host-elfutils HOST_LTTNG_BABELTRACE_CONF_OPTS += --enable-debug-info -# For: 0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch +# We're patching tests/lib/Makefile.am LTTNG_BABELTRACE_AUTORECONF = YES ifeq ($(BR2_PACKAGE_ELFUTILS),y) diff --git a/buildroot/package/lttng-libust/0001-configure.ac-add-disable-examples-option-to-not-buil.patch b/buildroot/package/lttng-libust/0001-configure.ac-add-disable-examples-option-to-not-buil.patch deleted file mode 100644 index ef817e44b..000000000 --- a/buildroot/package/lttng-libust/0001-configure.ac-add-disable-examples-option-to-not-buil.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 08aa9a26779d4ede3de7857fafd03bd6331ba948 Mon Sep 17 00:00:00 2001 -From: Philippe Proulx -Date: Mon, 6 Nov 2017 15:46:03 -0500 -Subject: [PATCH] configure.ac: add --disable-examples option to not - build/install examples - -Some environments and distributions do not need the LTTng-UST examples -to be built because they remove them anyway. Continue to build them by -default, but add --disable-examples to explicitly disable them. - -Signed-off-by: Philippe Proulx -[Philippe: backport from upstream commit 08aa9a26] -Signed-off-by: Mathieu Desnoyers ---- - configure.ac | 16 ++++++++++++++++ - doc/Makefile.am | 6 +++++- - 2 files changed, 21 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 10087f3f..68f41315 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -423,6 +423,19 @@ AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"], - AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES], [python], ["yes"]) - AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test "x$BUILD_GEN_TP_EXAMPLES" = "xyes"]) - -+# Enable building examples -+AC_ARG_ENABLE( -+ examples, -+ AS_HELP_STRING( -+ [--disable-examples], -+ [Do not build and install examples] -+ ), -+ [enable_examples=$enableval], -+ [enable_examples=yes] -+) -+ -+AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" != "xno"]) -+ - # Set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file - # is not distributed in tarballs. - AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no]) -@@ -596,6 +609,9 @@ PPRINT_PROP_BOOL([NUMA], $value) - AS_ECHO - PPRINT_SET_INDENT(0) - -+test "x$enable_examples" = xyes && value=1 || value=0 -+PPRINT_PROP_BOOL([Build and install examples], $value, $PPRINT_COLOR_SUBTITLE) -+ - # man pages build enabled/disabled - m4_pushdef([build_man_pages_msg], [Build and install man pages]) - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index e110ed85..a67c8c22 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,3 +1,7 @@ --SUBDIRS = . man examples -+SUBDIRS = . man -+ -+if ENABLE_EXAMPLES -+SUBDIRS += examples -+endif - - dist_doc_DATA = java-agent.txt --- -2.15.0 - diff --git a/buildroot/package/lttng-libust/lttng-libust.hash b/buildroot/package/lttng-libust/lttng-libust.hash index 6e5fdf23c..85e1acc26 100644 --- a/buildroot/package/lttng-libust/lttng-libust.hash +++ b/buildroot/package/lttng-libust/lttng-libust.hash @@ -1,3 +1,5 @@ -# From http://lttng.org/files/lttng-ust/lttng-ust-2.10.1.tar.bz2.{md5,sha1} -md5 4863cc2f9f0a070b42438bb646bbba06 lttng-ust-2.10.1.tar.bz2 -sha1 3779c9ed75e3fa532797431f2c47979ce73614a7 lttng-ust-2.10.1.tar.bz2 +# From https://lttng.org/files/lttng-ust/lttng-ust-2.11.0.tar.bz2.sha256 +sha256 683280cfe5e12021e64c32cef9eeb0128f1f23dec32ba28adb5a2074be37c4d8 lttng-ust-2.11.0.tar.bz2 + +# Hash for license file +sha256 74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e COPYING diff --git a/buildroot/package/lttng-libust/lttng-libust.mk b/buildroot/package/lttng-libust/lttng-libust.mk index d645220ba..0c2fdb57e 100644 --- a/buildroot/package/lttng-libust/lttng-libust.mk +++ b/buildroot/package/lttng-libust/lttng-libust.mk @@ -5,15 +5,13 @@ ################################################################################ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust -LTTNG_LIBUST_VERSION = 2.10.1 +LTTNG_LIBUST_VERSION = 2.11.0 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_LICENSE = LGPL-2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond) LTTNG_LIBUST_LICENSE_FILES = COPYING LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux LTTNG_LIBUST_CONF_OPTS += --disable-man-pages --disable-examples -# 0001-configure.ac-add-disable-examples-option-to-not-buil.patch -LTTNG_LIBUST_AUTORECONF = YES ifeq ($(BR2_PACKAGE_PYTHON),y) LTTNG_LIBUST_DEPENDENCIES += python @@ -26,4 +24,11 @@ LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none" LTTNG_LIBUST_CONF_OPTS += --disable-python-agent endif +ifeq ($(BR2_PACKAGE_NUMACTL),y) +LTTNG_LIBUST_DEPENDENCIES += numactl +LTTNG_LIBUST_CONF_OPTS += --enable-numa +else +LTTNG_LIBUST_CONF_OPTS += --disable-numa +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/lttng-modules/lttng-modules.hash b/buildroot/package/lttng-modules/lttng-modules.hash index 8992cbce9..f04247ab0 100644 --- a/buildroot/package/lttng-modules/lttng-modules.hash +++ b/buildroot/package/lttng-modules/lttng-modules.hash @@ -1,3 +1,8 @@ -# From http://lttng.org/files/lttng-modules/lttng-modules-2.10.6.tar.bz2.{md5,sha1} -md5 8110099f4615fc89a74ffe9189b56cfc lttng-modules-2.10.6.tar.bz2 -sha1 1126b29e055ebdb3fad9201edaf0ef27f88c9369 lttng-modules-2.10.6.tar.bz2 +# From https://lttng.org/files/lttng-modules/lttng-modules-2.11.0.tar.bz2.sha256 +sha256 98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f lttng-modules-2.11.0.tar.bz2 + +# Hash for license files +sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt +sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt +sha256 6334b377a5bd56b56a1e8a495830f2d28ed1b5cbedc7493aec9fba979efcdfe1 LICENSE diff --git a/buildroot/package/lttng-modules/lttng-modules.mk b/buildroot/package/lttng-modules/lttng-modules.mk index 8d48c37ba..b8f9be865 100644 --- a/buildroot/package/lttng-modules/lttng-modules.mk +++ b/buildroot/package/lttng-modules/lttng-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.10.6 +LTTNG_MODULES_VERSION = 2.11.0 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_LICENSE = LGPL-2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*) diff --git a/buildroot/package/lttng-tools/lttng-tools.hash b/buildroot/package/lttng-tools/lttng-tools.hash index f6c01b7de..f5f9fdbbd 100644 --- a/buildroot/package/lttng-tools/lttng-tools.hash +++ b/buildroot/package/lttng-tools/lttng-tools.hash @@ -1,8 +1,6 @@ -# From https://lttng.org/files/lttng-tools/lttng-tools-2.10.5.tar.bz2.{md5,sha1} -md5 50e07676d5eb5d6cf4ece804863a6f74 lttng-tools-2.10.5.tar.bz2 -sha1 68790d44529a3b29896c35bb2350e8a0e1226264 lttng-tools-2.10.5.tar.bz2 +# From https://lttng.org/files/lttng-tools/lttng-tools-2.11.0.tar.bz2.sha256 +sha256 dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc lttng-tools-2.11.0.tar.bz2 # Locally computed -sha256 a4868078ef961e83dc236c4f24fd848161bfa755344b064dece62c4c81a07411 lttng-tools-2.10.5.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt sha256 051be1f11b508ef7bb839994f6b58be19a827c56bd9bddfe36d77d3d4be55abe lgpl-2.1.txt sha256 f07515677547da5f3ee2396bdf491affc1accd5e4765a5378b6e1e98392fd5e7 LICENSE diff --git a/buildroot/package/lttng-tools/lttng-tools.mk b/buildroot/package/lttng-tools/lttng-tools.mk index ce07ce4b5..f85f6bcbc 100644 --- a/buildroot/package/lttng-tools/lttng-tools.mk +++ b/buildroot/package/lttng-tools/lttng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.10.5 +LTTNG_TOOLS_VERSION = 2.11.0 LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_INSTALL_STAGING = YES diff --git a/buildroot/package/lua-binaryheap/Config.in b/buildroot/package/lua-binaryheap/Config.in new file mode 100644 index 000000000..fa0b304a5 --- /dev/null +++ b/buildroot/package/lua-binaryheap/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_BINARYHEAP + bool "lua-binaryheap" + help + Binary heap implementation in pure Lua. + + https://github.com/Tieske/binaryheap.lua diff --git a/buildroot/package/lua-binaryheap/lua-binaryheap.hash b/buildroot/package/lua-binaryheap/lua-binaryheap.hash new file mode 100644 index 000000000..3713ea331 --- /dev/null +++ b/buildroot/package/lua-binaryheap/lua-binaryheap.hash @@ -0,0 +1,2 @@ +# computed by luarocks/buildroot +sha256 ecce14dedfa7a1938aa2383c83036b98461876934f169384a2cec6bb46462d87 binaryheap-0.4-1.src.rock diff --git a/buildroot/package/lua-binaryheap/lua-binaryheap.mk b/buildroot/package/lua-binaryheap/lua-binaryheap.mk new file mode 100644 index 000000000..56958e6ff --- /dev/null +++ b/buildroot/package/lua-binaryheap/lua-binaryheap.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# lua-binaryheap +# +################################################################################ + +LUA_BINARYHEAP_VERSION = 0.4-1 +LUA_BINARYHEAP_NAME_UPSTREAM = binaryheap +LUA_BINARYHEAP_SUBDIR = binaryheap.lua-version_0v4 +LUA_BINARYHEAP_LICENSE = MIT + +$(eval $(luarocks-package)) diff --git a/buildroot/package/lua-codegen/Config.in b/buildroot/package/lua-codegen/Config.in new file mode 100644 index 000000000..fbcf5ca48 --- /dev/null +++ b/buildroot/package/lua-codegen/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_CODEGEN + bool "lua-codegen" + help + A template engine. + + https://fperrad.frama.io/lua-CodeGen diff --git a/buildroot/package/lua-codegen/lua-codegen.hash b/buildroot/package/lua-codegen/lua-codegen.hash new file mode 100644 index 000000000..0b49a5a78 --- /dev/null +++ b/buildroot/package/lua-codegen/lua-codegen.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 c09126d7f5d0fa9c867ee9108eb5961dab111320ee35e5f842317f6058e922ec lua-codegen-0.3.3-1.src.rock +sha256 f09265c450c3a59558ecc552ea4ba61e5a74dec995738eec545d121718833a80 lua-CodeGen-0.3.3/COPYRIGHT diff --git a/buildroot/package/lua-codegen/lua-codegen.mk b/buildroot/package/lua-codegen/lua-codegen.mk new file mode 100644 index 000000000..caa9008e5 --- /dev/null +++ b/buildroot/package/lua-codegen/lua-codegen.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# lua-codegen +# +################################################################################ + +LUA_CODEGEN_VERSION = 0.3.3-1 +LUA_CODEGEN_NAME_UPSTREAM = lua-CodeGen +LUA_CODEGEN_LICENSE = MIT +LUA_CODEGEN_LICENSE_FILES = $(LUA_CODEGEN_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package)) diff --git a/buildroot/package/lua-cqueues/lua-cqueues.hash b/buildroot/package/lua-cqueues/lua-cqueues.hash index 9fd664d69..69d8ec1c1 100644 --- a/buildroot/package/lua-cqueues/lua-cqueues.hash +++ b/buildroot/package/lua-cqueues/lua-cqueues.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 ae51b713bdf966215b87244e03ac60b5a12beb82d15dfb02755a000cfb2df905 lua-cqueues-rel-20161215.tar.gz +sha256 24f1aa69b539e6796445c2228f921744ad64f9336498c7537bee97719d914804 lua-cqueues-20190813.tar.gz +sha256 5f4b1f94047790eadf8fd0f9a8e3bd2895bea4c9a2c0f8bf7cd8c8e57caa5219 LICENSE diff --git a/buildroot/package/lua-cqueues/lua-cqueues.mk b/buildroot/package/lua-cqueues/lua-cqueues.mk index 4f31c3277..fc2c85c11 100644 --- a/buildroot/package/lua-cqueues/lua-cqueues.mk +++ b/buildroot/package/lua-cqueues/lua-cqueues.mk @@ -4,14 +4,21 @@ # ################################################################################ -LUA_CQUEUES_VERSION = rel-20161215 -LUA_CQUEUES_SITE = $(call github,wahern,cqueues,$(LUA_CQUEUES_VERSION)) +LUA_CQUEUES_VERSION = 20190813 +LUA_CQUEUES_SITE = $(call github,wahern,cqueues,rel-$(LUA_CQUEUES_VERSION)) LUA_CQUEUES_LICENSE = MIT LUA_CQUEUES_LICENSE_FILES = LICENSE LUA_CQUEUES_DEPENDENCIES = luainterpreter openssl host-m4 +LUA_CQUEUES_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +LUA_CQUEUES_CFLAGS += -O0 +endif + define LUA_CQUEUES_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(LUA_CQUEUES_CFLAGS)" -C $(@D) \ prefix="$(STAGING_DIR)/usr" all$(LUAINTERPRETER_ABIVER) endef diff --git a/buildroot/package/lua-curl/0001-add-variant-definition-of-lcurl_url_t.patch b/buildroot/package/lua-curl/0001-add-variant-definition-of-lcurl_url_t.patch deleted file mode 100644 index 0fdd0760d..000000000 --- a/buildroot/package/lua-curl/0001-add-variant-definition-of-lcurl_url_t.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 28ac0c5e642c9f7e3091a60268745f7cab4cc92b Mon Sep 17 00:00:00 2001 -From: Francois Perrad -Date: Sat, 23 Feb 2019 15:23:26 +0100 -Subject: [PATCH] add variant definition of lcurl_url_t - -like in lceasy.h - -Signed-off-by: Francois Perrad ---- - src/lcurlapi.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/Lua-cURLv3-0.3.9/src/lcurlapi.h b/Lua-cURLv3-0.3.9/src/lcurlapi.h -index 4dd4672..862c94f 100644 ---- a/Lua-cURLv3-0.3.9/src/lcurlapi.h -+++ b/Lua-cURLv3-0.3.9/src/lcurlapi.h -@@ -19,11 +19,20 @@ - - #if LCURL_CURL_VER_GE(7,62,0) - -+#if LCURL_CC_SUPPORT_FORWARD_TYPEDEF - typedef struct lcurl_url_tag { - CURLU *url; - - int err_mode; - }lcurl_url_t; -+#else -+struct lcurl_url_tag { -+ CURLU *url; -+ -+ int err_mode; -+}; -+#define lcurl_url_t struct lcurl_url_tag -+#endif - - int lcurl_url_create(lua_State *L, int error_mode); - --- -2.17.1 - diff --git a/buildroot/package/lua-curl/lua-curl.hash b/buildroot/package/lua-curl/lua-curl.hash index 49cd6653a..33cc68e32 100644 --- a/buildroot/package/lua-curl/lua-curl.hash +++ b/buildroot/package/lua-curl/lua-curl.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 ec761e800cec630ff0e78f100e1a61246c35823073014de65f1af0a85bfe1dc0 lua-curl-0.3.9-1.src.rock -sha256 264807cb89f960808fed1ef9922aed9d9f8437764e836d8e594e66db7be9c54c Lua-cURLv3-0.3.9/LICENSE +sha256 01578439ba90338abba86ec77641a4998450dbc42c06cff41eeefa119a6962bc lua-curl-0.3.11-1.src.rock +sha256 3049265c5c05a5e2a40eb28dbf3fe46a51cd03e5f62cc1a419e352130e278e02 Lua-cURLv3-0.3.11/LICENSE diff --git a/buildroot/package/lua-curl/lua-curl.mk b/buildroot/package/lua-curl/lua-curl.mk index 9fa9408a4..3a0f1c69b 100644 --- a/buildroot/package/lua-curl/lua-curl.mk +++ b/buildroot/package/lua-curl/lua-curl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CURL_VERSION_UPSTREAM = 0.3.9 +LUA_CURL_VERSION_UPSTREAM = 0.3.11 LUA_CURL_VERSION = $(LUA_CURL_VERSION_UPSTREAM)-1 LUA_CURL_SUBDIR = Lua-cURLv3-$(LUA_CURL_VERSION_UPSTREAM) LUA_CURL_LICENSE = MIT diff --git a/buildroot/package/lua-ev/lua-ev.hash b/buildroot/package/lua-ev/lua-ev.hash index 3f8d98129..eb4f4cf74 100644 --- a/buildroot/package/lua-ev/lua-ev.hash +++ b/buildroot/package/lua-ev/lua-ev.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 4e26e05830955fdd882a1b48b535be94356582eea310327f839f830cd9250d3a lua-ev-339426fbe528f11cb3cd1af69a88f06bba367981.tar.gz +sha256 4e26e05830955fdd882a1b48b535be94356582eea310327f839f830cd9250d3a lua-ev-339426fbe528f11cb3cd1af69a88f06bba367981.tar.gz +sha256 c224cc31feec52e33b621ccdbc245e21316a20a134a4cd8706438a3b3382e8ac README diff --git a/buildroot/package/lua-flu/0001-use-system-xattr-h.patch b/buildroot/package/lua-flu/0001-use-system-xattr-h.patch deleted file mode 100644 index 1cd44b461..000000000 --- a/buildroot/package/lua-flu/0001-use-system-xattr-h.patch +++ /dev/null @@ -1,169 +0,0 @@ -Use system - -The one from attr is no longer installed with latest version. - -ENOATTR was in fact defined as ENODATA, so switch to using that instead. - -Signed-off-by: "Yann E. MORIN" - ---- -Upstream status: merged: - https://bitbucket.org/doub/flu/pull-requests/1 - https://bitbucket.org/doub/flu/commits/2d75cc2be79026b94188b11c6f53b219c24a5f70 - - -diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua ---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua 2015-03-31 18:54:19.000000000 +0200 -+++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua 2018-05-06 09:22:28.499324049 +0200 -@@ -327,7 +327,7 @@ - name = "fs.getxattr"; - parameters = {"path", "name"}; - results = {"value"}; -- doc = [[Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]]; -+ doc = [[Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]]; - }, - { - name = "fs.listxattr"; -@@ -338,7 +338,7 @@ - { - name = "fs.removexattr"; - parameters = {"path", "name"}; -- doc = [[Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]]; -+ doc = [[Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]]; - }, - { - name = "fs.opendir"; -diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua ---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua 2015-03-31 18:54:19.000000000 +0200 -+++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua 2018-05-06 09:22:28.495324054 +0200 -@@ -222,8 +222,8 @@ - -- :NOTE: since the filesystem is a pure tree (not a DAG), use the path to find attribs - - function luafs.getxattr(path, name) -- local attrs = assert(xattrs[path], errno.ENOATTR) -- return assert(attrs[name], errno.ENOATTR) -+ local attrs = assert(xattrs[path], errno.ENODATA) -+ return assert(attrs[name], errno.ENODATA) - end - - function luafs.setxattr(path, name, value, flags) -@@ -236,7 +236,7 @@ - end - - function luafs.removexattr(path, name) -- local attrs = assert(xattrs[path], errno.ENOATTR) -+ local attrs = assert(xattrs[path], errno.ENODATA) - attrs[name] = nil - if next(attrs)==nil then - xattrs[path] = nil -diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html ---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html 2015-03-31 18:54:19.000000000 +0200 -+++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html 2018-05-06 09:22:28.499324049 +0200 -@@ -347,7 +347,7 @@ -
        -

        value = fs.getxattr (path, name)

        - --

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

        -+

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

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

        fs.removexattr (path, name)

        - --

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

        -+

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

        -
        - -
        -diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c lua-flu-20150331-1/doub-flu-a7daae986339/errno.c ---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c 2015-03-31 18:54:19.000000000 +0200 -+++ lua-flu-20150331-1/doub-flu-a7daae986339/errno.c 2018-05-06 09:23:06.323282527 +0200 -@@ -3,7 +3,7 @@ - #include - #include - #include --#include -+#include - #include "compat.h" - - /****************************************************************************/ -@@ -103,7 +103,7 @@ - REGISTER_ERROR(EDOM) - REGISTER_ERROR(ERANGE) - REGISTER_ERROR(ENOSYS) -- REGISTER_ERROR(ENOATTR) -+ REGISTER_ERROR(ENODATA) - #undef REGISTER_ERROR - } - -diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec ---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec 2018-05-06 09:22:04.123351349 +0200 -+++ lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec 2018-05-06 09:23:06.323282527 +0200 -@@ -14,7 +14,7 @@ - library = 'fuse', - }, - ATTR = { -- header = 'attr/xattr.h', -+ header = 'sys/xattr.h', - }, - } - dependencies = { -diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c lua-flu-20150331-1/doub-flu-a7daae986339/flu.c ---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c 2015-03-31 18:54:19.000000000 +0200 -+++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.c 2018-05-06 09:23:06.323282527 +0200 -@@ -15,7 +15,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in ---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in 2015-03-31 18:54:19.000000000 +0200 -+++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in 2018-05-06 09:23:06.323282527 +0200 -@@ -14,7 +14,7 @@ - library = 'fuse', - }, - ATTR = { -- header = 'attr/xattr.h', -+ header = 'sys/xattr.h', - }, - } - dependencies = { -diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md lua-flu-20150331-1/doub-flu-a7daae986339/README.md ---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md 2015-03-31 18:54:19.000000000 +0200 -+++ lua-flu-20150331-1/doub-flu-a7daae986339/README.md 2018-05-06 09:22:28.495324054 +0200 -@@ -345,7 +345,7 @@ - - ### `value = fs.getxattr (path, name)` - --Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown. -+Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown. - - --- - -@@ -357,7 +357,7 @@ - - ### `fs.removexattr (path, name)` - --Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown. -+Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown. - - --- - -diff -durN lua-flu-20150331-1.orig/flu-20150331-1.rockspec lua-flu-20150331-1/flu-20150331-1.rockspec ---- lua-flu-20150331-1.orig/flu-20150331-1.rockspec 2015-04-02 23:44:11.000000000 +0200 -+++ lua-flu-20150331-1/flu-20150331-1.rockspec 2018-05-06 09:23:06.323282527 +0200 -@@ -14,7 +14,7 @@ - library = 'fuse', - }, - ATTR = { -- header = 'attr/xattr.h', -+ header = 'sys/xattr.h', - }, - } - dependencies = { diff --git a/buildroot/package/lua-flu/lua-flu.hash b/buildroot/package/lua-flu/lua-flu.hash index 2195b4246..63f414d38 100644 --- a/buildroot/package/lua-flu/lua-flu.hash +++ b/buildroot/package/lua-flu/lua-flu.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 1389c22daec77161ec93ff90c39ee70e0f8a656ff92f22f9cf5d7121999d5c53 flu-20150331-1.src.rock -sha256 409f7c274eb26874a382241d675a360ba6b2659742c5941e680d71a41dd35913 doub-flu-a7daae986339/doc/LICENSE.txt +sha256 221ba8f8d3abbf12d5fc217dbb965605391892eb314eff1cd9c7beca90fe9887 flu-20181218-1.src.rock +sha256 409f7c274eb26874a382241d675a360ba6b2659742c5941e680d71a41dd35913 doub-flu-63f077a988cd/doc/LICENSE.txt diff --git a/buildroot/package/lua-flu/lua-flu.mk b/buildroot/package/lua-flu/lua-flu.mk index c01a4848c..4c7b76547 100644 --- a/buildroot/package/lua-flu/lua-flu.mk +++ b/buildroot/package/lua-flu/lua-flu.mk @@ -4,9 +4,9 @@ # ################################################################################ -LUA_FLU_VERSION = 20150331-1 +LUA_FLU_VERSION = 20181218-1 LUA_FLU_NAME_UPSTREAM = Flu -LUA_FLU_SUBDIR = doub-flu-a7daae986339 +LUA_FLU_SUBDIR = doub-flu-63f077a988cd LUA_FLU_LICENSE = MIT LUA_FLU_LICENSE_FILES = $(LUA_FLU_SUBDIR)/doc/LICENSE.txt LUA_FLU_DEPENDENCIES = attr libfuse diff --git a/buildroot/package/lua-gd/0001-Protect-declaration-of-LgdImageCreateFromPng-with-GD.patch b/buildroot/package/lua-gd/0001-Protect-declaration-of-LgdImageCreateFromPng-with-GD.patch new file mode 100644 index 000000000..17a1fe507 --- /dev/null +++ b/buildroot/package/lua-gd/0001-Protect-declaration-of-LgdImageCreateFromPng-with-GD.patch @@ -0,0 +1,34 @@ +From 78afd1c5f1ceaed05b78ac42c297d87a493295fd Mon Sep 17 00:00:00 2001 +From: spacewander +Date: Tue, 31 Oct 2017 15:48:30 +0800 +Subject: [PATCH] Protect declaration of LgdImageCreateFromPng* with GD_PNG + feature test macro + +If GD_PNG is false, neither LgdImageCreateFromPng nor +LgdImageCreateFromPngPtr would be implemented. We should avoid declaring +them too. + +Fetch from: https://github.com/ittner/lua-gd/pull/8 +Signed-off-by: Francois Perrad +--- + luagd.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/luagd.c b/luagd.c +index 9730ff7..98bc03e 100644 +--- a/luagd.c ++++ b/luagd.c +@@ -2168,8 +2168,10 @@ static const luaL_Reg LgdFunctions[] = + { "createFromGif", LgdImageCreateFromGif }, + { "createFromGifStr", LgdImageCreateFromGifPtr }, + #endif ++#ifdef GD_PNG + { "createFromPng", LgdImageCreateFromPng }, + { "createFromPngStr", LgdImageCreateFromPngPtr }, ++#endif + { "createFromGd", LgdImageCreateFromGd }, + { "createFromGdStr", LgdImageCreateFromGdPtr }, + { "createFromGd2", LgdImageCreateFromGd2 }, +-- +2.17.1 + diff --git a/buildroot/package/lua-gd/Config.in b/buildroot/package/lua-gd/Config.in new file mode 100644 index 000000000..dd21bba45 --- /dev/null +++ b/buildroot/package/lua-gd/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LUA_GD + bool "lua-gd" + select BR2_PACKAGE_GD + help + GD (graphics library) bindings for Lua. + + https://ittner.github.io/lua-gd/ diff --git a/buildroot/package/lua-gd/lua-gd.hash b/buildroot/package/lua-gd/lua-gd.hash new file mode 100644 index 000000000..d1bab37bc --- /dev/null +++ b/buildroot/package/lua-gd/lua-gd.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 114f273a64da6ccbf6e0555757b952f84ab8c134416dd7aae1aeb666ca0e964d lua-gd-e60b13b7977bb3424d7044976ccba5d42c256934.tar.gz +sha256 b0ca41d88ddb0ca785436d37b08b8f413055755eb6bfd3ea0a6ff3214303aa43 COPYING diff --git a/buildroot/package/lua-gd/lua-gd.mk b/buildroot/package/lua-gd/lua-gd.mk new file mode 100644 index 000000000..e9a51a167 --- /dev/null +++ b/buildroot/package/lua-gd/lua-gd.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# lua-gd +# +################################################################################ + +LUA_GD_VERSION = e60b13b7977bb3424d7044976ccba5d42c256934 +LUA_GD_SITE = $(call github,ittner,lua-gd,$(LUA_GD_VERSION)) +LUA_GD_LICENSE = MIT +LUA_GD_LICENSE_FILES = COPYING +LUA_GD_DEPENDENCIES = luainterpreter gd + +# VERSION follows the scheme described on https://ittner.github.io/lua-gd/manual.html#intro, +# the current version of the binding is 3. +define LUA_GD_BUILD_CMDS + $(MAKE) -C $(@D) gd.so \ + GDLIBCONFIG="$(STAGING_DIR)/usr/bin/gdlib-config" \ + CC=$(TARGET_CC) \ + CFLAGS="$(TARGET_CFLAGS) -fPIC -DVERSION=\\\"$(GD_VERSION)r3\\\"" \ + LFLAGS="-shared -lgd" +endef + +define LUA_GD_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 -D $(@D)/gd.so $(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)/gd.so +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/lua-http/Config.in b/buildroot/package/lua-http/Config.in index 8aaec69ef..cbf71563b 100644 --- a/buildroot/package/lua-http/Config.in +++ b/buildroot/package/lua-http/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LUA_HTTP depends on BR2_TOOLCHAIN_HAS_THREADS # luaossl & lua-cqueues select BR2_PACKAGE_LPEG # runtime select BR2_PACKAGE_LUA_BASEXX # runtime + select BR2_PACKAGE_LUA_BINARYHEAP # runtime select BR2_PACKAGE_LUA_COMPAT53 if !BR2_PACKAGE_LUA_5_3 # runtime select BR2_PACKAGE_LUA_CQUEUES # runtime select BR2_PACKAGE_LUA_FIFO # runtime diff --git a/buildroot/package/lua-http/lua-http.hash b/buildroot/package/lua-http/lua-http.hash index 3c7bcebd3..d41b494e9 100644 --- a/buildroot/package/lua-http/lua-http.hash +++ b/buildroot/package/lua-http/lua-http.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 d68591eeeeb60c4187469eae89f5bad02d753a8c0adaa460d453b0734222645a http-0.2-0.src.rock -sha256 10650e71ba335c76955bbbec2b1f5b9d5655f2e0fdc6c7cecae5bd28a376302c lua-http-0.2/LICENSE.md +sha256 98318213be7b5ca60780c39f4736d5a3328631bc2c5dbfb8949b0db80e32746f http-0.3-0.src.rock +sha256 817cdf831c9d7cd1a2706b4b99dcc6f61a7a2345b7c9d39ed99e87d36338f4c8 lua-http-0.3/LICENSE.md diff --git a/buildroot/package/lua-http/lua-http.mk b/buildroot/package/lua-http/lua-http.mk index 9bc416b8a..00dcefa0d 100644 --- a/buildroot/package/lua-http/lua-http.mk +++ b/buildroot/package/lua-http/lua-http.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_HTTP_VERSION_UPSTREAM = 0.2 +LUA_HTTP_VERSION_UPSTREAM = 0.3 LUA_HTTP_VERSION = $(LUA_HTTP_VERSION_UPSTREAM)-0 LUA_HTTP_NAME_UPSTREAM = http LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM) diff --git a/buildroot/package/lua-livr-extra/Config.in b/buildroot/package/lua-livr-extra/Config.in new file mode 100644 index 000000000..085062292 --- /dev/null +++ b/buildroot/package/lua-livr-extra/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LUA_LIVR_EXTRA + bool "lua-livr-extra" + select BR2_PACKAGE_LUA_LIVR # runtime + help + more LIVR rules. + + https://fperrad.frama.io/lua-LIVR-extra diff --git a/buildroot/package/lua-livr-extra/lua-livr-extra.hash b/buildroot/package/lua-livr-extra/lua-livr-extra.hash new file mode 100644 index 000000000..cb7cf898b --- /dev/null +++ b/buildroot/package/lua-livr-extra/lua-livr-extra.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 42fef357db3e05e32112ddebcd4296f040a825dfac77ff2fa03aedbdcdaac729 lua-livr-extra-0.1.1-1.src.rock +sha256 96751dc604608ecf2357d1599bc2d2e9f56382793a6c218dc98d460759adbf07 lua-LIVR-extra-0.1.1/COPYRIGHT diff --git a/buildroot/package/lua-livr-extra/lua-livr-extra.mk b/buildroot/package/lua-livr-extra/lua-livr-extra.mk new file mode 100644 index 000000000..0a6378dbf --- /dev/null +++ b/buildroot/package/lua-livr-extra/lua-livr-extra.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# lua-livr-extra +# +################################################################################ + +LUA_LIVR_EXTRA_VERSION = 0.1.1-1 +LUA_LIVR_EXTRA_NAME_UPSTREAM = lua-LIVR-extra +LUA_LIVR_EXTRA_LICENSE = MIT +LUA_LIVR_EXTRA_LICENSE_FILES = $(LUA_LIVR_EXTRA_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package)) diff --git a/buildroot/package/lua-livr/Config.in b/buildroot/package/lua-livr/Config.in new file mode 100644 index 000000000..76fd1c754 --- /dev/null +++ b/buildroot/package/lua-livr/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LUA_LIVR + bool "lua-livr" + help + Lightweight validator supporting Language Independent + Validation Rules Specification (LIVR). + + https://fperrad.frama.io/lua-LIVR diff --git a/buildroot/package/lua-livr/lua-livr.hash b/buildroot/package/lua-livr/lua-livr.hash new file mode 100644 index 000000000..a891420b4 --- /dev/null +++ b/buildroot/package/lua-livr/lua-livr.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 a3890301ed5f393b585cab26ac944eddc9df41bfa2ab87c11785925193453493 lua-livr-0.2.1-1.src.rock +sha256 8f09089acf52cfabcc2a44ec3a492dc261e0ae9df3c618f43b33805e696e02d8 lua-LIVR-0.2.1/COPYRIGHT diff --git a/buildroot/package/lua-livr/lua-livr.mk b/buildroot/package/lua-livr/lua-livr.mk new file mode 100644 index 000000000..25034b897 --- /dev/null +++ b/buildroot/package/lua-livr/lua-livr.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# lua-livr +# +################################################################################ + +LUA_LIVR_VERSION = 0.2.1-1 +LUA_LIVR_NAME_UPSTREAM = lua-LIVR +LUA_LIVR_LICENSE = MIT +LUA_LIVR_LICENSE_FILES = $(LUA_LIVR_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package)) diff --git a/buildroot/package/lua-lunitx/Config.in b/buildroot/package/lua-lunitx/Config.in new file mode 100644 index 000000000..ea900e632 --- /dev/null +++ b/buildroot/package/lua-lunitx/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_LUNITX + bool "lua-lunitx" + help + Lunitx is a unit testing framework for lua, written in lua. + + https://github.com/dcurrie/lunit diff --git a/buildroot/package/lua-lunitx/lua-lunitx.hash b/buildroot/package/lua-lunitx/lua-lunitx.hash new file mode 100644 index 000000000..b97b93f09 --- /dev/null +++ b/buildroot/package/lua-lunitx/lua-lunitx.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 2299facf4977f9b663e1ad402098139116a87a693c3df66e1f6b89e2cf47646f lunitx-0.8-1.src.rock +sha256 3fcfcd6010d73bc2b22505b6a91779022a82661809a3e4e0a0bdd7b3463def8f lunit/LICENSE diff --git a/buildroot/package/lua-lunitx/lua-lunitx.mk b/buildroot/package/lua-lunitx/lua-lunitx.mk new file mode 100644 index 000000000..e12cf0724 --- /dev/null +++ b/buildroot/package/lua-lunitx/lua-lunitx.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# lua-lunitx +# +################################################################################ + +LUA_LUNITX_VERSION = 0.8-1 +LUA_LUNITX_NAME_UPSTREAM = lunitx +LUA_LUNITX_SUBDIR = lunit +LUA_LUNITX_LICENSE = MIT +LUA_LUNITX_LICENSE_FILES = $(LUA_LUNITX_SUBDIR)/LICENSE + +$(eval $(luarocks-package)) diff --git a/buildroot/package/lua-messagepack/lua-messagepack.hash b/buildroot/package/lua-messagepack/lua-messagepack.hash index aa1a1b541..a550a190f 100644 --- a/buildroot/package/lua-messagepack/lua-messagepack.hash +++ b/buildroot/package/lua-messagepack/lua-messagepack.hash @@ -1,4 +1,4 @@ # computed by luarocks/buildroot -sha256 a27d985b8bdb79ebe78dfe255c795e839a04eb2fed1c610a81c7876e3f72fd97 lua-messagepack-0.5.1-1.src.rock -sha256 b7f69ada6aed7e0cdfd690291607d8f41246e67f191107ecdc0a1e592c449abe lua-messagepack-lua53-0.5.1-1.src.rock -sha256 e409ff1f089c1cd36840349fd790a6ffce5a31f16d30c108ce94aaa3b128dcea lua-MessagePack-0.5.1/COPYRIGHT +sha256 cbb1b7b12834b7f49fd20621446ec4d76eff67d324b8182b7988324b10830a43 lua-messagepack-0.5.2-1.src.rock +sha256 b3b3d8c3d28a4d4f26404cdb7d7d9329e2e831ea2dd2c6b119d958ed113579b2 lua-messagepack-lua53-0.5.2-1.src.rock +sha256 709fd93a7dd6f8e941e7f0cb9e3eeba1f4de375302f1b19e14bb51aff23c5970 lua-MessagePack-0.5.2/COPYRIGHT diff --git a/buildroot/package/lua-messagepack/lua-messagepack.mk b/buildroot/package/lua-messagepack/lua-messagepack.mk index 7c9bb0d87..f393a8d02 100644 --- a/buildroot/package/lua-messagepack/lua-messagepack.mk +++ b/buildroot/package/lua-messagepack/lua-messagepack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.5.1 +LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.5.2 LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1 ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack-lua53 diff --git a/buildroot/package/lua-msgpack-native/lua-msgpack-native.hash b/buildroot/package/lua-msgpack-native/lua-msgpack-native.hash index cfc598319..2a49e9f38 100644 --- a/buildroot/package/lua-msgpack-native/lua-msgpack-native.hash +++ b/buildroot/package/lua-msgpack-native/lua-msgpack-native.hash @@ -1,2 +1,3 @@ # locally computed sha256 025cf91d509fa3985869d18ef9b8eaeb875ff3c9fcf6467beeed6eab3bb35c93 lua-msgpack-native-41a91b994c70389dc9daa1a15678741d8ec41749.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/lua-msgpack-native/lua-msgpack-native.mk b/buildroot/package/lua-msgpack-native/lua-msgpack-native.mk index acd3a0e1c..4a7e672cf 100644 --- a/buildroot/package/lua-msgpack-native/lua-msgpack-native.mk +++ b/buildroot/package/lua-msgpack-native/lua-msgpack-native.mk @@ -10,8 +10,12 @@ LUA_MSGPACK_NATIVE_DEPENDENCIES = luainterpreter LUA_MSGPACK_NATIVE_LICENSE = Apache-2.0 LUA_MSGPACK_NATIVE_LICENSE_FILES = LICENSE.txt +# lua-msgpack-native uses the old Lua 5.0 API with luaL_reg, but it is +# no longer provided by LuaJit 2.1, so we have to alias luaL_reg to +# luaL_Reg. define LUA_MSGPACK_NATIVE_BUILD_CMDS - $(TARGET_CC) $(TARGET_CFLAGS) -fPIC -shared -o $(@D)/msgpack.so $(@D)/mp.c + $(TARGET_CC) $(TARGET_CFLAGS) -DluaL_reg=luaL_Reg -fPIC \ + -shared -o $(@D)/msgpack.so $(@D)/mp.c endef define LUA_MSGPACK_NATIVE_INSTALL_TARGET_CMDS diff --git a/buildroot/package/lua-resty-http/Config.in b/buildroot/package/lua-resty-http/Config.in index 4697c90df..7f90b51b7 100644 --- a/buildroot/package/lua-resty-http/Config.in +++ b/buildroot/package/lua-resty-http/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_LUA_RESTY_HTTP help Lua HTTP client cosocket driver for OpenResty / ngx_lua. - http://github.com/pintsized/lua-resty-http + https://github.com/ledgetech/lua-resty-http diff --git a/buildroot/package/lua-resty-http/lua-resty-http.hash b/buildroot/package/lua-resty-http/lua-resty-http.hash index 486a110a7..4aacc097c 100644 --- a/buildroot/package/lua-resty-http/lua-resty-http.hash +++ b/buildroot/package/lua-resty-http/lua-resty-http.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 4628413a5a2828645e3ddb38a2a0c764e81443cbd1a011357eeed7e983750329 lua-resty-http-0.12-0.src.rock +sha256 df913a055ddc2f029017602732c7a497225f4e0df1bcc6858e13f9f4d9524184 lua-resty-http-0.15-0.src.rock sha256 407e4b1412d8afa317dc703a1d318866c3de87d78899402125cbd90548c6057d lua-resty-http/LICENSE diff --git a/buildroot/package/lua-resty-http/lua-resty-http.mk b/buildroot/package/lua-resty-http/lua-resty-http.mk index 2aee63d78..61f33c2bd 100644 --- a/buildroot/package/lua-resty-http/lua-resty-http.mk +++ b/buildroot/package/lua-resty-http/lua-resty-http.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_RESTY_HTTP_VERSION = 0.12-0 +LUA_RESTY_HTTP_VERSION = 0.15-0 LUA_RESTY_HTTP_SUBDIR = lua-resty-http LUA_RESTY_HTTP_LICENSE = BSD-2-Clause LUA_RESTY_HTTP_LICENSE_FILES = $(LUA_RESTY_HTTP_SUBDIR)/LICENSE diff --git a/buildroot/package/lua-rotas/Config.in b/buildroot/package/lua-rotas/Config.in new file mode 100644 index 000000000..565efce93 --- /dev/null +++ b/buildroot/package/lua-rotas/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_ROTAS + bool "lua-rotas" + help + a web server router. + + https://fperrad.frama.io/lua-Rotas diff --git a/buildroot/package/lua-rotas/lua-rotas.hash b/buildroot/package/lua-rotas/lua-rotas.hash new file mode 100644 index 000000000..6f8d0df41 --- /dev/null +++ b/buildroot/package/lua-rotas/lua-rotas.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 be47e72ec703ffc319fe4fd539b531bbe8a8c0c52e0cc9774273028f1599a0cf lua-rotas-0.2.0-1.src.rock +sha256 4a7fdc0e44509d79c9bf18560cfb98368f70bb3832abe07e3cdba5c06466b0bb lua-Rotas-0.2.0/COPYRIGHT diff --git a/buildroot/package/lua-rotas/lua-rotas.mk b/buildroot/package/lua-rotas/lua-rotas.mk new file mode 100644 index 000000000..6ace963a4 --- /dev/null +++ b/buildroot/package/lua-rotas/lua-rotas.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# lua-rotas +# +################################################################################ + +LUA_ROTAS_VERSION = 0.2.0-1 +LUA_ROTAS_NAME_UPSTREAM = lua-Rotas +LUA_ROTAS_LICENSE = MIT +LUA_ROTAS_LICENSE_FILES = $(LUA_ROTAS_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package)) diff --git a/buildroot/package/lua-sdl2/lua-sdl2.hash b/buildroot/package/lua-sdl2/lua-sdl2.hash index 80aa1cccb..e3680a92e 100644 --- a/buildroot/package/lua-sdl2/lua-sdl2.hash +++ b/buildroot/package/lua-sdl2/lua-sdl2.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 cee7875106062fbc00cf8acb3b2738e336e2327df73ede011968cb060c094bfb lua-sdl2-v2.0.5-6.0.tar.gz +sha256 cee7875106062fbc00cf8acb3b2738e336e2327df73ede011968cb060c094bfb lua-sdl2-2.0.5-6.0.tar.gz +sha256 4f56a5b6943a8ff9611a39e7d4d88dba9ad314dcdf56c62a1425798a6e624494 LICENSE diff --git a/buildroot/package/lua-sdl2/lua-sdl2.mk b/buildroot/package/lua-sdl2/lua-sdl2.mk index ef3ede9cc..43fa2668c 100644 --- a/buildroot/package/lua-sdl2/lua-sdl2.mk +++ b/buildroot/package/lua-sdl2/lua-sdl2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUA_SDL2_VERSION = v2.0.5-6.0 -LUA_SDL2_SITE = $(call github,Tangent128,luasdl2,$(LUA_SDL2_VERSION)) +LUA_SDL2_VERSION = 2.0.5-6.0 +LUA_SDL2_SITE = $(call github,Tangent128,luasdl2,v$(LUA_SDL2_VERSION)) LUA_SDL2_LICENSE = ISC LUA_SDL2_LICENSE_FILES = LICENSE LUA_SDL2_DEPENDENCIES = luainterpreter sdl2 diff --git a/buildroot/package/lua-silva/Config.in b/buildroot/package/lua-silva/Config.in new file mode 100644 index 000000000..1ddc3fad9 --- /dev/null +++ b/buildroot/package/lua-silva/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_SILVA + bool "lua-silva" + help + your string matcher expert. + + https://fperrad.frama.io/lua-Silva diff --git a/buildroot/package/lua-silva/lua-silva.hash b/buildroot/package/lua-silva/lua-silva.hash new file mode 100644 index 000000000..7bb04da95 --- /dev/null +++ b/buildroot/package/lua-silva/lua-silva.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 89cfdf6c67b69ff5e18591fb79cfe10c7e5f4923494ed92f426f44e475a9b522 lua-silva-0.1.6-1.src.rock +sha256 166beeb47e49a35b3ff8c6af91a399046a9cc5e29a8072618b4ca90f5b7a6c95 lua-Silva-0.1.6/COPYRIGHT diff --git a/buildroot/package/lua-silva/lua-silva.mk b/buildroot/package/lua-silva/lua-silva.mk new file mode 100644 index 000000000..949e2d36d --- /dev/null +++ b/buildroot/package/lua-silva/lua-silva.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# lua-silva +# +################################################################################ + +LUA_SILVA_VERSION = 0.1.6-1 +LUA_SILVA_NAME_UPSTREAM = lua-Silva +LUA_SILVA_LICENSE = MIT +LUA_SILVA_LICENSE_FILES = $(LUA_SILVA_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package)) diff --git a/buildroot/package/lua/lua.hash b/buildroot/package/lua/lua.hash index ba57304d0..3e7812b7d 100644 --- a/buildroot/package/lua/lua.hash +++ b/buildroot/package/lua/lua.hash @@ -4,3 +4,5 @@ sha1 112eb10ff04d1b4c9898e121d6bdf54a81482447 lua-5.3.5.tar.gz md5 2e115fe26e435e33b0d5c022e4490567 lua-5.1.5.tar.gz sha1 b3882111ad02ecc6b972f8c1241647905cb2e3fc lua-5.1.5.tar.gz +# Locally computed +sha256 ee5e3e82af1e1b543c4f216e399d7c8cfee797711913f349e385101c4ae60a79 COPYRIGHT diff --git a/buildroot/package/luabitop/luabitop.hash b/buildroot/package/luabitop/luabitop.hash index 6f36bd18b..02757a6b0 100644 --- a/buildroot/package/luabitop/luabitop.hash +++ b/buildroot/package/luabitop/luabitop.hash @@ -1,2 +1,4 @@ # computed by luarocks/buildroot -sha256 fc7a8065a57462ee13bed7f95b0ab13f94ecd1bf846108c61ccf2c75548af26e luabitop-1.0.2-1.src.rock +sha256 fc7a8065a57462ee13bed7f95b0ab13f94ecd1bf846108c61ccf2c75548af26e luabitop-1.0.2-1.src.rock +# Locally calcuated +sha256 25e331120d0c2f95fa2ac6e439ca920f0a4362c366a4c7382d843113743a3ba5 LuaBitOp-1.0.2/README diff --git a/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash b/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash index 093a9067f..3e865df30 100644 --- a/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash +++ b/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 2868dad4d189368fcf5cddd191965c8cb2efaa3a3ba83d50e6a88c30353f74ce luadbi-sqlite3-0.6-2.src.rock +sha256 c5b043db43941a3c6e43d3e3699236846ed6d03a6c4cb12fa1a497f965138d9f luadbi-sqlite3-0.7.2-1.src.rock sha256 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928 luadbi/COPYING diff --git a/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk b/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk index 44cf4d107..4ae2b5cf3 100644 --- a/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk +++ b/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUADBI_SQLITE3_VERSION = 0.6-2 +LUADBI_SQLITE3_VERSION = 0.7.2-1 LUADBI_SQLITE3_SUBDIR = luadbi LUADBI_SQLITE3_LICENSE = MIT LUADBI_SQLITE3_LICENSE_FILES = $(LUADBI_SQLITE3_SUBDIR)/COPYING diff --git a/buildroot/package/luadbi/luadbi.hash b/buildroot/package/luadbi/luadbi.hash index d72690d9a..07a9cc218 100644 --- a/buildroot/package/luadbi/luadbi.hash +++ b/buildroot/package/luadbi/luadbi.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 723f63b744b7367ddfd6bbf7a7e6f6867aa1eaabbbc2bab5dc8a90e80b0c34c2 luadbi-0.6-2.src.rock +sha256 9ebbbaf4ea1f48628341e9ff3c1de10a57200c02453734f41b8016b0fc7b4956 luadbi-0.7.2-1.src.rock sha256 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928 luadbi/COPYING diff --git a/buildroot/package/luadbi/luadbi.mk b/buildroot/package/luadbi/luadbi.mk index 969c01ee2..fbae6b319 100644 --- a/buildroot/package/luadbi/luadbi.mk +++ b/buildroot/package/luadbi/luadbi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUADBI_VERSION = 0.6-2 +LUADBI_VERSION = 0.7.2-1 LUADBI_SUBDIR = luadbi LUADBI_LICENSE = MIT LUADBI_LICENSE_FILES = $(LUADBI_SUBDIR)/COPYING diff --git a/buildroot/package/luajit/0001-no-bin-symlink.patch b/buildroot/package/luajit/0001-no-bin-symlink.patch index dd1dfd89f..d32ec5ad6 100644 --- a/buildroot/package/luajit/0001-no-bin-symlink.patch +++ b/buildroot/package/luajit/0001-no-bin-symlink.patch @@ -6,7 +6,7 @@ Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -43,8 +43,7 @@ +@@ -44,8 +44,7 @@ INSTALL_MAN= $(INSTALL_SHARE)/man/man1 INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig @@ -16,7 +16,7 @@ Index: b/Makefile INSTALL_ANAME= libluajit-$(ABIVER).a INSTALL_SOSHORT1= libluajit-$(ABIVER).so INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER) -@@ -59,7 +58,6 @@ +@@ -60,7 +59,6 @@ INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1) INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2) INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) diff --git a/buildroot/package/luajit/0002-install-inc.patch b/buildroot/package/luajit/0002-install-inc.patch index 86b766dfc..5f6547fc3 100644 --- a/buildroot/package/luajit/0002-install-inc.patch +++ b/buildroot/package/luajit/0002-install-inc.patch @@ -6,7 +6,7 @@ Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ INSTALL_BIN= $(DPREFIX)/bin INSTALL_LIB= $(DPREFIX)/$(MULTILIB) INSTALL_SHARE= $(DPREFIX)/share diff --git a/buildroot/package/luajit/Config.in b/buildroot/package/luajit/Config.in index 88c5bcbf2..f4d600158 100644 --- a/buildroot/package/luajit/Config.in +++ b/buildroot/package/luajit/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS bool default y if BR2_i386 || \ (BR2_x86_64 && BR2_HOSTARCH='x86_64') || \ - BR2_powerpc || BR2_arm || BR2_armeb || \ + BR2_powerpc || BR2_arm || BR2_armeb || BR2_aarch64 || \ ((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT && \ !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6) # -m32 flag is used for 32bit builds and host-luajit has @@ -26,7 +26,7 @@ config BR2_PACKAGE_LUAJIT ABI-compatible to the standard Lua interpreter and can be deployed as a drop-in replacement. - http://luajit.org/ + https://github.com/moonjit/moonjit if BR2_PACKAGE_LUAJIT diff --git a/buildroot/package/luajit/luajit.hash b/buildroot/package/luajit/luajit.hash index 7e2d87ebb..532ec0b29 100644 --- a/buildroot/package/luajit/luajit.hash +++ b/buildroot/package/luajit/luajit.hash @@ -1,5 +1,5 @@ -# Hashes from: http://luajit.org/download.html -md5 48353202cbcacab84ee41a5a70ea0a2c LuaJIT-2.0.5.tar.gz +# Locally calculated +sha256 c3de8e29aa617fc594c043f57636ab9ad71af2b4a3a513932b05f5cdaa4320b2 luajit-2.1.2.tar.gz # Locally calculated -sha256 accb335aa3102f80d31caa2c2508fbcb795314106493519a367f13a87d0e87de COPYRIGHT +sha256 aa64a7706ded773011b933f4230d7b35ba662598197f82ac2c7bca62abdaa4d7 COPYRIGHT diff --git a/buildroot/package/luajit/luajit.mk b/buildroot/package/luajit/luajit.mk index 5b08a42d9..68e6af4f5 100644 --- a/buildroot/package/luajit/luajit.mk +++ b/buildroot/package/luajit/luajit.mk @@ -4,9 +4,8 @@ # ################################################################################ -LUAJIT_VERSION = 2.0.5 -LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz -LUAJIT_SITE = http://luajit.org/download +LUAJIT_VERSION = 2.1.2 +LUAJIT_SITE = $(call github,moonjit,moonjit,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT diff --git a/buildroot/package/luaossl/luaossl.hash b/buildroot/package/luaossl/luaossl.hash index 981ad10a1..9b959f6fc 100644 --- a/buildroot/package/luaossl/luaossl.hash +++ b/buildroot/package/luaossl/luaossl.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b0af04a5ad83c12badaf0e988dbeddc98ad6d2cd9fc06baaf0c801290ae1a5bd luaossl-20181207-0.src.rock -sha256 7c397b120b8356805c17ba10fdea13d4319b1ee244703813d0de4cbb22720c74 luaossl-rel-20181207/LICENSE +sha256 b558790c0d1c965bd98b98a91a44eef9f72a0b784dbb4978810a1e52206d593d luaossl-20190731-0.src.rock +sha256 7bd585fba3ae52943e0915e4c8ca049acde9f1e5cea101ef6b294427c8f0ee7d luaossl-rel-20190731/LICENSE diff --git a/buildroot/package/luaossl/luaossl.mk b/buildroot/package/luaossl/luaossl.mk index aa3937bb0..128c320d1 100644 --- a/buildroot/package/luaossl/luaossl.mk +++ b/buildroot/package/luaossl/luaossl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAOSSL_VERSION_UPSTREAM = 20181207 +LUAOSSL_VERSION_UPSTREAM = 20190731 LUAOSSL_VERSION = $(LUAOSSL_VERSION_UPSTREAM)-0 LUAOSSL_SUBDIR = luaossl-rel-$(LUAOSSL_VERSION_UPSTREAM) LUAOSSL_LICENSE = MIT diff --git a/buildroot/package/luaposix/Config.in b/buildroot/package/luaposix/Config.in index bdc9926b1..1e2291b3f 100644 --- a/buildroot/package/luaposix/Config.in +++ b/buildroot/package/luaposix/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LUAPOSIX bool "luaposix" - select BR2_PACKAGE_LUA_STD_NORMALIZE # runtime # "bit32" is included in Lua 5.2+. luajit has an equivalent # "bit" module, but since it has a different name, luaposix # doesn't find it. diff --git a/buildroot/package/luaposix/luaposix.hash b/buildroot/package/luaposix/luaposix.hash index a13cb4a9e..ee72bfe32 100644 --- a/buildroot/package/luaposix/luaposix.hash +++ b/buildroot/package/luaposix/luaposix.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 eb6e7322da3013bdb3d524f68df4f5510a2efd805c06bf7cc27be6611eab7483 luaposix-34.0.4.tar.gz +sha256 7948f4ac8b953172e928753632e37ad97cc3014df74b524fe7839f71216a7e90 luaposix-34.1.1.tar.gz +sha256 a868e95dd14f832eb63c4580c5fed42d78a6bd11785e3605211f446b05904a18 LICENSE diff --git a/buildroot/package/luaposix/luaposix.mk b/buildroot/package/luaposix/luaposix.mk index f4679929c..ab6b030fc 100644 --- a/buildroot/package/luaposix/luaposix.mk +++ b/buildroot/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 34.0.4 +LUAPOSIX_VERSION = 34.1.1 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE diff --git a/buildroot/package/luarocks/0001-allow-libluajit-detection.patch b/buildroot/package/luarocks/0001-allow-libluajit-detection.patch deleted file mode 100644 index 05d025bba..000000000 --- a/buildroot/package/luarocks/0001-allow-libluajit-detection.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 961269271134e711bcfffebb0f179ffddcbf3d5a Mon Sep 17 00:00:00 2001 -From: Francois Perrad -Date: Sun, 29 Jul 2018 11:17:34 +0200 -Subject: [PATCH] allow libluajit detection - -This detection was done only if luarocks is runned by luajit. -But on Buildroot, luarocks is always runned by lua. - -See https://github.com/luarocks/luarocks/pull/883 - -Signed-off-by: Francois Perrad ---- - src/luarocks/deps.lua | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua -index 8403f12..c1c0220 100644 ---- a/src/luarocks/deps.lua -+++ b/src/luarocks/deps.lua -@@ -513,10 +513,8 @@ function deps.check_lua(vars) - "lua-" .. cfg.lua_version, - "lua-" .. shortv, - "lua", -+ "luajit-" .. cfg.lua_version, - } -- if cfg.luajit_version then -- table.insert(libnames, 1, "luajit-" .. cfg.lua_version) -- end - for _, libname in ipairs(libnames) do - local ok = check_external_dependency("LUA", { library = libname }, vars, "build") - if ok then --- -2.17.1 - diff --git a/buildroot/package/luarocks/buildroot.lua b/buildroot/package/luarocks/buildroot.lua index 4be5fbd7c..67dac33aa 100644 --- a/buildroot/package/luarocks/buildroot.lua +++ b/buildroot/package/luarocks/buildroot.lua @@ -10,15 +10,20 @@ local search = require("luarocks.search") local download = require("luarocks.download") local fetch = require("luarocks.fetch") -buildroot.help_summary = "generate buildroot package files of a rock." -buildroot.help_arguments = "rockname [brname]" -buildroot.help = [[ +function buildroot.add_to_parser(parser) + local cmd = parser:command("buildroot", [[ This addon generates Buildroot package files of a rock. First argument is the name of a rock, the second argument is optional and needed when Buildroot uses another name (usually prefixed by lua-). Files are generated with the source content of the rock and more especially the rockspec. So, the rock is downloaded and unpacked. -]] +]], util.see_also()) + :summary("generate buildroot package files of a rock.") + + cmd:argument("rockname", "the name of a rock to be fetched and unpacked.") + cmd:argument("brname", "the name used by Buildroot.") + :args("?") +end local function brname (name) return name:upper():gsub('-', '_') @@ -49,6 +54,46 @@ local function wrap (txt, max) return lines end +local function has_c_files (rockspec) + for _, mod in pairs(rockspec.build.modules or {}) do + if type(mod) == 'string' then + if mod:match'%.c$' then + return true + end + elseif type(mod) == 'table' then + local sources = mod.sources + if type(sources) == 'string' and sources:match'%.c$' then + return true + end + for _, src in ipairs(sources or mod) do + if src:match'%.c$' then + return true + end + end + end + end + return false +end + +local function get_main_modules (rockspec) + local t = {} + for name in pairs(rockspec.build.modules or {}) do + if not name:match('%.') then + t[#t+1] = name + end + end + if #t == 0 then + for name in pairs(rockspec.build.modules or {}) do + t[#t+1] = name + end + end + if #t == 0 then + t[#t+1] = rockspec.package:gsub('%-', '') + end + table.sort(t) + return t +end + local function get_external_dependencies (rockspec) local t = {} for k in pairs(rockspec.external_dependencies or {}) do @@ -228,18 +273,53 @@ local function generate_hash (rockspec, lcname, rock_file, licenses, digest) f:close() end ---- Driver function for the "buildroot" command. --- @param rockname string: the name of a rock to be fetched and unpacked. --- @param brname string: the name used by Buildroot (optional) --- @return boolean: true if successful -function buildroot.command(flags, rockname, fsname) - if type(rockname) ~= 'string' then - return nil, "Argument missing. "..util.see_help('buildroot') +local function generate_test (rockspec, lcname) + local ucname = brname(lcname) + local classname = rockspec.package:gsub('%-', ''):gsub('%.', '') + classname = classname:sub(1, 1):upper() .. classname:sub(2) + local modnames = get_main_modules(rockspec) + local fname = 'support/testing/tests/package/test_' .. ucname:lower() .. '.py' + local f = assert(io.open(fname, 'w')) + util.printout('write ' .. fname) + f:write('from tests.package.test_lua import TestLuaBase\n') + f:write('\n') + f:write('\n') + f:write('class TestLua' .. classname .. '(TestLuaBase):\n') + f:write(' config = TestLuaBase.config + \\\n') + f:write(' """\n') + f:write(' BR2_PACKAGE_LUA=y\n') + f:write(' BR2_PACKAGE_' .. ucname .. '=y\n') + f:write(' """\n') + f:write('\n') + f:write(' def test_run(self):\n') + f:write(' self.login()\n') + for i = 1, #modnames do + f:write(' self.module_test("' .. modnames[i] .. '")\n') end - fsname = fsname or rockname - assert(type(fsname) == 'string') + f:write('\n') + f:write('\n') + f:write('class TestLuajit' .. classname .. '(TestLuaBase):\n') + f:write(' config = TestLuaBase.config + \\\n') + f:write(' """\n') + f:write(' BR2_PACKAGE_LUAJIT=y\n') + f:write(' BR2_PACKAGE_' .. ucname .. '=y\n') + f:write(' """\n') + f:write('\n') + f:write(' def test_run(self):\n') + f:write(' self.login()\n') + for i = 1, #modnames do + f:write(' self.module_test("' .. modnames[i] .. '")\n') + end + f:close() +end - local query = queries.new(rockname:lower(), nil, false, 'src') +--- Driver function for the "buildroot" command. +-- @return boolean: true if successful +function buildroot.command(args) + local rockname = assert(args.rockname) + local fsname = args.brname or rockname + + local query = queries.new(rockname:lower(), nil, nil, false, 'src') local url, err = search.find_suitable_rock(query) if not url then return nil, "Could not find a result named " .. tostring(query) .. ": " .. err @@ -319,6 +399,11 @@ function buildroot.command(flags, rockname, fsname) generate_config(rockspec, fsname:lower()) generate_mk(rockspec, fsname:lower(), licenses) generate_hash(rockspec, fsname:lower(), rock_file, licenses, digest) + if has_c_files(rockspec) then + ok, err = fs.make_dir('support/testing/tests/package') + if not ok then return nil, err end + generate_test(rockspec, fsname:lower()) + end return true end diff --git a/buildroot/package/luarocks/luarocks.hash b/buildroot/package/luarocks/luarocks.hash index 224dbcc16..069d181d6 100644 --- a/buildroot/package/luarocks/luarocks.hash +++ b/buildroot/package/luarocks/luarocks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1236a307ca5c556c4fed9fdbd35a7e0e80ccf063024becc8c3bf212f37ff0edf luarocks-3.0.4.tar.gz +sha256 eb20cd9814df05535d9aae98da532217c590fc07d48d90ca237e2a7cdcf284fe luarocks-3.3.1.tar.gz sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f COPYING diff --git a/buildroot/package/luarocks/luarocks.mk b/buildroot/package/luarocks/luarocks.mk index 5b15eae67..123f8c073 100644 --- a/buildroot/package/luarocks/luarocks.mk +++ b/buildroot/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 3.0.4 +LUAROCKS_VERSION = 3.3.1 LUAROCKS_SITE = http://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING @@ -33,10 +33,17 @@ define HOST_LUAROCKS_CONFIGURE_CMDS cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPTS) endef +ifeq ($(BR2_PACKAGE_LUAJIT),y) +define LUAROCKS_CONFIGURE_INTERPRETER_LUAJIT + echo "lua_interpreter = [[luajit]]" >> $(LUAROCKS_CONFIG_FILE) +endef +endif + define HOST_LUAROCKS_INSTALL_CMDS rm -f $(LUAROCKS_CONFIG_FILE) $(MAKE1) -C $(@D) install cat $(HOST_LUAROCKS_PKGDIR)/luarocks-br-config.lua >> $(LUAROCKS_CONFIG_FILE) + $(LUAROCKS_CONFIGURE_INTERPRETER_LUAJIT) endef $(eval $(host-generic-package)) diff --git a/buildroot/package/luasec/Config.in b/buildroot/package/luasec/Config.in index 43527ab09..d22fd57a6 100644 --- a/buildroot/package/luasec/Config.in +++ b/buildroot/package/luasec/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_LUASEC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LUASOCKET # runtime help - LuaSec is a binding for OpenSSL library to provide TLS/SSL - communication. + A binding for OpenSSL library to provide TLS/SSL communication + over LuaSocket. https://github.com/brunoos/luasec/wiki diff --git a/buildroot/package/luasec/luasec.hash b/buildroot/package/luasec/luasec.hash index 37fc08d45..c50da8b9a 100644 --- a/buildroot/package/luasec/luasec.hash +++ b/buildroot/package/luasec/luasec.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 383e183ba712f00b2fcbf60187177432ccde724a23ac6186075ceae620cf0b0a luasec-0.7-1.src.rock -sha256 b310a4c5a9927a43123e3ffcfaa5f5921b545b64d38ea55c7faf2a837547a200 luasec-luasec-0.7/LICENSE +sha256 b87c7d3bc5f07f5ad6fcf90f32f182d9a4a3f5f6b07e19221a86e89179ebd702 luasec-0.9-1.src.rock +sha256 4e1b2e7a46c756febf3ea76440fb5456c17e6c0312fd0135bd4649f4a2cd0d41 luasec/LICENSE diff --git a/buildroot/package/luasec/luasec.mk b/buildroot/package/luasec/luasec.mk index 7ae729093..42d292245 100644 --- a/buildroot/package/luasec/luasec.mk +++ b/buildroot/package/luasec/luasec.mk @@ -4,9 +4,8 @@ # ################################################################################ -LUASEC_VERSION_UPSTREAM = 0.7 -LUASEC_VERSION = $(LUASEC_VERSION_UPSTREAM)-1 -LUASEC_SUBDIR = luasec-luasec-$(LUASEC_VERSION_UPSTREAM) +LUASEC_VERSION = 0.9-1 +LUASEC_SUBDIR = luasec LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE LUASEC_DEPENDENCIES = openssl diff --git a/buildroot/package/luasyslog/0001-compat-Lua-5.3.patch b/buildroot/package/luasyslog/0001-compat-Lua-5.3.patch new file mode 100644 index 000000000..6c2c1e591 --- /dev/null +++ b/buildroot/package/luasyslog/0001-compat-Lua-5.3.patch @@ -0,0 +1,52 @@ +From b3347655bd31c4f1fd9e101787a84da0c98f2f8f Mon Sep 17 00:00:00 2001 +From: Francois Perrad +Date: Wed, 12 Jun 2019 20:47:18 +0200 +Subject: [PATCH] compat Lua 5.3 + +Signed-off-by: Francois Perrad +--- + lsyslog.c | 8 ++++++-- + syslog.lua | 4 ++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/luasyslog-1.0.0/lsyslog.c b/luasyslog-1.0.0/lsyslog.c +index cd512dc..57121da 100644 +--- a/luasyslog-1.0.0/lsyslog.c ++++ b/luasyslog-1.0.0/lsyslog.c +@@ -136,7 +136,7 @@ + lua_settable(L, -3); + } + +-static const struct luaL_reg lsysloglib[] = ++static const struct luaL_Reg lsysloglib[] = + { + {"open", lsyslog_open}, + {"close", lsyslog_close}, +@@ -146,7 +146,11 @@ + + int luaopen_lsyslog(lua_State *L) + { +- luaL_openlib(L, "lsyslog", lsysloglib, 0); ++#if LUA_VERSION_NUM >= 502 ++ luaL_newlib(L, lsysloglib); ++#else ++ luaL_register(L, "lsyslog", lsysloglib); ++#endif + + set_info(L); + return 1; +diff --git a/luasyslog-1.0.0/syslog.lua b/luasyslog-1.0.0/syslog.lua +index febda00..f4d98ec 100644 +--- a/luasyslog-1.0.0/syslog.lua ++++ b/luasyslog-1.0.0/syslog.lua +@@ -1,5 +1,5 @@ +-require"logging" +-require"lsyslog" ++local logging = require"logging" ++local lsyslog = require"lsyslog" + + local convert = + { +-- +2.20.1 + diff --git a/buildroot/package/luasyslog/Config.in b/buildroot/package/luasyslog/Config.in new file mode 100644 index 000000000..326fa6bf9 --- /dev/null +++ b/buildroot/package/luasyslog/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LUASYSLOG + bool "luasyslog" + select BR2_PACKAGE_LUALOGGING # runtime + help + Syslog logging for Lua. + + https://luarocks.org/modules/luarocks/luasyslog diff --git a/buildroot/package/luasyslog/luasyslog.hash b/buildroot/package/luasyslog/luasyslog.hash new file mode 100644 index 000000000..02a0d838a --- /dev/null +++ b/buildroot/package/luasyslog/luasyslog.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 e807a614b77108ca25aeed061faf73b7ef00708f5bfebb9e4f03d27f3d453e7b luasyslog-1.0.0-2.src.rock +sha256 c1ed5cbf3fc02836d3fc5d2354818a5c151c1cd75fcc0bf240dbf8d2b36a3c1d luasyslog-1.0.0/COPYING diff --git a/buildroot/package/luasyslog/luasyslog.mk b/buildroot/package/luasyslog/luasyslog.mk new file mode 100644 index 000000000..1d88b6056 --- /dev/null +++ b/buildroot/package/luasyslog/luasyslog.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# luasyslog +# +################################################################################ + +LUASYSLOG_VERSION = 1.0.0-2 +LUASYSLOG_LICENSE = MIT +LUASYSLOG_LICENSE_FILES = $(LUASYSLOG_SUBDIR)/COPYING + +$(eval $(luarocks-package)) diff --git a/buildroot/package/lugaru/lugaru.hash b/buildroot/package/lugaru/lugaru.hash index 6ba2bca6e..a08edb460 100644 --- a/buildroot/package/lugaru/lugaru.hash +++ b/buildroot/package/lugaru/lugaru.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 f3ea477caf78911c69939fbdc163f9f6517c7ef2267e716a0e050be1a166ef97 lugaru-1.2.tar.xz +sha256 f3ea477caf78911c69939fbdc163f9f6517c7ef2267e716a0e050be1a166ef97 lugaru-1.2.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.txt +sha256 df020520630390de59394235a90a17c5d52d3b80ef76e2edf6d0690cd8b7fd7c CONTENT-LICENSE.txt diff --git a/buildroot/package/lunit/Config.in b/buildroot/package/lunit/Config.in deleted file mode 100644 index d6c2c6b15..000000000 --- a/buildroot/package/lunit/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LUNIT - bool "lunit" - depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT - help - A unit testing framework for Lua. - - http://www.mroth.net/lunit/ - -comment "lunit needs a Lua 5.1 interpreter" - depends on !BR2_PACKAGE_LUA_5_1 - depends on !BR2_PACKAGE_LUAJIT diff --git a/buildroot/package/lunit/lunit.hash b/buildroot/package/lunit/lunit.hash deleted file mode 100644 index bd168ba8f..000000000 --- a/buildroot/package/lunit/lunit.hash +++ /dev/null @@ -1,3 +0,0 @@ -# computed by luarocks/buildroot -sha256 b19854c685337ddcec2fe9c22113d2cd14715d52ccd2676abe2fa49b61a2ec4d lunit-0.5-2.src.rock -sha256 316317e9e9b7eac811e1be56738e2434fb4a0c39ecd660f3b34dad739bfb3707 lunit-0.5/LICENSE diff --git a/buildroot/package/lunit/lunit.mk b/buildroot/package/lunit/lunit.mk deleted file mode 100644 index 34e22db75..000000000 --- a/buildroot/package/lunit/lunit.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# -# lunit -# -################################################################################ - -LUNIT_VERSION = 0.5-2 -LUNIT_LICENSE = MIT -LUNIT_LICENSE_FILES = $(LUNIT_SUBDIR)/LICENSE - -$(eval $(luarocks-package)) diff --git a/buildroot/package/lutok/lutok.hash b/buildroot/package/lutok/lutok.hash index 0ec898807..5ae9b1f42 100644 --- a/buildroot/package/lutok/lutok.hash +++ b/buildroot/package/lutok/lutok.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 2cec51efa0c8d65ace8b21eaa08384b77abc5087b46e785f78de1c21fb754cd5 lutok-0.4.tar.gz +sha256 2cec51efa0c8d65ace8b21eaa08384b77abc5087b46e785f78de1c21fb754cd5 lutok-0.4.tar.gz +sha256 9343913f8ef8a91ceaf148fdcdb70bb8a45b9df9dac2ef71308053dcb312ade9 COPYING diff --git a/buildroot/package/luv/0001-Do-not-include-compat-5.3.h-in-luv-header-file.patch b/buildroot/package/luv/0001-Do-not-include-compat-5.3.h-in-luv-header-file.patch deleted file mode 100644 index 22428c98f..000000000 --- a/buildroot/package/luv/0001-Do-not-include-compat-5.3.h-in-luv-header-file.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0b541b828142dab6c23b0f4415dd2fd052d69ff1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 31 Oct 2018 18:14:18 +0100 -Subject: [PATCH] Do not include compat-5.3.h in luv header file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Do not include compat-5.3.h in luv header file - -Exposing the compat-5.3.h header file directly in the luv.h header file -is not a good idea, because it causes redefinition errors when building, -for example latest luvi version 2.8.0, with a shared luv library and -LuaJIT 2.0.5. - -Therefore, include the compat header file in the luv.c source file. - -Note, that luvi version 2.8.0 (and 2.7.6) still fails to build against the -shared luv library using LuaJIT 2.0.5, as it does use `luaL_newlib` which is -not available in Lua 5.1. However, this is unrelated to the luv library as -luvi itself should define the macro for Lua 5.1. - -Upstream status: https://github.com/luvit/luv/pull/310 - -Signed-off-by: Jörg Krause ---- - src/luv.c | 3 +++ - src/luv.h | 4 ---- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/luv.c b/src/luv.c -index c4c7cb7..4af7582 100644 ---- a/src/luv.c -+++ b/src/luv.c -@@ -15,6 +15,9 @@ - * - */ - -+#if (LUA_VERSION_NUM != 503) -+#include "c-api/compat-5.3.h" -+#endif - #include "luv.h" - #include "util.c" - #include "lhandle.c" -diff --git a/src/luv.h b/src/luv.h -index 27c8c94..4fedd3f 100644 ---- a/src/luv.h -+++ b/src/luv.h -@@ -50,10 +50,6 @@ - #define MAX_TITLE_LENGTH (8192) - #endif - --#if (LUA_VERSION_NUM != 503) --#include "c-api/compat-5.3.h" --#endif -- - #if defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wunused-function" --- -2.19.1 - diff --git a/buildroot/package/luv/0001-src-lreq.c-fix-build-with-gcc-4.8.patch b/buildroot/package/luv/0001-src-lreq.c-fix-build-with-gcc-4.8.patch new file mode 100644 index 000000000..7f7c480ca --- /dev/null +++ b/buildroot/package/luv/0001-src-lreq.c-fix-build-with-gcc-4.8.patch @@ -0,0 +1,43 @@ +From d05134115ec8fcfc87188899cec336a8b4df7e62 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 22 Feb 2020 22:17:19 +0100 +Subject: [PATCH] src/lreq.c: fix build with gcc 4.8 + +Since commit 3e34390cc15101d7fc46ea26f5adf9ac022c2029, build fails with +gcc 4.8.3 on: + +In file included from /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output/build/luv-1.34.1-1/src/luv.c:27:0: +/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output/build/luv-1.34.1-1/src/lreq.c: In function 'luv_cleanup_req': +/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output/build/luv-1.34.1-1/src/lreq.c:70:5: error: 'for' loop initial declarations are only allowed in C99 mode + for (int i = 0; ((int*)(data->data))[i] != LUA_NOREF; i++) { + ^ + +Fixes: + - http://autobuild.buildroot.org/results/83b34e606b128546da8a70836d039090e334a1ec + +Signed-off-by: Fabrice Fontaine +[Accepted status: https://github.com/luvit/luv/pull/456] +--- + src/lreq.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/lreq.c b/src/lreq.c +index c8e07eb..b12ec4f 100644 +--- a/src/lreq.c ++++ b/src/lreq.c +@@ -64,10 +64,11 @@ static void luv_fulfill_req(lua_State* L, luv_req_t* data, int nargs) { + } + + static void luv_cleanup_req(lua_State* L, luv_req_t* data) { ++ int i; + luaL_unref(L, LUA_REGISTRYINDEX, data->req_ref); + luaL_unref(L, LUA_REGISTRYINDEX, data->callback_ref); + if (data->data_ref == LUV_REQ_MULTIREF) { +- for (int i = 0; ((int*)(data->data))[i] != LUA_NOREF; i++) { ++ for (i = 0; ((int*)(data->data))[i] != LUA_NOREF; i++) { + luaL_unref(L, LUA_REGISTRYINDEX, ((int*)(data->data))[i]); + } + } +-- +2.25.0 + diff --git a/buildroot/package/luv/luv.hash b/buildroot/package/luv/luv.hash index 24440bef8..388bba9eb 100644 --- a/buildroot/package/luv/luv.hash +++ b/buildroot/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 27886acb3d3f531a3d6ca70360d2593ddf1a8d4daf94ca3beea14d9381227ff7 luv-1.22.0-1.tar.gz +sha256 e8267a65149a16ea279bc767c554b1441f8b52ec5ee48fe7d60b3f4106592aba luv-1.34.1-1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/luv/luv.mk b/buildroot/package/luv/luv.mk index 87158b72e..c1af50856 100644 --- a/buildroot/package/luv/luv.mk +++ b/buildroot/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.22.0-1 +LUV_VERSION = 1.34.1-1 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/luvi/luvi.hash b/buildroot/package/luvi/luvi.hash index 084f3a42c..4627db5c5 100644 --- a/buildroot/package/luvi/luvi.hash +++ b/buildroot/package/luvi/luvi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 81e898dc67b8166222716f763d8d0e0307132edc999167259d28ad0b54e20a7f luvi-src-v2.9.0.tar.gz +sha256 a38e440d3f82d75f428bafc3f3cd51cb64f8a03c9e0eb297b0ff27c5209edebb luvi-src-v2.9.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/buildroot/package/luvi/luvi.mk b/buildroot/package/luvi/luvi.mk index c43033f4f..e311504e9 100644 --- a/buildroot/package/luvi/luvi.mk +++ b/buildroot/package/luvi/luvi.mk @@ -4,9 +4,9 @@ # ################################################################################ -LUVI_VERSION = v2.9.0 -LUVI_SOURCE = luvi-src-$(LUVI_VERSION).tar.gz -LUVI_SITE = https://github.com/luvit/luvi/releases/download/$(LUVI_VERSION) +LUVI_VERSION = 2.9.3 +LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz +LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) LUVI_LICENSE = Apache-2.0 LUVI_LICENSE_FILES = LICENSE.txt LUVI_DEPENDENCIES = libuv luajit luv host-luajit @@ -20,6 +20,8 @@ else ifeq ($(BR2_powerpc),y) LUVI_TARGET_ARCH = ppc else ifeq ($(BR2_arm)$(BR2_armeb),y) LUVI_TARGET_ARCH = arm +else ifeq ($(BR2_aarch64),y) +LUVI_TARGET_ARCH = arm64 else ifeq ($(BR2_mips),y) LUVI_TARGET_ARCH = mips else ifeq ($(BR2_mipsel),y) diff --git a/buildroot/package/lvm2/0002-udev-remove-unsupported-options-event-timeout-rule.patch b/buildroot/package/lvm2/0002-udev-remove-unsupported-options-event-timeout-rule.patch new file mode 100644 index 000000000..f162ec58d --- /dev/null +++ b/buildroot/package/lvm2/0002-udev-remove-unsupported-options-event-timeout-rule.patch @@ -0,0 +1,33 @@ +From 125f27ac37bc9b93cc96f64052b9681b3d479ee1 Mon Sep 17 00:00:00 2001 +From: Peter Rajnoha +Date: Tue, 13 Aug 2019 15:18:30 +0200 +Subject: [PATCH] udev: remove unsupported OPTIONS+="event_timeout" rule + +The OPTIONS+="event_timeout" is Unsupported since systemd/udev version 216, +that is ~5 years ago. + +Since systemd/udev version 243, there's a new message printed if unsupported +OPTIONS value is used: + + Invalid value for OPTIONS key, ignoring: 'event_timeout=180' + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1740666 + +Signed-off-by: Pascal de Bruijn +--- +diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in +index 91cb991..7c58994 100644 +--- a/udev/11-dm-lvm.rules.in ++++ b/udev/11-dm-lvm.rules.in +@@ -37,8 +37,6 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_DISABLE_OTHE + + ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end" + +-OPTIONS+="event_timeout=180" +- + # Do not create symlinks for inappropriate subdevices. + ENV{DM_LV_NAME}=="pvmove?*|?*_vorigin", GOTO="lvm_disable" + ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable" +-- +2.9.3 + diff --git a/buildroot/package/lvm2/lvm2.hash b/buildroot/package/lvm2/lvm2.hash index ad0d93b14..3d560c4be 100644 --- a/buildroot/package/lvm2/lvm2.hash +++ b/buildroot/package/lvm2/lvm2.hash @@ -1,5 +1,5 @@ # From ftp://sources.redhat.com/pub/lvm2/sha512.sum -sha512 3947523c6b0862ada40677ed171ed0cf95e070119e377296fc5ccb153e9c4212d34c0b16a887dbd68ccf265525345dabfed2aa59fb3604555429a7e2ecfff4d7 LVM2.2.02.183.tgz +sha512 f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf LVM2.2.02.185.tgz # Locally computed sha256 checksums sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB diff --git a/buildroot/package/lvm2/lvm2.mk b/buildroot/package/lvm2/lvm2.mk index 3da713fe8..43370b03b 100644 --- a/buildroot/package/lvm2/lvm2.mk +++ b/buildroot/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.183 +LVM2_VERSION = 2.02.185 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2 LVM2_INSTALL_STAGING = YES diff --git a/buildroot/package/lxc/0002-configure.ac-fix-build-on-toolchain-without-SSP.patch b/buildroot/package/lxc/0002-configure.ac-fix-build-on-toolchain-without-SSP.patch new file mode 100644 index 000000000..aa35e9382 --- /dev/null +++ b/buildroot/package/lxc/0002-configure.ac-fix-build-on-toolchain-without-SSP.patch @@ -0,0 +1,36 @@ +From 226205f0c5e3ef6f5757ffdfddd5b815b217e4ff Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 11 Nov 2019 22:55:36 +0100 +Subject: [PATCH] configure.ac: fix build on toolchain without SSP + +Commit 3b5a0eebd4d2efdaa03c6fb11950abfcf081fab8 reverted +3aa7271157d3c815a4426c1f8eaea2f3b6dafa6a resulting in lxc being unable +to be built on toolchain without SSP support + +Fixes: + - http://autobuild.buildroot.org/results/57945f54ffbc5c8764b6891a4516c4907e56ab97 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/lxc/lxc/pull/3184] +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 645a2166d..4c1a10b3d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -713,8 +713,8 @@ AX_CHECK_COMPILE_FLAG([-Wcast-align], [CFLAGS="$CFLAGS -Wcast-align"],,[-Werror] + AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS="$CFLAGS -Wstrict-prototypes"],,[-Werror]) + AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing], [CFLAGS="$CFLAGS -fno-strict-aliasing"],,[-Werror]) + AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [CFLAGS="$CFLAGS -fstack-clash-protection"],,[-Werror]) +-AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [CFLAGS="$CFLAGS -fstack-protector-strong"],,[-Werror]) +-AX_CHECK_COMPILE_FLAG([--param=ssp-buffer-size=4], [CFLAGS="$CFLAGS --param=ssp-buffer-size=4"],,[-Werror]) ++AX_CHECK_LINK_FLAG([-fstack-protector-strong], [CFLAGS="$CFLAGS -fstack-protector-strong"],,[-Werror]) ++AX_CHECK_LINK_FLAG([--param=ssp-buffer-size=4], [CFLAGS="$CFLAGS --param=ssp-buffer-size=4"],,[-Werror]) + AX_CHECK_COMPILE_FLAG([-g], [CFLAGS="$CFLAGS -g"],,[-Werror]) + AX_CHECK_COMPILE_FLAG([--mcet -fcf-protection], [CFLAGS="$CFLAGS --mcet -fcf-protection"],,[-Werror]) + AX_CHECK_COMPILE_FLAG([-Werror=implicit-function-declaration], [CFLAGS="$CFLAGS -Werror=implicit-function-declaration"],,[-Werror]) +-- +2.23.0 + diff --git a/buildroot/package/lxc/0003-src-lxc-raw_syscalls.c-fix-sparc-assembly.patch b/buildroot/package/lxc/0003-src-lxc-raw_syscalls.c-fix-sparc-assembly.patch new file mode 100644 index 000000000..4de07ddad --- /dev/null +++ b/buildroot/package/lxc/0003-src-lxc-raw_syscalls.c-fix-sparc-assembly.patch @@ -0,0 +1,41 @@ +From 5f7dd076fe203ebe6992698b63a1856a98bc0bba Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 28 Feb 2020 17:35:42 +0100 +Subject: [PATCH] src/lxc/raw_syscalls.c: fix sparc assembly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Build of lxc 3.2.1 fails with ultrasparc on: + +raw_syscalls.c: In function ‘lxc_raw_clone’: +raw_syscalls.c:66:3: error: invalid 'asm': invalid operand output code + asm volatile( + ^~~ + +Issue has been added with commit +b52e8e68a61866da2af86e85905ec850f8a8b7fc which added %g1 instead of %%g1 + +Fixes: + - http://autobuild.buildroot.org/results/17c2319850f02f24da6fbef9656c07f86fdc5a3a + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/lxc/lxc/commit/5f7dd076fe203ebe6992698b63a1856a98bc0bba] +--- + src/lxc/raw_syscalls.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lxc/raw_syscalls.c b/src/lxc/raw_syscalls.c +index 7ffb2584b8..bfa48c0348 100644 +--- a/src/lxc/raw_syscalls.c ++++ b/src/lxc/raw_syscalls.c +@@ -76,7 +76,7 @@ __returns_twice pid_t lxc_raw_clone(unsigned long flags, int *pidfd) + * processor status register (psr) is used instead of a + * full register. + */ +- "addx %%g0, 0, %g1" ++ "addx %%g0, 0, %%g1" + : "=r"(g1), "=r"(o0), "=r"(o1), "=r"(o2) /* outputs */ + : "r"(g1), "r"(o0), "r"(o1), "r"(o2) /* inputs */ + : "%cc"); /* clobbers */ diff --git a/buildroot/package/lxc/0004-cgroups-initialize-cpuset-properly.patch b/buildroot/package/lxc/0004-cgroups-initialize-cpuset-properly.patch new file mode 100644 index 000000000..86aa708d5 --- /dev/null +++ b/buildroot/package/lxc/0004-cgroups-initialize-cpuset-properly.patch @@ -0,0 +1,38 @@ +From 6a8a510211515824ff20699d45f6d07a84f3c02e Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Sun, 28 Jul 2019 23:13:26 +0200 +Subject: [PATCH] cgroups: initialize cpuset properly + +Closes #3108. +Signed-off-by: Christian Brauner +(cherry picked from commit b31d62b847a3ee013613795094cce4acc12345ef) +Signed-off-by: Romain Naour +--- + src/lxc/cgroups/cgfsng.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c +index 87e12d2dd..7e691d7cc 100644 +--- a/src/lxc/cgroups/cgfsng.c ++++ b/src/lxc/cgroups/cgfsng.c +@@ -496,12 +496,12 @@ static bool cg_legacy_filter_and_set_cpus(char *path, bool am_initialized) + } + + if (!flipped_bit) { +- DEBUG("No isolated or offline cpus present in cpuset"); +- return true; ++ cpulist = lxc_cpumask_to_cpulist(possmask, maxposs); ++ TRACE("No isolated or offline cpus present in cpuset"); ++ } else { ++ cpulist = move_ptr(posscpus); ++ TRACE("Removed isolated or offline cpus from cpuset"); + } +- DEBUG("Removed isolated or offline cpus from cpuset"); +- +- cpulist = lxc_cpumask_to_cpulist(possmask, maxposs); + if (!cpulist) { + ERROR("Failed to create cpu list"); + return false; +-- +2.24.1 + diff --git a/buildroot/package/lxc/Config.in b/buildroot/package/lxc/Config.in index d8d8f50c8..72b675113 100644 --- a/buildroot/package/lxc/Config.in +++ b/buildroot/package/lxc/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LXC depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # setns() system call + depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve help Linux Containers (LXC), provides the ability to group and isolate of a set of processes in a jail by virtualizing and @@ -14,9 +15,10 @@ config BR2_PACKAGE_LXC https://linuxcontainers.org/ -comment "lxc needs a toolchain w/ threads, headers >= 3.0, dynamic library, gcc >= 4.7" +comment "lxc needs a glibc or musl toolchain w/ threads, headers >= 3.0, dynamic library, gcc >= 4.7" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 \ - || BR2_STATIC_LIBS + || BR2_STATIC_LIBS \ + || BR2_TOOLCHAN_USES_UCLIBC diff --git a/buildroot/package/lxc/lxc.hash b/buildroot/package/lxc/lxc.hash index aad38ca57..d5ea79977 100644 --- a/buildroot/package/lxc/lxc.hash +++ b/buildroot/package/lxc/lxc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4d8772c25baeaea2c37a954902b88c05d1454c91c887cb6a0997258cfac3fdc5 lxc-3.1.0.tar.gz +sha256 5f903986a4b17d607eea28c0aa56bf1e76e8707747b1aa07d31680338b1cc3d4 lxc-3.2.1.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/lxc/lxc.mk b/buildroot/package/lxc/lxc.mk index a059fd578..53e3c85c6 100644 --- a/buildroot/package/lxc/lxc.mk +++ b/buildroot/package/lxc/lxc.mk @@ -4,12 +4,14 @@ # ################################################################################ -LXC_VERSION = 3.1.0 +LXC_VERSION = 3.2.1 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = LGPL-2.1+ LXC_LICENSE_FILES = COPYING LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES +# We're patching configure.ac +LXC_AUTORECONF = YES LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ --disable-werror \ @@ -19,13 +21,6 @@ ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) LXC_DEPENDENCIES += bash-completion endif -ifeq ($(BR2_PACKAGE_GNUTLS),y) -LXC_CONF_OPTS += --enable-gnutls -LXC_DEPENDENCIES += gnutls -else -LXC_CONF_OPTS += --disable-gnutls -endif - ifeq ($(BR2_PACKAGE_LIBCAP),y) LXC_CONF_OPTS += --enable-capabilities LXC_DEPENDENCIES += libcap @@ -47,4 +42,11 @@ else LXC_CONF_OPTS += --disable-selinux endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LXC_CONF_OPTS += --enable-openssl +LXC_DEPENDENCIES += openssl +else +LXC_CONF_OPTS += --disable-openssl +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/lz4/lz4.hash b/buildroot/package/lz4/lz4.hash index 691ec6c42..01d0107b3 100644 --- a/buildroot/package/lz4/lz4.hash +++ b/buildroot/package/lz4/lz4.hash @@ -1,4 +1,4 @@ # sha256 locally computed -sha256 33af5936ac06536805f9745e0b6d61da606a1f8b4cc5c04dd3cbaca3b9b4fc43 lz4-v1.8.3.tar.gz -sha256 d15d99c8dc6b0ec22174c0e563a95bc40f9363ca7f9d9d793bb5c5a8e8d0af71 lib/LICENSE -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 programs/COPYING +sha256 658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc lz4-1.9.2.tar.gz +sha256 d15d99c8dc6b0ec22174c0e563a95bc40f9363ca7f9d9d793bb5c5a8e8d0af71 lib/LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 programs/COPYING diff --git a/buildroot/package/lz4/lz4.mk b/buildroot/package/lz4/lz4.mk index a7152cb53..2a658fbba 100644 --- a/buildroot/package/lz4/lz4.mk +++ b/buildroot/package/lz4/lz4.mk @@ -4,8 +4,8 @@ # ################################################################################ -LZ4_VERSION = v1.8.3 -LZ4_SITE = $(call github,lz4,lz4,$(LZ4_VERSION)) +LZ4_VERSION = 1.9.2 +LZ4_SITE = $(call github,lz4,lz4,v$(LZ4_VERSION)) LZ4_INSTALL_STAGING = YES LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs) LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING diff --git a/buildroot/package/lzo/lzo.hash b/buildroot/package/lzo/lzo.hash index cf2734fc7..39a2dd495 100644 --- a/buildroot/package/lzo/lzo.hash +++ b/buildroot/package/lzo/lzo.hash @@ -2,3 +2,4 @@ sha1 4924676a9bae5db58ef129dc1cebce3baa3c4b5d lzo-2.10.tar.gz # Locally computed sha256 c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072 lzo-2.10.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/lzop/lzop.hash b/buildroot/package/lzop/lzop.hash index a484e7f26..8496ac218 100644 --- a/buildroot/package/lzop/lzop.hash +++ b/buildroot/package/lzop/lzop.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz +sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/buildroot/package/macchanger/macchanger.hash b/buildroot/package/macchanger/macchanger.hash index ce3a7f569..dbcfa6cff 100644 --- a/buildroot/package/macchanger/macchanger.hash +++ b/buildroot/package/macchanger/macchanger.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature sha256 dae2717c270fd5f62d790dbf80c19793c651b1b26b62c101b82d5fdf25a845bf macchanger-1.7.0.tar.gz +# Locally computed +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/make/make.hash b/buildroot/package/make/make.hash index ea2e86051..242cb9564 100644 --- a/buildroot/package/make/make.hash +++ b/buildroot/package/make/make.hash @@ -1,4 +1,6 @@ # From http://lists.gnu.org/archive/html/info-gnu/2016-06/msg00005.html md5 15b012617e7c44c0ed482721629577ac make-4.2.1.tar.bz2 # Locally calculated after checking signature -sha256 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 make-4.2.1.tar.bz2 +sha256 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 make-4.2.1.tar.bz2 +# Locally computed +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/mariadb/0002-fix-build-error-with-newer-cmake.patch b/buildroot/package/mariadb/0002-fix-build-error-with-newer-cmake.patch deleted file mode 100644 index 5ffac688a..000000000 --- a/buildroot/package/mariadb/0002-fix-build-error-with-newer-cmake.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c90ae2ca3dff267b9e21595376d22de397f6f78f Mon Sep 17 00:00:00 2001 -From: Ryan Coe -Date: Tue, 20 Aug 2019 06:22:43 -0700 -Subject: [PATCH] Fix build error with newer cmake - -Fixes the following build error: - -CMake Error at cmake/os/Linux.cmake:29 (STRING): -STRING sub-command REPLACE requires at least four arguments. -Call Stack (most recent call first): -CMakeLists.txt:101 (INCLUDE) - -CMake Error at cmake/os/Linux.cmake:29 (STRING): -STRING sub-command REPLACE requires at least four arguments. -Call Stack (most recent call first): -CMakeLists.txt:101 (INCLUDE) - -https://jira.mariadb.org/browse/MDEV-20596 - -Signed-off-by: Ryan Coe ---- - cmake/os/Linux.cmake | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake -index 50a2b21c838d8d6ca4cacc0704a9be4da3a57a0a..b871586acc9cfaddc3836cc9afafd85969120420 100644 ---- a/cmake/os/Linux.cmake -+++ b/cmake/os/Linux.cmake -@@ -26,9 +26,9 @@ SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE=1) - - # Fix CMake (< 2.8) flags. -rdynamic exports too many symbols. - FOREACH(LANG C CXX) -- STRING(REPLACE "-rdynamic" "" -- CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS -- ${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS} -+ STRING(REPLACE "-rdynamic" "" -+ "CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS" -+ "${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}" - ) - ENDFOREACH() - --- -2.17.1 - diff --git a/buildroot/package/mariadb/S97mysqld b/buildroot/package/mariadb/S97mysqld index 62357fa8c..54594a9e8 100644 --- a/buildroot/package/mariadb/S97mysqld +++ b/buildroot/package/mariadb/S97mysqld @@ -5,7 +5,9 @@ MYSQL_LIB="/var/lib/mysql" MYSQL_RUN="/run/mysql" -MYSQL_PID="$MYSQL_RUN/mysqld.pid" +MYSQL_PIDFILE="$MYSQL_RUN/mysqld.pid" +MYSQL_LOG="/var/log/mysql" +MYSQL_LOGFILE="$MYSQL_LOG/mysqld.log" MYSQL_BIN="/usr/bin" wait_for_ready() { @@ -21,14 +23,17 @@ wait_for_ready() { } start() { - if [ `ls -1 $MYSQL_LIB | wc -l` = 0 ] ; then + # stderr is redirected to prevent a warning + # if mysql lib directory doesn't exist + if [ `ls -1 $MYSQL_LIB 2> /dev/null | wc -l` = 0 ] ; then printf "Creating mysql system tables ... " - $MYSQL_BIN/mysql_install_db --basedir=/usr --user=mysql \ + $MYSQL_BIN/mysql_install_db --basedir=/usr \ --datadir=$MYSQL_LIB > /dev/null 2>&1 if [ $? != 0 ]; then echo "FAIL" exit 1 fi + chown -R mysql:mysql $MYSQL_LIB echo "OK" fi @@ -36,19 +41,22 @@ start() { # so create a subdirectory for mysql. install -d -o mysql -g root -m 0755 $MYSQL_RUN + # Also create logging directory as user mysql. + install -d -o mysql -g root -m 0755 $MYSQL_LOG + # We don't use start-stop-daemon because mysqld has its own # wrapper script. printf "Starting mysql ... " - $MYSQL_BIN/mysqld_safe --pid-file=$MYSQL_PID --user=mysql \ - > /dev/null 2>&1 & + $MYSQL_BIN/mysqld_safe --pid-file=$MYSQL_PIDFILE --user=mysql \ + --log-error=$MYSQL_LOGFILE > /dev/null 2>&1 & wait_for_ready [ $? = 0 ] && echo "OK" || echo "FAIL" } stop() { printf "Stopping mysql ... " - if [ -f $MYSQL_PID ]; then - kill `cat $MYSQL_PID` > /dev/null 2>&1 + if [ -f $MYSQL_PIDFILE ]; then + kill `cat $MYSQL_PIDFILE` > /dev/null 2>&1 [ $? = 0 ] && echo "OK" || echo "FAIL" else echo "FAIL" diff --git a/buildroot/package/mariadb/mariadb.hash b/buildroot/package/mariadb/mariadb.hash index a6534d8d6..679643887 100644 --- a/buildroot/package/mariadb/mariadb.hash +++ b/buildroot/package/mariadb/mariadb.hash @@ -1,8 +1,8 @@ -# From https://downloads.mariadb.org/mariadb/10.3.17 -md5 6bcee042bcc393cfcffeccbddbf6fe0e mariadb-10.3.17.tar.gz -sha1 16edbd4762c8804118dda10de713cbddc675df5a mariadb-10.3.17.tar.gz -sha256 20a1ea4fc59aae89dcc82aff0d4907b036daf9bfbd252f08162399f055097097 mariadb-10.3.17.tar.gz -sha512 6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e mariadb-10.3.17.tar.gz +# From https://downloads.mariadb.org/mariadb/10.3.22 +md5 f712a5e6fde038d0c9c6d2a2cd88b84e mariadb-10.3.22.tar.gz +sha1 f92f517fc2ea893ffb3d599ade219bf0a0045265 mariadb-10.3.22.tar.gz +sha256 3200055dbdc27746981b3bb4bc182e2cb79dcf28ea88014b641a5b81280ccec7 mariadb-10.3.22.tar.gz +sha512 57a6551b8939f54742963202d50a537e69e8ab9b2dca42ce3d2a09c0f7af368fded71f36af26f6cbd956d54fe43853981ba8fe28b7a3ba97c7d52ea4a0d233f6 mariadb-10.3.22.tar.gz # Hash for license files sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md diff --git a/buildroot/package/mariadb/mariadb.mk b/buildroot/package/mariadb/mariadb.mk index 6d8441b25..d5f4ef6bb 100644 --- a/buildroot/package/mariadb/mariadb.mk +++ b/buildroot/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.3.17 +MARIADB_VERSION = 10.3.22 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text @@ -120,17 +120,15 @@ endef define MARIADB_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/mariadb/mysqld.service \ $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/mysqld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mysqld.service endef endif -# We don't need mysql_config on the target as it's only useful in staging -# We also don't need the test suite on the target +# We don't need mysql_config or mariadb_config on the target as it's +# only useful in staging. We also don't need the test suite on the target. define MARIADB_POST_INSTALL mkdir -p $(TARGET_DIR)/var/lib/mysql $(RM) $(TARGET_DIR)/usr/bin/mysql_config + $(RM) $(TARGET_DIR)/usr/bin/mariadb_config $(RM) -r $(TARGET_DIR)/usr/share/mysql/test endef diff --git a/buildroot/package/mariadb/mysqld.service b/buildroot/package/mariadb/mysqld.service index cd308310c..d9ea74ebc 100644 --- a/buildroot/package/mariadb/mysqld.service +++ b/buildroot/package/mariadb/mysqld.service @@ -2,8 +2,9 @@ Description=MySQL database server [Service] -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' -ExecStart=/usr/bin/mysqld_safe +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql && chown -R mysql:mysql /var/lib/mysql' +ExecStartPre=install -d -o mysql -g root -m 0755 /var/log/mysql +ExecStart=/usr/bin/mysqld_safe --log-error=/var/log/mysql/mysqld.log Restart=always User=mysql RuntimeDirectory=mysql diff --git a/buildroot/package/matchbox-common/matchbox-common.hash b/buildroot/package/matchbox-common/matchbox-common.hash index 619d8473c..b4aa42a15 100644 --- a/buildroot/package/matchbox-common/matchbox-common.hash +++ b/buildroot/package/matchbox-common/matchbox-common.hash @@ -1,2 +1,4 @@ # From http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/0.9/matchbox-common-0.9.1.tar.bz2.md5 md5 8e8ba0ee170a9ac78fdc583b00ccf76b matchbox-common-0.9.1.tar.bz2 +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/matchbox-desktop/matchbox-desktop.hash b/buildroot/package/matchbox-desktop/matchbox-desktop.hash index e48a4a955..0673e8e10 100644 --- a/buildroot/package/matchbox-desktop/matchbox-desktop.hash +++ b/buildroot/package/matchbox-desktop/matchbox-desktop.hash @@ -1,2 +1,4 @@ # From http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-0.9.1.tar.bz2.md5 md5 3335a30b1a1aacfb39f23b505254765c matchbox-desktop-0.9.1.tar.bz2 +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/matchbox-fakekey/matchbox-fakekey.hash b/buildroot/package/matchbox-fakekey/matchbox-fakekey.hash index 3e8778a6e..516e0b636 100644 --- a/buildroot/package/matchbox-fakekey/matchbox-fakekey.hash +++ b/buildroot/package/matchbox-fakekey/matchbox-fakekey.hash @@ -1,2 +1,4 @@ # From http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/libfakekey-0.1.tar.bz2.md5 md5 83dbde4d77e8baf0176fe4291d8a2303 libfakekey-0.1.tar.bz2 +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/matchbox-keyboard/matchbox-keyboard.hash b/buildroot/package/matchbox-keyboard/matchbox-keyboard.hash index 76997b0da..c65fbecff 100644 --- a/buildroot/package/matchbox-keyboard/matchbox-keyboard.hash +++ b/buildroot/package/matchbox-keyboard/matchbox-keyboard.hash @@ -1,2 +1,4 @@ # From http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/0.1/matchbox-keyboard-0.1.tar.bz2.md5 md5 50940321d59fee23b38a4941100abf25 matchbox-keyboard-0.1.tar.bz2 +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/matchbox-lib/matchbox-lib.hash b/buildroot/package/matchbox-lib/matchbox-lib.hash index 6f3a6531e..d48fb3204 100644 --- a/buildroot/package/matchbox-lib/matchbox-lib.hash +++ b/buildroot/package/matchbox-lib/matchbox-lib.hash @@ -1,2 +1,4 @@ # From http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/1.9/libmatchbox-1.9.tar.bz2.md5 md5 9f73e7515cc4679171a5db180dc1343b libmatchbox-1.9.tar.bz2 +# Locally computed +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/buildroot/package/matchbox-panel/matchbox-panel.hash b/buildroot/package/matchbox-panel/matchbox-panel.hash index 82802a998..5e72b9ec8 100644 --- a/buildroot/package/matchbox-panel/matchbox-panel.hash +++ b/buildroot/package/matchbox-panel/matchbox-panel.hash @@ -1,2 +1,4 @@ # From http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/0.9/matchbox-panel-0.9.3.tar.bz2.md5 md5 56d1807636f3919e22e51896ab7ccd2e matchbox-panel-0.9.3.tar.bz2 +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/matchbox-startup-monitor/matchbox-startup-monitor.hash b/buildroot/package/matchbox-startup-monitor/matchbox-startup-monitor.hash index b08e22891..c1b5098e9 100644 --- a/buildroot/package/matchbox-startup-monitor/matchbox-startup-monitor.hash +++ b/buildroot/package/matchbox-startup-monitor/matchbox-startup-monitor.hash @@ -1,2 +1,4 @@ # From http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/0.1/mb-applet-startup-monitor-0.1.tar.bz2.md5 md5 ea4b3c1ebee3f731b77a2d4bf8e9aa3c mb-applet-startup-monitor-0.1.tar.bz2 +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/mbedtls/mbedtls.hash b/buildroot/package/mbedtls/mbedtls.hash index 84fe820c5..92e7d35a6 100644 --- a/buildroot/package/mbedtls/mbedtls.hash +++ b/buildroot/package/mbedtls/mbedtls.hash @@ -1,5 +1,5 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.3-and-2.7.12-released -sha1 ce1af75d497cc03fe5c8e8e15fbf583d9dfbacd1 mbedtls-2.7.12-apache.tgz -sha256 d3a36dbc9f607747daa6875c1ab2e41f49eff5fc99d3436b4f3ac90c89f3c143 mbedtls-2.7.12-apache.tgz +# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.5-and-2.7.14-released +sha1 c36962183e05467aa1dadafcaacf90216a737866 mbedtls-2.16.5-apache.tgz +sha256 65b4c6cec83e048fd1c675e9a29a394ea30ad0371d37b5742453f74084e7b04d mbedtls-2.16.5-apache.tgz # Locally calculated -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/buildroot/package/mbedtls/mbedtls.mk b/buildroot/package/mbedtls/mbedtls.mk index 427b2acb5..5d0dd8733 100644 --- a/buildroot/package/mbedtls/mbedtls.mk +++ b/buildroot/package/mbedtls/mbedtls.mk @@ -5,7 +5,7 @@ ################################################################################ MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.7.12 +MBEDTLS_VERSION = 2.16.5 MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ diff --git a/buildroot/package/mc/mc.hash b/buildroot/package/mc/mc.hash index d980b8a47..963b2ad2f 100644 --- a/buildroot/package/mc/mc.hash +++ b/buildroot/package/mc/mc.hash @@ -1,4 +1,4 @@ -# Hash from http://ftp.midnight-commander.org/mc-4.8.20.sha256: -sha256 017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c mc-4.8.20.tar.xz +# Hash from http://ftp.midnight-commander.org/mc-4.8.23.sha256: +sha256 dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c mc-4.8.23.tar.xz # sha256 locally computed: sha256 5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284 COPYING diff --git a/buildroot/package/mc/mc.mk b/buildroot/package/mc/mc.mk index a83c5f0ab..24f6ac36a 100644 --- a/buildroot/package/mc/mc.mk +++ b/buildroot/package/mc/mc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MC_VERSION = 4.8.20 +MC_VERSION = 4.8.23 MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ diff --git a/buildroot/package/mcelog/mcelog.hash b/buildroot/package/mcelog/mcelog.hash index 1a9dd602d..c323d681c 100644 --- a/buildroot/package/mcelog/mcelog.hash +++ b/buildroot/package/mcelog/mcelog.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 d8f3dde21b2e0d76740f374385817c11b3fd69b095a186a6dd12c7b0ba0cca8f mcelog-v153.tar.gz +sha256 a18fdef9cfe2dfaefa09087c616c376a301dc87b1fa14a37476d97370962c668 mcelog-165.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/mcelog/mcelog.mk b/buildroot/package/mcelog/mcelog.mk index dca6a18c2..cedf474ac 100644 --- a/buildroot/package/mcelog/mcelog.mk +++ b/buildroot/package/mcelog/mcelog.mk @@ -4,11 +4,10 @@ # ################################################################################ -MCELOG_VERSION = v153 -MCELOG_SITE = $(BR2_KERNEL_MIRROR)/scm/utils/cpu/mce/mcelog.git -MCELOG_SITE_METHOD = git +MCELOG_VERSION = 165 +MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION)) MCELOG_LICENSE = GPL-2.0 -MCELOG_LICENSE_FILES = README.md +MCELOG_LICENSE_FILES = LICENSE define MCELOG_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all diff --git a/buildroot/package/mcrypt/mcrypt.hash b/buildroot/package/mcrypt/mcrypt.hash index cf29eaa9f..c6c8871f4 100644 --- a/buildroot/package/mcrypt/mcrypt.hash +++ b/buildroot/package/mcrypt/mcrypt.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098 mcrypt-2.6.8.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/mcrypt/mcrypt.mk b/buildroot/package/mcrypt/mcrypt.mk index f98895f40..a04b97375 100644 --- a/buildroot/package/mcrypt/mcrypt.mk +++ b/buildroot/package/mcrypt/mcrypt.mk @@ -14,4 +14,11 @@ MCRYPT_CONF_OPTS = --with-libmcrypt-prefix=$(STAGING_DIR)/usr MCRYPT_LICENSE = GPL-3.0 MCRYPT_LICENSE_FILES = COPYING +# 0001-CVE-2012-4409.patch +MCRYPT_IGNORE_CVES += CVE-2012-4409 +# 0002-CVE-2012-4426.patch +MCRYPT_IGNORE_CVES += CVE-2012-4426 +# 0003-CVE-2012-4527.patch +MCRYPT_IGNORE_CVES += CVE-2012-4527 + $(eval $(autotools-package)) diff --git a/buildroot/package/mdadm/0010-add-install-targets-for-mdadm-and-mdmon.patch b/buildroot/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch similarity index 100% rename from buildroot/package/mdadm/0010-add-install-targets-for-mdadm-and-mdmon.patch rename to buildroot/package/mdadm/0001-add-install-targets-for-mdadm-and-mdmon.patch diff --git a/buildroot/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch b/buildroot/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch new file mode 100644 index 000000000..c8944c847 --- /dev/null +++ b/buildroot/package/mdadm/0002-mdadm.h-include-sysmacros.h-unconditionally.patch @@ -0,0 +1,35 @@ +From 6c781ad75d92c6f65832810c44afcba1b2dffc41 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 6 Aug 2019 16:01:15 +0300 +Subject: [PATCH] mdadm.h: include sysmacros.h unconditionally + +musl libc now also requires sys/sysmacros.h for the major/minor macros. +All supported libc implementations carry sys/sysmacros.h, including +diet-libc, klibc, and uclibc-ng. + +Cc: Hauke Mehrtens +Signed-off-by: Baruch Siach +--- +Upstream status: https://marc.info/?l=linux-raid&m=156509677018508 + + mdadm.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/mdadm.h b/mdadm.h +index c36d7fdb10f6..d61a9ca82dc1 100644 +--- a/mdadm.h ++++ b/mdadm.h +@@ -45,10 +45,8 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); + #include + #include + #include +-#ifdef __GLIBC__ + /* Newer glibc requires sys/sysmacros.h directly for makedev() */ + #include +-#endif + #ifdef __dietlibc__ + #include + /* dietlibc has deprecated random and srandom!! */ +-- +2.20.1 + diff --git a/buildroot/package/mdadm/mdadm.hash b/buildroot/package/mdadm/mdadm.hash index 6132a6d8c..b15cb4e03 100644 --- a/buildroot/package/mdadm/mdadm.hash +++ b/buildroot/package/mdadm/mdadm.hash @@ -1,2 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc -sha256 1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9 mdadm-4.0.tar.xz +sha256 ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a mdadm-4.1.tar.xz +# Locally calculated +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/mdadm/mdadm.mk b/buildroot/package/mdadm/mdadm.mk index b2ed5049a..171782712 100644 --- a/buildroot/package/mdadm/mdadm.mk +++ b/buildroot/package/mdadm/mdadm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MDADM_VERSION = 4.0 +MDADM_VERSION = 4.1 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ diff --git a/buildroot/package/mdevd/Config.in b/buildroot/package/mdevd/Config.in new file mode 100644 index 000000000..046094039 --- /dev/null +++ b/buildroot/package/mdevd/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_MDEVD + bool "mdevd" + depends on BR2_USE_MMU # skalibs + select BR2_PACKAGE_SKALIBS + help + mdevd is a small daemon managing kernel hotplug events, + similarly to udevd. + + http://skarnet.org/software/mdevd/ diff --git a/buildroot/package/mdevd/mdevd.hash b/buildroot/package/mdevd/mdevd.hash new file mode 100644 index 000000000..2b36740fb --- /dev/null +++ b/buildroot/package/mdevd/mdevd.hash @@ -0,0 +1,3 @@ +# Locally generated +sha256 ad93048afbd8394d709da35934a62ef5826143b6baa13d37115a3b265f9038b7 mdevd-0.1.1.1.tar.gz +sha256 2e59eb9754eaece119072a4379d8b320900cc8c4a1a488d2d7788768b95e89ae COPYING diff --git a/buildroot/package/mdevd/mdevd.mk b/buildroot/package/mdevd/mdevd.mk new file mode 100644 index 000000000..48de72492 --- /dev/null +++ b/buildroot/package/mdevd/mdevd.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# mdevd +# +################################################################################ + +MDEVD_VERSION = 0.1.1.1 +MDEVD_SITE = http://skarnet.org/software/mdevd +MDEVD_LICENSE = ISC +MDEVD_LICENSE_FILES = COPYING +MDEVD_INSTALL_STAGING = YES +MDEVD_DEPENDENCIES = skalibs + +MDEVD_CONF_OPTS = \ + --prefix=/usr \ + --with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \ + --with-include=$(STAGING_DIR)/usr/include \ + --with-dynlib=$(STAGING_DIR)/usr/lib \ + --with-lib=$(STAGING_DIR)/usr/lib/skalibs \ + $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ + $(SHARED_STATIC_LIBS_OPTS) + +define MDEVD_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(MDEVD_CONF_OPTS)) +endef + +define MDEVD_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define MDEVD_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef + +define MDEVD_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/memcached/0001-configure-Fix-cross-compilation-errors.patch b/buildroot/package/memcached/0001-configure-Fix-cross-compilation-errors.patch new file mode 100644 index 000000000..5c5d94832 --- /dev/null +++ b/buildroot/package/memcached/0001-configure-Fix-cross-compilation-errors.patch @@ -0,0 +1,142 @@ +From 1146bf07624b5820b942b84b68e66f0d3dd25914 Mon Sep 17 00:00:00 2001 +From: Ola Jeppsson +Date: Mon, 7 Oct 2019 18:07:30 -0400 +Subject: [PATCH] configure: Fix cross-compilation errors + +AC_RUN_IFELSE does not work when cross-compiling so we need to provide +fallback methods for those cases. + +I tried to use constructs that work with Autoconf 2.52. +Alas, I wasn't able to generate a working build system with that version. + +Autoconf 2.58 / Automake 1.7.9 is the earliest combo that I could get +to work (with and without this patch). +Perhaps it's time for a slight bump for the required version numbers? + +Cross-compiles sucessfully against: +riscv64-unknown-linux-gnu + +Downloaded from upstream PR: +https://github.com/memcached/memcached/pull/552 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 80 +++++++++++++++++++++++++++------------------------- + 1 file changed, 41 insertions(+), 39 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fb78fc5..27dc939 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -264,23 +264,42 @@ return sizeof(void*) == 8 ? 0 : 1; + ],[ + CFLAGS="-m64 $org_cflags" + ],[ +- AC_MSG_ERROR([Don't know how to build a 64-bit object.]) ++ AC_MSG_ERROR([Don't know how to build a 64-bit object.]) ++ ],[ ++ dnl cross compile ++ AC_MSG_WARN([Assuming no extra CFLAGS are required for cross-compiling 64bit version.]) + ]) + fi + + dnl If data pointer is 64bit or not. +-AC_RUN_IFELSE( +- [AC_LANG_PROGRAM([], [dnl +-return sizeof(void*) == 8 ? 0 : 1; +- ]) +-],[ +- have_64bit_ptr=yes +-],[ ++AC_CHECK_HEADERS([stdint.h]) ++AS_IF([test -z "$have_64bit_ptr"], ++ [AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM([], [return sizeof(void*) == 8 ? 0 : 1;])], ++ [have_64bit_ptr=yes ], ++ [have_64bit_ptr=no], ++ [dnl cross compile (this test requires C99) ++ AS_IF([test "x$ac_cv_header_stdint_h" = xyes], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([ ++ #include ++ #if UINTPTR_MAX == 0xFFFFFFFFFFFFFFFFUL ++ /* 64 bit pointer */ ++ #else ++ #error 32 bit pointer ++ #endif ++ ], [])], ++ [have_64bit_ptr=yes], ++ [have_64bit_ptr=no])], ++ [have_64bit_ptr=unknown]) ++ ]) + ]) +- +-if test $have_64bit_ptr = yes; then ++AS_IF([test "$have_64bit_ptr" = "unknown" ],[ ++ AC_MSG_ERROR([Cannot detect pointer size. Must pass have_64bit_ptr={yes,no} to configure.]) ++]) ++AS_IF([test "$have_64bit_ptr" = yes],[ + AC_DEFINE(HAVE_64BIT_PTR, 1, [data pointer is 64bit]) +-fi ++]) + + # Issue 213: Search for clock_gettime to help people linking + # with a static version of libevent +@@ -570,30 +589,10 @@ fi + AC_C_SOCKLEN_T + + dnl Check if we're a little-endian or a big-endian system, needed by hash code +-AC_DEFUN([AC_C_ENDIAN], +-[AC_CACHE_CHECK(for endianness, ac_cv_c_endian, +-[ +- AC_RUN_IFELSE( +- [AC_LANG_PROGRAM([], [dnl +- long val = 1; +- char *c = (char *) &val; +- exit(*c == 1); +- ]) +- ],[ +- ac_cv_c_endian=big +- ],[ +- ac_cv_c_endian=little +- ]) +-]) +-if test $ac_cv_c_endian = big; then +- AC_DEFINE(ENDIAN_BIG, 1, [machine is bigendian]) +-fi +-if test $ac_cv_c_endian = little; then +- AC_DEFINE(ENDIAN_LITTLE, 1, [machine is littleendian]) +-fi +-]) +- +-AC_C_ENDIAN ++AC_C_BIGENDIAN( ++ [AC_DEFINE(ENDIAN_BIG, 1, [machine is bigendian])], ++ [AC_DEFINE(ENDIAN_LITTLE, 1, [machine is littleendian])], ++ [AC_MSG_ERROR([Cannot detect endianness. Must pass ac_cv_c_bigendian={yes,no} to configure.])]) + + AC_DEFUN([AC_C_HTONLL], + [ +@@ -670,12 +669,15 @@ AC_DEFUN([AC_C_ALIGNMENT], + ],[ + ac_cv_c_alignment=need + ],[ +- ac_cv_c_alignment=need ++ dnl cross compile ++ ac_cv_c_alignment=maybe + ]) + ]) +-if test $ac_cv_c_alignment = need; then +- AC_DEFINE(NEED_ALIGN, 1, [Machine need alignment]) +-fi ++AS_IF([test $ac_cv_c_alignment = need], ++ [AC_DEFINE(NEED_ALIGN, 1, [Machine need alignment])]) ++AS_IF([test $ac_cv_c_alignment = maybe], ++ [AC_MSG_WARN([Assuming aligned access is required when cross-compiling]) ++ AC_DEFINE(NEED_ALIGN, 1, [Machine need alignment])]) + ]) + + AC_C_ALIGNMENT +-- +2.20.1 + diff --git a/buildroot/package/memcached/0002-configure-Simplify-pointer-size-check.patch b/buildroot/package/memcached/0002-configure-Simplify-pointer-size-check.patch new file mode 100644 index 000000000..1a5dc3196 --- /dev/null +++ b/buildroot/package/memcached/0002-configure-Simplify-pointer-size-check.patch @@ -0,0 +1,76 @@ +From ec7f3bc97c53578d5ca332b9e86c4d08d155c5a0 Mon Sep 17 00:00:00 2001 +From: Ola Jeppsson +Date: Mon, 7 Oct 2019 19:57:46 -0400 +Subject: [PATCH] configure: Simplify pointer size check + +Tested with: +Autoconf 2.59 / Automake 1.7.9 +Autoconf 2.69 / Automake 1.16.1 + +Downloaded from upstream PR: +https://github.com/memcached/memcached/pull/552 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 31 ++----------------------------- + restart.h | 2 +- + 2 files changed, 3 insertions(+), 30 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 27dc939..7e5bd5d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -271,35 +271,8 @@ return sizeof(void*) == 8 ? 0 : 1; + ]) + fi + +-dnl If data pointer is 64bit or not. +-AC_CHECK_HEADERS([stdint.h]) +-AS_IF([test -z "$have_64bit_ptr"], +- [AC_RUN_IFELSE( +- [AC_LANG_PROGRAM([], [return sizeof(void*) == 8 ? 0 : 1;])], +- [have_64bit_ptr=yes ], +- [have_64bit_ptr=no], +- [dnl cross compile (this test requires C99) +- AS_IF([test "x$ac_cv_header_stdint_h" = xyes], +- [AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM([ +- #include +- #if UINTPTR_MAX == 0xFFFFFFFFFFFFFFFFUL +- /* 64 bit pointer */ +- #else +- #error 32 bit pointer +- #endif +- ], [])], +- [have_64bit_ptr=yes], +- [have_64bit_ptr=no])], +- [have_64bit_ptr=unknown]) +- ]) +-]) +-AS_IF([test "$have_64bit_ptr" = "unknown" ],[ +- AC_MSG_ERROR([Cannot detect pointer size. Must pass have_64bit_ptr={yes,no} to configure.]) +-]) +-AS_IF([test "$have_64bit_ptr" = yes],[ +- AC_DEFINE(HAVE_64BIT_PTR, 1, [data pointer is 64bit]) +-]) ++dnl Check if data pointer is 64bit or not ++AC_CHECK_SIZEOF([void *]) + + # Issue 213: Search for clock_gettime to help people linking + # with a static version of libevent +diff --git a/restart.h b/restart.h +index 76cd0a8..9de5096 100644 +--- a/restart.h ++++ b/restart.h +@@ -4,7 +4,7 @@ + #define RESTART_TAG_MAXLEN 255 + + // Track the pointer size for restart fiddling. +-#ifdef HAVE_64BIT_PTR ++#if SIZEOF_VOID_P == 8 + typedef uint64_t mc_ptr_t; + #else + typedef uint32_t mc_ptr_t; +-- +2.20.1 + diff --git a/buildroot/package/memcached/memcached.hash b/buildroot/package/memcached/memcached.hash index df430cf4f..98e47d6c0 100644 --- a/buildroot/package/memcached/memcached.hash +++ b/buildroot/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.5.12.tar.gz.sha1 -sha1 f67096ba64b0c47668bcad5b680010c4f8987d4c memcached-1.5.12.tar.gz +# From http://www.memcached.org/files/memcached-1.5.19.tar.gz.sha1 +sha1 14e6a02e743838696fcb620edf6a2fd7e60cabec memcached-1.5.19.tar.gz # Locally computed -sha256 c02f97d5685617b209fbe25f3464317b234d765b427d254c2413410a5c095b29 memcached-1.5.12.tar.gz +sha256 3ddcdaa2d14d215f3111a7448b79c889c57618a26e97ad989581f1880a5a4be0 memcached-1.5.19.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/buildroot/package/memcached/memcached.mk b/buildroot/package/memcached/memcached.mk index b7c36ec15..9b362d2a3 100644 --- a/buildroot/package/memcached/memcached.mk +++ b/buildroot/package/memcached/memcached.mk @@ -4,13 +4,16 @@ # ################################################################################ -MEMCACHED_VERSION = 1.5.12 +MEMCACHED_VERSION = 1.5.19 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' MEMCACHED_CONF_OPTS = --disable-coverage MEMCACHED_LICENSE = BSD-3-Clause MEMCACHED_LICENSE_FILES = COPYING +# 0001-configure-Fix-cross-compilation-errors.patch +# 0002-configure-Simplify-pointer-size-check.patch +MEMCACHED_AUTORECONF = YES ifeq ($(BR2_ENDIAN),"BIG") MEMCACHED_CONF_ENV += ac_cv_c_endian=big diff --git a/buildroot/package/memstat/memstat.hash b/buildroot/package/memstat/memstat.hash index f27e7d25f..9a30e342f 100644 --- a/buildroot/package/memstat/memstat.hash +++ b/buildroot/package/memstat/memstat.hash @@ -1,2 +1,4 @@ # From http://sourceforge.net/projects/memstattool/files/ sha1 26071dbc30a2796c0503c7d8060a548ca36f8df9 memstat_1.0.tar.gz +# Locally computed +sha256 5e5db2a2fab637bbbc5d2400141fcb9f1b4b55540d025c2dc54378dc497cb524 debian/copyright diff --git a/buildroot/package/memtest86/memtest86.hash b/buildroot/package/memtest86/memtest86.hash index 81ad98e72..559ae0ac6 100644 --- a/buildroot/package/memtest86/memtest86.hash +++ b/buildroot/package/memtest86/memtest86.hash @@ -1,2 +1,3 @@ # locally computed using sha256sum -sha256 142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 memtest86+-5.01.tar.gz +sha256 142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 memtest86+-5.01.tar.gz +sha256 2e15e2174b86640d7fbfcb62b51d9182062d9db71d66a46e5b01d736c68150ea README diff --git a/buildroot/package/memtester/memtester.hash b/buildroot/package/memtester/memtester.hash index 2d9ef3977..da8c1c02c 100644 --- a/buildroot/package/memtester/memtester.hash +++ b/buildroot/package/memtester/memtester.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88 memtester-4.3.0.tar.gz +sha256 f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88 memtester-4.3.0.tar.gz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/buildroot/package/memtool/memtool.hash b/buildroot/package/memtool/memtool.hash index 95df1aaf8..da4880bd3 100644 --- a/buildroot/package/memtool/memtool.hash +++ b/buildroot/package/memtool/memtool.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 58309d356cb9b45a241cb602ca3850891a70ddaa93ced51d1cced78e14767680 memtool-2016.10.0.tar.xz +sha256 87cb7175266ff3a00a9c1f541c4c6c93693ffbe8dcc0d97a60d13c45ff860900 memtool-2018.03.0.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/memtool/memtool.mk b/buildroot/package/memtool/memtool.mk index c236cab8b..75e378311 100644 --- a/buildroot/package/memtool/memtool.mk +++ b/buildroot/package/memtool/memtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMTOOL_VERSION = 2016.10.0 +MEMTOOL_VERSION = 2018.03.0 MEMTOOL_SITE = http://public.pengutronix.de/software/memtool MEMTOOL_SOURCE = memtool-$(MEMTOOL_VERSION).tar.xz MEMTOOL_LICENSE = GPL-2.0 diff --git a/buildroot/package/mender-artifact/Config.in.host b/buildroot/package/mender-artifact/Config.in.host new file mode 100644 index 000000000..c7be0ed26 --- /dev/null +++ b/buildroot/package/mender-artifact/Config.in.host @@ -0,0 +1,18 @@ +config BR2_PACKAGE_HOST_MENDER_ARTIFACT + bool "host mender-artifact" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + The mender-artifact tool is a CLI implementation of the + Mender artifacts library. + + A Mender artifact can be recognized by its .mender suffix. + Mender artifacts can contain binaries, metadata, checksums, + signatures and scripts that are used during a deployment. + The artifact format acts as a wrapper, and uses the tar + format to bundle several files into one. + + In its simplest form, an artifact contains just a rootfs + image, along with its checksum, id and device type + compatibility. + + https://github.com/mendersoftware/mender-artifact diff --git a/buildroot/package/mender-artifact/mender-artifact.hash b/buildroot/package/mender-artifact/mender-artifact.hash new file mode 100644 index 000000000..74ea5686c --- /dev/null +++ b/buildroot/package/mender-artifact/mender-artifact.hash @@ -0,0 +1,29 @@ +# Locally computed: +sha256 62233e415399a32f4397cf9e2dfc1447db58b7ebd71379ee779b360140d5ab08 3.2.1.tar.gz +sha256 68d145b900b4845834d49efe470d7e9ec7a3d9f175e72cb974f38c54b9172801 LIC_FILES_CHKSUM.sha256 + +# License hash extracted from LIC_FILES_CHKSUM.sha256 using the +# following command: +# +# sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 + +# Apache 2.0 licenses. +sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 LICENSE +sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mendertesting/LICENSE +# +# BSD 2 Clause licenses. +sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE +# +# BSD 3 Clause licenses. +sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE +sha256 a284e538f3e5649ae6a8f32da2bbd18e9daabf2c1ebbfb99ed92e797b159be1a vendor/github.com/remyoudompheng/go-liblzma/LICENSE +# +# ISC licenses. +sha256 3525392c6db3b804af76980b2c560ee9ec1abdadd907d76a26091df7c78f3a25 vendor/github.com/davecgh/go-spew/LICENSE +# +# MIT licenses. +sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENSE +sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/LICENSE +sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE diff --git a/buildroot/package/mender-artifact/mender-artifact.mk b/buildroot/package/mender-artifact/mender-artifact.mk new file mode 100644 index 000000000..f4a606653 --- /dev/null +++ b/buildroot/package/mender-artifact/mender-artifact.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# host-mender-artifact +# +################################################################################ + +HOST_MENDER_ARTIFACT_VERSION = 3.2.1 +HOST_MENDER_ARTIFACT_SITE = https://github.com/mendersoftware/mender-artifact/archive +HOST_MENDER_ARTIFACT_SOURCE = $(HOST_MENDER_ARTIFACT_VERSION).tar.gz +HOST_MENDER_ARTIFACT_LICENSE = Apache2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT +HOST_MENDER_ARTIFACT_LICENSE_FILES = \ + LICENSE \ + LIC_FILES_CHKSUM.sha256 \ + vendor/github.com/mendersoftware/mendertesting/LICENSE \ + vendor/github.com/pkg/errors/LICENSE \ + vendor/github.com/pmezard/go-difflib/LICENSE \ + vendor/golang.org/x/sys/LICENSE \ + vendor/golang.org/x/crypto/LICENSE \ + vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ + vendor/github.com/davecgh/go-spew/LICENSE \ + vendor/github.com/stretchr/testify/LICENSE \ + vendor/github.com/urfave/cli/LICENSE \ + vendor/github.com/sirupsen/logrus/LICENSE +HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz + +HOST_MENDER_ARTIFACT_LDFLAGS = -X main.Version=$(HOST_MENDER_ARTIFACT_VERSION) + +HOST_MENDER_ARTIFACT_BUILD_TARGETS = cli/mender-artifact + +HOST_MENDER_ARTIFACT_BIN_NAME = mender-artifact +HOST_MENDER_ARTIFACT_INSTALL_BINS = $(HOST_MENDER_ARTIFACT_BIN_NAME) + +$(eval $(host-golang-package)) diff --git a/buildroot/package/mender-grubenv/Config.in b/buildroot/package/mender-grubenv/Config.in new file mode 100644 index 000000000..28b4bb707 --- /dev/null +++ b/buildroot/package/mender-grubenv/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_MENDER_GRUBENV + bool "mender-grubenv" + depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS + depends on BR2_PACKAGE_MENDER # runtime + # grubenv provides it's own fw_printenv. + depends on !BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV + depends on BR2_TARGET_GRUB2 + help + Contains the boot scripts and tools used by Mender to + integrate with the GRUB bootloader. + + The following Grub modules must be selected for this package: + loadenv hashsum echo halt gcry_sha256 test + + https://github.com/mendersoftware/grub-mender-grubenv + +if BR2_PACKAGE_MENDER_GRUBENV + +config BR2_PACKAGE_MENDER_GRUBENV_DEFINES + string "path to grubenv defines" + help + Specify a path to the mender grubenv defines file. + If no path is specified, the example file in the source + directory will be used. + + The example file in the source directory sets the following: + mender_rootfsa_part=2 + mender_rootfsb_part=3 + mender_kernel_root_base=/dev/mmcblk0p + mender_grub_storage_device=hd0 + kernel_imagetype=bzImage + +endif + +comment "mender-grubenv needs a grub2 bootloader" + depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS + depends on BR2_PACKAGE_MENDER + depends on !BR2_TARGET_GRUB2 + +comment "mender-grubenv does not work with uboot-tools fw_printenv" + depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS + depends on BR2_PACKAGE_MENDER + depends on BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV diff --git a/buildroot/package/mender-grubenv/mender-grubenv.hash b/buildroot/package/mender-grubenv/mender-grubenv.hash new file mode 100644 index 000000000..1b1eaa758 --- /dev/null +++ b/buildroot/package/mender-grubenv/mender-grubenv.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 e50cc18a844e3fd1edef7af9224733b0338a34d51f1186ee19803ef7af1a5065 mender-grubenv-1.3.0.tar.gz +sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 LICENSE diff --git a/buildroot/package/mender-grubenv/mender-grubenv.mk b/buildroot/package/mender-grubenv/mender-grubenv.mk new file mode 100644 index 000000000..6e38557eb --- /dev/null +++ b/buildroot/package/mender-grubenv/mender-grubenv.mk @@ -0,0 +1,65 @@ +################################################################################ +# +# mender-grubenv +# +################################################################################ + +MENDER_GRUBENV_VERSION = 1.3.0 +MENDER_GRUBENV_SITE = $(call github,mendersoftware,grub-mender-grubenv,$(MENDER_GRUBENV_VERSION)) +MENDER_GRUBENV_LICENSE = Apache-2.0 +MENDER_GRUBENV_LICENSE_FILES = LICENSE +# Grub2 must be built first so this package can overwrite the config files +# provided by grub. +MENDER_GRUBENV_DEPENDENCIES = grub2 +MENDER_GRUBENV_INSTALL_IMAGES = YES + +ifeq ($(BR2_TARGET_GRUB2_I386_PC)$(BR2_TARGET_GRUB2_ARM_UBOOT),y) +MENDER_GRUBENV_ENV_DIR = /boot/grub +else +MENDER_GRUBENV_ENV_DIR = /boot/EFI/BOOT +endif + +MENDER_GRUBENV_MAKE_ENV = \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) \ + ENV_DIR=$(MENDER_GRUBENV_ENV_DIR) + +MENDER_GRUBENV_DEFINES = \ + $(or $(call qstrip,$(BR2_PACKAGE_MENDER_GRUBENV_DEFINES)),\ + $(@D)/mender_grubenv_defines.example) + +# These grub modules must be built in for the grub scripts to work properly. +# Without them, the system will not boot. +MENDER_GRUBENV_MANDATORY_MODULES=loadenv hashsum echo halt gcry_sha256 test +MENDER_GRUBENV_MODULES_MISSING = \ + $(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES)),\ + $(MENDER_GRUBENV_MANDATORY_MODULES)) + +ifeq ($(BR2_PACKAGE_MENDER_GRUBENV)$(BR_BUILDING),yy) +ifneq ($(MENDER_GRUBENV_MODULES_MISSING),) +$(error The following missing grub2 modules must be enabled for mender-grubenv \ + to work: $(MENDER_GRUBENV_MODULES_MISSING)) +endif +endif + +define MENDER_GRUBENV_CONFIGURE_CMDS + $(INSTALL) -m 0644 $(MENDER_GRUBENV_DEFINES) $(@D)/mender_grubenv_defines +endef + +define MENDER_GRUBENV_BUILD_CMDS + $(MENDER_GRUBENV_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define MENDER_GRUBENV_INSTALL_TARGET_CMDS + $(MENDER_GRUBENV_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install +endef + +# Overwrite the default grub2 config files with the ones in this package. +define MENDER_GRUBENV_INSTALL_IMAGES_CMDS + mkdir -p $(BINARIES_DIR)/efi-part/EFI/BOOT + cp -dpfr $(TARGET_DIR)/boot/EFI/BOOT/grub.cfg \ + $(TARGET_DIR)/boot/EFI/BOOT/mender_grubenv* \ + $(BINARIES_DIR)/efi-part/EFI/BOOT +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/mender/Config.in b/buildroot/package/mender/Config.in index aeb0b2694..5cb3a3f2e 100644 --- a/buildroot/package/mender/Config.in +++ b/buildroot/package/mender/Config.in @@ -1,10 +1,11 @@ config BR2_PACKAGE_MENDER bool "mender" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_UBOOT_TOOLS # runtime - select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV # runtime + select BR2_PACKAGE_XZ + select BR2_PACKAGE_UBOOT_TOOLS if BR2_TARGET_UBOOT # runtime + select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV if BR2_TARGET_UBOOT # runtime help Mender is an open source over-the-air (OTA) software updater for embedded Linux devices. Mender comprises a client @@ -14,6 +15,6 @@ config BR2_PACKAGE_MENDER https://github.com/mendersoftware/mender comment "mender needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/mender/mender.hash b/buildroot/package/mender/mender.hash index 89aec239b..6d0a64da9 100644 --- a/buildroot/package/mender/mender.hash +++ b/buildroot/package/mender/mender.hash @@ -1,41 +1,43 @@ # Locally computed: -sha256 caee18d1b8446df0cbb9a9c5a1c040d7eb1924332da94c3489494443a8077eb8 1.7.0.tar.gz +sha256 eb288eaee8be4d58edeef7c8d1c3caa8fea94740a2002520ed43bc717c01dca6 2.1.2.tar.gz # Apache-2.0 license, locally computed -sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 LICENSE +sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 LICENSE # Vendor licenses # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache-2.0 license. -sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 vendor/github.com/mendersoftware/mendertesting/LICENSE -sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de vendor/github.com/mendersoftware/log/LICENSE -sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483 vendor/github.com/mendersoftware/log/COPYING -sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de vendor/github.com/mendersoftware/scopestack/LICENSE -sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483 vendor/github.com/mendersoftware/scopestack/COPYING -sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 vendor/github.com/mendersoftware/mender-artifact/LICENSE - +sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mendertesting/LICENSE +sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 vendor/github.com/mendersoftware/log/LICENSE +sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 vendor/github.com/mendersoftware/scopestack/LICENSE +sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mender-artifact/LICENSE +# # BSD 2 Clause license. -sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE - +sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE +# # BSD 3 Clause license. -sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/net/LICENSE -sha256 0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e vendor/github.com/bmatsuo/lmdb-go/LICENSE.md - +sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/net/LICENSE +sha256 0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e vendor/github.com/bmatsuo/lmdb-go/LICENSE.md +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/text/LICENSE +sha256 87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b vendor/github.com/remyoudompheng/go-liblzma/LICENSE +# # ISC license. -sha256 3525392c6db3b804af76980b2c560ee9ec1abdadd907d76a26091df7c78f3a25 vendor/github.com/davecgh/go-spew/LICENSE - +sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE +# # MIT license. -sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/Sirupsen/logrus/LICENSE -sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENSE -sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENCE.txt -sha256 fde7d610b9b95fc5a6304055c4dae951025b630aaa42a24e95ebf76675ae832c vendor/github.com/stretchr/objx/LICENSE.md -sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE - +sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE +sha256 dad2b0b2cc2dbdbf95ad5d800ef7588956e74dc2479014829d42be295125c25d vendor/github.com/stretchr/testify/LICENSE +sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENCE.txt +sha256 fde7d610b9b95fc5a6304055c4dae951025b630aaa42a24e95ebf76675ae832c vendor/github.com/stretchr/objx/LICENSE.md +sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE +sha256 95b8ef9c4137a8f75ddd3101ffdc4cfd594fa875b261697b68baddc16b0e537c vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE +# # OpenLDAP Public License -sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md # sha256 of all the vendor licenses combined -sha256 b84b543cab0505452982422783c0e68b7bfa0a1de4a625753d325e0a8b2dacb1 LIC_FILES_CHKSUM.sha256 +sha256 af7578d06eb10566dd12e9fb57113d035abd69b274eb2b8c70e83f9da3b7c9d7 LIC_FILES_CHKSUM.sha256 diff --git a/buildroot/package/mender/mender.mk b/buildroot/package/mender/mender.mk index d56b63471..87fdc4526 100644 --- a/buildroot/package/mender/mender.mk +++ b/buildroot/package/mender/mender.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_VERSION = 1.7.0 +MENDER_VERSION = 2.1.2 MENDER_SITE = https://github.com/mendersoftware/mender/archive MENDER_SOURCE = $(MENDER_VERSION).tar.gz MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 @@ -16,23 +16,27 @@ MENDER_LICENSE_FILES = \ LIC_FILES_CHKSUM.sha256 \ vendor/github.com/mendersoftware/mendertesting/LICENSE \ vendor/github.com/mendersoftware/log/LICENSE \ - vendor/github.com/mendersoftware/log/COPYING \ vendor/github.com/mendersoftware/scopestack/LICENSE \ - vendor/github.com/mendersoftware/scopestack/COPYING \ vendor/github.com/mendersoftware/mender-artifact/LICENSE \ vendor/github.com/pkg/errors/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ + vendor/golang.org/x/crypto/LICENSE \ vendor/golang.org/x/sys/LICENSE \ vendor/golang.org/x/net/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \ + vendor/golang.org/x/text/LICENSE \ + vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ vendor/github.com/davecgh/go-spew/LICENSE \ - vendor/github.com/Sirupsen/logrus/LICENSE \ + vendor/github.com/sirupsen/logrus/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ vendor/github.com/stretchr/testify/LICENCE.txt \ vendor/github.com/stretchr/objx/LICENSE.md \ vendor/github.com/ungerik/go-sysfs/LICENSE \ + vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md +MENDER_DEPENDENCIES = xz + MENDER_LDFLAGS = -X main.Version=$(MENDER_VERSION) define MENDER_INSTALL_CONFIG_FILES @@ -66,9 +70,6 @@ MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES define MENDER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender.service \ $(TARGET_DIR)/usr/lib/systemd/system/mender.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/mender.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mender.service endef define MENDER_INSTALL_INIT_SYSV diff --git a/buildroot/package/mesa3d-demos/mesa3d-demos.mk b/buildroot/package/mesa3d-demos/mesa3d-demos.mk index ddff9b9ed..e9aa44dc2 100644 --- a/buildroot/package/mesa3d-demos/mesa3d-demos.mk +++ b/buildroot/package/mesa3d-demos/mesa3d-demos.mk @@ -61,7 +61,7 @@ ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MESA3D_DEMOS_DEPENDENCIES += libfreeglut MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr # osmesa support depends on glut -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) MESA3D_DEMOS_CONF_OPTS += --enable-osmesa else MESA3D_DEMOS_CONF_OPTS += --disable-osmesa diff --git a/buildroot/package/mesa3d-headers/mesa3d-headers.mk b/buildroot/package/mesa3d-headers/mesa3d-headers.mk index 4730463ea..7d428f232 100644 --- a/buildroot/package/mesa3d-headers/mesa3d-headers.mk +++ b/buildroot/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 18.3.3 +MESA3D_HEADERS_VERSION = 19.3.4 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/buildroot/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch b/buildroot/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch deleted file mode 100644 index 513552879..000000000 --- a/buildroot/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ef96bac7cbbb11b98606864ead0f731dd5b71d5a Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 17 Nov 2016 15:36:54 -0300 -Subject: [PATCH] configure.ac: invert order for wayland-scanner check - -When cross-compiling the .pc file might point to the wrong -wayland-scanner binary (target rather than host) resulting in a -non-executable and wrong scanner. -Try searching the PATH first, and if that fails fall back into -pkg-config. - -[Vincent: tweak patch for 17.1.1 version] - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Vicente Olivert Riera -[Romain: rebase on 18.1] -Signed-off-by: Romain Naour -[Bernd rebase on 18.3] -Signed-off-by: Bernd Kuhls ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f1fbdcc6c7..dcf87e7dd6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1841,17 +1841,16 @@ - fi - WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` - -- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -+ if test "x$WAYLAND_SCANNER" = x; then -+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, - WAYLAND_SCANNER='') -+ fi - PKG_CHECK_EXISTS([wayland-scanner >= 1.15], - AC_SUBST(SCANNER_ARG, 'private-code'), - AC_SUBST(SCANNER_ARG, 'code')) - -- if test "x$WAYLAND_SCANNER" = x; then -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -- fi -- - if test "x$WAYLAND_SCANNER" = "x:"; then - AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) - fi --- -2.14.3 diff --git a/buildroot/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch b/buildroot/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch new file mode 100644 index 000000000..784b27c4a --- /dev/null +++ b/buildroot/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch @@ -0,0 +1,52 @@ +From 0e107f7bac8d84d8fb2bb5b83bfb4474348a82c1 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 17 Apr 2019 22:47:05 +0200 +Subject: [PATCH] meson: use wayland-scanner provided by wayland-scanner-path + +When cross-compiling the .pc file might point to the wrong +wayland-scanner binary (target rather than host) resulting in a +non-executable and wrong scanner. +First try by using the path provided by wayland-scanner-path, +and if that fails fall back into pkg-config. + +Based on the patch for autotools provided by Gustavo Zacarias. + +Signed-off-by: Romain Naour +--- + meson.build | 5 ++++- + meson_options.txt | 6 ++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6c4f1508855..ef0532b2cfb 100644 +--- a/meson.build ++++ b/meson.build +@@ -1319,7 +1319,10 @@ endif + + if with_platform_wayland + dep_wl_scanner = dependency('wayland-scanner', native: true) +- prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) ++ prog_wl_scanner = get_option('wayland-scanner-path') ++ if prog_wl_scanner == '' ++ prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) ++ endif + if dep_wl_scanner.version().version_compare('>= 1.15') + wl_scanner_arg = 'private-code' + else +diff --git a/meson_options.txt b/meson_options.txt +index ccf70659ff7..59ff8df8337 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -324,3 +324,9 @@ option( + value : true, + description : 'Enable direct rendering in GLX and EGL for DRI', + ) ++option( ++ 'wayland-scanner-path', ++ type : 'string', ++ value : '', ++ description : 'Locations to wayland-scanner binary. Default: use path from pkg-config' ++) +-- +2.20.1 + diff --git a/buildroot/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch b/buildroot/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch new file mode 100644 index 000000000..072d79a21 --- /dev/null +++ b/buildroot/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch @@ -0,0 +1,39 @@ +From 7b46756a99aca7f27a45c3b99460f088570f6f53 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 17 Apr 2019 23:07:42 +0200 +Subject: [PATCH] meson: Set proper value for LIBCLC_INCLUDEDIR + +LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation +will look for OpenCL "headers" on the target, when building the OpenCL +kernels. + +The value returned by pkg-config for includedir is relevant when +cross-compiling, on the build machine. But in this specific case, we +really need a value that is valid on the target. + +Those headers are installed by the libclc package in /usr/share so +that they are not removed by Buildroot target-finalize logic. + +Based on the patch for autotools provided by Valentin Korenblit. + +Signed-off-by: Romain Naour +--- + src/gallium/state_trackers/clover/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build +index 62ac5f5278d..ecdeb39669c 100644 +--- a/src/gallium/state_trackers/clover/meson.build ++++ b/src/gallium/state_trackers/clover/meson.build +@@ -49,7 +49,7 @@ libclllvm = static_library( + include_directories : clover_incs, + cpp_args : [ + cpp_vis_args, +- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')), ++ '-DLIBCLC_INCLUDEDIR="/usr/share"', + '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')), + '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths( + dep_llvm.get_configtool_variable('libdir'), 'clang', +-- +2.20.1 + diff --git a/buildroot/package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch b/buildroot/package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch deleted file mode 100644 index 42ae826a3..000000000 --- a/buildroot/package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 94bceeb621e36f3188c6246a763def8695526578 Mon Sep 17 00:00:00 2001 -From: Valentin Korenblit -Date: Sat, 20 Oct 2018 10:56:23 +0200 -Subject: [PATCH] Set proper value for LIBCLC_INCLUDEDIR - -LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation -will look for OpenCL "headers" on the target, when building the OpenCL -kernels. - -The value returned by pkg-config for includedir is relevant when -cross-compiling, on the build machine. But in this specific case, we -really need a value that is valid on the target. - -Those headers are installed by the libclc package in /usr/share so -that they are not removed by Buildroot target-finalize logic. - -Signed-off-by: Valentin Korenblit ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 864dcae..cc2390b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2429,7 +2429,7 @@ if test "x$enable_opencl" = xyes; then - PKG_CONFIG_PATH environment variable. - By default libclc.pc is installed to /usr/local/share/pkgconfig/]) - else -- LIBCLC_INCLUDEDIR=`$PKG_CONFIG --variable=includedir libclc` -+ LIBCLC_INCLUDEDIR="/usr/share" - LIBCLC_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir libclc` - AC_SUBST([LIBCLC_INCLUDEDIR]) - AC_SUBST([LIBCLC_LIBEXECDIR]) --- -2.7.4 - diff --git a/buildroot/package/mesa3d/0004-c99_math-import-isinf-for-uclibc-based-toolchains.patch b/buildroot/package/mesa3d/0004-c99_math-import-isinf-for-uclibc-based-toolchains.patch new file mode 100644 index 000000000..5acbaa4da --- /dev/null +++ b/buildroot/package/mesa3d/0004-c99_math-import-isinf-for-uclibc-based-toolchains.patch @@ -0,0 +1,30 @@ +From 705490763fcc052defa2d49a5c5200775cd12c54 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Wed, 4 Mar 2020 08:27:24 +0100 +Subject: [PATCH] c99_math: import isinf for uclibc based toolchains + +The same fix as for glibc >= 2.23 is needed for uclibc +based toolchains. + +[Upstream suggested: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4042] +Signed-off-by: Peter Seiderer +--- + include/c99_math.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/c99_math.h b/include/c99_math.h +index e906c26aa54..c8a73a2d2c7 100644 +--- a/include/c99_math.h ++++ b/include/c99_math.h +@@ -190,7 +190,7 @@ fpclassify(double x) + * undefines those functions, which in glibc 2.23, are defined as macros rather + * than functions as in glibc 2.22. + */ +-#if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23)) ++#if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23) || defined(__UCLIBC__)) + #include + + using std::fpclassify; +-- +2.25.1 + diff --git a/buildroot/package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch b/buildroot/package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch deleted file mode 100644 index 04621eeab..000000000 --- a/buildroot/package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch +++ /dev/null @@ -1,47 +0,0 @@ -From eb44c36cf1729e7e200b77cf8ea755dff72d1639 Mon Sep 17 00:00:00 2001 -From: Gurchetan Singh -Date: Wed, 28 Nov 2018 08:39:34 -0800 -Subject: [PATCH] egl: add missing #include in egldevice.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise, I get this error: - -main/egldevice.h:54:13: error: ‘NULL’ undeclared (first use in this function) - dev = NULL; - ^~~~ -with this config: - -./autogen.sh --enable-gles1 --enable-gles2 --with-platforms='surfaceless' --disable-glx - --with-dri-drivers="i965" --with-gallium-drivers="" --enable-gbm - -v3: Use stddef.h (Matt) -v4: Modify commit message (Eric) - -Reviewed-by: Matt Turner -Reviewed-by: Eric Engestrom -Backported from upstream commit eb44c36cf1729e7e200b77cf8ea755dff72d1639 -Signed-off-by: James Hilliard ---- - src/egl/main/egldevice.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/egl/main/egldevice.h b/src/egl/main/egldevice.h -index ddcdcd1..83a47d5 100644 ---- a/src/egl/main/egldevice.h -+++ b/src/egl/main/egldevice.h -@@ -31,9 +31,9 @@ - - - #include -+#include - #include "egltypedefs.h" - -- - #ifdef __cplusplus - extern "C" { - #endif --- -2.7.4 - diff --git a/buildroot/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch b/buildroot/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch new file mode 100644 index 000000000..27ae021e0 --- /dev/null +++ b/buildroot/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch @@ -0,0 +1,42 @@ +From 63ad4535df6a0a938e7391d73adcada05e730c89 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= +Date: Tue, 18 Feb 2020 16:12:23 -0500 +Subject: [PATCH] util: remove the dependency on kcmp.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: f76cbc7901f7 "util: Add os_same_file_description helper" + +Acked-by: Eric Engestrom +Reviewed-by: Michel Dänzer +Tested-by: Marge Bot +Part-of: + +[ Upstream: https://cgit.freedesktop.org/mesa/mesa/commit/?id=f7bfb10c69dfe48a91e35523cb5ee641bdbf6988 ] +Signed-off-by: Peter Seiderer +--- + src/util/os_file.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/util/os_file.c b/src/util/os_file.c +index b502ff4..128fe87 100644 +--- a/src/util/os_file.c ++++ b/src/util/os_file.c +@@ -34,11 +34,12 @@ os_file_create_unique(const char *filename, int filemode) + #if defined(__linux__) + + #include +-#include + #include + #include + #include + ++/* copied from */ ++#define KCMP_FILE 0 + + static ssize_t + readN(int fd, char *buf, size_t len) +-- +2.25.1 + diff --git a/buildroot/package/mesa3d/0007-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/buildroot/package/mesa3d/0007-vc4-add-meson-option-to-disable-optional-neon-suppor.patch new file mode 100644 index 000000000..138f145af --- /dev/null +++ b/buildroot/package/mesa3d/0007-vc4-add-meson-option-to-disable-optional-neon-suppor.patch @@ -0,0 +1,82 @@ +From e3b47c1b84964c62b3e1fa782f1ffa4be0ae62f9 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 9 Mar 2020 13:01:14 +0100 +Subject: [PATCH] vc4: add meson option to disable optional neon support + +Not all toolchains are able to compile the runtime +optional vc4 neon support, so add an meson option +to force disabling it at compile time. + +[Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114] +Signed-off-by: Peter Seiderer +--- + meson_options.txt | 7 +++++++ + src/gallium/drivers/vc4/meson.build | 4 ++-- + src/gallium/drivers/vc4/vc4_tiling.h | 4 ++-- + 3 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/meson_options.txt b/meson_options.txt +index a39596a6f19..0f6b6c62b55 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -117,6 +117,13 @@ option( + choices : ['auto', 'true', 'false'], + description : 'enable gallium va state tracker.', + ) ++option( ++ 'gallium-vc4-neon', ++ type : 'combo', ++ value : 'auto', ++ choices : ['auto', 'disabled'], ++ description : 'enable gallium vc4 optional neon support.', ++) + option( + 'va-libs-path', + type : 'string', +diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build +index 5ce5af5f6b4..e3f7d8d62ae 100644 +--- a/src/gallium/drivers/vc4/meson.build ++++ b/src/gallium/drivers/vc4/meson.build +@@ -84,7 +84,7 @@ files_libvc4 = files( + vc4_c_args = [] + + libvc4_neon = [] +-if host_machine.cpu_family() == 'arm' ++if host_machine.cpu_family() == 'arm' and get_option('gallium-vc4-neon') != 'disabled' + libvc4_neon = static_library( + 'vc4_neon', + 'vc4_tiling_lt_neon.c', +@@ -93,7 +93,7 @@ if host_machine.cpu_family() == 'arm' + ], + c_args : '-mfpu=neon', + ) +- vc4_c_args += '-DUSE_ARM_ASM' ++ vc4_c_args += '-DVC4_TILING_LT_NEON' + endif + + if dep_simpenrose.found() +diff --git a/src/gallium/drivers/vc4/vc4_tiling.h b/src/gallium/drivers/vc4/vc4_tiling.h +index 66767e7f1f8..7446f1c3d0c 100644 +--- a/src/gallium/drivers/vc4/vc4_tiling.h ++++ b/src/gallium/drivers/vc4/vc4_tiling.h +@@ -89,7 +89,7 @@ vc4_load_lt_image(void *dst, uint32_t dst_stride, + void *src, uint32_t src_stride, + int cpp, const struct pipe_box *box) + { +-#ifdef USE_ARM_ASM ++#ifdef VC4_TILING_LT_NEON + if (util_cpu_caps.has_neon) { + vc4_load_lt_image_neon(dst, dst_stride, src, src_stride, + cpp, box); +@@ -105,7 +105,7 @@ vc4_store_lt_image(void *dst, uint32_t dst_stride, + void *src, uint32_t src_stride, + int cpp, const struct pipe_box *box) + { +-#ifdef USE_ARM_ASM ++#ifdef VC4_TILING_LT_NEON + if (util_cpu_caps.has_neon) { + vc4_store_lt_image_neon(dst, dst_stride, src, src_stride, + cpp, box); +-- +2.25.1 + diff --git a/buildroot/package/mesa3d/Config.in b/buildroot/package/mesa3d/Config.in index 9fb46a72f..16d77f42c 100644 --- a/buildroot/package/mesa3d/Config.in +++ b/buildroot/package/mesa3d/Config.in @@ -6,16 +6,7 @@ menuconfig BR2_PACKAGE_MESA3D depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7 select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND - select BR2_PACKAGE_XORGPROTO if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXXF86VM if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7 select BR2_PACKAGE_ZLIB help Mesa 3D, an open-source implementation of the OpenGL @@ -32,7 +23,6 @@ config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS config BR2_PACKAGE_MESA3D_LLVM bool "llvm support" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_HOST_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP @@ -41,10 +31,10 @@ config BR2_PACKAGE_MESA3D_LLVM depends on BR2_USE_WCHAR # std::wstring select BR2_PACKAGE_LLVM -comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, host gcc >= 4.8, dynamic library" +comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR comment "llvm support needs a toolchain not affected by GCC bug 64735" @@ -58,6 +48,7 @@ config BR2_PACKAGE_MESA3D_OPENCL depends on BR2_PACKAGE_MESA3D_LLVM depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + select BR2_PACKAGE_LLVM_RTTI select BR2_PACKAGE_CLANG select BR2_PACKAGE_LIBCLC select BR2_PACKAGE_HAS_LIBOPENCL @@ -70,6 +61,10 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER config BR2_PACKAGE_MESA3D_DRI_DRIVER bool select BR2_PACKAGE_MESA3D_DRIVER + select BR2_PACKAGE_MESA3D_GBM if \ + !BR2_PACKAGE_MESA3D_OPENGL_GLX && \ + !BR2_PACKAGE_MESA3D_OPENGL_EGL && \ + !BR2_PACKAGE_MESA3D_OSMESA_CLASSIC select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \ (BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4) @@ -80,28 +75,114 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER config BR2_PACKAGE_MESA3D_DRIVER bool +# Gallium xa state tracker. +# Quote from mesa3d meson.build: "XA state tracker requires at least +# one of the following gallium drivers: nouveau, freedreno, i915, svga. config BR2_PACKAGE_MESA3D_NEEDS_XA bool +# Quote from mesa3d meson.build: "kmsro driver requires one or more +# renderonly drivers (vc4, etnaviv, freedreno)". +config BR2_PACKAGE_MESA3D_GALLIUM_KMSRO + bool + +# OpenGL GLX and Gallium VDPAU both needs X11 +config BR2_PACKAGE_MESA3D_NEEDS_X11 + bool + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXDAMAGE + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXFIXES + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXXF86VM + select BR2_PACKAGE_XORGPROTO + comment "Gallium drivers" config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV bool "Gallium Etnaviv driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_ETNAVIV + select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO select BR2_PACKAGE_MESA3D_OPENGL_EGL help Mesa driver for Vivante GPUs. +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO + bool "Gallium freedreno driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO + help + Mesa driver for Freedreno GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 + bool "Gallium i915 driver" + depends on BR2_i386 || BR2_x86_64 + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_INTEL + help + Support for i915-based Intel GPUs. + +comment "Gallium i915: Only one i915 provider can be built" + depends on BR2_i386 || BR2_x86_64 + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS + bool "Gallium iris driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + Mesa driver for iris-based Intel GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO + bool "Gallium KMSRO driver" + depends on BR2_PACKAGE_MESA3D_GALLIUM_KMSRO + help + Support various sorts of KMS displays with the + renderonly layer used to attach a GPU. + +comment "Gallium KMSRO needs one or more renderonly drivers" + depends on !BR2_PACKAGE_MESA3D_GALLIUM_KMSRO + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA + bool "Gallium lima driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO + help + Mesa driver for ARM Mali Utgard GPUs. + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU bool "Gallium nouveau driver" - depends on BR2_i386 || BR2_x86_64 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_NOUVEAU select BR2_PACKAGE_MESA3D_NEEDS_XA + select BR2_PACKAGE_LLVM_RTTI if BR2_PACKAGE_MESA3D_LLVM help Supports all Nvidia GPUs. +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST + bool "Gallium panfrost driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO + help + Mesa driver for ARM Mali Midgard and Bifrost GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300 + bool "Gallium Radeon R300 driver" + depends on BR2_i386 || BR2_x86_64 + # lbdrm's radeon option depends on LIBDRM_HAS_ATOMIC. Propagating + # that dependency here causes a circular dependency that Kconfig + # can't see is just spurious. However, that dependency is about + # the toolchain having sync4 primitives, which is always a given + # for x86. + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_RADEON + help + Driver for ATI/AMD Radeon R300/R400/R500 GPUs. + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 bool "Gallium Radeon R600 driver" depends on BR2_i386 || BR2_x86_64 @@ -113,7 +194,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 select BR2_PACKAGE_LLVM_AMDGPU if BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_ELFUTILS if BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS if BR2_PACKAGE_MESA3D_LLVM - select BR2_PACKAGE_MESA3D_NEEDS_XA help Driver for ATI/AMD Radeon R600/R700/HD5000/HD6000 GPUs. @@ -135,7 +215,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI select BR2_PACKAGE_LLVM_AMDGPU select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS - select BR2_PACKAGE_MESA3D_NEEDS_XA help Driver for ATI/AMD Radeon HD7000/HD8000/Rx200 GPUs. @@ -157,17 +236,45 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST bool "Gallium swrast driver" + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help This is a software opengl implementation using the Gallium3D infrastructure. +comment "Gallium swrast: Only one swrast provider can be built" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA + bool "Gallium tegra driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU + select BR2_PACKAGE_LIBDRM_NOUVEAU + select BR2_PACKAGE_MESA3D_NEEDS_XA + help + Adds support for Nvidia Tegra GPUs, requires nouveau. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D + bool "Gallium v3d driver" + depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO + select BR2_PACKAGE_LIBDRM_VC4 + select BR2_PACKAGE_MESA3D_OPENGL_EGL + help + Driver for Broadcom VC6 (rpi4) GPUs (needs kmsro and vc4). + + It requires a kernel 4.18+ with DRM V3D support enabled: + + - CONFIG_DRM_V3D + - CONFIG_DRM_VC4 + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" depends on BR2_arm || BR2_aarch64 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO select BR2_PACKAGE_LIBDRM_VC4 - select BR2_PACKAGE_MESA3D_NEEDS_XA select BR2_PACKAGE_MESA3D_OPENGL_EGL help Driver for Broadcom VC4 (rpi2/3) GPUs. @@ -181,6 +288,43 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL virgl is the 3D acceleration backend for the virtio-gpu shipping with qemu. +config BR2_PACKAGE_MESA3D_VDPAU + bool "Gallium VDPAU state tracker" + depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300 \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + select BR2_PACKAGE_MESA3D_NEEDS_X11 + select BR2_PACKAGE_LIBVDPAU + help + VDPAU state tracker (needs r300, r600, radeonsi or nouveau + gallium drivers). + +comment "Gallium VDPAU state tracker needs X.org and gallium drivers r300, r600, radeonsi or nouveau" + depends on !BR2_PACKAGE_XORG7 || \ + !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300 \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) + +config BR2_PACKAGE_MESA3D_XVMC + bool "Gallium XvMC state tracker" + depends on BR2_i386 || BR2_x86_64 + depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 + select BR2_PACKAGE_XLIB_LIBXV + select BR2_PACKAGE_XLIB_LIBXVMC + help + XvMC state tracker (needs r600 or nouveau gallium drivers). + +comment "Gallium XvMC state tracker needs X.org and gallium drivers r600 or nouveau" + depends on BR2_i386 || BR2_x86_64 + depends on !BR2_PACKAGE_XORG7 || \ + !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) + comment "DRI drivers" config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST @@ -248,20 +392,43 @@ comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= comment "Off-screen Rendering" -config BR2_PACKAGE_MESA3D_OSMESA - bool "OSMesa library" +config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC + bool "OSMesa (classic) library" help - The OSMesa API provides functions for making off-screen - renderings. + The OSMesa classic API provides functions for + making off-screen renderings. if BR2_PACKAGE_MESA3D_DRIVER -comment "Additional API Support" +comment "OpenGL API Support" + +config BR2_PACKAGE_MESA3D_GBM + bool "gbm" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER \ + || (BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) + help + Enable Generic Buffer Management (gbm) + +comment "gbm support needs a dri driver or a gallium driver w/ EGL support." + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER \ + && !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) + +config BR2_PACKAGE_MESA3D_OPENGL_GLX + bool "OpenGL GLX" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_MESA3D_NEEDS_X11 + help + Enable GLX graphic acceleration (OpenGL + X11). + +comment "OpenGL GLX support needs X11" + depends on !BR2_PACKAGE_XORG7 config BR2_PACKAGE_MESA3D_OPENGL_EGL bool "OpenGL EGL" select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBEGL_WAYLAND + select BR2_PACKAGE_MESA3D_GBM help Use the Khronos EGL APIs. EGL is a window manager for OpenGL applications similar to GLX, for X, and WGL, for Windows. @@ -276,7 +443,7 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES endif # BR2_PACKAGE_MESA3D_DRIVER config BR2_PACKAGE_PROVIDES_LIBGL - default "mesa3d" if BR2_PACKAGE_XORG7 + default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX config BR2_PACKAGE_PROVIDES_LIBEGL default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL diff --git a/buildroot/package/mesa3d/mesa3d.hash b/buildroot/package/mesa3d/mesa3d.hash index b0774ff40..3237135b1 100644 --- a/buildroot/package/mesa3d/mesa3d.hash +++ b/buildroot/package/mesa3d/mesa3d.hash @@ -1,7 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2019-February/000492.html -md5 e9d1a24dbd5ca20efa75b9a29eb4566f mesa-18.3.3.tar.xz -sha1 abb067204ae31493dba7710c378b2b90245108ca mesa-18.3.3.tar.xz -sha256 2ab6886a6966c532ccbcc3b240925e681464b658244f0cbed752615af3936299 mesa-18.3.3.tar.xz -sha512 cd6214b8bbeb3e3d187139ae1e949684f32f90152e1d7ba8d81222bd088770e28cff7ff165f2ccc41c068950561fe952420c6e54472f7204532a8d8700ff18bb mesa-18.3.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2020-February/000570.html +sha256 1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4 mesa-19.3.4.tar.xz +sha512 2bbb3dc8f1d839f11fe12cc959393cd69607fa6714b2166b80299e0559d2d3b0ac38ed4e15ac3e5f472264eb24536d1901d350f7409f3a7e00d6f4ccbb2312fb mesa-19.3.4.tar.xz + # License -sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html +sha256 d8d662974fc86e2e640362015e42de3fcc161d435a9f2111ecd8561412feca73 docs/license.html diff --git a/buildroot/package/mesa3d/mesa3d.mk b/buildroot/package/mesa3d/mesa3d.mk index c3469f778..e742c4982 100644 --- a/buildroot/package/mesa3d/mesa3d.mk +++ b/buildroot/package/mesa3d/mesa3d.mk @@ -5,14 +5,11 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 18.3.3 +MESA3D_VERSION = 19.3.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos MESA3D_LICENSE_FILES = docs/license.html -# 0002-configure.ac-invert-order-for-wayland-scanner-check.patch -# 0003-set-LIBCLC_INCLUDEDIR.patch -MESA3D_AUTORECONF = YES MESA3D_INSTALL_STAGING = YES @@ -21,28 +18,23 @@ MESA3D_PROVIDES = MESA3D_DEPENDENCIES = \ host-bison \ host-flex \ + host-python3-mako \ expat \ libdrm \ zlib -# Disable assembly usage. -MESA3D_CONF_OPTS = --disable-asm - -# Disable static, otherwise configure will fail with: "Cannot enable both static -# and shared." -ifeq ($(BR2_SHARED_STATIC_LIBS),y) -MESA3D_CONF_OPTS += --disable-static -endif +MESA3D_CONF_OPTS = \ + -Dgallium-omx=disabled \ + -Dpower8=false \ + -Dvalgrind=false ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) MESA3D_DEPENDENCIES += host-llvm llvm -MESA3D_CONF_OPTS += \ - --with-llvm-prefix=$(STAGING_DIR)/usr \ - --enable-llvm-shared-libs \ - --enable-llvm +MESA3D_MESON_EXTRA_BINARIES += llvm-config='$(STAGING_DIR)/usr/bin/llvm-config' +MESA3D_CONF_OPTS += -Dllvm=true else # Avoid automatic search of llvm-config -MESA3D_CONF_OPTS += --disable-llvm +MESA3D_CONF_OPTS += -Dllvm=false endif # Disable opencl-icd: OpenCL lib will be named libOpenCL instead of @@ -50,57 +42,57 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) MESA3D_PROVIDES += libopencl MESA3D_DEPENDENCIES += clang libclc -MESA3D_CONF_OPTS += --enable-opencl \ - --disable-opencl-icd \ - --with-clang-libdir=$(STAGING_DIR)/usr/lib +MESA3D_CONF_OPTS += -Dgallium-opencl=standalone else -MESA3D_CONF_OPTS += --disable-opencl +MESA3D_CONF_OPTS += -Dgallium-opencl=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y) MESA3D_DEPENDENCIES += elfutils endif -# The Sourcery MIPS toolchain has a special (non-upstream) feature to -# have "compact exception handling", which unfortunately breaks with -# mesa3d, so we disable it here by passing -mno-compact-eh. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS),y) -MESA3D_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh" -MESA3D_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mno-compact-eh" -endif - -ifeq ($(BR2_PACKAGE_XORG7),y) -MESA3D_DEPENDENCIES += \ - xlib_libX11 \ - xlib_libXext \ - xlib_libXdamage \ - xlib_libXfixes \ - xlib_libXrandr \ - xlib_libXxf86vm \ - xorgproto \ - libxcb -MESA3D_CONF_OPTS += --enable-glx --disable-mangling -# quote from mesa3d configure "Building xa requires at least one non swrast gallium driver." +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) +# Disable-mangling not yet supported by meson build system. +# glx: +# dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi +# xlib : xlib conflicts with any dri driver +# gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. +MESA3D_CONF_OPTS += -Dglx=dri ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) -MESA3D_CONF_OPTS += --enable-xa +MESA3D_CONF_OPTS += -Dgallium-xa=true else -MESA3D_CONF_OPTS += --disable-xa +MESA3D_CONF_OPTS += -Dgallium-xa=false endif else MESA3D_CONF_OPTS += \ - --disable-glx \ - --disable-xa + -Dglx=disabled \ + -Dgallium-xa=false +endif + +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +MESA3D_CONF_OPTS += -Dgallium-vc4-neon=auto +else +MESA3D_CONF_OPTS += -Dgallium-vc4-neon=disabled endif # Drivers #Gallium Drivers -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV) += etnaviv imx +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV) += etnaviv +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO) += freedreno +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915) += i915 +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS) += iris +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO) += kmsro +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA) += lima MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST) += panfrost +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300) += r300 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) += r600 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) += radeonsi MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA) += tegra +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D) += v3d MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl # DRI Drivers @@ -108,66 +100,65 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100 # Vulkan Drivers MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) MESA3D_CONF_OPTS += \ - --without-gallium-drivers \ - --disable-gallium-extra-hud + -Dgallium-drivers= \ + -Dgallium-extra-hud=false else MESA3D_CONF_OPTS += \ - --enable-shared-glapi \ - --with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ - --enable-gallium-extra-hud + -Dshared-glapi=true \ + -Dgallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ + -Dgallium-extra-hud=true endif ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) MESA3D_CONF_OPTS += \ - --without-dri-drivers --disable-dri3 + -Ddri-drivers= -Ddri3=false else ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) MESA3D_DEPENDENCIES += xlib_libxshmfence -MESA3D_CONF_OPTS += --enable-dri3 +MESA3D_CONF_OPTS += -Ddri3=true else -MESA3D_CONF_OPTS += --disable-dri3 +MESA3D_CONF_OPTS += -Ddri3=false endif MESA3D_CONF_OPTS += \ - --enable-shared-glapi \ - --enable-driglx-direct \ - --with-dri-driverdir=/usr/lib/dri \ - --with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) + -Dshared-glapi=true \ + -Dglx-direct=true \ + -Ddri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) endif ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ - --without-vulkan-drivers + -Dvulkan-drivers= else MESA3D_DEPENDENCIES += xlib_libxshmfence MESA3D_CONF_OPTS += \ - --enable-dri3 \ - --with-vulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) + -Ddri3=true \ + -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif # APIs -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) -MESA3D_CONF_OPTS += --enable-osmesa +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) +MESA3D_CONF_OPTS += -Dosmesa=classic else -MESA3D_CONF_OPTS += --disable-osmesa +MESA3D_CONF_OPTS += -Dosmesa=none endif # Always enable OpenGL: -# - it is needed for GLES (mesa3d's ./configure is a bit weird) -MESA3D_CONF_OPTS += --enable-opengl --enable-dri +# - Building OpenGL ES without OpenGL is not supported, so always keep opengl enabled. +MESA3D_CONF_OPTS += -Dopengl=true # libva and mesa3d have a circular dependency # we do not need libva support in mesa3d, therefore disable this option -MESA3D_CONF_OPTS += --disable-va +MESA3D_CONF_OPTS += -Dgallium-va=false # libGL is only provided for a full xorg stack -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) MESA3D_PROVIDES += libgl else define MESA3D_REMOVE_OPENGL_HEADERS @@ -177,71 +168,99 @@ endef MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_HEADERS endif +MESA3D_PLATFORMS = surfaceless ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) -MESA3D_PLATFORMS = drm +MESA3D_PLATFORMS += drm +else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D),y) +MESA3D_PLATFORMS += drm else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4),y) -MESA3D_PLATFORMS = drm +MESA3D_PLATFORMS += drm else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV),y) -MESA3D_PLATFORMS = drm +MESA3D_PLATFORMS += drm +else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO),y) +MESA3D_PLATFORMS += drm +else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS),y) +MESA3D_PLATFORMS += drm +else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA),y) +MESA3D_PLATFORMS += drm +else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST),y) +MESA3D_PLATFORMS += drm else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL),y) -MESA3D_PLATFORMS = drm +MESA3D_PLATFORMS += drm else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI),y) -MESA3D_PLATFORMS = drm +MESA3D_PLATFORMS += drm endif ifeq ($(BR2_PACKAGE_WAYLAND),y) MESA3D_DEPENDENCIES += wayland wayland-protocols MESA3D_PLATFORMS += wayland +MESA3D_CONF_OPTS += -Dwayland-scanner-path=$(HOST_DIR)/bin/wayland-scanner endif -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_X11),y) +MESA3D_DEPENDENCIES += \ + xlib_libX11 \ + xlib_libXext \ + xlib_libXdamage \ + xlib_libXfixes \ + xlib_libXrandr \ + xlib_libXxf86vm \ + xorgproto \ + libxcb MESA3D_PLATFORMS += x11 endif MESA3D_CONF_OPTS += \ - --with-platforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) + -Dplatforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) + +ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) +MESA3D_CONF_OPTS += \ + -Dgbm=true +else +MESA3D_CONF_OPTS += \ + -Dgbm=false +endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) MESA3D_PROVIDES += libegl MESA3D_CONF_OPTS += \ - --enable-gbm \ - --enable-egl + -Degl=true else MESA3D_CONF_OPTS += \ - --disable-egl + -Degl=false endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) MESA3D_PROVIDES += libgles -MESA3D_CONF_OPTS += --enable-gles1 --enable-gles2 +MESA3D_CONF_OPTS += -Dgles1=true -Dgles2=true else -MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2 +MESA3D_CONF_OPTS += -Dgles1=false -Dgles2=false endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXVMC),y) -MESA3D_DEPENDENCIES += xlib_libXvMC -MESA3D_CONF_OPTS += --enable-xvmc +ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) +MESA3D_DEPENDENCIES += xlib_libXv xlib_libXvMC +MESA3D_CONF_OPTS += -Dgallium-xvmc=true else -MESA3D_CONF_OPTS += --disable-xvmc +MESA3D_CONF_OPTS += -Dgallium-xvmc=false endif ifeq ($(BR2_PACKAGE_LIBUNWIND),y) -MESA3D_CONF_OPTS += --enable-libunwind +MESA3D_CONF_OPTS += -Dlibunwind=true MESA3D_DEPENDENCIES += libunwind else -MESA3D_CONF_OPTS += --disable-libunwind +MESA3D_CONF_OPTS += -Dlibunwind=false endif -ifeq ($(BR2_PACKAGE_LIBVDPAU),y) +ifeq ($(BR2_PACKAGE_MESA3D_VDPAU),y) MESA3D_DEPENDENCIES += libvdpau -MESA3D_CONF_OPTS += --enable-vdpau +MESA3D_CONF_OPTS += -Dgallium-vdpau=true else -MESA3D_CONF_OPTS += --disable-vdpau +MESA3D_CONF_OPTS += -Dgallium-vdpau=false endif ifeq ($(BR2_PACKAGE_LM_SENSORS),y) -MESA3D_CONF_OPTS += --enable-lmsensors +MESA3D_CONF_OPTS += -Dlmsensors=true MESA3D_DEPENDENCIES += lm-sensors else -MESA3D_CONF_OPTS += --disable-lmsensors +MESA3D_CONF_OPTS += -Dlmsensors=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch b/buildroot/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch new file mode 100644 index 000000000..798cd6529 --- /dev/null +++ b/buildroot/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch @@ -0,0 +1,45 @@ +From b390f29b9e0170d5bf410f4bef5a697655857633 Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Sat, 26 Oct 2019 09:17:29 -0500 +Subject: [PATCH] Prefer ext static libs when --default-library=static + +This patch adds a case in the library pattern logic to prefer static +libraries when the Meson Core option for "default_library" is set to +solely static. + +The existing library search order makes sense for cases of shared and +shared / static mixed. However if using a prebuilt cross-toolchain, +they usually provide both a static and shared version of sysroot +libraries. This presents a problem in a complete static build where +there won't be shared libraries at runtime and during build time there +are failures like "ld: attempted static link of dynamic object". + +Bug: +https://github.com/mesonbuild/meson/issues/6108 + +Fixes: +http://autobuild.buildroot.net/results/db1740b4777f436324218c52bc7b08e5c21b667d/ +http://autobuild.buildroot.net/results/c17/c17bbb12d9deadd64a441b36e324cfbbe8aba5be/ + +Signed-off-by: Matthew Weber +--- + mesonbuild/compilers/mixins/clike.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py +index 5d50b7d..8f5f1c6 100644 +--- a/mesonbuild/compilers/mixins/clike.py ++++ b/mesonbuild/compilers/mixins/clike.py +@@ -858,6 +858,9 @@ class CLikeCompiler: + elif env.machines[self.for_machine].is_cygwin(): + shlibext = ['dll', 'dll.a'] + prefixes = ['cyg'] + prefixes ++ elif env.coredata.get_builtin_option('default_library') == 'static': ++ # Linux/BSDs ++ shlibext = ['a'] + else: + # Linux/BSDs + shlibext = ['so'] +-- +2.17.1 + diff --git a/buildroot/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch b/buildroot/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch new file mode 100644 index 000000000..ae40ab8b1 --- /dev/null +++ b/buildroot/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch @@ -0,0 +1,102 @@ +From 3af920cb4a9c272b9b75a4f3eea9da9000520949 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= +Date: Tue, 14 Jan 2020 11:11:52 +0100 +Subject: [PATCH] envconfig: add pkg_config_libdir property + +In order to unify the use of sysroot in the cross-file, +the pkg_config_libdir can now be passed directly in the file. + +Upstream: 958df63dac810246e84c2b8eaa32d22d19ace0ef +[Arnout: remove documentation changes: we don't extract docs/] +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + mesonbuild/dependencies/base.py | 6 ++++++ + mesonbuild/envconfig.py | 6 ++++++ + run_unittests.py | 30 +++++++++++++++++++++++++++++- + 3 files changed, 41 insertions(+), 1 deletion(-) + +diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py +index 40e304c7..282c314b 100644 +--- a/mesonbuild/dependencies/base.py ++++ b/mesonbuild/dependencies/base.py +@@ -697,6 +697,12 @@ class PkgConfigDependency(ExternalDependency): + mlog.debug('PKG_CONFIG_PATH: ' + new_pkg_config_path) + env['PKG_CONFIG_PATH'] = new_pkg_config_path + ++ pkg_config_libdir_prop = self.env.properties[self.for_machine].get_pkg_config_libdir() ++ if pkg_config_libdir_prop: ++ new_pkg_config_libdir = ':'.join([p for p in pkg_config_libdir_prop]) ++ env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir ++ mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir) ++ + fenv = frozenset(env.items()) + targs = tuple(args) + cache = PkgConfigDependency.pkgbin_cache +diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py +index c8a37f4c..3e5e44b8 100644 +--- a/mesonbuild/envconfig.py ++++ b/mesonbuild/envconfig.py +@@ -143,6 +143,12 @@ class Properties(HasEnvVarFallback): + def get_sys_root(self) -> T.Optional[T.Union[str, T.List[str]]]: + return self.properties.get('sys_root', None) + ++ def get_pkg_config_libdir(self) -> T.Optional[T.List[str]]: ++ p = self.properties.get('pkg_config_libdir', None) ++ if p is None: ++ return p ++ return mesonlib.listify(p) ++ + def __eq__(self, other: T.Any) -> 'T.Union[bool, NotImplemented]': + if isinstance(other, type(self)): + return self.properties == other.properties +diff --git a/run_unittests.py b/run_unittests.py +index 676604f4..382c0964 100755 +--- a/run_unittests.py ++++ b/run_unittests.py +@@ -3621,6 +3621,34 @@ recommended as it is not supported on some platforms''') + self.wipe() + self.init(testdir, extra_args=['-Dstart_native=true'], override_envvars=env) + ++ @skipIfNoPkgconfig ++ @unittest.skipIf(is_windows(), 'Help needed with fixing this test on windows') ++ def test_pkg_config_libdir(self): ++ testdir = os.path.join(self.unit_test_dir, ++ '46 native dep pkgconfig var') ++ with tempfile.NamedTemporaryFile(mode='w', delete=False) as crossfile: ++ crossfile.write(textwrap.dedent( ++ '''[binaries] ++ pkgconfig = 'pkg-config' ++ ++ [properties] ++ pkg_config_libdir = [r'{0}'] ++ ++ [host_machine] ++ system = 'linux' ++ cpu_family = 'arm' ++ cpu = 'armv7' ++ endian = 'little' ++ '''.format(os.path.join(testdir, 'cross_pkgconfig')))) ++ crossfile.flush() ++ self.meson_cross_file = crossfile.name ++ ++ env = {'PKG_CONFIG_LIBDIR': os.path.join(testdir, ++ 'native_pkgconfig')} ++ self.init(testdir, extra_args=['-Dstart_native=false'], override_envvars=env) ++ self.wipe() ++ self.init(testdir, extra_args=['-Dstart_native=true'], override_envvars=env) ++ + def __reconfigure(self, change_minor=False): + # Set an older version to force a reconfigure from scratch + filename = os.path.join(self.privatedir, 'coredata.dat') +@@ -6847,7 +6875,7 @@ class NativeFileTests(BasePlatformTests): + + class CrossFileTests(BasePlatformTests): + +- """Tests for cross file functioality not directly related to ++ """Tests for cross file functionality not directly related to + cross compiling. + + This is mainly aimed to testing overrides from cross files. +-- +2.24.1 + diff --git a/buildroot/package/meson/cross-compilation.conf.in b/buildroot/package/meson/cross-compilation.conf.in index fc8e27f7e..369e225b3 100644 --- a/buildroot/package/meson/cross-compilation.conf.in +++ b/buildroot/package/meson/cross-compilation.conf.in @@ -8,7 +8,7 @@ c = '@TARGET_CROSS@gcc' cpp = '@TARGET_CROSS@g++' ar = '@TARGET_CROSS@ar' strip = '@TARGET_CROSS@strip' -pkgconfig = '@HOST_DIR@/usr/bin/pkg-config' +pkgconfig = '@HOST_DIR@/bin/pkgconf' [properties] needs_exe_wrapper = true @@ -16,6 +16,8 @@ c_args = [@TARGET_CFLAGS@] c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] +sys_root = '@STAGING_DIR@' +pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' [host_machine] system = 'linux' diff --git a/buildroot/package/meson/meson.hash b/buildroot/package/meson/meson.hash index 3a5c7dd43..881d4211c 100644 --- a/buildroot/package/meson/meson.hash +++ b/buildroot/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.49.0/meson-0.49.0.tar.gz.asc -sha256 fb0395c4ac208eab381cd1a20571584bdbba176eb562a7efa9cb17cace0e1551 meson-0.49.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.53.1/meson-0.53.1.tar.gz.asc +sha256 ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04 meson-0.53.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/buildroot/package/meson/meson.mk b/buildroot/package/meson/meson.mk index 71bdadf82..d782ee086 100644 --- a/buildroot/package/meson/meson.mk +++ b/buildroot/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.49.0 +MESON_VERSION = 0.53.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING @@ -13,7 +13,7 @@ MESON_SETUP_TYPE = setuptools HOST_MESON_DEPENDENCIES = host-ninja HOST_MESON_NEEDS_HOST_PYTHON = python3 -HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN)) +HOST_MESON_TARGET_ENDIAN = $(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) HOST_MESON_TARGET_CPU = $(GCC_TARGET_CPU) # https://mesonbuild.com/Reference-tables.html#cpu-families @@ -45,26 +45,10 @@ else HOST_MESON_TARGET_CPU_FAMILY = $(ARCH) endif -HOST_MESON_SED_CFLAGS = $(if $(strip $(TARGET_CFLAGS)),`printf '"%s"$(comma) ' $(TARGET_CFLAGS)`) -HOST_MESON_SED_LDFLAGS = $(if $(strip $(TARGET_LDFLAGS)),`printf '"%s"$(comma) ' $(TARGET_LDFLAGS)`) -HOST_MESON_SED_CXXFLAGS = $(if $(strip $(TARGET_CXXFLAGS)),`printf '"%s"$(comma) ' $(TARGET_CXXFLAGS)`) - -# Generate a Meson cross-compilation.conf suitable for use with the -# SDK -define HOST_MESON_INSTALL_CROSS_CONF - mkdir -p $(HOST_DIR)/etc/meson - sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \ - -e "s%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g" \ - -e "s%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g" \ - -e "s%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g" \ - -e "s%@TARGET_CFLAGS@%$(HOST_MESON_SED_CFLAGS)%g" \ - -e "s%@TARGET_LDFLAGS@%$(HOST_MESON_SED_LDFLAGS)%g" \ - -e "s%@TARGET_CXXFLAGS@%$(HOST_MESON_SED_CXXFLAGS)%g" \ - -e "s%@HOST_DIR@%$(HOST_DIR)%g" \ - $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ - > $(HOST_DIR)/etc/meson/cross-compilation.conf +# Avoid interpreter shebang longer than 128 chars +define HOST_MESON_SET_INTERPRETER + $(SED) '1s:.*:#!/usr/bin/env python3:' $(HOST_DIR)/bin/meson endef - -TARGET_FINALIZE_HOOKS += HOST_MESON_INSTALL_CROSS_CONF +HOST_MESON_POST_INSTALL_HOOKS += HOST_MESON_SET_INTERPRETER $(eval $(host-python-package)) diff --git a/buildroot/package/metacity/metacity.hash b/buildroot/package/metacity/metacity.hash index 49450160f..583db0f20 100644 --- a/buildroot/package/metacity/metacity.hash +++ b/buildroot/package/metacity/metacity.hash @@ -1,2 +1,5 @@ # From http://ftp.gnome.org/pub/gnome/sources/metacity/2.25/metacity-2.25.1.sha256sum -sha256 fb2ede4ac02d7da08d3c3323fb76afaf945c8cccc07cb2d3a4b7f44fb49f1c47 metacity-2.25.1.tar.bz2 +sha256 fb2ede4ac02d7da08d3c3323fb76afaf945c8cccc07cb2d3a4b7f44fb49f1c47 metacity-2.25.1.tar.bz2 + +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch b/buildroot/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch new file mode 100644 index 000000000..7d0d3974a --- /dev/null +++ b/buildroot/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch @@ -0,0 +1,27 @@ +From 1af7bc09451e0b779f7bfb0dcc58ffb3abe9c584 Mon Sep 17 00:00:00 2001 +From: Gary Bisson +Date: Tue, 11 Feb 2020 15:30:12 +0100 +Subject: [PATCH] lnx_def.h: fix conflicting declaration of __time64_t + +Signed-off-by: Gary Bisson +--- + MfgToolLib/lnx_def.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/MfgToolLib/lnx_def.h b/MfgToolLib/lnx_def.h +index c6869dd..a38bb99 100644 +--- a/MfgToolLib/lnx_def.h ++++ b/MfgToolLib/lnx_def.h +@@ -124,7 +124,9 @@ typedef unsigned long * ULONG_PTR; + typedef char * LPOLESTR; + typedef void * HDEVINFO; + typedef unsigned long long ULONGLONG; ++#ifndef __time64_t + typedef long long __time64_t; ++#endif + typedef long long __int64; + typedef unsigned long DWORD_PTR; + typedef unsigned int UINT; +-- +2.25.0 + diff --git a/buildroot/package/mfgtools/Config.in.host b/buildroot/package/mfgtools/Config.in.host index 4bbdde38e..6f2f3a326 100644 --- a/buildroot/package/mfgtools/Config.in.host +++ b/buildroot/package/mfgtools/Config.in.host @@ -1,10 +1,6 @@ -comment "mfgtools needs host gcc >= 4.8" - depends on !BR2_HOST_GCC_AT_LEAST_4_8 - config BR2_PACKAGE_HOST_MFGTOOLS bool "host mfgtools" depends on BR2_arm - depends on BR2_HOST_GCC_AT_LEAST_4_8 # needs C++11 help This package contains the Freescale manufacturing tool. It is designed to program firmware to i.MX boards during diff --git a/buildroot/package/mfgtools/mfgtools.hash b/buildroot/package/mfgtools/mfgtools.hash index 4932a80db..0b215f529 100644 --- a/buildroot/package/mfgtools/mfgtools.hash +++ b/buildroot/package/mfgtools/mfgtools.hash @@ -1,4 +1,4 @@ # locally computed -sha256 055d71227d18883d6e8bc9e854c076015f9a7749820a94272e19071bf0b25c89 mfgtools-v0.02.tar.gz +sha256 055d71227d18883d6e8bc9e854c076015f9a7749820a94272e19071bf0b25c89 mfgtools-0.02.tar.gz sha256 2655559a6bb1179eae514f5c7166f4ede4f2453efa9cf4dc3c045cab5d57dede LICENSE sha256 0963b6e5086bf454265b0f57821a02b681d1211e40ad74c310231cb4d94815c9 README.txt diff --git a/buildroot/package/mfgtools/mfgtools.mk b/buildroot/package/mfgtools/mfgtools.mk index e4663a8af..48ce5dda2 100644 --- a/buildroot/package/mfgtools/mfgtools.mk +++ b/buildroot/package/mfgtools/mfgtools.mk @@ -4,8 +4,8 @@ # ################################################################################ -MFGTOOLS_VERSION = v0.02 -MFGTOOLS_SITE = $(call github,codeauroraforum,mfgtools,$(MFGTOOLS_VERSION)) +MFGTOOLS_VERSION = 0.02 +MFGTOOLS_SITE = $(call github,codeauroraforum,mfgtools,v$(MFGTOOLS_VERSION)) MFGTOOLS_SUBDIR = MfgToolLib MFGTOOLS_LICENSE = BSD-3-Clause or CPOL MFGTOOLS_LICENSE_FILES = LICENSE README.txt diff --git a/buildroot/package/mfoc/Config.in b/buildroot/package/mfoc/Config.in new file mode 100644 index 000000000..1267cf04e --- /dev/null +++ b/buildroot/package/mfoc/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_MFOC + bool "mfoc" + select BR2_PACKAGE_LIBNFC + help + Mifare Classic Offline Cracker + + https://github.com/nfc-tools/mfoc diff --git a/buildroot/package/mfoc/mfoc.hash b/buildroot/package/mfoc/mfoc.hash new file mode 100644 index 000000000..2358bfd3e --- /dev/null +++ b/buildroot/package/mfoc/mfoc.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 2dfd8ffa4a8b357807680d190a91c8cf3db54b4211a781edc1108af401dbaad7 mfoc-0.10.7.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/mfoc/mfoc.mk b/buildroot/package/mfoc/mfoc.mk new file mode 100644 index 000000000..c4a785212 --- /dev/null +++ b/buildroot/package/mfoc/mfoc.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# mfoc +# +################################################################################ + +MFOC_VERSION = 0.10.7 +MFOC_SITE = $(call github,nfc-tools,mfoc,mfoc-$(MFOC_VERSION)) +MFOC_LICENSE = GPL-2.0 +MFOC_LICENSE_FILES = COPYING +MFOC_DEPENDENCIES = libnfc +# Fetching from github, we need to generate the configure script +MFOC_AUTORECONF = YES +MFOC_INSTALL_STAGING = YES + +$(eval $(autotools-package)) diff --git a/buildroot/package/micropython-lib/micropython-lib.hash b/buildroot/package/micropython-lib/micropython-lib.hash index f63c52cf0..cbdda2384 100644 --- a/buildroot/package/micropython-lib/micropython-lib.hash +++ b/buildroot/package/micropython-lib/micropython-lib.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 66e15380eb109613263beb6825b8eecb9191088270c1a59e8c7d922dd57183c7 micropython-lib-v1.9.3.tar.gz +sha256 66e15380eb109613263beb6825b8eecb9191088270c1a59e8c7d922dd57183c7 micropython-lib-1.9.3.tar.gz +sha256 baed4196a4310c576c2010f0a49f987a49e63856df7cd45af11cb3571df4bf74 LICENSE diff --git a/buildroot/package/micropython-lib/micropython-lib.mk b/buildroot/package/micropython-lib/micropython-lib.mk index 3c46b9242..78ac0d3b3 100644 --- a/buildroot/package/micropython-lib/micropython-lib.mk +++ b/buildroot/package/micropython-lib/micropython-lib.mk @@ -4,8 +4,8 @@ # ################################################################################ -MICROPYTHON_LIB_VERSION = v1.9.3 -MICROPYTHON_LIB_SITE = $(call github,micropython,micropython-lib,$(MICROPYTHON_LIB_VERSION)) +MICROPYTHON_LIB_VERSION = 1.9.3 +MICROPYTHON_LIB_SITE = $(call github,micropython,micropython-lib,v$(MICROPYTHON_LIB_VERSION)) MICROPYTHON_LIB_LICENSE = Python-2.0 (some modules), MIT (everything else) MICROPYTHON_LIB_LICENSE_FILES = LICENSE diff --git a/buildroot/package/micropython/0001-fix-version.patch b/buildroot/package/micropython/0001-fix-version.patch deleted file mode 100644 index 1bf299216..000000000 --- a/buildroot/package/micropython/0001-fix-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -Always use the fallback behaviour for determining the version number - -When built from within buildroot the micropython build process detects -that it is inside a git repository and ends up using the buildroot -version number instead of the correct micropython version number. - -Signed-off-by: Chris Packham ---- -diff -Naur micropython-v1.4.5-old/py/makeversionhdr.py micropython-v1.4.5/py/makeversionhdr.py ---- micropython-v1.4.5-old/py/makeversionhdr.py 2015-08-12 00:42:30.000000000 +1200 -+++ micropython-v1.4.5/py/makeversionhdr.py 2015-09-16 10:21:06.698962836 +1200 -@@ -70,9 +70,7 @@ - - def make_version_header(filename): - # Get version info using git, with fallback to docs/conf.py -- info = get_version_info_from_git() -- if info is None: -- info = get_version_info_from_docs_conf() -+ info = get_version_info_from_docs_conf() - - git_tag, git_hash, ver = info - diff --git a/buildroot/package/micropython/micropython.hash b/buildroot/package/micropython/micropython.hash index 88068a60f..49fd903fa 100644 --- a/buildroot/package/micropython/micropython.hash +++ b/buildroot/package/micropython/micropython.hash @@ -1,2 +1,3 @@ #locally computed -sha256 9a66205d0ba3dff6dcc98119f104cd59c15855c6c030a190ca02354be52836c1 micropython-v1.9.4.tar.gz +sha256 330cd32c7b67cb6b531d158eabcf68af3a7d7ad7b5a4b0ce3c73da3d241da6a2 micropython-1.12.tar.gz +sha256 afde3432122205e8e08d615fcb920aca58631c52b6c0c01813854287a457b298 LICENSE diff --git a/buildroot/package/micropython/micropython.mk b/buildroot/package/micropython/micropython.mk index cff8b17b1..832899209 100644 --- a/buildroot/package/micropython/micropython.mk +++ b/buildroot/package/micropython/micropython.mk @@ -4,11 +4,16 @@ # ################################################################################ -MICROPYTHON_VERSION = v1.9.4 -MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION)) +MICROPYTHON_VERSION = 1.12 +MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) MICROPYTHON_LICENSE = MIT MICROPYTHON_LICENSE_FILES = LICENSE -MICROPYTHON_DEPENDENCIES = host-pkgconf libffi +MICROPYTHON_DEPENDENCIES = host-pkgconf libffi $(BR2_PYTHON3_HOST_DEPENDENCY) + +# Set GIT_DIR so package won't use buildroot's version number +MICROPYTHON_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + GIT_DIR=. # Use fallback implementation for exception handling on architectures that don't # have explicit support. @@ -22,15 +27,15 @@ MICROPYTHON_MAKE_OPTS = MICROPY_PY_BTREE=0 MICROPYTHON_MAKE_OPTS += MICROPY_PY_USSL=0 define MICROPYTHON_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross + $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) \ CROSS_COMPILE=$(TARGET_CROSS) \ CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) endef define MICROPYTHON_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) \ CROSS_COMPILE=$(TARGET_CROSS) \ CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \ diff --git a/buildroot/package/midori/Config.in b/buildroot/package/midori/Config.in index f0767c85f..64139ce49 100644 --- a/buildroot/package/midori/Config.in +++ b/buildroot/package/midori/Config.in @@ -1,7 +1,7 @@ -comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8" +comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \ !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_MIDORI @@ -9,7 +9,6 @@ config BR2_PACKAGE_MIDORI depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2 depends on BR2_PACKAGE_LIBGTK3 depends on BR2_INSTALL_LIBSTDCPP # webkitgtk - depends on BR2_HOST_GCC_AT_LEAST_4_8 # webkitgtk -> icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # webkitgtk depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/buildroot/package/midori/midori.hash b/buildroot/package/midori/midori.hash index f548c427f..d8fd1b7a2 100644 --- a/buildroot/package/midori/midori.hash +++ b/buildroot/package/midori/midori.hash @@ -1,2 +1,5 @@ # From download link @ http://midori-browser.org/download/source/ sha1 64c86935028feb5f89d799c2acacaad67764da6f midori_0.5.11_all_.tar.bz2 + +# Locally computed +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/mii-diag/mii-diag.hash b/buildroot/package/mii-diag/mii-diag.hash index 22c69e3e5..2af3f9600 100644 --- a/buildroot/package/mii-diag/mii-diag.hash +++ b/buildroot/package/mii-diag/mii-diag.hash @@ -1,3 +1,4 @@ # From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/m/mii-diag/mii-diag_2.11-3.dsc -sha256 c690e87e6010607593c1cc2ccd5c481eb3be179387220ad445d8ab83d73ad41c mii-diag_2.11.orig.tar.gz -sha256 b49fd3e7c0c446a949c3ca246cc441824d7ef5a61530f884756a82b0b2997190 mii-diag_2.11-3.diff.gz +sha256 c690e87e6010607593c1cc2ccd5c481eb3be179387220ad445d8ab83d73ad41c mii-diag_2.11.orig.tar.gz +sha256 b49fd3e7c0c446a949c3ca246cc441824d7ef5a61530f884756a82b0b2997190 mii-diag_2.11-3.diff.gz +sha256 c83cf866874d6171fbea4e3786370483beb6d2898ac2ea91123b144effec7fcb mii-diag.c diff --git a/buildroot/package/mimic/mimic.hash b/buildroot/package/mimic/mimic.hash index 39d016548..10780d415 100644 --- a/buildroot/package/mimic/mimic.hash +++ b/buildroot/package/mimic/mimic.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 725003c9972d5b67c49d5ea6a89cb26b63414ff2c7adbbaf9200cf9eb55f80eb mimic-1.1.0.tar.gz +sha256 725003c9972d5b67c49d5ea6a89cb26b63414ff2c7adbbaf9200cf9eb55f80eb mimic-1.1.0.tar.gz +sha256 c423c1c6d260091d80ee4c00f386a10fea39963a3f1530f2c245f15dd20324ee COPYING diff --git a/buildroot/package/minetest-game/minetest-game.hash b/buildroot/package/minetest-game/minetest-game.hash index 52aa10d58..a618f32d1 100644 --- a/buildroot/package/minetest-game/minetest-game.hash +++ b/buildroot/package/minetest-game/minetest-game.hash @@ -1,25 +1,35 @@ # Locally calculated -sha256 f0ab07cb47c1540b2016bf76a36e2eec28b0ea7827bf66fc5447e0c5e5d4495d minetest-game-0.4.17.tar.gz +sha256 f165fac0081bf4797cf9094282cc25034b2347b3ea94e6bb8d9329c5ee63f41b minetest-game-5.1.0.tar.gz sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt -sha256 3382f3bf99566089543621ee3256f7f98bf9364d3b852c5ed08202d435215d7d mods/beds/license.txt +sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt +sha256 559749ba0d269b768e1b85bdac0f8b7a0cf100ecb3edd0df8529fe57cd4bfc0d mods/binoculars/license.txt sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt +sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/butterflies/license.txt sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt -sha256 c0eca35bf446b1b9c8a0d1eefa0613bf2996187cd1f9382e7424b3d0b0dd7851 mods/creative/license.txt -sha256 6972a14d2cea9362cda1293284c5a472b1912056e2da215ce43e9c54c80da334 mods/default/license.txt +sha256 b6c3aca8da2f6c272fe431740dda0a349cff419f1f72e55c6de677379fc04169 mods/creative/license.txt +sha256 66f93a58a7418b86f2ca54e8de931f5c38d9f3e07d407c2c095b632fcda72956 mods/default/license.txt sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt +sha256 33d0b8726dd27c8f0c96d6dfd611e0e980bbdbb8075fac7476d055518319ec1c mods/dungeon_loot/license.txt sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt +sha256 29a05b102726b9a3115f7ec06d5188dac7b1c005d8cf1c4d6dc2d5544405a45c mods/env_sounds/license.txt sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt -sha256 a8647ac7609fdaea96bd0ec58ac5837fd17d049fd450008fd7922162979a292e mods/flowers/license.txt +sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/fireflies/license.txt +sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt +sha256 ffbac006d197fcb8e36e9cdda638053ac80eef4e6446bbe36cb94bd28f54ba0b mods/game_commands/license.txt sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt +sha256 dcbab8d7dc4137789958d19471807b37447fd303bced310d7d76d901eefca8ff mods/map/license.txt +sha256 8acd4a18781a508f641b9364a0b491fccb0affd4c638b74b215238d0b0ee7b76 mods/player_api/license.txt sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt -sha256 a82dfda1c9feb704997ea42116eb6a15a1f3f99ee8c49215fbbd32d519e8ad74 mods/stairs/license.txt -sha256 1d42ffae6bad0da2e76966532f5f759bbeb5adb395ee4bf7bacca1fdfef745a6 mods/tnt/license.txt +sha256 478b9944a446b4d88496d10736ddcd8ad5a3ca52f8b75f747315583d4012cb3c mods/sfinv/license.txt +sha256 e361fc900d9203859391d35c38c3284c91600d23c1617076c641ff7e9fe10b15 mods/spawn/license.txt +sha256 eab4c0cb318bb83c13362047a5a0fc5cb650a4e561ceb5a9124e5a1253cbc21a mods/stairs/license.txt +sha256 e8593deed04ed4199ce9303db900f32276e0b629fd7f0089074d13370c12d00a mods/tnt/license.txt sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt -sha256 54fd170807a31712e3d6489287a27cdf5aa42eaff10e321aea040fb5b3e5a60a mods/xpanes/license.txt +sha256 c71155c9a68a5242223c5f814c1b9b1270492729b0ff0add770b6418bccf17c9 mods/xpanes/license.txt diff --git a/buildroot/package/minetest-game/minetest-game.mk b/buildroot/package/minetest-game/minetest-game.mk index bef7a63bb..1e6bb4d0c 100644 --- a/buildroot/package/minetest-game/minetest-game.mk +++ b/buildroot/package/minetest-game/minetest-game.mk @@ -4,26 +4,36 @@ # ################################################################################ -MINETEST_GAME_VERSION = 0.4.17 +MINETEST_GAME_VERSION = 5.1.0 MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION)) MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \ CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods) MINETEST_GAME_LICENSE_FILES = LICENSE.txt \ mods/beds/license.txt \ + mods/binoculars/license.txt \ mods/boats/license.txt \ mods/bones/license.txt \ mods/bucket/license.txt \ + mods/butterflies/license.txt \ mods/carts/license.txt \ mods/creative/license.txt \ mods/default/license.txt \ mods/doors/license.txt \ + mods/dungeon_loot/license.txt \ mods/dye/license.txt \ + mods/env_sounds/license.txt \ mods/farming/license.txt \ mods/fire/license.txt \ + mods/fireflies/license.txt \ mods/flowers/license.txt \ + mods/game_commands/license.txt \ mods/give_initial_stuff/license.txt \ + mods/map/license.txt \ + mods/player_api/license.txt \ mods/screwdriver/license.txt \ mods/sethome/license.txt \ + mods/sfinv/license.txt \ + mods/spawn/license.txt \ mods/stairs/license.txt \ mods/tnt/license.txt \ mods/vessels/license.txt \ diff --git a/buildroot/package/minetest/Config.in b/buildroot/package/minetest/Config.in index 4e8b1d0ee..085525534 100644 --- a/buildroot/package/minetest/Config.in +++ b/buildroot/package/minetest/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_MINETEST bool "minetest" depends on BR2_INSTALL_LIBSTDCPP # irrlicht - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_XORG7 # irrlicht depends on BR2_PACKAGE_HAS_LIBGL # irrlicht @@ -52,15 +52,15 @@ comment "sound support needs a toolchain w/ threads NPTL" endif -comment "minetest needs a toolchain w/ C++, gcc >= 4.7, threads" +comment "minetest needs a toolchain w/ C++, gcc >= 4.9, threads" depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || !BR2_TOOLCHAIN_HAS_THREADS comment "minetest needs X11 and an OpenGL provider" depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on (BR2_INSTALL_LIBSTDCPP \ - && BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ + && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ && BR2_TOOLCHAIN_HAS_THREADS) depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7 diff --git a/buildroot/package/minetest/minetest.hash b/buildroot/package/minetest/minetest.hash index e8b8bf2fc..bedc7633c 100644 --- a/buildroot/package/minetest/minetest.hash +++ b/buildroot/package/minetest/minetest.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 cd25d40c53f492325edabd2f6397250f40a61cb9fe4a1d4dd6eb030e0d1ceb59 minetest-0.4.17.1.tar.gz +sha256 ca53975eecf6a39383040658f41d697c8d7f8d5fe9176460f564979c73b53906 minetest-5.1.0.tar.gz -sha256 e48121374512b8f2fada00ac1c8e100a767e2a2edd2853557ccf1995e35a4be0 README.txt +sha256 03ec12b2ba71d5e31c37bcf2700af2f278141df62e5a2ac0ce056c53bf266e44 LICENSE.txt diff --git a/buildroot/package/minetest/minetest.mk b/buildroot/package/minetest/minetest.mk index 8b573a0f4..326479213 100644 --- a/buildroot/package/minetest/minetest.mk +++ b/buildroot/package/minetest/minetest.mk @@ -4,10 +4,10 @@ # ################################################################################ -MINETEST_VERSION = 0.4.17.1 +MINETEST_VERSION = 5.1.0 MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION)) MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds) -MINETEST_LICENSE_FILES = README.txt +MINETEST_LICENSE_FILES = LICENSE.txt MINETEST_DEPENDENCIES = gmp irrlicht jsoncpp luajit sqlite zlib diff --git a/buildroot/package/mini-snmpd/mini-snmpd.hash b/buildroot/package/mini-snmpd/mini-snmpd.hash index 19118b7f9..de72bb59e 100644 --- a/buildroot/package/mini-snmpd/mini-snmpd.hash +++ b/buildroot/package/mini-snmpd/mini-snmpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 59f84e94ef7c9ff36d243c7974a100903a4a9a0bb529b67cf6f0d3352138a86b mini-snmpd-v1.4.tar.gz +sha256 59f84e94ef7c9ff36d243c7974a100903a4a9a0bb529b67cf6f0d3352138a86b mini-snmpd-1.4.tar.gz sha256 8a43b895972a24567297f44f35dab0f5f9ed3b7db6dac0bf6094075b27ab9d56 COPYING diff --git a/buildroot/package/mini-snmpd/mini-snmpd.mk b/buildroot/package/mini-snmpd/mini-snmpd.mk index ebcbcce1c..698402bc5 100644 --- a/buildroot/package/mini-snmpd/mini-snmpd.mk +++ b/buildroot/package/mini-snmpd/mini-snmpd.mk @@ -4,8 +4,8 @@ # ################################################################################ -MINI_SNMPD_VERSION = v1.4 -MINI_SNMPD_SITE = $(call github,troglobit,mini-snmpd,$(MINI_SNMPD_VERSION)) +MINI_SNMPD_VERSION = 1.4 +MINI_SNMPD_SITE = $(call github,troglobit,mini-snmpd,v$(MINI_SNMPD_VERSION)) MINI_SNMPD_LICENSE = GPL-2.0 MINI_SNMPD_LICENSE_FILES = COPYING MINI_SNMPD_AUTORECONF = YES @@ -13,9 +13,6 @@ MINI_SNMPD_AUTORECONF = YES define MINI_SNMPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/mini-snmpd/mini-snmpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/mini-snmpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/mini-snmpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mini-snmpd.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/minicom/0001-fix-static-linking-with-ncurses.patch b/buildroot/package/minicom/0001-fix-static-linking-with-ncurses.patch new file mode 100644 index 000000000..56c442e85 --- /dev/null +++ b/buildroot/package/minicom/0001-fix-static-linking-with-ncurses.patch @@ -0,0 +1,745 @@ +From c13180cb2bead49addb00f33f4999200cbbd801f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 26 Feb 2020 10:16:14 +0100 +Subject: [PATCH] fix static linking with ncurses + +Prefix LINES and COLS with MINICOM_ to avoid the following build failure +when building statically with ncurses: + +/home/giuliobenetti/autobuild/run/instance-1/output-1/per-package/minicom/host/bin/arm-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -W -Wall -Wextra -std=gnu99 -fno-common -Wno-format-truncation -static -o minicom minicom.o vt100.o config.o help.o updown.o util.o dial.o window.o wkeys.o ipc.o windiv.o sysdep1.o sysdep1_s.o sysdep2.o rwconf.o main.o file.o getsdir.o wildmat.o common.o ../lib/libport.a -lncurses +/home/giuliobenetti/autobuild/run/instance-1/output-1/per-package/minicom/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/giuliobenetti/autobuild/run/instance-1/output-1/per-package/minicom/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libncurses.a(lib_setup.o):(.bss+0x100): multiple definition of `COLS'; window.o:(.bss+0x38): first defined here +/home/giuliobenetti/autobuild/run/instance-1/output-1/per-package/minicom/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/giuliobenetti/autobuild/run/instance-1/output-1/per-package/minicom/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libncurses.a(lib_setup.o):(.bss+0x104): multiple definition of `LINES'; window.o:(.bss+0x3c): first defined here +collect2: error: ld returned 1 exit status +Makefile:448: recipe for target 'minicom' failed + +Fixes: + - http://autobuild.buildroot.org/results/d3edbab1f2cd0f7b790e2559dc8d489497ae02f3 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to minicom-devel@lists.alioth.debian.org] +--- + src/config.c | 8 ++-- + src/dial.c | 10 ++--- + src/file.c | 8 ++-- + src/help.c | 4 +- + src/main.c | 68 ++++++++++++++++----------------- + src/minicom.c | 2 +- + src/vt100.c | 2 +- + src/windiv.c | 8 ++-- + src/window.c | 102 +++++++++++++++++++++++++------------------------- + src/window.h | 2 +- + 10 files changed, 107 insertions(+), 107 deletions(-) + +diff --git a/src/config.c b/src/config.c +index 87901f0..3c26f9f 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -1078,7 +1078,7 @@ static void doscrkeyb(void) + } else { + psets(P_STATLINE, N_("enabled")); + /* See if it fits on screen */ +- if (LINES > 24) ++ if (MINICOM_LINES > 24) + tempst = 0; + } + mc_wlocate(w, mbswidth(status_line) + 1, 2); +@@ -1140,7 +1140,7 @@ static void doscrkeyb(void) + + if (st) { + mc_wclose(st,0); +- st = mc_wopen(0, LINES - 1, COLS - 1, LINES - 1, BNONE, ++ st = mc_wopen(0, MINICOM_LINES - 1, MINICOM_COLS - 1, MINICOM_LINES - 1, BNONE, + XA_NORMAL, sfcolor, sbcolor, 1, 0, 1); + show_status(); + } +@@ -1159,7 +1159,7 @@ static void doscrkeyb(void) + + if (st) { + mc_wclose(st,0); +- st = mc_wopen(0, LINES - 1, COLS - 1, LINES - 1, BNONE, ++ st = mc_wopen(0, MINICOM_LINES - 1, MINICOM_COLS - 1, MINICOM_LINES - 1, BNONE, + XA_NORMAL, sfcolor, sbcolor, 1, 0, 0); + show_status(); + } +@@ -1326,7 +1326,7 @@ int dotermmenu(void) + } else { + psets(P_STATLINE, N_("enabled")); + /* See if it fits on screen */ +- if (LINES > 24 || use_status) ++ if (MINICOM_LINES > 24 || use_status) + tempst = 0; + } + mc_wlocate(w, mbswidth(status_line) + 1, 3); +diff --git a/src/dial.c b/src/dial.c +index 5076b32..5ef7ac3 100644 +--- a/src/dial.c ++++ b/src/dial.c +@@ -1575,7 +1575,7 @@ void dialdir(void) + *move_exit = N_(" Move entry up/down, Escape to exit"); + unsigned int tagmvlen = 0; + size_t i; +- int position_dialing_directory = ((COLS / 2) + 32 - DIALOPTS * DIAL_WIDTH) / 2; ++ int position_dialing_directory = ((MINICOM_COLS / 2) + 32 - DIALOPTS * DIAL_WIDTH) / 2; + + dprev = -1; + dname[0] = 0; +@@ -1586,11 +1586,11 @@ void dialdir(void) + /* Alright, draw the dialing directory! */ + + dirflush = 0; +- x1 = (COLS / 2) - 37; +- x2 = (COLS / 2) + 37; +- dsub = mc_wopen(x1 - 1, LINES - 3, x2 + 1, LINES - 3, BNONE, ++ x1 = (MINICOM_COLS / 2) - 37; ++ x2 = (MINICOM_COLS / 2) + 37; ++ dsub = mc_wopen(x1 - 1, MINICOM_LINES - 3, x2 + 1, MINICOM_LINES - 3, BNONE, + XA_REVERSE | stdattr, mfcolor, mbcolor, 0, 0, 1); +- w = mc_wopen(x1, 2, x2, LINES - 6, BSINGLE, stdattr, mfcolor, mbcolor, 0, 0, 1); ++ w = mc_wopen(x1, 2, x2, MINICOM_LINES - 6, BSINGLE, stdattr, mfcolor, mbcolor, 0, 0, 1); + mc_wcursor(w, CNONE); + mc_wtitle(w, TMID, _("Dialing Directory")); + mc_wputs(w, +diff --git a/src/file.c b/src/file.c +index be26afd..7c208a7 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -491,11 +491,11 @@ static void init_filedir(void) + int x1, x2; + + dirflush = 0; +- x1 = (COLS / 2) - 37; +- x2 = (COLS / 2) + 37; +- dsub = mc_wopen(x1 - 1, LINES - 3, x2 + 1, LINES - 3, BNONE, ++ x1 = (MINICOM_COLS / 2) - 37; ++ x2 = (MINICOM_COLS / 2) + 37; ++ dsub = mc_wopen(x1 - 1, MINICOM_LINES - 3, x2 + 1, MINICOM_LINES - 3, BNONE, + stdattr, mfcolor, mbcolor, 0, 0, 1); +- main_w = mc_wopen(x1, 2, x2, LINES - 6, BSINGLE, stdattr, mfcolor, ++ main_w = mc_wopen(x1, 2, x2, MINICOM_LINES - 6, BSINGLE, stdattr, mfcolor, + mbcolor, 0, 0, 1); + + if (ret_buf == NULL) { +diff --git a/src/help.c b/src/help.c +index 70cf8c6..3036d0a 100644 +--- a/src/help.c ++++ b/src/help.c +@@ -34,8 +34,8 @@ int help(void) + const char *s; + char buf[40]; + +- x1 = (COLS / 2) - 34; +- x2 = (COLS / 2) + 32; ++ x1 = (MINICOM_COLS / 2) - 34; ++ x2 = (MINICOM_COLS / 2) + 32; + w = mc_wopen(x1, 2, x2, 18, BDOUBLE, stdattr, mfcolor, mbcolor, 0, 0, 1); + + s = _("Minicom Command Summary"); +diff --git a/src/main.c b/src/main.c +index 85bd4a5..8f8e8f7 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -485,17 +485,17 @@ void init_emul(int type, int do_init) + } + + /* See if we have space for a fixed status line */ +- maxy = LINES - 1; +- if ((use_status || LINES > 24) && ++ maxy = MINICOM_LINES - 1; ++ if ((use_status || MINICOM_LINES > 24) && + P_STATLINE[0] == 'e') { + if (use_status) { +- ypos = LINES; +- maxy = LINES - 1; ++ ypos = MINICOM_LINES; ++ maxy = MINICOM_LINES - 1; + } else { +- ypos = LINES - 1; +- maxy = LINES - 2; ++ ypos = MINICOM_LINES - 1; ++ maxy = MINICOM_LINES - 2; + } +- st = mc_wopen(0, ypos, COLS - 1, ypos, BNONE, ++ st = mc_wopen(0, ypos, MINICOM_COLS - 1, ypos, BNONE, + st_attr, sfcolor, sbcolor, 1, 0, 1); + mc_wredraw(st, 1); + } +@@ -508,7 +508,7 @@ void init_emul(int type, int do_init) + num_hist_lines = 5000; + + /* Open a new main window, and define the configured history buffer size. */ +- us = mc_wopen(0, 0, COLS - 1, maxy, ++ us = mc_wopen(0, 0, MINICOM_COLS - 1, maxy, + BNONE, XA_NORMAL, tfcolor, tbcolor, 1, num_hist_lines, 0); + + if (x >= 0) { +@@ -520,8 +520,8 @@ void init_emul(int type, int do_init) + us->wrap = wrapln; + + terminal = type; +- lines = LINES - (st != NULL); +- cols = COLS; ++ lines = MINICOM_LINES - (st != NULL); ++ cols = MINICOM_COLS; + + /* Install and reset the terminal emulator. */ + if (do_init) { +@@ -583,10 +583,10 @@ static void show_status_fmt(const char *fmt) + if (!st) + return; + +- char buf[COLS]; ++ char buf[MINICOM_COLS]; + int bufi = 0; + int l = strlen(fmt); +- for (int i = 0; i < l && bufi < COLS; ++i) ++ for (int i = 0; i < l && bufi < MINICOM_COLS; ++i) + { + if (fmt[i] == '%' && i + 1 < l) + { +@@ -596,70 +596,70 @@ static void show_status_fmt(const char *fmt) + switch (func) + { + case '%': +- bufi += snprintf(buf + bufi, COLS - bufi, "%%"); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%%"); + break; + case 'H': +- bufi += snprintf(buf + bufi, COLS - bufi, "%sZ", esc_key()); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%sZ", esc_key()); + break; + case 'V': +- bufi += snprintf(buf + bufi, COLS - bufi, "%s", VERSION); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%s", VERSION); + break; + case 'b': + #ifdef USE_SOCKET + if (portfd_is_socket == Socket_type_unix) +- bufi += snprintf(buf + bufi, COLS - bufi, "unix-socket"); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "unix-socket"); + else if (portfd_is_socket == Socket_type_tcp) +- bufi += snprintf(buf + bufi, COLS - bufi, "TCP"); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "TCP"); + else + #endif /* USE_SOCKET */ + { + if (P_SHOWSPD[0] == 'l') +- bufi += snprintf(buf + bufi, COLS - bufi, "%6ld", linespd); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%6ld", linespd); + else +- bufi += snprintf(buf + bufi, COLS - bufi, "%s", P_BAUDRATE); +- bufi += snprintf(buf + bufi, COLS - bufi, " %s%s%s", P_BITS, P_PARITY, P_STOPB); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%s", P_BAUDRATE); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, " %s%s%s", P_BITS, P_PARITY, P_STOPB); + } + break; + case 'T': + switch (terminal) + { + case VT100: +- bufi += snprintf(buf + bufi, COLS - bufi, "VT102"); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "VT102"); + break; + case ANSI: +- bufi += snprintf(buf + bufi, COLS - bufi, "ANSI"); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "ANSI"); + break; + } + + break; + case 'C': +- bufi += snprintf(buf + bufi, COLS - bufi, cursormode == NORMAL ? "NOR" : "APP"); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, cursormode == NORMAL ? "NOR" : "APP"); + break; + + case 't': + if (online < 0) +- bufi += snprintf(buf + bufi, COLS - bufi, "%s", ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%s", + P_HASDCD[0] == 'Y' ? _("Offline") : _("OFFLINE")); + else +- bufi += snprintf(buf + bufi, COLS - bufi, "%s %ld:%ld", ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%s %ld:%ld", + P_HASDCD[0] == 'Y' ? _("Online") : _("ONLINE"), + online / 3600, (online / 60) % 60); + break; + + case 'D': + { +- char b[COLS - bufi]; +- bufi += snprintf(buf + bufi, COLS - bufi, "%s", ++ char b[MINICOM_COLS - bufi]; ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%s", + shortened_devpath(b, sizeof(b), dial_tty)); + } + break; + + case '$': +- bufi += snprintf(buf + bufi, COLS - bufi, "%s", status_message); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "%s", status_message); + break; + + default: +- bufi += snprintf(buf + bufi, COLS - bufi, "?%c", func); ++ bufi += snprintf(buf + bufi, MINICOM_COLS - bufi, "?%c", func); + break; + } + } +@@ -670,9 +670,9 @@ static void show_status_fmt(const char *fmt) + } + } + +- if (bufi < COLS - 1) +- memset(buf + bufi, ' ', COLS - bufi); +- buf[COLS - 1] = 0; ++ if (bufi < MINICOM_COLS - 1) ++ memset(buf + bufi, ' ', MINICOM_COLS - bufi); ++ buf[MINICOM_COLS - 1] = 0; + + if (size_changed || !current_status_line || strcmp(buf, current_status_line)) + { +@@ -681,7 +681,7 @@ static void show_status_fmt(const char *fmt) + mc_wprintf(st, "%s", buf); + mc_wredraw(st, 1); + ret_csr(); +- current_status_line = realloc(current_status_line, COLS); ++ current_status_line = realloc(current_status_line, MINICOM_COLS); + assert(current_status_line); + strcpy(current_status_line, buf); + } +@@ -814,7 +814,7 @@ static void showtemp(void) + if (st) + return; + +- st = mc_wopen(0, LINES - 1, COLS - 1, LINES - 1, ++ st = mc_wopen(0, MINICOM_LINES - 1, MINICOM_COLS - 1, MINICOM_LINES - 1, + BNONE, st_attr, sfcolor, sbcolor, 1, 0, 1); + show_status(); + tempst = 1; +diff --git a/src/minicom.c b/src/minicom.c +index cfdb763..d876cb2 100644 +--- a/src/minicom.c ++++ b/src/minicom.c +@@ -1502,7 +1502,7 @@ int main(int argc, char **argv) + if (win_init(tfcolor, tbcolor, XA_NORMAL) < 0) + leave(""); + +- if (COLS < 40 || LINES < 10) ++ if (MINICOM_COLS < 40 || MINICOM_LINES < 10) + leave(_("Sorry. Your screen is too small.\n")); + + if (dosetup) { +diff --git a/src/vt100.c b/src/vt100.c +index 82e395e..2f03549 100644 +--- a/src/vt100.c ++++ b/src/vt100.c +@@ -739,7 +739,7 @@ static void dec_mode(int on_off) + + if (on_off) + { +- us_alternate = mc_wopen(0, 0, COLS - 1, us->y2, BNONE, XA_NORMAL, ++ us_alternate = mc_wopen(0, 0, MINICOM_COLS - 1, us->y2, BNONE, XA_NORMAL, + tfcolor, tbcolor, 1, 0, 0); + vt_win = us_alternate; + } +diff --git a/src/windiv.c b/src/windiv.c +index 2644dff..fb4d73c 100644 +--- a/src/windiv.c ++++ b/src/windiv.c +@@ -48,8 +48,8 @@ static WIN *vmc_tell(const char *fmt, va_list va) + + vsnprintf(buf, sizeof(buf), fmt, va); + +- w = mc_wopen((COLS / 2) - 2 - mbswidth(buf) / 2, 8, +- (COLS / 2) + 2 + mbswidth(buf) / 2, 10, ++ w = mc_wopen((MINICOM_COLS / 2) - 2 - mbswidth(buf) / 2, 8, ++ (MINICOM_COLS / 2) + 2 + mbswidth(buf) / 2, 10, + BDOUBLE, stdattr, mfcolor, mbcolor, 0, 0, 1); + mc_wcursor(w, CNONE); + mc_wlocate(w, 2, 1); +@@ -104,7 +104,7 @@ int ask(const char *what, const char **s) + size = mbswidth(what) / 2 + 2; + offs = size - 5*num; + } +- w = mc_wopen((COLS / 2) - size , 8, (COLS / 2) + 1 + size, 9, ++ w = mc_wopen((MINICOM_COLS / 2) - size , 8, (MINICOM_COLS / 2) + 1 + size, 9, + BSINGLE, stdattr, mfcolor, mbcolor, 0, 0, 1); + + dirflush = 0; +@@ -167,7 +167,7 @@ char *input(char *s, char *buf, size_t bufsize) + { + WIN *w; + +- w = mc_wopen((COLS / 2) - 20, 11, (COLS / 2) + 20, 12, ++ w = mc_wopen((MINICOM_COLS / 2) - 20, 11, (MINICOM_COLS / 2) + 20, 12, + BDOUBLE, stdattr, mfcolor, mbcolor, 1, 0, 1); + mc_wputs(w, s); + mc_wlocate(w, 0, 1); +diff --git a/src/window.c b/src/window.c +index c6cf0f1..66f2978 100644 +--- a/src/window.c ++++ b/src/window.c +@@ -104,7 +104,7 @@ static int sflag = 0; + + int useattr = 1; + int dirflush = 1; +-int LINES, COLS; ++int MINICOM_LINES, MINICOM_COLS; + int usecolor = 0; + WIN *stdwin; + /* +@@ -266,12 +266,12 @@ static void _gotoxy(int x, int y) + int tmp; + + /* Sanity check. */ +- if (x >= COLS || y > LINES || (x == curx && y == cury)) ++ if (x >= MINICOM_COLS || y > MINICOM_LINES || (x == curx && y == cury)) + return; + + if (use_status) { + /* Leaving status line? */ +- if (cury == LINES && y < cury) { ++ if (cury == MINICOM_LINES && y < cury) { + outstr(FS); + /* Re-set attributes. */ + tmp = curattr; +@@ -282,7 +282,7 @@ static void _gotoxy(int x, int y) + return; + } + /* Writing on status line? */ +- else if (y == LINES) { ++ else if (y == MINICOM_LINES) { + /* From normal screen? */ + if (cury < y) { + outstr(tgoto(TS, x, x)); +@@ -298,11 +298,11 @@ static void _gotoxy(int x, int y) + } + #else + /* Sanity check. */ +- if (x >= COLS || y >= LINES || (x == curx && y == cury)) { ++ if (x >= MINICOM_COLS || y >= MINICOM_LINES || (x == curx && y == cury)) { + # if 0 +- if (x >= COLS || y >= LINES) ++ if (x >= MINICOM_COLS || y >= MINICOM_LINES) + fprintf(stderr, "OOPS: (x, y) == (%d, %d)\n", +- COLS, LINES); ++ MINICOM_COLS, MINICOM_LINES); + # endif + return; + } +@@ -345,7 +345,7 @@ static void _write(wchar_t c, int doit, int x, int y, char attr, char color) + * last line, last character. After scrolling, this "invisible" + * character is automatically restored. + */ +- if (_has_am && y >= LINES - 1 && x >= COLS - 1) { ++ if (_has_am && y >= MINICOM_LINES - 1 && x >= MINICOM_COLS - 1) { + doit = 0; + sflag = 1; + oldc.value = c; +@@ -353,9 +353,9 @@ static void _write(wchar_t c, int doit, int x, int y, char attr, char color) + oldc.color = color; + } + #ifdef ST_LINE +- if (x < COLS && y <= LINES) ++ if (x < MINICOM_COLS && y <= MINICOM_LINES) + #else +- if (x < COLS && y < LINES) ++ if (x < MINICOM_COLS && y < MINICOM_LINES) + #endif + { + if (doit != 0) { +@@ -380,7 +380,7 @@ static void _write(wchar_t c, int doit, int x, int y, char attr, char color) + curx++; + } + if (doit >= 0) { +- e = &gmap[x + y * COLS]; ++ e = &gmap[x + y * MINICOM_COLS]; + e->value = c; + e->attr = attr; + e->color = color; +@@ -428,7 +428,7 @@ void mc_wresize(WIN *win, int lines, int cols) + for (x = 0; x < cols; x++) { + n = &newmap[y + x * cols]; + if (x < win->xs && y < win->ys) { +- e = &oldmap[y + x * COLS]; ++ e = &oldmap[y + x * MINICOM_COLS]; + n->value = e->value; + n->color = e->color; + n->attr = e->attr; +@@ -446,8 +446,8 @@ void mc_wresize(WIN *win, int lines, int cols) + free(oldmap); + if (win == stdwin) { + gmap = newmap; +- LINES = lines; +- COLS = cols; ++ MINICOM_LINES = lines; ++ MINICOM_COLS = cols; + } else + win->map = newmap; + } +@@ -485,10 +485,10 @@ WIN *mc_wopen(int x1, int y1, int x2, int y2, int border, int attr, + if (y1 < offs) + y1 = offs; + #if 0 +- if (x2 >= COLS - offs) +- x2 = COLS - offs - 1; +- if (y2 >= LINES - offs) +- y2 = LINES - offs - 1; ++ if (x2 >= MINICOM_COLS - offs) ++ x2 = MINICOM_COLS - offs - 1; ++ if (y2 >= MINICOM_LINES - offs) ++ y2 = MINICOM_LINES - offs - 1; + #endif + + w->xs = x2 - x1 + 1; +@@ -531,7 +531,7 @@ WIN *mc_wopen(int x1, int y1, int x2, int y2, int border, int attr, + bytes = (x2 - x1 + 1) * sizeof(ELM); + /* Loop */ + for (y = y1; y <= y2; y++) { +- memcpy(e, gmap + COLS * y + x1, bytes); ++ memcpy(e, gmap + MINICOM_COLS * y + x1, bytes); + e += (x2 - x1 + 1); + } + +@@ -649,7 +649,7 @@ void mc_wleave(void) + ocursor = _curstype; + + setcbreak(0); /* Normal */ +- _gotoxy(0, LINES - 1); ++ _gotoxy(0, MINICOM_LINES - 1); + _setattr(XA_NORMAL, COLATTR(WHITE, BLACK)); + _cursor(CNORMAL); + if (CL != NULL) +@@ -688,8 +688,8 @@ void mc_wreturn(void) + _cursor(ocursor); + + e = gmap; +- for (y = 0; y value, -1, x, y, e->attr, e->color); + e++; + } +@@ -750,7 +750,7 @@ static int _wclreol(WIN *w) + + y = w->cury + w->y1; + +- if (w->direct && (w->x2 == COLS - 1) && CE) { ++ if (w->direct && (w->x2 == MINICOM_COLS - 1) && CE) { + _gotoxy(w->curx + w->x1, y); + _setattr(w->attr, w->color); + outstr(CE); +@@ -779,12 +779,12 @@ void mc_wscroll(WIN *win, int dir) + * This improves performance on slow screens (eg ATARI ST) dramatically. + */ + if (win->direct && SF != NULL && +- (dir == S_UP || SR != NULL) && (LINES == win->sy2 - win->sy1 + 1)) { ++ (dir == S_UP || SR != NULL) && (MINICOM_LINES == win->sy2 - win->sy1 + 1)) { + doit = 0; + phys_scr = 1; + _setattr(win->attr, win->color); + if (dir == S_UP) { +- _gotoxy(0, LINES - 1); ++ _gotoxy(0, MINICOM_LINES - 1); + outstr(SF); + } else { + _gotoxy(0, 0); +@@ -795,7 +795,7 @@ void mc_wscroll(WIN *win, int dir) + * If the window is as wide as the physical screen, we can + * scroll it with insert/delete line (or set scroll region - vt100!) + */ +- else if (win->direct && win->xs == COLS && ++ else if (win->direct && win->xs == MINICOM_COLS && + ((CS != NULL && SF != NULL && SR != NULL) + || (Dl != NULL && Al != NULL))) { + doit = 0; +@@ -806,7 +806,7 @@ void mc_wscroll(WIN *win, int dir) + * big as the physical screen, we don't _have_ to + * initialize it. + */ +- if (win->sy2 == LINES - 1 && win->sy1 == 0) ++ if (win->sy2 == MINICOM_LINES - 1 && win->sy1 == 0) + fs = 1; + if (!fs) { + outstr(tgoto(CS, win->sy2, win->sy1)); +@@ -820,7 +820,7 @@ void mc_wscroll(WIN *win, int dir) + outstr(SR); + } + if (!fs) { +- outstr(tgoto(CS, LINES - 1, 0)); ++ outstr(tgoto(CS, MINICOM_LINES - 1, 0)); + cury = 0; + } + _gotoxy(0, win->sy2); +@@ -843,9 +843,9 @@ void mc_wscroll(WIN *win, int dir) + * to the lower right. After scrolling we have to restore + * the non-visible character that is now visible. + */ +- if (sflag && win->sy2 == (LINES - 1) && win->sy1 != win->sy2) { ++ if (sflag && win->sy2 == (MINICOM_LINES - 1) && win->sy1 != win->sy2) { + if (dir == S_UP) { +- _write(oldc.value, 1, COLS - 1, LINES - 2, ++ _write(oldc.value, 1, MINICOM_COLS - 1, MINICOM_LINES - 2, + oldc.attr, oldc.color); + } + sflag = 0; +@@ -858,7 +858,7 @@ void mc_wscroll(WIN *win, int dir) + win->sy2 == win->y2 && win->sy1 == win->y1) { + + /* Calculate screen buffer */ +- e = gmap + win->y1 * COLS + win->x1; ++ e = gmap + win->y1 * MINICOM_COLS + win->x1; + + /* Calculate history buffer */ + f = win->histbuf + (win->xs * win->histline); +@@ -903,7 +903,7 @@ void mc_wscroll(WIN *win, int dir) + /* Now scroll the memory image. */ + if (dir == S_UP) { + for (y = win->sy1 + 1; y <= win->sy2; y++) { +- e = gmap + y * COLS + win->x1; ++ e = gmap + y * MINICOM_COLS + win->x1; + for (x = win->x1; x <= win->x2; x++) { + _write(e->value, win->direct && doit, x, y - 1, e->attr, e->color); + e++; +@@ -915,7 +915,7 @@ void mc_wscroll(WIN *win, int dir) + _wclreol(win); + } else { + for (y = win->sy2 - 1; y >= win->sy1; y--) { +- e = gmap + y * COLS + win->x1; ++ e = gmap + y * MINICOM_COLS + win->x1; + for (x = win->x1; x <= win->x2; x++) { + _write(e->value, win->direct && doit, x, y + 1, e->attr, e->color); + e++; +@@ -1195,7 +1195,7 @@ void mc_wcurbar(WIN *w, int y, int attr) + + y += w->y1; + +- e = gmap + y * COLS + w->x1; ++ e = gmap + y * MINICOM_COLS + w->x1; + + /* If we can't do reverse, just put a '>' in front of + * the line. We only support XA_NORMAL & XA_REVERSE. +@@ -1447,7 +1447,7 @@ void mc_winclr(WIN *w) + /* contains them for cosmetic purposes or as separators. */ + for (m = w->y2; m >= w->y1; m--) { + /* Start of this line in the global map. */ +- e = gmap + m * COLS + w->x1; ++ e = gmap + m * MINICOM_COLS + w->x1; + + /* Quick check to see if line is empty. */ + for (i = 0; i < w->xs; i++) +@@ -1461,7 +1461,7 @@ void mc_winclr(WIN *w) + /* Copy window into history buffer line-by-line. */ + for (y = w->y1; y <= m; y++) { + /* Start of this line in the global map. */ +- e = gmap + y * COLS + w->x1; ++ e = gmap + y * MINICOM_COLS + w->x1; + + /* Now copy this line. */ + f = w->histbuf + (w->xs * w->histline); /* History buffer */ +@@ -1475,7 +1475,7 @@ void mc_winclr(WIN *w) + _setattr(w->attr, w->color); + w->curx = 0; + +- if (CL && w->y1 == 0 && w->y2 == LINES-1 && w->x1 == 0 && w->x2 == COLS-1) { ++ if (CL && w->y1 == 0 && w->y2 == MINICOM_LINES-1 && w->x1 == 0 && w->x2 == MINICOM_COLS-1) { + w->direct = 0; + curx = 0; + cury = 0; +@@ -1567,7 +1567,7 @@ void mc_winschar2(WIN *w, wchar_t c, int move) + } + + odir = w->direct; +- if (w->xs == COLS && IC != NULL) { ++ if (w->xs == MINICOM_COLS && IC != NULL) { + /* We can use the insert character capability. */ + if (w->direct) + outstr(IC); +@@ -1589,7 +1589,7 @@ void mc_winschar2(WIN *w, wchar_t c, int move) + buf = malloc(sizeof(ELM) * len); + if (!buf) + return; /* Umm... */ +- memcpy(buf, gmap + COLS * y + x, sizeof(ELM) * len); ++ memcpy(buf, gmap + MINICOM_COLS * y + x, sizeof(ELM) * len); + + /* Now, put the new character on screen. */ + mc_wputc(w, c); +@@ -1625,14 +1625,14 @@ void mc_wdelchar(WIN *w) + x = w->x1 + w->curx; + y = w->y1 + w->cury; + +- if (w->direct && w->xs == COLS && DC != NULL) { ++ if (w->direct && w->xs == MINICOM_COLS && DC != NULL) { + /*_gotoxy(x - 1, y);*/ + _gotoxy(x, y); + outstr(DC); + doit = 0; + } + +- e = gmap + y * COLS + x + 1; ++ e = gmap + y * MINICOM_COLS + x + 1; + + for (; x < w->x2; x++) { + _write(e->value, doit && w->direct, x, y, e->attr, e->color); +@@ -1906,16 +1906,16 @@ int win_init(int fg, int bg, int attr) + fprintf(stderr, _("No cursor motion capability (cm)\n")); + return -1; + } +- LINES = COLS = 0; +- getrowcols(&LINES, &COLS); ++ MINICOM_LINES = MINICOM_COLS = 0; ++ getrowcols(&MINICOM_LINES, &MINICOM_COLS); + #ifdef BBS +- LINES = lines; ++ MINICOM_LINES = lines; + #endif +- if (LINES == 0 && (LINES = tgetnum("li")) <= 0) { ++ if (MINICOM_LINES == 0 && (MINICOM_LINES = tgetnum("li")) <= 0) { + fprintf(stderr, _("Number of terminal lines unknown\n")); + return -1; + } +- if (COLS == 0 && (COLS = tgetnum("co")) <= 0) { ++ if (MINICOM_COLS == 0 && (MINICOM_COLS = tgetnum("co")) <= 0) { + fprintf(stderr, _("Number of terminal columns unknown\n")); + return -1; + } +@@ -2053,7 +2053,7 @@ int win_init(int fg, int bg, int attr) + + + /* Memory for global map */ +- if ((gmap = malloc(sizeof(ELM) * (LINES + 1) * COLS)) == NULL) { ++ if ((gmap = malloc(sizeof(ELM) * (MINICOM_LINES + 1) * MINICOM_COLS)) == NULL) { + fprintf(stderr, _("Not enough memory\n")); + return -1; + }; +@@ -2068,10 +2068,10 @@ int win_init(int fg, int bg, int attr) + stdwin->doscroll = 1; + stdwin->x1 = 0; + stdwin->sy1 = stdwin->y1 = 0; +- stdwin->x2 = COLS - 1; +- stdwin->sy2 = stdwin->y2 = LINES - 1; +- stdwin->xs = COLS; +- stdwin->ys = LINES; ++ stdwin->x2 = MINICOM_COLS - 1; ++ stdwin->sy2 = stdwin->y2 = MINICOM_LINES - 1; ++ stdwin->xs = MINICOM_COLS; ++ stdwin->ys = MINICOM_LINES; + stdwin->attr = attr; + stdwin->color = COLATTR(fg, bg); + stdwin->direct = 1; +diff --git a/src/window.h b/src/window.h +index 1b8eb12..97f3bdd 100644 +--- a/src/window.h ++++ b/src/window.h +@@ -62,7 +62,7 @@ typedef struct _win { + * Stdwin is the whole screen + */ + extern WIN *stdwin; /* Whole screen */ +-extern int LINES, COLS; /* Size of screen */ ++extern int MINICOM_LINES, MINICOM_COLS; /* Size of screen */ + extern int usecolor; /* Use ansi color escape sequences */ + extern int useattr; /* Use attributes (reverse, bold etc. ) */ + extern int dirflush; /* Direct flush after write */ +-- +2.25.0 + diff --git a/buildroot/package/minicom/0001-sysdep1-check-if-RS485-is-support-before-setting-its.patch b/buildroot/package/minicom/0001-sysdep1-check-if-RS485-is-support-before-setting-its.patch deleted file mode 100644 index 39f68350c..000000000 --- a/buildroot/package/minicom/0001-sysdep1-check-if-RS485-is-support-before-setting-its.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 238bbe98558bcd5ed9ab73ef03db82b57ab056ab Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Fri, 31 Aug 2018 15:18:22 +0200 -Subject: [PATCH] sysdep1: check if RS485 is support before setting its - parameters - -Not every kernel supports RS485, so better check it before setting its -parameters. - -Test if RS485 is supported by checking if these 3 macros are defined: -- SER_RS485_ENABLED -- TIOCGRS485 -- TIOCSRS485 -If they're not defined m_set485parms becomes a dummy function. - -Signed-off-by: Giulio Benetti ---- - src/sysdep1.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sysdep1.c b/src/sysdep1.c -index 798b006..b03b442 100644 ---- a/src/sysdep1.c -+++ b/src/sysdep1.c -@@ -599,7 +599,7 @@ void m_set485parms(int fd, int en, int rts_on_snd, int rts_aft_snd, - int rx_dur_tx, int term_bus, char *del_rts_bef_snd, - char *del_rts_aft_snd) - { --#ifdef SER_RS485_ENABLED -+#if defined (SER_RS485_ENABLED) && defined (TIOCGRS485) && defined (TIOCSRS485) - struct serial_rs485 rs485conf; - - if (ioctl(fd, TIOCGRS485, &rs485conf)) --- -2.17.1 - diff --git a/buildroot/package/minicom/0002-src-Makefile.am-fix-ascii-xfr-link-with-lintl.patch b/buildroot/package/minicom/0002-src-Makefile.am-fix-ascii-xfr-link-with-lintl.patch deleted file mode 100644 index efc880d2e..000000000 --- a/buildroot/package/minicom/0002-src-Makefile.am-fix-ascii-xfr-link-with-lintl.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6fe734c5a1d51e2d4a3c1cd4d7a61cc246faa3f2 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 20 Apr 2019 13:34:23 +0200 -Subject: [PATCH] src/Makefile.am: fix ascii-xfr link with lintl - -ascii-xfr needs to link with lintl if needed: - -/home/dawncrow/buildroot-test/scripts/instance-0/output/host/bin/m68k-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -W -Wall -Wextra -std=gnu99 -Wno-format-truncation -o ascii-xfr ascii-xfr.o ../lib/libport.a -lncurses -ascii-xfr.o: In function `stats': -ascii-xfr.c:(.text+0x4c): undefined reference to `libintl_gettext' -ascii-xfr.c:(.text+0xb2): undefined reference to `libintl_gettext' -ascii-xfr.o: In function `usage': -ascii-xfr.c:(.text+0x10e): undefined reference to `libintl_gettext' -ascii-xfr.o: In function `asend': -ascii-xfr.c:(.text+0x534): undefined reference to `libintl_gettext' -ascii-xfr.o: In function `main': -ascii-xfr.c:(.text.startup+0xc8): undefined reference to `libintl_gettext' -ascii-xfr.o:ascii-xfr.c:(.text.startup+0x1a8): more undefined references to `libintl_gettext' follow - -Fixes: - - http://autobuild.buildroot.org/results/e64cdcf648764be53a3e951304bb89dc9410db23 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://salsa.debian.org/minicom-team/minicom/merge_requests/7] ---- - src/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 19b1888..ba92f71 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -29,6 +29,7 @@ confdir = @MINICOM_CONFDIR@ - AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/lib -DCONFDIR=\"$(confdir)\" \ - -DLOCALEDIR=\"$(datadir)/locale\" - -+ascii_xfr_LDADD = @LIBINTL@ - minicom_LDADD = @LIBINTL@ $(LIBICONV) $(MINICOM_LIBPORT) $(LOCKDEV_LIBS) - minicom_keyserv_LDADD = @LIBINTL@ $(MINICOM_LIBPORT) - runscript_LDADD = @LIBINTL@ $(MINICOM_LIBPORT) --- -2.20.1 - diff --git a/buildroot/package/minicom/minicom.hash b/buildroot/package/minicom/minicom.hash index c566f4be5..7622ec004 100644 --- a/buildroot/package/minicom/minicom.hash +++ b/buildroot/package/minicom/minicom.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3bd58b594ac66545649c13ab2b728a4df0f78612eb030680d4152f7627d1f177 minicom-19ab49422f3431102c31fea01549121385113f80.tar.gz +sha256 f2b69b874b93f7bb68ad84e09d4d4c7a79160fcdd0117e8c0c1465fe71e64f28 minicom-52b626b15a883b0300682a03aa8e048e317f1e56.tar.gz sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15 COPYING diff --git a/buildroot/package/minicom/minicom.mk b/buildroot/package/minicom/minicom.mk index 4635d39ee..77bc6f533 100644 --- a/buildroot/package/minicom/minicom.mk +++ b/buildroot/package/minicom/minicom.mk @@ -4,30 +4,18 @@ # ################################################################################ -MINICOM_VERSION = 19ab49422f3431102c31fea01549121385113f80 +MINICOM_VERSION = 52b626b15a883b0300682a03aa8e048e317f1e56 MINICOM_SITE = https://salsa.debian.org/minicom-team/minicom.git MINICOM_SITE_METHOD = git MINICOM_LICENSE = GPL-2.0+ MINICOM_LICENSE_FILES = COPYING MINICOM_AUTORECONF = YES -# pkg-config is only used to check for liblockdev, which we don't have -# in BR, so instead of adding host-pkgconf as a dependency, simply make -# sure the host version isn't used so we don't end up with problems if -# people have liblockdev1-dev installed -MINICOM_CONF_ENV = PKG_CONFIG=/bin/false - MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) \ - $(TARGET_NLS_DEPENDENCIES) + $(TARGET_NLS_DEPENDENCIES) host-pkgconf # add host-gettext for AM_ICONV macro MINICOM_DEPENDENCIES += host-gettext -# Autoreconf requires an existing m4 directory -define MINICOM_MKDIR_M4 - mkdir -p $(@D)/m4 -endef -MINICOM_POST_PATCH_HOOKS += MINICOM_MKDIR_M4 - MINICOM_CONF_OPTS = \ --enable-dfl-port=/dev/ttyS1 \ --enable-lock-dir=/var/lock diff --git a/buildroot/package/minidlna/minidlna.hash b/buildroot/package/minidlna/minidlna.hash index 5398506c2..608970b1c 100644 --- a/buildroot/package/minidlna/minidlna.hash +++ b/buildroot/package/minidlna/minidlna.hash @@ -2,4 +2,6 @@ md5 a968d3d84971322471cabda3669cc0f8 minidlna-1.2.1.tar.gz sha1 79d0032c7055aefd4c8e5178bc86fbf258d449d2 minidlna-1.2.1.tar.gz # Locally computed -sha256 67388ba23ab0c7033557a32084804f796aa2a796db7bb2b770fb76ac2a742eec minidlna-1.2.1.tar.gz +sha256 67388ba23ab0c7033557a32084804f796aa2a796db7bb2b770fb76ac2a742eec minidlna-1.2.1.tar.gz +sha256 79146b7f558e56510b9a714ff75318c05ab93aeccfd6597497b9bce212cf92ea COPYING +sha256 94876d7886116e176e702b4902bd9f19731a6883db5f229ac2a7058a22aa6529 LICENCE.miniupnpd diff --git a/buildroot/package/minidlna/minidlna.mk b/buildroot/package/minidlna/minidlna.mk index 262480cbf..c66e97b07 100644 --- a/buildroot/package/minidlna/minidlna.mk +++ b/buildroot/package/minidlna/minidlna.mk @@ -31,11 +31,6 @@ endef define MINIDLNA_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/minidlna/minidlnad.service \ $(TARGET_DIR)/usr/lib/systemd/system/minidlnad.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/minidlnad.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/minidlnad.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/minimodem/Config.in b/buildroot/package/minimodem/Config.in new file mode 100644 index 000000000..7d4efb690 --- /dev/null +++ b/buildroot/package/minimodem/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_MINIMODEM + bool "minimodem" + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_SINGLE + select BR2_PACKAGE_LIBSNDFILE if !BR2_PACKAGE_ALSA_LIB_PCM && !BR2_PACKAGE_PULSEAUDIO + help + Minimodem is a command-line program which decodes (or + generates) audio modem tones at any specified baud rate, + using various framing protocols. It acts a general-purpose + software FSK modem, and includes support for various + standard FSK protocols such as Bell103, Bell202, RTTY, + TTY/TDD NOAA SAME, and Caller-ID. + + http://www.whence.com/minimodem/ diff --git a/buildroot/package/minimodem/minimodem.hash b/buildroot/package/minimodem/minimodem.hash new file mode 100644 index 000000000..084a5606f --- /dev/null +++ b/buildroot/package/minimodem/minimodem.hash @@ -0,0 +1,2 @@ +sha256 f8cca4db8e3f284d67f843054d6bb4d88a3db5e77b26192410e41e9a06f4378e minimodem-0.24.tar.gz +sha256 c298178753129680ef6d3112f0f8b61acc405c86c1997dfe59735257988f8b33 COPYING diff --git a/buildroot/package/minimodem/minimodem.mk b/buildroot/package/minimodem/minimodem.mk new file mode 100644 index 000000000..9b9ee158e --- /dev/null +++ b/buildroot/package/minimodem/minimodem.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# minimodem +# +################################################################################ + +MINIMODEM_VERSION = 0.24 +MINIMODEM_SITE = http://www.whence.com/minimodem +MINIMODEM_LICENSE = GPL-3.0+ +MINIMODEM_LICENSE_FILES = COPYING + +MINIMODEM_DEPENDENCIES = fftw-single host-pkgconf + +ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM),y) +MINIMODEM_DEPENDENCIES += alsa-lib +MINIMODEM_CONF_OPTS += --with-alsa +else +MINIMODEM_CONF_OPTS += --without-alsa +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +MINIMODEM_DEPENDENCIES += pulseaudio +MINIMODEM_CONF_OPTS += --with-pulseaudio +else +MINIMODEM_CONF_OPTS += --without-pulseaudio +endif + +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +MINIMODEM_DEPENDENCIES += libsndfile +MINIMODEM_CONF_OPTS += --with-sndfile +else +MINIMODEM_CONF_OPTS += --without-sndfile +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/minissdpd/minissdpd.hash b/buildroot/package/minissdpd/minissdpd.hash index a1729d685..695f652b3 100644 --- a/buildroot/package/minissdpd/minissdpd.hash +++ b/buildroot/package/minissdpd/minissdpd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 bba94209b40755b32022db9450ee3f4446896a16912915fbb292001a7f8087b0 minissdpd-1.5.20180223.tar.gz -sha256 8801b32567ec20015c7d31668602a3a7f4a4785b7e17468360146b6003713cba LICENSE +sha256 07feea19dfa7d79d144e0f4a19a859a21cdb58445b77dc2d6222f2434e0ac92c minissdpd-1.5.20190824.tar.gz +sha256 00c8368dd1574b025df65f24f61c32d1297ff9b6dc695fda964b1b1efc7a53d3 LICENSE diff --git a/buildroot/package/minissdpd/minissdpd.mk b/buildroot/package/minissdpd/minissdpd.mk index 31d942eac..55973752c 100644 --- a/buildroot/package/minissdpd/minissdpd.mk +++ b/buildroot/package/minissdpd/minissdpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINISSDPD_VERSION = 1.5.20180223 +MINISSDPD_VERSION = 1.5.20190824 MINISSDPD_SITE = http://miniupnp.free.fr/files MINISSDPD_LICENSE = BSD-3-Clause MINISSDPD_LICENSE_FILES = LICENSE @@ -32,9 +32,6 @@ endef define MINISSDPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/minissdpd/minissdpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/minissdpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/minissdpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/minissdpd.service endef $(eval $(generic-package)) diff --git a/buildroot/package/minizip/minizip.hash b/buildroot/package/minizip/minizip.hash index d9473581c..e27eb03d9 100644 --- a/buildroot/package/minizip/minizip.hash +++ b/buildroot/package/minizip/minizip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b01607d219ed40d817404947dd5339d64242a083df6372c37b0387b5501d84f5 minizip-2.8.2.tar.gz -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 LICENSE +sha256 90481093302ccda81b2d129fea1800ea53be3f826ab0ec6176ad6807869ec4d9 minizip-2.9.1.tar.gz +sha256 675181c03fc1302a1c8554c00f7be9bb420c5dbc9dcc2013433cec144413de03 LICENSE diff --git a/buildroot/package/minizip/minizip.mk b/buildroot/package/minizip/minizip.mk index a9eea1b1c..40e6bcf9a 100644 --- a/buildroot/package/minizip/minizip.mk +++ b/buildroot/package/minizip/minizip.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINIZIP_VERSION = 2.8.2 +MINIZIP_VERSION = 2.9.1 MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) MINIZIP_DEPENDENCIES = \ host-pkgconf \ @@ -12,30 +12,30 @@ MINIZIP_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) MINIZIP_INSTALL_STAGING = YES MINIZIP_CONF_OPTS = \ - $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DBUILD_TEST=ON) \ - -DUSE_COMPAT=OFF + $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DMZ_BUILD_TEST=ON) \ + -DMZ_COMPAT=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_BZIP2),y) MINIZIP_DEPENDENCIES += bzip2 -MINIZIP_CONF_OPTS += -DUSE_BZIP2=ON +MINIZIP_CONF_OPTS += -DMZ_BZIP2=ON else -MINIZIP_CONF_OPTS += -DUSE_BZIP2=OFF +MINIZIP_CONF_OPTS += -DMZ_BZIP2=OFF endif ifeq ($(BR2_PACKAGE_OPENSSL),y) MINIZIP_DEPENDENCIES += openssl -MINIZIP_CONF_OPTS += -DUSE_OPENSSL=ON +MINIZIP_CONF_OPTS += -DMZ_OPENSSL=ON else -MINIZIP_CONF_OPTS += -DUSE_OPENSSL=OFF +MINIZIP_CONF_OPTS += -DMZ_OPENSSL=OFF endif ifeq ($(BR2_PACKAGE_ZLIB),y) MINIZIP_DEPENDENCIES += zlib -MINIZIP_CONF_OPTS += -DUSE_ZLIB=ON +MINIZIP_CONF_OPTS += -DMZ_ZLIB=ON else -MINIZIP_CONF_OPTS += -DUSE_ZLIB=OFF +MINIZIP_CONF_OPTS += -DMZ_ZLIB=OFF endif $(eval $(cmake-package)) diff --git a/buildroot/package/miraclecast/miraclecast.hash b/buildroot/package/miraclecast/miraclecast.hash index 97c68d019..1ec0b27fd 100644 --- a/buildroot/package/miraclecast/miraclecast.hash +++ b/buildroot/package/miraclecast/miraclecast.hash @@ -1,2 +1,6 @@ # Locally calculated -sha256 e11440f782519663db367285dd54b53eb5feb78682dac42bd90230222de9f0fd miraclecast-c94be167c85c6ec8badd7ac79e3dea2e0b73225c.tar.gz +sha256 e11440f782519663db367285dd54b53eb5feb78682dac42bd90230222de9f0fd miraclecast-c94be167c85c6ec8badd7ac79e3dea2e0b73225c.tar.gz +sha256 66bdcc8bcbd1d5ee336c4c8e8749ea538e17b0c0e22b0f705025deb1e912a6d3 COPYING +sha256 8e136a0e16783d79792e6a57a1422a40acea2e18affb5e2cecb858382f8b0a6c LICENSE_gdhcp +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE_htable +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE_lgpl diff --git a/buildroot/package/mjpegtools/mjpegtools.hash b/buildroot/package/mjpegtools/mjpegtools.hash index db184f784..76e9403f8 100644 --- a/buildroot/package/mjpegtools/mjpegtools.hash +++ b/buildroot/package/mjpegtools/mjpegtools.hash @@ -1,3 +1,5 @@ # From http://sourceforge.net/projects/mjpeg/files/mjpegtools/2.1.0/ md5 57bf5dd78976ca9bac972a6511b236f3 mjpegtools-2.1.0.tar.gz sha1 b9effa86280e23d67369e842e5cb645948583097 mjpegtools-2.1.0.tar.gz +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/mjpegtools/mjpegtools.mk b/buildroot/package/mjpegtools/mjpegtools.mk index f028afc82..e2c6b7d8b 100644 --- a/buildroot/package/mjpegtools/mjpegtools.mk +++ b/buildroot/package/mjpegtools/mjpegtools.mk @@ -7,6 +7,7 @@ MJPEGTOOLS_VERSION = 2.1.0 MJPEGTOOLS_SITE = http://sourceforge.net/projects/mjpeg/files/mjpegtools/$(MJPEGTOOLS_VERSION) MJPEGTOOLS_DEPENDENCIES = host-pkgconf jpeg +MJPEGTOOLS_INSTALL_STAGING = YES MJPEGTOOLS_LICENSE = GPL-2.0+ MJPEGTOOLS_LICENSE_FILES = COPYING # We're patching Makefile.am diff --git a/buildroot/package/mjpg-streamer/mjpg-streamer.hash b/buildroot/package/mjpg-streamer/mjpg-streamer.hash index 76716266b..0a08151a4 100644 --- a/buildroot/package/mjpg-streamer/mjpg-streamer.hash +++ b/buildroot/package/mjpg-streamer/mjpg-streamer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d2c2c9dbc95332245f34247f4a0791d741d1ae875084f9886442f48a01b01d81 mjpg-streamer-ddb69b7b4f114f3c2ca01adf55712792ca8aed43.tar.gz +sha256 bd934363b5cb6ef3665aa2dfa15d08b72bbfe84ca60f7c342fe8ae1f94e19201 mjpg-streamer-501f6362c5afddcfb41055f97ae484252c85c912.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 mjpg-streamer-experimental/LICENSE diff --git a/buildroot/package/mjpg-streamer/mjpg-streamer.mk b/buildroot/package/mjpg-streamer/mjpg-streamer.mk index 4077a3dcb..d5980dbf1 100644 --- a/buildroot/package/mjpg-streamer/mjpg-streamer.mk +++ b/buildroot/package/mjpg-streamer/mjpg-streamer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MJPG_STREAMER_VERSION = ddb69b7b4f114f3c2ca01adf55712792ca8aed43 +MJPG_STREAMER_VERSION = 501f6362c5afddcfb41055f97ae484252c85c912 MJPG_STREAMER_SITE = $(call github,jacksonliam,mjpg-streamer,$(MJPG_STREAMER_VERSION)) MJPG_STREAMER_SUBDIR = mjpg-streamer-experimental MJPG_STREAMER_LICENSE = GPL-2.0+ diff --git a/buildroot/package/mksh/mksh.hash b/buildroot/package/mksh/mksh.hash index 411baa862..4e71a4263 100644 --- a/buildroot/package/mksh/mksh.hash +++ b/buildroot/package/mksh/mksh.hash @@ -1,4 +1,4 @@ # From http://www.mirbsd.org/mksh.htm#build -md5 718c44251b52c48e7312903273e263f4 mksh-R55.tgz -# Calculated based on the hash above -sha256 ced42cb4a181d97d52d98009eed753bd553f7c34e6991d404f9a8dcb45c35a57 mksh-R55.tgz +sha256 3d101154182d52ae54ef26e1360c95bc89c929d28859d378cc1c84f3439dbe75 mksh-R57.tgz +# Locally computed +sha256 4655d87a53a703ead36a52f166f065c23cf58dd02d7b14abd2474f9f49383a16 mksh.1 diff --git a/buildroot/package/mksh/mksh.mk b/buildroot/package/mksh/mksh.mk index 4fa0e020a..2aa8f70ff 100644 --- a/buildroot/package/mksh/mksh.mk +++ b/buildroot/package/mksh/mksh.mk @@ -4,8 +4,8 @@ # ################################################################################ -MKSH_VERSION = R55 -MKSH_SOURCE = mksh-$(MKSH_VERSION).tgz +MKSH_VERSION = 57 +MKSH_SOURCE = mksh-R$(MKSH_VERSION).tgz MKSH_SITE = https://www.mirbsd.org/MirOS/dist/mir/mksh # For MirOS License see https://www.mirbsd.org/TaC-mksh.txt MKSH_LICENSE = MirOS, ISC diff --git a/buildroot/package/mmc-utils/0001-fix-mmc-h-includes.patch b/buildroot/package/mmc-utils/0001-fix-mmc-h-includes.patch deleted file mode 100644 index 8d0b2eb23..000000000 --- a/buildroot/package/mmc-utils/0001-fix-mmc-h-includes.patch +++ /dev/null @@ -1,41 +0,0 @@ -mmc-utils: fix mmc.h includes - -Some toolchains include asm-generic/int-l64.h from their asm/types.h -file for certain 64-bit architectures. This causes a conflict between -types like this one: - -asm-generic/int-l64.h:28:25: error: conflicting types for '__s64' - typedef __signed__ long __s64; - ^ -In file included from mmc.h:17:0, - from mmc_cmds.c:30: -asm-generic/int-ll64.h:29:44: note: previous declaration of '__s64' was -here - __extension__ typedef __signed__ long long __s64; - -[Ryan: added include of linux/types.h because mmc/ioctl.h does not - include it in kernel version before 3.4] - -Signed-off-by: Vicente Olivert Riera -Signed-off-by: Ryan Barnett ---- - mmc.h | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) -diff --git a/mmc.h b/mmc.h -index 9871d62..2d54ec5 100644 ---- a/mmc.h -+++ b/mmc.h -@@ -14,9 +14,12 @@ - * Boston, MA 021110-1307, USA. - */ - --#include -+#include - #include - #include -+#ifndef _ASM_GENERIC_INT_L64_H -+#include -+#endif - - #define CHECK(expr, msg, err_stmt) { if (expr) { fprintf(stderr, msg); err_stmt; } } - diff --git a/buildroot/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch b/buildroot/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch new file mode 100644 index 000000000..7725f9ca5 --- /dev/null +++ b/buildroot/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch @@ -0,0 +1,37 @@ +From 6208cc78f6efd1fafc4f5bc6a487247a383df80f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 28 Sep 2019 20:44:52 +0200 +Subject: [PATCH] mmc_cmds.c: fix build with gcc 4.9 + +Fix following error with gcc 4.9: + +mmc_cmds.c:1918:9: error: missing braces around initializer [-Werror=missing-braces] + struct rpmb_frame frame_status = {0}; + +Fixes: + - http://autobuild.buildroot.org/results/bf3b6f9f6ef39b99842b3c92495b7bf359c68158 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to linux-mmc@vger.kernel.org] +--- + mmc_cmds.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/mmc_cmds.c b/mmc_cmds.c +index fb37189..6b09f26 100644 +--- a/mmc_cmds.c ++++ b/mmc_cmds.c +@@ -1915,7 +1915,9 @@ static int do_rpmb_op(int fd, + u_int16_t rpmb_type; + struct mmc_ioc_multi_cmd *mioc; + struct mmc_ioc_cmd *ioc; +- struct rpmb_frame frame_status = {0}; ++ struct rpmb_frame frame_status; ++ ++ memset(&frame_status, 0, sizeof(frame_status)); + + if (!frame_in || !frame_out || !out_cnt) + return -EINVAL; +-- +2.23.0 + diff --git a/buildroot/package/mmc-utils/0002-fix-overlapping-with-strncpy.patch b/buildroot/package/mmc-utils/0002-fix-overlapping-with-strncpy.patch deleted file mode 100644 index a562845ff..000000000 --- a/buildroot/package/mmc-utils/0002-fix-overlapping-with-strncpy.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1c90a7534658056b884d71ef82dc7ca8bad4271b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= -Date: Wed, 24 Oct 2018 13:00:47 +0200 -Subject: [PATCH] mmc-utils: fix overlapping with strncpy -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 8.2 warns about an overlapping using strncpy. - -Replace strncpy with a memmove to avoid this issue. - -In file included from /usr/include/string.h:494, - from lsmmc.c:46: -In function ‘strncpy’, - inlined from ‘read_file’ at lsmmc.c:356:3: -/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ accessing 4096 bytes at offsets 0 and 1 overlaps 4095 bytes at offset 1 [-Werror=restrict] - return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -cc1: all warnings being treated as errors -make: *** [Makefile:36: lsmmc.o] Error 1 - -Signed-off-by: Clément Péron -Signed-off-by: Sébastien Szymanski ---- - lsmmc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lsmmc.c b/lsmmc.c -index c4faa00..bcb854d 100644 ---- a/lsmmc.c -+++ b/lsmmc.c -@@ -353,7 +353,7 @@ char *read_file(char *name) - line[strlen(line) - 1] = '\0'; - - while (isspace(line[0])) -- strncpy(&line[0], &line[1], sizeof(line)); -+ memmove(&line[0], &line[1], sizeof(line)-1); - - return strdup(line); - } --- -2.16.4 - diff --git a/buildroot/package/mmc-utils/mmc-utils.hash b/buildroot/package/mmc-utils/mmc-utils.hash index 35cd5800d..86c644f77 100644 --- a/buildroot/package/mmc-utils/mmc-utils.hash +++ b/buildroot/package/mmc-utils/mmc-utils.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 92ba148648688fca6e0e0e30248ebc6b432bea55584760f20a013583f20a109d mmc-utils-37c86e60c0442fef570b75cd81aeb1db4d0cbafd.tar.gz +sha256 df8876e0e671f502bb8872cecca3cc6d1055253fa314f3544d22829e129e024e mmc-utils-d40ec535b9d4e4c974e8c2fbfb422cd0348cc5e8.tar.gz +sha256 c3165393bcd710624e2909327a6fbeb736c47bdbe66de1c1a364ac7324d3e4d6 mmc.h diff --git a/buildroot/package/mmc-utils/mmc-utils.mk b/buildroot/package/mmc-utils/mmc-utils.mk index 9aeaf5c69..8c264a454 100644 --- a/buildroot/package/mmc-utils/mmc-utils.mk +++ b/buildroot/package/mmc-utils/mmc-utils.mk @@ -4,12 +4,17 @@ # ################################################################################ -MMC_UTILS_VERSION = 37c86e60c0442fef570b75cd81aeb1db4d0cbafd +MMC_UTILS_VERSION = d40ec535b9d4e4c974e8c2fbfb422cd0348cc5e8 MMC_UTILS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git MMC_UTILS_LICENSE = GPL-2.0 +MMC_UTILS_LICENSE_FILES = mmc.h +# override AM_CFLAGS as the project Makefile uses it to pass +# -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2, and the latter conflicts +# with the _FORTIFY_SOURCE that we pass when hardening options are +# enabled. define MMC_UTILS_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) + $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) AM_CFLAGS= endef define MMC_UTILS_INSTALL_TARGET_CMDS diff --git a/buildroot/package/moarvm/0001-Fix-Name-Collision-With-LibTomMath-Funcs.patch b/buildroot/package/moarvm/0001-Fix-Name-Collision-With-LibTomMath-Funcs.patch deleted file mode 100644 index 4af4d3264..000000000 --- a/buildroot/package/moarvm/0001-Fix-Name-Collision-With-LibTomMath-Funcs.patch +++ /dev/null @@ -1,65 +0,0 @@ -From ead5f4da759465cf6fc2ceab7c431d3550a3323f Mon Sep 17 00:00:00 2001 -From: Timo Paulssen -Date: Tue, 15 Jan 2019 12:35:56 +0100 -Subject: [PATCH] Fix Name Collision With Existing LibTomMath Function - -fixes #1032 - -Upstream: https://github.com/MoarVM/MoarVM/commit/f7204a3ee5199dd70f26d6fe133008cc86c63bbe -(backported mp_get_double() as other functions weren't yet used) - -Signed-off-by: Matthew Weber ---- - src/math/bigintops.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/math/bigintops.c b/src/math/bigintops.c -index 2275593..8ab7ed6 100644 ---- a/src/math/bigintops.c -+++ b/src/math/bigintops.c -@@ -45,7 +45,7 @@ int MVM_bigint_mp_set_uint64(mp_int * a, MVMuint64 b) { - return MP_OKAY; - } - --static MVMnum64 mp_get_double(mp_int *a) { -+static MVMnum64 MVM_mp_get_double(mp_int *a) { - MVMnum64 d = 0.0; - MVMnum64 sign = SIGN(a) == MP_NEG ? -1.0 : 1.0; - int i; -@@ -680,8 +680,8 @@ MVMObject * MVM_bigint_pow(MVMThreadContext *tc, MVMObject *a, MVMObject *b, - } - } - else { -- MVMnum64 f_base = mp_get_double(base); -- MVMnum64 f_exp = mp_get_double(exponent); -+ MVMnum64 f_base = MVM_mp_get_double(base); -+ MVMnum64 f_exp = MVM_mp_get_double(exponent); - r = MVM_repr_box_num(tc, num_type, pow(f_base, f_exp)); - } - clear_temp_bigints(tmp, 2); -@@ -880,7 +880,7 @@ MVMnum64 MVM_bigint_to_num(MVMThreadContext *tc, MVMObject *a) { - - if (MVM_BIGINT_IS_BIG(ba)) { - mp_int *ia = ba->u.bigint; -- return mp_get_double(ia); -+ return MVM_mp_get_double(ia); - } else { - return (double)ba->u.smallint.value; - } -@@ -913,11 +913,11 @@ MVMnum64 MVM_bigint_div_num(MVMThreadContext *tc, MVMObject *a, MVMObject *b) { - mp_init(&reduced_b); - mp_div_2d(ia, max_size - 1023, &reduced_a, NULL); - mp_div_2d(ib, max_size - 1023, &reduced_b, NULL); -- c = mp_get_double(&reduced_a) / mp_get_double(&reduced_b); -+ c = MVM_mp_get_double(&reduced_a) / MVM_mp_get_double(&reduced_b); - mp_clear(&reduced_a); - mp_clear(&reduced_b); - } else { -- c = mp_get_double(ia) / mp_get_double(ib); -+ c = MVM_mp_get_double(ia) / MVM_mp_get_double(ib); - } - clear_temp_bigints(tmp, 2); - } else { --- -1.9.1 - diff --git a/buildroot/package/moarvm/0001-dynload-dynload_unix.c-don-t-use-RTLD_DI_LINKMAP-wit.patch b/buildroot/package/moarvm/0001-dynload-dynload_unix.c-don-t-use-RTLD_DI_LINKMAP-wit.patch new file mode 100644 index 000000000..326423679 --- /dev/null +++ b/buildroot/package/moarvm/0001-dynload-dynload_unix.c-don-t-use-RTLD_DI_LINKMAP-wit.patch @@ -0,0 +1,38 @@ +From a83f1fd053aadd2e849df80f67b69ba7298341f3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 25 Dec 2019 20:37:57 +0100 +Subject: [PATCH] dynload/dynload_unix.c: don't use RTLD_DI_LINKMAP with uclibc + +RTLD_DI_LINKMAP is not defined on uclibc so check that __UCLIBC__ is not +defined before using it otherwise build fails on: + +dynload_unix.c:93:19: error: 'RTLD_DI_LINKMAP' undeclared (first use in this function); did you mean 'RTLD_BINDING_MASK'? + if(dlinfo(pLib, RTLD_DI_LINKMAP, &p) == 0) { + ^~~~~~~~~~~~~~~ + RTLD_BINDING_MASK + +Fixes: + - http://autobuild.buildroot.org/results/b88e55dde1acab967023ae49bb1722eadb9cc6ab + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/MoarVM/dyncall/pull/6] +--- + dynload/dynload_unix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/3rdparty/dyncall/dynload/dynload_unix.c b/3rdparty/dyncall/dynload/dynload_unix.c +index adfd351..129a1e5 100644 +--- a/3rdparty/dyncall/dynload/dynload_unix.c ++++ b/3rdparty/dyncall/dynload/dynload_unix.c +@@ -82,7 +82,7 @@ void dlFreeLibrary(DLLib* pLib) + /* that: check for RTLD_DI_LINKMAP (#define for dlinfo()), or if GNU C Lib */ + /* is used (where RTLD_DI_LINKMAP is an enum), or by OS (dlinfo comes from */ + /* Solaris), etc. */ +-#if defined(RTLD_DI_LINKMAP) || defined(OS_SunOS) || defined(__GLIBC__) /* @@@ dlinfo() was introduced in glibc 2.3.3 (in 2003), somehow check for that, also */ ++#if defined(RTLD_DI_LINKMAP) || defined(OS_SunOS) || (defined(__GLIBC__) && !defined(__UCLIBC__)) /* @@@ dlinfo() was introduced in glibc 2.3.3 (in 2003), somehow check for that, also */ + + #include + +-- +2.24.0 + diff --git a/buildroot/package/moarvm/moarvm.hash b/buildroot/package/moarvm/moarvm.hash index 409486ac7..908885f68 100644 --- a/buildroot/package/moarvm/moarvm.hash +++ b/buildroot/package/moarvm/moarvm.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 7cb9b7a871b14ac9b6cddc57e646d277177c4b3b21220e6fbc204084a15a4e41 MoarVM-2017.05.tar.gz +sha256 dcb61e44a098e8375c385eb9d52bd6394255a388697b2f6a52d88e6cf4a53587 MoarVM-2020.01.1.tar.gz +sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/buildroot/package/moarvm/moarvm.mk b/buildroot/package/moarvm/moarvm.mk index 705c93934..e554ddb6d 100644 --- a/buildroot/package/moarvm/moarvm.mk +++ b/buildroot/package/moarvm/moarvm.mk @@ -4,13 +4,13 @@ # ################################################################################ -MOARVM_VERSION = 2017.05 +MOARVM_VERSION = 2020.01.1 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 MOARVM_LICENSE_FILES = Artistic2.txt MOARVM_INSTALL_STAGING = YES -MOARVM_DEPENDENCIES = host-lua host-pkgconf libuv libtommath libatomic_ops +MOARVM_DEPENDENCIES = host-pkgconf libuv libtommath libatomic_ops MOARVM_CONF_OPTS = \ --build=$(GNU_HOST_NAME) \ @@ -20,7 +20,6 @@ MOARVM_CONF_OPTS = \ --ld="$(TARGET_CC)" \ --prefix="/usr" \ --pkgconfig=$(PKG_CONFIG_HOST_BINARY) \ - --lua=$(HOST_DIR)/bin/lua \ --has-libuv \ --has-libtommath \ --has-libatomic diff --git a/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash b/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash index 632fc935a..bbdfd1f03 100644 --- a/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash +++ b/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash @@ -1,4 +1,4 @@ -# http://ftp.acc.umu.se/pub/GNOME/sources/mobile-broadband-provider-info/20190116/mobile-broadband-provider-info-20190116.sha256sum -sha256 2cba10f82b8e6aec46b871c1f7d20086ecc17e1168f18e588a6a37770fa3c59b mobile-broadband-provider-info-20190116.tar.xz +# http://ftp.acc.umu.se/pub/GNOME/sources/mobile-broadband-provider-info/20190618/mobile-broadband-provider-info-20190618.sha256sum +sha256 c22d64a565d1975b9eecb6ed2eeaef18634bc6f385c8137d05e845d8fb3cce5b mobile-broadband-provider-info-20190618.tar.xz # Locally computed sha256 3d510b215a33087b9ceb9592da21575ea1f9f98bd4d983a38e65fe851a552174 COPYING diff --git a/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk b/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk index ed741f6fa..2986f92f6 100644 --- a/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk +++ b/buildroot/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk @@ -4,12 +4,12 @@ # ################################################################################ -MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20190116 +MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20190618 MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION) MOBILE_BROADBAND_PROVIDER_INFO_SOURCE = mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION).tar.xz MOBILE_BROADBAND_PROVIDER_INFO_LICENSE = Public domain MOBILE_BROADBAND_PROVIDER_INFO_LICENSE_FILES = COPYING MOBILE_BROADBAND_PROVIDER_INFO_INSTALL_STAGING = YES -MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkgconf +MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkgconf host-libxslt $(eval $(autotools-package)) diff --git a/buildroot/package/modem-manager/0001-kerneldevice-fix-build-with-musl-libc.patch b/buildroot/package/modem-manager/0001-kerneldevice-fix-build-with-musl-libc.patch deleted file mode 100644 index 68181cb5e..000000000 --- a/buildroot/package/modem-manager/0001-kerneldevice-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ed40ac76b125b1c3b2e2f8522d283b073c23bd3b Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 15 Jun 2018 06:25:46 +0300 -Subject: [PATCH] kerneldevice: fix build with musl libc - -musl libc does not implement the canonicalize_file_name() GNU extension. -Use the POSIX standard realpath() instead. - -Signed-off-by: Baruch Siach ---- -Upstream status: sent to modemmanager-devel@lists.freedesktop.org - - src/kerneldevice/mm-kernel-device-generic.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/kerneldevice/mm-kernel-device-generic.c b/src/kerneldevice/mm-kernel-device-generic.c -index 6b0f072402ff..885bef171f5d 100644 ---- a/src/kerneldevice/mm-kernel-device-generic.c -+++ b/src/kerneldevice/mm-kernel-device-generic.c -@@ -120,7 +120,7 @@ preload_sysfs_path (MMKernelDeviceGeneric *self) - mm_kernel_event_properties_get_subsystem (self->priv->properties), - mm_kernel_event_properties_get_name (self->priv->properties)); - -- self->priv->sysfs_path = canonicalize_file_name (tmp); -+ self->priv->sysfs_path = realpath (tmp, NULL); - if (!self->priv->sysfs_path || !g_file_test (self->priv->sysfs_path, G_FILE_TEST_EXISTS)) { - mm_warn ("Invalid sysfs path read for %s/%s", - mm_kernel_event_properties_get_subsystem (self->priv->properties), -@@ -163,7 +163,7 @@ preload_interface_sysfs_path (MMKernelDeviceGeneric *self) - * The correct parent dir we want to have is the first one with "usb" subsystem. - */ - aux = g_strdup_printf ("%s/device", self->priv->sysfs_path); -- dirpath = canonicalize_file_name (aux); -+ dirpath = realpath (aux, NULL); - g_free (aux); - - while (dirpath) { -@@ -179,7 +179,7 @@ preload_interface_sysfs_path (MMKernelDeviceGeneric *self) - gchar *canonicalized_subsystem; - gchar *subsystem_name; - -- canonicalized_subsystem = canonicalize_file_name (subsystem_filepath); -+ canonicalized_subsystem = realpath (subsystem_filepath, NULL); - g_free (subsystem_filepath); - - subsystem_name = g_path_get_basename (canonicalized_subsystem); -@@ -239,7 +239,7 @@ preload_driver (MMKernelDeviceGeneric *self) - gchar *tmp2; - - tmp = g_strdup_printf ("%s/driver", self->priv->interface_sysfs_path); -- tmp2 = canonicalize_file_name (tmp); -+ tmp2 = realpath (tmp, NULL); - if (tmp2 && g_file_test (tmp2, G_FILE_TEST_EXISTS)) - self->priv->driver = g_path_get_basename (tmp2); - g_free (tmp2); -@@ -308,7 +308,7 @@ preload_physdev_subsystem (MMKernelDeviceGeneric *self) - gchar *subsyspath; - - aux = g_strdup_printf ("%s/subsystem", self->priv->physdev_sysfs_path); -- subsyspath = canonicalize_file_name (aux); -+ subsyspath = realpath (aux, NULL); - self->priv->physdev_subsystem = g_path_get_dirname (subsyspath); - g_free (subsyspath); - g_free (aux); --- -2.17.1 - diff --git a/buildroot/package/modem-manager/modem-manager.hash b/buildroot/package/modem-manager/modem-manager.hash index 77a8c2dc4..f9d790cd0 100644 --- a/buildroot/package/modem-manager/modem-manager.hash +++ b/buildroot/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 18abe34421aa3b52ff47d4ba93aa282f8f8944717dd644a5c0c81eeeac9c7eb1 ModemManager-1.8.0.tar.xz +sha256 2eb3353ee5518005c51d429308695c69d8c38cf2fd9102b04f785c03a0cc624c ModemManager-1.12.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/modem-manager/modem-manager.mk b/buildroot/package/modem-manager/modem-manager.mk index e2f89d9de..75fc5811d 100644 --- a/buildroot/package/modem-manager/modem-manager.mk +++ b/buildroot/package/modem-manager/modem-manager.mk @@ -4,12 +4,12 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.8.0 +MODEM_MANAGER_VERSION = 1.12.6 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB -MODEM_MANAGER_DEPENDENCIES = host-pkgconf host-intltool libglib2 +MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = --disable-more-warnings diff --git a/buildroot/package/modplugtools/modplugtools.hash b/buildroot/package/modplugtools/modplugtools.hash index e29eda90e..848d64032 100644 --- a/buildroot/package/modplugtools/modplugtools.hash +++ b/buildroot/package/modplugtools/modplugtools.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 0122d44ea0513b928cf9d463acc886d08a2664579aa96ddeeb270d5c81193a4e modplugtools-0.5.3.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/mongodb/mongodb.mk b/buildroot/package/mongodb/mongodb.mk index d33670c14..22ca920e1 100644 --- a/buildroot/package/mongodb/mongodb.mk +++ b/buildroot/package/mongodb/mongodb.mk @@ -74,7 +74,7 @@ endif define MONGODB_BUILD_CMDS (cd $(@D); \ - $(SCONS) \ + $(HOST_DIR)/bin/python $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ $(MONGODB_SCONS_TARGETS)) @@ -82,7 +82,7 @@ endef define MONGODB_INSTALL_TARGET_CMDS (cd $(@D); \ - $(SCONS) \ + $(HOST_DIR)/bin/python $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ --prefix=$(TARGET_DIR)/usr \ diff --git a/buildroot/package/mongoose/mongoose.hash b/buildroot/package/mongoose/mongoose.hash index d38013163..c5de11bec 100644 --- a/buildroot/package/mongoose/mongoose.hash +++ b/buildroot/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1f20f2781862560ddf3203dfb0e6fcf248a68bf92aefbeafb9d2a629c4767c02 mongoose-6.16.tar.gz -sha256 fdc34eeea97327d75c83492abd34f1a3200c53dec04422ecda8071dc60a36d10 LICENSE +sha256 5bff3cc70bb2248cf87d06a3543f120f3b29b9368d25a7715443cb10612987cc mongoose-6.17.tar.gz +sha256 fdc34eeea97327d75c83492abd34f1a3200c53dec04422ecda8071dc60a36d10 LICENSE diff --git a/buildroot/package/mongoose/mongoose.mk b/buildroot/package/mongoose/mongoose.mk index bb40de261..7944f5e53 100644 --- a/buildroot/package/mongoose/mongoose.mk +++ b/buildroot/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 6.16 +MONGOOSE_VERSION = 6.17 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/mongrel2/mongrel2.hash b/buildroot/package/mongrel2/mongrel2.hash index b8f8de3d7..b1db917c5 100644 --- a/buildroot/package/mongrel2/mongrel2.hash +++ b/buildroot/package/mongrel2/mongrel2.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 543553c3082f2b992649a975f6cb7324ae2aea93af05288ea4f2c1262a7f63b2 mongrel2-v1.9.2.tar.bz2 +sha256 543553c3082f2b992649a975f6cb7324ae2aea93af05288ea4f2c1262a7f63b2 mongrel2-v1.9.2.tar.bz2 +sha256 eb6e2a2baa637d06f6aa762886fbc8939934eb5fdb0b3a5b3882f2a61e9a4357 LICENSE diff --git a/buildroot/package/monit/monit.hash b/buildroot/package/monit/monit.hash index 3f528590d..26d665c08 100644 --- a/buildroot/package/monit/monit.hash +++ b/buildroot/package/monit/monit.hash @@ -1,4 +1,4 @@ -# From https://mmonit.com/monit/dist/monit-5.25.3.tar.gz.sha256: -sha256 c10258c8839d20864d30390e7cbf2ff5e0480a67a6fb80c02aa457d6e3390569 monit-5.25.3.tar.gz +# From https://mmonit.com/monit/dist/monit-5.26.0.tar.gz.sha256: +sha256 87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2 monit-5.26.0.tar.gz # Locally computed sha256 d5a4f52b1a5e1e7fe14e01a76aac8b08dc6bbea15466058f271456c97aac1ada COPYING diff --git a/buildroot/package/monit/monit.mk b/buildroot/package/monit/monit.mk index 980da13cb..93e310ff7 100644 --- a/buildroot/package/monit/monit.mk +++ b/buildroot/package/monit/monit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONIT_VERSION = 5.25.3 +MONIT_VERSION = 5.26.0 MONIT_SITE = http://mmonit.com/monit/dist MONIT_LICENSE = AGPL-3.0 with OpenSSL exception MONIT_LICENSE_FILES = COPYING diff --git a/buildroot/package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch b/buildroot/package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch new file mode 100644 index 000000000..6596849a8 --- /dev/null +++ b/buildroot/package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch @@ -0,0 +1,28 @@ +From c1b9bd4214b78dc426bc6e6a07c23a8ab4ab50ea Mon Sep 17 00:00:00 2001 +From: Jordi Mas +Date: Tue, 12 Mar 2019 12:24:19 +0100 +Subject: [PATCH] Fixes MONO_PROFILE_ENTER_LEAVE undeclared when compiling with + newer versions of Mono (#266) + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/mono/gtk-sharp/commit/c1b9bd4214b78dc426bc6e6a07c23a8ab4ab50ea] +--- + gtk/gui-thread-check/profiler/gui-thread-check.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/gtk/gui-thread-check/profiler/gui-thread-check.c b/gtk/gui-thread-check/profiler/gui-thread-check.c +index 11838e3b0..9f45fe6b2 100644 +--- a/gtk/gui-thread-check/profiler/gui-thread-check.c ++++ b/gtk/gui-thread-check/profiler/gui-thread-check.c +@@ -86,6 +86,10 @@ simple_method_enter (MonoProfiler *prof, MonoMethod *method) + } + } + ++#ifndef MONO_PROFILE_ENTER_LEAVE ++#define MONO_PROFILE_ENTER_LEAVE (1 << 12) ++#endif ++ + void + mono_profiler_startup (const char *desc) + { diff --git a/buildroot/package/mono-gtksharp3/mono-gtksharp3.hash b/buildroot/package/mono-gtksharp3/mono-gtksharp3.hash index 4005051b1..706d98515 100644 --- a/buildroot/package/mono-gtksharp3/mono-gtksharp3.hash +++ b/buildroot/package/mono-gtksharp3/mono-gtksharp3.hash @@ -1,2 +1,5 @@ # sha256 from https://download.gnome.org/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.sha256sum -sha256 6440f571416267ae0cb5698071d087b31e3084693fa2c829b1db37ca7ea2c3a2 gtk-sharp-2.99.3.tar.xz +sha256 6440f571416267ae0cb5698071d087b31e3084693fa2c829b1db37ca7ea2c3a2 gtk-sharp-2.99.3.tar.xz + +# Locally computed +sha256 4b96eca92e6964e89c2faf6a810c9a0214daf6be651fa848fdfbb8cef80c04b1 COPYING diff --git a/buildroot/package/mono/0003-configure.ac-checks-for-libunwind.patch b/buildroot/package/mono/0003-configure.ac-checks-for-libunwind.patch new file mode 100644 index 000000000..8ff6b2f5c --- /dev/null +++ b/buildroot/package/mono/0003-configure.ac-checks-for-libunwind.patch @@ -0,0 +1,40 @@ +From 4dc1d1fe553f3a8ad00919324419aba54675239e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 15 May 2019 22:30:01 +0200 +Subject: [PATCH] configure.ac: checks for libunwind + +_Unwind_GetIP is used in build_stack_trace however this function can be +provided by libunwind so check for it to avoid the following build +failure: + +/home/buildroot/autobuild/run/instance-1/output/host/lib/gcc/arm-buildroot-linux-musleabihf/7.4.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: ./.libs/libmini.a(libmini_la-mini-exceptions.o): in function `build_stack_trace': +/home/buildroot/autobuild/run/instance-1/output/build/mono-5.20.1.27/mono/mini/mini-exceptions.c:365: undefined reference to `_Unwind_GetIP' +collect2: error: ld returned 1 exit status + +Fixes: + - http://autobuild.buildroot.net/results/dbd64c89815d393a4e28b312d74fd80ee6de92da + +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/configure.ac b/configure.ac +index d724f9e2d27..c3067246f08 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2206,6 +2206,11 @@ if test x$host_win32 = xno; then + dnl ***************************** + AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket") + ++ dnl ***************************** ++ dnl *** Checks for libunwind *** ++ dnl **************************** ++ AC_CHECK_LIB(unwind, _Unwind_GetIP, LIBS="$LIBS -lunwind") ++ + case "$host" in + *-*-*freebsd*) + dnl ***************************** +-- +2.20.1 + diff --git a/buildroot/package/mono/0004-ppc32-delete-leftover-code-from-pre-monoctx-area.patch b/buildroot/package/mono/0004-ppc32-delete-leftover-code-from-pre-monoctx-area.patch new file mode 100644 index 000000000..cfda7fdfa --- /dev/null +++ b/buildroot/package/mono/0004-ppc32-delete-leftover-code-from-pre-monoctx-area.patch @@ -0,0 +1,33 @@ +From 121928d29ac1e0aebb80531b3ebcca1a9ffcd618 Mon Sep 17 00:00:00 2001 +From: Bernhard Urban-Forster +Date: Fri, 6 Dec 2019 11:35:11 +0100 +Subject: [PATCH] [ppc32] delete leftover code from pre-monoctx area (#18072) + +Also update assert which doesn't make sense since we have moved over to MonoContext + +Some context: e7011c780f676914f559f14f25e76c192bb2b0b2 + +Fixes: https://github.com/mono/mono/issues/18064 +[Retrieved from: +https://github.com/mono/mono/commit/121928d29ac1e0aebb80531b3ebcca1a9ffcd618] +Signed-off-by: Fabrice Fontaine +--- + mono/mini/exceptions-ppc.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/mono/mini/exceptions-ppc.c b/mono/mini/exceptions-ppc.c +index 44d09bcaba1d..d14f8383eba9 100644 +--- a/mono/mini/exceptions-ppc.c ++++ b/mono/mini/exceptions-ppc.c +@@ -692,10 +692,7 @@ mono_arch_handle_altstack_exception (void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *s + /* may need to adjust pointers in the new struct copy, depending on the OS */ + uc_copy = (MonoContext*)(sp + 16); + mono_sigctx_to_monoctx (uc, uc_copy); +-#if defined(__linux__) && !defined(__mono_ppc64__) +- uc_copy->uc_mcontext.uc_regs = (gpointer)((char*)uc_copy + ((char*)uc->uc_mcontext.uc_regs - (char*)uc)); +-#endif +- g_assert (mono_arch_ip_from_context (uc) == mono_arch_ip_from_context (uc_copy)); ++ g_assert (mono_arch_ip_from_context (uc) == MONO_CONTEXT_GET_IP (uc_copy)); + /* at the return form the signal handler execution starts in altstack_handle_and_restore() */ + UCONTEXT_REG_LNK(uc) = UCONTEXT_REG_NIP(uc); + #ifdef PPC_USES_FUNCTION_DESCRIPTOR diff --git a/buildroot/package/mono/Config.in b/buildroot/package/mono/Config.in index a375a9844..0d555bfa8 100644 --- a/buildroot/package/mono/Config.in +++ b/buildroot/package/mono/Config.in @@ -12,6 +12,7 @@ config BR2_PACKAGE_MONO_ARCH_SUPPORTS config BR2_PACKAGE_MONO bool "mono" depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS help @@ -20,6 +21,7 @@ config BR2_PACKAGE_MONO http://download.mono-project.com/sources/mono/ -comment "mono needs a toolchain w/ threads, dynamic library" +comment "mono needs a toolchain w/ C++, threads, dynamic library" depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/mono/mono.hash b/buildroot/package/mono/mono.hash index db7ce52c9..fa5333867 100644 --- a/buildroot/package/mono/mono.hash +++ b/buildroot/package/mono/mono.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 d4f5fa2e8188d66fbc8054f4145711e45c1faa6d070e63600efab93d1d189498 mono-5.14.0.177.tar.bz2 -sha256 3b40a54878b5ac2767a764bd082f8772ab27c03b9da9c7328c4c4935725556f7 LICENSE +sha256 ed5df4ec663a4e228e89e910e954fa18d33f72e790c11174e1b62fc8cca90ba0 mono-6.8.0.96.tar.xz +sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt diff --git a/buildroot/package/mono/mono.mk b/buildroot/package/mono/mono.mk index 62eaeaf8b..274d9817e 100644 --- a/buildroot/package/mono/mono.mk +++ b/buildroot/package/mono/mono.mk @@ -4,9 +4,9 @@ # ################################################################################ -MONO_VERSION = 5.14.0.177 +MONO_VERSION = 6.8.0.96 MONO_SITE = http://download.mono-project.com/sources/mono -MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2 +MONO_SOURCE = mono-$(MONO_VERSION).tar.xz MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial MONO_LICENSE_FILES = LICENSE mcs/COPYING \ external/Newtonsoft.Json/Tools/7-zip/copying.txt @@ -40,7 +40,9 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) MONO_DEPENDENCIES += libiconv endif -MONO_DEPENDENCIES += host-mono +MONO_DEPENDENCIES += \ + host-mono \ + $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) ## Mono managed diff --git a/buildroot/package/monolite/monolite.hash b/buildroot/package/monolite/monolite.hash index cf7291685..bd953591b 100644 --- a/buildroot/package/monolite/monolite.hash +++ b/buildroot/package/monolite/monolite.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 bb4b3b12b9ff04b219ad00dcea78145475d756a1c22ad84e0db978a8eee8c654 monolite-linux-1051400005-latest.tar.gz +sha256 4b75a73bb4a99b8e3b51837afb72192cce27b482cb5ec70cc136b293071f902e monolite-linux-ABB721D6-116A-4555-B4FD-9248146D2051-latest.tar.gz diff --git a/buildroot/package/monolite/monolite.mk b/buildroot/package/monolite/monolite.mk index 2e1e54a54..b9e3990c4 100644 --- a/buildroot/package/monolite/monolite.mk +++ b/buildroot/package/monolite/monolite.mk @@ -4,14 +4,14 @@ # ################################################################################ -MONOLITE_VERSION = 1051400005 +MONOLITE_VERSION = ABB721D6-116A-4555-B4FD-9248146D2051 MONOLITE_SITE = http://download.mono-project.com/monolite MONOLITE_SOURCE = monolite-linux-$(MONOLITE_VERSION)-latest.tar.gz MONOLITE_LICENSE = LGPL-2.0 or commercial define HOST_MONOLITE_INSTALL_CMDS - mkdir -p $(HOST_DIR)/lib/monolite/$(MONOLITE_VERSION) - cp -r $(@D)/* $(HOST_DIR)/lib/monolite/$(MONOLITE_VERSION) + mkdir -p $(HOST_DIR)/lib/monolite-linux/$(MONOLITE_VERSION) + cp -r $(@D)/* $(HOST_DIR)/lib/monolite-linux/$(MONOLITE_VERSION) endef $(eval $(host-generic-package)) diff --git a/buildroot/package/mosh/Config.in b/buildroot/package/mosh/Config.in index 00da41c79..5b90358ca 100644 --- a/buildroot/package/mosh/Config.in +++ b/buildroot/package/mosh/Config.in @@ -1,7 +1,7 @@ -comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar, host and target gcc >= 4.8" +comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar, gcc >= 4.8" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS config BR2_PACKAGE_MOSH @@ -9,7 +9,6 @@ config BR2_PACKAGE_MOSH depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf - depends on BR2_HOST_GCC_AT_LEAST_4_8 # protobuf depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf depends on !BR2_STATIC_LIBS # protobuf depends on BR2_USE_WCHAR diff --git a/buildroot/package/mosquitto/Config.in b/buildroot/package/mosquitto/Config.in index c7373d9a8..b4effa36b 100644 --- a/buildroot/package/mosquitto/Config.in +++ b/buildroot/package/mosquitto/Config.in @@ -1,14 +1,21 @@ config BR2_PACKAGE_MOSQUITTO bool "mosquitto" - depends on !BR2_STATIC_LIBS # builds .so help - Mosquitto is an open source message broker that implements - the MQ Telemetry Transport protocol versions 3.1 and - 3.1.1. MQTT provides a lightweight method of carrying out - messaging using a publish/subscribe model. This makes it - suitable for "machine to machine" messaging such as with low - power sensors or mobile devices such as phones, embedded - computers or microcontrollers like the Arduino. + Eclipse Mosquitto is an open source (EPL/EDL licensed) message + broker that implements the MQTT protocol versions 5.0, 3.1.1 + and 3.1. Mosquitto is lightweight and is suitable for use on + all devices from low power single board computers to full + servers. + + The MQTT protocol provides a lightweight method of carrying + out messaging using a publish/subscribe model. This makes it + suitable for Internet of Things messaging such as with low + power sensors or mobile devices such as phones, + embedded computers or microcontrollers. + + The Mosquitto project also provides a C library for + implementing MQTT clients, and the very popular mosquitto_pub + and mosquitto_sub command line MQTT clients. http://mosquitto.org/ @@ -16,12 +23,12 @@ config BR2_PACKAGE_MOSQUITTO_BROKER bool "install the mosquitto broker" default y depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # include depends on BR2_PACKAGE_MOSQUITTO help Build and install the mosquitto broker onto target. -comment "mosquitto broker needs a system with MMU" - depends on BR2_PACKAGE_MOSQUITTO && !BR2_USE_MMU - -comment "mosquitto needs a toolchain w/ dynamic library" +comment "mosquitto broker needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU depends on BR2_STATIC_LIBS + depends on BR2_PACKAGE_MOSQUITTO diff --git a/buildroot/package/mosquitto/mosquitto.hash b/buildroot/package/mosquitto/mosquitto.hash index 83b521aa8..ab3f7aeb2 100644 --- a/buildroot/package/mosquitto/mosquitto.hash +++ b/buildroot/package/mosquitto/mosquitto.hash @@ -1,7 +1,8 @@ # Locally calculated after checking gpg signature -sha256 d7b62aa0ca680b0d869d6883373903362f98326a6465fc6cd01a0b9e0e8f0333 mosquitto-1.5.9.tar.gz +# from https://mosquitto.org/files/source/mosquitto-1.6.9.tar.gz.asc +sha256 412979b2db0a0020bd02fa64f0a0de9e7000b84462586e32b67f29bb1f6c1685 mosquitto-1.6.9.tar.gz # License files -sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt -sha256 3b9be6b894d0769de796e653571ff6cef494913c0ce78c35a97db939e7d9087c epl-v10 -sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 +sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt +sha256 3b9be6b894d0769de796e653571ff6cef494913c0ce78c35a97db939e7d9087c epl-v10 +sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 diff --git a/buildroot/package/mosquitto/mosquitto.mk b/buildroot/package/mosquitto/mosquitto.mk index b6ee048cc..ea57d7693 100644 --- a/buildroot/package/mosquitto/mosquitto.mk +++ b/buildroot/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.5.9 +MOSQUITTO_VERSION = 1.6.9 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 @@ -17,6 +17,23 @@ MOSQUITTO_MAKE_OPTS = \ WITH_WRAP=no \ WITH_DOCS=no +ifeq ($(BR2_SHARED_LIBS),y) +MOSQUITTO_MAKE_OPTS += WITH_STATIC_LIBRARIES=no +else +MOSQUITTO_MAKE_OPTS += WITH_STATIC_LIBRARIES=yes +endif + +ifeq ($(BR2_STATIC_LIBS),y) +MOSQUITTO_MAKE_OPTS += WITH_SHARED_LIBRARIES=no +else +MOSQUITTO_MAKE_OPTS += WITH_SHARED_LIBRARIES=yes +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +MOSQUITTO_MAKE_OPTS += WITH_SYSTEMD=yes +MOSQUITTO_DEPENDENCIES += systemd +endif + # adns uses getaddrinfo_a ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) MOSQUITTO_MAKE_OPTS += WITH_ADNS=yes @@ -31,8 +48,10 @@ MOSQUITTO_MAKE_OPTS += WITH_THREADING=no endif ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -MOSQUITTO_DEPENDENCIES += libopenssl -MOSQUITTO_MAKE_OPTS += WITH_TLS=yes +MOSQUITTO_DEPENDENCIES += host-pkgconf libopenssl +MOSQUITTO_MAKE_OPTS += \ + WITH_TLS=yes \ + CLIENT_STATIC_LDADD="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`" else MOSQUITTO_MAKE_OPTS += WITH_TLS=no endif @@ -44,13 +63,6 @@ else MOSQUITTO_MAKE_OPTS += WITH_SRV=no endif -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -MOSQUITTO_DEPENDENCIES += util-linux -MOSQUITTO_MAKE_OPTS += WITH_UUID=yes -else -MOSQUITTO_MAKE_OPTS += WITH_UUID=no -endif - ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS),y) MOSQUITTO_DEPENDENCIES += libwebsockets MOSQUITTO_MAKE_OPTS += WITH_WEBSOCKETS=yes @@ -97,11 +109,8 @@ define MOSQUITTO_INSTALL_INIT_SYSV endef define MOSQUITTO_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/mosquitto/mosquitto.service \ + $(INSTALL) -D -m 644 $(@D)/service/systemd/mosquitto.service.notify \ $(TARGET_DIR)/usr/lib/systemd/system/mosquitto.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/mosquitto.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mosquitto.service endef define MOSQUITTO_USERS diff --git a/buildroot/package/mosquitto/mosquitto.service b/buildroot/package/mosquitto/mosquitto.service deleted file mode 100644 index 2d1939d1c..000000000 --- a/buildroot/package/mosquitto/mosquitto.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Mosquitto MQTT broker - -[Service] -ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf -ExecReload=/bin/kill -HUP $MAINPID -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/buildroot/package/most/Config.in b/buildroot/package/most/Config.in new file mode 100644 index 000000000..194d2bd35 --- /dev/null +++ b/buildroot/package/most/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_MOST + bool "most" + depends on BR2_USE_MMU # slang + select BR2_PACKAGE_SLANG + help + most is a powerful pager, including features like multi + document support, hex view and unpack on-the-fly. + + Note: this program depends on the slang library which is + rather large to be used just for this pager. + + https://www.jedsoft.org/most/ diff --git a/buildroot/package/most/most.hash b/buildroot/package/most/most.hash new file mode 100644 index 000000000..151caadc3 --- /dev/null +++ b/buildroot/package/most/most.hash @@ -0,0 +1,6 @@ +# From https://www.jedsoft.org/releases/most/ +sha1 db811669a6b22c15478c957b439b5e4483ce1c95 most-5.1.0.tar.gz +# Locally computed +sha256 db805d1ffad3e85890802061ac8c90e3c89e25afb184a794e03715a3ed190501 most-5.1.0.tar.gz +sha256 1b2a567f289f66a143c56353e7b3d4fa5862514a5e3c5cfdf8b02ee5e5aaa953 COPYING +sha256 47ad1c3f9b94d6ec42d9bee6c5df980c5c2daa5b9d22113545ae6a3f21ca2f52 COPYRIGHT diff --git a/buildroot/package/most/most.mk b/buildroot/package/most/most.mk new file mode 100644 index 000000000..28d82cddf --- /dev/null +++ b/buildroot/package/most/most.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# most +# +################################################################################ + +MOST_SITE = http://www.jedsoft.org/releases/most +MOST_VERSION = 5.1.0 +MOST_LICENSE = GPL-2.0+ +MOST_LICENSE_FILES = COPYING COPYRIGHT +MOST_DEPENDENCIES = slang + +MOST_CONF_OPTS = --with-slang=$(STAGING_DIR)/usr +MOST_MAKE = $(MAKE1) + +define MOST_REMOVE_LOCAL_SLANG_CHECK + $(SED) 's/ slangversion / /g' $(@D)/src/Makefile.in +endef +MOST_POST_PATCH_HOOKS += MOST_REMOVE_LOCAL_SLANG_CHECK + +define MOST_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/src/objs/most $(TARGET_DIR)/usr/bin/most +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/motion/motion.hash b/buildroot/package/motion/motion.hash index 679defa3d..2b25d0a52 100644 --- a/buildroot/package/motion/motion.hash +++ b/buildroot/package/motion/motion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d97ec6ae766adfd478b6f7f9cc0da5f2fe21faa9366d98664be255714c1cf81d motion-release-4.2.1.tar.gz +sha256 c8d40976b41da8eb9f9f7128599403a312fc26b7226bf3787d75f78cb5a6cc6e motion-4.2.2.tar.gz sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/motion/motion.mk b/buildroot/package/motion/motion.mk index 6dfc5a561..ae58c5493 100644 --- a/buildroot/package/motion/motion.mk +++ b/buildroot/package/motion/motion.mk @@ -4,8 +4,8 @@ # ################################################################################ -MOTION_VERSION = release-4.2.1 -MOTION_SITE = $(call github,Motion-Project,motion,$(MOTION_VERSION)) +MOTION_VERSION = 4.2.2 +MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 MOTION_LICENSE_FILES = COPYING MOTION_DEPENDENCIES = host-pkgconf jpeg libmicrohttpd $(TARGET_NLS_DEPENDENCIES) @@ -71,9 +71,6 @@ endef define MOTION_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/motion/motion.service \ $(TARGET_DIR)/usr/lib/systemd/system/motion.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/motion.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/motion.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/mp4v2/mp4v2.hash b/buildroot/package/mp4v2/mp4v2.hash index d5a49c44c..d75c1994d 100644 --- a/buildroot/package/mp4v2/mp4v2.hash +++ b/buildroot/package/mp4v2/mp4v2.hash @@ -1,2 +1,4 @@ # From https://code.google.com/p/mp4v2/downloads/detail?name=mp4v2-2.0.0.tar.bz2 sha1 193260cfb7201e6ec250137bcca1468d4d20e2f0 mp4v2-2.0.0.tar.bz2 +# Locally computed +sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING diff --git a/buildroot/package/mpc/mpc.hash b/buildroot/package/mpc/mpc.hash index 98f1447a0..fa98f673d 100644 --- a/buildroot/package/mpc/mpc.hash +++ b/buildroot/package/mpc/mpc.hash @@ -1,2 +1,3 @@ -# From http://www.multiprecision.org/index.php?prog=mpc&page=download -sha1 b8be66396c726fdc36ebb0f692ed8a8cca3bcc66 mpc-1.0.3.tar.gz +# Locally calculated +sha256 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e mpc-1.1.0.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER diff --git a/buildroot/package/mpc/mpc.mk b/buildroot/package/mpc/mpc.mk index 89bbfd9c5..0e84bc277 100644 --- a/buildroot/package/mpc/mpc.mk +++ b/buildroot/package/mpc/mpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPC_VERSION = 1.0.3 +MPC_VERSION = 1.1.0 MPC_SITE = $(BR2_GNU_MIRROR)/mpc MPC_LICENSE = LGPL-3.0+ MPC_LICENSE_FILES = COPYING.LESSER diff --git a/buildroot/package/mpd-mpc/mpd-mpc.hash b/buildroot/package/mpd-mpc/mpd-mpc.hash index b1f262fc0..9c55bcf03 100644 --- a/buildroot/package/mpd-mpc/mpd-mpc.hash +++ b/buildroot/package/mpd-mpc/mpd-mpc.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 62373e83a8a165b2ed43967975efecd3feee530f4557d6b861dd08aa89d52b2d mpc-0.31.tar.xz +sha256 4f40ccbe18f5095437283cfc525a97815e983cbfd3a29e48ff610fa4f1bf1296 mpc-0.33.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/mpd-mpc/mpd-mpc.mk b/buildroot/package/mpd-mpc/mpd-mpc.mk index 05c70ba04..6eebc63cc 100644 --- a/buildroot/package/mpd-mpc/mpd-mpc.mk +++ b/buildroot/package/mpd-mpc/mpd-mpc.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_MPC_VERSION_MAJOR = 0 -MPD_MPC_VERSION = $(MPD_MPC_VERSION_MAJOR).31 +MPD_MPC_VERSION = $(MPD_MPC_VERSION_MAJOR).33 MPD_MPC_SITE = http://www.musicpd.org/download/mpc/$(MPD_MPC_VERSION_MAJOR) MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz MPD_MPC_LICENSE = GPL-2.0+ diff --git a/buildroot/package/mpd/0001-configure.ac-check-if-libatomic-is-needed.patch b/buildroot/package/mpd/0001-configure.ac-check-if-libatomic-is-needed.patch deleted file mode 100644 index a9873a741..000000000 --- a/buildroot/package/mpd/0001-configure.ac-check-if-libatomic-is-needed.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8eaf14a17244aaf000b4d19e4fde4a637576939f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Feb 2016 21:40:47 +0100 -Subject: [PATCH] configure.ac: check if libatomic is needed - -The mpd source code uses the C++11 functionality, which -internally is implemented using the __atomic_*() gcc built-ins. On -certain architectures, the __atomic_*() built-ins are implemented in -the libatomic library that comes with the rest of the gcc runtime. Due -to this, code using might need to link against libatomic, -otherwise one hits build issues such as: - -GlobalEvents.cxx:(.text._ZN12GlobalEvents4EmitENS_5EventE+0x14): undefined reference to `__atomic_fetch_or_4' - -on an architecture like SPARC. - -To solve this, a configure.ac check is added to know if we need to -link against libatomic or not. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 107b45a..8e6fab7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -233,6 +233,8 @@ if test x$have_pthread_setname_np = xyes; then - AC_DEFINE(HAVE_PTHREAD_SETNAME_NP, 1, [Is pthread_setname_np() available?]) - fi - -+AC_SEARCH_LIBS([__atomic_load_4], [atomic]) -+ - dnl --------------------------------------------------------------------------- - dnl Event loop selection - dnl --------------------------------------------------------------------------- --- -2.6.4 - diff --git a/buildroot/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch b/buildroot/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch new file mode 100644 index 000000000..81bd981d6 --- /dev/null +++ b/buildroot/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch @@ -0,0 +1,39 @@ +From cb190801706da046823c74f89472af83ff947ce1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 17 Aug 2019 22:25:06 +0200 +Subject: [PATCH] src/event/meson.build: add atomic dependency for sparc + +Linking with libatomic is needed on sparc otherwise build fails on: +/usr/lfs/v0/rc-buildroot-test/scripts/instance-0/output/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/7.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/event/libevent.a(MaskMonitor.cxx.o): undefined reference to symbol '__atomic_fetch_or_4@@LIBATOMIC_1.0' + +Fixes: + - http://autobuild.buildroot.org/results/7a9fdb7e323892fb6ed85a2441054303e889c089 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent (the same kind of patch for ncmpc was +refused: https://github.com/MusicPlayerDaemon/ncmpc/pull/45)] +--- + src/event/meson.build | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/event/meson.build b/src/event/meson.build +index bc13bbcd2..88370c03a 100644 +--- a/src/event/meson.build ++++ b/src/event/meson.build +@@ -21,9 +21,13 @@ event = static_library( + ], + ) + ++# Needed on sparc ++atomic_dep = c_compiler.find_library('atomic', required: false) ++ + event_dep = declare_dependency( + link_with: event, + dependencies: [ ++ atomic_dep, + thread_dep, + system_dep, + boost_dep, +-- +2.20.1 + diff --git a/buildroot/package/mpd/Config.in b/buildroot/package/mpd/Config.in index 923f0c220..e9e7b83cb 100644 --- a/buildroot/package/mpd/Config.in +++ b/buildroot/package/mpd/Config.in @@ -5,7 +5,7 @@ menuconfig BR2_PACKAGE_MPD depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE @@ -34,6 +34,31 @@ config BR2_PACKAGE_MPD_SQLITE Enable sqlite database support. If you don't use sqlite it will use an ASCII database. +comment "Commercial services" + +config BR2_PACKAGE_MPD_QOBUZ + bool "qobuz" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + select BR2_PACKAGE_MPD_CURL + select BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_YAJL + help + Play songs from the commercial streaming service Qobuz. + +config BR2_PACKAGE_MPD_SOUNDCLOUD + bool "soundcloud" + select BR2_PACKAGE_MPD_CURL + select BR2_PACKAGE_YAJL + help + Enable soundcloud.com playlist support. + +config BR2_PACKAGE_MPD_TIDAL + bool "tidal" + select BR2_PACKAGE_MPD_CURL + select BR2_PACKAGE_YAJL + help + Play songs from the commercial streaming service TIDAL. + comment "Converter plugins" config BR2_PACKAGE_MPD_LIBSAMPLERATE @@ -217,12 +242,6 @@ config BR2_PACKAGE_MPD_LIBSMBCLIENT help Enable Samba support. -config BR2_PACKAGE_MPD_SOUNDCLOUD - bool "soundcloud" - select BR2_PACKAGE_YAJL - help - Enable soundcloud.com playlist support. - comment "Output plugins" config BR2_PACKAGE_MPD_ALSA @@ -332,16 +351,17 @@ config BR2_PACKAGE_MPD_UPNP bool "UPnP" select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP + select BR2_PACKAGE_MPD_CURL help Enable MPD UPnP client support. endif -comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" +comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 6" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_6 comment "mpd needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/mpd/mpd.hash b/buildroot/package/mpd/mpd.hash index b80bfc82a..ecc2ee42a 100644 --- a/buildroot/package/mpd/mpd.hash +++ b/buildroot/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 503e5f9f237290f568ff7956ab2f9aed563594bf749f19b8fe994fb21434afea mpd-0.20.23.tar.xz +sha256 d3275e11d85637adde250cadf3b4f5aec2144228f0d8085767493fc46c55b2f9 mpd-0.21.19.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/mpd/mpd.mk b/buildroot/package/mpd/mpd.mk index f410c1fd9..647cac4f3 100644 --- a/buildroot/package/mpd/mpd.mk +++ b/buildroot/package/mpd/mpd.mk @@ -4,279 +4,289 @@ # ################################################################################ -MPD_VERSION_MAJOR = 0.20 -MPD_VERSION = $(MPD_VERSION_MAJOR).23 +MPD_VERSION_MAJOR = 0.21 +MPD_VERSION = $(MPD_VERSION_MAJOR).19 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING -MPD_AUTORECONF = YES - -# Some options need an explicit --disable or --enable # Zeroconf support depends on libdns_sd from avahi. ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y) MPD_DEPENDENCIES += avahi -MPD_CONF_OPTS += --with-zeroconf=avahi +MPD_CONF_OPTS += -Dzeroconf=avahi else -MPD_CONF_OPTS += --with-zeroconf=no +MPD_CONF_OPTS += -Dzeroconf=disabled endif # MPD prefers libicu for utf8 collation instead of libglib2. ifeq ($(BR2_PACKAGE_ICU),y) MPD_DEPENDENCIES += icu -MPD_CONF_OPTS += --enable-icu +MPD_CONF_OPTS += -Dicu=enabled else -MPD_CONF_OPTS += --disable-icu +MPD_CONF_OPTS += -Dicu=disabled endif ifeq ($(BR2_PACKAGE_MPD_ALSA),y) MPD_DEPENDENCIES += alsa-lib -MPD_CONF_OPTS += --enable-alsa +MPD_CONF_OPTS += -Dalsa=enabled else -MPD_CONF_OPTS += --disable-alsa +MPD_CONF_OPTS += -Dalsa=disabled endif ifeq ($(BR2_PACKAGE_MPD_AO),y) MPD_DEPENDENCIES += libao -MPD_CONF_OPTS += --enable-ao +MPD_CONF_OPTS += -Dao=enabled else -MPD_CONF_OPTS += --disable-ao +MPD_CONF_OPTS += -Dao=disabled endif ifeq ($(BR2_PACKAGE_MPD_AUDIOFILE),y) MPD_DEPENDENCIES += audiofile -MPD_CONF_OPTS += --enable-audiofile +MPD_CONF_OPTS += -Daudiofile=enabled else -MPD_CONF_OPTS += --disable-audiofile +MPD_CONF_OPTS += -Daudiofile=disabled endif ifeq ($(BR2_PACKAGE_MPD_BZIP2),y) MPD_DEPENDENCIES += bzip2 -MPD_CONF_OPTS += --enable-bzip2 +MPD_CONF_OPTS += -Dbzip2=enabled else -MPD_CONF_OPTS += --disable-bzip2 +MPD_CONF_OPTS += -Dbzip2=disabled endif ifeq ($(BR2_PACKAGE_MPD_CDIO_PARANOIA),y) MPD_DEPENDENCIES += libcdio-paranoia -MPD_CONF_OPTS += --enable-cdio-paranoia +MPD_CONF_OPTS += -Dcdio_paranoia=enabled else -MPD_CONF_OPTS += --disable-cdio-paranoia +MPD_CONF_OPTS += -Dcdio_paranoia=disabled endif ifeq ($(BR2_PACKAGE_MPD_CURL),y) MPD_DEPENDENCIES += libcurl -MPD_CONF_OPTS += --enable-curl +MPD_CONF_OPTS += -Dcurl=enabled else -MPD_CONF_OPTS += --disable-curl +MPD_CONF_OPTS += -Dcurl=disabled endif ifeq ($(BR2_PACKAGE_MPD_DSD),y) -MPD_CONF_OPTS += --enable-dsd +MPD_CONF_OPTS += -Ddsd=true else -MPD_CONF_OPTS += --disable-dsd +MPD_CONF_OPTS += -Ddsd=false endif ifeq ($(BR2_PACKAGE_MPD_FAAD2),y) MPD_DEPENDENCIES += faad2 -MPD_CONF_OPTS += --enable-aac +MPD_CONF_OPTS += -Dfaad=enabled else -MPD_CONF_OPTS += --disable-aac +MPD_CONF_OPTS += -Dfaad=disabled endif ifeq ($(BR2_PACKAGE_MPD_FFMPEG),y) MPD_DEPENDENCIES += ffmpeg -MPD_CONF_OPTS += --enable-ffmpeg +MPD_CONF_OPTS += -Dffmpeg=enabled else -MPD_CONF_OPTS += --disable-ffmpeg +MPD_CONF_OPTS += -Dffmpeg=disabled endif ifeq ($(BR2_PACKAGE_MPD_FLAC),y) MPD_DEPENDENCIES += flac -MPD_CONF_OPTS += --enable-flac +MPD_CONF_OPTS += -Dflac=enabled else -MPD_CONF_OPTS += --disable-flac +MPD_CONF_OPTS += -Dflac=disabled endif ifeq ($(BR2_PACKAGE_MPD_HTTPD_OUTPUT),y) -MPD_CONF_OPTS += --enable-httpd-output +MPD_CONF_OPTS += -Dhttpd=true else -MPD_CONF_OPTS += --disable-httpd-output +MPD_CONF_OPTS += -Dhttpd=false endif ifeq ($(BR2_PACKAGE_MPD_JACK2),y) MPD_DEPENDENCIES += jack2 -MPD_CONF_OPTS += --enable-jack +MPD_CONF_OPTS += -Djack=enabled else -MPD_CONF_OPTS += --disable-jack +MPD_CONF_OPTS += -Djack=disabled endif ifeq ($(BR2_PACKAGE_MPD_LAME),y) MPD_DEPENDENCIES += lame -MPD_CONF_OPTS += --enable-lame-encoder +MPD_CONF_OPTS += -Dlame=enabled else -MPD_CONF_OPTS += --disable-lame-encoder +MPD_CONF_OPTS += -Dlame=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBMPDCLIENT),y) MPD_DEPENDENCIES += libmpdclient -MPD_CONF_OPTS += --enable-libmpdclient +MPD_CONF_OPTS += -Dlibmpdclient=enabled else -MPD_CONF_OPTS += --disable-libmpdclient +MPD_CONF_OPTS += -Dlibmpdclient=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBMMS),y) MPD_DEPENDENCIES += libmms -MPD_CONF_OPTS += --enable-mms +MPD_CONF_OPTS += -Dmms=enabled else -MPD_CONF_OPTS += --disable-mms +MPD_CONF_OPTS += -Dmms=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBNFS),y) MPD_DEPENDENCIES += libnfs -MPD_CONF_OPTS += --enable-nfs +MPD_CONF_OPTS += -Dnfs=enabled else -MPD_CONF_OPTS += --disable-nfs +MPD_CONF_OPTS += -Dnfs=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBSMBCLIENT),y) MPD_DEPENDENCIES += samba4 -MPD_CONF_OPTS += --enable-smbclient +MPD_CONF_OPTS += -Dsmbclient=enabled else -MPD_CONF_OPTS += --disable-smbclient +MPD_CONF_OPTS += -Dsmbclient=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBSAMPLERATE),y) MPD_DEPENDENCIES += libsamplerate -MPD_CONF_OPTS += --enable-lsr +MPD_CONF_OPTS += -Dlibsamplerate=enabled else -MPD_CONF_OPTS += --disable-lsr +MPD_CONF_OPTS += -Dlibsamplerate=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBSNDFILE),y) MPD_DEPENDENCIES += libsndfile -MPD_CONF_OPTS += --enable-sndfile +MPD_CONF_OPTS += -Dsndfile=enabled else -MPD_CONF_OPTS += --disable-sndfile +MPD_CONF_OPTS += -Dsndfile=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBSOXR),y) MPD_DEPENDENCIES += libsoxr -MPD_CONF_OPTS += --enable-soxr +MPD_CONF_OPTS += -Dsoxr=enabled else -MPD_CONF_OPTS += --disable-soxr +MPD_CONF_OPTS += -Dsoxr=disabled endif ifeq ($(BR2_PACKAGE_MPD_MAD),y) MPD_DEPENDENCIES += libid3tag libmad -MPD_CONF_OPTS += --enable-mad +MPD_CONF_OPTS += -Dmad=enabled else -MPD_CONF_OPTS += --disable-mad +MPD_CONF_OPTS += -Dmad=disabled endif ifeq ($(BR2_PACKAGE_MPD_MPG123),y) MPD_DEPENDENCIES += libid3tag mpg123 -MPD_CONF_OPTS += --enable-mpg123 +MPD_CONF_OPTS += -Dmpg123=enabled else -MPD_CONF_OPTS += --disable-mpg123 +MPD_CONF_OPTS += -Dmpg123=disabled endif ifeq ($(BR2_PACKAGE_MPD_MUSEPACK),y) MPD_DEPENDENCIES += musepack -MPD_CONF_OPTS += --enable-mpc +MPD_CONF_OPTS += -Dmpcdec=enabled else -MPD_CONF_OPTS += --disable-mpc +MPD_CONF_OPTS += -Dmpcdec=disabled endif ifeq ($(BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT),y) -MPD_CONF_OPTS += --enable-neighbor-plugins +MPD_CONF_OPTS += -Dneighbor=true else -MPD_CONF_OPTS += --disable-neighbor-plugins +MPD_CONF_OPTS += -Dneighbor=false endif ifeq ($(BR2_PACKAGE_MPD_OPUS),y) MPD_DEPENDENCIES += opus libogg -MPD_CONF_OPTS += --enable-opus +MPD_CONF_OPTS += -Dopus=enabled else -MPD_CONF_OPTS += --disable-opus +MPD_CONF_OPTS += -Dopus=disabled endif ifeq ($(BR2_PACKAGE_MPD_OSS),y) -MPD_CONF_OPTS += --enable-oss +MPD_CONF_OPTS += -Doss=enabled else -MPD_CONF_OPTS += --disable-oss +MPD_CONF_OPTS += -Doss=disabled endif ifeq ($(BR2_PACKAGE_MPD_PULSEAUDIO),y) MPD_DEPENDENCIES += pulseaudio -MPD_CONF_OPTS += --enable-pulse +MPD_CONF_OPTS += -Dpulse=enabled else -MPD_CONF_OPTS += --disable-pulse +MPD_CONF_OPTS += -Dpulse=disabled +endif + +ifeq ($(BR2_PACKAGE_MPD_QOBUZ),y) +MPD_DEPENDENCIES += libgcrypt yajl +MPD_CONF_OPTS += -Dqobuz=enabled +else +MPD_CONF_OPTS += -Dqobuz=disabled endif ifeq ($(BR2_PACKAGE_MPD_SHOUTCAST),y) MPD_DEPENDENCIES += libshout -MPD_CONF_OPTS += --enable-shout +MPD_CONF_OPTS += -Dshout=enabled else -MPD_CONF_OPTS += --disable-shout +MPD_CONF_OPTS += -Dshout=disabled endif ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y) MPD_DEPENDENCIES += yajl -MPD_CONF_OPTS += --enable-soundcloud +MPD_CONF_OPTS += -Dsoundcloud=enabled else -MPD_CONF_OPTS += --disable-soundcloud +MPD_CONF_OPTS += -Dsoundcloud=disabled endif ifeq ($(BR2_PACKAGE_MPD_SQLITE),y) MPD_DEPENDENCIES += sqlite -MPD_CONF_OPTS += --enable-sqlite +MPD_CONF_OPTS += -Dsqlite=enabled else -MPD_CONF_OPTS += --disable-sqlite +MPD_CONF_OPTS += -Dsqlite=disabled endif ifneq ($(BR2_PACKAGE_MPD_TCP),y) -MPD_CONF_OPTS += --disable-tcp +MPD_CONF_OPTS += -Dtcp=true +endif + +ifeq ($(BR2_PACKAGE_MPD_TIDAL),y) +MPD_DEPENDENCIES += yajl +MPD_CONF_OPTS += -Dtidal=enabled +else +MPD_CONF_OPTS += -Dtidal=disabled endif ifeq ($(BR2_PACKAGE_MPD_TREMOR),y) MPD_DEPENDENCIES += tremor -# Help mpd to find tremor in static linking scenarios -MPD_CONF_ENV += \ - TREMOR_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs vorbisidec`" -MPD_CONF_OPTS += --with-tremor=$(STAGING_DIR)/usr +MPD_CONF_OPTS += -Dtremor=enabled +else +MPD_CONF_OPTS += -Dtremor=disabled endif ifeq ($(BR2_PACKAGE_MPD_TWOLAME),y) MPD_DEPENDENCIES += twolame -MPD_CONF_OPTS += --enable-twolame-encoder +MPD_CONF_OPTS += -Dtwolame=enabled else -MPD_CONF_OPTS += --disable-twolame-encoder +MPD_CONF_OPTS += -Dtwolame=disabled endif ifeq ($(BR2_PACKAGE_MPD_UPNP),y) MPD_DEPENDENCIES += \ expat \ $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18) -MPD_CONF_OPTS += --enable-upnp +MPD_CONF_OPTS += -Dupnp=enabled else -MPD_CONF_OPTS += --disable-upnp +MPD_CONF_OPTS += -Dupnp=disabled endif ifeq ($(BR2_PACKAGE_MPD_VORBIS),y) MPD_DEPENDENCIES += libvorbis -MPD_CONF_OPTS += --enable-vorbis --enable-vorbis-encoder +MPD_CONF_OPTS += -Dvorbis=enabled -Dvorbisenc=enabled else -MPD_CONF_OPTS += --disable-vorbis --disable-vorbis-encoder +MPD_CONF_OPTS += -Dvorbis=disabled -Dvorbisenc=disabled endif ifeq ($(BR2_PACKAGE_MPD_WAVPACK),y) MPD_DEPENDENCIES += wavpack -MPD_CONF_OPTS += --enable-wavpack +MPD_CONF_OPTS += -Dwavpack=enabled else -MPD_CONF_OPTS += --disable-wavpack +MPD_CONF_OPTS += -Dwavpack=disabled endif define MPD_INSTALL_EXTRA_FILES @@ -290,4 +300,4 @@ define MPD_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S95mpd endef -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/mpdecimal/mpdecimal.hash b/buildroot/package/mpdecimal/mpdecimal.hash index bc443d1cd..e15224323 100644 --- a/buildroot/package/mpdecimal/mpdecimal.hash +++ b/buildroot/package/mpdecimal/mpdecimal.hash @@ -1,2 +1,4 @@ # From http://www.bytereef.org/mpdecimal/download.html -sha256 da74d3cfab559971a4fbd4fb506e1b4498636eb77d0fd09e44f8e546d18ac068 mpdecimal-2.4.1.tar.gz +sha256 83c628b90f009470981cf084c5418329c88b19835d8af3691b930afccb7d79c7 mpdecimal-2.4.2.tar.gz +# Locally computed +sha256 e384413a13f061a50f6fadceefc0f326c22d83c13ae94978e1f86d0468332c19 LICENSE.txt diff --git a/buildroot/package/mpdecimal/mpdecimal.mk b/buildroot/package/mpdecimal/mpdecimal.mk index 5e0929ee9..2d06d0f6b 100644 --- a/buildroot/package/mpdecimal/mpdecimal.mk +++ b/buildroot/package/mpdecimal/mpdecimal.mk @@ -5,7 +5,7 @@ ################################################################################ MPDECIMAL_SITE = http://www.bytereef.org/software/mpdecimal/releases -MPDECIMAL_VERSION = 2.4.1 +MPDECIMAL_VERSION = 2.4.2 MPDECIMAL_INSTALL_STAGING = YES MPDECIMAL_LICENSE = BSD-2-Clause MPDECIMAL_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch b/buildroot/package/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch deleted file mode 100644 index 12590cfd3..000000000 --- a/buildroot/package/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch +++ /dev/null @@ -1,37 +0,0 @@ -mpfr-longlong.h: Fix obsolete ARC asm constraints - -This patch replaces obsolete ARC "J" asm constraint with -up-to-date "Cal" constraint. -The patch should be applied to upstream "mpfr" library and -after that it should be removed from buildroot as soon as -mpfr version with current fix will come up. - -Signed-off-by: Vlad Zakharov -Signed-off-by: Claudiu Zissulescu ---- -Index: /src/mpfr-longlong.h -=================================================================== ---- /src/mpfr-longlong.h (revision 10963) -+++ /src/mpfr-longlong.h (working copy) -@@ -416,17 +416,17 @@ - : "=r" (sh), \ - "=&r" (sl) \ - : "r" ((USItype) (ah)), \ -- "rIJ" ((USItype) (bh)), \ -+ "rICal" ((USItype) (bh)), \ - "%r" ((USItype) (al)), \ -- "rIJ" ((USItype) (bl))) -+ "rICal" ((USItype) (bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ - __asm__ ("sub.f\t%1, %4, %5\n\tsbc\t%0, %2, %3" \ - : "=r" (sh), \ - "=&r" (sl) \ - : "r" ((USItype) (ah)), \ -- "rIJ" ((USItype) (bh)), \ -+ "rICal" ((USItype) (bh)), \ - "r" ((USItype) (al)), \ -- "rIJ" ((USItype) (bl))) -+ "rICal" ((USItype) (bl))) - #endif - - #if defined (__arm__) && (defined (__thumb2__) || !defined (__thumb__)) \ diff --git a/buildroot/package/mpfr/mpfr.hash b/buildroot/package/mpfr/mpfr.hash index 1c825e123..ea44b8c20 100644 --- a/buildroot/package/mpfr/mpfr.hash +++ b/buildroot/package/mpfr/mpfr.hash @@ -1,2 +1,5 @@ -# From http://lists.gnu.org/archive/html/info-gnu/2017-09/msg00004.html -sha256 7a62ac1a04408614fccdc506e4844b10cf0ad2c2b1677097f8f35d3a1344a950 mpfr-3.1.6.tar.xz +# From http://lists.gnu.org/archive/html/info-gnu/2019-01/msg00019.html +sha256 1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a mpfr-4.0.2.tar.xz + +# Hash for license file +sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER diff --git a/buildroot/package/mpfr/mpfr.mk b/buildroot/package/mpfr/mpfr.mk index 1b67cf2e4..ef2999eb1 100644 --- a/buildroot/package/mpfr/mpfr.mk +++ b/buildroot/package/mpfr/mpfr.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPFR_VERSION = 3.1.6 +MPFR_VERSION = 4.0.2 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ diff --git a/buildroot/package/mpg123/mpg123.hash b/buildroot/package/mpg123/mpg123.hash index e5a549b57..02c40ad08 100644 --- a/buildroot/package/mpg123/mpg123.hash +++ b/buildroot/package/mpg123/mpg123.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/mpg123/files/mpg123/1.25.12/ -sha1 4ece1ec124a6ca085e1d68f7ede6d5619fc587ff mpg123-1.25.12.tar.bz2 -md5 ddb38254966eb38c77f220d456a1839d mpg123-1.25.12.tar.bz2 +# From https://sourceforge.net/projects/mpg123/files/mpg123/1.25.13/ +sha1 2b6428dc563c56fb1374191d1244c8ac928e4d89 mpg123-1.25.13.tar.bz2 +md5 294a6c30546504ec3d0deac2b2ea22be mpg123-1.25.13.tar.bz2 # Locally calculated -sha256 1ffec7c9683dfb86ea9040d6a53d6ea819ecdda215df347f79def08f1fe731d1 mpg123-1.25.12.tar.bz2 +sha256 90306848359c793fd43b9906e52201df18775742dc3c81c06ab67a806509890a mpg123-1.25.13.tar.bz2 # License file sha256 f40e0dd86b27b52e429b693a87b3ca63ae0a98a4d142e77207aa6bdf1db7a295 COPYING diff --git a/buildroot/package/mpg123/mpg123.mk b/buildroot/package/mpg123/mpg123.mk index 6247e54a0..5e3b7fd94 100644 --- a/buildroot/package/mpg123/mpg123.mk +++ b/buildroot/package/mpg123/mpg123.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPG123_VERSION = 1.25.12 +MPG123_VERSION = 1.25.13 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_CONF_OPTS = --disable-lfs-alias diff --git a/buildroot/package/mpir/mpir.hash b/buildroot/package/mpir/mpir.hash index 8320337eb..71d0c19d1 100644 --- a/buildroot/package/mpir/mpir.hash +++ b/buildroot/package/mpir/mpir.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 52f63459cf3f9478859de29e00357f004050ead70b45913f2c2269d9708675bb mpir-3.0.0.tar.bz2 +sha256 52f63459cf3f9478859de29e00357f004050ead70b45913f2c2269d9708675bb mpir-3.0.0.tar.bz2 +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING.LIB diff --git a/buildroot/package/mpv/0003-rpi-fix-linking-errors.patch b/buildroot/package/mpv/0003-rpi-fix-linking-errors.patch deleted file mode 100644 index 0e65a5a3e..000000000 --- a/buildroot/package/mpv/0003-rpi-fix-linking-errors.patch +++ /dev/null @@ -1,90 +0,0 @@ -From fe482a600d507dc7ce77f6d154a9e8b395f74fdd Mon Sep 17 00:00:00 2001 -From: Mahyar Koshkouei -Date: Tue, 24 Oct 2017 09:47:38 +0100 -Subject: [PATCH] rpi: fix linking errors - -Fixes linking issues when compiling with Raspberry Pi support. - -Signed-off-by: Mahyar Koshkouei ---- -Status: pull request https://github.com/mpv-player/mpv/pull/4883 ---- - waftools/checks/custom.py | 26 +++++++++++++++++++++++++- - wscript | 18 +----------------- - 2 files changed, 26 insertions(+), 18 deletions(-) - -diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py -index d8065a3..9086795 100644 ---- a/waftools/checks/custom.py -+++ b/waftools/checks/custom.py -@@ -4,7 +4,7 @@ from waflib import Utils - import os - - __all__ = ["check_pthreads", "check_iconv", "check_lua", -- "check_cocoa", "check_openal"] -+ "check_cocoa", "check_openal", "check_rpi"] - - pthreads_program = load_fragment('pthreads.c') - -@@ -103,3 +103,27 @@ def check_openal(ctx, dependency_identifier): - if fn(ctx, dependency_identifier): - return True - return False -+ -+def check_rpi(ctx, dependency_identifier): -+ # We need MMAL/bcm_host/dispmanx APIs. -+ # Upstream keeps pkgconfig files in '/opt/vc/lib/pkgconfig'. -+ # See https://github.com/raspberrypi/userland/issues/245 -+ # PKG_CONFIG_SYSROOT_DIR helps with cross compilation. -+ prev_pkg_path = os.getenv('PKG_CONFIG_PATH', '') -+ os.environ['PKG_CONFIG_PATH'] = os.pathsep.join( -+ filter(None, [os.path.join(os.getenv('PKG_CONFIG_SYSROOT_DIR', '/'), -+ 'opt/vc/lib/pkgconfig'), -+ prev_pkg_path])) -+ -+ checks = [ -+ # We still need all OpenGL symbols, because the vo_opengl code is -+ # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. -+ check_pkg_config('bcm_host', uselib_store='bcm_host'), -+ check_pkg_config('egl'), -+ check_pkg_config('glesv2'), -+ check_cc(lib=['mmal_core', 'mmal_util', 'mmal_vc_client'], use=['bcm_host']), -+ ] -+ -+ ret = all((fn(ctx, dependency_identifier) for fn in checks)) -+ os.environ['PKG_CONFIG_PATH'] = prev_pkg_path -+ return ret -diff --git a/wscript b/wscript -index 9d88588..84e5f2e 100644 ---- a/wscript -+++ b/wscript -@@ -732,25 +732,9 @@ video_output_features = [ - 'desc': 'Android support', - 'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header - }, { -- # We need MMAL/bcm_host/dispmanx APIs. Also, most RPI distros require -- # every project to hardcode the paths to the include directories. Also, -- # these headers are so broken that they spam tons of warnings by merely -- # including them (compensate with -isystem and -fgnu89-inline). - 'name': '--rpi', - 'desc': 'Raspberry Pi support', -- 'func': compose_checks( -- check_cc(cflags="-isystem/opt/vc/include/ "+ -- "-isystem/opt/vc/include/interface/vcos/pthreads " + -- "-isystem/opt/vc/include/interface/vmcs_host/linux " + -- "-fgnu89-inline", -- linkflags="-L/opt/vc/lib", -- header_name="bcm_host.h", -- lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']), -- # We still need all OpenGL symbols, because the vo_opengl code is -- # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. -- check_cc(lib="EGL"), -- check_cc(lib="GLESv2"), -- ), -+ 'func': check_rpi, - } , { - 'name': '--ios-gl', - 'desc': 'iOS OpenGL ES hardware decoding interop support', --- -2.14.2 - diff --git a/buildroot/package/mpv/0004-libva20.patch b/buildroot/package/mpv/0004-libva20.patch deleted file mode 100644 index 349dd3cb1..000000000 --- a/buildroot/package/mpv/0004-libva20.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 2ecf240b1cd20875991a5b18efafbe799864ff7f Mon Sep 17 00:00:00 2001 -From: Mark Thompson -Date: Mon, 9 Oct 2017 20:10:26 +0100 -Subject: [PATCH] vaapi: Use libva2 message callbacks - -They are no longer global, so they work vaguely sensibly. - -Downloaded from upstream commit: -https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f - -Signed-off-by: Bernd Kuhls ---- - video/vaapi.c | 32 +++++++++++++++++++++++++++++--- - 1 file changed, 29 insertions(+), 3 deletions(-) - -diff --git a/video/vaapi.c b/video/vaapi.c -index 6bedbbaa18..3b1cb9cc41 100644 ---- a/video/vaapi.c -+++ b/video/vaapi.c -@@ -40,9 +40,27 @@ int va_get_colorspace_flag(enum mp_csp csp) - return 0; - } - --// VA message callbacks are global and do not have a context parameter, so it's --// impossible to know from which VADisplay they originate. Try to route them --// to existing mpv/libmpv instances within this process. -+#if VA_CHECK_VERSION(1, 0, 0) -+static void va_message_callback(void *context, const char *msg, int mp_level) -+{ -+ struct mp_vaapi_ctx *res = context; -+ mp_msg(res->log, mp_level, "libva: %s", msg); -+} -+ -+static void va_error_callback(void *context, const char *msg) -+{ -+ va_message_callback(context, msg, MSGL_ERR); -+} -+ -+static void va_info_callback(void *context, const char *msg) -+{ -+ va_message_callback(context, msg, MSGL_V); -+} -+#else -+// Pre-libva2 VA message callbacks are global and do not have a context -+// parameter, so it's impossible to know from which VADisplay they -+// originate. Try to route them to existing mpv/libmpv instances within -+// this process. - static pthread_mutex_t va_log_mutex = PTHREAD_MUTEX_INITIALIZER; - static struct mp_vaapi_ctx **va_mpv_clients; - static int num_va_mpv_clients; -@@ -77,6 +95,7 @@ static void va_info_callback(const char *msg) - { - va_message_callback(msg, MSGL_V); - } -+#endif - - static void open_lavu_vaapi_device(struct mp_vaapi_ctx *ctx) - { -@@ -108,6 +127,10 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog, - }, - }; - -+#if VA_CHECK_VERSION(1, 0, 0) -+ vaSetErrorCallback(display, va_error_callback, res); -+ vaSetInfoCallback(display, va_info_callback, res); -+#else - pthread_mutex_lock(&va_log_mutex); - MP_TARRAY_APPEND(NULL, va_mpv_clients, num_va_mpv_clients, res); - pthread_mutex_unlock(&va_log_mutex); -@@ -118,6 +141,7 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog, - vaSetErrorCallback(va_error_callback); - vaSetInfoCallback(va_info_callback); - #endif -+#endif - - int major, minor; - int status = vaInitialize(display, &major, &minor); -@@ -154,6 +178,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx) - if (ctx->destroy_native_ctx) - ctx->destroy_native_ctx(ctx->native_ctx); - -+#if !VA_CHECK_VERSION(1, 0, 0) - pthread_mutex_lock(&va_log_mutex); - for (int n = 0; n < num_va_mpv_clients; n++) { - if (va_mpv_clients[n] == ctx) { -@@ -164,6 +189,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx) - if (num_va_mpv_clients == 0) - TA_FREEP(&va_mpv_clients); // avoid triggering leak detectors - pthread_mutex_unlock(&va_log_mutex); -+#endif - - talloc_free(ctx); - } diff --git a/buildroot/package/mpv/Config.in b/buildroot/package/mpv/Config.in index 69810038f..32910f224 100644 --- a/buildroot/package/mpv/Config.in +++ b/buildroot/package/mpv/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_MPV select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND # Select xkbcommon for wayland to avoid being mysterious select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND # Select all necessary X11 dependencies if X.org is enabled diff --git a/buildroot/package/mpv/mpv.hash b/buildroot/package/mpv/mpv.hash index 1dac3a494..734b6a366 100644 --- a/buildroot/package/mpv/mpv.hash +++ b/buildroot/package/mpv/mpv.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 2ad104d83fd3b2b9457716615acad57e479fd1537b8fc5e37bfe9065359b50be v0.27.2.tar.gz +sha256 f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623 v0.29.1.tar.gz +sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL diff --git a/buildroot/package/mpv/mpv.mk b/buildroot/package/mpv/mpv.mk index 3ab267377..8619de5a8 100644 --- a/buildroot/package/mpv/mpv.mk +++ b/buildroot/package/mpv/mpv.mk @@ -4,14 +4,14 @@ # ################################################################################ -MPV_VERSION = 0.27.2 +MPV_VERSION = 0.29.1 MPV_SITE = https://github.com/mpv-player/mpv/archive MPV_SOURCE = v$(MPV_VERSION).tar.gz MPV_DEPENDENCIES = \ host-pkgconf ffmpeg zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) MPV_LICENSE = GPL-2.0+ -MPV_LICENSE_FILES = LICENSE +MPV_LICENSE_FILES = LICENSE.GPL MPV_NEEDS_EXTERNAL_WAF = YES @@ -23,14 +23,12 @@ MPV_CONF_OPTS = \ --disable-cocoa \ --disable-coreaudio \ --disable-cuda-hwaccel \ - --disable-libv4l2 \ --disable-opensles \ --disable-rsound \ --disable-rubberband \ --disable-uchardet \ --disable-vapoursynth \ --disable-vapoursynth-lazy \ - --disable-vdpau \ --disable-mali-fbdev # ALSA support requires pcm+mixer @@ -130,6 +128,24 @@ else MPV_CONF_OPTS += --disable-drm endif +# libv4l +ifeq ($(BR2_PACKAGE_LIBV4L),y) +MPV_CONF_OPTS += \ + --enable-libv4l2 \ + --enable-tv +MPV_DEPENDENCIES += libv4l +else +MPV_CONF_OPTS += --disable-libv4l2 +endif + +# libvdpau +ifeq ($(BR2_PACKAGE_LIBVDPAU),y) +MPV_CONF_OPTS += --enable-vdpau +MPV_DEPENDENCIES += libvdpau +else +MPV_CONF_OPTS += --disable-vdpau +endif + # LUA support, only for lua51/lua52/luajit # This enables the controller (OSD) together with libass ifeq ($(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUAJIT),y) @@ -164,16 +180,12 @@ MPV_CONF_OPTS += --disable-libsmbclient endif # SDL support -# Both can't be used at the same time, prefer newer API -# It also requires 64-bit sync intrinsics +# Sdl2 requires 64-bit sync intrinsics ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL2),yy) -MPV_CONF_OPTS += --enable-sdl2 --disable-sdl1 +MPV_CONF_OPTS += --enable-sdl2 MPV_DEPENDENCIES += sdl2 -else ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL),yy) -MPV_CONF_OPTS += --enable-sdl1 --disable-sdl2 -MPV_DEPENDENCIES += sdl else -MPV_CONF_OPTS += --disable-sdl1 --disable-sdl2 +MPV_CONF_OPTS += --disable-sdl2 endif # Raspberry Pi support @@ -201,7 +213,7 @@ endif # wayland support ifeq ($(BR2_PACKAGE_WAYLAND),y) MPV_CONF_OPTS += --enable-wayland -MPV_DEPENDENCIES += libxkbcommon wayland +MPV_DEPENDENCIES += libxkbcommon wayland wayland-protocols else MPV_CONF_OPTS += --disable-wayland endif diff --git a/buildroot/package/mraa/mraa.hash b/buildroot/package/mraa/mraa.hash index cbd70a460..f2eb73ca7 100644 --- a/buildroot/package/mraa/mraa.hash +++ b/buildroot/package/mraa/mraa.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 e4501e6936afb426c75b7d406c1a7a27b514297f640e887de4d88a2d9687f37b mraa-v0.9.1.tar.gz +sha256 e4501e6936afb426c75b7d406c1a7a27b514297f640e887de4d88a2d9687f37b mraa-0.9.1.tar.gz +sha256 04f8503394c6d01c86538a693f6990fc1debd94119954ff4eae4407fe7c60a8e COPYING diff --git a/buildroot/package/mraa/mraa.mk b/buildroot/package/mraa/mraa.mk index 42cc2e335..5077859fa 100644 --- a/buildroot/package/mraa/mraa.mk +++ b/buildroot/package/mraa/mraa.mk @@ -4,8 +4,8 @@ # ################################################################################ -MRAA_VERSION = v0.9.1 -MRAA_SITE = $(call github,intel-iot-devkit,mraa,$(MRAA_VERSION)) +MRAA_VERSION = 0.9.1 +MRAA_SITE = $(call github,intel-iot-devkit,mraa,v$(MRAA_VERSION)) MRAA_LICENSE = MIT MRAA_LICENSE_FILES = COPYING MRAA_INSTALL_STAGING = YES diff --git a/buildroot/package/mrouted/0001-DVMRP-report-missing-subnet.patch b/buildroot/package/mrouted/0001-DVMRP-report-missing-subnet.patch deleted file mode 100644 index 023c8cfd8..000000000 --- a/buildroot/package/mrouted/0001-DVMRP-report-missing-subnet.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 687f41680d51585e9a5a135e39efee330588bea7 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Fri, 11 Sep 2015 12:49:30 -0500 -Subject: [PATCH 1/1] DVMRP report missing subnet - -Accepted upstream and will be included in 3.9.8. -https://github.com/troglobit/mrouted/commit/512af5ffe0f48ffa2ba3b45898c66c2a561a5c2d - -A subnet is missing in the DVMRP report sent to it's neighbor after -the initial probe occurs. The issue was with the traversal of a double -linked list from end to start. Once the traversing pointer reaches -the start of routing table for loop (condition) it would break and -always drop the first subnet. - -Signed-off-by: Matt Weber ---- - route.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/route.c b/route.c -index f74e601..9fe779d 100644 ---- a/route.c -+++ b/route.c -@@ -1193,7 +1193,7 @@ static int report_chunk(int which_routes, struct rtentry *start_rt, vifi_t vifi, - - p = send_buf + MIN_IP_HEADER_LEN + IGMP_MINLEN; - -- for (r = start_rt; r != routing_table; r = r->rt_prev) { -+ for (r = start_rt; r != NULL; r = r->rt_prev) { - if (which_routes == CHANGED_ROUTES && !(r->rt_flags & RTF_CHANGED)) { - nrt++; - continue; --- -1.9.1 - diff --git a/buildroot/package/mrouted/mrouted.hash b/buildroot/package/mrouted/mrouted.hash index d5069e5fd..8f10e014e 100644 --- a/buildroot/package/mrouted/mrouted.hash +++ b/buildroot/package/mrouted/mrouted.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 181908f7025c5a2dee2e50d86888780469eaa9e1bd42d3eca9dfed8274aecd3d mrouted-3.9.7.tar.gz +sha256 179636d211a82d0140a3488c6b65e634b4838da23e50d8cdee15ef03fe9b46af mrouted-3.9.8.tar.gz +sha256 2e6c7d9e92afc391f584290c3817f2cdec1501621cf820abbd4bc4adc2e5b2ef LICENSE diff --git a/buildroot/package/mrouted/mrouted.mk b/buildroot/package/mrouted/mrouted.mk index 731e79eb8..b9a4eaba4 100644 --- a/buildroot/package/mrouted/mrouted.mk +++ b/buildroot/package/mrouted/mrouted.mk @@ -4,7 +4,7 @@ # ################################################################################ -MROUTED_VERSION = 3.9.7 +MROUTED_VERSION = 3.9.8 MROUTED_SITE = $(call github,troglobit,mrouted,$(MROUTED_VERSION)) MROUTED_DEPENDENCIES = host-bison MROUTED_LICENSE = BSD-3-Clause diff --git a/buildroot/package/msgpack/msgpack.hash b/buildroot/package/msgpack/msgpack.hash index df4e54b18..6b3a7ef13 100644 --- a/buildroot/package/msgpack/msgpack.hash +++ b/buildroot/package/msgpack/msgpack.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 bda49f996a73d2c6080ff0523e7b535917cd28c8a79c3a5da54fc29332d61d1e msgpack-3.1.1.tar.gz +sha256 ff865a36bad5c72b8e7ebc4b7cf5f27a820fce4faff9c571c1791e3728355a39 msgpack-3.2.0.tar.gz sha256 664550b43996452a5a2c7471bb0ff77185a58c69ccafa60f983dc4c162e1ee22 COPYING sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/buildroot/package/msgpack/msgpack.mk b/buildroot/package/msgpack/msgpack.mk index 781e67e37..1e13464ca 100644 --- a/buildroot/package/msgpack/msgpack.mk +++ b/buildroot/package/msgpack/msgpack.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSGPACK_VERSION = 3.1.1 +MSGPACK_VERSION = 3.2.0 MSGPACK_SITE = $(call github,msgpack,msgpack-c,cpp-$(MSGPACK_VERSION)) MSGPACK_LICENSE = BSL-1.0 MSGPACK_LICENSE_FILES = COPYING LICENSE_1_0.txt diff --git a/buildroot/package/msmtp/msmtp.hash b/buildroot/package/msmtp/msmtp.hash index f966e5d6d..9849c547c 100644 --- a/buildroot/package/msmtp/msmtp.hash +++ b/buildroot/package/msmtp/msmtp.hash @@ -1,6 +1,6 @@ # Locally calculated after checking signature -# https://marlam.de/msmtp/releases/msmtp-1.8.0.tar.xz.sig -sha256 bd730cbf000d1b8382849ea21d569a387e63f936be00dc07c569f67915e53ccd msmtp-1.8.0.tar.xz +# https://marlam.de/msmtp/releases/msmtp-1.8.6.tar.xz.sig +sha256 6625f147430c65ba8527f52c4fe5d4d33552d3c0fb6d793ba7df819a3b3042e1 msmtp-1.8.6.tar.xz # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/msmtp/msmtp.mk b/buildroot/package/msmtp/msmtp.mk index db3d42cd9..1518aa10e 100644 --- a/buildroot/package/msmtp/msmtp.mk +++ b/buildroot/package/msmtp/msmtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSMTP_VERSION = 1.8.0 +MSMTP_VERSION = 1.8.6 MSMTP_SITE = https://marlam.de/msmtp/releases MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz MSMTP_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/msr-tools/msr-tools.hash b/buildroot/package/msr-tools/msr-tools.hash index 18146df51..51ec1c79c 100644 --- a/buildroot/package/msr-tools/msr-tools.hash +++ b/buildroot/package/msr-tools/msr-tools.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 9b87245ee091a798184e447066e9e0d7709b7c81f5e6ad55f2b958c1aa50c4a3 msr-tools-1.3.tar.gz +sha256 9b87245ee091a798184e447066e9e0d7709b7c81f5e6ad55f2b958c1aa50c4a3 msr-tools-1.3.tar.gz +sha256 98398b08cd0dab9a04115b049758d4a7917af3c74389a4576d26c8a240d38a73 cpuid.c diff --git a/buildroot/package/mtd/0001-revert-return-correct-error-number-in-ubi_get_vol_info1.patch b/buildroot/package/mtd/0001-revert-return-correct-error-number-in-ubi_get_vol_info1.patch deleted file mode 100644 index 1fd4f7693..000000000 --- a/buildroot/package/mtd/0001-revert-return-correct-error-number-in-ubi_get_vol_info1.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 0f833ac73ad631248826386e2918d8571ecf0347 Mon Sep 17 00:00:00 2001 -From: David Oberhollenzer -Date: Sat, 9 Jun 2018 16:45:22 +0200 -Subject: [PATCH] Revert "Return correct error number in ubi_get_vol_info1" - -This reverts commit dede98ffb706676309488d7cc660f569548d5930. - -The original commit tried to fix a descrepancy between the implementation -and the documentation by making the implementation comply. - -When making the change, it was overlooked, that ubinfo and ubirename were -written against the implementation instead of the behaviour specified by -the documentation. So were further internal functions like -ubi_get_vol_info1_nm which further breaks ubirmvol. - -A report with an outline of a resulting problem can be read on -the mailing list: - -http://lists.infradead.org/pipermail/linux-mtd/2018-June/081562.html - -From the report: - -steps to reproduce: have mtd-utils 2.0.1 or 2.0.2 - -0. make a bunch of ubi volumes in sequential order - -ubimkvol /dev/ubi0 -s 64KiB -N test1 -ubimkvol /dev/ubi0 -s 64KiB -N test2 -ubimkvol /dev/ubi0 -s 64KiB -N test3 -ubimkvol /dev/ubi0 -s 64KiB -N test4 -.. - -1. delete the test1 volume, making a hole in the volume table - -ubirmvol /dev/ubi0 -N test1 - -2. try an affected tool (i.e. "ubirmvol /dev/ubi0 -N test4" ) - - |root at mr24:/# ubirmvol /dev/ubi0 -N test4 - |ubirmvol: error!: cannot find UBI volume "test4" - | error 19 (No such device) - -or "ubinfo -a" - - | root at mr24:/# ubinfo -a - | UBI version: 1 - | Count of UBI devices: 1 - | UBI control device major/minor: 10:59 - | Present UBI devices: ubi0 - | - | ubi0 - | Volumes count: 11 - | Logical eraseblock size: 15872 bytes, 15.5 KiB - | Total amount of logical eraseblocks: 1952 (30982144 bytes, 29.5 MiB) - | Amount of available logical eraseblocks: 75 (1190400 bytes, 1.1 MiB) - | Maximum count of volumes 92 - | Count of bad physical eraseblocks: 0 - | Count of reserved physical eraseblocks: 40 - | Current maximum erase counter value: 984 - | Minimum input/output unit size: 512 bytes - | Character device major/minor: 251:0 - | ubinfo: error!: libubi failed to probe volume 5 on ubi0 - | error 19 (No such device) - | Present volumes: 0, 1, 2, 3, 4root at mr24:/# - -Reported-by: Christian Lamparter -Signed-off-by: David Oberhollenzer -Signed-off-by: David Owens ---- - lib/libubi.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/lib/libubi.c b/lib/libubi.c -index b50e68a..978b433 100644 ---- a/lib/libubi.c -+++ b/lib/libubi.c -@@ -1240,11 +1240,8 @@ int ubi_get_vol_info1(libubi_t desc, int dev_num, int vol_id, - info->dev_num = dev_num; - info->vol_id = vol_id; - -- if (vol_get_major(lib, dev_num, vol_id, &info->major, &info->minor)) { -- if (errno == ENOENT) -- errno = ENODEV; -+ if (vol_get_major(lib, dev_num, vol_id, &info->major, &info->minor)) - return -1; -- } - - ret = vol_read_data(lib->vol_type, dev_num, vol_id, buf, 50); - if (ret < 0) --- -2.14.4 - diff --git a/buildroot/package/mtd/mtd.hash b/buildroot/package/mtd/mtd.hash index 4bd0cda09..2e23fbb81 100644 --- a/buildroot/package/mtd/mtd.hash +++ b/buildroot/package/mtd/mtd.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.0.2.tar.bz2.asc -sha256 fb3de61be8e932abb424e8ea3c30298f553d5f970ad158a737bb303bbf9660b8 mtd-utils-2.0.2.tar.bz2 +# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.1.tar.bz2.asc +sha256 8d15e8b70f036d6af1a66011f8ca0e048e9675fa7983d33bea92c24313a232d2 mtd-utils-2.1.1.tar.bz2 sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/buildroot/package/mtd/mtd.mk b/buildroot/package/mtd/mtd.mk index 13e501fc3..347746020 100644 --- a/buildroot/package/mtd/mtd.mk +++ b/buildroot/package/mtd/mtd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTD_VERSION = 2.0.2 +MTD_VERSION = 2.1.1 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils MTD_LICENSE = GPL-2.0 @@ -21,6 +21,18 @@ endif ifeq ($(BR2_PACKAGE_MTD_UBIFS_UTILS),y) MTD_DEPENDENCIES += util-linux zlib lzo host-pkgconf MTD_CONF_OPTS += --with-ubifs +ifeq ($(BR2_PACKAGE_OPENSSL),y) +MTD_DEPENDENCIES += openssl +MTD_CONF_OPTS += --with-crypto +else +MTD_CONF_OPTS += --without-crypto +endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +MTD_DEPENDENCIES += zstd +MTD_CONF_OPTS += --with-zstd +else +MTD_CONF_OPTS += --without-zstd +endif else MTD_CONF_OPTS += --without-ubifs endif @@ -40,7 +52,7 @@ else MTD_CONF_OPTS += --without-xattr endif -HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-util-linux +HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-util-linux host-zstd HOST_MTD_CONF_OPTS = \ --with-jffs \ --with-ubifs \ diff --git a/buildroot/package/mtdev/mtdev.hash b/buildroot/package/mtdev/mtdev.hash index 7ba5ffdf5..7ead723ef 100644 --- a/buildroot/package/mtdev/mtdev.hash +++ b/buildroot/package/mtdev/mtdev.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 6b59b055ff22f2b91d4284187c2515826c338b81f6f33bd90f6bedc7c1fb9a38 mtdev-1.1.4.tar.bz2 +sha256 6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f mtdev-1.1.5.tar.bz2 +sha256 795bfe74daae59a97d3a0c8ec0ba0f08c243adf94a3aa7981a4136fce31d55b4 COPYING diff --git a/buildroot/package/mtdev/mtdev.mk b/buildroot/package/mtdev/mtdev.mk index fc6ee4c46..f4c38d5c4 100644 --- a/buildroot/package/mtdev/mtdev.mk +++ b/buildroot/package/mtdev/mtdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTDEV_VERSION = 1.1.4 +MTDEV_VERSION = 1.1.5 MTDEV_SOURCE = mtdev-$(MTDEV_VERSION).tar.bz2 MTDEV_SITE = http://bitmath.org/code/mtdev diff --git a/buildroot/package/mtdev2tuio/mtdev2tuio.hash b/buildroot/package/mtdev2tuio/mtdev2tuio.hash index b0d159cad..9932e9e18 100644 --- a/buildroot/package/mtdev2tuio/mtdev2tuio.hash +++ b/buildroot/package/mtdev2tuio/mtdev2tuio.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 4a6aa319c44478dceaf01a24603690767e56c029a1f0380da0f31eac5a02e10f mtdev2tuio-e1e7378d86abe751158e743586133022f32fa4d1.tar.gz +sha256 4a6aa319c44478dceaf01a24603690767e56c029a1f0380da0f31eac5a02e10f mtdev2tuio-e1e7378d86abe751158e743586133022f32fa4d1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/mtools/mtools.hash b/buildroot/package/mtools/mtools.hash index 5d86498cd..1efc99a6b 100644 --- a/buildroot/package/mtools/mtools.hash +++ b/buildroot/package/mtools/mtools.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85 mtools-4.0.18.tar.bz2 +sha256 c708ff513fada78060a9e55db7c8d169d82d0e3d4afbd7c2744dce6ae0bfdb6d mtools-4.0.23.tar.lz + +# Locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/mtools/mtools.mk b/buildroot/package/mtools/mtools.mk index 1a6218831..bd3444022 100644 --- a/buildroot/package/mtools/mtools.mk +++ b/buildroot/package/mtools/mtools.mk @@ -4,8 +4,8 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.18 -MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.bz2 +MTOOLS_VERSION = 4.0.23 +MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ MTOOLS_LICENSE_FILES = COPYING diff --git a/buildroot/package/mtr/mtr.hash b/buildroot/package/mtr/mtr.hash index f3df81f42..7771e091e 100644 --- a/buildroot/package/mtr/mtr.hash +++ b/buildroot/package/mtr/mtr.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 12a6a94c0ec04d508de27eda5f5ba91f50d4b5fe74a98aca0973e2c16a42555a mtr-66de3ecbab28b054b868a73fbb57f30549d770ac.tar.gz +sha256 3a1ab330104ddee3135af3cfa567b9608001c5deecbf200c08b545ed6d7a4c8f mtr-0.93.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/mtr/mtr.mk b/buildroot/package/mtr/mtr.mk index 82688ed06..7a4b14026 100644 --- a/buildroot/package/mtr/mtr.mk +++ b/buildroot/package/mtr/mtr.mk @@ -4,8 +4,8 @@ # ################################################################################ -MTR_VERSION = 66de3ecbab28b054b868a73fbb57f30549d770ac -MTR_SITE = $(call github,traviscross,mtr,$(MTR_VERSION)) +MTR_VERSION = 0.93 +MTR_SITE = $(call github,traviscross,mtr,v$(MTR_VERSION)) MTR_AUTORECONF = YES MTR_CONF_OPTS = --without-gtk MTR_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_NCURSES),ncurses) diff --git a/buildroot/package/murata-cyw-fw/Config.in b/buildroot/package/murata-cyw-fw/Config.in new file mode 100644 index 000000000..753047751 --- /dev/null +++ b/buildroot/package/murata-cyw-fw/Config.in @@ -0,0 +1,97 @@ +config BR2_PACKAGE_MURATA_CYW_FW + bool "murata-cyw-fw" + help + Murata Wireless firmware, NVRAM and Bluetooth HCD patch files. + + https://github.com/murata-wireless/cyw-fmac-fw + https://github.com/murata-wireless/cyw-fmac-nvram + https://github.com/murata-wireless/cyw-bt-patch + +if BR2_PACKAGE_MURATA_CYW_FW + +config BR2_PACKAGE_MURATA_CYW_FW_CYW43012 + bool "CYW43012 (1LV)" + help + Murata Wireless CYW43012 (1LV) module firmware files. + +config BR2_PACKAGE_MURATA_CYW_FW_CYW43340 + bool "CYW43340/CYW43341 (1BW)" + help + Murata Wireless CYW43340/CYW43341 (1BW) module firmware files. + +config BR2_PACKAGE_MURATA_CYW_FW_CYW43362 + bool "CYW43362 (SN8000)" + help + Murata Wireless CYW43362 (SN8000) module firmware files. + +config BR2_PACKAGE_MURATA_CYW_FW_CYW4339 + bool "CYW4339 (1CK/ZP)" + help + Murata Wireless CYW4339 (1CK/ZP) module firmware files. + +choice + prompt "CYW4339 module" if BR2_PACKAGE_MURATA_CYW_FW_CYW4339 + +config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK + bool "1CK" + +config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP + bool "ZP" + +endchoice + +config BR2_PACKAGE_MURATA_CYW_FW_CYW43430 + bool "CYW43430/CYW4343W/CYW43364 (1DX/1FX/1LN)" + help + Murata Wireless CYW43430/CYW4343W/CYW43364 (1DX/1FX/1LN) + module firmware files. + +choice + prompt "CYW43430/CYW4343W/CYW43364 module" if BR2_PACKAGE_MURATA_CYW_FW_CYW43430 + +config BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1DX + bool "1DX" + +config BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1FX + bool "1FX" + +config BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1LN + bool "1LN" + +endchoice + +config BR2_PACKAGE_MURATA_CYW_FW_CYW43455 + bool "CYW43455 (1HK/1LC/1MW)" + help + Murata Wireless CYW43455 (1HK/1LC/1MW) module firmware files. + +choice + prompt "CYW43455 module" if BR2_PACKAGE_MURATA_CYW_FW_CYW43455 + +config BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1HK + bool "1HK" + +config BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1LC + bool "1LC" + +config BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1MW + bool "1MW" + +endchoice + +config BR2_PACKAGE_MURATA_CYW_FW_CYW4354 + bool "CYW4354 (1BB)" + help + Murata Wireless CYW4354 (1BB) module firmware files. + +config BR2_PACKAGE_MURATA_CYW_FW_CYW4356 + bool "CYW4356 (1CX)" + help + Murata Wireless CYW4356 (1CX) module firmware files. + +config BR2_PACKAGE_MURATA_CYW_FW_CYW4359 + bool "CYW4359 (1FD)" + help + Murata Wireless CYW4359 (1FD) module firmware files. + +endif diff --git a/buildroot/package/murata-cyw-fw/murata-cyw-fw.hash b/buildroot/package/murata-cyw-fw/murata-cyw-fw.hash new file mode 100644 index 000000000..c1afb229e --- /dev/null +++ b/buildroot/package/murata-cyw-fw/murata-cyw-fw.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 c3ecf357786d6db6f3283c0ea36ec067b1728f801fd8871694aed1502a82e9bc murata-cyw-fw-8d87950bfad28c65926695b7357bd8995b60016a.tar.gz +sha256 03c140ae04f9c2036678262d6457b9c4b4a9ebb523c5e681af6d57b97c11da37 cyw-fmac-nvram-d27f1bf105fa1e5b828e355793b88d4b66188411.tar.gz +sha256 8f23ebb9a262112b62ace1e1bedcdeb00523d9a45e8d48a829d4ca35db4f0280 cyw-bt-patch-748462f0b02ec4aeb500bedd60780ac51c37be31.tar.gz +sha256 3a892759b73e8b459f1a750954b316118b0061fd9d1868d11fa258c104ee7e0c LICENCE.cypress diff --git a/buildroot/package/murata-cyw-fw/murata-cyw-fw.mk b/buildroot/package/murata-cyw-fw/murata-cyw-fw.mk new file mode 100644 index 000000000..b99168b87 --- /dev/null +++ b/buildroot/package/murata-cyw-fw/murata-cyw-fw.mk @@ -0,0 +1,98 @@ +################################################################################ +# +# murata-cyw-fw +# +################################################################################ + +MURATA_CYW_FW_VERSION = 8d87950bfad28c65926695b7357bd8995b60016a +MURATA_CYW_FW_VERSION_NVRAM = d27f1bf105fa1e5b828e355793b88d4b66188411 +MURATA_CYW_FW_VERSION_BT_PATCH = 748462f0b02ec4aeb500bedd60780ac51c37be31 +MURATA_CYW_FW_SITE = $(call github,murata-wireless,cyw-fmac-fw,$(MURATA_CYW_FW_VERSION)) +MURATA_CYW_FW_EXTRA_DOWNLOADS = \ + $(call github,murata-wireless,cyw-fmac-nvram,$(MURATA_CYW_FW_VERSION_NVRAM))/cyw-fmac-nvram-$(MURATA_CYW_FW_VERSION_NVRAM).tar.gz \ + $(call github,murata-wireless,cyw-bt-patch,$(MURATA_CYW_FW_VERSION_BT_PATCH))/cyw-bt-patch-$(MURATA_CYW_FW_VERSION_BT_PATCH).tar.gz +MURATA_CYW_FW_LICENSE = PROPRIETARY +MURATA_CYW_FW_LICENSE_FILES = LICENCE.cypress +MURATA_CYW_FW_REDISTRIBUTE = NO + +define MURATA_CYW_FW_EXTRACT_NVRAM_PATCH + $(foreach tar,$(notdir $(MURATA_CYW_FW_EXTRA_DOWNLOADS)), \ + $(call suitable-extractor,$(tar)) $(MURATA_CYW_FW_DL_DIR)/$(tar) | \ + $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) - + ) +endef +MURATA_CYW_FW_POST_EXTRACT_HOOKS += MURATA_CYW_FW_EXTRACT_NVRAM_PATCH + +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43012) += \ + brcmfmac43012-sdio.bin \ + brcmfmac43012-sdio.1LV.clm_blob \ + brcmfmac43012-sdio.1LV.txt \ + CYW43012C0.1LV.hcd +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43340) += \ + brcmfmac43340-sdio.bin \ + brcmfmac43340-sdio.1BW.txt \ + CYW43341B0.1BW.hcd +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43362) += \ + brcmfmac43362-sdio.bin \ + brcmfmac43362-sdio.SN8000.txt +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339) += \ + brcmfmac4339-sdio.bin +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK) += \ + brcmfmac4339-sdio.1CK.txt +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP) += \ + brcmfmac4339-sdio.ZP.txt \ + CYW4335C0.ZP.hcd +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430) += \ + brcmfmac43430-sdio.bin +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1DX) += \ + brcmfmac43430-sdio.1DX.clm_blob \ + brcmfmac43430-sdio.1DX.txt \ + CYW43430A1.1DX.hcd +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1FX) += \ + brcmfmac43430-sdio.1FX.clm_blob \ + brcmfmac43430-sdio.1FX.txt +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1LN) += \ + brcmfmac43430-sdio.1LN.clm_blob \ + brcmfmac43430-sdio.1LN.txt +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455) += \ + brcmfmac43455-sdio.bin +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1HK) += \ + brcmfmac43455-sdio.1HK.clm_blob \ + brcmfmac43455-sdio.1HK.txt +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1LC) += \ + brcmfmac43455-sdio.1LC.clm_blob \ + brcmfmac43455-sdio.1LC.txt +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1MW) += \ + brcmfmac43455-sdio.1MW.clm_blob \ + brcmfmac43455-sdio.1MW.txt \ + CYW4345C0.1MW.hcd +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4354) += \ + brcmfmac4354-sdio.bin \ + brcmfmac4354-sdio.1BB.clm_blob \ + brcmfmac4354-sdio.1BB.txt \ + CYW4350C0.1BB.hcd +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4356) += \ + brcmfmac4356-pcie.bin \ + brcmfmac4356-pcie.1CX.clm_blob \ + brcmfmac4356-pcie.1CX.txt \ + CYW4354A2.1CX.hcd +MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4359) += \ + brcmfmac4359-pcie.bin \ + brcmfmac4359-pcie.1FD.clm_blob + +# Helper that assumes filename with model has two dots (CHIP.MODEL.EXT), +# but filename without model has only single dot (CHIP.EXT). +murata-cyw-fw-strip-model = $(shell echo -n $(1) | sed 's/\..*\./\./') + +# Helper that strips model name and renames Bluetooth patch files to the ones +# expected by Linux kernel. +murata-cyw-fw-file-rename = $(call murata-cyw-fw-strip-model,$(patsubst CYW%,BCM%,$(f))) + +define MURATA_CYW_FW_INSTALL_TARGET_CMDS + $(foreach f,$(MURATA_CYW_FW_FILES_y), \ + $(INSTALL) -m 0644 -D $(@D)/$(f) \ + $(TARGET_DIR)/lib/firmware/brcm/$(call murata-cyw-fw-file-rename,$(f)) + ) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/musepack/musepack.hash b/buildroot/package/musepack/musepack.hash index b1bd73ca8..b811edd99 100644 --- a/buildroot/package/musepack/musepack.hash +++ b/buildroot/package/musepack/musepack.hash @@ -1,4 +1,7 @@ # From https://www.musepack.net/index.php?pg=src md5 754d67be67f713e54baf70fcfdb2817e musepack_src_r475.tar.gz # Calculated based on the hash above -sha256 a4b1742f997f83e1056142d556a8c20845ba764b70365ff9ccf2e3f81c427b2b musepack_src_r475.tar.gz +sha256 a4b1742f997f83e1056142d556a8c20845ba764b70365ff9ccf2e3f81c427b2b musepack_src_r475.tar.gz +# Locally computed +sha256 141f551d8e4f037b7f6bc9136b7d3116c7ae9ec8da10c4f14c07c6dc34bc9aa5 libmpcdec/COPYING +sha256 0da88639aebbd614151ee52294fa13789f8cd28d9f2e0a56998b89b5c21ddc2b libmpcenc/quant.c diff --git a/buildroot/package/musl-fts/Config.in b/buildroot/package/musl-fts/Config.in new file mode 100644 index 000000000..358bf271c --- /dev/null +++ b/buildroot/package/musl-fts/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_MUSL_FTS + bool "musl-fts" + depends on !BR2_TOOLCHAIN_USES_GLIBC + help + The musl-fts package implements the fts(3) functions + fts_open, fts_read, fts_children, fts_set and fts_close, + which are missing in musl and uClibc-ng C libraries. + + https://github.com/void-linux/musl-fts diff --git a/buildroot/package/musl-fts/musl-fts.hash b/buildroot/package/musl-fts/musl-fts.hash new file mode 100644 index 000000000..8838c8479 --- /dev/null +++ b/buildroot/package/musl-fts/musl-fts.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6 musl-fts-1.2.7.tar.gz +sha256 55af87e4017668f54467a3380e7ebbac5e672d8c763bfe95e6fc882a6fdc4046 COPYING diff --git a/buildroot/package/musl-fts/musl-fts.mk b/buildroot/package/musl-fts/musl-fts.mk new file mode 100644 index 000000000..dd7f1f9ea --- /dev/null +++ b/buildroot/package/musl-fts/musl-fts.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# musl-fts +# +################################################################################ + +MUSL_FTS_VERSION = 1.2.7 +MUSL_FTS_SITE = $(call github,void-linux,musl-fts,v$(MUSL_FTS_VERSION)) +MUSL_FTS_AUTORECONF = YES +MUSL_FTS_LICENSE = BSD-3-Clause +MUSL_FTS_LICENSE_FILES = COPYING +# pkg-config needed for autoreconf +MUSL_FTS_DEPENDENCIES = host-pkgconf +MUSL_FTS_INSTALL_STAGING = YES + +$(eval $(autotools-package)) diff --git a/buildroot/package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch b/buildroot/package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch new file mode 100644 index 000000000..7c3acf9f0 --- /dev/null +++ b/buildroot/package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch @@ -0,0 +1,76 @@ +From 407c96fc790d0d11ca9603a2a533216c745b5051 Mon Sep 17 00:00:00 2001 +From: Stefan Nickl +Date: Mon, 13 May 2019 22:33:21 +0200 +Subject: [PATCH] Make scheduler functions Linux-compatible + +Let sched_getscheduler(), sched_setscheduler(), sched_getparam(), +sched_setparam() invoke the Linux syscalls of the same name instead +of returning -ENOSYS. + +Signed-off-by: Stefan Nickl +--- + src/sched/sched_getparam.c | 3 +-- + src/sched/sched_getscheduler.c | 3 +-- + src/sched/sched_setparam.c | 3 +-- + src/sched/sched_setscheduler.c | 3 +-- + 4 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/src/sched/sched_getparam.c b/src/sched/sched_getparam.c +index 76f10e4..65be107 100644 +--- a/src/sched/sched_getparam.c ++++ b/src/sched/sched_getparam.c +@@ -1,8 +1,7 @@ + #include +-#include + #include "syscall.h" + + int sched_getparam(pid_t pid, struct sched_param *param) + { +- return __syscall_ret(-ENOSYS); ++ return syscall(SYS_sched_getparam, pid, param); + } +diff --git a/src/sched/sched_getscheduler.c b/src/sched/sched_getscheduler.c +index 394e508..4c922f6 100644 +--- a/src/sched/sched_getscheduler.c ++++ b/src/sched/sched_getscheduler.c +@@ -1,8 +1,7 @@ + #include +-#include + #include "syscall.h" + + int sched_getscheduler(pid_t pid) + { +- return __syscall_ret(-ENOSYS); ++ return syscall(SYS_sched_getscheduler, pid); + } +diff --git a/src/sched/sched_setparam.c b/src/sched/sched_setparam.c +index 18623ee..f699faf 100644 +--- a/src/sched/sched_setparam.c ++++ b/src/sched/sched_setparam.c +@@ -1,8 +1,7 @@ + #include +-#include + #include "syscall.h" + + int sched_setparam(pid_t pid, const struct sched_param *param) + { +- return __syscall_ret(-ENOSYS); ++ return syscall(SYS_sched_setparam, pid, param); + } +diff --git a/src/sched/sched_setscheduler.c b/src/sched/sched_setscheduler.c +index 4435f21..e678221 100644 +--- a/src/sched/sched_setscheduler.c ++++ b/src/sched/sched_setscheduler.c +@@ -1,8 +1,7 @@ + #include +-#include + #include "syscall.h" + + int sched_setscheduler(pid_t pid, int sched, const struct sched_param *param) + { +- return __syscall_ret(-ENOSYS); ++ return syscall(SYS_sched_setscheduler, pid, sched, param); + } +-- +2.21.0 + diff --git a/buildroot/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch b/buildroot/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch new file mode 100644 index 000000000..8221c0ea3 --- /dev/null +++ b/buildroot/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch @@ -0,0 +1,54 @@ +From 329e79299daaa994b8e75941331a1093051ea5d9 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Tue, 4 Feb 2020 09:29:13 -0500 +Subject: move riscv64 register index constants to signal.h + +under _GNU_SOURCE for namespace cleanliness, analogous to other archs. +the original placement in sys/reg.h seems not to have been motivated; +such a header isn't even present on other implementations. + +Downloaded from upstream commit +https://git.musl-libc.org/cgit/musl/commit/?id=329e79299daaa994b8e75941331a1093051ea5d9 + +Signed-off-by: Mark Corbin +--- + arch/riscv64/bits/reg.h | 6 ------ + arch/riscv64/bits/signal.h | 9 +++++++++ + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/arch/riscv64/bits/reg.h b/arch/riscv64/bits/reg.h +index c800788c..2633f39d 100644 +--- a/arch/riscv64/bits/reg.h ++++ b/arch/riscv64/bits/reg.h +@@ -1,8 +1,2 @@ + #undef __WORDSIZE + #define __WORDSIZE 64 +-#define REG_PC 0 +-#define REG_RA 1 +-#define REG_SP 2 +-#define REG_TP 4 +-#define REG_S0 8 +-#define REG_A0 10 +diff --git a/arch/riscv64/bits/signal.h b/arch/riscv64/bits/signal.h +index 2ff4be30..b006334f 100644 +--- a/arch/riscv64/bits/signal.h ++++ b/arch/riscv64/bits/signal.h +@@ -35,6 +35,15 @@ typedef struct mcontext_t { + union __riscv_mc_fp_state __fpregs; + } mcontext_t; + ++#if defined(_GNU_SOURCE) ++#define REG_PC 0 ++#define REG_RA 1 ++#define REG_SP 2 ++#define REG_TP 4 ++#define REG_S0 8 ++#define REG_A0 10 ++#endif ++ + #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) + typedef unsigned long greg_t; + typedef unsigned long gregset_t[32]; +-- +cgit v1.2.1 + diff --git a/buildroot/package/musl/0004-fix-x87-stack-imbalance-in-corner-cases-of-i386-math.patch b/buildroot/package/musl/0004-fix-x87-stack-imbalance-in-corner-cases-of-i386-math.patch deleted file mode 100644 index 8940c2865..000000000 --- a/buildroot/package/musl/0004-fix-x87-stack-imbalance-in-corner-cases-of-i386-math.patch +++ /dev/null @@ -1,200 +0,0 @@ -From f3ed8bfe8a82af1870ddc8696ed4cc1d5aa6b441 Mon Sep 17 00:00:00 2001 -From: Rich Felker -Date: Mon, 5 Aug 2019 18:41:47 -0400 -Subject: [PATCH] fix x87 stack imbalance in corner cases of i386 math asm - -commit 31c5fb80b9eae86f801be4f46025bc6532a554c5 introduced underflow -code paths for the i386 math asm, along with checks on the fpu status -word to skip the underflow-generation instructions if the underflow -flag was already raised. unfortunately, at least one such path, in -log1p, returned with 2 items on the x87 stack rather than just 1 item -for the return value. this is a violation of the ABI's calling -convention, and could cause subsequent floating point code to produce -NANs due to x87 stack overflow. if floating point results are used in -flow control, this can lead to runaway wrong code execution. - -rather than reviewing each "underflow already raised" code path for -correctness, remove them all. they're likely slower than just -performing the underflow code unconditionally, and significantly more -complex. - -all of this code should be ripped out and replaced by C source files -with inline asm. doing so would preclude this kind of error by having -the compiler perform all x87 stack register allocation and stack -manipulation, and would produce comparable or better code. however -such a change is a much larger project. - -Signed-off-by: Peter Korsgaard ---- - src/math/i386/asin.s | 10 ++-------- - src/math/i386/atan.s | 7 ++----- - src/math/i386/atan2.s | 5 +---- - src/math/i386/atan2f.s | 5 +---- - src/math/i386/atanf.s | 7 ++----- - src/math/i386/exp.s | 10 ++-------- - src/math/i386/log1p.s | 7 ++----- - src/math/i386/log1pf.s | 7 ++----- - 8 files changed, 14 insertions(+), 44 deletions(-) - -diff --git a/src/math/i386/asin.s b/src/math/i386/asin.s -index a9f691bf..920d967a 100644 ---- a/src/math/i386/asin.s -+++ b/src/math/i386/asin.s -@@ -7,13 +7,10 @@ asinf: - cmp $0x01000000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 2f - fld %st(0) - fmul %st(1) - fstps 4(%esp) --2: ret -+ ret - - .global asinl - .type asinl,@function -@@ -30,11 +27,8 @@ asin: - cmp $0x00200000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 2f - fsts 4(%esp) --2: ret -+ ret - 1: fld %st(0) - fld1 - fsub %st(0),%st(1) -diff --git a/src/math/i386/atan.s b/src/math/i386/atan.s -index d73137b2..a26feae1 100644 ---- a/src/math/i386/atan.s -+++ b/src/math/i386/atan.s -@@ -10,8 +10,5 @@ atan: - fpatan - ret - # subnormal x, return x with underflow --1: fnstsw %ax -- and $16,%ax -- jnz 2f -- fsts 4(%esp) --2: ret -+1: fsts 4(%esp) -+ ret -diff --git a/src/math/i386/atan2.s b/src/math/i386/atan2.s -index a7d2979b..1fa0524d 100644 ---- a/src/math/i386/atan2.s -+++ b/src/math/i386/atan2.s -@@ -10,8 +10,5 @@ atan2: - cmp $0x00200000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 1f - fsts 4(%esp) --1: ret -+ ret -diff --git a/src/math/i386/atan2f.s b/src/math/i386/atan2f.s -index 14b88ce5..0b264726 100644 ---- a/src/math/i386/atan2f.s -+++ b/src/math/i386/atan2f.s -@@ -10,10 +10,7 @@ atan2f: - cmp $0x01000000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 1f - fld %st(0) - fmul %st(1) - fstps 4(%esp) --1: ret -+ ret -diff --git a/src/math/i386/atanf.s b/src/math/i386/atanf.s -index 8caddefa..893beac5 100644 ---- a/src/math/i386/atanf.s -+++ b/src/math/i386/atanf.s -@@ -10,10 +10,7 @@ atanf: - fpatan - ret - # subnormal x, return x with underflow --1: fnstsw %ax -- and $16,%ax -- jnz 2f -- fld %st(0) -+1: fld %st(0) - fmul %st(1) - fstps 4(%esp) --2: ret -+ ret -diff --git a/src/math/i386/exp.s b/src/math/i386/exp.s -index c7aa5b6e..df87c497 100644 ---- a/src/math/i386/exp.s -+++ b/src/math/i386/exp.s -@@ -7,13 +7,10 @@ expm1f: - cmp $0x01000000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 2f - fld %st(0) - fmul %st(1) - fstps 4(%esp) --2: ret -+ ret - - .global expm1l - .type expm1l,@function -@@ -30,11 +27,8 @@ expm1: - cmp $0x00200000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 2f - fsts 4(%esp) --2: ret -+ ret - 1: fldl2e - fmulp - mov $0xc2820000,%eax -diff --git a/src/math/i386/log1p.s b/src/math/i386/log1p.s -index 6b6929c7..354f391a 100644 ---- a/src/math/i386/log1p.s -+++ b/src/math/i386/log1p.s -@@ -16,9 +16,6 @@ log1p: - fyl2x - ret - # subnormal x, return x with underflow --2: fnstsw %ax -- and $16,%ax -- jnz 1f -- fsts 4(%esp) -+2: fsts 4(%esp) - fstp %st(1) --1: ret -+ ret -diff --git a/src/math/i386/log1pf.s b/src/math/i386/log1pf.s -index c0bcd30f..4d3484cd 100644 ---- a/src/math/i386/log1pf.s -+++ b/src/math/i386/log1pf.s -@@ -16,10 +16,7 @@ log1pf: - fyl2x - ret - # subnormal x, return x with underflow --2: fnstsw %ax -- and $16,%ax -- jnz 1f -- fxch -+2: fxch - fmul %st(1) - fstps 4(%esp) --1: ret -+ ret --- -2.11.0 - diff --git a/buildroot/package/musl/0005-fix-build-regression-in-i386-asm-for-atan2-atan2f.patch b/buildroot/package/musl/0005-fix-build-regression-in-i386-asm-for-atan2-atan2f.patch deleted file mode 100644 index 824933c6d..000000000 --- a/buildroot/package/musl/0005-fix-build-regression-in-i386-asm-for-atan2-atan2f.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6818c31c9bc4bbad5357f1de14bedf781e5b349e Mon Sep 17 00:00:00 2001 -From: Rich Felker -Date: Mon, 5 Aug 2019 19:57:07 -0400 -Subject: [PATCH] fix build regression in i386 asm for atan2, atan2f - -commit f3ed8bfe8a82af1870ddc8696ed4cc1d5aa6b441 inadvertently removed -labels that were still needed. - -Signed-off-by: Peter Korsgaard ---- - src/math/i386/atan2.s | 2 +- - src/math/i386/atan2f.s | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/math/i386/atan2.s b/src/math/i386/atan2.s -index 1fa0524d..76b95f31 100644 ---- a/src/math/i386/atan2.s -+++ b/src/math/i386/atan2.s -@@ -11,4 +11,4 @@ atan2: - jae 1f - # subnormal x, return x with underflow - fsts 4(%esp) -- ret -+1: ret -diff --git a/src/math/i386/atan2f.s b/src/math/i386/atan2f.s -index 0b264726..c9408a90 100644 ---- a/src/math/i386/atan2f.s -+++ b/src/math/i386/atan2f.s -@@ -13,4 +13,4 @@ atan2f: - fld %st(0) - fmul %st(1) - fstps 4(%esp) -- ret -+1: ret --- -2.11.0 - diff --git a/buildroot/package/musl/musl.hash b/buildroot/package/musl/musl.hash index 564440177..f0450897c 100644 --- a/buildroot/package/musl/musl.hash +++ b/buildroot/package/musl/musl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# http://www.musl-libc.org/releases/musl-1.1.22.tar.gz.asc -sha256 8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3 musl-1.1.22.tar.gz -sha256 a3ae1b9fc5d4938f5734734383b9813d27a5652df23010c6f9d4c5419b239a41 COPYRIGHT +# http://www.musl-libc.org/releases/musl-1.1.24.tar.gz.asc +sha256 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 musl-1.1.24.tar.gz +sha256 3520d478bccbdf68d9dc0c03984efb0fa4b99868ab2599f5b5f72f3fb3b07a49 COPYRIGHT diff --git a/buildroot/package/musl/musl.mk b/buildroot/package/musl/musl.mk index 5db5bbd26..df68c5f51 100644 --- a/buildroot/package/musl/musl.mk +++ b/buildroot/package/musl/musl.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.1.22 +MUSL_VERSION = 1.1.24 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT diff --git a/buildroot/package/mutt/0001-Convert-makedoc-c-to-makedoc-pl.patch b/buildroot/package/mutt/0001-Convert-makedoc-c-to-makedoc-pl.patch new file mode 100644 index 000000000..ed15e34f6 --- /dev/null +++ b/buildroot/package/mutt/0001-Convert-makedoc-c-to-makedoc-pl.patch @@ -0,0 +1,1090 @@ +From 27fdc2f5b55fa1849d1b51fa866a4c2a4e83a3cd Mon Sep 17 00:00:00 2001 +From: Kevin McCarthy +Date: Tue, 24 Dec 2019 19:04:07 -0800 +Subject: [PATCH] Convert makedoc.c to makedoc.pl. + +This removes the build-time dependency on a compiled program, which +doesn't work for cross-compilation. + +My perl is pretty rusty, and the result isn't super pretty. However, +since perl is already a build dependency, it made the most sense to +use that. The output of Muttrc, muttrc.man, and manual.xml match. + +There might be a few bugs, so I'm going to leave makedoc.c in for now +as a reference. + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://gitlab.com/muttmua/mutt/commit/27fdc2f5b55fa1849d1b51fa866a4c2a4e83a3cd] +--- + doc/Makefile.am | 16 +- + doc/devel-notes.txt | 2 +- + doc/makedoc.pl | 952 ++++++++++++++++++++++++++++++++++++++++++++ + init.h | 2 +- + sort.h | 2 +- + 5 files changed, 962 insertions(+), 12 deletions(-) + create mode 100644 doc/makedoc.pl + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 8f94a09b..1cb21b64 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -17,8 +17,6 @@ AM_CPPFLAGS = -I. -I.. -I$(includedir) -I$(top_srcdir) + + MAKEDOC_CPP = $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C + +-noinst_PROGRAMS = makedoc +- + EXTRA_DIST = dotlock.man \ + smime_keys.man \ + mutt.man \ +@@ -38,7 +36,7 @@ EXTRA_DIST = dotlock.man \ + patch-notes.txt \ + smime-notes.txt \ + Muttrc Muttrc.head stamp-doc-rc \ +- makedoc.c makedoc-defs.h \ ++ makedoc.pl makedoc-defs.h \ + mutt.css mutt.xsl html.xsl chunk.xsl $(BUILT_DISTFILES) + + CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \ +@@ -136,11 +134,11 @@ manual.txt: manual.html + + Muttrc: stamp-doc-rc + +-stamp-doc-rc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head ++stamp-doc-rc: $(top_srcdir)/init.h makedoc.pl $(srcdir)/Muttrc.head + -rm -f Muttrc stamp-doc-rc + sed -e 's,[@]docdir[@],$(docdir),' $(srcdir)/Muttrc.head > Muttrc + $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \ +- $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -c >> Muttrc ++ $(top_srcdir)/init.h | perl $(srcdir)/makedoc.pl -c >> Muttrc + touch stamp-doc-rc + + manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css +@@ -211,8 +209,8 @@ instdoc: instdoc.sh + + update-doc: stamp-doc-rc $(BUILD_DOC_TARGETS) + +-muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail +- $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -m | \ ++muttrc.man: makedoc.pl $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail ++ $(MAKEDOC_CPP) $(top_srcdir)/init.h | perl $(srcdir)/makedoc.pl -m | \ + cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail\ + > muttrc.man + +@@ -232,13 +230,13 @@ mutt_pgpring.1: $(srcdir)/pgpring.man + smime_keys.1: $(srcdir)/smime_keys.man + $(EDIT) $(srcdir)/smime_keys.man > $@ + +-stamp-doc-xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \ ++stamp-doc-xml: makedoc.pl $(top_srcdir)/init.h \ + manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \ + $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog + ( date=`(cd $(top_srcdir) && ./mkreldate.sh)` && \ + version=`(cd $(top_srcdir) && env sh ./version.sh)` && \ + sed -e "s/@VERSION\@/$$version ($$date)/" $(srcdir)/manual.xml.head && \ +- $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -s && \ ++ $(MAKEDOC_CPP) $(top_srcdir)/init.h | perl $(srcdir)/makedoc.pl -s && \ + $(MAKEDOC_CPP) $(top_srcdir)/functions.h | \ + perl $(srcdir)/gen-map-doc $(srcdir)/manual.xml.tail $(top_srcdir)/OPS* \ + ) > manual.xml +diff --git a/doc/devel-notes.txt b/doc/devel-notes.txt +index 99bc0fa0..bde077ab 100644 +--- a/doc/devel-notes.txt ++++ b/doc/devel-notes.txt +@@ -225,7 +225,7 @@ these variables, and the global Muttrc, are generated automatically + from that documentation. To start this process, type "make + update-doc" in the top-level source directory. + +-Note that you may have to update the makedoc utility (makedoc.c) ++Note that you may have to update the makedoc utility (makedoc.pl) + when adding new data types to init.h. + + More precisely, variable name, type, and default value are directly +diff --git a/doc/makedoc.pl b/doc/makedoc.pl +new file mode 100644 +index 00000000..e64d3c50 +--- /dev/null ++++ b/doc/makedoc.pl +@@ -0,0 +1,952 @@ ++#! /usr/bin/perl -w ++# ++# Copyright (C) 1999-2000 Thomas Roessler ++# Copyright (C) 2019 Kevin J. McCarthy ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ ++# This program was translated from the C version (makedoc.c). ++# So it looks like "c'ish perl" because it is, plus my perl is rusty ;-) ++ ++ ++# Documentation line parser notes: ++# ++# The format is very remotely inspired by nroff. Most important, it's ++# easy to parse and convert, and it was easy to generate from the SGML ++# source of mutt's original manual. ++# ++# - \fI switches to italics ++# - \fB switches to boldface ++# - \fC swtiches to a literal string ++# - \fP switches to normal display ++# - .dl on a line starts a definition list (name taken taken from HTML). ++# - .dt starts a term in a definition list. ++# - .dd starts a definition in a definition list. ++# - .de on a line finishes a definition list. ++# - .il on a line starts an itemized list ++# - .dd starts an item in an itemized list ++# - .ie on a line finishes an itemized list ++# - .ts on a line starts a "tscreen" environment (name taken from SGML). ++# - .te on a line finishes this environment. ++# - .pp on a line starts a paragraph. ++# - \$word will be converted to a reference to word, where appropriate. ++# Note that \$$word is possible as well. ++# - '. ' in the beginning of a line expands to two space characters. ++# This is used to protect indentations in tables. ++# ++ ++use strict; ++use warnings; ++use Getopt::Std; ++ ++# Output formats ++my $F_CONF = 1; ++my $F_MAN = 2; ++my $F_SGML = 3; ++ ++my $OutputFormat; ++ ++# docstatus flags, used by print_it() ++my $D_INIT = (1 << 0); # init ++my $D_NL = (1 << 1); # (usually) on a new line ++my $D_NP = (1 << 2); # new paragraph ".pp" ++my $D_PA = (1 << 3); # inside paragraph ".pp" ++ ++my $D_EM = (1 << 4); # emphasis "\fI" .. "\fP" ++my $D_BF = (1 << 5); # boldface "\fB" .. "\fP" ++my $D_TT = (1 << 6); # literal string "\fC" .. "\fP" ++ ++my $D_TAB = (1 << 7); # "tscreen" screen shot ".ts" .. ".te" ++my $D_DL = (1 << 8); # start defn list ".dl" .. ".de" ++my $D_DT = (1 << 9); # dlist term ".dt" ++my $D_DD = (1 << 10); # dlist defn ".dd" ++my $D_IL = (1 << 11); # itemized list ".il" .. ".ie" ++ ++# Commands sent to print_it() in response to various input strings ++my $SP_START_EM = 1; ++my $SP_START_BF = 2; ++my $SP_START_TT = 3; ++my $SP_END_FT = 4; ++my $SP_NEWLINE = 5; ++my $SP_NEWPAR = 6; ++my $SP_END_PAR = 7; ++my $SP_STR = 8; ++my $SP_START_TAB = 9; ++my $SP_END_TAB = 10; ++my $SP_START_DL = 11; ++my $SP_DT = 12; ++my $SP_DD = 13; ++my $SP_END_DD = 14; ++my $SP_END_DL = 15; ++my $SP_START_IL = 16; ++my $SP_END_IL = 17; ++my $SP_END_SECT = 18; ++my $SP_REFER = 19; ++ ++# Types to documentation readable strings: ++my %type2human = ("DT_NONE" => "-none-", ++ "DT_BOOL" => "boolean", ++ "DT_NUM" => "number", ++ "DT_LNUM" => "number (long)", ++ "DT_STR" => "string", ++ "DT_PATH" => "path", ++ "DT_QUAD" => "quadoption", ++ "DT_SORT" => "sort order", ++ "DT_RX" => "regular expression", ++ "DT_MAGIC" => "folder magic", ++ "DT_ADDR" => "e-mail address", ++ "DT_MBCHARTBL"=> "string"); ++ ++my %string_types = ("DT_STR" => 1, ++ "DT_RX" => 1, ++ "DT_ADDR" => 1, ++ "DT_PATH" => 1, ++ "DT_MBCHARTBL" => 1); ++ ++my %quad2human = ("MUTT_YES" => "yes", ++ "MUTT_NO" => "no", ++ "MUTT_ASKYES" => "ask-yes", ++ "MUTT_ASKNO" => "ask-no"); ++ ++my %bool2human = ("1" => "yes", ++ "0" => "no"); ++ ++ ++# prototypes ++# to update: ++# M-1 M-! grep '^sub' makedoc.pl ++sub makedoc(); ++sub flush_doc($); ++sub handle_confline($); ++sub pretty_default($$); ++sub string_unescape($); ++sub string_escape($); ++sub print_confline($$$); ++sub print_confline_conf($$$); ++sub print_conf_strval($); ++sub print_confline_man($$$); ++sub man_string_escape($); ++sub print_man_strval($); ++sub print_confline_sgml($$$); ++sub print_sgml_id($); ++sub print_sgml($); ++sub print_sgml_strval($); ++sub handle_docline($$); ++sub commit_buff($$); ++sub print_docline($$$); ++sub print_ref($$); ++sub print_docline_conf($$$$); ++sub print_docline_man($$$$); ++sub print_docline_sgml($$$$); ++ ++ ++our($opt_c, $opt_m, $opt_s); ++getopts('cms'); ++if ($opt_c) { ++ $OutputFormat = $F_CONF; ++} ++elsif ($opt_m) { ++ $OutputFormat = $F_MAN; ++} ++elsif ($opt_s) { ++ $OutputFormat = $F_SGML; ++} ++else { ++ die "$0: no output format specified" ++} ++ ++makedoc(); ++ ++ ++sub makedoc() { ++ my $line; ++ my $lineno = 0; ++ my $active = 0; ++ my $docstat = $D_INIT; ++ ++ while ($line = ) { ++ chomp($line); ++ $line =~ s/^\s+//; ++ if ($line eq '/*++*/') { ++ $active = 1; ++ } ++ elsif ($line eq '/*--*/') { ++ $docstat = flush_doc($docstat); ++ $active = 0; ++ } ++ elsif ($active) { ++ if (($line =~ /^\/\*\*/) || ($line =~ /^\*\*/)) { ++ $line =~ s/^[\/*]+\s*//; ++ $docstat = handle_docline($line, $docstat); ++ } ++ elsif ($line =~ /^{/) { ++ $line =~ s/^{\s*//; ++ $docstat = flush_doc($docstat); ++ handle_confline($line); ++ } ++ } ++ } ++ flush_doc($docstat); ++ print("\n"); ++} ++ ++sub flush_doc($) { ++ my ($docstat) = @_; ++ ++ if ($docstat & $D_INIT) { ++ return $D_INIT; ++ } ++ ++ if ($docstat & ($D_PA)) { ++ $docstat = print_docline($SP_END_PAR, undef, $docstat); ++ } ++ ++ if ($docstat & ($D_TAB)) { ++ $docstat = print_docline($SP_END_TAB, undef, $docstat); ++ } ++ ++ if ($docstat & ($D_DL)) { ++ $docstat = print_docline($SP_END_DL, undef, $docstat); ++ } ++ ++ if ($docstat & ($D_EM | $D_BF | $D_TT)) { ++ $docstat = print_docline($SP_END_FT, undef, $docstat); ++ } ++ ++ $docstat = print_docline($SP_END_SECT, undef, $docstat); ++ ++ $docstat = print_docline($SP_NEWLINE, undef, 0); ++ ++ return $D_INIT; ++} ++ ++#################### ++# Confline handling ++#################### ++ ++sub handle_confline($) { ++ my ($line) = @_; ++ ++ my ($name, $type, $flags, $data, $val) = split(/\s*,\s*/, $line, 5); ++ $name =~ s/"//g; ++ ++ $type =~ s/\|.*//; ++ ++ $val =~ s/^{\s*\.[lp]\s*=\s*"?//; ++ $val =~ s/"?\s*}\s*},\s*$//; ++ # This is a hack to concatenate compile-time constants. ++ # (?\n"; ++ print_sgml($name); ++ print "\nType: ${type2human{$type}}"; ++ ++ if (exists $string_types{$type}) { ++ if ($val ne "") { ++ print "\nDefault: "; ++ print_sgml_strval($val); ++ print ""; ++ } ++ else { ++ print "\nDefault: (empty)"; ++ } ++ } ++ else { ++ print "\nDefault: ${val}" ++ } ++ ++ print "\n"; ++} ++ ++sub print_sgml_id($) { ++ my ($id) = @_; ++ ++ $id =~ s/^$//; ++ $id =~ s/_/-/g; ++ ++ print $id; ++} ++ ++sub print_sgml($) { ++ my ($val) = @_; ++ ++ $val =~ s/&/&/g; ++ $val =~ s//>/g; ++ ++ print $val; ++} ++ ++sub print_sgml_strval($) { ++ my ($val) = @_; ++ ++ $val = string_escape($val); ++ print_sgml($val); ++} ++ ++ ++################### ++# Docline handling ++################### ++ ++sub handle_docline($$) { ++ my ($line, $docstat) = @_; ++ my $buff = ""; ++ ++ if ($line =~ /^\.pp/) { ++ return print_docline($SP_NEWPAR, undef, $docstat); ++ } ++ elsif ($line =~ /^\.ts/) { ++ return print_docline($SP_START_TAB, undef, $docstat); ++ } ++ elsif ($line =~ /^\.te/) { ++ return print_docline($SP_END_TAB, undef, $docstat); ++ } ++ elsif ($line =~ /^\.dl/) { ++ return print_docline($SP_START_DL, undef, $docstat); ++ } ++ elsif ($line =~ /^\.de/) { ++ return print_docline($SP_END_DL, undef, $docstat); ++ } ++ elsif ($line =~ /^\.il/) { ++ return print_docline($SP_START_IL, undef, $docstat); ++ } ++ elsif ($line =~ /^\.ie/) { ++ return print_docline($SP_END_IL, undef, $docstat); ++ } ++ ++ $line =~ s/^\. / /; ++ ++ while ($line ne "") { ++ if ($line =~ /^\\\(as/) { ++ $buff .= "*"; ++ substr($line, 0, 4) = ""; ++ } ++ elsif ($line =~ /^\\\(rs/) { ++ $buff .= "\\"; ++ substr($line, 0, 4) = ""; ++ } ++ elsif ($line =~ /^\\fI/) { ++ $docstat = commit_buff(\$buff, $docstat); ++ $docstat = print_docline($SP_START_EM, undef, $docstat); ++ substr($line, 0, 3) = ""; ++ } ++ elsif ($line =~ /^\\fB/) { ++ $docstat = commit_buff(\$buff, $docstat); ++ $docstat = print_docline($SP_START_BF, undef, $docstat); ++ substr($line, 0, 3) = ""; ++ } ++ elsif ($line =~ /^\\fC/) { ++ $docstat = commit_buff(\$buff, $docstat); ++ $docstat = print_docline($SP_START_TT, undef, $docstat); ++ substr($line, 0, 3) = ""; ++ } ++ elsif ($line =~ /^\\fP/) { ++ $docstat = commit_buff(\$buff, $docstat); ++ $docstat = print_docline($SP_END_FT, undef, $docstat); ++ substr($line, 0, 3) = ""; ++ } ++ elsif ($line =~ /^\.dt/) { ++ if ($docstat & $D_DD) { ++ $docstat = commit_buff(\$buff, $docstat); ++ $docstat = print_docline($SP_END_DD, undef, $docstat); ++ } ++ $docstat = commit_buff(\$buff, $docstat); ++ $docstat = print_docline($SP_DT, undef, $docstat); ++ substr($line, 0, 4) = ""; ++ } ++ elsif ($line =~ /^\.dd/) { ++ if (($docstat & $D_IL) && ($docstat & $D_DD)) { ++ $docstat = commit_buff(\$buff, $docstat); ++ $docstat = print_docline($SP_END_DD, undef, $docstat); ++ } ++ $docstat = commit_buff(\$buff, $docstat); ++ $docstat = print_docline($SP_DD, undef, $docstat); ++ substr($line, 0, 4) = ""; ++ } ++ elsif ($line =~ /^\$\$\$/) { ++ print "\$"; ++ substr($line, 0, 3) = ""; ++ } ++ elsif ($line =~ /^(\$(\$?)([\w\-_<>]*))/) { ++ my $whole_ref; ++ my $ref; ++ my $output_dollar = 0; ++ ++ $whole_ref = $1; ++ if ($2) { ++ $output_dollar = 1; ++ } ++ $ref = $3; ++ ++ $docstat = commit_buff(\$buff, $docstat); ++ print_ref($output_dollar, $ref); ++ substr($line, 0, length($whole_ref)) = ""; ++ } ++ else { ++ $buff .= substr($line, 0, 1); ++ substr($line, 0, 1) = ""; ++ } ++ } ++ ++ $docstat = commit_buff(\$buff, $docstat); ++ return print_docline($SP_NEWLINE, undef, $docstat); ++} ++ ++sub commit_buff($$) { ++ my ($ref_buf, $docstat) = @_; ++ ++ if ($$ref_buf ne "") { ++ $docstat = print_docline($SP_STR, $$ref_buf, $docstat); ++ $$ref_buf = ""; ++ } ++ ++ return $docstat; ++} ++ ++sub print_docline($$$) { ++ my ($special, $str, $docstat) = @_; ++ my $onl; ++ ++ $onl = ($docstat & ($D_NL | $D_NP)); ++ $docstat &= ~($D_NL | $D_NP | $D_INIT); ++ ++ if ($OutputFormat == $F_CONF) { ++ return print_docline_conf($special, $str, $docstat, $onl); ++ } ++ elsif ($OutputFormat == $F_MAN) { ++ return print_docline_man($special, $str, $docstat, $onl); ++ } ++ elsif ($OutputFormat == $F_SGML) { ++ return print_docline_sgml($special, $str, $docstat, $onl); ++ } ++ ++ return $docstat; ++} ++ ++sub print_ref($$) { ++ my ($output_dollar, $ref) = @_; ++ ++ if (($OutputFormat == $F_CONF) || ($OutputFormat == $F_MAN)) { ++ if ($output_dollar) { ++ print "\$"; ++ } ++ print $ref; ++ } ++ elsif ($OutputFormat == $F_SGML) { ++ print ""; ++ if ($output_dollar) { ++ print "\$"; ++ } ++ print_sgml($ref); ++ print ""; ++ } ++} ++ ++my $Continuation = 0; ++ ++sub print_docline_conf($$$$) { ++ my ($special, $str, $docstat, $onl) = @_; ++ ++ if ($special == $SP_END_FT) { ++ $docstat &= ~($D_EM|$D_BF|$D_TT); ++ } ++ elsif ($special == $SP_START_BF) { ++ $docstat |= $D_BF; ++ } ++ elsif ($special == $SP_START_EM) { ++ $docstat |= $D_EM; ++ } ++ elsif ($special == $SP_START_TT) { ++ $docstat |= $D_TT; ++ } ++ elsif ($special == $SP_NEWLINE) { ++ if ($onl) { ++ $docstat |= $onl; ++ } ++ else { ++ print "\n# "; ++ $docstat |= $D_NL; ++ } ++ if ($docstat & $D_DL) { ++ $Continuation++; ++ } ++ } ++ elsif ($special == $SP_NEWPAR) { ++ if ($onl & $D_NP) { ++ $docstat |= $onl; ++ } ++ else { ++ if (!($onl & $D_NL)) { ++ print "\n# "; ++ } ++ print "\n# "; ++ $docstat |= $D_NP; ++ } ++ } ++ elsif ($special == $SP_START_TAB) { ++ if (!$onl) { ++ print "\n# "; ++ } ++ $docstat |= $D_TAB; ++ } ++ elsif ($special == $SP_END_TAB) { ++ $docstat &= ~$D_TAB; ++ $docstat |= $D_NL; ++ } ++ elsif ($special == $SP_START_DL) { ++ $docstat |= $D_DL; ++ } ++ elsif ($special == $SP_DT) { ++ $Continuation = 0; ++ $docstat |= $D_DT; ++ } ++ elsif ($special == $SP_DD) { ++ if ($docstat & $D_IL) { ++ print "- "; ++ } ++ $Continuation = 0; ++ } ++ elsif ($special == $SP_END_DL) { ++ $Continuation = 0; ++ $docstat &= ~$D_DL; ++ } ++ elsif ($special == $SP_START_IL) { ++ $docstat |= $D_IL; ++ } ++ elsif ($special == $SP_END_IL) { ++ $Continuation = 0; ++ $docstat &= ~$D_IL; ++ } ++ elsif ($special == $SP_STR) { ++ if ($Continuation) { ++ $Continuation = 0; ++ print " "; ++ } ++ print $str; ++ if ($docstat & $D_DT) { ++ if (length($str) < 8) { ++ print " " x (8 - length($str)); ++ } ++ $docstat &= ~$D_DT; ++ $docstat |= $D_NL; ++ } ++ } ++ ++ return $docstat; ++} ++ ++sub print_docline_man($$$$) { ++ my ($special, $str, $docstat, $onl) = @_; ++ ++ if ($special == $SP_END_FT) { ++ print "\\fP"; ++ $docstat &= ~($D_EM|$D_BF|$D_TT); ++ } ++ elsif ($special == $SP_START_BF) { ++ print "\\fB"; ++ $docstat |= $D_BF; ++ $docstat &= ~($D_EM|$D_TT); ++ } ++ elsif ($special == $SP_START_EM) { ++ print "\\fI"; ++ $docstat |= $D_EM; ++ $docstat &= ~($D_BF|$D_TT); ++ } ++ elsif ($special == $SP_START_TT) { ++ print "\\fC"; ++ $docstat |= $D_TT; ++ $docstat &= ~($D_BF|$D_EM); ++ } ++ elsif ($special == $SP_NEWLINE) { ++ if ($onl) { ++ $docstat |= $onl; ++ } ++ else { ++ print "\n"; ++ $docstat |= $D_NL; ++ } ++ } ++ elsif ($special == $SP_NEWPAR) { ++ if ($onl & $D_NP) { ++ $docstat |= $onl; ++ } ++ else { ++ if (!($onl & $D_NL)) { ++ print "\n"; ++ } ++ print ".IP\n"; ++ $docstat |= $D_NP; ++ } ++ } ++ elsif ($special == $SP_START_TAB) { ++ print "\n.IP\n.EX\n"; ++ $docstat |= $D_TAB | $D_NL; ++ } ++ elsif ($special == $SP_END_TAB) { ++ print "\n.EE\n"; ++ $docstat &= ~$D_TAB; ++ $docstat |= $D_NL; ++ } ++ elsif ($special == $SP_START_DL) { ++ print ".RS\n.PD 0\n"; ++ $docstat |= $D_DL; ++ } ++ elsif ($special == $SP_DT) { ++ print ".TP\n"; ++ } ++ elsif ($special == $SP_DD) { ++ if ($docstat & $D_IL) { ++ print ".TP\n\\(hy "; ++ } ++ else { ++ print "\n"; ++ } ++ } ++ elsif ($special == $SP_END_DL) { ++ print ".RE\n.PD 1"; ++ $docstat &= ~$D_DL; ++ } ++ elsif ($special == $SP_START_IL) { ++ print ".RS\n.PD 0\n"; ++ $docstat |= $D_IL; ++ } ++ elsif ($special == $SP_END_IL) { ++ print ".RE\n.PD 1"; ++ $docstat &= ~$D_DL; ++ } ++ elsif ($special == $SP_STR) { ++ $str =~ s/\\/\\\\/g; ++ $str =~ s/"/\\(rq/g; ++ $str =~ s/-/\\-/g; ++ $str =~ s/``/\\(lq/g; ++ $str =~ s/''/\\(rq/g; ++ print $str; ++ } ++ ++ return $docstat; ++} ++ ++sub print_docline_sgml($$$$) { ++ my ($special, $str, $docstat, $onl) = @_; ++ ++ if ($special == $SP_END_FT) { ++ if ($docstat & $D_EM) { ++ print ""; ++ } ++ if ($docstat & $D_BF) { ++ print ""; ++ } ++ if ($docstat & $D_TT) { ++ print ""; ++ } ++ $docstat &= ~($D_EM|$D_BF|$D_TT); ++ } ++ elsif ($special == $SP_START_BF) { ++ print ""; ++ $docstat |= $D_BF; ++ $docstat &= ~($D_EM|$D_TT); ++ } ++ elsif ($special == $SP_START_EM) { ++ print ""; ++ $docstat |= $D_EM; ++ $docstat &= ~($D_BF|$D_TT); ++ } ++ elsif ($special == $SP_START_TT) { ++ print ""; ++ $docstat |= $D_TT; ++ $docstat &= ~($D_BF|$D_EM); ++ } ++ elsif ($special == $SP_NEWLINE) { ++ if ($onl) { ++ $docstat |= $onl; ++ } ++ else { ++ print "\n"; ++ $docstat |= $D_NL; ++ } ++ } ++ elsif ($special == $SP_NEWPAR) { ++ if ($onl & $D_NP) { ++ $docstat |= $onl; ++ } ++ else { ++ if (!($onl & $D_NL)) { ++ print "\n"; ++ } ++ if ($docstat & $D_PA) { ++ print "\n"; ++ } ++ print "\n"; ++ $docstat |= $D_NP; ++ $docstat |= $D_PA; ++ } ++ } ++ elsif ($special == $SP_END_PAR) { ++ print "\n"; ++ $docstat &= ~$D_PA; ++ } ++ elsif ($special == $SP_START_TAB) { ++ if ($docstat & $D_PA) { ++ print "\n\n"; ++ $docstat &= ~$D_PA; ++ } ++ print "\n\n"; ++ $docstat |= $D_TAB | $D_NL; ++ } ++ elsif ($special == $SP_END_TAB) { ++ print ""; ++ $docstat &= ~$D_TAB; ++ $docstat |= $D_NL; ++ } ++ elsif ($special == $SP_START_DL) { ++ if ($docstat & $D_PA) { ++ print "\n\n"; ++ $docstat &= ~$D_PA; ++ } ++ print "\n\n\n\n"; ++ $docstat |= $D_DL; ++ } ++ elsif ($special == $SP_DT) { ++ print ""; ++ } ++ elsif ($special == $SP_DD) { ++ $docstat |= $D_DD; ++ if ($docstat & $D_DL) { ++ print ""; ++ } ++ else { ++ print ""; ++ } ++ } ++ elsif ($special == $SP_END_DD) { ++ if ($docstat & $D_DL) { ++ print "\n"; ++ } ++ else { ++ print ""; ++ } ++ $docstat &= ~$D_DD; ++ } ++ elsif ($special == $SP_END_DL) { ++ print "\n"; ++ $docstat &= ~($D_DD|$D_DL); ++ } ++ elsif ($special == $SP_START_IL) { ++ if ($docstat & $D_PA) { ++ print "\n\n"; ++ $docstat &= ~$D_PA; ++ } ++ print "\n\n"; ++ $docstat |= $D_IL; ++ } ++ elsif ($special == $SP_END_IL) { ++ print "\n"; ++ $docstat &= ~($D_DD|$D_DL); ++ } ++ elsif ($special == $SP_END_SECT) { ++ print ""; ++ } ++ elsif ($special == $SP_STR) { ++ if ($docstat & $D_TAB) { ++ print_sgml($str); ++ } ++ else { ++ $str =~ s/&/&/g; ++ $str =~ s//>/g; ++ $str =~ s/``//g; ++ $str =~ s/''/<\/quote>/g; ++ print $str; ++ } ++ } ++ ++ return $docstat; ++} +diff --git a/init.h b/init.h +index a237cb80..b797dd1c 100644 +--- a/init.h ++++ b/init.h +@@ -27,7 +27,7 @@ + #include "buffy.h" + + #ifndef _MAKEDOC +-/* If you add a data type, be sure to update doc/makedoc.c */ ++/* If you add a data type, be sure to update doc/makedoc.pl */ + #define DT_MASK 0x0f + #define DT_BOOL 1 /* boolean option */ + #define DT_NUM 2 /* a number (short) */ +diff --git a/sort.h b/sort.h +index 0a6450e9..340ad18b 100644 +--- a/sort.h ++++ b/sort.h +@@ -19,7 +19,7 @@ + #define SORT_DATE 1 /* the date the mail was sent. */ + #define SORT_SIZE 2 + #define SORT_SUBJECT 3 +-#define SORT_ALPHA 3 /* makedoc.c requires this */ ++#define SORT_ALPHA 3 /* makedoc.pl requires this */ + #define SORT_FROM 4 + #define SORT_ORDER 5 /* the order the messages appear in the mailbox. */ + #define SORT_THREADS 6 +-- +2.24.1 + diff --git a/buildroot/package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch b/buildroot/package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch deleted file mode 100644 index c802cbb36..000000000 --- a/buildroot/package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c53b36698fe4721fb562908ac6119aa9280383af Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 14 Apr 2019 10:22:12 +0200 -Subject: [PATCH] configure.ac: fix static build with idn2 and unistring - -Commit 78db40f25c6479b14da5a73adf7207bfbec5ccc5 did not fix static build -failure - -AC_SEARCH_LIBS prepends the library to LIBS as a result -lunistring is -added before -lidn2. To fix static build, we must set -lunistring after --lidn2 - -Fixes: - - http://autobuild.buildroot.org/results/c9544b4f1a0252e260a2ed19218fa950f4dc2d2d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://gitlab.com/muttmua/mutt/merge_requests/42] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index bd8beb91..75943eee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1402,7 +1402,7 @@ if test "x$with_idn2" != "xno"; then - AC_SEARCH_LIBS([idn2_check_version], [idn2], [ - AC_DEFINE([HAVE_LIBIDN2], 1, [Define to 1 if you have the GNU idn2 library]) - dnl -lunistring is needed for static linking -- AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring]) -+ AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring], [LIBS="$LIBS -lunistring"]) - MUTTLIBS="$MUTTLIBS $LIBS" - - dnl libidn2 >= 2.0.0 declares compatibility macros in idn2.h --- -2.20.1 - diff --git a/buildroot/package/mutt/0002-Convert-hcachever-sh-in-to-hcachever-pl.patch b/buildroot/package/mutt/0002-Convert-hcachever-sh-in-to-hcachever-pl.patch new file mode 100644 index 000000000..fc6851137 --- /dev/null +++ b/buildroot/package/mutt/0002-Convert-hcachever-sh-in-to-hcachever-pl.patch @@ -0,0 +1,310 @@ +From acd49f242c867583856973fd8644a45e53f56489 Mon Sep 17 00:00:00 2001 +From: Kevin McCarthy +Date: Wed, 8 Jan 2020 19:09:33 -0800 +Subject: [PATCH] Convert hcachever.sh.in to hcachever.pl. + +Use Digest::MD5 to remove build-time dependency on mutt_md5, for +cross-compilation support. + +Signed-off-by: Fabrice Fontaine +[Retrieved (and slightly updated to remove .gitignore) from: +https://gitlab.com/muttmua/mutt/commit/acd49f242c867583856973fd8644a45e53f56489] +--- + .gitignore | 2 - + Makefile.am | 14 +++--- + configure.ac | 7 +-- + hcachever.pl | 112 ++++++++++++++++++++++++++++++++++++++++++++++++ + hcachever.sh.in | 89 -------------------------------------- + 5 files changed, 118 insertions(+), 106 deletions(-) + create mode 100644 hcachever.pl + delete mode 100755 hcachever.sh.in + +diff --git a/Makefile.am b/Makefile.am +index cede1adb..e46f6544 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,7 @@ + include $(top_srcdir)/flymake.am + + AUTOMAKE_OPTIONS = 1.6 foreign +-EXTRA_PROGRAMS = mutt_dotlock mutt_pgpring pgpewrap mutt_md5 ++EXTRA_PROGRAMS = mutt_dotlock mutt_pgpring pgpewrap + + if BUILD_IMAP + IMAP_SUBDIR = imap +@@ -80,7 +80,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ + README.SSL smime.h group.h mutt_zstrm.h \ + muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ + ChangeLog mkchangelog.sh mkreldate.sh mutt_idna.h sidebar.h OPS.SIDEBAR \ +- snprintf.c regex.c crypt-gpgme.h hcachever.sh.in \ ++ snprintf.c regex.c crypt-gpgme.h hcachever.pl \ + txt2c.c txt2c.sh version.sh check_sec.sh + + EXTRA_SCRIPTS = smime_keys +@@ -93,14 +93,10 @@ mutt_pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5.c pgppack + mutt_pgpring_LDADD = $(LIBOBJS) $(INTLLIBS) + mutt_pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS) + +-mutt_md5_SOURCES = md5.c +-mutt_md5_CFLAGS = -DMD5UTIL +-mutt_md5_LDADD = +- + txt2c_SOURCES = txt2c.c + txt2c_LDADD = + +-noinst_PROGRAMS = $(MUTT_MD5) txt2c ++noinst_PROGRAMS = txt2c + + mutt_dotlock.c: dotlock.c + cp $(srcdir)/dotlock.c mutt_dotlock.c +@@ -166,9 +162,9 @@ reldate.h: $(srcdir)/mkreldate.sh $(srcdir)/ChangeLog + # If configured with --with-included-gettext this means that intl will + # not have generated libintl.h yet, and mutt.h -> lib.h will generate + # an error. +-hcversion.h: $(srcdir)/mutt.h $(srcdir)/rfc822.h hcachever.sh $(MUTT_MD5) ++hcversion.h: $(srcdir)/mutt.h $(srcdir)/rfc822.h config.h $(srcdir)/hcachever.pl + ( echo '#include "config.h"'; echo '#undef ENABLE_NLS'; echo '#include "mutt.h"'; ) \ +- | $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - | sh ./hcachever.sh hcversion.h ++ | $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - | perl $(srcdir)/hcachever.pl > hcversion.h + + patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh + $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c +diff --git a/configure.ac b/configure.ac +index 7fe55402..7906ce35 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1283,11 +1283,6 @@ then + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5.o" + fi + +-if test x$db_found != xno ; then +- MUTT_MD5="mutt_md5$EXEEXT" +-fi +-AC_SUBST(MUTT_MD5) +- + AC_SUBST(MUTTLIBS) + AC_SUBST(MUTT_LIB_OBJECTS) + AC_SUBST(LIBIMAP) +@@ -1677,5 +1672,5 @@ fi + + AC_CONFIG_FILES(Makefile contrib/Makefile doc/Makefile imap/Makefile + intl/Makefile m4/Makefile po/Makefile.in autocrypt/Makefile +- hcachever.sh doc/instdoc.sh) ++ doc/instdoc.sh) + AC_OUTPUT +diff --git a/hcachever.pl b/hcachever.pl +new file mode 100644 +index 00000000..be630a82 +--- /dev/null ++++ b/hcachever.pl +@@ -0,0 +1,112 @@ ++#!/usr/bin/perl -w ++# ++# Copyright (C) 2020 Kevin J. McCarthy ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ ++# This file is a rewrite of hcachever.sh.in in perl. ++# The rewrite removes the dependency on mutt_md5, in order to ++# improve cross-compilation support. ++ ++use strict; ++use warnings; ++# note Digest::MD5 is standard in perl since 5.8.0 (July 18, 2002) ++use Digest::MD5; ++ ++ ++sub read_line() { ++ my $line; ++ ++ while (1) { ++ $line = ; ++ return "" if (!$line); ++ ++ chomp($line); ++ $line =~ s/^\s+//; ++ $line =~ s/\s+$//; ++ $line =~ s/\s{2,}//g; ++ ++ return $line if ($line ne ""); ++ } ++} ++ ++ ++sub process_struct($$) { ++ my ($line, $md5) = @_; ++ my $struct = ""; ++ my @body; ++ my $bodytxt; ++ my $inbody = 0; ++ ++ return if $line =~ /;$/; ++ if ($line =~ /{$/) { ++ $inbody = 1; ++ } ++ ++ while (($line = read_line()) ne "") { ++ if (!$inbody) { ++ return if $line =~ /;$/; ++ if ($line =~ /{$/) { ++ $inbody = 1; ++ } ++ } ++ ++ if ($line =~ /^} (.*);$/) { ++ $struct = $1; ++ last; ++ } ++ elsif ($line =~ /^}/) { ++ $struct = read_line(); ++ if ($struct ne "") { ++ $struct =~ s/;$//; ++ } ++ last; ++ } ++ elsif (($line !~ /^#/) && ($line !~ /^{/)) { ++ if ($inbody) { ++ push @body, $line; ++ } ++ } ++ } ++ ++ if ($struct =~ /^(ADDRESS|LIST|BUFFER|PARAMETER|BODY|ENVELOPE|HEADER)$/) { ++ $bodytxt = join(" ", @body); ++ print " * ${struct}: ${bodytxt}\n"; ++ ++ $md5->add(" ${struct} {${bodytxt}}"); ++ } ++} ++ ++ ++my $md5; ++my $line; ++my $BASEVERSION = "2"; ++ ++$md5 = Digest::MD5->new; ++ ++$md5->add($BASEVERSION); ++print "/* base version: $BASEVERSION\n"; ++ ++while (($line = read_line()) ne "") { ++ if ($line =~ /^typedef struct/) { ++ process_struct($line, $md5); ++ } ++} ++ ++$md5->add("\n"); ++my $digest = substr($md5->hexdigest, 0, 8); ++ ++print " */\n"; ++print "#define HCACHEVER 0x${digest}\n"; +diff --git a/hcachever.sh.in b/hcachever.sh.in +deleted file mode 100755 +index 730ca76b..00000000 +--- a/hcachever.sh.in ++++ /dev/null +@@ -1,89 +0,0 @@ +-#!/bin/sh +- +-BASEVERSION=2 +- +-cleanstruct () { +- echo "$1" | sed -e 's/} *//' -e 's/;$//' +-} +- +-cleanbody () { +- echo "$1" | sed -e 's/{ *//' +-} +- +-getstruct () { +- STRUCT="" +- BODY='' +- inbody=0 +- case "$1" in +- *'{') inbody=1 ;; +- *';') return ;; +- esac +- +- while read line +- do +- if test $inbody -eq 0 +- then +- case "$line" in +- '{'*) inbody=1 ;; +- *';') return ;; +- esac +- fi +- +- case "$line" in +- '} '*) +- STRUCT=`cleanstruct "$line"` +- break +- ;; +- '}') +- read line +- STRUCT=`cleanstruct "$line"` +- break +- ;; +- '#'*) continue ;; +- *) +- if test $inbody -ne 0 +- then +- BODY="$BODY $line" +- fi +- ;; +- esac +- done +- +- case $STRUCT in +- ADDRESS|LIST|BUFFER|PARAMETER|BODY|ENVELOPE|HEADER) +- BODY=`cleanbody "$BODY"` +- echo "$STRUCT: $BODY" +- ;; +- esac +- return +-} +- +-DEST="$1" +-TMPD="$DEST.tmp" +- +-TEXT="$BASEVERSION" +- +-echo "/* base version: $BASEVERSION" > $TMPD +-while read line +-do +- case "$line" in +- 'typedef struct'*) +- STRUCT=`getstruct "$line"` +- if test -n "$STRUCT" +- then +- NAME=`echo $STRUCT | cut -d: -f1` +- BODY=`echo $STRUCT | cut -d' ' -f2-` +- echo " * $NAME:" $BODY >> $TMPD +- TEXT="$TEXT $NAME {$BODY}" +- fi +- ;; +- esac +-done +-echo " */" >> $TMPD +- +-MD5TEXT=`echo "$TEXT" | ./mutt_md5` +-echo "#define HCACHEVER 0x"`echo $MD5TEXT | cut -c-8` >> $TMPD +- +-# TODO: validate we have all structs +- +-mv $TMPD $DEST +-- +2.24.1 + diff --git a/buildroot/package/mutt/mutt.hash b/buildroot/package/mutt/mutt.hash index 476773c29..f0b015322 100644 --- a/buildroot/package/mutt/mutt.hash +++ b/buildroot/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 da5cd4c39f228914d3933d8cf3a017c8271fdd9b9d81c6e4fc42ad22e1a28723 mutt-1.11.2.tar.gz +sha256 78423016b5f2fcb31bfd156999ff6638177be4459230d2ee61a81e5641d07378 mutt-1.13.3.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/buildroot/package/mutt/mutt.mk b/buildroot/package/mutt/mutt.mk index 5860e8430..9cf8304bf 100644 --- a/buildroot/package/mutt/mutt.mk +++ b/buildroot/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 1.11.2 +MUTT_VERSION = 1.13.3 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL @@ -53,6 +53,13 @@ else MUTT_CONF_OPTS += --without-ssl endif +ifeq ($(BR2_PACKAGE_SQLITE),y) +MUTT_DEPENDENCIES += sqlite +MUTT_CONF_OPTS += --with-sqlite3 +else +MUTT_CONF_OPTS += --without-sqlite3 +endif + # Avoid running tests to check for: # - target system is *BSD # - C99 conformance (snprintf, vsnprintf) diff --git a/buildroot/package/mxml/0001-fix-cross-target-installation.patch b/buildroot/package/mxml/0001-fix-cross-target-installation.patch deleted file mode 100644 index 3a9fa0c0c..000000000 --- a/buildroot/package/mxml/0001-fix-cross-target-installation.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Baruch Siach -Subject: [PATCH] mxml: workaround for cross build - -The added patch is a workaround for cross build as follows: - - * disable run of a test binary at build time - * disable generation of documentation using the mxmldoc binary - * remove now non-existent entries from the install target - * disable strip when running install - -Signed-off-by: Baruch Siach ---- -diff -Nuar mxml-2.7-orig/Makefile.in mxml-2.7/Makefile.in ---- mxml-2.7-orig/Makefile.in 2011-04-13 18:43:32.000000000 +0300 -+++ mxml-2.7/Makefile.in 2012-05-16 07:21:42.677220980 +0300 -@@ -57,7 +57,7 @@ - # Install commands... - # - --INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 -s -+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 - INSTALL_DATA = $(INSTALL) -m 644 - INSTALL_DIR = $(INSTALL) -d - INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755 -@@ -88,7 +88,7 @@ - mxml-index.o mxml-node.o mxml-search.o mxml-set.o - LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o - OBJS = mxmldoc.o testmxml.o $(LIBOBJS) --TARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man -+TARGETS = $(LIBMXML) libmxml.a - - - # -@@ -140,9 +140,6 @@ - # - - install: $(TARGETS) install-$(LIBMXML) install-libmxml.a -- echo Installing mxmldoc in $(BUILDROOT)$(bindir)... -- $(INSTALL_DIR) $(BUILDROOT)$(bindir) -- $(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) - echo Installing documentation in $(BUILDROOT)$(docdir)... - $(INSTALL_DIR) $(BUILDROOT)$(docdir) - for file in $(DOCFILES); do \ -@@ -154,11 +151,6 @@ - echo Installing pkgconfig files in $(BUILDROOT)$(libdir)/pkgconfig... - $(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig - $(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig -- echo Installing man pages in $(BUILDROOT)$(mandir)... -- $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1 -- $(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1 -- $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3 -- $(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3 - - install-libmxml.a: - echo Installing libmxml.a to $(BUILDROOT)$(libdir)... diff --git a/buildroot/package/mxml/mxml.hash b/buildroot/package/mxml/mxml.hash index 90392755b..811064c31 100644 --- a/buildroot/package/mxml/mxml.hash +++ b/buildroot/package/mxml/mxml.hash @@ -1,4 +1,4 @@ -# From http://www.msweet.org/downloads.php?L+Z3 -md5 8804c961a24500a95690ef287d150abe mxml-2.10.tar.gz # Locally computed -sha256 267ff58b64ddc767170d71dab0c729c06f45e1df9a9b6f75180b564f09767891 mxml-2.10.tar.gz +sha256 1ac8d252f62f9dc2b2004518c70d2da313bdfcd92b8350e215f46064a34b52fc mxml-3.1.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE +sha256 63cc06ba05adecb1fdf2c94460a98291fd71614865456e52a19a1e7cc674250f NOTICE diff --git a/buildroot/package/mxml/mxml.mk b/buildroot/package/mxml/mxml.mk index ac270bd1b..8ca83e111 100644 --- a/buildroot/package/mxml/mxml.mk +++ b/buildroot/package/mxml/mxml.mk @@ -4,10 +4,10 @@ # ################################################################################ -MXML_VERSION = 2.10 -MXML_SITE = https://github.com/michaelrsweet/mxml/releases/download/release-$(MXML_VERSION) -MXML_LICENSE = LGPL-2.0+ with exceptions -MXML_LICENSE_FILES = COPYING +MXML_VERSION = 3.1 +MXML_SITE = https://github.com/michaelrsweet/mxml/releases/download/v$(MXML_VERSION) +MXML_LICENSE = Apache-2.0 with exceptions +MXML_LICENSE_FILES = LICENSE NOTICE MXML_INSTALL_STAGING = YES MXML_INSTALL_STAGING_OPTS = DSTROOT=$(STAGING_DIR) install diff --git a/buildroot/package/nano/nano.hash b/buildroot/package/nano/nano.hash index eae648d16..965a94aa0 100644 --- a/buildroot/package/nano/nano.hash +++ b/buildroot/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v3/nano-3.2.tar.xz.asc +# https://www.nano-editor.org/dist/v4/nano-4.7.tar.xz.asc # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 d12773af3589994b2e4982c5792b07c6240da5b86c5aef2103ab13b401fe6349 nano-3.2.tar.xz +sha256 58c0e197de5339ca3cad3ef42b65626d612ddb0b270e730f02e6ab3785c736f5 nano-4.7.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/buildroot/package/nano/nano.mk b/buildroot/package/nano/nano.mk index 206d210a1..5cb8d1d5c 100644 --- a/buildroot/package/nano/nano.mk +++ b/buildroot/package/nano/nano.mk @@ -4,8 +4,8 @@ # ################################################################################ -NANO_VERSION_MAJOR = 3 -NANO_VERSION = $(NANO_VERSION_MAJOR).2 +NANO_VERSION_MAJOR = 4 +NANO_VERSION = $(NANO_VERSION_MAJOR).7 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ @@ -24,8 +24,9 @@ endif ifeq ($(BR2_PACKAGE_FILE),y) NANO_DEPENDENCIES += file +NANO_CONF_OPTS += --enable-libmagic else -NANO_CONF_ENV += ac_cv_lib_magic_magic_open=no +NANO_CONF_OPTS += --disable-libmagic endif ifeq ($(BR2_PACKAGE_NANO_TINY),y) diff --git a/buildroot/package/nanocom/nanocom.hash b/buildroot/package/nanocom/nanocom.hash index 7e7016c25..df35a37b0 100644 --- a/buildroot/package/nanocom/nanocom.hash +++ b/buildroot/package/nanocom/nanocom.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 5cb26e3e232cfc4a7cb16da432db532b775c5ebdb887ac9d39df5632f2c9a5e5 nanocom.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/nanomsg/nanomsg.hash b/buildroot/package/nanomsg/nanomsg.hash index 5164a754e..062ac9f6f 100644 --- a/buildroot/package/nanomsg/nanomsg.hash +++ b/buildroot/package/nanomsg/nanomsg.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 24afdeb71b2e362e8a003a7ecc906e1b84fd9f56ce15ec567481d1bb33132cc7 nanomsg-1.0.0.tar.gz +sha256 218b31ae1534ab897cb5c419973603de9ca1a5f54df2e724ab4a188eb416df5a nanomsg-1.1.5.tar.gz # Hash for license file: sha256 4e51f6a04312ea7c5f4f0e92d91b6415c1eeb09bdaf86a6fd11d93499457c07a COPYING diff --git a/buildroot/package/nanomsg/nanomsg.mk b/buildroot/package/nanomsg/nanomsg.mk index 3b1c2ca0c..b86e8c128 100644 --- a/buildroot/package/nanomsg/nanomsg.mk +++ b/buildroot/package/nanomsg/nanomsg.mk @@ -4,7 +4,7 @@ # ################################################################################ -NANOMSG_VERSION = 1.0.0 +NANOMSG_VERSION = 1.1.5 NANOMSG_SITE = $(call github,nanomsg,nanomsg,$(NANOMSG_VERSION)) NANOMSG_INSTALL_STAGING = YES NANOMSG_LICENSE = MIT diff --git a/buildroot/package/nasm/0001-nasmlib-Drop-unused-seg_init.patch b/buildroot/package/nasm/0001-nasmlib-Drop-unused-seg_init.patch deleted file mode 100644 index a18d121bf..000000000 --- a/buildroot/package/nasm/0001-nasmlib-Drop-unused-seg_init.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5eb1838b4d3752fd863d19442943983a2a5ee87c Mon Sep 17 00:00:00 2001 -From: Cyrill Gorcunov -Date: Sat, 10 Feb 2018 00:33:41 +0300 -Subject: [PATCH] nasmlib: Drop unused seg_init - -The helper has been eliminated in 2c4a4d5810d0a59b033a07876a2648ef5d4c2859 - -https://bugzilla.nasm.us/show_bug.cgi?id=3392461 - -Signed-off-by: Cyrill Gorcunov ---- - include/nasmlib.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/include/nasmlib.h b/include/nasmlib.h -index 79e866b5..fee1b5ea 100644 ---- a/include/nasmlib.h -+++ b/include/nasmlib.h -@@ -188,10 +188,8 @@ int64_t readnum(char *str, bool *error); - int64_t readstrnum(char *str, int length, bool *warn); - - /* -- * seg_init: Initialise the segment-number allocator. - * seg_alloc: allocate a hitherto unused segment number. - */ --void pure_func seg_init(void); - int32_t pure_func seg_alloc(void); - - /* --- -2.17.0 - diff --git a/buildroot/package/nasm/nasm.hash b/buildroot/package/nasm/nasm.hash index db5b85719..d824f22b8 100644 --- a/buildroot/package/nasm/nasm.hash +++ b/buildroot/package/nasm/nasm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 812ecfb0dcbc5bd409aaa8f61c7de94c5b8752a7b00c632883d15b2ed6452573 nasm-2.13.03.tar.xz +sha256 e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5 nasm-2.14.02.tar.xz sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 LICENSE diff --git a/buildroot/package/nasm/nasm.mk b/buildroot/package/nasm/nasm.mk index 76bcca3bb..5a46fd0a4 100644 --- a/buildroot/package/nasm/nasm.mk +++ b/buildroot/package/nasm/nasm.mk @@ -4,9 +4,9 @@ # ################################################################################ -NASM_VERSION = 2.13.03 +NASM_VERSION = 2.14.02 NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz -NASM_SITE = http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) +NASM_SITE = https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) NASM_LICENSE = BSD-2-Clause NASM_LICENSE_FILES = LICENSE diff --git a/buildroot/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch b/buildroot/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch new file mode 100644 index 000000000..70330c8e9 --- /dev/null +++ b/buildroot/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch @@ -0,0 +1,25 @@ +From d2480de925e83c8bf60faa96141f4198bdf7f619 Mon Sep 17 00:00:00 2001 +From: Wouter Verhelst +Date: Fri, 2 Aug 2019 10:33:00 +0200 +Subject: [PATCH] Also close the file descriptor before returning + +Coverity CID#1162721 +[Retrieved from: +https://github.com/NetworkBlockDevice/nbd/commit/d2480de925e83c8bf60faa96141f4198bdf7f619] +Signed-off-by: Fabrice Fontaine +--- + nbd-client.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/nbd-client.c b/nbd-client.c +index e9ec0a86..94035886 100644 +--- a/nbd-client.c ++++ b/nbd-client.c +@@ -930,6 +930,7 @@ void disconnect(char* device) { + if (ioctl(nbd, NBD_CLEAR_SOCK)<0) + err("Ioctl failed: %m\n"); + printf("done\n"); ++ close(nbd); + } + + #if HAVE_NETLINK diff --git a/buildroot/package/nbd/0001-avoid-name-clashing.patch b/buildroot/package/nbd/0001-avoid-name-clashing.patch deleted file mode 100644 index b3ea9c99c..000000000 --- a/buildroot/package/nbd/0001-avoid-name-clashing.patch +++ /dev/null @@ -1,28 +0,0 @@ -rename err() function to avoid clashing with err() form C library - -err() is a function available in the C library, so when static linking, -there is a clash at link timebecause the function is provided both by -nbd and the C library: - http://autobuild.buildroot.org/results/aa8/aa8a1ac35a93e1c8b9fddbc2b5d66ecaa921f31e/build-end.log - -Fix that by renaming err() to nbd_err() and providing a small maco -wrapper to avoid touching the many call sites. - -Signed-off-by: "Yann E. MORIN" - ---- -Upstream status: hack, not submitted. - -diff -durN nbd-3.11.orig/cliserv.h nbd-3.11/cliserv.h ---- nbd-3.11.orig/cliserv.h 2015-05-25 12:27:56.000000000 +0200 -+++ nbd-3.11/cliserv.h 2015-08-13 19:28:21.609467505 +0200 -@@ -75,7 +75,8 @@ - void setmysockopt(int sock); - void err_nonfatal(const char *s); - --void err(const char *s) G_GNUC_NORETURN; -+void nbd_err(const char *s) G_GNUC_NORETURN; -+#define err(S) nbd_err(S) - - void logging(const char* name); - diff --git a/buildroot/package/nbd/nbd.hash b/buildroot/package/nbd/nbd.hash index 03234fd87..d856953c2 100644 --- a/buildroot/package/nbd/nbd.hash +++ b/buildroot/package/nbd/nbd.hash @@ -1,3 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.13/ -md5 f52a4ef8979d81e6c15a745236582fdf nbd-3.15.2.tar.xz -sha1 c8248dd76641a31189735407cd4d55fe63969c08 nbd-3.15.2.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.20/ +md5 910fe6c152f8c30ad8608388e6a4ce89 nbd-3.20.tar.xz +sha1 9240430266ff4bfb2316ef6d880056a9974a59fd nbd-3.20.tar.xz + +# Locally calculated +sha256 e0e1b3538ab7ae5accf56180afd1a9887d415b98d21223b8ad42592b4af7d6cd nbd-3.20.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/nbd/nbd.mk b/buildroot/package/nbd/nbd.mk index 82de1c487..5fd555551 100644 --- a/buildroot/package/nbd/nbd.mk +++ b/buildroot/package/nbd/nbd.mk @@ -4,11 +4,11 @@ # ################################################################################ -NBD_VERSION = 3.15.2 +NBD_VERSION = 3.20 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs -NBD_DEPENDENCIES = libglib2 +NBD_DEPENDENCIES = host-pkgconf libglib2 NBD_LICENSE = GPL-2.0 NBD_LICENSE_FILES = COPYING diff --git a/buildroot/package/ncdu/ncdu.hash b/buildroot/package/ncdu/ncdu.hash index 7326a1598..285dc9bfa 100644 --- a/buildroot/package/ncdu/ncdu.hash +++ b/buildroot/package/ncdu/ncdu.hash @@ -1,6 +1,5 @@ -# From http://dev.yorhel.nl/download/ncdu-1.13.tar.gz.{md5,sha1} -md5 67239592ac41f42290f52ab89ff198be ncdu-1.13.tar.gz -sha1 3233c4185208d9989ac528a94817ed92dd59c773 ncdu-1.13.tar.gz +# From https://dev.yorhel.nl/download/ncdu-1.14.2.tar.gz.sha256 +sha256 947a7f5c1d0cd4e338e72b4f5bc5e2873651442cec3cb012e04ad2c37152c6b1 ncdu-1.14.2.tar.gz # computed locally -sha256 0ee47c3742a867ace26eb429cce593b54ab4ccb4c4a97d62e41363cbf80c8a24 COPYING +sha256 978f49428f21714c973706030c0ef09983cc1e2889a1b7b521dbf8860870cf05 COPYING diff --git a/buildroot/package/ncdu/ncdu.mk b/buildroot/package/ncdu/ncdu.mk index 9a7170d60..681c8bd87 100644 --- a/buildroot/package/ncdu/ncdu.mk +++ b/buildroot/package/ncdu/ncdu.mk @@ -4,7 +4,7 @@ # ################################################################################ -NCDU_VERSION = 1.13 +NCDU_VERSION = 1.14.2 NCDU_SITE = http://dev.yorhel.nl/download NCDU_DEPENDENCIES = ncurses diff --git a/buildroot/package/ncftp/ncftp.hash b/buildroot/package/ncftp/ncftp.hash index f6f731015..3ab27df5c 100644 --- a/buildroot/package/ncftp/ncftp.hash +++ b/buildroot/package/ncftp/ncftp.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 129e5954850290da98af012559e6743de193de0012e972ff939df9b604f81c23 ncftp-3.2.6-src.tar.gz +sha256 129e5954850290da98af012559e6743de193de0012e972ff939df9b604f81c23 ncftp-3.2.6-src.tar.gz +sha256 4fe2f063d25d79c49712a272ebb68e050c703eed9c66c80108427edfe3285580 doc/LICENSE.txt diff --git a/buildroot/package/ncftp/ncftp.mk b/buildroot/package/ncftp/ncftp.mk index c8c894233..676a9c589 100644 --- a/buildroot/package/ncftp/ncftp.mk +++ b/buildroot/package/ncftp/ncftp.mk @@ -21,7 +21,7 @@ NCFTP_CONF_OPTS = --disable-ccdv # We need to pass -I because of the non-standard m4 directory name, and # none of the other autotools are used, so the below is the easiest. define NCFTP_RUN_AUTOCONF - (cd $(@D); $(HOST_DIR)/bin/autoconf -I$(@D)/autoconf_local/) + (cd $(@D); $(AUTOCONF) -I$(@D)/autoconf_local/) endef NCFTP_PRE_CONFIGURE_HOOKS += NCFTP_RUN_AUTOCONF diff --git a/buildroot/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch b/buildroot/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch deleted file mode 100644 index 47905d71d..000000000 --- a/buildroot/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 63c0c47106007f7b2a791e3e4b062a5424d3dfe8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 Aug 2018 09:02:50 +0200 -Subject: [PATCH] Fix unique_ptr error with some old toolchains - -With some "old" toolchains (glibc, uclibc in version 4.9.4, 5.3, 5.4, -5.5 ...), the following error is raised by the compiler: - -../src/screen.cxx:60:29: required from here -/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/ext/new_allocator.h:120:4: -error: no matching function for call to 'std::pair >::pair(const screen_functions*, Page*)' - -[...] - -/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/stl_pair.h:112:26: -note: candidate: constexpr std::pair<_T1, _T2>::pair(const _T1&, const _T2&) [with _T1 = const screen_functions* const; _T2 = std::unique_ptr] - _GLIBCXX_CONSTEXPR pair(const _T1& __a, const _T2& __b) - ^ -/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/stl_pair.h:112:26: -note: no known conversion for argument 2 from 'Page*' to 'const -std::unique_ptr&' - -This is due to the fact that init function of screen_functions -structure returns Page* but PageMap wants a std::unique_ptr - -To fix this, cast raw pointer into a unique_ptr with an explicit cast - -Fixes: - - http://autobuild.buildroot.net/results/d8a7339d8bdd5cdc6bd1716585d4bcf15a2e8015 - -Signed-off-by: Fabrice Fontaine ---- - src/screen.cxx | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/screen.cxx b/src/screen.cxx -index dd42b25..56afd11 100644 ---- a/src/screen.cxx -+++ b/src/screen.cxx -@@ -56,8 +56,9 @@ ScreenManager::MakePage(const struct screen_functions &sf) - return i; - - auto j = pages.emplace(&sf, -- sf.init(*this, main_window.w, -- main_window.size)); -+ std::unique_ptr(sf.init(*this, -+ main_window.w, -+ main_window.size))); - assert(j.second); - return j.first; - } --- -2.14.1 - diff --git a/buildroot/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch b/buildroot/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch new file mode 100644 index 000000000..fd2458976 --- /dev/null +++ b/buildroot/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch @@ -0,0 +1,43 @@ +From d2bd33ec18c146b27fb5aff7dd0089faa195ef9b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 11 Feb 2019 21:42:01 +0100 +Subject: [PATCH] meson.build: add atomic dependency for sparc + +Linking with libatomic is needed on sparc otherwise build fails on: +ncmpc@exe/src_Main.cxx.o: In function `std::__atomic_base::operator++()': +/home/buildroot/autobuild/instance-1/output/host/opt/ext-toolchain/sparc-buildroot-linux-uclibc/include/c++/6.4.0/bits/atomic_base.h:296: undefined reference to `__atomic_fetch_add_4' + +Fixes: + - http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/MusicPlayerDaemon/ncmpc/pull/45] +--- + meson.build | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/meson.build b/meson.build +index 2e6defc..b393e39 100644 +--- a/meson.build ++++ b/meson.build +@@ -174,6 +174,9 @@ else + pcre_dep = declare_dependency() + endif + ++# Needed on sparc ++atomic_dep = cc.find_library('atomic', required: false) ++ + inc = include_directories( + 'src', + +@@ -352,6 +355,7 @@ ncmpc = executable('ncmpc', + sources, + include_directories: inc, + dependencies: [ ++ atomic_dep, + thread_dep, + boost_dep, + pcre_dep, +-- +2.14.1 + diff --git a/buildroot/package/ncmpc/0002-Global-Bindings-add-KeyBindings-constructor-to-simplify-initializers.patch b/buildroot/package/ncmpc/0002-Global-Bindings-add-KeyBindings-constructor-to-simplify-initializers.patch deleted file mode 100644 index 217fa9b55..000000000 --- a/buildroot/package/ncmpc/0002-Global-Bindings-add-KeyBindings-constructor-to-simplify-initializers.patch +++ /dev/null @@ -1,217 +0,0 @@ -From da27fcc39e187671b5e4373848f701a3d910446c Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Wed, 26 Sep 2018 09:51:09 +0200 -Subject: [PATCH] {Global,}Bindings: add KeyBindings constructor to simplify - initializers - -As a side effect, this works around a build failure with GCC 4.9. - -Signed-off-by: Fabrice Fontaine -[Retrieved from -https://github.com/MusicPlayerDaemon/ncmpc/commit/da27fcc39e187671b5e4373848f701a3d910446c -and updated for 0.31 (remove NEWS update)] ---- - src/Bindings.hxx | 3 + - src/GlobalBindings.cxx | 142 ++++++++++++++++++++--------------------- - 3 files changed, 75 insertions(+), 71 deletions(-) - -diff --git a/src/Bindings.hxx b/src/Bindings.hxx -index 342d951..0c630dc 100644 ---- a/src/Bindings.hxx -+++ b/src/Bindings.hxx -@@ -42,6 +42,9 @@ struct KeyBinding { - bool modified = false; - #endif - -+ constexpr KeyBinding(int a, int b=0, int c=0) noexcept -+ :keys{{a, b, c}} {} -+ - gcc_pure - bool HasKey(int key) const { - return std::find(keys.begin(), keys.end(), key) != keys.end(); -diff --git a/src/GlobalBindings.cxx b/src/GlobalBindings.cxx -index b565848..8049ed2 100644 ---- a/src/GlobalBindings.cxx -+++ b/src/GlobalBindings.cxx -@@ -51,110 +51,110 @@ - - static KeyBindings global_key_bindings{{{ - #ifdef ENABLE_KEYDEF_SCREEN -- { {'K', 0, 0 } }, -+ {'K'}, - #endif -- { { 'q', 'Q', C('C') } }, -+ {'q', 'Q', C('C')}, - - /* movement */ -- { { UP, 'k', 0 } }, -- { { DWN, 'j', 0 } }, -- { { 'H', 0, 0 } }, -- { { 'M', 0, 0 } }, -- { { 'L', 0, 0 } }, -- { { HOME, C('A'), 0 } }, -- { { END, C('E'), 0 } }, -- { { PGUP, 0, 0 } }, -- { { PGDN, 0, 0 } }, -- { { 'v', 0, 0 } }, -- { { C('N'), 0, 0 } }, -- { { C('B'), 0, 0 } }, -- { { 'N', 0, 0 } }, -- { { 'B', 0, 0 } }, -- { { 'l', 0, 0 } }, -+ {UP, 'k'}, -+ {DWN, 'j'}, -+ {'H'}, -+ {'M'}, -+ {'L'}, -+ {HOME, C('A')}, -+ {END, C('E')}, -+ {PGUP}, -+ {PGDN}, -+ {'v', 0}, -+ {C('N'), 0}, -+ {C('B'), 0}, -+ {'N', 0}, -+ {'B', 0}, -+ {'l'}, - - /* basic screens */ -- { { '1', F1, 'h' } }, -- { { '2', F2, 0 } }, -- { { '3', F3, 0 } }, -+ {'1', F1, 'h'}, -+ {'2', F2}, -+ {'3', F3}, - - /* player commands */ -- { { RET, 0, 0 } }, -- { { 'P', 0, 0 } }, -- { { 's', BS, 0 } }, -- { { 'o', 0, 0 } }, -- { { '>', 0, 0 } }, -- { { '<', 0, 0 } }, -- { { 'f', 0, 0 } }, -- { { 'b', 0, 0 } }, -- { { '+', RGHT, 0 } }, -- { { '-', LEFT, 0 } }, -- { { ' ', 0, 0 } }, -- { { 't', 0, 0 } }, -- { { DEL, 'd', 0 } }, -- { { 'Z', 0, 0 } }, -- { { 'c', 0, 0 } }, -- { { 'r', 0, 0 } }, -- { { 'z', 0, 0 } }, -- { { 'y', 0, 0 } }, -- { { 'C', 0, 0 } }, -- { { 'x', 0, 0 } }, -- { { C('U'), 0, 0 } }, -- { { 'S', 0, 0 } }, -- { { 'a', 0, 0 } }, -- -- { { '!', 0, 0 } }, -- { { '"', 0, 0 } }, -- -- { { 'G', 0, 0 } }, -+ {RET}, -+ {'P'}, -+ {'s', BS}, -+ {'o'}, -+ {'>'}, -+ {'<'}, -+ {'f'}, -+ {'b'}, -+ {'+', RGHT}, -+ {'-', LEFT}, -+ {' '}, -+ {'t'}, -+ {DEL, 'd'}, -+ {'Z'}, -+ {'c'}, -+ {'r'}, -+ {'z'}, -+ {'y'}, -+ {'C'}, -+ {'x'}, -+ {C('U')}, -+ {'S'}, -+ {'a'}, -+ -+ {'!'}, -+ {'"'}, -+ -+ {'G'}, - - /* lists */ -- { { C('K'), 0, 0 } }, -- { { C('J'), 0, 0 } }, -- { { C('L'), 0, 0 } }, -+ {C('K')}, -+ {C('J')}, -+ {C('L')}, - - - /* ncmpc options */ -- { { 'w', 0, 0 } }, -- { { 'U', 0, 0 } }, -+ {'w'}, -+ {'U'}, - - /* change screen */ -- { { TAB, 0, 0 } }, -- { { STAB, 0, 0 } }, -- { { '`', 0, 0 } }, -+ {TAB}, -+ {STAB}, -+ {'`'}, - - - /* find */ -- { { '/', 0, 0 } }, -- { { 'n', 0, 0 } }, -- { { '?', 0, 0 } }, -- { { 'p', 0, 0 } }, -- { { '.', 0, 0 } }, -+ {'/'}, -+ {'n'}, -+ {'?'}, -+ {'p'}, -+ {'.'}, - - - /* extra screens */ - #ifdef ENABLE_ARTIST_SCREEN -- { {'4', F4, 0 } }, -+ {'4', F4}, - #endif - #ifdef ENABLE_SEARCH_SCREEN -- { {'5', F5, 0 } }, -- { {'m', 0, 0 } }, -+ {'5', F5}, -+ {'m'}, - #endif - #ifdef ENABLE_SONG_SCREEN -- { { 'i', 0, 0 } }, -+ {'i'}, - #endif - #ifdef ENABLE_LYRICS_SCREEN -- { {'7', F7, 0 } }, -- { {ESC, 0, 0 } }, -- { {'u', 0, 0 } }, -- { {'e', 0, 0 } }, -+ {'7', F7}, -+ {ESC}, -+ {'u'}, -+ {'e'}, - #endif - - #ifdef ENABLE_OUTPUTS_SCREEN -- { {'8', F8, 0 } }, -+ {'8', F8}, - #endif - - #ifdef ENABLE_CHAT_SCREEN -- { {'9', F9, 0} }, -+ {'9', F9}, - #endif - }}}; - diff --git a/buildroot/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch b/buildroot/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch new file mode 100644 index 000000000..9f599c89e --- /dev/null +++ b/buildroot/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch @@ -0,0 +1,38 @@ +From 21ad6bf2bcb0745c25a28637449a72eee883a8e2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Apr 2019 19:19:10 +0200 +Subject: [PATCH] meson.build: link with lintl if needed + +Fixes: + - http://autobuild.buildroot.org/results/d53978fb30d77cb4d10921bf721eff3d066567ce + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent as upstream already rejected the first patch +on atomic: https://github.com/MusicPlayerDaemon/ncmpc/pull/45] +--- + meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/meson.build b/meson.build +index 2e6defc..28e9d29 100644 +--- a/meson.build ++++ b/meson.build +@@ -42,6 +42,7 @@ else + error('libintl.h not found') + endif + conf.set('ENABLE_NLS', enable_nls) ++intl_dep = cc.find_library('intl', required: false) + if enable_nls + conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) + subdir('po') +@@ -356,6 +357,7 @@ ncmpc = executable('ncmpc', + boost_dep, + pcre_dep, + curses_dep, ++ intl_dep, + lirc_dep, + libmpdclient_dep, + ], +-- +2.20.1 + diff --git a/buildroot/package/ncmpc/Config.in b/buildroot/package/ncmpc/Config.in index d22ea368b..0e062460a 100644 --- a/buildroot/package/ncmpc/Config.in +++ b/buildroot/package/ncmpc/Config.in @@ -2,10 +2,11 @@ config BR2_PACKAGE_NCMPC bool "ncmpc" depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # libglib2 -> gettext - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - select BR2_PACKAGE_LIBGLIB2 + depends on BR2_USE_WCHAR # boost + depends on BR2_TOOLCHAIN_HAS_THREADS # boost + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_LIBMPDCLIENT select BR2_PACKAGE_NCURSES help @@ -15,7 +16,7 @@ config BR2_PACKAGE_NCMPC http://www.musicpd.org/clients/ncmpc/ -comment "ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 7" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/buildroot/package/ncmpc/ncmpc.hash b/buildroot/package/ncmpc/ncmpc.hash index afa5260be..963c6d260 100644 --- a/buildroot/package/ncmpc/ncmpc.hash +++ b/buildroot/package/ncmpc/ncmpc.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 8d3416c5b99ec21527b506f75bd7e536ddff60e61695b05989e791a751611bcc ncmpc-0.31.tar.xz +sha256 7c8eb727f6e12d8f97a53915b1b5632898b4afb335a1121c5e01c81df695615c ncmpc-0.37.tar.xz # Hash for license file: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/ncmpc/ncmpc.mk b/buildroot/package/ncmpc/ncmpc.mk index 787f58201..29675f225 100644 --- a/buildroot/package/ncmpc/ncmpc.mk +++ b/buildroot/package/ncmpc/ncmpc.mk @@ -5,22 +5,35 @@ ################################################################################ NCMPC_VERSION_MAJOR = 0 -NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).31 +NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).37 NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR) -NCMPC_DEPENDENCIES = host-pkgconf libglib2 libmpdclient ncurses +NCMPC_DEPENDENCIES = \ + boost \ + host-pkgconf \ + libmpdclient \ + ncurses \ + $(TARGET_NLS_DEPENDENCIES) NCMPC_LICENSE = GPL-2.0+ NCMPC_LICENSE_FILES = COPYING NCMPC_CONF_OPTS = \ -Dcurses=ncurses \ - -Ddocumentation=false + -Ddocumentation=disabled \ + $(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled) ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) NCMPC_DEPENDENCIES += lirc-tools -NCMPC_CONF_OPTS += -Dlirc=true +NCMPC_CONF_OPTS += -Dlirc=enabled else -NCMPC_CONF_OPTS += -Dlirc=false +NCMPC_CONF_OPTS += -Dlirc=disabled +endif + +ifeq ($(BR2_PACKAGE_PCRE),y) +NCMPC_DEPENDENCIES += pcre +NCMPC_CONF_OPTS += -Dregex=enabled +else +NCMPC_CONF_OPTS += -Dregex=disabled endif $(eval $(meson-package)) diff --git a/buildroot/package/ncurses/ncurses.hash b/buildroot/package/ncurses/ncurses.hash index 123256bf9..69115f5ca 100644 --- a/buildroot/package/ncurses/ncurses.hash +++ b/buildroot/package/ncurses/ncurses.hash @@ -1,4 +1,39 @@ # Locally calculated after checking pgp signature -sha256 aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 ncurses-6.1.tar.gz +sha256 aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 ncurses-6.1.tar.gz +sha256 cf9038be62c49a6b5fe93f33b32f983649b2f4c4c31cc99bd18e1e5871c31443 ncurses-6.1-20190609-patch.sh.bz2 +sha256 4b0a4c6abce4543ac4fd4c3389b14825e73b7cddcbb01a687c5dd837f21a3b04 ncurses-6.1-20190615.patch.gz +sha256 b2302625ec2fa6dce79622670452e56ff6130dc02e655b52177264cfeff84c51 ncurses-6.1-20190623.patch.gz +sha256 48b004a3e5409a02a5e751f996fe487f5ce45be1fff38572f7cc8167b22179bf ncurses-6.1-20190630.patch.gz +sha256 faf849eed92161ac09782badf84a19ad6beae472e87d460905865e08a6ed46e4 ncurses-6.1-20190706.patch.gz +sha256 62d4954bf818659105aa1c21cc27cb2c133e02bdc7d3f6aa548caae2d1db7440 ncurses-6.1-20190713.patch.gz +sha256 0c1a54bd5de9c890d1fabcfa92bf5bf46f7eccc54a48051367e82bdb29636450 ncurses-6.1-20190720.patch.gz +sha256 0bbd08d3bd12686d4427c242d6a8fde2e299698039cd597303af713c5f538f17 ncurses-6.1-20190727.patch.gz +sha256 40e5f350a921dbd03e3d9ff93bc477ec4f1f65878f307c534882fba3b0b40507 ncurses-6.1-20190728.patch.gz +sha256 9648104311e209d17db9556d6efc898d5c80ed5fc80e8aa3cd08769544c839b8 ncurses-6.1-20190803.patch.gz +sha256 fa1f583575717b2538d3a4ea59a67bc17dd07ed46cb99fe2beaf23d1b006e9df ncurses-6.1-20190810.patch.gz +sha256 5e9ae4f1b3e2e2d567a01a8fb2c9b7f3804cae97f28cd483d239afee781b8c2b ncurses-6.1-20190817.patch.gz +sha256 7592e5e610b3e9eeca78897da2330b7518f00e0a59d20df873c88a9b26bc4da9 ncurses-6.1-20190824.patch.gz +sha256 1a9800a5ccc4f2cb572b63cdc8f1431642e014a58a30151af73977614d5c4aac ncurses-6.1-20190831.patch.gz +sha256 87685a6b90225efcd03375eb11b124fd9e95ee4b0f36bcbc82e56a70cd466b33 ncurses-6.1-20190907.patch.gz +sha256 4ddebb6e0e5a67028eb3aca2352c9bd48cf122a512719f93e449e00a3c6634f8 ncurses-6.1-20190914.patch.gz +sha256 4c725fa729d754f4e75af78fda4cf67d60e71c1625b5f4f49b7930c95bb8dd36 ncurses-6.1-20190921.patch.gz +sha256 a830b879b57906b1e480e4785b32cec05081b7849c06c4b116459c4d343ba21b ncurses-6.1-20190928.patch.gz +sha256 d5eae35d920409613f565825e1e215fed89828040aab541328455da38e1a9b7c ncurses-6.1-20191005.patch.gz +sha256 136dbd07254810728c1fcb7614b566e7c3cb6af8c0783019bbb6b4b5e3c1e2c6 ncurses-6.1-20191012.patch.gz +sha256 1d5125b20792e9f534432c3ef2aa68984c713416addeb2c4364c5ae897a3b8b7 ncurses-6.1-20191015.patch.gz +sha256 a6475c05312ba0b12b72b83529c1d283a14c4470414c505fa45451e35f3ffcf5 ncurses-6.1-20191019.patch.gz +sha256 f6c7469f33065faf1d04ac9e9bea1a88142b00b82e3db3674cca9ec24920b4af ncurses-6.1-20191026.patch.gz +sha256 0d0443937b9c04663de25b405bb95e658e7c87e1dd7a726b3813aa7f9b55f69a ncurses-6.1-20191102.patch.gz +sha256 f3b75787918d2f02a2005877e81fdc054c45b8249b43aabb531e3b817bcf7576 ncurses-6.1-20191109.patch.gz +sha256 801d138b55986719aea7f42dc8c0cb618fa9a6edf92d1789a6ba5d61678f7761 ncurses-6.1-20191116.patch.gz +sha256 45f447cf2c7a24295c7b9210473e943a238c57ca80581d121c9a1a3aa05332a6 ncurses-6.1-20191123.patch.gz +sha256 ea758e3b0162348c4d5d6dac56f95809da3b7d0589205661a13430eb93f72f75 ncurses-6.1-20191130.patch.gz +sha256 16b5a588c56a53c468d2359b21d5d8a007c4ef7696de12c964a1b661ed185f72 ncurses-6.1-20191207.patch.gz +sha256 8725a2dc8f1cfdab41cb5fe56f930e070f8cdc81a77f303ef2658f65cd0b8edd ncurses-6.1-20191214.patch.gz +sha256 7e2a06fb0af6c84269d23ffe06c689bf1a8a57af39369690ee0698778d4b6cda ncurses-6.1-20191221.patch.gz +sha256 d052bcdb38f8b45a00c0a3190dec7ac1e72d5682f3a16d8accda239308aad62f ncurses-6.1-20191228.patch.gz +sha256 7b6253bae438154a88c7f3e301b872ed7ad71f943c873f4e6c82d8d36a5df72b ncurses-6.1-20200104.patch.gz +sha256 e438f28025c7d97c7f8fabf40eeab68bbf8ca871a0ba349e3fdec9165efe85cb ncurses-6.1-20200111.patch.gz +sha256 06d002c33f727c4a36a0b502c226ea3c3c5b80770703d2f783fffa6a0db04d92 ncurses-6.1-20200118.patch.gz # Locally computed -sha256 86106f0da1cf5ccfa0f0651665dd1b4515e8edad1c7972780155770548b317d9 COPYING +sha256 4d1fde61868c73776a539366dccf5d5a4857e7fd7299efb1f02e07c2afe9ea87 COPYING diff --git a/buildroot/package/ncurses/ncurses.mk b/buildroot/package/ncurses/ncurses.mk index 12fb9812e..c11650c76 100644 --- a/buildroot/package/ncurses/ncurses.mk +++ b/buildroot/package/ncurses/ncurses.mk @@ -11,6 +11,44 @@ NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config +NCURSES_PATCH = \ + $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ + ncurses-6.1-20190609-patch.sh.bz2 \ + ncurses-6.1-20190615.patch.gz \ + ncurses-6.1-20190623.patch.gz \ + ncurses-6.1-20190630.patch.gz \ + ncurses-6.1-20190706.patch.gz \ + ncurses-6.1-20190713.patch.gz \ + ncurses-6.1-20190720.patch.gz \ + ncurses-6.1-20190727.patch.gz \ + ncurses-6.1-20190728.patch.gz \ + ncurses-6.1-20190803.patch.gz \ + ncurses-6.1-20190810.patch.gz \ + ncurses-6.1-20190817.patch.gz \ + ncurses-6.1-20190824.patch.gz \ + ncurses-6.1-20190831.patch.gz \ + ncurses-6.1-20190907.patch.gz \ + ncurses-6.1-20190914.patch.gz \ + ncurses-6.1-20190921.patch.gz \ + ncurses-6.1-20190928.patch.gz \ + ncurses-6.1-20191005.patch.gz \ + ncurses-6.1-20191012.patch.gz \ + ncurses-6.1-20191015.patch.gz \ + ncurses-6.1-20191019.patch.gz \ + ncurses-6.1-20191026.patch.gz \ + ncurses-6.1-20191102.patch.gz \ + ncurses-6.1-20191109.patch.gz \ + ncurses-6.1-20191116.patch.gz \ + ncurses-6.1-20191123.patch.gz \ + ncurses-6.1-20191130.patch.gz \ + ncurses-6.1-20191207.patch.gz \ + ncurses-6.1-20191214.patch.gz \ + ncurses-6.1-20191221.patch.gz \ + ncurses-6.1-20191228.patch.gz \ + ncurses-6.1-20200104.patch.gz \ + ncurses-6.1-20200111.patch.gz \ + ncurses-6.1-20200118.patch.gz \ + ) NCURSES_CONF_OPTS = \ --without-cxx \ diff --git a/buildroot/package/ndisc6/0001-Fix-musl-build.patch b/buildroot/package/ndisc6/0001-Fix-musl-build.patch new file mode 100644 index 000000000..6a13a435c --- /dev/null +++ b/buildroot/package/ndisc6/0001-Fix-musl-build.patch @@ -0,0 +1,34 @@ +From 12787f5936c79b56b24ffe0a92f4370804070223 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Thu, 7 Nov 2019 21:41:34 +0100 +Subject: [PATCH] Fix musl build + +Fixes +src/trace-tcp.c:67:24: error: 'TH_SYN' undeclared (first use in this function); did you mean 'TH_CWR'? + packet->th.th_flags = TH_SYN | (ecn ? (TH_ECE | TH_CWR) : 0); + +Musl guards TH_SYN with if defined(_GNU_SOURCE): +https://git.musl-libc.org/cgit/musl/tree/include/netinet/tcp.h#n82 + +Patch sent via email to upstream. + +Signed-off-by: Bernd Kuhls +--- + src/trace-tcp.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/trace-tcp.c b/src/trace-tcp.c +index 5aba9d4..1b367ae 100644 +--- a/src/trace-tcp.c ++++ b/src/trace-tcp.c +@@ -21,7 +21,6 @@ + # include + #endif + +-#undef _GNU_SOURCE + #define _DEFAULT_SOURCE 1 + + #include +-- +2.20.1 + diff --git a/buildroot/package/ndisc6/Config.in b/buildroot/package/ndisc6/Config.in index 553112385..287dc9199 100644 --- a/buildroot/package/ndisc6/Config.in +++ b/buildroot/package/ndisc6/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_NDISC6 bool "ndisc6 tools" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # c11 help NDisc6 is a small collection of useful tools for IPv6 networking @@ -45,3 +46,7 @@ config BR2_PACKAGE_NDISC6_TCPSPRAY TCP/IP bandwidth measurement tool (Discard and Echo client). endif + +comment "ndisc6 needs a toolchain w/ gcc >= 4.7" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/buildroot/package/ndisc6/ndisc6.hash b/buildroot/package/ndisc6/ndisc6.hash index e37e33e65..381667c2c 100644 --- a/buildroot/package/ndisc6/ndisc6.hash +++ b/buildroot/package/ndisc6/ndisc6.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821 ndisc6-1.0.3.tar.bz2 +sha256 abb1da4a98d94e5abe1dd7b1c975de540306b0581cbbd36aff035118b2f25c1f ndisc6-1.0.4.tar.bz2 +# Locally computed +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/ndisc6/ndisc6.mk b/buildroot/package/ndisc6/ndisc6.mk index eb4fbbbc2..9845aa2c9 100644 --- a/buildroot/package/ndisc6/ndisc6.mk +++ b/buildroot/package/ndisc6/ndisc6.mk @@ -4,10 +4,10 @@ # ################################################################################ -NDISC6_VERSION = 1.0.3 +NDISC6_VERSION = 1.0.4 NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2 NDISC6_SITE = http://www.remlab.net/files/ndisc6 -NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99" LIBS=$(TARGET_NLS_LIBS) +NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=c11" LIBS=$(TARGET_NLS_LIBS) NDISC6_CONF_OPTS = --disable-rpath --disable-suid-install NDISC6_LICENSE = GPL-2.0 or GPL-3.0 NDISC6_LICENSE_FILES = COPYING diff --git a/buildroot/package/ne10/ne10.hash b/buildroot/package/ne10/ne10.hash index db5b6f127..2c56215c1 100644 --- a/buildroot/package/ne10/ne10.hash +++ b/buildroot/package/ne10/ne10.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 450dac5bb3a2351019ae23792e97c3bf965d16a21c0598b73cea9fbc3b3a56af ne10-v1.2.0.tar.gz +sha256 450dac5bb3a2351019ae23792e97c3bf965d16a21c0598b73cea9fbc3b3a56af ne10-1.2.0.tar.gz +sha256 eb48041c8e0ad556cf72f2a6eff89c893aa5702bba4e163ca7798cce07e6c55e doc/LICENSE diff --git a/buildroot/package/ne10/ne10.mk b/buildroot/package/ne10/ne10.mk index cb303bd7b..2af664be3 100644 --- a/buildroot/package/ne10/ne10.mk +++ b/buildroot/package/ne10/ne10.mk @@ -4,8 +4,8 @@ # ################################################################################ -NE10_VERSION = v1.2.0 -NE10_SITE = $(call github,projectNe10,Ne10,$(NE10_VERSION)) +NE10_VERSION = 1.2.0 +NE10_SITE = $(call github,projectNe10,Ne10,v$(NE10_VERSION)) NE10_LICENSE = BSD-3-Clause or Apache-2.0 NE10_LICENSE_FILES = doc/LICENSE NE10_INSTALL_STAGING = YES diff --git a/buildroot/package/neard/neard.hash b/buildroot/package/neard/neard.hash index d1e74b37b..948314ddd 100644 --- a/buildroot/package/neard/neard.hash +++ b/buildroot/package/neard/neard.hash @@ -1,2 +1,4 @@ # From https://www.kernel.org/pub/linux/network/nfc/sha256sums.asc -sha256 eae3b11c541a988ec11ca94b7deab01080cd5b58cfef3ced6ceac9b6e6e65b36 neard-0.16.tar.xz +sha256 eae3b11c541a988ec11ca94b7deab01080cd5b58cfef3ced6ceac9b6e6e65b36 neard-0.16.tar.xz +# Locally computed +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/buildroot/package/neardal/0001-fix-static-linking-with-libedit-or-readline.patch b/buildroot/package/neardal/0001-fix-static-linking-with-libedit-or-readline.patch deleted file mode 100644 index bae0edae9..000000000 --- a/buildroot/package/neardal/0001-fix-static-linking-with-libedit-or-readline.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 62ae1bf0206960d0ba5ff8f90238030e67f1a5cd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 28 Oct 2018 20:58:55 +0100 -Subject: [PATCH] fix static linking with libedit or readline - -Use PKG_CHECK_MODULES to find libedit or readline and continue to use -AC_SEARCH_LIBS as a fallback - -By using PKG_CHECK_MODULES, static link will work as -lncurses or -lbsd -will be automatically added - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/connectivity/neardal/pull/7] ---- - configure.ac | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f0cebed..211b896 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -68,10 +68,16 @@ PKG_CHECK_MODULES(gio, gio-unix-2.0 >= 2.30, - AC_SUBST([gio_LIBS]), - AC_MSG_ERROR(gio-unix-2.0 >= 2.30 is required)) - --AC_SEARCH_LIBS([rl_initialize], [edit readline], -- [AS_IF([echo $LIBS | grep -q "-ledit"], -- [CPPFLAGS="-DHAVE_LIBEDIT $CPPFLAGS"])], -- [AC_MSG_ERROR(editline or readline is required)]) -+PKG_CHECK_MODULES(libedit, libedit, -+ [CPPFLAGS="-DHAVE_LIBEDIT $libedit_CFLAGS $CPPFLAGS" -+ LIBS="$libedit_LIBS $LIBS"], -+ [PKG_CHECK_MODULES(readline, readline, -+ [CPPFLAGS="$readline_CFLAGS $CPPFLAGS" -+ LIBS="$readline_LIBS $LIBS"], -+ AC_SEARCH_LIBS([rl_initialize], [edit readline], -+ [AS_IF([echo $LIBS | grep -q "-ledit"], -+ [CPPFLAGS="-DHAVE_LIBEDIT $CPPFLAGS"])], -+ [AC_MSG_ERROR(editline or readline is required)]))]) - - AC_PATH_TOOL([DOXYGEN], [doxygen]) - AM_CONDITIONAL([HAVE_DOXYGEN], [test ! -z "$DOXYGEN"]) --- -2.17.1 - diff --git a/buildroot/package/neardal/neardal.hash b/buildroot/package/neardal/neardal.hash index c767a7456..b8b8b96a4 100644 --- a/buildroot/package/neardal/neardal.hash +++ b/buildroot/package/neardal/neardal.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 9955753759a2604fa47562a4bbccd3b787d625e70311bb6662936d89d26715b7 neardal-33b54a55032b047fd885a5eb3592c169c0056c49.tar.gz +sha256 dae3c432e619a0d3102c5222d0b8fde74413ae519a64ccaae0fc81d31504aecb neardal-4143d130ed39299bfc59d08d2c7c77dbc7f809e9.tar.gz +sha256 296a87e9098d3f2ce1ef80c73c53399dc2c7412f35d4175c45810ea15ed86406 COPYING diff --git a/buildroot/package/neardal/neardal.mk b/buildroot/package/neardal/neardal.mk index f511201b9..28e2850e3 100644 --- a/buildroot/package/neardal/neardal.mk +++ b/buildroot/package/neardal/neardal.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEARDAL_VERSION = 33b54a55032b047fd885a5eb3592c169c0056c49 +NEARDAL_VERSION = 4143d130ed39299bfc59d08d2c7c77dbc7f809e9 NEARDAL_SITE = $(call github,connectivity,neardal,$(NEARDAL_VERSION)) NEARDAL_INSTALL_STAGING = YES NEARDAL_LICENSE = LGPL-2.0 diff --git a/buildroot/package/neon/neon.hash b/buildroot/package/neon/neon.hash index d66b6fd74..2ebefbe52 100644 --- a/buildroot/package/neon/neon.hash +++ b/buildroot/package/neon/neon.hash @@ -1,2 +1,6 @@ # Locally calculated after checking pgp signature sha256 db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca neon-0.30.2.tar.gz +# Locally computed +sha256 95f77624e96f6728145826fc895142275451f43f41c073766db3dbbcc8b790b0 README +sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING diff --git a/buildroot/package/net-tools/net-tools.hash b/buildroot/package/net-tools/net-tools.hash index 766b6fa03..510cac365 100644 --- a/buildroot/package/net-tools/net-tools.hash +++ b/buildroot/package/net-tools/net-tools.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 f7cfe9e73825bac9ab1a6f99d1fc7f54bfd9d33a6f62ba58d28a566905c4e86c net-tools-479bb4a7e11a4084e2935c0a576388f92469225b.tar.gz +sha256 f7cfe9e73825bac9ab1a6f99d1fc7f54bfd9d33a6f62ba58d28a566905c4e86c net-tools-479bb4a7e11a4084e2935c0a576388f92469225b.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/netatalk/netatalk.hash b/buildroot/package/netatalk/netatalk.hash index 762fcd460..6c3250a00 100644 --- a/buildroot/package/netatalk/netatalk.hash +++ b/buildroot/package/netatalk/netatalk.hash @@ -1,3 +1,6 @@ # From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/ md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2 sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2 +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/buildroot/package/netcat-openbsd/netcat-openbsd.hash b/buildroot/package/netcat-openbsd/netcat-openbsd.hash index 2cf471344..cfa65ee24 100644 --- a/buildroot/package/netcat-openbsd/netcat-openbsd.hash +++ b/buildroot/package/netcat-openbsd/netcat-openbsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 06b04b163e8c923943b9fc276eea555625f615a530d5bd8fbdbc1af9b2b0d5db netcat-openbsd-debian_1.190-1.tar.gz +sha256 b46c11f83f66c41ad8f413e842c51a9fb2c495e9a2ed836e6ee75bc314545c30 netcat-openbsd-debian_1.195-2.tar.gz sha256 e2e86d58c38f044a49f51e45515747585db58a2305419c73323eaad88fcaef5c debian/copyright diff --git a/buildroot/package/netcat-openbsd/netcat-openbsd.mk b/buildroot/package/netcat-openbsd/netcat-openbsd.mk index b313116b3..a2333531c 100644 --- a/buildroot/package/netcat-openbsd/netcat-openbsd.mk +++ b/buildroot/package/netcat-openbsd/netcat-openbsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETCAT_OPENBSD_VERSION = debian/1.190-1 +NETCAT_OPENBSD_VERSION = debian/1.195-2 NETCAT_OPENBSD_SITE = https://salsa.debian.org/debian/netcat-openbsd.git NETCAT_OPENBSD_SITE_METHOD = git NETCAT_OPENBSD_LICENSE = BSD-3-Clause diff --git a/buildroot/package/netcat/netcat.hash b/buildroot/package/netcat/netcat.hash index e20c4c297..d591f3d66 100644 --- a/buildroot/package/netcat/netcat.hash +++ b/buildroot/package/netcat/netcat.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 30719c9a4ffbcf15676b8f528233ccc54ee6cba96cb4590975f5fd60c68a066f netcat-0.7.1.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/netifrc/Config.in b/buildroot/package/netifrc/Config.in new file mode 100644 index 000000000..9347033d6 --- /dev/null +++ b/buildroot/package/netifrc/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_NETIFRC + bool "netifrc" + depends on BR2_PACKAGE_OPENRC + help + netifrc is a collection of modules created to configure and + manage network interfaces via individual, per-interface + scripts. + + https://wiki.gentoo.org/wiki/Netifrc + +comment "netifrc needs openrc as init system" + depends on !BR2_PACKAGE_OPENRC diff --git a/buildroot/package/netifrc/netifrc.hash b/buildroot/package/netifrc/netifrc.hash new file mode 100644 index 000000000..d811acc4a --- /dev/null +++ b/buildroot/package/netifrc/netifrc.hash @@ -0,0 +1,3 @@ +# Calculated manually +sha256 004907e0c3db2d106d6a51d604d79f971f1013fa7642054ad7efe5076e52f7b3 netifrc-0.6.1.tar.gz +sha256 da376c9e2244f2a7220767ea4dd88cf423ff5b548e7c2f96b0f3b9dac727748a LICENSE diff --git a/buildroot/package/netifrc/netifrc.mk b/buildroot/package/netifrc/netifrc.mk new file mode 100644 index 000000000..d13dc356f --- /dev/null +++ b/buildroot/package/netifrc/netifrc.mk @@ -0,0 +1,58 @@ +################################################################################ +# +# netifrc +# +################################################################################ + +NETIFRC_VERSION = 0.6.1 +NETIFRC_SITE = $(call github,gentoo,netifrc,$(NETIFRC_VERSION)) +NETIFRC_LICENSE = BSD-2-Clause +NETIFRC_LICENSE_FILES = LICENSE + +NETIFRC_DEPENDENCIES = openrc + +# set LIBNAME so netifrc puts files in proper directories and sets proper +# paths in installed files. Since in buildroot /lib64 and /lib32 always +# points to /lib, it's safe to hardcode it to "lib" +NETIFRC_MAKE_OPTS = \ + LIBNAME=lib \ + UDEVDIR=/lib/udev \ + LIBEXECDIR=/usr/libexec/netifrc + +define NETIFRC_BUILD_CMDS + $(MAKE) $(NETIFRC_MAKE_OPTS) -C $(@D) +endef + +ifeq ($(BR2_PACKAGE_HAS_UDEV),) +define NETIFRC_REMOVE_UDEV + $(RM) $(TARGET_DIR)/lib/udev/net.sh + $(RM) $(TARGET_DIR)/lib/udev/rules.d/90-network.rules + rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/lib/udev/rules.d + rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/lib/udev +endef +endif # BR2_PACKAGE_HAS_UDEV + +NETIFRC_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) +ifneq ($(NETIFRC_DHCP_IFACE),) +NETIFRC_DHCP_CFG = config_$(NETIFRC_DHCP_IFACE)="dhcp" +define NETIFRC_DHCP_SERVICE + ln -sf net.lo $(TARGET_DIR)/etc/init.d/net.$(NETIFRC_DHCP_IFACE) + ln -sf /etc/init.d/net.$(NETIFRC_DHCP_IFACE) \ + $(TARGET_DIR)/etc/runlevels/default/net.$(NETIFRC_DHCP_IFACE) +endef +endif # BR2_SYSTEM_DHCP != "" + +define NETIFRC_NET_CFG + config_lo="127.0.0.1/8" + $(NETIFRC_DHCP_CFG) +endef + +define NETIFRC_INSTALL_TARGET_CMDS + $(MAKE) $(NETIFRC_MAKE_OPTS) DESTDIR=$(TARGET_DIR) -C $(@D) install + $(NETIFRC_REMOVE_UDEV) + $(call PRINTF,$(NETIFRC_NET_CFG)) > $(TARGET_DIR)/etc/conf.d/net + ln -sf /etc/init.d/net.lo $(TARGET_DIR)/etc/runlevels/default/net.lo + $(NETIFRC_DHCP_SERVICE) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/netperf/netperf.hash b/buildroot/package/netperf/netperf.hash index f97274015..47730855d 100644 --- a/buildroot/package/netperf/netperf.hash +++ b/buildroot/package/netperf/netperf.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 842af17655835c8be7203808c3393e6cb327a8067f3ed1f1053eb78b4e40375a netperf-2.7.0.tar.bz2 +sha256 842af17655835c8be7203808c3393e6cb327a8067f3ed1f1053eb78b4e40375a netperf-2.7.0.tar.bz2 +sha256 dc874b3047b6259336431e813961fb6c5945561c6ad7a732aa8531a3c6b1a9fa COPYING diff --git a/buildroot/package/netplug/netplug.hash b/buildroot/package/netplug/netplug.hash index 16a98b7d6..a0d2317a8 100644 --- a/buildroot/package/netplug/netplug.hash +++ b/buildroot/package/netplug/netplug.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 5180dfd9a7d3d0633a027b0a04f01b45a6a64623813cd48bd54423b90814864e netplug-1.2.9.2.tar.bz2 +sha256 5180dfd9a7d3d0633a027b0a04f01b45a6a64623813cd48bd54423b90814864e netplug-1.2.9.2.tar.bz2 +sha256 08ce3ddda499d6befdc80161c7cc82e90da05c31eb1047dae41ef531d5170e9b COPYING diff --git a/buildroot/package/netplug/netplug.mk b/buildroot/package/netplug/netplug.mk index 9363a7181..b5083120f 100644 --- a/buildroot/package/netplug/netplug.mk +++ b/buildroot/package/netplug/netplug.mk @@ -26,9 +26,6 @@ endef define NETPLUG_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/netplug/netplug.service \ $(TARGET_DIR)/usr/lib/systemd/system/netplug.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/netplug.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/netplug.service endef $(eval $(generic-package)) diff --git a/buildroot/package/netsniff-ng/Config.in b/buildroot/package/netsniff-ng/Config.in index c4803b2fa..5d1407baa 100644 --- a/buildroot/package/netsniff-ng/Config.in +++ b/buildroot/package/netsniff-ng/Config.in @@ -1,16 +1,12 @@ config BR2_PACKAGE_NETSNIFF_NG bool "netsniff-ng" - # Build with uClibc fails due to missing ceill() - depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS select BR2_PACKAGE_LIBNL select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_LIBCLI select BR2_PACKAGE_LIBNETFILTER_CONNTRACK select BR2_PACKAGE_LIBURCU - select BR2_PACKAGE_LIBNET help netsniff-ng is a free, performant Linux network analyzer and networking toolkit. If you will, the Swiss army knife for @@ -18,7 +14,22 @@ config BR2_PACKAGE_NETSNIFF_NG http://netsniff-ng.org -comment "netsniff-ng needs a glibc or musl toolchain w/ threads, headers >= 3.0" +if BR2_PACKAGE_NETSNIFF_NG + +config BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN + bool "mausezahn" + default y + # Build with uClibc fails due to missing ceill() + depends on !BR2_TOOLCHAIN_USES_UCLIBC + select BR2_PACKAGE_LIBCLI + select BR2_PACKAGE_LIBNET + +comment "mausezahn needs glibc or musl toolchain" + depends on BR2_TOOLCHAIN_USES_UCLIBC + +endif + +comment "netsniff-ng needs a toolchain w/ threads, headers >= 3.0" depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC \ - || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/buildroot/package/netsniff-ng/netsniff-ng.hash b/buildroot/package/netsniff-ng/netsniff-ng.hash index 706c9461c..c9408ccbd 100644 --- a/buildroot/package/netsniff-ng/netsniff-ng.hash +++ b/buildroot/package/netsniff-ng/netsniff-ng.hash @@ -1,2 +1,5 @@ # Locally calculated after checking signature -sha256 4966821510079bb13722b9fbb4b7567e44b1b4c3e1b1e7ad95f417a89be5d795 netsniff-ng-0.6.5.tar.xz +sha256 7949d38eb5b507700ea0f3c87e9f804d87b43f86ea5de0e961451044c2d3dba2 netsniff-ng-0.6.6.tar.xz +# Locally computed +sha256 b353349ba51e0d4b59cf2f188f0c285296e154ce8c58954bc5e0dc0282a4db2d README +sha256 8f6d85366f3763557d6ddd0637988b9ba11edef354e3c9302fff4262a235c387 COPYING diff --git a/buildroot/package/netsniff-ng/netsniff-ng.mk b/buildroot/package/netsniff-ng/netsniff-ng.mk index 77d892142..283ecaf24 100644 --- a/buildroot/package/netsniff-ng/netsniff-ng.mk +++ b/buildroot/package/netsniff-ng/netsniff-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETSNIFF_NG_VERSION = 0.6.5 +NETSNIFF_NG_VERSION = 0.6.6 NETSNIFF_NG_SITE = http://pub.netsniff-ng.org/netsniff-ng NETSNIFF_NG_SOURCE = netsniff-ng-$(NETSNIFF_NG_VERSION).tar.xz NETSNIFF_NG_LICENSE = GPL-2.0 @@ -13,9 +13,16 @@ NETSNIFF_NG_LICENSE_FILES = README COPYING NETSNIFF_NG_CONF_ENV = \ NACL_INC_DIR=/dev/null \ NACL_LIB_DIR=/dev/null -NETSNIFF_NG_DEPENDENCIES = \ - libnl libpcap libcli libnetfilter_conntrack \ - liburcu libnet +NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu + +ifeq ($(BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN),y) +NETSNIFF_NG_DEPENDENCIES += libcli libnet +NETSNIFF_NG_BUILD_MAKE_TARGET = all +NETSNIFF_NG_INSTALL_MAKE_TARGET = install +else +NETSNIFF_NG_BUILD_MAKE_TARGET = allbutmausezahn +NETSNIFF_NG_INSTALL_MAKE_TARGET = install_allbutmausezahn +endif ifeq ($(BR2_PACKAGE_GEOIP),y) NETSNIFF_NG_DEPENDENCIES += geoip @@ -41,12 +48,14 @@ define NETSNIFF_NG_CONFIGURE_CMDS endef define NETSNIFF_NG_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + $(NETSNIFF_NG_BUILD_MAKE_TARGET) endef define NETSNIFF_NG_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - PREFIX=$(TARGET_DIR)/usr ETCDIR=$(TARGET_DIR)/etc install -C $(@D) + PREFIX=$(TARGET_DIR)/usr ETCDIR=$(TARGET_DIR)/etc \ + -C $(@D) $(NETSNIFF_NG_INSTALL_MAKE_TARGET) endef $(eval $(generic-package)) diff --git a/buildroot/package/netstat-nat/netstat-nat.hash b/buildroot/package/netstat-nat/netstat-nat.hash index 924da129f..7530b8a09 100644 --- a/buildroot/package/netstat-nat/netstat-nat.hash +++ b/buildroot/package/netstat-nat/netstat-nat.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 e945faa283a49f33af15de915a949c9273a230fc17154925364c547adab676ca netstat-nat-1.4.10.tar.gz +sha256 e945faa283a49f33af15de915a949c9273a230fc17154925364c547adab676ca netstat-nat-1.4.10.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash b/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash index c326c28d2..8e3bbabf0 100644 --- a/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash +++ b/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 2e2d93e25623761c5de39c8c94750c982335acc1c2da4439b1a2088ecd4455c9 netsurf-buildsystem-7574b41345968b5f7e9ca5875faccb1478ce0555.tar.gz +sha256 2e2d93e25623761c5de39c8c94750c982335acc1c2da4439b1a2088ecd4455c9 netsurf-buildsystem-7574b41345968b5f7e9ca5875faccb1478ce0555.tar.gz +sha256 b2ddc1d607332423f6cf415b2ac619a1c03dd565facdc39a571282a520929a65 llvm/LICENSE.TXT diff --git a/buildroot/package/netsurf/0002-fix-freetype-detection.patch b/buildroot/package/netsurf/0002-fix-freetype-detection.patch deleted file mode 100644 index 27e3a6a1d..000000000 --- a/buildroot/package/netsurf/0002-fix-freetype-detection.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 85336f2404b9583267019650ea0112ebf1bb571a Mon Sep 17 00:00:00 2001 -From: Francois Perrad -Date: Wed, 28 Nov 2018 17:59:44 +0100 -Subject: [PATCH] fix freetype detection - -Using freetype-config doesn't work well, because it's going to use the -system freetype-config instead of the one installed in the -cross-compilation sysroot. So, let's use pkg-config instead. - -Signed-off-by: Francois Perrad ---- - netsurf/frontends/framebuffer/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/netsurf/frontends/framebuffer/Makefile b/netsurf/frontends/framebuffer/Makefile -index bdedd90..249c7c4 100644 ---- a/netsurf/frontends/framebuffer/Makefile -+++ b/netsurf/frontends/framebuffer/Makefile -@@ -35,8 +35,8 @@ LDFLAGS += -Wl,--no-whole-archive - - # freetype is optional but does not use pkg-config - ifeq ($(NETSURF_FB_FONTLIB),freetype) -- CFLAGS += -DFB_USE_FREETYPE $(shell freetype-config --cflags) -- LDFLAGS += $(shell freetype-config --libs) -+ CFLAGS += -DFB_USE_FREETYPE $(shell $(PKG_CONFIG) --cflags freetype2) -+ LDFLAGS += $(shell $(PKG_CONFIG) --libs freetype2) - endif - - --- -2.17.1 - diff --git a/buildroot/package/netsurf/netsurf.hash b/buildroot/package/netsurf/netsurf.hash index 26e8c76f3..0f38ea208 100644 --- a/buildroot/package/netsurf/netsurf.hash +++ b/buildroot/package/netsurf/netsurf.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb4864d4459d6f9958dd10a3301c272ea7f5df72667a7db0aad5bc5ae06c0e10 netsurf-all-3.8.tar.gz +sha256 11e384eaf47e65c186da5001f1055a02f2d72ff17b50f403b8392546a2cf65ff netsurf-all-3.9.tar.gz sha256 55c4a7ae3953d720a462e69d1f128a20004933d12538be5314a33f8821675378 netsurf/COPYING diff --git a/buildroot/package/netsurf/netsurf.mk b/buildroot/package/netsurf/netsurf.mk index 31cf9e62b..0077adde2 100644 --- a/buildroot/package/netsurf/netsurf.mk +++ b/buildroot/package/netsurf/netsurf.mk @@ -4,13 +4,14 @@ # ################################################################################ -NETSURF_VERSION = 3.8 +NETSURF_VERSION = 3.9 NETSURF_SOURCE = netsurf-all-$(NETSURF_VERSION).tar.gz NETSURF_SITE = http://download.netsurf-browser.org/netsurf/releases/source-full NETSURF_LICENSE = GPL-2.0 NETSURF_LICENSE_FILES = netsurf/COPYING +# host-vim needed for the xxd utility NETSURF_DEPENDENCIES = expat jpeg libpng \ - host-bison host-flex host-gperf host-pkgconf + host-bison host-flex host-gperf host-pkgconf host-vim ifeq ($(BR2_PACKAGE_NETSURF_GTK),y) NETSURF_DEPENDENCIES += libgtk2 @@ -36,8 +37,8 @@ ifeq ($(BR2_PACKAGE_NETSURF_SDL),y) NETSURF_DEPENDENCIES += sdl host-libpng NETSURF_FRONTEND = framebuffer NETSURF_CONFIG = \ - HOST_CFLAGS='$(HOST_CFLAGS)' \ - HOST_LDFLAGS='$(HOST_LDFLAGS) -lpng' + BUILD_CFLAGS='$(HOST_CFLAGS)' \ + BUILD_LDFLAGS='$(HOST_LDFLAGS) -lpng' ifeq ($(BR2_PACKAGE_FREETYPE),y) NETSURF_DEPENDENCIES += freetype define NETSURF_FONTLIB_CONFIGURE_CMDS @@ -63,11 +64,23 @@ define NETSURF_CURL_CONFIGURE_CMDS endef endif +ifeq ($(BR2_PACKAGE_WEBP),y) +NETSURF_DEPENDENCIES += webp +define NETSURF_WEBP_CONFIGURE_CMDS + echo "override NETSURF_USE_WEBP := YES" >> $(@D)/netsurf/Makefile.config +endef +else +define NETSURF_WEBP_CONFIGURE_CMDS + echo "override NETSURF_USE_WEBP := NO" >> $(@D)/netsurf/Makefile.config +endef +endif + define NETSURF_CONFIGURE_CMDS $(NETSURF_ICONV_CONFIGURE_CMDS) $(NETSURF_SVG_CONFIGURE_CMDS) $(NETSURF_FONTLIB_CONFIGURE_CMDS) $(NETSURF_CURL_CONFIGURE_CMDS) + $(NETSURF_WEBP_CONFIGURE_CMDS) endef NETSURF_MAKE_ENV = \ diff --git a/buildroot/package/nettle/0001-Fix-accidental-use-of-C99-for-loop.patch b/buildroot/package/nettle/0001-Fix-accidental-use-of-C99-for-loop.patch deleted file mode 100644 index e03af7a45..000000000 --- a/buildroot/package/nettle/0001-Fix-accidental-use-of-C99-for-loop.patch +++ /dev/null @@ -1,71 +0,0 @@ -From f5a3a224bf00bef5669366d2ae23c2b2b13b8016 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niels=20M=C3=B6ller?= -Date: Wed, 26 Dec 2018 11:04:31 +0100 -Subject: [PATCH] Fix accidental use of C99 for loop. - -* rsa-sign-tr.c (sec_equal): Fix accidental use of C99 for loop. -Reported by Andreas Gustafsson. -* testsuite/rsa-sec-decrypt-test.c (test_main): Likewise. - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://git.lysator.liu.se/nettle/nettle/commit/f5a3a224bf00bef5669366d2ae23c2b2b13b8016] ---- - ChangeLog | 6 ++++++ - rsa-sign-tr.c | 3 ++- - testsuite/rsa-sec-decrypt-test.c | 3 ++- - 3 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 4c7338a1..079d0153 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,9 @@ -+2018-12-26 Niels Möller -+ -+ * rsa-sign-tr.c (sec_equal): Fix accidental use of C99 for loop. -+ Reported by Andreas Gustafsson. -+ * testsuite/rsa-sec-decrypt-test.c (test_main): Likewise. -+ - 2018-12-04 Niels Möller - - * Released nettle-3.4.1. -diff --git a/rsa-sign-tr.c b/rsa-sign-tr.c -index 59c9bd07..f824c4ca 100644 ---- a/rsa-sign-tr.c -+++ b/rsa-sign-tr.c -@@ -239,8 +239,9 @@ static int - sec_equal(const mp_limb_t *a, const mp_limb_t *b, size_t limbs) - { - volatile mp_limb_t z = 0; -+ size_t i; - -- for (size_t i = 0; i < limbs; i++) -+ for (i = 0; i < limbs; i++) - { - z |= (a[i] ^ b[i]); - } -diff --git a/testsuite/rsa-sec-decrypt-test.c b/testsuite/rsa-sec-decrypt-test.c -index 64f0b13c..fb0ed3a1 100644 ---- a/testsuite/rsa-sec-decrypt-test.c -+++ b/testsuite/rsa-sec-decrypt-test.c -@@ -68,6 +68,7 @@ test_main(void) - unsigned n_size = 1024; - mpz_t gibberish; - mpz_t garbage; -+ size_t size; - - rsa_private_key_init(&key); - rsa_public_key_init(&pub); -@@ -78,7 +79,7 @@ test_main(void) - - memset(verifybad, 'A', PAYLOAD_SIZE); - -- for (size_t size = 1; size < 51; size++) -+ for (size = 1; size < 51; size++) - { - ASSERT (rsa_generate_keypair(&pub, &key, &random_ctx, - (nettle_random_func *) knuth_lfib_random, --- -2.18.1 - diff --git a/buildroot/package/nettle/nettle.hash b/buildroot/package/nettle/nettle.hash index 32ed22c6c..1e13aab41 100644 --- a/buildroot/package/nettle/nettle.hash +++ b/buildroot/package/nettle/nettle.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/nettle/nettle-3.4.1.tar.gz.sig -sha256 f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad nettle-3.4.1.tar.gz +# https://ftp.gnu.org/gnu/nettle/nettle-3.5.1.tar.gz.sig +sha256 75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419 nettle-3.5.1.tar.gz # Locally calculated sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/buildroot/package/nettle/nettle.mk b/buildroot/package/nettle/nettle.mk index 6a1144ed3..380d16752 100644 --- a/buildroot/package/nettle/nettle.mk +++ b/buildroot/package/nettle/nettle.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETTLE_VERSION = 3.4.1 +NETTLE_VERSION = 3.5.1 NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive NETTLE_DEPENDENCIES = gmp NETTLE_INSTALL_STAGING = YES diff --git a/buildroot/package/network-manager-openvpn/Config.in b/buildroot/package/network-manager-openvpn/Config.in new file mode 100644 index 000000000..557145e94 --- /dev/null +++ b/buildroot/package/network-manager-openvpn/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_NETWORK_MANAGER_OPENVPN + bool "network-manager-openvpn" + depends on BR2_PACKAGE_NETWORK_MANAGER + depends on BR2_PACKAGE_OPENVPN + help + OpenVPN support for NetworkManager + + https://gitlab.gnome.org/GNOME/NetworkManager-openvpn diff --git a/buildroot/package/network-manager-openvpn/network-manager-openvpn.hash b/buildroot/package/network-manager-openvpn/network-manager-openvpn.hash new file mode 100644 index 000000000..0c52fb8d1 --- /dev/null +++ b/buildroot/package/network-manager-openvpn/network-manager-openvpn.hash @@ -0,0 +1,4 @@ +# From https://download.gnome.org/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.10.sha256sum +sha256 af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef NetworkManager-openvpn-1.8.10.tar.xz +# Locally computed +sha256 c39e345d992dfba62db265f8c6d6ff1d90c61d92876635ae05adbfa2f45fff46 COPYING diff --git a/buildroot/package/network-manager-openvpn/network-manager-openvpn.mk b/buildroot/package/network-manager-openvpn/network-manager-openvpn.mk new file mode 100644 index 000000000..1a872dc12 --- /dev/null +++ b/buildroot/package/network-manager-openvpn/network-manager-openvpn.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# network-manager-openvpn +# +################################################################################ + +NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.8 +NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).10 +NETWORK_MANAGER_OPENVPN_SOURCE = NetworkManager-openvpn-$(NETWORK_MANAGER_OPENVPN_VERSION).tar.xz +NETWORK_MANAGER_OPENVPN_SITE = https://download.gnome.org/sources/NetworkManager-openvpn/$(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR) +NETWORK_MANAGER_OPENVPN_DEPENDENCIES = network-manager openvpn +NETWORK_MANAGER_OPENVPN_LICENSE = GPL-2.0+ +NETWORK_MANAGER_OPENVPN_LICENSE_FILES = COPYING + +NETWORK_MANAGER_OPENVPN_CONF_OPTS = \ + --without-gnome + +define NETWORK_MANAGER_OPENVPN_USERS + nm-openvpn -1 nm-openvpn -1 * - - - Openvpn user +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/network-manager/Config.in b/buildroot/package/network-manager/Config.in index 1db6f32d3..accea923a 100644 --- a/buildroot/package/network-manager/Config.in +++ b/buildroot/package/network-manager/Config.in @@ -7,17 +7,16 @@ config BR2_PACKAGE_NETWORK_MANAGER # Tested with 3.2, but may even work with earlier versions depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_* - select BR2_PACKAGE_DHCPCD if !BR2_PACKAGE_DHCP_CLIENT + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_WCHAR # libglib2 select BR2_PACKAGE_DBUS - select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_LIBNL - select BR2_PACKAGE_LIBGUDEV select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_WPA_SUPPLICANT - select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW + select BR2_PACKAGE_WPA_SUPPLICANT_DBUS select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION select BR2_PACKAGE_READLINE select BR2_PACKAGE_LIBNDP @@ -65,8 +64,9 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS endif -comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.2, dynamic library" +comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.2, dynamic library, wchar, threads" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || \ - !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS + !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/network-manager/network-manager.hash b/buildroot/package/network-manager/network-manager.hash index f1bc5d1b0..ca8b0a2f4 100644 --- a/buildroot/package/network-manager/network-manager.hash +++ b/buildroot/package/network-manager/network-manager.hash @@ -1,4 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.10/NetworkManager-1.10.8.sha256sum -sha256 8fe9cd2c45bd661c58a91b03d8a922d6d2ab6b25bc185b2d3f050c80f427589f NetworkManager-1.16.2.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.20/NetworkManager-1.20.4.sha256sum +sha256 a3d738b7e702d9548b522a5781a5fb75ba69363f468c400ddd885ca65035914c NetworkManager-1.20.4.tar.xz # Locally computed sha256 49d9659a4f9a09747c320d51d3cf9dfde210de67b70862acf849890f6477b00d COPYING +sha256 64a6d38d1b551a1bfd8509e732cdc9202d2681b61f5b39298f488674d3466fc9 CONTRIBUTING diff --git a/buildroot/package/network-manager/network-manager.mk b/buildroot/package/network-manager/network-manager.mk index 2951f1230..727cfb98a 100644 --- a/buildroot/package/network-manager/network-manager.mk +++ b/buildroot/package/network-manager/network-manager.mk @@ -4,15 +4,18 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.16 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2 +NETWORK_MANAGER_VERSION_MAJOR = 1.20 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz -NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) +NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \ - libgcrypt wpa_supplicant util-linux host-intltool readline libndp libgudev -NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.0+ (libnm-util) -NETWORK_MANAGER_LICENSE_FILES = COPYING libnm-util/COPYING +NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ + libgcrypt wpa_supplicant util-linux host-intltool readline libndp +# Even though the COPYING file only contains the GPL-2.0 text, many +# parts of network-manager are under LGPL-2.0. See the "Legal" section +# of the CONTRIBUTING file for details. +NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.0+ (libnm) +NETWORK_MANAGER_LICENSE_FILES = COPYING CONTRIBUTING NETWORK_MANAGER_CONF_ENV = \ ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ @@ -26,11 +29,9 @@ NETWORK_MANAGER_CONF_OPTS = \ --disable-tests \ --disable-qt \ --disable-more-warnings \ - --without-docs \ --with-crypto=gnutls \ --with-iptables=/usr/sbin/iptables \ - --disable-ifupdown \ - --disable-ifnet + --disable-ifupdown ifeq ($(BR2_PACKAGE_OFONO),y) NETWORK_MANAGER_DEPENDENCIES += ofono @@ -82,30 +83,14 @@ else NETWORK_MANAGER_CONF_OPTS += --disable-ovs endif -# uClibc by default doesn't have backtrace support, so don't use it -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -NETWORK_MANAGER_CONF_OPTS += --disable-crashtrace -endif - define NETWORK_MANAGER_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/network-manager/S45network-manager $(TARGET_DIR)/etc/init.d/S45network-manager endef define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants - ln -sf /usr/lib/systemd/system/NetworkManager.service \ $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service - ln -sf /usr/lib/systemd/system/NetworkManager.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service - - ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \ - $(TARGET_DIR)/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service - - ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/newt/newt.hash b/buildroot/package/newt/newt.hash index b6fd317ce..b136d82af 100644 --- a/buildroot/package/newt/newt.hash +++ b/buildroot/package/newt/newt.hash @@ -1,2 +1,5 @@ +# From https://releases.pagure.org/newt/CHECKSUMS +sha256 265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31 newt-0.52.21.tar.gz +sha512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c newt-0.52.21.tar.gz # Locally calculated -sha256 8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc newt-0.52.20.tar.gz +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/buildroot/package/newt/newt.mk b/buildroot/package/newt/newt.mk index b6d973af7..b39acb0fc 100644 --- a/buildroot/package/newt/newt.mk +++ b/buildroot/package/newt/newt.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEWT_VERSION = 0.52.20 +NEWT_VERSION = 0.52.21 NEWT_SITE = https://pagure.io/releases/newt NEWT_INSTALL_STAGING = YES NEWT_DEPENDENCIES = popt slang $(TARGET_NLS_DEPENDENCIES) @@ -12,7 +12,6 @@ NEWT_DEPENDENCIES = popt slang $(TARGET_NLS_DEPENDENCIES) # library, and does not link against libintl. NEWT_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) NEWT_CONF_OPTS = --without-python --without-tcl -NEWT_MAKE = $(MAKE1) NEWT_LICENSE = GPL-2.0 NEWT_LICENSE_FILES = COPYING diff --git a/buildroot/package/nfacct/nfacct.hash b/buildroot/package/nfacct/nfacct.hash index 737354ef3..d6c05e16d 100644 --- a/buildroot/package/nfacct/nfacct.hash +++ b/buildroot/package/nfacct/nfacct.hash @@ -1,3 +1,5 @@ # From ftp://ftp.netfilter.org/pub/nfacct/nfacct-1.0.2.tar.bz2.{md5sum,sha1sum} md5 94faafdaaed85ca9220c5692be8a408e nfacct-1.0.2.tar.bz2 sha1 17d6576778227ea93c62600d9b18ff4932963c6a nfacct-1.0.2.tar.bz2 +# Locally computed +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/nfs-utils/0001-Patch-taken-from-Gentoo.patch b/buildroot/package/nfs-utils/0001-Patch-taken-from-Gentoo.patch deleted file mode 100644 index 47bf9db40..000000000 --- a/buildroot/package/nfs-utils/0001-Patch-taken-from-Gentoo.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5796ca01e33596d4102dd714349c908fecc331c0 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sat, 10 Nov 2012 18:56:12 +0100 -Subject: [PATCH] Patch taken from Gentoo - -Signed-off-by: Gustavo Zacarias ---- - tools/locktest/Makefile.am | 7 +++---- - tools/rpcgen/Makefile.am | 8 +++----- - 2 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am -index 3156815..efe6fcd 100644 ---- a/tools/locktest/Makefile.am -+++ b/tools/locktest/Makefile.am -@@ -1,12 +1,11 @@ - ## Process this file with automake to produce Makefile.in - - CC=$(CC_FOR_BUILD) --LIBTOOL = @LIBTOOL@ --tag=CC -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) - - noinst_PROGRAMS = testlk - testlk_SOURCES = testlk.c --testlk_CFLAGS=$(CFLAGS_FOR_BUILD) --testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) --testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD) - - MAINTAINERCLEANFILES = Makefile.in -diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am -index 8a9ec89..5a5b4d3 100644 ---- a/tools/rpcgen/Makefile.am -+++ b/tools/rpcgen/Makefile.am -@@ -1,7 +1,9 @@ - ## Process this file with automake to produce Makefile.in - - CC=$(CC_FOR_BUILD) --LIBTOOL = @LIBTOOL@ --tag=CC -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) - - noinst_PROGRAMS = rpcgen - rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \ -@@ -9,10 +11,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \ - rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \ - rpc_scan.h rpc_util.h - --rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD) --rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD) --rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD) --rpcgen_LDADD=$(LIBTIRPC) - - MAINTAINERCLEANFILES = Makefile.in - --- -2.1.0 - diff --git a/buildroot/package/nfs-utils/0002-Switch-legacy-index-in-favour-of-strchr.patch b/buildroot/package/nfs-utils/0002-Switch-legacy-index-in-favour-of-strchr.patch deleted file mode 100644 index 655d53425..000000000 --- a/buildroot/package/nfs-utils/0002-Switch-legacy-index-in-favour-of-strchr.patch +++ /dev/null @@ -1,72 +0,0 @@ -From a1d45736286939b822fcc7b9c74843f6f90a747e Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sat, 10 Nov 2012 18:58:15 +0100 -Subject: [PATCH] Switch legacy index() in favour of strchr() Updated for 1.2.6 - from the previous patch by Frederik Pasch. - -Signed-off-by: Gustavo Zacarias ---- - support/nfs/nfs_mntent.c | 6 +++--- - utils/mount/error.c | 2 +- - utils/mountd/fsloc.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/support/nfs/nfs_mntent.c b/support/nfs/nfs_mntent.c -index a2118a2..7496ed6 100644 ---- a/support/nfs/nfs_mntent.c -+++ b/support/nfs/nfs_mntent.c -@@ -9,7 +9,7 @@ - */ - - #include --#include /* for index */ -+#include /* for strchr */ - #include /* for isdigit */ - #include /* for umask */ - #include /* for ftruncate */ -@@ -172,7 +172,7 @@ nfs_getmntent (mntFILE *mfp) { - return NULL; - - mfp->mntent_lineno++; -- s = index (buf, '\n'); -+ s = strchr (buf, '\n'); - if (s == NULL) { - /* Missing final newline? Otherwise extremely */ - /* long line - assume file was corrupted */ -@@ -180,7 +180,7 @@ nfs_getmntent (mntFILE *mfp) { - fprintf(stderr, _("[mntent]: warning: no final " - "newline at the end of %s\n"), - mfp->mntent_file); -- s = index (buf, 0); -+ s = strchr (buf, 0); - } else { - mfp->mntent_errs = 1; - goto err; -diff --git a/utils/mount/error.c b/utils/mount/error.c -index e06f598..7bd1d27 100644 ---- a/utils/mount/error.c -+++ b/utils/mount/error.c -@@ -62,7 +62,7 @@ static int rpc_strerror(int spos) - char *tmp; - - if (estr) { -- if ((ptr = index(estr, ':'))) -+ if ((ptr = strchr(estr, ':'))) - estr = ++ptr; - - tmp = &errbuf[spos]; -diff --git a/utils/mountd/fsloc.c b/utils/mountd/fsloc.c -index bc737d1..ddbe92f 100644 ---- a/utils/mountd/fsloc.c -+++ b/utils/mountd/fsloc.c -@@ -127,7 +127,7 @@ static struct servers *method_list(char *data) - bool v6esc = false; - - xlog(L_NOTICE, "method_list(%s)", data); -- for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++) -+ for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++) - ptr++; - list = malloc(listsize * sizeof(char *)); - copy = strdup(data); --- -2.1.0 diff --git a/buildroot/package/nfs-utils/0003-Let-the-configure-script-find-getrpcbynumber-in-libt.patch b/buildroot/package/nfs-utils/0003-Let-the-configure-script-find-getrpcbynumber-in-libt.patch deleted file mode 100644 index dca44f6db..000000000 --- a/buildroot/package/nfs-utils/0003-Let-the-configure-script-find-getrpcbynumber-in-libt.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 87f88b28ac01b6449463f00b660fe7416d7f9a55 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 10 Nov 2012 18:53:03 +0100 -Subject: [PATCH] Let the configure script find getrpcbynumber in libtirpc - -The getrpcbynumber() function may not be available in the C library, -but only in the libtirpc library. Take this into account when checking -for the existence of getrpcbynumber() and getrpcbynumber_r(). - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8e427e3..6e42c96 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -433,11 +433,23 @@ AC_FUNC_STAT - AC_FUNC_VPRINTF - AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \ - gethostbyaddr gethostbyname gethostname getmntent \ -- getnameinfo getrpcbyname getrpcbynumber getrpcbynumber_r getifaddrs \ -+ getnameinfo getrpcbyname getifaddrs \ - gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \ - ppoll realpath rmdir select socket strcasecmp strchr strdup \ - strerror strrchr strtol strtoul sigprocmask name_to_handle_at]) - -+save_CFLAGS=$CFLAGS -+save_LIBS=$LIBS -+CFLAGS="$CFLAGS $AM_CPPFLAGS" -+LIBS="$LIBS $LIBTIRPC" -+AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r]) -+CFLAGS=$save_CFLAGS -+LIBS=$save_LIBS -+ -+if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then -+ AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available]) -+fi -+ - dnl ************************************************************* - dnl Check for data sizes - dnl ************************************************************* --- -2.1.0 - diff --git a/buildroot/package/nfs-utils/0004-mountd-Add-check-for-struct-file_handle.patch b/buildroot/package/nfs-utils/0004-mountd-Add-check-for-struct-file_handle.patch deleted file mode 100644 index 7aca26697..000000000 --- a/buildroot/package/nfs-utils/0004-mountd-Add-check-for-struct-file_handle.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3c23b3ea7f5069e8fd4d5758704cd968504f1079 Mon Sep 17 00:00:00 2001 -From: Maxime Hadjinlian -Date: Tue, 2 Feb 2016 10:07:22 +0100 -Subject: [PATCH] mountd: Add check for 'struct file_handle' - -The code to check if name_to_handle_at() is implemented generates only a -warning but with some toolchain it doesn't fail to link (the function must be -implemented somewhere). -However the "struct file_handle" type is not available. - -So, this patch adds a check for this struct. - -Signed-off-by: Maxime Hadjinlian ---- - configure.ac | 1 + - utils/mountd/cache.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 25d2ba4..913a86f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -425,6 +425,7 @@ AC_TYPE_PID_T - AC_TYPE_SIZE_T - AC_HEADER_TIME - AC_STRUCT_TM -+AC_CHECK_TYPES([struct file_handle]) - - dnl ************************************************************* - dnl Check for functions -diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c -index 7847446..dc64f6d 100644 ---- a/utils/mountd/cache.c -+++ b/utils/mountd/cache.c -@@ -424,7 +424,7 @@ static int same_path(char *child, char *parent, int len) - if (count_slashes(p) != count_slashes(parent)) - return 0; - --#if HAVE_NAME_TO_HANDLE_AT -+#if defined(HAVE_NAME_TO_HANDLE_AT) && defined(HAVE_STRUCT_FILE_HANDLE) - struct { - struct file_handle fh; - unsigned char handle[128]; --- -2.7.0 - diff --git a/buildroot/package/nfs-utils/0005-nfs-utils-add-missing-include-of-stdint.h.patch b/buildroot/package/nfs-utils/0005-nfs-utils-add-missing-include-of-stdint.h.patch deleted file mode 100644 index a6214350c..000000000 --- a/buildroot/package/nfs-utils/0005-nfs-utils-add-missing-include-of-stdint.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b3ff26fa182b34b6faa1317f18a9dac4c7963334 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Mon, 2 Oct 2017 09:57:15 -0500 -Subject: [PATCH] nfs-utils: add missing include of stdint.h - -Glibc bump to 2.26 exposed this missing header when building -with the following combination using an i386 internal toolchain. -gcc5.4.0 -bin2.28.1 -linux4.1.43 - -Upstream: https://bugzilla.linux-nfs.org/show_bug.cgi?id=312 - -Signed-off-by: Matthew Weber ---- - support/nsm/rpc.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/support/nsm/rpc.c b/support/nsm/rpc.c -index 4e5f40e..d91c6ea 100644 ---- a/support/nsm/rpc.c -+++ b/support/nsm/rpc.c -@@ -40,6 +40,7 @@ - - #include - #include -+#include - #include - #include - #include --- -1.9.1 - diff --git a/buildroot/package/nfs-utils/0006-Include-sys-sysmacros.h-where-appropriate.patch b/buildroot/package/nfs-utils/0006-Include-sys-sysmacros.h-where-appropriate.patch deleted file mode 100644 index a593ca3b6..000000000 --- a/buildroot/package/nfs-utils/0006-Include-sys-sysmacros.h-where-appropriate.patch +++ /dev/null @@ -1,50 +0,0 @@ -From e3918d70b0b4a1d0f5421318e542ec807833da3f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 2 Nov 2018 10:45:21 +0100 -Subject: [PATCH] Include where appropriate - -Since glibc 2.28, the major() and minor() macros need to explicitly -include . - -Patch initially contributed by -Timothy Pearson . - -Signed-off-by: Thomas Petazzoni ---- - support/nfs/nfsexport.c | 4 ++++ - utils/mountd/cache.c | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/support/nfs/nfsexport.c b/support/nfs/nfsexport.c -index afd7c90..a7cbc14 100644 ---- a/support/nfs/nfsexport.c -+++ b/support/nfs/nfsexport.c -@@ -17,6 +17,10 @@ - #include - #include - -+#ifdef __GLIBC__ -+#include -+#endif -+ - #include "nfslib.h" - #include "misc.h" - -diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c -index 179ea18..61f9b14 100644 ---- a/utils/mountd/cache.c -+++ b/utils/mountd/cache.c -@@ -36,6 +36,10 @@ - #include "blkid/blkid.h" - #endif - -+#ifdef __GLIBC__ -+#include -+#endif -+ - /* - * Invoked by RPC service loop - */ --- -2.14.4 - diff --git a/buildroot/package/nfs-utils/Config.in b/buildroot/package/nfs-utils/Config.in index 4b0eb1510..cfca03401 100644 --- a/buildroot/package/nfs-utils/Config.in +++ b/buildroot/package/nfs-utils/Config.in @@ -25,6 +25,12 @@ config BR2_PACKAGE_NFS_UTILS_RPC_LOCKD help NFS lock manager for Linux kernels older than 2.4 +config BR2_PACKAGE_NFS_UTILS_RPC_NFSD + bool "rpc.nfsd" + default y + help + NFS server + config BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD bool "rpc.rquotad" help diff --git a/buildroot/package/nfs-utils/nfs-utils.hash b/buildroot/package/nfs-utils/nfs-utils.hash index 2bd512118..a30013af9 100644 --- a/buildroot/package/nfs-utils/nfs-utils.hash +++ b/buildroot/package/nfs-utils/nfs-utils.hash @@ -1,2 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/1.3.3/sha256sums.asc -sha256 700d689c5622c87953c34102e5befafc4d3c811e676852238f0dd79c9c0c084d nfs-utils-1.3.3.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.4.3/sha256sums.asc +sha256 af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599 nfs-utils-2.4.3.tar.xz +# Locally computed +sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/buildroot/package/nfs-utils/nfs-utils.mk b/buildroot/package/nfs-utils/nfs-utils.mk index 9ae02c003..7af229a57 100644 --- a/buildroot/package/nfs-utils/nfs-utils.mk +++ b/buildroot/package/nfs-utils/nfs-utils.mk @@ -4,13 +4,12 @@ # ################################################################################ -NFS_UTILS_VERSION = 1.3.3 +NFS_UTILS_VERSION = 2.4.3 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ NFS_UTILS_LICENSE_FILES = COPYING -NFS_UTILS_AUTORECONF = YES -NFS_UTILS_DEPENDENCIES = host-pkgconf libtirpc +NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libtirpc NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no @@ -23,7 +22,7 @@ NFS_UTILS_CONF_OPTS = \ --enable-ipv6 \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ - --with-rpcgen=internal + --with-rpcgen=$(HOST_DIR)/bin/rpcgen HOST_NFS_UTILS_CONF_OPTS = \ --disable-nfsv4 \ @@ -42,6 +41,8 @@ HOST_NFS_UTILS_DEPENDENCIES = host-pkgconf host-libtirpc NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad +NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_NFSD) += usr/sbin/exportfs \ + usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service ifeq ($(BR2_PACKAGE_LIBCAP),y) NFS_UTILS_CONF_OPTS += --enable-caps @@ -65,26 +66,17 @@ else NFS_UTILS_CONF_OPTS += --without-systemd endif +ifeq ($(BR2_PACKAGE_NFS_UTILS_RPC_NFSD),y) define NFS_UTILS_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/nfs-utils/S60nfs \ $(TARGET_DIR)/etc/init.d/S60nfs endef +endif + define NFS_UTILS_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/nfs-server.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-server.service - ln -fs ../../../../usr/lib/systemd/system/nfs-client.target \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-client.target - - mkdir -p $(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants - - ln -fs ../../../../usr/lib/systemd/system/nfs-client.target \ - $(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants/nfs-client.target - $(INSTALL) -D -m 0755 package/nfs-utils/nfs-utils_env.sh \ - $(TARGET_DIR)/usr/lib/systemd/scripts/nfs-utils_env.sh + $(TARGET_DIR)/usr/libexec/nfs-utils/nfs-utils_env.sh $(INSTALL) -D -m 0644 package/nfs-utils/nfs-utils_tmpfiles.conf \ $(TARGET_DIR)/usr/lib/tmpfiles.d/nfs-utils.conf diff --git a/buildroot/package/nftables/nftables.hash b/buildroot/package/nftables/nftables.hash index a0e0d5e77..93c816edc 100644 --- a/buildroot/package/nftables/nftables.hash +++ b/buildroot/package/nftables/nftables.hash @@ -1,3 +1,3 @@ # From https://netfilter.org/projects/nftables/downloads.html -sha256 ad8181b5fcb9ca572f444bed54018749588522ee97e4c21922648bb78d7e7e91 nftables-0.9.0.tar.bz2 +sha256 956b915ce2a7aeaff123e49006be7a0690a0964e96c062703181a36e2e5edb78 nftables-0.9.3.tar.bz2 sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING diff --git a/buildroot/package/nftables/nftables.mk b/buildroot/package/nftables/nftables.mk index 9f12e42c5..210e950c1 100644 --- a/buildroot/package/nftables/nftables.mk +++ b/buildroot/package/nftables/nftables.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFTABLES_VERSION = 0.9.0 +NFTABLES_VERSION = 0.9.3 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \ @@ -27,6 +27,13 @@ else NFTABLES_CONF_OPTS += --without-json endif +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +NFTABLES_CONF_OPTS += --enable-python +NFTABLES_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +else +NFTABLES_CONF_OPTS += --disable-python +endif + ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy) NFTABLES_LIBS += -ljansson -lm endif diff --git a/buildroot/package/nginx-dav-ext/nginx-dav-ext.hash b/buildroot/package/nginx-dav-ext/nginx-dav-ext.hash index a711f8c6f..fbed87f0c 100644 --- a/buildroot/package/nginx-dav-ext/nginx-dav-ext.hash +++ b/buildroot/package/nginx-dav-ext/nginx-dav-ext.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6b004eed8ea16ad8de4d304027bf0413cc323a95914e58625a7dc066481aae3a nginx-dav-ext-v0.1.0.tar.gz +sha256 6b004eed8ea16ad8de4d304027bf0413cc323a95914e58625a7dc066481aae3a nginx-dav-ext-0.1.0.tar.gz sha256 40581cf424621965adaf1461e97129520ff4fcfb62ed9965ec6fd50b7f4ddfca LICENSE diff --git a/buildroot/package/nginx-dav-ext/nginx-dav-ext.mk b/buildroot/package/nginx-dav-ext/nginx-dav-ext.mk index 436bc295a..695287ee2 100644 --- a/buildroot/package/nginx-dav-ext/nginx-dav-ext.mk +++ b/buildroot/package/nginx-dav-ext/nginx-dav-ext.mk @@ -4,8 +4,8 @@ # ################################################################################ -NGINX_DAV_EXT_VERSION = v0.1.0 -NGINX_DAV_EXT_SITE = $(call github,arut,nginx-dav-ext-module,$(NGINX_DAV_EXT_VERSION)) +NGINX_DAV_EXT_VERSION = 0.1.0 +NGINX_DAV_EXT_SITE = $(call github,arut,nginx-dav-ext-module,v$(NGINX_DAV_EXT_VERSION)) NGINX_DAV_EXT_LICENSE = BSD-2-Clause NGINX_DAV_EXT_LICENSE_FILES = LICENSE NGINX_DAV_EXT_DEPENDENCIES = expat diff --git a/buildroot/package/nginx-modsecurity/Config.in b/buildroot/package/nginx-modsecurity/Config.in new file mode 100644 index 000000000..2af11eeee --- /dev/null +++ b/buildroot/package/nginx-modsecurity/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_NGINX_MODSECURITY + bool "nginx-modsecurity" + depends on BR2_PACKAGE_NGINX_HTTP + depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity + depends on !BR2_STATIC_LIBS # libmodsecurity + depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity + select BR2_PACKAGE_PCRE # libmodsecurity + select BR2_PACKAGE_LIBMODSECURITY + help + The ModSecurity-nginx connector is the connection + point between nginx and libmodsecurity + (ModSecurity v3). + + https://github.com/SpiderLabs/ModSecurity-nginx + +comment "nginx-modsecurity needs a toolchain w/ C++, dynamic library, threads" + depends on BR2_PACKAGE_NGINX_HTTP + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/nginx-modsecurity/nginx-modsecurity.hash b/buildroot/package/nginx-modsecurity/nginx-modsecurity.hash new file mode 100644 index 000000000..d2dd266ac --- /dev/null +++ b/buildroot/package/nginx-modsecurity/nginx-modsecurity.hash @@ -0,0 +1,4 @@ +# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.1/modsecurity-nginx-v1.0.1.tar.gz.sha256 +sha256 def45a8db5bc9da14765eda75363457209a86c89538ccf5bfbd3aa02fa10833c modsecurity-nginx-v1.0.1.tar.gz +# Localy calculated +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/buildroot/package/nginx-modsecurity/nginx-modsecurity.mk b/buildroot/package/nginx-modsecurity/nginx-modsecurity.mk new file mode 100644 index 000000000..6d33403d6 --- /dev/null +++ b/buildroot/package/nginx-modsecurity/nginx-modsecurity.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# nginx-modsecurity +# +################################################################################ + +NGINX_MODSECURITY_VERSION = 1.0.1 +NGINX_MODSECURITY_SOURCE = modsecurity-nginx-v$(NGINX_MODSECURITY_VERSION).tar.gz +NGINX_MODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v$(NGINX_MODSECURITY_VERSION) +NGINX_MODSECURITY_LICENSE = Apache-2.0 +NGINX_MODSECURITY_LICENSE_FILES = LICENSE +NGINX_MODSECURITY_DEPENDENCIES = libmodsecurity + +$(eval $(generic-package)) diff --git a/buildroot/package/nginx-naxsi/nginx-naxsi.hash b/buildroot/package/nginx-naxsi/nginx-naxsi.hash index 55fc4f146..1f289c56c 100644 --- a/buildroot/package/nginx-naxsi/nginx-naxsi.hash +++ b/buildroot/package/nginx-naxsi/nginx-naxsi.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 0b3c95d250772dc89ad8b49e47c1e024c5ae2c76c0cffa445e9fe05c4dd13495 nginx-naxsi-0.55.3.tar.gz +sha256 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4 nginx-naxsi-0.56.tar.gz +sha256 046812ddc8f250f85b5d6e04218c185849c618b309271ef9d8b01e92c6f7a6ac naxsi_src/naxsi_json.c diff --git a/buildroot/package/nginx-naxsi/nginx-naxsi.mk b/buildroot/package/nginx-naxsi/nginx-naxsi.mk index 491d51836..7cfa94a5d 100644 --- a/buildroot/package/nginx-naxsi/nginx-naxsi.mk +++ b/buildroot/package/nginx-naxsi/nginx-naxsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_NAXSI_VERSION = 0.55.3 +NGINX_NAXSI_VERSION = 0.56 NGINX_NAXSI_SITE = $(call github,nbs-system,naxsi,$(NGINX_NAXSI_VERSION)) NGINX_NAXSI_LICENSE = GPL-2.0+ with OpenSSL exception NGINX_NAXSI_LICENSE_FILES = naxsi_src/naxsi_json.c diff --git a/buildroot/package/nginx-upload/nginx-upload.hash b/buildroot/package/nginx-upload/nginx-upload.hash index 3a8dfeddf..ac04626eb 100644 --- a/buildroot/package/nginx-upload/nginx-upload.hash +++ b/buildroot/package/nginx-upload/nginx-upload.hash @@ -1,2 +1,3 @@ #Locally Computed: -sha256 5f1c3c2b9858b9cacd877a0f2df9b9263734e9cef8d837b73f0e659c0f7fde2d nginx-upload-70bee48f1811eecd255ed094ce9f0fb560c390c3.tar.gz +sha256 5f1c3c2b9858b9cacd877a0f2df9b9263734e9cef8d837b73f0e659c0f7fde2d nginx-upload-70bee48f1811eecd255ed094ce9f0fb560c390c3.tar.gz +sha256 825f9684c427e29fd1ab085d5c421a4cbf96a460f3c58884a42c28bfbac5e544 LICENCE diff --git a/buildroot/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch b/buildroot/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch index 5b1a50b26..332cb85bb 100644 --- a/buildroot/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch +++ b/buildroot/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch @@ -15,7 +15,7 @@ Refresh for 1.8.0. Signed-off-by: Danomi Manchego [martin@barkynet.com: Updated for 1.10.0] Signed-off-by: Martin Bark -Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett Refresh for 1.12.0 --- auto/types/sizeof | 37 ++++++++++++++++++++++++++++--------- diff --git a/buildroot/package/nginx/nginx.hash b/buildroot/package/nginx/nginx.hash index 4df7906ee..8c5b80f80 100644 --- a/buildroot/package/nginx/nginx.hash +++ b/buildroot/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b nginx-1.16.1.tar.gz +sha256 b62756842807e5693b794e5d0ae289bd8ae5b098e66538b2a91eb80f25c591ff nginx-1.17.7.tar.gz # License files, locally calculated sha256 28ad30e2f64bd89ac1287b4606906bb99ed04d9f4e13fb6564a0be9c8a23f509 LICENSE diff --git a/buildroot/package/nginx/nginx.mk b/buildroot/package/nginx/nginx.mk index 08adcaec5..5c828d3bb 100644 --- a/buildroot/package/nginx/nginx.mk +++ b/buildroot/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.16.1 +NGINX_VERSION = 1.17.7 NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE @@ -250,6 +250,11 @@ NGINX_DEPENDENCIES += nginx-naxsi NGINX_CONF_OPTS += --add-module=$(NGINX_NAXSI_DIR)/naxsi_src endif +ifeq ($(BR2_PACKAGE_NGINX_MODSECURITY),y) +NGINX_DEPENDENCIES += nginx-modsecurity +NGINX_CONF_OPTS += --add-module=$(NGINX_MODSECURITY_DIR) +endif + # Debug logging NGINX_CONF_OPTS += $(if $(BR2_PACKAGE_NGINX_DEBUG),--with-debug) @@ -281,11 +286,6 @@ endef define NGINX_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/nginx/nginx.service \ $(TARGET_DIR)/usr/lib/systemd/system/nginx.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/nginx.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nginx.service endef define NGINX_INSTALL_INIT_SYSV diff --git a/buildroot/package/ngircd/0001-Fix-Get_error-usage.patch b/buildroot/package/ngircd/0001-Fix-Get_error-usage.patch deleted file mode 100644 index 3724e46d8..000000000 --- a/buildroot/package/ngircd/0001-Fix-Get_error-usage.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 543f44bff8d56785dc13a74a14d4eaa96465bf05 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Wed, 13 Sep 2017 14:07:11 +0200 -Subject: [PATCH] Fix Get_error usage - -The usage of Get_Error is guarded by "ifdef h_errno" in this file, the -definition of this function should follow the same rules. - -Fixes a build error when cross-compiling: -https://github.com/ngircd/ngircd/issues/223 - -Patch sent upstream: https://github.com/ngircd/ngircd/pull/240 - -Signed-off-by: Bernd Kuhls ---- - src/ngircd/resolve.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c -index 32791901..e1903254 100644 ---- a/src/ngircd/resolve.c -+++ b/src/ngircd/resolve.c -@@ -108,9 +108,7 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short)) - return false; - } /* Resolve_Name */ - -- --#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO) --#if !defined(WANT_IPV6) && defined(h_errno) -+#ifdef h_errno - static char * - Get_Error( int H_Error ) - { -@@ -128,7 +126,6 @@ Get_Error( int H_Error ) - return "unknown error"; - } - #endif --#endif - - - /* Do "IDENT" (aka "AUTH") lookup and append result to resolved_addr array */ --- -2.11.0 - diff --git a/buildroot/package/ngircd/ngircd.hash b/buildroot/package/ngircd/ngircd.hash index 128867bfd..3772bd6c1 100644 --- a/buildroot/package/ngircd/ngircd.hash +++ b/buildroot/package/ngircd/ngircd.hash @@ -1,2 +1,3 @@ # Locally calculated after checking pgp signature -sha256 173fa0ea10788a8ba08ef2f7e64ea8951d7c88862e744128c8b87bae424b1008 ngircd-24.tar.xz +sha256 c4997cae3e3dd6ff6a605ca274268f2b8c9ba0b1a96792c7402e5594222eee4e ngircd-25.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/ngircd/ngircd.mk b/buildroot/package/ngircd/ngircd.mk index 9b330fab5..5fa86afdd 100644 --- a/buildroot/package/ngircd/ngircd.mk +++ b/buildroot/package/ngircd/ngircd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGIRCD_VERSION = 24 +NGIRCD_VERSION = 25 NGIRCD_SOURCE = ngircd-$(NGIRCD_VERSION).tar.xz NGIRCD_SITE = https://arthur.barton.de/pub/ngircd NGIRCD_LICENSE = GPL-2.0+ diff --git a/buildroot/package/ngrep/ngrep.hash b/buildroot/package/ngrep/ngrep.hash index bf9e621a8..7dd13b3b6 100644 --- a/buildroot/package/ngrep/ngrep.hash +++ b/buildroot/package/ngrep/ngrep.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dc4dbe20991cc36bac5e97e99475e2a1522fd88c59ee2e08f813432c04c5fff3 ngrep-1_47.tar.gz +sha256 dc4dbe20991cc36bac5e97e99475e2a1522fd88c59ee2e08f813432c04c5fff3 ngrep-1.47.tar.gz sha256 d46e593e048e0b9fc803561ed4c283f37a2d5447e4dcfa10cad29b394c2b8b9e LICENSE diff --git a/buildroot/package/ngrep/ngrep.mk b/buildroot/package/ngrep/ngrep.mk index d17792cda..c4750f750 100644 --- a/buildroot/package/ngrep/ngrep.mk +++ b/buildroot/package/ngrep/ngrep.mk @@ -4,8 +4,8 @@ # ################################################################################ -NGREP_VERSION = 1_47 -NGREP_SITE = $(call github,jpr5,ngrep,V$(NGREP_VERSION)) +NGREP_VERSION = 1.47 +NGREP_SITE = $(call github,jpr5,ngrep,$(subst .,_,V$(NGREP_VERSION))) NGREP_LICENSE = BSD-4-Clause-like, BSD-3-Clause (tcpkill) NGREP_LICENSE_FILES = LICENSE NGREP_INSTALL_STAGING = YES diff --git a/buildroot/package/nilfs-utils/0001-nilfs-utils-use-_POSIX_MAX_INPUT.patch b/buildroot/package/nilfs-utils/0001-nilfs-utils-use-_POSIX_MAX_INPUT.patch deleted file mode 100644 index f14079a5c..000000000 --- a/buildroot/package/nilfs-utils/0001-nilfs-utils-use-_POSIX_MAX_INPUT.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c6e5a79b130ac33093c36f972be49454f506be7e Mon Sep 17 00:00:00 2001 -From: Kurt Van Dijck -Date: Thu, 28 Dec 2017 20:06:38 +0100 -Subject: [PATCH] nilfs-utils: use _POSIX_MAX_INPUT - -musl does provide _POSIX_MAX_INPUT, but no MAX_INPUT out of the box. -This commit assigns _POSIX_MAX_INPUT to MAX_INPUT. - -Signed-off-by: Kurt Van Dijck ---- - bin/rmcp.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/bin/rmcp.c b/bin/rmcp.c -index 0140f56..6773912 100644 ---- a/bin/rmcp.c -+++ b/bin/rmcp.c -@@ -47,6 +47,11 @@ - #include - #endif /* HAVE_LIMITS_H */ - -+/* define MAX_INPUT for musl */ -+#ifndef MAX_INPUT -+#define MAX_INPUT _POSIX_MAX_INPUT -+#endif -+ - #include - #include "nilfs.h" - #include "parser.h" --- -1.8.5.rc3 - diff --git a/buildroot/package/nilfs-utils/0002-nilfs_cleanerd-link-dynamically.patch b/buildroot/package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch similarity index 100% rename from buildroot/package/nilfs-utils/0002-nilfs_cleanerd-link-dynamically.patch rename to buildroot/package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch diff --git a/buildroot/package/nilfs-utils/0003-mount.nilfs-drop-include-rpc-types.h.patch b/buildroot/package/nilfs-utils/0003-mount.nilfs-drop-include-rpc-types.h.patch deleted file mode 100644 index 9d54c40fc..000000000 --- a/buildroot/package/nilfs-utils/0003-mount.nilfs-drop-include-rpc-types.h.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a924a05ea6fd8c5284983a09d1ea8993124b6b77 Mon Sep 17 00:00:00 2001 -From: Kurt Van Dijck -Date: Thu, 28 Dec 2017 20:26:09 +0100 -Subject: [PATCH] mount.nilfs: drop include rpc/types.h - -rpc/types.h does not exist on low-footprint musl toolchains, -and is only required for the boolean types, which musl provides -elsewhere. -This commit drops the include completely. - -Signed-off-by: Kurt Van Dijck ---- - sbin/mount/sundries.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/sbin/mount/sundries.h b/sbin/mount/sundries.h -index b3064a7..94d8ce4 100644 ---- a/sbin/mount/sundries.h -+++ b/sbin/mount/sundries.h -@@ -15,9 +15,6 @@ - #include - #include - #include --#if !defined(bool_t) && !defined(__GLIBC__) --#include --#endif - - extern int mount_quiet; - --- -1.8.5.rc3 - diff --git a/buildroot/package/nilfs-utils/0004-autoconf-use-PKG_CHECK_MODULES-for-libmount-and-libb.patch b/buildroot/package/nilfs-utils/0004-autoconf-use-PKG_CHECK_MODULES-for-libmount-and-libb.patch deleted file mode 100644 index 49cdd2661..000000000 --- a/buildroot/package/nilfs-utils/0004-autoconf-use-PKG_CHECK_MODULES-for-libmount-and-libb.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 65ce9b4817544734770e410c5c2779065152f991 Mon Sep 17 00:00:00 2001 -From: Kurt Van Dijck -Date: Thu, 4 Jan 2018 09:47:45 +0100 -Subject: [PATCH] autoconf: use PKG_CHECK_MODULES for libmount and libblkid - -The dependencies of libmount to libblkid and libblkid to libuuid -were not handled correctly, and only work for the shared object scenario. -This commit switches the autoconfiguration to use PKG_CHECK_MODULES -which handles the static vs. dynamic case. -This commit has been compile-tested using buildroot on different compilers, -including static & dynamic ones - -Signed-off-by: Kurt Van Dijck ---- - configure.ac | 13 +++---------- - sbin/mkfs/Makefile.am | 4 ++-- - sbin/mkfs/mkfs.c | 6 +++--- - sbin/mount/Makefile.am | 4 ++-- - sbin/mount/mount_libmount.c | 4 +--- - sbin/mount/umount_libmount.c | 4 +--- - 6 files changed, 12 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6fa8c41..3e31e55 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -104,13 +104,10 @@ AC_CHECK_HEADERS([ctype.h err.h fcntl.h grp.h libintl.h limits.h \ - - # Check for conditional libraries and headers. - if test "${with_libmount}" = "yes"; then -- AC_CHECK_LIB(mount, mnt_context_do_mount, [LIB_MOUNT="-lmount"], -- AC_MSG_ERROR([Mount library is enabled but libmount not found])) -- AC_CHECK_HEADERS([libmount/libmount.h]) -+ PKG_CHECK_MODULES([MOUNT], [mount]) - with_selinux=no - fi - AM_CONDITIONAL(CONFIG_LIBMOUNT, [test "$with_libmount" = "yes"]) --AC_SUBST(LIB_MOUNT) - - if test "${with_selinux}" = "yes"; then - AC_CHECK_LIB(selinux, getprevcon, -@@ -125,15 +122,11 @@ fi - AC_SUBST([LIB_SELINUX]) - - if test "${with_blkid}" = "yes"; then -- AC_CHECK_LIB(blkid, blkid_new_probe_from_filename, -+ PKG_CHECK_MODULES([BLKID], [blkid], - [AC_DEFINE(HAVE_LIBBLKID, 1, - [Define to 1 if you have the 'blkid' library (-lblkid).]) -- LIB_BLKID="-lblkid" -- ], -- AC_MSG_ERROR([BLKID library not found])) -- AC_CHECK_HEADERS([blkid/blkid.h]) -+ ]) - fi --AC_SUBST(LIB_BLKID) - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST -diff --git a/sbin/mkfs/Makefile.am b/sbin/mkfs/Makefile.am -index 28f5128..408c976 100644 ---- a/sbin/mkfs/Makefile.am -+++ b/sbin/mkfs/Makefile.am -@@ -1,8 +1,8 @@ - ## Makefile.am - --AM_CFLAGS = -Wall -+AM_CFLAGS = -Wall $(BLKID_CFLAGS) - AM_CPPFLAGS = -I$(top_srcdir)/include --LDADD = -luuid $(LIB_BLKID) $(top_builddir)/lib/libnilfsfeature.la \ -+LDADD = -luuid $(BLKID_LIBS) $(top_builddir)/lib/libnilfsfeature.la \ - $(top_builddir)/lib/libmountchk.la \ - $(top_builddir)/lib/libcrc32.la - -diff --git a/sbin/mkfs/mkfs.c b/sbin/mkfs/mkfs.c -index d7f161e..0c45d6a 100644 ---- a/sbin/mkfs/mkfs.c -+++ b/sbin/mkfs/mkfs.c -@@ -66,9 +66,9 @@ - - #include - --#if HAVE_BLKID_BLKID_H --#include --#endif /* HAVE_BLKID_BLKID_H */ -+#if HAVE_LIBBLKID -+#include -+#endif /* HAVE_LIBBLKID */ - - #include "nilfs.h" - #include "util.h" -diff --git a/sbin/mount/Makefile.am b/sbin/mount/Makefile.am -index f5d3c27..9554aa5 100644 ---- a/sbin/mount/Makefile.am -+++ b/sbin/mount/Makefile.am -@@ -6,10 +6,10 @@ COMMONHEADERS = mount.nilfs2.h sundries.h xmalloc.h - LEGACYSOURCES = fstab.c mount_mntent.c mount_opts.c - LEGACYHEADERS = fstab.h mount_constants.h mount_mntent.h mount_opts.h - --AM_CFLAGS = -Wall -+AM_CFLAGS = -Wall $(MOUNT_CFLAGS) - AM_CPPFLAGS = -I$(top_srcdir)/include - LDADD = $(top_builddir)/lib/librealpath.la \ -- $(top_builddir)/lib/libcleanerexec.la $(LIB_MOUNT) $(LIB_SELINUX) \ -+ $(top_builddir)/lib/libcleanerexec.la $(MOUNT_LIBS) $(LIB_SELINUX) \ - $(LIB_POSIX_TIMER) - - root_sbin_PROGRAMS = mount.nilfs2 umount.nilfs2 -diff --git a/sbin/mount/mount_libmount.c b/sbin/mount/mount_libmount.c -index ef40e68..a7fec00 100644 ---- a/sbin/mount/mount_libmount.c -+++ b/sbin/mount/mount_libmount.c -@@ -67,9 +67,7 @@ - #include - #endif /* HAVE_SYSLOG_H */ - --#if HAVE_LIBMOUNT_LIBMOUNT_H --#include --#endif /* HAVE_LIBMOUNT_H */ -+#include - - #include - #include -diff --git a/sbin/mount/umount_libmount.c b/sbin/mount/umount_libmount.c -index ae5a337..b678f54 100644 ---- a/sbin/mount/umount_libmount.c -+++ b/sbin/mount/umount_libmount.c -@@ -59,9 +59,7 @@ - #include - #endif /* HAVE_SYSLOG_H */ - --#if HAVE_LIBMOUNT_LIBMOUNT_H --#include --#endif /* HAVE_LIBMOUNT_H */ -+#include - - #include - #include --- -1.8.5.rc3 - diff --git a/buildroot/package/nilfs-utils/Config.in b/buildroot/package/nilfs-utils/Config.in index 7b239b1af..30d7dba75 100644 --- a/buildroot/package/nilfs-utils/Config.in +++ b/buildroot/package/nilfs-utils/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_NILFS_UTILS help Tools for creating and managing NILFS2 filesystems. - https://github.com/nilfs-dev/nilfs-utils + https://nilfs.sourceforge.io comment "nilfs-utils needs a toolchain w/ threads" depends on BR2_USE_MMU diff --git a/buildroot/package/nilfs-utils/nilfs-utils.hash b/buildroot/package/nilfs-utils/nilfs-utils.hash index bf8036706..ad6a57d8f 100644 --- a/buildroot/package/nilfs-utils/nilfs-utils.hash +++ b/buildroot/package/nilfs-utils/nilfs-utils.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha512 8a73b807bbdb2dc56b100ab8fbffe8129c9db31a6cbceecf267bdeb726fc13dd6844ce8ef96690bd7786709cb884881a3cd6d3cf24290248c5abc457976e9487 nilfs-utils-v2.2.7.tar.gz +sha512 3232390581f63de5ebe7b461b178a40dfbdaa4bc6aa96b218ea8182c5bf81b162a1e632a1c21d9f1e89fdba9393b4e268e001c335a99ce22f645a62ae3154783 nilfs-utils-2.2.8.tar.bz2 sha512 4fc92d3998910acb108f81b1aee70a55a572b661a2766d0e57a55e48e2b737eea41415356cbd62593f26aec5797ab9fbb40211d7782b5834b4855ff1ce6ad5f7 COPYING diff --git a/buildroot/package/nilfs-utils/nilfs-utils.mk b/buildroot/package/nilfs-utils/nilfs-utils.mk index 3fde94fd4..7335d8720 100644 --- a/buildroot/package/nilfs-utils/nilfs-utils.mk +++ b/buildroot/package/nilfs-utils/nilfs-utils.mk @@ -4,15 +4,16 @@ # ################################################################################ -NILFS_UTILS_VERSION = v2.2.7 -NILFS_UTILS_SITE = $(call github,nilfs-dev,nilfs-utils,$(NILFS_UTILS_VERSION)) +NILFS_UTILS_VERSION = 2.2.8 +NILFS_UTILS_SOURCE = nilfs-utils-$(NILFS_UTILS_VERSION).tar.bz2 +NILFS_UTILS_SITE = https://nilfs.sourceforge.io/download NILFS_UTILS_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) NILFS_UTILS_LICENSE_FILES = COPYING # need libuuid, libblkid, libmount -NILFS_UTILS_DEPENDENCIES = host-pkgconf util-linux +NILFS_UTILS_DEPENDENCIES = util-linux -# we're fetching from github +# We're patching sbin/cleanerd/Makefile.am NILFS_UTILS_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBSELINUX),y) diff --git a/buildroot/package/ninja/0001-set-minimum-cmake-version-to-3.10.patch b/buildroot/package/ninja/0001-set-minimum-cmake-version-to-3.10.patch new file mode 100644 index 000000000..d75b78fde --- /dev/null +++ b/buildroot/package/ninja/0001-set-minimum-cmake-version-to-3.10.patch @@ -0,0 +1,30 @@ +From 4645f74eb668cc1cf876d1e9bef933591da7575c Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Mon, 3 Feb 2020 06:21:57 -0800 +Subject: [PATCH] set minimum cmake version to 3.10 + +The CMakeLists.txt file uses the CMP0091 which is an MSVC runtime library flag +abstraction macro. + +Because we are not building ninja for Microsoft, it is safe to remove this +macro and set the minimum version to 3.10. + +Signed-off-by: Adam Duskett +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 60fd8a1..a040e0b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,4 @@ +-cmake_minimum_required(VERSION 3.15) +-cmake_policy(SET CMP0091 NEW) ++cmake_minimum_required(VERSION 3.10) + project(ninja) + + if(CMAKE_BUILD_TYPE MATCHES "Release") +-- +2.24.1 + diff --git a/buildroot/package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch b/buildroot/package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch new file mode 100644 index 000000000..d419ab48d --- /dev/null +++ b/buildroot/package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch @@ -0,0 +1,29 @@ +From 87caa8c4bc536f745aceed757ce8a492fbdba84f Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Mon, 3 Feb 2020 07:36:58 -0800 +Subject: [PATCH] remove fdiagnostics-color from make command + +-fdiagnostics-color was introduced in gcc 4.9 and the minimum supported version +that Buildroot supports is 4.8. + +Signed-off-by: Adam Duskett +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a040e0b..af8010f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,7 +18,7 @@ if(MSVC) + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /GR- /Zc:__cplusplus") + else() +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -fdiagnostics-color") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") + endif() + + find_program(RE2C re2c) +-- +2.24.1 + diff --git a/buildroot/package/ninja/0003-CMake-fix-object-library-usage.patch b/buildroot/package/ninja/0003-CMake-fix-object-library-usage.patch new file mode 100644 index 000000000..8f8fac994 --- /dev/null +++ b/buildroot/package/ninja/0003-CMake-fix-object-library-usage.patch @@ -0,0 +1,56 @@ +From 7982ecebe1c1c41e82779a65fa2d93f19ffd755f Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Wed, 5 Feb 2020 12:28:44 +0100 +Subject: [PATCH] CMake: fix object library usage + +Object libraries cannot be use in target_link_libraries() command +as they are no normal binary files like *.a or *.so but a collection +of object files. + +See add_library() definition for details. + +Signed-off-by: Yegor Yefremov +--- + CMakeLists.txt | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index af8010f..028a7bb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,8 +83,7 @@ target_compile_definitions(libninja PRIVATE _WIN32_WINNT=0x0601 __USE_MINGW_ANSI + endif() + + # Main executable is library plus main() function. +-add_executable(ninja src/ninja.cc) +-target_link_libraries(ninja PRIVATE libninja libninja-re2c) ++add_executable(ninja src/ninja.cc $ $) + + # Tests all build into ninja_test executable. + add_executable(ninja_test +@@ -106,11 +105,12 @@ add_executable(ninja_test + src/subprocess_test.cc + src/test.cc + src/util_test.cc ++ $ ++ $ + ) + if(WIN32) + target_sources(ninja_test PRIVATE src/includes_normalize_test.cc src/msvc_helper_test.cc) + endif() +-target_link_libraries(ninja_test PRIVATE libninja libninja-re2c) + + foreach(perftest + build_log_perftest +@@ -120,8 +120,7 @@ foreach(perftest + hash_collision_bench + manifest_parser_perftest + ) +- add_executable(${perftest} src/${perftest}.cc) +- target_link_libraries(${perftest} PRIVATE libninja libninja-re2c) ++ add_executable(${perftest} src/${perftest}.cc $ $) + endforeach() + + enable_testing() +-- +2.17.0 diff --git a/buildroot/package/ninja/ninja.hash b/buildroot/package/ninja/ninja.hash index 6334c0420..cd9bb0883 100644 --- a/buildroot/package/ninja/ninja.hash +++ b/buildroot/package/ninja/ninja.hash @@ -1,2 +1,3 @@ # Locally generated -sha256 86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4 ninja-v1.8.2.tar.gz +sha256 3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f ninja-1.10.0.tar.gz +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING diff --git a/buildroot/package/ninja/ninja.mk b/buildroot/package/ninja/ninja.mk index 259a87d21..060893d85 100644 --- a/buildroot/package/ninja/ninja.mk +++ b/buildroot/package/ninja/ninja.mk @@ -4,19 +4,13 @@ # ################################################################################ -NINJA_VERSION = v1.8.2 -NINJA_SITE = $(call github,ninja-build,ninja,$(NINJA_VERSION)) +NINJA_VERSION = 1.10.0 +NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING -HOST_NINJA_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) - -define HOST_NINJA_BUILD_CMDS - (cd $(@D); ./configure.py --bootstrap) -endef - define HOST_NINJA_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/ninja $(HOST_DIR)/bin/ninja endef -$(eval $(host-generic-package)) +$(eval $(host-cmake-package)) diff --git a/buildroot/package/nload/nload.hash b/buildroot/package/nload/nload.hash index 4a8a09d39..f5b8e58f6 100644 --- a/buildroot/package/nload/nload.hash +++ b/buildroot/package/nload/nload.hash @@ -1,3 +1,5 @@ # From https://sourceforge.net/projects/nload/files/nload/0.7.4/ md5 3c733c528f244ca5a4f76bf185729c39 nload-0.7.4.tar.gz sha1 bb0a168c93c588ad4fd5e3a653b3620b79ada1e8 nload-0.7.4.tar.gz +# Locally computed +sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/buildroot/package/nmap/nmap.hash b/buildroot/package/nmap/nmap.hash index 349f98d48..d7446f1ea 100644 --- a/buildroot/package/nmap/nmap.hash +++ b/buildroot/package/nmap/nmap.hash @@ -1,4 +1,5 @@ -# From https://nmap.org/dist/sigs/nmap-7.70.tar.bz2.digest.txt -sha256 847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18 nmap-7.70.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.80.tar.bz2.digest.txt (lowercase) +sha256 fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa nmap-7.80.tar.bz2 + # Locally calculated -sha256 e013006fbdb7a7923e456e72272b115a5d722a3c6a372f27b5e8fcd282104651 COPYING +sha256 a6afaad36c803dc602734451d9421ed363b48d1ca0faadf0907fc2d91a000284 COPYING diff --git a/buildroot/package/nmap/nmap.mk b/buildroot/package/nmap/nmap.mk index 761df3ffa..5da1ce925 100644 --- a/buildroot/package/nmap/nmap.mk +++ b/buildroot/package/nmap/nmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMAP_VERSION = 7.70 +NMAP_VERSION = 7.80 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = liblinear libpcap diff --git a/buildroot/package/nodejs/Config.in b/buildroot/package/nodejs/Config.in index e99544130..ba3fde887 100644 --- a/buildroot/package/nodejs/Config.in +++ b/buildroot/package/nodejs/Config.in @@ -7,19 +7,19 @@ config BR2_PACKAGE_NODEJS_ARCH_SUPPORTS # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 -comment "nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 4.8, wchar" +comment "nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 4.9, wchar" depends on BR2_USE_MMU depends on BR2_PACKAGE_NODEJS_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR + !BR2_HOST_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR config BR2_PACKAGE_NODEJS bool "nodejs" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_NODEJS_ARCH_SUPPORTS - depends on BR2_HOST_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_HOST_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_WCHAR # uses fork() depends on BR2_USE_MMU @@ -27,7 +27,6 @@ config BR2_PACKAGE_NODEJS # linking, but that's too much of a corner case to support it. depends on !BR2_STATIC_LIBS select BR2_PACKAGE_C_ARES - select BR2_PACKAGE_LIBHTTPPARSER select BR2_PACKAGE_LIBUV select BR2_PACKAGE_ZLIB select BR2_PACKAGE_NGHTTP2 diff --git a/buildroot/package/nodejs/nodejs.hash b/buildroot/package/nodejs/nodejs.hash index ce987e683..992040d39 100644 --- a/buildroot/package/nodejs/nodejs.hash +++ b/buildroot/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v8.17.0/SHASUMS256.txt -sha256 5b0d96db482b273f0324c299ead86ecfbc5d033516e5fc37c92cfccb933ef6ff node-v8.17.0.tar.xz +# From https://nodejs.org/dist/v12.16.1/SHASUMS256.txt +sha256 0a95845ba02c46102b5671d0c5732460073f2d397488337e18d1fc30146d412d node-v12.16.1.tar.xz # Hash for license file -sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5 LICENSE +sha256 3f5749f7a58edaadd77843057a90063a18067f472d8b26c0a76905cafa1063e3 LICENSE diff --git a/buildroot/package/nodejs/nodejs.mk b/buildroot/package/nodejs/nodejs.mk index 72346a516..7f875058b 100644 --- a/buildroot/package/nodejs/nodejs.mk +++ b/buildroot/package/nodejs/nodejs.mk @@ -4,11 +4,11 @@ # ################################################################################ -NODEJS_VERSION = 8.17.0 +NODEJS_VERSION = 12.16.1 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ - libhttpparser libuv zlib nghttp2 \ + libuv zlib nghttp2 \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) @@ -18,11 +18,11 @@ NODEJS_CONF_OPTS = \ --without-snapshot \ --shared-zlib \ --shared-cares \ - --shared-http-parser \ --shared-libuv \ --shared-nghttp2 \ --without-dtrace \ --without-etw \ + --cross-compiling \ --dest-os=linux ifeq ($(BR2_PACKAGE_OPENSSL),y) @@ -64,10 +64,18 @@ define HOST_NODEJS_CONFIGURE_CMDS --shared-openssl-includes=$(HOST_DIR)/include/openssl \ --shared-openssl-libpath=$(HOST_DIR)/lib \ --shared-zlib \ - --with-intl=none \ + --no-cross-compiling \ + --with-intl=small-icu \ ) endef +NODEJS_HOST_TOOLS_V8 = \ + torque \ + gen-regexp-special-case \ + bytecode_builtins_list_generator +NODEJS_HOST_TOOLS_NODE = mkcodecache +NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) + define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) \ @@ -84,6 +92,10 @@ define HOST_NODEJS_INSTALL_CMDS LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) + + $(foreach f,$(NODEJS_HOST_TOOLS), \ + $(INSTALL) -m755 -D $(@D)/out/Release/$(f) $(HOST_DIR)/bin/$(f) + ) endef ifeq ($(BR2_i386),y) @@ -127,6 +139,12 @@ NODEJS_MIPS_ARCH_VARIANT = r1 endif endif +NODEJS_LDFLAGS = $(TARGET_LDFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +NODEJS_LDFLAGS += -latomic +endif + define NODEJS_CONFIGURE_CMDS mkdir -p $(@D)/bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/bin/python @@ -134,6 +152,7 @@ define NODEJS_CONFIGURE_CMDS (cd $(@D); \ $(TARGET_CONFIGURE_OPTS) \ PATH=$(@D)/bin:$(BR_PATH) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ LD="$(TARGET_CXX)" \ PYTHON=$(HOST_DIR)/bin/python2 \ $(HOST_DIR)/bin/python2 ./configure \ @@ -145,6 +164,15 @@ define NODEJS_CONFIGURE_CMDS $(if $(NODEJS_MIPS_FPU_MODE),--with-mips-fpu-mode=$(NODEJS_MIPS_FPU_MODE)) \ $(NODEJS_CONF_OPTS) \ ) + + $(foreach f,$(NODEJS_HOST_TOOLS_V8), \ + $(SED) "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(HOST_DIR)/bin/$(f)#" \ + $(@D)/tools/v8_gypfiles/v8.gyp + ) + $(foreach f,$(NODEJS_HOST_TOOLS_NODE), \ + $(SED) "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(HOST_DIR)/bin/$(f)#" \ + -i $(@D)/node.gyp + ) endef define NODEJS_BUILD_CMDS @@ -153,6 +181,7 @@ define NODEJS_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ LD="$(TARGET_CXX)" endef @@ -164,6 +193,7 @@ NODEJS_MODULES_LIST= $(call qstrip,\ # Define NPM for other packages to use NPM = $(TARGET_CONFIGURE_OPTS) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ LD="$(TARGET_CXX)" \ npm_config_arch=$(NODEJS_CPU) \ npm_config_target_arch=$(NODEJS_CPU) \ @@ -192,6 +222,7 @@ define NODEJS_INSTALL_TARGET_CMDS $(TARGET_CONFIGURE_OPTS) \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ LD="$(TARGET_CXX)" $(NODEJS_INSTALL_MODULES) endef diff --git a/buildroot/package/nodm/nodm.hash b/buildroot/package/nodm/nodm.hash index 2a70c6860..79f16af78 100644 --- a/buildroot/package/nodm/nodm.hash +++ b/buildroot/package/nodm/nodm.hash @@ -1,2 +1,3 @@ # locally calculated -sha256 ef11667ae82846801a9633df36c20f632cc03319bb1da35f062ac0f950771273 nodm-0.13.tar.gz +sha256 ef11667ae82846801a9633df36c20f632cc03319bb1da35f062ac0f950771273 nodm-0.13.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/noip/noip.hash b/buildroot/package/noip/noip.hash index 166438db4..79b6309da 100644 --- a/buildroot/package/noip/noip.hash +++ b/buildroot/package/noip/noip.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593 noip-duc-linux.tar.gz +sha256 82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593 noip-duc-linux.tar.gz +sha256 5aaf7e9e1790c6e372b6c5dec8c6c4b60504414a8c56f64c3071d281d3c251fa COPYING diff --git a/buildroot/package/norm/0001-fix-bigendian-build.patch b/buildroot/package/norm/0001-fix-bigendian-build.patch deleted file mode 100644 index cf999c27c..000000000 --- a/buildroot/package/norm/0001-fix-bigendian-build.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix big-endian build breakage in protolib. -Patch status: submitted to author via email. - -Signed-off-by: Gustavo Zacarias - -diff -Nura norm-1.5r6.orig/protolib/include/protoSpace.h norm-1.5r6/protolib/include/protoSpace.h ---- norm-1.5r6.orig/protolib/include/protoSpace.h 2016-03-08 19:48:21.326357963 -0300 -+++ norm-1.5r6/protolib/include/protoSpace.h 2016-03-08 19:48:46.647234075 -0300 -@@ -89,7 +89,7 @@ - } - #else - ProtoTree::Endian GetEndian() const -- return ProtoTree::ENDIAN_BIG; -+ {return ProtoTree::ENDIAN_BIG;} - void SetNode(Node* theNode) - {memcpy(key+sizeof(double), &theNode, sizeof(Node*));} - Node* GetNode() const diff --git a/buildroot/package/norm/0002-protolib-drop-linux-version-check.patch b/buildroot/package/norm/0001-protolib-drop-linux-version-check.patch similarity index 100% rename from buildroot/package/norm/0002-protolib-drop-linux-version-check.patch rename to buildroot/package/norm/0001-protolib-drop-linux-version-check.patch diff --git a/buildroot/package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch b/buildroot/package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch new file mode 100644 index 000000000..945a9df48 --- /dev/null +++ b/buildroot/package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch @@ -0,0 +1,29 @@ +From 8c02c2cbc6f07ddaef23e6bf2f6b9a269ed85ff4 Mon Sep 17 00:00:00 2001 +From: Titouan Christophe +Date: Tue, 4 Feb 2020 11:59:07 +0100 +Subject: [PATCH] Use print as function call for Python3 compatibility + +A similar patch has already been applied upstream, in commit +ada15125a1cbb3b1718d6eef78512a36ed327fcc, which will therefore be +available in the next norm release + +Signed-off-by: Titouan Christophe +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index 8428899..0fdae96 100644 +--- a/wscript ++++ b/wscript +@@ -32,7 +32,7 @@ for line in vfile.readlines(): + if "#define" == line[0] and "VERSION" == line[1]: + VERSION = line[2].strip('"') + if VERSION is None: +- print "Warning: NORM VERSION not found!?" ++ print("Warning: NORM VERSION not found!?") + + # So you don't need to do ./waf configure if you are just using the defaults + waflib.Configure.autoconfig = True +-- +2.24.1 diff --git a/buildroot/package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch b/buildroot/package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch new file mode 100644 index 000000000..e99f292d2 --- /dev/null +++ b/buildroot/package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch @@ -0,0 +1,41 @@ +From 0ff75628845d3c86974c31b50ecd60c0b0144c6d Mon Sep 17 00:00:00 2001 +From: Titouan Christophe +Date: Tue, 4 Feb 2020 13:44:27 +0100 +Subject: [PATCH] Fix mixed tabs/spaces in protolib wscript + +This fixes the following error when using waf in Python3: + TabError: inconsistent use of tabs and spaces in indentation + +The upstream file has since diverged, but with similar issues. +[Upstream status: https://github.com/USNavalResearchLaboratory/protolib/pull/6] + +Signed-off-by: Titouan Christophe +--- + protolib/wscript | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/protolib/wscript b/protolib/wscript +index 155a660..97dda93 100644 +--- a/protolib/wscript ++++ b/protolib/wscript +@@ -120,7 +120,7 @@ def configure(ctx): + # Compiler-specific flags + if ctx.options.debug: + #ctx.env.DEFINES_BUILD_PROTOLIB += ['PROTO_DEBUG', 'DEBUG', '_DEBUG'] +- ctx.env.DEFINES_BUILD_PROTOLIB += ['PROTO_DEBUG', 'DEBUG'] ++ ctx.env.DEFINES_BUILD_PROTOLIB += ['PROTO_DEBUG', 'DEBUG'] + else: + ctx.env.DEFINES_BUILD_PROTOLIB += ['NDEBUG', "PROTO_DEBUG"] + +@@ -139,7 +139,7 @@ def configure(ctx): + ctx.env.CFLAGS += ['/Od', '/RTC1', '/ZI'] + else: + ctx.env.CXXFLAGS += ['/Ox', '/DNDEBUG'] +- #ctx.env.CXXFLAGS += ['/Ox', '/DNDEBUG', '/DWINVER=0x0501'] ++ #ctx.env.CXXFLAGS += ['/Ox', '/DNDEBUG', '/DWINVER=0x0501'] + ctx.env.CFLAGS + + def build(ctx): +-- +2.24.1 + diff --git a/buildroot/package/norm/0003-fix-const-qualifier-gcc7.patch b/buildroot/package/norm/0003-fix-const-qualifier-gcc7.patch deleted file mode 100644 index 57e01f9c1..000000000 --- a/buildroot/package/norm/0003-fix-const-qualifier-gcc7.patch +++ /dev/null @@ -1,46 +0,0 @@ -protolib: remove const qualifiers in ProtoSortedTreeTemplate - -The methods PeekPrevItem() and PeekNextItem() in -ProtoSortedTreeTemplate were using a const qualifier, but not the -corresponding methods in ProtoSortedTree, causing a build failure with -gcc 7.x: - -norm-1.5r6/protolib/include/protoTree.h: In member function 'ITEM_TYPE* ProtoSortedTreeTemplate::Iterator::PeekPrevItem() const': -norm-1.5r6/protolib/include/protoTree.h:652:93: error: no matching function for call to 'ProtoSortedTreeTemplate::Iterator::PeekPrevItem() const' - {return static_cast(ProtoSortedTree::Iterator::PeekPrevItem());} - ^ -norm-1.5r6/protolib/include/protoTree.h:565:23: note: candidate: ProtoSortedTree::Item* ProtoSortedTree::Iterator::PeekPrevItem() - Item* PeekPrevItem() - ^~~~~~~~~~~~ - -Since the same methods in ProtoTreeTemplate don't have the const -qualifier, we take the simple solution of dropping such qualifiers -from ProtoSortedTreeTemplate as well, which fixes the build of norm -with gcc 7.x. - -Many thanks to Romain Naour for pointing out -the solution. - -Signed-off-by: Thomas Petazzoni -[Patch has been submitted upstream and accepted, but mailing list -archive not updated.] - -Index: b/protolib/include/protoTree.h -=================================================================== ---- a/protolib/include/protoTree.h -+++ b/protolib/include/protoTree.h -@@ -648,12 +648,12 @@ - - ITEM_TYPE* GetPrevItem() - {return static_cast(ProtoSortedTree::Iterator::GetPrevItem());} -- ITEM_TYPE* PeekPrevItem() const -+ ITEM_TYPE* PeekPrevItem() - {return static_cast(ProtoSortedTree::Iterator::PeekPrevItem());} - - ITEM_TYPE* GetNextItem() - {return static_cast(ProtoSortedTree::Iterator::GetNextItem());} -- ITEM_TYPE* PeekNextItem() const -+ ITEM_TYPE* PeekNextItem() - {return static_cast(ProtoSortedTree::Iterator::PeekNextItem());} - - }; // end class ProtoSortedTreeTemplate::Iterator diff --git a/buildroot/package/norm/norm.hash b/buildroot/package/norm/norm.hash index 4693eed6b..ab0930e8b 100644 --- a/buildroot/package/norm/norm.hash +++ b/buildroot/package/norm/norm.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 20ea2e8dd5d5e1ff1ff91dc7dab6db53a77d7b7183d8cf2425c215fd294f22a7 src-norm-1.5r6.tgz +sha256 4480a6ea53fb7ce45b4bc2061d18fbfd46ee9990fc2ed9a9dc303ce4d87888a6 src-norm-with-protolib-1.5.8.tgz +sha256 ba4b7e49b0163d6839830e3f47505696c6eaac77ccd93531831dc837b2160608 LICENSE.TXT diff --git a/buildroot/package/norm/norm.mk b/buildroot/package/norm/norm.mk index 8af76f834..2f9fc7b65 100644 --- a/buildroot/package/norm/norm.mk +++ b/buildroot/package/norm/norm.mk @@ -4,9 +4,9 @@ # ################################################################################ -NORM_VERSION = 1.5r6 -NORM_SITE = http://downloads.pf.itd.nrl.navy.mil/norm/archive -NORM_SOURCE = src-norm-$(NORM_VERSION).tgz +NORM_VERSION = 1.5.8 +NORM_SITE = https://github.com/USNavalResearchLaboratory/norm/releases/download/v$(NORM_VERSION) +NORM_SOURCE = src-norm-with-protolib-$(NORM_VERSION).tgz NORM_INSTALL_STAGING = YES NORM_LICENSE = NRL License NORM_LICENSE_FILES = LICENSE.TXT diff --git a/buildroot/package/nss-mdns/Config.in b/buildroot/package/nss-mdns/Config.in index ad69e2aa4..017e80030 100644 --- a/buildroot/package/nss-mdns/Config.in +++ b/buildroot/package/nss-mdns/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_NSS_MDNS resolution by common Unix/Linux programs in the ad-hoc mDNS domain .local. - http://0pointer.de/lennart/projects/nss-mdns/ + https://github.com/lathiat/nss-mdns comment "nss-mdns needs a glibc toolchain" depends on BR2_USE_MMU && BR2_PACKAGE_AVAHI_DAEMON diff --git a/buildroot/package/nss-mdns/nss-mdns.hash b/buildroot/package/nss-mdns/nss-mdns.hash index 169c497bb..9bcec0849 100644 --- a/buildroot/package/nss-mdns/nss-mdns.hash +++ b/buildroot/package/nss-mdns/nss-mdns.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d nss-mdns-0.10.tar.gz +sha256 a2094101b735cade45048764ea594bdae2bfa9399837f3c852a5b264416e9c8c nss-mdns-0.14.1.tar.gz +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE diff --git a/buildroot/package/nss-mdns/nss-mdns.mk b/buildroot/package/nss-mdns/nss-mdns.mk index 1512ea2e7..77ab6c1ed 100644 --- a/buildroot/package/nss-mdns/nss-mdns.mk +++ b/buildroot/package/nss-mdns/nss-mdns.mk @@ -4,10 +4,12 @@ # ################################################################################ -NSS_MDNS_VERSION = 0.10 -NSS_MDNS_SITE = http://0pointer.de/lennart/projects/nss-mdns +NSS_MDNS_VERSION = 0.14.1 +NSS_MDNS_SITE = \ + https://github.com/lathiat/nss-mdns/releases/download/v$(NSS_MDNS_VERSION) NSS_MDNS_LICENSE = LGPL-2.1+ NSS_MDNS_LICENSE_FILES = LICENSE +NSS_MDNS_CONF_OPTS = --disable-tests # add mdns4_minimal / mdns around the dns provider if missing define NSS_MDNS_INSTALL_CONFIG diff --git a/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.hash b/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.hash index 66cb79406..47864c4fe 100644 --- a/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.hash +++ b/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.hash @@ -1,4 +1,5 @@ -# From https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.8.tar.gz.md5 -md5 8c99fdc54f4bf9aca8c5f53fdb1403ff nss-pam-ldapd-0.9.8.tar.gz +# From https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.11.tar.gz.md5 +md5 91df9d46a548aa7aa95d0e7c672215d0 nss-pam-ldapd-0.9.8.tar.gz # Locally computed: -sha256 ef7362e7f2003da8c7beb7bcc03c30494acf712625aaac8badc6e7eb16f3453f nss-pam-ldapd-0.9.8.tar.gz +sha256 d0d71be06d1a90940b7566ce00cef1a465aae7171d5d062785506a83411ecab6 nss-pam-ldapd-0.9.11.tar.gz +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.mk b/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.mk index c094db96a..223a9eeae 100644 --- a/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.mk +++ b/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NSS_PAM_LDAPD_VERSION = 0.9.8 +NSS_PAM_LDAPD_VERSION = 0.9.11 NSS_PAM_LDAPD_SITE = http://arthurdejong.org/nss-pam-ldapd NSS_PAM_LDAPD_LICENSE = LGPL-2.1+ NSS_PAM_LDAPD_LICENSE_FILES = COPYING @@ -29,9 +29,6 @@ endif define NSS_PAM_LDAPD_INSTALL_INIT_SYSTEMD $(INSTALL) -m 644 -D package/nss-pam-ldapd/nslcd.service \ $(TARGET_DIR)/usr/lib/systemd/system/nslcd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/nslcd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nslcd.service endef define NSS_PAM_LDAPD_INSTALL_INIT_SYSV diff --git a/buildroot/package/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch b/buildroot/package/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch new file mode 100644 index 000000000..9ba8aae50 --- /dev/null +++ b/buildroot/package/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch @@ -0,0 +1,72 @@ +From 85c1634a26faa572d3c558d4cf8aaaca5202d4e9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jean-Pierre=20Andr=C3=A9?= +Date: Wed, 19 Dec 2018 15:57:50 +0100 +Subject: [PATCH] Fixed reporting an error when failed to build the mountpoint + +The size check was inefficient because getcwd() uses an unsigned int +argument. + +Fixes CVE-2019-9755: An integer underflow issue exists in ntfs-3g 2017.3.23. +A local attacker could potentially exploit this by running /bin/ntfs-3g with +specially crafted arguments from a specially crafted directory to cause a +heap buffer overflow, resulting in a crash or the ability to execute +arbitrary code. In installations where /bin/ntfs-3g is a setuid-root +binary, this could lead to a local escalation of privileges. + +Signed-off-by: Peter Korsgaard +--- + src/lowntfs-3g.c | 6 +++++- + src/ntfs-3g.c | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c +index 993867fa..0660439b 100644 +--- a/src/lowntfs-3g.c ++++ b/src/lowntfs-3g.c +@@ -4411,7 +4411,8 @@ int main(int argc, char *argv[]) + else { + ctx->abs_mnt_point = (char*)ntfs_malloc(PATH_MAX); + if (ctx->abs_mnt_point) { +- if (getcwd(ctx->abs_mnt_point, ++ if ((strlen(opts.mnt_point) < PATH_MAX) ++ && getcwd(ctx->abs_mnt_point, + PATH_MAX - strlen(opts.mnt_point) - 1)) { + strcat(ctx->abs_mnt_point, "/"); + strcat(ctx->abs_mnt_point, opts.mnt_point); +@@ -4419,6 +4420,9 @@ int main(int argc, char *argv[]) + /* Solaris also wants the absolute mount point */ + opts.mnt_point = ctx->abs_mnt_point; + #endif /* defined(__sun) && defined (__SVR4) */ ++ } else { ++ free(ctx->abs_mnt_point); ++ ctx->abs_mnt_point = (char*)NULL; + } + } + } +diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c +index 6ce89fef..4e0912ae 100644 +--- a/src/ntfs-3g.c ++++ b/src/ntfs-3g.c +@@ -4148,7 +4148,8 @@ int main(int argc, char *argv[]) + else { + ctx->abs_mnt_point = (char*)ntfs_malloc(PATH_MAX); + if (ctx->abs_mnt_point) { +- if (getcwd(ctx->abs_mnt_point, ++ if ((strlen(opts.mnt_point) < PATH_MAX) ++ && getcwd(ctx->abs_mnt_point, + PATH_MAX - strlen(opts.mnt_point) - 1)) { + strcat(ctx->abs_mnt_point, "/"); + strcat(ctx->abs_mnt_point, opts.mnt_point); +@@ -4156,6 +4157,9 @@ int main(int argc, char *argv[]) + /* Solaris also wants the absolute mount point */ + opts.mnt_point = ctx->abs_mnt_point; + #endif /* defined(__sun) && defined (__SVR4) */ ++ } else { ++ free(ctx->abs_mnt_point); ++ ctx->abs_mnt_point = (char*)NULL; + } + } + } +-- +2.20.1 + diff --git a/buildroot/package/ntfs-3g/ntfs-3g.hash b/buildroot/package/ntfs-3g/ntfs-3g.hash index 2e0b06fd5..63c999f25 100644 --- a/buildroot/package/ntfs-3g/ntfs-3g.hash +++ b/buildroot/package/ntfs-3g/ntfs-3g.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5 ntfs-3g_ntfsprogs-2017.3.23.tgz +sha256 3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5 ntfs-3g_ntfsprogs-2017.3.23.tgz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING.LIB diff --git a/buildroot/package/ntfs-3g/ntfs-3g.mk b/buildroot/package/ntfs-3g/ntfs-3g.mk index 5f23eae9c..cbb356195 100644 --- a/buildroot/package/ntfs-3g/ntfs-3g.mk +++ b/buildroot/package/ntfs-3g/ntfs-3g.mk @@ -13,6 +13,9 @@ NTFS_3G_DEPENDENCIES = host-pkgconf NTFS_3G_LICENSE = GPL-2.0+, LGPL-2.0+ NTFS_3G_LICENSE_FILES = COPYING COPYING.LIB +# 0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch +NTFS_3G_IGNORE_CVES += CVE-2019-9755 + ifeq ($(BR2_PACKAGE_LIBFUSE),y) NTFS_3G_CONF_OPTS += --with-fuse=external NTFS_3G_DEPENDENCIES += libfuse diff --git a/buildroot/package/ntp/ntp.hash b/buildroot/package/ntp/ntp.hash index 4014936e6..fdb5bacad 100644 --- a/buildroot/package/ntp/ntp.hash +++ b/buildroot/package/ntp/ntp.hash @@ -1,5 +1,5 @@ -# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p13.tar.gz.md5 -md5 ea040ab9b4ca656b5229b89d6b822f13 ntp-4.2.8p13.tar.gz +# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p14.tar.gz.md5 +md5 783edaf1d68ddf651bde64eda54a579d ntp-4.2.8p14.tar.gz # Calculated based on the hash above -sha256 288772cecfcd9a53694ffab108d1825a31ba77f3a8466b0401baeca3bc232a38 ntp-4.2.8p13.tar.gz -sha256 3828da5fc8126889d6a64432288ace08526c490bf5427d799931689069968d91 COPYRIGHT +sha256 1960e4f081f6aafd108d721bc3ab15f9e8dfd08dc08339aa95bca9d2545e4eb7 ntp-4.2.8p14.tar.gz +sha256 957e6a13445cc61ab1ca3dc80d8c269cf9b0a6d9eaec20f9f39639b0b3e66ee8 COPYRIGHT diff --git a/buildroot/package/ntp/ntp.mk b/buildroot/package/ntp/ntp.mk index 56050f4fe..3af3e01a5 100644 --- a/buildroot/package/ntp/ntp.mk +++ b/buildroot/package/ntp/ntp.mk @@ -5,7 +5,7 @@ ################################################################################ NTP_VERSION_MAJOR = 4.2 -NTP_VERSION = $(NTP_VERSION_MAJOR).8p13 +NTP_VERSION = $(NTP_VERSION_MAJOR).8p14 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent NTP_LICENSE = NTP @@ -108,9 +108,6 @@ endef define NTP_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/ntp/ntpd.service $(TARGET_DIR)/usr/lib/systemd/system/ntpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/ntpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ntpd.service endef endif diff --git a/buildroot/package/numactl/numactl.hash b/buildroot/package/numactl/numactl.hash index d93af1a7b..61cb94b3b 100644 --- a/buildroot/package/numactl/numactl.hash +++ b/buildroot/package/numactl/numactl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7c3e819c2bdeb883de68bafe88776a01356f7ef565e75ba866c4b49a087c6bdf numactl-v2.0.12.tar.gz +sha256 97ee012b2f294903530424b4ff7f28bcaad6a356897ce8777383f87e5c2e325d numactl-2.0.13.tar.gz sha256 e2b738b1303c088421b09933a78c1326fe43692e2c05a7c510a2eb7e7a8eb575 README.md diff --git a/buildroot/package/numactl/numactl.mk b/buildroot/package/numactl/numactl.mk index 9efbcb5f6..4d3ceeb6c 100644 --- a/buildroot/package/numactl/numactl.mk +++ b/buildroot/package/numactl/numactl.mk @@ -4,8 +4,8 @@ # ################################################################################ -NUMACTL_VERSION = v2.0.12 -NUMACTL_SITE = $(call github,numactl,numactl,$(NUMACTL_VERSION)) +NUMACTL_VERSION = 2.0.13 +NUMACTL_SITE = $(call github,numactl,numactl,v$(NUMACTL_VERSION)) NUMACTL_LICENSE = LGPL-2.1 (libnuma), GPL-2.0 (programs) NUMACTL_LICENSE_FILES = README.md NUMACTL_INSTALL_STAGING = YES diff --git a/buildroot/package/nut/nut.hash b/buildroot/package/nut/nut.hash index 870c67cc8..0a677bc05 100644 --- a/buildroot/package/nut/nut.hash +++ b/buildroot/package/nut/nut.hash @@ -1,2 +1,6 @@ # From http://www.networkupstools.org/source/2.7/nut-2.7.2.tar.gz.sha256 sha256 980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7 nut-2.7.4.tar.gz +# Locally computed +sha256 9f562d0e6be5108a06684dd249686d378abe1653df14b1944e971e084f6751f0 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE-GPL2 +sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 LICENSE-GPL3 diff --git a/buildroot/package/nuttcp/nuttcp.hash b/buildroot/package/nuttcp/nuttcp.hash index 88310a31d..c7d0148e1 100644 --- a/buildroot/package/nuttcp/nuttcp.hash +++ b/buildroot/package/nuttcp/nuttcp.hash @@ -1,2 +1,4 @@ # From http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2009-August/170685.html -sha256 054e96d9d68fe917df6f25fab15c7755bdd480f6420d7d48d9194a1a52378169 nuttcp-6.1.2.tar.bz2 +sha256 054e96d9d68fe917df6f25fab15c7755bdd480f6420d7d48d9194a1a52378169 nuttcp-6.1.2.tar.bz2 +# Locally computed +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in index 3494c5b9a..0c09051b6 100644 --- a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in +++ b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in @@ -23,20 +23,4 @@ config BR2_PACKAGE_PROVIDES_LIBGLES config BR2_PACKAGE_PROVIDES_LIBOPENMAX default "nvidia-tegra23-binaries" -config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS - bool "GStreamer 0.10.x plugins" - depends on BR2_PACKAGE_GSTREAMER # Run-time only - select BR2_PACKAGE_XLIB_LIBXV - help - GStreamer 0.10.x plugins - -config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_NV_SAMPLE_APPS - bool "NVIDIA multimedia sample apps" - depends on BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS - help - nvgstplayer and nvgstcapture multimedia test applications. - -comment "GStreamer 0.10.x plugins need GStreamer 0.10" - depends on !BR2_PACKAGE_GSTREAMER - endif diff --git a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk index 9b153b025..ed3c5a78b 100644 --- a/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk +++ b/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk @@ -10,10 +10,6 @@ NVIDIA_TEGRA23_BINARIES_SOURCE = $(NVIDIA_TEGRA23_BASE)_R$(NVIDIA_TEGRA23_BINARI NVIDIA_TEGRA23_BINARIES_LICENSE = License For Customer Use of NVIDIA Software NVIDIA_TEGRA23_BINARIES_LICENSE_FILES = nv_tegra/LICENSE -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS),y) -NVIDIA_TEGRA23_BINARIES_LICENSE += LGPL-2.1 -NVIDIA_TEGRA23_BINARIES_LICENSE_FILES += nv_tegra/nv_sample_apps/LICENSE.gst-openmax -endif NVIDIA_TEGRA23_BINARIES_INSTALL_STAGING = YES @@ -24,10 +20,6 @@ NVIDIA_TEGRA23_BINARIES_INSTALL_STAGING = YES NVIDIA_TEGRA23_BINARIES_DEPENDENCIES = mesa3d-headers \ xlib_libX11 xlib_libXext -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS),y) -NVIDIA_TEGRA23_BINARIES_DEPENDENCIES += xlib_libXv -endif - NVIDIA_TEGRA23_BINARIES_PROVIDES = libegl libgles libopenmax NVIDIA_TEGRA23_BINARIES_DRV = \ @@ -38,10 +30,6 @@ define NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER $(call suitable-extractor,$(@D)/nv_tegra/nvidia_drivers.tbz2) \ $(@D)/nv_tegra/nvidia_drivers.tbz2 | \ $(TAR) --strip-components=0 -C $(@D)/nv_tegra/nvidia_drivers/ $(TAR_OPTIONS) - - $(INSTALL) -d $(@D)/nv_tegra/nv_sample_apps/nvgstapps - $(call suitable-extractor,$(@D)/nv_tegra/nv_sample_apps/nvgstapps.tbz2) \ - $(@D)/nv_tegra/nv_sample_apps/nvgstapps.tbz2 | \ - $(TAR) --strip-components=0 -C $(@D)/nv_tegra/nv_sample_apps/nvgstapps/ $(TAR_OPTIONS) - endef NVIDIA_TEGRA23_BINARIES_POST_EXTRACT_HOOKS += NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER @@ -55,28 +43,11 @@ define NVIDIA_TEGRA23_BINARIES_INSTALL_LIBS ) endef -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS),y) -define NVIDIA_TEGRA23_BINARIES_INSTALL_GST_PLUGINS - mkdir -p $(1)/usr/lib/gstreamer-0.10/ - cp -dpfr $(@D)/nv_tegra/nv_sample_apps/nvgstapps/usr/lib/gstreamer-0.10/*.so \ - $(1)/usr/lib/gstreamer-0.10/ -endef -endif - -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_NV_SAMPLE_APPS),y) -define NVIDIA_TEGRA23_BINARIES_INSTALL_APPS - mkdir -p $(TARGET_DIR)/usr/bin/ - cp -dpfr $(@D)/nv_tegra/nv_sample_apps/nvgstapps/usr/bin/* \ - $(TARGET_DIR)/usr/bin/ -endef -endif - define NVIDIA_TEGRA23_BINARIES_INSTALL_STAGING_CMDS $(call NVIDIA_TEGRA23_BINARIES_INSTALL_LIBS,$(STAGING_DIR)) mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/ cp -dpfr package/nvidia-tegra23/nvidia-tegra23-binaries/*.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/ - $(call NVIDIA_TEGRA23_BINARIES_INSTALL_GST_PLUGINS,$(STAGING_DIR)) endef define NVIDIA_TEGRA23_BINARIES_INSTALL_TARGET_CMDS @@ -88,8 +59,6 @@ define NVIDIA_TEGRA23_BINARIES_INSTALL_TARGET_CMDS $(TARGET_DIR)/etc/nv_tegra_release $(INSTALL) -D -m 0644 $(@D)/$(NVIDIA_TEGRA23_BINARIES_DRV) \ $(TARGET_DIR)/usr/lib/xorg/modules/drivers/tegra_drv.so - $(call NVIDIA_TEGRA23_BINARIES_INSTALL_GST_PLUGINS,$(TARGET_DIR)) - $(NVIDIA_TEGRA23_BINARIES_INSTALL_APPS) endef $(eval $(generic-package)) diff --git a/buildroot/package/nvme/0001-Makefile-allow-linker-override-for-cross-uuid-test.patch b/buildroot/package/nvme/0001-Makefile-allow-linker-override-for-cross-uuid-test.patch deleted file mode 100644 index dc1c01a88..000000000 --- a/buildroot/package/nvme/0001-Makefile-allow-linker-override-for-cross-uuid-test.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f926559acd1beb74dc5dc9b0e414b087110a251f Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Wed, 9 Aug 2017 09:43:12 +0300 -Subject: [PATCH] Makefile: allow linker override for cross uuid test - -The test to determine whether libuuid is installed uses the host 'ld' utility. -This breaks when cross compiling, since target libraries are often different -than host libraries. - -Use $(LD) instead. This allows to easily use the cross compiler linker. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/linux-nvme/nvme-cli/pull/216 - - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 3f1d9aaa890d..cc74bdd6c3e6 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,7 @@ - CFLAGS ?= -O2 -g -Wall -Werror - CFLAGS += -std=gnu99 - CPPFLAGS += -D_GNU_SOURCE -D__CHECK_ENDIAN__ --LIBUUID = $(shell ld -o /dev/null -luuid >/dev/null 2>&1; echo $$?) -+LIBUUID = $(shell $(LD) -o /dev/null -luuid >/dev/null 2>&1; echo $$?) - NVME = nvme - INSTALL ?= install - DESTDIR = --- -2.13.2 - diff --git a/buildroot/package/nvme/nvme.hash b/buildroot/package/nvme/nvme.hash index 92e2bc0ac..94aefb2ff 100644 --- a/buildroot/package/nvme/nvme.hash +++ b/buildroot/package/nvme/nvme.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 52eb45c9ef5a529580a3f6f9e02c067695675ac01b8ab8b8e0398c62e8a8646d nvme-v1.3.tar.gz +sha256 d7c3d56f36f81c0933f7b7c3f90c4196be0fec758affc8062c525b6bc5ea65f5 nvme-1.9.tar.gz +sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE diff --git a/buildroot/package/nvme/nvme.mk b/buildroot/package/nvme/nvme.mk index 8eab1dacf..5a7c634e3 100644 --- a/buildroot/package/nvme/nvme.mk +++ b/buildroot/package/nvme/nvme.mk @@ -4,18 +4,28 @@ # ################################################################################ -NVME_VERSION = v1.3 -NVME_SITE = $(call github,linux-nvme,nvme-cli,$(NVME_VERSION)) +NVME_VERSION = 1.9 +NVME_SITE = $(call github,linux-nvme,nvme-cli,v$(NVME_VERSION)) NVME_LICENSE = GPL-2.0+ NVME_LICENSE_FILES = LICENSE +# Yes, LIBUUID=0 means libuuid support enabled. +# LIBUUID=1 means libuuid support disabled. +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +NVME_DEPENDENCIES += util-linux +NVME_MAKE_OPTS += LIBUUID=0 +else +NVME_MAKE_OPTS += LIBUUID=1 +endif + define NVME_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + $(NVME_MAKE_OPTS) -C $(@D) endef define NVME_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \ - PREFIX=/usr install-bin + $(TARGET_MAKE_ENV) $(MAKE) $(NVME_MAKE_OPTS) -C $(@D) \ + DESTDIR=$(TARGET_DIR) PREFIX=/usr install-bin endef $(eval $(generic-package)) diff --git a/buildroot/package/odhcp6c/0001-dhcpv6-fix-strncpy-bounds.patch b/buildroot/package/odhcp6c/0001-dhcpv6-fix-strncpy-bounds.patch deleted file mode 100644 index abf519152..000000000 --- a/buildroot/package/odhcp6c/0001-dhcpv6-fix-strncpy-bounds.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 327f73dd7093d04c2dbea13ee30fc3dfafc5e944 Mon Sep 17 00:00:00 2001 -From: Hans Dedecker -Date: Sat, 21 Apr 2018 13:40:29 +0200 -Subject: [PATCH] dhcpv6: fix strncpy bounds - -Fixes dhcpv6.c:138:2: error: 'strncpy' specified bound 16 equals destination size [-Werror=stringop-truncation] strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - -Signed-off-by: Khem Raj -Signed-off-by: Hans Dedecker -[Retrieved (and backported) from: -https://github.com/openwrt/odhcp6c/commit/327f73dd7093d04c2dbea13ee30fc3dfafc5e944] -Signed-off-by: Fabrice Fontaine ---- - src/dhcpv6.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dhcpv6.c b/src/dhcpv6.c -index 0b3585c..d70d533 100644 ---- a/src/dhcpv6.c -+++ b/src/dhcpv6.c -@@ -135,7 +135,7 @@ int init_dhcpv6(const char *ifname, unsigned int options, int sol_timeout) - // Detect interface - struct ifreq ifr; -- strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); -+ strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1); - if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0) - return -1; - diff --git a/buildroot/package/odhcp6c/odhcp6c.hash b/buildroot/package/odhcp6c/odhcp6c.hash index 688d77dc6..8b16fa98b 100644 --- a/buildroot/package/odhcp6c/odhcp6c.hash +++ b/buildroot/package/odhcp6c/odhcp6c.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 d84a713010865215301b4186c7b5368c9f006e6d3b9b52b99bd25e2d9e7a1dfc odhcp6c-7533a6243dc3ac5a747cf6ccbc4d0539dafd3e07.tar.gz +sha256 6d472320ccfa2e57197596869507f2a4bf9900a502939404bf0c033dceeadf5f odhcp6c-d2e247d8d87ecf8c60fcf0acdad05667bd379521.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/odhcp6c/odhcp6c.mk b/buildroot/package/odhcp6c/odhcp6c.mk index 31867d721..3b4e7580a 100644 --- a/buildroot/package/odhcp6c/odhcp6c.mk +++ b/buildroot/package/odhcp6c/odhcp6c.mk @@ -4,7 +4,7 @@ # ################################################################################ -ODHCP6C_VERSION = 7533a6243dc3ac5a747cf6ccbc4d0539dafd3e07 +ODHCP6C_VERSION = d2e247d8d87ecf8c60fcf0acdad05667bd379521 ODHCP6C_SITE = $(call github,sbyx,odhcp6c,$(ODHCP6C_VERSION)) ODHCP6C_LICENSE = GPL-2.0 ODHCP6C_LICENSE_FILES = COPYING @@ -16,4 +16,11 @@ endef ODHCP6C_POST_INSTALL_TARGET_HOOKS += ODHCP6C_INSTALL_SCRIPT +ifeq ($(BR2_PACKAGE_LIBUBOX),y) +ODHCP6C_CONF_OPTS += -DUSE_LIBUBOX=1 +ODHCP6C_DEPENDENCIES += libubox +else +ODHCP6C_CONF_OPTS += -DUSE_LIBUBOX=0 +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/odhcploc/odhcploc.hash b/buildroot/package/odhcploc/odhcploc.hash index 201339f97..a1d9a5661 100644 --- a/buildroot/package/odhcploc/odhcploc.hash +++ b/buildroot/package/odhcploc/odhcploc.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 b0360a3aece8a29d131531da7bfc36d57c30c6eed30ff1ea360f7cccea1d62d7 odhcploc-20111021.tar.gz +sha256 092a5b7be2a7ff088be7ec99adf68629509911b66f304b8ea0c835cdc138d544 COPYING diff --git a/buildroot/package/odroid-mali/Config.in b/buildroot/package/odroid-mali/Config.in deleted file mode 100644 index 1c31c2d0e..000000000 --- a/buildroot/package/odroid-mali/Config.in +++ /dev/null @@ -1,34 +0,0 @@ -config BR2_PACKAGE_ODROID_MALI - bool "odroid-mali" - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_aarch64 || BR2_ARM_EABIHF - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_ODROID_SCRIPTS # runtime - help - Install the ARM Mali drivers for odroidc2 based systems. - - https://github.com/mdrjr/c2_mali - -if BR2_PACKAGE_ODROID_MALI - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "odroid-mali" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "odroid-mali" - -endif - -config BR2_PACKAGE_ODROID_MALI_X11 - bool - depends on BR2_aarch64 # No 32 bit version available - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - -comment "odroid-mali needs a glibc toolchain" - depends on BR2_aarch64 || BR2_ARM_EABIHF - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/buildroot/package/odroid-mali/odroid-mali.hash b/buildroot/package/odroid-mali/odroid-mali.hash deleted file mode 100644 index b71ebab13..000000000 --- a/buildroot/package/odroid-mali/odroid-mali.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed hash -sha256 6c85e96f3372c24c6497f2a1cbea867a8dbf3a7b3edd736802c762176006aec6 odroid-mali-4f8a541693fee5fdcaa162a7fd8922861a4ba0a9.tar.gz diff --git a/buildroot/package/odroid-mali/odroid-mali.mk b/buildroot/package/odroid-mali/odroid-mali.mk deleted file mode 100644 index 86215a1d5..000000000 --- a/buildroot/package/odroid-mali/odroid-mali.mk +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# -# odroid-mali -# -################################################################################ - -ODROID_MALI_VERSION = 4f8a541693fee5fdcaa162a7fd8922861a4ba0a9 -ODROID_MALI_SITE = $(call github,mdrjr,c2_mali,$(ODROID_MALI_VERSION)) -ODROID_MALI_LICENSE = Hardkernel EULA -ODROID_MALI_LICENSE_FILES = README.md - -ODROID_MALI_INSTALL_STAGING = YES -ODROID_MALI_PROVIDES = libegl libgles - -ifeq ($(BR2_PACKAGE_ODROID_MALI_X11),y) -ODROID_MALI_HEADERS_SUBDIR = x11/mali_headers/ -ODROID_MALI_LIBS_SUBDIR = x11/mali_libs/ -# The X11 blobs are linked against those libraries, and the headers -# include headers from those libraries -ODROID_MALI_DEPENDENCIES += \ - libdrm xlib_libX11 xlib_libXdamage \ - xlib_libXext xlib_libXfixes -else -define ODROID_MALI_FIX_EGL_PC - $(SED) "s/Cflags: /Cflags: -DMESA_EGL_NO_X11_HEADERS /" \ - $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc -endef -ODROID_MALI_HEADERS_SUBDIR = fbdev/mali_headers/ -ifeq ($(BR2_aarch64),y) -ODROID_MALI_LIBS_SUBDIR = fbdev/mali_libs/ -else -ODROID_MALI_LIBS_SUBDIR = fbdev/32bit_libs/ -endif -endif - -define ODROID_MALI_INSTALL_LIBS - cp -dpfr $(@D)/$(ODROID_MALI_LIBS_SUBDIR)/lib* $(1)/usr/lib/ -endef - -define ODROID_MALI_INSTALL_STAGING_CMDS - $(call ODROID_MALI_INSTALL_LIBS,$(STAGING_DIR)) - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -dpfr $(@D)/pkgconfig/*.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - cp -dpfr $(@D)/$(ODROID_MALI_HEADERS_SUBDIR)/* $(STAGING_DIR)/usr/include - $(ODROID_MALI_FIX_EGL_PC) -endef - -define ODROID_MALI_INSTALL_TARGET_CMDS - $(call ODROID_MALI_INSTALL_LIBS,$(TARGET_DIR)) -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/odroid-scripts/Config.in b/buildroot/package/odroid-scripts/Config.in deleted file mode 100644 index c07c3a4c0..000000000 --- a/buildroot/package/odroid-scripts/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_ODROID_SCRIPTS - bool "odroid-scripts" - depends on BR2_aarch64 || BR2_arm || BR2_armeb - select BR2_PACKAGE_FBSET # runtime - select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # needed for fbset - help - Install the scripts for the odroidc2 based systems. - - https://github.com/mdrjr/c2_bootini diff --git a/buildroot/package/odroid-scripts/S02odroidc2_fb b/buildroot/package/odroid-scripts/S02odroidc2_fb deleted file mode 100644 index 2aae59db9..000000000 --- a/buildroot/package/odroid-scripts/S02odroidc2_fb +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# -# Set up frame buffer -# - -case "$1" in - start) - echo "Setting up display..." - /usr/sbin/odroidc2_init_fb.sh - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/buildroot/package/odroid-scripts/odroid-scripts.hash b/buildroot/package/odroid-scripts/odroid-scripts.hash deleted file mode 100644 index e5a262d20..000000000 --- a/buildroot/package/odroid-scripts/odroid-scripts.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed hash -sha256 9d61472ee6aed2d1a7b5afdcb91b823003c8524a242572f24f89d4e57323daf3 odroid-scripts-cfd289b1d69136b8bfd725d90cd648da4654f2bd.tar.gz diff --git a/buildroot/package/odroid-scripts/odroid-scripts.mk b/buildroot/package/odroid-scripts/odroid-scripts.mk deleted file mode 100644 index fc1940dce..000000000 --- a/buildroot/package/odroid-scripts/odroid-scripts.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# odroid-scripts -# -################################################################################ - -ODROID_SCRIPTS_VERSION = cfd289b1d69136b8bfd725d90cd648da4654f2bd -ODROID_SCRIPTS_SITE = $(call github,mdrjr,c2_bootini,$(ODROID_SCRIPTS_VERSION)) -ODROID_SCRIPTS_LICENSE = unclear - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -define ODROID_SCRIPTS_INSTALL_UDEV_RULES - $(INSTALL) -D -m 0644 $(@D)/10-odroid.rules \ - $(TARGET_DIR)/etc/udev/rules.d/10-odroid.rules -endef -endif - -define ODROID_SCRIPTS_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/c2_init.sh $(TARGET_DIR)/usr/sbin/odroidc2_init_fb.sh - $(ODROID_SCRIPTS_INSTALL_UDEV_RULES) -endef - -define ODROID_SCRIPTS_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 $(@D)/amlogic.service \ - $(TARGET_DIR)/usr/lib/systemd/system/odroidc2_fb.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/odroidc2_fb.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/odroidc2_fb.service -endef - -define ODROID_SCRIPTS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/odroid-scripts/S02odroidc2_fb \ - $(TARGET_DIR)/etc/init.d/S02odroidc2_fb -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/ofono/0001-uclibc-backtrace.patch b/buildroot/package/ofono/0001-uclibc-backtrace.patch index 3ce7bf8cb..3fa241497 100644 --- a/buildroot/package/ofono/0001-uclibc-backtrace.patch +++ b/buildroot/package/ofono/0001-uclibc-backtrace.patch @@ -29,7 +29,7 @@ Signed-off-by: Petr Vorel static void print_backtrace(unsigned int offset) { void *frames[99]; -@@ -309,7 +310,7 @@ +@@ -312,7 +313,7 @@ if (detach == FALSE) option |= LOG_PERROR; @@ -38,7 +38,7 @@ Signed-off-by: Petr Vorel signal_setup(signal_handler); #endif -@@ -326,7 +327,7 @@ +@@ -329,7 +330,7 @@ closelog(); diff --git a/buildroot/package/ofono/Config.in b/buildroot/package/ofono/Config.in index 70daef7a1..57ee4bc53 100644 --- a/buildroot/package/ofono/Config.in +++ b/buildroot/package/ofono/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_OFONO bool "ofono" - depends on BR2_USE_WCHAR # gettext, libglib2 + depends on BR2_USE_WCHAR # gettext, libglib2, ell depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus, libglib2 - depends on !BR2_STATIC_LIBS # dlopen() + depends on !BR2_STATIC_LIBS # dlopen(), ell depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_LIBCAP_NG select BR2_PACKAGE_DBUS + select BR2_PACKAGE_ELL + select BR2_PACKAGE_LIBCAP_NG select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO help diff --git a/buildroot/package/ofono/ofono.hash b/buildroot/package/ofono/ofono.hash index 2dbb9986c..02245a46f 100644 --- a/buildroot/package/ofono/ofono.hash +++ b/buildroot/package/ofono/ofono.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc -sha256 93bb2cedef54f897dd5200e22b072a6e38b5d9b44be57eebbbe8d513f0beb0e4 ofono-1.28.tar.xz +sha256 a15c5d28096c10eb30e47a68b6dc2e7c4a5a99d7f4cfedf0b69624f33d859e9b ofono-1.31.tar.xz # Locally computed sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/ofono/ofono.mk b/buildroot/package/ofono/ofono.mk index 0552a181f..57d6cab47 100644 --- a/buildroot/package/ofono/ofono.mk +++ b/buildroot/package/ofono/ofono.mk @@ -4,7 +4,7 @@ # ################################################################################ -OFONO_VERSION = 1.28 +OFONO_VERSION = 1.31 OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono OFONO_LICENSE = GPL-2.0 @@ -12,11 +12,13 @@ OFONO_LICENSE_FILES = COPYING OFONO_DEPENDENCIES = \ host-pkgconf \ dbus \ - libglib2 \ + ell \ libcap-ng \ + libglib2 \ mobile-broadband-provider-info OFONO_CONF_OPTS = \ + --enable-external-ell \ --disable-test \ --with-dbusconfdir=/etc \ $(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system) @@ -29,12 +31,6 @@ define OFONO_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/ofono/S46ofono $(TARGET_DIR)/etc/init.d/S46ofono endef -define OFONO_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/systemd/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/ofono.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants -endef - ifeq ($(BR2_PACKAGE_HAS_UDEV),y) OFONO_CONF_OPTS += --enable-udev OFONO_DEPENDENCIES += udev @@ -42,9 +38,9 @@ else OFONO_CONF_OPTS += --disable-udev endif -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) OFONO_CONF_OPTS += --enable-bluetooth -OFONO_DEPENDENCIES += bluez_utils +OFONO_DEPENDENCIES += bluez5_utils else OFONO_CONF_OPTS += --disable-bluetooth endif diff --git a/buildroot/package/ogre/Config.in b/buildroot/package/ogre/Config.in new file mode 100644 index 000000000..b5475a7cb --- /dev/null +++ b/buildroot/package/ogre/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_OGRE + bool "ogre" + depends on BR2_PACKAGE_HAS_LIBGL # libglu + depends on BR2_PACKAGE_XORG7 + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on !BR2_STATIC_LIBS + depends on BR2_USE_MMU + depends on BR2_USE_WCHAR # use wchar_t + select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_LIBFREEIMAGE + select BR2_PACKAGE_LIBGLU # GL/glu.h + select BR2_PACKAGE_SDL2 + select BR2_PACKAGE_SDL2_OPENGL + select BR2_PACKAGE_SDL2_X11 # use wmInfo.info.x11 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXAW + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_ZZIPLIB + help + OGRE is a scene-oriented, flexible 3D engine written in C++ + designed to make it easier and more intuitive for developers + to produce games and demos utilising 3D hardware. The class + library abstracts all the details of using the underlying + system libraries like Direct3D and OpenGL and provides an + interface based on world objects and other intuitive classes. + + https://ogrecave.github.io/ogre + +comment "ogre needs X11 and an OpenGL provider" + depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7 + depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + && BR2_INSTALL_LIBSTDCPP && !BR2_STATIC_LIBS && BR2_USE_WCHAR + depends on BR2_USE_MMU + +comment "ogre needs a toolchain w/ C++, dynamic library, gcc >= 4.8, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_USE_WCHAR + depends on BR2_USE_MMU diff --git a/buildroot/package/ogre/ogre.hash b/buildroot/package/ogre/ogre.hash new file mode 100644 index 000000000..8bb4ae96a --- /dev/null +++ b/buildroot/package/ogre/ogre.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 163e7700e319532d4389ecba91e3ab88551f78610886fa36f8f262f9a5080988 ogre-1.12.0.tar.gz +sha256 82758e8d1d72139904b9b7472ef0f6544413d2871b58540307fdcc20e473e5f8 LICENSE diff --git a/buildroot/package/ogre/ogre.mk b/buildroot/package/ogre/ogre.mk new file mode 100644 index 000000000..253e022a7 --- /dev/null +++ b/buildroot/package/ogre/ogre.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# ogre +# +################################################################################ + +OGRE_VERSION = 1.12.0 +OGRE_SITE = $(call github,OGRECave,ogre,v$(OGRE_VERSION)) +OGRE_LICENSE = MIT (main library, DeferredShadingMedia samples), Public Domain (samples and plugins), Zlib (tinyxml) +OGRE_LICENSE_FILES = LICENSE +OGRE_INSTALL_STAGING = YES + +# Ogre use a bundled version of tinyxml +OGRE_DEPENDENCIES = host-pkgconf \ + freetype \ + libfreeimage \ + libgl \ + libglu \ + sdl2 \ + xlib_libX11 \ + xlib_libXaw \ + xlib_libXext \ + xlib_libXrandr \ + zziplib + +# Unbundle freetype and zziplib. +# Disable java and nvidia cg support. +OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \ + -DOGRE_BUILD_COMPONENT_JAVA=OFF \ + -DOGRE_BUILD_PLUGIN_CG=OFF \ + -DOGRE_INSTALL_DOCS=OFF + +# Enable optional python component if python interpreter is present on the target. +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +OGRE_DEPENDENCIES += host-swig \ + $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) +OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=ON +else +OGRE_CONF_OPTS += -DOGRE_BUILD_COMPONENT_PYTHON=OFF +endif + +# Uses __atomic_fetch_add_8 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +OGRE_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/olsr/0001-configurable-ldconfig.patch b/buildroot/package/olsr/0001-configurable-ldconfig.patch deleted file mode 100644 index 73fff7eec..000000000 --- a/buildroot/package/olsr/0001-configurable-ldconfig.patch +++ /dev/null @@ -1,33 +0,0 @@ -Make ldconfig configurable - -In a cross-compilation set up, running /sbin/ldconfig is useless, so -we make the path to ldconfig configurable through the environment/make -command line. This allows to pass LDCONFIG=/bin/true when doing -cross-compilation. - -[Gustavo: update patch for olsr 0.6.4] -Signed-off-by: Thomas Petazzoni - -diff -Nura olsrd-0.6.4.orig/make/Makefile.linux olsrd-0.6.4/make/Makefile.linux ---- olsrd-0.6.4.orig/make/Makefile.linux 2013-01-29 09:00:18.041356389 -0300 -+++ olsrd-0.6.4/make/Makefile.linux 2013-01-29 09:01:51.598226624 -0300 -@@ -3,6 +3,7 @@ - # - - ARCH := $(shell uname -m) -+LDCONFIG ?= /sbin/ldconfig - - DESTDIR ?= - prefix ?= /usr/local -@@ -26,9 +27,9 @@ - PLUGIN_SONAME ?= lib$(PLUGIN_NAME).so - PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) - INSTALL_LIB = install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ -- /sbin/ldconfig -n $(LIBDIR) -+ $(LDCONFIG) -n $(LIBDIR) - UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \ -- /sbin/ldconfig -n $(LIBDIR) -+ $(LDCONFIG) -n $(LIBDIR) - - ifdef OLSRD_PLUGIN - GENERATE_PIC = true diff --git a/buildroot/package/olsr/Config.in b/buildroot/package/olsr/Config.in index 85c5b4da1..632511fba 100644 --- a/buildroot/package/olsr/Config.in +++ b/buildroot/package/olsr/Config.in @@ -3,9 +3,8 @@ config BR2_PACKAGE_OLSR depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - # doesn't build with musl, # https://github.com/OLSR/olsrd/issues/6 - depends on !BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_USES_MUSL || BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 help The Optimized Link State Routing protocol (OLSR) is a routing protocol that is optimised for mobile ad-hoc @@ -16,7 +15,10 @@ config BR2_PACKAGE_OLSR http://www.olsr.org/ -comment "olsr needs a uClibc or glibc toolchain w/ threads, dynamic library" +comment "olsr needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +comment "olsr needs a musl toolchain w/ headers >= 4.15" + depends on BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 diff --git a/buildroot/package/olsr/olsr.hash b/buildroot/package/olsr/olsr.hash index 6de029055..821361bb1 100644 --- a/buildroot/package/olsr/olsr.hash +++ b/buildroot/package/olsr/olsr.hash @@ -1,2 +1,4 @@ -# From http://www.olsr.org/releases/0.9/SHA256SUM-0.9.6.1 -sha256 9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612 olsrd-0.9.6.1.tar.bz2 +# Locally computed +sha256 ee9e524224e5d5304dcf61f1dc5485c569da09d382934ff85b233be3e24821a3 olsr-0.9.8.tar.gz +sha256 7dcf1fb93ef105e2708b02603bb6ee443115d4819fbf2c5a3a001b46887acb9a license.txt +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 lib/pud/nmealib/LICENSE diff --git a/buildroot/package/olsr/olsr.mk b/buildroot/package/olsr/olsr.mk index faff2533d..f930b3cac 100644 --- a/buildroot/package/olsr/olsr.mk +++ b/buildroot/package/olsr/olsr.mk @@ -4,33 +4,38 @@ # ################################################################################ -OLSR_VERSION_MAJOR = 0.9 -OLSR_VERSION = $(OLSR_VERSION_MAJOR).6.1 -OLSR_SOURCE = olsrd-$(OLSR_VERSION).tar.bz2 -OLSR_SITE = http://www.olsr.org/releases/$(OLSR_VERSION_MAJOR) +OLSR_VERSION = 0.9.8 +OLSR_SITE = $(call github,OLSR,olsrd,v$(OLSR_VERSION)) OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \ - mdns nameservice p2pd pgraph secure txtinfo watchdog + mdns nameservice netjson poprouting p2pd pgraph secure txtinfo watchdog # Doesn't really need quagga but not very useful without it OLSR_PLUGINS += $(if $(BR2_PACKAGE_QUAGGA),quagga) OLSR_LICENSE = BSD-3-Clause, LGPL-2.1+ OLSR_LICENSE_FILES = license.txt lib/pud/nmealib/LICENSE OLSR_DEPENDENCIES = host-flex host-bison +OLSR_CFLAGS = $(TARGET_CFLAGS) + +# it needs -fPIC to link on lot of architectures +OLSR_CFLAGS += -fPIC + define OLSR_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D) olsrd - for p in $(OLSR_PLUGINS) ; do \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D)/lib/$$p ; \ - done + $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) \ + CFLAGS="$(OLSR_CFLAGS)" -C $(@D) olsrd + $(foreach p,$(OLSR_PLUGINS), \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) \ + CFLAGS="$(OLSR_CFLAGS)" -C $(@D)/lib/$(p) + ) endef define OLSR_INSTALL_TARGET_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \ prefix="/usr" install_bin - for p in $(OLSR_PLUGINS) ; do \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/lib/$$p \ + $(foreach p,$(OLSR_PLUGINS), \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/lib/$(p) \ LDCONFIG=/bin/true DESTDIR=$(TARGET_DIR) \ - prefix="/usr" install ; \ - done + prefix="/usr" install + ) $(INSTALL) -D -m 0644 $(@D)/files/olsrd.conf.default.lq \ $(TARGET_DIR)/etc/olsrd/olsrd.conf endef @@ -43,9 +48,6 @@ endef define OLSR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/olsr/olsr.service \ $(TARGET_DIR)/usr/lib/systemd/system/olsr.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/olsr.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/olsr.service endef $(eval $(generic-package)) diff --git a/buildroot/package/omap-u-boot-utils/omap-u-boot-utils.hash b/buildroot/package/omap-u-boot-utils/omap-u-boot-utils.hash index 020c4405c..e61bb812e 100644 --- a/buildroot/package/omap-u-boot-utils/omap-u-boot-utils.hash +++ b/buildroot/package/omap-u-boot-utils/omap-u-boot-utils.hash @@ -1,2 +1,3 @@ # locally computed sha256 f9c2553efeff1289b2b964a266a0b4a03a377f84a14d0599a779f6e3d7b75d5f omap-u-boot-utils-3f07426cddc0be9e24702e7aacc7574ddd7fba28.tar.gz +sha256 1080312c3230fb7dd32fe807ed8c8cd11f4061bf1a2f065b651630bfe30157b2 COPYING diff --git a/buildroot/package/omniorb/omniorb.hash b/buildroot/package/omniorb/omniorb.hash index 3f4af2e64..9911c4d6a 100644 --- a/buildroot/package/omniorb/omniorb.hash +++ b/buildroot/package/omniorb/omniorb.hash @@ -1,3 +1,7 @@ -# From http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.2/ -sha1 0c682542290cabb22878b3ef492de3e85c4b4281 omniORB-4.2.2.tar.bz2 -md5 cc6b2a65a2b1c1b3d44b3ccbaf92e104 omniORB-4.2.2.tar.bz2 +# From http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.3/ +sha1 0af1b8c181088c096de237315cce7b52fc457c78 omniORB-4.2.3.tar.bz2 + +# Locally generated +sha256 26412ac08ab495ce5a6a8e40961fa20b7c43f623c6c26b616d210ca32f078bca omniORB-4.2.3.tar.bz2 +sha256 126647a6ee062fe46f8f3766965dc62e031c0a31238a347e4bc07aab2ac1e2a7 COPYING +sha256 eaf5b13ffd5355da7c0b83074e4b798152ff7086c95c4f3045122a06e2673eb9 COPYING.LIB diff --git a/buildroot/package/omniorb/omniorb.mk b/buildroot/package/omniorb/omniorb.mk index 2f094b576..b5caf6ff8 100644 --- a/buildroot/package/omniorb/omniorb.mk +++ b/buildroot/package/omniorb/omniorb.mk @@ -4,7 +4,7 @@ # ################################################################################ -OMNIORB_VERSION = 4.2.2 +OMNIORB_VERSION = 4.2.3 OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION) OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2 OMNIORB_INSTALL_STAGING = YES diff --git a/buildroot/package/omxplayer/omxplayer.hash b/buildroot/package/omxplayer/omxplayer.hash index ad084e264..fcbf730ab 100644 --- a/buildroot/package/omxplayer/omxplayer.hash +++ b/buildroot/package/omxplayer/omxplayer.hash @@ -1,6 +1,6 @@ # Locally computed: -sha1 258316ff94a1f1e5e47a5bb1a28d324ab08871a9 omxplayer-2ee17b22a6149a043a2e402580504f282c615373.tar.gz -sha256 c16498258ee78c59f9705b621e4b5b7b0673e1687d94681f9dc52451b1ceba48 omxplayer-2ee17b22a6149a043a2e402580504f282c615373.tar.gz +sha1 a9106203f822fe88eb35980479f46a555086d4a7 omxplayer-f06235cc9690a6d58187514452df8cf8fcdaacec.tar.gz +sha256 af2d9450f8947842ea8c401fe9f71eec444013ebbdee29f2ac828c9c493c1329 omxplayer-f06235cc9690a6d58187514452df8cf8fcdaacec.tar.gz # Hash for license file: -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 60e78ba9f921bb06bcf957575245414b1577c9688a63ddd73bc65f9d48fe31c9 COPYING diff --git a/buildroot/package/omxplayer/omxplayer.mk b/buildroot/package/omxplayer/omxplayer.mk index 699926916..072274cdf 100644 --- a/buildroot/package/omxplayer/omxplayer.mk +++ b/buildroot/package/omxplayer/omxplayer.mk @@ -4,7 +4,7 @@ # ################################################################################ -OMXPLAYER_VERSION = 2ee17b22a6149a043a2e402580504f282c615373 +OMXPLAYER_VERSION = f06235cc9690a6d58187514452df8cf8fcdaacec OMXPLAYER_SITE = $(call github,popcornmix,omxplayer,$(OMXPLAYER_VERSION)) OMXPLAYER_LICENSE = GPL-2.0+ OMXPLAYER_LICENSE_FILES = COPYING diff --git a/buildroot/package/oniguruma/Config.in b/buildroot/package/oniguruma/Config.in new file mode 100644 index 000000000..2e8b41c1d --- /dev/null +++ b/buildroot/package/oniguruma/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_ONIGURUMA + bool "oniguruma" + help + Oniguruma is a modern and flexible regular expressions + library. It encompasses features from different regular + expression implementations that traditionally exist in + different languages. + + https://github.com/kkos/oniguruma diff --git a/buildroot/package/oniguruma/oniguruma.hash b/buildroot/package/oniguruma/oniguruma.hash new file mode 100644 index 000000000..b0764ab1f --- /dev/null +++ b/buildroot/package/oniguruma/oniguruma.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53 onig-6.9.4.tar.gz +sha256 ae266a1ad1c2ef50baf14a1a2993e926cd46d09c6cc8b0b3a8498e44da2746b8 COPYING diff --git a/buildroot/package/oniguruma/oniguruma.mk b/buildroot/package/oniguruma/oniguruma.mk new file mode 100644 index 000000000..2126ff912 --- /dev/null +++ b/buildroot/package/oniguruma/oniguruma.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# oniguruma +# +################################################################################ + +ONIGURUMA_VERSION = 6.9.4 +ONIGURUMA_SITE = \ + https://github.com/kkos/oniguruma/releases/download/v$(ONIGURUMA_VERSION) +ONIGURUMA_SOURCE = onig-$(ONIGURUMA_VERSION).tar.gz +ONIGURUMA_LICENSE = BSD-2-Clause +ONIGURUMA_LICENSE_FILES = COPYING +ONIGURUMA_INSTALL_STAGING = YES + +$(eval $(autotools-package)) diff --git a/buildroot/package/open-lldp/open-lldp.mk b/buildroot/package/open-lldp/open-lldp.mk index b650aea3c..c9fd958a4 100644 --- a/buildroot/package/open-lldp/open-lldp.mk +++ b/buildroot/package/open-lldp/open-lldp.mk @@ -13,12 +13,4 @@ OPEN_LLDP_LICENSE_FILES = COPYING # Fetching from git, need to generate configure/Makefile.in OPEN_LLDP_AUTORECONF = YES -# Create the m4 directory (missing from the archive). -# This is required for autoconf. -define OPEN_LLDP_CREATE_M4 - mkdir -p $(@D)/m4 -endef - -OPEN_LLDP_PRE_CONFIGURE_HOOKS += OPEN_LLDP_CREATE_M4 - $(eval $(autotools-package)) diff --git a/buildroot/package/open-plc-utils/open-plc-utils.hash b/buildroot/package/open-plc-utils/open-plc-utils.hash index a76630df9..0c3b64b7e 100644 --- a/buildroot/package/open-plc-utils/open-plc-utils.hash +++ b/buildroot/package/open-plc-utils/open-plc-utils.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 00cd7f71e03849b1d6a96ec040351b819481e2f420cfb246f0b0f02cde73e098 open-plc-utils-1be781d1ea81827e5f6c1a35961c65dd4d15472c.tar.gz +sha256 00cd7f71e03849b1d6a96ec040351b819481e2f420cfb246f0b0f02cde73e098 open-plc-utils-1be781d1ea81827e5f6c1a35961c65dd4d15472c.tar.gz +sha256 3137c632bbcec5e88b72dc13f4fe06ee184eea364fec8f7494bdfa57672ef921 LICENSE diff --git a/buildroot/package/open2300/open2300.hash b/buildroot/package/open2300/open2300.hash new file mode 100644 index 000000000..414041b92 --- /dev/null +++ b/buildroot/package/open2300/open2300.hash @@ -0,0 +1,6 @@ +# Localy computed +# Note: open2300's upstream svn tree is off-line, so this tarball is +# served from s.b.o. instead, which actually makes it stable. +sha256 f4239d2f16d52156586d06be38f06a3eb58168377e243a8de8720b66e33ddb8f open2300-12.tar.gz + +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/openal/openal.hash b/buildroot/package/openal/openal.hash index cb41dc4e1..a133808ca 100644 --- a/buildroot/package/openal/openal.hash +++ b/buildroot/package/openal/openal.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 9f8ac1e27fba15a59758a13f0c7f6540a0605b6c3a691def9d420570506d7e82 openal-soft-1.18.2.tar.bz2 +sha256 9f3536ab2bb7781dbafabc6a61e0b34b17edd16bd6c2eaf2ae71bc63078f98c7 openal-1.19.1.tar.gz +sha256 d808ce217e5b611854da622b57ec29fe545584c48bc5352fae72a4b6e5074a15 COPYING diff --git a/buildroot/package/openal/openal.mk b/buildroot/package/openal/openal.mk index c687c08be..8e761a8d9 100644 --- a/buildroot/package/openal/openal.mk +++ b/buildroot/package/openal/openal.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENAL_VERSION = 1.18.2 -OPENAL_SOURCE = openal-soft-$(OPENAL_VERSION).tar.bz2 -OPENAL_SITE = http://kcat.strangesoft.net/openal-releases +OPENAL_VERSION = 1.19.1 +OPENAL_SITE = $(call github,kcat,openal-soft,openal-soft-$(OPENAL_VERSION)) OPENAL_LICENSE = LGPL-2.0+ OPENAL_LICENSE_FILES = COPYING OPENAL_INSTALL_STAGING = YES diff --git a/buildroot/package/openblas/0001-Makefile.arm-remove-march-flags.patch b/buildroot/package/openblas/0001-Makefile.arm-remove-march-flags.patch deleted file mode 100644 index db975de59..000000000 --- a/buildroot/package/openblas/0001-Makefile.arm-remove-march-flags.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e6c498f68b61057fb5505e41c3858c2b5d223227 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Aug 2016 23:20:00 +0200 -Subject: [PATCH] Makefile.arm: remove -march flags - -The provided -march flags, especially for ARMv5 and ARMv6 may not -necessarily match the needed ones: for ARMv5, it might be armv5, -armv5te, armv5t, etc. If the wrong one is used, the incorrect toolchain -sysroot can be used in a multilib toolchain. - -Therefore, let the user building OpenBLAS pass the appropriate -march -flag. - -The other flags, such as -mfpu=vfp or -mfloat-abi=hard are kept, as they -are actually required for the build to proceed (OpenBLAS uses VFP -instructions, and assume an EABIhf ABI). - -[Peter: update for v0.2.20] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Peter Korsgaard ---- - Makefile.arm | 13 ++++--------- - 1 file changed, 4 insertions(+), 9 deletions(-) - -diff --git a/Makefile.arm b/Makefile.arm -index eedd39b7..b5d80f8e 100644 ---- a/Makefile.arm -+++ b/Makefile.arm -@@ -1,7 +1,7 @@ - ifeq ($(CORE), $(filter $(CORE),ARMV7 CORTEXA9 CORTEXA15)) - ifeq ($(OSNAME), Android) --CCOMMON_OPT += -mfpu=neon -march=armv7-a --FCOMMON_OPT += -mfpu=neon -march=armv7-a -+CCOMMON_OPT += -mfpu=neon -+FCOMMON_OPT += -mfpu=neon - else - CCOMMON_OPT += -mfpu=vfpv3 -march=armv7-a - FCOMMON_OPT += -mfpu=vfpv3 -march=armv7-a -@@ -9,11 +9,6 @@ endif - endif - - ifeq ($(CORE), ARMV6) --CCOMMON_OPT += -mfpu=vfp -march=armv6 --FCOMMON_OPT += -mfpu=vfp -march=armv6 --endif -- --ifeq ($(CORE), ARMV5) --CCOMMON_OPT += -march=armv5 --FCOMMON_OPT += -march=armv5 -+CCOMMON_OPT += -mfpu=vfp -+FCOMMON_OPT += -mfpu=vfp - endif --- -2.11.0 - diff --git a/buildroot/package/openblas/0002-Rework-__GLIBC_PREREQ-checks-to-avoid-breaking-non-g.patch b/buildroot/package/openblas/0002-Rework-__GLIBC_PREREQ-checks-to-avoid-breaking-non-g.patch deleted file mode 100644 index 7659ee088..000000000 --- a/buildroot/package/openblas/0002-Rework-__GLIBC_PREREQ-checks-to-avoid-breaking-non-g.patch +++ /dev/null @@ -1,73 +0,0 @@ -From ad0f270ed32635d8ef9a7446ae280db415cf78ac Mon Sep 17 00:00:00 2001 -From: Martin Kroeker -Date: Mon, 31 Jul 2017 21:02:43 +0200 -Subject: [PATCH] Rework __GLIBC_PREREQ checks to avoid breaking non-glibc - builds - -[baruch: backported to v0.2.20 -Signed-off-by: Baruch Siach ---- -Upstream status: commit 63cfa32691680 - - driver/others/memory.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/driver/others/memory.c b/driver/others/memory.c -index 38d063715602..79d6988e08a4 100644 ---- a/driver/others/memory.c -+++ b/driver/others/memory.c -@@ -155,7 +155,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef DYNAMIC_ARCH - gotoblas_t *gotoblas = NULL; - #endif -- - extern void openblas_warning(int verbose, const char * msg); - - #ifndef SMP -@@ -187,25 +186,24 @@ int i,n; - - #if !defined(__GLIBC_PREREQ) - return nums; --#endif --#if !__GLIBC_PREREQ(2, 3) -+#else -+ #if !__GLIBC_PREREQ(2, 3) - return nums; --#endif -+ #endif - --#if !__GLIBC_PREREQ(2, 7) -+ #if !__GLIBC_PREREQ(2, 7) - ret = sched_getaffinity(0,sizeof(cpu_set_t), cpusetp); - if (ret!=0) return nums; - n=0; --#if !__GLIBC_PREREQ(2, 6) -+ #if !__GLIBC_PREREQ(2, 6) - for (i=0;i -Date: Tue, 17 Apr 2018 18:46:29 +0300 -Subject: [PATCH] Fix build when __GLIBC_PREREQ is not defined - -Rearrange the code so that __GLIBC_PREREQ is not used when not defined. -This fixes build with musl libc. - -[baruch: backport to v0.2.20] -Signed-off-by: Baruch Siach ---- -Upstream status: combines upstream commits 480e69768176 and c4af196a2d ---- - driver/others/init.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/driver/others/init.c b/driver/others/init.c -index 4c75d72e4075..adce075f0ac0 100644 ---- a/driver/others/init.c -+++ b/driver/others/init.c -@@ -838,7 +838,11 @@ void gotoblas_affinity_init(void) { - - nums = sysconf(_SC_NPROCESSORS_CONF); - --#if !defined(__GLIBC_PREREQ) || !__GLIBC_PREREQ(2, 3) -+#if !defined(__GLIBC_PREREQ) -+ common->num_procs = nums; -+#else -+ -+#if !__GLIBC_PREREQ(2, 3) - common->num_procs = nums; - #elif __GLIBC_PREREQ(2, 7) - cpusetp = CPU_ALLOC(nums); -@@ -872,6 +876,8 @@ void gotoblas_affinity_init(void) { - - #endif - -+#endif -+ - if(common -> num_procs > MAX_CPUS) { - fprintf(stderr, "\nOpenBLAS Warning : The number of CPU/Cores(%d) is beyond the limit(%d). Terminated.\n", common->num_procs, MAX_CPUS); - exit(1); --- -2.17.0 - diff --git a/buildroot/package/openblas/openblas.hash b/buildroot/package/openblas/openblas.hash index e4a3989f6..5b1fb17fa 100644 --- a/buildroot/package/openblas/openblas.hash +++ b/buildroot/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5ef38b15d9c652985774869efd548b8e3e972e1e99475c673b25537ed7bcf394 openblas-v0.2.20.tar.gz +sha256 bde136122cef3dd6efe2de1c6f65c10955bbb0cc01a520c2342f5287c28f9379 openblas-0.3.7.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/buildroot/package/openblas/openblas.mk b/buildroot/package/openblas/openblas.mk index e9a87b026..f06840226 100644 --- a/buildroot/package/openblas/openblas.mk +++ b/buildroot/package/openblas/openblas.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENBLAS_VERSION = v0.2.20 -OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,$(OPENBLAS_VERSION)) +OPENBLAS_VERSION = 0.3.7 +OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,v$(OPENBLAS_VERSION)) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES diff --git a/buildroot/package/openbox/Config.in b/buildroot/package/openbox/Config.in index 3ddd37680..fe6e88686 100644 --- a/buildroot/package/openbox/Config.in +++ b/buildroot/package/openbox/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_OPENBOX depends on BR2_USE_MMU # glib2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBXML2 @@ -19,9 +20,10 @@ config BR2_PACKAGE_OPENBOX http://openbox.org -comment "openbox needs a toolchain w/ C++, threads, wchar" +comment "openbox needs a toolchain w/ C++, threads, wchar, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_XORG7 diff --git a/buildroot/package/openbox/openbox.hash b/buildroot/package/openbox/openbox.hash index a8696b3f8..c3f9953a9 100644 --- a/buildroot/package/openbox/openbox.hash +++ b/buildroot/package/openbox/openbox.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d openbox-3.6.1.tar.xz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/opencv/Config.in b/buildroot/package/opencv/Config.in index 54094b29c..836f5c96e 100644 --- a/buildroot/package/opencv/Config.in +++ b/buildroot/package/opencv/Config.in @@ -195,44 +195,21 @@ config BR2_PACKAGE_OPENCV_WITH_FFMPEG help Use ffmpeg from the target system. -choice - prompt "gstreamer support" - help - OpenCV prefers gstreamer-1 over gstreamer-0.10. - -config BR2_PACKAGE_OPENCV_WITHOUT_GSTREAMER - bool "none" - -config BR2_PACKAGE_OPENCV_WITH_GSTREAMER - bool "gstreamer-0.10" - depends on BR2_USE_MMU # gstreamer -> libglib2 - depends on BR2_USE_WCHAR # gstreamer -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2 - depends on !BR2_STATIC_LIBS # gstreamer - select BR2_PACKAGE_GSTREAMER - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - -comment "gstreamer-0.10 support needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - config BR2_PACKAGE_OPENCV_WITH_GSTREAMER1 - bool "gstreamer-1.x" + bool "gstreamer support" depends on BR2_USE_MMU # gstreamer1 -> libglib2 depends on BR2_USE_WCHAR # gstreamer1 -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer1 -> libglib2 select BR2_PACKAGE_GSTREAMER1 select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + help + Enable gstreamer support. -comment "gstreamer-1.x support needs a toolchain w/ wchar, threads" +comment "gstreamer support needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS -endchoice - config BR2_PACKAGE_OPENCV_WITH_GTK bool "gtk support" depends on BR2_PACKAGE_XORG7 @@ -241,6 +218,7 @@ config BR2_PACKAGE_OPENCV_WITH_GTK depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # libgtk2 -> glib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI select BR2_PACKAGE_LIBGTK2 diff --git a/buildroot/package/opencv/opencv.mk b/buildroot/package/opencv/opencv.mk index ccc2d820d..939058e4e 100644 --- a/buildroot/package/opencv/opencv.mk +++ b/buildroot/package/opencv/opencv.mk @@ -10,6 +10,7 @@ OPENCV_INSTALL_STAGING = YES OPENCV_LICENSE = BSD-3-Clause OPENCV_LICENSE_FILES = LICENSE OPENCV_SUPPORTS_IN_SOURCE_BUILD = NO +OPENCV_CXXFLAGS = $(TARGET_CXXFLAGS) # OpenCV component options OPENCV_CONF_OPTS += \ @@ -154,6 +155,7 @@ OPENCV_CONF_OPTS += \ OPENCV_CONF_OPTS += \ -DWITH_1394=OFF \ -DWITH_EIGEN=OFF \ + -DWITH_GSTREAMER_0_10=OFF \ -DWITH_IMAGEIO=OFF \ -DWITH_OPENCL=OFF \ -DWITH_OPENEXR=OFF \ @@ -166,6 +168,10 @@ OPENCV_CONF_OPTS += \ OPENCV_DEPENDENCIES += zlib +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +OPENCV_CXXFLAGS += -O0 +endif + ifeq ($(BR2_PACKAGE_OPENCV_WITH_FFMPEG),y) OPENCV_CONF_OPTS += -DWITH_FFMPEG=ON OPENCV_DEPENDENCIES += ffmpeg bzip2 @@ -173,13 +179,6 @@ else OPENCV_CONF_OPTS += -DWITH_FFMPEG=OFF endif -ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER),y) -OPENCV_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON -OPENCV_DEPENDENCIES += gstreamer gst-plugins-base -else -OPENCV_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF -endif - ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER1),y) OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON OPENCV_DEPENDENCIES += gstreamer1 gst1-plugins-base @@ -195,8 +194,8 @@ OPENCV_CONF_OPTS += -DWITH_GTK=OFF endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_JASPER),y) -OPENCV_CONF_OPTS += -DWITH_JASPER=ON \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -D__STDC_LIMIT_MACROS" +OPENCV_CONF_OPTS += -DWITH_JASPER=ON +OPENCV_CXXFLAGS += -D__STDC_LIMIT_MACROS OPENCV_DEPENDENCIES += jasper else OPENCV_CONF_OPTS += -DWITH_JASPER=OFF @@ -232,6 +231,8 @@ else OPENCV_CONF_OPTS += -DWITH_V4L=OFF -DWITH_LIBV4L=OFF endif +OPENCV_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(OPENCV_CXXFLAGS)" + # Installation hooks: define OPENCV_CLEAN_INSTALL_DOC $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/doc diff --git a/buildroot/package/opencv3/Config.in b/buildroot/package/opencv3/Config.in index cf7763d4a..d4b17b6ac 100644 --- a/buildroot/package/opencv3/Config.in +++ b/buildroot/package/opencv3/Config.in @@ -249,27 +249,6 @@ config BR2_PACKAGE_OPENCV3_WITH_FFMPEG help Use ffmpeg from the target system. -choice - prompt "gstreamer support" - help - OpenCV prefers gstreamer-1 over gstreamer-0.10. - -config BR2_PACKAGE_OPENCV3_WITHOUT_GSTREAMER - bool "none" - -config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER - bool "gstreamer-0.10" - depends on BR2_USE_MMU # gstreamer -> libglib2 - depends on BR2_USE_WCHAR # gstreamer -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2 - select BR2_PACKAGE_GSTREAMER - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - -comment "gstreamer-0.10 support needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1 bool "gstreamer-1.x" depends on BR2_USE_MMU # gstreamer1 -> libglib2 @@ -278,13 +257,13 @@ config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1 select BR2_PACKAGE_GSTREAMER1 select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + help + Enable gstreamer support. -comment "gstreamer-1.x support needs a toolchain w/ wchar, threads" +comment "gstreamer support needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS -endchoice - config BR2_PACKAGE_OPENCV3_WITH_JASPER bool "jpeg2000 support" select BR2_PACKAGE_JASPER @@ -307,6 +286,18 @@ config BR2_PACKAGE_OPENCV3_WITH_PNG help Use shared libpng from the target system. +config BR2_PACKAGE_OPENCV3_WITH_PROTOBUF + bool "protobuf support" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + select BR2_PACKAGE_PROTOBUF + help + Use shared protobuf from the target system. + +comment "protobuf support needs a toolchain w/ gcc >= 4.8" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + config BR2_PACKAGE_OPENCV3_WITH_TIFF bool "tiff support" select BR2_PACKAGE_TIFF diff --git a/buildroot/package/opencv3/opencv3.mk b/buildroot/package/opencv3/opencv3.mk index a6d795bd8..fab671634 100644 --- a/buildroot/package/opencv3/opencv3.mk +++ b/buildroot/package/opencv3/opencv3.mk @@ -104,17 +104,15 @@ OPENCV3_CONF_OPTS += \ # Hardware support options. # -# * PowerPC support is turned off since its only effect is altering CFLAGS, -# adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot. +# * PowerPC and VFPv3 support are turned off since their only effects +# are altering CFLAGS, adding '-mcpu=G3 -mtune=G5' or '-mfpu=vfpv3' +# to them, which is already handled by Buildroot. +# * NEON logic is needed as it is not only used to add CFLAGS, but +# also to enable additional NEON code. OPENCV3_CONF_OPTS += \ -DENABLE_POWERPC=OFF \ - -DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF) - -ifeq ($(BR2_ARCH_IS_64):$(BR2_ARM_CPU_HAS_VFPV3),:y) -OPENCV3_CONF_OPTS += -DENABLE_VFPV3=ON -else -OPENCV3_CONF_OPTS += -DENABLE_VFPV3=OFF -endif + -DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF) \ + -DENABLE_VFPV3=OFF # Cuda stuff OPENCV3_CONF_OPTS += \ @@ -193,6 +191,7 @@ OPENCV3_CONF_OPTS += \ -DBUILD_JPEG=OFF \ -DBUILD_OPENEXR=OFF \ -DBUILD_PNG=OFF \ + -DBUILD_PROTOBUF=OFF \ -DBUILD_TIFF=OFF \ -DBUILD_ZLIB=OFF \ -DINSTALL_C_EXAMPLES=OFF \ @@ -207,6 +206,7 @@ OPENCV3_CONF_OPTS += \ -DWITH_EIGEN=OFF \ -DWITH_GDAL=OFF \ -DWITH_GPHOTO2=OFF \ + -DWITH_GSTREAMER_0_10=OFF \ -DWITH_LAPACK=OFF \ -DWITH_MATLAB=OFF \ -DWITH_OPENCL=OFF \ @@ -230,13 +230,6 @@ else OPENCV3_CONF_OPTS += -DWITH_FFMPEG=OFF endif -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GSTREAMER),y) -OPENCV3_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON -OPENCV3_DEPENDENCIES += gstreamer gst-plugins-base -else -OPENCV3_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF -endif - ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1),y) OPENCV3_CONF_OPTS += -DWITH_GSTREAMER=ON OPENCV3_DEPENDENCIES += gstreamer1 gst1-plugins-base @@ -279,7 +272,7 @@ else OPENCV3_CONF_OPTS += -DWITH_OPENGL=OFF endif -OPENCV3_CONF_OPTS += -DWITH_OPENMP=$(if $(BR2_GCC_ENABLE_OPENMP),ON,OFF) +OPENCV3_CONF_OPTS += -DWITH_OPENMP=$(if $(BR2_TOOLCHAIN_HAS_OPENMP),ON,OFF) ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PNG),y) OPENCV3_CONF_OPTS += -DWITH_PNG=ON @@ -288,6 +281,15 @@ else OPENCV3_CONF_OPTS += -DWITH_PNG=OFF endif +ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PROTOBUF),y) +OPENCV3_CONF_OPTS += \ + -DPROTOBUF_UPDATE_FILES=ON \ + -DWITH_PROTOBUF=ON +OPENCV3_DEPENDENCIES += protobuf +else +OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=OFF +endif + ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y) OPENCV3_CONF_OPTS += -DWITH_QT=5 OPENCV3_DEPENDENCIES += qt5base @@ -329,8 +331,8 @@ OPENCV3_CONF_OPTS += \ -DBUILD_opencv_python2=OFF \ -DBUILD_opencv_python3=ON \ -DPYTHON3_EXECUTABLE=$(HOST_DIR)/bin/python3 \ - -DPYTHON3_INCLUDE_PATH=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m \ - -DPYTHON3_LIBRARIES=$(STAGING_DIR)/usr/lib/libpython$(PYTHON3_VERSION_MAJOR)m.so \ + -DPYTHON3_INCLUDE_PATH=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + -DPYTHON3_LIBRARIES=$(STAGING_DIR)/usr/lib/libpython$(PYTHON3_VERSION_MAJOR).so \ -DPYTHON3_NUMPY_INCLUDE_DIRS=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/include \ -DPYTHON3_PACKAGES_PATH=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) diff --git a/buildroot/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch b/buildroot/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch new file mode 100644 index 000000000..112d63854 --- /dev/null +++ b/buildroot/package/openipmi/0002-sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch @@ -0,0 +1,31 @@ +From 6a051666b50ae1df24b24312a7a56a03e343c15d Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 16 Aug 2019 09:48:21 +0300 +Subject: [PATCH] sample: fix readline include in ipmi_serial_bmc_emu.c + +Bundled editline has been removed. Use the readline headers instead. Fix +the build when editline is not installed on host. + +Signed-off-by: Baruch Siach +--- +Upstream status: sent to openipmi-developer@lists.sourceforge.net (moderated) + + sample/ipmi_serial_bmc_emu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c +index e0ae0197688b..1b8bb9ac201f 100644 +--- a/sample/ipmi_serial_bmc_emu.c ++++ b/sample/ipmi_serial_bmc_emu.c +@@ -42,7 +42,7 @@ + #include + #include + #include +-#include ++#include + + #define _GNU_SOURCE + #include +-- +2.23.0.rc1 + diff --git a/buildroot/package/openipmi/Config.in b/buildroot/package/openipmi/Config.in index d8c94b307..22fb9fa7b 100644 --- a/buildroot/package/openipmi/Config.in +++ b/buildroot/package/openipmi/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_OPENIPMI depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_POPT select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_READLINE help IPMI allows remote monitoring and remote management of devices. OpenIPMI provides a library and command line tools diff --git a/buildroot/package/openipmi/openipmi.hash b/buildroot/package/openipmi/openipmi.hash index 37048ca2a..756ea539f 100644 --- a/buildroot/package/openipmi/openipmi.hash +++ b/buildroot/package/openipmi/openipmi.hash @@ -1,4 +1,7 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 f37656813a826a3147ed557c32408f8daa399c28 OpenIPMI-2.0.24.tar.gz +sha1 043738af9e1aaa6ae4f372d4af7870683e68faf8 OpenIPMI-2.0.27.tar.gz # Locally computed -sha256 bca39a27071278a8b74610181ede8df51e155e5e9031bc8eaa3699d1720292b4 OpenIPMI-2.0.24.tar.gz +sha256 f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b OpenIPMI-2.0.27.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/buildroot/package/openipmi/openipmi.mk b/buildroot/package/openipmi/openipmi.mk index 8e91e4ed0..ca8fa7734 100644 --- a/buildroot/package/openipmi/openipmi.mk +++ b/buildroot/package/openipmi/openipmi.mk @@ -4,12 +4,13 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.24 +OPENIPMI_VERSION = 2.0.27 OPENIPMI_SITE = http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD -OPENIPMI_DEPENDENCIES = popt ncurses host-pkgconf +OPENIPMI_DEPENDENCIES = popt ncurses readline host-pkgconf +OPENIPMI_INSTALL_STAGING = YES # Patching Makefile.am OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" diff --git a/buildroot/package/openjdk-bin/openjdk-bin.hash b/buildroot/package/openjdk-bin/openjdk-bin.hash new file mode 100644 index 000000000..3e4df5923 --- /dev/null +++ b/buildroot/package/openjdk-bin/openjdk-bin.hash @@ -0,0 +1,6 @@ +# From https://github.com/AdoptOpenJDK/openjdk12-binaries/releases +sha256 9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998 OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz + +# Locally calculated +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE +sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION diff --git a/buildroot/package/openjdk-bin/openjdk-bin.mk b/buildroot/package/openjdk-bin/openjdk-bin.mk new file mode 100644 index 000000000..e780a797e --- /dev/null +++ b/buildroot/package/openjdk-bin/openjdk-bin.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# host-openjdk-bin +# +################################################################################ + +HOST_OPENJDK_BIN_VERSION_MAJOR = 13.0.2 +HOST_OPENJDK_BIN_VERSION_MINOR = 8 +HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_SOURCE = OpenJDK13U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception +HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION + +# unpack200 has an invalid RPATH and relies on libzlib. When +# host-libzlib is installed on the system, the error "ERROR: package +# host-libzlib installs executables without proper RPATH: will occur. +# Because unpack200 is a deprecated tool, removing it to fix this +# issue is safe. +define HOST_OPENJDK_BIN_INSTALL_CMDS + mkdir -p $(HOST_DIR)/bin + cp -dpfr $(@D)/bin/* $(HOST_DIR)/bin/ + mkdir -p $(HOST_DIR)/lib + cp -dpfr $(@D)/lib/* $(HOST_DIR)/lib/ + $(RM) -f $(HOST_DIR)/bin/unpack200 +endef + +$(eval $(host-generic-package)) diff --git a/buildroot/package/openjdk/Config.in b/buildroot/package/openjdk/Config.in new file mode 100644 index 000000000..61294ec49 --- /dev/null +++ b/buildroot/package/openjdk/Config.in @@ -0,0 +1,98 @@ +config BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS + bool + default y if BR2_HOSTARCH = "x86_64" + +# Taken from make/autoconf/platform.m4 +config BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_i386 || BR2_x86_64 + default y if BR2_m68k + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_sh + default y if BR2_sparc || BR2_sparc64 + +config BR2_PACKAGE_OPENJDK + bool "openjdk" + depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS + depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS + depends on !BR2_SOFT_FLOAT + depends on !BR2_STATIC_LIBS # glibc + depends on BR2_INSTALL_LIBSTDCPP # cups + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, cups, libusb + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_USE_MMU # cups + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_MIXER + select BR2_PACKAGE_ALSA_LIB_PCM + select BR2_PACKAGE_ALSA_LIB_RAWMIDI + select BR2_PACKAGE_ALSA_LIB_SEQ + select BR2_PACKAGE_CUPS + select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_GIFLIB + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LCMS2 + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXRENDER + select BR2_PACKAGE_XLIB_LIBXT + select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_ZLIB + help + OpenJDK is a free and open-source implementation of the + Java Platform. + + http://openjdk.java.net/ + +if BR2_PACKAGE_OPENJDK + +choice + prompt "openjdk variant" + default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpc + default BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_powerpc + +config BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT + bool "client" + depends on !BR2_powerpc + help + Quick loading, but slower run-time performance. + +config BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER + bool "server" + depends on !BR2_powerpc + help + Slower loading, but faster run-time performance. + +config BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO + bool "zero" + select BR2_PACKAGE_LIBFFI + help + A non-assembler variant with wide arch support, however + performance is less then client/server. + + http://openjdk.java.net/projects/zero + +endchoice +endif + +comment "openjdk needs X.Org" + depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_XORG7 + +comment "openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC + +comment "openjdk does not support soft float configurations" + depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on BR2_SOFT_FLOAT diff --git a/buildroot/package/openjdk/openjdk.hash b/buildroot/package/openjdk/openjdk.hash new file mode 100644 index 000000000..ca282591e --- /dev/null +++ b/buildroot/package/openjdk/openjdk.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0 jdk-13.0.2+8.tar.gz +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/buildroot/package/openjdk/openjdk.mk b/buildroot/package/openjdk/openjdk.mk new file mode 100644 index 000000000..030a20522 --- /dev/null +++ b/buildroot/package/openjdk/openjdk.mk @@ -0,0 +1,121 @@ +################################################################################ +# +# openjdk +# +################################################################################ + +OPENJDK_VERSION_MAJOR = 13.0.2 +OPENJDK_VERSION_MINOR = 8 +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) +OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz +OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk13u/archive +OPENJDK_LICENSE = GPL-2.0+ with exception +OPENJDK_LICENSE_FILES = LICENSE + +# OpenJDK requires Alsa, cups, and X11 even for a headless build. +# host-zip is needed for the zip executable. +OPENJDK_DEPENDENCIES = \ + host-gawk \ + host-openjdk-bin \ + host-pkgconf \ + host-zip \ + host-zlib \ + alsa-lib \ + cups \ + fontconfig \ + giflib \ + jpeg \ + lcms2 \ + libpng \ + libusb \ + xlib_libXrandr \ + xlib_libXrender \ + xlib_libXt \ + xlib_libXtst \ + zlib + +# JVM variants +ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT),y) +OPENJDK_JVM_VARIANT = client +endif +ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER),y) +OPENJDK_JVM_VARIANT = server +endif +ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO),y) +OPENJDK_JVM_VARIANT = zero +OPENJDK_DEPENDENCIES += libffi +endif + +# OpenJDK ignores some variables unless passed via the environment. +# These variables are PATH, LD, CC, CXX, and CPP. +# OpenJDK defaults ld to the ld binary but passes -Xlinker and -z as +# arguments during the linking process, which causes compilation failures. +# To fix this issue, LD is set to point to gcc. +OPENJDK_CONF_ENV = \ + PATH=$(BR_PATH) \ + CC=$(TARGET_CC) \ + CPP=$(TARGET_CPP) \ + CXX=$(TARGET_CXX) \ + LD=$(TARGET_CC) \ + BUILD_SYSROOT_CFLAGS="$(HOST_CFLAGS)" \ + BUILD_SYSROOT_LDFLAGS="$(HOST_LDFLAGS)" + +OPENJDK_CONF_OPTS = \ + --disable-full-docs \ + --disable-hotspot-gtest \ + --disable-manpages \ + --disable-warnings-as-errors \ + --enable-headless-only \ + --enable-openjdk-only \ + --enable-unlimited-crypto \ + --openjdk-target=$(GNU_TARGET_NAME) \ + --with-boot-jdk=$(HOST_DIR) \ + --with-stdc++lib=dynamic \ + --with-debug-level=release \ + --with-devkit=$(HOST_DIR) \ + --with-extra-cflags="$(TARGET_CFLAGS)" \ + --with-extra-cxxflags="$(TARGET_CXXFLAGS)" \ + --with-giflib=system \ + --with-jobs=$(PARALLEL_JOBS) \ + --with-jvm-variants=$(OPENJDK_JVM_VARIANT) \ + --with-lcms=system \ + --with-libjpeg=system \ + --with-libpng=system \ + --with-zlib=system \ + --with-native-debug-symbols=none \ + --without-version-pre \ + --with-sysroot=$(STAGING_DIR) \ + --with-version-build="$(OPENJDK_VERSION_MAJOR)" \ + --with-version-string="$(OPENJDK_VERSION_MAJOR)" + +# If building for AArch64, use the provided CPU port. +ifeq ($(BR2_aarch64),y) +OPENJDK_CONF_OPTS += --with-abi-profile=aarch64 +endif + +ifeq ($(BR2_CCACHE),y) +OPENJDK_CONF_OPTS += \ + --enable-ccache \ + --with-ccache-dir=$(BR2_CCACHE_DIR) +endif + +# Autogen and configure are performed in a single step. +define OPENJDK_CONFIGURE_CMDS + chmod +x $(@D)/configure + cd $(@D); $(OPENJDK_CONF_ENV) ./configure autogen $(OPENJDK_CONF_OPTS) +endef + +# Make -jn is unsupported. Instead, set the "--with-jobs=" configure option, +# and use $(MAKE1). +define OPENJDK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) legacy-jre-image +endef + +# Calling make install always builds and installs the JDK instead of the JRE, +# which makes manual installation necessary. +define OPENJDK_INSTALL_TARGET_CMDS + cp -dpfr $(@D)/build/linux-*-release/images/jre/bin/* $(TARGET_DIR)/usr/bin/ + cp -dpfr $(@D)/build/linux-*-release/images/jre/lib/* $(TARGET_DIR)/usr/lib/ +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/openjpeg/0004-convertbmp-detect-invalid-file-dimensions-early.patch b/buildroot/package/openjpeg/0004-convertbmp-detect-invalid-file-dimensions-early.patch new file mode 100644 index 000000000..c648020bf --- /dev/null +++ b/buildroot/package/openjpeg/0004-convertbmp-detect-invalid-file-dimensions-early.patch @@ -0,0 +1,71 @@ +From 21399f6b7d318fcdf4406d5e88723c4922202aa3 Mon Sep 17 00:00:00 2001 +From: Young Xiao +Date: Sat, 16 Mar 2019 19:57:27 +0800 +Subject: [PATCH] convertbmp: detect invalid file dimensions early + +width/length dimensions read from bmp headers are not necessarily +valid. For instance they may have been maliciously set to very large +values with the intention to cause DoS (large memory allocation, stack +overflow). In these cases we want to detect the invalid size as early +as possible. + +This commit introduces a counter which verifies that the number of +written bytes corresponds to the advertized width/length. + +See commit 8ee335227bbc for details. + +Signed-off-by: Young Xiao +[Retrieved from: +https://github.com/uclouvain/openjpeg/commit/21399f6b7d318fcdf4406d5e88723c4922202aa3] +Signed-off-by: Fabrice Fontaine +--- + src/bin/jp2/convertbmp.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/bin/jp2/convertbmp.c b/src/bin/jp2/convertbmp.c +index 0af52f816..ec34f535b 100644 +--- a/src/bin/jp2/convertbmp.c ++++ b/src/bin/jp2/convertbmp.c +@@ -622,13 +622,13 @@ static OPJ_BOOL bmp_read_rle8_data(FILE* IN, OPJ_UINT8* pData, + static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, + OPJ_UINT32 stride, OPJ_UINT32 width, OPJ_UINT32 height) + { +- OPJ_UINT32 x, y; ++ OPJ_UINT32 x, y, written; + OPJ_UINT8 *pix; + const OPJ_UINT8 *beyond; + + beyond = pData + stride * height; + pix = pData; +- x = y = 0U; ++ x = y = written = 0U; + while (y < height) { + int c = getc(IN); + if (c == EOF) { +@@ -642,6 +642,7 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, + for (j = 0; (j < c) && (x < width) && + ((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) { + *pix = (OPJ_UINT8)((j & 1) ? (c1 & 0x0fU) : ((c1 >> 4) & 0x0fU)); ++ written++; + } + } else { /* absolute mode */ + c = getc(IN); +@@ -671,6 +672,7 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, + c1 = (OPJ_UINT8)getc(IN); + } + *pix = (OPJ_UINT8)((j & 1) ? (c1 & 0x0fU) : ((c1 >> 4) & 0x0fU)); ++ written++; + } + if (((c & 3) == 1) || ((c & 3) == 2)) { /* skip padding byte */ + getc(IN); +@@ -678,6 +680,10 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, + } + } + } /* while(y < height) */ ++ if (written != width * height) { ++ fprintf(stderr, "warning, image's actual size does not match advertized one\n"); ++ return OPJ_FALSE; ++ } + return OPJ_TRUE; + } + diff --git a/buildroot/package/openjpeg/0005-bmp_read_rle4_data-avoid-potential-infinite-loop.patch b/buildroot/package/openjpeg/0005-bmp_read_rle4_data-avoid-potential-infinite-loop.patch new file mode 100644 index 000000000..dbaea3c8d --- /dev/null +++ b/buildroot/package/openjpeg/0005-bmp_read_rle4_data-avoid-potential-infinite-loop.patch @@ -0,0 +1,86 @@ +From 3aef207f90e937d4931daf6d411e092f76d82e66 Mon Sep 17 00:00:00 2001 +From: Young Xiao +Date: Sat, 16 Mar 2019 20:09:59 +0800 +Subject: [PATCH] bmp_read_rle4_data(): avoid potential infinite loop + +[Retrieved from: +https://github.com/uclouvain/openjpeg/commit/3aef207f90e937d4931daf6d411e092f76d82e66] +Signed-off-by: Fabrice Fontaine +--- + src/bin/jp2/convertbmp.c | 32 ++++++++++++++++++++++++++------ + 1 file changed, 26 insertions(+), 6 deletions(-) + +diff --git a/src/bin/jp2/convertbmp.c b/src/bin/jp2/convertbmp.c +index ec34f535b..2fc4e9bc4 100644 +--- a/src/bin/jp2/convertbmp.c ++++ b/src/bin/jp2/convertbmp.c +@@ -632,12 +632,18 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, + while (y < height) { + int c = getc(IN); + if (c == EOF) { +- break; ++ return OPJ_FALSE; + } + + if (c) { /* encoded mode */ +- int j; +- OPJ_UINT8 c1 = (OPJ_UINT8)getc(IN); ++ int j, c1_int; ++ OPJ_UINT8 c1; ++ ++ c1_int = getc(IN); ++ if (c1_int == EOF) { ++ return OPJ_FALSE; ++ } ++ c1 = (OPJ_UINT8)c1_int; + + for (j = 0; (j < c) && (x < width) && + ((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) { +@@ -647,7 +653,7 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, + } else { /* absolute mode */ + c = getc(IN); + if (c == EOF) { +- break; ++ return OPJ_FALSE; + } + + if (c == 0x00) { /* EOL */ +@@ -658,8 +664,14 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, + break; + } else if (c == 0x02) { /* MOVE by dxdy */ + c = getc(IN); ++ if (c == EOF) { ++ return OPJ_FALSE; ++ } + x += (OPJ_UINT32)c; + c = getc(IN); ++ if (c == EOF) { ++ return OPJ_FALSE; ++ } + y += (OPJ_UINT32)c; + pix = pData + y * stride + x; + } else { /* 03 .. 255 : absolute mode */ +@@ -669,13 +681,21 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, + for (j = 0; (j < c) && (x < width) && + ((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) { + if ((j & 1) == 0) { +- c1 = (OPJ_UINT8)getc(IN); ++ int c1_int; ++ c1_int = getc(IN); ++ if (c1_int == EOF) { ++ return OPJ_FALSE; ++ } ++ c1 = (OPJ_UINT8)c1_int; + } + *pix = (OPJ_UINT8)((j & 1) ? (c1 & 0x0fU) : ((c1 >> 4) & 0x0fU)); + written++; + } + if (((c & 3) == 1) || ((c & 3) == 2)) { /* skip padding byte */ +- getc(IN); ++ c = getc(IN); ++ if (c == EOF) { ++ return OPJ_FALSE; ++ } + } + } + } diff --git a/buildroot/package/openjpeg/0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch b/buildroot/package/openjpeg/0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch new file mode 100644 index 000000000..fe1390a31 --- /dev/null +++ b/buildroot/package/openjpeg/0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch @@ -0,0 +1,32 @@ +From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Sat, 11 Jan 2020 01:51:19 +0100 +Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose + coordinates are beyond INT_MAX (fixes #1228) + +[Retrieved from: +https://github.com/uclouvain/openjpeg/commit/024b8407392cb0b82b04b58ed256094ed5799e04] +Signed-off-by: Fabrice Fontaine +--- + src/lib/openjp2/j2k.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c +index 14f6ff41a..922550eb1 100644 +--- a/src/lib/openjp2/j2k.c ++++ b/src/lib/openjp2/j2k.c +@@ -9221,6 +9221,14 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image, + l_img_comp = p_image->comps; + for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) { + OPJ_INT32 l_h, l_w; ++ if (p_image->x0 > (OPJ_UINT32)INT_MAX || ++ p_image->y0 > (OPJ_UINT32)INT_MAX || ++ p_image->x1 > (OPJ_UINT32)INT_MAX || ++ p_image->y1 > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(p_manager, EVT_ERROR, ++ "Image coordinates above INT_MAX are not supported\n"); ++ return OPJ_FALSE; ++ } + + l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0, + (OPJ_INT32)l_img_comp->dx); diff --git a/buildroot/package/openjpeg/0007-opj_tcd_init_tile-avoid-integer-overflow.patch b/buildroot/package/openjpeg/0007-opj_tcd_init_tile-avoid-integer-overflow.patch new file mode 100644 index 000000000..7d82377d5 --- /dev/null +++ b/buildroot/package/openjpeg/0007-opj_tcd_init_tile-avoid-integer-overflow.patch @@ -0,0 +1,46 @@ +From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Thu, 30 Jan 2020 00:59:57 +0100 +Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow + +That could lead to later assertion failures. + +Fixes #1231 / CVE-2020-8112 +[Retrieved from: +https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074] +Signed-off-by: Fabrice Fontaine +--- + src/lib/openjp2/tcd.c | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c +index deecc4dff..aa419030a 100644 +--- a/src/lib/openjp2/tcd.c ++++ b/src/lib/openjp2/tcd.c +@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, + /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */ + l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx; + l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy; +- l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx; +- l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy; ++ { ++ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1, ++ (OPJ_INT32)l_pdx)) << l_pdx; ++ if (tmp > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); ++ return OPJ_FALSE; ++ } ++ l_br_prc_x_end = (OPJ_INT32)tmp; ++ } ++ { ++ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1, ++ (OPJ_INT32)l_pdy)) << l_pdy; ++ if (tmp > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); ++ return OPJ_FALSE; ++ } ++ l_br_prc_y_end = (OPJ_INT32)tmp; ++ } + /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/ + + l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)(( diff --git a/buildroot/package/openjpeg/openjpeg.hash b/buildroot/package/openjpeg/openjpeg.hash index 8a6fda48c..31c5b5040 100644 --- a/buildroot/package/openjpeg/openjpeg.hash +++ b/buildroot/package/openjpeg/openjpeg.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3389a1aa908c2b577863da213db3a170df3edbb1432e99ae5fd3f2ac721d69d3 openjpeg-51f097e6d5754ddae93e716276fe8176b44ec548.tar.gz +sha256 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9 openjpeg-2.3.1.tar.gz sha256 a6af136f3e15038a666b61f376612a07d9a4e48cb7c01adbf3e33b3f14ab49b6 LICENSE diff --git a/buildroot/package/openjpeg/openjpeg.mk b/buildroot/package/openjpeg/openjpeg.mk index 6036ab95a..1ff3111d6 100644 --- a/buildroot/package/openjpeg/openjpeg.mk +++ b/buildroot/package/openjpeg/openjpeg.mk @@ -4,12 +4,22 @@ # ################################################################################ -OPENJPEG_VERSION = 51f097e6d5754ddae93e716276fe8176b44ec548 -OPENJPEG_SITE = $(call github,uclouvain,openjpeg,$(OPENJPEG_VERSION)) +OPENJPEG_VERSION = 2.3.1 +OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION)) OPENJPEG_LICENSE = BSD-2-Clause OPENJPEG_LICENSE_FILES = LICENSE OPENJPEG_INSTALL_STAGING = YES +# 0004-convertbmp-detect-invalid-file-dimensions-early.patch +# 0005-bmp_read_rle4_data-avoid-potential-infinite-loop.patch +OPENJPEG_IGNORE_CVES += CVE-2019-12973 + +# 0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch +OPENJPEG_IGNORE_CVES += CVE-2020-6851 + +# 0007-opj_tcd_init_tile-avoid-integer-overflow.patch +OPENJPEG_IGNORE_CVES += CVE-2020-8112 + OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng) OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) diff --git a/buildroot/package/openlayers/Config.in b/buildroot/package/openlayers/Config.in new file mode 100644 index 000000000..a7b7f334c --- /dev/null +++ b/buildroot/package/openlayers/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_OPENLAYERS + bool "openlayers" + help + OpenLayers makes it easy to put a dynamic map in any web + page. It can display map tiles, vector data and markers + loaded from any source. OpenLayers has been developed to + further the use of geographic information of all kinds. It + is completely free, Open Source JavaScript, released under + the 2-clause BSD License (also known as the FreeBSD). + + https://openlayers.org diff --git a/buildroot/package/openlayers/openlayers.hash b/buildroot/package/openlayers/openlayers.hash new file mode 100644 index 000000000..b9efd448a --- /dev/null +++ b/buildroot/package/openlayers/openlayers.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 9513cf83d5a2c6093e8c4321fc50ef03cb16fb7c455858924059f5924b0fa20c v6.1.1-dist.zip diff --git a/buildroot/package/openlayers/openlayers.mk b/buildroot/package/openlayers/openlayers.mk new file mode 100644 index 000000000..85003b620 --- /dev/null +++ b/buildroot/package/openlayers/openlayers.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# openlayers +# +################################################################################ + +OPENLAYERS_VERSION = 6.1.1 +OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip +OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) +OPENLAYERS_LICENSE = BSD-2-Clause +# There's no separate license file in the archive, only minified files. + +define OPENLAYERS_EXTRACT_CMDS + unzip $(OPENLAYERS_DL_DIR)/$(OPENLAYERS_SOURCE) -d $(@D) + mv $(@D)/v$(OPENLAYERS_VERSION)-dist/* $(@D) + rmdir $(@D)/v$(OPENLAYERS_VERSION)-dist/ +endef + +define OPENLAYERS_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0644 $(@D)/ol.css $(TARGET_DIR)/var/www/ol.css + $(INSTALL) -D -m 0644 $(@D)/ol.js $(TARGET_DIR)/var/www/ol.js +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/openmpi/openmpi.mk b/buildroot/package/openmpi/openmpi.mk index 8d9eafd63..b682e6e74 100644 --- a/buildroot/package/openmpi/openmpi.mk +++ b/buildroot/package/openmpi/openmpi.mk @@ -38,4 +38,12 @@ else OPENMPI_CONF_OPTS += --enable-mpi-fortran=no endif +OPENMPI_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +OPENMPI_CFLAGS += -O0 +endif + +OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" + $(eval $(autotools-package)) diff --git a/buildroot/package/openntpd/openntpd.mk b/buildroot/package/openntpd/openntpd.mk index f5a569047..f2eaee7ef 100644 --- a/buildroot/package/openntpd/openntpd.mk +++ b/buildroot/package/openntpd/openntpd.mk @@ -24,9 +24,6 @@ OPENNTPD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -pthread" define OPENNTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/openntpd/ntpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/ntpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/ntpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ntpd.service endef define OPENNTPD_INSTALL_INIT_SYSV diff --git a/buildroot/package/openobex/openobex.mk b/buildroot/package/openobex/openobex.mk index ea41f65a8..bc4a47e3d 100644 --- a/buildroot/package/openobex/openobex.mk +++ b/buildroot/package/openobex/openobex.mk @@ -15,10 +15,6 @@ OPENOBEX_DEPENDENCIES = host-pkgconf OPENOBEX_INSTALL_STAGING = YES OPENOBEX_CONF_OPTS = -DBUILD_DOCUMENTATION=OFF -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -OPENOBEX_DEPENDENCIES += bluez_utils -endif - ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) OPENOBEX_DEPENDENCIES += bluez5_utils endif diff --git a/buildroot/package/openocd/0001-Fix-jimtcl-auto-configuration-to-force-static-librar.patch b/buildroot/package/openocd/0001-Fix-jimtcl-auto-configuration-to-force-static-librar.patch deleted file mode 100644 index fd3cfa469..000000000 --- a/buildroot/package/openocd/0001-Fix-jimtcl-auto-configuration-to-force-static-librar.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3bef159779c8fd39a070ec5c8191e18ba2efa79d Mon Sep 17 00:00:00 2001 -From: Claudio Laurita -Date: Sun, 30 Nov 2014 18:21:58 +0100 -Subject: [PATCH 2/2] Fix jimtcl auto configuration to force static library - only. jimtcl ignores a --disable-shared option if a previous --enable-shared - option was given. This breaks openocd compilation if shared was the preferred - option in buildroot project. - -Signed-off-by: Claudio Laurita - ---- a/jimtcl/auto.def -+++ b/jimtcl/auto.def -@@ -194,12 +194,8 @@ - msg-result "Enabling references" - define JIM_REFERENCES - } --if {[opt-bool shared with-jim-shared]} { -- msg-result "Building shared library" --} else { -- msg-result "Building static library" -- define JIM_STATICLIB --} -+msg-result "Building static library" -+define JIM_STATICLIB - define LIBSOEXT [format [get-define SH_SOEXTVER] [format %.2f [expr {[get-define JIM_VERSION] / 100.0}]]] - define JIM_INSTALL [opt-bool install-jim] - define JIM_DOCS [opt-bool docs] diff --git a/buildroot/package/openocd/0002-configure-enable-build-on-uclinux.patch b/buildroot/package/openocd/0001-configure-enable-build-on-uclinux.patch similarity index 100% rename from buildroot/package/openocd/0002-configure-enable-build-on-uclinux.patch rename to buildroot/package/openocd/0001-configure-enable-build-on-uclinux.patch diff --git a/buildroot/package/openocd/0003-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch b/buildroot/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch similarity index 100% rename from buildroot/package/openocd/0003-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch rename to buildroot/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch diff --git a/buildroot/package/openocd/Config.in b/buildroot/package/openocd/Config.in index abba07e88..448872061 100644 --- a/buildroot/package/openocd/Config.in +++ b/buildroot/package/openocd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_OPENOCD bool "openocd" + select BR2_PACKAGE_JIMTCL help OpenOCD - Open On-Chip Debugger diff --git a/buildroot/package/openocd/openocd.mk b/buildroot/package/openocd/openocd.mk index d35ed77cd..7887f3a6d 100644 --- a/buildroot/package/openocd/openocd.mk +++ b/buildroot/package/openocd/openocd.mk @@ -11,18 +11,13 @@ OPENOCD_LICENSE = GPL-2.0+ OPENOCD_LICENSE_FILES = COPYING # 0002-configure-enable-build-on-uclinux.patch patches configure.ac OPENOCD_AUTORECONF = YES - -# The bundled jimtcl really wants to find a existing $CXX, so feed it -# false when we do not have one. -OPENOCD_CONF_ENV = \ - $(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99" +OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" OPENOCD_CONF_OPTS = \ --oldincludedir=$(STAGING_DIR)/usr/include \ --includedir=$(STAGING_DIR)/usr/include \ --disable-doxygen-html \ - --with-jim-shared=no \ + --disable-internal-jimtcl \ --disable-shared \ --enable-dummy \ --disable-werror @@ -32,6 +27,7 @@ OPENOCD_CONF_OPTS = \ OPENOCD_DEPENDENCIES = \ host-pkgconf \ + jimtcl \ $(if $(BR2_PACKAGE_LIBFTDI1),libftdi1) \ $(if $(BR2_PACKAGE_LIBUSB),libusb) \ $(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \ @@ -101,12 +97,12 @@ HOST_OPENOCD_CONF_OPTS = \ --oldincludedir=$(HOST_DIR)/include \ --includedir=$(HOST_DIR)/include \ --disable-doxygen-html \ - --with-jim-shared=no \ + --disable-internal-jimtcl \ --disable-shared \ --enable-dummy \ --disable-werror -HOST_OPENOCD_DEPENDENCIES = host-libftdi host-libusb host-libusb-compat +HOST_OPENOCD_DEPENDENCIES = host-jimtcl host-libftdi host-libusb host-libusb-compat # Avoid documentation rebuild. On PowerPC64(le), we patch the # configure script. Due to this, the version.texi files gets diff --git a/buildroot/package/openpgm/openpgm.hash b/buildroot/package/openpgm/openpgm.hash index f20e02a7f..472053173 100644 --- a/buildroot/package/openpgm/openpgm.hash +++ b/buildroot/package/openpgm/openpgm.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 ecd48fd0bcfd8351ce6dcf31b063dd8fe83d3dab41bca62a6ebd6880a88c4a69 openpgm-release-5-2-122.tar.gz +sha256 acc1545fd8060aa66b17327110e2859e451cfc685ebd3b2211619728e3471b66 openpgm-5-2-122.tar.gz +sha256 4a7d4ec71fa60969399fd4caad64d5a3003fee2775445f271a5a36a8ae743a29 openpgm/pgm/LICENSE diff --git a/buildroot/package/openpgm/openpgm.mk b/buildroot/package/openpgm/openpgm.mk index 8c85344b6..ec293b42d 100644 --- a/buildroot/package/openpgm/openpgm.mk +++ b/buildroot/package/openpgm/openpgm.mk @@ -4,22 +4,14 @@ # ################################################################################ -OPENPGM_VERSION = release-5-2-122 -OPENPGM_SITE = $(call github,steve-o,openpgm,$(OPENPGM_VERSION)) +OPENPGM_VERSION = 5-2-122 +OPENPGM_SITE = $(call github,steve-o,openpgm,release-$(OPENPGM_VERSION)) OPENPGM_LICENSE = LGPL-2.1+ OPENPGM_LICENSE_FILES = openpgm/pgm/LICENSE OPENPGM_INSTALL_STAGING = YES OPENPGM_SUBDIR = openpgm/pgm OPENPGM_AUTORECONF = YES -# We need to create the m4 directory to make sure that autoreconf will -# start calling libtoolize. Otherwise it will start with aclocal and it -# will fail because the m4 directory doesn't exist. -define OPENPGM_CREATE_M4_DIR - mkdir -p $(@D)/$(OPENPGM_SUBDIR)/m4 -endef -OPENPGM_POST_PATCH_HOOKS += OPENPGM_CREATE_M4_DIR - OPENPGM_CONF_ENV = \ ac_cv_file__proc_cpuinfo=yes \ ac_cv_file__dev_rtc=no \ diff --git a/buildroot/package/openpowerlink/openpowerlink.hash b/buildroot/package/openpowerlink/openpowerlink.hash index 13b5e9351..cd00f902f 100644 --- a/buildroot/package/openpowerlink/openpowerlink.hash +++ b/buildroot/package/openpowerlink/openpowerlink.hash @@ -2,4 +2,5 @@ md5 04524d1b1f9946176dce0ccb0eecf537 openPOWERLINK_V2.7.1.tar.gz sha1 4ee9c6e26bbc729fdbbb272155b093ffa0d9cefd openPOWERLINK_V2.7.1.tar.gz # sha256 locally computed -sha256 d0d65f4fb8f2ad209cf9575714f88f33168a1cf71e8f1801e1e1ac4df6a37ffd openPOWERLINK_V2.7.1.tar.gz +sha256 d0d65f4fb8f2ad209cf9575714f88f33168a1cf71e8f1801e1e1ac4df6a37ffd openPOWERLINK_V2.7.1.tar.gz +sha256 348e31e9e5094104463d58d33abd31049fdf209afbc12ea7abb7fd4b4a147429 license.md diff --git a/buildroot/package/openpowerlink/openpowerlink.mk b/buildroot/package/openpowerlink/openpowerlink.mk index f86978082..46dc3d10c 100644 --- a/buildroot/package/openpowerlink/openpowerlink.mk +++ b/buildroot/package/openpowerlink/openpowerlink.mk @@ -4,9 +4,9 @@ # ################################################################################ -OPENPOWERLINK_VERSION = V2.7.1 -OPENPOWERLINK_SITE = https://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/$(OPENPOWERLINK_VERSION) -OPENPOWERLINK_SOURCE = openPOWERLINK_$(OPENPOWERLINK_VERSION).tar.gz +OPENPOWERLINK_VERSION = 2.7.1 +OPENPOWERLINK_SITE = https://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/V$(OPENPOWERLINK_VERSION) +OPENPOWERLINK_SOURCE = openPOWERLINK_V$(OPENPOWERLINK_VERSION).tar.gz OPENPOWERLINK_LICENSE = BSD-2-Clause, GPL-2.0 OPENPOWERLINK_LICENSE_FILES = license.md diff --git a/buildroot/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch b/buildroot/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch new file mode 100644 index 000000000..da8cf042c --- /dev/null +++ b/buildroot/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch @@ -0,0 +1,66 @@ +From ec1a0c8fa2e7a7c6cf70f68bdabc07cbb1a567cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= +Date: Sun, 5 May 2019 23:43:40 +0200 +Subject: [PATCH] init.d/sysctl.in: add support for busybox sysctl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Busybox version of sysctl does not support --system argument, +and files need to be loaded one by one. This patch adds code +to recognize busybox sysctl and execute proper function based +on that. + +Signed-off-by: Michał Łyszczek +--- + init.d/sysctl.in | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +diff --git a/init.d/sysctl.in b/init.d/sysctl.in +index e49f4db2..a705b3d4 100644 +--- a/init.d/sysctl.in ++++ b/init.d/sysctl.in +@@ -37,6 +37,23 @@ BSD_sysctl() + return $retval + } + ++Busybox_sysctl() ++{ ++ local quiet ++ yesno $rc_verbose || quiet=-q ++ ++ eindent ++ for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do ++ if [ -r "$conf" ]; then ++ vebegin "applying $conf" ++ sysctl $quiet -p "$conf" || retval=1 ++ veend $retval ++ fi ++ done ++ eoutdent ++ return $retval ++} ++ + Linux_sysctl() + { + local quiet +@@ -52,7 +69,15 @@ start() + ebegin "Configuring kernel parameters" + case "$RC_UNAME" in + *BSD|GNU) BSD_sysctl; rc=$? ;; +- Linux) Linux_sysctl; rc=$? ;; ++ Linux) ++ sysctl -h > /dev/null 2>&1 ++ if [ $? -ne 0 ]; then ++ # busybox version of sysctl does not recognize -h option ++ Busybox_sysctl ++ else ++ Linux_sysctl ++ fi ++ rc=$? ;; + esac + eend $rc "Unable to configure some kernel parameters" + } +-- +2.18.1 + diff --git a/buildroot/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch b/buildroot/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch new file mode 100644 index 000000000..66bbba42b --- /dev/null +++ b/buildroot/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch @@ -0,0 +1,34 @@ +From 5ae8209afad9a4284723712b46d8685e7f7fd72c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= +Date: Mon, 6 May 2019 00:06:39 +0200 +Subject: [PATCH] sh/init.sh.Linux.in: change /run/lock from root:uucp to + root:daemon +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On gentoo /run/lock is owned by uucp group because of historical +reasons. However uucp does not exist on buildroot by default, and +it makes more sense that 'daemon' group should own this directory. + +Signed-off-by: Michał Łyszczek +--- + sh/init.sh.Linux.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in +index 222bbd3b..7f1a88db 100644 +--- a/sh/init.sh.Linux.in ++++ b/sh/init.sh.Linux.in +@@ -85,7 +85,7 @@ fi + + [ -x /sbin/restorecon ] && /sbin/restorecon -rF /run + checkpath -d $RC_SVCDIR +-checkpath -d -m 0775 -o root:uucp /run/lock ++checkpath -d -m 0775 -o root:daemon /run/lock + + # Try to mount xenfs as early as possible, otherwise rc_sys() will always + # return RC_SYS_XENU and will think that we are in a domU while it's not. +-- +2.18.1 + diff --git a/buildroot/package/openrc/Config.in b/buildroot/package/openrc/Config.in new file mode 100644 index 000000000..4691be63a --- /dev/null +++ b/buildroot/package/openrc/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_OPENRC + bool "openrc" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS + depends on BR2_INIT_OPENRC + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod tools + select BR2_PACKAGE_KMOD # runtime + select BR2_PACKAGE_KMOD_TOOLS # runtime + select BR2_PACKAGE_NCURSES + help + Init that works on top of pid 1 (for example + openrc-init). By default it does quite a lot on startup + (like setting hwclock, mounting directories, configuring + interfaces and so on). So for this init to properly work you + need at least these tools on the root filesystem (default + busybox configuration provides them all): + + swapon, fsck, hwclock, getty, login, grep, mount, coreutils, + procps, modprobe (kmod), net-tools + + Number of tools may be decreased by removing services that + use them. + + https://github.com/OpenRC/openrc + +comment "openrc needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_INIT_OPENRC + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/openrc/getty b/buildroot/package/openrc/getty new file mode 100755 index 000000000..8fcb071f8 --- /dev/null +++ b/buildroot/package/openrc/getty @@ -0,0 +1,24 @@ +#!/sbin/openrc-run +# based on agetty service from OpenRC package + +description="start getty on terminal" +supervisor=supervise-daemon +port="${RC_SVCNAME#*.}" +term_type="${term_type:-linux}" +command=/sbin/getty +command_args_foreground="${getty_options} ${baud} ${port} ${term_type}" +pidfile="/run/${RC_SVCNAME}.pid" + +depend() { + # start getty at the very end of init + after * + keyword -prefix +} + +start_pre() { + export EINFO_QUIET="${quiet:-yes}" +} + +stop_pre() { + export EINFO_QUIET="${quiet:-yes}" +} diff --git a/buildroot/package/openrc/openrc.hash b/buildroot/package/openrc/openrc.hash new file mode 100644 index 000000000..7d58e254c --- /dev/null +++ b/buildroot/package/openrc/openrc.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 c99488ca54f2b795328d07bbd456ade49b571136bba7501f7eaaeb1ca9f9ecc4 openrc-0.41.2.tar.gz +sha256 96862463f4e77e2508e4fc2c83773fd24807cb699368b63fd93a5e2b466dd624 LICENSE diff --git a/buildroot/package/openrc/openrc.mk b/buildroot/package/openrc/openrc.mk new file mode 100644 index 000000000..1f8516f5e --- /dev/null +++ b/buildroot/package/openrc/openrc.mk @@ -0,0 +1,88 @@ +################################################################################ +# +# openrc +# +################################################################################ + +OPENRC_VERSION = 0.41.2 +OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION)) +OPENRC_LICENSE = BSD-2-Clause +OPENRC_LICENSE_FILES = LICENSE + +OPENRC_DEPENDENCIES = ncurses + +# set LIBNAME so openrc puts files in proper directories and sets proper +# paths in installed files. Since in buildroot /lib64 and /lib32 always +# points to /lib, it's safe to hardcode it to "lib" +OPENRC_MAKE_OPTS = \ + LIBNAME=lib \ + LIBEXECDIR=/usr/libexec/rc \ + MKPKGCONFIG=no \ + MKSELINUX=no \ + MKSYSVINIT=yes \ + BRANDING="Buildroot $(BR2_VERSION_FULL)" \ + CC=$(TARGET_CC) + +ifeq ($(BR2_SHARED_LIBS),y) +OPENRC_MAKE_OPTS += MKSTATICLIBS=no +else +OPENRC_MAKE_OPTS += MKSTATICLIBS=yes +endif + +define OPENRC_BUILD_CMDS + $(MAKE) $(OPENRC_MAKE_OPTS) -C $(@D) +endef + +define OPENRC_INSTALL_TARGET_CMDS + $(MAKE) $(OPENRC_MAKE_OPTS) DESTDIR=$(TARGET_DIR) -C $(@D) install + $(INSTALL) -D -m 0755 $(OPENRC_PKGDIR)/sysv-rcs \ + $(TARGET_DIR)/etc/init.d/sysv-rcs +endef + +ifeq ($(BR2_PACKAGE_KBD),) +# keymaps and save-keymaps require kbd_mode and dumpkeys, respectively, so +# remove them if the kbd package is not selected (e.g. devices with serial +# console, only). +define OPENRC_NO_KBD + $(RM) $(TARGET_DIR)/etc/runlevels/boot/{keymaps,save-keymaps} + $(RM) $(TARGET_DIR)/etc/init.d/{keymaps,save-keymaps} + $(RM) $(TARGET_DIR)/etc/conf.d/keymaps +endef +OPENRC_POST_INSTALL_TARGET_HOOKS += OPENRC_NO_KBD +endif + +ifeq ($(BR2_PACKAGE_NETIFRC),y) +# netifrc replaces network, staticroute and loopback services which are +# installed by openrc +define OPENRC_NO_NET + $(RM) $(TARGET_DIR)/etc/runlevels/boot/{network,staticroute,loopback} + $(RM) $(TARGET_DIR)/etc/init.d/{network,staticroute,loopback} + $(RM) $(TARGET_DIR)/etc/conf.d/{network,staticroute,loopback} +endef +OPENRC_POST_INSTALL_TARGET_HOOKS += OPENRC_NO_NET +endif + +define OPENRC_REMOVE_UNNEEDED + $(RM) -r $(TARGET_DIR)/usr/share/openrc +endef +OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_REMOVE_UNNEEDED + +ifeq ($(BR2_TARGET_GENERIC_GETTY),y) +OPENRC_GETTY_SVCNAME = getty.$(SYSTEM_GETTY_PORT) +OPENRC_GETTY_CONF_D = $(TARGET_DIR)/etc/conf.d/$(OPENRC_GETTY_SVCNAME) +define OPENRC_SET_GETTY + { \ + echo "baud=\"$(SYSTEM_GETTY_BAUDRATE)\""; \ + echo "term_type=\"$(SYSTEM_GETTY_TERM)\"" ; \ + echo "getty_options=\"-L $(SYSTEM_GETTY_OPTIONS)\""; \ + } > $(OPENRC_GETTY_CONF_D) + $(INSTALL) -D -m 0755 $(OPENRC_PKGDIR)/getty \ + $(TARGET_DIR)/etc/init.d/getty + ln -sf getty $(TARGET_DIR)/etc/init.d/$(OPENRC_GETTY_SVCNAME) + ln -sf /etc/init.d/$(OPENRC_GETTY_SVCNAME) \ + $(TARGET_DIR)/etc/runlevels/default/$(OPENRC_GETTY_SVCNAME) +endef +OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_SET_GETTY +endif # BR2_TARGET_GENERIC_GETTY + +$(eval $(generic-package)) diff --git a/buildroot/package/openrc/sysv-rcs b/buildroot/package/openrc/sysv-rcs new file mode 100755 index 000000000..1564cbe60 --- /dev/null +++ b/buildroot/package/openrc/sysv-rcs @@ -0,0 +1,27 @@ +#!/sbin/openrc-run + +description="start or stop sysv rc[S,K] scripts" + +depend() { + after local +} + +start() { + for i in /etc/init.d/S??*; do + # Ignore dangling symlinks (if any). + [ -e "$i" ] || continue + einfo "Starting $i" + $i start > /dev/null + eend $? + done +} + +stop() { + for i in $(ls -r /etc/init.d/S??*); do + # Ignore dangling symlinks (if any). + [ -e "$i" ] || continue + einfo "Stopping $i" + $i stop > /dev/null + eend $? + done +} diff --git a/buildroot/package/openresolv/openresolv.hash b/buildroot/package/openresolv/openresolv.hash index e1a1fb546..b8eb4346b 100644 --- a/buildroot/package/openresolv/openresolv.hash +++ b/buildroot/package/openresolv/openresolv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 96b3f84435a183426c622db7097a930fb0d48a99e82cd87ce83bd343b8c20574 openresolv-fe4e1ec4e2be2adfc1530ade94ebb30aa6f51540.tar.gz -sha256 d1f9dcd2dac4e095b14caab517cfe791a6e0785346164b7d0cafc13c714f8aa5 LICENSE +sha256 0024df7c4568a157db1c3511a55d37d442629d586c575d9e0f9c2004df8297bd openresolv-3.9.2.tar.gz +sha256 f78b2c2bfb333e66e935c81510580d002b6e2009a5b8132b3b5be8ed8f8f3fa7 LICENSE diff --git a/buildroot/package/openresolv/openresolv.mk b/buildroot/package/openresolv/openresolv.mk index 3f9d603d4..3a6444669 100644 --- a/buildroot/package/openresolv/openresolv.mk +++ b/buildroot/package/openresolv/openresolv.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENRESOLV_VERSION = fe4e1ec4e2be2adfc1530ade94ebb30aa6f51540 -OPENRESOLV_SITE = $(call github,rsmarples,openresolv,$(OPENRESOLV_VERSION)) +OPENRESOLV_VERSION = 3.9.2 +OPENRESOLV_SITE = $(call github,rsmarples,openresolv,openresolv-$(OPENRESOLV_VERSION)) OPENRESOLV_LICENSE = BSD-2-Clause OPENRESOLV_LICENSE_FILES = LICENSE diff --git a/buildroot/package/openssh/0001-upstream-disallow-empty-incoming-filename-or-ones-th.patch b/buildroot/package/openssh/0001-upstream-disallow-empty-incoming-filename-or-ones-th.patch deleted file mode 100644 index 2b5a958d1..000000000 --- a/buildroot/package/openssh/0001-upstream-disallow-empty-incoming-filename-or-ones-th.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001 -From: "djm@openbsd.org" -Date: Fri, 16 Nov 2018 03:03:10 +0000 -Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer - to the - -current directory; based on report/patch from Harry Sintonen - -OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9 -Signed-off-by: Baruch Siach ---- -Upstream status (openssh-portable): commit 6010c0303a422 - - scp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/scp.c b/scp.c -index 60682c68769b..4f3fdcd3db89 100644 ---- a/scp.c -+++ b/scp.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */ -+/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */ - /* - * scp - secure remote copy. This is basically patched BSD rcp which - * uses ssh to do the data transfer (instead of using rcmd). -@@ -1106,7 +1106,8 @@ sink(int argc, char **argv) - SCREWUP("size out of range"); - size = (off_t)ull; - -- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { -+ if (*cp == '\0' || strchr(cp, '/') != NULL || -+ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) { - run_err("error: unexpected filename: %s", cp); - exit(1); - } --- -2.20.1 - diff --git a/buildroot/package/openssh/0002-upstream-Sanitize-scp-filenames-via-snmprintf.-To-do.patch b/buildroot/package/openssh/0002-upstream-Sanitize-scp-filenames-via-snmprintf.-To-do.patch deleted file mode 100644 index e5d137ef1..000000000 --- a/buildroot/package/openssh/0002-upstream-Sanitize-scp-filenames-via-snmprintf.-To-do.patch +++ /dev/null @@ -1,275 +0,0 @@ -From 5979bdfeca813dd7e997a1edb0f928d77ce70304 Mon Sep 17 00:00:00 2001 -From: "dtucker@openbsd.org" -Date: Wed, 23 Jan 2019 08:01:46 +0000 -Subject: [PATCH] upstream: Sanitize scp filenames via snmprintf. To do this we - move - -the progressmeter formatting outside of signal handler context and have the -atomicio callback called for EINTR too. bz#2434 with contributions from djm -and jjelen at redhat.com, ok djm@ - -OpenBSD-Commit-ID: 1af61c1f70e4f3bd8ab140b9f1fa699481db57d8 -Signed-off-by: Baruch Siach ---- -Upstream status (openssh-portable): backported from commit 8976f1c4b27 ---- - atomicio.c | 20 ++++++++++++++----- - progressmeter.c | 53 ++++++++++++++++++++++--------------------------- - progressmeter.h | 3 ++- - scp.c | 1 + - sftp-client.c | 16 ++++++++------- - 5 files changed, 51 insertions(+), 42 deletions(-) - -diff --git a/atomicio.c b/atomicio.c -index f854a06f5f50..d91bd7621c12 100644 ---- a/atomicio.c -+++ b/atomicio.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: atomicio.c,v 1.28 2016/07/27 23:18:12 djm Exp $ */ -+/* $OpenBSD: atomicio.c,v 1.29 2019/01/23 08:01:46 dtucker Exp $ */ - /* - * Copyright (c) 2006 Damien Miller. All rights reserved. - * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. -@@ -65,9 +65,14 @@ atomicio6(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n, - res = (f) (fd, s + pos, n - pos); - switch (res) { - case -1: -- if (errno == EINTR) -+ if (errno == EINTR) { -+ /* possible SIGALARM, update callback */ -+ if (cb != NULL && cb(cb_arg, 0) == -1) { -+ errno = EINTR; -+ return pos; -+ } - continue; -- if (errno == EAGAIN || errno == EWOULDBLOCK) { -+ } else if (errno == EAGAIN || errno == EWOULDBLOCK) { - #ifndef BROKEN_READ_COMPARISON - (void)poll(&pfd, 1, -1); - #endif -@@ -122,9 +127,14 @@ atomiciov6(ssize_t (*f) (int, const struct iovec *, int), int fd, - res = (f) (fd, iov, iovcnt); - switch (res) { - case -1: -- if (errno == EINTR) -+ if (errno == EINTR) { -+ /* possible SIGALARM, update callback */ -+ if (cb != NULL && cb(cb_arg, 0) == -1) { -+ errno = EINTR; -+ return pos; -+ } - continue; -- if (errno == EAGAIN || errno == EWOULDBLOCK) { -+ } else if (errno == EAGAIN || errno == EWOULDBLOCK) { - #ifndef BROKEN_READV_COMPARISON - (void)poll(&pfd, 1, -1); - #endif -diff --git a/progressmeter.c b/progressmeter.c -index fe9bf52e4c90..add462dde500 100644 ---- a/progressmeter.c -+++ b/progressmeter.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: progressmeter.c,v 1.45 2016/06/30 05:17:05 dtucker Exp $ */ -+/* $OpenBSD: progressmeter.c,v 1.46 2019/01/23 08:01:46 dtucker Exp $ */ - /* - * Copyright (c) 2003 Nils Nordman. All rights reserved. - * -@@ -31,6 +31,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -39,6 +40,7 @@ - #include "progressmeter.h" - #include "atomicio.h" - #include "misc.h" -+#include "utf8.h" - - #define DEFAULT_WINSIZE 80 - #define MAX_WINSIZE 512 -@@ -61,7 +63,7 @@ static void setscreensize(void); - void refresh_progress_meter(void); - - /* signal handler for updating the progress meter */ --static void update_progress_meter(int); -+static void sig_alarm(int); - - static double start; /* start progress */ - static double last_update; /* last progress update */ -@@ -74,6 +76,7 @@ static long stalled; /* how long we have been stalled */ - static int bytes_per_second; /* current speed in bytes per second */ - static int win_size; /* terminal window size */ - static volatile sig_atomic_t win_resized; /* for window resizing */ -+static volatile sig_atomic_t alarm_fired; - - /* units for format_size */ - static const char unit[] = " KMGT"; -@@ -126,9 +129,17 @@ refresh_progress_meter(void) - off_t bytes_left; - int cur_speed; - int hours, minutes, seconds; -- int i, len; - int file_len; - -+ if ((!alarm_fired && !win_resized) || !can_output()) -+ return; -+ alarm_fired = 0; -+ -+ if (win_resized) { -+ setscreensize(); -+ win_resized = 0; -+ } -+ - transferred = *counter - (cur_pos ? cur_pos : start_pos); - cur_pos = *counter; - now = monotime_double(); -@@ -158,16 +169,11 @@ refresh_progress_meter(void) - - /* filename */ - buf[0] = '\0'; -- file_len = win_size - 35; -+ file_len = win_size - 36; - if (file_len > 0) { -- len = snprintf(buf, file_len + 1, "\r%s", file); -- if (len < 0) -- len = 0; -- if (len >= file_len + 1) -- len = file_len; -- for (i = len; i < file_len; i++) -- buf[i] = ' '; -- buf[file_len] = '\0'; -+ buf[0] = '\r'; -+ snmprintf(buf+1, sizeof(buf)-1 , &file_len, "%*s", -+ file_len * -1, file); - } - - /* percent of transfer done */ -@@ -228,22 +234,11 @@ refresh_progress_meter(void) - - /*ARGSUSED*/ - static void --update_progress_meter(int ignore) -+sig_alarm(int ignore) - { -- int save_errno; -- -- save_errno = errno; -- -- if (win_resized) { -- setscreensize(); -- win_resized = 0; -- } -- if (can_output()) -- refresh_progress_meter(); -- -- signal(SIGALRM, update_progress_meter); -+ signal(SIGALRM, sig_alarm); -+ alarm_fired = 1; - alarm(UPDATE_INTERVAL); -- errno = save_errno; - } - - void -@@ -259,10 +254,9 @@ start_progress_meter(const char *f, off_t filesize, off_t *ctr) - bytes_per_second = 0; - - setscreensize(); -- if (can_output()) -- refresh_progress_meter(); -+ refresh_progress_meter(); - -- signal(SIGALRM, update_progress_meter); -+ signal(SIGALRM, sig_alarm); - signal(SIGWINCH, sig_winch); - alarm(UPDATE_INTERVAL); - } -@@ -286,6 +280,7 @@ stop_progress_meter(void) - static void - sig_winch(int sig) - { -+ signal(SIGWINCH, sig_winch); - win_resized = 1; - } - -diff --git a/progressmeter.h b/progressmeter.h -index bf179dca6518..8f6678060195 100644 ---- a/progressmeter.h -+++ b/progressmeter.h -@@ -1,4 +1,4 @@ --/* $OpenBSD: progressmeter.h,v 1.3 2015/01/14 13:54:13 djm Exp $ */ -+/* $OpenBSD: progressmeter.h,v 1.4 2019/01/23 08:01:46 dtucker Exp $ */ - /* - * Copyright (c) 2002 Nils Nordman. All rights reserved. - * -@@ -24,4 +24,5 @@ - */ - - void start_progress_meter(const char *, off_t, off_t *); -+void refresh_progress_meter(void); - void stop_progress_meter(void); -diff --git a/scp.c b/scp.c -index 4f3fdcd3db89..4a342a63873c 100644 ---- a/scp.c -+++ b/scp.c -@@ -585,6 +585,7 @@ scpio(void *_cnt, size_t s) - off_t *cnt = (off_t *)_cnt; - - *cnt += s; -+ refresh_progress_meter(); - if (limit_kbps > 0) - bandwidth_limit(&bwlimit, s); - return 0; -diff --git a/sftp-client.c b/sftp-client.c -index 4986d6d8d291..2bc698f868bc 100644 ---- a/sftp-client.c -+++ b/sftp-client.c -@@ -101,7 +101,9 @@ sftpio(void *_bwlimit, size_t amount) - { - struct bwlimit *bwlimit = (struct bwlimit *)_bwlimit; - -- bandwidth_limit(bwlimit, amount); -+ refresh_progress_meter(); -+ if (bwlimit != NULL) -+ bandwidth_limit(bwlimit, amount); - return 0; - } - -@@ -121,8 +123,8 @@ send_msg(struct sftp_conn *conn, struct sshbuf *m) - iov[1].iov_base = (u_char *)sshbuf_ptr(m); - iov[1].iov_len = sshbuf_len(m); - -- if (atomiciov6(writev, conn->fd_out, iov, 2, -- conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_out) != -+ if (atomiciov6(writev, conn->fd_out, iov, 2, sftpio, -+ conn->limit_kbps > 0 ? &conn->bwlimit_out : NULL) != - sshbuf_len(m) + sizeof(mlen)) - fatal("Couldn't send packet: %s", strerror(errno)); - -@@ -138,8 +140,8 @@ get_msg_extended(struct sftp_conn *conn, struct sshbuf *m, int initial) - - if ((r = sshbuf_reserve(m, 4, &p)) != 0) - fatal("%s: buffer error: %s", __func__, ssh_err(r)); -- if (atomicio6(read, conn->fd_in, p, 4, -- conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in) != 4) { -+ if (atomicio6(read, conn->fd_in, p, 4, sftpio, -+ conn->limit_kbps > 0 ? &conn->bwlimit_in : NULL) != 4) { - if (errno == EPIPE || errno == ECONNRESET) - fatal("Connection closed"); - else -@@ -157,8 +159,8 @@ get_msg_extended(struct sftp_conn *conn, struct sshbuf *m, int initial) - - if ((r = sshbuf_reserve(m, msg_len, &p)) != 0) - fatal("%s: buffer error: %s", __func__, ssh_err(r)); -- if (atomicio6(read, conn->fd_in, p, msg_len, -- conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in) -+ if (atomicio6(read, conn->fd_in, p, msg_len, sftpio, -+ conn->limit_kbps > 0 ? &conn->bwlimit_in : NULL) - != msg_len) { - if (errno == EPIPE) - fatal("Connection closed"); --- -2.20.1 - diff --git a/buildroot/package/openssh/0003-upstream-check-in-scp-client-that-filenames-sent-dur.patch b/buildroot/package/openssh/0003-upstream-check-in-scp-client-that-filenames-sent-dur.patch deleted file mode 100644 index 98ce5cd87..000000000 --- a/buildroot/package/openssh/0003-upstream-check-in-scp-client-that-filenames-sent-dur.patch +++ /dev/null @@ -1,186 +0,0 @@ -From f853123eda6b279a87be48e18bbea8dec82a94f2 Mon Sep 17 00:00:00 2001 -From: "djm@openbsd.org" -Date: Sat, 26 Jan 2019 22:41:28 +0000 -Subject: [PATCH] upstream: check in scp client that filenames sent during - -remote->local directory copies satisfy the wildcard specified by the user. - -This checking provides some protection against a malicious server -sending unexpected filenames, but it comes at a risk of rejecting wanted -files due to differences between client and server wildcard expansion rules. - -For this reason, this also adds a new -T flag to disable the check. - -reported by Harry Sintonen -fix approach suggested by markus@; -has been in snaps for ~1wk courtesy deraadt@ - -OpenBSD-Commit-ID: 00f44b50d2be8e321973f3c6d014260f8f7a8eda -Signed-off-by: Baruch Siach ---- -Upstream status (openssh-portable): backported from commit 8976f1c4b2 ---- - scp.1 | 12 +++++++++++- - scp.c | 37 +++++++++++++++++++++++++++++-------- - 2 files changed, 40 insertions(+), 9 deletions(-) - -diff --git a/scp.1 b/scp.1 -index 0e5cc1b2d675..397e7709195a 100644 ---- a/scp.1 -+++ b/scp.1 -@@ -18,7 +18,7 @@ - .Nd secure copy (remote file copy program) - .Sh SYNOPSIS - .Nm scp --.Op Fl 346BCpqrv -+.Op Fl 346BCpqrTv - .Op Fl c Ar cipher - .Op Fl F Ar ssh_config - .Op Fl i Ar identity_file -@@ -208,6 +208,16 @@ to use for the encrypted connection. - The program must understand - .Xr ssh 1 - options. -+.It Fl T -+Disable strict filename checking. -+By default when copying files from a remote host to a local directory -+.Nm -+checks that the received filenames match those requested on the command-line -+to prevent the remote end from sending unexpected or unwanted files. -+Because of differences in how various operating systems and shells interpret -+filename wildcards, these checks may cause wanted files to be rejected. -+This option disables these checks at the expense of fully trusting that -+the server will not send unexpected filenames. - .It Fl v - Verbose mode. - Causes -diff --git a/scp.c b/scp.c -index 4a342a63873c..7b0a08efb274 100644 ---- a/scp.c -+++ b/scp.c -@@ -94,6 +94,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -375,14 +376,14 @@ void verifydir(char *); - struct passwd *pwd; - uid_t userid; - int errs, remin, remout; --int pflag, iamremote, iamrecursive, targetshouldbedirectory; -+int Tflag, pflag, iamremote, iamrecursive, targetshouldbedirectory; - - #define CMDNEEDS 64 - char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */ - - int response(void); - void rsource(char *, struct stat *); --void sink(int, char *[]); -+void sink(int, char *[], const char *); - void source(int, char *[]); - void tolocal(int, char *[]); - void toremote(int, char *[]); -@@ -421,8 +422,9 @@ main(int argc, char **argv) - addargs(&args, "-oRemoteCommand=none"); - addargs(&args, "-oRequestTTY=no"); - -- fflag = tflag = 0; -- while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q12346S:o:F:")) != -1) -+ fflag = Tflag = tflag = 0; -+ while ((ch = getopt(argc, argv, -+ "dfl:prtTvBCc:i:P:q12346S:o:F:")) != -1) { - switch (ch) { - /* User-visible flags. */ - case '1': -@@ -501,9 +503,13 @@ main(int argc, char **argv) - setmode(0, O_BINARY); - #endif - break; -+ case 'T': -+ Tflag = 1; -+ break; - default: - usage(); - } -+ } - argc -= optind; - argv += optind; - -@@ -534,7 +540,7 @@ main(int argc, char **argv) - } - if (tflag) { - /* Receive data. */ -- sink(argc, argv); -+ sink(argc, argv, NULL); - exit(errs != 0); - } - if (argc < 2) -@@ -792,7 +798,7 @@ tolocal(int argc, char **argv) - continue; - } - free(bp); -- sink(1, argv + argc - 1); -+ sink(1, argv + argc - 1, src); - (void) close(remin); - remin = remout = -1; - } -@@ -968,7 +974,7 @@ rsource(char *name, struct stat *statp) - (sizeof(type) != 4 && sizeof(type) != 8)) - - void --sink(int argc, char **argv) -+sink(int argc, char **argv, const char *src) - { - static BUF buffer; - struct stat stb; -@@ -984,6 +990,7 @@ sink(int argc, char **argv) - unsigned long long ull; - int setimes, targisdir, wrerrno = 0; - char ch, *cp, *np, *targ, *why, *vect[1], buf[2048], visbuf[2048]; -+ char *src_copy = NULL, *restrict_pattern = NULL; - struct timeval tv[2]; - - #define atime tv[0] -@@ -1008,6 +1015,17 @@ sink(int argc, char **argv) - (void) atomicio(vwrite, remout, "", 1); - if (stat(targ, &stb) == 0 && S_ISDIR(stb.st_mode)) - targisdir = 1; -+ if (src != NULL && !iamrecursive && !Tflag) { -+ /* -+ * Prepare to try to restrict incoming filenames to match -+ * the requested destination file glob. -+ */ -+ if ((src_copy = strdup(src)) == NULL) -+ fatal("strdup failed"); -+ if ((restrict_pattern = strrchr(src_copy, '/')) != NULL) { -+ *restrict_pattern++ = '\0'; -+ } -+ } - for (first = 1;; first = 0) { - cp = buf; - if (atomicio(read, remin, cp, 1) != 1) -@@ -1112,6 +1130,9 @@ sink(int argc, char **argv) - run_err("error: unexpected filename: %s", cp); - exit(1); - } -+ if (restrict_pattern != NULL && -+ fnmatch(restrict_pattern, cp, 0) != 0) -+ SCREWUP("filename does not match request"); - if (targisdir) { - static char *namebuf; - static size_t cursize; -@@ -1149,7 +1170,7 @@ sink(int argc, char **argv) - goto bad; - } - vect[0] = xstrdup(np); -- sink(1, vect); -+ sink(1, vect, src); - if (setimes) { - setimes = 0; - if (utimes(vect[0], tv) < 0) --- -2.20.1 - diff --git a/buildroot/package/openssh/openssh.hash b/buildroot/package/openssh/openssh.hash index 26b143c05..4db933f7b 100644 --- a/buildroot/package/openssh/openssh.hash +++ b/buildroot/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From http://www.openssh.com/txt/release-7.9 (base64 encoded) -sha256 6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad openssh-7.9p1.tar.gz +# From https://www.openssh.com/txt/release-8.1 (base64 encoded) +sha256 02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff openssh-8.1p1.tar.gz # Locally calculated -sha256 05a4c25ef464e19656c5259bd4f4da8428efab01044f3541b79fbb3ff209350f LICENCE +sha256 73d0db766229670c7b4e1ec5e6baed54977a0694a565e7cc878c45ee834045d7 LICENCE diff --git a/buildroot/package/openssh/openssh.mk b/buildroot/package/openssh/openssh.mk index 4fef5caed..0411133bd 100644 --- a/buildroot/package/openssh/openssh.mk +++ b/buildroot/package/openssh/openssh.mk @@ -4,11 +4,14 @@ # ################################################################################ -OPENSSH_VERSION = 7.9p1 +OPENSSH_VERSION = 8.1p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE -OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)" +OPENSSH_CONF_ENV = \ + LD="$(TARGET_CC)" \ + LDFLAGS="$(TARGET_CFLAGS)" \ + LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` OPENSSH_CONF_OPTS = \ --sysconfdir=/etc/ssh \ --with-default-path=$(BR2_SYSTEM_DEFAULT_PATH) \ @@ -27,7 +30,7 @@ ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) OPENSSH_CONF_OPTS += --without-pie endif -OPENSSH_DEPENDENCIES = zlib openssl +OPENSSH_DEPENDENCIES = host-pkgconf zlib openssl ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) OPENSSH_DEPENDENCIES += cryptodev-linux @@ -71,9 +74,6 @@ endif define OPENSSH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/openssh/sshd.service \ $(TARGET_DIR)/usr/lib/systemd/system/sshd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/sshd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/sshd.service $(OPENSSH_INSTALL_SYSTEMD_SYSUSERS) endef diff --git a/buildroot/package/openssl/Config.in b/buildroot/package/openssl/Config.in index d84033141..5ce91cb80 100644 --- a/buildroot/package/openssl/Config.in +++ b/buildroot/package/openssl/Config.in @@ -29,21 +29,7 @@ config BR2_PACKAGE_LIBOPENSSL Note: Some helper scripts need perl. -if BR2_PACKAGE_LIBOPENSSL - -config BR2_PACKAGE_LIBOPENSSL_BIN - bool "openssl binary" - help - Install the openssl binary and the associated helper scripts - to the target file system. This is a command line tool for - doing various cryptographic stuff. - -config BR2_PACKAGE_LIBOPENSSL_ENGINES - bool "openssl additional engines" - help - Install additional encryption engine libraries. - -endif +source "package/libopenssl/Config.in" config BR2_PACKAGE_LIBRESSL bool "libressl" @@ -58,15 +44,10 @@ config BR2_PACKAGE_LIBRESSL http://www.libressl.org/ -if BR2_PACKAGE_LIBRESSL +source "package/libressl/Config.in" -config BR2_PACKAGE_LIBRESSL_BIN - bool "openssl binary" - help - Install the openssl binary to the target file system. This is - a command line tool for doing various cryptographic stuff. - -endif +# openssl from br2-external trees, if any +source "$BR2_BASE_DIR/.br2-external.in.openssl" endchoice diff --git a/buildroot/package/openswan/openswan.hash b/buildroot/package/openswan/openswan.hash index de0fa0505..a9b54dbaf 100644 --- a/buildroot/package/openswan/openswan.hash +++ b/buildroot/package/openswan/openswan.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 857c0d0b9a7e447d2857bf4d0f7118d7ed1196499e0b640e53e5c6bd0c0185d9 openswan-2.6.51.1.tar.gz +sha256 4124f4ce970089f301c34b9c48f54b021cf6b2b8813877942337f8022104f70d openswan-2.6.51.5.tar.gz sha256 1c36ae1e7b0f6cce4b4ffe969b71f83635734804acdd38544443564b00f8783a COPYING sha256 d7d012ef3be47faffba4d97a83d4986c9f4a63ac997ebf5961d33852e5f1801a LICENSE diff --git a/buildroot/package/openswan/openswan.mk b/buildroot/package/openswan/openswan.mk index d7f1c4647..aabf7d98c 100644 --- a/buildroot/package/openswan/openswan.mk +++ b/buildroot/package/openswan/openswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSWAN_VERSION = 2.6.51.1 +OPENSWAN_VERSION = 2.6.51.5 OPENSWAN_SITE = https://download.openswan.org/openswan OPENSWAN_LICENSE = GPL-2.0+, BSD-3-Clause OPENSWAN_LICENSE_FILES = COPYING LICENSE diff --git a/buildroot/package/opentracing-cpp/opentracing-cpp.hash b/buildroot/package/opentracing-cpp/opentracing-cpp.hash index c5085ba9c..591c0e4a0 100644 --- a/buildroot/package/opentracing-cpp/opentracing-cpp.hash +++ b/buildroot/package/opentracing-cpp/opentracing-cpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-v1.5.1.tar.gz +sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-1.5.1.tar.gz sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE diff --git a/buildroot/package/opentracing-cpp/opentracing-cpp.mk b/buildroot/package/opentracing-cpp/opentracing-cpp.mk index a61993f7f..d466a8023 100644 --- a/buildroot/package/opentracing-cpp/opentracing-cpp.mk +++ b/buildroot/package/opentracing-cpp/opentracing-cpp.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENTRACING_CPP_VERSION = v1.5.1 -OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,$(OPENTRACING_CPP_VERSION)) +OPENTRACING_CPP_VERSION = 1.5.1 +OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) OPENTRACING_CPP_LICENSE = Apache-2.0 OPENTRACING_CPP_LICENSE_FILES = LICENSE diff --git a/buildroot/package/openvmtools/0011-open-vm-tools-vmhgfs-fuse-fsutils.h-fix-build-on-mus.patch b/buildroot/package/openvmtools/0011-open-vm-tools-vmhgfs-fuse-fsutils.h-fix-build-on-mus.patch new file mode 100644 index 000000000..e2984a38b --- /dev/null +++ b/buildroot/package/openvmtools/0011-open-vm-tools-vmhgfs-fuse-fsutils.h-fix-build-on-mus.patch @@ -0,0 +1,41 @@ +From 0a5032669951ffd6735c294a6f309b0ec6667ea5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 Mar 2020 18:49:00 +0100 +Subject: [PATCH] open-vm-tools/vmhgfs-fuse/fsutils.h: fix build on musl + +loff_t is not defined on musl so define it to avoid the following build +failure: + +In file included from module.h:39, + from bdhandler.c:31: +fsutil.h:76:11: error: unknown type name 'loff_t'; did you mean 'off_t'? + loff_t offset); + ^~~~~~ + off_t + +Fixes: + - http://autobuild.buildroot.org/results/4eba7c4585d318efdb9b965d58d879426588aa14 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet (upstream is not reactive on third patch] +--- + vmhgfs-fuse/fsutil.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/vmhgfs-fuse/fsutil.h b/vmhgfs-fuse/fsutil.h +index 34b6d489..a94f9fbb 100644 +--- a/vmhgfs-fuse/fsutil.h ++++ b/vmhgfs-fuse/fsutil.h +@@ -32,7 +32,8 @@ + #include "hgfsProto.h" + #include + +-#if defined(__FreeBSD__) || defined(__SOLARIS__) || defined(__APPLE__) ++#if defined(__FreeBSD__) || defined(__SOLARIS__) || defined(__APPLE__) || \ ++ !(defined(__GLIBC__) || defined(__UCLIBC__)) + typedef long long loff_t; + #endif + +-- +2.25.0 + diff --git a/buildroot/package/openvmtools/Config.in b/buildroot/package/openvmtools/Config.in index 49d718953..1a077a2a4 100644 --- a/buildroot/package/openvmtools/Config.in +++ b/buildroot/package/openvmtools/Config.in @@ -22,16 +22,6 @@ config BR2_PACKAGE_OPENVMTOOLS if BR2_PACKAGE_OPENVMTOOLS -config BR2_PACKAGE_OPENVMTOOLS_PROCPS - bool "procps support" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_PROCPS_NG - help - Enable support for procps / meminfo - -comment "procps support needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS" - depends on !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - config BR2_PACKAGE_OPENVMTOOLS_PAM bool "PAM support" # linux-pam needs locale and wchar, but we already have this @@ -45,6 +35,20 @@ config BR2_PACKAGE_OPENVMTOOLS_PAM comment "PAM support needs a glibc toolchain w/ dynamic library" depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL +config BR2_PACKAGE_OPENVMTOOLS_RESOLUTIONKMS + bool "resolutionkms support" + depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + depends on BR2_i386 || BR2_x86_64 # libdrm vmwgfx + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_LIBDRM_VMWGFX + help + Enable support for resolutionkms + +comment "resolutionkms needs udev, a toolchain w/ threads" + depends on BR2_i386 || BR2_x86_64 + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS + endif comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale" diff --git a/buildroot/package/openvmtools/S10vmtoolsd b/buildroot/package/openvmtools/S10vmtoolsd index 5fdb5682f..60ee875c0 100644 --- a/buildroot/package/openvmtools/S10vmtoolsd +++ b/buildroot/package/openvmtools/S10vmtoolsd @@ -3,33 +3,54 @@ # Starts vmtoolsd for openvmtools # -EXEC="/usr/bin/vmtoolsd" -ARGS="-b" -PID="/var/run/vmtoolsd.pid" +DAEMON="vmtoolsd" +PIDFILE="/var/run/$DAEMON.pid" -[ -r /etc/default/vmtoolsd ] && . /etc/default/vmtoolsd +VMTOOLSD_ARGS="-b" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ + -- $VMTOOLSD_ARGS "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} case "$1" in - start) - printf "Starting vmtoolsd: " - start-stop-daemon -S -q -x $EXEC -- $ARGS $PID - if [ $? != 0 ]; then - echo "FAILED" - exit 1 - else - echo "OK" - fi - ;; - stop) - printf "Stopping vmtoolsd: " - start-stop-daemon -K -q -p $PID - echo "OK" - ;; - restart|reload) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac diff --git a/buildroot/package/openvmtools/openvmtools.mk b/buildroot/package/openvmtools/openvmtools.mk index c5e306221..4201c6daa 100644 --- a/buildroot/package/openvmtools/openvmtools.mk +++ b/buildroot/package/openvmtools/openvmtools.mk @@ -17,8 +17,14 @@ OPENVMTOOLS_CONF_OPTS = --with-dnet \ --without-icu --without-x --without-gtk2 \ --without-gtkmm --without-kernel-modules \ --disable-deploypkg --without-xerces -OPENVMTOOLS_CONF_ENV += CUSTOM_DNET_CPPFLAGS=" " -OPENVMTOOLS_DEPENDENCIES = host-nfs-utils libglib2 libdnet +OPENVMTOOLS_CONF_ENV += \ + CUSTOM_DNET_CPPFLAGS=" " \ + LIBS=$(TARGET_NLS_LIBS) +OPENVMTOOLS_DEPENDENCIES = \ + host-nfs-utils \ + libglib2 \ + libdnet \ + $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBTIRPC),y) OPENVMTOOLS_DEPENDENCIES += libtirpc @@ -37,13 +43,6 @@ else OPENVMTOOLS_CONF_OPTS += --without-ssl endif -ifeq ($(BR2_PACKAGE_OPENVMTOOLS_PROCPS),y) -OPENVMTOOLS_CONF_OPTS += --with-procps -OPENVMTOOLS_DEPENDENCIES += procps-ng -else -OPENVMTOOLS_CONF_OPTS += --without-procps -endif - ifeq ($(BR2_PACKAGE_OPENVMTOOLS_PAM),y) OPENVMTOOLS_CONF_OPTS += --with-pam OPENVMTOOLS_DEPENDENCIES += linux-pam @@ -51,6 +50,13 @@ else OPENVMTOOLS_CONF_OPTS += --without-pam endif +ifeq ($(BR2_PACKAGE_OPENVMTOOLS_RESOLUTIONKMS),y) +OPENVMTOOLS_CONF_OPTS += --enable-resolutionkms +OPENVMTOOLS_DEPENDENCIES += libdrm udev +else +OPENVMTOOLS_CONF_OPTS += --disable-resolutionkms +endif + # symlink needed by lib/system/systemLinux.c (or will cry in /var/log/messages) # defined in lib/misc/hostinfoPosix.c # /sbin/shutdown needed for Guest OS restart/shutdown from hypervisor @@ -72,9 +78,6 @@ endef define OPENVMTOOLS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/openvmtools/vmtoolsd.service \ $(TARGET_DIR)/usr/lib/systemd/system/vmtoolsd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/vmtoolsd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vmtoolsd.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/openvpn/openvpn.hash b/buildroot/package/openvpn/openvpn.hash index b740ea9a8..d219c0f18 100644 --- a/buildroot/package/openvpn/openvpn.hash +++ b/buildroot/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 4f6434fa541cc9e363434ea71a16a62cf2615fb2f16af5b38f43ab5939998c26 openvpn-2.4.6.tar.xz +sha256 fb8ca66bb7807fff595fbdf2a0afd085c02a6aa47715c9aa3171002f9f1a3f91 openvpn-2.4.8.tar.xz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/buildroot/package/openvpn/openvpn.mk b/buildroot/package/openvpn/openvpn.mk index 858398a32..64f459eee 100644 --- a/buildroot/package/openvpn/openvpn.mk +++ b/buildroot/package/openvpn/openvpn.mk @@ -4,14 +4,13 @@ # ################################################################################ -OPENVPN_VERSION = 2.4.6 +OPENVPN_VERSION = 2.4.8 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf openssl OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL OPENVPN_CONF_OPTS = \ - --disable-plugin-auth-pam \ --enable-iproute2 \ --with-crypto-library=openssl \ $(if $(BR2_STATIC_LIBS),--disable-plugins) @@ -38,6 +37,27 @@ else OPENVPN_CONF_OPTS += --disable-lzo endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +OPENVPN_DEPENDENCIES += libselinux +OPENVPN_CONF_OPTS += --enable-selinux +else +OPENVPN_CONF_OPTS += --disable-selinux +endif + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +OPENVPN_DEPENDENCIES += linux-pam +OPENVPN_CONF_OPTS += --enable-plugin-auth-pam +else +OPENVPN_CONF_OPTS += --disable-plugin-auth-pam +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +OPENVPN_DEPENDENCIES += systemd +OPENVPN_CONF_OPTS += --enable-systemd +else +OPENVPN_CONF_OPTS += --disable-systemd +endif + define OPENVPN_INSTALL_TARGET_CMDS $(INSTALL) -m 755 $(@D)/src/openvpn/openvpn \ $(TARGET_DIR)/usr/sbin/openvpn diff --git a/buildroot/package/openzwave/0001-Fix-compilation-of-MinOZW.patch b/buildroot/package/openzwave/0001-Fix-compilation-of-MinOZW.patch deleted file mode 100644 index 773672e0b..000000000 --- a/buildroot/package/openzwave/0001-Fix-compilation-of-MinOZW.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 599e2a11c6f48dde744012ec45686c08e15f3059 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 3 Oct 2016 10:35:52 +0200 -Subject: [PATCH] Fix compilation of MinOZW (#991) - -LIBDIR was used in cpp/examples/MinOZW/Makefile to add dynamic -libraries. However, as it was unset by default, the cross-compilation -could fail if the host had a library such as libnss3.so in /. -To fix this issue, this patch sets LIBDIR to top_buildir if it is unset - -Fixes: - http://autobuild.buildroot.net/results/68719fdf1320a69310bada6d3c47654dacdb5898 - -Signed-off-by: Fabrice Fontaine -[Upstream commit: https://github.com/OpenZWave/open-zwave/commit/599e2a11c6f48dde744012ec45686c08e15f3059] -Signed-off-by: Thomas Petazzoni ---- - cpp/examples/MinOZW/Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/cpp/examples/MinOZW/Makefile b/cpp/examples/MinOZW/Makefile -index e575632a3..95d684b77 100644 ---- a/cpp/examples/MinOZW/Makefile -+++ b/cpp/examples/MinOZW/Makefile -@@ -17,9 +17,11 @@ DEBUG_LDFLAGS := -g - - top_srcdir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../../) - -+#where is put the temporary library -+LIBDIR ?= $(top_builddir) - - INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/ -I $(top_srcdir)/cpp/hidapi/hidapi/ --LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/*.so $(top_builddir)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib ) -+LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib ) - LIBSDIR = $(abspath $(dir $(firstword $(LIBS)))) - minozwsrc := $(notdir $(wildcard $(top_srcdir)/cpp/examples/MinOZW/*.cpp)) - VPATH := $(top_srcdir)/cpp/examples/MinOZW diff --git a/buildroot/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch b/buildroot/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch new file mode 100644 index 000000000..51a06a20f --- /dev/null +++ b/buildroot/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch @@ -0,0 +1,26 @@ +From 3b029a467e83bc7f0054e4dbba1e77e6eac7bc7f Mon Sep 17 00:00:00 2001 +From: Justin Hammond +Date: Sat, 4 May 2019 02:58:15 +0800 +Subject: [PATCH] Fix issue #1783 - Most Compilers Get it, Some need a little + help + +Signed-off-by: Fabrice Fontaine +[Retrieved from +https://github.com/OpenZWave/open-zwave/commit/3b029a467e83bc7f0054e4dbba1e77e6eac7bc7f] +--- + cpp/src/CompatOptionManager.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cpp/src/CompatOptionManager.cpp b/cpp/src/CompatOptionManager.cpp +index 90c87b54d..2d9ac435e 100644 +--- a/cpp/src/CompatOptionManager.cpp ++++ b/cpp/src/CompatOptionManager.cpp +@@ -237,7 +237,7 @@ void CompatOptionManager::WriteXML + { + TiXmlElement* valElement = new TiXmlElement( it->first.c_str() ); + char str[32]; +- TiXmlText * text; ++ TiXmlText * text = NULL; + // std::cout << "Name " << it->first << " Type: " << m_CompatVals[it->second].type << std::endl; + switch (m_CompatVals[it->second].type) { + case COMPAT_FLAG_TYPE_BOOL: diff --git a/buildroot/package/openzwave/0002-Fix-warning-on-wcsdup-implicit-declaration.patch b/buildroot/package/openzwave/0002-Fix-warning-on-wcsdup-implicit-declaration.patch deleted file mode 100644 index 1fe30e41d..000000000 --- a/buildroot/package/openzwave/0002-Fix-warning-on-wcsdup-implicit-declaration.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0878d933223158343af3fe13e03bcd128e8b4cbc Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 22 Apr 2016 17:06:27 +0200 -Subject: [PATCH 1/1] Fix warning on wcsdup implicit declaration - -Define __GNU_SOURCE in cpp/hidapi/linux/hid.c (like already done in -cpp/hidapi/libusb/hid.c) to fix implicit declaration of wcsdup function - -Signed-off-by: Fabrice Fontaine ---- - cpp/hidapi/linux/hid.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cpp/hidapi/linux/hid.c b/cpp/hidapi/linux/hid.c -index dbf9b9b..c3eb22b 100644 ---- a/cpp/hidapi/linux/hid.c -+++ b/cpp/hidapi/linux/hid.c -@@ -21,6 +21,8 @@ - http://github.com/signal11/hidapi . - ********************************************************/ - -+#define _GNU_SOURCE /* needed for wcsdup() before glibc 2.10 */ -+ - /* C */ - #include - #include --- -1.9.1 - diff --git a/buildroot/package/openzwave/0002-update-spec-files.patch b/buildroot/package/openzwave/0002-update-spec-files.patch new file mode 100644 index 000000000..0ba74ab10 --- /dev/null +++ b/buildroot/package/openzwave/0002-update-spec-files.patch @@ -0,0 +1,445 @@ +From 601e5fb16232a7984885e67fdddaf5b9c9dd8105 Mon Sep 17 00:00:00 2001 +From: Justin Hammond +Date: Mon, 6 May 2019 17:05:17 +0800 +Subject: [PATCH] update spec files + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/OpenZWave/open-zwave/commit/601e5fb16232a7984885e67fdddaf5b9c9dd8105] +--- + cpp/build/Makefile | 22 ++- + cpp/build/support.mk | 7 +- + cpp/src/command_classes/DoorLockLogging.cpp | 4 +- + cpp/src/command_classes/UserCode.cpp | 4 +- + dist/libopenzwave.spec | 152 -------------------- + dist/openzwave.spec.in | 145 +++++++++++++++++++ + distfiles.mk | 2 +- + 7 files changed, 174 insertions(+), 162 deletions(-) + delete mode 100644 dist/libopenzwave.spec + create mode 100644 dist/openzwave.spec.in + +diff --git a/cpp/build/Makefile b/cpp/build/Makefile +index bd9463c86..b404a87fd 100644 +--- a/cpp/build/Makefile ++++ b/cpp/build/Makefile +@@ -84,7 +84,19 @@ endif + #where to put the temporary library + LIBDIR ?= $(top_builddir) + +-INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/ ++INCLUDES := -I $(top_srcdir)/cpp/src ++ ++ ++ifeq ($(USE_BI_TXML), 1) ++INCLUDES += -I $(top_srcdir)/cpp/tinyxml/ ++SOURCES_TXML =$(top_srcdir)/cpp/tinyxml/ ++tinyxml := $(notdir $(wildcard $(top_srcdir)/cpp/tinyxml/*.cpp)) ++else ++LIBS+= -ltinyxml ++endif ++ ++ ++ + + + ifeq ($(USE_HID),1) +@@ -105,12 +117,11 @@ LIBS += -ludev + endif + endif # USE_HID + +-SOURCES := $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes $(top_srcdir)/cpp/tinyxml \ ++SOURCES := $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes $(SOURCES_TXML) \ + $(top_srcdir)/cpp/src/value_classes $(top_srcdir)/cpp/src/platform $(top_srcdir)/cpp/src/platform/unix $(SOURCES_HIDAPI) $(top_srcdir)/cpp/src/aes/ +-VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:$(top_srcdir)/cpp/tinyxml:\ ++VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:$(SOURCES_TXML):\ + $(top_srcdir)/cpp/src/value_classes:$(top_srcdir)/cpp/src/platform:$(top_srcdir)/cpp/src/platform/unix:$(SOURCES_HIDAPI):$(top_srcdir)/cpp/src/aes/ + +-tinyxml := $(notdir $(wildcard $(top_srcdir)/cpp/tinyxml/*.cpp)) + + ifeq ($(USE_HID),1) + ifeq ($(UNAME),Darwin) +@@ -163,6 +174,9 @@ $(top_srcdir)/cpp/src/vers.cpp: + @echo 'uint16_t ozw_vers_minor = $(VERSION_MIN);' >> $(top_srcdir)/cpp/src/vers.cpp + @echo 'uint16_t ozw_vers_revision = $(VERSION_REV);' >> $(top_srcdir)/cpp/src/vers.cpp + @echo 'char ozw_version_string[] = "$(GITVERSION)";' >> $(top_srcdir)/cpp/src/vers.cpp ++ @$(SED) \ ++ -e 's|[@]VERSION@|$(VERSION).$(VERSION_REV)|g' \ ++ < "$(top_srcdir)/dist/openzwave.spec.in" > "$(top_srcdir)/dist/openzwave.spec" + + + #$(OBJDIR)/vers.o: $(top_builddir)/vers.cpp +diff --git a/cpp/build/support.mk b/cpp/build/support.mk +index 562a9b280..3ffd17e48 100644 +--- a/cpp/build/support.mk ++++ b/cpp/build/support.mk +@@ -8,8 +8,11 @@ BUILD ?= release + #the prefix to install the library into + PREFIX ?= /usr/local + +-# build HID support by default +-USE_HID ?= 1 ++# dont build HID support by default ++USE_HID ?= 0 ++ ++# use builtin tinyXML by default ++USE_BI_TXML ?= 1 + + #the System we are building on + UNAME := $(shell uname -s) +diff --git a/cpp/src/command_classes/DoorLockLogging.cpp b/cpp/src/command_classes/DoorLockLogging.cpp +index a8d824cd5..f318b3e59 100644 +--- a/cpp/src/command_classes/DoorLockLogging.cpp ++++ b/cpp/src/command_classes/DoorLockLogging.cpp +@@ -268,13 +268,13 @@ bool DoorLockLogging::HandleMsg + } + uint8 userid = (_data[10]); + uint8 usercodelength = (_data[11]); +- char usercode[254], tmpusercode[254]; ++ char usercode[254], tmpusercode[10]; + snprintf(usercode, sizeof(usercode), "UserCode:"); + if (usercodelength > 0) + for (int i = 0; i < usercodelength; i++ ) + { + snprintf(tmpusercode, sizeof(tmpusercode), "%d", (int)_data[12+i]); +- strncat(usercode, tmpusercode, sizeof(usercode) - strlen(usercode) - 1 ); ++ strncat(usercode, tmpusercode, 10); + } + + if (valid) { +diff --git a/cpp/src/command_classes/UserCode.cpp b/cpp/src/command_classes/UserCode.cpp +index a58091aca..dab006731 100644 +--- a/cpp/src/command_classes/UserCode.cpp ++++ b/cpp/src/command_classes/UserCode.cpp +@@ -466,7 +466,9 @@ bool UserCode::HandleMsg + node->CreateValueString( ValueID::ValueGenre_User, GetCommandClassId(), _instance, i, str, "", false, false, data, 0 ); + } + m_userCode[i].status = UserCode_Available; +- memcpy(&m_userCode[i].usercode, 0, 10); ++ /* silly compilers */ ++ for (int j = 0; j < 10; j++) ++ m_userCode[i].usercode[i] = 0; + } + if (m_com.GetFlagBool(COMPAT_FLAG_UC_EXPOSERAWVALUE)) { + node->CreateValueRaw( ValueID::ValueGenre_User, GetCommandClassId(), _instance, UserCodeIndex_RawValue, "Raw UserCode", "", false, false, 0, 0, 0); +diff --git a/dist/libopenzwave.spec b/dist/libopenzwave.spec +deleted file mode 100644 +index 3f29473dd..000000000 +--- a/dist/libopenzwave.spec ++++ /dev/null +@@ -1,152 +0,0 @@ +-Name: libopenzwave +-%if 0%{?fedora} > 0 +-Group: Development/Libraries +-%else +-Group: Productivity/Networking/Other +-%endif +-Summary: Library to access Z-Wave interfaces +-URL:http://code.google.com/p/open-zwave/ +-%if 0%{?suse_version} > 0 +-License: LGPL-2.0+ +-%else +-License: LGPLv2+ +-%endif +-Version: 1.6.0 +-Release: 1 +-BuildRequires: gcc-c++ make libudev-devel doxygen graphviz +-%if 0%{?fedora} >= 18 +-BuildRequires: systemd-devel pkgconfig +-%else +-%if 0%{?suse_version} >= 1220 +-BuildRequires: systemd-devel pkg-config +-%else +-BuildRequires: libudev-devel pkgconfig +-%endif +-%endif +-Source0: open-zwave-%{version}.tar.gz +- +- +-BuildRoot: %{_tmppath}/libopenzwave-root +- +-%description +-OpenZWave is an open-source, cross-platform library designed to enable anyone to +-add support for Z-Wave home-automation devices to their applications, without +-requiring any in depth knowledge of the Z-Wave protocol. +- +-Z-Wave employs a proprietary protocol which the owners, Sigma Designs, have +-chosen not to release into the public domain. There is also no official free +-or low-cost SDK that can be used to develop applications (The ControlThink SDK +-is now tied exclusively to their own Z-Wave PC interface). The only way to +-obtain the protocol documentation and sample code is to purchase an expensive +-development kit, and sign a non-disclosure agreement (NDA) preventing the +-release of that knowledge. +- +-OpenZWave was created to fill that gap. We do not have the official +-documentation, have signed no NDA, and are free to develop the library as we +-see fit. Our knowledge comes from existing bodies of open-source code +-(principally the Z-Wave parts of LinuxMCE), and through examining the +-messages sent by Z-Wave devices. +- +-The goal of the project is to make a positive contribution to the Z-Wave +-community by creating a library that supports as much of the Z-Wave +-specification as possible, and that can be used as a "black-box" solution +-by anyone wanting to add Z-Wave to their application. It is NOT our aim +-to publish alternative documentation of the Z-Wave protocol, or to +-attempt to "punish" Sigma Designs for their decision to keep the +-protocol closed. +- +-%package -n libopenzwave-devel +-Summary: Open-ZWave header files +-%if 0%{?fedora} > 0 +-Group: Development/Libraries +-%else +-Group: Development/Libraries/C and C++ +-%endif +-Requires: %{name} = %{version}-%{release} +- +-%description -n libopenzwave-devel +-header files needed when you want to compile your own +-applications using openzwave +- +-%package -n openzwave +-Summary: Open-ZWave Sample Executables +-%if 0%{?fedora} > 0 +-Group: Development/Libraries +-%else +-Group: Development/Libraries/C and C++ +-%endif +-Requires: %{name} = %{version}-%{release} +- +-%description -n openzwave +-Sample Executables for OpenZWave +- +-%prep +- +-%setup -q -n open-zwave-%{version} +- +- +- +- +-%build +-major_ver=$(echo %{version} | awk -F \. {'print $1'}) +-minor_ver=$(echo %{version} | awk -F \. {'print $2'}) +-revision=$(echo %{version} | awk -F \. {'print $3'}) +-CPPFLAGS=-g VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir} docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make %{?_smp_mflags} +- +-%install +-rm -rf %{buildroot}/* +-major_ver=$(echo %{version} | awk -F \. {'print $1'}) +-minor_ver=$(echo %{version} | awk -F \. {'print $2'}) +-revision=$(echo %{version} | awk -F \. {'print $3'}) +-mkdir -p %{buildroot}/%{_bindir} +-mkdir -p %{buildroot}/%{_libdir} +-mkdir -p %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/ +-mkdir -p %{buildroot}/%{_sysconfdir}/ +-mkdir -p %{buildroot}/%{_includedir}/openzwave/ +-DESTDIR=%{buildroot} VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir}/openzwave/ docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make install +-cp -p INSTALL %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/ +-cp -pr license %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/ +-rm %{buildroot}%{_defaultdocdir}/openzwave-%{version}/Doxyfile.in +-rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/html/ +- +-%files +-%defattr(-,root,root,-) +-%{_libdir}/libopenzwave.so.* +-%dir %{_defaultdocdir}/openzwave-%{version} +-%doc %{_defaultdocdir}/openzwave-%{version}/default.htm +-%doc %{_defaultdocdir}/openzwave-%{version}/general/ +-%doc %{_defaultdocdir}/openzwave-%{version}/images+css/ +-%doc %{_defaultdocdir}/openzwave-%{version}/license/ +-%doc %{_defaultdocdir}/openzwave-%{version}/INSTALL +-%config(noreplace) %{_sysconfdir}/openzwave/ +- +- +- +-%files -n libopenzwave-devel +-%defattr(-,root,root,-) +-%{_bindir}/ozw_config +-%{_includedir}/openzwave/ +-%{_libdir}/libopenzwave.so +-%{_libdir}/pkgconfig/libopenzwave.pc +-%dir %{_defaultdocdir}/openzwave-%{version} +-%doc %{_defaultdocdir}/openzwave-%{version}/api/ +- +- +-%files -n openzwave +-%defattr(-,root,root,-) +-%{_bindir}/MinOZW +- +- +-%post +-/sbin/ldconfig +- +-%post -n libopenzwave-devel +-/sbin/ldconfig +- +-%postun +-/sbin/ldconfig +- +-%changelog +-* Tue Feb 04 2014 Justin Hammond+justin@dynam.ac - 1.0.730-1 +-- Initial Release +- +diff --git a/dist/openzwave.spec.in b/dist/openzwave.spec.in +new file mode 100644 +index 000000000..4d7d22151 +--- /dev/null ++++ b/dist/openzwave.spec.in +@@ -0,0 +1,145 @@ ++Name: openzwave ++Version: @VERSION@ ++Release: 1.0%{?dist} ++Summary: Sample Executables for OpenZWave ++URL: http://www.openzwave.net ++License: LGPLv3+ ++Source0: http://old.openzwave.com/downloads/openzwave-%{version}.tar.gz ++ ++# Use system tinyxml ++#Patch1: openzwave-tinyxml.patch ++# Use system hidapi ++#Patch2: openzwave-hidapi.patch ++# Fix FTBFS ++#Patch3: openzwave-1.5.0-format.patch ++ ++BuildRequires: gcc-c++ ++BuildRequires: doxygen ++BuildRequires: graphviz ++BuildRequires: hidapi-devel ++BuildRequires: systemd-devel ++BuildRequires: tinyxml-devel ++ ++ ++%description ++OpenZWave is an open-source, cross-platform library designed to enable anyone to ++add support for Z-Wave home-automation devices to their applications, without ++requiring any in depth knowledge of the Z-Wave protocol. ++ ++ ++%package -n libopenzwave ++Summary: Library to access Z-Wave interfaces ++ ++ ++%description -n libopenzwave ++OpenZWave is an open-source, cross-platform library designed to enable anyone to ++add support for Z-Wave home-automation devices to their applications, without ++requiring any in depth knowledge of the Z-Wave protocol. ++ ++ ++%package -n libopenzwave-devel ++Summary: Open-ZWave header files ++Requires: libopenzwave%{?_isa} = %{version}-%{release} ++ ++ ++%description -n libopenzwave-devel ++Header files needed when you want to compile your own ++applications using openzwave ++ ++ ++%package -n libopenzwave-devel-doc ++Summary: Open-ZWave API documentation files ++Requires: libopenzwave-devel%{?_isa} = %{version}-%{release} ++ ++ ++%description -n libopenzwave-devel-doc ++API documentation files needed when you want to compile your own ++applications using openzwave ++ ++ ++%prep ++%setup -q -n openzwave-%{version} ++#%patch1 -p1 -b.tinyxml ++#%patch2 -p1 -b.hidapi ++#%patch3 -p1 -b.format ++ ++ ++%build ++major_ver=$(echo %{version} | awk -F \. {'print $1'}) ++minor_ver=$(echo %{version} | awk -F \. {'print $2'}) ++revision=$(echo %{version} | awk -F \. {'print $3'}) ++CPPFLAGS="%{optflags} -Wformat -DOPENZWAVE_ENABLE_EXCEPTIONS" LDFLAGS="%{__global_ldflags}" VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir} docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make %{?_smp_mflags} ++ ++ ++%install ++rm -rf %{buildroot}/* ++major_ver=$(echo %{version} | awk -F \. {'print $1'}) ++minor_ver=$(echo %{version} | awk -F \. {'print $2'}) ++revision=$(echo %{version} | awk -F \. {'print $3'}) ++mkdir -p %{buildroot}/%{_bindir} ++mkdir -p %{buildroot}/%{_libdir} ++mkdir -p %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/ ++mkdir -p %{buildroot}/%{_sysconfdir}/ ++mkdir -p %{buildroot}/%{_includedir}/openzwave/ ++DESTDIR=%{buildroot} VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir}/openzwave/ docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make install ++rm %{buildroot}%{_defaultdocdir}/openzwave-%{version}/Doxyfile.in ++rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/html/ ++rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/default.htm ++rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/general/ ++rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/images+css/ ++rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/api/ ++ ++ ++%files ++%{_bindir}/MinOZW ++ ++ ++%files -n libopenzwave ++%license license/*.txt ++%doc docs/default.htm docs/general/ docs/images+css/ ++%{_libdir}/libopenzwave.so.* ++%dir %{_sysconfdir}/openzwave/ ++%config(noreplace) %{_sysconfdir}/openzwave/* ++ ++ ++%files -n libopenzwave-devel ++%{_bindir}/ozw_config ++%{_includedir}/openzwave/ ++%{_libdir}/libopenzwave.so ++%{_libdir}/pkgconfig/libopenzwave.pc ++ ++ ++%files -n libopenzwave-devel-doc ++%doc docs/api/ ++ ++ ++%ldconfig_scriptlets -n libopenzwave ++ ++ ++%changelog ++* Fri Feb 01 2019 Fedora Release Engineering - 1.5.0-0.20180624git1e36dcc.0 ++- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild ++ ++* Wed Jul 18 2018 Michael Cronenworth - 1.5.0-0.20180623git1e36dcc.0 ++- Update to 20180623 git checkout to fix FTBFS ++- Drop patches that revert BARRIER_OPERATOR support and use newer version ++ ++* Fri Jul 13 2018 Fedora Release Engineering - 1.5.0-0.20171212gitc3b0e31.0 ++- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild ++ ++* Mon Feb 26 2018 Michael Cronenworth - 1.5.0-0.20171211gitc3b0e31.0 ++- Update to 20171211 git checkout ++- Revert new BARRIER_OPERATOR support and use older version ++ ++* Thu Feb 08 2018 Fedora Release Engineering - 1.5.0-0.20170725gitde1c0e6 ++- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild ++ ++* Mon Jul 31 2017 Michael Cronenworth - 1.5.0-0.20170724gitde1c0e6 ++- Update to a git checkout, execeptions patch is upstream ++- Fixes crashing issues with domoticz ++ ++* Thu Jul 27 2017 Fedora Release Engineering - 1.4.164-2 ++- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild ++ ++* Wed Jul 12 2017 Michael Cronenworth - 1.4.164-1 ++- Initial spec +diff --git a/distfiles.mk b/distfiles.mk +index e68082967..9cf436a6f 100644 +--- a/distfiles.mk ++++ b/distfiles.mk +@@ -1273,7 +1273,7 @@ DISTFILES = .gitignore \ + debian/watch \ + dist.mk \ + dist/libopenzwave.changes \ +- dist/libopenzwave.spec \ ++ dist/openzwave.spec \ + distfiles.mk \ + docs/Doxyfile.in \ + docs/default.htm \ diff --git a/buildroot/package/openzwave/0003-Ensure-correct-git-repository-path.patch b/buildroot/package/openzwave/0003-Ensure-correct-git-repository-path.patch deleted file mode 100644 index 6c40ec9d0..000000000 --- a/buildroot/package/openzwave/0003-Ensure-correct-git-repository-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 89cdc83307f61422db21cc7965ea294862c128bf Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 30 May 2016 10:37:42 +0200 -Subject: [PATCH 2/2] Ensure correct git repository path - -Add "--git-dir ./.git" to ensure the correct git repository path is used (this -fix a bug when trying to add openzwave to buildroot build system) - -Signed-off-by: Fabrice Fontaine ---- - cpp/build/support.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cpp/build/support.mk b/cpp/build/support.mk -index 3f74c7e..f529b25 100644 ---- a/cpp/build/support.mk -+++ b/cpp/build/support.mk -@@ -29,7 +29,7 @@ GIT := $(shell which git) - ifeq ($(GIT),) - VERSION_REV ?= 0 - else --GITVERSION := $(shell $(GIT) describe --long --tags --dirty 2>/dev/null | sed s/^v//) -+GITVERSION := $(shell $(GIT) --git-dir ./.git describe --long --tags --dirty 2>/dev/null | sed s/^v//) - ifeq ($(GITVERSION),) - GITVERSION := $(VERSION_MAJ).$(VERSION_MIN).-1 - VERSION_REV := 0 --- -2.7.4 - diff --git a/buildroot/package/openzwave/0004-Fix-compilation-error-in-regards-to-Werror-restrict.patch b/buildroot/package/openzwave/0004-Fix-compilation-error-in-regards-to-Werror-restrict.patch deleted file mode 100644 index b3dbd8f88..000000000 --- a/buildroot/package/openzwave/0004-Fix-compilation-error-in-regards-to-Werror-restrict.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 14164e9920ce3482747483fc16654c82d3ce445f Mon Sep 17 00:00:00 2001 -From: pipiche38 -Date: Fri, 8 Jun 2018 15:13:39 +0200 -Subject: [PATCH] Fix compilation error in regards to -Werror=restrict -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -/usr/share/domoticz/open-zwave/cpp/src/command_classes/DoorLockLogging.cpp: In member function �virtual bool OpenZWave::DoorLockLogging::HandleMsg(const uint8*, uint32, uint32)�: -/usr/share/domoticz/open-zwave/cpp/src/command_classes/DoorLockLogging.cpp:312:15: error: passing argument 1 to restrict-qualified parameter aliases with argument 4 [-Werror=restrict] - snprintf(usercode, sizeof(usercode), "%s %d", usercode, (int)_data[12+i]); - ^~~~~~~~ ~~~~~~~~ -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/OpenZWave/open-zwave/commit/14164e9920ce3482747483fc16654c82d3ce445f] ---- - cpp/src/command_classes/DoorLockLogging.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/cpp/src/command_classes/DoorLockLogging.cpp b/cpp/src/command_classes/DoorLockLogging.cpp -index c235a8497..418f61b7d 100644 ---- a/cpp/src/command_classes/DoorLockLogging.cpp -+++ b/cpp/src/command_classes/DoorLockLogging.cpp -@@ -304,12 +304,13 @@ bool DoorLockLogging::HandleMsg - } - uint8 userid = (_data[10]); - uint8 usercodelength = (_data[11]); -- char usercode[254]; -+ char usercode[254], tmpusercode[254]; - snprintf(usercode, sizeof(usercode), "UserCode:"); - if (usercodelength > 0) - for (int i = 0; i < usercodelength; i++ ) - { -- snprintf(usercode, sizeof(usercode), "%s %d", usercode, (int)_data[12+i]); -+ strncpy(tmpusercode, usercode, sizeof(tmpusercode)); -+ snprintf(usercode, sizeof(usercode), "%s %d", tmpusercode, (int)_data[12+i]); - } - - if (valid) { diff --git a/buildroot/package/openzwave/Config.in b/buildroot/package/openzwave/Config.in index 86f45dc7b..b5c1b620c 100644 --- a/buildroot/package/openzwave/Config.in +++ b/buildroot/package/openzwave/Config.in @@ -1,9 +1,10 @@ config BR2_PACKAGE_OPENZWAVE bool "openzwave" - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_HAS_UDEV + depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR + select BR2_PACKAGE_TINYXML help Free software library that interfaces with selected Z-Wave PC controllers, allowing anyone to create applications that @@ -12,6 +13,6 @@ config BR2_PACKAGE_OPENZWAVE http://www.openzwave.net -comment "openzwave needs udev and a toolchain w/ C++, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_PACKAGE_HAS_UDEV || !BR2_USE_WCHAR +comment "openzwave needs a toolchain w/ C++, dynamic library, NPTL, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/buildroot/package/openzwave/openzwave.hash b/buildroot/package/openzwave/openzwave.hash index f3a677bd4..897973c8d 100644 --- a/buildroot/package/openzwave/openzwave.hash +++ b/buildroot/package/openzwave/openzwave.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 abfb4c7e7728e86ba374c2e0ef7de912594eb24a8c44935457352df844530238 openzwave-V1.5.tar.gz +sha256 3b11dffa7608359c8c848451863e0287e17f5f101aeee7c2e89b7dc16f87050b openzwave-1.6.tar.gz sha256 c8db08727d03bea1213cdb29459b4b489b0d68a0866765df40ff205c6cd7224b license/license.txt sha256 4da452226e9064b597020ad404e1c78d8175bc31ad7c1908485a92c0a4d70284 license/lgpl.txt sha256 33ffdead480674d5f33e2934822a3b93c93e3f8c894667a3bf30bd1195b38f83 license/gpl.txt diff --git a/buildroot/package/openzwave/openzwave.mk b/buildroot/package/openzwave/openzwave.mk index 38515e389..d343f9aad 100644 --- a/buildroot/package/openzwave/openzwave.mk +++ b/buildroot/package/openzwave/openzwave.mk @@ -4,13 +4,13 @@ # ################################################################################ -OPENZWAVE_VERSION = V1.5 -OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,$(OPENZWAVE_VERSION)) +OPENZWAVE_VERSION = 1.6 +OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,v$(OPENZWAVE_VERSION)) OPENZWAVE_LICENSE = LGPL-3.0+, GPL-3.0 (examples), Apache-2.0 (sh2ju.sh) OPENZWAVE_LICENSE_FILES = license/license.txt license/lgpl.txt \ license/gpl.txt license/Apache-License-2.0.txt +OPENZWAVE_DEPENDENCIES = tinyxml -OPENZWAVE_DEPENDENCIES = host-pkgconf udev OPENZWAVE_INSTALL_STAGING = YES # Set instlibdir to install libopenzwave.so* in the correct directory @@ -29,7 +29,15 @@ OPENZWAVE_MAKE_OPTS = \ instlibdir=/usr/lib \ pkgconfigdir=/usr/lib/pkgconfig \ sysconfdir=/etc/openzwave \ - DOXYGEN= + DOXYGEN= \ + USE_BI_TXML=0 + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +OPENZWAVE_DEPENDENCIES += host-pkgconf udev +OPENZWAVE_MAKE_OPTS += USE_HID=1 +else +OPENZWAVE_MAKE_OPTS += USE_HID=0 +endif define OPENZWAVE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(OPENZWAVE_MAKE_OPTS) -C $(@D) diff --git a/buildroot/package/opkg-utils/opkg-utils.hash b/buildroot/package/opkg-utils/opkg-utils.hash index 332823f2c..d95286abc 100644 --- a/buildroot/package/opkg-utils/opkg-utils.hash +++ b/buildroot/package/opkg-utils/opkg-utils.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c14284d999cdd18fee4c6b22720f38beee962b2c8e099166d8d55d76a2111beb opkg-utils-0.3.4.tar.gz +sha256 5a3071019715cf3066946ac9a57fcb51117c611a3114efc56894afc8b3b51b4c opkg-utils-0.4.2.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/opkg-utils/opkg-utils.mk b/buildroot/package/opkg-utils/opkg-utils.mk index df202220d..38137bc67 100644 --- a/buildroot/package/opkg-utils/opkg-utils.mk +++ b/buildroot/package/opkg-utils/opkg-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPKG_UTILS_VERSION = 0.3.4 +OPKG_UTILS_VERSION = 0.4.2 OPKG_UTILS_SITE = http://git.yoctoproject.org/git/opkg-utils OPKG_UTILS_SITE_METHOD = git OPKG_UTILS_LICENSE = GPL-2.0+ diff --git a/buildroot/package/opkg/opkg.hash b/buildroot/package/opkg/opkg.hash index 321c41dbd..b1ead67a1 100644 --- a/buildroot/package/opkg/opkg.hash +++ b/buildroot/package/opkg/opkg.hash @@ -1,2 +1,4 @@ # From http://downloads.yoctoproject.org/releases/opkg/SHA256SUMS -sha256 f607f0e61be8cf8a3bbd0d2dccd9ec9e9b6c21dd4307b671c600d6eeaf84d30b opkg-0.3.6.tar.gz +sha256 86887852c43457edfff9d8b6d9520f3f1cdd55f25eb600a6eb31e1c4e151e106 opkg-0.4.2.tar.gz +# Locally calculated +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/opkg/opkg.mk b/buildroot/package/opkg/opkg.mk index 4d34c6d4d..e25e51b9e 100644 --- a/buildroot/package/opkg/opkg.mk +++ b/buildroot/package/opkg/opkg.mk @@ -4,29 +4,19 @@ # ################################################################################ -OPKG_VERSION = 0.3.6 +OPKG_VERSION = 0.4.2 OPKG_SITE = http://downloads.yoctoproject.org/releases/opkg OPKG_DEPENDENCIES = host-pkgconf libarchive OPKG_LICENSE = GPL-2.0+ OPKG_LICENSE_FILES = COPYING OPKG_INSTALL_STAGING = YES OPKG_CONF_OPTS = --disable-curl -# Populate the conf/ directory -OPKG_AUTORECONF = YES # Ensure directory for lockfile exists define OPKG_CREATE_LOCKDIR mkdir -p $(TARGET_DIR)/usr/lib/opkg endef -# The conf/ directory contains symlinks to host automake and libtool provided -# scripts. Don't rely on them being present. -define OPKG_REMOVE_AUTOTOOLS_SYMLINKS - rm $(@D)/conf/* -endef - -OPKG_POST_EXTRACT_HOOKS += OPKG_REMOVE_AUTOTOOLS_SYMLINKS - ifeq ($(BR2_PACKAGE_OPKG_GPG_SIGN),y) OPKG_CONF_OPTS += --enable-gpg OPKG_CONF_ENV += \ diff --git a/buildroot/package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch b/buildroot/package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch new file mode 100644 index 000000000..98dcac690 --- /dev/null +++ b/buildroot/package/oprofile/0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch @@ -0,0 +1,36 @@ +From ff172a49d1ca5708f45939b9b4f125cafba01db3 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 24 Mar 2020 22:50:32 +0100 +Subject: [PATCH] configure.ac: add foreign option to AM_INIT_AUTOMAKE + +oprofile doesn't provide the NEWS, AUTHORS and ChangeLog file, so +autoreconf complains with: + +Makefile.am: error: required file './NEWS' not found +Makefile.am: error: required file './AUTHORS' not found +Makefile.am: error: required file './ChangeLog' not found + +Such errors can be avoided by passing the "foreign" option to +AM_INIT_AUTOMAKE. + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 00e30079..87afe2b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,7 +13,7 @@ AC_PREREQ(2.13) + + AC_INIT([OProfile], [1.3.0]) + AC_CONFIG_SRCDIR([libop/op_config.h]) +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + AC_CONFIG_HEADERS(config.h) + + AC_CHECK_DECLS([basename], [], [], [[#include ]]) +-- +2.25.1 + diff --git a/buildroot/package/oprofile/0002-oparchive-replace-basename-with-op_basename.patch b/buildroot/package/oprofile/0002-oparchive-replace-basename-with-op_basename.patch deleted file mode 100644 index a2b580dad..000000000 --- a/buildroot/package/oprofile/0002-oparchive-replace-basename-with-op_basename.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5da92e18a538c630cb06a3dbb2affd9bfc128901 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 5 Jun 2018 13:31:34 +0200 -Subject: [PATCH] oparchive: replace basename with op_basename - -Use op_basename instead of basename in oparchive function. -This seems to be the intended use as there is no include on libgen.h for -the standard basename and the argument is a const char* instead of a -char*. - -Fixes: - - http://autobuild.buildroot.net/results/06fbff267063e09f7bc06adb08c896f861ecdb1d - -Signed-off-by: Fabrice Fontaine ---- - pp/oparchive.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pp/oparchive.cpp b/pp/oparchive.cpp -index 6221e148..274152ba 100644 ---- a/pp/oparchive.cpp -+++ b/pp/oparchive.cpp -@@ -261,7 +261,7 @@ int oparchive(options::spec const & spec) - /* determine the session name of sample file */ - int offset = sample_name.find('{'); - string base_samples_dir = sample_name.substr(0, offset-1); -- string session = basename(base_samples_dir.c_str()); -+ string session = op_basename(base_samples_dir.c_str()); - /* Get rid of the the archive_path from the name */ - string sample_base = sample_name.substr(offset); - string sample_archive_file = dest_samples_dir + "/" + session + "/" + sample_base; --- -2.14.1 - diff --git a/buildroot/package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch b/buildroot/package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch new file mode 100644 index 000000000..cff5030e0 --- /dev/null +++ b/buildroot/package/oprofile/0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch @@ -0,0 +1,169 @@ +From 377610414fb6cd7ac30e4485d9d6482fcf29aca6 Mon Sep 17 00:00:00 2001 +From: William Cohen +Date: Wed, 18 Mar 2020 21:19:16 -0400 +Subject: [PATCH] Macro wrappers to handle the binutils 2.34 api changes + +Changes in binutils 2.34 API prevented oprofile from compiling with +it. This patch tests for the changes in the binutils API during +configuration and selects the appropiate wrappers to allow oprofile to +compile. This allows oprofile to compile with both older and newer +versions of binutils. + +Upstream: 377610414fb6cd7ac30e4485d9d6482fcf29aca6 +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 20 ++++++++++++++++++++ + libutil++/bfd_support.cpp | 11 ++++++----- + libutil/op_bfd_wrappers.h | 28 ++++++++++++++++++++++++++++ + opjitconv/create_bfd.c | 7 ++++--- + 4 files changed, 58 insertions(+), 8 deletions(-) + create mode 100644 libutil/op_bfd_wrappers.h + +diff --git a/configure.ac b/configure.ac +index ac2fd35e..df032a78 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -224,6 +224,26 @@ if test "$host_cpu" = "powerpc64le" -o "$host_cpu" = "powerpc64"; then + fi + AC_SUBST(PFM_LIB) + ++HAVE_BINUTILS_234='1' ++AC_MSG_CHECKING([whether binutils 2.34 is being used]) ++rm -f test-for-BINUTILS ++AC_LANG_CONFTEST( ++ [AC_LANG_PROGRAM([[#include ]], ++ [[asection * sect; ++ bfd_size_type buildid_sect_size = bfd_section_size(sect); ++ return 0;]]) ++ ]) ++$CC conftest.$ac_ext $CFLAGS $LDFLAGS $LIBS $PERF_EVENT_FLAGS -o test-for-BINUTILS > /dev/null 2>&1 ++if test -f test-for-BINUTILS; then ++ echo "yes" ++ HAVE_BINUTILS_234='1' ++else ++ echo "no" ++ HAVE_BINUTILS_234='0' ++fi ++AC_DEFINE_UNQUOTED(HAVE_BINUTILS_234, $HAVE_BINUTILS_234, [Using binutils 2.34]) ++rm -f test-for-BINUTILS* ++ + AC_ARG_WITH(java, + [ --with-java=java-home Path to Java home directory (default is "no"; "yes" will use /usr as Java home)], + JAVA_HOMEDIR=$with_java, [with_java=no]) +diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp +index fa904839..cd0f4f71 100644 +--- a/libutil++/bfd_support.cpp ++++ b/libutil++/bfd_support.cpp +@@ -19,6 +19,7 @@ + #include "locate_images.h" + #include "op_libiberty.h" + #include "op_exception.h" ++#include "op_bfd_wrappers.h" + + #include + #include +@@ -137,7 +138,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) + } + } + +- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); ++ bfd_size_type buildid_sect_size = op_bfd_section_size(ibfd, sect); + char * contents = (char *) xmalloc(buildid_sect_size); + errno = 0; + if (!bfd_get_section_contents(ibfd, sect, +@@ -188,7 +189,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) + if (sect == NULL) + return false; + +- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); ++ bfd_size_type debuglink_size = op_bfd_section_size(ibfd, sect); + char * contents = (char *) xmalloc(debuglink_size); + cverb << vbfd + << ".gnu_debuglink section has size " << debuglink_size << endl; +@@ -346,7 +347,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, + // first restrict the search on a sensible range of vma, 16 is + // an intuitive value based on epilog code look + size_t max_search = 16; +- size_t section_size = bfd_section_size(abfd, section); ++ size_t section_size = op_bfd_section_size(abfd, section); + if (pc + max_search > section_size) + max_search = section_size - pc; + +@@ -819,10 +820,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, + else + pc = (sym.value() + offset) - sym.filepos(); + +- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) ++ if ((op_bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) + goto fail; + +- if (pc >= bfd_section_size(abfd, section)) ++ if (pc >= op_bfd_section_size(abfd, section)) + goto fail; + + ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, +diff --git a/libutil/op_bfd_wrappers.h b/libutil/op_bfd_wrappers.h +new file mode 100644 +index 00000000..b229cc12 +--- /dev/null ++++ b/libutil/op_bfd_wrappers.h +@@ -0,0 +1,28 @@ ++/** ++ * @file op_bfd_wrappers.h ++ * Wrappers to hide API changes in binutils 2.34 ++ * ++ * @remark Copyright 2020 OProfile authors ++ * @remark Read the file COPYING ++ * ++ * @author William Cohen ++ */ ++ ++#ifndef OP_BFD_WRAPPERS_H ++#define OP_BFD_WRAPPERS_H ++ ++#if HAVE_BINUTILS_234 ++#define op_bfd_section_size(ibfd, sec) bfd_section_size(sec) ++#define op_bfd_get_section_flags(abfd, sec) bfd_section_flags(sec) ++#define op_bfd_set_section_flags(abfd, sec, flags) bfd_set_section_flags(sec, flags) ++#define op_bfd_set_section_vma(abfd, sec, vma) bfd_set_section_vma(sec, vma) ++#define op_bfd_set_section_size(abfd, sec, size) bfd_set_section_size(sec, size) ++#else ++#define op_bfd_section_size(ibfd, sec) bfd_section_size(ibfd, sec) ++#define op_bfd_get_section_flags(abfd, sec) bfd_get_section_flags(abfd, sec) ++#define op_bfd_set_section_flags(abfd, sec, flags) bfd_set_section_flags(abfd, sec, flags) ++#define op_bfd_set_section_vma(abfd, sec, vma) bfd_set_section_vma(abfd, sec, vma) ++#define op_bfd_set_section_size(abfd, sec, size) bfd_set_section_size(abfd, sec, size) ++#endif ++ ++#endif /* !OP_BFD_WRAPPERS_H */ +diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c +index 48db143b..da1e6d29 100644 +--- a/opjitconv/create_bfd.c ++++ b/opjitconv/create_bfd.c +@@ -16,6 +16,7 @@ + + #include "opjitconv.h" + #include "op_libiberty.h" ++#include "op_bfd_wrappers.h" + + #include + #include +@@ -86,12 +87,12 @@ asection * create_section(bfd * abfd, char const * section_name, + bfd_perror("bfd_make_section"); + goto error; + } +- bfd_set_section_vma(abfd, section, vma); +- if (bfd_set_section_size(abfd, section, size) == FALSE) { ++ op_bfd_set_section_vma(abfd, section, vma); ++ if (op_bfd_set_section_size(abfd, section, size) == FALSE) { + bfd_perror("bfd_set_section_size"); + goto error; + } +- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { ++ if (op_bfd_set_section_flags(abfd, section, flags) == FALSE) { + bfd_perror("bfd_set_section_flags"); + goto error; + } +-- +2.25.1 + diff --git a/buildroot/package/oprofile/oprofile.hash b/buildroot/package/oprofile/oprofile.hash index 737137e0d..d1d96c623 100644 --- a/buildroot/package/oprofile/oprofile.hash +++ b/buildroot/package/oprofile/oprofile.hash @@ -1,6 +1,6 @@ -# From http://sourceforge.net/projects/oprofile/files/oprofile/oprofile-1.2.0/ -sha1 7bf28b74953bd042ff23dc53c399be96d37f144c oprofile-1.2.0.tar.gz -md5 4fcd3920984dcb607314b2e225086c3a oprofile-1.2.0.tar.gz +# From http://sourceforge.net/projects/oprofile/files/oprofile/oprofile-1.3.0/ +sha1 7daa0cca8587e399cb3df9eb817c6a39ffea2082 oprofile-1.3.0.tar.gz +md5 bd998df5521ebedae31e71cd3fb6200b oprofile-1.3.0.tar.gz # Hash for license file: sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/oprofile/oprofile.mk b/buildroot/package/oprofile/oprofile.mk index 2b8219440..b9d7d9e60 100644 --- a/buildroot/package/oprofile/oprofile.mk +++ b/buildroot/package/oprofile/oprofile.mk @@ -4,10 +4,13 @@ # ################################################################################ -OPROFILE_VERSION = 1.2.0 +OPROFILE_VERSION = 1.3.0 OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION) OPROFILE_LICENSE = GPL-2.0+ OPROFILE_LICENSE_FILES = COPYING +# 0002-configure.ac-add-foreign-option-to-AM_INIT_AUTOMAKE.patch +# 0003-Macro-wrappers-to-handle-the-binutils-2.34-api-chang.patch +OPROFILE_AUTORECONF = YES OPROFILE_CONF_OPTS = \ --disable-account-check \ --enable-gui=no \ diff --git a/buildroot/package/optee-benchmark/Config.in b/buildroot/package/optee-benchmark/Config.in new file mode 100644 index 000000000..5fd365a9e --- /dev/null +++ b/buildroot/package/optee-benchmark/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_OPTEE_BENCHMARK + bool "optee-benchmark" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client + select BR2_PACKAGE_OPTEE_CLIENT + select BR2_PACKAGE_LIBYAML + help + Enable the OP-TEE benchmark package that brings facilities + for profiling traversal and execution timings when + invoking OP-TEE. OP-TEE benchmark is a component delivered + by the OP-TEE project. + + http://github.com/linaro-swg/optee_benchmark + +comment "optee-benchmark needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/optee-benchmark/optee-benchmark.hash b/buildroot/package/optee-benchmark/optee-benchmark.hash new file mode 100644 index 000000000..3f5195db6 --- /dev/null +++ b/buildroot/package/optee-benchmark/optee-benchmark.hash @@ -0,0 +1,4 @@ +# From https://github.com/linaro-swg/optee_benchmark/archive/3.7.0.tar.gz +sha256 c2bbeb188e3ebe06c62b1a7d6483d023737695c36d4752402fae33bd8f487c40 optee-benchmark-3.7.0.tar.gz +# Locally computed +sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/buildroot/package/optee-benchmark/optee-benchmark.mk b/buildroot/package/optee-benchmark/optee-benchmark.mk new file mode 100644 index 000000000..9d67f9d26 --- /dev/null +++ b/buildroot/package/optee-benchmark/optee-benchmark.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# optee-benchmark +# +################################################################################ + +OPTEE_BENCHMARK_VERSION = 3.7.0 +OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) +OPTEE_BENCHMARK_LICENSE = BSD-2-Clause +OPTEE_BENCHMARK_LICENSE_FILES = LICENSE + +OPTEE_BENCHMARK_DEPENDENCIES = optee-client libyaml + +$(eval $(cmake-package)) diff --git a/buildroot/package/optee-client/Config.in b/buildroot/package/optee-client/Config.in new file mode 100644 index 000000000..e519a1345 --- /dev/null +++ b/buildroot/package/optee-client/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_OPTEE_CLIENT + bool "optee-client" + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Enable the OP-TEE client package that brings non-secure + client application resources for OP-TEE support. OP-TEE + client is a component delivered by the OP-TEE project. + + The client API library allows application to invoke trusted + applications hosted in the OP-TEE OS secure world. The + supplicant provides services hosted by the non-secure world + and invoked by the secure world. + + https://github.com/OP-TEE/optee_client + +comment "optee-client needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/optee-client/S30optee b/buildroot/package/optee-client/S30optee new file mode 100644 index 000000000..17e6d6d2b --- /dev/null +++ b/buildroot/package/optee-client/S30optee @@ -0,0 +1,49 @@ +#!/bin/sh + +DAEMON="tee-supplicant" +PIDFILE="/var/run/$DAEMON.pid" + +DAEMON_ARGS="-d /dev/teepriv0" + +start() { + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $DAEMON_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature (does not + # reconfigure/restart on SIGHUP, just closes all open files). + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/optee-client/optee-client.hash b/buildroot/package/optee-client/optee-client.hash new file mode 100644 index 000000000..3fae359f3 --- /dev/null +++ b/buildroot/package/optee-client/optee-client.hash @@ -0,0 +1,4 @@ +# From https://github.com/OP-TEE/optee_client/archive/3.7.0.tar.gz +sha256 7a31076a3a77398c6db2b5d3e0a6ac297923bee126ff83430e8f1ebc2a060faa optee-client-3.7.0.tar.gz +# Locally computed +sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/buildroot/package/optee-client/optee-client.mk b/buildroot/package/optee-client/optee-client.mk new file mode 100644 index 000000000..15bebdc61 --- /dev/null +++ b/buildroot/package/optee-client/optee-client.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# optee-client +# +################################################################################ + +OPTEE_CLIENT_VERSION = 3.7.0 +OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) +OPTEE_CLIENT_LICENSE = BSD-2-Clause +OPTEE_CLIENT_LICENSE_FILES = LICENSE +OPTEE_CLIENT_INSTALL_STAGING = YES + +define OPTEE_CLIENT_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30optee \ + $(TARGET_DIR)/etc/init.d/S30optee +endef + +$(eval $(cmake-package)) diff --git a/buildroot/package/optee-examples/Config.in b/buildroot/package/optee-examples/Config.in new file mode 100644 index 000000000..c0fecfdf5 --- /dev/null +++ b/buildroot/package/optee-examples/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_OPTEE_EXAMPLES + bool "optee-examples" + depends on BR2_TARGET_OPTEE_OS + depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client + select BR2_PACKAGE_OPTEE_CLIENT + select BR2_TARGET_OPTEE_OS_SDK + help + Enable the OP-TEE examples package that brings examples of + implementation of OP-TEE non-secure client applications and + secure trusted applications. OP-TEE examples is a + component delivered by the OP-TEE project. + + Trusted application binary files are installed in the target + directory /lib/optee_armtz as other trusted applications. + At runtime OP-TEE OS can load trusted applications from this + non-secure filesystem/directory into the secure world for + execution. + + https://github.com/linaro-swg/optee_examples + +comment "optee-examples needs a toolchain w/ threads" + depends on BR2_TARGET_OPTEE_OS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/optee-examples/optee-examples.hash b/buildroot/package/optee-examples/optee-examples.hash new file mode 100644 index 000000000..8b14e43ad --- /dev/null +++ b/buildroot/package/optee-examples/optee-examples.hash @@ -0,0 +1,4 @@ +# From https://github.com/linaro-swg/optee_examples/archive/3.7.0.tar.gz +sha256 6c5600871edc64dbdca08dfe40b3161bfb55a11e6004699957c6da8f67b2a475 optee-examples-3.7.0.tar.gz +# Locally computed +sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/buildroot/package/optee-examples/optee-examples.mk b/buildroot/package/optee-examples/optee-examples.mk new file mode 100644 index 000000000..093b8600c --- /dev/null +++ b/buildroot/package/optee-examples/optee-examples.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# optee-examples +# +################################################################################ + +OPTEE_EXAMPLES_VERSION = 3.7.0 +OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) +OPTEE_EXAMPLES_LICENSE = BSD-2-Clause +OPTEE_EXAMPLES_LICENSE_FILES = LICENSE + +OPTEE_EXAMPLES_DEPENDENCIES = optee-client optee-os + +# Trusted Application are not built from CMake due to ta_dev_kit dependencies. +# We must build and install them on target. +define OPTEE_EXAMPLES_BUILD_TAS + $(foreach f,$(wildcard $(@D)/*/ta/Makefile), \ + $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ + TA_DEV_KIT_DIR=$(OPTEE_OS_SDK) \ + O=out -C $(dir $f) all + ) +endef +define OPTEE_EXAMPLES_INSTALL_TAS + @mkdir -p $(TARGET_DIR)/lib/optee_armtz + @$(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz $(@D)/*/ta/out/*.ta +endef +OPTEE_EXAMPLES_POST_BUILD_HOOKS += OPTEE_EXAMPLES_BUILD_TAS +OPTEE_EXAMPLES_POST_INSTALL_TARGET_HOOKS += OPTEE_EXAMPLES_INSTALL_TAS + +$(eval $(cmake-package)) diff --git a/buildroot/package/optee-test/0001-use-python3-instead-of-python.patch b/buildroot/package/optee-test/0001-use-python3-instead-of-python.patch new file mode 100644 index 000000000..2765a980d --- /dev/null +++ b/buildroot/package/optee-test/0001-use-python3-instead-of-python.patch @@ -0,0 +1,50 @@ +From cc3cb798375c5f47ea5c7579f32060933435e231 Mon Sep 17 00:00:00 2001 +From: Scott Branden +Date: Fri, 27 Dec 2019 12:54:28 -0800 +Subject: [PATCH] use python3 instead of python + +use python3 instead of python as python2 is EOL January 2020. + +Signed-off-by: Scott Branden +Reviewed-by: Jerome Forissier +Tested-by: Jerome Forissier (QEMU, CFG_GCM_NIST_VECTORS=y) + +(cherry picked from commit 6271160639002a2580d80b75b5397a96d56329f2) +Signed-off-by: Romain Naour +--- + scripts/file_to_c.py | 4 ++-- + scripts/rsp_to_gcm_test.py | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/scripts/file_to_c.py b/scripts/file_to_c.py +index ae16f52..b4ce2a2 100755 +--- a/scripts/file_to_c.py ++++ b/scripts/file_to_c.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-2-Clause + # + # Copyright (c) 2018, Linaro Limited +@@ -29,7 +29,7 @@ def main(): + + f.write("const uint8_t " + args.name + "[] = {\n") + i = 0 +- for x in array.array("B", inf.read()): ++ for x in array.array("B", map(ord, (inf.read()))): + f.write("0x" + '{0:02x}'.format(x) + ",") + i = i + 1 + if i % 8 == 0: +diff --git a/scripts/rsp_to_gcm_test.py b/scripts/rsp_to_gcm_test.py +index 0543541..e4418be 100755 +--- a/scripts/rsp_to_gcm_test.py ++++ b/scripts/rsp_to_gcm_test.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + modes = {'encrypt': 0, 'decrypt': 1} + +-- +2.24.1 + diff --git a/buildroot/package/optee-test/Config.in b/buildroot/package/optee-test/Config.in new file mode 100644 index 000000000..a40f1e906 --- /dev/null +++ b/buildroot/package/optee-test/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_OPTEE_TEST + bool "optee-test" + depends on BR2_TARGET_OPTEE_OS + depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client + select BR2_PACKAGE_OPTEE_CLIENT + select BR2_TARGET_OPTEE_OS_SDK + help + This build option enables OP-TEE test package from the + OP-TEE project. It helps platforms to verify the OP-TEE + installation against a set of regression and performance + tests. + + The package generates userspace test applications and + data files for the Linux userland. It also generates + OP-TEE trusted applications. + + Trusted application binary files are installed in the target + directory /lib/optee_armtz as other trusted applications. + At runtime OP-TEE OS can load trusted applications from this + non-secure filesystem/directory into the secure world for + execution. + + http://github.com/OP-TEE/optee_test + +comment "optee-test needs a toolchain w/ threads" + depends on BR2_TARGET_OPTEE_OS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/optee-test/optee-test.hash b/buildroot/package/optee-test/optee-test.hash new file mode 100644 index 000000000..17f73e26d --- /dev/null +++ b/buildroot/package/optee-test/optee-test.hash @@ -0,0 +1,4 @@ +# From https://github.com/OP-TEE/optee_test/archive/3.7.0.tar.gz +sha256 6486ba7eba8ea8b43278032c9d6ea1d6b35340a7f76ef4c6f34efbca3d80265d optee-test-3.7.0.tar.gz +# Locally computed +sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/buildroot/package/optee-test/optee-test.mk b/buildroot/package/optee-test/optee-test.mk new file mode 100644 index 000000000..4cf2f9530 --- /dev/null +++ b/buildroot/package/optee-test/optee-test.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# optee-test +# +################################################################################ + +OPTEE_TEST_VERSION = 3.7.0 +OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) +OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, +OPTEE_TEST_LICENSE_FILES = LICENSE.md + +OPTEE_TEST_DEPENDENCIES = optee-client optee-os + +OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_OS_SDK) + +# Trusted Application are not built from CMake due to ta_dev_kit +# dependencies. We must build and install them on target. +define OPTEE_TEST_BUILD_TAS + $(foreach f,$(wildcard $(@D)/ta/*_lib/Makefile) $(wildcard $(@D)/ta/*/Makefile), \ + $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ + TA_DEV_KIT_DIR=$(OPTEE_OS_SDK) \ + -C $(dir $f) all + ) +endef +define OPTEE_TEST_INSTALL_TAS + @mkdir -p $(TARGET_DIR)/lib/optee_armtz + @$(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz $(@D)/ta/*/*.ta +endef +OPTEE_TEST_POST_BUILD_HOOKS += OPTEE_TEST_BUILD_TAS +OPTEE_TEST_POST_INSTALL_TARGET_HOOKS += OPTEE_TEST_INSTALL_TAS + +$(eval $(cmake-package)) diff --git a/buildroot/package/oracle-mysql/oracle-mysql.hash b/buildroot/package/oracle-mysql/oracle-mysql.hash index bc309ec9a..9d1c86854 100644 --- a/buildroot/package/oracle-mysql/oracle-mysql.hash +++ b/buildroot/package/oracle-mysql/oracle-mysql.hash @@ -1,4 +1,6 @@ # From https://downloads.mariadb.com/archives/mysql-5.1/mysql-5.1.73.tar.gz.md5 md5 887f869bcc757957067b9198f707f32f mysql-5.1.73.tar.gz # Locally computed -sha256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 mysql-5.1.73.tar.gz +sha256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 mysql-5.1.73.tar.gz +sha256 cbf0dbf56528a629f4358a1339f981202f1a9a0d9542c092b03f486064ced2db README +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/oracle-mysql/oracle-mysql.mk b/buildroot/package/oracle-mysql/oracle-mysql.mk index 326fbcc04..8a8613a3d 100644 --- a/buildroot/package/oracle-mysql/oracle-mysql.mk +++ b/buildroot/package/oracle-mysql/oracle-mysql.mk @@ -116,9 +116,6 @@ endef define ORACLE_MYSQL_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(ORACLE_MYSQL_PKGDIR)/mysqld.service \ $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/mysqld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mysqld.service endef else diff --git a/buildroot/package/orc/Config.in b/buildroot/package/orc/Config.in index 7943ecfbf..90f2b3262 100644 --- a/buildroot/package/orc/Config.in +++ b/buildroot/package/orc/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_ORC bool "orc" depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_BINFMT_FLAT # configure doesn't know uclinux help Orc is a library and set of tools for compiling and executing very simple programs that operate on arrays of data. @@ -10,4 +9,3 @@ config BR2_PACKAGE_ORC comment "orc needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_BINFMT_FLAT diff --git a/buildroot/package/orc/orc.hash b/buildroot/package/orc/orc.hash index 71dd3007c..c30a50112 100644 --- a/buildroot/package/orc/orc.hash +++ b/buildroot/package/orc/orc.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/orc/orc-0.4.27.tar.xz.sha256sum -sha256 4f8901f9144b5ec17dffdb33548b5f4c7f8049b0d1023be3462cdd64ec5a3ab2 orc-0.4.29.tar.xz +# From https://gstreamer.freedesktop.org/src/orc/orc-0.4.31.tar.xz.sha256sum +sha256 a0ab5f10a6a9ae7c3a6b4218246564c3bf00d657cbdf587e6d34ec3ef0616075 orc-0.4.31.tar.xz # Locally calculated sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf COPYING diff --git a/buildroot/package/orc/orc.mk b/buildroot/package/orc/orc.mk index d121266bc..51a9b7848 100644 --- a/buildroot/package/orc/orc.mk +++ b/buildroot/package/orc/orc.mk @@ -4,24 +4,20 @@ # ################################################################################ -ORC_VERSION = 0.4.29 +ORC_VERSION = 0.4.31 ORC_SOURCE = orc-$(ORC_VERSION).tar.xz ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc ORC_LICENSE = BSD-2-Clause, BSD-3-Clause ORC_LICENSE_FILES = COPYING ORC_INSTALL_STAGING = YES ORC_DEPENDENCIES = host-orc +ORC_CONF_OPTS = \ + -Dbenchmarks=disabled \ + -Dexamples=disabled \ + -Dgtk_doc=disabled \ + -Dorc-test=disabled \ + -Dtests=disabled \ + -Dtools=disabled -define ORC_REMOVE_BUGREPORT - rm -f $(TARGET_DIR)/usr/bin/orc-bugreport -endef - -define ORC_REMOVE_DEVFILES - rm -f $(TARGET_DIR)/usr/bin/orcc -endef - -ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_BUGREPORT -ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_DEVFILES - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/buildroot/package/ortp/ortp.hash b/buildroot/package/ortp/ortp.hash index c990d96eb..93ec39297 100644 --- a/buildroot/package/ortp/ortp.hash +++ b/buildroot/package/ortp/ortp.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 eb61a833ab3ad80978d7007411240f46e9b2d1034373b9d9dfaac88c1b6ec0af ortp-0.27.0.tar.gz +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/buildroot/package/owfs/0001-include-sys-sysmacros.h-for-major.patch b/buildroot/package/owfs/0001-include-sys-sysmacros.h-for-major.patch deleted file mode 100644 index dadf0276c..000000000 --- a/buildroot/package/owfs/0001-include-sys-sysmacros.h-for-major.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0d5e4ba51d2b90a64f5d310d715ed367bbcc8996 Mon Sep 17 00:00:00 2001 -From: Tomasz Torcz -Date: Sat, 17 Mar 2018 12:56:04 +0100 -Subject: [PATCH] include for major() - - Linux glibc ceased to include it in sys/types.h: -https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html - -Signed-off-by: Baruch Siach ---- -Upstream status: commit 0d5e4ba51d2 - - configure.ac | 2 +- - module/owlib/src/include/ow.h | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 86751bf7cff7..d625d3f02b48 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -180,7 +180,7 @@ m4_include([src/scripts/m4/acx_pthread.m4]) - # Checks for header files. - AC_HEADER_DIRENT - AC_HEADER_STDC --AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h]) -+AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/sysmacros.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h]) - AC_CHECK_HEADERS([linux/limits.h linux/types.h netdb.h dlfcn.h]) - AC_CHECK_HEADERS(sys/event.h sys/inotify.h) - -diff --git a/module/owlib/src/include/ow.h b/module/owlib/src/include/ow.h -index 9dbec5f31cf7..0a31055238b1 100644 ---- a/module/owlib/src/include/ow.h -+++ b/module/owlib/src/include/ow.h -@@ -188,8 +188,12 @@ - #include /* for getaddrinfo */ - #endif /* HAVE_NETDB_H */ - -+#ifdef HAVE_SYS_SYSMACROS_H -+#include /* for major() */ -+#endif /* HAVE_SYS_SYSMACROS_H */ -+ - #ifdef HAVE_SYS_MKDEV_H --#include /* for major() */ -+#include /* for major() on Solaris */ - #endif /* HAVE_SYS_MKDEV_H */ - - #include // for offsetof() --- -2.18.0 - diff --git a/buildroot/package/owfs/owfs.hash b/buildroot/package/owfs/owfs.hash index eeea64368..4c6b15a4e 100644 --- a/buildroot/package/owfs/owfs.hash +++ b/buildroot/package/owfs/owfs.hash @@ -1,7 +1,4 @@ -# From https://sourceforge.net/projects/owfs/files/owfs/3.2p2/ -md5 f85e81837fe9ec273499a17f2f7a9143 owfs-3.2p2.tar.gz -sha1 d04032696a3fba9f250a9a1d552361072a9f22ea owfs-3.2p2.tar.gz # Locally calculated -sha256 39535521a65a74bd36dc31726bcf04201f60f230a7944e9a63c393c318f5113c owfs-3.2p2.tar.gz -sha256 e484a24fa5d177576e1672306165f495633bd5f0daaf628d1ff5ecfc85bdc637 COPYING -sha256 3879dcca586c08d1fe3325f3a0aec5b47d543100bc6b1dfb30bf24ec48675b10 COPYING.LIB +sha256 b8d33eba57d4a2f6c8a11ff23f233e3248bd75a42c8219b058a888846edd8717 owfs-3.2p3.tar.gz +sha256 1f0527ab035eefb5197c68633d06f50f5077c719d82a99344702ceaca29150b9 COPYING +sha256 8a6601b893d5784d931b2ede64a406fac463acfbb7014914e27de4d6e68457c3 COPYING.LIB diff --git a/buildroot/package/owfs/owfs.mk b/buildroot/package/owfs/owfs.mk index fccc2efa5..ffc0b3098 100644 --- a/buildroot/package/owfs/owfs.mk +++ b/buildroot/package/owfs/owfs.mk @@ -4,14 +4,11 @@ # ################################################################################ -OWFS_VERSION = 3.2p2 -OWFS_SITE = http://downloads.sourceforge.net/project/owfs/owfs/$(OWFS_VERSION) +OWFS_VERSION = 3.2p3 +OWFS_SITE = https://github.com/owfs/owfs/releases/download/v$(OWFS_VERSION) OWFS_DEPENDENCIES = host-pkgconf OWFS_CONF_OPTS = --disable-owperl --without-perl5 --disable-owtcl --without-tcl -# We're patching configure.ac -OWFS_AUTORECONF = YES - # owtcl license is declared in module/ownet/c/src/include/ow_functions.h OWFS_LICENSE = GPL-2.0+, LGPL-2.0 (owtcl) OWFS_LICENSE_FILES = COPYING COPYING.LIB @@ -90,6 +87,16 @@ OWFS_DEPENDENCIES += python host-swig # Patching owfs to do the right thing is not trivial, it's much easier to # override the PYSITEDIR variable in make. OWFS_EXTRA_MAKE_OPTS += PYSITEDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages + +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define OWFS_FIXUP_PYTHON_SYSCONFIGDATA + find $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python* \ + -name "_sysconfigdata*.py" | xargs --no-run-if-empty \ + $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/owfs/:g" +endef +OWFS_PRE_CONFIGURE_HOOKS += OWFS_FIXUP_PYTHON_SYSCONFIGDATA +endif + else OWFS_CONF_OPTS += --disable-owpython --without-python endif diff --git a/buildroot/package/owl-linux/owl-linux.hash b/buildroot/package/owl-linux/owl-linux.hash index 4a5133df4..555d2c284 100644 --- a/buildroot/package/owl-linux/owl-linux.hash +++ b/buildroot/package/owl-linux/owl-linux.hash @@ -1,2 +1,3 @@ # locally computed sha256 a6b1bc6b3900954438a0f1a316bac5f74171125a88c80c35e137f4ca512dedc6 owl-linux-1.0.7.tar.gz +sha256 092f1698328e0d4cc2d04ef1445207a9d278963284cd709fa88f1b8c9999264b LICENSE diff --git a/buildroot/package/p11-kit/0001-Fix-build-against-older-pthreads-implementations.patch b/buildroot/package/p11-kit/0001-Fix-build-against-older-pthreads-implementations.patch deleted file mode 100644 index 3562f3c2b..000000000 --- a/buildroot/package/p11-kit/0001-Fix-build-against-older-pthreads-implementations.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 05b6a7550756ffdced25a6c51cf2222bad9e59e7 Mon Sep 17 00:00:00 2001 -Message-Id: <05b6a7550756ffdced25a6c51cf2222bad9e59e7.1399285491.git.baruch@tkos.co.il> -From: Baruch Siach -Date: Mon, 5 May 2014 09:32:23 +0300 -Subject: [PATCH] Fix build against older pthreads implementations - -Older pthreads implementations like glibc NPTL prior to version 2.12, and -uClibc linuxthreads (both), need _XOPEN_SOURCE to expose -pthread_mutexattr_settype() and THREAD_MUTEX_DEFAULT. The value 600 (SuSv3, -POSIX.1-2001) is equivalent to _POSIX_C_SOURCE 200112L. - -Fixes the following build error: - - CC compat.lo -compat.c: In function 'p11_mutex_init': -compat.c:164:2: warning: implicit declaration of function 'pthread_mutexattr_settype' [-Wimplicit-function-declaration] -compat.c:164:2: warning: nested extern declaration of 'pthread_mutexattr_settype' [-Wnested-externs] -compat.c:164:36: error: 'PTHREAD_MUTEX_DEFAULT' undeclared (first use in this function) - -Patch status: sent upstream - -Signed-off-by: Baruch Siach ---- - common/compat.h | 6 ++++++ - common/message.c | 6 ------ - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/common/compat.h b/common/compat.h -index d7fe414a46bf..fbc1dc1d4f0f 100644 ---- a/common/compat.h -+++ b/common/compat.h -@@ -37,6 +37,12 @@ - - #include "config.h" - -+/* -+ * Oh god. glibc is nasty. Changes behavior and definitions of POSIX -+ * functions to completely different signatures depending on defines -+ */ -+#define _XOPEN_SOURCE 600 -+ - #include - #include - -diff --git a/common/message.c b/common/message.c -index 35f2764487a9..e68dfac561c8 100644 ---- a/common/message.c -+++ b/common/message.c -@@ -37,12 +37,6 @@ - - #include "config.h" - --/* -- * Oh god. glibc is nasty. Changes behavior and definitions of POSIX -- * functions to completely different signatures depending on defines -- */ --#define _POSIX_C_SOURCE 200112L -- - #include "compat.h" - #define P11_DEBUG_FLAG P11_DEBUG_LIB - #include "debug.h" --- -2.0.0.rc0 - diff --git a/buildroot/package/p11-kit/p11-kit.hash b/buildroot/package/p11-kit/p11-kit.hash index c0182eb4c..45f0f1d64 100644 --- a/buildroot/package/p11-kit/p11-kit.hash +++ b/buildroot/package/p11-kit/p11-kit.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 ba726ea8303c97467a33fca50ee79b7b35212964be808ecf9b145e9042fdfaf0 p11-kit-0.23.2.tar.gz +sha256 4b34e92ae36fa493e0d94366c767f06d5f9951e3d8581d10fd935d738db1574d p11-kit-0.23.16.1.tar.gz +# Locally computed +sha256 2e1ba993904df807a10c3eda1e5c272338edc35674b679773a8b3ad460731054 COPYING diff --git a/buildroot/package/p11-kit/p11-kit.mk b/buildroot/package/p11-kit/p11-kit.mk index 10b5cc039..1f72e0515 100644 --- a/buildroot/package/p11-kit/p11-kit.mk +++ b/buildroot/package/p11-kit/p11-kit.mk @@ -4,8 +4,8 @@ # ################################################################################ -P11_KIT_VERSION = 0.23.2 -P11_KIT_SITE = http://p11-glue.freedesktop.org/releases +P11_KIT_VERSION = 0.23.16.1 +P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION) P11_KIT_DEPENDENCIES = host-pkgconf libffi libtasn1 P11_KIT_INSTALL_STAGING = YES P11_KIT_CONF_OPTS = --disable-static diff --git a/buildroot/package/p7zip/p7zip.hash b/buildroot/package/p7zip/p7zip.hash index b134550ee..a63a0b4a9 100644 --- a/buildroot/package/p7zip/p7zip.hash +++ b/buildroot/package/p7zip/p7zip.hash @@ -2,4 +2,5 @@ md5 a0128d661cfe7cc8c121e73519c54fbf p7zip_16.02_src_all.tar.bz2 sha1 e8819907132811aa1afe5ef296181d3a15cc8f22 p7zip_16.02_src_all.tar.bz2 # Locally computed -sha256 5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f p7zip_16.02_src_all.tar.bz2 +sha256 5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f p7zip_16.02_src_all.tar.bz2 +sha256 555806657dcf0f1e720b581c52643c195ec86ae3f00bd18cc66d2e0f88ffa210 DOC/License.txt diff --git a/buildroot/package/p910nd/p910nd.hash b/buildroot/package/p910nd/p910nd.hash index 1b952c8e1..93b138990 100644 --- a/buildroot/package/p910nd/p910nd.hash +++ b/buildroot/package/p910nd/p910nd.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 4ac980a3ae24babae6f70f0a692625ece03a4a92c357fbb10d2e368386c3c26f p910nd-0.97.tar.bz2 +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash index d628d0661..97b15d132 100644 --- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash +++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 87cf846b02dde6328b84832287d8725d91f12f41366eecb4d59eeda1d6c7efdf paho-mqtt-c-v1.3.0.tar.gz +sha256 7b4eed66ae3df3613629139c0df28b16abfa4e0927bd17360027d936784aa55e paho-mqtt-c-1.3.1.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 sha256 44277b2bec6093e4ac313afec251a4de599d24c4e768f8574d95b13a9d2d97b5 epl-v10 diff --git a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk index 9e8ae2999..8772d73be 100644 --- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,8 +4,8 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = v1.3.0 -PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,$(PAHO_MQTT_C_VERSION)) +PAHO_MQTT_C_VERSION = 1.3.1 +PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION)) PAHO_MQTT_C_LICENSE = EPL-1.0 or BSD-3-Clause PAHO_MQTT_C_LICENSE_FILES = epl-v10 edl-v10 PAHO_MQTT_C_INSTALL_STAGING = YES diff --git a/buildroot/package/paho-mqtt-cpp/Config.in b/buildroot/package/paho-mqtt-cpp/Config.in new file mode 100644 index 000000000..dfeb5545f --- /dev/null +++ b/buildroot/package/paho-mqtt-cpp/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_PAHO_MQTT_CPP + bool "paho-mqtt-cpp" + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_PAHO_MQTT_C + help + MQTT client C++ library + + https://eclipse.org/paho/clients/cpp/ + +comment "paho-mqtt-cpp needs a toolchain w/ threads, C++, dynamic library support" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + +comment "paho-mqtt-cpp needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.hash b/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.hash new file mode 100644 index 000000000..e5406e0b8 --- /dev/null +++ b/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 cb0343349ed91ef51d0e76ae860d19435a730d3d355e57886bb090014cb70bbe paho-mqtt-cpp-1.1.tar.gz +sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 +sha256 44277b2bec6093e4ac313afec251a4de599d24c4e768f8574d95b13a9d2d97b5 epl-v10 diff --git a/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk b/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk new file mode 100644 index 000000000..2cb65d984 --- /dev/null +++ b/buildroot/package/paho-mqtt-cpp/paho-mqtt-cpp.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# paho-mqtt-cpp +# +################################################################################ + +PAHO_MQTT_CPP_VERSION = 1.1 +PAHO_MQTT_CPP_SITE = $(call github,eclipse,paho.mqtt.cpp,v$(PAHO_MQTT_CPP_VERSION)) +PAHO_MQTT_CPP_LICENSE = EPL-1.0 or BSD-3-Clause +PAHO_MQTT_CPP_LICENSE_FILES = epl-v10 edl-v10 +PAHO_MQTT_CPP_INSTALL_STAGING = YES +PAHO_MQTT_CPP_DEPENDENCIES = paho-mqtt-c + +# The following CMake variable disables a TRY_RUN call in the -pthread +# test which is not allowed when cross-compiling (for cmake < 3.10) +PAHO_MQTT_CPP_CONF_OPTS = -DTHREADS_PTHREAD_ARG=OFF + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +PAHO_MQTT_CPP_DEPENDENCIES += openssl +PAHO_MQTT_CPP_CONF_OPTS += -DPAHO_WITH_SSL=TRUE +else +PAHO_MQTT_CPP_CONF_OPTS += -DPAHO_WITH_SSL=FALSE +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/pango/0001-build-disable-tests-from-building.patch b/buildroot/package/pango/0001-build-disable-tests-from-building.patch deleted file mode 100644 index 1156c24f0..000000000 --- a/buildroot/package/pango/0001-build-disable-tests-from-building.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1c503a8b2f127c12e58a6e8ba01743c04061df50 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 5 Sep 2017 07:25:17 -0400 -Subject: [PATCH] build: disable tests from building - -Signed-off-by: Gustavo Zacarias -[Adam: refresh for pango 1.40.12] -Signed-off-by: Adam Duskett ---- - Makefile.am | 2 +- - Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 70bf8b0..c69daf0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in. - --SUBDIRS= pango pango-view examples docs tools tests win32 -+SUBDIRS= pango pango-view examples docs tools win32 - - meson_dist_files = \ - pango/pango-features.h.meson \ -diff --git a/Makefile.in b/Makefile.in -index 8489ca1..51f6ada 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -412,7 +412,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = pango pango-view examples docs tools tests win32 -+SUBDIRS = pango pango-view examples docs tools win32 - meson_dist_files = \ - pango/pango-features.h.meson \ - pango-view/meson.build \ --- -2.13.5 - diff --git a/buildroot/package/pango/0002-Prevent-an-assertion-with-invalid-Unicode-sequences.patch b/buildroot/package/pango/0002-Prevent-an-assertion-with-invalid-Unicode-sequences.patch deleted file mode 100644 index 010981e8b..000000000 --- a/buildroot/package/pango/0002-Prevent-an-assertion-with-invalid-Unicode-sequences.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 71aaeaf020340412b8d012fe23a556c0420eda5f Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Fri, 17 Aug 2018 22:29:36 -0400 -Subject: [PATCH] Prevent an assertion with invalid Unicode sequences - -Invalid Unicode sequences, such as 0x2665 0xfe0e 0xfe0f, -can trick the Emoji iter code into returning an empty -segment, which then triggers an assertion in the itemizer. - -Prevent this by ensuring that we make progress. - -This issue was reported by Jeffrey M. - -Signed-off-by: Peter Korsgaard ---- - pango/pango-emoji.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/pango/pango-emoji.c b/pango/pango-emoji.c -index 0e332dff..29472452 100644 ---- a/pango/pango-emoji.c -+++ b/pango/pango-emoji.c -@@ -253,6 +253,12 @@ _pango_emoji_iter_next (PangoEmojiIter *iter) - if (iter->is_emoji == PANGO_EMOJI_TYPE_IS_EMOJI (current_emoji_type)) - { - iter->is_emoji = !PANGO_EMOJI_TYPE_IS_EMOJI (current_emoji_type); -+ -+ /* Make sure we make progress. Weird sequences, like a VC15 followed -+ * by VC16, can trick us into stalling otherwise. */ -+ if (iter->start == iter->end) -+ iter->end = g_utf8_next_char (iter->end); -+ - return TRUE; - } - } --- -2.11.0 - diff --git a/buildroot/package/pango/0002-no-gtk-doc.patch b/buildroot/package/pango/0002-no-gtk-doc.patch deleted file mode 100644 index 926a263f1..000000000 --- a/buildroot/package/pango/0002-no-gtk-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -Same patch as for systemd in commit -7144f2f04b705538a893e538a6b851f536f433b6: - -Fix deactivation of gtk-doc - -The tarball contains the Makefile for building documentation with gtk-doc, -Unfortunately the AM_CONDITIONAL variable is not the correct one, which -results in an error when running autoreconf. - -This patch fixes this issue. - -Signed-off-by: Eric Le Bihan -Signed-off-by: Hadrien Boutteville - ---- a/gtk-doc.make -+++ b/gtk-doc.make -@@ -267,7 +267,7 @@ - # - # Require gtk-doc when making dist - # --if HAVE_GTK_DOC -+if ENABLE_GTK_DOC - dist-check-gtkdoc: docs - else - dist-check-gtkdoc: diff --git a/buildroot/package/pango/Config.in b/buildroot/package/pango/Config.in index e8a531867..e810598ee 100644 --- a/buildroot/package/pango/Config.in +++ b/buildroot/package/pango/Config.in @@ -5,7 +5,9 @@ config BR2_PACKAGE_PANGO depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # freetype support depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # harfbuzz select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBFRIBIDI select BR2_PACKAGE_EXPAT select BR2_PACKAGE_CAIRO select BR2_PACKAGE_FONTCONFIG @@ -22,8 +24,9 @@ config BR2_PACKAGE_PANGO http://www.pango.org/ -comment "pango needs a toolchain w/ wchar, threads, C++" +comment "pango needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/pango/pango.hash b/buildroot/package/pango/pango.hash index 6df08e9cf..1cd19d3cf 100644 --- a/buildroot/package/pango/pango.hash +++ b/buildroot/package/pango/pango.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-1.40.14.sha256sum -sha256 90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3 pango-1.40.14.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.44/pango-1.44.6.sha256sum +sha256 3e1e41ba838737e200611ff001e3b304c2ca4cdbba63d200a20db0b0ddc0f86c pango-1.44.6.tar.xz sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/pango/pango.mk b/buildroot/package/pango/pango.mk index 805d35e12..48edd18b0 100644 --- a/buildroot/package/pango/pango.mk +++ b/buildroot/package/pango/pango.mk @@ -4,22 +4,22 @@ # ################################################################################ -PANGO_VERSION_MAJOR = 1.40 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).14 +PANGO_VERSION_MAJOR = 1.44 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).6 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) -PANGO_AUTORECONF = YES PANGO_INSTALL_STAGING = YES PANGO_LICENSE = LGPL-2.0+ PANGO_LICENSE_FILES = COPYING -PANGO_CONF_OPTS = --enable-explicit-deps=no -HOST_PANGO_CONF_OPTS = --enable-explicit-deps=no +PANGO_CONF_OPTS = -Duse_fontconfig=true -Dintrospection=false +HOST_PANGO_CONF_OPTS = -Duse_fontconfig=true -Dintrospection=false PANGO_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ host-pkgconf \ libglib2 \ + libfribidi \ cairo \ harfbuzz \ fontconfig \ @@ -27,22 +27,19 @@ PANGO_DEPENDENCIES = \ HOST_PANGO_DEPENDENCIES = \ host-pkgconf \ host-libglib2 \ + host-libfribidi \ host-cairo \ host-harfbuzz \ host-fontconfig \ host-freetype ifeq ($(BR2_PACKAGE_XORG7),y) -PANGO_CONF_OPTS += \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib PANGO_DEPENDENCIES += xlib_libX11 endif ifeq ($(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yy) PANGO_DEPENDENCIES += xlib_libXft xlib_libXrender -PANGO_CONF_OPTS += --with-xft endif -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/buildroot/package/pangomm/pangomm.hash b/buildroot/package/pangomm/pangomm.hash index b5d527fa7..bde53e4fb 100644 --- a/buildroot/package/pangomm/pangomm.hash +++ b/buildroot/package/pangomm/pangomm.hash @@ -1,2 +1,5 @@ # From http://ftp.gnome.org/pub/gnome/sources/pangomm/2.40/pangomm-2.40.1.sha256sum -sha256 9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af pangomm-2.40.1.tar.xz +sha256 9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af pangomm-2.40.1.tar.xz +# Locally computed +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/buildroot/package/parted/0001-libparted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch b/buildroot/package/parted/0001-libparted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch deleted file mode 100644 index 1cf699bb1..000000000 --- a/buildroot/package/parted/0001-libparted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 141c4309d7164dcd4e09d137fc075c1726fd8dbb Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sun, 3 May 2015 10:33:15 +0200 -Subject: [PATCH] libparted/arch/linux.c: Compile without ENABLE_DEVICE_MAPPER - -Signed-off-by: Brian C. Lane -Signed-off-by: Yegor Yefremov ---- - libparted/arch/linux.c | 21 +++++++++++++++++---- - 1 file changed, 17 insertions(+), 4 deletions(-) - -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 0f18904..cf38c6f 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -2304,6 +2304,7 @@ zasprintf (const char *format, ...) - return r < 0 ? NULL : resultp; - } - -+#ifdef ENABLE_DEVICE_MAPPER - static char * - dm_canonical_path (PedDevice const *dev) - { -@@ -2326,14 +2327,21 @@ dm_canonical_path (PedDevice const *dev) - err: - return NULL; - } -+#endif - - static char* - _device_get_part_path (PedDevice const *dev, int num) - { -- char *devpath = (dev->type == PED_DEVICE_DM -- ? dm_canonical_path (dev) : dev->path); -- size_t path_len = strlen (devpath); -+ char *devpath; -+ size_t path_len; - char *result; -+#ifdef ENABLE_DEVICE_MAPPER -+ devpath = (dev->type == PED_DEVICE_DM -+ ? dm_canonical_path (dev) : dev->path); -+#else -+ devpath = dev->path; -+#endif -+ path_len = strlen (devpath); - /* Check for devfs-style /disc => /partN transformation - unconditionally; the system might be using udev with devfs rules, - and if not the test is harmless. */ -@@ -2349,8 +2357,10 @@ _device_get_part_path (PedDevice const *dev, int num) - ? "p" : ""); - result = zasprintf ("%s%s%d", devpath, p, num); - } -+#ifdef ENABLE_DEVICE_MAPPER - if (dev->type == PED_DEVICE_DM) - free (devpath); -+#endif - return result; - } - -@@ -2945,12 +2955,15 @@ _disk_sync_part_table (PedDisk* disk) - unsigned long long *length); - - -+#ifdef ENABLE_DEVICE_MAPPER - if (disk->dev->type == PED_DEVICE_DM) { - add_partition = _dm_add_partition; - remove_partition = _dm_remove_partition; - resize_partition = _dm_resize_partition; - get_partition_start_and_length = _dm_get_partition_start_and_length; -- } else { -+ } else -+#endif -+ { - add_partition = _blkpg_add_partition; - remove_partition = _blkpg_remove_partition; - #ifdef BLKPG_RESIZE_PARTITION --- -2.14.2 - diff --git a/buildroot/package/parted/0002-configure.ac-uclinux-is-also-linux.patch b/buildroot/package/parted/0002-configure.ac-uclinux-is-also-linux.patch deleted file mode 100644 index 5a264ced8..000000000 --- a/buildroot/package/parted/0002-configure.ac-uclinux-is-also-linux.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7697d9c54e489b32b82c01f17db04f8b51857e51 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Mon, 30 Jun 2014 10:09:04 -0300 -Subject: [PATCH] configure.ac: uclinux is also linux - -uclinux is used in the tuple for some noMMU linux builds like Blackfin -FLAT output, so accept it as linux too. - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 436d0e2..50ad478 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,10 +58,10 @@ AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. - - AC_CANONICAL_HOST - case "$host_os" in -- linux*) OS=linux ;; -+ linux*|uclinux*) OS=linux ;; - gnu*) OS=gnu ;; - beos*) OS=beos ;; -- *) AC_MSG_ERROR([Unknown or unsupported OS "$host_os". Only "linux", "gnu" and "beos" are supported in this version of GNU Parted.]) ;; -+ *) AC_MSG_ERROR([Unknown or unsupported OS "$host_os". Only "linux", "uclinux", "gnu" and "beos" are supported in this version of GNU Parted.]) ;; - esac - AC_SUBST([OS]) - --- -2.14.2 - diff --git a/buildroot/package/parted/0003-Include-fcntl.h-to-get-loff_t-definition.patch b/buildroot/package/parted/0003-Include-fcntl.h-to-get-loff_t-definition.patch deleted file mode 100644 index 752938ab7..000000000 --- a/buildroot/package/parted/0003-Include-fcntl.h-to-get-loff_t-definition.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2078c07d38ee7841b89ac8d81afc5e8bfcd4f703 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 8 Oct 2017 00:58:58 +0200 -Subject: [PATCH] Include to get loff_t definition - -Patch borrowed from Alpine Linux at -http://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch. Solves -build with musl. - -Signed-off-by: Thomas Petazzoni ---- - libparted/fs/xfs/platform_defs.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libparted/fs/xfs/platform_defs.h b/libparted/fs/xfs/platform_defs.h -index 2b55752..17023dc 100644 ---- a/libparted/fs/xfs/platform_defs.h -+++ b/libparted/fs/xfs/platform_defs.h -@@ -35,6 +35,7 @@ - #define __XFS_PLATFORM_DEFS_H__ - - #include -+#include - #include - #include - #include --- -2.14.2 - diff --git a/buildroot/package/parted/0004-libparted-labels-link-with-libiconv-if-needed.patch b/buildroot/package/parted/0004-libparted-labels-link-with-libiconv-if-needed.patch deleted file mode 100644 index a4a1b0033..000000000 --- a/buildroot/package/parted/0004-libparted-labels-link-with-libiconv-if-needed.patch +++ /dev/null @@ -1,54 +0,0 @@ -From dd17f55b2ac189ccd3b8025e4f6509537d00f9d3 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Sun, 8 Oct 2017 00:53:31 +0200 -Subject: [PATCH] libparted/labels: link with libiconv if needed - -gpt.c uses iconv so it should link with it. Otherwise, on platforms -where libiconv is a separate library, we get a link failure of parted: - - CCLD parted - ../libparted/.libs/libparted.so: undefined reference to `libiconv' - ../libparted/.libs/libparted.so: undefined reference to `libiconv_open' - ../libparted/.libs/libparted.so: undefined reference to `libiconv_close' - -Since iconv functionality is needed unconditionally (not only when -gettext is enabled), AM_ICONV needs to be added to configure.ac. - -Upstream status: sent to mailing list -http://lists.alioth.debian.org/pipermail/parted-devel/2017-November/005131.html - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - configure.ac | 2 ++ - libparted/labels/Makefile.am | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 50ad478..62f1b4d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -288,6 +288,8 @@ fi - AC_PROG_LIBTOOL - LT_INIT - -+AM_ICONV -+ - AM_GNU_GETTEXT_VERSION([0.18]) - AM_GNU_GETTEXT([external]) - if test "$USE_INCLUDED_LIBINTL" = "yes"; then -diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am -index c996f81..b204379 100644 ---- a/libparted/labels/Makefile.am -+++ b/libparted/labels/Makefile.am -@@ -35,7 +35,7 @@ liblabels_la_SOURCES = \ - rdb.c \ - sun.c - --liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) -+liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) $(LIBICONV) - - AM_CPPFLAGS = $(partedincludedir) $(INTLINCS) - --- -2.14.2 - diff --git a/buildroot/package/parted/0005-linux-Include-sys-sysmacros.h-for-major-macro.patch b/buildroot/package/parted/0005-linux-Include-sys-sysmacros.h-for-major-macro.patch deleted file mode 100644 index e0b4c2acb..000000000 --- a/buildroot/package/parted/0005-linux-Include-sys-sysmacros.h-for-major-macro.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ba5e0451b51c983e40afd123b6e0d3eddb55e610 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sat, 24 Mar 2018 17:37:02 +0000 -Subject: [PATCH] linux: Include for major() macro. - -Since glibc 2.27 this header is required. - -Signed-off-by: Giulio Benetti ---- - libparted/arch/linux.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 31b98ab..7e86b51 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -41,6 +41,7 @@ - #include /* for uname() */ - #include - #include -+#include - #ifdef ENABLE_DEVICE_MAPPER - #include - #endif --- -2.17.1 - diff --git a/buildroot/package/parted/Config.in b/buildroot/package/parted/Config.in index 9d78f0f1f..a35b30662 100644 --- a/buildroot/package/parted/Config.in +++ b/buildroot/package/parted/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_PARTED bool "parted" + depends on BR2_ENABLE_LOCALE depends on BR2_USE_WCHAR + depends on !BR2_TOOLCHAIN_USES_UCLIBC select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID help @@ -8,5 +10,6 @@ config BR2_PACKAGE_PARTED http://www.gnu.org/software/parted/ -comment "parted needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR +comment "parted needs a glibc or musl toolchain w/ locale, wchar" + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR diff --git a/buildroot/package/parted/parted.hash b/buildroot/package/parted/parted.hash index e31ae3c4c..2c466eb8d 100644 --- a/buildroot/package/parted/parted.hash +++ b/buildroot/package/parted/parted.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 parted-3.2.tar.xz +sha256 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 parted-3.3.tar.xz + +# Locally calculated +sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING diff --git a/buildroot/package/parted/parted.mk b/buildroot/package/parted/parted.mk index 1f0428a55..c3ab3ceb4 100644 --- a/buildroot/package/parted/parted.mk +++ b/buildroot/package/parted/parted.mk @@ -4,15 +4,11 @@ # ################################################################################ -PARTED_VERSION = 3.2 +PARTED_VERSION = 3.3 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted PARTED_DEPENDENCIES = host-pkgconf util-linux PARTED_INSTALL_STAGING = YES -# 0002-configure.ac-uclinux-is-also-linux.patch -# 0004-libparted-labels-link-with-libiconv-if-needed.patch -PARTED_AUTORECONF = YES -PARTED_GETTEXTIZE = YES PARTED_LICENSE = GPL-3.0+ PARTED_LICENSE_FILES = COPYING @@ -34,10 +30,6 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) PARTED_DEPENDENCIES += libiconv endif -ifeq ($(BR2_STATIC_LIBS),y) -PARTED_CONF_OPTS += --disable-dynamic-loading -endif - HOST_PARTED_DEPENDENCIES = host-pkgconf host-util-linux HOST_PARTED_CONF_OPTS += \ --without-readline \ diff --git a/buildroot/package/patch/0004-Invoke-ed-directly-instead-of-using-the-shell.patch b/buildroot/package/patch/0004-Invoke-ed-directly-instead-of-using-the-shell.patch new file mode 100644 index 000000000..ae64d58b9 --- /dev/null +++ b/buildroot/package/patch/0004-Invoke-ed-directly-instead-of-using-the-shell.patch @@ -0,0 +1,41 @@ +From 3fcd042d26d70856e826a42b5f93dc4854d80bf0 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Fri, 6 Apr 2018 19:36:15 +0200 +Subject: Invoke ed directly instead of using the shell + +* src/pch.c (do_ed_script): Invoke ed directly instead of using a shell +command to avoid quoting vulnerabilities. +[Retrieved from: +https://git.savannah.gnu.org/cgit/patch.git/commit/?id=3fcd042d26d70856e826a42b5f93dc4854d80bf0] +Signed-off-by: Fabrice Fontaine +--- + src/pch.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/pch.c b/src/pch.c +index 4fd5a05..16e001a 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char const *outname, + *outname_needs_removal = true; + copy_file (inname, outname, 0, exclusive, instat.st_mode, true); + } +- sprintf (buf, "%s %s%s", editor_program, +- verbosity == VERBOSE ? "" : "- ", +- outname); + fflush (stdout); + + pid = fork(); +@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char const *outname, + else if (pid == 0) + { + dup2 (tmpfd, 0); +- execl ("/bin/sh", "sh", "-c", buf, (char *) 0); ++ assert (outname[0] != '!' && outname[0] != '-'); ++ execlp (editor_program, editor_program, "-", outname, (char *) NULL); + _exit (2); + } + else +-- +cgit v1.2.1 + diff --git a/buildroot/package/patch/0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch b/buildroot/package/patch/0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch new file mode 100644 index 000000000..e07ae0c67 --- /dev/null +++ b/buildroot/package/patch/0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch @@ -0,0 +1,111 @@ +From dce4683cbbe107a95f1f0d45fabc304acfb5d71a Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Mon, 15 Jul 2019 16:21:48 +0200 +Subject: Don't follow symlinks unless --follow-symlinks is given + +* src/inp.c (plan_a, plan_b), src/util.c (copy_to_fd, copy_file, +append_to_file): Unless the --follow-symlinks option is given, open files with +the O_NOFOLLOW flag to avoid following symlinks. So far, we were only doing +that consistently for input files. +* src/util.c (create_backup): When creating empty backup files, (re)create them +with O_CREAT | O_EXCL to avoid following symlinks in that case as well. +[Retrieved from: +https://git.savannah.gnu.org/cgit/patch.git/commit/?id=dce4683cbbe107a95f1f0d45fabc304acfb5d71a] +Signed-off-by: Fabrice Fontaine +--- + src/inp.c | 12 ++++++++++-- + src/util.c | 14 +++++++++++--- + 2 files changed, 21 insertions(+), 5 deletions(-) + +diff --git a/src/inp.c b/src/inp.c +index 32d0919..22d7473 100644 +--- a/src/inp.c ++++ b/src/inp.c +@@ -238,8 +238,13 @@ plan_a (char const *filename) + { + if (S_ISREG (instat.st_mode)) + { +- int ifd = safe_open (filename, O_RDONLY|binary_transput, 0); ++ int flags = O_RDONLY | binary_transput; + size_t buffered = 0, n; ++ int ifd; ++ ++ if (! follow_symlinks) ++ flags |= O_NOFOLLOW; ++ ifd = safe_open (filename, flags, 0); + if (ifd < 0) + pfatal ("can't open file %s", quotearg (filename)); + +@@ -340,6 +345,7 @@ plan_a (char const *filename) + static void + plan_b (char const *filename) + { ++ int flags = O_RDONLY | binary_transput; + int ifd; + FILE *ifp; + int c; +@@ -353,7 +359,9 @@ plan_b (char const *filename) + + if (instat.st_size == 0) + filename = NULL_DEVICE; +- if ((ifd = safe_open (filename, O_RDONLY | binary_transput, 0)) < 0 ++ if (! follow_symlinks) ++ flags |= O_NOFOLLOW; ++ if ((ifd = safe_open (filename, flags, 0)) < 0 + || ! (ifp = fdopen (ifd, binary_transput ? "rb" : "r"))) + pfatal ("Can't open file %s", quotearg (filename)); + if (TMPINNAME_needs_removal) +diff --git a/src/util.c b/src/util.c +index 1cc08ba..fb38307 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -388,7 +388,7 @@ create_backup (char const *to, const struct stat *to_st, bool leave_original) + + try_makedirs_errno = ENOENT; + safe_unlink (bakname); +- while ((fd = safe_open (bakname, O_CREAT | O_WRONLY | O_TRUNC, 0666)) < 0) ++ while ((fd = safe_open (bakname, O_CREAT | O_EXCL | O_WRONLY | O_TRUNC, 0666)) < 0) + { + if (errno != try_makedirs_errno) + pfatal ("Can't create file %s", quotearg (bakname)); +@@ -579,10 +579,13 @@ create_file (char const *file, int open_flags, mode_t mode, + static void + copy_to_fd (const char *from, int tofd) + { ++ int from_flags = O_RDONLY | O_BINARY; + int fromfd; + ssize_t i; + +- if ((fromfd = safe_open (from, O_RDONLY | O_BINARY, 0)) < 0) ++ if (! follow_symlinks) ++ from_flags |= O_NOFOLLOW; ++ if ((fromfd = safe_open (from, from_flags, 0)) < 0) + pfatal ("Can't reopen file %s", quotearg (from)); + while ((i = read (fromfd, buf, bufsize)) != 0) + { +@@ -625,6 +628,8 @@ copy_file (char const *from, char const *to, struct stat *tost, + else + { + assert (S_ISREG (mode)); ++ if (! follow_symlinks) ++ to_flags |= O_NOFOLLOW; + tofd = create_file (to, O_WRONLY | O_BINARY | to_flags, mode, + to_dir_known_to_exist); + copy_to_fd (from, tofd); +@@ -640,9 +645,12 @@ copy_file (char const *from, char const *to, struct stat *tost, + void + append_to_file (char const *from, char const *to) + { ++ int to_flags = O_WRONLY | O_APPEND | O_BINARY; + int tofd; + +- if ((tofd = safe_open (to, O_WRONLY | O_BINARY | O_APPEND, 0)) < 0) ++ if (! follow_symlinks) ++ to_flags |= O_NOFOLLOW; ++ if ((tofd = safe_open (to, to_flags, 0)) < 0) + pfatal ("Can't reopen file %s", quotearg (to)); + copy_to_fd (from, tofd); + if (close (tofd) != 0) +-- +cgit v1.2.1 + diff --git a/buildroot/package/patch/patch.mk b/buildroot/package/patch/patch.mk index d581682c7..b7f5bac05 100644 --- a/buildroot/package/patch/patch.mk +++ b/buildroot/package/patch/patch.mk @@ -10,6 +10,18 @@ PATCH_SITE = $(BR2_GNU_MIRROR)/patch PATCH_LICENSE = GPL-3.0+ PATCH_LICENSE_FILES = COPYING +# 0001-Fix-segfault-with-mangled-rename-patch.patch +PATCH_IGNORE_CVES += CVE-2018-6951 + +# 0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch +PATCH_IGNORE_CVES += CVE-2018-1000156 + +# 0004-Invoke-ed-directly-instead-of-using-the-shell.patch +PATCH_IGNORE_CVES += CVE-2018-20969 CVE-2019-13638 + +# 0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch +PATCH_IGNORE_CVES += CVE-2019-13636 + ifeq ($(BR2_PACKAGE_ATTR),y) PATCH_CONF_OPTS += --enable-xattr PATCH_DEPENDENCIES += attr diff --git a/buildroot/package/pax-utils/pax-utils.hash b/buildroot/package/pax-utils/pax-utils.hash index c75589602..1b4cee4fb 100644 --- a/buildroot/package/pax-utils/pax-utils.hash +++ b/buildroot/package/pax-utils/pax-utils.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9 pax-utils-1.2.2.tar.xz +sha256 7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9 pax-utils-1.2.2.tar.xz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/paxtest/paxtest.hash b/buildroot/package/paxtest/paxtest.hash index c10566c5a..d9a8caa24 100644 --- a/buildroot/package/paxtest/paxtest.hash +++ b/buildroot/package/paxtest/paxtest.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 d553848431fd8c2ab6c8361b62e5cedfed1cc1d60088241f4a33d2af15dd667f paxtest-0.9.15.tar.gz +sha256 d553848431fd8c2ab6c8361b62e5cedfed1cc1d60088241f4a33d2af15dd667f paxtest-0.9.15.tar.gz +sha256 fe8759e6d3ff462c876ded6e95e3fb297d607bc45799bb264ec9a170b5046522 README diff --git a/buildroot/package/pciutils/pciutils.hash b/buildroot/package/pciutils/pciutils.hash index 80d7041a4..da0358cac 100644 --- a/buildroot/package/pciutils/pciutils.hash +++ b/buildroot/package/pciutils/pciutils.hash @@ -1,2 +1,3 @@ # From https://www.kernel.org/pub/software/utils/pciutils/sha256sums.asc sha256 1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5 pciutils-3.5.5.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/pcmanfm/Config.in b/buildroot/package/pcmanfm/Config.in index 69ddf0023..f28159963 100644 --- a/buildroot/package/pcmanfm/Config.in +++ b/buildroot/package/pcmanfm/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_PCMANFM depends on BR2_USE_MMU # libglib2 depends on BR2_INSTALL_LIBSTDCPP # libgtk2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_LIBFM select BR2_PACKAGE_MENU_CACHE select BR2_PACKAGE_LIBGLIB2 @@ -17,9 +18,10 @@ config BR2_PACKAGE_PCMANFM http://wiki.lxde.org/en/PCManFM -comment "pcmanfm needs a toolchain w/ wchar, threads, C++" +comment "pcmanfm needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_PACKAGE_XORG7 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/pcmanfm/pcmanfm.hash b/buildroot/package/pcmanfm/pcmanfm.hash index f633b49aa..b5574e39c 100644 --- a/buildroot/package/pcmanfm/pcmanfm.hash +++ b/buildroot/package/pcmanfm/pcmanfm.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/ -md5 827838f7f6b17dc97e1690c07da8fdb3 pcmanfm-1.3.0.tar.xz -sha1 690fb28c0957ad56e28d1b8f5384e63462c118b2 pcmanfm-1.3.0.tar.xz +md5 d32ad2c9c7c52bff2004bbc120b53420 pcmanfm-1.3.1.tar.xz +sha1 4de1e5cb00fbf837c137f205e7e2327e3b49cb90 pcmanfm-1.3.1.tar.xz # Hash for license file: sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/pcmanfm/pcmanfm.mk b/buildroot/package/pcmanfm/pcmanfm.mk index 5d8730984..1d946ba52 100644 --- a/buildroot/package/pcmanfm/pcmanfm.mk +++ b/buildroot/package/pcmanfm/pcmanfm.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCMANFM_VERSION = 1.3.0 +PCMANFM_VERSION = 1.3.1 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.xz PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm $(TARGET_NLS_DEPENDENCIES) diff --git a/buildroot/package/pcre/pcre.hash b/buildroot/package/pcre/pcre.hash index ca72a78cd..7513d5f19 100644 --- a/buildroot/package/pcre/pcre.hash +++ b/buildroot/package/pcre/pcre.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301 pcre-8.42.tar.bz2 +sha256 91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b pcre-8.43.tar.bz2 # License files, locally calculated -sha256 f998c0f52eb704eff28f503580cfca3f2547280aa212994f6cf2d8e317587c1c LICENCE +sha256 a5fce68baf797e0918463a4437ef75984c41118f43850ddeabda1b5a90154309 LICENCE diff --git a/buildroot/package/pcre/pcre.mk b/buildroot/package/pcre/pcre.mk index 163e535ec..595cda8a5 100644 --- a/buildroot/package/pcre/pcre.mk +++ b/buildroot/package/pcre/pcre.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE_VERSION = 8.42 +PCRE_VERSION = 8.43 PCRE_SITE = https://ftp.pcre.org/pub/pcre PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2 PCRE_LICENSE = BSD-3-Clause diff --git a/buildroot/package/pcre2/Config.in b/buildroot/package/pcre2/Config.in index bb576c75a..f35877f37 100644 --- a/buildroot/package/pcre2/Config.in +++ b/buildroot/package/pcre2/Config.in @@ -23,4 +23,24 @@ config BR2_PACKAGE_PCRE2_32 This option builds the 32-bits pcre2 library, i.e 'libpcre2-32' +config BR2_PACKAGE_PCRE2_JIT_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc + default y if BR2_sparc + +config BR2_PACKAGE_PCRE2_JIT + bool "enable JIT support" + depends on BR2_PACKAGE_PCRE2_JIT_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + This option enables JIT support + +comment "JIT support needs a toolchain w/ threads" + depends on BR2_PACKAGE_PCRE2_JIT_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS + endif diff --git a/buildroot/package/pcre2/pcre2.hash b/buildroot/package/pcre2/pcre2.hash index a3210b184..03f7eb32d 100644 --- a/buildroot/package/pcre2/pcre2.hash +++ b/buildroot/package/pcre2/pcre2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.32.tar.bz2.sig -sha256 f29e89cc5de813f45786580101aaee3984a65818631d4ddbda7b32f699b87c2e pcre2-10.32.tar.bz2 +# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.33.tar.bz2.sig +sha256 35514dff0ccdf02b55bd2e9fa586a1b9d01f62332c3356e379eabb75f789d8aa pcre2-10.33.tar.bz2 # Locally computed -sha256 c4a8b89cd38d6a7501d5b11a472fa15e71a051b66d6331c6cda364101389d6ee LICENCE +sha256 982293becea3f18eb4e3ce2145f66638e46d105a27b88418766caf321a684d03 LICENCE diff --git a/buildroot/package/pcre2/pcre2.mk b/buildroot/package/pcre2/pcre2.mk index ee3cacb9a..61f41e06e 100644 --- a/buildroot/package/pcre2/pcre2.mk +++ b/buildroot/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.32 +PCRE2_VERSION = 10.33 PCRE2_SITE = https://ftp.pcre.org/pub/pcre PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause @@ -16,6 +16,12 @@ PCRE2_CONF_OPTS += --enable-pcre2-8 PCRE2_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE2_16),--enable-pcre2-16,--disable-pcre2-16) PCRE2_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE2_32),--enable-pcre2-32,--disable-pcre2-32) +ifeq ($(BR2_PACKAGE_PCRE2_JIT),y) +PCRE2_CONF_OPTS += --enable-jit +else +PCRE2_CONF_OPTS += --disable-jit +endif + # disable fork usage if not available ifeq ($(BR2_USE_MMU),) PCRE2_CONF_OPTS += --disable-pcre2grep-callout diff --git a/buildroot/package/pcsc-lite/0001-Add-disable-documentation-option.patch b/buildroot/package/pcsc-lite/0001-Add-disable-documentation-option.patch deleted file mode 100644 index 6a083f5aa..000000000 --- a/buildroot/package/pcsc-lite/0001-Add-disable-documentation-option.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 77ac8fcb78e3085577cd4eb5c4ac7746a5444f13 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 17 May 2019 15:48:35 +0200 -Subject: [PATCH] Add --disable-documentation option - -This option allows the user to disable man pages which can be useful if -podman is not available - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/LudovicRousseau/PCSC/pull/60] ---- - configure.ac | 7 +++++++ - src/spy/Makefile.am | 2 ++ - 2 files changed, 9 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 0fa5168..7d20c6e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -144,6 +144,12 @@ esac - AC_DEFINE_UNQUOTED(PCSC_ARCH, "$PCSC_ARCH", [PC/SC target architecture]) - PCSCLITE_FEATURES="${PCSCLITE_FEATURES} $PCSC_ARCH $host" - -+# --disable-documentation -+AC_ARG_ENABLE(documentation, -+ AS_HELP_STRING([--disable-documentation],[do not build documentation]), -+ [ enable_doc="${enableval}" ], [ enable_doc="yes" ] ) -+AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no") -+ - # See if socket() is found from libsocket - AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"]) - -@@ -446,6 +452,7 @@ use libsystemd: ${use_libsystemd} - systemd unit directory: ${with_systemdsystemunitdir} - serial config dir.: ${confdir_exp} - filter: ${use_filter} -+documentation: ${enable_doc} - - PCSCLITE_FEATURES: ${PCSCLITE_FEATURES} - -diff --git a/src/spy/Makefile.am b/src/spy/Makefile.am -index 3c3daee..0a83371 100644 ---- a/src/spy/Makefile.am -+++ b/src/spy/Makefile.am -@@ -6,6 +6,7 @@ dist_bin_SCRIPTS = pcsc-spy - libpcscspy_la_SOURCES = \ - libpcscspy.c - -+if ENABLE_DOC - man_MANS = pcsc-spy.1 - - pcsc-spy.1: pcsc-spy.pod -@@ -13,6 +14,7 @@ pcsc-spy.1: pcsc-spy.pod - --center="PC/SC lite" \ - --release="$(PACKAGE_NAME) $(PACKAGE_VERSION)" \ - $(srcdir)/pcsc-spy.pod > $@ -+endif - - EXTRA_DIST = install_spy.sh uninstall_spy.sh pcsc-spy.pod - CLEANFILES = pcsc-spy.1 --- -2.20.1 - diff --git a/buildroot/package/pcsc-lite/pcsc-lite.hash b/buildroot/package/pcsc-lite/pcsc-lite.hash index 7e209f8cd..5df6a9358 100644 --- a/buildroot/package/pcsc-lite/pcsc-lite.hash +++ b/buildroot/package/pcsc-lite/pcsc-lite.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d76d79edc31cf76e782b9f697420d3defbcc91778c3c650658086a1b748e8792 pcsc-lite-1.8.25.tar.bz2 +sha256 3eb7be7d6ef618c0a444316cf5c1f2f9d7227aedba7a192f389fe3e7c0dfbbd9 pcsc-lite-1.8.26.tar.bz2 sha256 40d4358bb8dc8d30f5365ae6d999b6f820bbc051b292912482f2e4d0ebd837e1 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-3.0.txt diff --git a/buildroot/package/pcsc-lite/pcsc-lite.mk b/buildroot/package/pcsc-lite/pcsc-lite.mk index e819a9391..96fa3f937 100644 --- a/buildroot/package/pcsc-lite/pcsc-lite.mk +++ b/buildroot/package/pcsc-lite/pcsc-lite.mk @@ -4,14 +4,13 @@ # ################################################################################ -PCSC_LITE_VERSION = 1.8.25 +PCSC_LITE_VERSION = 1.8.26 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2 PCSC_LITE_SITE = https://pcsclite.apdu.fr/files PCSC_LITE_INSTALL_STAGING = YES PCSC_LITE_DEPENDENCIES = host-pkgconf PCSC_LITE_LICENSE = BSD-2-Clause (auth), BSD-3-Clause, GPL-3.0+ (demo, spy, tests), ISC (simclist) PCSC_LITE_LICENSE_FILES = COPYING GPL-3.0.txt -PCSC_LITE_AUTORECONF = YES # - libudev and libusb are optional # - libudev and libusb can't be used together @@ -44,10 +43,4 @@ ifeq ($(PACKAGE_PCSC_LITE_EMBEDDED),y) PCSC_LITE_CONF_OPTS += --enable-embedded endif -define PCSC_LITE_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants - ln -sf ../../../../usr/lib/systemd/system/pcscd.socket \ - $(TARGET_DIR)/etc/systemd/system/sockets.target.wants/pcscd.socket -endef - $(eval $(autotools-package)) diff --git a/buildroot/package/pdbg/pdbg.hash b/buildroot/package/pdbg/pdbg.hash index 2f11ad599..486dff240 100644 --- a/buildroot/package/pdbg/pdbg.hash +++ b/buildroot/package/pdbg/pdbg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 da65ebbd9a710555e9684472ee36fff37e897111034fcc2c07172cc39016d169 pdbg-v2.0.tar.gz +sha256 10f701c4bb8557a35de166c4322d77fa64ddbdd1146141a88a3d530144545820 pdbg-2.4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/buildroot/package/pdbg/pdbg.mk b/buildroot/package/pdbg/pdbg.mk index ba3b0b887..9977a126f 100644 --- a/buildroot/package/pdbg/pdbg.mk +++ b/buildroot/package/pdbg/pdbg.mk @@ -4,18 +4,13 @@ # ################################################################################ -PDBG_VERSION = v2.0 -PDBG_SITE = $(call github,open-power,pdbg,$(PDBG_VERSION)) +PDBG_VERSION = 2.4 +PDBG_SITE = $(call github,open-power,pdbg,v$(PDBG_VERSION)) PDBG_LICENSE = Apache-2.0 PDBG_LICENSE_FILES = COPYING PDBG_AUTORECONF = YES PDBG_DEPENDENCIES = host-dtc -PDBG_MAKE_OPTS = "GIT_SHA1=\"$(PDBG_VERSION)\"" - -define PDBG_PATCH_M4 - mkdir -p $(@D)/m4 -endef -PDBG_POST_PATCH_HOOKS += PDBG_PATCH_M4 +PDBG_MAKE_OPTS = "GIT_SHA1=\"v$(PDBG_VERSION)\"" $(eval $(autotools-package)) diff --git a/buildroot/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.hash b/buildroot/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.hash index 5466435c5..de33cfb17 100644 --- a/buildroot/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.hash +++ b/buildroot/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 cbb0bf041ade8a39f65eadbdf8a346c1 Apache-LogFormat-Compiler-0.35.tar.gz -sha256 1654c0000a042a8af052616e30b91c1f0b95a720c8048b59168a8bd99b07271a Apache-LogFormat-Compiler-0.35.tar.gz +md5 a0cdfcd875cb2ee4dc9a2c24381eb55b Apache-LogFormat-Compiler-0.36.tar.gz +sha256 94509503ee74ea820183d070c11630ee5bc0fd8c12cb74fae953ed62e4a1ac17 Apache-LogFormat-Compiler-0.36.tar.gz # computed by scancpan sha256 ab941cfc4794afa2113795b167177d1b25cbc77ebadd016e5727effc2cadd96b LICENSE diff --git a/buildroot/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.mk b/buildroot/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.mk index 59290f376..82ceb7979 100644 --- a/buildroot/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.mk +++ b/buildroot/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_APACHE_LOGFORMAT_COMPILER_VERSION = 0.35 +PERL_APACHE_LOGFORMAT_COMPILER_VERSION = 0.36 PERL_APACHE_LOGFORMAT_COMPILER_SOURCE = Apache-LogFormat-Compiler-$(PERL_APACHE_LOGFORMAT_COMPILER_VERSION).tar.gz PERL_APACHE_LOGFORMAT_COMPILER_SITE = $(BR2_CPAN_MIRROR)/authors/id/K/KA/KAZEBURO PERL_APACHE_LOGFORMAT_COMPILER_DEPENDENCIES = host-perl-module-build-tiny diff --git a/buildroot/package/perl-class-inspector/perl-class-inspector.hash b/buildroot/package/perl-class-inspector/perl-class-inspector.hash index 181c09ace..ee7a95bfa 100644 --- a/buildroot/package/perl-class-inspector/perl-class-inspector.hash +++ b/buildroot/package/perl-class-inspector/perl-class-inspector.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 db471d6ecf47fa054726553319b7c34f Class-Inspector-1.32.tar.gz -sha256 cefadc8b5338e43e570bc43f583e7c98d535c17b196bcf9084bb41d561cc0535 Class-Inspector-1.32.tar.gz +md5 084c3aeec023639d21ecbaf7d4460b21 Class-Inspector-1.36.tar.gz +sha256 cc295d23a472687c24489d58226ead23b9fdc2588e522f0b5f0747741700694e Class-Inspector-1.36.tar.gz # computed by scancpan -sha256 3ed0185f73a0570b72a2dc95c6bde500dc800c6f778ccbd688df4f88e6e65232 LICENSE +sha256 401fe9c98bdb5707df71447fb93141f8cb2d85337d45505f5ae50a776a3f6666 LICENSE diff --git a/buildroot/package/perl-class-inspector/perl-class-inspector.mk b/buildroot/package/perl-class-inspector/perl-class-inspector.mk index c265194f1..fdb332366 100644 --- a/buildroot/package/perl-class-inspector/perl-class-inspector.mk +++ b/buildroot/package/perl-class-inspector/perl-class-inspector.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_CLASS_INSPECTOR_VERSION = 1.32 +PERL_CLASS_INSPECTOR_VERSION = 1.36 PERL_CLASS_INSPECTOR_SOURCE = Class-Inspector-$(PERL_CLASS_INSPECTOR_VERSION).tar.gz PERL_CLASS_INSPECTOR_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PL/PLICEASE PERL_CLASS_INSPECTOR_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-class-method-modifiers/perl-class-method-modifiers.hash b/buildroot/package/perl-class-method-modifiers/perl-class-method-modifiers.hash index 540f357b6..82bf91f74 100644 --- a/buildroot/package/perl-class-method-modifiers/perl-class-method-modifiers.hash +++ b/buildroot/package/perl-class-method-modifiers/perl-class-method-modifiers.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 f55400c7a8134acf3657f8af89bdd7af Class-Method-Modifiers-2.12.tar.gz -sha256 e44c1073020bf55b8c97975ed77235fd7e2a6a56f29b5c702301721184e27ac8 Class-Method-Modifiers-2.12.tar.gz +md5 b1398e3682aa2e075b913b9f9000b596 Class-Method-Modifiers-2.13.tar.gz +sha256 ab5807f71018a842de6b7a4826d6c1f24b8d5b09fcce5005a3309cf6ea40fd63 Class-Method-Modifiers-2.13.tar.gz # computed by scancpan sha256 d17e5cba8d4039f6973d5873f73b0c8949c1cffb338fafe7a57e972767546561 LICENSE diff --git a/buildroot/package/perl-class-method-modifiers/perl-class-method-modifiers.mk b/buildroot/package/perl-class-method-modifiers/perl-class-method-modifiers.mk index e93553f96..ef688acf7 100644 --- a/buildroot/package/perl-class-method-modifiers/perl-class-method-modifiers.mk +++ b/buildroot/package/perl-class-method-modifiers/perl-class-method-modifiers.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_CLASS_METHOD_MODIFIERS_VERSION = 2.12 +PERL_CLASS_METHOD_MODIFIERS_VERSION = 2.13 PERL_CLASS_METHOD_MODIFIERS_SOURCE = Class-Method-Modifiers-$(PERL_CLASS_METHOD_MODIFIERS_VERSION).tar.gz PERL_CLASS_METHOD_MODIFIERS_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_CLASS_METHOD_MODIFIERS_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-class-std-fast/perl-class-std-fast.mk b/buildroot/package/perl-class-std-fast/perl-class-std-fast.mk index 57e57b195..b5d32398a 100644 --- a/buildroot/package/perl-class-std-fast/perl-class-std-fast.mk +++ b/buildroot/package/perl-class-std-fast/perl-class-std-fast.mk @@ -4,8 +4,8 @@ # ################################################################################ -PERL_CLASS_STD_FAST_VERSION = v0.0.8 -PERL_CLASS_STD_FAST_SOURCE = Class-Std-Fast-$(PERL_CLASS_STD_FAST_VERSION).tar.gz +PERL_CLASS_STD_FAST_VERSION = 0.0.8 +PERL_CLASS_STD_FAST_SOURCE = Class-Std-Fast-v$(PERL_CLASS_STD_FAST_VERSION).tar.gz PERL_CLASS_STD_FAST_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AC/ACID PERL_CLASS_STD_FAST_DEPENDENCIES = host-perl-module-build PERL_CLASS_STD_FAST_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-cookie-baker/perl-cookie-baker.hash b/buildroot/package/perl-cookie-baker/perl-cookie-baker.hash index 8d0d63b17..3b056c46c 100644 --- a/buildroot/package/perl-cookie-baker/perl-cookie-baker.hash +++ b/buildroot/package/perl-cookie-baker/perl-cookie-baker.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 20f6f16689df949db86645652c1ebe38 Cookie-Baker-0.10.tar.gz -sha256 b42bad15b12da4cdc5c90c902faf3ad484281a42203fa4e7652866434f6fa4dd Cookie-Baker-0.10.tar.gz +md5 bc8f95893d6ec3093a62d1957e1908f2 Cookie-Baker-0.11.tar.gz +sha256 59275f474e07c0aa3611e3e684b894e7db913333d8214420be63f12ec18cd7ab Cookie-Baker-0.11.tar.gz # computed by scancpan sha256 b4ce94671fa219074d4e91e2268652d6bf9764cebcc7a5e27bfc14897745ca4c LICENSE diff --git a/buildroot/package/perl-cookie-baker/perl-cookie-baker.mk b/buildroot/package/perl-cookie-baker/perl-cookie-baker.mk index 45ecdc96c..27c88f3e5 100644 --- a/buildroot/package/perl-cookie-baker/perl-cookie-baker.mk +++ b/buildroot/package/perl-cookie-baker/perl-cookie-baker.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_COOKIE_BAKER_VERSION = 0.10 +PERL_COOKIE_BAKER_VERSION = 0.11 PERL_COOKIE_BAKER_SOURCE = Cookie-Baker-$(PERL_COOKIE_BAKER_VERSION).tar.gz PERL_COOKIE_BAKER_SITE = $(BR2_CPAN_MIRROR)/authors/id/K/KA/KAZEBURO PERL_COOKIE_BAKER_DEPENDENCIES = host-perl-module-build-tiny diff --git a/buildroot/package/perl-crypt-openssl-aes/Config.in b/buildroot/package/perl-crypt-openssl-aes/Config.in new file mode 100644 index 000000000..ab408d0a2 --- /dev/null +++ b/buildroot/package/perl-crypt-openssl-aes/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PERL_CRYPT_OPENSSL_AES + bool "perl-crypt-openssl-aes" + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_OPENSSL + help + A Perl wrapper around OpenSSL's AES library. + + https://metacpan.org/release/Crypt-OpenSSL-AES + +comment "perl-crypt-openssl-aes needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.hash b/buildroot/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.hash new file mode 100644 index 000000000..07064dfbb --- /dev/null +++ b/buildroot/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 269db65cbf580c3174471a2cbc9a9d95 Crypt-OpenSSL-AES-0.02.tar.gz +sha256 b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908 Crypt-OpenSSL-AES-0.02.tar.gz + +# computed by scancpan +sha256 a60b8c187cc5d90f7a43adc6be3c127abaa4c739e1e7fdcff16be358533d037f README diff --git a/buildroot/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.mk b/buildroot/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.mk new file mode 100644 index 000000000..c05f3a9c3 --- /dev/null +++ b/buildroot/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# perl-crypt-openssl-aes +# +################################################################################ + +PERL_CRYPT_OPENSSL_AES_VERSION = 0.02 +PERL_CRYPT_OPENSSL_AES_SOURCE = Crypt-OpenSSL-AES-$(PERL_CRYPT_OPENSSL_AES_VERSION).tar.gz +PERL_CRYPT_OPENSSL_AES_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TT/TTAR +PERL_CRYPT_OPENSSL_AES_LICENSE = Artistic or GPL-1.0+ +PERL_CRYPT_OPENSSL_AES_LICENSE_FILES = README +PERL_CRYPT_OPENSSL_AES_DISTNAME = Crypt-OpenSSL-AES +PERL_CRYPT_OPENSSL_AES_DEPENDENCIES = openssl + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-data-uuid/perl-data-uuid.hash b/buildroot/package/perl-data-uuid/perl-data-uuid.hash index 5086936d4..280567177 100644 --- a/buildroot/package/perl-data-uuid/perl-data-uuid.hash +++ b/buildroot/package/perl-data-uuid/perl-data-uuid.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 7619929e8fe205a7fb83bc1c29ecbf99 Data-UUID-1.221.tar.gz -sha256 3cc7b2a3a7b74b45a059e013f7fd878078500ea4b7269036f84556b022078667 Data-UUID-1.221.tar.gz +md5 71510bbcce760c394591fca83a9b5e6d Data-UUID-1.224.tar.gz +sha256 c958c17502bbef5eccf40c040874895747f7f9b9f9e5192c18688370981bf47c Data-UUID-1.224.tar.gz # computed by scancpan sha256 0560c8eea8e1fb8173faa6c2e9b7e9f8728b8ae8250a814709a53c30b778d5fb LICENSE diff --git a/buildroot/package/perl-data-uuid/perl-data-uuid.mk b/buildroot/package/perl-data-uuid/perl-data-uuid.mk index 6ce393960..00dccdb7e 100644 --- a/buildroot/package/perl-data-uuid/perl-data-uuid.mk +++ b/buildroot/package/perl-data-uuid/perl-data-uuid.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATA_UUID_VERSION = 1.221 +PERL_DATA_UUID_VERSION = 1.224 PERL_DATA_UUID_SOURCE = Data-UUID-$(PERL_DATA_UUID_VERSION).tar.gz PERL_DATA_UUID_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RJ/RJBS # The license is documented at diff --git a/buildroot/package/perl-date-manip/perl-date-manip.hash b/buildroot/package/perl-date-manip/perl-date-manip.hash index b290e8ea2..bb2e6efe7 100644 --- a/buildroot/package/perl-date-manip/perl-date-manip.hash +++ b/buildroot/package/perl-date-manip/perl-date-manip.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d922d5fe4a00521dc171ac3ee65a9d61 Date-Manip-6.75.tar.gz -sha256 c1fbcfbe2ab1a84e57f191807e87c97985da00926f64d1aae598c8756acbb67d Date-Manip-6.75.tar.gz +md5 a3b2c1129f02cc5ce5de59d506afab1a Date-Manip-6.79.tar.gz +sha256 71a8c42ce4edbd46a3ca2a17a7218ceed958cd7ad0dfeb79389f23d0f466943a Date-Manip-6.79.tar.gz # computed by scancpan sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE diff --git a/buildroot/package/perl-date-manip/perl-date-manip.mk b/buildroot/package/perl-date-manip/perl-date-manip.mk index cc668184e..d930ee8c9 100644 --- a/buildroot/package/perl-date-manip/perl-date-manip.mk +++ b/buildroot/package/perl-date-manip/perl-date-manip.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATE_MANIP_VERSION = 6.75 +PERL_DATE_MANIP_VERSION = 6.79 PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-dbi/perl-dbi.hash b/buildroot/package/perl-dbi/perl-dbi.hash index 1d0b7e9ad..100d07038 100644 --- a/buildroot/package/perl-dbi/perl-dbi.hash +++ b/buildroot/package/perl-dbi/perl-dbi.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e77fd37fcf77fc88fde029c1b75ded54 DBI-1.641.tar.gz -sha256 5509e532cdd0e3d91eda550578deaac29e2f008a12b64576e8c261bb92e8c2c1 DBI-1.641.tar.gz +md5 f2ba18b5cea1c8cb322a62be0a847f3d DBI-1.642.tar.gz +sha256 3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d DBI-1.642.tar.gz # computed by scancpan sha256 33453c8b0d8d474a42669ac702a13c20f39c91a34b3df4e6ca778fc2f0f711c7 LICENSE diff --git a/buildroot/package/perl-dbi/perl-dbi.mk b/buildroot/package/perl-dbi/perl-dbi.mk index 835e8bdfe..3b824d748 100644 --- a/buildroot/package/perl-dbi/perl-dbi.mk +++ b/buildroot/package/perl-dbi/perl-dbi.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DBI_VERSION = 1.641 +PERL_DBI_VERSION = 1.642 PERL_DBI_SOURCE = DBI-$(PERL_DBI_VERSION).tar.gz PERL_DBI_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TI/TIMB PERL_DBI_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-devel-stacktrace/perl-devel-stacktrace.hash b/buildroot/package/perl-devel-stacktrace/perl-devel-stacktrace.hash index 1fcfb6438..58923cc07 100644 --- a/buildroot/package/perl-devel-stacktrace/perl-devel-stacktrace.hash +++ b/buildroot/package/perl-devel-stacktrace/perl-devel-stacktrace.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 1eb6874d834f3d5d15fa626dd726df77 Devel-StackTrace-2.03.tar.gz -sha256 7618cd4ebe24e254c17085f4b418784ab503cb4cb3baf8f48a7be894e59ba848 Devel-StackTrace-2.03.tar.gz +md5 a5b09f7be7f2b10b525a9740676906d8 Devel-StackTrace-2.04.tar.gz +sha256 cd3c03ed547d3d42c61fa5814c98296139392e7971c092e09a431f2c9f5d6855 Devel-StackTrace-2.04.tar.gz # computed by scancpan -sha256 e16dd93533bb65e25fad00d06e88840d9b5fd6bb80d551d8866126c52d89e1de LICENSE +sha256 dbd3162d261db5b40cac4d85afba619ec6a196398003c57b85c2333e7ef4c393 LICENSE diff --git a/buildroot/package/perl-devel-stacktrace/perl-devel-stacktrace.mk b/buildroot/package/perl-devel-stacktrace/perl-devel-stacktrace.mk index 1d3ec98ec..017839014 100644 --- a/buildroot/package/perl-devel-stacktrace/perl-devel-stacktrace.mk +++ b/buildroot/package/perl-devel-stacktrace/perl-devel-stacktrace.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DEVEL_STACKTRACE_VERSION = 2.03 +PERL_DEVEL_STACKTRACE_VERSION = 2.04 PERL_DEVEL_STACKTRACE_SOURCE = Devel-StackTrace-$(PERL_DEVEL_STACKTRACE_VERSION).tar.gz PERL_DEVEL_STACKTRACE_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DR/DROLSKY PERL_DEVEL_STACKTRACE_LICENSE = Artistic-2.0 diff --git a/buildroot/package/perl-digest-md5/Config.in b/buildroot/package/perl-digest-md5/Config.in deleted file mode 100644 index 88aeab6fc..000000000 --- a/buildroot/package/perl-digest-md5/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PERL_DIGEST_MD5 - bool "perl-digest-md5" - depends on !BR2_STATIC_LIBS - help - Perl interface to the MD-5 algorithm. - - https://metacpan.org/release/Digest-MD5 - -comment "perl-digest-md5 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/buildroot/package/perl-digest-md5/perl-digest-md5.hash b/buildroot/package/perl-digest-md5/perl-digest-md5.hash deleted file mode 100644 index 3876f3aca..000000000 --- a/buildroot/package/perl-digest-md5/perl-digest-md5.hash +++ /dev/null @@ -1,6 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 601519b826ca14c233f13a4578b967ef Digest-MD5-2.55.tar.gz -sha256 03b198a2d14425d951e5e50a885d3818c3162c8fe4c21e18d7798a9a179d0e3c Digest-MD5-2.55.tar.gz - -# computed by scancpan -sha256 f92f16702159fc57cd29c23f29b7f2420bff578ed72365d0225d2945a501cd5a README diff --git a/buildroot/package/perl-digest-md5/perl-digest-md5.mk b/buildroot/package/perl-digest-md5/perl-digest-md5.mk deleted file mode 100644 index 19c89d95a..000000000 --- a/buildroot/package/perl-digest-md5/perl-digest-md5.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-digest-md5 -# -################################################################################ - -PERL_DIGEST_MD5_VERSION = 2.55 -PERL_DIGEST_MD5_SOURCE = Digest-MD5-$(PERL_DIGEST_MD5_VERSION).tar.gz -PERL_DIGEST_MD5_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_DIGEST_MD5_LICENSE = Artistic or GPL-1.0+ -PERL_DIGEST_MD5_LICENSE_FILES = README -PERL_DIGEST_MD5_DISTNAME = Digest-MD5 - -$(eval $(perl-package)) diff --git a/buildroot/package/perl-file-slurp/perl-file-slurp.hash b/buildroot/package/perl-file-slurp/perl-file-slurp.hash index 4ed670ec7..5fc123851 100644 --- a/buildroot/package/perl-file-slurp/perl-file-slurp.hash +++ b/buildroot/package/perl-file-slurp/perl-file-slurp.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 52afbe79bbf2b86c11ac4986030a9275 File-Slurp-9999.25.tar.gz -sha256 c7ea97bae61bc68404476ce69277f6f796d31ab58c9c40ee390d9d5a1c5ce3c1 File-Slurp-9999.25.tar.gz +md5 603483824746ab4b1958bf7cf956c57a File-Slurp-9999.29.tar.gz +sha256 0e6e47e0bba639e37e51fdc7a43b187cd90ac642e4baa13a7185bc6c223e19c7 File-Slurp-9999.29.tar.gz # computed by scancpan -sha256 87744d1995d9a41ef32478c98f08167a13a1e09d96c3bb00ade315e3290facef README.md +sha256 2281c2e5a690ac7f227fd9934b3d0b9abc419fd514f001d421f2f854203d92b4 README.md diff --git a/buildroot/package/perl-file-slurp/perl-file-slurp.mk b/buildroot/package/perl-file-slurp/perl-file-slurp.mk index 4ceba25f5..c1a64a7b2 100644 --- a/buildroot/package/perl-file-slurp/perl-file-slurp.mk +++ b/buildroot/package/perl-file-slurp/perl-file-slurp.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILE_SLURP_VERSION = 9999.25 +PERL_FILE_SLURP_VERSION = 9999.29 PERL_FILE_SLURP_SOURCE = File-Slurp-$(PERL_FILE_SLURP_VERSION).tar.gz PERL_FILE_SLURP_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CA/CAPOEIRAB PERL_FILE_SLURP_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-filesys-notify-simple/perl-filesys-notify-simple.hash b/buildroot/package/perl-filesys-notify-simple/perl-filesys-notify-simple.hash index a48394504..87d365d6c 100644 --- a/buildroot/package/perl-filesys-notify-simple/perl-filesys-notify-simple.hash +++ b/buildroot/package/perl-filesys-notify-simple/perl-filesys-notify-simple.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 6042cd96abcc7bf69f959142d00b8143 Filesys-Notify-Simple-0.13.tar.gz -sha256 ade3d3db882ce2137e527201893d4b8c12b2dbd15009bb89c31cb91ba6495ba2 Filesys-Notify-Simple-0.13.tar.gz +md5 4a3ca3098b2455346fe24a66c94d2151 Filesys-Notify-Simple-0.14.tar.gz +sha256 1fda712d4ba5e1868159ed35f6f8efbfae9d435d6376f5606d533bcb080555a4 Filesys-Notify-Simple-0.14.tar.gz # computed by scancpan -sha256 bd61ca40272d971750f0a2bd0122629865355c5f4a2aa9e70c0d325e75d0da3a LICENSE +sha256 9a5cceb9fdb0064b57eeca0e7ad2af1e57eff51320a13083fc22930d2a190ed7 LICENSE diff --git a/buildroot/package/perl-filesys-notify-simple/perl-filesys-notify-simple.mk b/buildroot/package/perl-filesys-notify-simple/perl-filesys-notify-simple.mk index bb48f2278..62bc80c9f 100644 --- a/buildroot/package/perl-filesys-notify-simple/perl-filesys-notify-simple.mk +++ b/buildroot/package/perl-filesys-notify-simple/perl-filesys-notify-simple.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILESYS_NOTIFY_SIMPLE_VERSION = 0.13 +PERL_FILESYS_NOTIFY_SIMPLE_VERSION = 0.14 PERL_FILESYS_NOTIFY_SIMPLE_SOURCE = Filesys-Notify-Simple-$(PERL_FILESYS_NOTIFY_SIMPLE_VERSION).tar.gz PERL_FILESYS_NOTIFY_SIMPLE_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIYAGAWA PERL_FILESYS_NOTIFY_SIMPLE_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-gd/perl-gd.hash b/buildroot/package/perl-gd/perl-gd.hash index 851aa6e57..5895cc345 100644 --- a/buildroot/package/perl-gd/perl-gd.hash +++ b/buildroot/package/perl-gd/perl-gd.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d9596406f64e50b9ecef8d7cfbf0d99b GD-2.70.tar.gz -sha256 66b26a322e1fd82ef874721dd5274effcc60eb0c0f3481bf88ddf91529b633e2 GD-2.70.tar.gz +md5 1e2534e1d0db57d6aad438f15ca63253 GD-2.71.tar.gz +sha256 451be4873b2ad7261cc5679698cd9d2e84dbdde4309971869fc7734b569b7ac7 GD-2.71.tar.gz # computed by scancpan sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE diff --git a/buildroot/package/perl-gd/perl-gd.mk b/buildroot/package/perl-gd/perl-gd.mk index 755751713..d52ba1cce 100644 --- a/buildroot/package/perl-gd/perl-gd.mk +++ b/buildroot/package/perl-gd/perl-gd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_GD_VERSION = 2.70 +PERL_GD_VERSION = 2.71 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN PERL_GD_DEPENDENCIES = zlib libpng freetype gd diff --git a/buildroot/package/perl-http-cookies/Config.in b/buildroot/package/perl-http-cookies/Config.in index fd869f064..3ca461bf8 100644 --- a/buildroot/package/perl-http-cookies/Config.in +++ b/buildroot/package/perl-http-cookies/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_PERL_HTTP_COOKIES help HTTP cookie jars. - https://github.com/libwww-perl/http-cookies + https://github.com/libwww-perl/HTTP-Cookies diff --git a/buildroot/package/perl-http-cookies/perl-http-cookies.hash b/buildroot/package/perl-http-cookies/perl-http-cookies.hash index e504063fa..4099ce707 100644 --- a/buildroot/package/perl-http-cookies/perl-http-cookies.hash +++ b/buildroot/package/perl-http-cookies/perl-http-cookies.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 7bf1e277bd5c886bc18d21eb8423b65f HTTP-Cookies-6.04.tar.gz -sha256 0cc7f079079dcad8293fea36875ef58dd1bfd75ce1a6c244cd73ed9523eb13d4 HTTP-Cookies-6.04.tar.gz +md5 8c663710244e70c85775393a8f5be443 HTTP-Cookies-6.08.tar.gz +sha256 49ebb73576eb41063c04bc079477df094496deec805ae033f3be338c23c3af59 HTTP-Cookies-6.08.tar.gz # computed by scancpan -sha256 f67a84709b8757e38e389ea9ab7cdef424d2b7cf999a92556ffd0b61ff87600d LICENSE +sha256 5204690d6efb272e6fde7c3e3b8aba5114e1458b706710eaf607041ac080344d LICENSE diff --git a/buildroot/package/perl-http-cookies/perl-http-cookies.mk b/buildroot/package/perl-http-cookies/perl-http-cookies.mk index 74ffe8f42..6f802d644 100644 --- a/buildroot/package/perl-http-cookies/perl-http-cookies.mk +++ b/buildroot/package/perl-http-cookies/perl-http-cookies.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_COOKIES_VERSION = 6.04 +PERL_HTTP_COOKIES_VERSION = 6.08 PERL_HTTP_COOKIES_SOURCE = HTTP-Cookies-$(PERL_HTTP_COOKIES_VERSION).tar.gz PERL_HTTP_COOKIES_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_COOKIES_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-http-daemon/Config.in b/buildroot/package/perl-http-daemon/Config.in index bc03b8c8c..0c7ffe723 100644 --- a/buildroot/package/perl-http-daemon/Config.in +++ b/buildroot/package/perl-http-daemon/Config.in @@ -4,6 +4,6 @@ config BR2_PACKAGE_PERL_HTTP_DAEMON select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime select BR2_PACKAGE_PERL_LWP_MEDIATYPES # runtime help - a simple http server class. + A simple http server class. - https://metacpan.org/release/HTTP-Daemon + https://github.com/libwww-perl/HTTP-Daemon diff --git a/buildroot/package/perl-http-daemon/perl-http-daemon.hash b/buildroot/package/perl-http-daemon/perl-http-daemon.hash index f7bf64f63..b2e5dbceb 100644 --- a/buildroot/package/perl-http-daemon/perl-http-daemon.hash +++ b/buildroot/package/perl-http-daemon/perl-http-daemon.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ed0ae02d25d7f1e89456d4d69732adc2 HTTP-Daemon-6.01.tar.gz -sha256 43fd867742701a3f9fcc7bd59838ab72c6490c0ebaf66901068ec6997514adc2 HTTP-Daemon-6.01.tar.gz +md5 c5d6e1d84f7f09770d9ce52d4bddef59 HTTP-Daemon-6.06.tar.gz +sha256 fc03a161b54553f766457a4267e7066767f54ad01cacfe9a91d7caa2a0319bad HTTP-Daemon-6.06.tar.gz # computed by scancpan -sha256 6a23ab5e150eeab25c21065446beda077352181aa024972ae06965c377f5b15f README +sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENCE diff --git a/buildroot/package/perl-http-daemon/perl-http-daemon.mk b/buildroot/package/perl-http-daemon/perl-http-daemon.mk index 99e053f42..3fb89db92 100644 --- a/buildroot/package/perl-http-daemon/perl-http-daemon.mk +++ b/buildroot/package/perl-http-daemon/perl-http-daemon.mk @@ -4,11 +4,12 @@ # ################################################################################ -PERL_HTTP_DAEMON_VERSION = 6.01 +PERL_HTTP_DAEMON_VERSION = 6.06 PERL_HTTP_DAEMON_SOURCE = HTTP-Daemon-$(PERL_HTTP_DAEMON_VERSION).tar.gz -PERL_HTTP_DAEMON_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS +PERL_HTTP_DAEMON_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS +PERL_HTTP_DAEMON_DEPENDENCIES = host-perl-module-build-tiny PERL_HTTP_DAEMON_LICENSE = Artistic or GPL-1.0+ -PERL_HTTP_DAEMON_LICENSE_FILES = README +PERL_HTTP_DAEMON_LICENSE_FILES = LICENCE PERL_HTTP_DAEMON_DISTNAME = HTTP-Daemon $(eval $(perl-package)) diff --git a/buildroot/package/perl-http-date/Config.in b/buildroot/package/perl-http-date/Config.in index 12524e6da..c5151f2ec 100644 --- a/buildroot/package/perl-http-date/Config.in +++ b/buildroot/package/perl-http-date/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PERL_HTTP_DATE bool "perl-http-date" + select BR2_PACKAGE_PERL_TIMEDATE # runtime help - date conversion routines. + HTTP::Date - date conversion routines. - https://metacpan.org/release/HTTP-Date + https://github.com/libwww-perl/HTTP-Date diff --git a/buildroot/package/perl-http-date/perl-http-date.hash b/buildroot/package/perl-http-date/perl-http-date.hash index f74ca0cd8..7c1fa5b9c 100644 --- a/buildroot/package/perl-http-date/perl-http-date.hash +++ b/buildroot/package/perl-http-date/perl-http-date.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 52b7a0d5982d61be1edb217751d7daba HTTP-Date-6.02.tar.gz -sha256 e8b9941da0f9f0c9c01068401a5e81341f0e3707d1c754f8e11f42a7e629e333 HTTP-Date-6.02.tar.gz +md5 2ecbb3aedf6aef062605191813ca3027 HTTP-Date-6.05.tar.gz +sha256 365d6294dfbd37ebc51def8b65b81eb79b3934ecbc95a2ec2d4d827efe6a922b HTTP-Date-6.05.tar.gz # computed by scancpan -sha256 fad3a7732ff63e3521b94baea45d82a300edf8e0a5cf571ef2661c894e196632 README +sha256 305b71c4d2fd6380585689c5f1c620737a36a318ce0f9c772badce0fe293a44e LICENSE diff --git a/buildroot/package/perl-http-date/perl-http-date.mk b/buildroot/package/perl-http-date/perl-http-date.mk index 5dc91f31d..43583be30 100644 --- a/buildroot/package/perl-http-date/perl-http-date.mk +++ b/buildroot/package/perl-http-date/perl-http-date.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_HTTP_DATE_VERSION = 6.02 +PERL_HTTP_DATE_VERSION = 6.05 PERL_HTTP_DATE_SOURCE = HTTP-Date-$(PERL_HTTP_DATE_VERSION).tar.gz -PERL_HTTP_DATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS +PERL_HTTP_DATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_DATE_LICENSE = Artistic or GPL-1.0+ -PERL_HTTP_DATE_LICENSE_FILES = README +PERL_HTTP_DATE_LICENSE_FILES = LICENSE PERL_HTTP_DATE_DISTNAME = HTTP-Date $(eval $(perl-package)) diff --git a/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash index cb6657413..6e0dccba9 100644 --- a/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash +++ b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 50e8418bfe27ab26818ca6e264052c95 HTTP-Entity-Parser-0.21.tar.gz -sha256 c14d3e42bdb0845eb412640ca5e396cbd52d3a9a616a5974a32a52cab487f8d8 HTTP-Entity-Parser-0.21.tar.gz +md5 d8256c95119a3ddc6f4a88e59b67f0ec HTTP-Entity-Parser-0.22.tar.gz +sha256 93fe1cf2a2b4e6834bf0c1abd0d3bf28c614e8582ff10e6e0426f46a81eed6c8 HTTP-Entity-Parser-0.22.tar.gz # computed by scancpan sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE diff --git a/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk index 6d814b2f5..1638d5b1d 100644 --- a/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk +++ b/buildroot/package/perl-http-entity-parser/perl-http-entity-parser.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_ENTITY_PARSER_VERSION = 0.21 +PERL_HTTP_ENTITY_PARSER_VERSION = 0.22 PERL_HTTP_ENTITY_PARSER_SOURCE = HTTP-Entity-Parser-$(PERL_HTTP_ENTITY_PARSER_VERSION).tar.gz PERL_HTTP_ENTITY_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/K/KA/KAZEBURO PERL_HTTP_ENTITY_PARSER_DEPENDENCIES = host-perl-module-build-tiny diff --git a/buildroot/package/perl-http-headers-fast/perl-http-headers-fast.hash b/buildroot/package/perl-http-headers-fast/perl-http-headers-fast.hash index 0cba0f95a..9282f2ef1 100644 --- a/buildroot/package/perl-http-headers-fast/perl-http-headers-fast.hash +++ b/buildroot/package/perl-http-headers-fast/perl-http-headers-fast.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 024fde06808fc47db61a62655afacb41 HTTP-Headers-Fast-0.21.tar.gz -sha256 5e68ed8e3e67531e1d43c6a2cdfd0ee2daddf2e5b94c1a2648f3a6500a6f12d5 HTTP-Headers-Fast-0.21.tar.gz +md5 a166a4d0ba47eca8ff9dffb760865f5f HTTP-Headers-Fast-0.22.tar.gz +sha256 cc431db68496dd884db4bc0c0b7112c1f4a4f1dc68c4f5a3caa757a1e7481b48 HTTP-Headers-Fast-0.22.tar.gz # computed by scancpan sha256 511724425acf76d736145cfbf7c775b024c70ae8674ebf9a24dfda2c8e4032a3 LICENSE diff --git a/buildroot/package/perl-http-headers-fast/perl-http-headers-fast.mk b/buildroot/package/perl-http-headers-fast/perl-http-headers-fast.mk index fadf06d5b..d7bff6f99 100644 --- a/buildroot/package/perl-http-headers-fast/perl-http-headers-fast.mk +++ b/buildroot/package/perl-http-headers-fast/perl-http-headers-fast.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_HEADERS_FAST_VERSION = 0.21 +PERL_HTTP_HEADERS_FAST_VERSION = 0.22 PERL_HTTP_HEADERS_FAST_SOURCE = HTTP-Headers-Fast-$(PERL_HTTP_HEADERS_FAST_VERSION).tar.gz PERL_HTTP_HEADERS_FAST_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOKUHIROM PERL_HTTP_HEADERS_FAST_DEPENDENCIES = host-perl-module-build-tiny diff --git a/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash index ad9e5ae4b..de9b28abe 100644 --- a/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash +++ b/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 97fa6cd64f15db60f810cd8ab02d57fc IO-Socket-SSL-2.060.tar.gz -sha256 fb5b2877ac5b686a5d7b8dd71cf5464ffe75d10c32047b5570674870e46b1b8c IO-Socket-SSL-2.060.tar.gz +md5 ecf96ce2ff9e04a03a2d101c76ce1020 IO-Socket-SSL-2.066.tar.gz +sha256 0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd IO-Socket-SSL-2.066.tar.gz # computed by scancpan sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README diff --git a/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk index e4857c70c..59c340759 100644 --- a/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ b/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_SOCKET_SSL_VERSION = 2.060 +PERL_IO_SOCKET_SSL_VERSION = 2.066 PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash b/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash index b6d8382af..bdd3df7db 100644 --- a/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 20062717e4084d2f56d84c7ab4c91ec1 libwww-perl-6.36.tar.gz -sha256 75c034ab4b37f4b9506dc644300697505582cf9545bcf2e2079e7263f675290a libwww-perl-6.36.tar.gz +md5 e64d87052eb51bb55627c756ccdfe233 libwww-perl-6.43.tar.gz +sha256 e9849d7ee6fd0e89cc999e63d7612c951afd6aeea6bc721b767870d9df4ac40d libwww-perl-6.43.tar.gz # computed by scancpan sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE diff --git a/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk b/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk index c3367e10c..dbc77db08 100644 --- a/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PERL_LIBWWW_PERL_VERSION = 6.36 +PERL_LIBWWW_PERL_VERSION = 6.43 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz -PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER +PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LIBWWW_PERL_LICENSE = Artistic or GPL-1.0+ PERL_LIBWWW_PERL_LICENSE_FILES = LICENSE PERL_LIBWWW_PERL_DISTNAME = libwww-perl diff --git a/buildroot/package/perl-lwp-mediatypes/Config.in b/buildroot/package/perl-lwp-mediatypes/Config.in index 488109014..c1f58a6f3 100644 --- a/buildroot/package/perl-lwp-mediatypes/Config.in +++ b/buildroot/package/perl-lwp-mediatypes/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_PERL_LWP_MEDIATYPES help guess media type for a file or a URL. - https://metacpan.org/release/LWP-MediaTypes + https://github.com/libwww-perl/lwp-mediatypes diff --git a/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash b/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash index b459bb066..e125c0d57 100644 --- a/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash +++ b/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 8c5f25fb64b974d22aff424476ba13c9 LWP-MediaTypes-6.02.tar.gz -sha256 18790b0cc5f0a51468495c3847b16738f785a2d460403595001e0b932e5db676 LWP-MediaTypes-6.02.tar.gz +md5 84b799a90c0d2ce52897a7cb4c0478d0 LWP-MediaTypes-6.04.tar.gz +sha256 8f1bca12dab16a1c2a7c03a49c5e58cce41a6fec9519f0aadfba8dad997919d9 LWP-MediaTypes-6.04.tar.gz # computed by scancpan -sha256 0844071ccbc184e7376c61051986c0b7bc3f0e6094c052ceaafd3d057673c17d README +sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE diff --git a/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk b/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk index 3ba2abc89..687a84427 100644 --- a/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk +++ b/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_LWP_MEDIATYPES_VERSION = 6.02 +PERL_LWP_MEDIATYPES_VERSION = 6.04 PERL_LWP_MEDIATYPES_SOURCE = LWP-MediaTypes-$(PERL_LWP_MEDIATYPES_VERSION).tar.gz -PERL_LWP_MEDIATYPES_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS +PERL_LWP_MEDIATYPES_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LWP_MEDIATYPES_LICENSE = Artistic or GPL-1.0+ -PERL_LWP_MEDIATYPES_LICENSE_FILES = README +PERL_LWP_MEDIATYPES_LICENSE_FILES = LICENSE PERL_LWP_MEDIATYPES_DISTNAME = LWP-MediaTypes $(eval $(perl-package)) diff --git a/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash b/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash index 6d0b07970..86a638479 100644 --- a/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash +++ b/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash @@ -1,3 +1,3 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 7f65cb291545aa10fa9d0d87d0e8d1d2 Mail-DKIM-0.54.tar.gz -sha256 b72f78c80f7aa1bdb2a80986b45f9225a8fa0b7c91644590b102a78eb31c3dca Mail-DKIM-0.54.tar.gz +md5 9b03bcd334cbf22a93fd94af9935e11b Mail-DKIM-0.58.tar.gz +sha256 0a43a42b528a435f9e393171bf8ca1dc0cb54092f1d120d6299e615c0c55f331 Mail-DKIM-0.58.tar.gz diff --git a/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk b/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk index 986df27cb..d331fe9d6 100644 --- a/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk +++ b/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MAIL_DKIM_VERSION = 0.54 +PERL_MAIL_DKIM_VERSION = 0.58 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MB/MBRADSHAW PERL_MAIL_DKIM_DISTNAME = Mail-DKIM diff --git a/buildroot/package/perl-mailtools/Config.in b/buildroot/package/perl-mailtools/Config.in index a442e7193..6aa5d2d05 100644 --- a/buildroot/package/perl-mailtools/Config.in +++ b/buildroot/package/perl-mailtools/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PERL_MAILTOOLS help Various ancient e-mail related modules. - https://metacpan.org/release/MailTools + http://perl.overmeer.net/CPAN/ diff --git a/buildroot/package/perl-mailtools/perl-mailtools.hash b/buildroot/package/perl-mailtools/perl-mailtools.hash index 1db4772f5..bf8b17a5b 100644 --- a/buildroot/package/perl-mailtools/perl-mailtools.hash +++ b/buildroot/package/perl-mailtools/perl-mailtools.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 53e9d35256c3fd7cef0e4a24b15e9512 MailTools-2.20.tar.gz -sha256 f55606f7a9cc342ee9d5f996e2b6a4c0047e2ee47cd88c3250ecf0d0c5fb3196 MailTools-2.20.tar.gz +md5 69ee516d40011e7e92b77c6f06c0dc01 MailTools-2.21.tar.gz +sha256 4ad9bd6826b6f03a2727332466b1b7d29890c8d99a32b4b3b0a8d926ee1a44cb MailTools-2.21.tar.gz # computed by scancpan -sha256 734d5b1bd212de832aea99e94c98d56217ea9519d900a29c0547538f596a9b26 README +sha256 f7558badc4f4875df247bcccb50a8f369bfe4a2c19361f1df7b26ddf6aaaaf6b README diff --git a/buildroot/package/perl-mailtools/perl-mailtools.mk b/buildroot/package/perl-mailtools/perl-mailtools.mk index ef58849b9..900ee41ff 100644 --- a/buildroot/package/perl-mailtools/perl-mailtools.mk +++ b/buildroot/package/perl-mailtools/perl-mailtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MAILTOOLS_VERSION = 2.20 +PERL_MAILTOOLS_VERSION = 2.21 PERL_MAILTOOLS_SOURCE = MailTools-$(PERL_MAILTOOLS_VERSION).tar.gz PERL_MAILTOOLS_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MA/MARKOV PERL_MAILTOOLS_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-math-prime-util/Config.in b/buildroot/package/perl-math-prime-util/Config.in new file mode 100644 index 000000000..1c7b700ac --- /dev/null +++ b/buildroot/package/perl-math-prime-util/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PERL_MATH_PRIME_UTIL + bool "perl-math-prime-util" + depends on !BR2_STATIC_LIBS + help + Utilities related to prime numbers, including fast sieves and + factoring. + + https://github.com/danaj/Math-Prime-Util + +comment "perl-math-prime-util needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/perl-math-prime-util/perl-math-prime-util.hash b/buildroot/package/perl-math-prime-util/perl-math-prime-util.hash new file mode 100644 index 000000000..789f3a35f --- /dev/null +++ b/buildroot/package/perl-math-prime-util/perl-math-prime-util.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 26496630990db586dfede6551de79cbe Math-Prime-Util-0.73.tar.gz +sha256 4afa6dd8cdb97499bd4eca6925861812c29d9f5a0f1ac27ad9d2d9c9b5602894 Math-Prime-Util-0.73.tar.gz + +# computed by scancpan +sha256 475b5f12062de0e197fb8cfa44eef3b032342d097752868e72c1239fe52a8942 LICENSE diff --git a/buildroot/package/perl-math-prime-util/perl-math-prime-util.mk b/buildroot/package/perl-math-prime-util/perl-math-prime-util.mk new file mode 100644 index 000000000..5781fe75d --- /dev/null +++ b/buildroot/package/perl-math-prime-util/perl-math-prime-util.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-math-prime-util +# +################################################################################ + +PERL_MATH_PRIME_UTIL_VERSION = 0.73 +PERL_MATH_PRIME_UTIL_SOURCE = Math-Prime-Util-$(PERL_MATH_PRIME_UTIL_VERSION).tar.gz +PERL_MATH_PRIME_UTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DANAJ +PERL_MATH_PRIME_UTIL_LICENSE = Artistic or GPL-1.0+ +PERL_MATH_PRIME_UTIL_LICENSE_FILES = LICENSE +PERL_MATH_PRIME_UTIL_DISTNAME = Math-Prime-Util + +$(eval $(perl-package)) diff --git a/buildroot/package/perl-mime-base64/Config.in b/buildroot/package/perl-mime-base64/Config.in deleted file mode 100644 index ecb3d2ee6..000000000 --- a/buildroot/package/perl-mime-base64/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PERL_MIME_BASE64 - bool "perl-mime-base64" - depends on !BR2_STATIC_LIBS - help - The RFC 2045 encodings; base64 and quoted-printable. - - https://metacpan.org/release/MIME-Base64 - -comment "perl-mime-base64 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/buildroot/package/perl-mime-base64/perl-mime-base64.hash b/buildroot/package/perl-mime-base64/perl-mime-base64.hash deleted file mode 100644 index 77bd7b063..000000000 --- a/buildroot/package/perl-mime-base64/perl-mime-base64.hash +++ /dev/null @@ -1,6 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 ef958dc2bf96be5f759391c6ac1debd4 MIME-Base64-3.15.tar.gz -sha256 7f863566a6a9cb93eda93beadb77d9aa04b9304d769cea3bb921b9a91b3a1eb9 MIME-Base64-3.15.tar.gz - -# computed by scancpan -sha256 08e6898e3d62619e83880832ec42ae8a2984257e4c244843db9d3b9b7fcff236 README diff --git a/buildroot/package/perl-mime-base64/perl-mime-base64.mk b/buildroot/package/perl-mime-base64/perl-mime-base64.mk deleted file mode 100644 index 201707d46..000000000 --- a/buildroot/package/perl-mime-base64/perl-mime-base64.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-mime-base64 -# -################################################################################ - -PERL_MIME_BASE64_VERSION = 3.15 -PERL_MIME_BASE64_SOURCE = MIME-Base64-$(PERL_MIME_BASE64_VERSION).tar.gz -PERL_MIME_BASE64_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_MIME_BASE64_LICENSE = Artistic or GPL-1.0+ -PERL_MIME_BASE64_LICENSE_FILES = README -PERL_MIME_BASE64_DISTNAME = MIME-Base64 - -$(eval $(perl-package)) diff --git a/buildroot/package/perl-module-build/perl-module-build.hash b/buildroot/package/perl-module-build/perl-module-build.hash index fa0f22316..2af1a1ac8 100644 --- a/buildroot/package/perl-module-build/perl-module-build.hash +++ b/buildroot/package/perl-module-build/perl-module-build.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b74c2f6e84b60aad3a3defd30b6f0f4d Module-Build-0.4224.tar.gz -sha256 a6ca15d78244a7b50fdbf27f85c85f4035aa799ce7dd018a0d98b358ef7bc782 Module-Build-0.4224.tar.gz +md5 1447d9e02e63f7a1643986789a8f1ba9 Module-Build-0.4229.tar.gz +sha256 1fe491a6cda914b01bc8e592faa2b5404e9f35915ca15322f8f2a8d8f9008c18 Module-Build-0.4229.tar.gz # computed by scancpan sha256 f35ac2cc6b808a38c42c2d230b875217b0a24bb51e5a497ebb630cbb3d806c3e LICENSE diff --git a/buildroot/package/perl-module-build/perl-module-build.mk b/buildroot/package/perl-module-build/perl-module-build.mk index caf68f7fe..a8a01f6ba 100644 --- a/buildroot/package/perl-module-build/perl-module-build.mk +++ b/buildroot/package/perl-module-build/perl-module-build.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MODULE_BUILD_VERSION = 0.4224 +PERL_MODULE_BUILD_VERSION = 0.4229 PERL_MODULE_BUILD_SOURCE = Module-Build-$(PERL_MODULE_BUILD_VERSION).tar.gz PERL_MODULE_BUILD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT PERL_MODULE_BUILD_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-mojolicious/perl-mojolicious.hash b/buildroot/package/perl-mojolicious/perl-mojolicious.hash index e2eb158b1..f409e484d 100644 --- a/buildroot/package/perl-mojolicious/perl-mojolicious.hash +++ b/buildroot/package/perl-mojolicious/perl-mojolicious.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 00419dac75fec23d06fe8695e4bde303 Mojolicious-8.11.tar.gz -sha256 d95f42aa901b9aba96880dae53fd77d89690cca65635ff93a47885a2c7b312f2 Mojolicious-8.11.tar.gz +md5 c714aae5e1c3914efc0352531718c473 Mojolicious-8.32.tar.gz +sha256 503450e76b5d114c79a01b76a3c661c8138c5729062582a88e307a4d46f9de85 Mojolicious-8.32.tar.gz # computed by scancpan sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE diff --git a/buildroot/package/perl-mojolicious/perl-mojolicious.mk b/buildroot/package/perl-mojolicious/perl-mojolicious.mk index 4ff942ce8..62281d7de 100644 --- a/buildroot/package/perl-mojolicious/perl-mojolicious.mk +++ b/buildroot/package/perl-mojolicious/perl-mojolicious.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_VERSION = 8.11 +PERL_MOJOLICIOUS_VERSION = 8.32 PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI PERL_MOJOLICIOUS_LICENSE = Artistic-2.0 diff --git a/buildroot/package/perl-moo/Config.in b/buildroot/package/perl-moo/Config.in index 141b95ca5..e4a6db290 100644 --- a/buildroot/package/perl-moo/Config.in +++ b/buildroot/package/perl-moo/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PERL_MOO bool "perl-moo" select BR2_PACKAGE_PERL_CLASS_METHOD_MODIFIERS # runtime - select BR2_PACKAGE_PERL_DEVEL_GLOBALDESTRUCTION # runtime select BR2_PACKAGE_PERL_MODULE_RUNTIME # runtime select BR2_PACKAGE_PERL_ROLE_TINY # runtime select BR2_PACKAGE_PERL_SUB_QUOTE # runtime diff --git a/buildroot/package/perl-moo/perl-moo.hash b/buildroot/package/perl-moo/perl-moo.hash index 509a9ea4e..21bcc6cca 100644 --- a/buildroot/package/perl-moo/perl-moo.hash +++ b/buildroot/package/perl-moo/perl-moo.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d4fcd0f240033198571fcc81ce7c5f15 Moo-2.003004.tar.gz -sha256 f8bbb625f8e963eabe05cff9048fdd72bdd26777404ff2c40bc690f558be91e1 Moo-2.003004.tar.gz +md5 53af7e7849492a8e3994ee379d12e348 Moo-2.003006.tar.gz +sha256 bcb2092ab18a45005b5e2e84465ebf3a4999d8e82a43a09f5a94d859ae7f2472 Moo-2.003006.tar.gz # computed by scancpan -sha256 3fe29ec1d93827ee69825ed4bf916cc5ce4e7bf0b940ec6dd2d4ed30f4755dc3 README +sha256 88f4a8719c584d756dcfeebc7f35643066354188bfb57c672fbafcd44e044e9c LICENSE diff --git a/buildroot/package/perl-moo/perl-moo.mk b/buildroot/package/perl-moo/perl-moo.mk index 64e8d748a..691377640 100644 --- a/buildroot/package/perl-moo/perl-moo.mk +++ b/buildroot/package/perl-moo/perl-moo.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_MOO_VERSION = 2.003004 +PERL_MOO_VERSION = 2.003006 PERL_MOO_SOURCE = Moo-$(PERL_MOO_VERSION).tar.gz PERL_MOO_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG PERL_MOO_LICENSE = Artistic or GPL-1.0+ -PERL_MOO_LICENSE_FILES = README +PERL_MOO_LICENSE_FILES = LICENSE PERL_MOO_DISTNAME = Moo $(eval $(perl-package)) diff --git a/buildroot/package/perl-net-dns/perl-net-dns.hash b/buildroot/package/perl-net-dns/perl-net-dns.hash index 2a30ea7ba..e015b872d 100644 --- a/buildroot/package/perl-net-dns/perl-net-dns.hash +++ b/buildroot/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 8a40402888487b853f861d21433f341a Net-DNS-1.19.tar.gz -sha256 206278bdd9a538bec3e45b50e80cc5a9d7dc6e70ebf0889ef78254f0f710ccd7 Net-DNS-1.19.tar.gz +md5 91e8593eb6eed41995e6edc567fb6fec Net-DNS-1.21.tar.gz +sha256 ddefe13b28084ffcc8f10a96b3c13c59449dbf6fc371c006d129630ea0ce767a Net-DNS-1.21.tar.gz # computed by scancpan sha256 afa7d288df3e3edbdb34790407ba4a9c7750c2746059d9355f4168bfb3212583 README diff --git a/buildroot/package/perl-net-dns/perl-net-dns.mk b/buildroot/package/perl-net-dns/perl-net-dns.mk index 31db330b1..a4424c113 100644 --- a/buildroot/package/perl-net-dns/perl-net-dns.mk +++ b/buildroot/package/perl-net-dns/perl-net-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_DNS_VERSION = 1.19 +PERL_NET_DNS_VERSION = 1.21 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS PERL_NET_DNS_LICENSE = MIT diff --git a/buildroot/package/perl-net-http/perl-net-http.hash b/buildroot/package/perl-net-http/perl-net-http.hash index 0dd996495..5c93ad117 100644 --- a/buildroot/package/perl-net-http/perl-net-http.hash +++ b/buildroot/package/perl-net-http/perl-net-http.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 6da11a7db0e933b7684148e1fb32006a Net-HTTP-6.18.tar.gz -sha256 7e42df2db7adce3e0eb4f78b88c450f453f5380f120fd5411232e03374ba951c Net-HTTP-6.18.tar.gz +md5 6cbebcc76099ce822f0aa7764af11f73 Net-HTTP-6.19.tar.gz +sha256 52b76ec13959522cae64d965f15da3d99dcb445eddd85d2ce4e4f4df385b2fc4 Net-HTTP-6.19.tar.gz # computed by scancpan sha256 49fbcc80e17295888b909176a0029f275a8c17b6cbfaf8867fe571ebe9a9ca79 LICENSE diff --git a/buildroot/package/perl-net-http/perl-net-http.mk b/buildroot/package/perl-net-http/perl-net-http.mk index da65450ea..c7d0e3d0a 100644 --- a/buildroot/package/perl-net-http/perl-net-http.mk +++ b/buildroot/package/perl-net-http/perl-net-http.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_HTTP_VERSION = 6.18 +PERL_NET_HTTP_VERSION = 6.19 PERL_NET_HTTP_SOURCE = Net-HTTP-$(PERL_NET_HTTP_VERSION).tar.gz PERL_NET_HTTP_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_NET_HTTP_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-net-ping/Config.in b/buildroot/package/perl-net-ping/Config.in deleted file mode 100644 index 21239a095..000000000 --- a/buildroot/package/perl-net-ping/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_NET_PING - bool "perl-net-ping" - help - check a remote host for reachability. - - https://metacpan.org/release/Net-Ping diff --git a/buildroot/package/perl-net-ping/perl-net-ping.hash b/buildroot/package/perl-net-ping/perl-net-ping.hash deleted file mode 100644 index c3bff0339..000000000 --- a/buildroot/package/perl-net-ping/perl-net-ping.hash +++ /dev/null @@ -1,6 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 58110451d15d27b46ebc6a53f1697ff1 Net-Ping-2.71.tar.gz -sha256 0819d0aa87b173e98ecb3ccfd92272ce53c7fc9e86f962f64602a6fa477f7d4f Net-Ping-2.71.tar.gz - -# computed by scancpan -sha256 9441a22309a2b40ff1282ac1906c137f07f5e521e7b1ec162b251f6006051b47 README diff --git a/buildroot/package/perl-net-ping/perl-net-ping.mk b/buildroot/package/perl-net-ping/perl-net-ping.mk deleted file mode 100644 index 5e8f53be1..000000000 --- a/buildroot/package/perl-net-ping/perl-net-ping.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-net-ping -# -################################################################################ - -PERL_NET_PING_VERSION = 2.71 -PERL_NET_PING_SOURCE = Net-Ping-$(PERL_NET_PING_VERSION).tar.gz -PERL_NET_PING_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN -PERL_NET_PING_LICENSE = Artistic or GPL-1.0+ -PERL_NET_PING_LICENSE_FILES = README -PERL_NET_PING_DISTNAME = Net-Ping - -$(eval $(perl-package)) diff --git a/buildroot/package/perl-net-snmp/perl-net-snmp.mk b/buildroot/package/perl-net-snmp/perl-net-snmp.mk index ae8607e40..36b50d635 100644 --- a/buildroot/package/perl-net-snmp/perl-net-snmp.mk +++ b/buildroot/package/perl-net-snmp/perl-net-snmp.mk @@ -4,8 +4,8 @@ # ################################################################################ -PERL_NET_SNMP_VERSION = v6.0.1 -PERL_NET_SNMP_SOURCE = Net-SNMP-$(PERL_NET_SNMP_VERSION).tar.gz +PERL_NET_SNMP_VERSION = 6.0.1 +PERL_NET_SNMP_SOURCE = Net-SNMP-v$(PERL_NET_SNMP_VERSION).tar.gz PERL_NET_SNMP_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DT/DTOWN PERL_NET_SNMP_DEPENDENCIES = host-perl-module-build PERL_NET_SNMP_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-net-ssh2/perl-net-ssh2.hash b/buildroot/package/perl-net-ssh2/perl-net-ssh2.hash index 7a84949a6..006f79477 100644 --- a/buildroot/package/perl-net-ssh2/perl-net-ssh2.hash +++ b/buildroot/package/perl-net-ssh2/perl-net-ssh2.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 94ed21d4557a6bbc3cb6bfd7c3479ef0 Net-SSH2-0.69.tar.gz -sha256 2fc85e1434b8a6e77142d85e3cea5a081ca71da5d02c4212b9970d3a3924baa6 Net-SSH2-0.69.tar.gz +md5 ef8d282c410728aa452fb380a7d22b05 Net-SSH2-0.70.tar.gz +sha256 47236af8f4a5e4cfa3036f7969d940247349b65b032478a0c72ba0b2e398b000 Net-SSH2-0.70.tar.gz # computed by scancpan -sha256 6db904d7c8127a33df4666961088c97586c24644a4980dc50d0676ef4c0509f7 README +sha256 3e479d43f8316315caa30ba00b7a143175326a3be83fd4e03146c831afaa22bd README diff --git a/buildroot/package/perl-net-ssh2/perl-net-ssh2.mk b/buildroot/package/perl-net-ssh2/perl-net-ssh2.mk index 7860c7f05..e75d01d9b 100644 --- a/buildroot/package/perl-net-ssh2/perl-net-ssh2.mk +++ b/buildroot/package/perl-net-ssh2/perl-net-ssh2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_SSH2_VERSION = 0.69 +PERL_NET_SSH2_VERSION = 0.70 PERL_NET_SSH2_SOURCE = Net-SSH2-$(PERL_NET_SSH2_VERSION).tar.gz PERL_NET_SSH2_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SA/SALVA PERL_NET_SSH2_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-path-tiny/perl-path-tiny.hash b/buildroot/package/perl-path-tiny/perl-path-tiny.hash index 2ad8a6414..954843a0a 100644 --- a/buildroot/package/perl-path-tiny/perl-path-tiny.hash +++ b/buildroot/package/perl-path-tiny/perl-path-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 1a7fbdccc4585074ce4419b7bec0966c Path-Tiny-0.108.tar.gz -sha256 3c49482be2b3eb7ddd7e73a5b90cff648393f5d5de334ff126ce7a3632723ff5 Path-Tiny-0.108.tar.gz +md5 da6316a7b9e4fd747cf98c11be95f630 Path-Tiny-0.110.tar.gz +sha256 a849dc0777315899689d0b351e815d90eaa636a01ed1d5e6de99a368529b5cfa Path-Tiny-0.110.tar.gz # computed by scancpan sha256 a999b03d2b80e5c7f987289ac835fa2d88cafa9f0df24adf8a1fd21e175acd79 LICENSE diff --git a/buildroot/package/perl-path-tiny/perl-path-tiny.mk b/buildroot/package/perl-path-tiny/perl-path-tiny.mk index 5d654efee..b2748834d 100644 --- a/buildroot/package/perl-path-tiny/perl-path-tiny.mk +++ b/buildroot/package/perl-path-tiny/perl-path-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PATH_TINY_VERSION = 0.108 +PERL_PATH_TINY_VERSION = 0.110 PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN PERL_PATH_TINY_LICENSE = Apache-2.0 diff --git a/buildroot/package/perl-role-tiny/Config.in b/buildroot/package/perl-role-tiny/Config.in index ebbe72020..0c44d9907 100644 --- a/buildroot/package/perl-role-tiny/Config.in +++ b/buildroot/package/perl-role-tiny/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PERL_ROLE_TINY bool "perl-role-tiny" help - Roles. Like a nouvelle cuisine portion size slice of Moose. + Roles: a nouvelle cuisine portion size slice of Moose. https://metacpan.org/release/Role-Tiny diff --git a/buildroot/package/perl-role-tiny/perl-role-tiny.hash b/buildroot/package/perl-role-tiny/perl-role-tiny.hash index 33601bb6b..c05873e65 100644 --- a/buildroot/package/perl-role-tiny/perl-role-tiny.hash +++ b/buildroot/package/perl-role-tiny/perl-role-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 7c277728a7e090f64b495857cadfed08 Role-Tiny-2.000006.tar.gz -sha256 cc73418c904a0286ecd8915eac11f5be2a8d1e17ea9cb54c9116b0340cd3e382 Role-Tiny-2.000006.tar.gz +md5 98446826608b1e943e65c1f6e35942fe Role-Tiny-2.001004.tar.gz +sha256 92ba5712850a74102c93c942eb6e7f62f7a4f8f483734ed289d08b324c281687 Role-Tiny-2.001004.tar.gz # computed by scancpan -sha256 08292f0e1797371bce0a1b5bd80e0657b3aabf9c0ecc2ce87ad7a448a7adacce README +sha256 88f4a8719c584d756dcfeebc7f35643066354188bfb57c672fbafcd44e044e9c LICENSE diff --git a/buildroot/package/perl-role-tiny/perl-role-tiny.mk b/buildroot/package/perl-role-tiny/perl-role-tiny.mk index 6501972f2..0e1974fa1 100644 --- a/buildroot/package/perl-role-tiny/perl-role-tiny.mk +++ b/buildroot/package/perl-role-tiny/perl-role-tiny.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_ROLE_TINY_VERSION = 2.000006 +PERL_ROLE_TINY_VERSION = 2.001004 PERL_ROLE_TINY_SOURCE = Role-Tiny-$(PERL_ROLE_TINY_VERSION).tar.gz PERL_ROLE_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG PERL_ROLE_TINY_LICENSE = Artistic or GPL-1.0+ -PERL_ROLE_TINY_LICENSE_FILES = README +PERL_ROLE_TINY_LICENSE_FILES = LICENSE PERL_ROLE_TINY_DISTNAME = Role-Tiny $(eval $(perl-package)) diff --git a/buildroot/package/perl-sub-quote/perl-sub-quote.hash b/buildroot/package/perl-sub-quote/perl-sub-quote.hash index 8af5e2c07..d918af235 100644 --- a/buildroot/package/perl-sub-quote/perl-sub-quote.hash +++ b/buildroot/package/perl-sub-quote/perl-sub-quote.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 1b0f288ca8c60243f9bc29cfee4c4986 Sub-Quote-2.005001.tar.gz -sha256 d6ab4f0775def015367a05e02024b403f991b2be11d774f3d235fe7e9bdbba07 Sub-Quote-2.005001.tar.gz +md5 1bb9caee697bcfa738f419d40505e506 Sub-Quote-2.006006.tar.gz +sha256 6e4e2af42388fa6d2609e0e82417de7cc6be47223f576592c656c73c7524d89d Sub-Quote-2.006006.tar.gz # computed by scancpan -sha256 8f7a1d60c718174b7752562007b2643d4a1c23f901cbeb7774015805efe0a817 README +sha256 88f4a8719c584d756dcfeebc7f35643066354188bfb57c672fbafcd44e044e9c LICENSE diff --git a/buildroot/package/perl-sub-quote/perl-sub-quote.mk b/buildroot/package/perl-sub-quote/perl-sub-quote.mk index 1e364f213..a22da1692 100644 --- a/buildroot/package/perl-sub-quote/perl-sub-quote.mk +++ b/buildroot/package/perl-sub-quote/perl-sub-quote.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_SUB_QUOTE_VERSION = 2.005001 +PERL_SUB_QUOTE_VERSION = 2.006006 PERL_SUB_QUOTE_SOURCE = Sub-Quote-$(PERL_SUB_QUOTE_VERSION).tar.gz PERL_SUB_QUOTE_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG PERL_SUB_QUOTE_LICENSE = Artistic or GPL-1.0+ -PERL_SUB_QUOTE_LICENSE_FILES = README +PERL_SUB_QUOTE_LICENSE_FILES = LICENSE PERL_SUB_QUOTE_DISTNAME = Sub-Quote $(eval $(perl-package)) diff --git a/buildroot/package/perl-sys-cpu/perl-sys-cpu.hash b/buildroot/package/perl-sys-cpu/perl-sys-cpu.hash index 0977606b1..896a74109 100644 --- a/buildroot/package/perl-sys-cpu/perl-sys-cpu.hash +++ b/buildroot/package/perl-sys-cpu/perl-sys-cpu.hash @@ -1,2 +1,3 @@ # locally computed -sha256 ca0ec47ab24070e3040e5075337cfc69721362d9bef50f6992072efe644d4d26 Sys-CPU-0.52.tar.gz +sha256 ca0ec47ab24070e3040e5075337cfc69721362d9bef50f6992072efe644d4d26 Sys-CPU-0.52.tar.gz +sha256 911a3f8e83dfff143794b34881e13f0759b498c31e067fc7dff0c2e641559e1e README diff --git a/buildroot/package/perl-timedate/perl-timedate.hash b/buildroot/package/perl-timedate/perl-timedate.hash index 234136d0c..5ddfbd251 100644 --- a/buildroot/package/perl-timedate/perl-timedate.hash +++ b/buildroot/package/perl-timedate/perl-timedate.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b1d91153ac971347aee84292ed886c1c TimeDate-2.30.tar.gz -sha256 75bd254871cb5853a6aa0403ac0be270cdd75c9d1b6639f18ecba63c15298e86 TimeDate-2.30.tar.gz +md5 230d361a13eae79dfe3fb650acece511 TimeDate-2.31.tar.gz +sha256 5c720fedb245122d073ea9c030aca24b06a615c71d40c46f832a8a1809354d81 TimeDate-2.31.tar.gz # computed by scancpan sha256 e72e67533eb3ddd705ae718898945e2f3bf3702e91e85bb67824575706bd5bf9 README diff --git a/buildroot/package/perl-timedate/perl-timedate.mk b/buildroot/package/perl-timedate/perl-timedate.mk index bc4fc9a11..d4b6305ab 100644 --- a/buildroot/package/perl-timedate/perl-timedate.mk +++ b/buildroot/package/perl-timedate/perl-timedate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PERL_TIMEDATE_VERSION = 2.30 +PERL_TIMEDATE_VERSION = 2.31 PERL_TIMEDATE_SOURCE = TimeDate-$(PERL_TIMEDATE_VERSION).tar.gz -PERL_TIMEDATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GB/GBARR +PERL_TIMEDATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AT/ATOOMIC PERL_TIMEDATE_LICENSE = Artistic or GPL-1.0+ PERL_TIMEDATE_LICENSE_FILES = README PERL_TIMEDATE_DISTNAME = TimeDate diff --git a/buildroot/package/perl-try-tiny/perl-try-tiny.hash b/buildroot/package/perl-try-tiny/perl-try-tiny.hash index 65731bc14..ed4d8ac74 100644 --- a/buildroot/package/perl-try-tiny/perl-try-tiny.hash +++ b/buildroot/package/perl-try-tiny/perl-try-tiny.hash @@ -3,4 +3,4 @@ md5 eb362c3cb32c42f9f28de9ddb7f2ead6 Try-Tiny-0.30.tar.gz sha256 da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b Try-Tiny-0.30.tar.gz # computed by scancpan -sha256 6c7eb089021283de176a5c838217ae16453cf9f67899b27cdcd0827045f6f781 README +sha256 f1864ede834871a1207fcd19838b6bd5e1ff0a8704f5cc523fc397126041ed0b LICENCE diff --git a/buildroot/package/perl-try-tiny/perl-try-tiny.mk b/buildroot/package/perl-try-tiny/perl-try-tiny.mk index bce96269d..f13e2ee59 100644 --- a/buildroot/package/perl-try-tiny/perl-try-tiny.mk +++ b/buildroot/package/perl-try-tiny/perl-try-tiny.mk @@ -8,7 +8,7 @@ PERL_TRY_TINY_VERSION = 0.30 PERL_TRY_TINY_SOURCE = Try-Tiny-$(PERL_TRY_TINY_VERSION).tar.gz PERL_TRY_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_TRY_TINY_LICENSE = MIT -PERL_TRY_TINY_LICENSE_FILES = README +PERL_TRY_TINY_LICENSE_FILES = LICENCE PERL_TRY_TINY_DISTNAME = Try-Tiny $(eval $(perl-package)) diff --git a/buildroot/package/perl-type-tiny/Config.in b/buildroot/package/perl-type-tiny/Config.in index c49a0d4bb..96e5ea135 100644 --- a/buildroot/package/perl-type-tiny/Config.in +++ b/buildroot/package/perl-type-tiny/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PERL_TYPE_TINY help tiny, yet Moo(se)-compatible type constraint. - https://metacpan.org/release/Type-Tiny + http://typetiny.toby.ink/ diff --git a/buildroot/package/perl-type-tiny/perl-type-tiny.hash b/buildroot/package/perl-type-tiny/perl-type-tiny.hash index d6b3639dc..8263e14c9 100644 --- a/buildroot/package/perl-type-tiny/perl-type-tiny.hash +++ b/buildroot/package/perl-type-tiny/perl-type-tiny.hash @@ -1,7 +1,7 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 a7fe90a6d53d2cd57381e60e682f828f Type-Tiny-1.004004.tar.gz -sha256 081281ea004cdd89003d938aa52c1398e24411dd8f7163b14d0977a13f7062be Type-Tiny-1.004004.tar.gz +md5 04194fe9673ef5504be9d50aa5d6782a Type-Tiny-1.008003.tar.gz +sha256 a44e6e3ab29f05516d2a670de817278a7a06d55bce6f4ceaeb84ce032dcd00f5 Type-Tiny-1.008003.tar.gz # computed by scancpan -sha256 57e58f271bf6bca0bb22ab9e72b04c9e12010b0a898453a2fcde49fb9ff28afc COPYRIGHT -sha256 5c791221f0dde289392a38a5921b66d4a1be8248cc64ee6de15f3c2426892673 LICENSE +sha256 7cf4a3f3f81896130c0bc8041fddd737052cdf28e1bd8af7046884f63f262e53 COPYRIGHT +sha256 1fb7395e76eabf94c421912d7d0a4f7fa745d49e1acb76b222c21d605b66bd25 LICENSE diff --git a/buildroot/package/perl-type-tiny/perl-type-tiny.mk b/buildroot/package/perl-type-tiny/perl-type-tiny.mk index aa7306416..ea1290bb2 100644 --- a/buildroot/package/perl-type-tiny/perl-type-tiny.mk +++ b/buildroot/package/perl-type-tiny/perl-type-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_TYPE_TINY_VERSION = 1.004004 +PERL_TYPE_TINY_VERSION = 1.008003 PERL_TYPE_TINY_SOURCE = Type-Tiny-$(PERL_TYPE_TINY_VERSION).tar.gz PERL_TYPE_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOBYINK PERL_TYPE_TINY_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl-www-form-urlencoded/perl-www-form-urlencoded.hash b/buildroot/package/perl-www-form-urlencoded/perl-www-form-urlencoded.hash index 2ad969a12..c4ed48890 100644 --- a/buildroot/package/perl-www-form-urlencoded/perl-www-form-urlencoded.hash +++ b/buildroot/package/perl-www-form-urlencoded/perl-www-form-urlencoded.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c7f8fbd616f9a342b5ff726b405d2a96 WWW-Form-UrlEncoded-0.25.tar.gz -sha256 e1f7a6d22fe558242d1df584229d99058f63ef2658e43b8a90642e3875c6074e WWW-Form-UrlEncoded-0.25.tar.gz +md5 cbe0e1c3ee54738d900c739ea348efda WWW-Form-UrlEncoded-0.26.tar.gz +sha256 c0480b5f1f15b71163ec327b8e7842298f0cb3ace97e63d7034af1e94a2d90f4 WWW-Form-UrlEncoded-0.26.tar.gz # computed by scancpan sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE diff --git a/buildroot/package/perl-www-form-urlencoded/perl-www-form-urlencoded.mk b/buildroot/package/perl-www-form-urlencoded/perl-www-form-urlencoded.mk index a0ccba531..a6f2edd5e 100644 --- a/buildroot/package/perl-www-form-urlencoded/perl-www-form-urlencoded.mk +++ b/buildroot/package/perl-www-form-urlencoded/perl-www-form-urlencoded.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_WWW_FORM_URLENCODED_VERSION = 0.25 +PERL_WWW_FORM_URLENCODED_VERSION = 0.26 PERL_WWW_FORM_URLENCODED_SOURCE = WWW-Form-UrlEncoded-$(PERL_WWW_FORM_URLENCODED_VERSION).tar.gz PERL_WWW_FORM_URLENCODED_SITE = $(BR2_CPAN_MIRROR)/authors/id/K/KA/KAZEBURO PERL_WWW_FORM_URLENCODED_DEPENDENCIES = host-perl-module-build diff --git a/buildroot/package/perl-xml-libxml/perl-xml-libxml.hash b/buildroot/package/perl-xml-libxml/perl-xml-libxml.hash index a3f4d5d64..4842f4fec 100644 --- a/buildroot/package/perl-xml-libxml/perl-xml-libxml.hash +++ b/buildroot/package/perl-xml-libxml/perl-xml-libxml.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 43546fd9a3974f19323f9fb04861ece9 XML-LibXML-2.0132.tar.gz -sha256 721452e3103ca188f5968ab06d5ba29fe8e00e49f4767790882095050312d476 XML-LibXML-2.0132.tar.gz +md5 dce687dd8b7e82d1c359fd74b1852f64 XML-LibXML-2.0134.tar.gz +sha256 f0bca4d0c2da35d879fee4cd13f352014186cedab27ab5e191f39b5d7d4f46cf XML-LibXML-2.0134.tar.gz # computed by scancpan sha256 5046a7ec515cc1542beafdf2eadeeff24cc221fc3fde9913dd144fd263ae6100 LICENSE diff --git a/buildroot/package/perl-xml-libxml/perl-xml-libxml.mk b/buildroot/package/perl-xml-libxml/perl-xml-libxml.mk index 3218d34d5..23d3e988f 100644 --- a/buildroot/package/perl-xml-libxml/perl-xml-libxml.mk +++ b/buildroot/package/perl-xml-libxml/perl-xml-libxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_XML_LIBXML_VERSION = 2.0132 +PERL_XML_LIBXML_VERSION = 2.0134 PERL_XML_LIBXML_SOURCE = XML-LibXML-$(PERL_XML_LIBXML_VERSION).tar.gz PERL_XML_LIBXML_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SH/SHLOMIF PERL_XML_LIBXML_DEPENDENCIES = zlib libxml2 diff --git a/buildroot/package/perl-xml-sax/perl-xml-sax.hash b/buildroot/package/perl-xml-sax/perl-xml-sax.hash index 888e9d2b5..df63047f0 100644 --- a/buildroot/package/perl-xml-sax/perl-xml-sax.hash +++ b/buildroot/package/perl-xml-sax/perl-xml-sax.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 861a454f7bf269990ed2c1c125f4db48 XML-SAX-1.00.tar.gz -sha256 45ea6564ef8692155d57b2de0862b6442d3c7e29f4a9bc9ede5d7ecdc74c2ae3 XML-SAX-1.00.tar.gz +md5 b62e3754523695c7f5bbcafa3676a38d XML-SAX-1.02.tar.gz +sha256 4506c387043aa6a77b455f00f57409f3720aa7e553495ab2535263b4ed1ea12a XML-SAX-1.02.tar.gz # computed by scancpan sha256 bf2fb225e77b46b8892ef2a8aa5efa92d65b176a870f42559d8b73b308a36509 LICENSE diff --git a/buildroot/package/perl-xml-sax/perl-xml-sax.mk b/buildroot/package/perl-xml-sax/perl-xml-sax.mk index 17518367d..e8de01bcb 100644 --- a/buildroot/package/perl-xml-sax/perl-xml-sax.mk +++ b/buildroot/package/perl-xml-sax/perl-xml-sax.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_XML_SAX_VERSION = 1.00 +PERL_XML_SAX_VERSION = 1.02 PERL_XML_SAX_SOURCE = XML-SAX-$(PERL_XML_SAX_VERSION).tar.gz PERL_XML_SAX_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GR/GRANTM PERL_XML_SAX_LICENSE = Artistic or GPL-1.0+ diff --git a/buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch b/buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch index 178c7baa5..ae1ce0699 100644 --- a/buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch +++ b/buildroot/package/perl/0001-fix-the-generated-subdirectory-Makefiles.patch @@ -7,6 +7,8 @@ all variables used by BR must be propagated similar to https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/commit/98e8532fffe5afa8186329acc44fb957427f1823 +see https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker/pull/331, merged in EU-MM v7.35_08 + Signed-off-by: Francois Perrad --- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | 2 +- diff --git a/buildroot/package/perl/perl.hash b/buildroot/package/perl/perl.hash index 4604d2715..161a4fd61 100644 --- a/buildroot/package/perl/perl.hash +++ b/buildroot/package/perl/perl.hash @@ -1,7 +1,12 @@ -# Hashes from: http://www.cpan.org/src/5.0/perl-5.28.2.tar.xz.{md5,sha1,sha256}.txt -md5 6bb75770e9ba085b32bf13e4be71e4ac perl-5.28.2.tar.xz -sha1 e7be78eca9ac5596783e6abcf957408050a7b650 perl-5.28.2.tar.xz -sha256 0b0189bfa4b2da20e899b4bdd746ac402e8f746a58e4fcf5516484157f2aab07 perl-5.28.2.tar.xz +# Hashes from: http://www.cpan.org/src/5.0/perl-5.30.1.tar.xz.{md5,sha1,sha256}.txt +md5 f399f3aaee90ddcff5eadd3bccdaacc0 perl-5.30.1.tar.xz +sha1 4bc190b6ac368f573e6a028f91430f831d40d30a perl-5.30.1.tar.xz +sha256 7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 perl-5.30.1.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.2.3/perl-cross-1.2.3.hash -sha256 84583a1bb5f3a2c64d13d031386c114382e5c62955c6f84a27cec8318536627c perl-cross-1.2.3.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.1/perl-cross-1.3.1.hash +sha256 edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d1590551e40694f21200141d perl-cross-1.3.1.tar.gz + +# Locally calculated +sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic +sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying +sha256 4a39adc445d79e213df5c2028c5432806dfcdfe69a5bc31ba5c83071a0097877 README diff --git a/buildroot/package/perl/perl.mk b/buildroot/package/perl/perl.mk index ecb21c4b8..0ab81ddb3 100644 --- a/buildroot/package/perl/perl.mk +++ b/buildroot/package/perl/perl.mk @@ -5,15 +5,15 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 28 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2 +PERL_VERSION_MAJOR = 30 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 PERL_SITE = http://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ PERL_LICENSE_FILES = Artistic Copying README PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.2.3 +PERL_CROSS_VERSION = 1.3.1 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz diff --git a/buildroot/package/php-amqp/Config.in b/buildroot/package/php-amqp/Config.in index dc779f0ee..48fff91d4 100644 --- a/buildroot/package/php-amqp/Config.in +++ b/buildroot/package/php-amqp/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PHP_AMQP bool "php-amqp" - depends on BR2_PACKAGE_PHP depends on BR2_TOOLCHAIN_HAS_THREADS # rabbitmq-c select BR2_PACKAGE_OPENSSL # rabbitmq-c: amqp_ssl_socket.h select BR2_PACKAGE_RABBITMQ_C diff --git a/buildroot/package/php-geoip/Config.in b/buildroot/package/php-geoip/Config.in index adb20466f..35c6c1c36 100644 --- a/buildroot/package/php-geoip/Config.in +++ b/buildroot/package/php-geoip/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PHP_GEOIP bool "php-geoip" - depends on BR2_PACKAGE_PHP select BR2_PACKAGE_GEOIP help PHP GeoIP-based IP address mapper to geographical places. diff --git a/buildroot/package/php-geoip/php-geoip.hash b/buildroot/package/php-geoip/php-geoip.hash index 21e26c8ea..8c99d8ba7 100644 --- a/buildroot/package/php-geoip/php-geoip.hash +++ b/buildroot/package/php-geoip/php-geoip.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 b2d05c03019d46135c249b5a7fa0dbd43ca5ee98aea8ed807bc7aa90ac8c0f06 geoip-1.1.1.tgz +sha256 b2d05c03019d46135c249b5a7fa0dbd43ca5ee98aea8ed807bc7aa90ac8c0f06 geoip-1.1.1.tgz +sha256 93eb7fe81da0861e7013d12fe82cc8691a450822d889c2b0443a434be6c28ef4 geoip.c diff --git a/buildroot/package/php-gnupg/Config.in b/buildroot/package/php-gnupg/Config.in index 113017d02..8cc8bb9f3 100644 --- a/buildroot/package/php-gnupg/Config.in +++ b/buildroot/package/php-gnupg/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PHP_GNUPG bool "php-gnupg" - depends on BR2_PACKAGE_PHP depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # ligpgme depends on BR2_USE_MMU # libassuan select BR2_PACKAGE_LIBGPGME diff --git a/buildroot/package/php-gnupg/php-gnupg.hash b/buildroot/package/php-gnupg/php-gnupg.hash index 4185665e0..8d142cdaa 100644 --- a/buildroot/package/php-gnupg/php-gnupg.hash +++ b/buildroot/package/php-gnupg/php-gnupg.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 35e16bee11345a7d6bf57bea3cadf45e371ad1ed4e0218b0c06f6f637e4e1772 gnupg-1.4.0.tgz +sha256 35e16bee11345a7d6bf57bea3cadf45e371ad1ed4e0218b0c06f6f637e4e1772 gnupg-1.4.0.tgz +sha256 da1136d4d9326317cbd320dadddf7e9b4b4edffd973eb083cb7b9754fb6a15d9 LICENSE diff --git a/buildroot/package/php-imagick/Config.in b/buildroot/package/php-imagick/Config.in index f759eea2f..488e37584 100644 --- a/buildroot/package/php-imagick/Config.in +++ b/buildroot/package/php-imagick/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PHP_IMAGICK bool "php-imagick" - depends on BR2_PACKAGE_PHP depends on BR2_USE_MMU # imagemagick depends on BR2_TOOLCHAIN_HAS_THREADS # imagemagick select BR2_PACKAGE_IMAGEMAGICK @@ -11,5 +10,4 @@ config BR2_PACKAGE_PHP_IMAGICK comment "php-imagemagick needs a toolchain w/ threads" depends on BR2_USE_MMU - depends on BR2_PACKAGE_PHP depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/php-imagick/php-imagick.hash b/buildroot/package/php-imagick/php-imagick.hash index abb29d4e2..8b62ed1d9 100644 --- a/buildroot/package/php-imagick/php-imagick.hash +++ b/buildroot/package/php-imagick/php-imagick.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1f3c5b5eeaa02800ad22f506cd100e8889a66b2ec937e192eaaa30d74562567c imagick-3.4.3.tgz +sha256 1f3c5b5eeaa02800ad22f506cd100e8889a66b2ec937e192eaaa30d74562567c imagick-3.4.3.tgz +sha256 b6e00df9cb3b91977c0d64a7c4db48cb6f5041f6eeda6583c236775f70a35b78 LICENSE diff --git a/buildroot/package/php-ssh2/Config.in b/buildroot/package/php-ssh2/Config.in index b45790074..5a23114ba 100644 --- a/buildroot/package/php-ssh2/Config.in +++ b/buildroot/package/php-ssh2/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PHP_SSH2 bool "php-ssh2" - depends on BR2_PACKAGE_PHP select BR2_PACKAGE_LIBSSH2 help PHP bindings for the libssh2 library. diff --git a/buildroot/package/php-ssh2/php-ssh2.hash b/buildroot/package/php-ssh2/php-ssh2.hash index f110e7786..36e04f471 100644 --- a/buildroot/package/php-ssh2/php-ssh2.hash +++ b/buildroot/package/php-ssh2/php-ssh2.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 87618d6a0981afe8c24b36d6b38c21a0aa0237b62e60347d0170bd86b51f79fb ssh2-1.1.2.tgz +sha256 87618d6a0981afe8c24b36d6b38c21a0aa0237b62e60347d0170bd86b51f79fb ssh2-1.1.2.tgz +sha256 ac7c56f1e416ce6e60abcf26269395128bc9e5a2e4f3293e5dcc124aac606508 LICENSE diff --git a/buildroot/package/php-yaml/Config.in b/buildroot/package/php-yaml/Config.in index 8d09ce28f..28f917fe6 100644 --- a/buildroot/package/php-yaml/Config.in +++ b/buildroot/package/php-yaml/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PHP_YAML bool "php-yaml" - depends on BR2_PACKAGE_PHP select BR2_PACKAGE_LIBYAML help PHP YAML-1.1 parser and emitter. diff --git a/buildroot/package/php-zmq/Config.in b/buildroot/package/php-zmq/Config.in index 058f93d9a..37be17792 100644 --- a/buildroot/package/php-zmq/Config.in +++ b/buildroot/package/php-zmq/Config.in @@ -3,7 +3,6 @@ comment "php-zmq needs a toolchain w/ C++, threads" config BR2_PACKAGE_PHP_ZMQ bool "php-zmq" - depends on BR2_PACKAGE_PHP depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_ZEROMQ diff --git a/buildroot/package/php-zmq/php-zmq.hash b/buildroot/package/php-zmq/php-zmq.hash index c99e351ed..a4cca6987 100644 --- a/buildroot/package/php-zmq/php-zmq.hash +++ b/buildroot/package/php-zmq/php-zmq.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c492375818bd51b355352798fb94f04d6828c6aeda41ba813849624af74144ce zmq-1.1.3.tgz +sha256 c492375818bd51b355352798fb94f04d6828c6aeda41ba813849624af74144ce zmq-1.1.3.tgz +sha256 0302303063d3612fc240032aeb6d70e9b7509fc17a4a9edf00eba091ed597514 LICENSE diff --git a/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch b/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch index b25f66175..982857a35 100644 --- a/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch +++ b/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch @@ -10,14 +10,14 @@ Signed-off-by: Gustavo Zacarias Signed-off-by: Adam Duskett [aduskett@gmail.com: Update for 7.3.0] --- - acinclude.m4 | 4 ---- + build/php.m4 | 4 ---- 1 file changed, 4 deletions(-) -diff --git a/acinclude.m4 b/acinclude.m4 -index 28506b6..af4aa06 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -1921,8 +1921,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,])) +diff --git a/build/php.m4 b/build/php.m4 +index e91ef988..9586c490 100644 +--- a/build/php.m4 ++++ b/build/php.m4 +@@ -1587,8 +1587,6 @@ dnl PHP_CHECK_FUNC_LIB dnl AC_DEFUN([PHP_CHECK_FUNC_LIB],[ ifelse($2,,:,[ @@ -26,14 +26,14 @@ index 28506b6..af4aa06 100644 unset found AC_CHECK_LIB($2, $1, [found=yes], [ AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) -@@ -1954,8 +1952,6 @@ dnl in the default libraries and as a fall back in the specified library. - dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS. +@@ -1620,8 +1618,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and + dnl HAVE_library if found and adds the library to LIBS. dnl AC_DEFUN([PHP_CHECK_FUNC],[ - unset ac_cv_func_$1 - unset ac_cv_func___$1 unset found - + AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ]) -- 2.7.4 diff --git a/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch b/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch index e4f2abbc0..1aa840013 100644 --- a/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch +++ b/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch @@ -3,7 +3,7 @@ From: Gustavo Zacarias Date: Tue, 9 Aug 2016 11:50:49 +0200 Subject: [PATCH] iconv: tweak iconv detection -Tweak PHP_SETUP_ICONV from aclocal/acinclude.m4 to not +Tweak PHP_SETUP_ICONV from aclocal/build/php.m4 to not PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use test instead of AC_TRY_LINK to find headers which is bad, specially when adding /usr and /usr/local to the mix. @@ -16,16 +16,16 @@ Signed-off-by: Gustavo Zacarias Signed-off-by: Adam Duskett [aduskett@gmail.com: Update for 7.3.0] --- - acinclude.m4 | 2 +- + build/php.m4 | 2 +- ext/iconv/config.m4 | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) -diff --git a/acinclude.m4 b/acinclude.m4 -index af4aa06..1bd2652 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2444,7 +2444,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ - dnl +diff --git a/build/php.m4 b/build/php.m4 +index 9586c490..8b3d47ed 100644 +--- a/build/php.m4 ++++ b/build/php.m4 +@@ -1971,7 +1971,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ + dnl Check external libs for iconv funcs. if test "$found_iconv" = "no"; then - for i in $PHP_ICONV /usr/local /usr; do @@ -34,10 +34,10 @@ index af4aa06..1bd2652 100644 AC_DEFINE(HAVE_GICONV_H, 1, [ ]) ICONV_DIR=$i diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 -index 72334f79..29c358ad 100644 +index fe9b47aa..70599694 100644 --- a/ext/iconv/config.m4 +++ b/ext/iconv/config.m4 -@@ -12,28 +12,6 @@ if test "$PHP_ICONV" != "no"; then +@@ -13,28 +13,6 @@ if test "$PHP_ICONV" != "no"; then ]) if test "$iconv_avail" != "no"; then diff --git a/buildroot/package/php/0003-configure-disable-the-phar-tool.patch b/buildroot/package/php/0003-configure-disable-the-phar-tool.patch index 396a80649..7cc363797 100644 --- a/buildroot/package/php/0003-configure-disable-the-phar-tool.patch +++ b/buildroot/package/php/0003-configure-disable-the-phar-tool.patch @@ -10,17 +10,17 @@ on the target. Signed-off-by: Gustavo Zacarias [Gustavo: update for autoreconf/configure.in] -Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett [Aduskett: update for 7.3.0] --- configure.ac | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index d20af76..7f02f1a 100644 +index 0dfab302..6026fb66 100644 --- a/configure.ac +++ b/configure.ac -@@ -1472,13 +1472,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" +@@ -1430,13 +1430,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" diff --git a/buildroot/package/php/0004-Call-apxs-with-correct-prefix.patch b/buildroot/package/php/0004-Call-apxs-with-correct-prefix.patch index 60589b54f..a0a071578 100644 --- a/buildroot/package/php/0004-Call-apxs-with-correct-prefix.patch +++ b/buildroot/package/php/0004-Call-apxs-with-correct-prefix.patch @@ -22,10 +22,10 @@ Signed-off-by: Adam Duskett 1 file changed, 3 insertions(+) diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 -index 2e64b21..f5bf002 100644 +index 55c16179..68ce66c0 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 -@@ -64,10 +64,12 @@ if test "$PHP_APXS2" != "no"; then +@@ -63,10 +63,12 @@ if test "$PHP_APXS2" != "no"; then AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) fi @@ -38,7 +38,7 @@ index 2e64b21..f5bf002 100644 -i -n php7" else APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` -@@ -75,6 +77,7 @@ if test "$PHP_APXS2" != "no"; then +@@ -74,6 +76,7 @@ if test "$PHP_APXS2" != "no"; then \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ -S SYSCONFDIR='$APXS_SYSCONFDIR' \ diff --git a/buildroot/package/php/0005-Check-for-sys-auxv.h-before-using-it.patch b/buildroot/package/php/0005-Check-for-sys-auxv.h-before-using-it.patch new file mode 100644 index 000000000..559c64db8 --- /dev/null +++ b/buildroot/package/php/0005-Check-for-sys-auxv.h-before-using-it.patch @@ -0,0 +1,60 @@ +From f150702d5ab72878d45b722b6d7d4194db92c44a Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 9 Mar 2020 15:36:48 +0100 +Subject: [PATCH] Check for sys/auxv.h before using it. + +Fixes aarch64 compile wiht uclibc-ng (does not provide +sys/auxv.h header file). + +Signed-off-by: Peter Seiderer +Upstream: https://github.com/php/php-src/commit/f73528f0e0d59ac744ccb4a94a3a9d7b9f0fba1b +--- + configure.ac | 1 + + ext/standard/crc32.c | 9 +++++++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5219a5f2..caf62302 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -440,6 +440,7 @@ resolv.h \ + strings.h \ + syslog.h \ + sysexits.h \ ++sys/auxv.h \ + sys/ioctl.h \ + sys/file.h \ + sys/mman.h \ +diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c +index c3ca5903..e59ab45f 100644 +--- a/ext/standard/crc32.c ++++ b/ext/standard/crc32.c +@@ -17,10 +17,15 @@ + */ + + #include "php.h" ++#ifdef PHP_WIN32 ++#include "config.w32.h" ++#else ++#include ++#endif + #include "basic_functions.h" + #include "crc32.h" + +-#if defined(__aarch64__) ++#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H) + # include + # if defined(__linux__) + # include +@@ -85,7 +90,7 @@ PHP_NAMED_FUNCTION(php_if_crc32) + + crc = crcinit^0xFFFFFFFF; + +-#if defined(__aarch64__) ++#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H) + if (has_crc32_insn()) { + crc = crc32_aarch64(crc, p, nr); + RETURN_LONG(crc^0xFFFFFFFF); +-- +2.25.1 + diff --git a/buildroot/package/php/Config.ext b/buildroot/package/php/Config.ext index d71cfb998..193bc1bd0 100644 --- a/buildroot/package/php/Config.ext +++ b/buildroot/package/php/Config.ext @@ -70,6 +70,24 @@ config BR2_PACKAGE_PHP_EXT_HASH help HASH message digest framework +comment "libargon2 needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS + +config BR2_PACKAGE_PHP_EXT_LIBARGON2 + bool "libargon2" + depends on BR2_USE_MMU # libargon2 + depends on !BR2_STATIC_LIBS # libargon2 + select BR2_PACKAGE_LIBARGON2 + help + libargon2 support + +config BR2_PACKAGE_PHP_EXT_LIBSODIUM + bool "libsodium" + select BR2_PACKAGE_LIBSODIUM + help + libsodium support + config BR2_PACKAGE_PHP_EXT_MCRYPT bool "mcrypt" select BR2_PACKAGE_LIBMCRYPT @@ -204,7 +222,6 @@ config BR2_PACKAGE_PHP_EXT_ICONV config BR2_PACKAGE_PHP_EXT_INTL bool "intl" - depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu @@ -215,15 +232,15 @@ config BR2_PACKAGE_PHP_EXT_INTL help Internationalization support -comment "intl support needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.8, host gcc >= 4.8" +comment "intl support needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.8" depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ - !BR2_HOST_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 config BR2_PACKAGE_PHP_EXT_MBSTRING bool "mbstring" + select BR2_PACKAGE_ONIGURUMA help multibyte string support diff --git a/buildroot/package/php/php.hash b/buildroot/package/php/php.hash index 11ce10959..4584524f1 100644 --- a/buildroot/package/php/php.hash +++ b/buildroot/package/php/php.hash @@ -1,5 +1,5 @@ -# From http://php.net/downloads.php -sha256 aafe5e9861ad828860c6af8c88cdc1488314785962328eb1783607c1fdd855df php-7.3.12.tar.xz +# From https://www.php.net/downloads.php +sha256 1873c4cefdd3df9a78dcffb2198bba5c2f0464f55c9c960720c84df483fca74c php-7.4.4.tar.xz # License file -sha256 f689b8fa63bea7950ce6a21bf52ed88ea0d77673ee76e6de12f51191174d91b8 LICENSE +sha256 0967ad6cf4b7fe81d38709d7aaef3fecb3bd685be7eebb37b864aa34c991baa7 LICENSE diff --git a/buildroot/package/php/php.mk b/buildroot/package/php/php.mk index dae1fade2..f62204c2a 100644 --- a/buildroot/package/php/php.mk +++ b/buildroot/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.3.12 +PHP_VERSION = 7.4.4 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES @@ -16,6 +16,7 @@ PHP_LICENSE_FILES = LICENSE PHP_CONF_OPTS = \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ + --with-config-file-scan-dir=/etc/php.d \ --disable-all \ --without-pear \ --with-config-file-path=/etc \ @@ -118,9 +119,23 @@ PHP_CONF_OPTS += \ $(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \ $(if $(BR2_PACKAGE_PHP_EXT_FILEINFO),--enable-fileinfo) \ $(if $(BR2_PACKAGE_PHP_EXT_BCMATH),--enable-bcmath) \ - $(if $(BR2_PACKAGE_PHP_EXT_MBSTRING),--enable-mbstring) \ $(if $(BR2_PACKAGE_PHP_EXT_PHAR),--enable-phar) +ifeq ($(BR2_PACKAGE_PHP_EXT_LIBARGON2),y) +PHP_CONF_OPTS += --with-password-argon2=$(STAGING_DIR)/usr +PHP_DEPENDENCIES += libargon2 +endif + +ifeq ($(BR2_PACKAGE_PHP_EXT_LIBSODIUM),y) +PHP_CONF_OPTS += --with-sodium=$(STAGING_DIR)/usr +PHP_DEPENDENCIES += libsodium +endif + +ifeq ($(BR2_PACKAGE_PHP_EXT_MBSTRING),y) +PHP_CONF_OPTS += --enable-mbstring +PHP_DEPENDENCIES += oniguruma +endif + ifeq ($(BR2_PACKAGE_PHP_EXT_MCRYPT),y) PHP_CONF_OPTS += --with-mcrypt=$(STAGING_DIR)/usr PHP_DEPENDENCIES += libmcrypt @@ -136,7 +151,7 @@ endif ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y) PHP_CONF_ENV += php_cv_libxml_build_works=yes -PHP_CONF_OPTS += --enable-libxml --with-libxml-dir=$(STAGING_DIR)/usr +PHP_CONF_OPTS += --with-libxml --with-libxml-dir=$(STAGING_DIR)/usr PHP_DEPENDENCIES += libxml2 endif @@ -159,6 +174,8 @@ endif ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),) PHP_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr PHP_DEPENDENCIES += zlib +else +PHP_CONF_OPTS += --disable-mysqlnd_compression_support endif ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y) @@ -246,6 +263,15 @@ PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_VALGRIND ifeq ($(BR2_PACKAGE_PCRE2),y) PHP_CONF_OPTS += --with-pcre-regex=$(STAGING_DIR)/usr PHP_DEPENDENCIES += pcre2 + +ifeq ($(BR2_PACKAGE_PCRE2_JIT),y) +PHP_CONF_OPTS += --with-pcre-jit=yes +PHP_CONF_ENV += ac_cv_have_pcre2_jit=yes +else +PHP_CONF_OPTS += --with-pcre-jit=no +PHP_CONF_ENV += ac_cv_have_pcre2_jit=no +endif + else # The bundled pcre library is not configurable through ./configure options, # and by default is configured to be thread-safe, so it wants pthreads. So @@ -318,15 +344,12 @@ endef define PHP_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/sapi/fpm/php-fpm.service \ $(TARGET_DIR)/usr/lib/systemd/system/php-fpm.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/php-fpm.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/php-fpm.service endef define PHP_INSTALL_FPM_CONF $(INSTALL) -D -m 0644 package/php/php-fpm.conf \ $(TARGET_DIR)/etc/php-fpm.conf - rm -f $(TARGET_DIR)/etc/php-fpm.conf.default + rm -f $(TARGET_DIR)/etc/php-fpm.d/www.conf.default # remove unused sample status page /usr/php/php/fpm/status.html rm -rf $(TARGET_DIR)/usr/php endef diff --git a/buildroot/package/physfs/physfs.hash b/buildroot/package/physfs/physfs.hash index 3d97fe0b0..a2219edd2 100644 --- a/buildroot/package/physfs/physfs.hash +++ b/buildroot/package/physfs/physfs.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b77b9f853168d9636a44f75fca372b363106f52d789d18a2f776397bf117f2f1 physfs-3.0.1.tar.bz2 -sha256 7ce475991f6cc09958ef0d57312522eba78e36d984307c95f9a3965adf7e4e2b LICENSE.txt +sha256 304df76206d633df5360e738b138c94e82ccf086e50ba84f456d3f8432f9f863 physfs-3.0.2.tar.bz2 +sha256 d80c0b09a1c98c61667ea044eefa2fd98fb70bd5fe12c49ff52b1fc2289a6583 LICENSE.txt diff --git a/buildroot/package/physfs/physfs.mk b/buildroot/package/physfs/physfs.mk index 78176be4b..9a3bd441a 100644 --- a/buildroot/package/physfs/physfs.mk +++ b/buildroot/package/physfs/physfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHYSFS_VERSION = 3.0.1 +PHYSFS_VERSION = 3.0.2 PHYSFS_SOURCE = physfs-$(PHYSFS_VERSION).tar.bz2 PHYSFS_SITE = https://icculus.org/physfs/downloads diff --git a/buildroot/package/phytool/phytool.hash b/buildroot/package/phytool/phytool.hash index ce0493641..b6bfd8132 100644 --- a/buildroot/package/phytool/phytool.hash +++ b/buildroot/package/phytool/phytool.hash @@ -2,3 +2,4 @@ # sha256 locally computed: md5 972982f8e5f7237cbccfc6d275da7348 phytool-2.tar.xz sha256 9901a14e8c6af02b7333c60b21ff81f50620e8326d54827185e5617ff9b11d21 phytool-2.tar.xz +sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 LICENSE diff --git a/buildroot/package/pifmrds/pifmrds.hash b/buildroot/package/pifmrds/pifmrds.hash index 0c91d3d44..b0949ca11 100644 --- a/buildroot/package/pifmrds/pifmrds.hash +++ b/buildroot/package/pifmrds/pifmrds.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 2afc9f3c9fc206ba32865d7dd77f3a97d7d86dcfc9b44eeb5665e8fddaafcf44 pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.tar.gz +sha256 2afc9f3c9fc206ba32865d7dd77f3a97d7d86dcfc9b44eeb5665e8fddaafcf44 pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.tar.gz +sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/buildroot/package/piglit/0001-tests-fix-test-build-requiring-gles3.patch b/buildroot/package/piglit/0001-tests-fix-test-build-requiring-gles3.patch new file mode 100644 index 000000000..4183f2343 --- /dev/null +++ b/buildroot/package/piglit/0001-tests-fix-test-build-requiring-gles3.patch @@ -0,0 +1,49 @@ +From 8417ca1725d523493d8f6782699273dc056888ac Mon Sep 17 00:00:00 2001 +From: Lionel Landwerlin +Date: Thu, 1 Aug 2019 20:51:55 +0300 +Subject: [PATCH] tests: fix test build requiring gles3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This should be built only on gles3. + +Signed-off-by: Lionel Landwerlin +Reported-by: Krzysztof Raszkowski +Fixes: ef761094be ("tests: Reproducer for 110796") +Reviewed-by: Tapani Pälli +[Retrieved from: +https://gitlab.freedesktop.org/mesa/piglit/commit/8417ca1725d523493d8f6782699273dc056888ac] +Signed-off-by: Fabrice Fontaine +--- + tests/shaders/CMakeLists.gl.txt | 1 - + tests/shaders/CMakeLists.gles3.txt | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt +index f1512f9cf..a299001cb 100644 +--- a/tests/shaders/CMakeLists.gl.txt ++++ b/tests/shaders/CMakeLists.gl.txt +@@ -43,7 +43,6 @@ IF (UNIX) + ENDIF (UNIX) + piglit_add_executable (glsl-arb-fragment-coord-conventions glsl-arb-fragment-coord-conventions.c) + piglit_add_executable (glsl-bindattriblocation glsl-bindattriblocation.c) +-piglit_add_executable (glsl-bug-110796 glsl-bug-110796.c) + piglit_add_executable (glsl-bug-22603 glsl-bug-22603.c) + piglit_add_executable (glsl-dlist-getattriblocation glsl-dlist-getattriblocation.c) + piglit_add_executable (glsl-explicit-location-01 glsl-explicit-location-01.c) +diff --git a/tests/shaders/CMakeLists.gles3.txt b/tests/shaders/CMakeLists.gles3.txt +index 18b8c3534..c8ccfad42 100644 +--- a/tests/shaders/CMakeLists.gles3.txt ++++ b/tests/shaders/CMakeLists.gles3.txt +@@ -3,6 +3,7 @@ link_libraries( + ) + + piglit_add_executable (built-in-constants_${piglit_target_api} built-in-constants.c parser_utils.c) ++piglit_add_executable (glsl-bug-110796 glsl-bug-110796.c) + piglit_add_executable(shader_runner_${piglit_target_api} shader_runner.c parser_utils.c) + + # vim: ft=cmake: +-- +2.24.1 + diff --git a/buildroot/package/piglit/Config.in b/buildroot/package/piglit/Config.in new file mode 100644 index 000000000..736fd95d7 --- /dev/null +++ b/buildroot/package/piglit/Config.in @@ -0,0 +1,35 @@ +config BR2_PACKAGE_PIGLIT + bool "piglit" + depends on BR2_PACKAGE_PYTHON3 # python3 only script + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_PACKAGE_WAFFLE_SUPPORTS_GLX || \ + BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND || \ + BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL || \ + BR2_PACKAGE_WAFFLE_SUPPORTS_GBM + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_MESA3D_DEMOS # glxinfo + select BR2_PACKAGE_PYTHON_MAKO + select BR2_PACKAGE_PYTHON_NUMPY + select BR2_PACKAGE_PYTHON_SIX + select BR2_PACKAGE_PYTHON3_BZIP2 + select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_XZ + select BR2_PACKAGE_PYTHON3_ZLIB + select BR2_PACKAGE_UTIL_LINUX # runtime + select BR2_PACKAGE_UTIL_LINUX_BINARIES # requires real dmesg tool + select BR2_PACKAGE_WAFFLE # wflinfo, libwaffle-1 + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XORGPROTO if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_ZLIB + help + Piglit is an open-source test suite for OpenGL + implementations. + + https://piglit.freedesktop.org + +comment "piglit needs glibc or musl" + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/buildroot/package/piglit/piglit.hash b/buildroot/package/piglit/piglit.hash new file mode 100644 index 000000000..8cfd04f7e --- /dev/null +++ b/buildroot/package/piglit/piglit.hash @@ -0,0 +1,6 @@ +# Locally calculated +sha256 4eba46520df1c47b0aea5446c302ff51d52f905a63d1ba29230866fc6c952a2e piglit-ef761094be04d14e258ad7706e7295f80d4411f2.tar.gz +sha256 dcc398730859aee7cc1d6aa57f526f8d181b47bb3a49830e85b5723d5bc2c3bc COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licences/GPL-2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 licences/GPL-3 +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c licences/LGPL-2 diff --git a/buildroot/package/piglit/piglit.mk b/buildroot/package/piglit/piglit.mk new file mode 100644 index 000000000..d4753b9f7 --- /dev/null +++ b/buildroot/package/piglit/piglit.mk @@ -0,0 +1,72 @@ +################################################################################ +# +# piglit +# +################################################################################ + +PIGLIT_VERSION = ef761094be04d14e258ad7706e7295f80d4411f2 +PIGLIT_SITE = https://gitlab.freedesktop.org/mesa/piglit.git +PIGLIT_SITE_METHOD = git +PIGLIT_LICENSE = MIT (code), \ + LGPL-2.0+ (tests/glslparsertest/glsl2/gst-gl-*), \ + LGPL-2.1+ (some tests), \ + GPL-3.0 (tests/glslparsertest/glsl2/norsetto-*), \ + GPL-2.0+ (tests/glslparsertest/glsl2/xreal-*, some other shaders), \ + BSD-3-Clause (tests/glslparsertest/shaders/*) +PIGLIT_LICENSE_FILES = COPYING licences/GPL-2 licences/GPL-3 licences/LGPL-2 + +PIGLIT_DEPENDENCIES = host-pkgconf \ + host-python-mako \ + host-python-numpy \ + host-python-six \ + libpng \ + python-mako \ + python-numpy \ + python-six \ + waffle \ + zlib + +PIGLIT_CONF_OPTS += \ + -DPIGLIT_USE_WAFFLE=ON \ + -DPIGLIT_BUILD_CL_TESTS=OFF \ + -DPIGLIT_BUILD_WGL_TESTS=OFF \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 + +ifeq ($(BR2_PACKAGE_XORG7),y) +# libxcb for xcb-dri2 +PIGLIT_DEPENDENCIES += \ + xlib_libX11 \ + xlib_libXext \ + xorgproto \ + $(if $(BR2_PACKAGE_LIBXCB),libxcb) +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +PIGLIT_DEPENDENCIES += libgl libdrm +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GL_TESTS=ON +else +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GL_TESTS=OFF +endif + +ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy) +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLX_TESTS=ON +else +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLX_TESTS=OFF +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yy) +PIGLIT_DEPENDENCIES += libegl +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLES1_TESTS=ON \ + -DPIGLIT_BUILD_GLES2_TESTS=ON \ + -DPIGLIT_BUILD_GLES3_TESTS=ON +else +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLES1_TESTS=OFF \ + -DPIGLIT_BUILD_GLES2_TESTS=OFF \ + -DPIGLIT_BUILD_GLES3_TESTS=OFF +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +PIGLIT_DEPENDENCIES += wayland libxkbcommon +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/pigpio/pigpio.hash b/buildroot/package/pigpio/pigpio.hash index 3df55faff..f20b9bf6b 100644 --- a/buildroot/package/pigpio/pigpio.hash +++ b/buildroot/package/pigpio/pigpio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ec980f5e672e8e9395b801fecec3fbbbc5c04182b16ee72eb9ca25a453e38062 pigpio-V68.tar.gz +sha256 87ec2ec87cb6cb0f42af47868631e657217b5927cdfbea3ad0ecdc2ca885a2d1 pigpio-7301.tar.gz sha256 6a90b88421a0d9b090e121daa11b3c6d55eed5eeb3281a2fcc454d6a28b5547c UNLICENCE diff --git a/buildroot/package/pigpio/pigpio.mk b/buildroot/package/pigpio/pigpio.mk index 461ca0440..aed5f2744 100644 --- a/buildroot/package/pigpio/pigpio.mk +++ b/buildroot/package/pigpio/pigpio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PIGPIO_VERSION = V68 -PIGPIO_SITE = $(call github,joan2937,pigpio,$(PIGPIO_VERSION)) +PIGPIO_VERSION = 7301 +PIGPIO_SITE = $(call github,joan2937,pigpio,v$(PIGPIO_VERSION)) PIGPIO_LICENSE = Unlicense PIGPIO_LICENSE_FILES = UNLICENCE PIGPIO_INSTALL_STAGING = YES @@ -18,18 +18,24 @@ define PIGPIO_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/pig2vcd $(TARGET_DIR)/usr/bin/pig2vcd $(INSTALL) -D -m 0755 $(@D)/pigpiod $(TARGET_DIR)/usr/bin/pigpiod $(INSTALL) -D -m 0755 $(@D)/pigs $(TARGET_DIR)/usr/bin/pigs - $(INSTALL) -D -m 0755 $(@D)/libpigpio.so $(TARGET_DIR)/usr/lib/libpigpio.so - $(INSTALL) -D -m 0755 $(@D)/libpigpiod_if.so $(TARGET_DIR)/usr/lib/libpigpiod_if.so - $(INSTALL) -D -m 0755 $(@D)/libpigpiod_if2.so $(TARGET_DIR)/usr/lib/libpigpiod_if2.so + $(INSTALL) -D -m 0755 $(@D)/libpigpio.so.1 $(TARGET_DIR)/usr/lib/libpigpio.so.1 + $(INSTALL) -D -m 0755 $(@D)/libpigpiod_if.so.1 $(TARGET_DIR)/usr/lib/libpigpiod_if.so.1 + $(INSTALL) -D -m 0755 $(@D)/libpigpiod_if2.so.1 $(TARGET_DIR)/usr/lib/libpigpiod_if2.so.1 + ln -sf libpigpio.so.1 $(TARGET_DIR)/usr/lib/libpigpio.so + ln -sf libpigpiod_if.so.1 $(TARGET_DIR)/usr/lib/libpigpiod_if.so + ln -sf libpigpiod_if2.so.1 $(TARGET_DIR)/usr/lib/libpigpiod_if2.so endef define PIGPIO_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0755 $(@D)/libpigpio.so $(STAGING_DIR)/usr/lib/libpigpio.so - $(INSTALL) -D -m 0755 $(@D)/libpigpiod_if.so $(STAGING_DIR)/usr/lib/libpigpiod_if.so - $(INSTALL) -D -m 0755 $(@D)/libpigpiod_if2.so $(STAGING_DIR)/usr/lib/libpigpiod_if2.so + $(INSTALL) -D -m 0755 $(@D)/libpigpio.so.1 $(STAGING_DIR)/usr/lib/libpigpio.so.1 + $(INSTALL) -D -m 0755 $(@D)/libpigpiod_if.so.1 $(STAGING_DIR)/usr/lib/libpigpiod_if.so.1 + $(INSTALL) -D -m 0755 $(@D)/libpigpiod_if2.so.1 $(STAGING_DIR)/usr/lib/libpigpiod_if2.so.1 $(INSTALL) -D -m 0644 $(@D)/pigpio.h $(STAGING_DIR)/usr/include/pigpio.h $(INSTALL) -D -m 0644 $(@D)/pigpiod_if.h $(STAGING_DIR)/usr/include/pigpiod_if.h $(INSTALL) -D -m 0644 $(@D)/pigpiod_if2.h $(STAGING_DIR)/usr/include/pigpiod_if2.h + ln -sf libpigpio.so.1 $(STAGING_DIR)/usr/lib/libpigpio.so + ln -sf libpigpiod_if.so.1 $(STAGING_DIR)/usr/lib/libpigpiod_if.so + ln -sf libpigpiod_if2.so.1 $(STAGING_DIR)/usr/lib/libpigpiod_if2.so endef $(eval $(generic-package)) diff --git a/buildroot/package/pigz/pigz.hash b/buildroot/package/pigz/pigz.hash index 843fd4fba..ec75b4e53 100644 --- a/buildroot/package/pigz/pigz.hash +++ b/buildroot/package/pigz/pigz.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52 pigz-v2.4.tar.gz +sha256 e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52 pigz-2.4.tar.gz sha256 dc8f78258cdb4478b5922f4c00eb63d3cbac06c171dc829648fd414bb0cf4493 README diff --git a/buildroot/package/pigz/pigz.mk b/buildroot/package/pigz/pigz.mk index ac4f94027..b4f28c048 100644 --- a/buildroot/package/pigz/pigz.mk +++ b/buildroot/package/pigz/pigz.mk @@ -4,8 +4,8 @@ # ################################################################################ -PIGZ_VERSION = v2.4 -PIGZ_SITE = $(call github,madler,pigz,$(PIGZ_VERSION)) +PIGZ_VERSION = 2.4 +PIGZ_SITE = $(call github,madler,pigz,v$(PIGZ_VERSION)) PIGZ_DEPENDENCIES = zlib PIGZ_LICENSE = Zlib PIGZ_LICENSE_FILES = README diff --git a/buildroot/package/pinentry/Config.in b/buildroot/package/pinentry/Config.in index 22bc2bb43..ef7090850 100644 --- a/buildroot/package/pinentry/Config.in +++ b/buildroot/package/pinentry/Config.in @@ -15,6 +15,19 @@ menuconfig BR2_PACKAGE_PINENTRY if BR2_PACKAGE_PINENTRY +config BR2_PACKAGE_PINENTRY_FLTK + bool "pinentry-fltk" + depends on BR2_USE_MMU # fltk + depends on BR2_INSTALL_LIBSTDCPP # fltk + depends on BR2_PACKAGE_XORG7 # fltk + select BR2_PACKAGE_FLTK + help + The pinentry-fltk tool + +comment "pinentry-fltk needs X and a toolchain w/ C++" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_XORG7 || !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_PINENTRY_NCURSES bool "pinentry-ncurses" select BR2_PACKAGE_NCURSES @@ -30,15 +43,17 @@ config BR2_PACKAGE_PINENTRY_GTK2 depends on BR2_USE_MMU depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help The pinentry-gtk2 tool -comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++" +comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_PACKAGE_XORG7 || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_PINENTRY_QT5 @@ -46,6 +61,8 @@ config BR2_PACKAGE_PINENTRY_QT5 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_arc depends on !BR2_STATIC_LIBS select BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_GUI @@ -53,8 +70,10 @@ config BR2_PACKAGE_PINENTRY_QT5 help The pinentry-qt5 tool -comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" +comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, gcc >= 4.8, C++, dynamic library" + depends on !BR2_arc depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + BR2_STATIC_LIBS endif diff --git a/buildroot/package/pinentry/pinentry.hash b/buildroot/package/pinentry/pinentry.hash index ef450b3c4..c9610d6eb 100644 --- a/buildroot/package/pinentry/pinentry.hash +++ b/buildroot/package/pinentry/pinentry.hash @@ -1,4 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 85d9ac81ebad3fb082514c505c90c39a0456f1f6 pinentry-1.0.0.tar.bz2 +sha1 693bdf9f48dfb3e040d92f50b1bb464e268b9fb0 pinentry-1.1.0.tar.bz2 # Locally computed -sha256 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a pinentry-1.0.0.tar.bz2 +sha256 68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570 pinentry-1.1.0.tar.bz2 +sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/buildroot/package/pinentry/pinentry.mk b/buildroot/package/pinentry/pinentry.mk index ce82f1090..1bc1adab1 100644 --- a/buildroot/package/pinentry/pinentry.mk +++ b/buildroot/package/pinentry/pinentry.mk @@ -4,7 +4,7 @@ # ################################################################################ -PINENTRY_VERSION = 1.0.0 +PINENTRY_VERSION = 1.1.0 PINENTRY_SOURCE = pinentry-$(PINENTRY_VERSION).tar.bz2 PINENTRY_SITE = https://www.gnupg.org/ftp/gcrypt/pinentry PINENTRY_LICENSE = GPL-2.0+ @@ -36,6 +36,15 @@ else PINENTRY_CONF_OPTS += --disable-libsecret endif +# pinentry-fltk backend +ifeq ($(BR2_PACKAGE_PINENTRY_FLTK),y) +PINENTRY_CONF_ENV += ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config +PINENTRY_CONF_OPTS += --enable-pinentry-fltk +PINENTRY_DEPENDENCIES += fltk +else +PINENTRY_CONF_OPTS += --disable-pinentry-fltk +endif + # pinentry-ncurses backend ifeq ($(BR2_PACKAGE_PINENTRY_NCURSES),y) PINENTRY_CONF_OPTS += --enable-ncurses --with-ncurses-include-dir=none diff --git a/buildroot/package/pipewire/Config.in b/buildroot/package/pipewire/Config.in new file mode 100644 index 000000000..57e70d65f --- /dev/null +++ b/buildroot/package/pipewire/Config.in @@ -0,0 +1,35 @@ +config BR2_PACKAGE_PIPEWIRE + bool "pipewire" + depends on BR2_PACKAGE_HAS_UDEV # libudev + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib + depends on BR2_USE_MMU # dbus + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_DBUS + help + PipeWire is a server and user space API to deal with + multimedia pipelines. + + https://pipewire.org/ + +if BR2_PACKAGE_PIPEWIRE + +config BR2_PACKAGE_PIPEWIRE_GSTREAMER + bool "pipewire gstreamer plugins" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BASE + help + Build GStreamer plugins + +comment "pipewire gstreamer support needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + +endif + +comment "pipewire needs udev and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/pipewire/pipewire.hash b/buildroot/package/pipewire/pipewire.hash new file mode 100644 index 000000000..81c53867e --- /dev/null +++ b/buildroot/package/pipewire/pipewire.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 bfaa0f6ae6c0791e2e0b59234d399753bf24f1b33dbf587682363a8463dd8df1 pipewire-0.2.7.tar.gz +sha256 88c0ca786c735a11e0eb508196d3aa1389fbaacb8d5de9adb5ccb15bcd4009d9 LICENSE +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL diff --git a/buildroot/package/pipewire/pipewire.mk b/buildroot/package/pipewire/pipewire.mk new file mode 100644 index 000000000..df159c5ef --- /dev/null +++ b/buildroot/package/pipewire/pipewire.mk @@ -0,0 +1,48 @@ +################################################################################ +# +# pipewire +# +################################################################################ + +PIPEWIRE_VERSION = 0.2.7 +PIPEWIRE_SITE = $(call github,PipeWire,pipewire,$(PIPEWIRE_VERSION)) +PIPEWIRE_LICENSE = LGPL-2.1+ +PIPEWIRE_LICENSE_FILES = LICENSE LGPL +PIPEWIRE_INSTALL_STAGING = YES +PIPEWIRE_DEPENDENCIES = host-pkgconf alsa-lib dbus udev + +ifeq ($(BR2_PACKAGE_FFMPEG),y) +PIPEWIRE_DEPENDENCIES += ffmpeg +endif + +ifeq ($(BR2_PACKAGE_LIBVA),y) +PIPEWIRE_DEPENDENCIES += libva +endif + +ifeq ($(BR2_PACKAGE_SBC),y) +PIPEWIRE_DEPENDENCIES += sbc +endif + +ifeq ($(BR2_PACKAGE_SDL2),y) +PIPEWIRE_DEPENDENCIES += sdl2 +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +PIPEWIRE_DEPENDENCIES += xlib_libX11 +endif + +ifeq ($(BR2_PACKAGE_PIPEWIRE_GSTREAMER),y) +PIPEWIRE_CONF_OPTS += -Dgstreamer=enabled +PIPEWIRE_DEPENDENCIES += libglib2 gstreamer1 gst1-plugins-base +else +PIPEWIRE_CONF_OPTS += -Dgstreamer=disabled +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +PIPEWIRE_CONF_OPTS += -Dsystemd=true +PIPEWIRE_DEPENDENCIES += systemd +else +PIPEWIRE_CONF_OPTS += -Dsystemd=false +endif + +$(eval $(meson-package)) diff --git a/buildroot/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch b/buildroot/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch deleted file mode 100644 index 455cebb26..000000000 --- a/buildroot/package/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 17 Jan 2016 14:14:28 +0100 -Subject: [PATCH] pixman-private: include only in C code - - is included unconditionally by pixman-private.h, which in -turn gets included by assembler files. Unfortunately, with certain C -libraries (like the musl C library), cannot be included in -assembler files: - - CCLD libpixman-arm-simd.la -/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: -/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' -/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: -/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' - -It turns out however that is not needed by assembly files, -so we move its inclusion within the #ifndef __ASSEMBLER__ condition, -which solves the problem. - -Signed-off-by: Thomas Petazzoni ---- - pixman/pixman-private.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h -index 73108a0..73a5414 100644 ---- a/pixman/pixman-private.h -+++ b/pixman/pixman-private.h -@@ -1,5 +1,3 @@ --#include -- - #ifndef PIXMAN_PRIVATE_H - #define PIXMAN_PRIVATE_H - -@@ -30,6 +28,7 @@ - #include - #include - #include -+#include - - #include "pixman-compiler.h" - --- -2.6.4 - diff --git a/buildroot/package/pixman/pixman.hash b/buildroot/package/pixman/pixman.hash index d5b8934e4..7a79c206f 100644 --- a/buildroot/package/pixman/pixman.hash +++ b/buildroot/package/pixman/pixman.hash @@ -1,2 +1,6 @@ -# From http://lists.x.org/archives/xorg-announce/2016-January/002672.html -sha1 367698744e74d6d4f363041482965b9ea7fbe4a5 pixman-0.34.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-April/002991.html +md5 16a350a8a40116ddf67632a1d2623711 pixman-0.38.4.tar.bz2 +sha1 87e1abc91ac4e5dfcc275f744f1d0ec3277ee7cd pixman-0.38.4.tar.bz2 +# Locally computed +sha256 84abb7fa2541af24d9c3b34bf75d6ac60cc94ac4410061bbb295b66a29221550 pixman-0.38.4.tar.bz2 +sha256 fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793 COPYING diff --git a/buildroot/package/pixman/pixman.mk b/buildroot/package/pixman/pixman.mk index c797b3e60..e566603d2 100644 --- a/buildroot/package/pixman/pixman.mk +++ b/buildroot/package/pixman/pixman.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIXMAN_VERSION = 0.34.0 +PIXMAN_VERSION = 0.38.4 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.bz2 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT diff --git a/buildroot/package/pixz/pixz.hash b/buildroot/package/pixz/pixz.hash index 3089bcd90..5491a016d 100644 --- a/buildroot/package/pixz/pixz.hash +++ b/buildroot/package/pixz/pixz.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 02c50746b134fa1b1aae41fcc314d7c6f1919b3d48bcdea01bf11769f83f72e8 pixz-1.0.6.tar.xz +sha256 02c50746b134fa1b1aae41fcc314d7c6f1919b3d48bcdea01bf11769f83f72e8 pixz-1.0.6.tar.xz +sha256 d036806b4d1efee7c6d86276451c4d833e9798751417e25daae62dfbe348641b LICENSE diff --git a/buildroot/package/pkg-autotools.mk b/buildroot/package/pkg-autotools.mk index 45de99356..daa688dab 100644 --- a/buildroot/package/pkg-autotools.mk +++ b/buildroot/package/pkg-autotools.mk @@ -232,6 +232,7 @@ define $(2)_CONFIGURE_CMDS --disable-debug \ --with-xmlto=no \ --with-fop=no \ + --disable-nls \ $$(if $$($$(PKG)_OVERRIDE_SRCDIR),,--disable-dependency-tracking) \ $$(QUIET) $$($$(PKG)_CONF_OPTS) \ ) diff --git a/buildroot/package/pkg-cmake.mk b/buildroot/package/pkg-cmake.mk index b9ce8ff62..57bfea9be 100644 --- a/buildroot/package/pkg-cmake.mk +++ b/buildroot/package/pkg-cmake.mk @@ -272,4 +272,3 @@ define TOOLCHAIN_CMAKE_INSTALL_FILES endef TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_CMAKE_INSTALL_FILES -TOOLCHAIN_INSTALL_STAGING = YES diff --git a/buildroot/package/pkg-download.mk b/buildroot/package/pkg-download.mk index 7cd87c38f..de619ba90 100644 --- a/buildroot/package/pkg-download.mk +++ b/buildroot/package/pkg-download.mk @@ -18,7 +18,6 @@ export SCP := $(call qstrip,$(BR2_SCP)) export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) DL_WRAPPER = support/download/dl-wrapper -FLOCK = flock $($(PKG)_DL_DIR)/ # DL_DIR may have been set already from the environment ifeq ($(origin DL_DIR),undefined) @@ -63,46 +62,55 @@ github = https://github.com/$(1)/$(2)/archive/$(3) export BR_NO_CHECK_HASH_FOR = ################################################################################ -# DOWNLOAD -- Download helper. Will call DL_WRAPPER which will try to download -# source from: +# DOWNLOAD_URIS - List the candidates URIs where to get the package from: # 1) BR2_PRIMARY_SITE if enabled # 2) Download site, unless BR2_PRIMARY_SITE_ONLY is set # 3) BR2_BACKUP_SITE if enabled, unless BR2_PRIMARY_SITE_ONLY is set # # Argument 1 is the source location +# Argument 2 is the upper-case package name # ################################################################################ ifneq ($(call qstrip,$(BR2_PRIMARY_SITE)),) DOWNLOAD_URIS += \ - -u $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ - -u $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)),urlencode) + $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)/$($(2)_DL_SUBDIR)),urlencode) \ + $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)),urlencode) endif ifeq ($(BR2_PRIMARY_SITE_ONLY),) DOWNLOAD_URIS += \ - -u $(patsubst %/,%,$(dir $(call qstrip,$(1)))) + $(patsubst %/,%,$(dir $(call qstrip,$(1)))) ifneq ($(call qstrip,$(BR2_BACKUP_SITE)),) DOWNLOAD_URIS += \ - -u $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ - -u $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)),urlencode) + $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(2)_DL_SUBDIR)),urlencode) \ + $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)),urlencode) endif endif +################################################################################ +# DOWNLOAD -- Download helper. Will call DL_WRAPPER which will try to download +# source from the list returned by DOWNLOAD_URIS. +# +# Argument 1 is the source location +# Argument 2 is the upper-case package name +# +################################################################################ + define DOWNLOAD - $(Q)mkdir -p $($(PKG)_DL_DIR) - $(Q)$(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ - -c '$($(PKG)_DL_VERSION)' \ - -d '$($(PKG)_DL_DIR)' \ + $(Q)mkdir -p $($(2)_DL_DIR) + $(Q)$(EXTRA_ENV) flock $($(2)_DL_DIR)/ $(DL_WRAPPER) \ + -c '$($(2)_DL_VERSION)' \ + -d '$($(2)_DL_DIR)' \ -D '$(DL_DIR)' \ -f '$(notdir $(1))' \ - -H '$($(PKG)_HASH_FILE)' \ - -n '$($(PKG)_BASENAME_RAW)' \ - -N '$($(PKG)_RAWNAME)' \ - -o '$($(PKG)_DL_DIR)/$(notdir $(1))' \ - $(if $($(PKG)_GIT_SUBMODULES),-r) \ - $(DOWNLOAD_URIS) \ + -H '$($(2)_HASH_FILE)' \ + -n '$($(2)_BASENAME_RAW)' \ + -N '$($(2)_RAWNAME)' \ + -o '$($(2)_DL_DIR)/$(notdir $(1))' \ + $(if $($(2)_GIT_SUBMODULES),-r) \ + $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ $(QUIET) \ -- \ - $($(PKG)_DL_OPTS) + $($(2)_DL_OPTS) endef diff --git a/buildroot/package/pkg-generic.mk b/buildroot/package/pkg-generic.mk index 1ac7f7877..7679c4155 100644 --- a/buildroot/package/pkg-generic.mk +++ b/buildroot/package/pkg-generic.mk @@ -57,36 +57,45 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time # Hooks to collect statistics about installed files -# The suffix is typically empty for the target variant, for legacy backward -# compatibility. # $(1): package name # $(2): base directory to search in -# $(3): suffix of file (optional) -define step_pkg_size_inner - @touch $(BUILD_DIR)/.files-list$(3).stat - @touch $(BUILD_DIR)/packages-file-list$(3).txt - $(SED) '/^$(1),/d' $(BUILD_DIR)/packages-file-list$(3).txt +# $(3): suffix of file (optional) +define step_pkg_size_before cd $(2); \ LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ - | LC_ALL=C sort > $(BUILD_DIR)/.files-list$(3).new + | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(3).before +endef + +# $(1): package name +# $(2): base directory to search in +# $(3): suffix of file (optional) +define step_pkg_size_after + cd $(2); \ + LC_ALL=C find . \( -type f -o -type l \) -printf '%T@:%i:%#m:%y:%s,%p\n' \ + | LC_ALL=C sort > $($(PKG)_DIR)/.files-list$(3).after LC_ALL=C comm -13 \ - $(BUILD_DIR)/.files-list$(3).stat \ - $(BUILD_DIR)/.files-list$(3).new \ - > $($(PKG)_BUILDDIR)/.files-list$(3).txt - sed -r -e 's/^[^,]+/$(1)/' \ - $($(PKG)_BUILDDIR)/.files-list$(3).txt \ - >> $(BUILD_DIR)/packages-file-list$(3).txt - mv $(BUILD_DIR)/.files-list$(3).new \ - $(BUILD_DIR)/.files-list$(3).stat + $($(PKG)_DIR)/.files-list$(3).before \ + $($(PKG)_DIR)/.files-list$(3).after \ + | sed -r -e 's/^[^,]+/$(1)/' \ + > $($(PKG)_DIR)/.files-list$(3).txt + rm -f $($(PKG)_DIR)/.files-list$(3).before + rm -f $($(PKG)_DIR)/.files-list$(3).after endef define step_pkg_size - $(if $(filter install-target,$(2)),\ - $(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(TARGET_DIR)))) - $(if $(filter install-staging,$(2)),\ - $(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(STAGING_DIR),-staging))) - $(if $(filter install-host,$(2)),\ - $(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(HOST_DIR),-host))) + $(if $(filter start-install-target,$(1)-$(2)),\ + $(call step_pkg_size_before,$(3),$(TARGET_DIR))) + $(if $(filter start-install-staging,$(1)-$(2)),\ + $(call step_pkg_size_before,$(3),$(STAGING_DIR),-staging)) + $(if $(filter start-install-host,$(1)-$(2)),\ + $(call step_pkg_size_before,$(3),$(HOST_DIR),-host)) + + $(if $(filter end-install-target,$(1)-$(2)),\ + $(call step_pkg_size_after,$(3),$(TARGET_DIR))) + $(if $(filter end-install-staging,$(1)-$(2)),\ + $(call step_pkg_size_after,$(3),$(STAGING_DIR),-staging)) + $(if $(filter end-install-host,$(1)-$(2)),\ + $(call step_pkg_size_after,$(3),$(HOST_DIR),-host)) endef GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size @@ -94,7 +103,7 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size define check_bin_arch $(if $(filter end-install-target,$(1)-$(2)),\ support/scripts/check-bin-arch -p $(3) \ - -l $(BUILD_DIR)/packages-file-list.txt \ + -l $($(PKG)_DIR)/.files-list.txt \ $(foreach i,$($(PKG)_BIN_ARCH_EXCLUDE),-i "$(i)") \ -r $(TARGET_READELF) \ -a $(BR2_READELF_ARCH_NAME)) @@ -106,7 +115,7 @@ GLOBAL_INSTRUMENTATION_HOOKS += check_bin_arch # have a proper DT_RPATH or DT_RUNPATH tag define check_host_rpath $(if $(filter install-host,$(2)),\ - $(if $(filter end,$(1)),support/scripts/check-host-rpath $(3) $(HOST_DIR))) + $(if $(filter end,$(1)),support/scripts/check-host-rpath $(3) $(HOST_DIR) $(PER_PACKAGE_DIR))) endef GLOBAL_INSTRUMENTATION_HOOKS += check_host_rpath @@ -134,6 +143,21 @@ endef GLOBAL_INSTRUMENTATION_HOOKS += step_user endif +####################################### +# Helper functions + +# Make sure .la files only reference the current per-package +# directory. + +# $1: package name (lower case) +# $2: staging directory of the package +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define fixup-libtool-files + $(Q)find $(2)/usr/lib* -name "*.la" | xargs --no-run-if-empty \ + $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g" +endef +endif + ################################################################################ # Implicit targets -- produce a stamp file for each step of a package build ################################################################################ @@ -141,6 +165,7 @@ endif # Retrieve the archive $(BUILD_DIR)/%/.stamp_downloaded: @$(call step_start,download) + $(call prepare-per-package-directory,$($(PKG)_FINAL_DOWNLOAD_DEPENDENCIES)) $(foreach hook,$($(PKG)_PRE_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) # Only show the download message if it isn't already downloaded $(Q)for p in $($(PKG)_ALL_DOWNLOADS); do \ @@ -149,7 +174,7 @@ $(BUILD_DIR)/%/.stamp_downloaded: break ; \ fi ; \ done - $(foreach p,$($(PKG)_ALL_DOWNLOADS),$(call DOWNLOAD,$(p))$(sep)) + $(foreach p,$($(PKG)_ALL_DOWNLOADS),$(call DOWNLOAD,$(p),$(PKG))$(sep)) $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) $(Q)mkdir -p $(@D) @$(call step_end,download) @@ -158,7 +183,7 @@ $(BUILD_DIR)/%/.stamp_downloaded: # Retrieve actual source archive, e.g. for prebuilt external toolchains $(BUILD_DIR)/%/.stamp_actual_downloaded: @$(call step_start,actual-download) - $(call DOWNLOAD,$($(PKG)_ACTUAL_SOURCE_SITE)/$($(PKG)_ACTUAL_SOURCE_TARBALL)) + $(call DOWNLOAD,$($(PKG)_ACTUAL_SOURCE_SITE)/$($(PKG)_ACTUAL_SOURCE_TARBALL),$(PKG)) $(Q)mkdir -p $(@D) @$(call step_end,actual-download) $(Q)touch $@ @@ -167,6 +192,7 @@ $(BUILD_DIR)/%/.stamp_actual_downloaded: $(BUILD_DIR)/%/.stamp_extracted: @$(call step_start,extract) @$(call MESSAGE,"Extracting") + $(call prepare-per-package-directory,$($(PKG)_FINAL_EXTRACT_DEPENDENCIES)) $(foreach hook,$($(PKG)_PRE_EXTRACT_HOOKS),$(call $(hook))$(sep)) $(Q)mkdir -p $(@D) $($(PKG)_EXTRACT_CMDS) @@ -227,6 +253,8 @@ $(foreach dir,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)),\ $(BUILD_DIR)/%/.stamp_configured: @$(call step_start,configure) @$(call MESSAGE,"Configuring") + $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) + $(call fixup-libtool-files,$(NAME),$(STAGING_DIR)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) @@ -245,9 +273,9 @@ $(BUILD_DIR)/%/.stamp_built:: # Install to host dir $(BUILD_DIR)/%/.stamp_host_installed: + @mkdir -p $(HOST_DIR) @$(call step_start,install-host) @$(call MESSAGE,"Installing to host directory") - @mkdir -p $(HOST_DIR) $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) +$($(PKG)_INSTALL_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) @@ -275,9 +303,9 @@ $(BUILD_DIR)/%/.stamp_host_installed: # empty when we use an internal toolchain. # $(BUILD_DIR)/%/.stamp_staging_installed: + @mkdir -p $(STAGING_DIR) @$(call step_start,install-staging) @$(call MESSAGE,"Installing to staging directory") - @mkdir -p $(STAGING_DIR) $(foreach hook,$($(PKG)_PRE_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) +$($(PKG)_INSTALL_STAGING_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) @@ -301,6 +329,7 @@ $(BUILD_DIR)/%/.stamp_staging_installed: $(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\ -e "s:$(TOOLCHAIN_EXTERNAL_INSTALL_DIR):@TOOLCHAIN_EXTERNAL_INSTALL_DIR@:g") \ -e "s:\(['= ]\)/usr:\\1@STAGING_DIR@/usr:g" \ + -e "s:\(['= ]\)/lib:\\1@STAGING_DIR@/lib:g" \ $(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\ -e "s:@TOOLCHAIN_EXTERNAL_INSTALL_DIR@:$(TOOLCHAIN_EXTERNAL_INSTALL_DIR):g") \ -e "s:@STAGING_DIR@:$(STAGING_DIR):g" \ @@ -317,10 +346,10 @@ $(BUILD_DIR)/%/.stamp_staging_installed: # Install to images dir $(BUILD_DIR)/%/.stamp_images_installed: - @$(call step_start,install-image) @mkdir -p $(BINARIES_DIR) - $(foreach hook,$($(PKG)_PRE_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) + @$(call step_start,install-image) @$(call MESSAGE,"Installing to images directory") + $(foreach hook,$($(PKG)_PRE_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) +$($(PKG)_INSTALL_IMAGES_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) @$(call step_end,install-image) @@ -328,15 +357,18 @@ $(BUILD_DIR)/%/.stamp_images_installed: # Install to target dir $(BUILD_DIR)/%/.stamp_target_installed: + @mkdir -p $(TARGET_DIR) @$(call step_start,install-target) @$(call MESSAGE,"Installing to target") - @mkdir -p $(TARGET_DIR) $(foreach hook,$($(PKG)_PRE_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) +$($(PKG)_INSTALL_TARGET_CMDS) $(if $(BR2_INIT_SYSTEMD),\ $($(PKG)_INSTALL_INIT_SYSTEMD)) $(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\ $($(PKG)_INSTALL_INIT_SYSV)) + $(if $(BR2_INIT_OPENRC), \ + $(or $($(PKG)_INSTALL_INIT_OPENRC), \ + $($(PKG)_INSTALL_INIT_SYSV))) $(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) $(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \ $(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \ @@ -346,6 +378,7 @@ $(BUILD_DIR)/%/.stamp_target_installed: # Remove package sources $(BUILD_DIR)/%/.stamp_dircleaned: + $(if $(BR2_PER_PACKAGE_DIRECTORIES),rm -Rf $(PER_PACKAGE_DIR)/$(NAME)) rm -Rf $(@D) ################################################################################ @@ -621,15 +654,9 @@ $(2)_EXTRACT_DEPENDENCIES += $$(BR2_TAR_HOST_DEPENDENCY) endif ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) -ifneq ($$(filter .xz .lzma,$$(suffix $$($(2)_SOURCE))),) -$(2)_EXTRACT_DEPENDENCIES += $$(BR2_XZCAT_HOST_DEPENDENCY) -endif -endif - -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate,$(1)),) -ifneq ($$(filter .lz,$$(suffix $$($(2)_SOURCE))),) -$(2)_EXTRACT_DEPENDENCIES += $$(BR2_LZIP_HOST_DEPENDENCY) -endif +$(2)_EXTRACT_DEPENDENCIES += \ + $$(foreach dl,$$($(2)_ALL_DOWNLOADS),\ + $$(call extractor-pkg-dependency,$$(notdir $$(dl)))) endif ifeq ($$(BR2_CCACHE),y) @@ -667,6 +694,18 @@ $(2)_FINAL_RECURSIVE_DEPENDENCIES = $$(sort \ ) \ $$($(2)_FINAL_RECURSIVE_DEPENDENCIES__X)) +$(2)_FINAL_RECURSIVE_RDEPENDENCIES = $$(sort \ + $$(if $$(filter undefined,$$(origin $(2)_FINAL_RECURSIVE_RDEPENDENCIES__X)), \ + $$(eval $(2)_FINAL_RECURSIVE_RDEPENDENCIES__X := \ + $$(foreach p, \ + $$($(2)_RDEPENDENCIES), \ + $$(p) \ + $$($$(call UPPERCASE,$$(p))_FINAL_RECURSIVE_RDEPENDENCIES) \ + ) \ + ) \ + ) \ + $$($(2)_FINAL_RECURSIVE_RDEPENDENCIES__X)) + $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO $(2)_INSTALL_TARGET ?= YES @@ -675,10 +714,10 @@ $(2)_INSTALL_TARGET ?= YES $(2)_TARGET_INSTALL_TARGET = $$($(2)_DIR)/.stamp_target_installed $(2)_TARGET_INSTALL_STAGING = $$($(2)_DIR)/.stamp_staging_installed $(2)_TARGET_INSTALL_IMAGES = $$($(2)_DIR)/.stamp_images_installed -$(2)_TARGET_INSTALL_HOST = $$($(2)_DIR)/.stamp_host_installed +$(2)_TARGET_INSTALL_HOST = $$($(2)_DIR)/.stamp_host_installed $(2)_TARGET_BUILD = $$($(2)_DIR)/.stamp_built $(2)_TARGET_CONFIGURE = $$($(2)_DIR)/.stamp_configured -$(2)_TARGET_RSYNC = $$($(2)_DIR)/.stamp_rsynced +$(2)_TARGET_RSYNC = $$($(2)_DIR)/.stamp_rsynced $(2)_TARGET_PATCH = $$($(2)_DIR)/.stamp_patched $(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted $(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded @@ -793,7 +832,7 @@ $(1)-extract: $$($(2)_TARGET_EXTRACT) $$($(2)_TARGET_EXTRACT): $$($(2)_TARGET_SOURCE) $$($(2)_TARGET_EXTRACT): | $$($(2)_FINAL_EXTRACT_DEPENDENCIES) -$(1)-depends: $$($(2)_FINAL_DEPENDENCIES) +$(1)-depends: $$($(2)_FINAL_ALL_DEPENDENCIES) $(1)-source: $$($(2)_TARGET_SOURCE) $$($(2)_TARGET_SOURCE): | $$($(2)_FINAL_DOWNLOAD_DEPENDENCIES) @@ -844,20 +883,22 @@ $(1)-show-depends: @echo $$($(2)_FINAL_ALL_DEPENDENCIES) $(1)-show-recursive-depends: - @cd "$$(CONFIG_DIR)" && \ - $$(TOPDIR)/support/scripts/graph-depends -p $(1) -f -q + @echo $$($(2)_FINAL_RECURSIVE_DEPENDENCIES) $(1)-show-rdepends: @echo $$($(2)_RDEPENDENCIES) $(1)-show-recursive-rdepends: - @cd "$$(CONFIG_DIR)" && \ - $$(TOPDIR)/support/scripts/graph-depends -p $(1) --reverse -f -q + @echo $$($(2)_FINAL_RECURSIVE_RDEPENDENCIES) $(1)-show-build-order: $$(patsubst %,%-show-build-order,$$($(2)_FINAL_ALL_DEPENDENCIES)) @: $$(info $(1)) +$(1)-show-info: + @: + $$(info $$(call clean-json,{ $$(call json-info,$(2)) })) + $(1)-graph-depends: graph-depends-requirements $(call pkg-graph-depends,$(1),--direct) @@ -904,6 +945,7 @@ $$($(2)_TARGET_INSTALL_IMAGES): PKG=$(2) $$($(2)_TARGET_INSTALL_HOST): PKG=$(2) $$($(2)_TARGET_BUILD): PKG=$(2) $$($(2)_TARGET_CONFIGURE): PKG=$(2) +$$($(2)_TARGET_CONFIGURE): NAME=$(1) $$($(2)_TARGET_RSYNC): SRCDIR=$$($(2)_OVERRIDE_SRCDIR) $$($(2)_TARGET_RSYNC): PKG=$(2) $$($(2)_TARGET_PATCH): PKG=$(2) @@ -915,6 +957,7 @@ $$($(2)_TARGET_SOURCE): PKGDIR=$(pkgdir) $$($(2)_TARGET_ACTUAL_SOURCE): PKG=$(2) $$($(2)_TARGET_ACTUAL_SOURCE): PKGDIR=$(pkgdir) $$($(2)_TARGET_DIRCLEAN): PKG=$(2) +$$($(2)_TARGET_DIRCLEAN): NAME=$(1) # Compute the name of the Kconfig option that correspond to the # package being enabled. We handle three cases: the special Linux @@ -995,7 +1038,7 @@ ifeq ($$($(2)_REDISTRIBUTE),YES) endif # redistribute endif # other packages - @$$(call legal-manifest,$$(call UPPERCASE,$(4)),$$($(2)_RAWNAME),$$($(2)_VERSION),$$($(2)_LICENSE),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_ACTUAL_SOURCE_SITE),$$(call legal-deps,$(1))) + @$$(call legal-manifest,$$(call UPPERCASE,$(4)),$$($(2)_RAWNAME),$$($(2)_VERSION),$$(subst $$(space)$$(comma),$$(comma),$$($(2)_LICENSE)),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_ACTUAL_SOURCE_SITE),$$(call legal-deps,$(1))) endif # ifneq ($$(call qstrip,$$($(2)_SOURCE)),) $$(foreach hook,$$($(2)_POST_LEGAL_INFO_HOOKS),$$(call $$(hook))$$(sep)) @@ -1059,7 +1102,7 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD -DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE)) +DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. .PHONY: $(1) \ @@ -1076,6 +1119,7 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE)) $(1)-external-deps \ $(1)-extract \ $(1)-graph-depends \ + $(1)-graph-rdepends \ $(1)-install \ $(1)-install-host \ $(1)-install-images \ @@ -1089,6 +1133,7 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE)) $(1)-reinstall \ $(1)-rsync \ $(1)-show-depends \ + $(1)-show-info \ $(1)-show-version \ $(1)-source diff --git a/buildroot/package/pkg-golang.mk b/buildroot/package/pkg-golang.mk index 4f2c7e77e..2494ce028 100644 --- a/buildroot/package/pkg-golang.mk +++ b/buildroot/package/pkg-golang.mk @@ -25,12 +25,20 @@ GO_BIN = $(HOST_DIR)/bin/go # We pass an empty GOBIN, otherwise "go install: cannot install # cross-compiled binaries when GOBIN is set" -GO_TARGET_ENV = \ - $(HOST_GO_TARGET_ENV) \ +GO_COMMON_ENV = \ PATH=$(BR_PATH) \ GOBIN= \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) +GO_TARGET_ENV = \ + $(HOST_GO_TARGET_ENV) \ + $(GO_COMMON_ENV) + +GO_HOST_ENV = \ + CGO_CFLAGS="$(HOST_CFLAGS)" \ + CGO_LDFLAGS="$(HOST_LDFLAGS)" \ + $(GO_COMMON_ENV) + ################################################################################ # inner-golang-package -- defines how the configuration, compilation and # installation of a Go package should be done, implements a few hooks to tune @@ -44,20 +52,16 @@ GO_TARGET_ENV = \ # packages # argument 4 is the type (target or host) # -# NOTE Only type target is supported at the moment ################################################################################ define inner-golang-package $(2)_WORKSPACE ?= _gopath -ifeq ($(BR2_STATIC_LIBS),y) -$(2)_LDFLAGS += -extldflags '-static' -endif - $(2)_BUILD_OPTS += \ -ldflags "$$($(2)_LDFLAGS)" \ -tags "$$($(2)_TAGS)" \ + -trimpath \ -p $(PARALLEL_JOBS) # Target packages need the Go compiler on the host. @@ -98,6 +102,13 @@ endif # Build step. Only define it if not already defined by the package .mk # file. ifndef $(2)_BUILD_CMDS +ifeq ($(4),target) + +ifeq ($(BR2_STATIC_LIBS),y) +$(2)_LDFLAGS += -extldflags '-static' +endif + +# Build package for target define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ cd $$($(2)_SRC_PATH); \ @@ -109,6 +120,20 @@ define $(2)_BUILD_CMDS ./$$(d) ) endef +else +# Build package for host +define $(2)_BUILD_CMDS + $$(foreach d,$$($(2)_BUILD_TARGETS),\ + cd $$($(2)_SRC_PATH); \ + $$(GO_HOST_ENV) \ + GOPATH="$$(@D)/$$($(2)_WORKSPACE)" \ + $$($(2)_GO_ENV) \ + $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \ + -o $$(@D)/bin/$$(or $$($(2)_BIN_NAME),$$(notdir $$(d))) \ + ./$$(d) + ) +endef +endif endif # Target installation step. Only define it if not already defined by the @@ -121,6 +146,15 @@ define $(2)_INSTALL_TARGET_CMDS endef endif +# Host installation step +ifndef $(2)_INSTALL_CMDS +define $(2)_INSTALL_CMDS + $$(foreach d,$$($(2)_INSTALL_BINS),\ + $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(HOST_DIR)/bin/$$(d) + ) +endef +endif + # Call the generic package infrastructure to generate the necessary make # targets $(call inner-generic-package,$(1),$(2),$(3),$(4)) @@ -132,3 +166,4 @@ endef # inner-golang-package ################################################################################ golang-package = $(call inner-golang-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) +host-golang-package = $(call inner-golang-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) diff --git a/buildroot/package/pkg-kconfig.mk b/buildroot/package/pkg-kconfig.mk index a79578135..e2d52ee8e 100644 --- a/buildroot/package/pkg-kconfig.mk +++ b/buildroot/package/pkg-kconfig.mk @@ -30,6 +30,40 @@ endef PKG_KCONFIG_COMMON_OPTS = \ HOSTCC=$(HOSTCC_NOCCACHE) +# Macro to save the defconfig file +# $(1): the name of the package in upper-case letters +define kconfig-package-savedefconfig + $($(1)_MAKE_ENV) $(MAKE) -C $($(1)_DIR) \ + $(PKG_KCONFIG_COMMON_OPTS) $($(1)_KCONFIG_OPTS) savedefconfig +endef + +# The correct way to regenerate a .config file is to use 'make olddefconfig'. +# For historical reasons, the target name is 'oldnoconfig' between Linux kernel +# versions 2.6.36 and 3.6, and remains as an alias in later versions. +# In older versions, and in some other projects that use kconfig, the target is +# not supported at all, and we use 'yes "" | make oldconfig' as a fallback +# only, as this can fail in complex cases. +# $(1): the name of the package in upper-case letters +define kconfig-package-regen-dot-config + $(if $(filter olddefconfig,$($(1)_KCONFIG_RULES)), + $(Q)$($(1)_KCONFIG_MAKE) olddefconfig, + $(if $(filter oldnoconfig,$($(1)_KCONFIG_RULES)), + $(Q)$($(1)_KCONFIG_MAKE) oldnoconfig, + $(Q)(yes "" | $($(1)_KCONFIG_MAKE) oldconfig))) +endef + +# Macro to create a .config file where all given fragments are merged into. +# $(1): the name of the package in upper-case letters +# $(2): name of the .config file +# $(3): fragment files to merge +define kconfig-package-merge-config + $(Q)$(if $($(1)_KCONFIG_DEFCONFIG),\ + $($(1)_KCONFIG_MAKE) $($(1)_KCONFIG_DEFCONFIG),\ + $(INSTALL) -m 0644 -D $($(1)_KCONFIG_FILE) $(2)) + $(Q)support/kconfig/merge_config.sh -m -O $(dir $(2)) $(2) $(3) + $(call kconfig-package-regen-dot-config,$(1)) +endef + ################################################################################ # inner-kconfig-package -- generates the make targets needed to support a # kconfig package @@ -104,31 +138,14 @@ $(2)_KCONFIG_RULES = \ $$(shell $$($(2)_KCONFIG_MAKE) -pn config 2>/dev/null | \ sed 's/^\([_0-9a-zA-Z]*config\):.*/\1/ p; d') -# The correct way to regenerate a .config file is to use 'make olddefconfig'. -# For historical reasons, the target name is 'oldnoconfig' between Linux kernel -# versions 2.6.36 and 3.6, and remains as an alias in later versions. -# In older versions, and in some other projects that use kconfig, the target is -# not supported at all, and we use 'yes "" | make oldconfig' as a fallback -# only, as this can fail in complex cases. -define $(2)_REGEN_DOT_CONFIG - $$(if $$(filter olddefconfig,$$($(2)_KCONFIG_RULES)), - $$(Q)$$($(2)_KCONFIG_MAKE) olddefconfig, - $$(if $$(filter oldnoconfig,$$($(2)_KCONFIG_RULES)), - $$(Q)$$($(2)_KCONFIG_MAKE) oldnoconfig, - $$(Q)(yes "" | $$($(2)_KCONFIG_MAKE) oldconfig))) -endef - # The specified source configuration file and any additional configuration file # fragments are merged together to .config, after the package has been patched. # Since the file could be a defconfig file it needs to be expanded to a # full .config first. $$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG): $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES) - $$(Q)$$(if $$($(2)_KCONFIG_DEFCONFIG), \ - $$($(2)_KCONFIG_MAKE) $$($(2)_KCONFIG_DEFCONFIG), \ - $$(INSTALL) -m 0644 -D $$($(2)_KCONFIG_FILE) $$(@D)/$$($(2)_KCONFIG_DOTCONFIG)) - $$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \ - $$(@D)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_KCONFIG_FRAGMENT_FILES) - $$($(2)_REGEN_DOT_CONFIG) + $$(call prepare-per-package-directory,$$($(2)_KCONFIG_DEPENDENCIES)) + $$(call kconfig-package-merge-config,$(2),$$(@D)/$$($(2)_KCONFIG_DOTCONFIG),\ + $$($(2)_KCONFIG_FRAGMENT_FILES)) $$(Q)touch $$(@D)/$$($(2)_KCONFIG_STAMP_DOTCONFIG) # If _KCONFIG_FILE or _KCONFIG_FRAGMENT_FILES exists, this dependency is @@ -145,7 +162,7 @@ $$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG): | $$($(2)_KCONFIG_DEPENDENCIES) # The exact rules are specified by the package .mk file. define $(2)_FIXUP_DOT_CONFIG $$($(2)_KCONFIG_FIXUP_CMDS) - $$($(2)_REGEN_DOT_CONFIG) + $$(call kconfig-package-regen-dot-config,$(2)) $$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done endef @@ -236,8 +253,7 @@ $(1)-check-configuration-done: fi $(1)-savedefconfig: $(1)-check-configuration-done - $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ - $$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) savedefconfig + $$(call kconfig-package-savedefconfig,$(2)) # Target to copy back the configuration to the source configuration file # Even though we could use 'cp --preserve-timestamps' here, the separate @@ -254,11 +270,26 @@ $(1)-update-defconfig: PKG=$(2) $(1)-update-defconfig: $(1)-savedefconfig $$(call kconfig-package-update-config,defconfig) +# Target to output differences between the configuration obtained via the +# defconfig + fragments (if any) and the current configuration. +# Note: it preserves the timestamp of the current configuration when moving it +# around. +$(1)-diff-config: $(1)-check-configuration-done + $$(Q)cp -a $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_DIR)/.config.dc.bak + $$(call kconfig-package-merge-config,$(2),$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG),\ + $$($(2)_KCONFIG_FRAGMENT_FILES)) + $$(Q)utils/diffconfig $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) \ + $$($(2)_DIR)/.config.dc.bak + $$(Q)cp -a $$($(2)_DIR)/.config.dc.bak $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) + $$(Q)rm -f $$($(2)_DIR)/.config.dc.bak + + endif # package enabled .PHONY: \ $(1)-update-config \ $(1)-update-defconfig \ + $(1)-diff-config \ $(1)-savedefconfig \ $(1)-check-configuration-done \ $$($(2)_DIR)/.kconfig_editor_% \ diff --git a/buildroot/package/pkg-meson.mk b/buildroot/package/pkg-meson.mk index 886fcf720..835098b85 100644 --- a/buildroot/package/pkg-meson.mk +++ b/buildroot/package/pkg-meson.mk @@ -57,20 +57,26 @@ $(2)_NINJA_ENV ?= ifndef $(2)_CONFIGURE_CMDS ifeq ($(4),target) +$(2)_CFLAGS ?= $$(TARGET_CFLAGS) +$(2)_LDFLAGS ?= $$(TARGET_LDFLAGS) +$(2)_CXXFLAGS ?= $$(TARGET_CXXFLAGS) + # Configure package for target # # define $(2)_CONFIGURE_CMDS rm -rf $$($$(PKG)_SRCDIR)/build mkdir -p $$($$(PKG)_SRCDIR)/build - sed -e "s%@TARGET_CROSS@%$$(TARGET_CROSS)%g" \ - -e "s%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g" \ - -e "s%@TARGET_CPU@%$$(GCC_TARGET_CPU)%g" \ - -e "s%@TARGET_ENDIAN@%$$(call LOWERCASE,$$(BR2_ENDIAN))%g" \ - -e "s%@TARGET_CFLAGS@%$$(HOST_MESON_SED_CFLAGS)%g" \ - -e "s%@TARGET_LDFLAGS@%$$(HOST_MESON_SED_LDFLAGS)%g" \ - -e "s%@TARGET_CXXFLAGS@%$$(HOST_MESON_SED_CXXFLAGS)%g" \ - -e "s%@HOST_DIR@%$$(HOST_DIR)%g" \ + sed -e 's%@TARGET_CROSS@%$$(TARGET_CROSS)%g' \ + -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ + -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ + -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ + -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ + -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ + -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \ + -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ + -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ + -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ package/meson/cross-compilation.conf.in \ > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf PATH=$$(BR_PATH) $$($$(PKG)_CONF_ENV) $$(MESON) \ @@ -167,3 +173,32 @@ endef meson-package = $(call inner-meson-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) host-meson-package = $(call inner-meson-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) + +################################################################################ +# Generation of the Meson cross-compilation.conf file +################################################################################ + +# Generate a Meson cross-compilation.conf suitable for use with the +# SDK; also install the file as a template for users to add their +# own flags if they need to. +define PKG_MESON_INSTALL_CROSS_CONF + mkdir -p $(HOST_DIR)/etc/meson + sed -e 's%@TARGET_CROSS@%$(TARGET_CROSS)%g' \ + -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ + -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ + -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ + -e 's%@TARGET_CFLAGS@%$(call make-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ + -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ + $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ + > $(HOST_DIR)/etc/meson/cross-compilation.conf.in + sed -e 's%@PKG_TARGET_CFLAGS@%%g' \ + -e 's%@PKG_TARGET_LDFLAGS@%%g' \ + -e 's%@PKG_TARGET_CXXFLAGS@%%g' \ + $(HOST_DIR)/etc/meson/cross-compilation.conf.in \ + > $(HOST_DIR)/etc/meson/cross-compilation.conf +endef + +TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += PKG_MESON_INSTALL_CROSS_CONF diff --git a/buildroot/package/pkg-python.mk b/buildroot/package/pkg-python.mk index cf6464989..4bf762e66 100644 --- a/buildroot/package/pkg-python.mk +++ b/buildroot/package/pkg-python.mk @@ -21,7 +21,7 @@ ################################################################################ define PKG_PYTHON_SYSCONFIGDATA_NAME -$(basename $(notdir $(wildcard $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/_sysconfigdata_m_linux_*.py))) +$(basename $(notdir $(wildcard $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/_sysconfigdata__linux_*.py))) endef # Target distutils-based packages @@ -90,6 +90,14 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --root=/ \ --single-version-externally-managed +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define PKG_PYTHON_FIXUP_SYSCONFIGDATA + find $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python* \ + -name "_sysconfigdata*.py" | xargs --no-run-if-empty \ + $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g" +endef +endif + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -234,6 +242,8 @@ $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/$$($(2)_NEEDS_HOST_PYTHON) endif endif +$(2)_PRE_CONFIGURE_HOOKS += PKG_PYTHON_FIXUP_SYSCONFIGDATA + # # Build step. Only define it if not already defined by the package .mk # file. diff --git a/buildroot/package/pkg-utils.mk b/buildroot/package/pkg-utils.mk index bffd79dfb..d324934db 100644 --- a/buildroot/package/pkg-utils.mk +++ b/buildroot/package/pkg-utils.mk @@ -46,12 +46,24 @@ INFLATE.tar = cat # suitable-extractor(filename): returns extractor based on suffix suitable-extractor = $(INFLATE$(suffix $(1))) -# extractor-dependency(filename): returns extractor for 'filename' if the -# extractor is a dependency. If we build the extractor return nothing. -# $(firstword) is used here because the extractor can have arguments, like -# ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'. -extractor-dependency = $(firstword $(INFLATE$(filter-out \ - $(EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS),$(suffix $(1))))) +EXTRACTOR_PKG_DEPENDENCY.lzma = $(BR2_XZCAT_HOST_DEPENDENCY) +EXTRACTOR_PKG_DEPENDENCY.xz = $(BR2_XZCAT_HOST_DEPENDENCY) +EXTRACTOR_PKG_DEPENDENCY.lz = $(BR2_LZIP_HOST_DEPENDENCY) + +# extractor-pkg-dependency(filename): returns a Buildroot package +# dependency needed to extract file based on suffix +extractor-pkg-dependency = $(EXTRACTOR_PKG_DEPENDENCY$(suffix $(1))) + +# extractor-system-dependency(filename): returns the name of the tool +# needed to extract 'filename', and is meant to be used with +# DL_TOOLS_DEPENDENCIES, in order to check that the necesary tool is +# provided by the system Buildroot runs on. +# +# $(firstword) is used here because the extractor can have arguments, +# like ZCAT="gzip -d -c", and to check for the dependency we only want +# 'gzip'. +extractor-system-dependency = $(if $(EXTRACTOR_PKG_DEPENDENCY$(suffix $(1))),,\ + $(firstword $(INFLATE$(suffix $(1))))) # check-deprecated-variable -- throw an error on deprecated variables # example: @@ -62,6 +74,105 @@ $$(error Package error: use $(2) instead of $(1). Please fix your .mk file) endif endef +# $(1): YES or NO +define yesno-to-bool + $(subst NO,false,$(subst YES,true,$(1))) +endef + +# json-info -- return package or filesystem metadata formatted as an entry +# of a JSON dictionnary +# $(1): upper-case package or filesystem name +define json-info + "$($(1)_NAME)": { + "type": "$($(1)_TYPE)", + $(if $(filter rootfs,$($(1)_TYPE)), \ + $(call _json-info-fs,$(1)), \ + $(call _json-info-pkg,$(1)), \ + ) + } +endef + +# _json-info-pkg, _json-info-pkg-details, _json-info-fs: private helpers +# for json-info, above +define _json-info-pkg + $(if $($(1)_IS_VIRTUAL), \ + "virtual": true$(comma), + "virtual": false$(comma) + $(call _json-info-pkg-details,$(1)) \ + ) + "dependencies": [ + $(call make-comma-list,$(sort $($(1)_FINAL_ALL_DEPENDENCIES))) + ], + "reverse_dependencies": [ + $(call make-comma-list,$(sort $($(1)_RDEPENDENCIES))) + ] +endef + +define _json-info-pkg-details + "version": "$($(1)_DL_VERSION)", + "licenses": "$($(1)_LICENSE)", + "dl_dir": "$($(1)_DL_SUBDIR)", + "install_target": $(call yesno-to-bool,$($(1)_INSTALL_TARGET)), + "install_staging": $(call yesno-to-bool,$($(1)_INSTALL_STAGING)), + "install_images": $(call yesno-to-bool,$($(1)_INSTALL_IMAGES)), + "downloads": [ + $(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)), + { + "source": "$(notdir $(dl))", + "uris": [ + $(call make-comma-list, + $(subst \|,|, + $(call DOWNLOAD_URIS,$(dl),$(1)) + ) + ) + ] + }, + ) + ], +endef + +define _json-info-fs + "dependencies": [ + $(call make-comma-list,$(sort $($(1)_DEPENDENCIES))) + ] +endef + +# clean-json -- cleanup pseudo-json into clean json: +# - remove commas before closing ] and } +# - minify with $(strip) +clean-json = $(strip \ + $(subst $(comma)},}, $(subst $(comma)$(space)},$(space)}, \ + $(subst $(comma)],], $(subst $(comma)$(space)],$(space)], \ + $(strip $(1)) \ + )))) \ +) + +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +# rsync the contents of per-package directories +# $1: space-separated list of packages to rsync from +# $2: 'host' or 'target' +# $3: destination directory +define per-package-rsync + mkdir -p $(3) + $(foreach pkg,$(1),\ + rsync -a --link-dest=$(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ + $(PER_PACKAGE_DIR)/$(pkg)/$(2)/ \ + $(3)$(sep)) +endef + +# prepares the per-package HOST_DIR and TARGET_DIR of the current +# package, by rsync the host and target directories of the +# dependencies of this package. The list of dependencies is passed as +# argument, so that this function can be used to prepare with +# different set of dependencies (download, extract, configure, etc.) +# +# $1: space-separated list of packages to rsync from +define prepare-per-package-directory + $(call per-package-rsync,$(1),host,$(HOST_DIR)) + $(call per-package-rsync,$(1),target,$(TARGET_DIR)) +endef +endif + # # legal-info helper functions # diff --git a/buildroot/package/pkgconf/pkg-config.in b/buildroot/package/pkgconf/pkg-config.in index 99c0add8f..e5a23a10f 100644 --- a/buildroot/package/pkgconf/pkg-config.in +++ b/buildroot/package/pkgconf/pkg-config.in @@ -2,4 +2,11 @@ PKGCONFDIR=$(dirname $0) DEFAULT_PKG_CONFIG_LIBDIR=${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/lib/pkgconfig:${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/share/pkgconfig DEFAULT_PKG_CONFIG_SYSROOT_DIR=${PKGCONFDIR}/../@STAGING_SUBDIR@ -PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} exec ${PKGCONFDIR}/pkgconf @STATIC@ "$@" +DEFAULT_PKG_CONFIG_SYSTEM_INCLUDE_PATH=${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/include +DEFAULT_PKG_CONFIG_SYSTEM_LIBRARY_PATH=${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/lib + +PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} \ + PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} \ + PKG_CONFIG_SYSTEM_INCLUDE_PATH=${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-${DEFAULT_PKG_CONFIG_SYSTEM_INCLUDE_PATH}} \ + PKG_CONFIG_SYSTEM_LIBRARY_PATH=${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-${DEFAULT_PKG_CONFIG_SYSTEM_LIBRARY_PATH}} \ + exec ${PKGCONFDIR}/pkgconf --keep-system-libs @STATIC@ "$@" diff --git a/buildroot/package/pkgconf/pkgconf.hash b/buildroot/package/pkgconf/pkgconf.hash index 7ea7ff57a..45848af94 100644 --- a/buildroot/package/pkgconf/pkgconf.hash +++ b/buildroot/package/pkgconf/pkgconf.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 d3468308553c94389dadfd10c4d1067269052b5364276a9d24a643c88485f715 pkgconf-1.5.3.tar.xz +sha256 22b9ee38438901f9d60f180e5182821180854fa738fd071f593ea26a81da208c pkgconf-1.6.1.tar.xz +sha256 07ee94b50a41ee3fc4e13a9b9c60b26fc28488494c465639f7e5f07a3952ec04 COPYING diff --git a/buildroot/package/pkgconf/pkgconf.mk b/buildroot/package/pkgconf/pkgconf.mk index e3c73fd40..1851ecfca 100644 --- a/buildroot/package/pkgconf/pkgconf.mk +++ b/buildroot/package/pkgconf/pkgconf.mk @@ -4,7 +4,7 @@ # ################################################################################ -PKGCONF_VERSION = 1.5.3 +PKGCONF_VERSION = 1.6.1 PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf license diff --git a/buildroot/package/pngquant/pngquant.hash b/buildroot/package/pngquant/pngquant.hash index f27eda60d..f67807cb8 100644 --- a/buildroot/package/pngquant/pngquant.hash +++ b/buildroot/package/pngquant/pngquant.hash @@ -1,5 +1,4 @@ # From https://pngquant.org/releases.html -sha1 24efa42105bf3d8d0f4cf699053d2701ea787bd5 pngquant-2.12.2-src.tar.gz +sha256 3638936cf6270eeeaabcee42e10768d78e4dc07cac9310307835c1f58b140808 pngquant-2.12.5-src.tar.gz # Locally computed -sha256 bb031c48039ee73ea0e60709bb9ab80c55bfa3a5920b798ea37a03f2757b099c pngquant-2.12.2-src.tar.gz sha256 e4f467f7abf860b4e620f5f60fdd88bc3a63a0fdb98a481fb002b5e511c9b826 COPYRIGHT diff --git a/buildroot/package/pngquant/pngquant.mk b/buildroot/package/pngquant/pngquant.mk index 0053b9a46..a8845c797 100644 --- a/buildroot/package/pngquant/pngquant.mk +++ b/buildroot/package/pngquant/pngquant.mk @@ -4,7 +4,7 @@ # ################################################################################ -PNGQUANT_VERSION = 2.12.2 +PNGQUANT_VERSION = 2.12.5 PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz PNGQUANT_SITE = https://pngquant.org PNGQUANT_LICENSE = GPL-3.0+ diff --git a/buildroot/package/poco/Config.in b/buildroot/package/poco/Config.in index 7e1257146..f8f921de0 100644 --- a/buildroot/package/poco/Config.in +++ b/buildroot/package/poco/Config.in @@ -54,6 +54,9 @@ config BR2_PACKAGE_POCO_CPP_PARSER config BR2_PACKAGE_POCO_PDF bool "pdf" + select BR2_PACKAGE_POCO_JSON + select BR2_PACKAGE_POCO_UTIL + select BR2_PACKAGE_POCO_XML config BR2_PACKAGE_POCO_REDIS bool "redis" diff --git a/buildroot/package/poco/poco.hash b/buildroot/package/poco/poco.hash index 0c0266f47..0cdaf0d3f 100644 --- a/buildroot/package/poco/poco.hash +++ b/buildroot/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 43cc469c01d1f799efc51e2bfde6ffdf467b98a8a0901e6b33db86958619b3af poco-poco-1.8.1-release.tar.gz +sha256 367014cdbcfe9df8f1d746239902149d2398af9b49ba2c1aaaa88616fd538f61 poco-1.9.4.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/buildroot/package/poco/poco.mk b/buildroot/package/poco/poco.mk index aa96d5127..d2b668ae1 100644 --- a/buildroot/package/poco/poco.mk +++ b/buildroot/package/poco/poco.mk @@ -4,8 +4,8 @@ # ################################################################################ -POCO_VERSION = poco-1.8.1-release -POCO_SITE = $(call github,pocoproject,poco,$(POCO_VERSION)) +POCO_VERSION = 1.9.4 +POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE POCO_INSTALL_STAGING = YES diff --git a/buildroot/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch b/buildroot/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch index 4cfe969a4..57833d817 100644 --- a/buildroot/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch +++ b/buildroot/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch @@ -1,5 +1,5 @@ From 85763549c53b2907dab094163f1404b2233f8029 Mon Sep 17 00:00:00 2001 -From: Adam Duskett +From: Adam Duskett Date: Mon, 9 Oct 2017 16:51:20 -0400 Subject: [PATCH] Add DESTDIR to setfiles @@ -12,7 +12,7 @@ accomodate version 2.5 Signed-off-by: Clayton Shotwell Signed-off-by: Niranjan Reddy -Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett Signed-off-by: Fabrice Fontaine [Update for 2.8] --- diff --git a/buildroot/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch b/buildroot/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch index 0b5304418..ffe5fcbd4 100644 --- a/buildroot/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch +++ b/buildroot/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch @@ -1,5 +1,5 @@ From a221304344b3f9db7e86d928cf97d77542bcf456 Mon Sep 17 00:00:00 2001 -From: Adam Duskett +From: Adam Duskett Date: Mon, 9 Oct 2017 16:47:19 -0400 Subject: [PATCH] Add PREFIX to host paths @@ -10,7 +10,7 @@ Updated to work with version 2.5 Signed-off-by: Clayton Shotwell Signed-off-by: Niranjan Reddy -Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett Signed-off-by: Fabrice Fontaine [Update for 2.8] --- diff --git a/buildroot/package/policycoreutils/Config.in b/buildroot/package/policycoreutils/Config.in index 0d69fb51a..81900b4e4 100644 --- a/buildroot/package/policycoreutils/Config.in +++ b/buildroot/package/policycoreutils/Config.in @@ -1,16 +1,12 @@ -comment "policycoreutils needs a glibc toolchain w/ threads, dynamic library" - depends on !BR2_arc +comment "policycoreutils needs a toolchain w/ threads, dynamic library" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS config BR2_PACKAGE_POLICYCOREUTILS bool "policycoreutils" depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # libsemanage depends on BR2_TOOLCHAIN_HAS_THREADS # libsemanage depends on !BR2_STATIC_LIBS #libsemanage - depends on !BR2_arc # libsemanage - depends on BR2_TOOLCHAIN_USES_GLIBC # libsemanage select BR2_PACKAGE_LIBSEMANAGE select BR2_PACKAGE_LIBCAP_NG help diff --git a/buildroot/package/policycoreutils/policycoreutils.hash b/buildroot/package/policycoreutils/policycoreutils.hash index b6367b4bf..c601c7818 100644 --- a/buildroot/package/policycoreutils/policycoreutils.hash +++ b/buildroot/package/policycoreutils/policycoreutils.hash @@ -1,3 +1,3 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 986553a235f27bee7ad7c2b7c35ea51eb2ee68e2cf03b661b1585de101bc1099 policycoreutils-2.8.tar.gz +sha256 c53c344f28007b3c0742bd958751e9b5d2385898adeb8aec6281ae57342f0f7b policycoreutils-2.9.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/policycoreutils/policycoreutils.mk b/buildroot/package/policycoreutils/policycoreutils.mk index abd70e16c..6cd5a019c 100644 --- a/buildroot/package/policycoreutils/policycoreutils.mk +++ b/buildroot/package/policycoreutils/policycoreutils.mk @@ -4,12 +4,13 @@ # ################################################################################ -POLICYCOREUTILS_VERSION = 2.8 -POLICYCOREUTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524 +POLICYCOREUTILS_VERSION = 2.9 +POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 POLICYCOREUTILS_LICENSE = GPL-2.0 POLICYCOREUTILS_LICENSE_FILES = COPYING -POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng +POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(TARGET_NLS_DEPENDENCIES) +POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLICYCOREUTILS_DEPENDENCIES += linux-pam @@ -36,8 +37,7 @@ endif POLICYCOREUTILS_MAKE_OPTS += \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" \ - ARCH="$(BR2_ARCH)" + CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" POLICYCOREUTILS_MAKE_DIRS = \ load_policy newrole run_init \ @@ -60,34 +60,19 @@ define POLICYCOREUTILS_INSTALL_TARGET_CMDS ) endef -HOST_POLICYCOREUTILS_DEPENDENCIES = \ - host-libsemanage host-dbus-glib host-setools +HOST_POLICYCOREUTILS_DEPENDENCIES = host-libsemanage # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h # large file support. # See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information -# We need to pass DESTDIR at build time because it's used by -# policycoreutils build system to find headers and libraries. # We also need to pass PREFIX because it defaults to $(DESTDIR)/usr HOST_POLICYCOREUTILS_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS) -U_FILE_OFFSET_BITS" \ CPPFLAGS="$(HOST_CPPFLAGS) -U_FILE_OFFSET_BITS" \ - PYTHON="$(HOST_DIR)/bin/python" \ - PYTHON_INSTALL_ARGS="$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)" \ - ARCH="$(HOSTARCH)" \ - DESTDIR=$(HOST_DIR) \ - PREFIX=$(HOST_DIR) - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_POLICYCOREUTILS_DEPENDENCIES += host-python3 -HOST_POLICYCOREUTILS_MAKE_OPTS += \ - PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" -else -HOST_POLICYCOREUTILS_DEPENDENCIES += host-python -HOST_POLICYCOREUTILS_MAKE_OPTS += \ - PYLIBVER="python$(PYTHON_VERSION_MAJOR)" -endif + PREFIX=$(HOST_DIR) \ + ETCDIR=$(HOST_DIR)/etc \ + SBINDIR=$(HOST_DIR)/sbin # Note: We are only building the programs required by the refpolicy build HOST_POLICYCOREUTILS_MAKE_DIRS = \ diff --git a/buildroot/package/polkit/0001-make-netgroup-support-optional.patch b/buildroot/package/polkit/0001-make-netgroup-support-optional.patch new file mode 100644 index 000000000..f96738c91 --- /dev/null +++ b/buildroot/package/polkit/0001-make-netgroup-support-optional.patch @@ -0,0 +1,232 @@ +From 21aa2747e8f0048759aab184b07dd6389666d5e6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 May 2019 13:18:55 -0700 +Subject: [PATCH] make netgroup support optional + +On at least Linux/musl and Linux/uclibc, netgroup +support is not available. PolKit fails to compile on these systems +for that reason. + +This change makes netgroup support conditional on the presence of the +setnetgrent(3) function which is required for the support to work. If +that function is not available on the system, an error will be returned +to the administrator if unix-netgroup: is specified in configuration. + +Fixes bug 50145. + +Signed-off-by: A. Wilcox +Signed-off-by: Khem Raj +Signed-off-by: Adam Duskett +--- + configure.ac | 2 +- + src/polkit/polkitidentity.c | 16 ++++++++++++++++ + src/polkit/polkitunixnetgroup.c | 3 +++ + .../polkitbackendinteractiveauthority.c | 14 ++++++++------ + src/polkitbackend/polkitbackendjsauthority.cpp | 2 ++ + test/polkit/polkitidentitytest.c | 9 ++++++++- + test/polkit/polkitunixnetgrouptest.c | 3 +++ + .../test-polkitbackendjsauthority.c | 2 ++ + 8 files changed, 43 insertions(+), 8 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXP + [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) + AC_SUBST(EXPAT_LIBS) + +-AC_CHECK_FUNCS(clearenv fdatasync) ++AC_CHECK_FUNCS(clearenv fdatasync setnetgrent) + + if test "x$GCC" = "xyes"; then + LDFLAGS="-Wl,--as-needed $LDFLAGS" +--- a/src/polkit/polkitidentity.c ++++ b/src/polkit/polkitidentity.c +@@ -182,7 +182,15 @@ polkit_identity_from_string (const gcha + } + else if (g_str_has_prefix (str, "unix-netgroup:")) + { ++#ifndef HAVE_SETNETGRENT ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "Netgroups are not available on this machine ('%s')", ++ str); ++#else + identity = polkit_unix_netgroup_new (str + sizeof "unix-netgroup:" - 1); ++#endif + } + + if (identity == NULL && (error != NULL && *error == NULL)) +@@ -344,6 +352,13 @@ polkit_identity_new_for_gvariant (GVaria + GVariant *v; + const char *name; + ++#ifndef HAVE_SETNETGRENT ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "Netgroups are not available on this machine"); ++ goto out; ++#else + v = lookup_asv (details_gvariant, "name", G_VARIANT_TYPE_STRING, error); + if (v == NULL) + { +@@ -353,6 +368,7 @@ polkit_identity_new_for_gvariant (GVaria + name = g_variant_get_string (v, NULL); + ret = polkit_unix_netgroup_new (name); + g_variant_unref (v); ++#endif + } + else + { +--- a/src/polkit/polkitunixnetgroup.c ++++ b/src/polkit/polkitunixnetgroup.c +@@ -194,6 +194,9 @@ polkit_unix_netgroup_set_name (PolkitUni + PolkitIdentity * + polkit_unix_netgroup_new (const gchar *name) + { ++#ifndef HAVE_SETNETGRENT ++ g_assert_not_reached(); ++#endif + g_return_val_if_fail (name != NULL, NULL); + return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_NETGROUP, + "name", name, +--- a/src/polkitbackend/polkitbackendinteractiveauthority.c ++++ b/src/polkitbackend/polkitbackendinteractiveauthority.c +@@ -2233,25 +2233,26 @@ get_users_in_net_group (PolkitIdentity + GList *ret; + + ret = NULL; ++#ifdef HAVE_SETNETGRENT + name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group)); + +-#ifdef HAVE_SETNETGRENT_RETURN ++# ifdef HAVE_SETNETGRENT_RETURN + if (setnetgrent (name) == 0) + { + g_warning ("Error looking up net group with name %s: %s", name, g_strerror (errno)); + goto out; + } +-#else ++# else + setnetgrent (name); +-#endif ++# endif /* HAVE_SETNETGRENT_RETURN */ + + for (;;) + { +-#if defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) ++# if defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) + const char *hostname, *username, *domainname; +-#else ++# else + char *hostname, *username, *domainname; +-#endif ++# endif /* defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) */ + PolkitIdentity *user; + GError *error = NULL; + +@@ -2282,6 +2283,7 @@ get_users_in_net_group (PolkitIdentity + + out: + endnetgrent (); ++#endif /* HAVE_SETNETGRENT */ + return ret; + } + +--- a/src/polkitbackend/polkitbackendjsauthority.cpp ++++ b/src/polkitbackend/polkitbackendjsauthority.cpp +@@ -1502,6 +1502,7 @@ js_polkit_user_is_in_netgroup (JSContext + + JS::CallArgs args = JS::CallArgsFromVp (argc, vp); + ++#ifdef HAVE_SETNETGRENT + JS::RootedString usrstr (authority->priv->cx); + usrstr = args[0].toString(); + user = JS_EncodeStringToUTF8 (cx, usrstr); +@@ -1519,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext + + JS_free (cx, netgroup); + JS_free (cx, user); ++#endif + + ret = true; + +--- a/test/polkit/polkitidentitytest.c ++++ b/test/polkit/polkitidentitytest.c +@@ -19,6 +19,7 @@ + * Author: Nikki VonHollen + */ + ++#include "config.h" + #include "glib.h" + #include + #include +@@ -145,11 +146,15 @@ struct ComparisonTestData comparison_tes + {"unix-group:root", "unix-group:jane", FALSE}, + {"unix-group:jane", "unix-group:jane", TRUE}, + ++#ifdef HAVE_SETNETGRENT + {"unix-netgroup:foo", "unix-netgroup:foo", TRUE}, + {"unix-netgroup:foo", "unix-netgroup:bar", FALSE}, ++#endif + + {"unix-user:root", "unix-group:root", FALSE}, ++#ifdef HAVE_SETNETGRENT + {"unix-user:jane", "unix-netgroup:foo", FALSE}, ++#endif + + {NULL}, + }; +@@ -181,11 +186,13 @@ main (int argc, char *argv[]) + g_test_add_data_func ("/PolkitIdentity/group_string_2", "unix-group:jane", test_string); + g_test_add_data_func ("/PolkitIdentity/group_string_3", "unix-group:users", test_string); + ++#ifdef HAVE_SETNETGRENT + g_test_add_data_func ("/PolkitIdentity/netgroup_string", "unix-netgroup:foo", test_string); ++ g_test_add_data_func ("/PolkitIdentity/netgroup_gvariant", "unix-netgroup:foo", test_gvariant); ++#endif + + g_test_add_data_func ("/PolkitIdentity/user_gvariant", "unix-user:root", test_gvariant); + g_test_add_data_func ("/PolkitIdentity/group_gvariant", "unix-group:root", test_gvariant); +- g_test_add_data_func ("/PolkitIdentity/netgroup_gvariant", "unix-netgroup:foo", test_gvariant); + + add_comparison_tests (); + +--- a/test/polkit/polkitunixnetgrouptest.c ++++ b/test/polkit/polkitunixnetgrouptest.c +@@ -19,6 +19,7 @@ + * Author: Nikki VonHollen + */ + ++#include "config.h" + #include "glib.h" + #include + #include +@@ -69,7 +70,9 @@ int + main (int argc, char *argv[]) + { + g_test_init (&argc, &argv, NULL); ++#ifdef HAVE_SETNETGRENT + g_test_add_func ("/PolkitUnixNetgroup/new", test_new); + g_test_add_func ("/PolkitUnixNetgroup/set_name", test_set_name); ++#endif + return g_test_run (); + } +--- a/test/polkitbackend/test-polkitbackendjsauthority.c ++++ b/test/polkitbackend/test-polkitbackendjsauthority.c +@@ -137,12 +137,14 @@ test_get_admin_identities (void) + "unix-group:users" + } + }, ++#ifdef HAVE_SETNETGRENT + { + "net.company.action3", + { + "unix-netgroup:foo" + } + }, ++#endif + }; + guint n; + diff --git a/buildroot/package/polkit/Config.in b/buildroot/package/polkit/Config.in index ac17cb4dc..f54b6b4cd 100644 --- a/buildroot/package/polkit/Config.in +++ b/buildroot/package/polkit/Config.in @@ -1,11 +1,18 @@ config BR2_PACKAGE_POLKIT bool "polkit" - depends on BR2_USE_MMU # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_HOST_GCC_AT_LEAST_4_9 # spidermonkey + depends on BR2_INSTALL_LIBSTDCPP # spidermonkey + depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS # spidermonkey + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # spidermonkey + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # spidermonkey + depends on BR2_USE_MMU # libglib2, dbus depends on BR2_USE_WCHAR # libglib2 - select BR2_PACKAGE_LIBGLIB2 + depends on !BR2_STATIC_LIBS # spidermonkey + depends on !BR2_TOOLCHAIN_USES_UCLIBC # spidermonkey + select BR2_PACKAGE_DBUS # runtime select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_SPIDERMONKEY help PolicyKit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged @@ -13,6 +20,13 @@ config BR2_PACKAGE_POLKIT http://www.freedesktop.org/wiki/Software/polkit -comment "polkit needs a toolchain w/ wchar, threads" +comment "polkit needs a glibc or musl toolchain with C++, wchar, dynamic library, NPTL, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_INSTALL_LIBSTDCPP || \ + BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + !BR2_HOST_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_USE_WCHAR diff --git a/buildroot/package/polkit/polkit.hash b/buildroot/package/polkit/polkit.hash index 1fe8607fb..bacd68213 100644 --- a/buildroot/package/polkit/polkit.hash +++ b/buildroot/package/polkit/polkit.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df polkit-0.105.tar.gz +sha256 88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1 polkit-0.116.tar.gz + +# Locally calculated +sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/buildroot/package/polkit/polkit.mk b/buildroot/package/polkit/polkit.mk index fb4c171c5..4e7cda943 100644 --- a/buildroot/package/polkit/polkit.mk +++ b/buildroot/package/polkit/polkit.mk @@ -4,20 +4,43 @@ # ################################################################################ -POLKIT_VERSION = 0.105 +POLKIT_VERSION = 0.116 POLKIT_SITE = http://www.freedesktop.org/software/polkit/releases POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING POLKIT_INSTALL_STAGING = YES -POLKIT_DEPENDENCIES = libglib2 host-intltool expat +POLKIT_DEPENDENCIES = \ + libglib2 host-intltool expat spidermonkey $(TARGET_NLS_DEPENDENCIES) + +# spidermonkey needs C++11 +POLKIT_CONF_ENV = \ + CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ + LIBS=$(TARGET_NLS_LIBS) -# We could also support --with-authfw=pam POLKIT_CONF_OPTS = \ - --with-authfw=shadow \ --with-os-type=unknown \ --disable-man-pages \ - --disable-examples + --disable-examples \ + --disable-libelogind \ + --disable-libsystemd-login + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +POLKIT_DEPENDENCIES += linux-pam +POLKIT_CONF_OPTS += --with-authfw=pam +else +POLKIT_CONF_OPTS += --with-authfw=shadow +endif + +define POLKIT_USERS + polkitd -1 polkitd -1 * - - - Polkit Daemon +endef + +define POLKIT_PERMISSIONS + /etc/polkit-1 r 750 root polkitd - - - - - + /usr/share/polkit-1 r 750 root polkitd - - - - - + /usr/bin/pkexec f 4755 root root - - - - - +endef $(eval $(autotools-package)) diff --git a/buildroot/package/poppler/0001-Form.cc-include-ctype.h-to-fix-build-error.patch b/buildroot/package/poppler/0001-Form.cc-include-ctype.h-to-fix-build-error.patch deleted file mode 100644 index 8d210dab9..000000000 --- a/buildroot/package/poppler/0001-Form.cc-include-ctype.h-to-fix-build-error.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f40143f7acca81b7d39d774ed4c349aec8d9310b Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 23 Sep 2017 11:37:23 +0200 -Subject: [PATCH] Form.cc: include ctype.h to fix build error - -Fixes -Form.cc:546:28: error: 'isdigit' was not declared in this scope -Form.cc:548:34: error: 'isxdigit' was not declared in this scope -Form.cc:575:40: error: 'isxdigit' was not declared in this scope - -detected by buildroot autobuilders: -http://autobuild.buildroot.net/results/a6a/a6a336f8b6a0136b204a34091e33dc4598178125/ -when cross-compiling with -gcc version 4.7.3 (crosstool-NG hg+-c65fcf8a34b7) - -Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=102951 - -Signed-off-by: Bernd Kuhls ---- - poppler/Form.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/poppler/Form.cc b/poppler/Form.cc -index 83bceb20..e7efae95 100644 ---- a/poppler/Form.cc -+++ b/poppler/Form.cc -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include "goo/gmem.h" - #include "goo/GooString.h" - #include "Error.h" --- -2.11.0 - diff --git a/buildroot/package/poppler/Config.in b/buildroot/package/poppler/Config.in index 4a553df72..521e3e65a 100644 --- a/buildroot/package/poppler/Config.in +++ b/buildroot/package/poppler/Config.in @@ -1,10 +1,11 @@ config BR2_PACKAGE_POPPLER bool "poppler" + depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14, constexpr select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 help Poppler is a PDF rendering library based on the xpdf-3.0 code base. @@ -22,7 +23,14 @@ config BR2_PACKAGE_POPPLER_QT5 help Build Qt support into the Poppler library +config BR2_PACKAGE_POPPLER_UTILS + bool "command line utils" + help + Compile poppler command line utils. + endif -comment "poppler needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "poppler needs a toolchain w/ wchar, C++, threads, dynamic library, gcc >= 5" + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/buildroot/package/poppler/poppler.hash b/buildroot/package/poppler/poppler.hash index 7aa14c681..a06def665 100644 --- a/buildroot/package/poppler/poppler.hash +++ b/buildroot/package/poppler/poppler.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 poppler-0.59.0.tar.xz +sha256 c7a130da743b38a548f7a21fe5940506fb1949f4ebdd3209f0e5b302fa139731 poppler-0.84.0.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/poppler/poppler.mk b/buildroot/package/poppler/poppler.mk index be1c0e482..e452c2336 100644 --- a/buildroot/package/poppler/poppler.mk +++ b/buildroot/package/poppler/poppler.mk @@ -4,102 +4,113 @@ # ################################################################################ -POPPLER_VERSION = 0.59.0 +POPPLER_VERSION = 0.84.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = http://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING POPPLER_INSTALL_STAGING = YES -POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \ - --enable-xpdf-headers --disable-poppler-qt4 + +POPPLER_CONF_OPTS = \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DBUILD_QT5_TESTS=OFF \ + -DBUILD_CPP_TESTS=OFF \ + -DENABLE_GOBJECT_INTROSPECTION=OFF \ + -DENABLE_GTK_DOC=OFF + +# cmake older than 3.10 requires this to avoid try_run() in FindThreads +POPPLER_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -POPPLER_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic" -endif - -ifeq ($(BR2_PACKAGE_CAIRO),y) -POPPLER_CONF_OPTS += --enable-cairo-output -POPPLER_DEPENDENCIES += cairo -else -POPPLER_CONF_OPTS += --disable-cairo-output -endif - -ifeq ($(BR2_PACKAGE_LCMS2),y) -POPPLER_CONF_OPTS += --enable-cms=lcms2 -POPPLER_DEPENDENCIES += lcms2 -else -POPPLER_CONF_OPTS += --enable-cms=none -endif - -ifeq ($(BR2_PACKAGE_CAIRO)$(BR2_PACKAGE_LIBGLIB2),yy) -POPPLER_CONF_OPTS += --enable-poppler-glib -POPPLER_DEPENDENCIES += libglib2 -else -POPPLER_CONF_OPTS += --disable-poppler-glib -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -POPPLER_CONF_OPTS += --enable-libtiff -# Help poppler to find libtiff in static linking scenarios -POPPLER_CONF_ENV += \ - LIBTIFF_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`" -POPPLER_DEPENDENCIES += tiff -else -POPPLER_CONF_OPTS += --disable-libtiff +POPPLER_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" endif ifeq ($(BR2_PACKAGE_JPEG),y) -POPPLER_CONF_OPTS += --enable-dctdecoder=libjpeg POPPLER_DEPENDENCIES += jpeg +POPPLER_CONF_OPTS += -DENABLE_DCTDECODER=libjpeg -DWITH_JPEG=ON else -POPPLER_CONF_OPTS += --enable-dctdecoder=none +POPPLER_CONF_OPTS += -DENABLE_DCTDECODER=none -DWITH_JPEG=OFF endif ifeq ($(BR2_PACKAGE_LIBPNG),y) -POPPLER_CONF_OPTS += --enable-libpng POPPLER_DEPENDENCIES += libpng +POPPLER_CONF_OPTS += -DWITH_PNG=ON else -POPPLER_CONF_OPTS += --disable-libpng +POPPLER_CONF_OPTS += -DWITH_PNG=OFF endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -POPPLER_CONF_OPTS += --enable-zlib -POPPLER_DEPENDENCIES += zlib +ifeq ($(BR2_PACKAGE_LCMS2),y) +POPPLER_DEPENDENCIES += lcms2 +POPPLER_CONF_OPTS += -DENABLE_CMS=lcms2 else -POPPLER_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -POPPLER_CONF_OPTS += --enable-libcurl -POPPLER_DEPENDENCIES += libcurl -else -POPPLER_CONF_OPTS += --disable-libcurl -endif - -ifeq ($(BR2_PACKAGE_XORG7),y) -POPPLER_CONF_OPTS += --with-x -POPPLER_DEPENDENCIES += xlib_libX11 xlib_libXext -else -POPPLER_CONF_OPTS += --without-x -endif - -ifeq ($(BR2_PACKAGE_POPPLER_QT5),y) -POPPLER_DEPENDENCIES += qt5base -POPPLER_CONF_OPTS += --enable-poppler-qt5 -# since Qt5.7.x c++11 is needed (LTS Qt5.6.x is the last one without this requirement) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -POPPLER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" -endif -else -POPPLER_CONF_OPTS += --disable-poppler-qt5 +POPPLER_CONF_OPTS += -DENABLE_CMS=none endif ifeq ($(BR2_PACKAGE_OPENJPEG),y) POPPLER_DEPENDENCIES += openjpeg -POPPLER_CONF_OPTS += --enable-libopenjpeg=openjpeg2 +POPPLER_CONF_OPTS += -DENABLE_LIBOPENJPEG=openjpeg2 else -POPPLER_CONF_OPTS += --enable-libopenjpeg=none +POPPLER_CONF_OPTS += -DENABLE_LIBOPENJPEG=none endif -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_LIBCURL),y) +POPPLER_DEPENDENCIES += libcurl +POPPLER_CONF_OPTS += -DENABLE_LIBCURL=ON +else +POPPLER_CONF_OPTS += -DENABLE_LIBCURL=OFF +endif + +ifeq ($(BR2_PACKAGE_POPPLER_QT5),y) +POPPLER_DEPENDENCIES += qt5base +POPPLER_CONF_OPTS += -DENABLE_QT5=ON +else +POPPLER_CONF_OPTS += -DENABLE_QT5=OFF +endif + +ifeq ($(BR2_PACKAGE_POPPLER_UTILS),y) +POPPLER_CONF_OPTS += -DENABLE_UTILS=ON +else +POPPLER_CONF_OPTS += -DENABLE_UTILS=OFF +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +POPPLER_DEPENDENCIES += zlib +POPPLER_CONF_OPTS += -DENABLE_ZLIB=ON +else +POPPLER_CONF_OPTS += -DENABLE_ZLIB=OFF +endif + +ifeq ($(BR2_PACKAGE_CAIRO),y) +POPPLER_DEPENDENCIES += cairo +POPPLER_CONF_OPTS += -DWITH_Cairo=ON +else +POPPLER_CONF_OPTS += -DWITH_Cairo=OFF +endif + +ifeq ($(BR2_PACKAGE_TIFF),y) +POPPLER_DEPENDENCIES += tiff +POPPLER_CONF_OPTS += -DWITH_TIFF=ON +else +POPPLER_CONF_OPTS += -DWITH_TIFF=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +POPPLER_DEPENDENCIES += libglib2 +endif + +ifeq ($(BR2_PACKAGE_LIBNSS),y) +POPPLER_DEPENDENCIES += libnss +POPPLER_CONF_OPTS += -DWITH_NSS3=ON +else +POPPLER_CONF_OPTS += -DWITH_NSS3=OFF +endif + +ifeq ($(BR2_SOFT_FLOAT),y) +POPPLER_CONF_OPTS += -DUSE_FLOAT=OFF +else +POPPLER_CONF_OPTS += -DUSE_FLOAT=ON +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/portaudio/portaudio.hash b/buildroot/package/portaudio/portaudio.hash index ca7baf7fb..903d760ce 100644 --- a/buildroot/package/portaudio/portaudio.hash +++ b/buildroot/package/portaudio/portaudio.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 pa_stable_v190600_20161030.tgz +sha256 f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 pa_stable_v190600_20161030.tgz +sha256 ec52a1952d701f94e5135719a47376da4ee0b4a0201f1cafb49f61db6480ac3d LICENSE.txt diff --git a/buildroot/package/postgresql/postgresql.hash b/buildroot/package/postgresql/postgresql.hash index 4c78ad68b..7cb0c67d6 100644 --- a/buildroot/package/postgresql/postgresql.hash +++ b/buildroot/package/postgresql/postgresql.hash @@ -1,7 +1,7 @@ -# From https://ftp.postgresql.org/pub/source/v11.6/postgresql-11.6.tar.bz2.md5 -md5 8e3462b342caf6f2265126674dde26da postgresql-11.6.tar.bz2 -# From https://ftp.postgresql.org/pub/source/v11.6/postgresql-11.6.tar.bz2.sha256 -sha256 49924f7ff92965fdb20c86e0696f2dc9f8553e1563124ead7beedf8910c13170 postgresql-11.6.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v12.2/postgresql-12.2.tar.bz2.md5 +md5 a88ceea8ecf2741307f663e4539b58b7 postgresql-12.2.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v12.2/postgresql-12.2.tar.bz2.sha256 +sha256 ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de postgresql-12.2.tar.bz2 # License file, Locally calculated -sha256 c4c86d683970b22b9fab53320ee1b3a30ef4e8223122b4fb6be53ea62ecee8b3 COPYRIGHT +sha256 739e5d454d81d31a482469338b7c856f1f5c6b4cdda1551cea6f0f6d18eef62c COPYRIGHT diff --git a/buildroot/package/postgresql/postgresql.mk b/buildroot/package/postgresql/postgresql.mk index 4209cde34..378197d33 100644 --- a/buildroot/package/postgresql/postgresql.mk +++ b/buildroot/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 11.6 +POSTGRESQL_VERSION = 12.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL @@ -36,7 +36,7 @@ ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) POSTGRESQL_CONF_OPTS += --disable-thread-safety endif -ifeq ($(BR2_arcle)$(BR2_arceb)$(BR2_microblazeel)$(BR2_microblazebe)$(BR2_or1k)$(BR2_nios2)$(BR2_riscv)$(BR2_xtensa),y) +ifeq ($(BR2_arcle)$(BR2_arceb)$(BR2_microblazeel)$(BR2_microblazebe)$(BR2_or1k)$(BR2_nios2)$(BR2_riscv)$(BR2_xtensa)$(BR2_nds32),y) POSTGRESQL_CONF_OPTS += --disable-spinlocks endif @@ -128,9 +128,6 @@ endef define POSTGRESQL_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/postgresql/postgresql.service \ $(TARGET_DIR)/usr/lib/systemd/system/postgresql.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/postgresql.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/postgresql.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/powerpc-utils/powerpc-utils.hash b/buildroot/package/powerpc-utils/powerpc-utils.hash index b493be086..0e86d8cca 100644 --- a/buildroot/package/powerpc-utils/powerpc-utils.hash +++ b/buildroot/package/powerpc-utils/powerpc-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 77efe3978ac9c251c4728a35b9aebd6076583939a8e26cc7f07ffa86432a8bf0 powerpc-utils-v1.3.5.tar.gz +sha256 77efe3978ac9c251c4728a35b9aebd6076583939a8e26cc7f07ffa86432a8bf0 powerpc-utils-1.3.5.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/powerpc-utils/powerpc-utils.mk b/buildroot/package/powerpc-utils/powerpc-utils.mk index a3bd8832f..221e5b04e 100644 --- a/buildroot/package/powerpc-utils/powerpc-utils.mk +++ b/buildroot/package/powerpc-utils/powerpc-utils.mk @@ -4,8 +4,8 @@ # ################################################################################ -POWERPC_UTILS_VERSION = v1.3.5 -POWERPC_UTILS_SITE = $(call github,ibm-power-utilities,powerpc-utils,$(POWERPC_UTILS_VERSION)) +POWERPC_UTILS_VERSION = 1.3.5 +POWERPC_UTILS_SITE = $(call github,ibm-power-utilities,powerpc-utils,v$(POWERPC_UTILS_VERSION)) POWERPC_UTILS_DEPENDENCIES = zlib POWERPC_UTILS_AUTORECONF = YES POWERPC_UTILS_LICENSE = GPL-2.0+ diff --git a/buildroot/package/powertop/powertop.hash b/buildroot/package/powertop/powertop.hash index 0f9acdc27..a3261789d 100644 --- a/buildroot/package/powertop/powertop.hash +++ b/buildroot/package/powertop/powertop.hash @@ -1,2 +1,3 @@ # Locally-generated hash -sha256 aa7fb7d8e9a00f05e7d8a7a2866d85929741e0d03a5bf40cab22d2021c959250 powertop-v2.9.tar.gz +sha256 ae68c913784f78b497076e0b1d588f59854a66c074690d545dae7956e4f5d64f powertop-v2.11-1-g7ef7f79.tar.gz +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/buildroot/package/powertop/powertop.mk b/buildroot/package/powertop/powertop.mk index cf5e8d4ff..3dbc015ce 100644 --- a/buildroot/package/powertop/powertop.mk +++ b/buildroot/package/powertop/powertop.mk @@ -4,9 +4,9 @@ # ################################################################################ -POWERTOP_VERSION = 2.9 -POWERTOP_SITE = https://01.org/sites/default/files/downloads/powertop -POWERTOP_SOURCE = powertop-v$(POWERTOP_VERSION).tar.gz +POWERTOP_VERSION = 2.11 +POWERTOP_SITE = https://01.org/sites/default/files/downloads +POWERTOP_SOURCE = powertop-v$(POWERTOP_VERSION)-1-g7ef7f79.tar.gz POWERTOP_DEPENDENCIES = pciutils ncurses libnl host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) POWERTOP_LICENSE = GPL-2.0 diff --git a/buildroot/package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch b/buildroot/package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch deleted file mode 100644 index 2f6933f5e..000000000 --- a/buildroot/package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..b827620 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -47,6 +47,8 @@ - #include - #endif - -+#include -+ - /* Ugly header files on some Linux boxes... */ - #if defined(HAVE_LINUX_IF_H) - #include -@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t; - #include - #endif - --#include -- - #ifdef HAVE_NETINET_IF_ETHER_H - #include - diff --git a/buildroot/package/pppd/0001-pppd-Fix-bounds-check.patch b/buildroot/package/pppd/0001-pppd-Fix-bounds-check.patch new file mode 100644 index 000000000..5d7c51bca --- /dev/null +++ b/buildroot/package/pppd/0001-pppd-Fix-bounds-check.patch @@ -0,0 +1,37 @@ +From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001 +From: Paul Mackerras +Date: Mon, 3 Feb 2020 15:53:28 +1100 +Subject: [PATCH] pppd: Fix bounds check in EAP code + +Given that we have just checked vallen < len, it can never be the case +that vallen >= len + sizeof(rhostname). This fixes the check so we +actually avoid overflowing the rhostname array. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Paul Mackerras +--- + pppd/eap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/eap.c b/pppd/eap.c +index 94407f56..1b93db01 100644 +--- a/pppd/eap.c ++++ b/pppd/eap.c +@@ -1420,7 +1420,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; +@@ -1846,7 +1846,7 @@ int len; + } + + /* Not so likely to happen. */ +- if (vallen >= len + sizeof (rhostname)) { ++ if (len - vallen >= sizeof (rhostname)) { + dbglog("EAP: trimming really long peer name down"); + BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); + rhostname[sizeof (rhostname) - 1] = '\0'; diff --git a/buildroot/package/pppd/0002-pppd-Use-openssl-for-the-DES-instead-of-the-libcrypt-glibc.patch b/buildroot/package/pppd/0002-pppd-Use-openssl-for-the-DES-instead-of-the-libcrypt-glibc.patch deleted file mode 100644 index 3804edc6d..000000000 --- a/buildroot/package/pppd/0002-pppd-Use-openssl-for-the-DES-instead-of-the-libcrypt-glibc.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 3c7b86229f7bd2600d74db14b1fe5b3896be3875 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= -Date: Fri, 6 Apr 2018 14:27:18 +0200 -Subject: [PATCH] pppd: Use openssl for the DES instead of the libcrypt / glibc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It seems the latest glibc (in Fedora glibc-2.27.9000-12.fc29) dropped -libcrypt. The libxcrypt standalone package can be used instead, but -it dropped the old setkey/encrypt API which ppp uses for DES. There -is support for using openssl in pppcrypt.c, but it contains typos -preventing it from compiling and seems to be written for an ancient -openssl version. - -This updates the code to use current openssl. - -[paulus@ozlabs.org - wrote the commit description, fixed comment in - Makefile.linux.] - -Signed-off-by: Jaroslav Škarvada -Signed-off-by: Paul Mackerras -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/paulusmack/ppp/commit/3c7b86229f7bd2600d74db14b1fe5b3896be3875] ---- - pppd/Makefile.linux | 7 ++++--- - pppd/pppcrypt.c | 18 +++++++++--------- - 2 files changed, 13 insertions(+), 12 deletions(-) - -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 36d2b036..8d5ce99d 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -35,10 +35,10 @@ endif - COPTS = -O2 -pipe -Wall -g - LIBS = - --# Uncomment the next 2 lines to include support for Microsoft's -+# Uncomment the next line to include support for Microsoft's - # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. - CHAPMS=y --USE_CRYPT=y -+#USE_CRYPT=y - # Don't use MSLANMAN unless you really know what you're doing. - #MSLANMAN=y - # Uncomment the next line to include support for MPPE. CHAPMS (above) must -@@ -137,7 +137,8 @@ endif - - ifdef NEEDDES - ifndef USE_CRYPT --LIBS += -ldes $(LIBS) -+CFLAGS += -I/usr/include/openssl -+LIBS += -lcrypto - else - CFLAGS += -DUSE_CRYPT=1 - endif -diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c -index 8b85b132..6b35375e 100644 ---- a/pppd/pppcrypt.c -+++ b/pppd/pppcrypt.c -@@ -64,7 +64,7 @@ u_char *des_key; /* OUT 64 bit DES key with parity bits added */ - des_key[7] = Get7Bits(key, 49); - - #ifndef USE_CRYPT -- des_set_odd_parity((des_cblock *)des_key); -+ DES_set_odd_parity((DES_cblock *)des_key); - #endif - } - -@@ -158,25 +158,25 @@ u_char *clear; /* OUT 8 octets */ - } - - #else /* USE_CRYPT */ --static des_key_schedule key_schedule; -+static DES_key_schedule key_schedule; - - bool - DesSetkey(key) - u_char *key; - { -- des_cblock des_key; -+ DES_cblock des_key; - MakeKey(key, des_key); -- des_set_key(&des_key, key_schedule); -+ DES_set_key(&des_key, &key_schedule); - return (1); - } - - bool --DesEncrypt(clear, key, cipher) -+DesEncrypt(clear, cipher) - u_char *clear; /* IN 8 octets */ - u_char *cipher; /* OUT 8 octets */ - { -- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher, -- key_schedule, 1); -+ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher, -+ &key_schedule, 1); - return (1); - } - -@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear) - u_char *cipher; /* IN 8 octets */ - u_char *clear; /* OUT 8 octets */ - { -- des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear, -- key_schedule, 0); -+ DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear, -+ &key_schedule, 0); - return (1); - } - diff --git a/buildroot/package/pppd/0003-Add-OPENSSL_INCLUDE_DIR.patch b/buildroot/package/pppd/0003-Add-OPENSSL_INCLUDE_DIR.patch deleted file mode 100644 index e629a2dec..000000000 --- a/buildroot/package/pppd/0003-Add-OPENSSL_INCLUDE_DIR.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 24dd10608bfb554390c17f709a5afa30060c994b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 31 Oct 2018 10:49:16 +0100 -Subject: [PATCH] Add OPENSSL_INCLUDE_DIR - -Add OPENSSL_INCLUDE_DIR to be able to override openssl include directory -as -I/usr/include/openssl can't be used when cross-compiling - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/paulusmack/ppp/pull/107] ---- - pppd/Makefile.linux | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 8d5ce99..b258d86 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -84,6 +84,7 @@ USE_LIBUTIL=y - MAXOCTETS=y - - INCLUDE_DIRS= -I../include -+OPENSSL_INCLUDE_DIR= /usr/include/openssl - - COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP - -@@ -137,7 +138,7 @@ endif - - ifdef NEEDDES - ifndef USE_CRYPT --CFLAGS += -I/usr/include/openssl -+CFLAGS += -I$(OPENSSL_INCLUDE_DIR) - LIBS += -lcrypto - else - CFLAGS += -DUSE_CRYPT=1 --- -2.17.1 - diff --git a/buildroot/package/pppd/Config.in b/buildroot/package/pppd/Config.in index bf05689f5..7db5674bf 100644 --- a/buildroot/package/pppd/Config.in +++ b/buildroot/package/pppd/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_PPPD depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_MUSL # Use __P() macro all over the tree depends on BR2_USE_MMU - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if BR2_TOOLCHAIN_USES_GLIBC help An implementation of the Point-to-point protocol. diff --git a/buildroot/package/pppd/pppd.hash b/buildroot/package/pppd/pppd.hash index 2bc248d89..a92315857 100644 --- a/buildroot/package/pppd/pppd.hash +++ b/buildroot/package/pppd/pppd.hash @@ -1,2 +1,7 @@ -# Locally calculated after checking pgp signature -sha256 02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 ppp-2.4.7.tar.gz +# Locally calculated +sha256 91fbff784ad16a1111a7f22df4675aeb161d958bb79f1cc4c1f0c81944e7cb40 pppd-2.4.8.tar.gz +sha256 3990c65c506885f7bb75455d1d6188743a14ad46f5b62e136ef3739aed52c532 pppd/tdb.c +sha256 1822ead9d2854adfbd282322b29730a3fec4cc67f6f6a2e487aad3476e3afd59 pppd/plugins/pppoatm/COPYING +sha256 91a5e9c173e0e001e081e15bf7850cfd782a0baa02f5921e327ae3b449beff3f pppdump/bsd-comp.c +sha256 ee1c28551c87cdcdaf80eb3922726f015201614cb560a5ed18a7a0c15f2b4aa4 pppd/ccp.c +sha256 6fa4c3dad059f6ef15c1c5e5219d9d0d40991dd3a162098a89967a1720de059e pppd/plugins/passprompt.c diff --git a/buildroot/package/pppd/pppd.mk b/buildroot/package/pppd/pppd.mk index 4dffc1794..685666a20 100644 --- a/buildroot/package/pppd/pppd.mk +++ b/buildroot/package/pppd/pppd.mk @@ -4,18 +4,23 @@ # ################################################################################ -PPPD_VERSION = 2.4.7 -PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz -PPPD_SITE = https://download.samba.org/pub/ppp +PPPD_VERSION = 2.4.8 +PPPD_SITE = $(call github,paulusmack,ppp,ppp-$(PPPD_VERSION)) PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -PPPD_DEPENDENCIES = openssl -PPPD_MAKE_OPTS = \ - HAVE_INET6=y \ - OPENSSL_INCLUDE_DIR=$(STAGING_DIR)/usr/include/openssl +# 0001-pppd-Fix-bounds-check.patch +PPPD_IGNORE_CVES += CVE-2020-8597 + +PPPD_MAKE_OPTS = HAVE_INET6=y +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) +PPPD_DEPENDENCIES += openssl +else +PPPD_MAKE_OPTS += USE_CRYPT=y +endif + PPPD_INSTALL_STAGING = YES PPPD_TARGET_BINS = chat pppd pppdump pppstats PPPD_RADIUS_CONF = \ diff --git a/buildroot/package/pps-tools/pps-tools.hash b/buildroot/package/pps-tools/pps-tools.hash index 1e54c2946..ee3e4e3d7 100644 --- a/buildroot/package/pps-tools/pps-tools.hash +++ b/buildroot/package/pps-tools/pps-tools.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1168f1474235017af413afdb07288303ad7a7b12a0282f3bf9ed0e22fe0d7d2e pps-tools-e2b25049df9a4da28168b7378016f1650d0dfa6b.tar.gz +sha256 1168f1474235017af413afdb07288303ad7a7b12a0282f3bf9ed0e22fe0d7d2e pps-tools-e2b25049df9a4da28168b7378016f1650d0dfa6b.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/pptp-linux/0003-pqueue.h-include-sys-types.h.patch b/buildroot/package/pptp-linux/0003-pqueue.h-include-sys-types.h.patch deleted file mode 100644 index 1036b3c89..000000000 --- a/buildroot/package/pptp-linux/0003-pqueue.h-include-sys-types.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 060ad28b9ca5e99d7c6e8010132da58a3a8a0585 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Fri, 22 Jan 2016 10:19:18 -0300 -Subject: [PATCH] pqueue.h: include sys/types.h - -We're using u_int32_t here, this breaks on musl libc builds otherwise. - -Signed-off-by: Gustavo Zacarias ---- -Patch status: applied upstream: -https://sourceforge.net/p/pptpclient/git/ci/ee8ef349d9543cb48045a27d1cdd801fc6e910e8/ - - pqueue.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pqueue.h b/pqueue.h -index a56590f..8c60c62 100644 ---- a/pqueue.h -+++ b/pqueue.h -@@ -3,6 +3,7 @@ - - #include - #include -+#include - - /* wait this many seconds for missing packets before forgetting about them */ - #define DEFAULT_PACKET_TIMEOUT 0.3 --- -2.4.10 - diff --git a/buildroot/package/pptp-linux/pptp-linux.hash b/buildroot/package/pptp-linux/pptp-linux.hash index 6200ef151..668e01c30 100644 --- a/buildroot/package/pptp-linux/pptp-linux.hash +++ b/buildroot/package/pptp-linux/pptp-linux.hash @@ -1,3 +1,7 @@ -# From http://sourceforge.net/projects/pptpclient/files/pptp/pptp-1.9.0/ -md5 b2117b377f65294a9786f80f0235d308 pptp-1.9.0.tar.gz -sha1 047bb9812be477b44c94ffb1dc95c34658eedc24 pptp-1.9.0.tar.gz +# From http://sourceforge.net/projects/pptpclient/files/pptp/pptp-1.10.0/ +md5 8d25341352fdae5ad5b36b9f18254908 pptp-1.10.0.tar.gz +sha1 173c9b7d204c89fd1538116f165bba1e9101b51c pptp-1.10.0.tar.gz + +# Locally calculated +sha256 82492db8e487ce73b182ee7f444251d20c44f5c26d6e96c553ec7093aefb5af4 pptp-1.10.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/pptp-linux/pptp-linux.mk b/buildroot/package/pptp-linux/pptp-linux.mk index 25f3037f8..7fd073397 100644 --- a/buildroot/package/pptp-linux/pptp-linux.mk +++ b/buildroot/package/pptp-linux/pptp-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -PPTP_LINUX_VERSION = 1.9.0 +PPTP_LINUX_VERSION = 1.10.0 PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION) PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz PPTP_LINUX_MAKE = $(MAKE1) diff --git a/buildroot/package/prboom/prboom.hash b/buildroot/package/prboom/prboom.hash index 0d80349a6..2cc0f5136 100644 --- a/buildroot/package/prboom/prboom.hash +++ b/buildroot/package/prboom/prboom.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 226c1c470f8cc983327536404f405a1d026cf0a5188c694a1243cc8630014bae prboom-2.5.0.tar.gz +sha256 1cba07ce0f6d1366d84b7cc62b76966ba79075e5f379c1e230c3ff0635fa789f COPYING diff --git a/buildroot/package/privoxy/privoxy.hash b/buildroot/package/privoxy/privoxy.hash index 72226b14f..9cf08f116 100644 --- a/buildroot/package/privoxy/privoxy.hash +++ b/buildroot/package/privoxy/privoxy.hash @@ -1,3 +1,5 @@ # From http://sourceforge.net/projects/ijbswa/files/Sources/3.0.26%20%28stable%29/ md5 8a1c842112ccea68c19b7ceb4a0e999f privoxy-3.0.26-stable-src.tar.gz sha1 b646624006225979f83453ba542e448667f45998 privoxy-3.0.26-stable-src.tar.gz +# Locally computed +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/procps-ng/S02sysctl b/buildroot/package/procps-ng/S02sysctl new file mode 100644 index 000000000..3a58578de --- /dev/null +++ b/buildroot/package/procps-ng/S02sysctl @@ -0,0 +1,64 @@ +#!/bin/sh + +PROGRAM="sysctl" + +SYSCTL_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$PROGRAM" ] && . "/etc/default/$PROGRAM" + +# Files are read from directories in the SYSCTL_SOURCES list, in the given +# order. A file may be used more than once, since there can be multiple +# symlinks to it. No attempt is made to prevent this. +SYSCTL_SOURCES="/etc/sysctl.d/ /usr/local/lib/sysctl.d/ /usr/lib/sysctl.d/ /lib/sysctl.d/ /etc/sysctl.conf" + +# The "--system" option activates "--ignore", which is bad because invalid +# variable settings in the configuration files will not be reported on the +# system log. Use some scripting to mimic the --system behavior but still +# reporting errors. Users not interested on error report can put "-e" in +# SYSCTL_ARGS. +# +# The file redirections do the following: +# +# - stdout is redirected to syslog with facility.level "kern.info" +# - stderr is redirected to syslog with facility.level "kern.err" +# - file dscriptor 4 is used to pass the result to the "start" function. +# +run_program() { + # shellcheck disable=SC2086 # we need the word splitting + find $SYSCTL_SOURCES -maxdepth 1 -name '*.conf' -print0 2> /dev/null | \ + xargs -0 -r -n 1 readlink -f | { + prog_status="OK" + while :; do + read -r file + if [ -z "$file" ]; then + echo "$prog_status" >&4 + break + fi + echo "* Applying $file ..." + /sbin/sysctl -p "$file" $SYSCTL_ARGS || prog_status="FAIL" + done 2>&1 >&3 | /usr/bin/logger -t sysctl -p kern.err + } 3>&1 | /usr/bin/logger -t sysctl -p kern.info +} + +start() { + printf '%s %s: ' "$1" "$PROGRAM" + status=$(run_program 4>&1) + echo "$status" + if [ "$status" = "OK" ]; then + return 0 + fi + return 1 +} + +case "$1" in + start) + start "Running";; + restart|reload) + start "Rerunning";; + stop) + :;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/procps-ng/procps-ng.mk b/buildroot/package/procps-ng/procps-ng.mk index 03b74784d..6a41e9b32 100644 --- a/buildroot/package/procps-ng/procps-ng.mk +++ b/buildroot/package/procps-ng/procps-ng.mk @@ -44,4 +44,9 @@ ifeq ($(BR2_STATIC_LIBS),y) PROCPS_NG_CONF_OPTS += --disable-numa endif +define PROCPS_NG_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/procps-ng/S02sysctl \ + $(TARGET_DIR)/etc/init.d/S02sysctl +endef + $(eval $(autotools-package)) diff --git a/buildroot/package/procrank_linux/procrank_linux.hash b/buildroot/package/procrank_linux/procrank_linux.hash index b28a8e368..cc9c403a0 100644 --- a/buildroot/package/procrank_linux/procrank_linux.hash +++ b/buildroot/package/procrank_linux/procrank_linux.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1c3592b549b6793b29ab561568f493d0edbfe288ea2aed59afa689eaa26b5d9e procrank_linux-21c30ab4514a5b15ac6e813e21bee0d3d714cb08.tar.gz +sha256 1c3592b549b6793b29ab561568f493d0edbfe288ea2aed59afa689eaa26b5d9e procrank_linux-21c30ab4514a5b15ac6e813e21bee0d3d714cb08.tar.gz +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a NOTICE diff --git a/buildroot/package/proftpd/0001-fix-kernel-header-capability-version.patch b/buildroot/package/proftpd/0001-fix-kernel-header-capability-version.patch deleted file mode 100644 index 4401c9aea..000000000 --- a/buildroot/package/proftpd/0001-fix-kernel-header-capability-version.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/lib/libcap/libcap.h 2008-08-22 19:49:48.000000000 -0700 -+++ b/lib/libcap/libcap.h 2010-10-06 15:31:11.000000000 -0700 -@@ -65,7 +65,8 @@ struct _cap_struct { - */ - - #if !defined(_LINUX_CAPABILITY_VERSION_1) || \ -- (_LINUX_CAPABILITY_VERSION_1 != 0x19980330) -+ ((_LINUX_CAPABILITY_VERSION_1 != 0x19980330) && \ -+ (_LINUX_CAPABILITY_VERSION_1 != 0x20071026)) - - # error "Kernel does not match library" - # error "file "libcap.h" --> fix and recompile libcap" diff --git a/buildroot/package/proftpd/0002-fix-CVE-2019-12815.patch b/buildroot/package/proftpd/0002-fix-CVE-2019-12815.patch deleted file mode 100644 index 8b56d0886..000000000 --- a/buildroot/package/proftpd/0002-fix-CVE-2019-12815.patch +++ /dev/null @@ -1,382 +0,0 @@ -From 71cd49ea82313f78d52a52d0c628a3770dc96608 Mon Sep 17 00:00:00 2001 -From: TJ Saunders -Date: Wed, 17 Jul 2019 09:25:31 -0700 -Subject: [PATCH] Bug #4372: Ensure that mod_copy checks for for its - SITE CPFR/CPTO commands. - -https://tbspace.de/cve201912815proftpd.html - -Downloaded from upstream commit -https://github.com/proftpd/proftpd/commit/d19dd64161936d70c0a1544bd2c8e90850f4b7ae - -Signed-off-by: Bernd Kuhls ---- - contrib/mod_copy.c | 36 ++- - tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm | 253 +++++++++++++++++- - 2 files changed, 285 insertions(+), 4 deletions(-) - -diff --git a/contrib/mod_copy.c b/contrib/mod_copy.c -index 26b72a91d..c8672c40d 100644 ---- a/contrib/mod_copy.c -+++ b/contrib/mod_copy.c -@@ -1,7 +1,7 @@ - /* - * ProFTPD: mod_copy -- a module supporting copying of files on the server - * without transferring the data to the client and back -- * Copyright (c) 2009-2016 TJ Saunders -+ * Copyright (c) 2009-2019 TJ Saunders - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -657,7 +657,7 @@ MODRET copy_copy(cmd_rec *cmd) { - MODRET copy_cpfr(cmd_rec *cmd) { - register unsigned int i; - int res; -- char *path = ""; -+ char *cmd_name, *path = ""; - unsigned char *authenticated = NULL; - - if (copy_engine == FALSE) { -@@ -705,6 +705,21 @@ MODRET copy_cpfr(cmd_rec *cmd) { - path = pstrcat(cmd->tmp_pool, path, *path ? " " : "", decoded_path, NULL); - } - -+ cmd_name = cmd->argv[0]; -+ pr_cmd_set_name(cmd, "SITE_CPFR"); -+ if (!dir_check(cmd->tmp_pool, cmd, G_READ, path, NULL)) { -+ int xerrno = EPERM; -+ -+ pr_cmd_set_name(cmd, cmd_name); -+ pr_response_add_err(R_550, "%s: %s", (char *) cmd->argv[3], -+ strerror(xerrno)); -+ -+ pr_cmd_set_errno(cmd, xerrno); -+ errno = xerrno; -+ return PR_ERROR(cmd); -+ } -+ pr_cmd_set_name(cmd, cmd_name); -+ - res = pr_filter_allow_path(CURRENT_CONF, path); - switch (res) { - case 0: -@@ -758,6 +773,7 @@ MODRET copy_cpfr(cmd_rec *cmd) { - MODRET copy_cpto(cmd_rec *cmd) { - register unsigned int i; - const char *from, *to = ""; -+ char *cmd_name; - unsigned char *authenticated = NULL; - - if (copy_engine == FALSE) { -@@ -816,6 +832,20 @@ MODRET copy_cpto(cmd_rec *cmd) { - - to = dir_canonical_vpath(cmd->tmp_pool, to); - -+ cmd_name = cmd->argv[0]; -+ pr_cmd_set_name(cmd, "SITE_CPTO"); -+ if (!dir_check(cmd->tmp_pool, cmd, G_WRITE, to, NULL)) { -+ int xerrno = EPERM; -+ -+ pr_cmd_set_name(cmd, cmd_name); -+ pr_response_add_err(R_550, "%s: %s", to, strerror(xerrno)); -+ -+ pr_cmd_set_errno(cmd, xerrno); -+ errno = xerrno; -+ return PR_ERROR(cmd); -+ } -+ pr_cmd_set_name(cmd, cmd_name); -+ - if (copy_paths(cmd->tmp_pool, from, to) < 0) { - int xerrno = errno; - const char *err_code = R_550; -@@ -940,7 +970,7 @@ static conftable copy_conftab[] = { - - static cmdtable copy_cmdtab[] = { - { CMD, C_SITE, G_WRITE, copy_copy, FALSE, FALSE, CL_MISC }, -- { CMD, C_SITE, G_DIRS, copy_cpfr, FALSE, FALSE, CL_MISC }, -+ { CMD, C_SITE, G_READ, copy_cpfr, FALSE, FALSE, CL_MISC }, - { CMD, C_SITE, G_WRITE, copy_cpto, FALSE, FALSE, CL_MISC }, - { POST_CMD, C_PASS, G_NONE, copy_post_pass, FALSE, FALSE }, - { LOG_CMD, C_SITE, G_NONE, copy_log_site, FALSE, FALSE }, -diff --git a/tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm b/tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm -index 778bff839..2018e71bc 100644 ---- a/tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm -+++ b/tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm -@@ -121,6 +121,15 @@ my $TESTS = { - test_class => [qw(bug forking)], - }, - -+ copy_cpfr_config_limit_read_bug4372 => { -+ order => ++$order, -+ test_class => [qw(bug forking)], -+ }, -+ -+ copy_cpto_config_limit_write_bug4372 => { -+ order => ++$order, -+ test_class => [qw(bug forking)], -+ }, - }; - - sub new { -@@ -3248,6 +3257,12 @@ sub copy_config_limit_bug3399 { - - my ($port, $config_user, $config_group) = config_write($config_file, $config); - -+ my $config_subdir = $sub_dir; -+ if ($^O eq 'darwin') { -+ # MacOSX hack -+ $config_subdir = '/private' . $sub_dir; -+ } -+ - if (open(my $fh, ">> $config_file")) { - print $fh < -@@ -3256,7 +3271,7 @@ sub copy_config_limit_bug3399 { - - - -- -+ - - AllowAll - -@@ -3652,4 +3667,240 @@ sub copy_cpto_timeout_bug4263 { - test_cleanup($setup->{log_file}, $ex); - } - -+sub copy_cpfr_config_limit_read_bug4372 { -+ my $self = shift; -+ my $tmpdir = $self->{tmpdir}; -+ my $setup = test_setup($tmpdir, 'copy'); -+ -+ my $src_file = File::Spec->rel2abs("$tmpdir/foo.dat"); -+ if (open(my $fh, "> $src_file")) { -+ unless (close($fh)) { -+ die("Can't write $src_file: $!"); -+ } -+ -+ } else { -+ die("Can't open $src_file: $!"); -+ } -+ -+ my $config = { -+ PidFile => $setup->{pid_file}, -+ ScoreboardFile => $setup->{scoreboard_file}, -+ SystemLog => $setup->{log_file}, -+ TraceLog => $setup->{log_file}, -+ Trace => 'copy:20 timer:20', -+ -+ AuthUserFile => $setup->{auth_user_file}, -+ AuthGroupFile => $setup->{auth_group_file}, -+ TimeoutIdle => 3, -+ -+ IfModules => { -+ 'mod_delay.c' => { -+ DelayEngine => 'off', -+ }, -+ }, -+ }; -+ -+ my ($port, $config_user, $config_group) = config_write($setup->{config_file}, -+ $config); -+ -+ if (open(my $fh, ">> $setup->{config_file}")) { -+ print $fh < -+ -+ DenyAll -+ -+ -+EOC -+ unless (close($fh)) { -+ die("Can't write $setup->{config_file}: $!"); -+ } -+ -+ } else { -+ die("Can't open $setup->{config_file}: $!"); -+ } -+ -+ # Open pipes, for use between the parent and child processes. Specifically, -+ # the child will indicate when it's done with its test by writing a message -+ # to the parent. -+ my ($rfh, $wfh); -+ unless (pipe($rfh, $wfh)) { -+ die("Can't open pipe: $!"); -+ } -+ -+ my $ex; -+ -+ # Fork child -+ $self->handle_sigchld(); -+ defined(my $pid = fork()) or die("Can't fork: $!"); -+ if ($pid) { -+ eval { -+ my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port, 0, 1); -+ $client->login($setup->{user}, $setup->{passwd}); -+ -+ eval { $client->site('CPFR', 'foo.dat') }; -+ unless ($@) { -+ die("SITE CPFR succeeded unexpectedly"); -+ } -+ -+ my $resp_code = $client->response_code(); -+ my $resp_msg = $client->response_msg(); -+ -+ my $expected = 550; -+ $self->assert($expected == $resp_code, -+ test_msg("Expected response code $expected, got $resp_code")); -+ -+ $expected = 'Operation not permitted'; -+ $self->assert(qr/$expected/, $resp_msg, -+ test_msg("Expected response message '$expected', got '$resp_msg'")); -+ -+ $client->quit(); -+ }; -+ if ($@) { -+ $ex = $@; -+ } -+ -+ $wfh->print("done\n"); -+ $wfh->flush(); -+ -+ } else { -+ eval { server_wait($setup->{config_file}, $rfh, 30) }; -+ if ($@) { -+ warn($@); -+ exit 1; -+ } -+ -+ exit 0; -+ } -+ -+ # Stop server -+ server_stop($setup->{pid_file}); -+ $self->assert_child_ok($pid); -+ -+ test_cleanup($setup->{log_file}, $ex); -+} -+ -+sub copy_cpto_config_limit_write_bug4372 { -+ my $self = shift; -+ my $tmpdir = $self->{tmpdir}; -+ my $setup = test_setup($tmpdir, 'copy'); -+ -+ my $src_file = File::Spec->rel2abs("$tmpdir/foo.dat"); -+ if (open(my $fh, "> $src_file")) { -+ unless (close($fh)) { -+ die("Can't write $src_file: $!"); -+ } -+ -+ } else { -+ die("Can't open $src_file: $!"); -+ } -+ -+ my $dst_file = File::Spec->rel2abs("$tmpdir/bar.dat"); -+ -+ my $config = { -+ PidFile => $setup->{pid_file}, -+ ScoreboardFile => $setup->{scoreboard_file}, -+ SystemLog => $setup->{log_file}, -+ TraceLog => $setup->{log_file}, -+ Trace => 'copy:20 timer:20', -+ -+ AuthUserFile => $setup->{auth_user_file}, -+ AuthGroupFile => $setup->{auth_group_file}, -+ TimeoutIdle => 3, -+ -+ IfModules => { -+ 'mod_delay.c' => { -+ DelayEngine => 'off', -+ }, -+ }, -+ }; -+ -+ my ($port, $config_user, $config_group) = config_write($setup->{config_file}, -+ $config); -+ -+ if (open(my $fh, ">> $setup->{config_file}")) { -+ print $fh < -+ -+ DenyAll -+ -+ -+EOC -+ unless (close($fh)) { -+ die("Can't write $setup->{config_file}: $!"); -+ } -+ -+ } else { -+ die("Can't open $setup->{config_file}: $!"); -+ } -+ -+ # Open pipes, for use between the parent and child processes. Specifically, -+ # the child will indicate when it's done with its test by writing a message -+ # to the parent. -+ my ($rfh, $wfh); -+ unless (pipe($rfh, $wfh)) { -+ die("Can't open pipe: $!"); -+ } -+ -+ my $ex; -+ -+ # Fork child -+ $self->handle_sigchld(); -+ defined(my $pid = fork()) or die("Can't fork: $!"); -+ if ($pid) { -+ eval { -+ my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port, 0, 1); -+ $client->login($setup->{user}, $setup->{passwd}); -+ -+ my ($resp_code, $resp_msg) = $client->site('CPFR', 'foo.dat'); -+ -+ my $expected = 350; -+ $self->assert($expected == $resp_code, -+ test_msg("Expected response code $expected, got $resp_code")); -+ -+ $expected = 'File or directory exists, ready for destination name'; -+ $self->assert($expected eq $resp_msg, -+ test_msg("Expected response message '$expected', got '$resp_msg'")); -+ -+ eval { $client->site('CPTO', 'bar.dat') }; -+ unless ($@) { -+ die('SITE CPTO succeeded unexpectedly'); -+ } -+ -+ my $resp_code = $client->response_code(); -+ my $resp_msg = $client->response_msg(); -+ -+ my $expected = 550; -+ $self->assert($expected == $resp_code, -+ test_msg("Expected response code $expected, got $resp_code")); -+ -+ $expected = 'Operation not permitted'; -+ $self->assert(qr/$expected/, $resp_msg, -+ test_msg("Expected response message '$expected', got '$resp_msg'")); -+ -+ $client->quit(); -+ }; -+ if ($@) { -+ $ex = $@; -+ } -+ -+ $wfh->print("done\n"); -+ $wfh->flush(); -+ -+ } else { -+ eval { server_wait($setup->{config_file}, $rfh, 30) }; -+ if ($@) { -+ warn($@); -+ exit 1; -+ } -+ -+ exit 0; -+ } -+ -+ # Stop server -+ server_stop($setup->{pid_file}); -+ $self->assert_child_ok($pid); -+ -+ test_cleanup($setup->{log_file}, $ex); -+} -+ - 1; diff --git a/buildroot/package/proftpd/Config.in b/buildroot/package/proftpd/Config.in index edec37c8d..4a544f0c5 100644 --- a/buildroot/package/proftpd/Config.in +++ b/buildroot/package/proftpd/Config.in @@ -8,6 +8,12 @@ config BR2_PACKAGE_PROFTPD if BR2_PACKAGE_PROFTPD +config BR2_PACKAGE_PROFTPD_MOD_CAP + bool "mod_cap support" + select BR2_PACKAGE_LIBCAP + help + Compile ProFTPD with mod_cap support + config BR2_PACKAGE_PROFTPD_MOD_REWRITE bool "mod_rewrite support" help diff --git a/buildroot/package/proftpd/proftpd.hash b/buildroot/package/proftpd/proftpd.hash index 47bc8fe81..1ac54de4c 100644 --- a/buildroot/package/proftpd/proftpd.hash +++ b/buildroot/package/proftpd/proftpd.hash @@ -1,5 +1,3 @@ -# From ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6.tar.gz.md5 -md5 13270911c42aac842435f18205546a1b proftpd-1.3.6.tar.gz # Locally calculated -sha256 91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf proftpd-1.3.6.tar.gz -sha256 391a473d755c29b5326fb726326ff3c37e42512f53a8f5789fc310232150bf80 COPYING +sha256 fa3541c4b34136a7b80cb12a2f6f9a0cab5118a5b0a1653d40af49c6479c35ad proftpd-1.3.6c.tar.gz +sha256 391a473d755c29b5326fb726326ff3c37e42512f53a8f5789fc310232150bf80 COPYING diff --git a/buildroot/package/proftpd/proftpd.mk b/buildroot/package/proftpd/proftpd.mk index 67d8eb8c6..946a37d69 100644 --- a/buildroot/package/proftpd/proftpd.mk +++ b/buildroot/package/proftpd/proftpd.mk @@ -4,8 +4,8 @@ # ################################################################################ -PROFTPD_VERSION = 1.3.6 -PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source +PROFTPD_VERSION = 1.3.6c +PROFTPD_SITE = $(call github,proftpd,proftpd,v$(PROFTPD_VERSION)) PROFTPD_LICENSE = GPL-2.0+ PROFTPD_LICENSE_FILES = COPYING @@ -25,6 +25,13 @@ PROFTPD_CONF_OPTS = \ --with-gnu-ld \ --without-openssl-cmdline +ifeq ($(BR2_PACKAGE_PROFTPD_MOD_CAP),y) +PROFTPD_CONF_OPTS += --enable-cap +PROFTPD_DEPENDENCIES += libcap +else +PROFTPD_CONF_OPTS += --disable-cap +endif + ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y) PROFTPD_MODULES += mod_rewrite endif @@ -85,12 +92,6 @@ define PROFTPD_USE_LLU endef PROFTPD_PRE_CONFIGURE_HOOKS += PROFTPD_USE_LLU -define PROFTPD_MAKENAMES - $(MAKE1) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" -C $(@D)/lib/libcap _makenames -endef - -PROFTPD_POST_CONFIGURE_HOOKS = PROFTPD_MAKENAMES - PROFTPD_MAKE = $(MAKE1) # install Perl based scripts in target @@ -123,9 +124,6 @@ endef define PROFTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/proftpd/proftpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/proftpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/proftpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/proftpd.service endef ifneq ($(BR2_PACKAGE_PROFTPD_BUFFER_SIZE),0) diff --git a/buildroot/package/proj/Config.in b/buildroot/package/proj/Config.in index 788aee831..1952fc7d9 100644 --- a/buildroot/package/proj/Config.in +++ b/buildroot/package/proj/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_PROJ bool "proj" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + select BR2_PACKAGE_SQLITE help proj.4 is a standard UNIX filter function which converts geographic longitude and latitude coordinates into cartesian @@ -10,5 +14,7 @@ config BR2_PACKAGE_PROJ http://proj4.org/ -comment "proj needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "proj needs a toolchain w/ C++, gcc >= 4.7, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/buildroot/package/proj/proj.hash b/buildroot/package/proj/proj.hash index aadbc385d..ade9502b6 100644 --- a/buildroot/package/proj/proj.hash +++ b/buildroot/package/proj/proj.hash @@ -1,5 +1,5 @@ -# Fetched from http://download.osgeo.org/proj/proj-4.9.3.tar.gz.md5 -md5 15c8d7d6a8cb945c7878d0ff322a232c proj-5.0.1.tar.gz +# Fetched from http://download.osgeo.org/proj/proj-6.3.0.tar.gz.md5 +md5 09243feb4f243a2bdd455035a2007384 proj-6.3.0.tar.gz # Locally calculated -sha256 a792f78897482ed2c4e2af4e8a1a02e294c64e32b591a635c5294cb9d49fdc8c proj-5.0.1.tar.gz +sha256 68ce9ba0005d442c2c1d238a3b9bc6654c358159b4af467b91e8d5b407c79c77 proj-6.3.0.tar.gz sha256 2dcac4af6990093ef48b896bfb81452d46a31b08d46cce34b27e83f93b2e37f6 COPYING diff --git a/buildroot/package/proj/proj.mk b/buildroot/package/proj/proj.mk index 2969eb57a..2be000402 100644 --- a/buildroot/package/proj/proj.mk +++ b/buildroot/package/proj/proj.mk @@ -4,18 +4,23 @@ # ################################################################################ -PROJ_VERSION = 5.0.1 +PROJ_VERSION = 6.3.0 PROJ_SITE = http://download.osgeo.org/proj PROJ_LICENSE = MIT PROJ_LICENSE_FILES = COPYING PROJ_INSTALL_STAGING = YES +PROJ_DEPENDENCIES = host-pkgconf host-sqlite sqlite PROJ_CFLAGS = $(TARGET_CFLAGS) +PROJ_CXXFLAGS = $(TARGET_CXXFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) PROJ_CFLAGS += -O0 +PROJ_CXXFLAGS += -O0 endif -PROJ_CONF_ENV = CFLAGS="$(PROJ_CFLAGS)" +PROJ_CONF_ENV = \ + CFLAGS="$(PROJ_CFLAGS)" \ + CXXFLAGS="$(PROJ_CXXFLAGS)" $(eval $(autotools-package)) diff --git a/buildroot/package/prosody/prosody.hash b/buildroot/package/prosody/prosody.hash index d7d1d06ed..e39fafde6 100644 --- a/buildroot/package/prosody/prosody.hash +++ b/buildroot/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 2cf85cd8f7fc061916d97a169e850a0e prosody-0.11.3.tar.gz -sha1 87ec8039bf297ba9bc4da44b2ba42f4b035e73ca prosody-0.11.3.tar.gz -sha256 cfdabd6f42a9fc5db300221967c518c26bd4b6e62def721c1626894d6325bf87 prosody-0.11.3.tar.gz -sha512 07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb prosody-0.11.3.tar.gz +md5 375a3737ffd6831d967fb1917f097372 prosody-0.11.4.tar.gz +sha1 59e9e684230c26daf53526e18b0e6e2efb0d63c5 prosody-0.11.4.tar.gz +sha256 b5f26fa343c7f32f6242721d6991cb35f5d2a28d2bf59d2bc329a940523704fd prosody-0.11.4.tar.gz +sha512 0c3aa3373c53f803b88a87dad4ca18b215de7a485d29b0bc4b186d97f7c48262840199a74f62aba6b7b4f1766fdfb37327ed4ff24e877c3a6dfca58764a035c3 prosody-0.11.4.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/buildroot/package/prosody/prosody.mk b/buildroot/package/prosody/prosody.mk index 05ea3d2e4..7245afdc6 100644 --- a/buildroot/package/prosody/prosody.mk +++ b/buildroot/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.3 +PROSODY_VERSION = 0.11.4 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING diff --git a/buildroot/package/protobuf-c/0001-Add-std-to-some-types.patch b/buildroot/package/protobuf-c/0001-Add-std-to-some-types.patch deleted file mode 100644 index 8f1a5d0be..000000000 --- a/buildroot/package/protobuf-c/0001-Add-std-to-some-types.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 034e603d2a5e629c1c3fbac405638f8afb3ead51 Mon Sep 17 00:00:00 2001 -From: Fredrik Gustafsson -Date: Sun, 11 Mar 2018 08:57:46 +0100 -Subject: [PATCH] Add std:: to some types - -This is required for compilation to succeed on debian jessie with g++ -6.3.0. - -Signed-off-by: Fabrice Fontaine -[Retrieved from: https://github.com/protobuf-c/protobuf-c/pull/309] ---- - protoc-c/c_file.h | 2 +- - protoc-c/c_generator.cc | 8 ++++---- - protoc-c/c_helpers.cc | 12 ++++++------ - 3 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/protoc-c/c_file.h b/protoc-c/c_file.h -index ed38ce4..84df522 100644 ---- a/protoc-c/c_file.h -+++ b/protoc-c/c_file.h -@@ -104,7 +104,7 @@ class FileGenerator { - scoped_array > extension_generators_; - - // E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}. -- vector package_parts_; -+ std::vector package_parts_; - - GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator); - }; -diff --git a/protoc-c/c_generator.cc b/protoc-c/c_generator.cc -index a0d0cb6..79a272f 100644 ---- a/protoc-c/c_generator.cc -+++ b/protoc-c/c_generator.cc -@@ -80,13 +80,13 @@ namespace c { - // "foo=bar,baz,qux=corge" - // parses to the pairs: - // ("foo", "bar"), ("baz", ""), ("qux", "corge") --void ParseOptions(const string& text, vector >* output) { -- vector parts; -+void ParseOptions(const string& text, std::vector >* output) { -+ std::vector parts; - SplitStringUsing(text, ",", &parts); - - for (unsigned i = 0; i < parts.size(); i++) { - string::size_type equals_pos = parts[i].find_first_of('='); -- pair value; -+ std::pair value; - if (equals_pos == string::npos) { - value.first = parts[i]; - value.second = ""; -@@ -105,7 +105,7 @@ bool CGenerator::Generate(const FileDescriptor* file, - const string& parameter, - OutputDirectory* output_directory, - string* error) const { -- vector > options; -+ std::vector > options; - ParseOptions(parameter, &options); - - // ----------------------------------------------------------------- -diff --git a/protoc-c/c_helpers.cc b/protoc-c/c_helpers.cc -index b79b5b0..71b8682 100644 ---- a/protoc-c/c_helpers.cc -+++ b/protoc-c/c_helpers.cc -@@ -177,7 +177,7 @@ string ToCamel(const string &name) { - } - - string FullNameToLower(const string &full_name) { -- vector pieces; -+ std::vector pieces; - SplitStringUsing(full_name, ".", &pieces); - string rv = ""; - for (unsigned i = 0; i < pieces.size(); i++) { -@@ -188,7 +188,7 @@ string FullNameToLower(const string &full_name) { - return rv; - } - string FullNameToUpper(const string &full_name) { -- vector pieces; -+ std::vector pieces; - SplitStringUsing(full_name, ".", &pieces); - string rv = ""; - for (unsigned i = 0; i < pieces.size(); i++) { -@@ -199,7 +199,7 @@ string FullNameToUpper(const string &full_name) { - return rv; - } - string FullNameToC(const string &full_name) { -- vector pieces; -+ std::vector pieces; - SplitStringUsing(full_name, ".", &pieces); - string rv = ""; - for (unsigned i = 0; i < pieces.size(); i++) { -@@ -214,7 +214,7 @@ void PrintComment (io::Printer* printer, string comment) - { - if (!comment.empty()) - { -- vector comment_lines; -+ std::vector comment_lines; - SplitStringUsing (comment, "\r\n", &comment_lines); - printer->Print ("/*\n"); - for (int i = 0; i < comment_lines.size(); i++) -@@ -503,8 +503,8 @@ void SplitStringToIteratorUsing(const string& full, - - void SplitStringUsing(const string& full, - const char* delim, -- vector* result) { -- std::back_insert_iterator< vector > it(*result); -+ std::vector* result) { -+ std::back_insert_iterator< std::vector > it(*result); - SplitStringToIteratorUsing(full, delim, it); - } - diff --git a/buildroot/package/protobuf-c/0002-Fix-build-with-protobuf-3.6.x.patch b/buildroot/package/protobuf-c/0002-Fix-build-with-protobuf-3.6.x.patch deleted file mode 100644 index 1469e0101..000000000 --- a/buildroot/package/protobuf-c/0002-Fix-build-with-protobuf-3.6.x.patch +++ /dev/null @@ -1,160 +0,0 @@ -From 67e5187e96baac2e16d88ac01471c5ce7cdc3c53 Mon Sep 17 00:00:00 2001 -From: ilovezfs -Date: Wed, 20 Jun 2018 08:08:53 -0700 -Subject: [PATCH] Fix build with protobuf 3.6.x - -Adapt to changes from https://github.com/google/protobuf/pull/4387. - -scoped_ptr and scoped_array were removed in favor of std::unique_ptr - -Signed-off-by: Fabrice Fontaine -[Retrieved from: https://github.com/protobuf-c/protobuf-c/pull/328] ---- - protoc-c/c_field.cc | 2 +- - protoc-c/c_field.h | 2 +- - protoc-c/c_file.cc | 8 ++++---- - protoc-c/c_file.h | 8 ++++---- - protoc-c/c_generator.cc | 4 ++-- - protoc-c/c_helpers.cc | 2 +- - protoc-c/c_message.cc | 6 +++--- - protoc-c/c_message.h | 6 +++--- - 8 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/protoc-c/c_field.cc b/protoc-c/c_field.cc -index 9fa56ef..eaa38d2 100644 ---- a/protoc-c/c_field.cc -+++ b/protoc-c/c_field.cc -@@ -189,7 +189,7 @@ void FieldGenerator::GenerateDescriptorInitializerGeneric(io::Printer* printer, - FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor) - : descriptor_(descriptor), - field_generators_( -- new scoped_ptr[descriptor->field_count()]) { -+ new std::unique_ptr[descriptor->field_count()]) { - // Construct all the FieldGenerators. - for (int i = 0; i < descriptor->field_count(); i++) { - field_generators_[i].reset(MakeGenerator(descriptor->field(i))); -diff --git a/protoc-c/c_field.h b/protoc-c/c_field.h -index 91f1a03..efd5a29 100644 ---- a/protoc-c/c_field.h -+++ b/protoc-c/c_field.h -@@ -117,7 +117,7 @@ class FieldGeneratorMap { - - private: - const Descriptor* descriptor_; -- scoped_array > field_generators_; -+ std::unique_ptr[] > field_generators_; - - static FieldGenerator* MakeGenerator(const FieldDescriptor* field); - -diff --git a/protoc-c/c_file.cc b/protoc-c/c_file.cc -index 9851768..6dae516 100644 ---- a/protoc-c/c_file.cc -+++ b/protoc-c/c_file.cc -@@ -83,13 +83,13 @@ FileGenerator::FileGenerator(const FileDescriptor* file, - const string& dllexport_decl) - : file_(file), - message_generators_( -- new scoped_ptr[file->message_type_count()]), -+ new std::unique_ptr[file->message_type_count()]), - enum_generators_( -- new scoped_ptr[file->enum_type_count()]), -+ new std::unique_ptr[file->enum_type_count()]), - service_generators_( -- new scoped_ptr[file->service_count()]), -+ new std::unique_ptr[file->service_count()]), - extension_generators_( -- new scoped_ptr[file->extension_count()]) { -+ new std::unique_ptr[file->extension_count()]) { - - for (int i = 0; i < file->message_type_count(); i++) { - message_generators_[i].reset( -diff --git a/protoc-c/c_file.h b/protoc-c/c_file.h -index ed38ce4..e86cc44 100644 ---- a/protoc-c/c_file.h -+++ b/protoc-c/c_file.h -@@ -98,10 +98,10 @@ class FileGenerator { - private: - const FileDescriptor* file_; - -- scoped_array > message_generators_; -- scoped_array > enum_generators_; -- scoped_array > service_generators_; -- scoped_array > extension_generators_; -+ std::unique_ptr[] > message_generators_; -+ std::unique_ptr[] > enum_generators_; -+ std::unique_ptr[] > service_generators_; -+ std::unique_ptr[] > extension_generators_; - - // E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}. - vector package_parts_; -diff --git a/protoc-c/c_generator.cc b/protoc-c/c_generator.cc -index a0d0cb6..fe3ad26 100644 ---- a/protoc-c/c_generator.cc -+++ b/protoc-c/c_generator.cc -@@ -149,7 +149,7 @@ bool CGenerator::Generate(const FileDescriptor* file, - - // Generate header. - { -- scoped_ptr output( -+ std::unique_ptr output( - output_directory->Open(basename + ".h")); - io::Printer printer(output.get(), '$'); - file_generator.GenerateHeader(&printer); -@@ -157,7 +157,7 @@ bool CGenerator::Generate(const FileDescriptor* file, - - // Generate cc file. - { -- scoped_ptr output( -+ std::unique_ptr output( - output_directory->Open(basename + ".c")); - io::Printer printer(output.get(), '$'); - file_generator.GenerateSource(&printer); -diff --git a/protoc-c/c_helpers.cc b/protoc-c/c_helpers.cc -index b79b5b0..f2ab448 100644 ---- a/protoc-c/c_helpers.cc -+++ b/protoc-c/c_helpers.cc -@@ -559,7 +559,7 @@ static int CEscapeInternal(const char* src, int src_len, char* dest, - } - string CEscape(const string& src) { - const int dest_length = src.size() * 4 + 1; // Maximum possible expansion -- scoped_array dest(new char[dest_length]); -+ std::unique_ptr dest(new char[dest_length]); - const int len = CEscapeInternal(src.data(), src.size(), - dest.get(), dest_length, false); - GOOGLE_DCHECK_GE(len, 0); -diff --git a/protoc-c/c_message.cc b/protoc-c/c_message.cc -index 6b22c71..85a946e 100755 ---- a/protoc-c/c_message.cc -+++ b/protoc-c/c_message.cc -@@ -83,11 +83,11 @@ MessageGenerator::MessageGenerator(const Descriptor* descriptor, - : descriptor_(descriptor), - dllexport_decl_(dllexport_decl), - field_generators_(descriptor), -- nested_generators_(new scoped_ptr[ -+ nested_generators_(new std::unique_ptr[ - descriptor->nested_type_count()]), -- enum_generators_(new scoped_ptr[ -+ enum_generators_(new std::unique_ptr[ - descriptor->enum_type_count()]), -- extension_generators_(new scoped_ptr[ -+ extension_generators_(new std::unique_ptr[ - descriptor->extension_count()]) { - - for (int i = 0; i < descriptor->nested_type_count(); i++) { -diff --git a/protoc-c/c_message.h b/protoc-c/c_message.h -index 8b115d1..63aa97a 100644 ---- a/protoc-c/c_message.h -+++ b/protoc-c/c_message.h -@@ -126,9 +126,9 @@ class MessageGenerator { - const Descriptor* descriptor_; - string dllexport_decl_; - FieldGeneratorMap field_generators_; -- scoped_array > nested_generators_; -- scoped_array > enum_generators_; -- scoped_array > extension_generators_; -+ std::unique_ptr[] > nested_generators_; -+ std::unique_ptr[] > enum_generators_; -+ std::unique_ptr[] > extension_generators_; - - GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator); - }; diff --git a/buildroot/package/protobuf-c/Config.in b/buildroot/package/protobuf-c/Config.in index 6d7e7e11d..a32e6cd9e 100644 --- a/buildroot/package/protobuf-c/Config.in +++ b/buildroot/package/protobuf-c/Config.in @@ -4,14 +4,12 @@ config BR2_PACKAGE_PROTOBUF_C depends on BR2_TOOLCHAIN_HAS_THREADS # host-protobuf only builds on certain architectures depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_HOST_GCC_AT_LEAST_4_8 # host-protobuf help Code generator and runtime libraries to use Protocol Buffers from pure C (not C++). https://github.com/protobuf-c/protobuf-c -comment "protobuf-c needs a toolchain w/ C++, threads, host gcc >= 4.8" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_HOST_GCC_AT_LEAST_4_8 +comment "protobuf-c needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" diff --git a/buildroot/package/protobuf-c/protobuf-c.hash b/buildroot/package/protobuf-c/protobuf-c.hash index e22a9f1c3..4f9c75a02 100644 --- a/buildroot/package/protobuf-c/protobuf-c.hash +++ b/buildroot/package/protobuf-c/protobuf-c.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 fd8f6f5d6927330cf2b8b4ec8332de8b1ee2b8f2480b52ee3f221aad6de2082c protobuf-c-v1.3.0.tar.gz +sha256 5205312e561b75b9d2db671b22f28d67afb5c7d1fef94a6f2d29d775ca4e0519 protobuf-c-1.3.2.tar.gz +sha256 20e800cad4550f4b19bb37fc9577dac21de13333ae66497c4c45ae489c35c34a LICENSE diff --git a/buildroot/package/protobuf-c/protobuf-c.mk b/buildroot/package/protobuf-c/protobuf-c.mk index 34f829441..2770d35b7 100644 --- a/buildroot/package/protobuf-c/protobuf-c.mk +++ b/buildroot/package/protobuf-c/protobuf-c.mk @@ -4,8 +4,8 @@ # ################################################################################ -PROTOBUF_C_VERSION = v1.3.0 -PROTOBUF_C_SITE = $(call github,protobuf-c,protobuf-c,$(PROTOBUF_C_VERSION)) +PROTOBUF_C_VERSION = 1.3.2 +PROTOBUF_C_SITE = $(call github,protobuf-c,protobuf-c,v$(PROTOBUF_C_VERSION)) PROTOBUF_C_DEPENDENCIES = host-protobuf-c HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf PROTOBUF_C_MAKE = $(MAKE1) diff --git a/buildroot/package/protobuf/0001-Fix-to-allow-a-compilation-under-mips-big-endian-wit.patch b/buildroot/package/protobuf/0001-Fix-to-allow-a-compilation-under-mips-big-endian-wit.patch deleted file mode 100644 index d2b34f15e..000000000 --- a/buildroot/package/protobuf/0001-Fix-to-allow-a-compilation-under-mips-big-endian-wit.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d105213bccfa4392eda889a95f808dd9cdf84494 Mon Sep 17 00:00:00 2001 -From: Charles Hardin -Date: Mon, 21 May 2018 09:19:30 -0700 -Subject: [PATCH] Fix to allow a compilation under mips big endian with gcc - -The __MIPSEL__ is mips little endian specific, but we needed to -compile for a big endian mips target that also happened to be a -mips64. This commit replaces the __MIPSEL__ test with a __mips__ test -which preserves the build on little endian and allows building for a -big endian setup. - - $ echo | mips64-linux-gcc -E -dM - - ... snip snip ... - #define __mips__ 1 - #define __MIPSEB__ 1 - -Signed-off-by: Charles Hardin -Upstream-status: https://github.com/google/protobuf/pull/4657 ---- - src/google/protobuf/stubs/platform_macros.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h -index c3a64dd2..f9e2bff6 100644 ---- a/src/google/protobuf/stubs/platform_macros.h -+++ b/src/google/protobuf/stubs/platform_macros.h -@@ -56,7 +56,7 @@ - #elif defined(__aarch64__) - #define GOOGLE_PROTOBUF_ARCH_AARCH64 1 - #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 --#elif defined(__MIPSEL__) -+#elif defined(__mips__) - #if defined(__LP64__) - #define GOOGLE_PROTOBUF_ARCH_MIPS64 1 - #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 --- -2.15.1 (Apple Git-101) - diff --git a/buildroot/package/protobuf/Config.in b/buildroot/package/protobuf/Config.in index 2829b2a5a..46c820b9c 100644 --- a/buildroot/package/protobuf/Config.in +++ b/buildroot/package/protobuf/Config.in @@ -30,7 +30,6 @@ config BR2_PACKAGE_PROTOBUF depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on !BR2_STATIC_LIBS help @@ -40,8 +39,7 @@ config BR2_PACKAGE_PROTOBUF https://developers.google.com/protocol-buffers -comment "protobuf needs a toolchain w/ C++, threads, dynamic library, host and target gcc >= 4.8" +comment "protobuf needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_4_8 \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/buildroot/package/protobuf/protobuf.hash b/buildroot/package/protobuf/protobuf.hash index bcd1f64de..5ebf99a99 100644 --- a/buildroot/package/protobuf/protobuf.hash +++ b/buildroot/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c3cab055964d554e4fd85067fe3e9eb45c9915cebcf537e97fafaa245376bce1 protobuf-cpp-3.6.0.tar.gz -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE +sha256 5abfd5bf11dc0a14bb2303883fa76ecde48a4b447eb2f9f90b84592ce8b8707c protobuf-cpp-3.11.0.tar.gz +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE diff --git a/buildroot/package/protobuf/protobuf.mk b/buildroot/package/protobuf/protobuf.mk index 919aae5b7..ed21f13c4 100644 --- a/buildroot/package/protobuf/protobuf.mk +++ b/buildroot/package/protobuf/protobuf.mk @@ -7,7 +7,7 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works, as they share the same # version/site variables. -PROTOBUF_VERSION = 3.6.0 +PROTOBUF_VERSION = 3.11.0 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause diff --git a/buildroot/package/proxychains-ng/proxychains-ng.hash b/buildroot/package/proxychains-ng/proxychains-ng.hash index 7ca4d5e27..9781b77af 100644 --- a/buildroot/package/proxychains-ng/proxychains-ng.hash +++ b/buildroot/package/proxychains-ng/proxychains-ng.hash @@ -3,3 +3,4 @@ md5 34d840eb184e96bff418201c28a935c5 proxychains-ng-4.11.tar.bz2 sha1 00bc3dc18f2b638c79112c99f082a7a2878beaad proxychains-ng-4.11.tar.bz2 # Locally computed: sha256 dcc4149808cd1fb5d9663cc09791f478805816b1f017381f424414c47f6376b6 proxychains-ng-4.11.tar.bz2 +sha256 86728623caeff60e9bcc37e03b432fd191de927eed48a72a3bb4ac4e53fe20df COPYING diff --git a/buildroot/package/pru-software-support/pru-software-support.hash b/buildroot/package/pru-software-support/pru-software-support.hash index f4ce8e466..9deb3e666 100644 --- a/buildroot/package/pru-software-support/pru-software-support.hash +++ b/buildroot/package/pru-software-support/pru-software-support.hash @@ -1,2 +1,3 @@ # Locally-calculated hash -sha256 1e880d74f9a1d04324e6255cb7a0e3d40f92e08809dc81dc6c714447bac5c335 pru-software-support-v5.1.0.tar.gz +sha256 d6d1f76ab5a50dbdf1dff834b271f9d3ffa7424e4d9615e00713f3f81ed5787e pru-software-support-package-v5.6.0.tar.gz +sha256 a68530804624227e4f2e007eacb5c2d616695426082e895ee1e2d77d3833f5f7 PRU-Package-v6.0-Manifest.html diff --git a/buildroot/package/pru-software-support/pru-software-support.mk b/buildroot/package/pru-software-support/pru-software-support.mk index f30ff6b5e..b56ac0af1 100644 --- a/buildroot/package/pru-software-support/pru-software-support.mk +++ b/buildroot/package/pru-software-support/pru-software-support.mk @@ -4,10 +4,12 @@ # ################################################################################ -PRU_SOFTWARE_SUPPORT_VERSION = v5.1.0 -PRU_SOFTWARE_SUPPORT_SITE = https://git.ti.com/pru-software-support-package/pru-software-support-package/archive-tarball/$(PRU_SOFTWARE_SUPPORT_VERSION)? +PRU_SOFTWARE_SUPPORT_VERSION = 5.6.0 +# https://git.ti.com/cgit/pru-software-support-package/pru-software-support-package/snapshot/pru-software-support-package-5.6.0.tar.gz +PRU_SOFTWARE_SUPPORT_SITE = https://git.ti.com/cgit/pru-software-support-package/pru-software-support-package/snapshot +PRU_SOFTWARE_SUPPORT_SOURCE = $(PRU_SOFTWARE_SUPPORT_NAME)-package-v$(PRU_SOFTWARE_SUPPORT_VERSION).tar.gz PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3-Clause, GPL-2.0, Public Domain -PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v5.0-Manifest.html +PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v6.0-Manifest.html PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru host-pru-software-support HOST_PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru diff --git a/buildroot/package/pseudo/0001-Fix-mixed-tab-space-indentation.patch b/buildroot/package/pseudo/0001-Fix-mixed-tab-space-indentation.patch deleted file mode 100644 index 6b62c1af9..000000000 --- a/buildroot/package/pseudo/0001-Fix-mixed-tab-space-indentation.patch +++ /dev/null @@ -1,105 +0,0 @@ -From bf4e5310547603bf36e67dc4cba027963f16508e Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Fri, 4 Nov 2016 11:53:48 -0400 -Subject: [PATCH 1/3] Fix mixed tab/space indentation -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -CC="cc -pipe -std=gnu99 -Wall -W -Wextra -fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE -DPSEUDO_PREFIX='"/usr/local"' -DPSEUDO_SUFFIX='""' -DPSEUDO_BINDIR='"bin"' -DPSEUDO_LIBDIR='"lib64"' -DPSEUDO_LOCALSTATEDIR='"var/pseudo"' -DPSEUDO_VERSION='"1.8.1"' -DUSE_MEMORY_DB -DPSEUDO_PASSWD_FALLBACK='""' -DPSEUDO_XATTR_SUPPORT -O2 -g " ./makewrappers "xattr=true" - File "./makewrappers", line 327 - return """/* This function is not called if pseudo is configured --enable-force-async */ - ^ -TabError: inconsistent use of tabs and spaces in indentation - -Signed-off-by: Gaël PORTAY ---- - makewrappers | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/makewrappers b/makewrappers -index e9191ed..303e2cc 100755 ---- a/makewrappers -+++ b/makewrappers -@@ -324,7 +324,7 @@ class Function: - - def maybe_async_skip(self): - if self.async_skip: -- return """/* This function is not called if pseudo is configured --enable-force-async */ -+ return """/* This function is not called if pseudo is configured --enable-force-async */ - #ifdef PSEUDO_FORCE_ASYNC - if (!pseudo_allow_fsync) { - PROFILE_DONE; -@@ -333,7 +333,7 @@ class Function: - #endif - """ % self.async_skip - else: -- return "" -+ return "" - - def comment(self): - """declare self (in a comment)""" -@@ -393,11 +393,11 @@ class Function: - - def rc_format(self): - """the format string to use for the return value""" -- return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['format'] -+ return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['format'] - - def rc_value(self): - """the value to pass for the format string for the return value""" -- return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['value'] -+ return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['value'] - - def rc_decl(self): - """declare rc (if needed)""" -@@ -456,7 +456,7 @@ additional ports to include. - self.name = port - self.subports = [] - self.preports = [] -- print port -+ print port - - if os.path.exists(self.portfile("pseudo_wrappers.c")): - self.wrappers = self.portfile("pseudo_wrappers.c") -@@ -522,11 +522,11 @@ additional ports to include. - return '#define PSEUDO_PORT_%s 1' % string.upper(self.name).replace('/', '_') - - def portdeps(self): -- deps = [] -- if self.wrappers: -- deps.append(self.wrappers) -- if self.portdef_file: -- deps.append(self.portdef_file) -+ deps = [] -+ if self.wrappers: -+ deps.append(self.wrappers) -+ if self.portdef_file: -+ deps.append(self.portdef_file) - if deps: - return 'pseudo_wrappers.o: %s' % ' '.join(deps) - else: -@@ -590,7 +590,7 @@ def main(argv): - - for arg in argv: - name, value = arg.split('=') -- os.environ["port_" + name] = value -+ os.environ["port_" + name] = value - - # error checking helpfully provided by the exception handler - copyright_file = open('guts/COPYRIGHT') -@@ -599,9 +599,9 @@ def main(argv): - - for path in glob.glob('templates/*'): - try: -- print "Considering template: " + path -+ print "Considering template: " + path - source = TemplateFile(path) -- if source.name.endswith('.c') or source.name.endswith('.h'): -+ if source.name.endswith('.c') or source.name.endswith('.h'): - source.emit('copyright') - source.emit('header') - sources.append(source) --- -2.10.1 - diff --git a/buildroot/package/pseudo/0002-Fix-missing-parentheses-at-print.patch b/buildroot/package/pseudo/0002-Fix-missing-parentheses-at-print.patch deleted file mode 100644 index b023fcf83..000000000 --- a/buildroot/package/pseudo/0002-Fix-missing-parentheses-at-print.patch +++ /dev/null @@ -1,190 +0,0 @@ -From 6488a68ca715d8e18f899e536effceb548ed136e Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Fri, 4 Nov 2016 12:23:25 -0400 -Subject: [PATCH 2/3] Fix missing parentheses at print -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -CC="cc -pipe -std=gnu99 -Wall -W -Wextra -fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE -DPSEUDO_PREFIX='"/usr/local"' -DPSEUDO_SUFFIX='""' -DPSEUDO_BINDIR='"bin"' -DPSEUDO_LIBDIR='"lib64"' -DPSEUDO_LOCALSTATEDIR='"var/pseudo"' -DPSEUDO_VERSION='"1.8.1"' -DUSE_MEMORY_DB -DPSEUDO_PASSWD_FALLBACK='""' -DPSEUDO_XATTR_SUPPORT -O2 -g " ./makewrappers "xattr=true" - File "./makewrappers", line 459 - print port - ^ -SyntaxError: Missing parentheses in call to 'print' - -Signed-off-by: Gaël PORTAY ---- - maketables | 12 ++++++------ - makewrappers | 32 ++++++++++++++++---------------- - templatefile.py | 8 ++++---- - 3 files changed, 26 insertions(+), 26 deletions(-) - -diff --git a/maketables b/maketables -index b32312e..0726485 100755 ---- a/maketables -+++ b/maketables -@@ -73,7 +73,7 @@ class DataType: - for col in columns: - indexed = False - if col.startswith("FLAGS"): -- print "Flags: set for %s" % self.name -+ print("Flags: set for %s" % self.name) - self.flags = True - continue - if col.startswith("INDEXED "): -@@ -248,7 +248,7 @@ def main(): - template_file.emit('header') - templates.append(template_file) - except IOError: -- print "Invalid or malformed template %s. Aborting." % path -+ print("Invalid or malformed template %s. Aborting." % path) - exit(1) - - for filename in sys.argv[1:]: -@@ -256,15 +256,15 @@ def main(): - sys.stdout.write("%s: " % filename) - datatype = DataType(filename) - datatypes.append(datatype) -- print datatype.__repr__() -- print "" -+ print(datatype.__repr__()) -+ print("") - -- print "Writing datatypes...", -+ print("Writing datatypes...") - for datatype in datatypes: - # populate various tables and files with each datatype - for template_file in templates: - template_file.emit('body', datatype) -- print "done. Cleaning up." -+ print("done. Cleaning up.") - - for template_file in templates: - # clean up files -diff --git a/makewrappers b/makewrappers -index 303e2cc..bac856b 100755 ---- a/makewrappers -+++ b/makewrappers -@@ -456,7 +456,7 @@ additional ports to include. - self.name = port - self.subports = [] - self.preports = [] -- print port -+ print(port) - - if os.path.exists(self.portfile("pseudo_wrappers.c")): - self.wrappers = self.portfile("pseudo_wrappers.c") -@@ -504,17 +504,17 @@ additional ports to include. - prefuncs = pre.functions() - for name in prefuncs.keys(): - if name in mergedfuncs: -- print "Warning: %s from %s overriding %s" % (name, pre.name, mergedfuncs[name].port) -+ print("Warning: %s from %s overriding %s" % (name, pre.name, mergedfuncs[name].port)) - mergedfuncs[name] = prefuncs[name] - for name in self.funcs.keys(): - if name in mergedfuncs: -- print "Warning: %s from %s overriding %s" % (name, self.name, mergedfuncs[name].port) -+ print("Warning: %s from %s overriding %s" % (name, self.name, mergedfuncs[name].port)) - mergedfuncs[name] = self.funcs[name] - for sub in self.subports: - subfuncs = sub.functions() - for name in subfuncs.keys(): - if name in mergedfuncs: -- print "Warning: %s from %s overriding %s" % (name, sub.name, mergedfuncs[name].port) -+ print("Warning: %s from %s overriding %s" % (name, sub.name, mergedfuncs[name].port)) - mergedfuncs[name] = subfuncs[name] - return mergedfuncs - -@@ -576,11 +576,11 @@ def process_wrapfuncs(port): - func.directory = directory - funcs[func.name] = func - sys.stdout.write(".") -- except Exception, e: -- print "Parsing failed:", e -+ except Exception(e): -+ print("Parsing failed:", e) - exit(1) - funclist.close() -- print "" -+ print("") - return funcs - - def main(argv): -@@ -599,35 +599,35 @@ def main(argv): - - for path in glob.glob('templates/*'): - try: -- print "Considering template: " + path -+ print("Considering template: " + path) - source = TemplateFile(path) - if source.name.endswith('.c') or source.name.endswith('.h'): - source.emit('copyright') - source.emit('header') - sources.append(source) - except IOError: -- print "Invalid or malformed template %s. Aborting." % path -+ print("Invalid or malformed template %s. Aborting." % path) - exit(1) - - try: - port = Port('common', sources) - - except KeyError: -- print "Unknown uname -s result: '%s'." % uname_s -- print "Known system types are:" -- print "%-20s %-10s %s" % ("uname -s", "port name", "description") -+ print("Unknown uname -s result: '%s'." % uname_s) -+ print("Known system types are:") -+ print("%-20s %-10s %s" % ("uname -s", "port name", "description")) - for key in host_ports: -- print "%-20s %-10s %s" % (key, host_ports[key], -- host_descrs[host_ports[key]]) -+ print("%-20s %-10s %s" % (key, host_ports[key], -+ host_descrs[host_ports[key]])) - - # the per-function stuff -- print "Writing functions...", -+ print("Writing functions...") - all_funcs = port.functions() - for name in sorted(all_funcs.keys()): - # populate various tables and files with each function - for source in sources: - source.emit('body', all_funcs[name]) -- print "done. Cleaning up." -+ print("done. Cleaning up.") - - for source in sources: - # clean up files -diff --git a/templatefile.py b/templatefile.py -index 2789b22..abf9a2c 100644 ---- a/templatefile.py -+++ b/templatefile.py -@@ -79,13 +79,13 @@ class TemplateFile: - return - path = Template(self.path).safe_substitute(item) - if os.path.exists(path): -- # print "We don't overwrite existing files." -+ # print("We don't overwrite existing files.") - return - self.file = open(path, 'w') - if not self.file: -- print "Couldn't open '%s' (expanded from %s), " \ -+ print("Couldn't open '%s' (expanded from %s), " \ - "not emitting '%s'." % \ -- (path, self.path, template) -+ (path, self.path, template)) - return - - def emit(self, template, item=None): -@@ -103,7 +103,7 @@ class TemplateFile: - self.file.write(templ.safe_substitute(item)) - self.file.write("\n") - else: -- print "Warning: Unknown template '%s'." % template -+ print("Warning: Unknown template '%s'." % template) - - if self.file_per_item: - if self.file: --- -2.10.1 - diff --git a/buildroot/package/pseudo/0003-Make-it-compatible-with-python3.patch b/buildroot/package/pseudo/0003-Make-it-compatible-with-python3.patch deleted file mode 100644 index 3bb74deac..000000000 --- a/buildroot/package/pseudo/0003-Make-it-compatible-with-python3.patch +++ /dev/null @@ -1,215 +0,0 @@ -From fcc10b1f4a9968af5cda1adb9e449df92939d5f2 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Fri, 4 Nov 2016 15:58:46 -0400 -Subject: [PATCH 3/3] Make it compatible with python3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -Python scripts are now compatible with both version of python, 2 and 3. - -Helped-by: Damien Riegel -Helped-by: Alexandre Leblanc -Signed-off-by: Gaël PORTAY ---- - maketables | 135 ++++++++++++++++++++++++++++++----------------------------- - makewrappers | 8 ++-- - 2 files changed, 73 insertions(+), 70 deletions(-) - -diff --git a/maketables b/maketables -index 0726485..f74f2b1 100755 ---- a/maketables -+++ b/maketables -@@ -51,6 +51,7 @@ value. (This is for consistency with C array bounds.) - import glob - import sys - import string -+import os - from templatefile import TemplateFile - - class DataType: -@@ -58,74 +59,74 @@ class DataType: - - def __init__(self, path): - """read the first line of path, then make tuples of the rest""" -- source = file(path) -- definition = source.readline().rstrip() -- self.name, qualifiers = string.split(definition, ': ', 2) -- if '; ' in qualifiers: -- self.prefix, columns = string.split(qualifiers, '; ') -- else: -- self.prefix = qualifiers -- columns = [] -- self.flags = False -- if len(columns): -- self.columns = [] -- columns = string.split(columns, ', ') -- for col in columns: -- indexed = False -- if col.startswith("FLAGS"): -- print("Flags: set for %s" % self.name) -- self.flags = True -+ with open(path,'r') as source: -+ definition = source.readline().rstrip() -+ self.name, qualifiers = definition.split(': ', 2) -+ if '; ' in qualifiers: -+ self.prefix, columns = qualifiers.split('; ') -+ else: -+ self.prefix = qualifiers -+ columns = [] -+ self.flags = False -+ if len(columns): -+ self.columns = [] -+ columns = columns.split(', ') -+ for col in columns: -+ indexed = False -+ if col.startswith("FLAGS"): -+ print("Flags: set for %s" % self.name) -+ self.flags = True -+ continue -+ if col.startswith("INDEXED "): -+ col = col[8:] -+ indexed = True -+ if "=" in col: -+ name, default = col.split(' = ') -+ else: -+ name, default = col, "" -+ if " " in name: -+ words = name.split(' ') -+ name = words[-1] -+ del words[-1] -+ type = ' '.join(words) -+ else: -+ type = "char *" -+ self.columns.append({"indexed":indexed, "type":type, "name":name, "value":default}) -+ else: -+ self.columns = [] -+ self.data = [] -+ self.comments = [] -+ index = 1 -+ for line in source.readlines(): -+ item = {} -+ if line.startswith('#'): -+ self.comments.append(line.rstrip().replace('#', '')) - continue -- if col.startswith("INDEXED "): -- col = col[8:] -- indexed = True -- if "=" in col: -- name, default = string.split(col, ' = ') -- else: -- name, default = col, "" -- if " " in name: -- words = string.split(name, ' ') -- name = words[-1] -- del words[-1] -- type = ' '.join(words) -- else: -- type = "char *" -- self.columns.append({"indexed":indexed, "type":type, "name":name, "value":default}) -- else: -- self.columns = [] -- self.data = [] -- self.comments = [] -- index = 1 -- for line in source.readlines(): -- item = {} -- if line.startswith('#'): -- self.comments.append(line.rstrip().replace('#', '')) -- continue -- # first entry on the line is the "real" name/id, following hunks -- # are additional columns -- cols = string.split(line.rstrip(), ', ') -- item["name"] = cols.pop(0) -- item["upper"] = item["name"].replace('-', '_').upper() -- column_list = [] -- for col in self.columns: -- if len(cols) > 0: -- value = cols.pop(0) -- if col["indexed"]: -- if not "max" in col: -- col["max"] = value -- if value > col["max"]: -- col["max"] = value -- if not "min" in col: -- col["min"] = value -- if value < col["min"]: -- col["min"] = value -- column_list.append({"name":col["name"], "value":value}) -- else: -- column_list.append({"name":col["name"], "value":col["value"]}) -- item["cols"] = column_list -- item["index"] = index -- index = index + 1 -- self.data.append(item) -+ # first entry on the line is the "real" name/id, following hunks -+ # are additional columns -+ cols = line.rstrip().split(', ') -+ item["name"] = cols.pop(0) -+ item["upper"] = item["name"].replace('-', '_').upper() -+ column_list = [] -+ for col in self.columns: -+ if len(cols) > 0: -+ value = cols.pop(0) -+ if col["indexed"]: -+ if not "max" in col: -+ col["max"] = value -+ if value > col["max"]: -+ col["max"] = value -+ if not "min" in col: -+ col["min"] = value -+ if value < col["min"]: -+ col["min"] = value -+ column_list.append({"name":col["name"], "value":value}) -+ else: -+ column_list.append({"name":col["name"], "value":col["value"]}) -+ item["cols"] = column_list -+ item["index"] = index -+ index = index + 1 -+ self.data.append(item) - - def __getitem__(self, key): - """Make this object look like a dict for Templates to use""" -diff --git a/makewrappers b/makewrappers -index bac856b..ff08ba0 100755 ---- a/makewrappers -+++ b/makewrappers -@@ -453,6 +453,8 @@ additional ports to include. - """ - - def __init__(self, port, sources): -+ if type(port) is not str: -+ port = str(port, encoding="ascii") - self.name = port - self.subports = [] - self.preports = [] -@@ -483,7 +485,7 @@ additional ports to include. - if retcode: - raise Exception("preports script failed for port %s" % self.name) - -- for preport in string.split(portlist): -+ for preport in portlist.split(): - next = Port(preport, sources) - self.preports.append(next) - -@@ -494,7 +496,7 @@ additional ports to include. - if retcode: - raise Exception("subports script failed for port %s" % self.name) - -- for subport in string.split(portlist): -+ for subport in portlist.split(): - next = Port(subport, sources) - self.subports.append(next) - -@@ -519,7 +521,7 @@ additional ports to include. - return mergedfuncs - - def define(self): -- return '#define PSEUDO_PORT_%s 1' % string.upper(self.name).replace('/', '_') -+ return '#define PSEUDO_PORT_%s 1' % self.name.upper().replace('/', '_') - - def portdeps(self): - deps = [] --- -2.10.1 - diff --git a/buildroot/package/pseudo/pseudo.hash b/buildroot/package/pseudo/pseudo.hash deleted file mode 100644 index 1553a293f..000000000 --- a/buildroot/package/pseudo/pseudo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 7d4b767302f118fa1c3f89b551cf3f3f2aa92721dab86ff62f0600a394b8a81a pseudo-45eca34c754d416a38bee90fb2d3c110a0b6cc5f.tar.gz diff --git a/buildroot/package/pseudo/pseudo.mk b/buildroot/package/pseudo/pseudo.mk deleted file mode 100644 index 446427109..000000000 --- a/buildroot/package/pseudo/pseudo.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# pseudo -# -################################################################################ - -PSEUDO_VERSION = 45eca34c754d416a38bee90fb2d3c110a0b6cc5f -PSEUDO_SITE = https://git.yoctoproject.org/git/pseudo -PSEUDO_SITE_METHOD = git - -# No "or later" clause. -PSEUDO_LICENSE = LGPL-2.1 -PSEUDO_LICENSE_FILES = COPYING - -HOST_PSEUDO_DEPENDENCIES = host-attr host-sqlite - -# configure script is not generated by autoconf, so passing --libdir -# is necessary, even if the infrastructure passes --prefix already. -# It also does not use CFLAGS from the environment, they need to be -# specified with a custom --cflags option. Also force rpath to avoid -# a warning at configure time. -HOST_PSEUDO_CONF_OPTS = \ - --cflags="$(HOSTCFLAGS)" \ - --with-rpath=$(HOST_DIR)/lib \ - --bits=$(if $(filter %64,$(HOSTARCH)),64,32) \ - --libdir=$(HOST_DIR)/lib \ - --with-sqlite=$(HOST_DIR) - -$(eval $(host-autotools-package)) diff --git a/buildroot/package/psplash/psplash.mk b/buildroot/package/psplash/psplash.mk index 4a2e0de5c..3dd2f4d57 100644 --- a/buildroot/package/psplash/psplash.mk +++ b/buildroot/package/psplash/psplash.mk @@ -13,15 +13,9 @@ PSPLASH_AUTORECONF = YES define PSPLASH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/psplash/psplash-start.service \ $(TARGET_DIR)/usr/lib/systemd/system/psplash-start.service - $(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -sf ../../../../usr/lib/systemd/system/psplash-start.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/ $(INSTALL) -D -m 644 package/psplash/psplash-quit.service \ $(TARGET_DIR)/usr/lib/systemd/system/psplash-quit.service - $(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/psplash-quit.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ endef $(eval $(autotools-package)) diff --git a/buildroot/package/ptm2human/Config.in b/buildroot/package/ptm2human/Config.in new file mode 100644 index 000000000..3d364394f --- /dev/null +++ b/buildroot/package/ptm2human/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_PTM2HUMAN_ARCH_SUPPORTS + bool + default y if BR2_arm + default y if BR2_armeb + default y if BR2_aarch64 + default y if BR2_aarch64_be + +config BR2_PACKAGE_PTM2HUMAN + bool "ptm2human" + depends on BR2_PACKAGE_PTM2HUMAN_ARCH_SUPPORTS + help + ptm2human is a decoder for trace data outputted by Program + Trace Macrocell (PTM) and Embedded Trace Macrocell + (ETMv4). It deconstructs ID packets and data packets + from the formatter of ARM Coresight ETB, and then + translates the trace data to a human-readable format. + + https://github.com/hwangcc23/ptm2human diff --git a/buildroot/package/ptm2human/ptm2human.hash b/buildroot/package/ptm2human/ptm2human.hash new file mode 100644 index 000000000..5546ef401 --- /dev/null +++ b/buildroot/package/ptm2human/ptm2human.hash @@ -0,0 +1,3 @@ +# Computed locally +sha256 28947eeb458d8b6a362cbeb8c5cb6098006274af04ebb4f5da70eac89f927d95 ptm2human-d0b8b6be9897ea5b04fd6460038a4773cec078bc.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/buildroot/package/ptm2human/ptm2human.mk b/buildroot/package/ptm2human/ptm2human.mk new file mode 100644 index 000000000..28a7b7ab4 --- /dev/null +++ b/buildroot/package/ptm2human/ptm2human.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# ptm2human +# +################################################################################ + +PTM2HUMAN_VERSION = d0b8b6be9897ea5b04fd6460038a4773cec078bc +PTM2HUMAN_SITE = $(call github,hwangcc23,ptm2human,$(PTM2HUMAN_VERSION)) +PTM2HUMAN_LICENSE = GPL-2.0 +PTM2HUMAN_LICENSE_FILES = LICENSE + +# Straight out from an non-autoconfigured git tree: +PTM2HUMAN_AUTORECONF = YES + +$(eval $(autotools-package)) diff --git a/buildroot/package/ptpd/ptpd.hash b/buildroot/package/ptpd/ptpd.hash index ccd1d84c3..199f93fc6 100644 --- a/buildroot/package/ptpd/ptpd.hash +++ b/buildroot/package/ptpd/ptpd.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 a7c6ea83bd53da75ae04a7b7a25fe7c597b4e9ff1f93d46f4502e3fa8a2cb950 ptpd-1.1.0.tar.gz +sha256 be69f30947abef91e0bce161005fe56b116b770e459e3e6980279349de47c366 COPYRIGHT diff --git a/buildroot/package/ptpd/ptpd.mk b/buildroot/package/ptpd/ptpd.mk index dad8ccfe1..49587231e 100644 --- a/buildroot/package/ptpd/ptpd.mk +++ b/buildroot/package/ptpd/ptpd.mk @@ -25,9 +25,6 @@ endef define PTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/ptpd/ptpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/ptpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/ptpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ptpd.service endef $(eval $(generic-package)) diff --git a/buildroot/package/ptpd2/ptpd2.hash b/buildroot/package/ptpd2/ptpd2.hash index af1f78a5a..b29ce2a0d 100644 --- a/buildroot/package/ptpd2/ptpd2.hash +++ b/buildroot/package/ptpd2/ptpd2.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 267ad61d09d97069acec5d4878dceda20d0ddbebd27557d80230847848cee6c2 ptpd2-ptpd-2.3.1.tar.gz +sha256 267ad61d09d97069acec5d4878dceda20d0ddbebd27557d80230847848cee6c2 ptpd2-2.3.1.tar.gz +sha256 5e101ac565a8e74ef4efbf7e0c95ef9333e00618c05dbf5fb4ed50a5bab1ff09 COPYRIGHT diff --git a/buildroot/package/ptpd2/ptpd2.mk b/buildroot/package/ptpd2/ptpd2.mk index c0c414ae8..0de336464 100644 --- a/buildroot/package/ptpd2/ptpd2.mk +++ b/buildroot/package/ptpd2/ptpd2.mk @@ -4,8 +4,8 @@ # ################################################################################ -PTPD2_VERSION = ptpd-2.3.1 -PTPD2_SITE = $(call github,ptpd,ptpd,$(PTPD2_VERSION)) +PTPD2_VERSION = 2.3.1 +PTPD2_SITE = $(call github,ptpd,ptpd,ptpd-$(PTPD2_VERSION)) PTPD2_DEPENDENCIES = libpcap PTPD2_CONF_OPTS = --with-pcap-config=$(STAGING_DIR)/usr/bin/pcap-config # configure not shipped @@ -32,9 +32,6 @@ endef define PTPD2_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/ptpd2/ptpd2.service \ $(TARGET_DIR)/usr/lib/systemd/system/ptpd2.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/ptpd2.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ptpd2.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/pugixml/pugixml.hash b/buildroot/package/pugixml/pugixml.hash index fb6566dab..79ae75e83 100644 --- a/buildroot/package/pugixml/pugixml.hash +++ b/buildroot/package/pugixml/pugixml.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6 pugixml-1.9.tar.gz -sha256 5f2318fdea73711b4761fd395462a51dc7d4626088ebaa41732b598821ac935a readme.txt +sha256 55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a pugixml-1.10.tar.gz +sha256 16582559c91ecf831d6289d472a903032e7d7994a86521c5c39513568d6ad208 readme.txt diff --git a/buildroot/package/pugixml/pugixml.mk b/buildroot/package/pugixml/pugixml.mk index 8edaddd82..800a3836c 100644 --- a/buildroot/package/pugixml/pugixml.mk +++ b/buildroot/package/pugixml/pugixml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUGIXML_VERSION = 1.9 +PUGIXML_VERSION = 1.10 PUGIXML_SITE = http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = readme.txt @@ -15,6 +15,7 @@ PUGIXML_INSTALL_STAGING = YES # force-enable this option to support older gcc versions. See also: # https://gcc.gnu.org/onlinedocs/gcc/Long-Long.html PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG +HOST_PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),) PUGIXML_BUILD_DEFINES += PUGIXML_NO_XPATH @@ -30,4 +31,9 @@ ifdef PUGIXML_BUILD_DEFINES PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" endif +HOST_PUGIXML_CONF_OPTS += \ + -DBUILD_PKGCONFIG=ON \ + -DBUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" + $(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/buildroot/package/pulseaudio/pulseaudio.hash b/buildroot/package/pulseaudio/pulseaudio.hash index 7e1ea1606..11d9a275c 100644 --- a/buildroot/package/pulseaudio/pulseaudio.hash +++ b/buildroot/package/pulseaudio/pulseaudio.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2018-July/030280.html -sha256 809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055 pulseaudio-12.2.tar.xz +# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2019-September/031373.html +sha256 961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057 pulseaudio-13.0.tar.xz # Locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 GPL sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL diff --git a/buildroot/package/pulseaudio/pulseaudio.mk b/buildroot/package/pulseaudio/pulseaudio.mk index c91af2293..e64aa6f97 100644 --- a/buildroot/package/pulseaudio/pulseaudio.mk +++ b/buildroot/package/pulseaudio/pulseaudio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PULSEAUDIO_VERSION = 12.2 +PULSEAUDIO_VERSION = 13.0 PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases PULSEAUDIO_INSTALL_STAGING = YES @@ -13,10 +13,12 @@ PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL PULSEAUDIO_CONF_OPTS = \ --disable-default-build-tests \ --disable-legacy-database-entry-format \ - --disable-manpages + --disable-manpages \ + --disable-running-from-build-tree PULSEAUDIO_DEPENDENCIES = \ - host-pkgconf libtool libsndfile speex host-intltool \ + host-pkgconf libtool libsndfile speex \ + $(TARGET_NLS_DEPENDENCIES) \ $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \ $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \ $(if $(BR2_PACKAGE_DBUS),dbus) \ @@ -82,13 +84,6 @@ else PULSEAUDIO_CONF_OPTS += --without-soxr endif -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_SBC),yy) -PULSEAUDIO_CONF_OPTS += --enable-bluez4 -PULSEAUDIO_DEPENDENCIES += bluez_utils sbc -else -PULSEAUDIO_CONF_OPTS += --disable-bluez4 -endif - ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy) PULSEAUDIO_CONF_OPTS += --enable-bluez5 PULSEAUDIO_DEPENDENCIES += bluez5_utils sbc @@ -173,9 +168,6 @@ endef define PULSEAUDIO_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/pulseaudio/pulseaudio.service \ $(TARGET_DIR)/usr/lib/systemd/system/pulseaudio.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/pulseaudio.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/pulseaudio.service endef endif diff --git a/buildroot/package/pulseview/Config.in b/buildroot/package/pulseview/Config.in index 01e522e1c..ea9bdc260 100644 --- a/buildroot/package/pulseview/Config.in +++ b/buildroot/package/pulseview/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_PULSEVIEW depends on !BR2_STATIC_LIBS # libsigrok depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBSIGROK select BR2_PACKAGE_LIBSIGROKCXX @@ -26,9 +27,10 @@ config BR2_PACKAGE_PULSEVIEW http://sigrok.org/wiki/PulseView -comment "pulseview needs a toolchain w/ locale, wchar, threads, dynamic library, C++, gcc >= 4.9" +comment "pulseview needs a toolchain w/ locale, wchar, threads, dynamic library, C++, gcc >= 4.9, host gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_PACKAGE_QT5 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ - || BR2_STATIC_LIBS || !BR2_ENABLE_LOCALE + || BR2_STATIC_LIBS || !BR2_ENABLE_LOCALE || \ + !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/pulseview/pulseview.hash b/buildroot/package/pulseview/pulseview.hash index 09b9d67bc..27e27ce1c 100644 --- a/buildroot/package/pulseview/pulseview.hash +++ b/buildroot/package/pulseview/pulseview.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 9ee7ce3dd1457c6a5f5e4e9c2469903a1f070ba077ea68535cc29ef1dfac6f2f pulseview-0.4.1.tar.gz +sha256 9ee7ce3dd1457c6a5f5e4e9c2469903a1f070ba077ea68535cc29ef1dfac6f2f pulseview-0.4.1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/pure-ftpd/0001-cross.patch b/buildroot/package/pure-ftpd/0001-cross.patch deleted file mode 100644 index f8b1d81da..000000000 --- a/buildroot/package/pure-ftpd/0001-cross.patch +++ /dev/null @@ -1,25 +0,0 @@ -Do not include host paths when cross-compiling. - -Signed-off-by: Bernd Kuhls - -diff -uNr pure-ftpd-1.0.36.org/configure pure-ftpd-1.0.36/configure ---- pure-ftpd-1.0.36.org/configure 2012-03-16 06:29:23.000000000 +0100 -+++ pure-ftpd-1.0.36/configure 2014-09-28 19:55:56.650529713 +0200 -@@ -6319,17 +6319,6 @@ - - - --if test -d /usr/local/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --if test -d /usr/kerberos/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" --fi -- --if test -d /usr/local/lib; then -- LDFLAGS="$LDFLAGS -L/usr/local/lib" --fi - - if uname | fgrep SunOS > /dev/null 2> /dev/null ; then - CPPFLAGS="$CPPFLAGS -D_XPG4_2=1" diff --git a/buildroot/package/pure-ftpd/0001-listdir-reuse-a-single-buffer-to-store-every-file-name-to-display.patch b/buildroot/package/pure-ftpd/0001-listdir-reuse-a-single-buffer-to-store-every-file-name-to-display.patch new file mode 100644 index 000000000..2f791d1d6 --- /dev/null +++ b/buildroot/package/pure-ftpd/0001-listdir-reuse-a-single-buffer-to-store-every-file-name-to-display.patch @@ -0,0 +1,70 @@ +From aea56f4bcb9948d456f3fae4d044fd3fa2e19706 Mon Sep 17 00:00:00 2001 +From: Frank Denis +Date: Mon, 30 Dec 2019 17:40:04 +0100 +Subject: [PATCH] listdir(): reuse a single buffer to store every file name to + display + +Allocating a new buffer for each entry is useless. + +And as these buffers are allocated on the stack, on systems with a +small stack size, with many entries, the limit can easily be reached, +causing a stack exhaustion and aborting the user session. + +Reported by Antonio Morales from the GitHub Security Lab team, thanks! +[Retrieved from: +https://github.com/jedisct1/pure-ftpd/commit/aea56f4bcb9948d456f3fae4d044fd3fa2e19706] +Signed-off-by: Fabrice Fontaine +--- + src/ls.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/src/ls.c b/src/ls.c +index cf804c7..f8a588f 100644 +--- a/src/ls.c ++++ b/src/ls.c +@@ -661,6 +661,8 @@ static void listdir(unsigned int depth, int f, void * const tls_fd, + char *names; + PureFileInfo *s; + PureFileInfo *r; ++ char *alloca_subdir; ++ size_t sizeof_subdir; + int d; + + if (depth >= max_ls_depth || matches >= max_ls_files) { +@@ -690,14 +692,12 @@ static void listdir(unsigned int depth, int f, void * const tls_fd, + } + outputfiles(f, tls_fd); + r = dir; ++ sizeof_subdir = PATH_MAX + 1U; ++ if ((alloca_subdir = ALLOCA(sizeof_subdir)) == NULL) { ++ goto toomany; ++ } + while (opt_R && r != s) { + if (r->name_offset != (size_t) -1 && !chdir(FI_NAME(r))) { +- char *alloca_subdir; +- const size_t sizeof_subdir = PATH_MAX + 1U; +- +- if ((alloca_subdir = ALLOCA(sizeof_subdir)) == NULL) { +- goto toomany; +- } + if (SNCHECK(snprintf(alloca_subdir, sizeof_subdir, "%s/%s", + name, FI_NAME(r)), sizeof_subdir)) { + goto nolist; +@@ -706,8 +706,8 @@ static void listdir(unsigned int depth, int f, void * const tls_fd, + wrstr(f, tls_fd, alloca_subdir); + wrstr(f, tls_fd, ":\r\n\r\n"); + listdir(depth + 1U, f, tls_fd, alloca_subdir); ++ + nolist: +- ALLOCA_FREE(alloca_subdir); + if (matches >= max_ls_files) { + goto toomany; + } +@@ -720,6 +720,7 @@ static void listdir(unsigned int depth, int f, void * const tls_fd, + r++; + } + toomany: ++ ALLOCA_FREE(alloca_subdir); + free(names); + free(dir); + names = NULL; diff --git a/buildroot/package/pure-ftpd/0002-pure_strcmp-len-s2-can-be-len-s1.patch b/buildroot/package/pure-ftpd/0002-pure_strcmp-len-s2-can-be-len-s1.patch new file mode 100644 index 000000000..3de3cbd2c --- /dev/null +++ b/buildroot/package/pure-ftpd/0002-pure_strcmp-len-s2-can-be-len-s1.patch @@ -0,0 +1,30 @@ +From 36c6d268cb190282a2c17106acfd31863121b58e Mon Sep 17 00:00:00 2001 +From: Frank Denis +Date: Mon, 24 Feb 2020 15:19:43 +0100 +Subject: [PATCH] pure_strcmp(): len(s2) can be > len(s1) + +Reported by Antonio Morales from GitHub Security Labs, thanks! +[Retrieved from: +https://github.com/jedisct1/pure-ftpd/commit/36c6d268cb190282a2c17106acfd31863121b] +Signed-off-by: Fabrice Fontaine +--- + src/utils.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/utils.c b/src/utils.c +index f41492d..a7f0381 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -45,5 +45,11 @@ int pure_memcmp(const void * const b1_, const void * const b2_, size_t len) + + int pure_strcmp(const char * const s1, const char * const s2) + { +- return pure_memcmp(s1, s2, strlen(s1) + 1U); ++ const size_t s1_len = strlen(s1); ++ const size_t s2_len = strlen(s2); ++ ++ if (s1_len != s2_len) { ++ return -1; ++ } ++ return pure_memcmp(s1, s2, s1_len); + } diff --git a/buildroot/package/pure-ftpd/0003-diraliases-always-set-the-tail-of-the-list-to-NULL.patch b/buildroot/package/pure-ftpd/0003-diraliases-always-set-the-tail-of-the-list-to-NULL.patch new file mode 100644 index 000000000..6c58eb74a --- /dev/null +++ b/buildroot/package/pure-ftpd/0003-diraliases-always-set-the-tail-of-the-list-to-NULL.patch @@ -0,0 +1,35 @@ +From 8d0d42542e2cb7a56d645fbe4d0ef436e38bcefa Mon Sep 17 00:00:00 2001 +From: Frank Denis +Date: Tue, 18 Feb 2020 18:36:58 +0100 +Subject: [PATCH] diraliases: always set the tail of the list to NULL + +Spotted and reported by Antonio Norales from GitHub Security Labs. +Thanks! + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/jedisct1/pure-ftpd/commit/8d0d42542e2cb7a56d645fbe4d0ef436e38bcefa] +--- + src/diraliases.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/diraliases.c b/src/diraliases.c +index 4002a36..fb70273 100644 +--- a/src/diraliases.c ++++ b/src/diraliases.c +@@ -93,7 +93,6 @@ int init_aliases(void) + (tail->dir = strdup(dir)) == NULL) { + die_mem(); + } +- tail->next = NULL; + } else { + DirAlias *curr; + +@@ -105,6 +104,7 @@ int init_aliases(void) + tail->next = curr; + tail = curr; + } ++ tail->next = NULL; + } + fclose(fp); + aliases_up++; diff --git a/buildroot/package/pure-ftpd/pure-ftpd.hash b/buildroot/package/pure-ftpd/pure-ftpd.hash index f01da51a3..8fe73e4fb 100644 --- a/buildroot/package/pure-ftpd/pure-ftpd.hash +++ b/buildroot/package/pure-ftpd/pure-ftpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 cb1b695e779a06e42d62d7a1a428d2f605d621dfd5afe4e192b5f9fc4e343692 pure-ftpd-1.0.47.tar.bz2 -sha256 e724ba991d8efa4c963e84ec31314c532dab00ac455ef77020fe60e78177bf23 COPYING +sha256 8a727dfef810f275fba3eb6099760d4f8a0bdeae2c1197d0d5bfeb8c1b2f61b6 pure-ftpd-1.0.49.tar.bz2 +sha256 3a9e94382a69d04aa434d69b20ff2c01dbbfcb7191f05f69a7109c0ee1559c19 COPYING diff --git a/buildroot/package/pure-ftpd/pure-ftpd.mk b/buildroot/package/pure-ftpd/pure-ftpd.mk index 6b85b0c65..7b7c7d963 100644 --- a/buildroot/package/pure-ftpd/pure-ftpd.mk +++ b/buildroot/package/pure-ftpd/pure-ftpd.mk @@ -4,17 +4,25 @@ # ################################################################################ -PURE_FTPD_VERSION = 1.0.47 +PURE_FTPD_VERSION = 1.0.49 PURE_FTPD_SITE = https://download.pureftpd.org/pub/pure-ftpd/releases PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2 PURE_FTPD_LICENSE = ISC PURE_FTPD_LICENSE_FILES = COPYING PURE_FTPD_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) +# 0001-listdir-reuse-a-single-buffer-to-store-every-file-name-to-display.patch +PURE_FTPD_IGNORE_CVES += CVE-2019-20176 + +# 0002-pure_strcmp-len-s2-can-be-len-s1.patch +PURE_FTPD_IGNORE_CVES += CVE-2020-9365 + +# 0003-diraliases-always-set-the-tail-of-the-list-to-NULL.patch +PURE_FTPD_IGNORE_CVES += CVE-2020-9274 + PURE_FTPD_CONF_OPTS = \ --with-altlog \ - --with-puredb \ - --with-rfc2640 + --with-puredb ifeq ($(BR2_PACKAGE_ELFUTILS),y) PURE_FTPD_DEPENDENCIES += elfutils @@ -31,6 +39,13 @@ ifeq ($(BR2_PACKAGE_LIBSODIUM),y) PURE_FTPD_DEPENDENCIES += libsodium endif +ifeq ($(BR2_PACKAGE_MYSQL),y) +PURE_FTPD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr +PURE_FTPD_DEPENDENCIES += mysql +else +PURE_FTPD_CONF_OPTS += --without-mysql +endif + ifeq ($(BR2_PACKAGE_OPENLDAP),y) PURE_FTPD_CONF_OPTS += --with-ldap PURE_FTPD_DEPENDENCIES += openldap @@ -46,6 +61,13 @@ else PURE_FTPD_CONF_OPTS += --without-tls endif +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +PURE_FTPD_CONF_OPTS += --with-pgsql=$(STAGING_DIR)/usr +PURE_FTPD_DEPENDENCIES += postgresql +else +PURE_FTPD_CONF_OPTS += --without-pgsql +endif + ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) PURE_FTPD_CONF_ENV += ax_cv_check_cflags___fPIE=no ax_cv_check_ldflags___fPIE=no endif diff --git a/buildroot/package/pv/pv.hash b/buildroot/package/pv/pv.hash index 291d6dd06..1ce1191d5 100644 --- a/buildroot/package/pv/pv.hash +++ b/buildroot/package/pv/pv.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 0ece824e0da27b384d11d1de371f20cafac465e038041adab57fcf4b5036ef8d pv-1.6.0.tar.bz2 +sha256 608ef935f7a377e1439c181c4fc188d247da10d51a19ef79bcdee5043b0973f1 pv-1.6.6.tar.bz2 + +# Hash for license file +sha256 280e182171df3e9bb4a9b407326e88521151fcb8f4f8557255f26177d5900ccf doc/COPYING diff --git a/buildroot/package/pv/pv.mk b/buildroot/package/pv/pv.mk index 0ef5a6f6a..122cc0c5c 100644 --- a/buildroot/package/pv/pv.mk +++ b/buildroot/package/pv/pv.mk @@ -4,7 +4,7 @@ # ################################################################################ -PV_VERSION = 1.6.0 +PV_VERSION = 1.6.6 PV_SOURCE = pv-$(PV_VERSION).tar.bz2 PV_SITE = http://www.ivarch.com/programs/sources PV_LICENSE = Artistic-2.0 diff --git a/buildroot/package/pwgen/pwgen.hash b/buildroot/package/pwgen/pwgen.hash index 2997ed3eb..6dca6363c 100644 --- a/buildroot/package/pwgen/pwgen.hash +++ b/buildroot/package/pwgen/pwgen.hash @@ -1,3 +1,5 @@ -# From http://sourceforge.net/projects/pwgen/files/pwgen/2.07/ -md5 910b1008cdd86445e9e01305d21ee4c5 pwgen-2.07.tar.gz -sha1 51180f9cd5530d79eea18b2443780dec4ec5ea43 pwgen-2.07.tar.gz +# From http://sourceforge.net/projects/pwgen/files/pwgen/2.08/ +md5 6cfba450ac6ff72d11e88a6b0b049165 pwgen-2.08.tar.gz +sha1 6406deba61297784888c2ec0c14e3c735a85a2b6 pwgen-2.08.tar.gz +# Locally computed: +sha256 5d3e49e01ef782be5841d5d1f7fb64d290cd86459598a913818584a46a2f81a1 debian/copyright diff --git a/buildroot/package/pwgen/pwgen.mk b/buildroot/package/pwgen/pwgen.mk index 653adb871..ad9465b82 100644 --- a/buildroot/package/pwgen/pwgen.mk +++ b/buildroot/package/pwgen/pwgen.mk @@ -4,7 +4,7 @@ # ################################################################################ -PWGEN_VERSION = 2.07 +PWGEN_VERSION = 2.08 PWGEN_SITE = http://downloads.sourceforge.net/project/pwgen/pwgen/$(PWGEN_VERSION) PWGEN_LICENSE = GPL-2.0 PWGEN_LICENSE_FILES = debian/copyright diff --git a/buildroot/package/python-aenum/Config.in b/buildroot/package/python-aenum/Config.in new file mode 100644 index 000000000..be3dd0fb9 --- /dev/null +++ b/buildroot/package/python-aenum/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_AENUM + bool "python-aenum" + help + Advanced Enumerations (compatible with Python's stdlib Enum), + NamedTuples, and NamedConstants. + + https://pypi.org/project/aenum diff --git a/buildroot/package/python-aenum/python-aenum.hash b/buildroot/package/python-aenum/python-aenum.hash new file mode 100644 index 000000000..16ee23aba --- /dev/null +++ b/buildroot/package/python-aenum/python-aenum.hash @@ -0,0 +1,4 @@ +# sha256 from https://pypi.org/pypi/aenum/json +sha256 a4334cabf47c167d44ab5a6198837b80deec5d5bad1b5cf70c966c3a330260e8 aenum-2.2.3.tar.gz +# locally calculated +sha256 0db837e38002017b352666c83c8d3216ee5b9b2229375eb2cf4487f8c24e1f8c aenum/LICENSE diff --git a/buildroot/package/python-aenum/python-aenum.mk b/buildroot/package/python-aenum/python-aenum.mk new file mode 100644 index 000000000..1d5322ef4 --- /dev/null +++ b/buildroot/package/python-aenum/python-aenum.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aenum +# +################################################################################ + +PYTHON_AENUM_VERSION = 2.2.3 +PYTHON_AENUM_SOURCE = aenum-$(PYTHON_AENUM_VERSION).tar.gz +PYTHON_AENUM_SITE = https://files.pythonhosted.org/packages/6f/6a/8ed729e0add885d7a559ebb06133029b1f8c4bd66cbf1bdee1ec969fb310 +PYTHON_AENUM_SETUP_TYPE = setuptools +PYTHON_AENUM_LICENSE = BSD-3-Clause +PYTHON_AENUM_LICENSE_FILES = aenum/LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-aioblescan/Config.in b/buildroot/package/python-aioblescan/Config.in new file mode 100644 index 000000000..dd1acfa09 --- /dev/null +++ b/buildroot/package/python-aioblescan/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_AIOBLESCAN + bool "python-aioblescan" + depends on BR2_PACKAGE_PYTHON3 + help + Scanning Bluetooth for advertised info with asyncio. + + https://github.com/frawau/aioblescan diff --git a/buildroot/package/python-aioblescan/python-aioblescan.hash b/buildroot/package/python-aioblescan/python-aioblescan.hash new file mode 100644 index 000000000..902a7a30f --- /dev/null +++ b/buildroot/package/python-aioblescan/python-aioblescan.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aioblescan/json +md5 9ad3f04ea7ad4c81a53f8e1316985527 aioblescan-0.2.6.tar.gz +sha256 2e45c325e070a0ee4e952a7d0c56e95ad230643e1057fb5f3e95ea5c99081436 aioblescan-0.2.6.tar.gz +# Locally computed sha256 checksums +sha256 c2066cd44079e0c706234001af18cb6ad4b62fc68d0d08d29fdc7319916647e0 LICENSE.txt diff --git a/buildroot/package/python-aioblescan/python-aioblescan.mk b/buildroot/package/python-aioblescan/python-aioblescan.mk new file mode 100644 index 000000000..6350007c7 --- /dev/null +++ b/buildroot/package/python-aioblescan/python-aioblescan.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aioblescan +# +################################################################################ + +PYTHON_AIOBLESCAN_VERSION = 0.2.6 +PYTHON_AIOBLESCAN_SOURCE = aioblescan-$(PYTHON_AIOBLESCAN_VERSION).tar.gz +PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/66/b8/888c2eb4323ed498dbc7deeb8aee0cfec9edd8c25184b06a8874bb0cf84f +PYTHON_AIOBLESCAN_SETUP_TYPE = setuptools +PYTHON_AIOBLESCAN_LICENSE = MIT +PYTHON_AIOBLESCAN_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-aioconsole/Config.in b/buildroot/package/python-aioconsole/Config.in new file mode 100644 index 000000000..cd52eecf3 --- /dev/null +++ b/buildroot/package/python-aioconsole/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_AIOCONSOLE + bool "python-aioconsole" + depends on BR2_PACKAGE_PYTHON3 + help + Asynchronous console and interfaces for asyncio. + + https://github.com/vxgmichel/aioconsole diff --git a/buildroot/package/python-aioconsole/python-aioconsole.hash b/buildroot/package/python-aioconsole/python-aioconsole.hash new file mode 100644 index 000000000..28c841cf1 --- /dev/null +++ b/buildroot/package/python-aioconsole/python-aioconsole.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/aioconsole/json +md5 918caf70f00a3fbc8a61cd74579da1c4 aioconsole-0.1.15.tar.gz +sha256 498e567805b74c1ecf4501d28e48727e8e77af8d6a0b8f1b7aa9a4842e02743d aioconsole-0.1.15.tar.gz diff --git a/buildroot/package/python-aioconsole/python-aioconsole.mk b/buildroot/package/python-aioconsole/python-aioconsole.mk new file mode 100644 index 000000000..83c694fe3 --- /dev/null +++ b/buildroot/package/python-aioconsole/python-aioconsole.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-aioconsole +# +################################################################################ + +PYTHON_AIOCONSOLE_VERSION = 0.1.15 +PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/c4/68/56b09bf94aff8e02a6080493b3f85bdf7ddea7e4f264e6a90a158e064898 +PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools +PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 + +$(eval $(python-package)) diff --git a/buildroot/package/python-aiodns/python-aiodns.hash b/buildroot/package/python-aiodns/python-aiodns.hash index b66693f86..c9511ce77 100644 --- a/buildroot/package/python-aiodns/python-aiodns.hash +++ b/buildroot/package/python-aiodns/python-aiodns.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiodns/json -md5 80e0419b49bb4c540b4857ec142219b8 aiodns-1.1.1.tar.gz -sha256 d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea aiodns-1.1.1.tar.gz +md5 3e121f9eb7ef3ba3556ba7ec28c6f63a aiodns-2.0.0.tar.gz +sha256 815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d aiodns-2.0.0.tar.gz # Locally computed sha256 checksums sha256 eb0455d35129425ed399883cd710923de3e246a510e2eb84d9f00032d0bbec97 LICENSE diff --git a/buildroot/package/python-aiodns/python-aiodns.mk b/buildroot/package/python-aiodns/python-aiodns.mk index 94f719d39..f02b4b75a 100644 --- a/buildroot/package/python-aiodns/python-aiodns.mk +++ b/buildroot/package/python-aiodns/python-aiodns.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIODNS_VERSION = 1.1.1 +PYTHON_AIODNS_VERSION = 2.0.0 PYTHON_AIODNS_SOURCE = aiodns-$(PYTHON_AIODNS_VERSION).tar.gz -PYTHON_AIODNS_SITE = https://files.pythonhosted.org/packages/3b/45/dcee156eabca900af3a1bab8acb9531636b13db4b677d44ba468a43969e0 +PYTHON_AIODNS_SITE = https://files.pythonhosted.org/packages/30/2e/b86ce168485b68d40c6a810838669deacf0abf41845c383659c2b613e69f PYTHON_AIODNS_SETUP_TYPE = setuptools PYTHON_AIODNS_LICENSE = MIT PYTHON_AIODNS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-aiohttp-cors/Config.in b/buildroot/package/python-aiohttp-cors/Config.in new file mode 100644 index 000000000..1c97cf3f8 --- /dev/null +++ b/buildroot/package/python-aiohttp-cors/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_AIOHTTP_CORS + bool "python-aiohttp-cors" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_AIOHTTP # runtime + help + CORS support for aiohttp. + + https://github.com/aio-libs/aiohttp-cors diff --git a/buildroot/package/python-aiohttp-cors/python-aiohttp-cors.hash b/buildroot/package/python-aiohttp-cors/python-aiohttp-cors.hash new file mode 100644 index 000000000..b91e5fa8c --- /dev/null +++ b/buildroot/package/python-aiohttp-cors/python-aiohttp-cors.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiohttp_cors/json +md5 de3940a901b269be82c8bd9f28d53ff0 aiohttp-cors-0.7.0.tar.gz +sha256 4d39c6d7100fd9764ed1caf8cebf0eb01bf5e3f24e2e073fda6234bc48b19f5d aiohttp-cors-0.7.0.tar.gz +# Locally computed sha256 checksums +sha256 86cb2262ff825ce1c8b8fb9ea9f5174318badc3912639b9275fc25d0e305c556 LICENSE diff --git a/buildroot/package/python-aiohttp-cors/python-aiohttp-cors.mk b/buildroot/package/python-aiohttp-cors/python-aiohttp-cors.mk new file mode 100644 index 000000000..27443540d --- /dev/null +++ b/buildroot/package/python-aiohttp-cors/python-aiohttp-cors.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiohttp-cors +# +################################################################################ + +PYTHON_AIOHTTP_CORS_VERSION = 0.7.0 +PYTHON_AIOHTTP_CORS_SOURCE = aiohttp-cors-$(PYTHON_AIOHTTP_CORS_VERSION).tar.gz +PYTHON_AIOHTTP_CORS_SITE = https://files.pythonhosted.org/packages/44/9e/6cdce7c3f346d8fd487adf68761728ad8cd5fbc296a7b07b92518350d31f +PYTHON_AIOHTTP_CORS_SETUP_TYPE = setuptools +PYTHON_AIOHTTP_CORS_LICENSE = Apache-2.0 +PYTHON_AIOHTTP_CORS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-aiohttp-debugtoolbar/Config.in b/buildroot/package/python-aiohttp-debugtoolbar/Config.in new file mode 100644 index 000000000..b22d2cf94 --- /dev/null +++ b/buildroot/package/python-aiohttp-debugtoolbar/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_AIOHTTP_DEBUGTOOLBAR + bool "python-aiohttp-debugtoolbar" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_AIOHTTP # runtime + select BR2_PACKAGE_PYTHON_AIOHTTP_JINJA2 # runtime + help + debugtoolbar for aiohttp. + + https://github.com/aio-libs/aiohttp_debugtoolbar diff --git a/buildroot/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash b/buildroot/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash new file mode 100644 index 000000000..927bd3289 --- /dev/null +++ b/buildroot/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiohttp_debugtoolbar/json +md5 496734057cb413d7a49a52a817802dbb aiohttp-debugtoolbar-0.6.0.tar.gz +sha256 ec231661133b40136608d39dfb688e7ea0c3d47b6ae6dee52d5bf24ceb9e4d45 aiohttp-debugtoolbar-0.6.0.tar.gz +# Locally computed sha256 checksums +sha256 94d638be2cb4f186cc62bb567455837757547c15f1b350863aaf05a38843b542 LICENSE diff --git a/buildroot/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk b/buildroot/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk new file mode 100644 index 000000000..319d20ffc --- /dev/null +++ b/buildroot/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiohttp-debugtoolbar +# +################################################################################ + +PYTHON_AIOHTTP_DEBUGTOOLBAR_VERSION = 0.6.0 +PYTHON_AIOHTTP_DEBUGTOOLBAR_SOURCE = aiohttp-debugtoolbar-$(PYTHON_AIOHTTP_DEBUGTOOLBAR_VERSION).tar.gz +PYTHON_AIOHTTP_DEBUGTOOLBAR_SITE = https://files.pythonhosted.org/packages/3f/dd/5121417dfbeb4661673afa5c8708f1539889d0e54b1509a6fdf66705efc5 +PYTHON_AIOHTTP_DEBUGTOOLBAR_SETUP_TYPE = setuptools +PYTHON_AIOHTTP_DEBUGTOOLBAR_LICENSE = Apache-2.0 +PYTHON_AIOHTTP_DEBUGTOOLBAR_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash index 390b0e4ed..3563d2ab4 100644 --- a/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash +++ b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-jinja2/json -md5 de5e02056d1b48dc2fa4fc0c1a8b0e08 aiohttp-jinja2-1.1.0.tar.gz -sha256 aef9b6595f962182ad00c990095fb51d731c280e1d183e2b28cf0bdb5a942d0c aiohttp-jinja2-1.1.0.tar.gz +md5 7eb1a9be9e776c94d3bff73330c213d0 aiohttp-jinja2-1.2.0.tar.gz +sha256 2dfe29cfd278d07cd0a851afb98471bc8ce2a830968443e40d67636f3c035d79 aiohttp-jinja2-1.2.0.tar.gz # Locally computed sha256 checksums sha256 2a86817fedf0c52baaa47d7dd975073639dfaaebd37312bd279de54d7f841791 LICENSE diff --git a/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk index 3b5359a06..94a0c9d75 100644 --- a/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk +++ b/buildroot/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_JINJA2_VERSION = 1.1.0 +PYTHON_AIOHTTP_JINJA2_VERSION = 1.2.0 PYTHON_AIOHTTP_JINJA2_SOURCE = aiohttp-jinja2-$(PYTHON_AIOHTTP_JINJA2_VERSION).tar.gz -PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/76/9d/68fa1e9ec3bafba572772eb385023de54096663bd6e302a24d7344c6a711 +PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/9c/fb/8f1f8941e1e1937247c6de552668d73ab8ef860a1d633072d9f4e3c9b542 PYTHON_AIOHTTP_JINJA2_SETUP_TYPE = setuptools PYTHON_AIOHTTP_JINJA2_LICENSE = Apache-2.0 PYTHON_AIOHTTP_JINJA2_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-aiohttp-mako/Config.in b/buildroot/package/python-aiohttp-mako/Config.in new file mode 100644 index 000000000..8c5df6a48 --- /dev/null +++ b/buildroot/package/python-aiohttp-mako/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_AIOHTTP_MAKO + bool "python-aiohttp-mako" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_AIOHTTP # runtime + select BR2_PACKAGE_PYTHON_MAKO # runtime + help + mako template renderer for aiohttp.web (http server for + asyncio). + + https://github.com/aio-libs/aiohttp-mako/ diff --git a/buildroot/package/python-aiohttp-mako/python-aiohttp-mako.hash b/buildroot/package/python-aiohttp-mako/python-aiohttp-mako.hash new file mode 100644 index 000000000..169027e1d --- /dev/null +++ b/buildroot/package/python-aiohttp-mako/python-aiohttp-mako.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiohttp-mako/json +md5 c0f2da2851d0b6e819b5c882f700bb11 aiohttp-mako-0.4.0.tar.gz +sha256 f10bdee54589b6567e8a0339db582276fdaaa198764541d2f9741f1d3836312c aiohttp-mako-0.4.0.tar.gz +# Locally computed sha256 checksums +sha256 b81fea0e0d4cda42faf00466cabe7b9e2a0cc3a0ffbf20ae3773c18e077c7c52 LICENSE diff --git a/buildroot/package/python-aiohttp-mako/python-aiohttp-mako.mk b/buildroot/package/python-aiohttp-mako/python-aiohttp-mako.mk new file mode 100644 index 000000000..4ff5f8903 --- /dev/null +++ b/buildroot/package/python-aiohttp-mako/python-aiohttp-mako.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiohttp-mako +# +################################################################################ + +PYTHON_AIOHTTP_MAKO_VERSION = 0.4.0 +PYTHON_AIOHTTP_MAKO_SOURCE = aiohttp-mako-$(PYTHON_AIOHTTP_MAKO_VERSION).tar.gz +PYTHON_AIOHTTP_MAKO_SITE = https://files.pythonhosted.org/packages/f9/8e/d7c0ea2c74e8102a94021e150b622d274fdef22ebd1f0c9a546b21458931 +PYTHON_AIOHTTP_MAKO_SETUP_TYPE = setuptools +PYTHON_AIOHTTP_MAKO_LICENSE = Apache-2.0 +PYTHON_AIOHTTP_MAKO_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-aiohttp-session/python-aiohttp-session.hash b/buildroot/package/python-aiohttp-session/python-aiohttp-session.hash index fdccb20d1..f10827b61 100644 --- a/buildroot/package/python-aiohttp-session/python-aiohttp-session.hash +++ b/buildroot/package/python-aiohttp-session/python-aiohttp-session.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-session/json -md5 a873141ee04ffc9fc948d9ee0ed47a8d aiohttp-session-2.7.0.tar.gz -sha256 18ae740845214086f783574edfee1bac36862332bd11d561e048b079d8f6ad34 aiohttp-session-2.7.0.tar.gz +md5 993ec277ece4765472d0edc0f6c0bba3 aiohttp-session-2.9.0.tar.gz +sha256 959413468b84e30e7ca09719617cfb0000066a2e0f6c20062d043433e82aeb74 aiohttp-session-2.9.0.tar.gz # Locally computed sha256 checksums sha256 2a86817fedf0c52baaa47d7dd975073639dfaaebd37312bd279de54d7f841791 LICENSE diff --git a/buildroot/package/python-aiohttp-session/python-aiohttp-session.mk b/buildroot/package/python-aiohttp-session/python-aiohttp-session.mk index 36c3180be..8fcd8e21b 100644 --- a/buildroot/package/python-aiohttp-session/python-aiohttp-session.mk +++ b/buildroot/package/python-aiohttp-session/python-aiohttp-session.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SESSION_VERSION = 2.7.0 +PYTHON_AIOHTTP_SESSION_VERSION = 2.9.0 PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/b5/5f/3f78fd4de2f9b17ad8cfe6c189bfaee3d0a5d2fe954aedad743edd08c813 +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/f8/fe/53dfd35f5c7fcc7f2d0866cb29e722303e3fae7f749c1f3d4d11d361dc38 PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-aiohttp/python-aiohttp.hash b/buildroot/package/python-aiohttp/python-aiohttp.hash index bd9e2d7a6..fd02bc80d 100644 --- a/buildroot/package/python-aiohttp/python-aiohttp.hash +++ b/buildroot/package/python-aiohttp/python-aiohttp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp/json -md5 85fe5c9037256c58d4678148bd91b3f3 aiohttp-3.5.4.tar.gz -sha256 9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf aiohttp-3.5.4.tar.gz +md5 ca40144c199a09fc1a141960cf6295f0 aiohttp-3.6.2.tar.gz +sha256 259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326 aiohttp-3.6.2.tar.gz # Locally computed sha256 checksums sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt diff --git a/buildroot/package/python-aiohttp/python-aiohttp.mk b/buildroot/package/python-aiohttp/python-aiohttp.mk index 7a142a655..5a5964ed5 100644 --- a/buildroot/package/python-aiohttp/python-aiohttp.mk +++ b/buildroot/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.5.4 +PYTHON_AIOHTTP_VERSION = 3.6.2 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/0f/58/c8b83f999da3b13e66249ea32f325be923791c0c10aee6cf16002a3effc1 +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/00/94/f9fa18e8d7124d7850a5715a0b9c0584f7b9375d331d35e157cee50f27cc PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-aiologstash/Config.in b/buildroot/package/python-aiologstash/Config.in new file mode 100644 index 000000000..e70c232fd --- /dev/null +++ b/buildroot/package/python-aiologstash/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_AIOLOGSTASH + bool "python-aiologstash" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime + select BR2_PACKAGE_PYTHON_LOGSTASH # runtime + help + asyncio-compatible logstash logging handler. + + https://github.com/aio-libs/aiologstash diff --git a/buildroot/package/python-aiologstash/python-aiologstash.hash b/buildroot/package/python-aiologstash/python-aiologstash.hash new file mode 100644 index 000000000..ff7d2cce9 --- /dev/null +++ b/buildroot/package/python-aiologstash/python-aiologstash.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiologstash/json +md5 1e321c11b34477f780f31b2553557d69 aiologstash-2.0.0.tar.gz +sha256 698522126ffd4e905cd5f52a08092a0a78096c8f0e28bc1e303369873da71f78 aiologstash-2.0.0.tar.gz +# Locally computed sha256 checksums +sha256 beddf3a80aaaa71ebd6765b13bc680bd0450bb81191249cc889539523f9404ec LICENSE diff --git a/buildroot/package/python-aiologstash/python-aiologstash.mk b/buildroot/package/python-aiologstash/python-aiologstash.mk new file mode 100644 index 000000000..be1c40b71 --- /dev/null +++ b/buildroot/package/python-aiologstash/python-aiologstash.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiologstash +# +################################################################################ + +PYTHON_AIOLOGSTASH_VERSION = 2.0.0 +PYTHON_AIOLOGSTASH_SOURCE = aiologstash-$(PYTHON_AIOLOGSTASH_VERSION).tar.gz +PYTHON_AIOLOGSTASH_SITE = https://files.pythonhosted.org/packages/1c/dc/382861d5d25ccc976d02118922598fc4547f74f3287793e270ed614d8176 +PYTHON_AIOLOGSTASH_SETUP_TYPE = distutils +PYTHON_AIOLOGSTASH_LICENSE = MIT +PYTHON_AIOLOGSTASH_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-aiomonitor/Config.in b/buildroot/package/python-aiomonitor/Config.in new file mode 100644 index 000000000..c76c952c8 --- /dev/null +++ b/buildroot/package/python-aiomonitor/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_AIOMONITOR + bool "python-aiomonitor" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_TERMINALTABLES # runtime + select BR2_PACKAGE_PYTHON_AIOCONSOLE # runtime + help + aiomonitor adds monitor and python REPL capabilities for + asyncio application. + + https://github.com/aio-libs/aiomonitor diff --git a/buildroot/package/python-aiomonitor/python-aiomonitor.hash b/buildroot/package/python-aiomonitor/python-aiomonitor.hash new file mode 100644 index 000000000..410beb797 --- /dev/null +++ b/buildroot/package/python-aiomonitor/python-aiomonitor.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiomonitor/json +md5 5f184e4b97ea161fc2d690aef604f997 aiomonitor-0.4.5.tar.gz +sha256 6232c1ab14bf06cd7217845801c27340032f74e283bdaf32d01cdd3b7c673d0e aiomonitor-0.4.5.tar.gz +# Locally computed sha256 checksums +sha256 9b42fe3a288996988c552e387e7877be7525a1649e62086aedd6b32d3cb56365 LICENSE diff --git a/buildroot/package/python-aiomonitor/python-aiomonitor.mk b/buildroot/package/python-aiomonitor/python-aiomonitor.mk new file mode 100644 index 000000000..a8860097d --- /dev/null +++ b/buildroot/package/python-aiomonitor/python-aiomonitor.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiomonitor +# +################################################################################ + +PYTHON_AIOMONITOR_VERSION = 0.4.5 +PYTHON_AIOMONITOR_SOURCE = aiomonitor-$(PYTHON_AIOMONITOR_VERSION).tar.gz +PYTHON_AIOMONITOR_SITE = https://files.pythonhosted.org/packages/98/76/b62e9fbe267287527fb6f4b6774394d4f00650195774173bb0055a99ab3d +PYTHON_AIOMONITOR_SETUP_TYPE = setuptools +PYTHON_AIOMONITOR_LICENSE = Apache-2.0 +PYTHON_AIOMONITOR_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-aioredis/Config.in b/buildroot/package/python-aioredis/Config.in new file mode 100644 index 000000000..dc2ee01d9 --- /dev/null +++ b/buildroot/package/python-aioredis/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_AIOREDIS + bool "python-aioredis" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime + select BR2_PACKAGE_PYTHON_HIREDIS # runtime + help + Provides simple and clear interface to Redis based on asyncio. + + https://github.com/aio-libs/aioredis diff --git a/buildroot/package/python-aioredis/python-aioredis.hash b/buildroot/package/python-aioredis/python-aioredis.hash new file mode 100644 index 000000000..7162890c4 --- /dev/null +++ b/buildroot/package/python-aioredis/python-aioredis.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aioredis/json +md5 950d2092ad96bb1145e9af7bd780fe38 aioredis-1.3.1.tar.gz +sha256 15f8af30b044c771aee6787e5ec24694c048184c7b9e54c3b60c750a4b93273a aioredis-1.3.1.tar.gz +# Locally computed sha256 checksums +sha256 a288b4f41b5531ff7e9e2df9cd3f17a1844badebc52d7a9205b131f8b8a50744 LICENSE diff --git a/buildroot/package/python-aioredis/python-aioredis.mk b/buildroot/package/python-aioredis/python-aioredis.mk new file mode 100644 index 000000000..750f37b6b --- /dev/null +++ b/buildroot/package/python-aioredis/python-aioredis.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aioredis +# +################################################################################ + +PYTHON_AIOREDIS_VERSION = 1.3.1 +PYTHON_AIOREDIS_SOURCE = aioredis-$(PYTHON_AIOREDIS_VERSION).tar.gz +PYTHON_AIOREDIS_SITE = https://files.pythonhosted.org/packages/2c/2a/662e5e79dde5d00964b995d50e38ecdefeeeb09b37edafff193c7e850f46 +PYTHON_AIOREDIS_SETUP_TYPE = setuptools +PYTHON_AIOREDIS_LICENSE = MIT +PYTHON_AIOREDIS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-aiorwlock/python-aiorwlock.hash b/buildroot/package/python-aiorwlock/python-aiorwlock.hash index 51d1a29f2..8556f5ebd 100644 --- a/buildroot/package/python-aiorwlock/python-aiorwlock.hash +++ b/buildroot/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 ee741761e4c9b1612e9dccf7f8bccdd0 aiorwlock-0.5.0.tar.gz -sha256 3cd892576d024934d72c3dd098033f276ace3495e71a1197daa8d21409a52174 aiorwlock-0.5.0.tar.gz +md5 8eccf28315b4f851f6f7e9332edeec52 aiorwlock-0.6.0.tar.gz +sha256 cd310f33a7ea3bf6fd76fcf0c1ba6e4d7eef4d5ded59e95859494425fb7e599d aiorwlock-0.6.0.tar.gz # Locally computed sha256 checksums sha256 56fb2baf14d84c59c15abbfbb1fdf30a724017e2ce97894a8236764513d10397 LICENSE diff --git a/buildroot/package/python-aiorwlock/python-aiorwlock.mk b/buildroot/package/python-aiorwlock/python-aiorwlock.mk index ca6aa2529..48e74c02f 100644 --- a/buildroot/package/python-aiorwlock/python-aiorwlock.mk +++ b/buildroot/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 0.5.0 +PYTHON_AIORWLOCK_VERSION = 0.6.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/0c/20/d30f332e6ecb2be467ab5603e277b26e3a8eb2a72f75bf8d309bdd4c0c82 +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/77/cf/2a2584c4fc1096ae959d7d189f205eb9c872ec58aca2cde16009d2d83b9e PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-aiosignal/Config.in b/buildroot/package/python-aiosignal/Config.in new file mode 100644 index 000000000..6b7753def --- /dev/null +++ b/buildroot/package/python-aiosignal/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_AIOSIGNAL + bool "python-aiosignal" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_FROZENLIST # runtime + help + aiosignal: a list of registered asynchronous callbacks. + + https://github.com/aio-libs/aiosignal diff --git a/buildroot/package/python-aiosignal/python-aiosignal.hash b/buildroot/package/python-aiosignal/python-aiosignal.hash new file mode 100644 index 000000000..17c69c814 --- /dev/null +++ b/buildroot/package/python-aiosignal/python-aiosignal.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiosignal/json +md5 0831ab9e46799842ed84529dbaa86196 aiosignal-1.0.0.tar.gz +sha256 7cd33cbe05bc2d83e77f80d688b4717e424d15eecf6d65384e173b2873e62f13 aiosignal-1.0.0.tar.gz +# Locally computed sha256 checksums +sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt diff --git a/buildroot/package/python-aiosignal/python-aiosignal.mk b/buildroot/package/python-aiosignal/python-aiosignal.mk new file mode 100644 index 000000000..14b426462 --- /dev/null +++ b/buildroot/package/python-aiosignal/python-aiosignal.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiosignal +# +################################################################################ + +PYTHON_AIOSIGNAL_VERSION = 1.0.0 +PYTHON_AIOSIGNAL_SOURCE = aiosignal-$(PYTHON_AIOSIGNAL_VERSION).tar.gz +PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/ca/b7/5ae01ed039ea51cc8280d87b8a1269ba2f1343d7466c1e50c618558352e5 +PYTHON_AIOSIGNAL_SETUP_TYPE = setuptools +PYTHON_AIOSIGNAL_LICENSE = Apache-2.0 +PYTHON_AIOSIGNAL_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-aiozipkin/Config.in b/buildroot/package/python-aiozipkin/Config.in new file mode 100644 index 000000000..643fc9a4d --- /dev/null +++ b/buildroot/package/python-aiozipkin/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_AIOZIPKIN + bool "python-aiozipkin" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_AIOHTTP # runtime + help + Distributed tracing instrumentation for asyncio application + with zipkin. + + https://github.com/aio-libs/aiozipkin diff --git a/buildroot/package/python-aiozipkin/python-aiozipkin.hash b/buildroot/package/python-aiozipkin/python-aiozipkin.hash new file mode 100644 index 000000000..803438175 --- /dev/null +++ b/buildroot/package/python-aiozipkin/python-aiozipkin.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiozipkin/json +md5 01766aa607ae121d2cbb3ebf15a8cd0b aiozipkin-0.6.0.tar.gz +sha256 7270cdaff81f4a6ea70de48b3e4597629c3beef76740bfe6f7c9b58b45b67c73 aiozipkin-0.6.0.tar.gz +# Locally computed sha256 checksums +sha256 9b42fe3a288996988c552e387e7877be7525a1649e62086aedd6b32d3cb56365 LICENSE diff --git a/buildroot/package/python-aiozipkin/python-aiozipkin.mk b/buildroot/package/python-aiozipkin/python-aiozipkin.mk new file mode 100644 index 000000000..2f5b54be6 --- /dev/null +++ b/buildroot/package/python-aiozipkin/python-aiozipkin.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiozipkin +# +################################################################################ + +PYTHON_AIOZIPKIN_VERSION = 0.6.0 +PYTHON_AIOZIPKIN_SOURCE = aiozipkin-$(PYTHON_AIOZIPKIN_VERSION).tar.gz +PYTHON_AIOZIPKIN_SITE = https://files.pythonhosted.org/packages/8d/14/33c79497c3082dd93172f834e4f3d1d6d0eb9b957b6885c919ca73462ed6 +PYTHON_AIOZIPKIN_SETUP_TYPE = setuptools +PYTHON_AIOZIPKIN_LICENSE = Apache-2.0 +PYTHON_AIOZIPKIN_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-alsaaudio/python-alsaaudio.hash b/buildroot/package/python-alsaaudio/python-alsaaudio.hash index 92277ec39..476bc8f1a 100644 --- a/buildroot/package/python-alsaaudio/python-alsaaudio.hash +++ b/buildroot/package/python-alsaaudio/python-alsaaudio.hash @@ -1,4 +1,5 @@ -# From https://pypi.python.org/pypi?:action=show_md5&digest=1f22415a3d8da4b303182ad81c2d062e -md5 1f22415a3d8da4b303182ad81c2d062e pyalsaaudio-0.8.2.tar.gz -# Locally calculated -sha256 b6df486f1c4035041a5f3800496b86c64e48e4a7d47f94dcbca11b0187aa3a15 pyalsaaudio-0.8.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyalsaaudio/json +md5 b46f69561bc85fc52e698b2440ca251e pyalsaaudio-0.8.4.tar.gz +sha256 84e8f8da544d7f4bd96479ce4a237600077984d9be1d7f16c1d9a492ecf50085 pyalsaaudio-0.8.4.tar.gz +# Locally computed sha256 checksums +sha256 ef6ba930f96986d78082e67c817ac617b9e833d60d5a0460f24c9c674a010935 LICENSE diff --git a/buildroot/package/python-alsaaudio/python-alsaaudio.mk b/buildroot/package/python-alsaaudio/python-alsaaudio.mk index 73a7e74b0..3344583cf 100644 --- a/buildroot/package/python-alsaaudio/python-alsaaudio.mk +++ b/buildroot/package/python-alsaaudio/python-alsaaudio.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_ALSAAUDIO_VERSION = 0.8.2 +PYTHON_ALSAAUDIO_VERSION = 0.8.4 PYTHON_ALSAAUDIO_SOURCE = pyalsaaudio-$(PYTHON_ALSAAUDIO_VERSION).tar.gz -PYTHON_ALSAAUDIO_SITE = https://pypi.python.org/packages/source/p/pyalsaaudio -PYTHON_ALSAAUDIO_SETUP_TYPE = distutils +PYTHON_ALSAAUDIO_SITE = https://files.pythonhosted.org/packages/52/b6/44871791929d9d7e11325af0b7be711388dfeeab17147988f044a41a6d83 +PYTHON_ALSAAUDIO_SETUP_TYPE = setuptools PYTHON_ALSAAUDIO_LICENSE = Python-2.0 PYTHON_ALSAAUDIO_LICENSE_FILES = LICENSE PYTHON_ALSAAUDIO_DEPENDENCIES = alsa-lib diff --git a/buildroot/package/python-argh/python-argh.hash b/buildroot/package/python-argh/python-argh.hash index 6f19de10b..163ea6cee 100644 --- a/buildroot/package/python-argh/python-argh.hash +++ b/buildroot/package/python-argh/python-argh.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/argh/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/argh/json md5 edda25f3f0164a963dd89c0e3c619973 argh-0.26.2.tar.gz +# Locally computed sha256 e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65 argh-0.26.2.tar.gz +sha256 9c318783389a2e78735dc3d633e745e5648b826744521857045e84ed2e79ce2e README.rst diff --git a/buildroot/package/python-arrow/Config.in b/buildroot/package/python-arrow/Config.in index 244956879..145855683 100644 --- a/buildroot/package/python-arrow/Config.in +++ b/buildroot/package/python-arrow/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_PYTHON_ARROW bool "python-arrow" select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + select BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE \ + if BR2_PACKAGE_PYTHON # runtime help Better dates and times for Python. diff --git a/buildroot/package/python-arrow/python-arrow.hash b/buildroot/package/python-arrow/python-arrow.hash index 0b5076aa9..90e053323 100644 --- a/buildroot/package/python-arrow/python-arrow.hash +++ b/buildroot/package/python-arrow/python-arrow.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/arrow/json, sha256 locally computed -md5 5d00592200050ad58284d45a4ee147c6 arrow-0.10.0.tar.gz -sha256 805906f09445afc1f0fc80187db8fe07670e3b25cdafa09b8d8ac264a8c0c722 arrow-0.10.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/arrow/json +md5 554f18b0e23182ee0e8cb2a882d2f607 arrow-0.15.2.tar.gz +sha256 10257c5daba1a88db34afa284823382f4963feca7733b9107956bed041aff24f arrow-0.15.2.tar.gz +# Locally computed sha256 checksums +sha256 a4b7601be50569c2c96a9818fc809b0149410c84c99714d60c9d4fb0ae861fa2 LICENSE diff --git a/buildroot/package/python-arrow/python-arrow.mk b/buildroot/package/python-arrow/python-arrow.mk index 6e2e331e3..f8326288b 100644 --- a/buildroot/package/python-arrow/python-arrow.mk +++ b/buildroot/package/python-arrow/python-arrow.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_ARROW_VERSION = 0.10.0 +PYTHON_ARROW_VERSION = 0.15.2 PYTHON_ARROW_SOURCE = arrow-$(PYTHON_ARROW_VERSION).tar.gz -PYTHON_ARROW_SITE = https://pypi.python.org/packages/54/db/76459c4dd3561bbe682619a5c576ff30c42e37c2e01900ed30a501957150 +PYTHON_ARROW_SITE = https://files.pythonhosted.org/packages/43/0e/47416c54ad7742981bf77fdfc405987551ab14b181a6140c8cd2a5823872 PYTHON_ARROW_SETUP_TYPE = setuptools PYTHON_ARROW_LICENSE = Apache-2.0 -PYTHON_ARROW_LICENSE_FILES = LICENSE docs/_themes/COPYING.txt +PYTHON_ARROW_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python-asgiref/Config.in b/buildroot/package/python-asgiref/Config.in new file mode 100644 index 000000000..e131f476c --- /dev/null +++ b/buildroot/package/python-asgiref/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_ASGIREF + bool "python-asgiref" + depends on BR2_PACKAGE_PYTHON3 + help + ASGI is a standard for Python asynchronous web apps and + servers to communicate with each other, and positioned as + an asynchronous successor to WSGI. + + This package includes ASGI base libraries, such as: + - Sync-to-async and async-to-sync function wrappers, + asgiref.sync + - Server base classes, asgiref.server + - A WSGI-to-ASGI adapter, in asgiref.wsgi + + http://github.com/django/asgiref/ diff --git a/buildroot/package/python-asgiref/python-asgiref.hash b/buildroot/package/python-asgiref/python-asgiref.hash new file mode 100644 index 000000000..782a13fe5 --- /dev/null +++ b/buildroot/package/python-asgiref/python-asgiref.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/asgiref/json +md5 39218c10eee0bf66a3d893491d835e86 asgiref-3.2.3.tar.gz +sha256 7e06d934a7718bf3975acbf87780ba678957b87c7adc056f13b6215d610695a0 asgiref-3.2.3.tar.gz +# Locally computed sha256 checksums +sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/buildroot/package/python-asgiref/python-asgiref.mk b/buildroot/package/python-asgiref/python-asgiref.mk new file mode 100644 index 000000000..b29903509 --- /dev/null +++ b/buildroot/package/python-asgiref/python-asgiref.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-asgiref +# +################################################################################ + +PYTHON_ASGIREF_VERSION = 3.2.3 +PYTHON_ASGIREF_SOURCE = asgiref-$(PYTHON_ASGIREF_VERSION).tar.gz +PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/80/c4/83a01607f2d10024c172097126264c8e00c6a4827b35d631ece9625e6ba2 +PYTHON_ASGIREF_SETUP_TYPE = setuptools +PYTHON_ASGIREF_LICENSE = BSD-3-Clause +PYTHON_ASGIREF_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-asn1crypto/python-asn1crypto.hash b/buildroot/package/python-asn1crypto/python-asn1crypto.hash index 41aa60230..d2c8487b8 100644 --- a/buildroot/package/python-asn1crypto/python-asn1crypto.hash +++ b/buildroot/package/python-asn1crypto/python-asn1crypto.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asn1crypto/json -md5 de3520426e81a6581352d4366f310eb1 asn1crypto-0.24.0.tar.gz -sha256 9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49 asn1crypto-0.24.0.tar.gz +md5 fc3815cdd4812505e3ee297740c5f5d3 asn1crypto-1.2.0.tar.gz +sha256 87620880a477123e01177a1f73d0f327210b43a3cdbd714efcd2fa49a8d7b384 asn1crypto-1.2.0.tar.gz # Locally computed sha256 checksums -sha256 7871ddf1918d53fd549943aad007cd4ad674b0e1da732a9aea4a79e1436d1eb5 LICENSE +sha256 a88480656ec98943fb04344f6a477ee74062896f3ddb1a6f99e5f05f0109a286 LICENSE diff --git a/buildroot/package/python-asn1crypto/python-asn1crypto.mk b/buildroot/package/python-asn1crypto/python-asn1crypto.mk index 4cd30e8ca..43d3842ff 100644 --- a/buildroot/package/python-asn1crypto/python-asn1crypto.mk +++ b/buildroot/package/python-asn1crypto/python-asn1crypto.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASN1CRYPTO_VERSION = 0.24.0 +PYTHON_ASN1CRYPTO_VERSION = 1.2.0 PYTHON_ASN1CRYPTO_SOURCE = asn1crypto-$(PYTHON_ASN1CRYPTO_VERSION).tar.gz -PYTHON_ASN1CRYPTO_SITE = https://files.pythonhosted.org/packages/fc/f1/8db7daa71f414ddabfa056c4ef792e1461ff655c2ae2928a2b675bfed6b4 +PYTHON_ASN1CRYPTO_SITE = https://files.pythonhosted.org/packages/c1/a9/86bfedaf41ca590747b4c9075bc470d0b2ec44fb5db5d378bc61447b3b6b PYTHON_ASN1CRYPTO_SETUP_TYPE = setuptools PYTHON_ASN1CRYPTO_LICENSE = MIT PYTHON_ASN1CRYPTO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-async-lru/Config.in b/buildroot/package/python-async-lru/Config.in new file mode 100644 index 000000000..794f504e5 --- /dev/null +++ b/buildroot/package/python-async-lru/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_ASYNC_LRU + bool "python-async-lru" + depends on BR2_PACKAGE_PYTHON3 + help + Simple lru_cache for asyncio. + + https://github.com/aio-libs/async_lru diff --git a/buildroot/package/python-async-lru/python-async-lru.hash b/buildroot/package/python-async-lru/python-async-lru.hash new file mode 100644 index 000000000..6fa61e0e1 --- /dev/null +++ b/buildroot/package/python-async-lru/python-async-lru.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/async_lru/json +md5 69bed62927426353513e68aec77989ab async_lru-1.0.2.tar.gz +sha256 baa898027619f5cc31b7966f96f00e4fc0df43ba206a8940a5d1af5336a477cb async_lru-1.0.2.tar.gz +# Locally computed sha256 checksums +sha256 ea65975679bc2093be925d520358e41096bd96fddedee3e929160a5faadcf573 LICENSE diff --git a/buildroot/package/python-async-lru/python-async-lru.mk b/buildroot/package/python-async-lru/python-async-lru.mk new file mode 100644 index 000000000..adaa8f628 --- /dev/null +++ b/buildroot/package/python-async-lru/python-async-lru.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-async-lru +# +################################################################################ + +PYTHON_ASYNC_LRU_VERSION = 1.0.2 +PYTHON_ASYNC_LRU_SOURCE = async_lru-$(PYTHON_ASYNC_LRU_VERSION).tar.gz +PYTHON_ASYNC_LRU_SITE = https://files.pythonhosted.org/packages/7e/c1/a3d6207deaaeb582d16dc9a0fd217f192efc9487ce59897131cf9a2bdc1c +PYTHON_ASYNC_LRU_SETUP_TYPE = setuptools +PYTHON_ASYNC_LRU_LICENSE = MIT +PYTHON_ASYNC_LRU_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-attrs/python-attrs.hash b/buildroot/package/python-attrs/python-attrs.hash index 23a5efd58..f8c38ee4e 100644 --- a/buildroot/package/python-attrs/python-attrs.hash +++ b/buildroot/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 44700294787c8018858777fc150e5d40 attrs-18.2.0.tar.gz -sha256 10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69 attrs-18.2.0.tar.gz +md5 5b2db50fcc31be34d32798183c9bd062 attrs-19.3.0.tar.gz +sha256 f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72 attrs-19.3.0.tar.gz # Locally computer sha256 sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/buildroot/package/python-attrs/python-attrs.mk b/buildroot/package/python-attrs/python-attrs.mk index 9fbee2d34..72b280c33 100644 --- a/buildroot/package/python-attrs/python-attrs.mk +++ b/buildroot/package/python-attrs/python-attrs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 18.2.0 +PYTHON_ATTRS_VERSION = 19.3.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/0f/9e/26b1d194aab960063b266170e53c39f73ea0d0d3f5ce23313e0ec8ee9bdf +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/98/c3/2c227e66b5e896e15ccdae2e00bbc69aa46e9a8ce8869cc5fa96310bf612 PYTHON_ATTRS_SETUP_TYPE = setuptools PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-autobahn/Config.in b/buildroot/package/python-autobahn/Config.in index 7e1429cdd..ba54d8b12 100644 --- a/buildroot/package/python-autobahn/Config.in +++ b/buildroot/package/python-autobahn/Config.in @@ -1,9 +1,14 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN bool "python-autobahn" + depends on BR2_INSTALL_LIBSTDCPP # python-cryptography -> python-pyasn + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TXAIO # runtime help - WebSocket client Hhh server library, WAMP real-time + WebSocket client and server library, WAMP real-time framework. https://pypi.python.org/pypi/autobahn + +comment "python-autobahn needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/python-autobahn/python-autobahn.hash b/buildroot/package/python-autobahn/python-autobahn.hash index dce40f160..1dc6c1eea 100644 --- a/buildroot/package/python-autobahn/python-autobahn.hash +++ b/buildroot/package/python-autobahn/python-autobahn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/autobahn/json -md5 b296b8ae0f42e7df8052b28d574ede82 autobahn-19.1.1.tar.gz -sha256 aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff autobahn-19.1.1.tar.gz +md5 472d965c75dba0f8cb5f3b9f9001ed1b autobahn-19.11.1.tar.gz +sha256 201b9879b49c6e259d4126dbafe9e3c73807de0c242d50065fbebc62c6ccb181 autobahn-19.11.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/buildroot/package/python-autobahn/python-autobahn.mk b/buildroot/package/python-autobahn/python-autobahn.mk index 213e0314c..6c5c608b9 100644 --- a/buildroot/package/python-autobahn/python-autobahn.mk +++ b/buildroot/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 19.1.1 +PYTHON_AUTOBAHN_VERSION = 19.11.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/66/cc/1e2b20dc6654d9a87fc30da36bfae687ec65428814378c44257a26fe5f2f +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/3f/f4/e907b172d3c1d912b8da57560b8b298ebad22f900f8a412002247716328a PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-automat/python-automat.hash b/buildroot/package/python-automat/python-automat.hash index f974679b9..1be91e0e9 100644 --- a/buildroot/package/python-automat/python-automat.hash +++ b/buildroot/package/python-automat/python-automat.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/automat/json -md5 b72d5b7a83c2b1bd6e9ec3614a69f9ea Automat-0.7.0.tar.gz -sha256 cbd78b83fa2d81fe2a4d23d258e1661dd7493c9a50ee2f1a5b2cac61c1793b0e Automat-0.7.0.tar.gz +md5 47e980a48201a1dabe37fa11f0187013 Automat-0.8.0.tar.gz +sha256 269a09dfb063a3b078983f4976d83f0a0d3e6e7aaf8e27d8df1095e09dc4a484 Automat-0.8.0.tar.gz # Locally computed sha256 checksums sha256 b2201301678d0a937d938543827ca1360712eb34e23de8ee3f3bfffbd4c0e376 LICENSE diff --git a/buildroot/package/python-automat/python-automat.mk b/buildroot/package/python-automat/python-automat.mk index f3d8da49f..0bd40daf7 100644 --- a/buildroot/package/python-automat/python-automat.mk +++ b/buildroot/package/python-automat/python-automat.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOMAT_VERSION = 0.7.0 +PYTHON_AUTOMAT_VERSION = 0.8.0 PYTHON_AUTOMAT_SOURCE = Automat-$(PYTHON_AUTOMAT_VERSION).tar.gz -PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/4a/4f/64db3ffda8828cb0541fe949354615f39d02f596b4c33fb74863756fc565 +PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/4c/9a/3052851fa3a888d1ff32f053fba424ed929b47383fb5327855fdf70018cd PYTHON_AUTOMAT_SETUP_TYPE = setuptools PYTHON_AUTOMAT_LICENSE = MIT PYTHON_AUTOMAT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-avro/Config.in b/buildroot/package/python-avro/Config.in new file mode 100644 index 000000000..e1d7fc832 --- /dev/null +++ b/buildroot/package/python-avro/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_PYTHON_AVRO + bool "python-avro" + depends on BR2_PACKAGE_PYTHON3 + help + Select this option to install the Avro Python3 language + bindings, and the `avro` command line tool + + Apache Avro is a data serialization system. + Avro provides: + - Rich data structures. + - A compact, fast, binary data format. + - A container file, to store persistent data. + - Remote procedure call (RPC). + - Simple integration with dynamic languages. + - Code generation is not required to read or write data + files nor to use or implement RPC protocols. + - Code generation as an optional optimization, + only worth implementing for statically typed languages. + + http://avro.apache.org/ diff --git a/buildroot/package/python-avro/python-avro.hash b/buildroot/package/python-avro/python-avro.hash new file mode 100644 index 000000000..f63b37ee0 --- /dev/null +++ b/buildroot/package/python-avro/python-avro.hash @@ -0,0 +1,5 @@ +# From https://www-eu.apache.org/dist/avro/avro-1.9.1/py3/avro-python3-1.9.1.tar.gz.sha512 +sha512 771ce6e5ca6315f5b9108cb4f5dd9488575cc3433ffdd744f96ce7989763728259c89475319fd9c411ed6b65c996b762548c50a697eb1fba9ab024112ca17daa avro-python3-1.9.1.tar.gz + +# License files +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE diff --git a/buildroot/package/python-avro/python-avro.mk b/buildroot/package/python-avro/python-avro.mk new file mode 100644 index 000000000..3f9140e94 --- /dev/null +++ b/buildroot/package/python-avro/python-avro.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-avro +# +################################################################################ + +PYTHON_AVRO_VERSION = $(AVRO_C_VERSION) +PYTHON_AVRO_SITE = https://www-eu.apache.org/dist/avro/avro-1.9.1/py3 +PYTHON_AVRO_SOURCE = avro-python3-$(PYTHON_AVRO_VERSION).tar.gz +PYTHON_AVRO_LICENSE = Apache-2.0 +PYTHON_AVRO_LICENSE_FILES = avro/LICENSE +PYTHON_AVRO_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot/package/python-babel/python-babel.hash b/buildroot/package/python-babel/python-babel.hash index a52da012c..95f9d725f 100644 --- a/buildroot/package/python-babel/python-babel.hash +++ b/buildroot/package/python-babel/python-babel.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/babel/json -md5 c384ac03026e8fe6f9b90f55201f1bff Babel-2.6.0.tar.gz -sha256 8cba50f48c529ca3fa18cf81fa9403be176d374ac4d60738b839122dfaaa3d23 Babel-2.6.0.tar.gz +md5 83c158b7dae9135750a7cf204e6e2eea Babel-2.7.0.tar.gz +sha256 e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28 Babel-2.7.0.tar.gz # Locally computed sha256 checksums -sha256 178b99c90df898d0bee84bd335f36b679c76fafa9d3c288b4eaea4ebd92d8602 LICENSE +sha256 5a0df5d46e8cb14bd5d4c2cd77338b22f681fe88bd34236626b1a3ae3b50101a LICENSE diff --git a/buildroot/package/python-babel/python-babel.mk b/buildroot/package/python-babel/python-babel.mk index a507cceae..cf0a8ab14 100644 --- a/buildroot/package/python-babel/python-babel.mk +++ b/buildroot/package/python-babel/python-babel.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BABEL_VERSION = 2.6.0 +PYTHON_BABEL_VERSION = 2.7.0 PYTHON_BABEL_SOURCE = Babel-$(PYTHON_BABEL_VERSION).tar.gz -PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/be/cc/9c981b249a455fa0c76338966325fc70b7265521bad641bf2932f77712f4 +PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/bd/78/9fb975cbb3f4b136de2cd4b5e5ce4a3341169ebf4c6c03630996d05428f1 PYTHON_BABEL_SETUP_TYPE = setuptools PYTHON_BABEL_LICENSE = BSD-3-Clause PYTHON_BABEL_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-backcall/Config.in b/buildroot/package/python-backcall/Config.in new file mode 100644 index 000000000..7b4345cab --- /dev/null +++ b/buildroot/package/python-backcall/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_BACKCALL + bool "python-backcall" + help + Specifications for callback functions passed in to an API. + + https://github.com/takluyver/backcall diff --git a/buildroot/package/python-backcall/python-backcall.hash b/buildroot/package/python-backcall/python-backcall.hash new file mode 100644 index 000000000..2eccbdef5 --- /dev/null +++ b/buildroot/package/python-backcall/python-backcall.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/backcall/json +md5 87ce0c7839808e6a3427d57df6a792e7 backcall-0.1.0.tar.gz +sha256 38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4 backcall-0.1.0.tar.gz diff --git a/buildroot/package/python-backcall/python-backcall.mk b/buildroot/package/python-backcall/python-backcall.mk new file mode 100644 index 000000000..3f95ea3d2 --- /dev/null +++ b/buildroot/package/python-backcall/python-backcall.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-backcall +# +################################################################################ + +PYTHON_BACKCALL_VERSION = 0.1.0 +PYTHON_BACKCALL_SOURCE = backcall-$(PYTHON_BACKCALL_VERSION).tar.gz +PYTHON_BACKCALL_SITE = https://files.pythonhosted.org/packages/84/71/c8ca4f5bb1e08401b916c68003acf0a0655df935d74d93bf3f3364b310e0 +PYTHON_BACKCALL_SETUP_TYPE = distutils +# From https://github.com/takluyver/backcall/blob/master/LICENSE +PYTHON_BACKCALL_LICENSE = BSD-3-Clause + +$(eval $(python-package)) diff --git a/buildroot/package/python-backports-abc/python-backports-abc.hash b/buildroot/package/python-backports-abc/python-backports-abc.hash index f638527d7..4f4c9bd1f 100644 --- a/buildroot/package/python-backports-abc/python-backports-abc.hash +++ b/buildroot/package/python-backports-abc/python-backports-abc.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/backports_abc/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/backports_abc/json md5 7d1936ec183a3586290adf60f6f96764 backports_abc-0.5.tar.gz -sha256 033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde backports_abc-0.5.tar.gz +# Locally computed +sha256 033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde backports_abc-0.5.tar.gz +sha256 0a4f3b38055f50f047a42521568fa6ddb9a5976c2884f6ae138796d0f71150ca LICENSE diff --git a/buildroot/package/python-backports-functools-lru-cache/Config.in b/buildroot/package/python-backports-functools-lru-cache/Config.in new file mode 100644 index 000000000..a5b7771e4 --- /dev/null +++ b/buildroot/package/python-backports-functools-lru-cache/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE + bool "python-backports-functools-lru-cache" + depends on BR2_PACKAGE_PYTHON + help + Backport of functools.lru_cache from Python 3.3 + + https://github.com/jaraco/backports.functools_lru_cache diff --git a/buildroot/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash b/buildroot/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash new file mode 100644 index 000000000..3db4aec1f --- /dev/null +++ b/buildroot/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/backports.functools_lru_cache/json +md5 20f53f54cd3f04b3346ce75a54959754 backports.functools_lru_cache-1.5.tar.gz +sha256 9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a backports.functools_lru_cache-1.5.tar.gz +# Localy computed sha256 checksumms +sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/buildroot/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk b/buildroot/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk new file mode 100644 index 000000000..334d6d8c4 --- /dev/null +++ b/buildroot/package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-backports-functools-lru-cache +# +################################################################################ + +PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_VERSION = 1.5 +PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SOURCE = backports.functools_lru_cache-$(PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_VERSION).tar.gz +PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SITE = https://files.pythonhosted.org/packages/57/d4/156eb5fbb08d2e85ab0a632e2bebdad355798dece07d4752f66a8d02d1ea +PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SETUP_TYPE = setuptools +PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_DEPENDENCIES = host-python-setuptools-scm +PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_LICENSE = MIT +PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash b/buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash index c1b65e598..40883a4e3 100644 --- a/buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash +++ b/buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/backports.shutil_get_terminal_size/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/backports.shutil_get_terminal_size/json md5 03267762480bd86b50580dc19dff3c66 backports.shutil_get_terminal_size-1.0.0.tar.gz -sha256 713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80 backports.shutil_get_terminal_size-1.0.0.tar.gz +# Locally computed +sha256 713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80 backports.shutil_get_terminal_size-1.0.0.tar.gz +sha256 9edd99f8c339cddbfe36a9707e671fccf245b3e50b80eec0877dccec87a2dfe4 LICENSE diff --git a/buildroot/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash b/buildroot/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash index b43e1af5a..145174cd5 100644 --- a/buildroot/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash +++ b/buildroot/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/backports.ssl_match_hostname/json, sha256 locally computed -md5 c03fc5e2c7b3da46b81acf5cbacfe1e6 backports.ssl_match_hostname-3.5.0.1.tar.gz -sha256 502ad98707319f4a51fa2ca1c677bd659008d27ded9f6380c79e8932e38dcdf2 backports.ssl_match_hostname-3.5.0.1.tar.gz -sha256 bfc8a75a4b9aec224aa7973c0c9d7cc0134bdcbf8eefd008936b58554d66e97e backports/ssl_match_hostname/LICENSE.txt +# md5, sha256 from https://pypi.org/pypi/backports.ssl_match_hostname/json +md5 32d2f593af01a046bec3d2f5181a420a backports.ssl_match_hostname-3.7.0.1.tar.gz +sha256 bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2 backports.ssl_match_hostname-3.7.0.1.tar.gz +# Locally computed sha256 checksums +sha256 bfc8a75a4b9aec224aa7973c0c9d7cc0134bdcbf8eefd008936b58554d66e97e LICENSE.txt diff --git a/buildroot/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk b/buildroot/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk index 01c8bc448..300961662 100644 --- a/buildroot/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk +++ b/buildroot/package/python-backports-ssl-match-hostname/python-backports-ssl-match-hostname.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION = 3.5.0.1 +PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION = 3.7.0.1 PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SOURCE = backports.ssl_match_hostname-$(PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_VERSION).tar.gz -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SITE = https://pypi.python.org/packages/76/21/2dc61178a2038a5cb35d14b61467c6ac632791ed05131dda72c20e7b9e23 +PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SITE = https://files.pythonhosted.org/packages/ff/2b/8265224812912bc5b7a607c44bf7b027554e1b9775e9ee0de8032e3de4b2 PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_SETUP_TYPE = distutils PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE = Python-2.0 -PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE_FILES = backports/ssl_match_hostname/LICENSE.txt +PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) diff --git a/buildroot/package/python-bcrypt/python-bcrypt.hash b/buildroot/package/python-bcrypt/python-bcrypt.hash index 3e4c303a1..a9c070f2e 100644 --- a/buildroot/package/python-bcrypt/python-bcrypt.hash +++ b/buildroot/package/python-bcrypt/python-bcrypt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bcrypt/json -md5 4d8ab82e5e0c86b15f4ba5aff2bec6b5 bcrypt-3.1.6.tar.gz -sha256 44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea bcrypt-3.1.6.tar.gz +md5 5d6f93b575ce52470af37a8e7dce76fe bcrypt-3.1.7.tar.gz +sha256 0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42 bcrypt-3.1.7.tar.gz # Locally computed sha256 checksums sha256 8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90 LICENSE diff --git a/buildroot/package/python-bcrypt/python-bcrypt.mk b/buildroot/package/python-bcrypt/python-bcrypt.mk index 71bf036fc..381d00347 100644 --- a/buildroot/package/python-bcrypt/python-bcrypt.mk +++ b/buildroot/package/python-bcrypt/python-bcrypt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BCRYPT_VERSION = 3.1.6 +PYTHON_BCRYPT_VERSION = 3.1.7 PYTHON_BCRYPT_SOURCE = bcrypt-$(PYTHON_BCRYPT_VERSION).tar.gz -PYTHON_BCRYPT_SITE = https://files.pythonhosted.org/packages/ce/3a/3d540b9f5ee8d92ce757eebacf167b9deedb8e30aedec69a2a072b2399bb +PYTHON_BCRYPT_SITE = https://files.pythonhosted.org/packages/fa/aa/025a3ab62469b5167bc397837c9ffc486c42a97ef12ceaa6699d8f5a5416 PYTHON_BCRYPT_SETUP_TYPE = setuptools PYTHON_BCRYPT_LICENSE = Apache-2.0 PYTHON_BCRYPT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-beautifulsoup4/Config.in b/buildroot/package/python-beautifulsoup4/Config.in index 76f6d9471..eb7d2ba67 100644 --- a/buildroot/package/python-beautifulsoup4/Config.in +++ b/buildroot/package/python-beautifulsoup4/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 bool "python-beautifulsoup4" + select BR2_PACKAGE_PYTHON_SOUPSIEVE # runtime help Beautiful Soup is a Python library for pulling data out of HTML and XML files. It works with your favorite parser to diff --git a/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.hash b/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.hash index dd0c3e431..8b8c51de4 100644 --- a/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.hash +++ b/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/beautifulsoup4/json, sha256 locally computed -md5 937e0df0d699a1237646f38fd567f0c6 beautifulsoup4-4.5.3.tar.gz -sha256 b21ca09366fa596043578fd4188b052b46634d22059e68dd0077d9ee77e08a3e beautifulsoup4-4.5.3.tar.gz +# md5, sha256 from https://pypi.org/pypi/beautifulsoup4/json +md5 be03d778cf61cf6734a480e2010d6657 beautifulsoup4-4.8.1.tar.gz +sha256 6135db2ba678168c07950f9a16c4031822c6f4aec75a65e0a97bc5ca09789931 beautifulsoup4-4.8.1.tar.gz +# Locally computed sha256 checksums +sha256 a47ea51236098464fe0b4f559743590b533056d9e00f49ecbf80299fab47e231 COPYING.txt diff --git a/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.mk b/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.mk index ccec30fb4..6364a3667 100644 --- a/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.mk +++ b/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BEAUTIFULSOUP4_VERSION = 4.5.3 +PYTHON_BEAUTIFULSOUP4_VERSION = 4.8.1 PYTHON_BEAUTIFULSOUP4_SOURCE = beautifulsoup4-$(PYTHON_BEAUTIFULSOUP4_VERSION).tar.gz -PYTHON_BEAUTIFULSOUP4_SITE = https://pypi.python.org/packages/9b/a5/c6fa2d08e6c671103f9508816588e0fb9cec40444e8e72993f3d4c325936 +PYTHON_BEAUTIFULSOUP4_SITE = https://files.pythonhosted.org/packages/86/cd/495c68f0536dcd25f016e006731ba7be72e072280305ec52590012c1e6f2 PYTHON_BEAUTIFULSOUP4_SETUP_TYPE = setuptools PYTHON_BEAUTIFULSOUP4_LICENSE = MIT PYTHON_BEAUTIFULSOUP4_LICENSE_FILES = COPYING.txt diff --git a/buildroot/package/python-bitstring/python-bitstring.hash b/buildroot/package/python-bitstring/python-bitstring.hash index 52630e0aa..07586d530 100644 --- a/buildroot/package/python-bitstring/python-bitstring.hash +++ b/buildroot/package/python-bitstring/python-bitstring.hash @@ -1,2 +1,5 @@ -# Locally computed: -sha256 b769620c1b52d6c1548c6c4f055613f4eee3120ed8a5cff4ba4ffbbc8a582286 bitstring-3.1.5.tar.gz +# md5, sha256 from https://pypi.org/pypi/bitstring/json +md5 38372014dd629be75c3a0ff7d799aa3f bitstring-3.1.6.tar.gz +sha256 c97a8e2a136e99b523b27da420736ae5cb68f83519d633794a6a11192f69f8bf bitstring-3.1.6.tar.gz +# Locally computed sha256 checksums +sha256 2e97cff64585d7cb66190ad298e9d77fd791e8b91bcc97967fa743edf8c2ba1b LICENSE diff --git a/buildroot/package/python-bitstring/python-bitstring.mk b/buildroot/package/python-bitstring/python-bitstring.mk index 2c8fb9959..636ae0e0c 100644 --- a/buildroot/package/python-bitstring/python-bitstring.mk +++ b/buildroot/package/python-bitstring/python-bitstring.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_BITSTRING_VERSION = 3.1.5 +PYTHON_BITSTRING_VERSION = 3.1.6 PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz -PYTHON_BITSTRING_SITE = https://github.com/scott-griffiths/bitstring/archive -PYTHON_BITSTRING_SETUP_TYPE = distutils +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/f4/87/fe6f7093088f4396e84c1b5d5dfb08c4840487ad46ff4805b7008c8f5ffc +PYTHON_BITSTRING_SETUP_TYPE = setuptools PYTHON_BITSTRING_LICENSE = MIT PYTHON_BITSTRING_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-bluezero/Config.in b/buildroot/package/python-bluezero/Config.in new file mode 100644 index 000000000..ed2277dc3 --- /dev/null +++ b/buildroot/package/python-bluezero/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_BLUEZERO + bool "python-bluezero" + help + Python library for Bluetooth Low Energy (BLE) on Linux. + + For central.py, peripheral.py and broadcaster.py you need + to enable the dbus-python and the bluez5-utils package. + For observer.py, you need to enable the python-aioblescan + package. + + https://github.com/ukBaz/python-bluezero diff --git a/buildroot/package/python-bluezero/python-bluezero.hash b/buildroot/package/python-bluezero/python-bluezero.hash new file mode 100644 index 000000000..738688d7a --- /dev/null +++ b/buildroot/package/python-bluezero/python-bluezero.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/bluezero/json +md5 eeb444ecaf7c6bd2613d8ff0eb92d0ac bluezero-0.3.0.tar.gz +sha256 7ebe7243169b5c7600941cb6aa31bc3f8b475c22f5ac32a94d2b0200d5faf684 bluezero-0.3.0.tar.gz diff --git a/buildroot/package/python-bluezero/python-bluezero.mk b/buildroot/package/python-bluezero/python-bluezero.mk new file mode 100644 index 000000000..97b1aeb78 --- /dev/null +++ b/buildroot/package/python-bluezero/python-bluezero.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-bluezero +# +################################################################################ + +PYTHON_BLUEZERO_VERSION = 0.3.0 +PYTHON_BLUEZERO_SOURCE = bluezero-$(PYTHON_BLUEZERO_VERSION).tar.gz +PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/e4/d8/c5451133c0773a0378cadb6c014d7f03b5786da1d39af2f9eaa8028e6662 +PYTHON_BLUEZERO_SETUP_TYPE = setuptools +PYTHON_BLUEZERO_LICENSE = MIT + +$(eval $(python-package)) diff --git a/buildroot/package/python-bottle/python-bottle.hash b/buildroot/package/python-bottle/python-bottle.hash index 3006c16e9..03558c1ab 100644 --- a/buildroot/package/python-bottle/python-bottle.hash +++ b/buildroot/package/python-bottle/python-bottle.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/bottle/json, sha256 locally computed -md5 d2fe1b48c1d49217e78bf326b1cad437 bottle-0.12.13.tar.gz -sha256 39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355 bottle-0.12.13.tar.gz +# md5, sha256 from https://pypi.org/pypi/bottle/json +md5 c7d8a42dbc6955593e5b9f957e650a60 bottle-0.12.17.tar.gz +sha256 e9eaa412a60cc3d42ceb42f58d15864d9ed1b92e9d630b8130c871c5bb16107c bottle-0.12.17.tar.gz +# Locally computed sha256 checksums +sha256 d0e7211f1c3c1a1c56f39d18bcb07f27f480c8a9552617756dda3a335933b8a6 LICENSE diff --git a/buildroot/package/python-bottle/python-bottle.mk b/buildroot/package/python-bottle/python-bottle.mk index 6f071f64b..a8879010e 100644 --- a/buildroot/package/python-bottle/python-bottle.mk +++ b/buildroot/package/python-bottle/python-bottle.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_BOTTLE_VERSION = 0.12.13 +PYTHON_BOTTLE_VERSION = 0.12.17 PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz -PYTHON_BOTTLE_SITE = https://pypi.python.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c +PYTHON_BOTTLE_SITE = https://files.pythonhosted.org/packages/c4/a5/6bf41779860e9b526772e1b3b31a65a22bd97535572988d16028c5ab617d PYTHON_BOTTLE_LICENSE = MIT -# README.rst refers to the file "LICENSE" but it's not included +PYTHON_BOTTLE_LICENSE_FILES = LICENSE PYTHON_BOTTLE_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-brotli/Config.in b/buildroot/package/python-brotli/Config.in new file mode 100644 index 000000000..1c09c2686 --- /dev/null +++ b/buildroot/package/python-brotli/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_BROTLI + bool "python-brotli" + depends on BR2_INSTALL_LIBSTDCPP + help + Python bindings for the Brotli compression library. + + https://github.com/google/brotli diff --git a/buildroot/package/python-brotli/python-brotli.hash b/buildroot/package/python-brotli/python-brotli.hash new file mode 100644 index 000000000..eaf59ae71 --- /dev/null +++ b/buildroot/package/python-brotli/python-brotli.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/brotli/json +md5 3444b534e86f65f9f229fd123965be87 Brotli-1.0.7.zip +sha256 0538dc1744fd17c314d2adc409ea7d1b779783b89fd95bcfb0c2acc93a6ea5a7 Brotli-1.0.7.zip +# Locally computed sha256 checksums +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 LICENSE diff --git a/buildroot/package/python-brotli/python-brotli.mk b/buildroot/package/python-brotli/python-brotli.mk new file mode 100644 index 000000000..2ec549ed0 --- /dev/null +++ b/buildroot/package/python-brotli/python-brotli.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# python-brotli +# +################################################################################ + +PYTHON_BROTLI_VERSION = 1.0.7 +PYTHON_BROTLI_SOURCE = Brotli-$(PYTHON_BROTLI_VERSION).zip +PYTHON_BROTLI_SITE = https://files.pythonhosted.org/packages/cd/9c/7955895f5672ecc85270244582c6b53ff95bb4c24bf77bd9271d42351635 +PYTHON_BROTLI_SETUP_TYPE = setuptools +PYTHON_BROTLI_LICENSE = MIT +PYTHON_BROTLI_LICENSE_FILES = LICENSE + +PYTHON_BROTLI_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +PYTHON_BROTLI_CFLAGS += -O0 +endif + +PYTHON_BROTLI_ENV = CFLAGS="$(PYTHON_BROTLI_CFLAGS)" + +define PYTHON_BROTLI_EXTRACT_CMDS + $(UNZIP) -d $(@D) $(PYTHON_BROTLI_DL_DIR)/$(PYTHON_BROTLI_SOURCE) + mv $(@D)/Brotli-$(PYTHON_BROTLI_VERSION)/* $(@D) + $(RM) -r $(@D)/Brotli-$(PYTHON_BROTLI_VERSION) +endef + +$(eval $(python-package)) diff --git a/buildroot/package/python-bunch/Config.in b/buildroot/package/python-bunch/Config.in new file mode 100644 index 000000000..89eae742b --- /dev/null +++ b/buildroot/package/python-bunch/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_BUNCH + bool "python-bunch" + help + A dot-accessible dictionary (a la JavaScript objects). + + http://github.com/dsc/bunch diff --git a/buildroot/package/python-bunch/python-bunch.hash b/buildroot/package/python-bunch/python-bunch.hash new file mode 100644 index 000000000..5cf2cece4 --- /dev/null +++ b/buildroot/package/python-bunch/python-bunch.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/bunch/json +md5 0a829d64e95ed96defbcae2bf9061bb0 bunch-1.0.1.tar.gz +sha256 50c77a0fc0cb372dfe48b5e11937d5f70e743adbf42683f3a6d2857645a76aaa bunch-1.0.1.tar.gz +# Locally computed sha256 checksums +sha256 57ca95c92059c8380625192462979bd32994aae3fcdf902ff6eb1e467eeb0469 LICENSE.txt diff --git a/buildroot/package/python-bunch/python-bunch.mk b/buildroot/package/python-bunch/python-bunch.mk new file mode 100644 index 000000000..18fdc223b --- /dev/null +++ b/buildroot/package/python-bunch/python-bunch.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-bunch +# +################################################################################ + +PYTHON_BUNCH_VERSION = 1.0.1 +PYTHON_BUNCH_SOURCE = bunch-$(PYTHON_BUNCH_VERSION).tar.gz +PYTHON_BUNCH_SITE = https://files.pythonhosted.org/packages/ef/bf/a4cf1779a4ffb4f610903fa08e15d1f4a8a2f4e3353a02afbe097c5bf4a8 +PYTHON_BUNCH_SETUP_TYPE = setuptools +PYTHON_BUNCH_LICENSE = MIT +PYTHON_BUNCH_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-cached-property/python-cached-property.hash b/buildroot/package/python-cached-property/python-cached-property.hash index 255b2d9ec..cfe34ca1d 100644 --- a/buildroot/package/python-cached-property/python-cached-property.hash +++ b/buildroot/package/python-cached-property/python-cached-property.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/cached-property/json, sha256 locally computed -md5 fc7a49d2c4b7987f92b00c7b49128530 cached-property-1.4.0.tar.gz -sha256 a2fa0f89dd422f7e5dd992a4a3e0ce209d5d1e47a4db28fd0a7b5273ec8da3f0 cached-property-1.4.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/cached-property/json +md5 4b6f3cd429da5f487f4ebf3242bb991f cached-property-1.5.1.tar.gz +sha256 9217a59f14a5682da7c4b8829deadbfc194ac22e9908ccf7c8820234e80a1504 cached-property-1.5.1.tar.gz +# Locally computed sha256 checksums sha256 ba4756c8039b25b66e3c456cc5bf635aa528cf459b97ee1499d06684ccd89b9a LICENSE diff --git a/buildroot/package/python-cached-property/python-cached-property.mk b/buildroot/package/python-cached-property/python-cached-property.mk index 3e1363853..f83a1f18f 100644 --- a/buildroot/package/python-cached-property/python-cached-property.mk +++ b/buildroot/package/python-cached-property/python-cached-property.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CACHED_PROPERTY_VERSION = 1.4.0 +PYTHON_CACHED_PROPERTY_VERSION = 1.5.1 PYTHON_CACHED_PROPERTY_SOURCE = cached-property-$(PYTHON_CACHED_PROPERTY_VERSION).tar.gz -PYTHON_CACHED_PROPERTY_SITE = https://pypi.python.org/packages/ce/87/72b7a5a0504ad8d5d5ea6804ac5b24ce4f07869f61c47ea00cd4382320ba +PYTHON_CACHED_PROPERTY_SITE = https://files.pythonhosted.org/packages/57/8e/0698e10350a57d46b3bcfe8eff1d4181642fd1724073336079cb13c5cf7f PYTHON_CACHED_PROPERTY_SETUP_TYPE = setuptools PYTHON_CACHED_PROPERTY_LICENSE = BSD-3-Clause PYTHON_CACHED_PROPERTY_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-can/Config.in b/buildroot/package/python-can/Config.in index f3ed1b77e..3d06374c6 100644 --- a/buildroot/package/python-can/Config.in +++ b/buildroot/package/python-can/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_CAN select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime select BR2_PACKAGE_PYTHON_TYPING if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_AENUM # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 diff --git a/buildroot/package/python-can/python-can.hash b/buildroot/package/python-can/python-can.hash index b2dc1a33c..0a945eb00 100644 --- a/buildroot/package/python-can/python-can.hash +++ b/buildroot/package/python-can/python-can.hash @@ -1,5 +1,4 @@ -# md5, sha256 from https://pypi.org/pypi/python-can/json -md5 d906a220d8bd173c4f8de2bfe7217cc2 python-can-3.0.0.tar.gz -sha256 0d2ddb3b663af51b11a4c7fb7a577c63302a831986239f82bb6af65efc065b07 python-can-3.0.0.tar.gz +# sha256 from https://pypi.org/pypi/python-can/json +sha256 8dc9e0f926e880cd57a3badbaebc6393cde7adffdd3e1975a78a82c48d4e3bbe python-can-3.3.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/buildroot/package/python-can/python-can.mk b/buildroot/package/python-can/python-can.mk index ca023ee89..749583f96 100644 --- a/buildroot/package/python-can/python-can.mk +++ b/buildroot/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 3.0.0 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/29/47/59d07bb02d6b244fb631487ae5424a10658c316defeeb90c923b48043792 +PYTHON_CAN_VERSION = 3.3.1 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/d1/7e/d92889e3fa6ed625b5d6f065bff1c1b5921519a5133553905affb0d6b97c PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-cchardet/python-cchardet.hash b/buildroot/package/python-cchardet/python-cchardet.hash index 231804ee3..d02345785 100644 --- a/buildroot/package/python-cchardet/python-cchardet.hash +++ b/buildroot/package/python-cchardet/python-cchardet.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cchardet/json -md5 17af20af67cb18e958854e273d857a88 cchardet-2.1.4.tar.gz -sha256 cc9745e0400da4cfb49f075e7819f22473b66443f953427058fee2c7b9547cc0 cchardet-2.1.4.tar.gz +md5 681af4e6546e47e2ae856057a8a7d105 cchardet-2.1.5.tar.gz +sha256 240efe3f255f916769458343840b9c6403cf3192720bc5129792cbcb88bf72fb cchardet-2.1.5.tar.gz # Locally computed sha256 checksums sha256 107a29ccdd2d778aa2df5462f85dddfa099059abd22e064e07ec2cc9bafc37cd COPYING diff --git a/buildroot/package/python-cchardet/python-cchardet.mk b/buildroot/package/python-cchardet/python-cchardet.mk index 9ac170c22..58082538d 100644 --- a/buildroot/package/python-cchardet/python-cchardet.mk +++ b/buildroot/package/python-cchardet/python-cchardet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CCHARDET_VERSION = 2.1.4 +PYTHON_CCHARDET_VERSION = 2.1.5 PYTHON_CCHARDET_SOURCE = cchardet-$(PYTHON_CCHARDET_VERSION).tar.gz -PYTHON_CCHARDET_SITE = https://files.pythonhosted.org/packages/74/64/3988d388315c1af3e24f447689dadf30edead43366fb2041cb103380b57f +PYTHON_CCHARDET_SITE = https://files.pythonhosted.org/packages/73/25/73649708a30aa97124631bd088a22f1bf721d05d4e72fb9cc9bedb97de51 PYTHON_CCHARDET_SETUP_TYPE = setuptools PYTHON_CCHARDET_LICENSE = MPL-1.1 PYTHON_CCHARDET_LICENSE_FILES = COPYING diff --git a/buildroot/package/python-certifi/Config.in b/buildroot/package/python-certifi/Config.in index 015b8092a..efa7a8939 100644 --- a/buildroot/package/python-certifi/Config.in +++ b/buildroot/package/python-certifi/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_PYTHON_CERTIFI help Python package for providing Mozilla's CA Bundle. - http://certifi.io/ + https://certifi.io/ diff --git a/buildroot/package/python-certifi/python-certifi.hash b/buildroot/package/python-certifi/python-certifi.hash index 3d0e48f6c..122ad55ca 100644 --- a/buildroot/package/python-certifi/python-certifi.hash +++ b/buildroot/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 8160cf662212bc731eccf1af8042c0af certifi-2018.11.29.tar.gz -sha256 47f9c83ef4c0c621eaef743f133f09fa8a74a9b75f037e8624f83bd1b6626cb7 certifi-2018.11.29.tar.gz +md5 cadd4e373fc08f649fa39b82aed9ad96 certifi-2019.9.11.tar.gz +sha256 e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50 certifi-2019.9.11.tar.gz # Locally computed sha256 checksums sha256 6a70a4bf6b010016d59a64b8ae4ad8dc7f5ef16f1fb453cc2ecd771c5a341131 LICENSE diff --git a/buildroot/package/python-certifi/python-certifi.mk b/buildroot/package/python-certifi/python-certifi.mk index 29b646922..e614b8356 100644 --- a/buildroot/package/python-certifi/python-certifi.mk +++ b/buildroot/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2018.11.29 +PYTHON_CERTIFI_VERSION = 2019.9.11 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/55/54/3ce77783acba5979ce16674fc98b1920d00b01d337cfaaf5db22543505ed +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/62/85/7585750fd65599e88df0fed59c74f5075d4ea2fe611deceb95dd1c2fb25b PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-cffi/python-cffi.hash b/buildroot/package/python-cffi/python-cffi.hash index 3d4387fb0..dd8720e82 100644 --- a/buildroot/package/python-cffi/python-cffi.hash +++ b/buildroot/package/python-cffi/python-cffi.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/cffi/json, sha256 locally computed -md5 a731487324b501c8295221b629d3f5f3 cffi-1.11.2.tar.gz -sha256 ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6 cffi-1.11.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/cffi/json +md5 824ad9f228fbc6ce203c334e2ff4ab8f cffi-1.13.1.tar.gz +sha256 558b3afef987cf4b17abd849e7bedf64ee12b28175d564d05b628a0f9355599b cffi-1.13.1.tar.gz +# Locally computed sha256 checksums sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE diff --git a/buildroot/package/python-cffi/python-cffi.mk b/buildroot/package/python-cffi/python-cffi.mk index 1ef83917a..b43e8887e 100644 --- a/buildroot/package/python-cffi/python-cffi.mk +++ b/buildroot/package/python-cffi/python-cffi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CFFI_VERSION = 1.11.2 +PYTHON_CFFI_VERSION = 1.13.1 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://pypi.python.org/packages/c9/70/89b68b6600d479034276fed316e14b9107d50a62f5627da37fafe083fde3 +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/0d/aa/c5ac2f337d9a10ee95d160d47beb8d9400e1b2a46bb94990a0409fe6d133 PYTHON_CFFI_SETUP_TYPE = setuptools PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi PYTHON_CFFI_LICENSE = MIT diff --git a/buildroot/package/python-channels-redis/Config.in b/buildroot/package/python-channels-redis/Config.in new file mode 100644 index 000000000..894667018 --- /dev/null +++ b/buildroot/package/python-channels-redis/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_PYTHON_CHANNELS_REDIS + bool "python-channels-redis" + depends on BR2_INSTALL_LIBSTDCPP # python-channels -> python-daphne + depends on BR2_PACKAGE_PYTHON3 # python-channels + select BR2_PACKAGE_PYTHON_AIOREDIS # runtime + select BR2_PACKAGE_PYTHON_ASGIREF # runtime + select BR2_PACKAGE_PYTHON_CHANNELS # runtime + select BR2_PACKAGE_PYTHON_MSGPACK # runtime + help + A Django Channels channel layer that uses Redis as its + backing store, and supports both a single-server and + sharded configurations, as well as group support. + + http://github.com/django/channels_redis/ + +comment "python-channels-redis needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_PYTHON3 diff --git a/buildroot/package/python-channels-redis/python-channels-redis.hash b/buildroot/package/python-channels-redis/python-channels-redis.hash new file mode 100644 index 000000000..1d80b4c12 --- /dev/null +++ b/buildroot/package/python-channels-redis/python-channels-redis.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/channels-redis/json +md5 9ec9ffd467e181906f257d6c0dbabf45 channels_redis-2.4.1.tar.gz +sha256 ddfa0c067085fdce24fb80d9c0b848638cbdbf0e1167f14eb2e99d635ad216e6 channels_redis-2.4.1.tar.gz +# Locally computed sha256 checksums +sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/buildroot/package/python-channels-redis/python-channels-redis.mk b/buildroot/package/python-channels-redis/python-channels-redis.mk new file mode 100644 index 000000000..c2c6f59c3 --- /dev/null +++ b/buildroot/package/python-channels-redis/python-channels-redis.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-channels-redis +# +################################################################################ + +PYTHON_CHANNELS_REDIS_VERSION = 2.4.1 +PYTHON_CHANNELS_REDIS_SOURCE = channels_redis-$(PYTHON_CHANNELS_REDIS_VERSION).tar.gz +PYTHON_CHANNELS_REDIS_SITE = https://files.pythonhosted.org/packages/87/a9/8d11c32ae6bf3a2cc893185f7d1e03b80bda680131a08473c07ed1fe591d +PYTHON_CHANNELS_REDIS_SETUP_TYPE = setuptools +PYTHON_CHANNELS_REDIS_LICENSE = BSD-3-Clause +PYTHON_CHANNELS_REDIS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-channels/Config.in b/buildroot/package/python-channels/Config.in new file mode 100644 index 000000000..5c70f20d1 --- /dev/null +++ b/buildroot/package/python-channels/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_PYTHON_CHANNELS + bool "python-channels" + depends on BR2_INSTALL_LIBSTDCPP # python-daphne -> python-autobahn -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 # python-daphne + select BR2_PACKAGE_PYTHON_ASGIREF # runtime + select BR2_PACKAGE_PYTHON_DAPHNE # runtime + select BR2_PACKAGE_PYTHON_DJANGO # runtime + help + Channels augments Django to bring WebSocket, long-poll + HTTP, task offloading and other async support to your + code, using familiar Django design patterns and a + flexible underlying framework that lets you not only + customize behaviours but also write support for your + own protocols and needs. + + http://github.com/django/channels + +comment "python-channels needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_PYTHON3 diff --git a/buildroot/package/python-channels/python-channels.hash b/buildroot/package/python-channels/python-channels.hash new file mode 100644 index 000000000..beeef4acc --- /dev/null +++ b/buildroot/package/python-channels/python-channels.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/channels/json +md5 6f3fb75828b681a69372934a09ac3f32 channels-2.3.1.tar.gz +sha256 6b8ebd93fe0041a23e31c9f4130d92fadb9c0040c0eb377a004540631325a31d channels-2.3.1.tar.gz +# Locally computed sha256 checksums +sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/buildroot/package/python-channels/python-channels.mk b/buildroot/package/python-channels/python-channels.mk new file mode 100644 index 000000000..c0eca71aa --- /dev/null +++ b/buildroot/package/python-channels/python-channels.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-channels +# +################################################################################ + +PYTHON_CHANNELS_VERSION = 2.3.1 +PYTHON_CHANNELS_SOURCE = channels-$(PYTHON_CHANNELS_VERSION).tar.gz +PYTHON_CHANNELS_SITE = https://files.pythonhosted.org/packages/75/53/2db9662a52dcedb02a25f87d8efc5e630059967790e4c10887dbd2db2073 +PYTHON_CHANNELS_SETUP_TYPE = setuptools +PYTHON_CHANNELS_LICENSE = BSD-3-Clause +PYTHON_CHANNELS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-characteristic/python-characteristic.hash b/buildroot/package/python-characteristic/python-characteristic.hash index 41dc18cca..2a5c7f5cd 100644 --- a/buildroot/package/python-characteristic/python-characteristic.hash +++ b/buildroot/package/python-characteristic/python-characteristic.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b249368dd021fde1c06b4802867c0913, sha256 locally computed. +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b249368dd021fde1c06b4802867c0913 md5 b249368dd021fde1c06b4802867c0913 characteristic-14.3.0.tar.gz +# Locally computed sha256 ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380 characteristic-14.3.0.tar.gz +sha256 0af91b662f8428b28f5e517b049a0bb9feeb59b1adaa5c9418c1579f9485107c LICENSE diff --git a/buildroot/package/python-chardet/python-chardet.hash b/buildroot/package/python-chardet/python-chardet.hash index 799713cf5..a1804603a 100644 --- a/buildroot/package/python-chardet/python-chardet.hash +++ b/buildroot/package/python-chardet/python-chardet.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/chardet/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/chardet/json md5 7dd1ba7f9c77e32351b0a0cfacf4055c chardet-3.0.4.tar.gz +# Locally computed sha256 84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae chardet-3.0.4.tar.gz +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE diff --git a/buildroot/package/python-cheroot/Config.in b/buildroot/package/python-cheroot/Config.in index bb85f7bdc..45dd2d8a1 100644 --- a/buildroot/package/python-cheroot/Config.in +++ b/buildroot/package/python-cheroot/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_PYTHON_CHEROOT bool "python-cheroot" + depends on BR2_PACKAGE_PYTHON3 # python-more-itertools, python-jaraco-functools select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime + select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime help Cheroot is the high-performance, pure-Python HTTP server used by CherryPy. diff --git a/buildroot/package/python-cheroot/python-cheroot.hash b/buildroot/package/python-cheroot/python-cheroot.hash index 664ad1002..e8144abaf 100644 --- a/buildroot/package/python-cheroot/python-cheroot.hash +++ b/buildroot/package/python-cheroot/python-cheroot.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/Cheroot/json, sha256 locally computed -md5 d256a0ccd28c3426a7764868e98a9020 cheroot-5.10.0.tar.gz -sha256 a408f1b80a3f93a3b49fc330f68eea40d8d30b9b07084f374607d1a5cc2e824f cheroot-5.10.0.tar.gz -sha256 02f4efe6e7dcd218c33cfa065c0552de983b5ad563b053e97697c5abd2ef14f9 LICENSE +# md5, sha256 from https://pypi.org/pypi/cheroot/json +md5 7ace4b584a8092deb9f6b0142a627086 cheroot-8.2.1.tar.gz +sha256 5b525b3e4a755adf78070ab54c1821fb860d4255a9317dba2b88eb2df2441cff cheroot-8.2.1.tar.gz +# Locally computed sha256 checksums +sha256 da6dc218683f6dab91c6367f00bf33095d980fb1f04d430c81c5e6994b8605e0 LICENSE.md diff --git a/buildroot/package/python-cheroot/python-cheroot.mk b/buildroot/package/python-cheroot/python-cheroot.mk index 07775e577..9eae88798 100644 --- a/buildroot/package/python-cheroot/python-cheroot.mk +++ b/buildroot/package/python-cheroot/python-cheroot.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_CHEROOT_VERSION = 5.10.0 +PYTHON_CHEROOT_VERSION = 8.2.1 PYTHON_CHEROOT_SOURCE = cheroot-$(PYTHON_CHEROOT_VERSION).tar.gz -PYTHON_CHEROOT_SITE = https://pypi.python.org/packages/14/dc/afc41e7f7e797973808d8520e6aef21c4efd00550aa32f5b726327d36be0 +PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/9b/4d/2e51e7ce60f54a5279e91648b9b9b497d4d22bc624ecae6af1b6866144a7 PYTHON_CHEROOT_LICENSE = BSD-3-Clause -PYTHON_CHEROOT_LICENSE_FILES = LICENSE +PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md PYTHON_CHEROOT_SETUP_TYPE = setuptools -PYTHON_CHEROOT_DEPENDENCIES = host-python-setuptools-scm +PYTHON_CHEROOT_DEPENDENCIES = host-python-setuptools-scm host-python-setuptools-scm-git-archive $(eval $(python-package)) diff --git a/buildroot/package/python-cherrypy/Config.in b/buildroot/package/python-cherrypy/Config.in index 622dd1f49..eb83054be 100644 --- a/buildroot/package/python-cherrypy/Config.in +++ b/buildroot/package/python-cherrypy/Config.in @@ -1,13 +1,12 @@ config BR2_PACKAGE_PYTHON_CHERRYPY bool "python-cherrypy" + depends on BR2_PACKAGE_PYTHON3 # python-cheroot, python-portend 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 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help A minimalist web framework diff --git a/buildroot/package/python-coherence/python-coherence.hash b/buildroot/package/python-coherence/python-coherence.hash index 533d0c663..3c2d45b53 100644 --- a/buildroot/package/python-coherence/python-coherence.hash +++ b/buildroot/package/python-coherence/python-coherence.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 97c8b700b3fe73d48eacb259008f410d6567e5d7d1b8e96386f8cc2422135ca5 python-coherence-b7856985fd496689ca1f9024925ae737297c00d1.tar.gz +sha256 7713ed8484b4d3364c7f6f2c02aed427b06a0159b1f77aecf907d47016812e81 LICENCE diff --git a/buildroot/package/python-colorama/Config.in b/buildroot/package/python-colorama/Config.in new file mode 100644 index 000000000..911effb3d --- /dev/null +++ b/buildroot/package/python-colorama/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_COLORAMA + bool "python-colorama" + help + Cross-platform colored terminal text. + + https://github.com/tartley/colorama diff --git a/buildroot/package/python-colorama/python-colorama.hash b/buildroot/package/python-colorama/python-colorama.hash new file mode 100644 index 000000000..06f61f80a --- /dev/null +++ b/buildroot/package/python-colorama/python-colorama.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/colorama/json +md5 f927529cd1735f6f50ee2c61628e9c1f colorama-0.4.1.tar.gz +sha256 05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d colorama-0.4.1.tar.gz +# Locally computed sha256 checksums +sha256 cac35c02686e5d04a5a7140bfb3b36e73aed496656e891102e428886d7930318 LICENSE.txt diff --git a/buildroot/package/python-colorama/python-colorama.mk b/buildroot/package/python-colorama/python-colorama.mk new file mode 100644 index 000000000..2f4bc5e1f --- /dev/null +++ b/buildroot/package/python-colorama/python-colorama.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-colorama +# +################################################################################ + +PYTHON_COLORAMA_VERSION = 0.4.1 +PYTHON_COLORAMA_SOURCE = colorama-$(PYTHON_COLORAMA_VERSION).tar.gz +PYTHON_COLORAMA_SITE = https://files.pythonhosted.org/packages/76/53/e785891dce0e2f2b9f4b4ff5bc6062a53332ed28833c7afede841f46a5db +PYTHON_COLORAMA_SETUP_TYPE = setuptools +PYTHON_COLORAMA_LICENSE = BSD-3-Clause +PYTHON_COLORAMA_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-colorlog/Config.in b/buildroot/package/python-colorlog/Config.in new file mode 100644 index 000000000..673f97aad --- /dev/null +++ b/buildroot/package/python-colorlog/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_COLORLOG + bool "python-colorlog" + help + Log formatting with colors. + + https://github.com/borntyping/python-colorlog diff --git a/buildroot/package/python-colorlog/python-colorlog.hash b/buildroot/package/python-colorlog/python-colorlog.hash new file mode 100644 index 000000000..b7b27b59d --- /dev/null +++ b/buildroot/package/python-colorlog/python-colorlog.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/colorlog/json +md5 25f79b76421132e2a9e08da15e4e0a73 colorlog-4.1.0.tar.gz +sha256 30aaef5ab2a1873dec5da38fd6ba568fa761c9fa10b40241027fa3edea47f3d2 colorlog-4.1.0.tar.gz +# Locally computed sha256 checksums +sha256 915d2c0c578d5015fb561f69ce2970a0d0ed566f0b99bdb6a4ebb439e9c81b0d LICENSE diff --git a/buildroot/package/python-colorlog/python-colorlog.mk b/buildroot/package/python-colorlog/python-colorlog.mk new file mode 100644 index 000000000..18c077e4a --- /dev/null +++ b/buildroot/package/python-colorlog/python-colorlog.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-colorlog +# +################################################################################ + +PYTHON_COLORLOG_VERSION = 4.1.0 +PYTHON_COLORLOG_SOURCE = colorlog-$(PYTHON_COLORLOG_VERSION).tar.gz +PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/a5/51/c6e1f2c7e6d7524b580d5a8d7691fd4530f894ae8a23ba66a065291ceba2 +PYTHON_COLORLOG_SETUP_TYPE = setuptools +PYTHON_COLORLOG_LICENSE = MIT +PYTHON_COLORLOG_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-configshell-fb/python-configshell-fb.hash b/buildroot/package/python-configshell-fb/python-configshell-fb.hash index 7bf4d347c..0903e284a 100644 --- a/buildroot/package/python-configshell-fb/python-configshell-fb.hash +++ b/buildroot/package/python-configshell-fb/python-configshell-fb.hash @@ -1,2 +1,3 @@ # locally computed -sha256 3685446d6ee02881930bb2fdc5fdd254938da66ce9843a5b3676c4246b058e4b python-configshell-fb-v1.1.fb18.tar.gz +sha256 3685446d6ee02881930bb2fdc5fdd254938da66ce9843a5b3676c4246b058e4b python-configshell-fb-1.1.fb18.tar.gz +sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/buildroot/package/python-configshell-fb/python-configshell-fb.mk b/buildroot/package/python-configshell-fb/python-configshell-fb.mk index a2e9cae15..94b6fed5a 100644 --- a/buildroot/package/python-configshell-fb/python-configshell-fb.mk +++ b/buildroot/package/python-configshell-fb/python-configshell-fb.mk @@ -6,8 +6,8 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and targetcli-fb at the same time. -PYTHON_CONFIGSHELL_FB_VERSION = v1.1.fb18 -PYTHON_CONFIGSHELL_FB_SITE = $(call github,open-iscsi,configshell-fb,$(PYTHON_CONFIGSHELL_FB_VERSION)) +PYTHON_CONFIGSHELL_FB_VERSION = 1.1.fb18 +PYTHON_CONFIGSHELL_FB_SITE = $(call github,open-iscsi,configshell-fb,v$(PYTHON_CONFIGSHELL_FB_VERSION)) PYTHON_CONFIGSHELL_FB_LICENSE = Apache-2.0 PYTHON_CONFIGSHELL_FB_LICENSE_FILES = COPYING PYTHON_CONFIGSHELL_FB_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-constantly/python-constantly.hash b/buildroot/package/python-constantly/python-constantly.hash index fb7787709..d2033de37 100644 --- a/buildroot/package/python-constantly/python-constantly.hash +++ b/buildroot/package/python-constantly/python-constantly.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/constantly/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/constantly/json md5 f0762f083d83039758e53f8cf0086eef constantly-15.1.0.tar.gz +# Locally computed sha256 586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 constantly-15.1.0.tar.gz +sha256 020870fcaf4bf9c50b233e331817094fe109b91c0880570fd476f527cfbfc085 LICENSE diff --git a/buildroot/package/python-couchdb/python-couchdb.hash b/buildroot/package/python-couchdb/python-couchdb.hash index f9422a8ce..67b7b1269 100644 --- a/buildroot/package/python-couchdb/python-couchdb.hash +++ b/buildroot/package/python-couchdb/python-couchdb.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/couchdb/json, sha256 locally computed -md5 2ed5ad2a477fd3cb472ed6dc5a381ff3 CouchDB-1.1.tar.gz -sha256 9503ea413956c33b5e2af248235afb5e0f011f33f816a32e872f8ff9b0a0e710 CouchDB-1.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/couchdb/json +md5 de40696472202d728cfca4279629e4ff CouchDB-1.2.tar.gz +sha256 1386a1a43f25bed3667e3b805222054940d674fa1967fa48e9d2012a18630ab7 CouchDB-1.2.tar.gz +# Locally computed sha256 checksums +sha256 c538da1ae16b6d75f6fa65852bb158dbf9e556b01681be5b692692906d244241 COPYING diff --git a/buildroot/package/python-couchdb/python-couchdb.mk b/buildroot/package/python-couchdb/python-couchdb.mk index afdbdf59c..b88c65703 100644 --- a/buildroot/package/python-couchdb/python-couchdb.mk +++ b/buildroot/package/python-couchdb/python-couchdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_COUCHDB_VERSION = 1.1 +PYTHON_COUCHDB_VERSION = 1.2 PYTHON_COUCHDB_SOURCE = CouchDB-$(PYTHON_COUCHDB_VERSION).tar.gz -PYTHON_COUCHDB_SITE = https://pypi.python.org/packages/9a/e8/c3c8da6d00145aaca07f2b784794917613dad26532068da4e8392dc48d7f +PYTHON_COUCHDB_SITE = https://files.pythonhosted.org/packages/7c/c8/f94a107eca0c178e5d74c705dad1a5205c0f580840bd1b155cd8a258cb7c PYTHON_COUCHDB_SETUP_TYPE = setuptools PYTHON_COUCHDB_LICENSE = BSD-3-Clause PYTHON_COUCHDB_LICENSE_FILES = COPYING diff --git a/buildroot/package/python-crc16/python-crc16.hash b/buildroot/package/python-crc16/python-crc16.hash index 81b39a037..4576a907e 100644 --- a/buildroot/package/python-crc16/python-crc16.hash +++ b/buildroot/package/python-crc16/python-crc16.hash @@ -1,2 +1,3 @@ # locally computed sha256 10aeda70fbe8b284874b3b1b8f74b9c1f6d5e8dee20ac8f9d5bc49f45f12a42a python-crc16-0.1.1.tar.gz +sha256 ea7d049c7705dc13afc202dd18e1827f3484f8212fd3fa7b82fc4a0c363432c9 COPYING.txt diff --git a/buildroot/package/python-crcmod/python-crcmod.hash b/buildroot/package/python-crcmod/python-crcmod.hash index 7ce549c30..8ba98d3c0 100644 --- a/buildroot/package/python-crcmod/python-crcmod.hash +++ b/buildroot/package/python-crcmod/python-crcmod.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/crcmod/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/crcmod/json md5 2d5b92117d958dcead94f9e17f54cd32 crcmod-1.7.tar.gz +# Locally computed sha256 dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e crcmod-1.7.tar.gz +sha256 89480768826f408daea1f3caff0509c2cc9606e10f6bb0ccfd12a3d604842c35 LICENSE diff --git a/buildroot/package/python-crontab/Config.in b/buildroot/package/python-crontab/Config.in new file mode 100644 index 000000000..102dbbdb6 --- /dev/null +++ b/buildroot/package/python-crontab/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_CRONTAB + bool "python-crontab" + select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + help + Crontab module for reading and writing crontab files and + accessing the system cron automatically and simply using + a direct API. + + https://gitlab.com/doctormo/python-crontab/ diff --git a/buildroot/package/python-crontab/python-crontab.hash b/buildroot/package/python-crontab/python-crontab.hash new file mode 100644 index 000000000..c4f3636f5 --- /dev/null +++ b/buildroot/package/python-crontab/python-crontab.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-crontab/json +md5 e1f2ca65e0218a85c724e3d6058da2a3 python-crontab-2.4.0.tar.gz +sha256 3ac1608ff76032e6fc6e16b5fbf83b51557e0e066bf78e9f88571571e7bd7ae6 python-crontab-2.4.0.tar.gz +# Locally computed sha256 checksums +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/buildroot/package/python-crontab/python-crontab.mk b/buildroot/package/python-crontab/python-crontab.mk new file mode 100644 index 000000000..f6bf8d707 --- /dev/null +++ b/buildroot/package/python-crontab/python-crontab.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-crontab +# +################################################################################ + +PYTHON_CRONTAB_VERSION = 2.4.0 +PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/bc/03/852f9c5f8da7f58abce06fe8ae769cbcf6502f1c60684b16bad72ffcced3 +PYTHON_CRONTAB_SETUP_TYPE = setuptools +PYTHON_CRONTAB_LICENSE = LGPL-3.0+ +PYTHON_CRONTAB_LICENSE_FILES = COPYING + +$(eval $(python-package)) diff --git a/buildroot/package/python-cryptography/python-cryptography.hash b/buildroot/package/python-cryptography/python-cryptography.hash index 36da21c9c..30ffa73d7 100644 --- a/buildroot/package/python-cryptography/python-cryptography.hash +++ b/buildroot/package/python-cryptography/python-cryptography.hash @@ -1,7 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/cryptography/json -md5 2b5e8269c43c9b9ab54fc8c75ba3c7ac cryptography-2.3.1.tar.gz -sha256 8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6 cryptography-2.3.1.tar.gz +md5 77730058b556c6d9838679a94c6229ce cryptography-2.8.tar.gz +sha256 3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651 cryptography-2.8.tar.gz # Locally computed sha256 checksums sha256 35452b557fab0efb1e80d7edb9c4e5118b9384082adaa051dde342102cb9de8d LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE +sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE sha256 602c4c7482de6479dd2e9793cda275e5e63d773dacd1eca689232ab7008fb4fb LICENSE.BSD diff --git a/buildroot/package/python-cryptography/python-cryptography.mk b/buildroot/package/python-cryptography/python-cryptography.mk index 91b680b2b..54437ae68 100644 --- a/buildroot/package/python-cryptography/python-cryptography.mk +++ b/buildroot/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 2.3.1 +PYTHON_CRYPTOGRAPHY_VERSION = 2.8 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/22/21/233e38f74188db94e8451ef6385754a98f3cad9b59bedf3a8e8b14988be4 +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/be/60/da377e1bed002716fb2d5d1d1cab720f298cb33ecff7bf7adea72788e4e4 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD diff --git a/buildroot/package/python-cssselect/python-cssselect.hash b/buildroot/package/python-cssselect/python-cssselect.hash index dd05bebe5..44813416c 100644 --- a/buildroot/package/python-cssselect/python-cssselect.hash +++ b/buildroot/package/python-cssselect/python-cssselect.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/cssselect/json, sha256 locally computed -md5 50422c9ec04b74cd60c571f74ddc1a80 cssselect-1.0.3.tar.gz -sha256 066d8bc5229af09617e24b3ca4d52f1f9092d9e061931f4184cd572885c23204 cssselect-1.0.3.tar.gz -sha256 5c8da9f744e0afba81a48c9b5dbe73048f798b3287d6f1af8a05ee08ebb10892 LICENSE +# md5, sha256 from https://pypi.org/pypi/cssselect/json +md5 fa57704c1cb66cc8e537b782bd6b227e cssselect-1.1.0.tar.gz +sha256 f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc cssselect-1.1.0.tar.gz +# Locally computed sha256 checksums +sha256 5c8da9f744e0afba81a48c9b5dbe73048f798b3287d6f1af8a05ee08ebb10892 LICENSE diff --git a/buildroot/package/python-cssselect/python-cssselect.mk b/buildroot/package/python-cssselect/python-cssselect.mk index 4ecc07aef..f6faa94b4 100644 --- a/buildroot/package/python-cssselect/python-cssselect.mk +++ b/buildroot/package/python-cssselect/python-cssselect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CSSSELECT_VERSION = 1.0.3 +PYTHON_CSSSELECT_VERSION = 1.1.0 PYTHON_CSSSELECT_SOURCE = cssselect-$(PYTHON_CSSSELECT_VERSION).tar.gz -PYTHON_CSSSELECT_SITE = https://pypi.python.org/packages/52/ea/f31e1d2e9eb130fda2a631e22eac369dc644e8807345fbed5113f2d6f92b +PYTHON_CSSSELECT_SITE = https://files.pythonhosted.org/packages/70/54/37630f6eb2c214cdee2ae56b7287394c8aa2f3bafb8b4eb8c3791aae7a14 PYTHON_CSSSELECT_SETUP_TYPE = setuptools PYTHON_CSSSELECT_LICENSE = BSD-3-Clause PYTHON_CSSSELECT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-cssutils/python-cssutils.hash b/buildroot/package/python-cssutils/python-cssutils.hash index 7b188bcd4..393daffb8 100644 --- a/buildroot/package/python-cssutils/python-cssutils.hash +++ b/buildroot/package/python-cssutils/python-cssutils.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/cssutils/json, sha256 locally computed -md5 7fcdf2c3e9f053136af1990146eb361d cssutils-1.0.1.tar.gz -sha256 d8a18b2848ea1011750231f1dd64fe9053dbec1be0b37563c582561e7a529063 cssutils-1.0.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/cssutils/json +md5 dc66d96c2d78f1687f59ac412fe9d318 cssutils-1.0.2.tar.gz +sha256 a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf cssutils-1.0.2.tar.gz +# Locally computed sha256 checksums +sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a COPYING.LESSER diff --git a/buildroot/package/python-cssutils/python-cssutils.mk b/buildroot/package/python-cssutils/python-cssutils.mk index 3aa96f47d..513c3a87d 100644 --- a/buildroot/package/python-cssutils/python-cssutils.mk +++ b/buildroot/package/python-cssutils/python-cssutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CSSUTILS_VERSION = 1.0.1 +PYTHON_CSSUTILS_VERSION = 1.0.2 PYTHON_CSSUTILS_SOURCE = cssutils-$(PYTHON_CSSUTILS_VERSION).tar.gz -PYTHON_CSSUTILS_SITE = https://pypi.python.org/packages/22/de/6b03e0088baf0299ab7d2e95a9e26c2092e9cb3855876b958b6a62175ca2 +PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/5c/0b/c5f29d29c037e97043770b5e7c740b6252993e4b57f029b3cd03c78ddfec PYTHON_CSSUTILS_LICENSE = LGPL-3.0+ PYTHON_CSSUTILS_LICENSE_FILES = COPYING.LESSER PYTHON_CSSUTILS_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-cycler/Config.in b/buildroot/package/python-cycler/Config.in new file mode 100644 index 000000000..854873c96 --- /dev/null +++ b/buildroot/package/python-cycler/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_CYCLER + bool "python-cycler" + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + help + Creates a Cycler objects much like cycler, but + includes input validation. + + https://matplotlib.org/cycler/ diff --git a/buildroot/package/python-cycler/python-cycler.hash b/buildroot/package/python-cycler/python-cycler.hash new file mode 100644 index 000000000..8255458b2 --- /dev/null +++ b/buildroot/package/python-cycler/python-cycler.hash @@ -0,0 +1,4 @@ +# sha256 from https://pypi.org/project/cyclic/#files +sha256 cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8 cycler-0.10.0.tar.gz +# Locally computed sha256 checksums +sha256 f1218143d766da3fea66f13396b7f15df46a83303f29bf96ba6e98eb4d42f408 LICENSE diff --git a/buildroot/package/python-cycler/python-cycler.mk b/buildroot/package/python-cycler/python-cycler.mk new file mode 100644 index 000000000..4f1f40191 --- /dev/null +++ b/buildroot/package/python-cycler/python-cycler.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-cycler +# +################################################################################ + +PYTHON_CYCLER_VERSION = 0.10.0 +PYTHON_CYCLER_SOURCE = cycler-$(PYTHON_CYCLER_VERSION).tar.gz +PYTHON_CYCLER_SITE = https://files.pythonhosted.org/packages/c2/4b/137dea450d6e1e3d474e1d873cd1d4f7d3beed7e0dc973b06e8e10d32488 +PYTHON_CYCLER_LICENSE = BSD +PYTHON_CYCLER_LICENSE_FILES = LICENSE +PYTHON_CYCLER_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot/package/python-cython/python-cython.hash b/buildroot/package/python-cython/python-cython.hash index 87aa56552..06ebbd5a9 100644 --- a/buildroot/package/python-cython/python-cython.hash +++ b/buildroot/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 bc0cca4658947bf2fb3fc10e8d090182 Cython-0.29.9.tar.gz -sha256 b88e033c06d29f3f3c760a3fb9837dce6e124d627bd562d1cdf93e9da16df215 Cython-0.29.9.tar.gz +md5 63c819697ed7ce89c6455ff578312a26 Cython-0.29.15.tar.gz +sha256 60d859e1efa5cc80436d58aecd3718ff2e74b987db0518376046adedba97ac30 Cython-0.29.15.tar.gz # Locally computed sha256 checksums sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/buildroot/package/python-cython/python-cython.mk b/buildroot/package/python-cython/python-cython.mk index bd9f322d5..997a38db1 100644 --- a/buildroot/package/python-cython/python-cython.mk +++ b/buildroot/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.9 +PYTHON_CYTHON_VERSION = 0.29.15 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/69/ab/b18f7f2e61c12e5e859c86b6d37f73971679d5f5c5c97d6cc7ff8916468a +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/d9/82/d01e767abb9c4a5c07a6a1e6f4d5a8dfce7369318d31f48a52374094372e PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt diff --git a/buildroot/package/python-daemon/Config.in b/buildroot/package/python-daemon/Config.in index 21f440745..9944bb9e3 100644 --- a/buildroot/package/python-daemon/Config.in +++ b/buildroot/package/python-daemon/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_DAEMON bool "python-daemon" select BR2_PACKAGE_PYTHON_DOCUTILS # runtime + select BR2_PACKAGE_PYTHON_LOCKFILE # runtime help Library to implement a well-behaved Unix daemon process. diff --git a/buildroot/package/python-daemon/python-daemon.hash b/buildroot/package/python-daemon/python-daemon.hash index 12977b579..4f53902d3 100644 --- a/buildroot/package/python-daemon/python-daemon.hash +++ b/buildroot/package/python-daemon/python-daemon.hash @@ -1,3 +1,6 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=72e2acf2c3d69c7fa75a6625d06adfd0, sha256 locally computed -md5 72e2acf2c3d69c7fa75a6625d06adfd0 python-daemon-2.1.1.tar.gz -sha256 58a8c187ee37c3a28913bef00f83240c9ecd4a59dce09a24d92f5c941606689f python-daemon-2.1.1.tar.gz +# md5, sha256 https://pypi.org/pypi/python-daemon/json +md5 3ab10a93472201214cd95c05f1923af6 python-daemon-2.2.3.tar.gz +sha256 affeca9e5adfce2666a63890af9d6aff79f670f7511899edaddca7f96593cc25 python-daemon-2.2.3.tar.gz +# Locally computed sha256 +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.ASF-2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL-3 diff --git a/buildroot/package/python-daemon/python-daemon.mk b/buildroot/package/python-daemon/python-daemon.mk index 76820b70f..600ccf5bf 100644 --- a/buildroot/package/python-daemon/python-daemon.mk +++ b/buildroot/package/python-daemon/python-daemon.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_DAEMON_VERSION = 2.1.1 +PYTHON_DAEMON_VERSION = 2.2.3 PYTHON_DAEMON_SITE = https://pypi.python.org/packages/source/p/python-daemon PYTHON_DAEMON_LICENSE = Apache-2.0 (library), GPL-3.0+ (test, build) PYTHON_DAEMON_LICENSE_FILES = LICENSE.ASF-2 LICENSE.GPL-3 diff --git a/buildroot/package/python-daemonize/python-daemonize.hash b/buildroot/package/python-daemonize/python-daemonize.hash index d2111a319..aa2c90452 100644 --- a/buildroot/package/python-daemonize/python-daemonize.hash +++ b/buildroot/package/python-daemonize/python-daemonize.hash @@ -1,3 +1,5 @@ -# From https://pypi.python.org/pypi/daemonize/json -md5 6759005b12dfeea0d4305f8536b4b0c2 daemonize-2.4.7.tar.gz -sha256 c0194e861826be456c7c69985825ac7b79632d8ac7ad4cde8e12fee7971468c8 daemonize-2.4.7.tar.gz +# md5, sha256 from https://pypi.org/pypi/daemonize/json +md5 3d64e7a0219ad22e3fca62460f893b6a daemonize-2.5.0.tar.gz +sha256 dd026e4ff8d22cb016ed2130bc738b7d4b1da597ef93c074d2adb9e4dea08bc3 daemonize-2.5.0.tar.gz +# Locally computed sha256 checksums +sha256 248d0d3147d20a09bed8f03da8ed72f47009073606dcc1bab658f942d34b29f8 LICENSE diff --git a/buildroot/package/python-daemonize/python-daemonize.mk b/buildroot/package/python-daemonize/python-daemonize.mk index bfcfe9337..de146bf8d 100644 --- a/buildroot/package/python-daemonize/python-daemonize.mk +++ b/buildroot/package/python-daemonize/python-daemonize.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DAEMONIZE_VERSION = 2.4.7 +PYTHON_DAEMONIZE_VERSION = 2.5.0 PYTHON_DAEMONIZE_SOURCE = daemonize-$(PYTHON_DAEMONIZE_VERSION).tar.gz -PYTHON_DAEMONIZE_SITE = https://pypi.python.org/packages/84/15/923e3fe48239adf5d697c29e04a3f868d3e4ce8539aab29d6abe784db5be +PYTHON_DAEMONIZE_SITE = https://files.pythonhosted.org/packages/8c/20/96f7dbc23812cfe4cf479c87af3e4305d0d115fd1fffec32ddeee7b9c82b PYTHON_DAEMONIZE_SETUP_TYPE = setuptools PYTHON_DAEMONIZE_LICENSE = MIT PYTHON_DAEMONIZE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-daphne/0001-remove-pytest-runner-requirement.patch b/buildroot/package/python-daphne/0001-remove-pytest-runner-requirement.patch new file mode 100644 index 000000000..30acf201d --- /dev/null +++ b/buildroot/package/python-daphne/0001-remove-pytest-runner-requirement.patch @@ -0,0 +1,27 @@ +From f9d881cc55c89f51240f93308713216cfec793eb Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Sat, 3 Aug 2019 14:23:19 -0400 +Subject: [PATCH] remove pytest-runner requirement + +Setup does not actually require pytest-runner. As such, remove it. + +Signed-off-by: Adam Duskett +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 64e94f1..4e3abb0 100755 +--- a/setup.py ++++ b/setup.py +@@ -23,7 +23,6 @@ setup( + packages=find_packages() + ["twisted.plugins"], + include_package_data=True, + install_requires=["twisted[tls]>=18.7", "autobahn>=0.18", "asgiref~=3.2"], +- setup_requires=["pytest-runner"], + extras_require={ + "tests": ["hypothesis~=3.88", "pytest~=3.10", "pytest-asyncio~=0.8"] + }, +-- +2.21.0 + diff --git a/buildroot/package/python-daphne/Config.in b/buildroot/package/python-daphne/Config.in new file mode 100644 index 000000000..601b2e1db --- /dev/null +++ b/buildroot/package/python-daphne/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_PYTHON_DAPHNE + bool "python-daphne" + depends on BR2_INSTALL_LIBSTDCPP # python-autobahn -> python-cryptography + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_ASGIREF # runtime + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime + help + Daphne is a HTTP, HTTP2 and WebSocket protocol server for + ASGI and ASGI-HTTP, developed to power Django Channels. + It supports automatic negotiation of protocols; there's no + need for URL prefixing to determine WebSocket endpoints + versus HTTP endpoints. + + https://github.com/django/daphne + +comment "python-daphne needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_PYTHON3 diff --git a/buildroot/package/python-daphne/python-daphne.hash b/buildroot/package/python-daphne/python-daphne.hash new file mode 100644 index 000000000..cdf5e83eb --- /dev/null +++ b/buildroot/package/python-daphne/python-daphne.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/daphne/json +md5 564353eaed92659e3b113d966a0288f2 daphne-2.4.1.tar.gz0 +sha256 1e41d02d78da373c1f8504835cdca6d447b5d64c2941661d4bd968d412b6c383 daphne-2.4.1.tar.gz +# Locally computed sha256 +sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/buildroot/package/python-daphne/python-daphne.mk b/buildroot/package/python-daphne/python-daphne.mk new file mode 100644 index 000000000..cd4739db1 --- /dev/null +++ b/buildroot/package/python-daphne/python-daphne.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-daphne +# +################################################################################ + +PYTHON_DAPHNE_VERSION = 2.4.1 +PYTHON_DAPHNE_SOURCE = daphne-$(PYTHON_DAPHNE_VERSION).tar.gz +PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/03/6c/847d1c962f8c45aa2ab0791583c4a41669d158e28fd6369ce940b8ea8417 +PYTHON_DAPHNE_SETUP_TYPE = setuptools +# https://github.com/django/daphne/blob/master/LICENSE +PYTHON_DAPHNE_LICENSE = BSD-3-Clause +PYTHON_DAPHNE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-dataproperty/Config.in b/buildroot/package/python-dataproperty/Config.in index 186870904..2d42b02c6 100644 --- a/buildroot/package/python-dataproperty/Config.in +++ b/buildroot/package/python-dataproperty/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_PYTHON_DATAPROPERTY bool "python-dataproperty" - select BR2_PACKAGE_PYTHON_LOGBOOK # runtime + select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_FUTURES if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help Python library for extract property from data. diff --git a/buildroot/package/python-dataproperty/python-dataproperty.hash b/buildroot/package/python-dataproperty/python-dataproperty.hash index 0e74acac5..2a1625065 100644 --- a/buildroot/package/python-dataproperty/python-dataproperty.hash +++ b/buildroot/package/python-dataproperty/python-dataproperty.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/DataProperty/json, sha256 locally computed -md5 66ecca45ae5e00b2a88799a2795a0cf8 DataProperty-0.29.1.tar.gz -sha256 3e547003b1af16126ff48b1c284241bc8a46d1e38e334ecd3a5ba87955446806 DataProperty-0.29.1.tar.gz -sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE +# md5, sha256 from https://pypi.org/pypi/dataproperty/json +md5 8280a85691959d988e58f52c0ed3d311 DataProperty-0.43.1.tar.gz +sha256 ac2bc221a53fcd2afa140d1feb45cadbe62b335f667dba1e08e3c43a93339103 DataProperty-0.43.1.tar.gz +# Locally computed sha256 checksums +sha256 98799b7c99b561c5ffa3ac86600e501f761afa8e72af8a2515026445fe134105 LICENSE diff --git a/buildroot/package/python-dataproperty/python-dataproperty.mk b/buildroot/package/python-dataproperty/python-dataproperty.mk index 900cd0460..74eeb859a 100644 --- a/buildroot/package/python-dataproperty/python-dataproperty.mk +++ b/buildroot/package/python-dataproperty/python-dataproperty.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DATAPROPERTY_VERSION = 0.29.1 +PYTHON_DATAPROPERTY_VERSION = 0.43.1 PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz -PYTHON_DATAPROPERTY_SITE = https://pypi.python.org/packages/38/6f/bf65cf1398ca34c709bf14ca9bc33821588498abe50c4652b0d345b9c08c +PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/95/68/fb3498145a106f700ff304158b6d0f0c76eb3001ee5129a4f16c9846b338 PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools PYTHON_DATAPROPERTY_LICENSE = MIT PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-dateutil/python-dateutil.hash b/buildroot/package/python-dateutil/python-dateutil.hash index eecba7d35..f3dc69f27 100644 --- a/buildroot/package/python-dateutil/python-dateutil.hash +++ b/buildroot/package/python-dateutil/python-dateutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-dateutil/json -md5 354db28843d949f1bc3e49e8458e22df python-dateutil-2.8.0.tar.gz -sha256 c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e python-dateutil-2.8.0.tar.gz +md5 f2a1d4b680b297b367a974664ca3a4f6 python-dateutil-2.8.1.tar.gz +sha256 73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c python-dateutil-2.8.1.tar.gz # Locally computed sha256 checksums sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE diff --git a/buildroot/package/python-dateutil/python-dateutil.mk b/buildroot/package/python-dateutil/python-dateutil.mk index 4c915c8e8..759261d2d 100644 --- a/buildroot/package/python-dateutil/python-dateutil.mk +++ b/buildroot/package/python-dateutil/python-dateutil.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_DATEUTIL_VERSION = 2.8.0 -PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/ad/99/5b2e99737edeb28c71bcbec5b5dda19d0d9ef3ca3e92e3e925e7c0bb364c +PYTHON_DATEUTIL_VERSION = 2.8.1 +PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/be/ed/5bbc91f03fa4c839c4c7360375da77f9659af5f7086b7a7bdda65771c8e0 PYTHON_DATEUTIL_SETUP_TYPE = setuptools PYTHON_DATEUTIL_LICENSE = BSD-3-Clause PYTHON_DATEUTIL_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-decorator/python-decorator.hash b/buildroot/package/python-decorator/python-decorator.hash index ca7fb88e7..77b48d84c 100644 --- a/buildroot/package/python-decorator/python-decorator.hash +++ b/buildroot/package/python-decorator/python-decorator.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/decorator/json, sha256 locally calculated -md5 73644c8f0bd4983d1b6a34b49adec0ae decorator-4.0.11.tar.gz -sha256 953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76 decorator-4.0.11.tar.gz +# md5, sha256 from https://pypi.org/pypi/decorator/json +md5 933981f288c4230816b5beee8d40e6ea decorator-4.4.1.tar.gz +sha256 54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce decorator-4.4.1.tar.gz # Locally computed sha256 checksums -sha256 c9fbbd46d5af040b2b26db2f693034c95de8e9faaaf1cd68af358b092a56d454 LICENSE.txt +sha256 fd11660cabf0532082c45706862fafc294907ec7f8e217818240a4999806782e LICENSE.txt diff --git a/buildroot/package/python-decorator/python-decorator.mk b/buildroot/package/python-decorator/python-decorator.mk index 67d9b8e71..8df1dd70c 100644 --- a/buildroot/package/python-decorator/python-decorator.mk +++ b/buildroot/package/python-decorator/python-decorator.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_DECORATOR_VERSION = 4.0.11 -PYTHON_DECORATOR_SITE = https://pypi.python.org/packages/cc/ac/5a16f1fc0506ff72fcc8fd4e858e3a1c231f224ab79bb7c4c9b2094cc570 +PYTHON_DECORATOR_VERSION = 4.4.1 +PYTHON_DECORATOR_SITE = https://files.pythonhosted.org/packages/dc/c3/9d378af09f5737cfd524b844cd2fbb0d2263a35c11d712043daab290144d PYTHON_DECORATOR_SOURCE = decorator-$(PYTHON_DECORATOR_VERSION).tar.gz PYTHON_DECORATOR_LICENSE = BSD-2-Clause PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-dialog/python-dialog.hash b/buildroot/package/python-dialog/python-dialog.hash index 3cf0eaa3d..8f84e198b 100644 --- a/buildroot/package/python-dialog/python-dialog.hash +++ b/buildroot/package/python-dialog/python-dialog.hash @@ -1,2 +1,5 @@ -# Locally computed: -sha256 58466c2f897ef761716b811ff74e035979b5ecefb529ba004b12db117a0f4581 python2-pythondialog-3.0.1.tar.bz2 +# Locally computed after verifying +# https://sourceforge.net/projects/pythondialog/files/pythondialog/3.4.0/python3-pythondialog-3.4.0.tar.bz2.asc +# with key 9B6F19FB52965E6C21FE76142A205688F8489BDD +sha256 8978d355c8db6728eeb9e23b39449b14597f1c76cb06dc72462642ca7cde46a0 python2-pythondialog-3.4.0.tar.bz2 +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/buildroot/package/python-dialog/python-dialog.mk b/buildroot/package/python-dialog/python-dialog.mk index 01bcb760d..d5d4a4ceb 100644 --- a/buildroot/package/python-dialog/python-dialog.mk +++ b/buildroot/package/python-dialog/python-dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_DIALOG_VERSION = 3.0.1 +PYTHON_DIALOG_VERSION = 3.4.0 PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2 PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION) PYTHON_DIALOG_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/python-dialog3/python-dialog3.hash b/buildroot/package/python-dialog3/python-dialog3.hash index dae863b76..83e26c572 100644 --- a/buildroot/package/python-dialog3/python-dialog3.hash +++ b/buildroot/package/python-dialog3/python-dialog3.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pythondialog/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/pythondialog/json md5 3d5ebc33e85f6313964f5eef720dab19 pythondialog-3.4.0.tar.bz2 +# Locally computed sha256 019cdbffe3f61d32d6fb158ce48a767478af2aac2f31fb40460b39aefae604fe pythondialog-3.4.0.tar.bz2 +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/buildroot/package/python-dicttoxml/python-dicttoxml.hash b/buildroot/package/python-dicttoxml/python-dicttoxml.hash index 32ba6b0fd..45c9fc8cc 100644 --- a/buildroot/package/python-dicttoxml/python-dicttoxml.hash +++ b/buildroot/package/python-dicttoxml/python-dicttoxml.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/dicttoxml/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/dicttoxml/json md5 ec5643a048cf32dad3c28db236b923e4 dicttoxml-1.7.4.tar.gz +# Locally computed sha256 ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45 dicttoxml-1.7.4.tar.gz +sha256 4514114bd9da0b2fbf8c4fa264c0e6cc80fd41e6ac7f09d7a39a215662951c7c LICENCE.txt diff --git a/buildroot/package/python-django-enumfields/Config.in b/buildroot/package/python-django-enumfields/Config.in new file mode 100644 index 000000000..58dea365e --- /dev/null +++ b/buildroot/package/python-django-enumfields/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_DJANGO_ENUMFIELDS + bool "python-django-enumfields" + select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime + help + Real Python Enums for Django. + + https://github.com/hzdg/django-enumfields diff --git a/buildroot/package/python-django-enumfields/python-django-enumfields.hash b/buildroot/package/python-django-enumfields/python-django-enumfields.hash new file mode 100644 index 000000000..84eb028e6 --- /dev/null +++ b/buildroot/package/python-django-enumfields/python-django-enumfields.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/django-enumfields/json +md5 c9725a2c31ca2949d111815742335279 django-enumfields-1.0.0.tar.gz +sha256 5b0e2dd5973337717ca6bd5a7d9e167e6ae01203c160d4761b88837c4678f219 django-enumfields-1.0.0.tar.gz +# Locally computed sha256 checksums +sha256 5548de8c163dc57bd0a4f5772f1509f2c04f1390251c98ebf060c9d52a223f57 LICENSE diff --git a/buildroot/package/python-django-enumfields/python-django-enumfields.mk b/buildroot/package/python-django-enumfields/python-django-enumfields.mk new file mode 100644 index 000000000..0121bd117 --- /dev/null +++ b/buildroot/package/python-django-enumfields/python-django-enumfields.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-django-enumfields +# +################################################################################ + +PYTHON_DJANGO_ENUMFIELDS_VERSION = 1.0.0 +PYTHON_DJANGO_ENUMFIELDS_SOURCE = django-enumfields-$(PYTHON_DJANGO_ENUMFIELDS_VERSION).tar.gz +PYTHON_DJANGO_ENUMFIELDS_SITE = https://files.pythonhosted.org/packages/b7/56/3f4e8d8ef6d5577a1b75b3cfae6dff819afd030e3a519a326ec7a7a0b74f +PYTHON_DJANGO_ENUMFIELDS_SETUP_TYPE = setuptools +PYTHON_DJANGO_ENUMFIELDS_LICENSE = MIT +PYTHON_DJANGO_ENUMFIELDS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-django/Config.in b/buildroot/package/python-django/Config.in index 0a2e308d3..6748d42e1 100644 --- a/buildroot/package/python-django/Config.in +++ b/buildroot/package/python-django/Config.in @@ -3,8 +3,11 @@ config BR2_PACKAGE_PYTHON_DJANGO depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_UNICODEDATA select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_SQLPARSE # runtime + help Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design. It takes your diff --git a/buildroot/package/python-django/python-django.hash b/buildroot/package/python-django/python-django.hash index 5d1e6c40e..af5e4bb6e 100644 --- a/buildroot/package/python-django/python-django.hash +++ b/buildroot/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 a9a6555d166196e502b69715341f7ad4 Django-2.2.9.tar.gz -sha256 662a1ff78792e3fd77f16f71b1f31149489434de4b62a74895bd5d6534e635a5 Django-2.2.9.tar.gz +md5 0b0299419770eaff86ff3a4af519cd6a Django-3.0.4.tar.gz +sha256 50b781f6cbeb98f673aa76ed8e572a019a45e52bdd4ad09001072dfd91ab07c8 Django-3.0.4.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/buildroot/package/python-django/python-django.mk b/buildroot/package/python-django/python-django.mk index d5b2c1585..0cc5749a9 100644 --- a/buildroot/package/python-django/python-django.mk +++ b/buildroot/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 2.2.9 +PYTHON_DJANGO_VERSION = 3.0.4 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/2c/0d/2aa8e58c791d2aa65658fa26f2b035a9da13a6a34d1b2d991912c8a33729 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/1d/38/89ea18b5aeb9b56fff7430388946e8e9dfd7a451f3e6ddb8a9b637f442c1 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-dnspython/Config.in b/buildroot/package/python-dnspython/Config.in new file mode 100644 index 000000000..99fd6a9a5 --- /dev/null +++ b/buildroot/package/python-dnspython/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_DNSPYTHON + bool "python-dnspython" + help + A powerful DNS toolkit for python. + + http://www.dnspython.org diff --git a/buildroot/package/python-dnspython/python-dnspython.hash b/buildroot/package/python-dnspython/python-dnspython.hash new file mode 100644 index 000000000..af09d51cd --- /dev/null +++ b/buildroot/package/python-dnspython/python-dnspython.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/dnspython/json +md5 bc9ca3b3a82164667d5730ec6d5248a2 dnspython-1.16.0.zip +sha256 36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01 dnspython-1.16.0.zip +# Locally computed sha256 checksums +sha256 c3ea3ff5654b329c19d3bc5f7481af623c3dded4a6145585499f843ad3d741cd LICENSE diff --git a/buildroot/package/python-dnspython/python-dnspython.mk b/buildroot/package/python-dnspython/python-dnspython.mk new file mode 100644 index 000000000..18d98efd7 --- /dev/null +++ b/buildroot/package/python-dnspython/python-dnspython.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-dnspython +# +################################################################################ + +PYTHON_DNSPYTHON_VERSION = 1.16.0 +PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).zip +PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/ec/c5/14bcd63cb6d06092a004793399ec395405edf97c2301dfdc146dfbd5beed +PYTHON_DNSPYTHON_LICENSE = ISC +PYTHON_DNSPYTHON_LICENSE_FILES = LICENSE +PYTHON_DNSPYTHON_SETUP_TYPE = setuptools + +define PYTHON_DNSPYTHON_EXTRACT_CMDS + $(UNZIP) -d $(@D) $(PYTHON_DNSPYTHON_DL_DIR)/$(PYTHON_DNSPYTHON_SOURCE) + mv $(@D)/dnspython-$(PYTHON_DNSPYTHON_VERSION)/* $(@D) + $(RM) -r $(@D)/dnspython-$(PYTHON_DNSPYTHON_VERSION) +endef + +$(eval $(python-package)) diff --git a/buildroot/package/python-docker/Config.in b/buildroot/package/python-docker/Config.in index 35f7666f1..df5e4887f 100644 --- a/buildroot/package/python-docker/Config.in +++ b/buildroot/package/python-docker/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_PYTHON_DOCKER select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime - select BR2_PACKAGE_PYTHON_DOCKER_PYCREDS # runtime help A Python library for the Docker Engine API. diff --git a/buildroot/package/python-docker/python-docker.hash b/buildroot/package/python-docker/python-docker.hash index 37fda94f0..0006a8a7d 100644 --- a/buildroot/package/python-docker/python-docker.hash +++ b/buildroot/package/python-docker/python-docker.hash @@ -1,4 +1,5 @@ -# md5 and sha256 from https://pypi.python.org/pypi/docker/json -md5 496237b9e0826eff8436b1a786943a86 docker-3.5.1.tar.gz -sha256 fbe82af9b94ccced752527c8de07fa20267f9634b48674ba478a0bb4000a0b1e docker-3.5.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/docker/json +md5 e1e8dc73e3220fe9eec1faf80b0290de docker-4.1.0.tar.gz +sha256 6e06c5e70ba4fad73e35f00c55a895a448398f3ada7faae072e2bb01348bafc1 docker-4.1.0.tar.gz +# Locally computed sha256 checksums sha256 f2f0b07fa5e492c11d27aa0d2f3f1a0e64b9d17f32d8aa489ae2af9609af33b2 LICENSE diff --git a/buildroot/package/python-docker/python-docker.mk b/buildroot/package/python-docker/python-docker.mk index 01ae2da9b..67cb150b4 100644 --- a/buildroot/package/python-docker/python-docker.mk +++ b/buildroot/package/python-docker/python-docker.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOCKER_VERSION = 3.5.1 +PYTHON_DOCKER_VERSION = 4.1.0 PYTHON_DOCKER_SOURCE = docker-$(PYTHON_DOCKER_VERSION).tar.gz -PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/b1/4f/d4f646843335430701d459fea08b0285a2c0a364150dd5b9c5f27f723121 +PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/de/54/a822d7116ff2f726f3da2b3e6c87659657bdcb7a36e382860ed505ed5e45 PYTHON_DOCKER_SETUP_TYPE = setuptools PYTHON_DOCKER_LICENSE = Apache-2.0 PYTHON_DOCKER_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-docopt/python-docopt.hash b/buildroot/package/python-docopt/python-docopt.hash index c38e1ab73..eebfd5cc9 100644 --- a/buildroot/package/python-docopt/python-docopt.hash +++ b/buildroot/package/python-docopt/python-docopt.hash @@ -1,2 +1,3 @@ # locally computed sha256 2113eed1e7fbbcd43fb7ee6a977fb02d0b482753586c9dc1a8e3b7d541426e99 python-docopt-0.6.2.tar.gz +sha256 3d5df78f592ff2433c3c6ce4984091b7f497059ddb8c6b08a061ba48e37b67f2 LICENSE-MIT diff --git a/buildroot/package/python-docutils/0001-Update-setup.py.patch b/buildroot/package/python-docutils/0001-Update-setup.py.patch new file mode 100644 index 000000000..3fb34a976 --- /dev/null +++ b/buildroot/package/python-docutils/0001-Update-setup.py.patch @@ -0,0 +1,64 @@ +From 583e59ccf72a02c2a6f0399f29f622c7f2f4a932 Mon Sep 17 00:00:00 2001 +From: milde +Date: Sun, 1 Sep 2019 19:39:36 +0000 +Subject: [PATCH] Update setup.py + +Python 3.4 no longer supported, +more languages supported (and Lithuanian accepted by PyPi). + +git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8383 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 + +[Asaf: adjust upstream patch to 0.15.2] +Signed-off-by: Asaf Kahlon +--- + setup.py | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index f801ea2..5c1ebfd 100755 +--- a/setup.py ++++ b/setup.py +@@ -7,6 +7,10 @@ import os + import glob + try: + import setuptools ++except ImportError: ++ print('Warning: Could not load package `setuptools`.') ++ print('Actions requiring `setuptools` instead of `distutils` will fail') ++try: + from distutils.core import setup, Command + from distutils.command.build import build + from distutils.command.build_py import build_py +@@ -123,7 +127,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 + 'maintainer_email': 'docutils-develop@lists.sourceforge.net', + 'license': 'public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)', + 'platforms': 'OS-independent', +- 'python_requires': '>=2.6, !=3.0.*, !=3.1.*, !=3.2.*', ++ 'python_requires': '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', + 'package_dir': {'docutils': 'docutils', + 'docutils.tools': 'tools'}, + 'packages': ['docutils', +@@ -213,14 +219,20 @@ classifiers = [ + 'Natural Language :: Chinese (Simplified)', + 'Natural Language :: Chinese (Traditional)', + 'Natural Language :: Czech', ++ 'Natural Language :: Danish', + 'Natural Language :: Dutch', + 'Natural Language :: Esperanto', + 'Natural Language :: Finnish', + 'Natural Language :: French', + 'Natural Language :: Galician', + 'Natural Language :: German', ++ 'Natural Language :: Hebrew', + 'Natural Language :: Italian', + 'Natural Language :: Japanese', ++ 'Natural Language :: Korean', ++ 'Natural Language :: Latvian', ++ 'Natural Language :: Lithuanian', ++ 'Natural Language :: Persian', + 'Natural Language :: Polish', + 'Natural Language :: Portuguese (Brazilian)', + 'Natural Language :: Russian', +-- +2.20.1 +k diff --git a/buildroot/package/python-docutils/python-docutils.hash b/buildroot/package/python-docutils/python-docutils.hash index dbf0fde8f..ccccca106 100644 --- a/buildroot/package/python-docutils/python-docutils.hash +++ b/buildroot/package/python-docutils/python-docutils.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed -md5 c53768d63db3873b7d452833553469de docutils-0.14.tar.gz -sha256 51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274 docutils-0.14.tar.gz -sha256 58c2807e9e6e3297ad4da08acc8884d09d8c5ffc9d824dd100922d0bb1ee4717 COPYING.txt +md5 e26a308d8000b0bed7416a633217c676 docutils-0.15.2.tar.gz +sha256 a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 docutils-0.15.2.tar.gz +sha256 efa0c85aa99ea5b4781240031b0d02af54d7b5554c87ad2b2bea9ba490f6663f COPYING.txt diff --git a/buildroot/package/python-docutils/python-docutils.mk b/buildroot/package/python-docutils/python-docutils.mk index 53da1a56d..9a42d3e5d 100644 --- a/buildroot/package/python-docutils/python-docutils.mk +++ b/buildroot/package/python-docutils/python-docutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOCUTILS_VERSION = 0.14 +PYTHON_DOCUTILS_VERSION = 0.15.2 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz -PYTHON_DOCUTILS_SITE = https://pypi.python.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61 PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, GPL-3.0 (emacs mode), other PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt PYTHON_DOCUTILS_SETUP_TYPE = distutils diff --git a/buildroot/package/python-dominate/python-dominate.hash b/buildroot/package/python-dominate/python-dominate.hash index 2480b004b..168e56e74 100644 --- a/buildroot/package/python-dominate/python-dominate.hash +++ b/buildroot/package/python-dominate/python-dominate.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/dominate/json, sha256 locally computed -md5 45bd97e6f7888aac24ae86013c57638e dominate-2.3.1.tar.gz -sha256 4b8ce6f33633c9dd9175b228d21c00c801b6bd0327747cd5e17fc2da934c3a69 dominate-2.3.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/dominate/json +md5 27d3aa7e0d67902c505e248e705e5e2e dominate-2.4.0.tar.gz +sha256 a92474b4312bd8b4c1789792f3ec8c571cd8afa8e7502a2b1c64dd48cd67e59c dominate-2.4.0.tar.gz +# Locally computed sha256 checksums +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 LICENSE.txt diff --git a/buildroot/package/python-dominate/python-dominate.mk b/buildroot/package/python-dominate/python-dominate.mk index 70ddb0679..e87b6842d 100644 --- a/buildroot/package/python-dominate/python-dominate.mk +++ b/buildroot/package/python-dominate/python-dominate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOMINATE_VERSION = 2.3.1 +PYTHON_DOMINATE_VERSION = 2.4.0 PYTHON_DOMINATE_SOURCE = dominate-$(PYTHON_DOMINATE_VERSION).tar.gz -PYTHON_DOMINATE_SITE = https://pypi.python.org/packages/43/b2/3b7d67dd59dab93ae08569384b254323516e8868b453eea5614a53835baf +PYTHON_DOMINATE_SITE = https://files.pythonhosted.org/packages/46/dd/0fde17069c908951941475eee110c84467591caa1cd8ca30136294c26621 PYTHON_DOMINATE_SETUP_TYPE = setuptools PYTHON_DOMINATE_LICENSE = LGPL-3.0+ PYTHON_DOMINATE_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-dpkt/python-dpkt.hash b/buildroot/package/python-dpkt/python-dpkt.hash index db46016d0..b8b53fd04 100644 --- a/buildroot/package/python-dpkt/python-dpkt.hash +++ b/buildroot/package/python-dpkt/python-dpkt.hash @@ -1,2 +1,5 @@ -# locally computed -sha256 33a98fd44eb0b6dfa6790c0fcef4d7e73a5cc12a664ea3c30f4d3c2b95f5efc4 python-dpkt-1.8.r98.tar.gz +# md5, sha256 from https://pypi.org/pypi/dpkt/json +md5 b204a5434fe29749de539150e00e762e dpkt-1.9.2.tar.gz +sha256 52a92ecd5ca04d5bd852bb11cb2eac4bbe38b42a7c472e0d950eeb9f82a81e54 dpkt-1.9.2.tar.gz +# Locally computed sha256 checksums +sha256 4c5ffde575425591cbd51410219a6b98bbbb717e0c5784187e356653da8e5095 LICENSE diff --git a/buildroot/package/python-dpkt/python-dpkt.mk b/buildroot/package/python-dpkt/python-dpkt.mk index 9694b9e62..aade014f6 100644 --- a/buildroot/package/python-dpkt/python-dpkt.mk +++ b/buildroot/package/python-dpkt/python-dpkt.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_DPKT_VERSION = 1.8.r98 -PYTHON_DPKT_SITE = $(call github,kbandla,dpkt,$(PYTHON_DPKT_VERSION)) -PYTHON_DPKT_SETUP_TYPE = distutils +PYTHON_DPKT_VERSION = 1.9.2 +PYTHON_DPKT_SOURCE = dpkt-$(PYTHON_DPKT_VERSION).tar.gz +PYTHON_DPKT_SITE = https://files.pythonhosted.org/packages/1c/25/0aebea939ea70d31a7ff8884e5ca577eddb9cfeac626398fe782d4e2f6a2 +PYTHON_DPKT_SETUP_TYPE = setuptools PYTHON_DPKT_LICENSE = BSD-3-Clause PYTHON_DPKT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-engineio/python-engineio.hash b/buildroot/package/python-engineio/python-engineio.hash index 09e004ac4..f10e69af6 100644 --- a/buildroot/package/python-engineio/python-engineio.hash +++ b/buildroot/package/python-engineio/python-engineio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-engineio/json -md5 ad32353278d0576bfa7d7a2f9b97dec5 python-engineio-3.3.0.tar.gz -sha256 e4ac17c04c32ccca67287dfdbbe4ee1e9eec3a0a1a9a6070f3ab784db08407dd python-engineio-3.3.0.tar.gz +md5 bec3b06a112a7f09a0a9c92b627282fe python-engineio-3.10.0.tar.gz +sha256 9c9a6035b4b5e5a225f426f846afa14cf627f7571d1ae02167cb703fefd134b7 python-engineio-3.10.0.tar.gz # Locally computed sha256 checksums sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/buildroot/package/python-engineio/python-engineio.mk b/buildroot/package/python-engineio/python-engineio.mk index c20101984..62036a9c7 100644 --- a/buildroot/package/python-engineio/python-engineio.mk +++ b/buildroot/package/python-engineio/python-engineio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_ENGINEIO_VERSION = 3.3.0 -PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/2f/09/83d627ad3dadd064bfb875c7767e93f3568354fe82cebe298b4e07f79238 +PYTHON_ENGINEIO_VERSION = 3.10.0 +PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/78/8e/c58cf2725fd17d65b9fe818b70aff4ccce4903b47aaee6f4321727a8b8bb PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-entrypoints/Config.in b/buildroot/package/python-entrypoints/Config.in new file mode 100644 index 000000000..8253a0459 --- /dev/null +++ b/buildroot/package/python-entrypoints/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_ENTRYPOINTS + bool "python-entrypoints" + help + Discover and load entry points from installed packages. + + https://github.com/takluyver/entrypoints diff --git a/buildroot/package/python-entrypoints/python-entrypoints.hash b/buildroot/package/python-entrypoints/python-entrypoints.hash new file mode 100644 index 000000000..c64545210 --- /dev/null +++ b/buildroot/package/python-entrypoints/python-entrypoints.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/entrypoints/json +md5 c5c61ea2e46a0c50ea08f4af7955a0b1 entrypoints-0.3.tar.gz +sha256 c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451 entrypoints-0.3.tar.gz +# Locally computed sha256 checksums +sha256 de5fcd7349cdf399b0707a2a024833c4704743650133c72d6f0ff7561a03a848 LICENSE diff --git a/buildroot/package/python-entrypoints/python-entrypoints.mk b/buildroot/package/python-entrypoints/python-entrypoints.mk new file mode 100644 index 000000000..7ab1b4d64 --- /dev/null +++ b/buildroot/package/python-entrypoints/python-entrypoints.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-entrypoints +# +################################################################################ + +PYTHON_ENTRYPOINTS_VERSION = 0.3 +PYTHON_ENTRYPOINTS_SOURCE = entrypoints-$(PYTHON_ENTRYPOINTS_VERSION).tar.gz +PYTHON_ENTRYPOINTS_SITE = https://files.pythonhosted.org/packages/b4/ef/063484f1f9ba3081e920ec9972c96664e2edb9fdc3d8669b0e3b8fc0ad7c +PYTHON_ENTRYPOINTS_SETUP_TYPE = distutils +PYTHON_ENTRYPOINTS_LICENSE = MIT +PYTHON_ENTRYPOINTS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-enum/python-enum.hash b/buildroot/package/python-enum/python-enum.hash index 6f1daa0b6..4b4b369e3 100644 --- a/buildroot/package/python-enum/python-enum.hash +++ b/buildroot/package/python-enum/python-enum.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/enum/json, sha256 locally computed -md5 173d468112cfa13a149b2c8af3e8fd52 enum-0.4.6.tar.gz -sha256 54e78526b166982b36884613f35a76d9a6711c49810d3ec1a05b10c9b31f938e enum-0.4.6.tar.gz +# md5, sha256 from https://pypi.org/pypi/enum/json +md5 e7d170e3f84435b77058de625c96ef58 enum-0.4.7.tar.gz +sha256 8c7cf3587eda51008bcc1eed99ea2c331ccd265c231dbaa95ec5258d3dc03100 enum-0.4.7.tar.gz +# Locally computed sha256 checksums +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL-3 diff --git a/buildroot/package/python-enum/python-enum.mk b/buildroot/package/python-enum/python-enum.mk index ea602e44a..f1de8a931 100644 --- a/buildroot/package/python-enum/python-enum.mk +++ b/buildroot/package/python-enum/python-enum.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ENUM_VERSION = 0.4.6 +PYTHON_ENUM_VERSION = 0.4.7 PYTHON_ENUM_SOURCE = enum-$(PYTHON_ENUM_VERSION).tar.gz -PYTHON_ENUM_SITE = https://pypi.python.org/packages/0c/4e/1ea357e7783c756bb579333c1e4a026fb331371ee771f616ffedc781e531 +PYTHON_ENUM_SITE = https://files.pythonhosted.org/packages/02/a0/32e1d5a21b703f600183e205aafc6773577e16429af5ad3c3f9b956b07ca PYTHON_ENUM_SETUP_TYPE = setuptools PYTHON_ENUM_LICENSE = GPL-3.0+ PYTHON_ENUM_LICENSE_FILES = LICENSE.GPL-3 diff --git a/buildroot/package/python-enum34/python-enum34.hash b/buildroot/package/python-enum34/python-enum34.hash index a5f0c6535..7c0746f80 100644 --- a/buildroot/package/python-enum34/python-enum34.hash +++ b/buildroot/package/python-enum34/python-enum34.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/enum34/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/enum34/json md5 5f13a0841a61f7fc295c514490d120d0 enum34-1.1.6.tar.gz -sha256 8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1 enum34-1.1.6.tar.gz +# Locally computed +sha256 8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1 enum34-1.1.6.tar.gz +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d enum/LICENSE diff --git a/buildroot/package/python-esptool/Config.in b/buildroot/package/python-esptool/Config.in new file mode 100644 index 000000000..08b84e3e0 --- /dev/null +++ b/buildroot/package/python-esptool/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_ESPTOOL + bool "python-esptool" + select BR2_PACKAGE_PYTHON_ECDSA # runtime + select BR2_PACKAGE_PYTHON_PYAES # runtime + select BR2_PACKAGE_PYTHON_SERIAL # runtime + help + A serial utility to communicate & flash code to Espressif + ESP8266 & ESP32 chips. + + https://github.com/espressif/esptool diff --git a/buildroot/package/python-esptool/python-esptool.hash b/buildroot/package/python-esptool/python-esptool.hash new file mode 100644 index 000000000..b4dac7ed5 --- /dev/null +++ b/buildroot/package/python-esptool/python-esptool.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/esptool/json +md5 d17b9293910773045b9de0d5caa0597d esptool-2.8.tar.gz +sha256 1e4288d9f00e55ba36809cc79c493643c623bfa036d7b019a0ebe396284bc317 esptool-2.8.tar.gz +# Locally computed sha256 checksums +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/python-esptool/python-esptool.mk b/buildroot/package/python-esptool/python-esptool.mk new file mode 100644 index 000000000..0cdc98ce1 --- /dev/null +++ b/buildroot/package/python-esptool/python-esptool.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-esptool +# +################################################################################ + +PYTHON_ESPTOOL_VERSION = 2.8 +PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/68/91/08c182f66fa3f12a96e754ae8ec7762abb2d778429834638f5746f81977a +PYTHON_ESPTOOL_SETUP_TYPE = setuptools +PYTHON_ESPTOOL_LICENSE = GPL-2.0+ +PYTHON_ESPTOOL_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-falcon/Config.in b/buildroot/package/python-falcon/Config.in index ffd66eec1..1bf93064b 100644 --- a/buildroot/package/python-falcon/Config.in +++ b/buildroot/package/python-falcon/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_PYTHON_FALCON bool "python-falcon" - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_MIMEPARSE # runtime help An unladen web framework for building APIs and app backends. - http://falconframework.org + https://falconframework.org diff --git a/buildroot/package/python-falcon/python-falcon.hash b/buildroot/package/python-falcon/python-falcon.hash index 7f6ee6ea3..68b8d4cb2 100644 --- a/buildroot/package/python-falcon/python-falcon.hash +++ b/buildroot/package/python-falcon/python-falcon.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/falcon/json -md5 3cb880665ee2cd52143cf8a7790a35e6 falcon-1.4.1.tar.gz -sha256 3981f609c0358a9fcdb25b0e7fab3d9e23019356fb429c635ce4133135ae1bc4 falcon-1.4.1.tar.gz +md5 77c52c144dd284e6259d257c6f008072 falcon-2.0.0.tar.gz +sha256 eea593cf466b9c126ce667f6d30503624ef24459f118c75594a69353b6c3d5fc falcon-2.0.0.tar.gz # Locally computed sha256 checksums sha256 e9e7f1a7ba764f042e56afce6f3563c2be9c4fffbb1404b20f8050ae051f577c LICENSE diff --git a/buildroot/package/python-falcon/python-falcon.mk b/buildroot/package/python-falcon/python-falcon.mk index b724ffadb..1d7c869d6 100644 --- a/buildroot/package/python-falcon/python-falcon.mk +++ b/buildroot/package/python-falcon/python-falcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FALCON_VERSION = 1.4.1 +PYTHON_FALCON_VERSION = 2.0.0 PYTHON_FALCON_SOURCE = falcon-$(PYTHON_FALCON_VERSION).tar.gz -PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/2f/e6/5045da9df509b9259037f065d15608930fd6c997ee930ad230f9fbfecf15 +PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/19/30/edff5a1fea7a8e9876c8391e170263e1bb207875b6a65cd619818487b27b PYTHON_FALCON_SETUP_TYPE = setuptools PYTHON_FALCON_LICENSE = Apache-2.0 PYTHON_FALCON_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-fire/Config.in b/buildroot/package/python-fire/Config.in index 2c6e55ab6..b718ddac5 100644 --- a/buildroot/package/python-fire/Config.in +++ b/buildroot/package/python-fire/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_PYTHON_FIRE bool "python-fire" select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_TERMCOLOR # runtime + select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime help A library for automatically generating command line interfaces. diff --git a/buildroot/package/python-fire/python-fire.hash b/buildroot/package/python-fire/python-fire.hash index d6304369d..411270b70 100644 --- a/buildroot/package/python-fire/python-fire.hash +++ b/buildroot/package/python-fire/python-fire.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fire/json -md5 44c51c634b61acc7ed42a413a64de38a fire-0.1.3.tar.gz -sha256 c299d16064ff81cbb649b65988300d4a28b71ecfb789d1fb74d99ea98ae4d2eb fire-0.1.3.tar.gz +md5 9f3a91c285b50351d039b6f0bb91aac3 fire-0.2.1.tar.gz +sha256 6865fefc6981a713d2ce56a2a2c92c56c729269f74a6cddd6f4b94d16ae084c9 fire-0.2.1.tar.gz # Locally computed sha256 checksums sha256 a5de77b62266bca0bb97bf058992f0b0f308a83a8ca55ee10fbf6bd8ed8f7ed0 LICENSE diff --git a/buildroot/package/python-fire/python-fire.mk b/buildroot/package/python-fire/python-fire.mk index bdb5ee191..6471a4d14 100644 --- a/buildroot/package/python-fire/python-fire.mk +++ b/buildroot/package/python-fire/python-fire.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FIRE_VERSION = 0.1.3 +PYTHON_FIRE_VERSION = 0.2.1 PYTHON_FIRE_SOURCE = fire-$(PYTHON_FIRE_VERSION).tar.gz -PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/5a/b7/205702f348aab198baecd1d8344a90748cb68f53bdcd1cc30cbc08e47d3e +PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/d9/69/faeaae8687f4de0f5973694d02e9d6c3eb827636a009157352d98de1129e PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-flask-babel/Config.in b/buildroot/package/python-flask-babel/Config.in index 61fd2c057..272d9ef1c 100644 --- a/buildroot/package/python-flask-babel/Config.in +++ b/buildroot/package/python-flask-babel/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_FLASK_BABEL bool "python-flask-babel" select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_BABEL # runtime + select BR2_PACKAGE_PYTHON_JINJA2 # runtime help Flask-Babel is an extension to Flask that adds i18n and l10n support to any Flask application with the help of babel, diff --git a/buildroot/package/python-flask-babel/python-flask-babel.hash b/buildroot/package/python-flask-babel/python-flask-babel.hash index c4420e4a9..e059a594d 100644 --- a/buildroot/package/python-flask-babel/python-flask-babel.hash +++ b/buildroot/package/python-flask-babel/python-flask-babel.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/Flask-Babel/json, sha256 locally computed -md5 658e84a20ddc545a7612144fe2c758d3 Flask-Babel-0.11.1.tar.gz -sha256 d29b36c399e42e98bc9401c8c1c159f2befcb8c12a2a2a87ec49ad7623036899 Flask-Babel-0.11.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/flask-babel/json +md5 fcf2f360ff279d3133e40974804efd72 Flask-Babel-0.12.2.tar.gz +sha256 316ad183e42003f3922957fa643d0a1e8e34a0f0301a88c3a8f605bc37ba5c86 Flask-Babel-0.12.2.tar.gz +# Locally computed sha256 checksums +sha256 a526100a7047237360a394ba4f70ae801b50ff9b8c9b9e73e7795480a59f6b7e LICENSE diff --git a/buildroot/package/python-flask-babel/python-flask-babel.mk b/buildroot/package/python-flask-babel/python-flask-babel.mk index 0b74149ff..978d29943 100644 --- a/buildroot/package/python-flask-babel/python-flask-babel.mk +++ b/buildroot/package/python-flask-babel/python-flask-babel.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_BABEL_VERSION = 0.11.1 +PYTHON_FLASK_BABEL_VERSION = 0.12.2 PYTHON_FLASK_BABEL_SOURCE = Flask-Babel-$(PYTHON_FLASK_BABEL_VERSION).tar.gz -PYTHON_FLASK_BABEL_SITE = https://pypi.python.org/packages/47/96/6013d4091fb4238e27e918aec4929f082942fa8c9489ae3aad2f18de4b5b +PYTHON_FLASK_BABEL_SITE = https://files.pythonhosted.org/packages/82/b0/986b29938d4e8be7deb552ebfd1ef16c311276a59bcae10dec567a5b3d20 PYTHON_FLASK_BABEL_LICENSE = BSD-3-Clause PYTHON_FLASK_BABEL_SETUP_TYPE = setuptools PYTHON_FLASK_BABEL_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-flask-cors/python-flask-cors.hash b/buildroot/package/python-flask-cors/python-flask-cors.hash index 5a8256ef9..a893b7c89 100644 --- a/buildroot/package/python-flask-cors/python-flask-cors.hash +++ b/buildroot/package/python-flask-cors/python-flask-cors.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/flask-cors/json, sha256 locally computed -md5 ddc12bdf8fa19a4ce1504ab9d0b0a8bc Flask-Cors-3.0.3.tar.gz -sha256 62ebc5ad80dc21ca0ea9f57466c2c74e24a62274af890b391790c260eb7b754b Flask-Cors-3.0.3.tar.gz +# md5, sha256 from https://pypi.org/pypi/flask-cors/json +md5 551cc4c0305a171d28caa2b3bc838867 Flask-Cors-3.0.8.tar.gz +sha256 72170423eb4612f0847318afff8c247b38bd516b7737adfc10d1c2cdbb382d16 Flask-Cors-3.0.8.tar.gz +# Locally computed sha256 checksums sha256 6e1a1bdc54834c1e0740cbce5d5f6f2cae1c846fd2a7f482b11649594fafbd5d LICENSE diff --git a/buildroot/package/python-flask-cors/python-flask-cors.mk b/buildroot/package/python-flask-cors/python-flask-cors.mk index 6d5900b48..60454e27c 100644 --- a/buildroot/package/python-flask-cors/python-flask-cors.mk +++ b/buildroot/package/python-flask-cors/python-flask-cors.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_CORS_VERSION = 3.0.3 +PYTHON_FLASK_CORS_VERSION = 3.0.8 PYTHON_FLASK_CORS_SOURCE = Flask-Cors-$(PYTHON_FLASK_CORS_VERSION).tar.gz -PYTHON_FLASK_CORS_SITE = https://pypi.python.org/packages/64/e8/e6bcf79dcad7b7c10f8c8c35d78b5710f2ddcd8ed38e607dd6a4853ab8a8 +PYTHON_FLASK_CORS_SITE = https://files.pythonhosted.org/packages/9e/11/ca8b95c5bf9644471601e425f0de8cbd09a506bb6c24842cb17a6cd1eea8 PYTHON_FLASK_CORS_SETUP_TYPE = setuptools PYTHON_FLASK_CORS_LICENSE = MIT PYTHON_FLASK_CORS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.hash b/buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.hash index a25fbb729..4204f59dd 100644 --- a/buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.hash +++ b/buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/flask-jsonrpc/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/flask-jsonrpc/json md5 5c0592f53b2f18e34d5be435acee8842 Flask-JSONRPC-0.3.1.tar.gz +# Locally computed sha256 4d0cc9c20874093306af91f5a48009fb8659a041428dcdb11703598ffbbc97d0 Flask-JSONRPC-0.3.1.tar.gz +sha256 f613b06cbe766fd514b1b619a71a12c353cccaa55fa4f547be55563d9829be6f setup.py diff --git a/buildroot/package/python-flask-login/python-flask-login.hash b/buildroot/package/python-flask-login/python-flask-login.hash index cd73b3ff6..75dbe30c7 100644 --- a/buildroot/package/python-flask-login/python-flask-login.hash +++ b/buildroot/package/python-flask-login/python-flask-login.hash @@ -1,3 +1,6 @@ -# md5 from https://pypi.python.org/pypi/flask_login/json, sha256 locally computed -md5 e050efaa2c4dbc2d97f480a70f4d44aa Flask-Login-0.4.0.tar.gz -sha256 d25e356b14a59f52da0ab30c31c2ad285fa23a840f0f6971df7ed247c77082a7 Flask-Login-0.4.0.tar.gz +# from https://pypi.python.org/pypi/flask_login/json +md5 25b34c74bd509792f291c16e184225df Flask-Login-0.4.1.tar.gz +sha256 c815c1ac7b3e35e2081685e389a665f2c74d7e077cb93cecabaea352da4752ec Flask-Login-0.4.1.tar.gz + +# Locally computed +sha256 7a9dfb9c5da204ed1370f3b62c13e2992a12da1da707f47e156897eeb4344e5b LICENSE diff --git a/buildroot/package/python-flask-login/python-flask-login.mk b/buildroot/package/python-flask-login/python-flask-login.mk index 50374130d..f81a4cdff 100644 --- a/buildroot/package/python-flask-login/python-flask-login.mk +++ b/buildroot/package/python-flask-login/python-flask-login.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_LOGIN_VERSION = 0.4.0 +PYTHON_FLASK_LOGIN_VERSION = 0.4.1 PYTHON_FLASK_LOGIN_SOURCE = Flask-Login-$(PYTHON_FLASK_LOGIN_VERSION).tar.gz -PYTHON_FLASK_LOGIN_SITE = https://pypi.python.org/packages/70/96/20cae731ef27084dcb183f3a6e3073d0232f10c1fd7be76729bd7bd4b994 +PYTHON_FLASK_LOGIN_SITE = https://files.pythonhosted.org/packages/c1/ff/bd9a4d2d81bf0c07d9e53e8cd3d675c56553719bbefd372df69bf1b3c1e4 PYTHON_FLASK_LOGIN_LICENSE = MIT PYTHON_FLASK_LOGIN_LICENSE_FILES = LICENSE PYTHON_FLASK_LOGIN_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash b/buildroot/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash index 9e15b5d8f..f1fe9775f 100644 --- a/buildroot/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash +++ b/buildroot/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/Flask-SQLAlchemy/json, sha256 locally computed -md5 373ce61dfd03b593ad2eaba68c9fee35 Flask-SQLAlchemy-2.3.2.tar.gz -sha256 5971b9852b5888655f11db634e87725a9031e170f37c0ce7851cf83497f56e53 Flask-SQLAlchemy-2.3.2.tar.gz -sha256 de2011f25501c45f2b78bfa4f851ce021cfbab0f1e7ab763233688e0b969821f PKG-INFO +# md5, sha256 from https://pypi.org/pypi/flask-sqlalchemy/json +md5 1f5781cf3e1a2b1aabda47a5b20d2073 Flask-SQLAlchemy-2.4.1.tar.gz +sha256 6974785d913666587949f7c2946f7001e4fa2cb2d19f4e69ead02e4b8f50b33d Flask-SQLAlchemy-2.4.1.tar.gz +# Locally computed sha256 checksums +sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst diff --git a/buildroot/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk b/buildroot/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk index 37fe603f1..c6d0094b4 100644 --- a/buildroot/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk +++ b/buildroot/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_FLASK_SQLALCHEMY_VERSION = 2.3.2 +PYTHON_FLASK_SQLALCHEMY_VERSION = 2.4.1 PYTHON_FLASK_SQLALCHEMY_SOURCE = Flask-SQLAlchemy-$(PYTHON_FLASK_SQLALCHEMY_VERSION).tar.gz -PYTHON_FLASK_SQLALCHEMY_SITE = https://pypi.python.org/packages/3a/66/f5ace276517c075f102457dd2f7d8645b033758f9c6effb4e0970a90fec1 +PYTHON_FLASK_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/52/7a/35bacbedafdc652d5198b80eb22eacccae0c97a49740a45da828b05cc37b PYTHON_FLASK_SQLALCHEMY_SETUP_TYPE = setuptools -PYTHON_FLASK_SQLALCHEMY_LICENSE = BSD-3c -PYTHON_FLASK_SQLALCHEMY_LICENSE_FILES = PKG-INFO +PYTHON_FLASK_SQLALCHEMY_LICENSE = BSD-3-Clause +PYTHON_FLASK_SQLALCHEMY_LICENSE_FILES = LICENSE.rst $(eval $(python-package)) diff --git a/buildroot/package/python-flask/python-flask.hash b/buildroot/package/python-flask/python-flask.hash index ca117218e..24f68c660 100644 --- a/buildroot/package/python-flask/python-flask.hash +++ b/buildroot/package/python-flask/python-flask.hash @@ -1,3 +1,6 @@ -# md5 from https://pypi.python.org/pypi/Flask/json, sha256 locally computed -md5 97278dfdafda98ba7902e890b0289177 Flask-0.12.2.tar.gz -sha256 49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1 Flask-0.12.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/flask/json +md5 0e3ed44ece1c489ed835d1b7047e349c Flask-1.1.1.tar.gz +sha256 13f9f196f330c7c2c5d7a5cf91af894110ca0215ac051b5844701f2bfd934d52 Flask-1.1.1.tar.gz +# Locally computed sha256 checksums +sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst +sha256 0ef3ae025f4a398761079f0d687ff3d66f4fef3a32ac2607318e909c0cba9150 docs/license.rst diff --git a/buildroot/package/python-flask/python-flask.mk b/buildroot/package/python-flask/python-flask.mk index 06b1b4d9d..0cd1a1801 100644 --- a/buildroot/package/python-flask/python-flask.mk +++ b/buildroot/package/python-flask/python-flask.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_FLASK_VERSION = 0.12.2 +PYTHON_FLASK_VERSION = 1.1.1 PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz -PYTHON_FLASK_SITE = https://pypi.python.org/packages/eb/12/1c7bd06fcbd08ba544f25bf2c6612e305a70ea51ca0eda8007344ec3f123 +PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/2e/80/3726a729de758513fd3dbc64e93098eb009c49305a97c6751de55b20b694 PYTHON_FLASK_SETUP_TYPE = setuptools PYTHON_FLASK_LICENSE = BSD-3-Clause -PYTHON_FLASK_LICENSE_FILES = LICENSE +PYTHON_FLASK_LICENSE_FILES = LICENSE.rst docs/license.rst $(eval $(python-package)) diff --git a/buildroot/package/python-flup/python-flup.hash b/buildroot/package/python-flup/python-flup.hash index 86f8d1bfa..d544d75e9 100644 --- a/buildroot/package/python-flup/python-flup.hash +++ b/buildroot/package/python-flup/python-flup.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/flup/json, sha256 locally computed -md5 bc104a7444bfac36fc2146a356de4c11 flup-1.0.3.dev20161029.tar.gz -sha256 3dc5620b77a6a4cd0afb556626eb0ce85708e513f9c50dc5e982190e3d5f9e26 flup-1.0.3.dev20161029.tar.gz +# md5, sha256 from https://pypi.org/pypi/flup/json +md5 a64e7a6374e043480ee92534c735964e flup-1.0.3.tar.gz +sha256 5eb09f26eb0751f8380d8ac43d1dfb20e1d42eca0fa45ea9289fa532a79cd159 flup-1.0.3.tar.gz +# Locally computed sha256 checksums +sha256 66a60ebc732165d199ec018fb9876d9f8168a5a8575375e64cc1b3d78c32b481 PKG-INFO diff --git a/buildroot/package/python-flup/python-flup.mk b/buildroot/package/python-flup/python-flup.mk index 26d59385b..2ea6a1a32 100644 --- a/buildroot/package/python-flup/python-flup.mk +++ b/buildroot/package/python-flup/python-flup.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_FLUP_VERSION = 1.0.3.dev20161029 +PYTHON_FLUP_VERSION = 1.0.3 PYTHON_FLUP_SOURCE = flup-$(PYTHON_FLUP_VERSION).tar.gz -PYTHON_FLUP_SITE = https://pypi.python.org/packages/17/33/36768930a5ffe4f294ed3987c631bfd3fddb4f9e5e46bc8dc30fd731dbcd - +PYTHON_FLUP_SITE = https://files.pythonhosted.org/packages/bb/b5/26cc8f7baf0ddebd3e61a354a2bcc692cfe8005123c37ee3d8507c4c7511 PYTHON_FLUP_LICENSE = BSD-2-Clause, MIT - +PYTHON_FLUP_LICENSE_FILES = PKG-INFO PYTHON_FLUP_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-frozenlist/Config.in b/buildroot/package/python-frozenlist/Config.in new file mode 100644 index 000000000..67a58b40c --- /dev/null +++ b/buildroot/package/python-frozenlist/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_FROZENLIST + bool "python-frozenlist" + depends on BR2_PACKAGE_PYTHON3 + help + A list-like structure which implements + collections.abc.MutableSequence. + + https://github.com/aio-libs/frozenlist diff --git a/buildroot/package/python-frozenlist/python-frozenlist.hash b/buildroot/package/python-frozenlist/python-frozenlist.hash new file mode 100644 index 000000000..4a006586d --- /dev/null +++ b/buildroot/package/python-frozenlist/python-frozenlist.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/frozenlist/json +md5 7d493070a7fe12b6be753585c1995abe frozenlist-1.0.0.tar.gz +sha256 d1076a40cd1bef6edf148cc05aecce52a11c9bbd2a3d60ce37cc07e03c8dc6c7 frozenlist-1.0.0.tar.gz +# Locally computed sha256 checksums +sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE.txt diff --git a/buildroot/package/python-frozenlist/python-frozenlist.mk b/buildroot/package/python-frozenlist/python-frozenlist.mk new file mode 100644 index 000000000..1d36b4df5 --- /dev/null +++ b/buildroot/package/python-frozenlist/python-frozenlist.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-frozenlist +# +################################################################################ + +PYTHON_FROZENLIST_VERSION = 1.0.0 +PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/85/32/12f1247bf4915b74a00264aa0033745ee871759daee47499641bd13aeee7 +PYTHON_FROZENLIST_SETUP_TYPE = setuptools +PYTHON_FROZENLIST_LICENSE = Apache-2.0 +PYTHON_FROZENLIST_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-future/Config.in b/buildroot/package/python-future/Config.in new file mode 100644 index 000000000..29303f334 --- /dev/null +++ b/buildroot/package/python-future/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_FUTURE + bool "python-future" + depends on BR2_PACKAGE_PYTHON + help + Easy, clean, reliable Python 2/3 compatibility. + + http://python-future.org diff --git a/buildroot/package/python-future/python-future.hash b/buildroot/package/python-future/python-future.hash new file mode 100644 index 000000000..c43018103 --- /dev/null +++ b/buildroot/package/python-future/python-future.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.python.org/pypi/future/json +md5 e4579c836b9c025872efe230f6270349 future-0.18.2.tar.gz +sha256 b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d future-0.18.2.tar.gz +# Locally computed sha256 checksums +sha256 916e561392d48471b9c23437f56e2652f320cb3b119ceaa162edf41016f746b9 LICENSE.txt diff --git a/buildroot/package/python-future/python-future.mk b/buildroot/package/python-future/python-future.mk new file mode 100644 index 000000000..76f32180a --- /dev/null +++ b/buildroot/package/python-future/python-future.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-future +# +################################################################################ + +PYTHON_FUTURE_VERSION = 0.18.2 +PYTHON_FUTURE_SOURCE = future-$(PYTHON_FUTURE_VERSION).tar.gz +PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/45/0b/38b06fd9b92dc2b68d58b75f900e97884c45bedd2ff83203d933cf5851c9 +PYTHON_FUTURE_SETUP_TYPE = setuptools +PYTHON_FUTURE_LICENSE = MIT +PYTHON_FUTURE_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-futures/python-futures.hash b/buildroot/package/python-futures/python-futures.hash index db6bb55ea..a4fbdf4fe 100644 --- a/buildroot/package/python-futures/python-futures.hash +++ b/buildroot/package/python-futures/python-futures.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/futures/json -md5 d1b299a06b96ccb59f70324716dc0016 futures-3.2.0.tar.gz -sha256 9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265 futures-3.2.0.tar.gz +md5 b43a39ae1475e3fd6940f2b4f7214675 futures-3.3.0.tar.gz +sha256 7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794 futures-3.3.0.tar.gz # Locally computed sha256 checksums sha256 a698bd5d441e4a16af6c992b8e80cbfa12755d72d910854fa1fb11d4deb0059a LICENSE diff --git a/buildroot/package/python-futures/python-futures.mk b/buildroot/package/python-futures/python-futures.mk index d6366f30e..066694811 100644 --- a/buildroot/package/python-futures/python-futures.mk +++ b/buildroot/package/python-futures/python-futures.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FUTURES_VERSION = 3.2.0 +PYTHON_FUTURES_VERSION = 3.3.0 PYTHON_FUTURES_SOURCE = futures-$(PYTHON_FUTURES_VERSION).tar.gz -PYTHON_FUTURES_SITE = https://files.pythonhosted.org/packages/1f/9e/7b2ff7e965fc654592269f2906ade1c7d705f1bf25b7d469fa153f7d19eb +PYTHON_FUTURES_SITE = https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00 PYTHON_FUTURES_SETUP_TYPE = setuptools PYTHON_FUTURES_LICENSE = BSD-2-Clause PYTHON_FUTURES_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-gitdb2/Config.in b/buildroot/package/python-gitdb2/Config.in new file mode 100644 index 000000000..a5962e7b7 --- /dev/null +++ b/buildroot/package/python-gitdb2/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_GITDB2 + bool "python-gitdb2" + select BR2_PACKAGE_PYTHON_SMMAP2 # runtime + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + help + GitDB allows you to access bare git repositories for reading + and writing. It aims at allowing full access to loose objects + as well as packs with performance and scalability in mind. It + operates exclusively on streams, allowing to handle large + objects with a small memory footprint. + + https://github.com/gitpython-developers/gitdb diff --git a/buildroot/package/python-gitdb2/python-gitdb2.hash b/buildroot/package/python-gitdb2/python-gitdb2.hash new file mode 100644 index 000000000..e97d25cf4 --- /dev/null +++ b/buildroot/package/python-gitdb2/python-gitdb2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/gitdb2/json +md5 1a7ea3362e405f8a5634f7ee53636094 gitdb2-2.0.6.tar.gz +sha256 1b6df1433567a51a4a9c1a5a0de977aa351a405cc56d7d35f3388bad1f630350 gitdb2-2.0.6.tar.gz +# Locally computed sha256 checksums +sha256 efd29f596a08e8857e68e7694a50bcda72839792da7c3f041bcbff5f18009239 LICENSE diff --git a/buildroot/package/python-gitdb2/python-gitdb2.mk b/buildroot/package/python-gitdb2/python-gitdb2.mk new file mode 100644 index 000000000..7664a1350 --- /dev/null +++ b/buildroot/package/python-gitdb2/python-gitdb2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-gitdb2 +# +################################################################################ + +PYTHON_GITDB2_VERSION = 2.0.6 +PYTHON_GITDB2_SOURCE = gitdb2-$(PYTHON_GITDB2_VERSION).tar.gz +PYTHON_GITDB2_SITE = https://files.pythonhosted.org/packages/c5/62/ed7205331e8d7cc377e2512cb32f8f8f075c0defce767551d0a76e102ce2 +PYTHON_GITDB2_SETUP_TYPE = setuptools +PYTHON_GITDB2_LICENSE = BSD-3-Clause +PYTHON_GITDB2_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-gobject/Config.in b/buildroot/package/python-gobject/Config.in index 475ff2518..36ddffebb 100644 --- a/buildroot/package/python-gobject/Config.in +++ b/buildroot/package/python-gobject/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_PYTHON_GOBJECT depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 + depends on BR2_PACKAGE_PYTHON # Broken with python 3.8 select BR2_PACKAGE_LIBGLIB2 help Python bindings for the GLib/GObject library @@ -10,5 +11,6 @@ config BR2_PACKAGE_PYTHON_GOBJECT https://wiki.gnome.org/action/show/Projects/PyGObject comment "python-gobject needs a toolchain w/ wchar, threads" + depends on BR2_PACKAGE_PYTHON depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/python-gobject/python-gobject.hash b/buildroot/package/python-gobject/python-gobject.hash index 024419e96..0c093f330 100644 --- a/buildroot/package/python-gobject/python-gobject.hash +++ b/buildroot/package/python-gobject/python-gobject.hash @@ -1,2 +1,4 @@ # from http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/pygobject-2.28.6.sha256sum sha256 fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8 pygobject-2.28.6.tar.xz +# Locally computed +sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/buildroot/package/python-h2/python-h2.hash b/buildroot/package/python-h2/python-h2.hash index e34f7beb9..1d5df8878 100644 --- a/buildroot/package/python-h2/python-h2.hash +++ b/buildroot/package/python-h2/python-h2.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/h2/json, sha256 locally computed -md5 586686662928c2851eb0f1fe99bf279d h2-3.0.1.tar.gz -sha256 b2962f883fa392a23cbfcc4ad03c335bcc661be0cf9627657b589f0df2206e64 h2-3.0.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/h2/json +md5 950b5a62a2a608dc4547a01edf99aa8f h2-3.1.1.tar.gz +sha256 b8a32bd282594424c0ac55845377eea13fa54fe4a8db012f3a198ed923dc3ab4 h2-3.1.1.tar.gz +# Locally computed sha256 checksums +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 LICENSE diff --git a/buildroot/package/python-h2/python-h2.mk b/buildroot/package/python-h2/python-h2.mk index 37f015645..0043ee2d5 100644 --- a/buildroot/package/python-h2/python-h2.mk +++ b/buildroot/package/python-h2/python-h2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_H2_VERSION = 3.0.1 +PYTHON_H2_VERSION = 3.1.1 PYTHON_H2_SOURCE = h2-$(PYTHON_H2_VERSION).tar.gz -PYTHON_H2_SITE = https://pypi.python.org/packages/3c/86/aebb88df3c87255cfd0ffd338608fbfb34d1c850750a486e7f05b013e5a3 +PYTHON_H2_SITE = https://files.pythonhosted.org/packages/56/73/0bc3a2f4238bdfbd9b0dc41a972fb558d96e8580ef2a37129ee5a54fa04e PYTHON_H2_SETUP_TYPE = setuptools PYTHON_H2_LICENSE = MIT PYTHON_H2_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-hiredis/Config.in b/buildroot/package/python-hiredis/Config.in new file mode 100644 index 000000000..a401de055 --- /dev/null +++ b/buildroot/package/python-hiredis/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_HIREDIS + bool "python-hiredis" + help + Python wrapper for hiredis. + + https://github.com/redis/hiredis-py diff --git a/buildroot/package/python-hiredis/python-hiredis.hash b/buildroot/package/python-hiredis/python-hiredis.hash new file mode 100644 index 000000000..1a013bb3a --- /dev/null +++ b/buildroot/package/python-hiredis/python-hiredis.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/hiredis/json +md5 ad421ea848734c7be5c10689caa2a6f1 hiredis-1.0.1.tar.gz +sha256 aa59dd63bb3f736de4fc2d080114429d5d369dfb3265f771778e8349d67a97a4 hiredis-1.0.1.tar.gz +# Locally computed sha256 checksums +sha256 70edfa6d3e11f9d7497c2c2f298d06f33b11d10f37f76605102c5ab3b1f28262 COPYING +sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb vendor/hiredis/COPYING diff --git a/buildroot/package/python-hiredis/python-hiredis.mk b/buildroot/package/python-hiredis/python-hiredis.mk new file mode 100644 index 000000000..435918feb --- /dev/null +++ b/buildroot/package/python-hiredis/python-hiredis.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-hiredis +# +################################################################################ + +PYTHON_HIREDIS_VERSION = 1.0.1 +PYTHON_HIREDIS_SOURCE = hiredis-$(PYTHON_HIREDIS_VERSION).tar.gz +PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/7f/5c/62e5c6b811b4dcef4125b4a01f76db82c496d79299dd67053b8f9c0732c0 +PYTHON_HIREDIS_SETUP_TYPE = setuptools +PYTHON_HIREDIS_LICENSE = BSD-3-Clause +PYTHON_HIREDIS_LICENSE_FILES = COPYING vendor/hiredis/COPYING + +$(eval $(python-package)) diff --git a/buildroot/package/python-hpack/python-hpack.hash b/buildroot/package/python-hpack/python-hpack.hash index 445d4d59f..72886b0ed 100644 --- a/buildroot/package/python-hpack/python-hpack.hash +++ b/buildroot/package/python-hpack/python-hpack.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/hpack/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/hpack/json md5 556b0ae66180f54c2ce8029a0952088b hpack-3.0.0.tar.gz +# Locally computed sha256 8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2 hpack-3.0.0.tar.gz +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE diff --git a/buildroot/package/python-html5lib/Config.in b/buildroot/package/python-html5lib/Config.in index c3e9f2a85..34e22049a 100644 --- a/buildroot/package/python-html5lib/Config.in +++ b/buildroot/package/python-html5lib/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_HTML5LIB bool "python-html5lib" + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime help HTML parser based on the WHATWG HTML specification. diff --git a/buildroot/package/python-html5lib/python-html5lib.hash b/buildroot/package/python-html5lib/python-html5lib.hash index 7ea082fa7..04c64c10c 100644 --- a/buildroot/package/python-html5lib/python-html5lib.hash +++ b/buildroot/package/python-html5lib/python-html5lib.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/html5lib/json, sha256 locally computed -md5 5ada1243b7a863624b2f35245b2186e9 html5lib-1.0b10.tar.gz -sha256 0d5fd54d5b2b79b876007a70c033a4023577768d18022c15681c00561432a0f9 html5lib-1.0b10.tar.gz +# md5, sha256 from https://pypi.org/pypi/html5lib/json +md5 942a0688d6bdf20d087c9805c40182ad html5lib-1.0.1.tar.gz +sha256 66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736 html5lib-1.0.1.tar.gz +# Locally computed sha256 checksums +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f LICENSE diff --git a/buildroot/package/python-html5lib/python-html5lib.mk b/buildroot/package/python-html5lib/python-html5lib.mk index 38affcbb4..1d6aef1aa 100644 --- a/buildroot/package/python-html5lib/python-html5lib.mk +++ b/buildroot/package/python-html5lib/python-html5lib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HTML5LIB_VERSION = 1.0b10 +PYTHON_HTML5LIB_VERSION = 1.0.1 PYTHON_HTML5LIB_SOURCE = html5lib-$(PYTHON_HTML5LIB_VERSION).tar.gz -PYTHON_HTML5LIB_SITE = https://pypi.python.org/packages/97/16/982214624095c1420c75f3bd295d9e658794aafb95fc075823de107e0ae4 +PYTHON_HTML5LIB_SITE = https://files.pythonhosted.org/packages/85/3e/cf449cf1b5004e87510b9368e7a5f1acd8831c2d6691edd3c62a0823f98f PYTHON_HTML5LIB_LICENSE = MIT PYTHON_HTML5LIB_LICENSE_FILES = LICENSE PYTHON_HTML5LIB_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-httplib2/python-httplib2.hash b/buildroot/package/python-httplib2/python-httplib2.hash index 9a075b6d4..d299b61bc 100644 --- a/buildroot/package/python-httplib2/python-httplib2.hash +++ b/buildroot/package/python-httplib2/python-httplib2.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/httplib2/json, sha256 locally computed -md5 709c305e1b00e9c0af49ee816429569c httplib2-0.10.3.tar.gz -sha256 e404d3b7bd86c1bc931906098e7c1305d6a3a6dcef141b8bb1059903abb3ceeb httplib2-0.10.3.tar.gz +# md5, sha256 from https://pypi.org/pypi/httplib2/json +md5 427cda9f4d55762db325bd2eb46b7fe0 httplib2-0.14.0.tar.gz +sha256 34537dcdd5e0f2386d29e0e2c6d4a1703a3b982d34c198a5102e6e5d6194b107 httplib2-0.14.0.tar.gz +# Locally computer sha256 checksums +sha256 d8b8e99f77a260b8ca939f6a73ed0ea86977229a3d97f85547f499a62f61f5af PKG-INFO diff --git a/buildroot/package/python-httplib2/python-httplib2.mk b/buildroot/package/python-httplib2/python-httplib2.mk index 7c14e24ef..a74c0e7c7 100644 --- a/buildroot/package/python-httplib2/python-httplib2.mk +++ b/buildroot/package/python-httplib2/python-httplib2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HTTPLIB2_VERSION = 0.10.3 +PYTHON_HTTPLIB2_VERSION = 0.14.0 PYTHON_HTTPLIB2_SOURCE = httplib2-$(PYTHON_HTTPLIB2_VERSION).tar.gz -PYTHON_HTTPLIB2_SITE = https://pypi.python.org/packages/e4/2e/a7e27d2c36076efeb8c0e519758968b20389adf57a9ce3af139891af2696 +PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/ce/2e/87461bfbb7e561203b759b3f7f639e2144226604372830d00a8279960ae1 PYTHON_HTTPLIB2_SETUP_TYPE = setuptools PYTHON_HTTPLIB2_LICENSE = MIT PYTHON_HTTPLIB2_LICENSE_FILES = PKG-INFO diff --git a/buildroot/package/python-huepy/0001-fix-import-with-python3.patch b/buildroot/package/python-huepy/0001-fix-import-with-python3.patch new file mode 100644 index 000000000..e04eacb22 --- /dev/null +++ b/buildroot/package/python-huepy/0001-fix-import-with-python3.patch @@ -0,0 +1,8 @@ +--- a/huepy/__init__.py ++++ b/huepy/__init__.py +@@ -1,4 +1,4 @@ +-from hue import COMMANDS ++from .hue import COMMANDS + + __all__ = list(COMMANDS.keys()) + __version__ = '1.0.1' diff --git a/buildroot/package/python-huepy/Config.in b/buildroot/package/python-huepy/Config.in new file mode 100644 index 000000000..0bdd25ffd --- /dev/null +++ b/buildroot/package/python-huepy/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_HUEPY + bool "python-huepy" + help + Hue will help you to print awesomely in terminals. + + https://github.com/s0md3v/hue diff --git a/buildroot/package/python-huepy/python-huepy.hash b/buildroot/package/python-huepy/python-huepy.hash new file mode 100644 index 000000000..5a1a8fc1e --- /dev/null +++ b/buildroot/package/python-huepy/python-huepy.hash @@ -0,0 +1,4 @@ +# Locally computer sha256 checksums +md5 da6514d9d61fb75ac9470f6863ce1aca python-huepy-a9851d5aea10d2299cc62b3f6dce26ac4ef2ea3e.tar.gz +sha256 63147cef5ecae5c1ab38000be91def351710e6bef2c5f67b5303418becf6c0f2 python-huepy-a9851d5aea10d2299cc62b3f6dce26ac4ef2ea3e.tar.gz +sha256 8b1ba204bb69a0ade2bfcf65ef294a920f6bb361b317dba43c7ef29d96332b9b LICENSE diff --git a/buildroot/package/python-huepy/python-huepy.mk b/buildroot/package/python-huepy/python-huepy.mk new file mode 100644 index 000000000..5c1041205 --- /dev/null +++ b/buildroot/package/python-huepy/python-huepy.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-huepy +# +################################################################################ + +PYTHON_HUEPY_VERSION = a9851d5aea10d2299cc62b3f6dce26ac4ef2ea3e +PYTHON_HUEPY_SITE = $(call github,s0md3v,hue,$(PYTHON_HUEPY_VERSION)) +PYTHON_HUEPY_LICENSE = GPL-3.0 +PYTHON_HUEPY_LICENSE_FILES = LICENSE +PYTHON_HUEPY_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot/package/python-humanize/python-humanize.hash b/buildroot/package/python-humanize/python-humanize.hash index bb66e4446..47b5f70c9 100644 --- a/buildroot/package/python-humanize/python-humanize.hash +++ b/buildroot/package/python-humanize/python-humanize.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/humanize/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/humanize/json md5 e8473d9dc1b220911cac2edd53b1d973 humanize-0.5.1.tar.gz +# Locally computed sha256 a43f57115831ac7c70de098e6ac46ac13be00d69abbf60bdcac251344785bb19 humanize-0.5.1.tar.gz +sha256 2ee89d331213b5886ae5416ead178694ac0eb13bb79c83bf92287f95d3597377 LICENCE diff --git a/buildroot/package/python-hyperframe/python-hyperframe.hash b/buildroot/package/python-hyperframe/python-hyperframe.hash index e6139374e..3e686a4aa 100644 --- a/buildroot/package/python-hyperframe/python-hyperframe.hash +++ b/buildroot/package/python-hyperframe/python-hyperframe.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/hyperframe/json, sha256 locally computed -md5 c2aa71dd091836e72d2c6784d1dd1591 hyperframe-5.1.0.tar.gz -sha256 a25944539db36d6a2e47689e7915dcee562b3f8d10c6cdfa0d53c91ed692fb04 hyperframe-5.1.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/hyperframe/json +md5 6919183242feb26d8bce3b4cba81defd hyperframe-5.2.0.tar.gz +sha256 a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f hyperframe-5.2.0.tar.gz +# Locally computed sha256 checksums +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed LICENSE diff --git a/buildroot/package/python-hyperframe/python-hyperframe.mk b/buildroot/package/python-hyperframe/python-hyperframe.mk index 8d0688f6b..7640ade5f 100644 --- a/buildroot/package/python-hyperframe/python-hyperframe.mk +++ b/buildroot/package/python-hyperframe/python-hyperframe.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HYPERFRAME_VERSION = 5.1.0 +PYTHON_HYPERFRAME_VERSION = 5.2.0 PYTHON_HYPERFRAME_SOURCE = hyperframe-$(PYTHON_HYPERFRAME_VERSION).tar.gz -PYTHON_HYPERFRAME_SITE = https://pypi.python.org/packages/a4/59/dddaddc73b4d53e9649850998e23b6daca80817c5442465a12423235d20b +PYTHON_HYPERFRAME_SITE = https://files.pythonhosted.org/packages/e6/7f/9a4834af1010dc1d570d5f394dfd9323a7d7ada7d25586bd299fc4cb0356 PYTHON_HYPERFRAME_SETUP_TYPE = setuptools PYTHON_HYPERFRAME_LICENSE = MIT PYTHON_HYPERFRAME_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-hyperlink/python-hyperlink.hash b/buildroot/package/python-hyperlink/python-hyperlink.hash index fcf0cc921..94535002e 100644 --- a/buildroot/package/python-hyperlink/python-hyperlink.hash +++ b/buildroot/package/python-hyperlink/python-hyperlink.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hyperlink/json -md5 f41a96779b324d824864696a94b24823 hyperlink-18.0.0.tar.gz -sha256 f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306 hyperlink-18.0.0.tar.gz +md5 4772fb4d87c26a1ab22a6161424e3cba hyperlink-19.0.0.tar.gz +sha256 4288e34705da077fada1111a24a0aa08bb1e76699c9ce49876af722441845654 hyperlink-19.0.0.tar.gz # Locally computed sha256 checksums sha256 9577b66fb599aa5700b4981078ab0a319416a086beee646cd282aa9f33c8c74c LICENSE diff --git a/buildroot/package/python-hyperlink/python-hyperlink.mk b/buildroot/package/python-hyperlink/python-hyperlink.mk index 6681df4f9..deff4feac 100644 --- a/buildroot/package/python-hyperlink/python-hyperlink.mk +++ b/buildroot/package/python-hyperlink/python-hyperlink.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HYPERLINK_VERSION = 18.0.0 +PYTHON_HYPERLINK_VERSION = 19.0.0 PYTHON_HYPERLINK_SOURCE = hyperlink-$(PYTHON_HYPERLINK_VERSION).tar.gz -PYTHON_HYPERLINK_SITE = https://files.pythonhosted.org/packages/41/e1/0abd4b480ec04892b1db714560f8c855d43df81895c98506442babf3652f +PYTHON_HYPERLINK_SITE = https://files.pythonhosted.org/packages/e0/46/1451027b513a75edf676d25a47f601ca00b06a6a7a109e5644d921e7462d PYTHON_HYPERLINK_SETUP_TYPE = setuptools PYTHON_HYPERLINK_LICENSE = MIT PYTHON_HYPERLINK_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-ibmiotf/Config.in b/buildroot/package/python-ibmiotf/Config.in index 66d58687c..0f5f75be5 100644 --- a/buildroot/package/python-ibmiotf/Config.in +++ b/buildroot/package/python-ibmiotf/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IBMIOTF bool "python-ibmiotf" - select BR2_PACKAGE_PYTHON_DICTTOXML # runtime select BR2_PACKAGE_PYTHON_ISO8601 # runtime select BR2_PACKAGE_PYTHON_PAHO_MQTT # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime @@ -8,7 +7,6 @@ config BR2_PACKAGE_PYTHON_IBMIOTF select BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT # runtime select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_XMLTODICT # runtime help Python Client for IBM Watson IoT Platform. diff --git a/buildroot/package/python-ibmiotf/python-ibmiotf.hash b/buildroot/package/python-ibmiotf/python-ibmiotf.hash index 9649876f6..6b60aa527 100644 --- a/buildroot/package/python-ibmiotf/python-ibmiotf.hash +++ b/buildroot/package/python-ibmiotf/python-ibmiotf.hash @@ -1,3 +1,5 @@ -# Locally computed -sha256 ab230bc4c90af4237abe790ebc6b171706a35971b886f1724d879c2f328a616b python-ibmiotf-0.2.8.tar.gz -sha256 d8288e11fc42988629f7c0b649fa007332dd0187b010d025feaf7b1925376e8d LICENSE +# md5, sha256 from https://pypi.org/pypi/ibmiotf/json +md5 a103427c15b2bc96d72de5e58975638c ibmiotf-0.4.0.tar.gz +sha256 753a29858d48ebd89aff8b73c207028814714d8a004a3c19b436c9bbeaa65ce6 ibmiotf-0.4.0.tar.gz +# Locally computed sha256 checksums +sha256 2c153c48f67e56031036fc28d12f76238a5151494bdfc24b6b81ec734c387a2d LICENSE diff --git a/buildroot/package/python-ibmiotf/python-ibmiotf.mk b/buildroot/package/python-ibmiotf/python-ibmiotf.mk index 9853389c3..62ffba5b0 100644 --- a/buildroot/package/python-ibmiotf/python-ibmiotf.mk +++ b/buildroot/package/python-ibmiotf/python-ibmiotf.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_IBMIOTF_VERSION = 0.2.8 -PYTHON_IBMIOTF_SITE = $(call github,ibm-watson-iot,iot-python,$(PYTHON_IBMIOTF_VERSION)) +PYTHON_IBMIOTF_VERSION = 0.4.0 +PYTHON_IBMIOTF_SOURCE = ibmiotf-$(PYTHON_IBMIOTF_VERSION).tar.gz +PYTHON_IBMIOTF_SITE = https://files.pythonhosted.org/packages/78/05/029ca6f78b788a3c55157fd11bb63922d002d75df982ffb8243f450a750e PYTHON_IBMIOTF_SETUP_TYPE = setuptools PYTHON_IBMIOTF_LICENSE = EPL-1.0 PYTHON_IBMIOTF_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-id3/python-id3.hash b/buildroot/package/python-id3/python-id3.hash index 28b58e895..c83b34a2d 100644 --- a/buildroot/package/python-id3/python-id3.hash +++ b/buildroot/package/python-id3/python-id3.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 ba612342b59a49cbf9a7eb23a646667757ffda96dc23b67245fc6cd8d90c2022 id3-py_1.2.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/python-ifaddr/Config.in b/buildroot/package/python-ifaddr/Config.in new file mode 100644 index 000000000..64e9a3aad --- /dev/null +++ b/buildroot/package/python-ifaddr/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_IFADDR + bool "python-ifaddr" + help + Enumerates all IP addresses on all network adapters of the + system. + + https://github.com/pydron/ifaddr diff --git a/buildroot/package/python-ifaddr/python-ifaddr.hash b/buildroot/package/python-ifaddr/python-ifaddr.hash new file mode 100644 index 000000000..18df40ac4 --- /dev/null +++ b/buildroot/package/python-ifaddr/python-ifaddr.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/ifaddr/json +md5 cc1b7f0a587ef38491f07e50bf91d82e ifaddr-0.1.6.tar.gz +sha256 c19c64882a7ad51a394451dabcbbed72e98b5625ec1e79789924d5ea3e3ecb93 ifaddr-0.1.6.tar.gz +# Locally calculated +sha256 926c6fdac9ede91ae54c67066597466b04f9b4f956a24f9c77931e7765607b2c setup.py diff --git a/buildroot/package/python-ifaddr/python-ifaddr.mk b/buildroot/package/python-ifaddr/python-ifaddr.mk new file mode 100644 index 000000000..23c4ee365 --- /dev/null +++ b/buildroot/package/python-ifaddr/python-ifaddr.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-ifaddr +# +################################################################################ + +PYTHON_IFADDR_VERSION = 0.1.6 +PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).tar.gz +PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/9f/54/d92bda685093ebc70e2057abfa83ef1b3fb0ae2b6357262a3e19dfe96bb8 +PYTHON_IFADDR_SETUP_TYPE = setuptools +PYTHON_IFADDR_LICENSE = MIT +PYTHON_IFADDR_LICENSE_FILES = setup.py + +$(eval $(python-package)) diff --git a/buildroot/package/python-inflection/Config.in b/buildroot/package/python-inflection/Config.in new file mode 100644 index 000000000..427275bc7 --- /dev/null +++ b/buildroot/package/python-inflection/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_INFLECTION + bool "python-inflection" + select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3 + help + A string transformation library that singularizes and + pluralizes English words, and transforms strings from + CamelCase to underscored string. + + Inflection is a port of Ruby on Rails' inflector to Python + + https://github.com/jpvanhal/inflection diff --git a/buildroot/package/python-inflection/python-inflection.hash b/buildroot/package/python-inflection/python-inflection.hash new file mode 100644 index 000000000..bdad35ad2 --- /dev/null +++ b/buildroot/package/python-inflection/python-inflection.hash @@ -0,0 +1,5 @@ +# Hashes from https://pypi.python.org/pypi/inflection/json +md5 7941165e9f148e0520023941c0886b40 inflection-0.3.1.tar.gz +sha256 18ea7fb7a7d152853386523def08736aa8c32636b047ade55f7578c4edeb16ca inflection-0.3.1.tar.gz +# License file, locally calculated +sha256 4a3f52ac1012a90db398e4c55f1d1bea501dddafef8a4b3adb7533b1d820e148 LICENSE diff --git a/buildroot/package/python-inflection/python-inflection.mk b/buildroot/package/python-inflection/python-inflection.mk new file mode 100644 index 000000000..7309880c6 --- /dev/null +++ b/buildroot/package/python-inflection/python-inflection.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-inflection +# +################################################################################ + +PYTHON_INFLECTION_VERSION = 0.3.1 +PYTHON_INFLECTION_SOURCE = inflection-$(PYTHON_INFLECTION_VERSION).tar.gz +PYTHON_INFLECTION_SITE = https://pypi.python.org/packages/d5/35/a6eb45b4e2356fe688b21570864d4aa0d0a880ce387defe9c589112077f8 +PYTHON_INFLECTION_SETUP_TYPE = setuptools +PYTHON_INFLECTION_LICENSE = MIT +PYTHON_INFLECTION_LICENSE_FILES = LICENSE + +$(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/buildroot/package/python-influxdb/python-influxdb.hash b/buildroot/package/python-influxdb/python-influxdb.hash index 28f2825c9..d1f25552c 100644 --- a/buildroot/package/python-influxdb/python-influxdb.hash +++ b/buildroot/package/python-influxdb/python-influxdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/influxdb/json -md5 dec1e6fe9770c36290d38fb2a37fba25 influxdb-5.0.0.tar.gz -sha256 6adba2ddfd5781a06b5204339e679d66645bf6cc2b7f493eb9d7c8986d714e80 influxdb-5.0.0.tar.gz +md5 01db77f4ca825d554a78804a4be4a353 influxdb-5.2.3.tar.gz +sha256 30276c7e04bf7659424c733b239ba2f0804d7a1f3c59ec5dd3f88c56176c8d36 influxdb-5.2.3.tar.gz # Locally computed sha256 checksums sha256 70146f78d168b33ac5903490a918469e22a801a8d3a81103f3d8706dc0024c9a LICENSE diff --git a/buildroot/package/python-influxdb/python-influxdb.mk b/buildroot/package/python-influxdb/python-influxdb.mk index 1571cbd47..160a9d413 100644 --- a/buildroot/package/python-influxdb/python-influxdb.mk +++ b/buildroot/package/python-influxdb/python-influxdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INFLUXDB_VERSION = 5.0.0 +PYTHON_INFLUXDB_VERSION = 5.2.3 PYTHON_INFLUXDB_SOURCE = influxdb-$(PYTHON_INFLUXDB_VERSION).tar.gz -PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/95/26/33e7b85b72a0df2dc00af4c1b9f5df3e7d0aea29ae4f8f65a83f7024c4e2 +PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/d2/0d/351a346886ecbe61211cbfcad8ac73f99f5a9bf526916631c5668dbad601 PYTHON_INFLUXDB_SETUP_TYPE = setuptools PYTHON_INFLUXDB_LICENSE = MIT PYTHON_INFLUXDB_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-iniparse/Config.in b/buildroot/package/python-iniparse/Config.in index 65c106492..3d9c02e4c 100644 --- a/buildroot/package/python-iniparse/Config.in +++ b/buildroot/package/python-iniparse/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_INIPARSE bool "python-iniparse" - depends on BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON_SIX # runtime help iniparse is an INI parser for Python which is API compatible with the standard library's ConfigParser, preserves diff --git a/buildroot/package/python-iniparse/python-iniparse.hash b/buildroot/package/python-iniparse/python-iniparse.hash index f1f803823..238d41e06 100644 --- a/buildroot/package/python-iniparse/python-iniparse.hash +++ b/buildroot/package/python-iniparse/python-iniparse.hash @@ -1,3 +1,7 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=5e573e9e9733d97623881ce9bbe5eca6, sha256 locally computed -md5 5e573e9e9733d97623881ce9bbe5eca6 iniparse-0.4.tar.gz -sha256 abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054 iniparse-0.4.tar.gz +# From https://pypi.org/project/iniparse/#copy-hash-modal-5fdd923b-0592-4d2d-8b49-03472f948290 +md5 2054bab923df21107652d009f2373789 iniparse-0.5.tar.gz +sha256 932e5239d526e7acb504017bb707be67019ac428a6932368e6851691093aa842 iniparse-0.5.tar.gz + +# sha256 locally computed +sha256 ff45637d8a96adc414179e502fbed40160e57205bf2e302140e79a0c71eceaa7 LICENSE +sha256 9b02e3dfe433ccd2bd94636ef6eb08638b5a54deafe5f87a3d9d9104356c48e0 LICENSE-PSF diff --git a/buildroot/package/python-iniparse/python-iniparse.mk b/buildroot/package/python-iniparse/python-iniparse.mk index 5c4e03c88..d31a490bd 100644 --- a/buildroot/package/python-iniparse/python-iniparse.mk +++ b/buildroot/package/python-iniparse/python-iniparse.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_INIPARSE_VERSION = 0.4 +PYTHON_INIPARSE_VERSION = 0.5 PYTHON_INIPARSE_SOURCE = iniparse-$(PYTHON_INIPARSE_VERSION).tar.gz PYTHON_INIPARSE_SITE = https://pypi.python.org/packages/source/i/iniparse PYTHON_INIPARSE_LICENSE = Python-2.0, MIT PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE -PYTHON_INIPARSE_SETUP_TYPE = distutils +PYTHON_INIPARSE_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-ipaddr/python-ipaddr.hash b/buildroot/package/python-ipaddr/python-ipaddr.hash index 99e1ca941..d9963a293 100644 --- a/buildroot/package/python-ipaddr/python-ipaddr.hash +++ b/buildroot/package/python-ipaddr/python-ipaddr.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f2c7852f95862715f92e7d089dc3f2cf, sha256 locally computed -md5 f2c7852f95862715f92e7d089dc3f2cf ipaddr-2.1.11.tar.gz -sha256 1b555b8a8800134fdafe32b7d0cb52f5bdbfdd093707c3dd484c5ea59f1d98b7 ipaddr-2.1.11.tar.gz +# md5, sha256 from https://pypi.org/pypi/ipaddr/json +md5 f88353e40dec06410acfa075b8209b27 ipaddr-2.2.0.tar.gz +sha256 4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6 ipaddr-2.2.0.tar.gz +# Locally computed sha256 checksums +sha256 175b3b509d5c840db72ad8c22d22a690d15c67b317f34de8a8bb0a66059e8215 COPYING diff --git a/buildroot/package/python-ipaddr/python-ipaddr.mk b/buildroot/package/python-ipaddr/python-ipaddr.mk index 84c486dc5..9a5d14753 100644 --- a/buildroot/package/python-ipaddr/python-ipaddr.mk +++ b/buildroot/package/python-ipaddr/python-ipaddr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPADDR_VERSION = 2.1.11 +PYTHON_IPADDR_VERSION = 2.2.0 PYTHON_IPADDR_SOURCE = ipaddr-$(PYTHON_IPADDR_VERSION).tar.gz -PYTHON_IPADDR_SITE = https://pypi.python.org/packages/source/i/ipaddr +PYTHON_IPADDR_SITE = https://files.pythonhosted.org/packages/9d/a7/1b39a16cb90dfe491f57e1cab3103a15d4e8dd9a150872744f531b1106c1 PYTHON_IPADDR_SETUP_TYPE = distutils PYTHON_IPADDR_LICENSE = Apache-2.0 PYTHON_IPADDR_LICENSE_FILES = COPYING diff --git a/buildroot/package/python-ipaddress/python-ipaddress.hash b/buildroot/package/python-ipaddress/python-ipaddress.hash index 5a3e674fa..e61835e19 100644 --- a/buildroot/package/python-ipaddress/python-ipaddress.hash +++ b/buildroot/package/python-ipaddress/python-ipaddress.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ipaddress/json -md5 74c1ce3109f30eaa1ab3dd342e7b76d4 ipaddress-1.0.22.tar.gz -sha256 b146c751ea45cad6188dd6cf2d9b757f6f4f8d6ffb96a023e6f2e26eea02a72c ipaddress-1.0.22.tar.gz +md5 aaee67a8026782af1831148beb0d9060 ipaddress-1.0.23.tar.gz +sha256 b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2 ipaddress-1.0.23.tar.gz # Locally computed sha256 checksums sha256 38675419eb4a79ec616396d70f1254b3a433fb7088fb3f4cc9b6c0bcdcec6162 LICENSE diff --git a/buildroot/package/python-ipaddress/python-ipaddress.mk b/buildroot/package/python-ipaddress/python-ipaddress.mk index 189efdfb1..8f1ad5ffc 100644 --- a/buildroot/package/python-ipaddress/python-ipaddress.mk +++ b/buildroot/package/python-ipaddress/python-ipaddress.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPADDRESS_VERSION = 1.0.22 +PYTHON_IPADDRESS_VERSION = 1.0.23 PYTHON_IPADDRESS_SOURCE = ipaddress-$(PYTHON_IPADDRESS_VERSION).tar.gz -PYTHON_IPADDRESS_SITE = https://files.pythonhosted.org/packages/97/8d/77b8cedcfbf93676148518036c6b1ce7f8e14bf07e95d7fd4ddcb8cc052f +PYTHON_IPADDRESS_SITE = https://files.pythonhosted.org/packages/b9/9a/3e9da40ea28b8210dd6504d3fe9fe7e013b62bf45902b458d1cdc3c34ed9 PYTHON_IPADDRESS_LICENSE = Python-2.0 PYTHON_IPADDRESS_LICENSE_FILES = LICENSE PYTHON_IPADDRESS_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-iptables/Config.in b/buildroot/package/python-iptables/Config.in new file mode 100644 index 000000000..e55359963 --- /dev/null +++ b/buildroot/package/python-iptables/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_IPTABLES + bool "python-iptables" + select BR2_PACKAGE_IPTABLES # runtime dependency + help + Python bindings for iptables. + + https://github.com/ldx/python-iptables diff --git a/buildroot/package/python-iptables/python-iptables.hash b/buildroot/package/python-iptables/python-iptables.hash new file mode 100644 index 000000000..46786699a --- /dev/null +++ b/buildroot/package/python-iptables/python-iptables.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-iptables/json +md5 98ee55f239bf8f2d002915d76b416c22 python-iptables-0.14.0.tar.gz +sha256 61b23850ad5d917436aa73c2847ab941bc0edbe79a324b0eebdb98af0b65b10d python-iptables-0.14.0.tar.gz +# Locally calculated +sha256 b827789c74144d9bb92595ed3bc568aef767a7e8d930fba61c2cdd9f6ec27599 NOTICE diff --git a/buildroot/package/python-iptables/python-iptables.mk b/buildroot/package/python-iptables/python-iptables.mk new file mode 100644 index 000000000..66e478a89 --- /dev/null +++ b/buildroot/package/python-iptables/python-iptables.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-iptables +# +################################################################################ + +PYTHON_IPTABLES_VERSION = 0.14.0 +PYTHON_IPTABLES_SITE = https://files.pythonhosted.org/packages/08/5e/16a5ca35c420b8059eeb72716e316eeb6f0e59ce028998d36b2dc87554e5 +PYTHON_IPTABLES_SETUP_TYPE = setuptools +PYTHON_IPTABLES_LICENSE = Apache-2.0 +PYTHON_IPTABLES_LICENSE_FILES = NOTICE + +$(eval $(python-package)) diff --git a/buildroot/package/python-ipy/python-ipy.hash b/buildroot/package/python-ipy/python-ipy.hash index ed93448b1..641a2eb21 100644 --- a/buildroot/package/python-ipy/python-ipy.hash +++ b/buildroot/package/python-ipy/python-ipy.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/ipy/json, sha256 locally computed -md5 7b8c6eb4111b15aea31b67108e769712 IPy-0.83.tar.gz -sha256 61da5a532b159b387176f6eabf11946e7458b6df8fb8b91ff1d345ca7a6edab8 IPy-0.83.tar.gz +# md5, sha256 from https://pypi.org/pypi/ipy/json +md5 1a90c68174234672241a7e60c7ea0fb9 IPy-1.00.tar.gz +sha256 2f2bf658a858d43868d8a4352b3889cf78c66e2ce678b300dcf518c9149ba621 IPy-1.00.tar.gz +# Locally computed sha256 checksums +sha256 078bb46799e46e51e7239c24ff130d345db911c11efafef5e3c45dfb7adb0a61 COPYING diff --git a/buildroot/package/python-ipy/python-ipy.mk b/buildroot/package/python-ipy/python-ipy.mk index 2b2bdf2dd..817b531e0 100644 --- a/buildroot/package/python-ipy/python-ipy.mk +++ b/buildroot/package/python-ipy/python-ipy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPY_VERSION = 0.83 +PYTHON_IPY_VERSION = 1.00 PYTHON_IPY_SOURCE = IPy-$(PYTHON_IPY_VERSION).tar.gz -PYTHON_IPY_SITE = https://pypi.python.org/packages/88/28/79162bfc351a3f1ab44d663ab3f03fb495806fdb592170990a1568ffbf63 +PYTHON_IPY_SITE = https://files.pythonhosted.org/packages/e1/66/b6dd22472bb027556849876beae2dd4dca3a4eaf2dd3039277b4edb8c6af PYTHON_IPY_LICENSE = BSD-3-Clause PYTHON_IPY_LICENSE_FILES = COPYING PYTHON_IPY_SETUP_TYPE = distutils diff --git a/buildroot/package/python-ipython-genutils/python-ipython-genutils.hash b/buildroot/package/python-ipython-genutils/python-ipython-genutils.hash index 6fa2bc54d..579cc7642 100644 --- a/buildroot/package/python-ipython-genutils/python-ipython-genutils.hash +++ b/buildroot/package/python-ipython-genutils/python-ipython-genutils.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/ipython_genutils/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/ipython_genutils/json md5 5a4f9781f78466da0ea1a648f3e1f79f ipython_genutils-0.2.0.tar.gz -sha256 eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8 ipython_genutils-0.2.0.tar.gz +# Locally computed +sha256 eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8 ipython_genutils-0.2.0.tar.gz +sha256 f09da6c0f4971485f6fbd6c630d0d6cdd012bfe128b2ebbd014de2f6c7c7e2a6 COPYING.md diff --git a/buildroot/package/python-ipython/Config.in b/buildroot/package/python-ipython/Config.in index d8164afba..c151ac2dd 100644 --- a/buildroot/package/python-ipython/Config.in +++ b/buildroot/package/python-ipython/Config.in @@ -1,13 +1,13 @@ config BR2_PACKAGE_PYTHON_IPYTHON bool "python-ipython" - select BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE if BR2_PACKAGE_PYTHON # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_BACKCALL # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime - select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_JEDI # runtime select BR2_PACKAGE_PYTHON_PICKLESHARE # runtime select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime select BR2_PACKAGE_PYTHON_PYGMENTS # runtime select BR2_PACKAGE_PYTHON_PEXPECT # runtime - select BR2_PACKAGE_PYTHON_SIMPLEGENERIC # runtime select BR2_PACKAGE_PYTHON_TRAITLETS # runtime help IPython is a command shell for interactive computing in diff --git a/buildroot/package/python-ipython/python-ipython.hash b/buildroot/package/python-ipython/python-ipython.hash index 41bdd70fe..e8e25f5cb 100644 --- a/buildroot/package/python-ipython/python-ipython.hash +++ b/buildroot/package/python-ipython/python-ipython.hash @@ -1,5 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 7014b8824981eef2cb893ea5398d6b8d ipython-5.8.0.tar.gz -sha256 4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906 ipython-5.8.0.tar.gz -# Locally computed sha256 -sha256 a5d87689342ec47cebdf623af06cec734c607666c696fe48271f2ff91752443d COPYING.rst +md5 68542bca2ebf39af7d9d0557e7fb5708 ipython-7.9.0.tar.gz +sha256 dfd303b270b7b5232b3d08bd30ec6fd685d8a58cabd54055e3d69d8f029f7280 ipython-7.9.0.tar.gz +# Locally computed sha256 checksums +sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst +sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/buildroot/package/python-ipython/python-ipython.mk b/buildroot/package/python-ipython/python-ipython.mk index 79a48bf43..f340e9b01 100644 --- a/buildroot/package/python-ipython/python-ipython.mk +++ b/buildroot/package/python-ipython/python-ipython.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 5.8.0 +PYTHON_IPYTHON_VERSION = 7.9.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/41/a6/2d25314b1f9375639d8f8e0f8052e8cec5df511d3449f22c4f1c2d8cb3c6 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/c0/e5/ba19ae58e9bdd80832332873cb4e11a90cf2049df052c1aadeabc2cdadeb PYTHON_IPYTHON_LICENSE = BSD-3-Clause -PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst +PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_SETUP_TYPE = distutils $(eval $(python-package)) diff --git a/buildroot/package/python-itsdangerous/python-itsdangerous.hash b/buildroot/package/python-itsdangerous/python-itsdangerous.hash index a927b8b7a..0904a9118 100644 --- a/buildroot/package/python-itsdangerous/python-itsdangerous.hash +++ b/buildroot/package/python-itsdangerous/python-itsdangerous.hash @@ -1,2 +1,4 @@ -# Locally calculated -sha256 b035b2da1d493b00a5ee7a5b750f96929de87b610643939fbe382902774626fc python-itsdangerous-0.24.tar.gz +# md5, sha256 from https://pypi.org/pypi/itsdangerous/json +md5 9b7f5afa7f1e3acfb7786eeca3d99307 itsdangerous-1.1.0.tar.gz +sha256 321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19 itsdangerous-1.1.0.tar.gz +sha256 feb28bfa348d816b0e7dbaeddf18499ee7e8007c67813db8d6ab37c65e046cd4 LICENSE.rst diff --git a/buildroot/package/python-itsdangerous/python-itsdangerous.mk b/buildroot/package/python-itsdangerous/python-itsdangerous.mk index 45adbb065..942923370 100644 --- a/buildroot/package/python-itsdangerous/python-itsdangerous.mk +++ b/buildroot/package/python-itsdangerous/python-itsdangerous.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_ITSDANGEROUS_VERSION = 0.24 -PYTHON_ITSDANGEROUS_SITE = $(call github,mitsuhiko,itsdangerous,$(PYTHON_ITSDANGEROUS_VERSION)) +PYTHON_ITSDANGEROUS_VERSION = 1.1.0 +PYTHON_ITSDANGEROUS_SOURCE = itsdangerous-$(PYTHON_ITSDANGEROUS_VERSION).tar.gz +PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/68/1a/f27de07a8a304ad5fa817bbe383d1238ac4396da447fa11ed937039fa04b PYTHON_ITSDANGEROUS_SETUP_TYPE = setuptools PYTHON_ITSDANGEROUS_LICENSE = BSD-3-Clause -PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE +PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.rst $(eval $(python-package)) diff --git a/buildroot/package/python-janus/Config.in b/buildroot/package/python-janus/Config.in new file mode 100644 index 000000000..a1ba0463f --- /dev/null +++ b/buildroot/package/python-janus/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_JANUS + bool "python-janus" + depends on BR2_PACKAGE_PYTHON3 + help + Mixed sync-async queue to interoperate between asyncio + tasks and classic threads. + + https://github.com/aio-libs/janus/ diff --git a/buildroot/package/python-janus/python-janus.hash b/buildroot/package/python-janus/python-janus.hash new file mode 100644 index 000000000..509876990 --- /dev/null +++ b/buildroot/package/python-janus/python-janus.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/janus/json +md5 26283b122439fbca4ae1db18ff839b7c janus-0.4.0.tar.gz +sha256 cfc221683160b91b35bae1917e2957b78dad10a2e634f4f8ed119ed72e2a88ef janus-0.4.0.tar.gz +# Locally computed sha256 checksums +sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE diff --git a/buildroot/package/python-janus/python-janus.mk b/buildroot/package/python-janus/python-janus.mk new file mode 100644 index 000000000..f718d0c19 --- /dev/null +++ b/buildroot/package/python-janus/python-janus.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-janus +# +################################################################################ + +PYTHON_JANUS_VERSION = 0.4.0 +PYTHON_JANUS_SOURCE = janus-$(PYTHON_JANUS_VERSION).tar.gz +PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/e2/39/41fd545b99eac81d47fe346b8c78c09a3b187ce2fd9f3c9656dfe035e39a +PYTHON_JANUS_SETUP_TYPE = setuptools +PYTHON_JANUS_LICENSE = Apache-2.0 +PYTHON_JANUS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-jaraco-classes/python-jaraco-classes.hash b/buildroot/package/python-jaraco-classes/python-jaraco-classes.hash index bc30c5f79..6489e8594 100644 --- a/buildroot/package/python-jaraco-classes/python-jaraco-classes.hash +++ b/buildroot/package/python-jaraco-classes/python-jaraco-classes.hash @@ -1,4 +1,5 @@ -# 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 +# md5, sha256 from https://pypi.org/pypi/jaraco.classes/json +md5 63d4f5a2df2625ec3979c9633da1505e jaraco.classes-2.0.tar.gz +sha256 dcc2c4a8ca4b344cdbf2e1be7124a5c4f192574cdbb453b62350ae8240a2caf5 jaraco.classes-2.0.tar.gz +# Locally computed sha256 checksums sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/buildroot/package/python-jaraco-classes/python-jaraco-classes.mk b/buildroot/package/python-jaraco-classes/python-jaraco-classes.mk index c361e97a6..7455ed4d4 100644 --- a/buildroot/package/python-jaraco-classes/python-jaraco-classes.mk +++ b/buildroot/package/python-jaraco-classes/python-jaraco-classes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JARACO_CLASSES_VERSION = 1.4.3 +PYTHON_JARACO_CLASSES_VERSION = 2.0 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_SITE = https://files.pythonhosted.org/packages/6e/27/f6ce0863a6ce574922ffe70d63c40b9771aefb686cb595cf435d184f0ca3 PYTHON_JARACO_CLASSES_LICENSE = MIT PYTHON_JARACO_CLASSES_LICENSE_FILES = LICENSE PYTHON_JARACO_CLASSES_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-jaraco-functools/Config.in b/buildroot/package/python-jaraco-functools/Config.in new file mode 100644 index 000000000..6c914f385 --- /dev/null +++ b/buildroot/package/python-jaraco-functools/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS + bool "python-jaraco-functools" + depends on BR2_PACKAGE_PYTHON3 # python-more-itertools + select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime + help + Additional functools in the spirit of stdlib’s + functools. + + https://github.com/jaraco/jaraco.functools diff --git a/buildroot/package/python-jaraco-functools/python-jaraco-functools.hash b/buildroot/package/python-jaraco-functools/python-jaraco-functools.hash new file mode 100644 index 000000000..051a39bfc --- /dev/null +++ b/buildroot/package/python-jaraco-functools/python-jaraco-functools.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/jaraco.functools/json +md5 c245ade3e753bc556415f1fec102f232 jaraco.functools-2.0.tar.gz +sha256 35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345 jaraco.functools-2.0.tar.gz +# Locally computed sha256 checksums +sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/buildroot/package/python-jaraco-functools/python-jaraco-functools.mk b/buildroot/package/python-jaraco-functools/python-jaraco-functools.mk new file mode 100644 index 000000000..f062063b0 --- /dev/null +++ b/buildroot/package/python-jaraco-functools/python-jaraco-functools.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-jaraco-functools +# +################################################################################ + +PYTHON_JARACO_FUNCTOOLS_VERSION = 2.0 +PYTHON_JARACO_FUNCTOOLS_SOURCE = jaraco.functools-$(PYTHON_JARACO_FUNCTOOLS_VERSION).tar.gz +PYTHON_JARACO_FUNCTOOLS_SITE = https://files.pythonhosted.org/packages/a9/1e/44f6a5cffef147a3ffd37a748b8f4c2ded9b07ca20a15f17cd9874158f24 +PYTHON_JARACO_FUNCTOOLS_LICENSE = MIT +PYTHON_JARACO_FUNCTOOLS_LICENSE_FILES = LICENSE +PYTHON_JARACO_FUNCTOOLS_SETUP_TYPE = setuptools +PYTHON_JARACO_FUNCTOOLS_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/buildroot/package/python-jedi/Config.in b/buildroot/package/python-jedi/Config.in new file mode 100644 index 000000000..8ceaa1530 --- /dev/null +++ b/buildroot/package/python-jedi/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_JEDI + bool "python-jedi" + select BR2_PACKAGE_PYTHON_PARSO # runtime + help + An autocompletion tool for Python that can be used for text + editors. + + https://github.com/davidhalter/jedi diff --git a/buildroot/package/python-jedi/python-jedi.hash b/buildroot/package/python-jedi/python-jedi.hash new file mode 100644 index 000000000..1fc3a3da5 --- /dev/null +++ b/buildroot/package/python-jedi/python-jedi.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/jedi/json +md5 ba88266caac41988ffb4fd6041a3c354 jedi-0.15.1.tar.gz +sha256 ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e jedi-0.15.1.tar.gz +# Locally computed sha256 checksums +sha256 78e60cd0b8f28694f30195482c33d76908d846b0d15278deb7332aa22ba8e412 LICENSE.txt +sha256 9c1e620a5cf8e74fe81c1fd4c55e9cc0b189fc04e677cfc7ef915de746c3f59e docs/_themes/flask/LICENSE diff --git a/buildroot/package/python-jedi/python-jedi.mk b/buildroot/package/python-jedi/python-jedi.mk new file mode 100644 index 000000000..e11146def --- /dev/null +++ b/buildroot/package/python-jedi/python-jedi.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-jedi +# +################################################################################ + +PYTHON_JEDI_VERSION = 0.15.1 +PYTHON_JEDI_SOURCE = jedi-$(PYTHON_JEDI_VERSION).tar.gz +PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/85/03/cd5a6e44a5753b4d539288d9d1f9645caac889c17dd2950292a8818f86b2 +PYTHON_JEDI_SETUP_TYPE = setuptools +PYTHON_JEDI_LICENSE = MIT, BSD-3-Clause (flask theme) +PYTHON_JEDI_LICENSE_FILES = LICENSE.txt docs/_themes/flask/LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-jinja2/python-jinja2.hash b/buildroot/package/python-jinja2/python-jinja2.hash index fe34f7396..7231123b5 100644 --- a/buildroot/package/python-jinja2/python-jinja2.hash +++ b/buildroot/package/python-jinja2/python-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jinja2/json -md5 61ef1117f945486472850819b8d1eb3d Jinja2-2.10.tar.gz -sha256 f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4 Jinja2-2.10.tar.gz +md5 7883559bc5cc3e2781d94b4be61cfdcd Jinja2-2.10.3.tar.gz +sha256 9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de Jinja2-2.10.3.tar.gz # Locally computed sha256 -sha256 26fcd436fdc8a39d44896ac03e6f1dfd25e38499c48f20d8bc1dd3bf0aaa8a5b LICENSE +sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/buildroot/package/python-jinja2/python-jinja2.mk b/buildroot/package/python-jinja2/python-jinja2.mk index 9ff36972d..5f011aa1a 100644 --- a/buildroot/package/python-jinja2/python-jinja2.mk +++ b/buildroot/package/python-jinja2/python-jinja2.mk @@ -4,12 +4,13 @@ # ################################################################################ -PYTHON_JINJA2_VERSION = 2.10 +PYTHON_JINJA2_VERSION = 2.10.3 PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz -PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/56/e6/332789f295cf22308386cf5bbd1f4e00ed11484299c5d7383378cf48ba47 +PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/7b/db/1d037ccd626d05a7a47a1b81ea73775614af83c2b3e53d86a0bb41d8d799 PYTHON_JINJA2_SETUP_TYPE = setuptools PYTHON_JINJA2_LICENSE = BSD-3-Clause -PYTHON_JINJA2_LICENSE_FILES = LICENSE +PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst + # In host build, setup.py tries to download markupsafe if it is not installed HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe diff --git a/buildroot/package/python-jsonschema/python-jsonschema.hash b/buildroot/package/python-jsonschema/python-jsonschema.hash index fc13630d6..c631fe981 100644 --- a/buildroot/package/python-jsonschema/python-jsonschema.hash +++ b/buildroot/package/python-jsonschema/python-jsonschema.hash @@ -1,3 +1,6 @@ -# md5 from https://pypi.python.org/pypi/jsonschema/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/jsonschema/json md5 374e848fdb69a3ce8b7e778b47c30640 jsonschema-2.5.1.tar.gz +# Locally computed sha256 36673ac378feed3daa5956276a829699056523d7961027911f064b52255ead41 jsonschema-2.5.1.tar.gz +sha256 4f92a015a13c4d1a040bef018aa13430b4f1bc73b41b16bb846c346766de7439 COPYING +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a json/LICENSE diff --git a/buildroot/package/python-keyring/Config.in b/buildroot/package/python-keyring/Config.in index 23d86a482..2dc990a50 100644 --- a/buildroot/package/python-keyring/Config.in +++ b/buildroot/package/python-keyring/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_KEYRING bool "python-keyring" + depends on BR2_PACKAGE_PYTHON3 # python-secretstorage depends on BR2_INSTALL_LIBSTDCPP # python-secretstorage select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime help diff --git a/buildroot/package/python-kiwisolver/Config.in b/buildroot/package/python-kiwisolver/Config.in new file mode 100644 index 000000000..33727ba8e --- /dev/null +++ b/buildroot/package/python-kiwisolver/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_PYTHON_KIWISOLVER + bool "python-kiwisolver" + depends on BR2_INSTALL_LIBSTDCPP + help + Kiwi is an efficient C++ implementation of the Cassowary + constraint solving algorithm. Kiwi is an implementation of + the algorithm based on the seminal Cassowary paper. It is + not a refactoring of the original C++ solver. Kiwi has been + designed from the ground up to be lightweight and fast. Kiwi + ranges from 10x to 500x faster than the original Cassowary + solver with typical use cases gaining a 40x + improvement. Memory savings are consistently > 5x. + + https://github.com/nucleic/kiwi + +comment "python-kiwisolver needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/python-kiwisolver/python-kiwisolver.hash b/buildroot/package/python-kiwisolver/python-kiwisolver.hash new file mode 100644 index 000000000..9cdb27002 --- /dev/null +++ b/buildroot/package/python-kiwisolver/python-kiwisolver.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 48168c0ace18319c649e31907f6d8586f648e503560f506f128798b99393bcdb python-kiwisolver-1.1.0.tar.gz +sha256 95c32f73d43fa54d8146badbcbd73b83acb7fa2cc81a7cef7784b3cd33b146a0 LICENSE diff --git a/buildroot/package/python-kiwisolver/python-kiwisolver.mk b/buildroot/package/python-kiwisolver/python-kiwisolver.mk new file mode 100644 index 000000000..2b99803c0 --- /dev/null +++ b/buildroot/package/python-kiwisolver/python-kiwisolver.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-kiwisolver +# +################################################################################ + +PYTHON_KIWISOLVER_VERSION = 1.1.0 +PYTHON_KIWISOLVER_SITE = $(call github,nucleic,kiwi,$(PYTHON_KIWISOLVER_VERSION)) +PYTHON_KIWISOLVER_LICENSE = BSD-3-Clause +PYTHON_KIWISOLVER_LICENSE_FILES = LICENSE +PYTHON_KIWISOLVER_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch b/buildroot/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch deleted file mode 100644 index ec7aec407..000000000 --- a/buildroot/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3bc4b9c0d60a735b1d63e52f74492ace39f02824 Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Thu, 27 Jul 2017 09:46:07 +0200 -Subject: [PATCH] Determine boost_python name depending on current Python - version - -Python2 requires boost_python27 and Python3 requires boost_python37 -(since boost 1.67). - -Signed-off-by: Yegor Yefremov -Signed-off-by: Fabrice Fontaine -[Bernd: adapted for python-3.7] -Signed-off-by: Bernd Kuhls ---- - setup.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index fdf5c27..4b38569 100644 ---- a/setup.py -+++ b/setup.py -@@ -3,6 +3,10 @@ - from setuptools import setup, find_packages, Extension - import sys, os - -+boostlib = "boost_python37" -+if sys.version_info < (3, 0): -+ boostlib = "boost_python27" -+ - setup( - name = 'pylibconfig', - description = "libconfig bindings for Python", -@@ -19,7 +23,7 @@ setup( - Extension( - "pylibconfig", - ["src/pylibconfig.cc"], -- libraries=["boost_python", "config++"] -+ libraries=[boostlib, "config++"] - #include_dirs=includes, - #extra_link_args=lflags - ) --- -2.11.0 - diff --git a/buildroot/package/python-libconfig/python-libconfig.hash b/buildroot/package/python-libconfig/python-libconfig.hash index 383904343..6d77fad5c 100644 --- a/buildroot/package/python-libconfig/python-libconfig.hash +++ b/buildroot/package/python-libconfig/python-libconfig.hash @@ -1,2 +1,3 @@ # locally computed sha256 f4cfb7e60b8fcee32ca3392c99932c579038db0852c1c2c42d7c4b859eea3c5c python-libconfig-b271c3d9dac938ad5cd29b67bd08cc5536a5a391.tar.gz +sha256 7e47579751c8125eaa031fd10b197d3956d231323598a42612f30abf19c7fed0 README diff --git a/buildroot/package/python-libconfig/python-libconfig.mk b/buildroot/package/python-libconfig/python-libconfig.mk index 3f5984b66..2db7e99cf 100644 --- a/buildroot/package/python-libconfig/python-libconfig.mk +++ b/buildroot/package/python-libconfig/python-libconfig.mk @@ -14,4 +14,16 @@ PYTHON_LIBCONFIG_SETUP_TYPE = setuptools PYTHON_LIBCONFIG_DEPENDENCIES = libconfig boost +ifeq ($(BR2_PACKAGE_PYTHON),y) +PYTHON_LIBCONFIG_PYVER = $(PYTHON_VERSION_MAJOR) +else ifeq ($(BR2_PACKAGE_PYTHON3),y) +PYTHON_LIBCONFIG_PYVER = $(PYTHON3_VERSION_MAJOR) +endif + +define PYTHON_LIBCONFIG_FIX_SETUP + $(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON_LIBCONFIG_PYVER))/g' \ + $(@D)/setup.py +endef +PYTHON_LIBCONFIG_POST_PATCH_HOOKS += PYTHON_LIBCONFIG_FIX_SETUP + $(eval $(python-package)) diff --git a/buildroot/package/python-libusb1/python-libusb1.hash b/buildroot/package/python-libusb1/python-libusb1.hash index 3649872ec..21f484060 100644 --- a/buildroot/package/python-libusb1/python-libusb1.hash +++ b/buildroot/package/python-libusb1/python-libusb1.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/libusb1/json, sha256 locally computed -md5 9c2eb6032deda59f287a443091d38cb4 libusb1-1.6.4.tar.gz -sha256 8c930d9c1d037d9c83924c82608aa6a1adcaa01ca0e4a23ee0e8e18d7eee670d libusb1-1.6.4.tar.gz +md5 cb4073182fef4cee6ab9c6666b48d1a1 libusb1-1.7.1.tar.gz +sha256 adf64a4f3f5c94643a1286f8153bcf4bc787c348b38934aacd7fe17fbeebc571 libusb1-1.7.1.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/buildroot/package/python-libusb1/python-libusb1.mk b/buildroot/package/python-libusb1/python-libusb1.mk index 3329764fe..075f50f41 100644 --- a/buildroot/package/python-libusb1/python-libusb1.mk +++ b/buildroot/package/python-libusb1/python-libusb1.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LIBUSB1_VERSION = 1.6.4 +PYTHON_LIBUSB1_VERSION = 1.7.1 PYTHON_LIBUSB1_SOURCE = libusb1-$(PYTHON_LIBUSB1_VERSION).tar.gz -PYTHON_LIBUSB1_SITE = https://pypi.python.org/packages/ec/5d/4fdac6c53525786fe35cff035c3345452e24e2bee5627893be65d12555cb +PYTHON_LIBUSB1_SITE = https://files.pythonhosted.org/packages/80/bb/4ee9d760dd29499d877ee384f1d2bc6bb9923defd4c69843aef5e729972d PYTHON_LIBUSB1_SETUP_TYPE = setuptools PYTHON_LIBUSB1_LICENSE = LGPL-2.1+ PYTHON_LIBUSB1_LICENSE_FILES = COPYING.LESSER diff --git a/buildroot/package/python-lmdb/python-lmdb.hash b/buildroot/package/python-lmdb/python-lmdb.hash index ed96d6954..f57437b5f 100644 --- a/buildroot/package/python-lmdb/python-lmdb.hash +++ b/buildroot/package/python-lmdb/python-lmdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lmdb/json -md5 57216cb8fba7aed91ceba5a69d359939 lmdb-0.94.tar.gz -sha256 9c2b7f05c26b2c95d6f3a566314feefe2dc64ecec6c50242a932703cf74303fe lmdb-0.94.tar.gz +md5 917f611903283a05d43a85ad1e7d05d3 lmdb-0.97.tar.gz +sha256 173d71ade5fd402c7e9ecb0a1d6022c92a7f89c313132ef4e5e561d349b0834b lmdb-0.97.tar.gz # Locally computed sha256 checksums sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/buildroot/package/python-lmdb/python-lmdb.mk b/buildroot/package/python-lmdb/python-lmdb.mk index 039656e2c..5e1c0f4c7 100644 --- a/buildroot/package/python-lmdb/python-lmdb.mk +++ b/buildroot/package/python-lmdb/python-lmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 0.94 +PYTHON_LMDB_VERSION = 0.97 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/cb/31/5be8f436b56733d9e69c721c358502f4d77b627489a459978686be7db65f +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/9f/8f/37cc080deb867305bf2d3ec4639e33b981d0def8d78949454a4654ca16bf PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE PYTHON_LMDB_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-lockfile/Config.in b/buildroot/package/python-lockfile/Config.in new file mode 100644 index 000000000..0e4a0fdd7 --- /dev/null +++ b/buildroot/package/python-lockfile/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_PYTHON_LOCKFILE + bool "python-lockfile" + help + The lockfile package exports a LockFile class which provides a + simple API for locking files. Unlike the Windows + msvcrt.locking function, the fcntl.lockf and flock functions, + and the deprecated posixfile module, the API is identical + across both Unix (including Linux and Mac) and Windows + platforms. + + The lock mechanism relies on the atomic nature of the link + (on Unix) and mkdir (on Windows) system calls. An + implementation based on SQLite is also provided, more as a + demonstration of the possibilities it provides than as + production-quality code. + + https://pypi.org/project/lockfile/ diff --git a/buildroot/package/python-lockfile/python-lockfile.hash b/buildroot/package/python-lockfile/python-lockfile.hash new file mode 100644 index 000000000..ac1b7d2d4 --- /dev/null +++ b/buildroot/package/python-lockfile/python-lockfile.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/project/lockfile/#copy-hash-modal-3c1db9ec-dd6e-4d06-8543-91094f428ac0 +md5 a6a1a82957a23afdf44cfdd039b65ff9 lockfile-0.12.2.tar.gz +sha256 6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799 lockfile-0.12.2.tar.gz +# Locally computed sha256 +sha256 a26276d53dacb369641f31aa0fe37216028a0d93753f862ae206ce04f54b7b29 LICENSE diff --git a/buildroot/package/python-lockfile/python-lockfile.mk b/buildroot/package/python-lockfile/python-lockfile.mk new file mode 100644 index 000000000..212edcdca --- /dev/null +++ b/buildroot/package/python-lockfile/python-lockfile.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-lockfile +# +################################################################################ + +PYTHON_LOCKFILE_VERSION = 0.12.2 +PYTHON_LOCKFILE_SOURCE = lockfile-$(PYTHON_LOCKFILE_VERSION).tar.gz +PYTHON_LOCKFILE_SITE = https://files.pythonhosted.org/packages/17/47/72cb04a58a35ec495f96984dddb48232b551aafb95bde614605b754fe6f7 +PYTHON_LOCKFILE_SETUP_TYPE = setuptools +PYTHON_LOCKFILE_LICENSE = MIT +PYTHON_LOCKFILE_LICENSE_FILES = LICENSE +PYTHON_LOCKFILE_DEPENDENCIES = host-python-pbr + +$(eval $(python-package)) diff --git a/buildroot/package/python-logbook/python-logbook.hash b/buildroot/package/python-logbook/python-logbook.hash index 0db9def1b..7cbcf6caf 100644 --- a/buildroot/package/python-logbook/python-logbook.hash +++ b/buildroot/package/python-logbook/python-logbook.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/logbook/json -md5 352d66684713fc323febe60c9244270e Logbook-1.4.3.tar.gz -sha256 a5a96792abd8172c80d61b7530e134524f20e2841981038031e602ed5920fef5 Logbook-1.4.3.tar.gz +md5 719970ea22dd274797bb4328161d700f Logbook-1.5.3.tar.gz +sha256 66f454ada0f56eae43066f604a222b09893f98c1adc18df169710761b8f32fe8 Logbook-1.5.3.tar.gz # Locally computed sha256 checksums sha256 2ca266337cc6947578654ab0dd6438de4d01fa78b2e6eb554b09757df1178f98 LICENSE diff --git a/buildroot/package/python-logbook/python-logbook.mk b/buildroot/package/python-logbook/python-logbook.mk index 4e9a5306d..8f02e9b94 100644 --- a/buildroot/package/python-logbook/python-logbook.mk +++ b/buildroot/package/python-logbook/python-logbook.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LOGBOOK_VERSION = 1.4.3 +PYTHON_LOGBOOK_VERSION = 1.5.3 PYTHON_LOGBOOK_SOURCE = Logbook-$(PYTHON_LOGBOOK_VERSION).tar.gz -PYTHON_LOGBOOK_SITE = https://files.pythonhosted.org/packages/f6/83/20fc0270614919cb799f76e32cf143a54c58ce2fa45c19fd38ac2e4f9977 +PYTHON_LOGBOOK_SITE = https://files.pythonhosted.org/packages/2f/d9/16ac346f7c0102835814cc9e5b684aaadea101560bb932a2403bd26b2320 PYTHON_LOGBOOK_SETUP_TYPE = setuptools PYTHON_LOGBOOK_LICENSE = BSD-3-Clause PYTHON_LOGBOOK_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-logstash/Config.in b/buildroot/package/python-logstash/Config.in new file mode 100644 index 000000000..9d225db81 --- /dev/null +++ b/buildroot/package/python-logstash/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_LOGSTASH + bool "python-logstash" + help + Python logging handler for Logstash. + + https://github.com/vklochan/python-logstash diff --git a/buildroot/package/python-logstash/python-logstash.hash b/buildroot/package/python-logstash/python-logstash.hash new file mode 100644 index 000000000..ba11c7ffa --- /dev/null +++ b/buildroot/package/python-logstash/python-logstash.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-logstash/json +md5 26fafa0ea306025fb7644d70cb38982a python-logstash-0.4.6.tar.gz +sha256 10943e5df83f592b4d61b63ad1afff855ccc8c9467f78718f0a59809ba1fe68c python-logstash-0.4.6.tar.gz +# Locally computed sha256 checksums +sha256 fea6a5c634ac9d9e047151675adc197c16f45bfba3c26ab113f48fb9fa717fff LICENSE diff --git a/buildroot/package/python-logstash/python-logstash.mk b/buildroot/package/python-logstash/python-logstash.mk new file mode 100644 index 000000000..68930bb1f --- /dev/null +++ b/buildroot/package/python-logstash/python-logstash.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-logstash +# +################################################################################ + +PYTHON_LOGSTASH_VERSION = 0.4.6 +PYTHON_LOGSTASH_SITE = https://files.pythonhosted.org/packages/4e/8d/7ff2e8e8e2613e7bb7654790480bb4cf51a55721371adbb631b16cb16dce +PYTHON_LOGSTASH_SETUP_TYPE = distutils +PYTHON_LOGSTASH_LICENSE = MIT +PYTHON_LOGSTASH_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-lxml/python-lxml.hash b/buildroot/package/python-lxml/python-lxml.hash index 6558f107e..eb7acbaab 100644 --- a/buildroot/package/python-lxml/python-lxml.hash +++ b/buildroot/package/python-lxml/python-lxml.hash @@ -1,6 +1,6 @@ # Locally computed -sha256 7035d9361f3ceec9ccc1dd3482094d1174580e7e1bf6870b77ea758f7cad15d2 lxml-4.2.6.tar.gz +sha256 c81cb40bff373ab7a7446d6bbca0190bccc5be3448b47b51d729e37799bb5692 lxml-4.4.1.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt -sha256 705bdfece6dbb87879d9ec40a8c9530651aefb98ae387da9134584464742d539 src/lxml/isoschematron/resources/rng/iso-schematron.rng +sha256 56c5b13f28b78958890c36e3249c34c169041e42ebcfdce8080f3324ba2bf4de src/lxml/isoschematron/resources/rng/iso-schematron.rng diff --git a/buildroot/package/python-lxml/python-lxml.mk b/buildroot/package/python-lxml/python-lxml.mk index 1b46670ff..0eb837080 100644 --- a/buildroot/package/python-lxml/python-lxml.mk +++ b/buildroot/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.2.6 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/b0/06/37437e348cd296c56a8bac0396007960abb2bcdaf77e8a3bde52bb68e550 +PYTHON_LXML_VERSION = 4.4.1 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/c4/43/3f1e7d742e2a7925be180b6af5e0f67d38de2f37560365ac1a0b9a04c015 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. diff --git a/buildroot/package/python-m2r/python-m2r.hash b/buildroot/package/python-m2r/python-m2r.hash index 50de2b4f1..3c22e9707 100644 --- a/buildroot/package/python-m2r/python-m2r.hash +++ b/buildroot/package/python-m2r/python-m2r.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/m2r/json, sha256 locally computed -md5 906eb6dabb0295c93881f32d0a1c0919 m2r-0.1.12.tar.gz -sha256 adfb86ebb7ff3fcd3ebb27ce8cd6f795c409a13f0c03363e265f17419ce5b9ab m2r-0.1.12.tar.gz -sha256 28728ec0ecbd8c171ebaeccebf69e3961282fd81f06abc7424c65546b6ae6f27 LICENSE +# md5, sha256 from https://pypi.org/pypi/m2r/json +md5 8bdb45c19e2b59bb5ffb9a0348e81ad8 m2r-0.2.1.tar.gz +sha256 bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99 m2r-0.2.1.tar.gz +# Locally computed sha256 checksums +sha256 28728ec0ecbd8c171ebaeccebf69e3961282fd81f06abc7424c65546b6ae6f27 LICENSE diff --git a/buildroot/package/python-m2r/python-m2r.mk b/buildroot/package/python-m2r/python-m2r.mk index 7c8ed2880..47fb154c6 100644 --- a/buildroot/package/python-m2r/python-m2r.mk +++ b/buildroot/package/python-m2r/python-m2r.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_M2R_VERSION = 0.1.12 +PYTHON_M2R_VERSION = 0.2.1 PYTHON_M2R_SOURCE = m2r-$(PYTHON_M2R_VERSION).tar.gz -PYTHON_M2R_SITE = https://pypi.python.org/packages/a0/95/7273d54664e74c3100d07206fe6b30247be046b39676972fc90ae04376a1 +PYTHON_M2R_SITE = https://files.pythonhosted.org/packages/39/e7/9fae11a45f5e1a3a21d8a98d02948e597c4afd7848a0dbe1a1ebd235f13e PYTHON_M2R_SETUP_TYPE = setuptools PYTHON_M2R_LICENSE = MIT PYTHON_M2R_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-mad/python-mad.hash b/buildroot/package/python-mad/python-mad.hash index ab91c3fe4..7b19ae5a4 100644 --- a/buildroot/package/python-mad/python-mad.hash +++ b/buildroot/package/python-mad/python-mad.hash @@ -1,2 +1,3 @@ # locally computed sha256 1c9fc529b78de7d26e9e47cf182c9f8bf43838d8f62a9c1773540d57f5ebc522 pymad-0.6.tar.gz +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/python-mako/python-mako.hash b/buildroot/package/python-mako/python-mako.hash index 6a64ec312..0f0dadcd0 100644 --- a/buildroot/package/python-mako/python-mako.hash +++ b/buildroot/package/python-mako/python-mako.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/mako/json, sha256 locally computed -md5 a28e22a339080316b2acc352b9ee631c Mako-1.0.6.tar.gz -sha256 48559ebd872a8e77f92005884b3d88ffae552812cdf17db6768e5c3be5ebbe0d Mako-1.0.6.tar.gz +# md5, sha256 from https://pypi.org/pypi/mako/json +md5 6c3f2da0b74af529a4c4a537d0848bf2 Mako-1.1.0.tar.gz +sha256 a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b Mako-1.1.0.tar.gz +# Locally computed sha256 checksums +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 LICENSE diff --git a/buildroot/package/python-mako/python-mako.mk b/buildroot/package/python-mako/python-mako.mk index 0d06dc498..622359493 100644 --- a/buildroot/package/python-mako/python-mako.mk +++ b/buildroot/package/python-mako/python-mako.mk @@ -4,9 +4,11 @@ # ################################################################################ -PYTHON_MAKO_VERSION = 1.0.6 +# Please keep in sync with +# package/python3-mako/python3-mako.mk +PYTHON_MAKO_VERSION = 1.1.0 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e +PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/b0/3c/8dcd6883d009f7cae0f3157fb53e9afb05a0d3d33b3db1268ec2e6f4a56b PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-markdown/python-markdown.hash b/buildroot/package/python-markdown/python-markdown.hash index 623156b50..6eff2035b 100644 --- a/buildroot/package/python-markdown/python-markdown.hash +++ b/buildroot/package/python-markdown/python-markdown.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markdown/json -md5 72219f46ca440b657bf227500731bdf1 Markdown-3.0.1.tar.gz -sha256 d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c Markdown-3.0.1.tar.gz +md5 d84732ecc65b3a1bff693d9d4c24277f Markdown-3.1.1.tar.gz +sha256 2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a Markdown-3.1.1.tar.gz # Locally computed sha256 sha256 6f1193cb634718e65c3a537d6e25ebd614820ec0ef693cfc12248112638d64da LICENSE.md diff --git a/buildroot/package/python-markdown/python-markdown.mk b/buildroot/package/python-markdown/python-markdown.mk index 8349638eb..a8311168f 100644 --- a/buildroot/package/python-markdown/python-markdown.mk +++ b/buildroot/package/python-markdown/python-markdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN_VERSION = 3.0.1 +PYTHON_MARKDOWN_VERSION = 3.1.1 PYTHON_MARKDOWN_SOURCE = Markdown-$(PYTHON_MARKDOWN_VERSION).tar.gz -PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/3c/52/7bae9e99a7a4be6af4a713fe9b692777e6468d28991c54c273dfb6ec9fb2 +PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/ac/df/0ae25a9fd5bb528fe3c65af7143708160aa3b47970d5272003a1ad5c03c6 PYTHON_MARKDOWN_LICENSE = BSD-3-Clause PYTHON_MARKDOWN_LICENSE_FILES = LICENSE.md PYTHON_MARKDOWN_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-markdown2/python-markdown2.hash b/buildroot/package/python-markdown2/python-markdown2.hash index 59a9a13ad..2d72a7805 100644 --- a/buildroot/package/python-markdown2/python-markdown2.hash +++ b/buildroot/package/python-markdown2/python-markdown2.hash @@ -1,3 +1,5 @@ -# Locally computed -sha256 53a6100ee005df09d0462cc246f8dc7cd48f4678d1074f36e7cff980a3819b48 python-markdown2-2.3.6.tar.gz +# md5, sha256 from https://pypi.org/pypi/markdown2/json +md5 a8dee88993d05a3e10765a57b1e1ea07 markdown2-2.3.8.tar.gz +sha256 7ff88e00b396c02c8e1ecd8d176cfa418fb01fe81234dcea77803e7ce4f05dbe markdown2-2.3.8.tar.gz +# Locally computed sha256 checksums sha256 f8c7c4d554409cf621b8d653dbfffb719745fd36f5c49b8305258649b403ef9c LICENSE.txt diff --git a/buildroot/package/python-markdown2/python-markdown2.mk b/buildroot/package/python-markdown2/python-markdown2.mk index 8069ef918..d8b946e14 100644 --- a/buildroot/package/python-markdown2/python-markdown2.mk +++ b/buildroot/package/python-markdown2/python-markdown2.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_MARKDOWN2_VERSION = 2.3.6 -PYTHON_MARKDOWN2_SITE = $(call github,trentm,python-markdown2,$(PYTHON_MARKDOWN2_VERSION)) -PYTHON_MARKDOWN2_SETUP_TYPE = distutils +PYTHON_MARKDOWN2_VERSION = 2.3.8 +PYTHON_MARKDOWN2_SOURCE = markdown2-$(PYTHON_MARKDOWN2_VERSION).tar.gz +PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/e3/93/d37055743009d1a492b2670cc215831a388b3d6e4a28b7672fdf0f7854f5 +PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-markupsafe/python-markupsafe.hash b/buildroot/package/python-markupsafe/python-markupsafe.hash index 4226a1ddf..df07662a8 100644 --- a/buildroot/package/python-markupsafe/python-markupsafe.hash +++ b/buildroot/package/python-markupsafe/python-markupsafe.hash @@ -1,3 +1,4 @@ # md5 from https://pypi.python.org/pypi/markupsafe/json, sha256 locally computed -md5 2fcedc9284d50e577b5192e8e3578355 MarkupSafe-1.0.tar.gz -sha256 a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665 MarkupSafe-1.0.tar.gz +md5 43fd756864fe42063068e092e220c57b MarkupSafe-1.1.1.tar.gz +sha256 29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b MarkupSafe-1.1.1.tar.gz +sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst diff --git a/buildroot/package/python-markupsafe/python-markupsafe.mk b/buildroot/package/python-markupsafe/python-markupsafe.mk index 625a9b5bb..b52770609 100644 --- a/buildroot/package/python-markupsafe/python-markupsafe.mk +++ b/buildroot/package/python-markupsafe/python-markupsafe.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_MARKUPSAFE_VERSION = 1.0 +PYTHON_MARKUPSAFE_VERSION = 1.1.1 PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz -PYTHON_MARKUPSAFE_SITE = https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b +PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094 PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause -PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE +PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/buildroot/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch b/buildroot/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch new file mode 100644 index 000000000..b10bfb326 --- /dev/null +++ b/buildroot/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch @@ -0,0 +1,29 @@ +From b0232c3cf1051749dd1e2bd0ec7c5c0a3a008d2f Mon Sep 17 00:00:00 2001 +From: Jugurtha BELKALEM +Date: Thu, 9 May 2019 15:06:36 +0200 +Subject: [PATCH] Fix invalid inclusion headers + +By default, matplotlib includes headers from host +machine which breaks the build process. + +Signed-off-by: Jugurtha BELKALEM +--- + python-matplotlib-3.0.3/setupext.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setupext.py b/setupext.py +index fc82d5d..eb978d2 100644 +--- a/setupext.py ++++ b/setupext.py +@@ -267,7 +267,7 @@ def get_base_dirs(): + 'gnu0': ['/usr'], + 'aix5': ['/usr/local'], + } +- return basedir_map.get(sys.platform, ['/usr/local', '/usr']) ++ return basedir_map.get(sys.platform, []) + + + def get_include_dirs(): +-- +2.7.4 + diff --git a/buildroot/package/python-matplotlib/Config.in b/buildroot/package/python-matplotlib/Config.in new file mode 100644 index 000000000..e6ed8cda2 --- /dev/null +++ b/buildroot/package/python-matplotlib/Config.in @@ -0,0 +1,30 @@ +config BR2_PACKAGE_PYTHON_MATPLOTLIB + bool "python-matplotlib" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + select BR2_PACKAGE_FREETYPE # runtime + select BR2_PACKAGE_LIBPNG # runtime + select BR2_PACKAGE_PYTHON_CYCLER + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + select BR2_PACKAGE_PYTHON_KIWISOLVER # runtime + select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PYPARSING # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime + select BR2_PACKAGE_ZLIB # runtime + help + Matplotlib strives to produce publication quality 2D + graphics for interactive graphing, scientific publishing, + user interface development and web application servers + targeting multiple user interfaces and hardcopy output + formats. + + https://matplotlib.org/ + +comment "python-matplotlib needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + +comment "python-matplotlib needs glibc or musl" + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/buildroot/package/python-matplotlib/python-matplotlib.hash b/buildroot/package/python-matplotlib/python-matplotlib.hash new file mode 100644 index 000000000..ccb22eefa --- /dev/null +++ b/buildroot/package/python-matplotlib/python-matplotlib.hash @@ -0,0 +1,4 @@ +# sha256 from https://pypi.org/project/matplotlib/#files +sha256 e1d33589e32f482d0a7d1957bf473d43341115d40d33f578dad44432e47df7b7 matplotlib-3.0.3.tar.gz +# Locally computed sha256 checksums +sha256 5a1a81ea301728c8bba2933da832c0cd62229daf20893a024ab3d53244468dbc LICENSE/LICENSE diff --git a/buildroot/package/python-matplotlib/python-matplotlib.mk b/buildroot/package/python-matplotlib/python-matplotlib.mk new file mode 100644 index 000000000..7082637d0 --- /dev/null +++ b/buildroot/package/python-matplotlib/python-matplotlib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-matplotlib +# +################################################################################ + +PYTHON_MATPLOTLIB_VERSION = 3.0.3 +PYTHON_MATPLOTLIB_SOURCE = matplotlib-$(PYTHON_MATPLOTLIB_VERSION).tar.gz +PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/26/04/8b381d5b166508cc258632b225adbafec49bbe69aa9a4fa1f1b461428313 +PYTHON_MATPLOTLIB_LICENSE = Python-2.0 +PYTHON_MATPLOTLIB_LICENSE_FILES = LICENSE/LICENSE +PYTHON_MATPLOTLIB_DEPENDENCIES = host-pkgconf freetype host-python-numpy \ + libpng python-cycler +PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash index 389bc49c4..b46f5d7cf 100644 --- a/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash +++ b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/mbstrdecoder/json, sha256 locally computed -md5 f528c26e537fe5c6987d5c5ccf6ab6e0 mbstrdecoder-0.2.2.tar.gz -sha256 fe6412d8f796fc86c90a5d394a2c93adc05a3e4225986494665a43c65dcc9312 mbstrdecoder-0.2.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/mbstrdecoder/json +md5 6dd814b20e7c68c2da2afe5bf72a5e9d mbstrdecoder-0.8.1.tar.gz +sha256 dabfae008a6b3b78f09847c2a73e9e866f97dcd9b52f7ccadf3b05a10a3656e6 mbstrdecoder-0.8.1.tar.gz +# Locally computed sha256 checksums +sha256 7fcef461a93fea587224132a865d1285969c9bec15baf59caeb7a8c7638a8744 LICENSE diff --git a/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk index 8eb36e791..4400cd673 100644 --- a/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk +++ b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MBSTRDECODER_VERSION = 0.2.2 +PYTHON_MBSTRDECODER_VERSION = 0.8.1 PYTHON_MBSTRDECODER_SOURCE = mbstrdecoder-$(PYTHON_MBSTRDECODER_VERSION).tar.gz -PYTHON_MBSTRDECODER_SITE = https://pypi.python.org/packages/40/17/ea4f3a4c844e3e5a112408879c02a1c0517ab07f97a070afe992d98d1a1a +PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/fd/0f/11982e1321f484b5ec85bb3e03878c9636ca5328fbcbed8b25ecbd76fd44 PYTHON_MBSTRDECODER_SETUP_TYPE = setuptools PYTHON_MBSTRDECODER_LICENSE = MIT PYTHON_MBSTRDECODER_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-meld3/python-meld3.hash b/buildroot/package/python-meld3/python-meld3.hash index c7d9025e7..f423b0bf1 100644 --- a/buildroot/package/python-meld3/python-meld3.hash +++ b/buildroot/package/python-meld3/python-meld3.hash @@ -1,3 +1,6 @@ -# md5 from https://pypi.python.org/pypi/meld3/json, sha256 locally computed -md5 3ccc78cd79cffd63a751ad7684c02c91 meld3-1.0.2.tar.gz -sha256 f7b754a0fde7a4429b2ebe49409db240b5699385a572501bb0d5627d299f9558 meld3-1.0.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/meld3/json +md5 56fff5d6599efeefc81cf2d3b8cf6b4e meld3-2.0.0.tar.gz +sha256 1efda676264490db2e30bfb81b27a918cc6d9c2de6d609491aa43410b9537eb9 meld3-2.0.0.tar.gz +# Locally computed sha256 checksums +sha256 5fe11cd858707131b6ec1338b5c2cd68dd1fdb875e3ec967149bc6fea858ecec LICENSE.txt +sha256 2422945b49554688d529e1f8d4ac6e0ab77a817e8889158e1e56cf963ecf5c4d COPYRIGHT.txt diff --git a/buildroot/package/python-meld3/python-meld3.mk b/buildroot/package/python-meld3/python-meld3.mk index 675478ef7..f67172e6f 100644 --- a/buildroot/package/python-meld3/python-meld3.mk +++ b/buildroot/package/python-meld3/python-meld3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MELD3_VERSION = 1.0.2 +PYTHON_MELD3_VERSION = 2.0.0 PYTHON_MELD3_SOURCE = meld3-$(PYTHON_MELD3_VERSION).tar.gz -PYTHON_MELD3_SITE = https://pypi.python.org/packages/45/a0/317c6422b26c12fe0161e936fc35f36552069ba8e6f7ecbd99bbffe32a5f +PYTHON_MELD3_SITE = https://files.pythonhosted.org/packages/00/3b/023446ddc1bf0b519c369cbe88269c30c6a64bd10af4817c73f560c302f7 PYTHON_MELD3_LICENSE = ZPL-2.1 PYTHON_MELD3_LICENSE_FILES = COPYRIGHT.txt LICENSE.txt PYTHON_MELD3_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-mistune/python-mistune.hash b/buildroot/package/python-mistune/python-mistune.hash index e939aefc8..f545308f4 100644 --- a/buildroot/package/python-mistune/python-mistune.hash +++ b/buildroot/package/python-mistune/python-mistune.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/mistune/json, sha256 locally computed -md5 8bd955fe74ce37af54b16c0d9b89a2ef mistune-0.8.tar.gz -sha256 dc3f43e7cf0abb95cdfecbf82d85c419108d5f13e1844b2a8a2fc0abf24c7a47 mistune-0.8.tar.gz +# md5, sha256 from https://pypi.org/pypi/mistune/json +md5 fb6ab174ece938dea09f8b2adad771e4 mistune-0.8.4.tar.gz +sha256 59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e mistune-0.8.4.tar.gz +# Locally computed sha256 checksums sha256 0c5259c3dd0a7c46f4835221645f62a0638c9b9faa02af08676e8069e1ff964b LICENSE diff --git a/buildroot/package/python-mistune/python-mistune.mk b/buildroot/package/python-mistune/python-mistune.mk index 405216ccb..6beb42583 100644 --- a/buildroot/package/python-mistune/python-mistune.mk +++ b/buildroot/package/python-mistune/python-mistune.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MISTUNE_VERSION = 0.8 +PYTHON_MISTUNE_VERSION = 0.8.4 PYTHON_MISTUNE_SOURCE = mistune-$(PYTHON_MISTUNE_VERSION).tar.gz -PYTHON_MISTUNE_SITE = https://pypi.python.org/packages/d3/66/a45d1c7c50fd63a707cd1bd340b969523137c5284d9466c41012fe54c621 +PYTHON_MISTUNE_SITE = https://files.pythonhosted.org/packages/2d/a4/509f6e7783ddd35482feda27bc7f72e65b5e7dc910eca4ab2164daf9c577 PYTHON_MISTUNE_LICENSE = BSD-3-Clause PYTHON_MISTUNE_LICENSE_FILES = LICENSE PYTHON_MISTUNE_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-more-itertools/Config.in b/buildroot/package/python-more-itertools/Config.in index dc5fb7ce5..1a7f95c27 100644 --- a/buildroot/package/python-more-itertools/Config.in +++ b/buildroot/package/python-more-itertools/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_MORE_ITERTOOLS bool "python-more-itertools" - select BR2_PACKAGE_PYTHON_SIX # runtime + depends on BR2_PACKAGE_PYTHON3 help More routines for operating on iterables, beyond itertools. diff --git a/buildroot/package/python-more-itertools/python-more-itertools.hash b/buildroot/package/python-more-itertools/python-more-itertools.hash index 36748cb39..3bb65897c 100644 --- a/buildroot/package/python-more-itertools/python-more-itertools.hash +++ b/buildroot/package/python-more-itertools/python-more-itertools.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/more-itertools/json, sha256 locally computed -md5 fef89b28d050e325fbb7eb209e75ab45 more-itertools-4.0.1.tar.gz -sha256 5d21dcefa19782f9ec9aa64e0bfd903f5024512b1e1f17519800b193b2e64d31 more-itertools-4.0.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/more-itertools/json +md5 f647bfd27243a7bebe53b5ddb6a3b1c4 more-itertools-7.2.0.tar.gz +sha256 409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832 more-itertools-7.2.0.tar.gz +# Locally computed sha256 checksums sha256 09f1c8c9e941af3e584d59641ea9b87d83c0cb0fd007eb5ef391a7e2643c1a46 LICENSE diff --git a/buildroot/package/python-more-itertools/python-more-itertools.mk b/buildroot/package/python-more-itertools/python-more-itertools.mk index 971a33862..4932fdc4a 100644 --- a/buildroot/package/python-more-itertools/python-more-itertools.mk +++ b/buildroot/package/python-more-itertools/python-more-itertools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MORE_ITERTOOLS_VERSION = 4.0.1 +PYTHON_MORE_ITERTOOLS_VERSION = 7.2.0 PYTHON_MORE_ITERTOOLS_SOURCE = more-itertools-$(PYTHON_MORE_ITERTOOLS_VERSION).tar.gz -PYTHON_MORE_ITERTOOLS_SITE = https://pypi.python.org/packages/a2/28/d02c111c230a769a32fd97e9f6d42bfb0136da381f356b945db38367b3d3 +PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/c2/31/45f61c8927c9550109f1c4b99ba3ca66d328d889a9c9853a808bff1c9fa0 PYTHON_MORE_ITERTOOLS_SETUP_TYPE = setuptools PYTHON_MORE_ITERTOOLS_LICENSE = MIT PYTHON_MORE_ITERTOOLS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-msgfy/Config.in b/buildroot/package/python-msgfy/Config.in new file mode 100644 index 000000000..7875379e9 --- /dev/null +++ b/buildroot/package/python-msgfy/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_MSGFY + bool "python-msgfy" + help + msgfy is a Python library for convert Exception instance to + a human-readable error message. + + https://github.com/thombashi/msgfy diff --git a/buildroot/package/python-msgfy/python-msgfy.hash b/buildroot/package/python-msgfy/python-msgfy.hash new file mode 100644 index 000000000..8f664ec2e --- /dev/null +++ b/buildroot/package/python-msgfy/python-msgfy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/msgfy/json +md5 3a94f49d7b31cc7bca21e0a9bfadf767 msgfy-0.0.7.tar.gz +sha256 370c54bb036d3728af8004e750b7cd7bc5a4ac25f9cdb8be13b7865cae3c73ee msgfy-0.0.7.tar.gz +# Locally computed sha256 checksums +sha256 fcfe96f8fb1bf3478a51c828e7f7afee01500ce1c2d4345d052edb858be05227 LICENSE diff --git a/buildroot/package/python-msgfy/python-msgfy.mk b/buildroot/package/python-msgfy/python-msgfy.mk new file mode 100644 index 000000000..0a642b434 --- /dev/null +++ b/buildroot/package/python-msgfy/python-msgfy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-msgfy +# +################################################################################ + +PYTHON_MSGFY_VERSION = 0.0.7 +PYTHON_MSGFY_SOURCE = msgfy-$(PYTHON_MSGFY_VERSION).tar.gz +PYTHON_MSGFY_SITE = https://files.pythonhosted.org/packages/23/82/b61a8353c36e60c2c8291c56ad7d00aa37918ef56811727510acada09f7f +PYTHON_MSGFY_SETUP_TYPE = setuptools +PYTHON_MSGFY_LICENSE = MIT +PYTHON_MSGFY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-msgpack/python-msgpack.hash b/buildroot/package/python-msgpack/python-msgpack.hash index cb3b75d5f..e58537d06 100644 --- a/buildroot/package/python-msgpack/python-msgpack.hash +++ b/buildroot/package/python-msgpack/python-msgpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msgpack/json -md5 1b96537be6f5186fed0d131aaa59ef26 msgpack-0.6.1.tar.gz -sha256 4008c72f5ef2b7936447dcb83db41d97e9791c83221be13d5e19db0796df1972 msgpack-0.6.1.tar.gz +md5 ba46fdee995565f40e332bd7eea882f1 msgpack-0.6.2.tar.gz +sha256 ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830 msgpack-0.6.2.tar.gz # Locally computed sha256 sha256 492dedba85da5872f78e6091bcd1fea474d660d35acb4dee964b8aab3f007427 COPYING diff --git a/buildroot/package/python-msgpack/python-msgpack.mk b/buildroot/package/python-msgpack/python-msgpack.mk index 517166db6..f4e059f5e 100644 --- a/buildroot/package/python-msgpack/python-msgpack.mk +++ b/buildroot/package/python-msgpack/python-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGPACK_VERSION = 0.6.1 +PYTHON_MSGPACK_VERSION = 0.6.2 PYTHON_MSGPACK_SOURCE = msgpack-$(PYTHON_MSGPACK_VERSION).tar.gz -PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/81/9c/0036c66234482044070836cc622266839e2412f8108849ab0bfdeaab8578 +PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/74/0a/de673c1c987f5779b65ef69052331ec0b0ebd22958bda77a8284be831964 PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-multidict/python-multidict.hash b/buildroot/package/python-multidict/python-multidict.hash index a98c4553d..431a94247 100644 --- a/buildroot/package/python-multidict/python-multidict.hash +++ b/buildroot/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 5e9d8f7e1ada9a22932aed6a72f88e43 multidict-4.5.2.tar.gz -sha256 024b8129695a952ebd93373e45b5d341dbb87c17ce49637b34000093f243dd4f multidict-4.5.2.tar.gz +md5 9a1ed2cc0cd3e5dd2e71921104f2b760 multidict-4.7.5.tar.gz +sha256 aee283c49601fa4c13adc64c09c978838a7e812f85377ae130a24d7198c0331e multidict-4.7.5.tar.gz # Locally computed sha256 checksums -sha256 a1c5825513279d3085a0ba46880e148ea3710c149bbaedcf2d11605a5ed3c4ad LICENSE +sha256 a1c5825513279d3085a0ba46880e148ea3710c149bbaedcf2d11605a5ed3c4ad LICENSE diff --git a/buildroot/package/python-multidict/python-multidict.mk b/buildroot/package/python-multidict/python-multidict.mk index 7b9cd3928..2f80b1f85 100644 --- a/buildroot/package/python-multidict/python-multidict.mk +++ b/buildroot/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 4.5.2 +PYTHON_MULTIDICT_VERSION = 4.7.5 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/7f/8f/b3c8c5b062309e854ce5b726fc101195fbaa881d306ffa5c2ba19efa3af2 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/61/b4/475114b3f1671da634f89239e61038f8742d9ac13aa34b32a05bf8022d22 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-mutagen/python-mutagen.hash b/buildroot/package/python-mutagen/python-mutagen.hash index 337100677..5ee8ed17c 100644 --- a/buildroot/package/python-mutagen/python-mutagen.hash +++ b/buildroot/package/python-mutagen/python-mutagen.hash @@ -1,3 +1,4 @@ # md5 from https://pypi.python.org/pypi/mutagen/json, sha256 locally computed -md5 af52956a1b8976accf402f3104b95a84 mutagen-1.36.2.tar.gz -sha256 86fe98e941ca305be8ee6bdc6bb0e4e9c473bf9fb69a838fe5bf2fc6124fbcc7 mutagen-1.36.2.tar.gz +md5 3729218f974c3a79ee9972ffa5ca5d12 mutagen-1.42.0.tar.gz +sha256 bb61e2456f59a9a4a259fbc08def6d01ba45a42da8eeaa97d00633b0ec5de71c mutagen-1.42.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/python-mutagen/python-mutagen.mk b/buildroot/package/python-mutagen/python-mutagen.mk index 3b516fe12..5477d6f4c 100644 --- a/buildroot/package/python-mutagen/python-mutagen.mk +++ b/buildroot/package/python-mutagen/python-mutagen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MUTAGEN_VERSION = 1.36.2 +PYTHON_MUTAGEN_VERSION = 1.42.0 PYTHON_MUTAGEN_SOURCE = mutagen-$(PYTHON_MUTAGEN_VERSION).tar.gz -PYTHON_MUTAGEN_SITE = https://pypi.python.org/packages/e7/8a/61496657e30c2cbeb9b3aa28848e0adbcba7cab0ff0bd8e6206647670088 +PYTHON_MUTAGEN_SITE = https://files.pythonhosted.org/packages/30/4c/5ad1a6e1ccbcfaf6462db727989c302d9d721beedd9b09c11e6f0c7065b0 PYTHON_MUTAGEN_LICENSE = GPL-2.0 PYTHON_MUTAGEN_LICENSE_FILES = COPYING PYTHON_MUTAGEN_SETUP_TYPE = distutils diff --git a/buildroot/package/python-mwclient/python-mwclient.hash b/buildroot/package/python-mwclient/python-mwclient.hash index fccfbcdcb..a61dfd696 100644 --- a/buildroot/package/python-mwclient/python-mwclient.hash +++ b/buildroot/package/python-mwclient/python-mwclient.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mwclient/json -md5 994337c4153d86345f2dfdf74e53b546 mwclient-0.9.2.tar.gz -sha256 60ed0b13fdef8cb2ce4dde79bc92dd729de093e86f188225b4bcd73e32d75282 mwclient-0.9.2.tar.gz +md5 c1b9f69d0eb71a031c1254b1ed16f678 mwclient-0.10.0.tar.gz +sha256 c3f1598a5f75fb80e9b8373f6574042208358aed81470fc2178a8ae7474069af mwclient-0.10.0.tar.gz # Locally computed -sha256 d29eaa80939b6d8fc3ab458bab90f4af879fa9e0430ed7e0fb2b94752e7eb33f mwclient/__init__.py +sha256 0e713ce8e3e490bdc15ac1e59feba3009daef3fff10dd80d8baa6e5f9a294f32 LICENSE.md diff --git a/buildroot/package/python-mwclient/python-mwclient.mk b/buildroot/package/python-mwclient/python-mwclient.mk index 0e20dd626..de66a4274 100644 --- a/buildroot/package/python-mwclient/python-mwclient.mk +++ b/buildroot/package/python-mwclient/python-mwclient.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_MWCLIENT_VERSION = 0.9.2 +PYTHON_MWCLIENT_VERSION = 0.10.0 PYTHON_MWCLIENT_SOURCE = mwclient-$(PYTHON_MWCLIENT_VERSION).tar.gz -PYTHON_MWCLIENT_SITE = https://files.pythonhosted.org/packages/f8/5a/9a5cf29e256c5720b9dc3b60586be6557e5f8bbf313d90bf75b0d967f0af +PYTHON_MWCLIENT_SITE = https://files.pythonhosted.org/packages/c1/ec/6206a7b3834572b3c1082f58dc960f4e49543395aa55955b598c29c9f8ad PYTHON_MWCLIENT_LICENSE = MIT -PYTHON_MWCLIENT_LICENSE_FILES = mwclient/__init__.py +PYTHON_MWCLIENT_LICENSE_FILES = LICENSE.md PYTHON_MWCLIENT_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-mwscrape/python-mwscrape.hash b/buildroot/package/python-mwscrape/python-mwscrape.hash index b91ef69a2..e6bdf396c 100644 --- a/buildroot/package/python-mwscrape/python-mwscrape.hash +++ b/buildroot/package/python-mwscrape/python-mwscrape.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 8de8a5ef257851f6e1e41247f64710f48859a5e3f91ebc7200bb60769f02f296 python-mwscrape-6a58d7801eb1e884fd0516f1adbedbd4481c10e6.tar.gz +sha256 8de8a5ef257851f6e1e41247f64710f48859a5e3f91ebc7200bb60769f02f296 python-mwscrape-6a58d7801eb1e884fd0516f1adbedbd4481c10e6.tar.gz +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE.txt diff --git a/buildroot/package/python-mwscrape2slob/Config.in b/buildroot/package/python-mwscrape2slob/Config.in index 7856a2c00..dc2b2ae3b 100644 --- a/buildroot/package/python-mwscrape2slob/Config.in +++ b/buildroot/package/python-mwscrape2slob/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB bool "python-mwscrape2slob" depends on !BR2_BINFMT_FLAT # python-slob -> python-pyicu -> icu depends on BR2_INSTALL_LIBSTDCPP # python-slob -> python-pyicu -> icu - depends on BR2_HOST_GCC_AT_LEAST_4_8 # python-slob -> python-pyicu -> icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # python-slob -> python-pyicu -> icu depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_COUCHDB # runtime @@ -16,8 +15,7 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB https://github.com/itkach/mwscrape2slob -comment "python-mwscrape2slob needs a toolchain w/ C++, gcc >= 4.8, host gcc >= 4.8" +comment "python-mwscrape2slob needs a toolchain w/ C++, gcc >= 4.8" depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/python-nested-dict/Config.in b/buildroot/package/python-nested-dict/Config.in new file mode 100644 index 000000000..dc453fff7 --- /dev/null +++ b/buildroot/package/python-nested-dict/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_NESTED_DICT + bool "python-nested-dict" + help + Python dictionary with automatic and arbitrary levels of + nestedness. + + http://pypi.python.org/pypi/nested_dict diff --git a/buildroot/package/python-nested-dict/python-nested-dict.hash b/buildroot/package/python-nested-dict/python-nested-dict.hash new file mode 100644 index 000000000..15f0ed8b5 --- /dev/null +++ b/buildroot/package/python-nested-dict/python-nested-dict.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/nested-dict/json +md5 e08e2e8de6d002f9ddda4eea5a4528c2 nested_dict-1.61.tar.gz +sha256 de0fb5bac82ba7bcc23736f09373f18628ea57f92bbaa13480d23f261c41e771 nested_dict-1.61.tar.gz +# Locally computed sha256 checksums +sha256 c84eb6b667b91fd9b8991f500c168354eb51af5b2dd970d8ee51ce336d9aeed1 LICENSE.TXT diff --git a/buildroot/package/python-nested-dict/python-nested-dict.mk b/buildroot/package/python-nested-dict/python-nested-dict.mk new file mode 100644 index 000000000..1a5b180e1 --- /dev/null +++ b/buildroot/package/python-nested-dict/python-nested-dict.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-nested-dict +# +################################################################################ + +PYTHON_NESTED_DICT_VERSION = 1.61 +PYTHON_NESTED_DICT_SOURCE = nested_dict-$(PYTHON_NESTED_DICT_VERSION).tar.gz +PYTHON_NESTED_DICT_SITE = https://files.pythonhosted.org/packages/42/d0/3b27fa65b16a2e44d793af59929fcdb3bb84b4664462ff2830105dfd9b7d +PYTHON_NESTED_DICT_SETUP_TYPE = setuptools +PYTHON_NESTED_DICT_LICENSE = MIT +PYTHON_NESTED_DICT_LICENSE_FILES = LICENSE.TXT + +$(eval $(python-package)) diff --git a/buildroot/package/python-netaddr/python-netaddr.hash b/buildroot/package/python-netaddr/python-netaddr.hash index 59628dbdf..c834721d2 100644 --- a/buildroot/package/python-netaddr/python-netaddr.hash +++ b/buildroot/package/python-netaddr/python-netaddr.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/netaddr/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/netaddr/json md5 51019ef59c93f3979bcb37d3b8527e07 netaddr-0.7.19.tar.gz +# Locally computed sha256 38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd netaddr-0.7.19.tar.gz +sha256 0e53de62547787462f41eefb5cee31a14f7ea767ba0362c6f9304f1742486d47 LICENSE diff --git a/buildroot/package/python-netifaces/python-netifaces.hash b/buildroot/package/python-netifaces/python-netifaces.hash index 335f907d5..f59208014 100644 --- a/buildroot/package/python-netifaces/python-netifaces.hash +++ b/buildroot/package/python-netifaces/python-netifaces.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/netifaces/json, sha256 locally computed -md5 1d424cb5ef52907c5ab913011122a98b netifaces-0.10.6.tar.gz -sha256 0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0 netifaces-0.10.6.tar.gz +# md5, sha256 from https://pypi.org/pypi/netifaces/json +md5 de92cc322b4f56047c073f802ad77860 netifaces-0.10.9.tar.gz +sha256 2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3 netifaces-0.10.9.tar.gz +# Locally computed sha256 checksums +sha256 b20b895164b72b9cc0170e6c0d60b14f9aaacc6862c0556eed41eaa348883705 LICENSE diff --git a/buildroot/package/python-netifaces/python-netifaces.mk b/buildroot/package/python-netifaces/python-netifaces.mk index 3258be7a9..502529c00 100644 --- a/buildroot/package/python-netifaces/python-netifaces.mk +++ b/buildroot/package/python-netifaces/python-netifaces.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_NETIFACES_VERSION = 0.10.6 +PYTHON_NETIFACES_VERSION = 0.10.9 PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz -PYTHON_NETIFACES_SITE = https://pypi.python.org/packages/72/01/ba076082628901bca750bf53b322a8ff10c1d757dc29196a8e6082711c9d +PYTHON_NETIFACES_SITE = https://files.pythonhosted.org/packages/0d/18/fd6e9c71a35b67a73160ec80a49da63d1eed2d2055054cc2995714949132 PYTHON_NETIFACES_LICENSE = MIT -PYTHON_NETIFACES_LICENSE_FILES = README.rst +PYTHON_NETIFACES_LICENSE_FILES = LICENSE PYTHON_NETIFACES_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-networkmanager/python-networkmanager.hash b/buildroot/package/python-networkmanager/python-networkmanager.hash index 83621761c..6ca94450f 100644 --- a/buildroot/package/python-networkmanager/python-networkmanager.hash +++ b/buildroot/package/python-networkmanager/python-networkmanager.hash @@ -1,3 +1,5 @@ # md5 and sha256 from https://pypi.python.org/pypi/python-networkmanager/json md5 f638d854a3639fb37c0e06d1092a771e python-networkmanager-2.1.tar.gz sha256 aef1e34d98d7bec7cc368e0ca0f2e97493f9b5ebe6d7103f8f6460cfca3dc6fc python-networkmanager-2.1.tar.gz +# Locally computed +sha256 be40f44d54bb5e0f0eee28e957ad020a00a6e3adb0290262e92129eba1c044cf COPYING diff --git a/buildroot/package/python-nfc/0001-add-setup-py.patch b/buildroot/package/python-nfc/0001-add-setup-py.patch deleted file mode 100644 index 5a5145271..000000000 --- a/buildroot/package/python-nfc/0001-add-setup-py.patch +++ /dev/null @@ -1,26 +0,0 @@ -Add simple setup.py - -Having a setup.py allows to easily get the .py files compiled into -.pyc, which is good because by default, Buildroot only keeps .pyc -files on the target. - -Signed-off-by: Thomas Petazzoni - -Index: b/setup.py -=================================================================== ---- /dev/null -+++ b/setup.py -@@ -0,0 +1,13 @@ -+#!/usr/bin/env python -+ -+from distutils.core import setup -+ -+setup(name='NFC', -+ version='1.0', -+ description='Python NFC', -+ author='Stephen Tiedemann', -+ author_email='stephen.tiedemann@googlemail.com', -+ url='https://launchpad.net/nfcpy', -+ packages=['nfc', 'nfc/dev', 'nfc/llcp', 'nfc/ndef', -+ 'nfc/snep'], -+ ) diff --git a/buildroot/package/python-nfc/python-nfc.hash b/buildroot/package/python-nfc/python-nfc.hash new file mode 100644 index 000000000..6514973f5 --- /dev/null +++ b/buildroot/package/python-nfc/python-nfc.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 7ff9265e393e9e70173ecef5a1f9124e67d3b6e481c2dc3a9537b6a769ebe16f python-nfc-0.13.5.tar.gz +sha256 0dc4b0a3362f197e250604567a6b4eb16bbc34c186425401e2201a193a82549f LICENSE diff --git a/buildroot/package/python-nfc/python-nfc.mk b/buildroot/package/python-nfc/python-nfc.mk index 574d2e56e..f5417410c 100644 --- a/buildroot/package/python-nfc/python-nfc.mk +++ b/buildroot/package/python-nfc/python-nfc.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_NFC_VERSION = 212 -PYTHON_NFC_SITE = https://launchpad.net/nfcpy -PYTHON_NFC_SITE_METHOD = bzr +PYTHON_NFC_VERSION = 0.13.5 +PYTHON_NFC_SITE = $(call github,nfcpy,nfcpy,v$(PYTHON_NFC_VERSION)) PYTHON_NFC_DEPENDENCIES = libusb libusb-compat -PYTHON_NFC_SETUP_TYPE = distutils +PYTHON_NFC_SETUP_TYPE = setuptools PYTHON_NFC_LICENSE = EUPL-1.1+ +PYTHON_NFC_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python-numpy/0001-no-fenv-on-uclibc.patch b/buildroot/package/python-numpy/0001-no-fenv-on-uclibc.patch deleted file mode 100644 index 5aa377bb2..000000000 --- a/buildroot/package/python-numpy/0001-no-fenv-on-uclibc.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1d309b81a6fdac33dfb5148f618bafe6ebdff958 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 15 Sep 2017 12:51:36 +0300 -Subject: [PATCH] Don't use on uClibc - -The python-numpy code already has provisions to not use when -not available. However, it uses __GLIBC__ to know whether fenv.h is -available or not, but uClibc defines __GLIBC__, so python-numpy thinks -fenv.h is available. - -This patch fixes that by changing all defined(__GLIBC__) occurences by -(defined(__GLIBC__) && !defined(__UCLIBC__)). - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Alexey Brodkin ---- - numpy/core/include/numpy/ufuncobject.h | 2 +- - numpy/core/src/npymath/ieee754.c.src | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h -index d0ac1fd7d732..65e49fcd5b7a 100644 ---- a/numpy/core/include/numpy/ufuncobject.h -+++ b/numpy/core/include/numpy/ufuncobject.h -@@ -319,7 +319,7 @@ typedef struct _loop1d_info { - #if defined(sun) || defined(__BSD__) || defined(__OpenBSD__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version < 502114)) || \ - defined(__NetBSD__) || \ -- defined(__GLIBC__) || defined(__APPLE__) || \ -+ (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ - defined(__CYGWIN__) || defined(__MINGW32__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) || \ - defined(_AIX) || \ -diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src -index 0370ea6c77aa..e63e409b6604 100644 ---- a/numpy/core/src/npymath/ieee754.c.src -+++ b/numpy/core/src/npymath/ieee754.c.src -@@ -612,7 +612,7 @@ void npy_set_floatstatus_invalid(void) - } - - --#elif defined(__GLIBC__) || defined(__APPLE__) || \ -+#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ - defined(__CYGWIN__) || defined(__MINGW32__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - # include --- -2.7.5 - diff --git a/buildroot/package/python-numpy/0003-no-FPU-exceptions-bits-on-ARC-glibc.patch b/buildroot/package/python-numpy/0003-no-FPU-exceptions-bits-on-ARC-glibc.patch deleted file mode 100644 index f2ed4f6f9..000000000 --- a/buildroot/package/python-numpy/0003-no-FPU-exceptions-bits-on-ARC-glibc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ae217b0e77a52f08f46ef66fa88820946984507a Mon Sep 17 00:00:00 2001 -From: Evgeniy Didin -Date: Tue, 6 Feb 2018 15:59:22 +0300 -Subject: [PATCH] FIX: no FPU exceptions bits on ARC glibc - -The FPU exceptions bits are missing in fenv.h in glibc for ARC architecture. - -Signed-off-by: Evgeniy Didin ---- - numpy/core/include/numpy/ufuncobject.h | 2 +- - numpy/core/src/npymath/ieee754.c.src | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h -index 89f72fcea..29e05b179 100644 ---- a/numpy/core/include/numpy/ufuncobject.h -+++ b/numpy/core/include/numpy/ufuncobject.h -@@ -319,7 +319,7 @@ typedef struct _loop1d_info { - #if defined(sun) || defined(__BSD__) || defined(__OpenBSD__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version < 502114)) || \ - defined(__NetBSD__) || \ -- (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ -+ (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__arc__)) || defined(__APPLE__) || \ - defined(__CYGWIN__) || defined(__MINGW32__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) || \ - defined(_AIX) || \ -diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src -index 8dc4d77ef..78e646470 100644 ---- a/numpy/core/src/npymath/ieee754.c.src -+++ b/numpy/core/src/npymath/ieee754.c.src -@@ -627,7 +627,7 @@ void npy_set_floatstatus_invalid(void) - } - - --#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ -+#elif (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__arc__)) || defined(__APPLE__) || \ - defined(__CYGWIN__) || defined(__MINGW32__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - # include --- -2.16.2 - diff --git a/buildroot/package/python-numpy/Config.in b/buildroot/package/python-numpy/Config.in index c337675ce..5b9ee5803 100644 --- a/buildroot/package/python-numpy/Config.in +++ b/buildroot/package/python-numpy/Config.in @@ -16,6 +16,8 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + # python-numpy needs fenv.h which is not provided by uclibc + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL help NumPy is the fundamental package for scientific computing with Python. @@ -24,3 +26,6 @@ config BR2_PACKAGE_PYTHON_NUMPY C library. http://www.numpy.org/ + +comment "python-numpy needs glibc or musl" + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/buildroot/package/python-numpy/python-numpy.hash b/buildroot/package/python-numpy/python-numpy.hash index 7c7f44611..eb4123e3f 100644 --- a/buildroot/package/python-numpy/python-numpy.hash +++ b/buildroot/package/python-numpy/python-numpy.hash @@ -1,4 +1,9 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.15.1 -sha256 3c1ccce5d935ef8df16ae0595b459ef08a5cdb05aee195ebc04b9d89a72be7fa numpy-1.15.1.tar.gz +# Copied from https://github.com/numpy/numpy/releases/tag/v1.16.4 +sha256 a3bccb70ad94091a5b9e2469fabd41ac877c140a6828c2022e35560a2ec0346c numpy-1.16.4.tar.gz # License files, locally calculated -sha256 9e85ee1c3f11444243c9b7667721592a01f1cd90cb28ad937ac99f6241d6b685 LICENSE.txt +sha256 6b5086f61fe0c71564a79304ecbaa60f11fa3f3debf82f73d16a611cab102adc LICENSE.txt +sha256 426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641 doc/sphinxext/LICENSE.txt +sha256 154a8706fa0fdeff1073bf6239c4ecf51f562ab107066eef839dade1a45c824c doc/scipy-sphinx-theme/LICENSE.txt +sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt +sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt +sha256 d37526b4a34c0aa859afe6f9b7e64ca7c306b7430df8113dd5ac6fcb246bd2d4 numpy/core/src/multiarray/dragon4.c diff --git a/buildroot/package/python-numpy/python-numpy.mk b/buildroot/package/python-numpy/python-numpy.mk index b20de6a75..3b474efa6 100644 --- a/buildroot/package/python-numpy/python-numpy.mk +++ b/buildroot/package/python-numpy/python-numpy.mk @@ -4,11 +4,15 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.15.1 +PYTHON_NUMPY_VERSION = 1.16.4 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) -PYTHON_NUMPY_LICENSE = BSD-3-Clause -PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt +PYTHON_NUMPY_LICENSE = BSD-3-Clause, BSD-2-Clause, PSF, Apache-2.0, MIT, Zlib +PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt doc/sphinxext/LICENSE.txt \ + doc/scipy-sphinx-theme/LICENSE.txt \ + numpy/linalg/lapack_lite/LICENSE.txt \ + tools/npy_tempita/license.txt \ + numpy/core/src/multiarray/dragon4.c PYTHON_NUMPY_SETUP_TYPE = setuptools ifeq ($(BR2_PACKAGE_CLAPACK),y) diff --git a/buildroot/package/python-oauthlib/python-oauthlib.hash b/buildroot/package/python-oauthlib/python-oauthlib.hash index f0a3dee82..2bf7f7974 100644 --- a/buildroot/package/python-oauthlib/python-oauthlib.hash +++ b/buildroot/package/python-oauthlib/python-oauthlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/oauthlib/json -md5 544b15398afe48d9493fa60d571bd8c7 oauthlib-2.1.0.tar.gz -sha256 ac35665a61c1685c56336bda97d5eefa246f1202618a1d6f34fccb1bdd404162 oauthlib-2.1.0.tar.gz +md5 43cb2b5bac983712ee55076b61181cc2 oauthlib-3.1.0.tar.gz +sha256 bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889 oauthlib-3.1.0.tar.gz # Locally computed sha256 checksums -sha256 9e1ae8725f5815738dadb6cbb09f450453d94e07c7b5efaee864f546a6209a95 LICENSE +sha256 3d1e12d8ac52c0b6c148af6d291f72400b8720ed16c0ac4a89868b6d14b1c939 LICENSE diff --git a/buildroot/package/python-oauthlib/python-oauthlib.mk b/buildroot/package/python-oauthlib/python-oauthlib.mk index 3aa7ae227..407abc765 100644 --- a/buildroot/package/python-oauthlib/python-oauthlib.mk +++ b/buildroot/package/python-oauthlib/python-oauthlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OAUTHLIB_VERSION = 2.1.0 +PYTHON_OAUTHLIB_VERSION = 3.1.0 PYTHON_OAUTHLIB_SOURCE = oauthlib-$(PYTHON_OAUTHLIB_VERSION).tar.gz -PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/df/5f/3f4aae7b28db87ddef18afed3b71921e531ca288dc604eb981e9ec9f8853 +PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/fc/c7/829c73c64d3749da7811c06319458e47f3461944da9d98bb4df1cb1598c2 PYTHON_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-paho-mqtt/python-paho-mqtt.hash b/buildroot/package/python-paho-mqtt/python-paho-mqtt.hash index e791d367e..35afccced 100644 --- a/buildroot/package/python-paho-mqtt/python-paho-mqtt.hash +++ b/buildroot/package/python-paho-mqtt/python-paho-mqtt.hash @@ -1,6 +1,6 @@ # md5 from https://pypi.python.org/pypi/paho-mqtt/json, sha256 locally computed -md5 2cc27d8b369700b1fc99325add0dadd2 paho-mqtt-1.3.1.tar.gz -sha256 31911f6031de306c27ed79dc77b690d7c55b0dcb0f0434ca34ec6361d0371122 paho-mqtt-1.3.1.tar.gz +md5 e3ac29cd5dc247a01083a2a8f3fddd08 paho-mqtt-1.4.0.tar.gz +sha256 e440a052b46d222e184be3be38676378722072fcd4dfd2c8f509fb861a7b0b79 paho-mqtt-1.4.0.tar.gz sha256 76f13729e84e9222e543303df00f87d1b2c0995b6a505cd859a285667e44babb LICENSE.txt sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 sha256 3b9be6b894d0769de796e653571ff6cef494913c0ce78c35a97db939e7d9087c epl-v10 diff --git a/buildroot/package/python-paho-mqtt/python-paho-mqtt.mk b/buildroot/package/python-paho-mqtt/python-paho-mqtt.mk index f335b35ed..d192749e1 100644 --- a/buildroot/package/python-paho-mqtt/python-paho-mqtt.mk +++ b/buildroot/package/python-paho-mqtt/python-paho-mqtt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PAHO_MQTT_VERSION = 1.3.1 +PYTHON_PAHO_MQTT_VERSION = 1.4.0 PYTHON_PAHO_MQTT_SOURCE = paho-mqtt-$(PYTHON_PAHO_MQTT_VERSION).tar.gz -PYTHON_PAHO_MQTT_SITE = https://pypi.python.org/packages/2a/5f/cf14b8f9f8ed1891cda893a2a7d1d6fa23de2a9fb4832f05cef02b79d01f +PYTHON_PAHO_MQTT_SITE = https://files.pythonhosted.org/packages/25/63/db25e62979c2a716a74950c9ed658dce431b5cb01fde29eb6cba9489a904 PYTHON_PAHO_MQTT_LICENSE = EPL-1.0 or EDLv1.0 PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt edl-v10 epl-v10 PYTHON_PAHO_MQTT_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pam/python-pam.hash b/buildroot/package/python-pam/python-pam.hash index 14a89484a..303455ae2 100644 --- a/buildroot/package/python-pam/python-pam.hash +++ b/buildroot/package/python-pam/python-pam.hash @@ -1,2 +1,3 @@ # locally computed sha256 796ac019b9ee805696d0d277d8fb912fa2391b6ac070dc6f9f1a9a0fadbc3a5a PyPAM-0.5.0.tar.gz +sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING diff --git a/buildroot/package/python-paramiko/python-paramiko.hash b/buildroot/package/python-paramiko/python-paramiko.hash index cca2dd612..48cc79e7e 100644 --- a/buildroot/package/python-paramiko/python-paramiko.hash +++ b/buildroot/package/python-paramiko/python-paramiko.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/paramiko/json -md5 a476ea106177fe22e797428d54811aed paramiko-2.4.2.tar.gz -sha256 a8975a7df3560c9f1e2b43dc54ebd40fd00a7017392ca5445ce7df409f900fcb paramiko-2.4.2.tar.gz +md5 f729a45c9122bf975b9177ec5aaa3791 paramiko-2.6.0.tar.gz +sha256 f4b2edfa0d226b70bd4ca31ea7e389325990283da23465d572ed1f70a7583041 paramiko-2.6.0.tar.gz # Locally computed sha256 checksums sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE diff --git a/buildroot/package/python-paramiko/python-paramiko.mk b/buildroot/package/python-paramiko/python-paramiko.mk index 1f5818e3b..381cd2df2 100644 --- a/buildroot/package/python-paramiko/python-paramiko.mk +++ b/buildroot/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.4.2 +PYTHON_PARAMIKO_VERSION = 2.6.0 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/a4/57/86681372e7a8d642718cadeef38ead1c24c4a1af21ae852642bf974e37c7 +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/54/68/dde7919279d4ecdd1607a7eb425a2874ccd49a73a5a71f8aa4f0102d3eb8 PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-parso/Config.in b/buildroot/package/python-parso/Config.in new file mode 100644 index 000000000..ea1c5a473 --- /dev/null +++ b/buildroot/package/python-parso/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PARSO + bool "python-parso" + help + A Python Parser. + + https://github.com/davidhalter/parso diff --git a/buildroot/package/python-parso/python-parso.hash b/buildroot/package/python-parso/python-parso.hash new file mode 100644 index 000000000..e687c437c --- /dev/null +++ b/buildroot/package/python-parso/python-parso.hash @@ -0,0 +1,7 @@ +# md5, sha256 from https://pypi.org/pypi/parso/json +md5 cfdc0d7ce446ac3984cd7ef3e5850354 parso-0.5.1.tar.gz +sha256 666b0ee4a7a1220f65d367617f2cd3ffddff3e205f3f16a0284df30e774c2a9c parso-0.5.1.tar.gz +# Locally computed sha256 checksums +sha256 fa67973073753d17624caf8684d5ee816d70c89d912c5bca7ca0f08e7b150edb LICENSE.txt +sha256 9c1e620a5cf8e74fe81c1fd4c55e9cc0b189fc04e677cfc7ef915de746c3f59e docs/_themes/flask/LICENSE +sha256 368780dd953e09148834e8d8c6cc1b09b3d621e77dbd1c4f5e8873561acda873 test/normalizer_issue_files/LICENSE diff --git a/buildroot/package/python-parso/python-parso.mk b/buildroot/package/python-parso/python-parso.mk new file mode 100644 index 000000000..28f699d64 --- /dev/null +++ b/buildroot/package/python-parso/python-parso.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-parso +# +################################################################################ + +PYTHON_PARSO_VERSION = 0.5.1 +PYTHON_PARSO_SOURCE = parso-$(PYTHON_PARSO_VERSION).tar.gz +PYTHON_PARSO_SITE = https://files.pythonhosted.org/packages/21/40/615957db4d178b7504c87b1a5b85fa5945b0b4fa5f5a845e31fc7aad6018 +PYTHON_PARSO_SETUP_TYPE = setuptools +PYTHON_PARSO_LICENSE = MIT, Python-2.0, BSD-3-Clause (flask theme) +PYTHON_PARSO_LICENSE_FILES = LICENSE.txt docs/_themes/flask/LICENSE test/normalizer_issue_files/LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-pathlib2/Config.in b/buildroot/package/python-pathlib2/Config.in index 7297f0add..e28de4c12 100644 --- a/buildroot/package/python-pathlib2/Config.in +++ b/buildroot/package/python-pathlib2/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PATHLIB2 bool "python-pathlib2" depends on BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_SCANDIR # runtime help Object-oriented filesystem paths. diff --git a/buildroot/package/python-pathlib2/python-pathlib2.hash b/buildroot/package/python-pathlib2/python-pathlib2.hash index b17517b44..986049d9d 100644 --- a/buildroot/package/python-pathlib2/python-pathlib2.hash +++ b/buildroot/package/python-pathlib2/python-pathlib2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathlib2/json -md5 f9ede5c162ea6fc6a3b1d26db53bb6a2 pathlib2-2.3.3.tar.gz -sha256 25199318e8cc3c25dcb45cbe084cc061051336d5a9ea2a12448d3d8cb748f742 pathlib2-2.3.3.tar.gz +md5 f2bd0a363eb0f8fa0556f35c1d9e66fb pathlib2-2.3.5.tar.gz +sha256 6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868 pathlib2-2.3.5.tar.gz # Locally computed sha256 checksums sha256 f8e02f1a07e4c6fc59a4bee831ddde26b97064105c423b9e24340f35aaa80262 LICENSE.rst diff --git a/buildroot/package/python-pathlib2/python-pathlib2.mk b/buildroot/package/python-pathlib2/python-pathlib2.mk index 256d9b81e..d813b77d7 100644 --- a/buildroot/package/python-pathlib2/python-pathlib2.mk +++ b/buildroot/package/python-pathlib2/python-pathlib2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHLIB2_VERSION = 2.3.3 +PYTHON_PATHLIB2_VERSION = 2.3.5 PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz -PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/bf/d7/a2568f4596b75d2c6e2b4094a7e64f620decc7887f69a1f2811931ea15b9 +PYTHON_PATHLIB2_SITE = https://files.pythonhosted.org/packages/94/d8/65c86584e7e97ef824a1845c72bbe95d79f5b306364fa778a3c3e401b309 PYTHON_PATHLIB2_LICENSE = MIT PYTHON_PATHLIB2_LICENSE_FILES = LICENSE.rst PYTHON_PATHLIB2_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pathpy/Config.in b/buildroot/package/python-pathpy/Config.in index 98c05126b..7c7ffc9e9 100644 --- a/buildroot/package/python-pathpy/Config.in +++ b/buildroot/package/python-pathpy/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PATHPY bool "python-pathpy" + depends on BR2_PACKAGE_PYTHON3 help path.py implements a path objects as first-class entities, allowing common operations on files to diff --git a/buildroot/package/python-pathpy/python-pathpy.hash b/buildroot/package/python-pathpy/python-pathpy.hash index de22f6c57..4ff5abb38 100644 --- a/buildroot/package/python-pathpy/python-pathpy.hash +++ b/buildroot/package/python-pathpy/python-pathpy.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/path.py/json, sha256 locally computed -md5 afb4f92e4114b595f50573ecd61c31ee path.py-10.5.tar.gz -sha256 63a7af08676668fd51750f111affbd38c1a13c61aba15c6665b16681771c79a8 path.py-10.5.tar.gz +# md5, sha256 from https://pypi.org/pypi/path.py/json +md5 307098b1827af6031687edb49ce2c39c path.py-12.0.1.tar.gz +sha256 9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f path.py-12.0.1.tar.gz +# Locally computed sha256 checksums +sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/buildroot/package/python-pathpy/python-pathpy.mk b/buildroot/package/python-pathpy/python-pathpy.mk index 452331682..3b7388bdd 100644 --- a/buildroot/package/python-pathpy/python-pathpy.mk +++ b/buildroot/package/python-pathpy/python-pathpy.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_PATHPY_VERSION = 10.5 +PYTHON_PATHPY_VERSION = 12.0.1 PYTHON_PATHPY_SOURCE = path.py-$(PYTHON_PATHPY_VERSION).tar.gz -PYTHON_PATHPY_SITE = https://pypi.python.org/packages/a5/7b/7b303dc1b79fc394b67cea351455ec0db8e6ca5d8537687d40cb7c7d70bb +PYTHON_PATHPY_SITE = https://files.pythonhosted.org/packages/70/63/c01c1bb2df17db4c78f78cc439a2800f55bec5445cabf1f3579a37909f41 PYTHON_PATHPY_SETUP_TYPE = setuptools PYTHON_PATHPY_LICENSE = MIT +PYTHON_PATHPY_LICENSE_FILES = LICENSE PYTHON_PATHPY_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/buildroot/package/python-pathtools/python-pathtools.hash b/buildroot/package/python-pathtools/python-pathtools.hash index 1fa624df0..6d7b2975d 100644 --- a/buildroot/package/python-pathtools/python-pathtools.hash +++ b/buildroot/package/python-pathtools/python-pathtools.hash @@ -2,3 +2,5 @@ md5 9a1af5c605768ea5804b03b734ff0f82 pathtools-0.1.2.tar.gz # sha256 calculated by scanpypi sha256 7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0 pathtools-0.1.2.tar.gz +# Locally computed +sha256 b52d83fba08f61bd1e603fee1b44cbc7ead9fcb512a5ceb8c53fec90ba415ac4 LICENSE diff --git a/buildroot/package/python-pathvalidate/python-pathvalidate.hash b/buildroot/package/python-pathvalidate/python-pathvalidate.hash index 734d44958..db1190fc7 100644 --- a/buildroot/package/python-pathvalidate/python-pathvalidate.hash +++ b/buildroot/package/python-pathvalidate/python-pathvalidate.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pathvalidate/json, sha256 locally computed -md5 fa119fcdbc744dc3a9de11185437992c pathvalidate-0.16.0.tar.gz -sha256 81c665a16e41203dc7698caf4f7ee15b7da97e36368e30e76e76e968ce77f468 pathvalidate-0.16.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/pathvalidate/json +md5 b0a8242d124a9e760ca2d084a4f8fa75 pathvalidate-0.29.0.tar.gz +sha256 bf250828f40d94881df764950cffca14bb3fa83783d9f239125a6b5e23a5646e pathvalidate-0.29.0.tar.gz +# Locally computed sha256 checksums +sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/buildroot/package/python-pathvalidate/python-pathvalidate.mk b/buildroot/package/python-pathvalidate/python-pathvalidate.mk index c25f4ce3c..ee707e4e2 100644 --- a/buildroot/package/python-pathvalidate/python-pathvalidate.mk +++ b/buildroot/package/python-pathvalidate/python-pathvalidate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHVALIDATE_VERSION = 0.16.0 +PYTHON_PATHVALIDATE_VERSION = 0.29.0 PYTHON_PATHVALIDATE_SOURCE = pathvalidate-$(PYTHON_PATHVALIDATE_VERSION).tar.gz -PYTHON_PATHVALIDATE_SITE = https://pypi.python.org/packages/d8/c5/37474d872ca29510a10d93b103920fad551f577b696104a3574a89093e5f +PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/fc/3f/7a96e26d36b7e99abc9c236ff6db2de2d98e59fed45f9932eb0d17d48473 PYTHON_PATHVALIDATE_SETUP_TYPE = setuptools PYTHON_PATHVALIDATE_LICENSE = MIT PYTHON_PATHVALIDATE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-pbr/python-pbr.hash b/buildroot/package/python-pbr/python-pbr.hash new file mode 100644 index 000000000..cca9de017 --- /dev/null +++ b/buildroot/package/python-pbr/python-pbr.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/pbr/json +md5 477d2aa285ad97250a172b199f4060b7 pbr-5.4.3.tar.gz +sha256 2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8 pbr-5.4.3.tar.gz +# Locally computed sha256 checksums +sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 LICENSE +sha256 eb4a8c8791f6caab1cf36df26db2b6f4e2ddda52657b060ff7f02abc63910aef pbr/tests/testpackage/LICENSE.txt diff --git a/buildroot/package/python-pbr/python-pbr.mk b/buildroot/package/python-pbr/python-pbr.mk new file mode 100644 index 000000000..12b5b5681 --- /dev/null +++ b/buildroot/package/python-pbr/python-pbr.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pbr +# +################################################################################ + +PYTHON_PBR_VERSION = 5.4.3 +PYTHON_PBR_SOURCE = pbr-$(PYTHON_PBR_VERSION).tar.gz +PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/99/f1/7807d3409c79905a907f1c616d910c921b2a8e73c17b2969930318f44777 +PYTHON_PBR_SETUP_TYPE = setuptools +PYTHON_PBR_LICENSE = Apache-2.0 (module), BSD-3-Clause (test package) +PYTHON_PBR_LICENSE_FILES = LICENSE pbr/tests/testpackage/LICENSE.txt + +$(eval $(host-python-package)) diff --git a/buildroot/package/python-periphery/Config.in b/buildroot/package/python-periphery/Config.in new file mode 100644 index 000000000..99585b0f5 --- /dev/null +++ b/buildroot/package/python-periphery/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PERIPHERY + bool "python-periphery" + help + A pure Python 2/3 library for peripheral I/O (GPIO, LED, + PWM, SPI, I2C, MMIO, Serial) in Linux. + + https://github.com/vsergeev/python-periphery diff --git a/buildroot/package/python-periphery/python-periphery.hash b/buildroot/package/python-periphery/python-periphery.hash new file mode 100644 index 000000000..e9c3869eb --- /dev/null +++ b/buildroot/package/python-periphery/python-periphery.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 e6da8dcf8f639d1c3be3f19d27cbd472ef904db204c5453b250f87ab9bca2025 python-periphery-2.0.1.tar.gz +sha256 bf032b9319cfd918368219450a9917529f131925e698cbab1b63f42b629ff505 LICENSE diff --git a/buildroot/package/python-periphery/python-periphery.mk b/buildroot/package/python-periphery/python-periphery.mk new file mode 100644 index 000000000..97cb52e58 --- /dev/null +++ b/buildroot/package/python-periphery/python-periphery.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-periphery +# +################################################################################ + +PYTHON_PERIPHERY_VERSION = 2.0.1 +PYTHON_PERIPHERY_SITE = $(call github,vsergeev,python-periphery,v$(PYTHON_PERIPHERY_VERSION)) +PYTHON_PERIPHERY_LICENSE = MIT +PYTHON_PERIPHERY_LICENSE_FILES = LICENSE +PYTHON_PERIPHERY_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/buildroot/package/python-pexpect/python-pexpect.hash b/buildroot/package/python-pexpect/python-pexpect.hash index bdeedefaa..6972cdb80 100644 --- a/buildroot/package/python-pexpect/python-pexpect.hash +++ b/buildroot/package/python-pexpect/python-pexpect.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pexpect/json -md5 d4f3372965a996238d57d19b95d2e03a pexpect-4.6.0.tar.gz -sha256 2a8e88259839571d1251d278476f3eec5db26deb73a70be5ed5dc5435e418aba pexpect-4.6.0.tar.gz +md5 ed003242cbf308aee1b1eaecdef59e43 pexpect-4.7.0.tar.gz +sha256 9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb pexpect-4.7.0.tar.gz # Locally computed sha256 checksums sha256 4a483ae1c4dc738a6c8b73feb49074e1835da02ab5aa686f2675029906fa364d LICENSE diff --git a/buildroot/package/python-pexpect/python-pexpect.mk b/buildroot/package/python-pexpect/python-pexpect.mk index 5c385cefb..45e331f64 100644 --- a/buildroot/package/python-pexpect/python-pexpect.mk +++ b/buildroot/package/python-pexpect/python-pexpect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PEXPECT_VERSION = 4.6.0 +PYTHON_PEXPECT_VERSION = 4.7.0 PYTHON_PEXPECT_SOURCE = pexpect-$(PYTHON_PEXPECT_VERSION).tar.gz -PYTHON_PEXPECT_SITE = https://files.pythonhosted.org/packages/89/43/07d07654ee3e25235d8cea4164cdee0ec39d1fda8e9203156ebe403ffda4 +PYTHON_PEXPECT_SITE = https://files.pythonhosted.org/packages/1c/b1/362a0d4235496cb42c33d1d8732b5e2c607b0129ad5fdd76f5a583b9fcb3 PYTHON_PEXPECT_LICENSE = ISC PYTHON_PEXPECT_LICENSE_FILES = LICENSE PYTHON_PEXPECT_SETUP_TYPE = distutils diff --git a/buildroot/package/python-pickleshare/python-pickleshare.hash b/buildroot/package/python-pickleshare/python-pickleshare.hash index 6e3d408ea..1b6afcc68 100644 --- a/buildroot/package/python-pickleshare/python-pickleshare.hash +++ b/buildroot/package/python-pickleshare/python-pickleshare.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pickleshare/json, sha256 locally computed -md5 6a9e5dd8dfc023031f6b7b3f824cab12 pickleshare-0.7.4.tar.gz -sha256 84a9257227dfdd6fe1b4be1319096c20eb85ff1e82c7932f36efccfe1b09737b pickleshare-0.7.4.tar.gz +# md5, sha256 from https://pypi.org/pypi/pickleshare/json +md5 44ab782615894a812ab96669a122a634 pickleshare-0.7.5.tar.gz +sha256 87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca pickleshare-0.7.5.tar.gz +# Locally computed sha256 checksums +sha256 db1fefc1789444409514c0cae0bfab7f8e374ff9b78e092cecb1e0aeb6a36d90 LICENSE diff --git a/buildroot/package/python-pickleshare/python-pickleshare.mk b/buildroot/package/python-pickleshare/python-pickleshare.mk index 53fd84e45..1ed1257d0 100644 --- a/buildroot/package/python-pickleshare/python-pickleshare.mk +++ b/buildroot/package/python-pickleshare/python-pickleshare.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PICKLESHARE_VERSION = 0.7.4 +PYTHON_PICKLESHARE_VERSION = 0.7.5 PYTHON_PICKLESHARE_SOURCE = pickleshare-$(PYTHON_PICKLESHARE_VERSION).tar.gz -PYTHON_PICKLESHARE_SITE = https://pypi.python.org/packages/69/fe/dd137d84daa0fd13a709e448138e310d9ea93070620c9db5454e234af525 +PYTHON_PICKLESHARE_SITE = https://files.pythonhosted.org/packages/d8/b6/df3c1c9b616e9c0edbc4fbab6ddd09df9535849c64ba51fcb6531c32d4d8 PYTHON_PICKLESHARE_LICENSE = MIT PYTHON_PICKLESHARE_LICENSE_FILES = LICENSE PYTHON_PICKLESHARE_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pigpio/python-pigpio.hash b/buildroot/package/python-pigpio/python-pigpio.hash index 41ac25c35..3498b762e 100644 --- a/buildroot/package/python-pigpio/python-pigpio.hash +++ b/buildroot/package/python-pigpio/python-pigpio.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/pigpio/json -md5 f63ca89fdc733a5bad784155e6c1b9ff pigpio-1.42.tar.gz -sha256 274fc6df10a787e6a34b748a61a142f38dbf812b386f5b1762c66ad6a67b7873 pigpio-1.42.tar.gz +md5 a6817d953549c19522bae2d4f36251f4 pigpio-1.45.tar.gz +sha256 a6a8dbc19e827046bde02b4c34ab725d55093490ed7bc1e7c80277adfadc16ac pigpio-1.45.tar.gz diff --git a/buildroot/package/python-pigpio/python-pigpio.mk b/buildroot/package/python-pigpio/python-pigpio.mk index 7da1b6f4b..1e18d9784 100644 --- a/buildroot/package/python-pigpio/python-pigpio.mk +++ b/buildroot/package/python-pigpio/python-pigpio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIGPIO_VERSION = 1.42 +PYTHON_PIGPIO_VERSION = 1.45 PYTHON_PIGPIO_SOURCE = pigpio-$(PYTHON_PIGPIO_VERSION).tar.gz -PYTHON_PIGPIO_SITE = https://files.pythonhosted.org/packages/f6/c1/73d7b4287e2edc7e06ac34a4ec0c73d4758ba755a8d2ecc2aaf57bf7d54c +PYTHON_PIGPIO_SITE = https://files.pythonhosted.org/packages/33/48/db99b4ccc9f895827aa96d35404bae803b31555cdef0c1356ad3b6fca2d5 PYTHON_PIGPIO_SETUP_TYPE = setuptools PYTHON_PIGPIO_LICENSE = Unlicense diff --git a/buildroot/package/python-pillow/Config.in b/buildroot/package/python-pillow/Config.in index 3820ba8fb..f824d1371 100644 --- a/buildroot/package/python-pillow/Config.in +++ b/buildroot/package/python-pillow/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PILLOW bool "python-pillow" + depends on BR2_PACKAGE_PYTHON3 help Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the Python Imaging Library by Fredrik diff --git a/buildroot/package/python-pillow/python-pillow.hash b/buildroot/package/python-pillow/python-pillow.hash index 0f90a0be1..0d66c4bb3 100644 --- a/buildroot/package/python-pillow/python-pillow.hash +++ b/buildroot/package/python-pillow/python-pillow.hash @@ -1,4 +1,5 @@ -# sha256 for python-pillow from https://pypi.org/project/Pillow/5.2.0/#files -# sha256 for LICENSE locally computed -sha256 f8b3d413c5a8f84b12cd4c5df1d8e211777c9852c6be3ee9c094b626644d3eab Pillow-5.2.0.tar.gz -sha256 4960fc18becc286be839c8ff17bd70cd5222533f761129142153443718a25199 LICENSE +# md5, sha256 from https://pypi.org/project/Pillow/ +md5 d099946335c1ba372f5b1fa68ca71645 Pillow-7.0.0.tar.gz +sha256 4d9ed9a64095e031435af120d3c910148067087541131e82b3e8db302f4c8946 Pillow-7.0.0.tar.gz +# Locally computed sha256 checksums +sha256 04a04a908e52921829c7f51528e5619c79becdde99c484ab7d4f235e2927968c LICENSE diff --git a/buildroot/package/python-pillow/python-pillow.mk b/buildroot/package/python-pillow/python-pillow.mk index c3a3d1331..5ff2dcfdb 100644 --- a/buildroot/package/python-pillow/python-pillow.mk +++ b/buildroot/package/python-pillow/python-pillow.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 5.2.0 +PYTHON_PILLOW_VERSION = 7.0.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/39/47/f28067b187dd664d205f75b07dcc6e0e95703e134008a14814827eebcaab PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/d3/c4/b45b9c0d549f482dd072055e2d3ced88f3b977f7b87c7a990228b20e7da1 PYTHON_PILLOW_LICENSE = PIL Software License PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pip/Config.in b/buildroot/package/python-pip/Config.in index ac741da87..d1b7e7f74 100644 --- a/buildroot/package/python-pip/Config.in +++ b/buildroot/package/python-pip/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_PYTHON_PIP bool "python-pip" select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime help The PyPA recommended tool for installing Python packages. diff --git a/buildroot/package/python-pip/python-pip.hash b/buildroot/package/python-pip/python-pip.hash index 149099b11..7d02a5102 100644 --- a/buildroot/package/python-pip/python-pip.hash +++ b/buildroot/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 b6919f1a368138f73b367abccc06f5ae pip-19.0.1.tar.gz -sha256 e81ddd35e361b630e94abeda4a1eddd36d47a90e71eb00f38f46b57f787cd1a5 pip-19.0.1.tar.gz +md5 1aaaf90fbafc50e7ba1e66ffceb00960 pip-19.3.1.tar.gz +sha256 21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7 pip-19.3.1.tar.gz # Locally computed sha256 checksums -sha256 5ba21fbb0964f936ad7d15362d1ed6d4931cc8c8f9ff2d4d91190e109be74431 LICENSE.txt +sha256 5ba21fbb0964f936ad7d15362d1ed6d4931cc8c8f9ff2d4d91190e109be74431 LICENSE.txt diff --git a/buildroot/package/python-pip/python-pip.mk b/buildroot/package/python-pip/python-pip.mk index 22562cc93..b8be234d2 100644 --- a/buildroot/package/python-pip/python-pip.mk +++ b/buildroot/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 19.0.1 +PYTHON_PIP_VERSION = 19.3.1 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/c8/89/ad7f27938e59db1f0f55ce214087460f65048626e2226531ba6cb6da15f0 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/ce/ea/9b445176a65ae4ba22dce1d93e4b5fe182f953df71a145f557cffaffc1bf PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-portend/Config.in b/buildroot/package/python-portend/Config.in index 6b21078ca..30a50c7f6 100644 --- a/buildroot/package/python-portend/Config.in +++ b/buildroot/package/python-portend/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PORTEND bool "python-portend" + depends on BR2_PACKAGE_PYTHON3 # python-tempora select BR2_PACKAGE_PYTHON_TEMPORA # runtime help TCP port monitoring utilities. diff --git a/buildroot/package/python-portend/python-portend.hash b/buildroot/package/python-portend/python-portend.hash index ce4d5f6f6..14338df05 100644 --- a/buildroot/package/python-portend/python-portend.hash +++ b/buildroot/package/python-portend/python-portend.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/portend/json, sha256 locally computed -md5 a45e001d40227c4529b1a7186f4442f5 portend-1.8.tar.gz -sha256 7de919b82c4ac60d4768fe80a2557290661aa665b7c427de6249d8cb2fde5561 portend-1.8.tar.gz +# md5, sha256 from https://pypi.org/pypi/portend/json +md5 0ab51a12b7462a5275946a3645a71e92 portend-2.5.tar.gz +sha256 19dc27bfb3c72471bd30a235a4d5fbefef8a7e31cab367744b5d87a205e7bfd9 portend-2.5.tar.gz +# Locally computed sha256 checksums +sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/buildroot/package/python-portend/python-portend.mk b/buildroot/package/python-portend/python-portend.mk index b0e89b130..8d619052c 100644 --- a/buildroot/package/python-portend/python-portend.mk +++ b/buildroot/package/python-portend/python-portend.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_PORTEND_VERSION = 1.8 +PYTHON_PORTEND_VERSION = 2.5 PYTHON_PORTEND_SOURCE = portend-$(PYTHON_PORTEND_VERSION).tar.gz -PYTHON_PORTEND_SITE = https://pypi.python.org/packages/3f/37/f3ab6c4a00632d53d7dfb74ba4a695e86605b92b0a94bd41fa443b60ccb6 +PYTHON_PORTEND_SITE = https://files.pythonhosted.org/packages/2c/59/948666fc2455ae471efd40cb2a9a990f5f6f2354a9a6b228e29b9fb4a307 PYTHON_PORTEND_LICENSE = MIT +PYTHON_PORTEND_LICENSE_FILES = LICENSE PYTHON_PORTEND_SETUP_TYPE = setuptools PYTHON_PORTEND_DEPENDENCIES = host-python-setuptools-scm diff --git a/buildroot/package/python-priority/python-priority.hash b/buildroot/package/python-priority/python-priority.hash index e115d6a4e..c94737570 100644 --- a/buildroot/package/python-priority/python-priority.hash +++ b/buildroot/package/python-priority/python-priority.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/priority/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/priority/json md5 4f1ff52f7fa448e9d9cb46337ae86d1e priority-1.3.0.tar.gz +# Locally computed sha256 6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe priority-1.3.0.tar.gz +sha256 f3e9c29e3db36dc305a4be68a8a225f93949852ce2d19b5b0a3c099eee6509c5 LICENSE diff --git a/buildroot/package/python-prompt-toolkit/Config.in b/buildroot/package/python-prompt-toolkit/Config.in index ccc9ebb0f..1066e166d 100644 --- a/buildroot/package/python-prompt-toolkit/Config.in +++ b/buildroot/package/python-prompt-toolkit/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT bool "python-prompt-toolkit" select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_WCWIDTH # runtime + select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime help Library for building powerful interactive command lines in Python. diff --git a/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.hash b/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.hash index f60fc0867..2d0c7ec95 100644 --- a/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.hash +++ b/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/prompt_toolkit/json, sha256 locally computed -md5 427b496d2c147bd3819bc3a7f6e0d493 prompt_toolkit-1.0.13.tar.gz -sha256 33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776 prompt_toolkit-1.0.13.tar.gz +# md5, sha256 from https://pypi.org/pypi/prompt-toolkit/json +md5 5016c523e603cd7119644fbc0f00ce53 prompt_toolkit-2.0.10.tar.gz +sha256 f15af68f66e664eaa559d4ac8a928111eebd5feda0c11738b5998045224829db prompt_toolkit-2.0.10.tar.gz +# Locally computed sha256 checksums +sha256 303574d9bdd85c757d6025017942bf17baeedf2778f62bd7f425d07d880f4c4a LICENSE diff --git a/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.mk b/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.mk index 19b7b34e0..183c7d258 100644 --- a/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.mk +++ b/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PROMPT_TOOLKIT_VERSION = 1.0.13 +PYTHON_PROMPT_TOOLKIT_VERSION = 2.0.10 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://pypi.python.org/packages/23/be/4876b52d5cc159cbd4b0ff6e7aa419a26470849a43a8f647857a4a24467b +PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/0c/37/7ad3bf3c6dbe96facf9927ddf066fdafa0f86766237cff32c3c7355d3b7c PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-protobuf/Config.in b/buildroot/package/python-protobuf/Config.in index 8a70e80ad..c53ef7f82 100644 --- a/buildroot/package/python-protobuf/Config.in +++ b/buildroot/package/python-protobuf/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PROTOBUF bool "python-protobuf" # host-protobuf only builds on certain architectures depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_HOST_GCC_AT_LEAST_4_8 # host-protobuf select BR2_PACKAGE_PYTHON_SIX # runtime help Python implementation of the Google Protocol Buffers. diff --git a/buildroot/package/python-protobuf/python-protobuf.hash b/buildroot/package/python-protobuf/python-protobuf.hash index 652751c7b..e299b8c76 100644 --- a/buildroot/package/python-protobuf/python-protobuf.hash +++ b/buildroot/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6b399412cd68c7efe64d31824ad0db44f803aed91d0c6a9ea94272682c3da2df protobuf-python-3.6.0.tar.gz -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE +sha256 a5ef6dccfe29f46168af8ab5194147f24701727a84661611fe80532ba83d3edd protobuf-python-3.11.0.tar.gz +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE diff --git a/buildroot/package/python-psutil/python-psutil.hash b/buildroot/package/python-psutil/python-psutil.hash index 12d53f95c..7f3d629d6 100644 --- a/buildroot/package/python-psutil/python-psutil.hash +++ b/buildroot/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json -md5 0502dad59fcbe047baebe07165b1376a psutil-5.5.0.tar.gz -sha256 1aba93430050270750d046a179c5f3d6e1f5f8b96c20399ba38c596b28fc4d37 psutil-5.5.0.tar.gz +md5 b2c94e0368fc6e6f237a7252f8e85ca2 psutil-5.6.7.tar.gz +sha256 ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa psutil-5.6.7.tar.gz # Locally computed sha256 checksums -sha256 bb073826b0dfb43b631c38ad5d9844cda74cc631d2a5569ad8798be4274a3e17 LICENSE +sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE diff --git a/buildroot/package/python-psutil/python-psutil.mk b/buildroot/package/python-psutil/python-psutil.mk index 2a7084548..62a94f3c4 100644 --- a/buildroot/package/python-psutil/python-psutil.mk +++ b/buildroot/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.5.0 +PYTHON_PSUTIL_VERSION = 5.6.7 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/6e/a0/833bcbcede5141cc5615e50c7cc5b960ce93d9c9b885fbe3b7d36e48a2d4 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/73/93/4f8213fbe66fc20cb904f35e6e04e20b47b85bee39845cc66a0bcf5ccdcb PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-psycopg2/0001-setup.py-avoid-installing-tests-to-site-packages.patch b/buildroot/package/python-psycopg2/0001-setup.py-avoid-installing-tests-to-site-packages.patch deleted file mode 100644 index f2dc3adca..000000000 --- a/buildroot/package/python-psycopg2/0001-setup.py-avoid-installing-tests-to-site-packages.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 46c50849584d254b81ad058e1a53adcef1eb4c53 Mon Sep 17 00:00:00 2001 -From: Asaf Kahlon -Date: Fri, 12 Oct 2018 07:57:23 +0300 -Subject: [PATCH 1/1] setup.py: avoid installing tests to site-packages - -This patch update only setup.py from upstream patch -(389f6c08d9536060184bfd5c8ea2491a4a91c2fb). - -Signed-off-by: Asaf Kahlon ---- - setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index b521290..3f309fc 100644 ---- a/setup.py -+++ b/setup.py -@@ -674,8 +674,8 @@ setup(name="psycopg2", - long_description="\n".join(readme.split("\n")[2:]).lstrip(), - classifiers=[x for x in classifiers.split("\n") if x], - data_files=data_files, -- package_dir={'psycopg2': 'lib', 'psycopg2.tests': 'tests'}, -- packages=['psycopg2', 'psycopg2.tests'], -+ package_dir={'psycopg2': 'lib'}, -+ packages=['psycopg2'], - cmdclass={ - 'build_ext': psycopg_build_ext, - 'build_py': build_py, }, --- -2.17.1 - diff --git a/buildroot/package/python-psycopg2/Config.in b/buildroot/package/python-psycopg2/Config.in index ec27d706d..5ffe17951 100644 --- a/buildroot/package/python-psycopg2/Config.in +++ b/buildroot/package/python-psycopg2/Config.in @@ -21,6 +21,5 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2 Psycopg 2 is both Unicode and Python 3 friendly. http://initd.org/psycopg/ - comment "python-psycopg2 needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR diff --git a/buildroot/package/python-psycopg2/python-psycopg2.hash b/buildroot/package/python-psycopg2/python-psycopg2.hash index c6e199769..5f98e359b 100644 --- a/buildroot/package/python-psycopg2/python-psycopg2.hash +++ b/buildroot/package/python-psycopg2/python-psycopg2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psycopg2/json -md5 598e2f43c1b26361ae2d3a3254dae414 psycopg2-2.7.7.tar.gz -sha256 f4526d078aedd5187d0508aa5f9a01eae6a48a470ed678406da94b4cd6524b7e psycopg2-2.7.7.tar.gz +md5 dbb5a67dd57cfa905de37ab9678a92f6 psycopg2-2.8.4.tar.gz +sha256 f898e5cc0a662a9e12bde6f931263a1bbd350cfb18e1d5336a12927851825bb6 psycopg2-2.8.4.tar.gz # Locally computed sha256 checksums -sha256 3c2b037df24cb85ca1a48739dcab60a5037644b436f87173f6db0d101636b525 LICENSE +sha256 9614b85dfc9a72c5b2ca33144c1d7e1ed3b1c297459d9fb28a6a5762c2e8d71b LICENSE diff --git a/buildroot/package/python-psycopg2/python-psycopg2.mk b/buildroot/package/python-psycopg2/python-psycopg2.mk index e297d6e2b..a32099e3b 100644 --- a/buildroot/package/python-psycopg2/python-psycopg2.mk +++ b/buildroot/package/python-psycopg2/python-psycopg2.mk @@ -4,14 +4,13 @@ # ################################################################################ -PYTHON_PSYCOPG2_VERSION = 2.7.7 +PYTHON_PSYCOPG2_VERSION = 2.8.4 PYTHON_PSYCOPG2_SOURCE = psycopg2-$(PYTHON_PSYCOPG2_VERSION).tar.gz -PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/63/54/c039eb0f46f9a9406b59a638415c2012ad7be9b4b97bfddb1f48c280df3a +PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/84/d7/6a93c99b5ba4d4d22daa3928b983cec66df4536ca50b22ce5dcac65e4e71 PYTHON_PSYCOPG2_SETUP_TYPE = setuptools PYTHON_PSYCOPG2_LICENSE = LGPL-3.0+ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE PYTHON_PSYCOPG2_DEPENDENCIES = postgresql - # Force psycopg2 to use the Buildroot provided postgresql version # instead of the one from the host machine PYTHON_PSYCOPG2_BUILD_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config diff --git a/buildroot/package/python-ptyprocess/python-ptyprocess.hash b/buildroot/package/python-ptyprocess/python-ptyprocess.hash index 0e2e0aeda..3af431a75 100644 --- a/buildroot/package/python-ptyprocess/python-ptyprocess.hash +++ b/buildroot/package/python-ptyprocess/python-ptyprocess.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org, sha256 locally computed -md5 94e537122914cc9ec9c1eadcd36e73a1 ptyprocess-0.5.1.tar.gz -sha256 0530ce63a9295bfae7bd06edc02b6aa935619f486f0f1dc0972f516265ee81a6 ptyprocess-0.5.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/ptyprocess/json +md5 37402d69f3b50913d4d483587bffad8f ptyprocess-0.6.0.tar.gz +sha256 923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0 ptyprocess-0.6.0.tar.gz +# Locally computed sha256 checksums +sha256 c822d385b1a73329846241799becf18690b5d44764c1bed69300b536a405030a LICENSE diff --git a/buildroot/package/python-ptyprocess/python-ptyprocess.mk b/buildroot/package/python-ptyprocess/python-ptyprocess.mk index 59329d01e..45102e9aa 100644 --- a/buildroot/package/python-ptyprocess/python-ptyprocess.mk +++ b/buildroot/package/python-ptyprocess/python-ptyprocess.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PTYPROCESS_VERSION = 0.5.1 -PYTHON_PTYPROCESS_SITE = https://pypi.python.org/packages/source/p/ptyprocess +PYTHON_PTYPROCESS_VERSION = 0.6.0 +PYTHON_PTYPROCESS_SITE = https://files.pythonhosted.org/packages/7d/2d/e4b8733cf79b7309d84c9081a4ab558c89d8c89da5961bf4ddb050ca1ce0 PYTHON_PTYPROCESS_SOURCE = ptyprocess-$(PYTHON_PTYPROCESS_VERSION).tar.gz PYTHON_PTYPROCESS_LICENSE = ISC PYTHON_PTYPROCESS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-pudb/python-pudb.hash b/buildroot/package/python-pudb/python-pudb.hash index febf38f82..b3c089b85 100644 --- a/buildroot/package/python-pudb/python-pudb.hash +++ b/buildroot/package/python-pudb/python-pudb.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pudb/json, sha256 locally computed -md5 97597d9fec79494a83ec8d55987a8a82 pudb-2017.1.2.tar.gz -sha256 29d82ed05030146e5f2f9431926cc24f6c6c284cb451a4a850625fc0303e46e7 pudb-2017.1.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/pudb/json +md5 4c024311d3f53bc189084821e7ef7d5e pudb-2019.1.tar.gz +sha256 ac30cfc64580958ab7265decb4cabb9141f08781ff072e9a336d5a7942ce35a6 pudb-2019.1.tar.gz +# Locally computed sha256 checksums +sha256 a95343fffff49cde3d9bf33cf6bb71cb3bf0ed83f47d98a7ba04b175d29c79ab LICENSE diff --git a/buildroot/package/python-pudb/python-pudb.mk b/buildroot/package/python-pudb/python-pudb.mk index b6b3d5386..6a462bf3e 100644 --- a/buildroot/package/python-pudb/python-pudb.mk +++ b/buildroot/package/python-pudb/python-pudb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PUDB_VERSION = 2017.1.2 +PYTHON_PUDB_VERSION = 2019.1 PYTHON_PUDB_SOURCE = pudb-$(PYTHON_PUDB_VERSION).tar.gz -PYTHON_PUDB_SITE = https://pypi.python.org/packages/d3/8a/e0fa18cf6f939a63364117546c9bd933add800642004ad40fd5f5bdba0c6 +PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/32/2a/96f72649e5dfc90cf69d8590c00884c6897d6cbc54f727fb40f47b4faae3 PYTHON_PUDB_SETUP_TYPE = setuptools PYTHON_PUDB_LICENSE = MIT PYTHON_PUDB_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-py/python-py.hash b/buildroot/package/python-py/python-py.hash index 67926527c..f8e644633 100644 --- a/buildroot/package/python-py/python-py.hash +++ b/buildroot/package/python-py/python-py.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/py/json -md5 e53ac12db4286737837ef3ccb4158301 py-1.7.0.tar.gz -sha256 bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694 py-1.7.0.tar.gz +md5 d9e30436ce7e79f30847f9b30b62e149 py-1.8.0.tar.gz +sha256 dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53 py-1.8.0.tar.gz # Locally computed sha256 checksums sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE diff --git a/buildroot/package/python-py/python-py.mk b/buildroot/package/python-py/python-py.mk index 87e19ac21..1592b5c6b 100644 --- a/buildroot/package/python-py/python-py.mk +++ b/buildroot/package/python-py/python-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PY_VERSION = 1.7.0 +PYTHON_PY_VERSION = 1.8.0 PYTHON_PY_SOURCE = py-$(PYTHON_PY_VERSION).tar.gz -PYTHON_PY_SITE = https://files.pythonhosted.org/packages/c7/fa/eb6dd513d9eb13436e110aaeef9a1703437a8efa466ce6bb2ff1d9217ac7 +PYTHON_PY_SITE = https://files.pythonhosted.org/packages/f1/5a/87ca5909f400a2de1561f1648883af74345fe96349f34f737cdfc94eba8c PYTHON_PY_DEPENDENCIES = host-python-setuptools-scm PYTHON_PY_SETUP_TYPE = setuptools PYTHON_PY_LICENSE = MIT diff --git a/buildroot/package/python-pyaes/Config.in b/buildroot/package/python-pyaes/Config.in new file mode 100644 index 000000000..629fd8280 --- /dev/null +++ b/buildroot/package/python-pyaes/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PYAES + bool "python-pyaes" + help + Pure-Python Implementation of the AES block-cipher and + common modes of operation. + + https://github.com/ricmoo/pyaes diff --git a/buildroot/package/python-pyaes/python-pyaes.hash b/buildroot/package/python-pyaes/python-pyaes.hash new file mode 100644 index 000000000..25a15f1e1 --- /dev/null +++ b/buildroot/package/python-pyaes/python-pyaes.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pyaes/json +md5 20fd5c6e29dcfdd08098e85a859a54ec pyaes-1.6.1.tar.gz +sha256 02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f pyaes-1.6.1.tar.gz +# Locally computed sha256 checksums +sha256 1efe6c78b28b4203d397ea9b68bdc9c658d21cd9afaf8ae8223def83f2a7ebbd LICENSE.txt diff --git a/buildroot/package/python-pyaes/python-pyaes.mk b/buildroot/package/python-pyaes/python-pyaes.mk new file mode 100644 index 000000000..a738d3c76 --- /dev/null +++ b/buildroot/package/python-pyaes/python-pyaes.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyaes +# +################################################################################ + +PYTHON_PYAES_VERSION = 1.6.1 +PYTHON_PYAES_SOURCE = pyaes-$(PYTHON_PYAES_VERSION).tar.gz +PYTHON_PYAES_SITE = https://files.pythonhosted.org/packages/44/66/2c17bae31c906613795711fc78045c285048168919ace2220daa372c7d72 +PYTHON_PYAES_SETUP_TYPE = distutils +PYTHON_PYAES_LICENSE = MIT +PYTHON_PYAES_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-pyasn-modules/python-pyasn-modules.hash b/buildroot/package/python-pyasn-modules/python-pyasn-modules.hash index 6d9a70793..e5880d24e 100644 --- a/buildroot/package/python-pyasn-modules/python-pyasn-modules.hash +++ b/buildroot/package/python-pyasn-modules/python-pyasn-modules.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=178129bc7fbf07215c25230c5f053f81, sha256 locally computed. +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=178129bc7fbf07215c25230c5f053f81 md5 178129bc7fbf07215c25230c5f053f81 pyasn1-modules-0.0.8.tar.gz +# Locally computed sha256 10561934f1829bcc455c7ecdcdacdb4be5ffd3696f26f468eb6eb41e107f3837 pyasn1-modules-0.0.8.tar.gz +sha256 8bea85439e7446ecb270079cce926d605a7d10f51fe8789b1aeced557dcbe1b6 LICENSE.txt diff --git a/buildroot/package/python-pyasn/python-pyasn.hash b/buildroot/package/python-pyasn/python-pyasn.hash index 59c90a832..c08b64dd2 100644 --- a/buildroot/package/python-pyasn/python-pyasn.hash +++ b/buildroot/package/python-pyasn/python-pyasn.hash @@ -1,3 +1,6 @@ # md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f00a02a631d4016818659d1cc38d229a, sha256 locally computed md5 f00a02a631d4016818659d1cc38d229a pyasn1-0.1.9.tar.gz sha256 853cacd96d1f701ddd67aa03ecc05f51890135b7262e922710112f12a2ed2a7f pyasn1-0.1.9.tar.gz + +# Locally calculated +sha256 8bea85439e7446ecb270079cce926d605a7d10f51fe8789b1aeced557dcbe1b6 LICENSE.txt diff --git a/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash index f8af9a4bb..96831dc5d 100644 --- a/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash +++ b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyasn1-modules/json -md5 0116a480c28e1ab00587ba3a6fd7c335 pyasn1-modules-0.2.4.tar.gz -sha256 a52090e8c5841ebbf08ae455146792d9ef3e8445b21055d3a3b7ed9c712b7c7c pyasn1-modules-0.2.4.tar.gz +md5 18c77d56abeef631d94f95ff2d652859 pyasn1-modules-0.2.7.tar.gz +sha256 0c35a52e00b672f832e5846826f1fb7507907f7d52fba6faa9e3c4cbe874fe4b pyasn1-modules-0.2.7.tar.gz # Locally computed sha256 checksums sha256 22c5cc6922ab5d69fba32d8c5ee4cdd14981508cb53afc0ebd85593847fd95a5 LICENSE.txt diff --git a/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk index a67d46956..afc3c363f 100644 --- a/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk +++ b/buildroot/package/python-pyasn1-modules/python-pyasn1-modules.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYASN1_MODULES_VERSION = 0.2.4 +PYTHON_PYASN1_MODULES_VERSION = 0.2.7 PYTHON_PYASN1_MODULES_SOURCE = pyasn1-modules-$(PYTHON_PYASN1_MODULES_VERSION).tar.gz -PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/bd/a5/ef7bf693e8a8f015386c9167483199f54f8a8ec01d1c737e05524f16e792 +PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/75/93/c51104ea6a74252957c341ccd110b65efecc18edfd386b666637d67d4d10 PYTHON_PYASN1_MODULES_SETUP_TYPE = setuptools PYTHON_PYASN1_MODULES_LICENSE = BSD-2-Clause PYTHON_PYASN1_MODULES_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-pyasn1/python-pyasn1.hash b/buildroot/package/python-pyasn1/python-pyasn1.hash index bd21cebd7..c6109345d 100644 --- a/buildroot/package/python-pyasn1/python-pyasn1.hash +++ b/buildroot/package/python-pyasn1/python-pyasn1.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyasn1/json -md5 f3c0cfbf882a20811be5ad5a41f74b82 pyasn1-0.4.5.tar.gz -sha256 da2420fe13a9452d8ae97a0e478adde1dee153b11ba832a95b223a2ba01c10f7 pyasn1-0.4.5.tar.gz +md5 50290e833395016c49903f4f9c7e47e5 pyasn1-0.4.7.tar.gz +sha256 a9495356ca1d66ed197a0f72b41eb1823cf7ea8b5bd07191673e8147aecf8604 pyasn1-0.4.7.tar.gz # Locally computed sha256 checksums sha256 22c5cc6922ab5d69fba32d8c5ee4cdd14981508cb53afc0ebd85593847fd95a5 LICENSE.rst diff --git a/buildroot/package/python-pyasn1/python-pyasn1.mk b/buildroot/package/python-pyasn1/python-pyasn1.mk index 3f79cc2e7..50a500c74 100644 --- a/buildroot/package/python-pyasn1/python-pyasn1.mk +++ b/buildroot/package/python-pyasn1/python-pyasn1.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYASN1_VERSION = 0.4.5 +PYTHON_PYASN1_VERSION = 0.4.7 PYTHON_PYASN1_SOURCE = pyasn1-$(PYTHON_PYASN1_VERSION).tar.gz -PYTHON_PYASN1_SITE = https://files.pythonhosted.org/packages/46/60/b7e32f6ff481b8a1f6c8f02b0fd9b693d1c92ddd2efb038ec050d99a7245 +PYTHON_PYASN1_SITE = https://files.pythonhosted.org/packages/ca/f8/2a60a2c88a97558bdd289b6dc9eb75b00bd90ff34155d681ba6dbbcb46b2 PYTHON_PYASN1_SETUP_TYPE = setuptools PYTHON_PYASN1_LICENSE = BSD-2-Clause PYTHON_PYASN1_LICENSE_FILES = LICENSE.rst diff --git a/buildroot/package/python-pycairo/Config.in b/buildroot/package/python-pycairo/Config.in new file mode 100644 index 000000000..0d8de977e --- /dev/null +++ b/buildroot/package/python-pycairo/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PYCAIRO + bool "python-pycairo" + select BR2_PACKAGE_CAIRO + help + Python interface for cairo. + + https://pycairo.readthedocs.io diff --git a/buildroot/package/python-pycairo/python-pycairo.hash b/buildroot/package/python-pycairo/python-pycairo.hash new file mode 100644 index 000000000..f0b76b1e3 --- /dev/null +++ b/buildroot/package/python-pycairo/python-pycairo.hash @@ -0,0 +1,7 @@ +# md5, sha256 from https://pypi.org/pypi/pycairo/json +md5 be2ba51f234270dec340f28f1695a95e pycairo-1.18.2.tar.gz +sha256 dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531 pycairo-1.18.2.tar.gz +# Locally computed sha256 checksums +sha256 22c7747e2decb1b26e395b45dbaeb627784ef7fdbf2b80ac09a26a560277e58a COPYING +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING-LGPL-2.1 +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING-MPL-1.1 diff --git a/buildroot/package/python-pycairo/python-pycairo.mk b/buildroot/package/python-pycairo/python-pycairo.mk new file mode 100644 index 000000000..5a48a2a29 --- /dev/null +++ b/buildroot/package/python-pycairo/python-pycairo.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-pycairo +# +################################################################################ + +PYTHON_PYCAIRO_VERSION = 1.18.2 +PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz +PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/3c/1a/c0478ecab31baae50fda9956547788afbd0ca563adc52c9b03cab30f17eb +PYTHON_PYCAIRO_SETUP_TYPE = setuptools +PYTHON_PYCAIRO_DEPENDENCIES = cairo +PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1 +PYTHON_PYCAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 + +$(eval $(python-package)) diff --git a/buildroot/package/python-pycares/Config.in b/buildroot/package/python-pycares/Config.in index 4144952d8..3452ae6b1 100644 --- a/buildroot/package/python-pycares/Config.in +++ b/buildroot/package/python-pycares/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_PYCARES bool "python-pycares" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_CFFI # runtime help Python interface for c-ares. diff --git a/buildroot/package/python-pycares/python-pycares.hash b/buildroot/package/python-pycares/python-pycares.hash index 2e80a974d..c8c46175d 100644 --- a/buildroot/package/python-pycares/python-pycares.hash +++ b/buildroot/package/python-pycares/python-pycares.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycares/json -md5 74893b2b380fbb45329a406ae4b1ae89 pycares-2.3.0.tar.gz -sha256 36f4c03df57c41a87eb3d642201684eb5a8bc194f4bafaa9f60ee6dc0aef8e40 pycares-2.3.0.tar.gz +md5 8ac802d79b318efa27d3a9949d0604d1 pycares-3.1.1.tar.gz +sha256 18dfd4fd300f570d6c4536c1d987b7b7673b2a9d14346592c5d6ed716df0d104 pycares-3.1.1.tar.gz # Locally computed sha256 checksums sha256 427bb3a5372024a26e2c290b24382512bcc7ca123431c4dd178dd613beea7eee LICENSE diff --git a/buildroot/package/python-pycares/python-pycares.mk b/buildroot/package/python-pycares/python-pycares.mk index 961c87eaf..dea34f82b 100644 --- a/buildroot/package/python-pycares/python-pycares.mk +++ b/buildroot/package/python-pycares/python-pycares.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_PYCARES_VERSION = 2.3.0 +PYTHON_PYCARES_VERSION = 3.1.1 PYTHON_PYCARES_SOURCE = pycares-$(PYTHON_PYCARES_VERSION).tar.gz -PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/89/5c/3a7e1a52d6abb52b9ca1a56d2df699936e89d8b98f75cfd60d03363e7c10 +PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/4e/09/f49ef1c4b6a5ad50fc08a8acd015f1938594dd7a6b4a6a96d049d9bbec7d PYTHON_PYCARES_SETUP_TYPE = setuptools PYTHON_PYCARES_LICENSE = MIT PYTHON_PYCARES_LICENSE_FILES = LICENSE +PYTHON_PYCARES_DEPENDENCIES = host-python-cffi $(eval $(python-package)) diff --git a/buildroot/package/python-pycli/python-pycli.hash b/buildroot/package/python-pycli/python-pycli.hash index 46a297e6d..f0890e83a 100644 --- a/buildroot/package/python-pycli/python-pycli.hash +++ b/buildroot/package/python-pycli/python-pycli.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pycli/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/pycli/json md5 89c487e7c8068ce05d63394d2ae7ebad pyCLI-2.0.3.tar.gz -sha256 bc53e6c5db031ae1c05d131641f153d22a201c5e82cc8c9324a945752efbb622 pyCLI-2.0.3.tar.gz +# Locally computed +sha256 bc53e6c5db031ae1c05d131641f153d22a201c5e82cc8c9324a945752efbb622 pyCLI-2.0.3.tar.gz +sha256 591490b2ef462a4ad2be1aae5dd47738cb17e191c82d3ba38c3ae906d288e6ba lib/cli/__init__.py diff --git a/buildroot/package/python-pycrypto/python-pycrypto.hash b/buildroot/package/python-pycrypto/python-pycrypto.hash index 46378945d..a16a44608 100644 --- a/buildroot/package/python-pycrypto/python-pycrypto.hash +++ b/buildroot/package/python-pycrypto/python-pycrypto.hash @@ -1,2 +1,7 @@ # Locally calculated after checking pgp signature -sha256 f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c pycrypto-2.6.1.tar.gz +sha256 f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c pycrypto-2.6.1.tar.gz +# Locally computed +sha256 15925a98d05c6d086c30943e4eacdbd361bcf76daa109b6e6dfc9d0c4ad9ed64 COPYRIGHT +sha256 10c41e1aaf84bd3546d1ff7ef89454817744fd2c18cdd80a137e802095448016 LEGAL/copy/LICENSE.libtom +sha256 253a271c681cd4b3f9503659fe754ee305efe68ebb6e8733b7f436d73845a32c LEGAL/copy/LICENSE.python-2.2 +sha256 96f9a25274a59843715a26986e4a2427c312a1d86b9207f26fcafcea47a417fe LEGAL/copy/LICENSE.original diff --git a/buildroot/package/python-pydal/python-pydal.hash b/buildroot/package/python-pydal/python-pydal.hash index 27f2e6c7a..ccc388d93 100644 --- a/buildroot/package/python-pydal/python-pydal.hash +++ b/buildroot/package/python-pydal/python-pydal.hash @@ -1,3 +1,3 @@ # sha256 from https://pypi.org/project/pyDAL/#files -sha256 763ed017f431fc3d9fa9243f6be2519ff49b8a260d15763c4733762d9c086904 python-pydal-v18.09.tar.gz +sha256 763ed017f431fc3d9fa9243f6be2519ff49b8a260d15763c4733762d9c086904 python-pydal-18.09.tar.gz sha256 ae7d7b6888bb72f26af2bcbee69ae6f8a49e12f66c99e78f2a8b806effc5219d LICENSE diff --git a/buildroot/package/python-pydal/python-pydal.mk b/buildroot/package/python-pydal/python-pydal.mk index 4ff58def6..8ef06bc03 100644 --- a/buildroot/package/python-pydal/python-pydal.mk +++ b/buildroot/package/python-pydal/python-pydal.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = v18.09 -PYTHON_PYDAL_SITE = $(call github,web2py,pydal,$(PYTHON_PYDAL_VERSION)) +PYTHON_PYDAL_VERSION = 18.09 +PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE PYTHON_PYDAL_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pydantic/Config.in b/buildroot/package/python-pydantic/Config.in new file mode 100644 index 000000000..07b506a20 --- /dev/null +++ b/buildroot/package/python-pydantic/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_PYDANTIC + bool "python-pydantic" + depends on BR2_PACKAGE_PYTHON3 + help + Data validation and settings management using python 3.6 + type hinting. + + https://github.com/samuelcolvin/pydantic diff --git a/buildroot/package/python-pydantic/python-pydantic.hash b/buildroot/package/python-pydantic/python-pydantic.hash new file mode 100644 index 000000000..7bb076fe2 --- /dev/null +++ b/buildroot/package/python-pydantic/python-pydantic.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pydantic/json +md5 ce0c1824d1797bc7d67953428c4fe965 pydantic-1.3.tar.gz +sha256 2eab7d548b0e530bf65bee7855ad8164c2f6a889975d5e9c4eefd1e7c98245dc pydantic-1.3.tar.gz +# Locally computed sha256 checksums +sha256 66badbfe56618ec52ddcbfda62450e43752d16fe1e7cae78d346c7ed10a35306 LICENSE diff --git a/buildroot/package/python-pydantic/python-pydantic.mk b/buildroot/package/python-pydantic/python-pydantic.mk new file mode 100644 index 000000000..0f9dd66a6 --- /dev/null +++ b/buildroot/package/python-pydantic/python-pydantic.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pydantic +# +################################################################################ + +PYTHON_PYDANTIC_VERSION = 1.3 +PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/3e/69/b22c0eb3157115e1e3d111f574a6a41552539f1e53b064121ef4e9ac1368 +PYTHON_PYDANTIC_SETUP_TYPE = setuptools +PYTHON_PYDANTIC_LICENSE = MIT +PYTHON_PYDANTIC_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-pyelftools/python-pyelftools.hash b/buildroot/package/python-pyelftools/python-pyelftools.hash index e345a5bbf..80900b711 100644 --- a/buildroot/package/python-pyelftools/python-pyelftools.hash +++ b/buildroot/package/python-pyelftools/python-pyelftools.hash @@ -1,4 +1,5 @@ -# From https://pypi.python.org/packages/ba/78/d4a186a2e38731286c99dc3e3ca8123b6f55cf2e28608e8daf2d84b65494/pyelftools-0.24.tar.gz#md5=c960d5fe0a9308d96ba38b4beec8ac8e -md5 c960d5fe0a9308d96ba38b4beec8ac8e pyelftools-0.24.tar.gz -# Locally calculated -sha256 e9dd97d685a5b96b88a988dabadb88e5a539b64cd7d7927fac9a7368dc4c459c pyelftools-0.24.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyelftools/json +md5 c5629b9a5d19c82107a946cce52eeec2 pyelftools-0.25.tar.gz +sha256 89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24 pyelftools-0.25.tar.gz +# Locally computed sha256 checksums +sha256 ae18bf4cb82f92af7547259177bc28bc48e4fc732518bcedfe690226288d3445 LICENSE diff --git a/buildroot/package/python-pyelftools/python-pyelftools.mk b/buildroot/package/python-pyelftools/python-pyelftools.mk index 5b5b488cf..21b9e409b 100644 --- a/buildroot/package/python-pyelftools/python-pyelftools.mk +++ b/buildroot/package/python-pyelftools/python-pyelftools.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_PYELFTOOLS_VERSION = 0.24 +PYTHON_PYELFTOOLS_VERSION = 0.25 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz -PYTHON_PYELFTOOLS_SITE = https://pypi.python.org/packages/ba/78/d4a186a2e38731286c99dc3e3ca8123b6f55cf2e28608e8daf2d84b65494 +PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/fa/9a/0674cb1725196568bdbca98304f2efb17368b57af1a4bb3fc772c026f474 PYTHON_PYELFTOOLS_LICENSE = Public domain PYTHON_PYELFTOOLS_LICENSE_FILES = LICENSE -PYTHON_PYELFTOOLS_SETUP_TYPE = distutils +PYTHON_PYELFTOOLS_SETUP_TYPE = setuptools $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/buildroot/package/python-pyftpdlib/python-pyftpdlib.hash b/buildroot/package/python-pyftpdlib/python-pyftpdlib.hash index 3ed16018d..7f8da9555 100644 --- a/buildroot/package/python-pyftpdlib/python-pyftpdlib.hash +++ b/buildroot/package/python-pyftpdlib/python-pyftpdlib.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pyftpdlib/json, sha256 locally computed -md5 f1c7e7f859b3310769149dea4ac26916 pyftpdlib-1.5.3.tar.gz -sha256 7b9ea701f91bee280c5a930a9c4ceaea91b6d4aaf82b8b8ede82fb84a32081a7 pyftpdlib-1.5.3.tar.gz -sha256 18a4ff1ddf890838e36504b307581e3eb42c890a7272ce28b18b3ce1205b7ea8 LICENSE +# md5, sha256 from https://pypi.org/pypi/pyftpdlib/json +md5 7f8089520d60171bee5dab2b721e8d00 pyftpdlib-1.5.5.tar.gz +sha256 1adf1c03d1508749e7c2f26dc9850ec0ef834318d725b7ae5ac91698f5c86752 pyftpdlib-1.5.5.tar.gz +# Locally computed sha256 checksums +sha256 18a4ff1ddf890838e36504b307581e3eb42c890a7272ce28b18b3ce1205b7ea8 LICENSE diff --git a/buildroot/package/python-pyftpdlib/python-pyftpdlib.mk b/buildroot/package/python-pyftpdlib/python-pyftpdlib.mk index a34b563cb..dbbb9e284 100644 --- a/buildroot/package/python-pyftpdlib/python-pyftpdlib.mk +++ b/buildroot/package/python-pyftpdlib/python-pyftpdlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYFTPDLIB_VERSION = 1.5.3 +PYTHON_PYFTPDLIB_VERSION = 1.5.5 PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz -PYTHON_PYFTPDLIB_SITE = https://pypi.python.org/packages/c5/fb/74f6425fbb7f2a87969e1aa01bb9684601de431a3488b95f64509bf985ef +PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/27/64/06a574350c79873e908fa9f48b617e7961de50fc468acc0a05d76771bce9 PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools PYTHON_PYFTPDLIB_LICENSE = MIT PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-pygame/python-pygame.hash b/buildroot/package/python-pygame/python-pygame.hash new file mode 100644 index 000000000..c0496515e --- /dev/null +++ b/buildroot/package/python-pygame/python-pygame.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 f95a7dd68ea294d415e36e068d2f533c5a01c67773452d14a535c5c7455681fe pygame-d61ea8eabd56.tar.gz +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 LGPL diff --git a/buildroot/package/python-pygments/python-pygments.hash b/buildroot/package/python-pygments/python-pygments.hash index 525aa0e2d..ad3604ee5 100644 --- a/buildroot/package/python-pygments/python-pygments.hash +++ b/buildroot/package/python-pygments/python-pygments.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pygments/json, sha256 locally computed -md5 13037baca42f16917cbd5ad2fab50844 Pygments-2.2.0.tar.gz -sha256 dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc Pygments-2.2.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/pygments/json +md5 5ecc3fbb2a783e917b369271fc0e6cd1 Pygments-2.4.2.tar.gz +sha256 881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297 Pygments-2.4.2.tar.gz +# Locally computed sha256 checksums +sha256 45b88d3449c37806594758bf3c484d9d98b12b1ecc163f65431fe07fea6025f0 LICENSE diff --git a/buildroot/package/python-pygments/python-pygments.mk b/buildroot/package/python-pygments/python-pygments.mk index 6e7eae69c..5d190c499 100644 --- a/buildroot/package/python-pygments/python-pygments.mk +++ b/buildroot/package/python-pygments/python-pygments.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.2.0 +PYTHON_PYGMENTS_VERSION = 2.4.2 PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a +PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/7e/ae/26808275fc76bf2832deb10d3a3ed3107bc4de01b85dcccbe525f2cd6d1e PYTHON_PYGMENTS_LICENSE = BSD-2-Clause PYTHON_PYGMENTS_LICENSE_FILES = LICENSE PYTHON_PYGMENTS_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pyicu/Config.in b/buildroot/package/python-pyicu/Config.in index 2d9624c11..efab0853e 100644 --- a/buildroot/package/python-pyicu/Config.in +++ b/buildroot/package/python-pyicu/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYICU bool "python-pyicu" - depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu depends on !BR2_BINFMT_FLAT # icu depends on BR2_INSTALL_LIBSTDCPP # icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu @@ -10,8 +9,7 @@ config BR2_PACKAGE_PYTHON_PYICU https://github.com/ovalhub/pyicu -comment "python-pyicu needs a toolchain w/ C++, gcc >= 4.8, host gcc >= 4.8" +comment "python-pyicu needs a toolchain w/ C++, gcc >= 4.8" depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ - !BR2_HOST_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/python-pyicu/python-pyicu.hash b/buildroot/package/python-pyicu/python-pyicu.hash index b0d75fd0b..a6ddeb24a 100644 --- a/buildroot/package/python-pyicu/python-pyicu.hash +++ b/buildroot/package/python-pyicu/python-pyicu.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/PyICU/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/PyICU/json md5 7656f5cc53a7c18b40e653d6eefdee14 PyICU-1.9.7.tar.gz -sha256 db27cd1cc150b879c5465872bec7fdaf340eca140aa922be03891d5b9f855b61 PyICU-1.9.7.tar.gz +# Locally computed +sha256 db27cd1cc150b879c5465872bec7fdaf340eca140aa922be03891d5b9f855b61 PyICU-1.9.7.tar.gz +sha256 74bbadee4ee3c3a1ac0ecfbd74bc7ce64046de1ceddf4717dc923809ca8ffce3 LICENSE diff --git a/buildroot/package/python-pyinotify/python-pyinotify.hash b/buildroot/package/python-pyinotify/python-pyinotify.hash index 2bcf0541d..72095ff6e 100644 --- a/buildroot/package/python-pyinotify/python-pyinotify.hash +++ b/buildroot/package/python-pyinotify/python-pyinotify.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 7943f198c5cef2bdc121d847937fbe565daaa7d4daaf1b8de8ef5689812f481c python-pyinotify-0.9.6.tar.gz +sha256 7943f198c5cef2bdc121d847937fbe565daaa7d4daaf1b8de8ef5689812f481c python-pyinotify-0.9.6.tar.gz +sha256 97c96d577f761e23c7778bda2b163dba7b94e4defdd7873b7155bed252820608 COPYING diff --git a/buildroot/package/python-pyjwt/Config.in b/buildroot/package/python-pyjwt/Config.in new file mode 100644 index 000000000..510875ce2 --- /dev/null +++ b/buildroot/package/python-pyjwt/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYJWT + bool "python-pyjwt" + help + JSON Web Token implementation in Python. + + http://github.com/jpadilla/pyjwt diff --git a/buildroot/package/python-pyjwt/python-pyjwt.hash b/buildroot/package/python-pyjwt/python-pyjwt.hash new file mode 100644 index 000000000..62ec3559a --- /dev/null +++ b/buildroot/package/python-pyjwt/python-pyjwt.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/PyJWT/json +md5 a4712f980c008696e13e09504120b2a0 PyJWT-1.7.1.tar.gz +sha256 8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96 PyJWT-1.7.1.tar.gz +# Locally computed sha256 checksums +sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE diff --git a/buildroot/package/python-pyjwt/python-pyjwt.mk b/buildroot/package/python-pyjwt/python-pyjwt.mk new file mode 100644 index 000000000..dfc66e565 --- /dev/null +++ b/buildroot/package/python-pyjwt/python-pyjwt.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyjwt +# +################################################################################ + +PYTHON_PYJWT_VERSION = 1.7.1 +PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz +PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/2f/38/ff37a24c0243c5f45f5798bd120c0f873eeed073994133c084e1cf13b95c +PYTHON_PYJWT_SETUP_TYPE = setuptools +PYTHON_PYJWT_LICENSE = MIT +PYTHON_PYJWT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-pylibftdi/python-pylibftdi.hash b/buildroot/package/python-pylibftdi/python-pylibftdi.hash index 54b33a112..62dac5cbb 100644 --- a/buildroot/package/python-pylibftdi/python-pylibftdi.hash +++ b/buildroot/package/python-pylibftdi/python-pylibftdi.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pylibftdi/json, sha256 locally computed -md5 eaee7fb3a67f33a35a164a9628daaafe pylibftdi-0.15.0.tar.gz -sha256 51ef08ebcc4ec3eaec2366e9648d3f8fa1b737ea507a7f3a374ac58abf148e77 pylibftdi-0.15.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/pylibftdi/json +md5 c48e442cef7b1e865b4d96ab92f509ad pylibftdi-0.18.1.tar.gz +sha256 bdd04076933959b20b3c8b4fb8be7882d3362675f259e7eeb23ebff03b81859d pylibftdi-0.18.1.tar.gz +# Locally computed sha256 checksums +sha256 0e40132339e1ef7d17d93837fbc273d1e87302e9295162bd19c9161e5700ddcc LICENSE.txt diff --git a/buildroot/package/python-pylibftdi/python-pylibftdi.mk b/buildroot/package/python-pylibftdi/python-pylibftdi.mk index 0a5887b2e..2f5614867 100644 --- a/buildroot/package/python-pylibftdi/python-pylibftdi.mk +++ b/buildroot/package/python-pylibftdi/python-pylibftdi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYLIBFTDI_VERSION = 0.15.0 +PYTHON_PYLIBFTDI_VERSION = 0.18.1 PYTHON_PYLIBFTDI_SOURCE = pylibftdi-$(PYTHON_PYLIBFTDI_VERSION).tar.gz -PYTHON_PYLIBFTDI_SITE = https://pypi.python.org/packages/e5/bb/d7a86dbd7685e3866ea75d21c6c726d01706fdc0aa5dc9051ce18ae65693 +PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/50/9b/1e1cdb9715bacfb83e5eaf5e69f4e2fbd92d61f43c5e185cc3935ec01b28 PYTHON_PYLIBFTDI_LICENSE = MIT PYTHON_PYLIBFTDI_LICENSE_FILES = LICENSE.txt PYTHON_PYLIBFTDI_DEPENDENCIES = libftdi diff --git a/buildroot/package/python-pylru/python-pylru.hash b/buildroot/package/python-pylru/python-pylru.hash index 806ea36a0..1962c6015 100644 --- a/buildroot/package/python-pylru/python-pylru.hash +++ b/buildroot/package/python-pylru/python-pylru.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pylru/json, sha256 locally computed -md5 41369d58a1c4391c5cc36f84262abcdc pylru-1.0.9.tar.gz -sha256 71376192671f0ad1690b2a7427d39a29b1df994c8469a9b46b03ed7e28c0172c pylru-1.0.9.tar.gz +# md5, sha256 from https://pypi.org/pypi/pylru/json +md5 8f0050f86d1fa68bb18673de37da543b pylru-1.2.0.tar.gz +sha256 492f934bb98dc6c8b2370c02c95c65516ddc08c8f64d27f70087eb038621d297 pylru-1.2.0.tar.gz +# Locally computed sha256 checksums +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.txt diff --git a/buildroot/package/python-pylru/python-pylru.mk b/buildroot/package/python-pylru/python-pylru.mk index 75b6de779..98c3945dd 100644 --- a/buildroot/package/python-pylru/python-pylru.mk +++ b/buildroot/package/python-pylru/python-pylru.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PYLRU_VERSION = 1.0.9 +PYTHON_PYLRU_VERSION = 1.2.0 PYTHON_PYLRU_SOURCE = pylru-$(PYTHON_PYLRU_VERSION).tar.gz -PYTHON_PYLRU_SITE = https://pypi.python.org/packages/c0/7d/0de1055632f3871dfeaabe5a3f0510317cd98b93e7b792b44e4c7de2b17b -PYTHON_PYLRU_SETUP_TYPE = distutils +PYTHON_PYLRU_SITE = https://files.pythonhosted.org/packages/9c/88/30972cd0518452563221c80bffc2a5832499d736648ef8fe492affae15c5 +PYTHON_PYLRU_SETUP_TYPE = setuptools PYTHON_PYLRU_LICENSE = GPL-2.0 PYTHON_PYLRU_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-pymodbus/Config.in b/buildroot/package/python-pymodbus/Config.in index 49043c10b..0ba6fb88f 100644 --- a/buildroot/package/python-pymodbus/Config.in +++ b/buildroot/package/python-pymodbus/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_PYMODBUS bool "python-pymodbus" select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_SERIAL # runtime help Pymodbus is a full Modbus protocol implementation. diff --git a/buildroot/package/python-pymodbus/python-pymodbus.hash b/buildroot/package/python-pymodbus/python-pymodbus.hash index c930795eb..8e60d94e6 100644 --- a/buildroot/package/python-pymodbus/python-pymodbus.hash +++ b/buildroot/package/python-pymodbus/python-pymodbus.hash @@ -1,3 +1,4 @@ # sha256 locally computed -sha256 e33bd0dfbd2cbd4dbc686ca87f809aebb7d72e940eb5846d5d38bb0f3371b26a python-pymodbus-v1.4.0.tar.gz +sha256 088c7ece2a11cad652939719695c457f26f9148cd7d2f4a79872167925180ad5 pymodbus-2.2.0.tar.gz +# Hash for license file sha256 796a47993313691ea404d8af7e4c0f9daf1d2760e3900938985b59c9008eee2f doc/LICENSE diff --git a/buildroot/package/python-pymodbus/python-pymodbus.mk b/buildroot/package/python-pymodbus/python-pymodbus.mk index 40470fe92..d96e21a55 100644 --- a/buildroot/package/python-pymodbus/python-pymodbus.mk +++ b/buildroot/package/python-pymodbus/python-pymodbus.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = v1.4.0 -PYTHON_PYMODBUS_SITE = $(call github,riptideio,pymodbus,$(PYTHON_PYMODBUS_VERSION)) +PYTHON_PYMODBUS_VERSION = 2.2.0 +PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz +PYTHON_PYMODBUS_SITE = $(call github,riptideio,pymodbus,v$(PYTHON_PYMODBUS_VERSION)) PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = doc/LICENSE diff --git a/buildroot/package/python-pymysql/python-pymysql.hash b/buildroot/package/python-pymysql/python-pymysql.hash index 429ed5aee..36323ca73 100644 --- a/buildroot/package/python-pymysql/python-pymysql.hash +++ b/buildroot/package/python-pymysql/python-pymysql.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pymysql/json, sha256 locally computed -md5 fc96ba7c76c01ff0613b0cca9c40df75 PyMySQL-0.7.10.tar.gz -sha256 9468bd7d54df68e49c39e91d7c223d13dedf9e4284173cb5d761673e6275024e PyMySQL-0.7.10.tar.gz +# md5, sha256 from https://pypi.org/pypi/pymysql/json +md5 e5d9183cc0a775ac29f9e0365cca6556 PyMySQL-0.9.3.tar.gz +sha256 d8c059dcd81dedb85a9f034d5e22dcb4442c0b201908bede99e306d65ea7c8e7 PyMySQL-0.9.3.tar.gz +# Locally computed sha256 checksums +sha256 314120dc65f0800f738a4b31400c76ee14decd1fbe77ce9c3540a421b86ea7b6 LICENSE diff --git a/buildroot/package/python-pymysql/python-pymysql.mk b/buildroot/package/python-pymysql/python-pymysql.mk index 863eb8be5..edb08ee05 100644 --- a/buildroot/package/python-pymysql/python-pymysql.mk +++ b/buildroot/package/python-pymysql/python-pymysql.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMYSQL_VERSION = 0.7.10 +PYTHON_PYMYSQL_VERSION = 0.9.3 PYTHON_PYMYSQL_SOURCE = PyMySQL-$(PYTHON_PYMYSQL_VERSION).tar.gz -PYTHON_PYMYSQL_SITE = https://pypi.python.org/packages/90/c2/d81638491baa572d6e79b78bde42c7449d2e45b578c919c0df1a76cb859b +PYTHON_PYMYSQL_SITE = https://files.pythonhosted.org/packages/da/15/23ba6592920e21cb40eb0fe0ea002d2b6177beb1ca8a4c1add5a8f32754d PYTHON_PYMYSQL_LICENSE = MIT PYTHON_PYMYSQL_LICENSE_FILES = LICENSE PYTHON_PYMYSQL_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pynacl/python-pynacl.hash b/buildroot/package/python-pynacl/python-pynacl.hash index 84d8674bf..9aa8a0eef 100644 --- a/buildroot/package/python-pynacl/python-pynacl.hash +++ b/buildroot/package/python-pynacl/python-pynacl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pynacl/json -md5 1db3e111775fbe6b66772ff30af7a956 PyNaCl-1.2.1.tar.gz -sha256 e0d38fa0a75f65f556fb912f2c6790d1fa29b7dd27a1d9cc5591b281321eaaa9 PyNaCl-1.2.1.tar.gz +md5 3f3b1272287bc2de8efd8a5fa18bf728 PyNaCl-1.3.0.tar.gz +sha256 0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c PyNaCl-1.3.0.tar.gz # Locally computed sha256 checksums sha256 d3174ad63e721d4c9dccb8ad4320848992d314369bc46319720b5802c9153fe9 LICENSE diff --git a/buildroot/package/python-pynacl/python-pynacl.mk b/buildroot/package/python-pynacl/python-pynacl.mk index 1203a6e11..679b3a779 100644 --- a/buildroot/package/python-pynacl/python-pynacl.mk +++ b/buildroot/package/python-pynacl/python-pynacl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYNACL_VERSION = 1.2.1 +PYTHON_PYNACL_VERSION = 1.3.0 PYTHON_PYNACL_SOURCE = PyNaCl-$(PYTHON_PYNACL_VERSION).tar.gz -PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/08/19/cf56e60efd122fa6d2228118a9b345455b13ffe16a14be81d025b03b261f +PYTHON_PYNACL_SITE = https://files.pythonhosted.org/packages/61/ab/2ac6dea8489fa713e2b4c6c5b549cc962dd4a842b5998d9e80cf8440b7cd PYTHON_PYNACL_LICENSE = Apache-2.0 PYTHON_PYNACL_LICENSE_FILES = LICENSE PYTHON_PYNACL_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pyopenssl/python-pyopenssl.hash b/buildroot/package/python-pyopenssl/python-pyopenssl.hash index 30071cf9f..b457aeacd 100644 --- a/buildroot/package/python-pyopenssl/python-pyopenssl.hash +++ b/buildroot/package/python-pyopenssl/python-pyopenssl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyopenssl/json -md5 b9876625dc1d5a5a662d748689191537 pyOpenSSL-19.0.0.tar.gz -sha256 aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200 pyOpenSSL-19.0.0.tar.gz +md5 d9804fedbd1eb0c7d9243397b1fbf972 pyOpenSSL-19.1.0.tar.gz +sha256 9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507 pyOpenSSL-19.1.0.tar.gz # Locally computed sha256 sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/python-pyopenssl/python-pyopenssl.mk b/buildroot/package/python-pyopenssl/python-pyopenssl.mk index d341ef124..bbbd836a1 100644 --- a/buildroot/package/python-pyopenssl/python-pyopenssl.mk +++ b/buildroot/package/python-pyopenssl/python-pyopenssl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYOPENSSL_VERSION = 19.0.0 +PYTHON_PYOPENSSL_VERSION = 19.1.0 PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/40/d0/8efd61531f338a89b4efa48fcf1972d870d2b67a7aea9dcf70783c8464dc +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/0d/1d/6cc4bd4e79f78be6640fab268555a11af48474fac9df187c3361a1d1d2f0 PYTHON_PYOPENSSL_LICENSE = Apache-2.0 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE PYTHON_PYOPENSSL_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pyparsing/python-pyparsing.hash b/buildroot/package/python-pyparsing/python-pyparsing.hash index 61385804b..d1161e4f8 100644 --- a/buildroot/package/python-pyparsing/python-pyparsing.hash +++ b/buildroot/package/python-pyparsing/python-pyparsing.hash @@ -1,3 +1,5 @@ # md5 from https://pypi.python.org/pypi/pyparsing/json, sha256 locally computed -md5 065908b92904e0d3634eb156f44cc80e pyparsing-2.1.10.tar.gz -sha256 811c3e7b0031021137fc83e051795025fcb98674d07eb8fe922ba4de53d39188 pyparsing-2.1.10.tar.gz +md5 46d02cbe0461fe0571d51649e6006ef5 pyparsing-2.4.2.tar.gz +sha256 6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80 pyparsing-2.4.2.tar.gz +# Locally computed sha256 checksums +sha256 10d5120a16805804ffda8b688c220bfb4e8f39741b57320604d455a309e01972 LICENSE diff --git a/buildroot/package/python-pyparsing/python-pyparsing.mk b/buildroot/package/python-pyparsing/python-pyparsing.mk index 4a4b1bb8e..f419e00d4 100644 --- a/buildroot/package/python-pyparsing/python-pyparsing.mk +++ b/buildroot/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 2.1.10 +PYTHON_PYPARSING_VERSION = 2.4.2 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://pypi.python.org/packages/38/bb/bf325351dd8ab6eb3c3b7c07c3978f38b2103e2ab48d59726916907cd6fb +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/7e/24/eaa8d7003aee23eda270099eeec754d7bf4399f75c6a011ef948304f66a2 PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pyparted/Config.in b/buildroot/package/python-pyparted/Config.in index 944796ff3..6e3bde203 100644 --- a/buildroot/package/python-pyparted/Config.in +++ b/buildroot/package/python-pyparted/Config.in @@ -1,11 +1,14 @@ config BR2_PACKAGE_PYTHON_PYPARTED bool "python-pyparted" + depends on BR2_ENABLE_LOCALE # parted depends on BR2_USE_WCHAR + depends on !BR2_TOOLCHAIN_USES_UCLIBC # parted select BR2_PACKAGE_PARTED help Python bindings for GNU parted (libparted). https://github.com/rhinstaller/pyparted -comment "pyparted needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR +comment "pyparted needs a glibc or musl toolchain w/ locale, wchar" + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR diff --git a/buildroot/package/python-pyparted/python-pyparted.hash b/buildroot/package/python-pyparted/python-pyparted.hash index 11995fb8f..61960f469 100644 --- a/buildroot/package/python-pyparted/python-pyparted.hash +++ b/buildroot/package/python-pyparted/python-pyparted.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 a9ec181bf3c7c0635862413fc86cb0950b5af957541535f530ea86a0f9d14e73 python-pyparted-v3.11.0.tar.gz +sha256 a9ec181bf3c7c0635862413fc86cb0950b5af957541535f530ea86a0f9d14e73 python-pyparted-3.11.0.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/python-pyparted/python-pyparted.mk b/buildroot/package/python-pyparted/python-pyparted.mk index 037883080..c4783459a 100644 --- a/buildroot/package/python-pyparted/python-pyparted.mk +++ b/buildroot/package/python-pyparted/python-pyparted.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PYPARTED_VERSION = v3.11.0 -PYTHON_PYPARTED_SITE = $(call github,rhinstaller,pyparted,$(PYTHON_PYPARTED_VERSION)) +PYTHON_PYPARTED_VERSION = 3.11.0 +PYTHON_PYPARTED_SITE = $(call github,rhinstaller,pyparted,v$(PYTHON_PYPARTED_VERSION)) PYTHON_PYPARTED_SETUP_TYPE = distutils PYTHON_PYPARTED_LICENSE = GPL-2.0+ PYTHON_PYPARTED_LICENSE_FILES = COPYING diff --git a/buildroot/package/python-pypcap/python-pypcap.hash b/buildroot/package/python-pypcap/python-pypcap.hash index 30ddfab41..40db6b4f3 100644 --- a/buildroot/package/python-pypcap/python-pypcap.hash +++ b/buildroot/package/python-pypcap/python-pypcap.hash @@ -1,2 +1,3 @@ # locally computed sha256 5716d97b39d40b79daf7b0c6a8c8c514f5f1de8f20561c8621ee62a90b93fb03 python-pypcap-6f46e7bf29a648256ddc732a7d0ec83d3ffca390.tar.gz +sha256 48306c284fdbdf836b880528c3bdd658deac47ed78ffeb24a4ca5a8c39a39304 LICENSE diff --git a/buildroot/package/python-pyqrcode/python-pyqrcode.hash b/buildroot/package/python-pyqrcode/python-pyqrcode.hash index 619ddb0cc..b54b4aad2 100644 --- a/buildroot/package/python-pyqrcode/python-pyqrcode.hash +++ b/buildroot/package/python-pyqrcode/python-pyqrcode.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pyqrcode/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/pyqrcode/json md5 371f29f4b03bd2830c6e0319258b1259 PyQRCode-1.2.1.tar.gz +# Locally computed sha256 fdbf7634733e56b72e27f9bce46e4550b75a3a2c420414035cae9d9d26b234d5 PyQRCode-1.2.1.tar.gz +sha256 bef0c3595451da5132dea99e288fb5dafcbc469e0643f993a4ba0a69980f5ec9 setup.py diff --git a/buildroot/package/python-pyqt5/Config.in b/buildroot/package/python-pyqt5/Config.in index 20ac98870..9fa7676f9 100644 --- a/buildroot/package/python-pyqt5/Config.in +++ b/buildroot/package/python-pyqt5/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_PYTHON_PYQT5 bool "python-pyqt5" depends on BR2_PACKAGE_QT5 select BR2_PACKAGE_PYTHON_SIP + select BR2_PACKAGE_QT5BASE_GUI help Python bindings for Qt 5 diff --git a/buildroot/package/python-pyqt5/python-pyqt5.mk b/buildroot/package/python-pyqt5/python-pyqt5.mk index b6d559cd5..260a93af9 100644 --- a/buildroot/package/python-pyqt5/python-pyqt5.mk +++ b/buildroot/package/python-pyqt5/python-pyqt5.mk @@ -12,9 +12,8 @@ PYTHON_PYQT5_LICENSE_FILES = LICENSE PYTHON_PYQT5_DEPENDENCIES = python-sip host-python-sip qt5base PYTHON_PYQT5_MODULES = \ - QtCore \ + QtCore QtGui \ $(if $(BR2_PACKAGE_QT5BASE_DBUS),QtDBus) \ - $(if $(BR2_PACKAGE_QT5BASE_GUI),QtGui) \ $(if $(BR2_PACKAGE_QT5BASE_NETWORK),QtNetwork) \ $(if $(BR2_PACKAGE_QT5BASE_OPENGL_LIB),QtOpenGL) \ $(if $(BR2_PACKAGE_QT5BASE_PRINTSUPPORT),QtPrintSupport) \ diff --git a/buildroot/package/python-pyratemp/python-pyratemp.hash b/buildroot/package/python-pyratemp/python-pyratemp.hash index f3f29a39a..91738321a 100644 --- a/buildroot/package/python-pyratemp/python-pyratemp.hash +++ b/buildroot/package/python-pyratemp/python-pyratemp.hash @@ -1,4 +1,5 @@ #md5 from https://pypi.python.org/pypi?:action=show_md5&digest=e4bbe5d4a98016efef882b2b2f47defb md5 e4bbe5d4a98016efef882b2b2f47defb pyratemp-0.3.2.tgz # Locally calculated: -sha256 c45ed656ada482a02fe780495f37a695e7671accb04f918f7e7f18abf877bc71 pyratemp-0.3.2.tgz +sha256 c45ed656ada482a02fe780495f37a695e7671accb04f918f7e7f18abf877bc71 pyratemp-0.3.2.tgz +sha256 3de57a97f9c8492808867ae2ac2b33b422a8a34d29d0ea981b9e85c0963462db LICENSE diff --git a/buildroot/package/python-pyrex/python-pyrex.hash b/buildroot/package/python-pyrex/python-pyrex.hash index 607d30360..e8963558f 100644 --- a/buildroot/package/python-pyrex/python-pyrex.hash +++ b/buildroot/package/python-pyrex/python-pyrex.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50 Pyrex-0.9.9.tar.gz +sha256 5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50 Pyrex-0.9.9.tar.gz +sha256 5c1aec55fc8c399ec23968ddb2117eec8f7a53f002c15472a8b0aa7426790700 LICENSE.txt diff --git a/buildroot/package/python-pyro/python-pyro.hash b/buildroot/package/python-pyro/python-pyro.hash index 4db42efea..c22b66ddc 100644 --- a/buildroot/package/python-pyro/python-pyro.hash +++ b/buildroot/package/python-pyro/python-pyro.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pyro/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/pyro/json md5 59d4d3f4a8786776c9d7f9051b8f1a69 Pyro-3.16.tar.gz +# Locally computed sha256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578 Pyro-3.16.tar.gz +sha256 7c14017a2f543384bfcde86043758b68d023b47bf09700a7df6dacbae9c82103 LICENSE diff --git a/buildroot/package/python-pyroute2/python-pyroute2.hash b/buildroot/package/python-pyroute2/python-pyroute2.hash index 9078004d5..35f397b14 100644 --- a/buildroot/package/python-pyroute2/python-pyroute2.hash +++ b/buildroot/package/python-pyroute2/python-pyroute2.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pyroute2/json -md5 62b24242940b5d73c6ec9c53169b8ef8 pyroute2-0.5.3.tar.gz -sha256 79f7b4286be773c46914df0201dabaf92717a9c06e341e0c420603b2dd31c6bf pyroute2-0.5.3.tar.gz +md5 371683b62314211b8bc9807ac8ef1144 pyroute2-0.5.7.tar.gz +sha256 963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98 pyroute2-0.5.7.tar.gz # Locally computed sha256 sha256 4739b32a2478e9c204bf010bad5d565d188e59ff905e3c8f71fe3398098b7093 LICENSE.Apache.v2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL.v2 diff --git a/buildroot/package/python-pyroute2/python-pyroute2.mk b/buildroot/package/python-pyroute2/python-pyroute2.mk index 7937bd236..44c42d103 100644 --- a/buildroot/package/python-pyroute2/python-pyroute2.mk +++ b/buildroot/package/python-pyroute2/python-pyroute2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYROUTE2_VERSION = 0.5.3 +PYTHON_PYROUTE2_VERSION = 0.5.7 PYTHON_PYROUTE2_SOURCE = pyroute2-$(PYTHON_PYROUTE2_VERSION).tar.gz -PYTHON_PYROUTE2_SITE = https://files.pythonhosted.org/packages/19/1c/fc2efd9dfa5c1f7f713dbfee621365ad01f7b7ec0a6908e444f08bfd5873 +PYTHON_PYROUTE2_SITE = https://files.pythonhosted.org/packages/6b/94/2a5f6c11369a21efd27a0b4cb92adf5012da7acdbce7e78055710986ca23 PYTHON_PYROUTE2_LICENSE = Apache-2.0 or GPL-2.0+ PYTHON_PYROUTE2_LICENSE_FILES = LICENSE.Apache.v2 LICENSE.GPL.v2 README.license.md PYTHON_PYROUTE2_SETUP_TYPE = distutils diff --git a/buildroot/package/python-pysendfile/python-pysendfile.hash b/buildroot/package/python-pysendfile/python-pysendfile.hash index 755be5036..d1aff6aed 100644 --- a/buildroot/package/python-pysendfile/python-pysendfile.hash +++ b/buildroot/package/python-pysendfile/python-pysendfile.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 f4ca8a7f0be67e3d710c0633dd9aadab6881203c31cb9eb9be4f10361ad3f937 python-pysendfile-2.0.1.tar.gz +sha256 259f433563cfe0296c84c00381c600e82e0ab1b617ce20fe6e7f555a2b95af26 LICENSE diff --git a/buildroot/package/python-pysmb/python-pysmb.hash b/buildroot/package/python-pysmb/python-pysmb.hash index 952466701..94ff33ea3 100644 --- a/buildroot/package/python-pysmb/python-pysmb.hash +++ b/buildroot/package/python-pysmb/python-pysmb.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pysmb/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/pysmb/json md5 e6f9ce0032db528aae060f7019bd409c pysmb-1.1.19.tar.gz -sha256 fa4e6b4a4f2afbfbd71e9179c491f8c77bc2ad19e0bc866d7c6cbfa9ae272602 pysmb-1.1.19.tar.gz +# Locally computed +sha256 fa4e6b4a4f2afbfbd71e9179c491f8c77bc2ad19e0bc866d7c6cbfa9ae272602 pysmb-1.1.19.tar.gz +sha256 2b1a0a56543c1bda07f5583dddaf544442c139d3f46747d4700c7031ef354c14 LICENSE diff --git a/buildroot/package/python-pysmi/python-pysmi.hash b/buildroot/package/python-pysmi/python-pysmi.hash index 3127d2057..b0c7a5d27 100644 --- a/buildroot/package/python-pysmi/python-pysmi.hash +++ b/buildroot/package/python-pysmi/python-pysmi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pysmi/json -md5 7ca6a849ea51929cfd44c4e5bc316b0e pysmi-0.3.3.tar.gz -sha256 4e35c2b935ba5a68e086d7781dae1b508c228a960279620d182e876448acf02f pysmi-0.3.3.tar.gz +md5 10a9dd140ad512eed9f37344df83ce9d pysmi-0.3.4.tar.gz +sha256 bd15a15020aee8376cab5be264c26330824a8b8164ed0195bd402dd59e4e8f7c pysmi-0.3.4.tar.gz # Locally computed sha256 checksums sha256 c43704eafcfa2bc33e56168f2b498c3c34a1d7865855626a52b5af411fc5837f LICENSE.rst diff --git a/buildroot/package/python-pysmi/python-pysmi.mk b/buildroot/package/python-pysmi/python-pysmi.mk index a686b6fba..2aee27b18 100644 --- a/buildroot/package/python-pysmi/python-pysmi.mk +++ b/buildroot/package/python-pysmi/python-pysmi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYSMI_VERSION = 0.3.3 +PYTHON_PYSMI_VERSION = 0.3.4 PYTHON_PYSMI_SOURCE = pysmi-$(PYTHON_PYSMI_VERSION).tar.gz -PYTHON_PYSMI_SITE = https://files.pythonhosted.org/packages/71/32/182dd4fa0c4e20c2a14154d3133cc08374694c2518a7c5445a918332b113 +PYTHON_PYSMI_SITE = https://files.pythonhosted.org/packages/52/42/ddaeb06ff551672b17b77f81bc2e26b7c6060b28fe1552226edc6476ce37 PYTHON_PYSMI_SETUP_TYPE = setuptools PYTHON_PYSMI_LICENSE = BSD-2-Clause PYTHON_PYSMI_LICENSE_FILES = LICENSE.rst diff --git a/buildroot/package/python-pysnmp-apps/Config.in b/buildroot/package/python-pysnmp-apps/Config.in deleted file mode 100644 index 32e326994..000000000 --- a/buildroot/package/python-pysnmp-apps/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYSNMP_APPS - bool "python-pysnmp-apps" - depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn - select BR2_PACKAGE_PYTHON_PYSNMP - help - A collection of command-line tools for SNMP management - purposes built on top of the PySNMP package. - - http://pysnmp.sf.net - -comment "python-pysnmp-apps needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/python-pysnmp-apps/python-pysnmp-apps.hash b/buildroot/package/python-pysnmp-apps/python-pysnmp-apps.hash deleted file mode 100644 index 2b865cbce..000000000 --- a/buildroot/package/python-pysnmp-apps/python-pysnmp-apps.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pysnmp-apps/json, sha256 locally computed -md5 7fc08e2d81a77d558b38be5e49ff833e pysnmp-apps-0.4.1.tar.gz -sha256 57accb8c2fcb255b4da85af07ef9cd6a266dc5143b2834419ec8a39a879edeb7 pysnmp-apps-0.4.1.tar.gz diff --git a/buildroot/package/python-pysnmp-apps/python-pysnmp-apps.mk b/buildroot/package/python-pysnmp-apps/python-pysnmp-apps.mk deleted file mode 100644 index ac43fda19..000000000 --- a/buildroot/package/python-pysnmp-apps/python-pysnmp-apps.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pysnmp-apps -# -################################################################################ - -PYTHON_PYSNMP_APPS_VERSION = 0.4.1 -PYTHON_PYSNMP_APPS_SOURCE = pysnmp-apps-$(PYTHON_PYSNMP_APPS_VERSION).tar.gz -PYTHON_PYSNMP_APPS_SITE = https://pypi.python.org/packages/source/p/pysnmp-apps -PYTHON_PYSNMP_APPS_SETUP_TYPE = setuptools -PYTHON_PYSNMP_APPS_LICENSE = BSD-2-Clause -PYTHON_PYSNMP_APPS_LICENSE_FILES = LICENSE.txt - -PYTHON_PYSNMP_APPS_DEPENDENCIES = python-pysnmp - -$(eval $(python-package)) diff --git a/buildroot/package/python-pysnmp-mibs/python-pysnmp-mibs.hash b/buildroot/package/python-pysnmp-mibs/python-pysnmp-mibs.hash index 8deb2e530..22d8dcb47 100644 --- a/buildroot/package/python-pysnmp-mibs/python-pysnmp-mibs.hash +++ b/buildroot/package/python-pysnmp-mibs/python-pysnmp-mibs.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pysnmp-mibs/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/pysnmp-mibs/json md5 01845c4595d87d3c3485c0449616cbda pysnmp-mibs-0.1.6.tar.gz +# Locally computed sha256 00fa321ca598e8a14c0ad98702bf10fb5e9d57b7d06bb99dc818fea07683720c pysnmp-mibs-0.1.6.tar.gz +sha256 361eda483f7fac1f8cca4e16c340fa07a1cad2bf1200577a01075745233b406c LICENSE.txt diff --git a/buildroot/package/python-pysnmp/python-pysnmp.hash b/buildroot/package/python-pysnmp/python-pysnmp.hash index bb5fc2483..582f9d666 100644 --- a/buildroot/package/python-pysnmp/python-pysnmp.hash +++ b/buildroot/package/python-pysnmp/python-pysnmp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pysnmp/json -md5 9eaed18907d9b15828f138471b187e8f pysnmp-4.4.6.tar.gz -sha256 e34ffa0dce5f69adabd478ff76c3e1b08e32ebb0767df8b178d0704f4a1ac406 pysnmp-4.4.6.tar.gz +md5 2222880259daf6e2cb322e938c818276 pysnmp-4.4.12.tar.gz +sha256 0c3dbef2f958caca96071fe5c19de43e9c1b0484ab02a0cf08b190bcee768ba9 pysnmp-4.4.12.tar.gz # Locally computed sha256 checksums -sha256 4781cdf5b05a40b8c36f2e71e248dac621762bc8e8482fa5fddab5053e2cdace LICENSE.rst +sha256 d0b2edd772164395320fc5ad7dfaa9806fa038fb29762b347c549891d7a79237 LICENSE.rst diff --git a/buildroot/package/python-pysnmp/python-pysnmp.mk b/buildroot/package/python-pysnmp/python-pysnmp.mk index 0a916119d..520ce2877 100644 --- a/buildroot/package/python-pysnmp/python-pysnmp.mk +++ b/buildroot/package/python-pysnmp/python-pysnmp.mk @@ -4,11 +4,10 @@ # ################################################################################ -PYTHON_PYSNMP_VERSION = 4.4.6 +PYTHON_PYSNMP_VERSION = 4.4.12 PYTHON_PYSNMP_SOURCE = pysnmp-$(PYTHON_PYSNMP_VERSION).tar.gz -PYTHON_PYSNMP_SITE = https://files.pythonhosted.org/packages/8b/66/96a49bf1d64ad1e005a8455644523b7e09663a405eb20a4599fb219e4c95 +PYTHON_PYSNMP_SITE = https://files.pythonhosted.org/packages/4e/75/72f64c451bf5884715f84f8217b69b4025da0b67628d611cd14a5b7db217 PYTHON_PYSNMP_SETUP_TYPE = setuptools - PYTHON_PYSNMP_LICENSE = BSD-3-Clause PYTHON_PYSNMP_LICENSE_FILES = LICENSE.rst diff --git a/buildroot/package/python-pysocks/python-pysocks.hash b/buildroot/package/python-pysocks/python-pysocks.hash index 802bd37f0..dc61bfbc5 100644 --- a/buildroot/package/python-pysocks/python-pysocks.hash +++ b/buildroot/package/python-pysocks/python-pysocks.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pysocks/json, sha256 locally computed -md5 07007ec7ed46292dab06013f2e3af365 PySocks-1.6.7.tar.gz -sha256 d00329f27efa157db7efe3ca26fcd69033cd61f83822461ee3f8a353b48e33cf PySocks-1.6.7.tar.gz +# md5, sha256 from https://pypi.org/pypi/pysocks/json +md5 89b1a6865c61bae67a32417517612ee6 PySocks-1.7.1.tar.gz +sha256 3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0 PySocks-1.7.1.tar.gz +# Locally computed sha256 checksums +sha256 7027e214e014eb78b7adcc1ceda5aca713a79fc4f6a0c52c9da5b3e707e6ffe9 LICENSE diff --git a/buildroot/package/python-pysocks/python-pysocks.mk b/buildroot/package/python-pysocks/python-pysocks.mk index 163da761b..ccb70fc5d 100644 --- a/buildroot/package/python-pysocks/python-pysocks.mk +++ b/buildroot/package/python-pysocks/python-pysocks.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYSOCKS_VERSION = 1.6.7 +PYTHON_PYSOCKS_VERSION = 1.7.1 PYTHON_PYSOCKS_SOURCE = PySocks-$(PYTHON_PYSOCKS_VERSION).tar.gz -PYTHON_PYSOCKS_SITE = https://pypi.python.org/packages/7d/38/edca891ce16827a1de45cc347e4b6c22311eba25838b9825a5e6c48cf560 +PYTHON_PYSOCKS_SITE = https://files.pythonhosted.org/packages/bd/11/293dd436aea955d45fc4e8a35b6ae7270f5b8e00b53cf6c024c83b657a11 PYTHON_PYSOCKS_LICENSE = BSD-3-Clause PYTHON_PYSOCKS_LICENSE_FILES = LICENSE PYTHON_PYSOCKS_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-pytablereader/Config.in b/buildroot/package/python-pytablereader/Config.in index 29951ab0a..6d61208bb 100644 --- a/buildroot/package/python-pytablereader/Config.in +++ b/buildroot/package/python-pytablereader/Config.in @@ -1,20 +1,15 @@ config BR2_PACKAGE_PYTHON_PYTABLEREADER bool "python-pytablereader" + depends on BR2_PACKAGE_PYTHON3 # python-pathpy select BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 # runtime select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime - select BR2_PACKAGE_PYTHON_LOGBOOK # runtime - select BR2_PACKAGE_PYTHON_MARKDOWN2 # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_PATHPY # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime - select BR2_PACKAGE_PYTHON_PYPARSING # runtime - select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime - select BR2_PACKAGE_PYTHON_XLRD # runtime help A python library to load structured table data from files/URL with various data formats: diff --git a/buildroot/package/python-pytablereader/python-pytablereader.hash b/buildroot/package/python-pytablereader/python-pytablereader.hash index ade5df3df..fb873caf7 100644 --- a/buildroot/package/python-pytablereader/python-pytablereader.hash +++ b/buildroot/package/python-pytablereader/python-pytablereader.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pytablereader/json, sha256 locally computed -md5 bad666f031a336466c0e9d5c0f4c5783 pytablereader-0.15.0.tar.gz -sha256 edd7d78ceb1692a1b29254f45574f85f03cd04311d2dfd2256a299c6634cc022 pytablereader-0.15.0.tar.gz -sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE +# md5, sha256 from https://pypi.org/pypi/pytablereader/json +md5 23ba6121e2f916dfbf4015516779dfcd pytablereader-0.26.1.tar.gz +sha256 f2e1477de8886267b765af7861baacc65606761bfabb0689f118cc5d27861f26 pytablereader-0.26.1.tar.gz +# Locally computed sha256 checksums +sha256 7fcef461a93fea587224132a865d1285969c9bec15baf59caeb7a8c7638a8744 LICENSE diff --git a/buildroot/package/python-pytablereader/python-pytablereader.mk b/buildroot/package/python-pytablereader/python-pytablereader.mk index ce1de4e4d..0f9e4c593 100644 --- a/buildroot/package/python-pytablereader/python-pytablereader.mk +++ b/buildroot/package/python-pytablereader/python-pytablereader.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTABLEREADER_VERSION = 0.15.0 +PYTHON_PYTABLEREADER_VERSION = 0.26.1 PYTHON_PYTABLEREADER_SOURCE = pytablereader-$(PYTHON_PYTABLEREADER_VERSION).tar.gz -PYTHON_PYTABLEREADER_SITE = https://pypi.python.org/packages/34/53/e2f51f2efe42c4045ad0822d4ffe739788a74cca35ba7d0bc59a53ec9424 +PYTHON_PYTABLEREADER_SITE = https://files.pythonhosted.org/packages/1e/bc/f60da8a733cd87215d8533f28536f8149eca3b898bbca346b37b6c915d8d PYTHON_PYTABLEREADER_SETUP_TYPE = setuptools PYTHON_PYTABLEREADER_LICENSE = MIT PYTHON_PYTABLEREADER_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-pytablewriter/Config.in b/buildroot/package/python-pytablewriter/Config.in index 10672dc46..9fed52c83 100644 --- a/buildroot/package/python-pytablewriter/Config.in +++ b/buildroot/package/python-pytablewriter/Config.in @@ -1,18 +1,14 @@ config BR2_PACKAGE_PYTHON_PYTABLEWRITER bool "python-pytablewriter" select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime - select BR2_PACKAGE_PYTHON_DOMINATE # runtime - select BR2_PACKAGE_PYTHON_LOGBOOK # runtime + select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime + select BR2_PACKAGE_PYTHON_MSGFY # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime - select BR2_PACKAGE_PYTHON_PYTABLEREADER # runtime - select BR2_PACKAGE_PYTHON_SIMPLESQLITE # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime - select BR2_PACKAGE_PYTHON_TOML # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime - select BR2_PACKAGE_PYTHON_XLSXWRITER # runtime - select BR2_PACKAGE_PYTHON_XLWT # runtime help pytablewriter is a python library to write a table in various formats: CSV, HTML, JavaScript, JSON, Markdown, Excel, Pandas, diff --git a/buildroot/package/python-pytablewriter/python-pytablewriter.hash b/buildroot/package/python-pytablewriter/python-pytablewriter.hash index 36e145392..8933fe37d 100644 --- a/buildroot/package/python-pytablewriter/python-pytablewriter.hash +++ b/buildroot/package/python-pytablewriter/python-pytablewriter.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pytablewriter/json, sha256 locally computed -md5 7d7eff9665b1d9e0c0189c34f8c562c3 pytablewriter-0.27.1.tar.gz -sha256 89e43bffc60ea93f0ed0cc8d8ddbf34ac0b74f8cf781c6c39f4c8bc3a7e4c436 pytablewriter-0.27.1.tar.gz -sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE +# md5, sha256 from https://pypi.org/pypi/pytablewriter/json +md5 4909dcdba8c6df35e14dbecbc6c94b6c pytablewriter-0.46.1.tar.gz +sha256 9d52ecc84bb89197c312e193b4ff04a3c934b914f3c32e4826d44a0acbc7764f pytablewriter-0.46.1.tar.gz +# Locally computed sha256 checksums +sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/buildroot/package/python-pytablewriter/python-pytablewriter.mk b/buildroot/package/python-pytablewriter/python-pytablewriter.mk index dd87213e2..a63f7f8a2 100644 --- a/buildroot/package/python-pytablewriter/python-pytablewriter.mk +++ b/buildroot/package/python-pytablewriter/python-pytablewriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTABLEWRITER_VERSION = 0.27.1 +PYTHON_PYTABLEWRITER_VERSION = 0.46.1 PYTHON_PYTABLEWRITER_SOURCE = pytablewriter-$(PYTHON_PYTABLEWRITER_VERSION).tar.gz -PYTHON_PYTABLEWRITER_SITE = https://pypi.python.org/packages/c2/88/6a9f6cbdabd773ba6de6c41d7a0af58eed37ca97b1d666b04819d0bf9b54 +PYTHON_PYTABLEWRITER_SITE = https://files.pythonhosted.org/packages/bb/86/d5f3dfec35d2d7583c9f3f1d731adf729851d1fe01011f07a747eb8c7df0 PYTHON_PYTABLEWRITER_SETUP_TYPE = setuptools PYTHON_PYTABLEWRITER_LICENSE = MIT PYTHON_PYTABLEWRITER_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-pytz/python-pytz.hash b/buildroot/package/python-pytz/python-pytz.hash index 525d45258..d1ce81e59 100644 --- a/buildroot/package/python-pytz/python-pytz.hash +++ b/buildroot/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 0f57d76c64d0965e7429c9b871f6b711 pytz-2018.9.tar.gz -sha256 d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c pytz-2018.9.tar.gz +md5 c3d84a465fc56a4edd52cca8873ac0df pytz-2019.3.tar.gz +sha256 b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be pytz-2019.3.tar.gz # Locally computed sha256 checksums sha256 39f07c72a1bfda349cbd27bac9bcb1e6f8c5b4e5cc3fadf56900406e8cc0b792 LICENSE.txt diff --git a/buildroot/package/python-pytz/python-pytz.mk b/buildroot/package/python-pytz/python-pytz.mk index a93a12c08..888f3c455 100644 --- a/buildroot/package/python-pytz/python-pytz.mk +++ b/buildroot/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2018.9 +PYTHON_PYTZ_VERSION = 2019.3 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/af/be/6c59e30e208a5f28da85751b93ec7b97e4612268bb054d0dff396e758a90 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/82/c3/534ddba230bd4fbbd3b7a3d35f3341d014cca213f369a9940925e7e5f691 PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-pyudev/python-pyudev.hash b/buildroot/package/python-pyudev/python-pyudev.hash index adda9a4d2..94c590731 100644 --- a/buildroot/package/python-pyudev/python-pyudev.hash +++ b/buildroot/package/python-pyudev/python-pyudev.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=07a60f5f7a6028e83725f759a1b9490a, sha256 locally computed +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=07a60f5f7a6028e83725f759a1b9490a md5 07a60f5f7a6028e83725f759a1b9490a pyudev-0.18.tar.gz +# Locally computed sha256 83b315f74e29c3a4aa6ea38b6cf73b0bb7e37066d7a5d70972ac418a80aed62a pyudev-0.18.tar.gz +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/python-pyusb/python-pyusb.hash b/buildroot/package/python-pyusb/python-pyusb.hash index 098d08f75..c5006c818 100644 --- a/buildroot/package/python-pyusb/python-pyusb.hash +++ b/buildroot/package/python-pyusb/python-pyusb.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pyusb/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/pyusb/json md5 c8a571bfdba778555156af3facaea6fc PyUSB-1.0.0.tar.gz +# Locally computed sha256 5b34ffa74ac34f330bff949c94ee00ec4a9d147234db17ee2eed2a67c0275368 PyUSB-1.0.0.tar.gz +sha256 de177fb928a0eed8d209fddbfa3861379e08b3b41f34ad17a329c2f78199371d LICENSE diff --git a/buildroot/package/python-pyyaml/python-pyyaml.hash b/buildroot/package/python-pyyaml/python-pyyaml.hash index 256742feb..90e1f2199 100644 --- a/buildroot/package/python-pyyaml/python-pyyaml.hash +++ b/buildroot/package/python-pyyaml/python-pyyaml.hash @@ -1,3 +1,5 @@ -# md5, sha256 from https://pypi.python.org/pypi/pyyaml/json -md5 a842bc7391e145bbe4e7fd0d32da1132 PyYAML-4.2b4.tar.gz -sha256 3c17fb92c8ba2f525e4b5f7941d850e7a48c3a59b32d331e2502a3cdc6648e76 PyYAML-4.2b4.tar.gz +# md5, sha256 from https://pypi.org/pypi/PyYAML/json +md5 d3590b85917362e837298e733321962b PyYAML-5.3.1.tar.gz +sha256 b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d PyYAML-5.3.1.tar.gz +# Locally computed sha256 checksums +sha256 c40112449f254b9753045925248313e9270efa36d226b22d82d4cc6c43c57f29 LICENSE diff --git a/buildroot/package/python-pyyaml/python-pyyaml.mk b/buildroot/package/python-pyyaml/python-pyyaml.mk index b73b4356a..78506390a 100644 --- a/buildroot/package/python-pyyaml/python-pyyaml.mk +++ b/buildroot/package/python-pyyaml/python-pyyaml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYYAML_VERSION = 4.2b4 +PYTHON_PYYAML_VERSION = 5.3.1 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz -PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a8/c6/a8d1555e795dbd0375c3c93b576ca13bbf139db51ea604afa19a2c35fc03 +PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c PYTHON_PYYAML_SETUP_TYPE = distutils PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch b/buildroot/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch index 461ef4e5f..315c8c8bb 100644 --- a/buildroot/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch +++ b/buildroot/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch @@ -15,7 +15,7 @@ dynamically, return the version of the buildroot environment. Written by Michael Rommel, modified for version 16.0.2 by Lionel Flandrin. -Modified for version 17.1.2 by Asaf Kahlon. +Modified for version 18.0.2 by Asaf Kahlon Signed-off-by: Lionel Flandrin Signed-off-by: Asaf Kahlon @@ -24,16 +24,16 @@ Signed-off-by: Asaf Kahlon 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/buildutils/detect.py b/buildutils/detect.py -index cb14a8d..b33a3b5 100644 +index d1380fe..4a91351 100644 --- a/buildutils/detect.py +++ b/buildutils/detect.py -@@ -116,13 +116,15 @@ def detect_zmq(basedir, compiler=None, **compiler_attrs): - +@@ -120,13 +120,15 @@ def detect_zmq(basedir, compiler=None, **compiler_attrs): + cc = get_compiler(compiler=compiler, **compiler_attrs) efile = test_compilation(cfile, compiler=cc, **compiler_attrs) - patch_lib_paths(efile, cc.library_dirs) + #patch_lib_paths(efile, cc.library_dirs) - + - rc, so, se = get_output_error([efile]) - if rc: - msg = "Error running version detection script:\n%s\n%s" % (so,se) @@ -50,5 +50,5 @@ index cb14a8d..b33a3b5 100644 handlers = {'vers': lambda val: tuple(int(v) for v in val.split('.'))} -- -2.17.1 +2.20.1 diff --git a/buildroot/package/python-pyzmq/python-pyzmq.hash b/buildroot/package/python-pyzmq/python-pyzmq.hash index eb8cf0923..96e0ab9ff 100644 --- a/buildroot/package/python-pyzmq/python-pyzmq.hash +++ b/buildroot/package/python-pyzmq/python-pyzmq.hash @@ -1,3 +1,6 @@ -# md5 from https://pypi.python.org/pypi/pyzmq/json, sha256 locally computed -md5 6f5d77cb5ec1617ce9b6e5ad7c6174fb pyzmq-17.1.2.tar.gz -sha256 a72b82ac1910f2cf61a49139f4974f994984475f771b0faa730839607eeedddf pyzmq-17.1.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyzmq/json +md5 d850bbab7c7f558b91c95b19028ff4b8 pyzmq-18.1.1.tar.gz +sha256 8c69a6cbfa94da29a34f6b16193e7c15f5d3220cb772d6d17425ff3faa063a6d pyzmq-18.1.1.tar.gz +# Locally calculated +sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD +sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER diff --git a/buildroot/package/python-pyzmq/python-pyzmq.mk b/buildroot/package/python-pyzmq/python-pyzmq.mk index b977cca92..0ba0c8d98 100644 --- a/buildroot/package/python-pyzmq/python-pyzmq.mk +++ b/buildroot/package/python-pyzmq/python-pyzmq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYZMQ_VERSION = 17.1.2 +PYTHON_PYZMQ_VERSION = 18.1.1 PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz -PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/b9/6a/bc9277b78f5c3236e36b8c16f4d2701a7fd4fa2eb697159d3e0a3a991573 +PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/3c/83/7ecbe9b762829f589fa9734026e0ccb63cb128fe5615ae1698f65df72bfe PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD diff --git a/buildroot/package/python-raven/python-raven.hash b/buildroot/package/python-raven/python-raven.hash index 1e451ba41..6f264193e 100644 --- a/buildroot/package/python-raven/python-raven.hash +++ b/buildroot/package/python-raven/python-raven.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/raven/json -md5 ba514edaca361a0edb476f76c959d8af raven-6.9.0.tar.gz -sha256 3fd787d19ebb49919268f06f19310e8112d619ef364f7989246fc8753d469888 raven-6.9.0.tar.gz +md5 3676f31dadfa61526444dd0245c78a38 raven-6.10.0.tar.gz +sha256 3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c8fae54 raven-6.10.0.tar.gz # Locally computed sha256 checksums sha256 5ce9459bc19ced99cc9eb135d4f559ed01e336354bdf16dd998be85aa688c233 LICENSE diff --git a/buildroot/package/python-raven/python-raven.mk b/buildroot/package/python-raven/python-raven.mk index b822fcda7..ff6c22c00 100644 --- a/buildroot/package/python-raven/python-raven.mk +++ b/buildroot/package/python-raven/python-raven.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RAVEN_VERSION = 6.9.0 +PYTHON_RAVEN_VERSION = 6.10.0 PYTHON_RAVEN_SOURCE = raven-$(PYTHON_RAVEN_VERSION).tar.gz -PYTHON_RAVEN_SITE = https://files.pythonhosted.org/packages/8f/80/e8d734244fd377fd7d65275b27252642512ccabe7850105922116340a37b +PYTHON_RAVEN_SITE = https://files.pythonhosted.org/packages/79/57/b74a86d74f96b224a477316d418389af9738ba7a63c829477e7a86dd6f47 PYTHON_RAVEN_SETUP_TYPE = setuptools PYTHON_RAVEN_LICENSE = BSD-3-Clause PYTHON_RAVEN_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-redis/Config.in b/buildroot/package/python-redis/Config.in new file mode 100644 index 000000000..4143e1f1c --- /dev/null +++ b/buildroot/package/python-redis/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_REDIS + bool "python-redis" + help + Python client for Redis key-value store. + + https://github.com/andymccurdy/redis-py diff --git a/buildroot/package/python-redis/python-redis.hash b/buildroot/package/python-redis/python-redis.hash new file mode 100644 index 000000000..02ec3bde5 --- /dev/null +++ b/buildroot/package/python-redis/python-redis.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/redis/json +md5 c2062a26ea12b69e0d39a23451c89998 redis-3.4.1.tar.gz +sha256 0dcfb335921b88a850d461dc255ff4708294943322bd55de6cfd68972490ca1f redis-3.4.1.tar.gz +# Locally computed sha256 checksums +sha256 790148d8c12f8a38b2707a74be2343316bad126995ff54801a181b8b231ba124 LICENSE diff --git a/buildroot/package/python-redis/python-redis.mk b/buildroot/package/python-redis/python-redis.mk new file mode 100644 index 000000000..a93ccfe02 --- /dev/null +++ b/buildroot/package/python-redis/python-redis.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-redis +# +################################################################################ + +PYTHON_REDIS_VERSION = 3.4.1 +PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/ef/2e/2c0f59891db7db087a7eeaa79bc7c7f2c039e71a2b5b0a41391e9d462926 +PYTHON_REDIS_SETUP_TYPE = setuptools +PYTHON_REDIS_LICENSE = MIT +PYTHON_REDIS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-reentry/Config.in b/buildroot/package/python-reentry/Config.in index 18518f2c3..8ebbe395c 100644 --- a/buildroot/package/python-reentry/Config.in +++ b/buildroot/package/python-reentry/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_PYTHON_REENTRY select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_PY # runtime + select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime help A plugin manager based on setuptools entry points mechanism. diff --git a/buildroot/package/python-reentry/python-reentry.hash b/buildroot/package/python-reentry/python-reentry.hash index 7a3bbf4d9..089d8594f 100644 --- a/buildroot/package/python-reentry/python-reentry.hash +++ b/buildroot/package/python-reentry/python-reentry.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/reentry/json -sha256 00df980d8c61713f5002d4d893ba6ea38e9a721cd04aef5a520b974e700ab550 reentry-1.2.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/reentry/json +md5 819931cd0a766a7c226879e57ccea9c7 reentry-1.3.1.tar.gz +sha256 2fe18c1a6946f3e2a51e1d5aa78228a11e879fbb0da14da5bf1e6252e83d26b1 reentry-1.3.1.tar.gz # Locally computed sha256 checksums sha256 4ae7f3216208a7e2327236e95bcd2397b2495f1c2298c708986c893bea608509 LICENSE diff --git a/buildroot/package/python-reentry/python-reentry.mk b/buildroot/package/python-reentry/python-reentry.mk index d3f0e03ef..428dbf2b1 100644 --- a/buildroot/package/python-reentry/python-reentry.mk +++ b/buildroot/package/python-reentry/python-reentry.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REENTRY_VERSION = 1.2.0 +PYTHON_REENTRY_VERSION = 1.3.1 PYTHON_REENTRY_SOURCE = reentry-$(PYTHON_REENTRY_VERSION).tar.gz -PYTHON_REENTRY_SITE = https://files.pythonhosted.org/packages/e2/b4/46dfac6613302fea51454a01aebedae9440aff9d813aedbbc5f687552e3b +PYTHON_REENTRY_SITE = https://files.pythonhosted.org/packages/ee/3f/a90789e01c4d2b67a57e9bd758e60ecb9338d428604f66130b57684ba8cc PYTHON_REENTRY_SETUP_TYPE = setuptools PYTHON_REENTRY_LICENSE = MIT PYTHON_REENTRY_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-remi/python-remi.hash b/buildroot/package/python-remi/python-remi.hash index 870e882b7..235538016 100644 --- a/buildroot/package/python-remi/python-remi.hash +++ b/buildroot/package/python-remi/python-remi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bb82f3f329aef387b3823e7e9b9d06b85a7deb0a4dc9078a4323812e26abb459 python-remi-v1.1.tar.gz +sha256 678c9caf1ecffc03c4a3d59931906520545d77e9a8027ff1a1ca90fc580f56e2 python-remi-2019.9.tar.gz sha256 bc198f9846c1da3a1c1b1fa2b12909b021365d1e7fe9b4039245edfcec3b7f7f LICENSE diff --git a/buildroot/package/python-remi/python-remi.mk b/buildroot/package/python-remi/python-remi.mk index b6c50a373..df0e1df5a 100644 --- a/buildroot/package/python-remi/python-remi.mk +++ b/buildroot/package/python-remi/python-remi.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_REMI_VERSION = v1.1 +PYTHON_REMI_VERSION = 2019.9 PYTHON_REMI_SITE = $(call github,dddomodossola,remi,$(PYTHON_REMI_VERSION)) PYTHON_REMI_LICENSE = Apache-2.0 PYTHON_REMI_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-request-id/python-request-id.hash b/buildroot/package/python-request-id/python-request-id.hash index f412502b9..ecf9d6508 100644 --- a/buildroot/package/python-request-id/python-request-id.hash +++ b/buildroot/package/python-request-id/python-request-id.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/request-id/json -md5 29cdbb13f26c0e944e58cfbebfc52085 request-id-0.3.1.tar.gz -sha256 4c8adff44ad6779305d5493f780400aff5ff5139e98d622379c0e0797b58d812 request-id-0.3.1.tar.gz +md5 81d6159edc745384181cb97f045c51b4 request-id-1.0.tar.gz +sha256 4928002c8e4c767f3f8319194c9f3080ff98f14cabf44c0674a81ee58ec20fc4 request-id-1.0.tar.gz # Locally computed sha256 checksums sha256 2d65d17b4df34f184557b8031df05e4c264d2fa6b82e560be074967eff3b326c LICENSE.txt diff --git a/buildroot/package/python-request-id/python-request-id.mk b/buildroot/package/python-request-id/python-request-id.mk index 96601b975..4812e53c7 100644 --- a/buildroot/package/python-request-id/python-request-id.mk +++ b/buildroot/package/python-request-id/python-request-id.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUEST_ID_VERSION = 0.3.1 +PYTHON_REQUEST_ID_VERSION = 1.0 PYTHON_REQUEST_ID_SOURCE = request-id-$(PYTHON_REQUEST_ID_VERSION).tar.gz -PYTHON_REQUEST_ID_SITE = https://files.pythonhosted.org/packages/2e/d4/bbe8cdd41012ba54d453452837101cecbb4151866b8aab6ca1ffb00d398c +PYTHON_REQUEST_ID_SITE = https://files.pythonhosted.org/packages/bc/b6/ade909d4af3dffe492789d36ea58a0ecbd637f8200bc480b282d455fe497 PYTHON_REQUEST_ID_SETUP_TYPE = setuptools PYTHON_REQUEST_ID_LICENSE = MIT PYTHON_REQUEST_ID_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash b/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash index 733d29338..784ad8e69 100644 --- a/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash +++ b/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests-oauthlib/json -md5 e867404084b688dbfb879b9ac9ac040a requests-oauthlib-1.0.0.tar.gz -sha256 8886bfec5ad7afb391ed5443b1f697c6f4ae98d0e5620839d8b4499c032ada3f requests-oauthlib-1.0.0.tar.gz +md5 c32a54ce04123480132960a290d50792 requests-oauthlib-1.2.0.tar.gz +sha256 bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57 requests-oauthlib-1.2.0.tar.gz # Locally computed sha256 checksums sha256 ae01846afad8a8291fe6a08966f3015af9a8ff675d84b981f9793c122f7876e8 LICENSE diff --git a/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk b/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk index a8761b18b..41dca1abd 100644 --- a/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk +++ b/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_OAUTHLIB_VERSION = 1.0.0 +PYTHON_REQUESTS_OAUTHLIB_VERSION = 1.2.0 PYTHON_REQUESTS_OAUTHLIB_SOURCE = requests-oauthlib-$(PYTHON_REQUESTS_OAUTHLIB_VERSION).tar.gz -PYTHON_REQUESTS_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/95/be/072464f05b70e4142cb37151e215a2037b08b1400f8a56f2538b76ca6205 +PYTHON_REQUESTS_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/de/a2/f55312dfe2f7a344d0d4044fdfae12ac8a24169dc668bd55f72b27090c32 PYTHON_REQUESTS_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_REQUESTS_OAUTHLIB_LICENSE = ISC PYTHON_REQUESTS_OAUTHLIB_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.hash b/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.hash index 75343b052..1b733fd7e 100644 --- a/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.hash +++ b/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/requests_toolbelt/json, sha256 locally computed -md5 be245e2093a9610fb2eb399afc063ad2 requests-toolbelt-0.7.1.tar.gz -sha256 c3843884269d79e492522f3e9f490917e074c1ddbb80111968970e721fe36eaf requests-toolbelt-0.7.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/requests-toolbelt/json +md5 b1509735c4b4cf95df2619facbc3672e requests-toolbelt-0.9.1.tar.gz +sha256 968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0 requests-toolbelt-0.9.1.tar.gz +# Locally computed sha256 checksums +sha256 3a1a3cffa7abc000cbd726a664f56c33c532a55480f9e056dfe941cf93b7c37f LICENSE diff --git a/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.mk b/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.mk index ce1d95871..119c40278 100644 --- a/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.mk +++ b/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_TOOLBELT_VERSION = 0.7.1 +PYTHON_REQUESTS_TOOLBELT_VERSION = 0.9.1 PYTHON_REQUESTS_TOOLBELT_SOURCE = requests-toolbelt-$(PYTHON_REQUESTS_TOOLBELT_VERSION).tar.gz -PYTHON_REQUESTS_TOOLBELT_SITE = https://pypi.python.org/packages/ab/bf/2af6b25f880e2d529a524f98837d33b1048a2a15703fc4806185b54e9672 +PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/28/30/7bf7e5071081f761766d46820e52f4b16c8a08fef02d2eb4682ca7534310 PYTHON_REQUESTS_TOOLBELT_SETUP_TYPE = setuptools PYTHON_REQUESTS_TOOLBELT_LICENSE = Apache-2.0 PYTHON_REQUESTS_TOOLBELT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-requests/python-requests.hash b/buildroot/package/python-requests/python-requests.hash index 46f62c75c..42f45d3a4 100644 --- a/buildroot/package/python-requests/python-requests.hash +++ b/buildroot/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 1bcd0e0977c3f8db1848ba0e2b7ab904 requests-2.21.0.tar.gz -sha256 502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e requests-2.21.0.tar.gz +md5 ee28bee2de76e9198fc41e48f3a7dd47 requests-2.22.0.tar.gz +sha256 11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 requests-2.22.0.tar.gz # Locally computed sha256 checksums sha256 be41abac2c40f8530307e8d172c590b476f4a488bc6a68f8de57b7cf64786687 LICENSE diff --git a/buildroot/package/python-requests/python-requests.mk b/buildroot/package/python-requests/python-requests.mk index 3d8542fcd..e64db9452 100644 --- a/buildroot/package/python-requests/python-requests.mk +++ b/buildroot/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.21.0 +PYTHON_REQUESTS_VERSION = 2.22.0 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/52/2c/514e4ac25da2b08ca5a464c50463682126385c4272c18193876e91f4bc38 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/01/62/ddcf76d1d19885e8579acb1b1df26a852b03472c0e46d2b959a714c90608 PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-rpi-gpio/python-rpi-gpio.hash b/buildroot/package/python-rpi-gpio/python-rpi-gpio.hash index e8d390daf..620efd27a 100644 --- a/buildroot/package/python-rpi-gpio/python-rpi-gpio.hash +++ b/buildroot/package/python-rpi-gpio/python-rpi-gpio.hash @@ -1,3 +1,6 @@ -# md5 from https://pypi.python.org/pypi/rpi_gpio/json, sha256 locally computed -md5 e4abe1cfb5eacebe53078032256eb837 RPi.GPIO-0.6.3.tar.gz -sha256 a5fc0eb5e401963b6c0a03650da6b42c4005f02d962b81241d96c98d0a578516 RPi.GPIO-0.6.3.tar.gz +# md5 from https://pypi.python.org/pypi/rpi_gpio/json +# sha256 from https://pypi.python.org/pypi/rpi_gpio/json +md5 777617f9dea9a1680f9af43db0cf150e RPi.GPIO-0.7.0.tar.gz +sha256 7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f RPi.GPIO-0.7.0.tar.gz +# Locally computed +sha256 a668b3edecb3e69e81ec25987257008208ffcba9d6c43682033b8060c5f2f994 LICENCE.txt diff --git a/buildroot/package/python-rpi-gpio/python-rpi-gpio.mk b/buildroot/package/python-rpi-gpio/python-rpi-gpio.mk index fd3267420..dfc59c882 100644 --- a/buildroot/package/python-rpi-gpio/python-rpi-gpio.mk +++ b/buildroot/package/python-rpi-gpio/python-rpi-gpio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPI_GPIO_VERSION = 0.6.3 +PYTHON_RPI_GPIO_VERSION = 0.7.0 PYTHON_RPI_GPIO_SOURCE = RPi.GPIO-$(PYTHON_RPI_GPIO_VERSION).tar.gz -PYTHON_RPI_GPIO_SITE = https://pypi.python.org/packages/e2/58/6e1b775606da6439fa3fd1550e7f714ac62aa75e162eed29dbec684ecb3e +PYTHON_RPI_GPIO_SITE = https://sourceforge.net/projects/raspberry-gpio-python/files PYTHON_RPI_GPIO_LICENSE = MIT PYTHON_RPI_GPIO_LICENSE_FILES = LICENCE.txt PYTHON_RPI_GPIO_SETUP_TYPE = distutils diff --git a/buildroot/package/python-rpi-ws281x/0001-Fix-cross-compilation.patch b/buildroot/package/python-rpi-ws281x/0001-Fix-cross-compilation.patch new file mode 100644 index 000000000..c291d4af3 --- /dev/null +++ b/buildroot/package/python-rpi-ws281x/0001-Fix-cross-compilation.patch @@ -0,0 +1,83 @@ +From aa3698d2eb38788b66b146faaa83ce4994c984e8 Mon Sep 17 00:00:00 2001 +From: Grzegorz Blach +Date: Fri, 20 Sep 2019 21:07:10 +0000 +Subject: [PATCH] Fix cross-compilation + +Signed-off-by: Grzegorz Blach +--- + Makefile | 24 ------------------------ + setup.py | 21 ++++++++------------- + 2 files changed, 8 insertions(+), 37 deletions(-) + delete mode 100644 Makefile + +diff --git a/Makefile b/Makefile +deleted file mode 100644 +index b8da8f5..0000000 +--- a/Makefile ++++ /dev/null +@@ -1,24 +0,0 @@ +-.PHONY: clean lib +- +-SRC = lib +-BUILD = lib-built +-OBJECTS = $(BUILD)/ws2811.o $(BUILD)/rpihw.o $(BUILD)/pcm.o $(BUILD)/pwm.o $(BUILD)/dma.o $(BUILD)/mailbox.o +-LIB = libws2811.a +- +-all: $(BUILD) $(BUILD)/version.h $(BUILD)/$(LIB) +- +-$(BUILD): +- mkdir -p $(BUILD) +- +-$(BUILD)/version.h: +- cp version.h $(BUILD)/version.h +- +-$(OBJECTS): $(BUILD)/%.o : $(SRC)/%.c +- gcc $< -o $@ -c -g -O2 -Wall -Werror -fPIC +- +-$(BUILD)/$(LIB): $(OBJECTS) +- ar rc $@ $^ +- ranlib $@ +- +-clean: +- -rm -f $(OBJECTS) $(BUILD)/$(LIB) $(BUILD)/version.h +diff --git a/library/setup.py b/library/setup.py +index b6785ec..1639574 100755 +--- a/setup.py ++++ b/setup.py +@@ -8,14 +8,6 @@ from setuptools import setup, find_packages, Extension + from setuptools.command.build_py import build_py + import subprocess + +-class CustomInstallCommand(build_py): +- """Customized install to run library Makefile""" +- def run(self): +- print("Compiling ws281x library...") +- proc =subprocess.Popen(["make"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) +- print(proc.stderr.read()) +- build_py.run(self) +- + setup(name = 'rpi_ws281x', + version = '4.2.2', + author = 'Jeremy Garff , Phil Howard ', +@@ -24,10 +16,13 @@ setup(name = 'rpi_ws281x', + long_description = open('README.rst').read() + "\n" + open('CHANGELOG.txt').read(), + license = 'MIT', + url = 'https://github.com/rpi-ws281x/rpi-ws281x-python/', +- cmdclass = {'build_py':CustomInstallCommand}, + packages = ['rpi_ws281x'], + ext_modules = [Extension('_rpi_ws281x', +- sources=['rpi_ws281x_wrap.c'], +- include_dirs=['lib/'], +- library_dirs=['lib-built/'], +- libraries=['ws2811'])]) ++ include_dirs=['.'], ++ sources=['rpi_ws281x_wrap.c', ++ 'lib/dma.c', ++ 'lib/mailbox.c', ++ 'lib/pcm.c', ++ 'lib/pwm.c', ++ 'lib/rpihw.c', ++ 'lib/ws2811.c'])]) +-- +2.23.0 + diff --git a/buildroot/package/python-rpi-ws281x/Config.in b/buildroot/package/python-rpi-ws281x/Config.in new file mode 100644 index 000000000..5f1313003 --- /dev/null +++ b/buildroot/package/python-rpi-ws281x/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_RPI_WS281X + bool "python-rpi-ws281x" + help + Userspace Raspberry Pi PWM/PCM/SPI library for SK6812 and + WS281X LEDs. + + https://github.com/rpi-ws281x/rpi-ws281x-python/ diff --git a/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.hash b/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.hash new file mode 100644 index 000000000..5333baabb --- /dev/null +++ b/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/rpi-ws281x/json +md5 17a714941043621e81f592e6a137dd92 rpi_ws281x-4.2.3.tar.gz +sha256 265a395410cc7199f779c4209ca3970b7211896b86dbaa4731bdc3569d2e595f rpi_ws281x-4.2.3.tar.gz +# Locally computed sha256 checksums +sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 LICENSE +sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 lib/LICENSE diff --git a/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.mk b/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.mk new file mode 100644 index 000000000..899ad3d1e --- /dev/null +++ b/buildroot/package/python-rpi-ws281x/python-rpi-ws281x.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-rpi-ws281x +# +################################################################################ + +PYTHON_RPI_WS281X_VERSION = 4.2.3 +PYTHON_RPI_WS281X_SOURCE = rpi_ws281x-$(PYTHON_RPI_WS281X_VERSION).tar.gz +PYTHON_RPI_WS281X_SITE = https://files.pythonhosted.org/packages/03/6c/46fad1bace9d5917190fd76e1550ec6727010cff6d3e5818b8c3a5405ba3 +PYTHON_RPI_WS281X_SETUP_TYPE = setuptools +PYTHON_RPI_WS281X_LICENSE = MIT +PYTHON_RPI_WS281X_LICENSE_FILES = LICENSE lib/LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-rtslib-fb/python-rtslib-fb.hash b/buildroot/package/python-rtslib-fb/python-rtslib-fb.hash index fd0618581..f67231d39 100644 --- a/buildroot/package/python-rtslib-fb/python-rtslib-fb.hash +++ b/buildroot/package/python-rtslib-fb/python-rtslib-fb.hash @@ -1,2 +1,3 @@ # locally computed -sha256 d5d81a78046b4c228d29ba88d9950e0f63858e5fcf601e3d0f8bf107fbaadc03 python-rtslib-fb-v2.1.fb57.tar.gz +sha256 d5d81a78046b4c228d29ba88d9950e0f63858e5fcf601e3d0f8bf107fbaadc03 python-rtslib-fb-2.1.fb57.tar.gz +sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/buildroot/package/python-rtslib-fb/python-rtslib-fb.mk b/buildroot/package/python-rtslib-fb/python-rtslib-fb.mk index 8236fb8eb..421fbed0a 100644 --- a/buildroot/package/python-rtslib-fb/python-rtslib-fb.mk +++ b/buildroot/package/python-rtslib-fb/python-rtslib-fb.mk @@ -6,9 +6,9 @@ # When upgrading the version, be sure to also upgrade # python-configshell-fb and targetcli-fb at the same time. -PYTHON_RTSLIB_FB_VERSION = v2.1.fb57 +PYTHON_RTSLIB_FB_VERSION = 2.1.fb57 # Do not switch site to PyPI: it does not contain the latest version. -PYTHON_RTSLIB_FB_SITE = $(call github,open-iscsi,rtslib-fb,$(PYTHON_RTSLIB_FB_VERSION)) +PYTHON_RTSLIB_FB_SITE = $(call github,open-iscsi,rtslib-fb,v$(PYTHON_RTSLIB_FB_VERSION)) PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 PYTHON_RTSLIB_FB_LICENSE_FILES = COPYING PYTHON_RTSLIB_FB_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-scandir/python-scandir.hash b/buildroot/package/python-scandir/python-scandir.hash index 5918291ba..5c01701ef 100644 --- a/buildroot/package/python-scandir/python-scandir.hash +++ b/buildroot/package/python-scandir/python-scandir.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/scandir/json -md5 506c4cc5f38c00b301642a9cb0433910 scandir-1.9.0.tar.gz -sha256 44975e209c4827fc18a3486f257154d34ec6eaec0f90fef0cca1caa482db7064 scandir-1.9.0.tar.gz +md5 f8378f4d9f95a6a78e97ab01aa900c1d scandir-1.10.0.tar.gz +sha256 4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae scandir-1.10.0.tar.gz # Locally computed sha256 checksums sha256 a5e2fbdc239744419d29407cdbc92793c4d9c1d956c174f7cb7f96fa6d058c86 LICENSE.txt diff --git a/buildroot/package/python-scandir/python-scandir.mk b/buildroot/package/python-scandir/python-scandir.mk index 1008fcad0..f205fe3b7 100644 --- a/buildroot/package/python-scandir/python-scandir.mk +++ b/buildroot/package/python-scandir/python-scandir.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCANDIR_VERSION = 1.9.0 +PYTHON_SCANDIR_VERSION = 1.10.0 PYTHON_SCANDIR_SOURCE = scandir-$(PYTHON_SCANDIR_VERSION).tar.gz -PYTHON_SCANDIR_SITE = https://files.pythonhosted.org/packages/16/2a/557af1181e6b4e30254d5a6163b18f5053791ca66e251e77ab08887e8fe3 +PYTHON_SCANDIR_SITE = https://files.pythonhosted.org/packages/df/f5/9c052db7bd54d0cbf1bc0bb6554362bba1012d03e5888950a4f5c5dadc4e PYTHON_SCANDIR_LICENSE = BSD-3-Clause PYTHON_SCANDIR_LICENSE_FILES = LICENSE.txt PYTHON_SCANDIR_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-scapy/python-scapy.hash b/buildroot/package/python-scapy/python-scapy.hash index 4d8001b75..df7eeb8ea 100644 --- a/buildroot/package/python-scapy/python-scapy.hash +++ b/buildroot/package/python-scapy/python-scapy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/scapy/json -md5 d7d3c4294f5a718e234775d38dbeb7ec scapy-2.4.0.tar.gz -sha256 452f714f5c2eac6fd0a6146b1dbddfc24dd5f4103f3ed76227995a488cfb2b73 scapy-2.4.0.tar.gz +md5 469ae6f5615799a5de3f3b4eb217b18d scapy-2.4.3.tar.gz +sha256 e2f8d11f6a941c14a789ae8b236b27bd634681f1b29b5e893861e284d234f6b0 scapy-2.4.3.tar.gz # Locally computed sha256 checksums -sha256 7a49a7fdaf7b648e451dd01e4875cf4dbfa556c6359c6b97feed5047540ea989 PKG-INFO +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/python-scapy/python-scapy.mk b/buildroot/package/python-scapy/python-scapy.mk index c44b2cb2e..f6cf2a07b 100644 --- a/buildroot/package/python-scapy/python-scapy.mk +++ b/buildroot/package/python-scapy/python-scapy.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_SCAPY_VERSION = 2.4.0 +PYTHON_SCAPY_VERSION = 2.4.3 PYTHON_SCAPY_SOURCE = scapy-$(PYTHON_SCAPY_VERSION).tar.gz -PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/68/01/b9943984447e7ea6f8948e90c1729b78161c2bb3eef908430638ec3f7296 +PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/52/e7/464079606a9cf97ad04936c52a5324d14dae36215f9319bf3faa46a7907d +PYTHON_SCAPY_SETUP_TYPE = setuptools PYTHON_SCAPY_LICENSE = GPL-2.0 -PYTHON_SCAPY_LICENSE_FILES = PKG-INFO -PYTHON_SCAPY_SETUP_TYPE = distutils +PYTHON_SCAPY_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python-scapy3k/Config.in b/buildroot/package/python-scapy3k/Config.in deleted file mode 100644 index 3e75fcd17..000000000 --- a/buildroot/package/python-scapy3k/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_SCAPY3K - bool "python-scapy3k" - depends on BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON3_ZLIB - help - Network packet and pcap file crafting/sniffing/manipulation - security tool (based on scapy) with python3 compatibility. - - https://github.com/phaethon/scapy diff --git a/buildroot/package/python-scapy3k/python-scapy3k.hash b/buildroot/package/python-scapy3k/python-scapy3k.hash deleted file mode 100644 index 36d5dfed3..000000000 --- a/buildroot/package/python-scapy3k/python-scapy3k.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 a4c68ef2f787d82a3aec8640cac8dbab6f5b9e31ae4d89a1877efbb9150a9e25 python-scapy3k-v0.18.tar.gz diff --git a/buildroot/package/python-scapy3k/python-scapy3k.mk b/buildroot/package/python-scapy3k/python-scapy3k.mk deleted file mode 100644 index e858dcc72..000000000 --- a/buildroot/package/python-scapy3k/python-scapy3k.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# python-scapy3k -# -################################################################################ - -PYTHON_SCAPY3K_VERSION = v0.18 -PYTHON_SCAPY3K_SITE = $(call github,phaethon,scapy,$(PYTHON_SCAPY3K_VERSION)) -PYTHON_SCAPY3K_SETUP_TYPE = distutils -PYTHON_SCAPY3K_LICENSE = GPL-2.0+ - -$(eval $(python-package)) diff --git a/buildroot/package/python-schedule/python-schedule.hash b/buildroot/package/python-schedule/python-schedule.hash index 92475f973..79777829d 100644 --- a/buildroot/package/python-schedule/python-schedule.hash +++ b/buildroot/package/python-schedule/python-schedule.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/schedule/json, sha256 locally computed -md5 53fb2e550b2539264eeceb5d85e82759 schedule-0.5.0.tar.gz -sha256 1003a07c2dce12828c25a03a611a7371cedfa956e5f1b4abc32bcc94eb5a335b schedule-0.5.0.tar.gz -# License file, locally calculated +# md5, sha256 from https://pypi.org/pypi/schedule/json +md5 e29fd3b436b03220e147a4ed8191d220 schedule-0.6.0.tar.gz +sha256 f9fb5181283de4db6e701d476dd01b6a3dd81c38462a54991ddbb9d26db857c9 schedule-0.6.0.tar.gz +# Locally computed sha256 checksums sha256 30a8352c318ce1b645acde0299697342d4380ed2637d7ca18a8ad25661e3b41b LICENSE.txt diff --git a/buildroot/package/python-schedule/python-schedule.mk b/buildroot/package/python-schedule/python-schedule.mk index 16612a088..c0cc7dce8 100644 --- a/buildroot/package/python-schedule/python-schedule.mk +++ b/buildroot/package/python-schedule/python-schedule.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCHEDULE_VERSION = 0.5.0 +PYTHON_SCHEDULE_VERSION = 0.6.0 PYTHON_SCHEDULE_SOURCE = schedule-$(PYTHON_SCHEDULE_VERSION).tar.gz -PYTHON_SCHEDULE_SITE = https://pypi.python.org/packages/fd/31/599a3387c2e98c270d5ac21a1575f3eb60a3712c192a0ca97a494a207739 +PYTHON_SCHEDULE_SITE = https://files.pythonhosted.org/packages/00/07/6a9953ff83e003eaadebf0a51d33c6b596f9451fcbea36a3a2e575f6af99 PYTHON_SCHEDULE_SETUP_TYPE = setuptools PYTHON_SCHEDULE_LICENSE = MIT PYTHON_SCHEDULE_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-secretstorage/Config.in b/buildroot/package/python-secretstorage/Config.in index 87aaf6a72..78a0a2ae1 100644 --- a/buildroot/package/python-secretstorage/Config.in +++ b/buildroot/package/python-secretstorage/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_SECRETSTORAGE bool "python-secretstorage" + depends on BR2_PACKAGE_PYTHON3 depends on BR2_INSTALL_LIBSTDCPP # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime help diff --git a/buildroot/package/python-secretstorage/python-secretstorage.hash b/buildroot/package/python-secretstorage/python-secretstorage.hash index b45fb5719..3f096a396 100644 --- a/buildroot/package/python-secretstorage/python-secretstorage.hash +++ b/buildroot/package/python-secretstorage/python-secretstorage.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/secretstorage/json, sha256 locally computed -md5 3b9465831b069e2622973afb7deb7bc2 SecretStorage-2.3.1.tar.gz -sha256 3af65c87765323e6f64c83575b05393f9e003431959c9395d1791d51497f29b6 SecretStorage-2.3.1.tar.gz -sha256 1debb9ff5d6759fd23cdb40e3ba34b1fa68dd0b19672b6d154599fb0ab704c57 LICENSE +# md5, sha256 from https://pypi.org/pypi/secretstorage/json +md5 12ea3fc6640e857331eb80ed46a7da20 SecretStorage-3.1.1.tar.gz +sha256 20c797ae48a4419f66f8d28fc221623f11fc45b6828f96bdb1ad9990acb59f92 SecretStorage-3.1.1.tar.gz +# Locally computed sha256 checksums +sha256 70f6bfca77633c35efa218328eda5486d7054c2914d61820980e378797520a25 LICENSE diff --git a/buildroot/package/python-secretstorage/python-secretstorage.mk b/buildroot/package/python-secretstorage/python-secretstorage.mk index b9776d664..4a8b6ac90 100644 --- a/buildroot/package/python-secretstorage/python-secretstorage.mk +++ b/buildroot/package/python-secretstorage/python-secretstorage.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SECRETSTORAGE_VERSION = 2.3.1 +PYTHON_SECRETSTORAGE_VERSION = 3.1.1 PYTHON_SECRETSTORAGE_SOURCE = SecretStorage-$(PYTHON_SECRETSTORAGE_VERSION).tar.gz -PYTHON_SECRETSTORAGE_SITE = https://pypi.python.org/packages/a5/a5/0830cfe34a4cfd0d1c3c8b614ede1edb2aaf999091ac8548dd19cb352e79 +PYTHON_SECRETSTORAGE_SITE = https://files.pythonhosted.org/packages/a6/89/df343dbc2957a317127e7ff2983230dc5336273be34f2e1911519d85aeb5 PYTHON_SECRETSTORAGE_SETUP_TYPE = setuptools PYTHON_SECRETSTORAGE_LICENSE = BSD-3-Clause PYTHON_SECRETSTORAGE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-semver/python-semver.hash b/buildroot/package/python-semver/python-semver.hash index e18cc1c67..60aaa6b8c 100644 --- a/buildroot/package/python-semver/python-semver.hash +++ b/buildroot/package/python-semver/python-semver.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/semver/json -md5 dc579ba9d0bb2137bad5324d4bdb7e40 semver-2.8.1.tar.gz -sha256 5b09010a66d9a3837211bb7ae5a20d10ba88f8cb49e92cb139a69ef90d5060d8 semver-2.8.1.tar.gz +md5 a411b305a3f6714bca126a0b59dc4429 semver-2.9.0.tar.gz +sha256 ed1edeaa0c27f68feb74f09f715077fd07b728446dc2bb7fc470fc0f737873a0 semver-2.9.0.tar.gz +# Locally computed +sha256 cda490c32e61d3884dc17791fc8078f2a3e564fba98dd18b4dc64eb2720b2b6f LICENSE.txt diff --git a/buildroot/package/python-semver/python-semver.mk b/buildroot/package/python-semver/python-semver.mk index afdd34564..6e1faef12 100644 --- a/buildroot/package/python-semver/python-semver.mk +++ b/buildroot/package/python-semver/python-semver.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_SEMVER_VERSION = 2.8.1 +PYTHON_SEMVER_VERSION = 2.9.0 PYTHON_SEMVER_SOURCE = semver-$(PYTHON_SEMVER_VERSION).tar.gz -PYTHON_SEMVER_SITE = https://files.pythonhosted.org/packages/47/13/8ae74584d6dd33a1d640ea27cd656a9f718132e75d759c09377d10d64595 +PYTHON_SEMVER_SITE = https://files.pythonhosted.org/packages/be/c8/392e3c1c4080202b99e8b3b5d0ab6cbcfc4b25d50031c2c21d130871bf88 PYTHON_SEMVER_SETUP_TYPE = setuptools -# no license file in tarball, but available in git PYTHON_SEMVER_LICENSE = BSD-3-Clause +PYTHON_SEMVER_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) diff --git a/buildroot/package/python-sentry-sdk/python-sentry-sdk.hash b/buildroot/package/python-sentry-sdk/python-sentry-sdk.hash index 34acf6ec1..e9dc46559 100644 --- a/buildroot/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/buildroot/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 78642322818c1ce47e80938fe1f40b5f sentry-sdk-0.6.2.tar.gz -sha256 56118f4c3bd3412e47d1969997580df2f27ae951df949d07f0c2120cefe40b00 sentry-sdk-0.6.2.tar.gz +md5 1b22a7cb91e1f9b83acbd61709d5e71d sentry-sdk-0.13.1.tar.gz +sha256 f6e850f304382d87c5c52c01db8c0004d2ced6a0b073df2f2257168cf31b31aa sentry-sdk-0.13.1.tar.gz # Locally computed sha256 checksums sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE diff --git a/buildroot/package/python-sentry-sdk/python-sentry-sdk.mk b/buildroot/package/python-sentry-sdk/python-sentry-sdk.mk index ae218de1c..dd47e7c0c 100644 --- a/buildroot/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/buildroot/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 0.6.2 +PYTHON_SENTRY_SDK_VERSION = 0.13.1 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/92/6f/b7b74d7635e220660c06897213fc6df894d291900c8e2710d72fb67528a7 +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/e2/5f/1f5881e98746c16464d46ae9d6ccdd6ce3c01c7e13093ea8a7d917642ee7 PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-service-identity/Config.in b/buildroot/package/python-service-identity/Config.in index 73593b0d6..f1ce5312c 100644 --- a/buildroot/package/python-service-identity/Config.in +++ b/buildroot/package/python-service-identity/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-pyasn select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CHARACTERISTIC # runtime + select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_PYASN # runtime select BR2_PACKAGE_PYTHON_PYASN_MODULES # runtime select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime diff --git a/buildroot/package/python-service-identity/python-service-identity.hash b/buildroot/package/python-service-identity/python-service-identity.hash index 7caaaf99e..9a20d0892 100644 --- a/buildroot/package/python-service-identity/python-service-identity.hash +++ b/buildroot/package/python-service-identity/python-service-identity.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/service_identity/json, sha256 locally computed -md5 f509cb41ca2f8420bd8496291136d6cc service_identity-17.0.0.tar.gz -sha256 4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab service_identity-17.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/service_identity/json +md5 c6b8bac93e7d899a1da313a19cc6570a service_identity-18.1.0.tar.gz +sha256 0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d service_identity-18.1.0.tar.gz +# Locally computed sha256 checksums +sha256 c5075126e1272b176504e36af369781a95c5c1124239da8e4f61b0f9c15a56cf LICENSE diff --git a/buildroot/package/python-service-identity/python-service-identity.mk b/buildroot/package/python-service-identity/python-service-identity.mk index ccc6e71ac..5330239e4 100644 --- a/buildroot/package/python-service-identity/python-service-identity.mk +++ b/buildroot/package/python-service-identity/python-service-identity.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SERVICE_IDENTITY_VERSION = 17.0.0 +PYTHON_SERVICE_IDENTITY_VERSION = 18.1.0 PYTHON_SERVICE_IDENTITY_SOURCE = service_identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz -PYTHON_SERVICE_IDENTITY_SITE = https://pypi.python.org/packages/de/2a/cab6e30be82c8fcd2339ef618036720eda954cf05daef514e386661c9221 +PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/9a/3d/9eb0563e066ea0540cf580695593ab079376e920016d4d1b3ff2fd8abf4b PYTHON_SERVICE_IDENTITY_LICENSE = MIT PYTHON_SERVICE_IDENTITY_LICENSE_FILES = LICENSE PYTHON_SERVICE_IDENTITY_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-setproctitle/python-setproctitle.hash b/buildroot/package/python-setproctitle/python-setproctitle.hash index bf4d96035..6bade7bba 100644 --- a/buildroot/package/python-setproctitle/python-setproctitle.hash +++ b/buildroot/package/python-setproctitle/python-setproctitle.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=2dcdd1b761700a5a13252fea3dfd1977, sha256 locally computed. +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=2dcdd1b761700a5a13252fea3dfd1977 md5 2dcdd1b761700a5a13252fea3dfd1977 setproctitle-1.1.10.tar.gz +# Locally computed sha256 6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398 setproctitle-1.1.10.tar.gz +sha256 40e85df0511ccacd29b6b5898e7e09b76889fc2f5d94b2670ece847977d3bbed COPYRIGHT diff --git a/buildroot/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash b/buildroot/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash new file mode 100644 index 000000000..e4f169ed9 --- /dev/null +++ b/buildroot/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/setuptools-scm-git-archive/json +md5 1c9351fa5cebd12e76488737a7c78f2e setuptools_scm_git_archive-1.1.tar.gz +sha256 6026f61089b73fa1b5ee737e95314f41cb512609b393530385ed281d0b46c062 setuptools_scm_git_archive-1.1.tar.gz +# Locally computed sha256 checksums +sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/buildroot/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/buildroot/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk new file mode 100644 index 000000000..032e2d3fc --- /dev/null +++ b/buildroot/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-setuptools-scm-git-archive +# +################################################################################ + +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.1 +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SOURCE = setuptools_scm_git_archive-$(PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION).tar.gz +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/7e/2c/0c15b29a1b5940250bfdc4a4f53272e35cd7cf8a34159291b6b4ec9eb291 +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE +HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(host-python-package)) diff --git a/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash b/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash index e34e8e2b6..8208a9dc1 100644 --- a/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/setuptools_scm/json, sha256 locally computed -md5 f17493d53f0d842bb0152f214775640b setuptools_scm-1.15.6.tar.gz -sha256 49ab4685589986a42da85706b3311a2f74f1af567d39fee6cb1e088d7a75fb5f setuptools_scm-1.15.6.tar.gz +# md5, sha256 from https://pypi.org/pypi/setuptools-scm/json +md5 50b2199082fe808d032ec1710c9d7415 setuptools_scm-3.3.3.tar.gz +sha256 bd25e1fb5e4d603dcf490f1fde40fb4c595b357795674c3e5cb7f6217ab39ea5 setuptools_scm-3.3.3.tar.gz +# sha256 locally computed +sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk b/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk index acde2618c..dc9d28059 100644 --- a/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 1.15.6 +PYTHON_SETUPTOOLS_SCM_VERSION = 3.3.3 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://pypi.python.org/packages/03/6d/aafdd01edd227ee879b691455bf19895091872af7e48192bea1758c82032 +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/83/44/53cad68ce686585d12222e6769682c4bdb9686808d2739671f9175e2938b PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-setuptools/python-setuptools.hash b/buildroot/package/python-setuptools/python-setuptools.hash index 53d77f57d..cc4a831d2 100644 --- a/buildroot/package/python-setuptools/python-setuptools.hash +++ b/buildroot/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 1fbcbe45c7fb1d21041e676ba68d2dec setuptools-40.6.3.zip -sha256 3b474dad69c49f0d2d86696b68105f3a6f195f7ab655af12ef9a9c326d2b08f8 setuptools-40.6.3.zip +md5 89a592d733b31e180a4b6ad760c0685a setuptools-41.4.0.zip +sha256 7eae782ccf36b790c21bde7d86a4f303a441cd77036b25c559a602cf5186ce4d setuptools-41.4.0.zip sha256 c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a LICENSE diff --git a/buildroot/package/python-setuptools/python-setuptools.mk b/buildroot/package/python-setuptools/python-setuptools.mk index 015347d49..163ba869c 100644 --- a/buildroot/package/python-setuptools/python-setuptools.mk +++ b/buildroot/package/python-setuptools/python-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk -PYTHON_SETUPTOOLS_VERSION = 40.6.3 +PYTHON_SETUPTOOLS_VERSION = 41.4.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/37/1b/b25507861991beeade31473868463dad0e58b1978c209de27384ae541b0b +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/f4/d5/a6c19dcbcbc267aca376558797f036d9bcdff344c9f785fe7d0fe9a5f2a7 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-sh/python-sh.hash b/buildroot/package/python-sh/python-sh.hash index cbc6745bd..cc9ba214b 100644 --- a/buildroot/package/python-sh/python-sh.hash +++ b/buildroot/package/python-sh/python-sh.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/sh/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/sh/json md5 a8351aef25d25f707c17e0a7a6280251 sh-1.12.14.tar.gz -sha256 b52bf5833ed01c7b5c5fb73a7f71b3d98d48e9b9b8764236237bdc7ecae850fc sh-1.12.14.tar.gz +# Locally computed +sha256 b52bf5833ed01c7b5c5fb73a7f71b3d98d48e9b9b8764236237bdc7ecae850fc sh-1.12.14.tar.gz +sha256 d8491c6e236568d04f7c8c07f2f1b8f5d142706dab6ab88f6e0d2dd476b6c706 LICENSE.txt diff --git a/buildroot/package/python-simpleaudio/python-simpleaudio.hash b/buildroot/package/python-simpleaudio/python-simpleaudio.hash index 7e3a7fb39..353fa5e36 100644 --- a/buildroot/package/python-simpleaudio/python-simpleaudio.hash +++ b/buildroot/package/python-simpleaudio/python-simpleaudio.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/simpleaudio/json, sha256 locally computed -md5 8c1c82fdf7ebba1a79b1243651e451d7 simpleaudio-1.0.1.tar.gz -sha256 6cc84d50d8192c074505c719722138ae6ea987fd8eee7fd930237cb308962604 simpleaudio-1.0.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/simpleaudio/json +md5 92f0a0891a198c000fedce0599b46c7b simpleaudio-1.0.2.tar.gz +sha256 4e0e4c0359f153408e9b8a65342ec0c1d014f36fbe9cdb594e9b6e5348916af8 simpleaudio-1.0.2.tar.gz +# Locally computed sha256 checksums +sha256 b4340683e83f0f25ea40f992773ceec6c749c4d64ec2c09dfa49d7f5b029adbf LICENSE.txt diff --git a/buildroot/package/python-simpleaudio/python-simpleaudio.mk b/buildroot/package/python-simpleaudio/python-simpleaudio.mk index 24ec067da..e23d4d026 100644 --- a/buildroot/package/python-simpleaudio/python-simpleaudio.mk +++ b/buildroot/package/python-simpleaudio/python-simpleaudio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEAUDIO_VERSION = 1.0.1 +PYTHON_SIMPLEAUDIO_VERSION = 1.0.2 PYTHON_SIMPLEAUDIO_SOURCE = simpleaudio-$(PYTHON_SIMPLEAUDIO_VERSION).tar.gz -PYTHON_SIMPLEAUDIO_SITE = https://pypi.python.org/packages/12/f6/327c1af94062a6a6a5ff06dcf9dc689ed81aa07ae757cca3438c3c9e50fe +PYTHON_SIMPLEAUDIO_SITE = https://files.pythonhosted.org/packages/ad/39/ce09ef827887cdfc755427195d7291446c1fb34a16356d1fec920d62269d PYTHON_SIMPLEAUDIO_LICENSE = MIT PYTHON_SIMPLEAUDIO_LICENSE_FILES = LICENSE.txt PYTHON_SIMPLEAUDIO_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-simplejson/python-simplejson.hash b/buildroot/package/python-simplejson/python-simplejson.hash index f2a5fce38..d89d824d1 100644 --- a/buildroot/package/python-simplejson/python-simplejson.hash +++ b/buildroot/package/python-simplejson/python-simplejson.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/simplejson/json, sha256 locally computed -md5 6e2f1bd5fb0a926facf5d89d217a7183 simplejson-3.11.1.tar.gz -sha256 01a22d49ddd9a168b136f26cac87d9a335660ce07aa5c630b8e3607d6f4325e7 simplejson-3.11.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/simplejson/json +md5 8a5ed75c367b90fedc3d685742e2a1c7 simplejson-3.17.0.tar.gz +sha256 2b4b2b738b3b99819a17feaf118265d0753d5536049ea570b3c43b51c4701e81 simplejson-3.17.0.tar.gz +# Locally computed sha256 checksums +sha256 fcaa1e313a99304322e2e0836ea4ee7d839ce9a480438f3922a853edfdde129f LICENSE.txt diff --git a/buildroot/package/python-simplejson/python-simplejson.mk b/buildroot/package/python-simplejson/python-simplejson.mk index afc77fec6..3e875015a 100644 --- a/buildroot/package/python-simplejson/python-simplejson.mk +++ b/buildroot/package/python-simplejson/python-simplejson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEJSON_VERSION = 3.11.1 +PYTHON_SIMPLEJSON_VERSION = 3.17.0 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = https://pypi.python.org/packages/08/48/c97b668d6da7d7bebe7ea1817a6f76394b0ec959cb04214ca833c34359df +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/98/87/a7b98aa9256c8843f92878966dc3d8d914c14aad97e2c5ce4798d5743e07 PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt PYTHON_SIMPLEJSON_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-simplelogging/Config.in b/buildroot/package/python-simplelogging/Config.in new file mode 100644 index 000000000..db95efa25 --- /dev/null +++ b/buildroot/package/python-simplelogging/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_SIMPLELOGGING + bool "python-simplelogging" + select BR2_PACKAGE_PYTHON_COLORLOG # runtime + help + Logging made simple, no excuse for any debug print call. + + https://github.com/vpoulailleau/simplelogging diff --git a/buildroot/package/python-simplelogging/python-simplelogging.hash b/buildroot/package/python-simplelogging/python-simplelogging.hash new file mode 100644 index 000000000..86698fe88 --- /dev/null +++ b/buildroot/package/python-simplelogging/python-simplelogging.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/simplelogging/json +md5 e3f9da393098d8fd8ebd8349a00692f2 simplelogging-0.10.0.tar.gz +sha256 c070e0d82b68eff6918076a0edbf0a48b2c9a263854bd35f48a12c6adbbe9d80 simplelogging-0.10.0.tar.gz +# Locally computed sha256 checksums +sha256 bd2a0fe3b3bab7092ffa7f58d46bb05d98f12f107b3a6be947c098f7c2ad1d1a LICENSE diff --git a/buildroot/package/python-simplelogging/python-simplelogging.mk b/buildroot/package/python-simplelogging/python-simplelogging.mk new file mode 100644 index 000000000..28acc5c95 --- /dev/null +++ b/buildroot/package/python-simplelogging/python-simplelogging.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-simplelogging +# +################################################################################ + +PYTHON_SIMPLELOGGING_VERSION = 0.10.0 +PYTHON_SIMPLELOGGING_SOURCE = simplelogging-$(PYTHON_SIMPLELOGGING_VERSION).tar.gz +PYTHON_SIMPLELOGGING_SITE = https://files.pythonhosted.org/packages/17/85/3d2431f971e703916c7254e4560ed15451faedf2461eb484da9e1ebc5da6 +PYTHON_SIMPLELOGGING_SETUP_TYPE = setuptools +PYTHON_SIMPLELOGGING_LICENSE = BSD-3-Clause +PYTHON_SIMPLELOGGING_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-simplesqlite/Config.in b/buildroot/package/python-simplesqlite/Config.in index 25941dd9c..c03411b90 100644 --- a/buildroot/package/python-simplesqlite/Config.in +++ b/buildroot/package/python-simplesqlite/Config.in @@ -1,14 +1,14 @@ config BR2_PACKAGE_PYTHON_SIMPLESQLITE bool "python-simplesqlite" select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime - select BR2_PACKAGE_PYTHON_LOGBOOK # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime - select BR2_PACKAGE_PYTHON_PYTABLEREADER # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON_SQLITESCHEMA # runtime + select BR2_PACKAGE_PYTHON_TABLEDATA # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help SimpleSQLite is a Python library to simplify SQLite database diff --git a/buildroot/package/python-simplesqlite/python-simplesqlite.hash b/buildroot/package/python-simplesqlite/python-simplesqlite.hash index b9dc1378c..7b4a91de0 100644 --- a/buildroot/package/python-simplesqlite/python-simplesqlite.hash +++ b/buildroot/package/python-simplesqlite/python-simplesqlite.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/simplesqlite/json, sha256 locally computed -md5 be05735a65f91bf0bb47c2bfcf474dd3 SimpleSQLite-0.15.0.tar.gz -sha256 319cf4fd660a2a8ba1d77bac65e3cb3bed30ef5e2b2f98aab558026a29bbefec SimpleSQLite-0.15.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/simplesqlite/json +md5 f1d4f2ec14e2c782a62e451587477598 SimpleSQLite-0.45.2.tar.gz +sha256 0b19c99c36b63173a715649f94a2fc3aee8deb9b70c683d584bca85e5930244b SimpleSQLite-0.45.2.tar.gz +# Locally computed sha256 checksums +sha256 98799b7c99b561c5ffa3ac86600e501f761afa8e72af8a2515026445fe134105 LICENSE diff --git a/buildroot/package/python-simplesqlite/python-simplesqlite.mk b/buildroot/package/python-simplesqlite/python-simplesqlite.mk index 48c37c563..88ffcd4d4 100644 --- a/buildroot/package/python-simplesqlite/python-simplesqlite.mk +++ b/buildroot/package/python-simplesqlite/python-simplesqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLESQLITE_VERSION = 0.15.0 +PYTHON_SIMPLESQLITE_VERSION = 0.45.2 PYTHON_SIMPLESQLITE_SOURCE = SimpleSQLite-$(PYTHON_SIMPLESQLITE_VERSION).tar.gz -PYTHON_SIMPLESQLITE_SITE = https://pypi.python.org/packages/d5/09/e256a7d421c223505d4e89079b4936c6a6de39a5a095ec4bcaa9bfc3f933 +PYTHON_SIMPLESQLITE_SITE = https://files.pythonhosted.org/packages/b3/d1/bc3668ed7d90ee70d556124b8b5b3329505d72b5290bb393626f1afe714d PYTHON_SIMPLESQLITE_SETUP_TYPE = setuptools PYTHON_SIMPLESQLITE_LICENSE = MIT PYTHON_SIMPLESQLITE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-singledispatch/python-singledispatch.hash b/buildroot/package/python-singledispatch/python-singledispatch.hash index 8a96d21a9..c4eec53e3 100644 --- a/buildroot/package/python-singledispatch/python-singledispatch.hash +++ b/buildroot/package/python-singledispatch/python-singledispatch.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=af2fc6a3d6cc5a02d0bf54d909785fcb, sha256 locally computed +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=af2fc6a3d6cc5a02d0bf54d909785fcb md5 af2fc6a3d6cc5a02d0bf54d909785fcb singledispatch-3.4.0.3.tar.gz +# Locally computed sha256 5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c singledispatch-3.4.0.3.tar.gz +sha256 5a724c436f88585973787af91cecf58503cbf09e5c1721c516880614700767ef setup.py diff --git a/buildroot/package/python-sip/python-sip.hash b/buildroot/package/python-sip/python-sip.hash index 2f7d4309b..6adf44d41 100644 --- a/buildroot/package/python-sip/python-sip.hash +++ b/buildroot/package/python-sip/python-sip.hash @@ -1,4 +1,7 @@ # From https://sourceforge.net/projects/pyqt/files/sip/sip-4.18/ md5 78724bf2a79878201c3bc81a1d8248ea sip-4.18.tar.gz # Locally calculated: -sha256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 sip-4.18.tar.gz +sha256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 sip-4.18.tar.gz +sha256 accecbfda71ad4497bce0d451796706e734e405e5ecf3b3f9ee0cc68300a3d9c LICENSE +sha256 7ebb61006e46b9e9340dd135d5f4afbbcb1d1d6c6709f74473b35929007b9aeb LICENSE-GPL2 +sha256 63cb5f5c1ea39b732c495f354f971e40f6db84c567ca5573a68bb65af07741f8 LICENSE-GPL3 diff --git a/buildroot/package/python-sip/python-sip.mk b/buildroot/package/python-sip/python-sip.mk index 69019f5f1..1d6c20539 100644 --- a/buildroot/package/python-sip/python-sip.mk +++ b/buildroot/package/python-sip/python-sip.mk @@ -21,7 +21,7 @@ else ifeq ($(BR2_PACKAGE_PYTHON3),y) PYTHON_SIP_DEPENDENCIES += python3 HOST_PYTHON_SIP_DEPENDENCIES += host-python3 PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON3_VERSION_MAJOR)m +PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON3_VERSION_MAJOR) endif define HOST_PYTHON_SIP_CONFIGURE_CMDS diff --git a/buildroot/package/python-six/python-six.hash b/buildroot/package/python-six/python-six.hash index b7262b12b..0d1e75fe9 100644 --- a/buildroot/package/python-six/python-six.hash +++ b/buildroot/package/python-six/python-six.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/six/json -md5 9ae5d1feed8c0215f4ae4adcd9207fcb six-1.12.0.tar.gz -sha256 d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73 six-1.12.0.tar.gz +md5 21674588a57e649d1a6d977ec3122140 six-1.14.0.tar.gz +sha256 236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a six-1.14.0.tar.gz # Locally computed sha256 checksums -sha256 e732f54da58f3e9cf0c48e8b512948936fcf7361bd58afa63a9a3c392bf794ad LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 LICENSE diff --git a/buildroot/package/python-six/python-six.mk b/buildroot/package/python-six/python-six.mk index 95817fa34..8acc739f2 100644 --- a/buildroot/package/python-six/python-six.mk +++ b/buildroot/package/python-six/python-six.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIX_VERSION = 1.12.0 +PYTHON_SIX_VERSION = 1.14.0 PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz -PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca +PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/21/9f/b251f7f8a76dec1d6651be194dfba8fb8d7781d10ab3987190de8391d08e PYTHON_SIX_SETUP_TYPE = setuptools PYTHON_SIX_LICENSE = MIT PYTHON_SIX_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-slob/Config.in b/buildroot/package/python-slob/Config.in index 6f83808ab..a8b6e45da 100644 --- a/buildroot/package/python-slob/Config.in +++ b/buildroot/package/python-slob/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_SLOB bool "python-slob" depends on !BR2_BINFMT_FLAT # python-pyicu -> icu depends on BR2_INSTALL_LIBSTDCPP # python-pyicu -> icu - depends on BR2_HOST_GCC_AT_LEAST_4_8 # python-pyicu -> icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # python-pyicu -> icu depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYICU # runtime @@ -14,8 +13,7 @@ config BR2_PACKAGE_PYTHON_SLOB https://github.com/itkach/slob -comment "python-slob needs a toolchain w/ C++, gcc >= 4.8, host gcc >= 4.8" +comment "python-slob needs a toolchain w/ C++, gcc >= 4.8" depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/python-slob/python-slob.hash b/buildroot/package/python-slob/python-slob.hash index 39d5d81f3..5bce1f132 100644 --- a/buildroot/package/python-slob/python-slob.hash +++ b/buildroot/package/python-slob/python-slob.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 18eb4f45d09d49b1f776cac52ea70ab951566c60cd30bbec39e88f10908fd8ff python-slob-31ad0e769360a5b10a4893f686587bb8e48c3895.tar.gz +sha256 18eb4f45d09d49b1f776cac52ea70ab951566c60cd30bbec39e88f10908fd8ff python-slob-31ad0e769360a5b10a4893f686587bb8e48c3895.tar.gz +sha256 db09bc6733ab28dc59bfbcd01819feb9d05241cbef3ca3f5f58ec739b341d56f LICENSE diff --git a/buildroot/package/python-smbus-cffi/python-smbus-cffi.hash b/buildroot/package/python-smbus-cffi/python-smbus-cffi.hash index 1e28df99b..ed851eb6f 100644 --- a/buildroot/package/python-smbus-cffi/python-smbus-cffi.hash +++ b/buildroot/package/python-smbus-cffi/python-smbus-cffi.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f621c871bd658ee665751ad78e3b2df9, sha256 locally computed +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f621c871bd658ee665751ad78e3b2df9 md5 f621c871bd658ee665751ad78e3b2df9 smbus-cffi-0.5.1.tar.gz +# Locally computed sha256 fb4195aaabfc01586863f60d3190b5cb1bf8f12622fd597e23e48768dad6bde8 smbus-cffi-0.5.1.tar.gz +sha256 d54f57bf73bd1ff19a424b6deab6ff08f6089a2469c8de360b167f755e4ecb4c LICENSE diff --git a/buildroot/package/python-smmap2/Config.in b/buildroot/package/python-smmap2/Config.in new file mode 100644 index 000000000..21a3bdb61 --- /dev/null +++ b/buildroot/package/python-smmap2/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_SMMAP2 + bool "python-smmap2" + help + Smmap wraps an interface around mmap and tracks the mapped + files as well as the amount of clients who use it. If the + system runs out of resources, or if a memory limit is reached, + it will automatically unload unused maps to allow continued + operation. + + https://github.com/gitpython-developers/smmap diff --git a/buildroot/package/python-smmap2/python-smmap2.hash b/buildroot/package/python-smmap2/python-smmap2.hash new file mode 100644 index 000000000..8a7ea42a5 --- /dev/null +++ b/buildroot/package/python-smmap2/python-smmap2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/smmap2/json +md5 1c59a985be5aa645c4c5a4e063a40dd5 smmap2-2.0.5.tar.gz +sha256 29a9ffa0497e7f2be94ca0ed1ca1aa3cd4cf25a1f6b4f5f87f74b46ed91d609a smmap2-2.0.5.tar.gz +# Locally computed sha256 checksums +sha256 88e9d93f708d110b328a834302dd1d5c6afbda530e7721d15d80b3511d86f235 LICENSE diff --git a/buildroot/package/python-smmap2/python-smmap2.mk b/buildroot/package/python-smmap2/python-smmap2.mk new file mode 100644 index 000000000..daf379fe1 --- /dev/null +++ b/buildroot/package/python-smmap2/python-smmap2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-smmap2 +# +################################################################################ + +PYTHON_SMMAP2_VERSION = 2.0.5 +PYTHON_SMMAP2_SOURCE = smmap2-$(PYTHON_SMMAP2_VERSION).tar.gz +PYTHON_SMMAP2_SITE = https://files.pythonhosted.org/packages/3b/ba/e49102b3e8ffff644edded25394b2d22ebe3e645f3f6a8139129c4842ffe +PYTHON_SMMAP2_SETUP_TYPE = setuptools +PYTHON_SMMAP2_LICENSE = BSD-3-Clause +PYTHON_SMMAP2_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-socketio/python-socketio.hash b/buildroot/package/python-socketio/python-socketio.hash index 659d4d540..d0d8a87dc 100644 --- a/buildroot/package/python-socketio/python-socketio.hash +++ b/buildroot/package/python-socketio/python-socketio.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/python-socketio/json -md5 44fd24e839dc3102920765f345740646 python-socketio-1.4.1.tar.gz -# sha256 calculated by scanpypi -sha256 ebd0984d831d602c8ec6d586ecde4466972cc7ed37dbbfe613192864e8263779 python-socketio-1.4.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/python-socketio/json +md5 86cd47dddea1785ce7a6c72f55c93fe7 python-socketio-4.3.1.tar.gz +sha256 506b2cf7a520b40ea0b3f25e1272eff8de134dce6f471c1f6bc0de8c90fe8c57 python-socketio-4.3.1.tar.gz +# Locally computed sha256 checksums +sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/buildroot/package/python-socketio/python-socketio.mk b/buildroot/package/python-socketio/python-socketio.mk index 57dc1f8b4..ece4f65b7 100644 --- a/buildroot/package/python-socketio/python-socketio.mk +++ b/buildroot/package/python-socketio/python-socketio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_SOCKETIO_VERSION = 1.4.1 -PYTHON_SOCKETIO_SITE = https://pypi.python.org/packages/da/00/66103df6a116a2ce3ea662a9c8c80f337d43d7f138caf04e9af6dec24ba7 +PYTHON_SOCKETIO_VERSION = 4.3.1 +PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/36/87/e9128a4da04df991fbdb01f44dc4d6dd8f6c03bfd4d1f42dcd6779fd975a PYTHON_SOCKETIO_SETUP_TYPE = setuptools PYTHON_SOCKETIO_LICENSE = MIT PYTHON_SOCKETIO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-sockjs/Config.in b/buildroot/package/python-sockjs/Config.in new file mode 100644 index 000000000..583d7ec74 --- /dev/null +++ b/buildroot/package/python-sockjs/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_SOCKJS + bool "python-sockjs" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_AIOHTTP # runtime + help + SockJS server implementation for aiohttp. + + https://github.com/aio-libs/sockjs/ diff --git a/buildroot/package/python-sockjs/python-sockjs.hash b/buildroot/package/python-sockjs/python-sockjs.hash new file mode 100644 index 000000000..55ea9dc64 --- /dev/null +++ b/buildroot/package/python-sockjs/python-sockjs.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/sockjs/json +md5 369417bd103f841f236a8623ea29353c sockjs-0.10.0.tar.gz +sha256 005a820387bb4611b59341eac091b05d4204050dd42e4ea6cfb83607e23e2f06 sockjs-0.10.0.tar.gz +# Locally computed sha256 checksums +sha256 7be23c071df0314fadeba6077a3830340a5121ad88bfa66b0c095051a766e141 LICENSE.txt diff --git a/buildroot/package/python-sockjs/python-sockjs.mk b/buildroot/package/python-sockjs/python-sockjs.mk new file mode 100644 index 000000000..e0f58e2b6 --- /dev/null +++ b/buildroot/package/python-sockjs/python-sockjs.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-sockjs +# +################################################################################ + +PYTHON_SOCKJS_VERSION = 0.10.0 +PYTHON_SOCKJS_SOURCE = sockjs-$(PYTHON_SOCKJS_VERSION).tar.gz +PYTHON_SOCKJS_SITE = https://files.pythonhosted.org/packages/35/0e/6aa4f3283b064b04a0c7f3859c8c2c0b736c05cfb07853b6d94073c1bf63 +PYTHON_SOCKJS_SETUP_TYPE = setuptools +PYTHON_SOCKJS_LICENSE = Apache-2.0 +PYTHON_SOCKJS_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-soupsieve/Config.in b/buildroot/package/python-soupsieve/Config.in new file mode 100644 index 000000000..c42e97587 --- /dev/null +++ b/buildroot/package/python-soupsieve/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_SOUPSIEVE + bool "python-soupsieve" + select BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE \ + if BR2_PACKAGE_PYTHON # runtime + help + A modern CSS selector implementation for Beautiful Soup. + + https://github.com/facelessuser/soupsieve diff --git a/buildroot/package/python-soupsieve/python-soupsieve.hash b/buildroot/package/python-soupsieve/python-soupsieve.hash new file mode 100644 index 000000000..c4c1273e5 --- /dev/null +++ b/buildroot/package/python-soupsieve/python-soupsieve.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/soupsieve/json +md5 43d8ea20c58494446aa65ba5cc6320fe soupsieve-1.9.4.tar.gz +sha256 605f89ad5fdbfefe30cdc293303665eff2d188865d4dbe4eb510bba1edfbfce3 soupsieve-1.9.4.tar.gz +# Locally computed sha256 checksums +sha256 0eee19bf360e5f7a8180e2f6d613d716f7115a456f670e3d8bb35c45a0db1838 LICENSE.md diff --git a/buildroot/package/python-soupsieve/python-soupsieve.mk b/buildroot/package/python-soupsieve/python-soupsieve.mk new file mode 100644 index 000000000..1203b26ce --- /dev/null +++ b/buildroot/package/python-soupsieve/python-soupsieve.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-soupsieve +# +################################################################################ + +PYTHON_SOUPSIEVE_VERSION = 1.9.4 +PYTHON_SOUPSIEVE_SOURCE = soupsieve-$(PYTHON_SOUPSIEVE_VERSION).tar.gz +PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/7f/4e/95a13527e18b6f1a15c93f1c634b86d5fa634c5619dce695f4e0cd68182f +PYTHON_SOUPSIEVE_SETUP_TYPE = setuptools +PYTHON_SOUPSIEVE_LICENSE = MIT +PYTHON_SOUPSIEVE_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) diff --git a/buildroot/package/python-spidev/python-spidev.hash b/buildroot/package/python-spidev/python-spidev.hash index dc08925d3..d3d2b685e 100644 --- a/buildroot/package/python-spidev/python-spidev.hash +++ b/buildroot/package/python-spidev/python-spidev.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/spidev/json, sha256 locally computed -md5 f601676f1bb48b9aa3b3897f95216365 spidev-3.2.tar.gz -sha256 09d2b5122f0dd79910713a11f9a0020f71537224bf829916def4fffc0ea59456 spidev-3.2.tar.gz +# sha256 from https://pypi.org/project/spidev +sha256 4314e52f573d95233c907f307558893313a8a606e197e77bb711526b0e179e80 spidev-3.4.tar.gz + +# locally computed +sha256 153a6f02f41aebe292cf3307f973a80b4fb0c988d8d3e7d126c7a66c20b1cc27 README.md diff --git a/buildroot/package/python-spidev/python-spidev.mk b/buildroot/package/python-spidev/python-spidev.mk index 17fb049ca..7f9bec7c9 100644 --- a/buildroot/package/python-spidev/python-spidev.mk +++ b/buildroot/package/python-spidev/python-spidev.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_SPIDEV_VERSION = 3.2 +PYTHON_SPIDEV_VERSION = 3.4 PYTHON_SPIDEV_SOURCE = spidev-$(PYTHON_SPIDEV_VERSION).tar.gz -PYTHON_SPIDEV_SITE = https://pypi.python.org/packages/36/83/73748b6e1819b57d8e1df8090200195cdae33aaa22a49a91ded16785eedd +PYTHON_SPIDEV_SITE = https://files.pythonhosted.org/packages/fb/14/4c2e1640f0cb04862c76d9d76ed7c945b0f67876e503ac02f7f675fe86a0 PYTHON_SPIDEV_SETUP_TYPE = distutils -PYTHON_SPIDEV_LICENSE = GPL-2.0 -PYTHON_SPIDEV_LICENSE_FILES = LICENSE.md +PYTHON_SPIDEV_LICENSE = MIT +PYTHON_SPIDEV_LICENSE_FILES = README.md $(eval $(python-package)) diff --git a/buildroot/package/python-sqlalchemy/python-sqlalchemy.hash b/buildroot/package/python-sqlalchemy/python-sqlalchemy.hash index 9e13a2f20..991293b5a 100644 --- a/buildroot/package/python-sqlalchemy/python-sqlalchemy.hash +++ b/buildroot/package/python-sqlalchemy/python-sqlalchemy.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/SQLAlchemy/json, sha256 locally computed -md5 968e07dc0aa92f9205bb3877f33f498f SQLAlchemy-1.2.2.tar.gz -sha256 64b4720f0a8e033db0154d3824f5bf677cf2797e11d44743cf0aebd2a0499d9d SQLAlchemy-1.2.2.tar.gz -sha256 73bda3d7d6c568f494c1d12520a97d41a38b7ce91d88c21f1b469b747b17f7fd LICENSE +# md5, sha256 from https://pypi.org/pypi/sqlalchemy/json +md5 af9722657ba51131703dbe75f24b054a SQLAlchemy-1.3.10.tar.gz +sha256 0f0768b5db594517e1f5e1572c73d14cf295140756431270d89496dc13d5e46c SQLAlchemy-1.3.10.tar.gz +# Locally computed sha256 checksums +sha256 0acffa15f3427e94014235e3c44376f6fe5df0ff461a93a9116eebcce74c056e LICENSE diff --git a/buildroot/package/python-sqlalchemy/python-sqlalchemy.mk b/buildroot/package/python-sqlalchemy/python-sqlalchemy.mk index c0023712a..3886e4976 100644 --- a/buildroot/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/buildroot/package/python-sqlalchemy/python-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLALCHEMY_VERSION = 1.2.2 +PYTHON_SQLALCHEMY_VERSION = 1.3.10 PYTHON_SQLALCHEMY_SOURCE = SQLAlchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz -PYTHON_SQLALCHEMY_SITE = https://pypi.python.org/packages/b9/fb/a56d2fc0ce3571328fa872734ad124cae25a4cea422088987f865fb71787 +PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/14/0e/487f7fc1e432cec50d2678f94e4133f2b9e9356e35bacc30d73e8cb831fc PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-sqliteschema/Config.in b/buildroot/package/python-sqliteschema/Config.in new file mode 100644 index 000000000..b9568adbe --- /dev/null +++ b/buildroot/package/python-sqliteschema/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_SQLITESCHEMA + bool "python-sqliteschema" + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_TABLEDATA # runtime + select BR2_PACKAGE_PYTHON_TYPEPY # runtime + help + A Python library to dump table schema of a SQLite database + file. + + https://github.com/thombashi/sqliteschema diff --git a/buildroot/package/python-sqliteschema/python-sqliteschema.hash b/buildroot/package/python-sqliteschema/python-sqliteschema.hash new file mode 100644 index 000000000..b25b0ae17 --- /dev/null +++ b/buildroot/package/python-sqliteschema/python-sqliteschema.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/sqliteschema/json +md5 175afa008a628f6dc32392a72d4c6b74 sqliteschema-0.16.2.tar.gz +sha256 023a443abdc12796928c04441fabbbe12e1fe8608f562b4650ae1f9a19504139 sqliteschema-0.16.2.tar.gz +# Locally computed sha256 checksums +sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/buildroot/package/python-sqliteschema/python-sqliteschema.mk b/buildroot/package/python-sqliteschema/python-sqliteschema.mk new file mode 100644 index 000000000..890bfb9dc --- /dev/null +++ b/buildroot/package/python-sqliteschema/python-sqliteschema.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-sqliteschema +# +################################################################################ + +PYTHON_SQLITESCHEMA_VERSION = 0.16.2 +PYTHON_SQLITESCHEMA_SOURCE = sqliteschema-$(PYTHON_SQLITESCHEMA_VERSION).tar.gz +PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/91/b6/87a9218d37afd061a8b26c0ec058299b85c3f859f1c80aff10752188e056 +PYTHON_SQLITESCHEMA_SETUP_TYPE = setuptools +PYTHON_SQLITESCHEMA_LICENSE = MIT +PYTHON_SQLITESCHEMA_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-sqlparse/Config.in b/buildroot/package/python-sqlparse/Config.in new file mode 100644 index 000000000..498b33ae0 --- /dev/null +++ b/buildroot/package/python-sqlparse/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_SQLPARSE + bool "python-sqlparse" + help + sqlparse is a non-validating SQL parser for Python. + It provides support for parsing, splitting and formatting + SQL statements. + + https://github.com/andialbrecht/sqlparse diff --git a/buildroot/package/python-sqlparse/python-sqlparse.hash b/buildroot/package/python-sqlparse/python-sqlparse.hash new file mode 100644 index 000000000..a03abe342 --- /dev/null +++ b/buildroot/package/python-sqlparse/python-sqlparse.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/sqlparse/json +md5 2ce34181d6b7b234c9f3c0ecd1ffb93e sqlparse-0.3.0.tar.gz +sha256 7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873 sqlparse-0.3.0.tar.gz +# Locally computed sha256 checksums +sha256 c1938235b80d39e93138eae89edc3af67e18ecbc40d266529fa57b2dce426310 LICENSE diff --git a/buildroot/package/python-sqlparse/python-sqlparse.mk b/buildroot/package/python-sqlparse/python-sqlparse.mk new file mode 100644 index 000000000..22111dfc4 --- /dev/null +++ b/buildroot/package/python-sqlparse/python-sqlparse.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-sqlparse +# +################################################################################ + +PYTHON_SQLPARSE_VERSION = 0.3.0 +PYTHON_SQLPARSE_SOURCE = sqlparse-$(PYTHON_SQLPARSE_VERSION).tar.gz +PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/63/c8/229dfd2d18663b375975d953e2bdc06d0eed714f93dcb7732f39e349c438 +PYTHON_SQLPARSE_SETUP_TYPE = setuptools +PYTHON_SQLPARSE_LICENSE = BSD-3-Clause +PYTHON_SQLPARSE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-subprocess32/python-subprocess32.hash b/buildroot/package/python-subprocess32/python-subprocess32.hash index e96505d3d..65d18763d 100644 --- a/buildroot/package/python-subprocess32/python-subprocess32.hash +++ b/buildroot/package/python-subprocess32/python-subprocess32.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/subprocess32/json -md5 afa0510115f483d668e25aa30502d9bc subprocess32-3.5.3.tar.gz -sha256 6bc82992316eef3ccff319b5033809801c0c3372709c5f6985299c88ac7225c3 subprocess32-3.5.3.tar.gz +md5 748844d560be5f0c707931cba1cdb48b subprocess32-3.5.4.tar.gz +sha256 eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d subprocess32-3.5.4.tar.gz # Locally computed sha256 checksums sha256 826b43437249d39422642f695154d064da64de92eb1476048a615f50bc1beb4a LICENSE diff --git a/buildroot/package/python-subprocess32/python-subprocess32.mk b/buildroot/package/python-subprocess32/python-subprocess32.mk index c635196e9..fb8a47f97 100644 --- a/buildroot/package/python-subprocess32/python-subprocess32.mk +++ b/buildroot/package/python-subprocess32/python-subprocess32.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SUBPROCESS32_VERSION = 3.5.3 +PYTHON_SUBPROCESS32_VERSION = 3.5.4 PYTHON_SUBPROCESS32_SOURCE = subprocess32-$(PYTHON_SUBPROCESS32_VERSION).tar.gz -PYTHON_SUBPROCESS32_SITE = https://files.pythonhosted.org/packages/be/2b/beeba583e9877e64db10b52a96915afc0feabf7144dcbf2a0d0ea68bf73d +PYTHON_SUBPROCESS32_SITE = https://files.pythonhosted.org/packages/32/c8/564be4d12629b912ea431f1a50eb8b3b9d00f1a0b1ceff17f266be190007 PYTHON_SUBPROCESS32_SETUP_TYPE = setuptools PYTHON_SUBPROCESS32_LICENSE = Python-2.0 PYTHON_SUBPROCESS32_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-systemd/python-systemd.hash b/buildroot/package/python-systemd/python-systemd.hash index ae480b8fe..1e5cee5ce 100644 --- a/buildroot/package/python-systemd/python-systemd.hash +++ b/buildroot/package/python-systemd/python-systemd.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/systemd-python/, sha256 locally computed +# md5 from https://pypi.python.org/pypi/systemd-python/ md5 5071ea5bcb976186e92a3f5e75df221d systemd-python-234.tar.gz -sha256 fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7 systemd-python-234.tar.gz +# Locally computed +sha256 fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7 systemd-python-234.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.txt diff --git a/buildroot/package/python-tabledata/Config.in b/buildroot/package/python-tabledata/Config.in index 9e8ca9c31..bd856d23e 100644 --- a/buildroot/package/python-tabledata/Config.in +++ b/buildroot/package/python-tabledata/Config.in @@ -1,9 +1,10 @@ config BR2_PACKAGE_PYTHON_TABLEDATA bool "python-tabledata" select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime - select BR2_PACKAGE_PYTHON_LOGBOOK # runtime - select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_FUTURES if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help A Python library to represent tabular data for diff --git a/buildroot/package/python-tabledata/python-tabledata.hash b/buildroot/package/python-tabledata/python-tabledata.hash index efc6d6a82..9d8564db3 100644 --- a/buildroot/package/python-tabledata/python-tabledata.hash +++ b/buildroot/package/python-tabledata/python-tabledata.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/tabledata/json, sha256 locally computed -md5 4ff69d8855a835890944591721d0c129 tabledata-0.0.5.tar.gz -sha256 e16490e4c15f06ee258015431ec247a5b301aec4ebca3297cf6451efb9eb3cfb tabledata-0.0.5.tar.gz -sha256 cbce2ac14dd81b6a1155029034512a304505692cc63b625538916cf93bee8ca2 LICENSE +# md5, sha256 from https://pypi.org/pypi/tabledata/json +md5 3a97a7bd3f2687a139578a79353a8188 tabledata-0.9.1.tar.gz +sha256 a2c59603ecb56cd2161a72978d56876377ba6a27a3e6d87e1874ba4d5ab02796 tabledata-0.9.1.tar.gz +# Locally computed sha256 checksums +sha256 bebbdf0524a147f89a615fff53d79bdc90cbc7631550fb4b725cd3f3bdcd24f6 LICENSE diff --git a/buildroot/package/python-tabledata/python-tabledata.mk b/buildroot/package/python-tabledata/python-tabledata.mk index 130590937..c1381928c 100644 --- a/buildroot/package/python-tabledata/python-tabledata.mk +++ b/buildroot/package/python-tabledata/python-tabledata.mk @@ -4,18 +4,11 @@ # ################################################################################ -PYTHON_TABLEDATA_VERSION = 0.0.5 +PYTHON_TABLEDATA_VERSION = 0.9.1 PYTHON_TABLEDATA_SOURCE = tabledata-$(PYTHON_TABLEDATA_VERSION).tar.gz -PYTHON_TABLEDATA_SITE = https://pypi.python.org/packages/9d/03/2e96d18f2bd4b76611fc6aa3881c7e15c857eea99debea9b80ec689354ba +PYTHON_TABLEDATA_SITE = https://files.pythonhosted.org/packages/7d/20/7178ce0e3e34d5aff07e2280522b7e1bc23d4f2fbb916b765bbb41b22174 PYTHON_TABLEDATA_SETUP_TYPE = setuptools PYTHON_TABLEDATA_LICENSE = MIT PYTHON_TABLEDATA_LICENSE_FILES = LICENSE -# remove setup.cfg as it tries to create a wheel file and hence -# breaks the build process -define PYTHON_TABLEDATA_REMOVE_SETUP_CFG - rm $(@D)/setup.cfg -endef -PYTHON_TABLEDATA_POST_EXTRACT_HOOKS = PYTHON_TABLEDATA_REMOVE_SETUP_CFG - $(eval $(python-package)) diff --git a/buildroot/package/python-tempora/Config.in b/buildroot/package/python-tempora/Config.in index ab5c57f6c..06ccbfc28 100644 --- a/buildroot/package/python-tempora/Config.in +++ b/buildroot/package/python-tempora/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_TEMPORA bool "python-tempora" + depends on BR2_PACKAGE_PYTHON3 # python-jaraco-functools + select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime help diff --git a/buildroot/package/python-tempora/python-tempora.hash b/buildroot/package/python-tempora/python-tempora.hash index a8367b942..e95924613 100644 --- a/buildroot/package/python-tempora/python-tempora.hash +++ b/buildroot/package/python-tempora/python-tempora.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/tempora/json, sha256 locally computed -md5 cd0dd5c51c9645285ff505ec531cbcc8 tempora-1.7.tar.gz -sha256 a264672b7f39198eb90b531490ade4e873f6e13839253636c3bd6a5549be1984 tempora-1.7.tar.gz +# md5, sha256 from https://pypi.org/pypi/tempora/json +md5 f8b2b0df1adf3f83b829a85e31bddb2d tempora-1.14.1.tar.gz +sha256 cb60b1d2b1664104e307f8e5269d7f4acdb077c82e35cd57246ae14a3427d2d6 tempora-1.14.1.tar.gz +# Locally computed sha256 checksums +sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/buildroot/package/python-tempora/python-tempora.mk b/buildroot/package/python-tempora/python-tempora.mk index 0bae36a2c..b2f1b6b30 100644 --- a/buildroot/package/python-tempora/python-tempora.mk +++ b/buildroot/package/python-tempora/python-tempora.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_TEMPORA_VERSION = 1.7 +PYTHON_TEMPORA_VERSION = 1.14.1 PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz -PYTHON_TEMPORA_SITE = https://pypi.python.org/packages/db/2d/c838e9e553d774962a71b832b2c6390194904bfe49fd0d9d792ce8091e8a +PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/2f/b5/5b0464385454c5ca93a39a1c6acefdf574aeb10ef45fa8958b3832cc7d96 PYTHON_TEMPORA_LICENSE = MIT +PYTHON_TEMPORA_LICENSE_FILES = LICENSE PYTHON_TEMPORA_SETUP_TYPE = setuptools PYTHON_TEMPORA_DEPENDENCIES = host-python-setuptools-scm diff --git a/buildroot/package/python-termcolor/Config.in b/buildroot/package/python-termcolor/Config.in new file mode 100644 index 000000000..e89da9b96 --- /dev/null +++ b/buildroot/package/python-termcolor/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_TERMCOLOR + bool "python-termcolor" + help + ANSII Color formatting for output in terminal. + + http://pypi.python.org/pypi/termcolor diff --git a/buildroot/package/python-termcolor/python-termcolor.hash b/buildroot/package/python-termcolor/python-termcolor.hash new file mode 100644 index 000000000..7cccc3ec9 --- /dev/null +++ b/buildroot/package/python-termcolor/python-termcolor.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/termcolor/json +md5 043e89644f8909d462fbbfa511c768df termcolor-1.1.0.tar.gz +sha256 1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b termcolor-1.1.0.tar.gz +# Locally computed sha256 checksums +sha256 497b3272b67b94a7aa58fa3748d21b62b29ccb783b1cda816f594e3932590bbf COPYING.txt diff --git a/buildroot/package/python-termcolor/python-termcolor.mk b/buildroot/package/python-termcolor/python-termcolor.mk new file mode 100644 index 000000000..ccdff4c0d --- /dev/null +++ b/buildroot/package/python-termcolor/python-termcolor.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-termcolor +# +################################################################################ + +PYTHON_TERMCOLOR_VERSION = 1.1.0 +PYTHON_TERMCOLOR_SOURCE = termcolor-$(PYTHON_TERMCOLOR_VERSION).tar.gz +PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981 +PYTHON_TERMCOLOR_SETUP_TYPE = distutils +PYTHON_TERMCOLOR_LICENSE = MIT +PYTHON_TERMCOLOR_LICENSE_FILES = COPYING.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-terminaltables/Config.in b/buildroot/package/python-terminaltables/Config.in new file mode 100644 index 000000000..8f3c4296e --- /dev/null +++ b/buildroot/package/python-terminaltables/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TERMINALTABLES + bool "python-terminaltables" + help + Generate simple tables in terminals from a nested list of + strings. + + https://github.com/Robpol86/terminaltables diff --git a/buildroot/package/python-terminaltables/python-terminaltables.hash b/buildroot/package/python-terminaltables/python-terminaltables.hash new file mode 100644 index 000000000..3184f5f71 --- /dev/null +++ b/buildroot/package/python-terminaltables/python-terminaltables.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/terminaltables/json +md5 863797674d8f75d22e16e6c1fdcbeb41 terminaltables-3.1.0.tar.gz +sha256 f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81 terminaltables-3.1.0.tar.gz diff --git a/buildroot/package/python-terminaltables/python-terminaltables.mk b/buildroot/package/python-terminaltables/python-terminaltables.mk new file mode 100644 index 000000000..763f82e9a --- /dev/null +++ b/buildroot/package/python-terminaltables/python-terminaltables.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-terminaltables +# +################################################################################ + +PYTHON_TERMINALTABLES_VERSION = 3.1.0 +PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz +PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/9b/c4/4a21174f32f8a7e1104798c445dacdc1d4df86f2f26722767034e4de4bff +PYTHON_TERMINALTABLES_SETUP_TYPE = setuptools +PYTHON_TERMINALTABLES_LICENSE = MIT + +$(eval $(python-package)) diff --git a/buildroot/package/python-texttable/python-texttable.hash b/buildroot/package/python-texttable/python-texttable.hash index 448d6b7dd..367eb8d60 100644 --- a/buildroot/package/python-texttable/python-texttable.hash +++ b/buildroot/package/python-texttable/python-texttable.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/texttable/json, sha256 locally computed -md5 a712b5a5464d51c5fc43c64d9d2cd0de texttable-0.9.1.tar.gz -sha256 119041773ff03596b56392532f9315cb3a3116e404fd6f36e76a7dc088d95c79 texttable-0.9.1.tar.gz -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE +# md5, sha256 from https://pypi.org/pypi/texttable/json +md5 763141f0bdf598cdc5cf780ed4d2eb94 texttable-1.6.2.tar.gz +sha256 eff3703781fbc7750125f50e10f001195174f13825a92a45e9403037d539b4f4 texttable-1.6.2.tar.gz +# Locally computed sha256 checksums +sha256 181d0c3366cc36fd6ae7d023b23a743581003fd42974c8983ea40f7161faeaf3 LICENSE diff --git a/buildroot/package/python-texttable/python-texttable.mk b/buildroot/package/python-texttable/python-texttable.mk index 96fe6cf88..3b173a35e 100644 --- a/buildroot/package/python-texttable/python-texttable.mk +++ b/buildroot/package/python-texttable/python-texttable.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_TEXTTABLE_VERSION = 0.9.1 +PYTHON_TEXTTABLE_VERSION = 1.6.2 PYTHON_TEXTTABLE_SOURCE = texttable-$(PYTHON_TEXTTABLE_VERSION).tar.gz -PYTHON_TEXTTABLE_SITE = https://pypi.python.org/packages/02/e1/2565e6b842de7945af0555167d33acfc8a615584ef7abd30d1eae00a4d80 -PYTHON_TEXTTABLE_SETUP_TYPE = distutils -PYTHON_TEXTTABLE_LICENSE = LGPL-3.0+ +PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/82/a8/60df592e3a100a1f83928795aca210414d72cebdc6e4e0c95a6d8ac632fe +PYTHON_TEXTTABLE_SETUP_TYPE = setuptools +PYTHON_TEXTTABLE_LICENSE = MIT PYTHON_TEXTTABLE_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python-thrift/Config.in b/buildroot/package/python-thrift/Config.in index 20d94d0c6..1ecfda357 100644 --- a/buildroot/package/python-thrift/Config.in +++ b/buildroot/package/python-thrift/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_THRIFT bool "python-thrift" - depends on BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON_SIX # runtime help python-thrift is a Python bindings for the Apache Thrift RPC system. diff --git a/buildroot/package/python-thrift/python-thrift.hash b/buildroot/package/python-thrift/python-thrift.hash index 72269eb83..56d99f2a5 100644 --- a/buildroot/package/python-thrift/python-thrift.hash +++ b/buildroot/package/python-thrift/python-thrift.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/thrift/json, sha256 locally computed -md5 b519551d7a086bb0b4f222a8f566b7e8 thrift-0.9.3.tar.gz -sha256 dfbc3d3bd19d396718dab05abaf46d93ae8005e2df798ef02e32793cd963877e thrift-0.9.3.tar.gz +# md5, sha256 from https://pypi.org/pypi/thrift/json +md5 36165d5c80e6b101dbe9fcf7ef524d51 thrift-0.11.0.tar.gz +sha256 7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b thrift-0.11.0.tar.gz +# Locally computed sha256 checksums +sha256 6a62a493bd7c741378619ff61c56282d64f3ad033dc8154b67c808311960bb02 setup.py diff --git a/buildroot/package/python-thrift/python-thrift.mk b/buildroot/package/python-thrift/python-thrift.mk index d0e3a1468..21f2355f6 100644 --- a/buildroot/package/python-thrift/python-thrift.mk +++ b/buildroot/package/python-thrift/python-thrift.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_THRIFT_VERSION = 0.9.3 +PYTHON_THRIFT_VERSION = 0.11.0 PYTHON_THRIFT_SOURCE = thrift-$(PYTHON_THRIFT_VERSION).tar.gz -PYTHON_THRIFT_SITE = https://pypi.python.org/packages/ae/58/35e3f0cd290039ff862c2c9d8ae8a76896665d70343d833bdc2f748b8e55 +PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/c6/b4/510617906f8e0c5660e7d96fbc5585113f83ad547a3989b80297ac72a74c PYTHON_THRIFT_LICENSE = Apache-2.0 PYTHON_THRIFT_LICENSE_FILES = setup.py PYTHON_THRIFT_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-tinyrpc/Config.in b/buildroot/package/python-tinyrpc/Config.in new file mode 100644 index 000000000..3c643c754 --- /dev/null +++ b/buildroot/package/python-tinyrpc/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_TINYRPC + bool "python-tinyrpc" + select BR2_PACKAGE_PYTHON_SIX # runtime + help + A small, modular, transport and protocol neutral RPC + library that, among other things, supports JSON-RPC and + zmq. + + http://github.com/mbr/tinyrpc diff --git a/buildroot/package/python-tinyrpc/python-tinyrpc.hash b/buildroot/package/python-tinyrpc/python-tinyrpc.hash new file mode 100644 index 000000000..b4bc7ae86 --- /dev/null +++ b/buildroot/package/python-tinyrpc/python-tinyrpc.hash @@ -0,0 +1,4 @@ +# md5, sha256 from https://pypi.org/pypi/tinyrpc/json +sha256 4b41fab967fb1c978f573bf0d609a3b12cc3b6ed62bd3108f43f575563746396 tinyrpc-1.0.4.tar.gz +md5 cd61e3cbc01ea940abc97d3a87abf4a7 tinyrpc-1.0.4.tar.gz +sha256 587f1ea174824613f4a7e0d7fb95fda000a7f58ca17df12416e014c9ee82e619 LICENSE diff --git a/buildroot/package/python-tinyrpc/python-tinyrpc.mk b/buildroot/package/python-tinyrpc/python-tinyrpc.mk new file mode 100644 index 000000000..0ac0470f7 --- /dev/null +++ b/buildroot/package/python-tinyrpc/python-tinyrpc.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-tinyrpc +# +################################################################################ + +PYTHON_TINYRPC_VERSION = 1.0.4 +PYTHON_TINYRPC_SOURCE = tinyrpc-$(PYTHON_TINYRPC_VERSION).tar.gz +PYTHON_TINYRPC_SITE = https://files.pythonhosted.org/packages/9d/91/c639ba014aada92446516c5fc4b04f2cee3539ab2d0758a6a87a6da973cb +PYTHON_TINYRPC_SETUP_TYPE = setuptools +PYTHON_TINYRPC_LICENSE = MIT +PYTHON_TINYRPC_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot/package/python-tomako/Config.in b/buildroot/package/python-tomako/Config.in index bd6d29982..1521035bb 100644 --- a/buildroot/package/python-tomako/Config.in +++ b/buildroot/package/python-tomako/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_TOMAKO bool "python-tomako" + depends on BR2_PACKAGE_PYTHON3 # python-tornado select BR2_PACKAGE_PYTHON_TORNADO # runtime select BR2_PACKAGE_PYTHON_MAKO # runtime help diff --git a/buildroot/package/python-tomako/python-tomako.hash b/buildroot/package/python-tomako/python-tomako.hash index af07a88ab..65576f419 100644 --- a/buildroot/package/python-tomako/python-tomako.hash +++ b/buildroot/package/python-tomako/python-tomako.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/tomako/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/tomako/json md5 a2e9e99be4ddf2263ed441ddc3dfcf96 tomako-0.1.0.post1.tar.gz +# Locally computed sha256 2d8ec113199408eb16ec00361aac6f10b716925779b6331083f304d01dafd150 tomako-0.1.0.post1.tar.gz +sha256 2b55167354e331f089d5f7a9a9ef4149b0baa95abd6860b6390a04001e1f2bb8 LICENSE diff --git a/buildroot/package/python-toml/python-toml.hash b/buildroot/package/python-toml/python-toml.hash index 20737c3ca..f0641ccda 100644 --- a/buildroot/package/python-toml/python-toml.hash +++ b/buildroot/package/python-toml/python-toml.hash @@ -1,2 +1,5 @@ -# Locally computed -sha256 633a90ecb1f5665b58f0c94153fcf519313ef53e1de0eac90929cd6b6a014235 python-toml-0.9.3.tar.gz +# md5, sha256 from https://pypi.org/pypi/toml/json +md5 63fffbe2d632865ec29cd69bfdf36682 toml-0.10.0.tar.gz +sha256 229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c toml-0.10.0.tar.gz +# Locally computed sha256 checksums +sha256 a879cc43c06aca11ada36f71c8db7257449ff4451874a0903f129920c66fcf2d LICENSE diff --git a/buildroot/package/python-toml/python-toml.mk b/buildroot/package/python-toml/python-toml.mk index fae15f938..b4f9070f2 100644 --- a/buildroot/package/python-toml/python-toml.mk +++ b/buildroot/package/python-toml/python-toml.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_TOML_VERSION = 0.9.3 -PYTHON_TOML_SITE = $(call github,uiri,toml,$(PYTHON_TOML_VERSION)) +PYTHON_TOML_VERSION = 0.10.0 +PYTHON_TOML_SOURCE = toml-$(PYTHON_TOML_VERSION).tar.gz +PYTHON_TOML_SITE = https://files.pythonhosted.org/packages/b9/19/5cbd78eac8b1783671c40e34bb0fa83133a06d340a38b55c645076d40094 PYTHON_TOML_SETUP_TYPE = setuptools PYTHON_TOML_LICENSE = MIT PYTHON_TOML_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-tornado/0001-Disable-SSL-checks.patch b/buildroot/package/python-tornado/0001-Disable-SSL-checks.patch deleted file mode 100644 index 272afd64f..000000000 --- a/buildroot/package/python-tornado/0001-Disable-SSL-checks.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 82a3bbc2ac41b5a1b34a53f97459558efe131f14 Mon Sep 17 00:00:00 2001 -From: Jan Dohl -Date: Sun, 24 Jun 2018 16:00:54 +0200 -Subject: [PATCH] Disable SSL checks - -Checking for SSL support in the Python used on the build system is not -relevant, as we need SSL support in the Python on the target system. - -Signed-off-by: Jan Dohl ---- - setup.py | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/setup.py b/setup.py -index 6fbb10a8..1a9220c7 100644 ---- a/setup.py -+++ b/setup.py -@@ -15,7 +15,6 @@ - - import os - import platform --import ssl - import sys - import warnings - -@@ -137,16 +136,6 @@ if setuptools is not None: - python_requires = '>= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, != 3.3.*' - kwargs['python_requires'] = python_requires - --# Verify that the SSL module has all the modern upgrades. Check for several --# names individually since they were introduced at different versions, --# although they should all be present by Python 3.4 or 2.7.9. --if (not hasattr(ssl, 'SSLContext') or -- not hasattr(ssl, 'create_default_context') or -- not hasattr(ssl, 'match_hostname')): -- raise ImportError("Tornado requires an up-to-date SSL module. This means " -- "Python 2.7.9+ or 3.4+ (although some distributions have " -- "backported the necessary changes to older versions).") -- - setup( - name="tornado", - version=version, --- -2.14.4 - diff --git a/buildroot/package/python-tornado/Config.in b/buildroot/package/python-tornado/Config.in index 1afbdc572..e1bf8343f 100644 --- a/buildroot/package/python-tornado/Config.in +++ b/buildroot/package/python-tornado/Config.in @@ -1,12 +1,8 @@ config BR2_PACKAGE_PYTHON_TORNADO bool "python-tornado" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_SINGLEDISPATCH if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_BACKPORTS_ABC if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_CERTIFI if BR2_PACKAGE_PYTHON # runtime + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_ZLIB + select BR2_PACKAGE_PYTHON3_SSL help Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed. diff --git a/buildroot/package/python-tornado/python-tornado.hash b/buildroot/package/python-tornado/python-tornado.hash index fbf5efa60..2aec0144e 100644 --- a/buildroot/package/python-tornado/python-tornado.hash +++ b/buildroot/package/python-tornado/python-tornado.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tornado/json -md5 a1ce4f392d30ff0ebcb255150d89b826 tornado-5.1.1.tar.gz -sha256 4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409 tornado-5.1.1.tar.gz +md5 cab4b11480f6d032e46465586192d343 tornado-6.0.3.tar.gz +sha256 c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9 tornado-6.0.3.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/python-tornado/python-tornado.mk b/buildroot/package/python-tornado/python-tornado.mk index 71f536f02..e326fadcb 100644 --- a/buildroot/package/python-tornado/python-tornado.mk +++ b/buildroot/package/python-tornado/python-tornado.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TORNADO_VERSION = 5.1.1 +PYTHON_TORNADO_VERSION = 6.0.3 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/e6/78/6e7b5af12c12bdf38ca9bfe863fcaf53dc10430a312d0324e76c1e5ca426 +PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/30/78/2d2823598496127b21423baffaa186b668f73cd91887fcef78b6eade136b PYTHON_TORNADO_LICENSE = Apache-2.0 PYTHON_TORNADO_LICENSE_FILES = LICENSE PYTHON_TORNADO_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-tqdm/Config.in b/buildroot/package/python-tqdm/Config.in new file mode 100644 index 000000000..89b571fe6 --- /dev/null +++ b/buildroot/package/python-tqdm/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_TQDM + bool "python-tqdm" + help + A Fast, Extensible Progress Bar for Python and CLI. + + https://tqdm.github.io diff --git a/buildroot/package/python-tqdm/python-tqdm.hash b/buildroot/package/python-tqdm/python-tqdm.hash new file mode 100644 index 000000000..8a61b29ad --- /dev/null +++ b/buildroot/package/python-tqdm/python-tqdm.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/project/tqdm +md5 285af1f905f4c375f03a86a667047950 tqdm-4.40.1.tar.gz +sha256 e405d16c98fcf30725d0c9d493ed07302a18846b5452de5253030ccd18996f87 tqdm-4.40.1.tar.gz +# Locally computed sha256 checksums +sha256 1bbf12d09d437844527b3cdaba01d379dac651b5cbb5ebb0d764274684d2680b LICENCE diff --git a/buildroot/package/python-tqdm/python-tqdm.mk b/buildroot/package/python-tqdm/python-tqdm.mk new file mode 100644 index 000000000..4ff4696e6 --- /dev/null +++ b/buildroot/package/python-tqdm/python-tqdm.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-tqdm +# +################################################################################ + +PYTHON_TQDM_VERSION = 4.40.1 +PYTHON_TQDM_SOURCE = tqdm-$(PYTHON_TQDM_VERSION).tar.gz +PYTHON_TQDM_SITE = https://files.pythonhosted.org/packages/4c/45/830c5c4bfaba60ef7d356a53c7751a86c81d148a16fda0daf3ac5ca8e288 +PYTHON_TQDM_SETUP_TYPE = setuptools +PYTHON_TQDM_LICENSE = MPL-2.0, MIT +PYTHON_TQDM_LICENSE_FILES = LICENCE + +$(eval $(python-package)) diff --git a/buildroot/package/python-traitlets/python-traitlets.hash b/buildroot/package/python-traitlets/python-traitlets.hash index 23aa1591c..068db553c 100644 --- a/buildroot/package/python-traitlets/python-traitlets.hash +++ b/buildroot/package/python-traitlets/python-traitlets.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/traitlets/json, sha256 locally computed -md5 3068663f2f38fd939a9eb3a500ccc154 traitlets-4.3.2.tar.gz -sha256 9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835 traitlets-4.3.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/traitlets/json +md5 3a4f263af65d3d79f1c279f0247077ef traitlets-4.3.3.tar.gz +sha256 d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7 traitlets-4.3.3.tar.gz +# Locally computed sha256 checksums +sha256 71c89129039b870cc92309466c4fbe8f285a82fa0ea36f0e840fa83979cbe31f COPYING.md diff --git a/buildroot/package/python-traitlets/python-traitlets.mk b/buildroot/package/python-traitlets/python-traitlets.mk index 779f5936d..5973caf3b 100644 --- a/buildroot/package/python-traitlets/python-traitlets.mk +++ b/buildroot/package/python-traitlets/python-traitlets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TRAITLETS_VERSION = 4.3.2 +PYTHON_TRAITLETS_VERSION = 4.3.3 PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz -PYTHON_TRAITLETS_SITE = https://pypi.python.org/packages/a5/98/7f5ef2fe9e9e071813aaf9cb91d1a732e0a68b6c44a32b38cb8e14c3f069 +PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/75/b0/43deb021bc943f18f07cbe3dac1d681626a48997b7ffa1e7fb14ef922b21 PYTHON_TRAITLETS_LICENSE = BSD-3-Clause PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md PYTHON_TRAITLETS_SETUP_TYPE = distutils diff --git a/buildroot/package/python-treq/Config.in b/buildroot/package/python-treq/Config.in index 3a121ea71..23056e72d 100644 --- a/buildroot/package/python-treq/Config.in +++ b/buildroot/package/python-treq/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_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_INCREMENTAL # runtime select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime diff --git a/buildroot/package/python-treq/python-treq.hash b/buildroot/package/python-treq/python-treq.hash index 14f39460f..a2c0ea33f 100644 --- a/buildroot/package/python-treq/python-treq.hash +++ b/buildroot/package/python-treq/python-treq.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/treq/json, sha256 locally computed -md5 7e1f5079b85ec104d4759fc0fb89071e treq-17.8.0.tar.gz -sha256 ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16 treq-17.8.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/treq/json +md5 a8e33a4b3259b45e08e1e0a5960f76f7 treq-18.6.0.tar.gz +sha256 91e09ff6b524cc90aa5e934b909c8d0d1a9d36ebd618b6c38e37b17013e69f48 treq-18.6.0.tar.gz +# Locally computed sha256 checksums sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE diff --git a/buildroot/package/python-treq/python-treq.mk b/buildroot/package/python-treq/python-treq.mk index 73c47152a..a79e2bac7 100644 --- a/buildroot/package/python-treq/python-treq.mk +++ b/buildroot/package/python-treq/python-treq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TREQ_VERSION = 17.8.0 +PYTHON_TREQ_VERSION = 18.6.0 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz -PYTHON_TREQ_SITE = https://pypi.python.org/packages/11/3e/1014f26bfd4d07db015ad48384446b3bdc4de4bbdd2eba3be7fbb149cc44 +PYTHON_TREQ_SITE = https://pypi.python.org/packages/cb/c5/c83628d7e1a5d62a71eab0a5d1cdcdc53b49ead873f52975457ff2a8ae21 PYTHON_TREQ_LICENSE = MIT PYTHON_TREQ_LICENSE_FILES = LICENSE PYTHON_TREQ_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-twisted/Config.in b/buildroot/package/python-twisted/Config.in index b72952f97..4e24a3f71 100644 --- a/buildroot/package/python-twisted/Config.in +++ b/buildroot/package/python-twisted/Config.in @@ -12,3 +12,22 @@ config BR2_PACKAGE_PYTHON_TWISTED Python. https://twistedmatrix.com/trac/ + +if BR2_PACKAGE_PYTHON_TWISTED + +config BR2_PACKAGE_PYTHON_TWISTED_HTTP2 + bool "HTTP2 support" + select BR2_PACKAGE_PYTHON_H2 # runtime + select BR2_PACKAGE_PYTHON_PRIORITY # runtime + +config BR2_PACKAGE_PYTHON_TWISTED_TLS + bool "TLS support" + depends on BR2_INSTALL_LIBSTDCPP # python-{pyopenssl,service-identity} + select BR2_PACKAGE_PYTHON_IDNA # runtime + select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime + select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime + +comment "TLS support needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + +endif diff --git a/buildroot/package/python-twisted/python-twisted.hash b/buildroot/package/python-twisted/python-twisted.hash index 884dce130..2ce30d0fb 100644 --- a/buildroot/package/python-twisted/python-twisted.hash +++ b/buildroot/package/python-twisted/python-twisted.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/twisted/json -md5 20fe2ec156e6e45b0b0d2ff06d9e828f Twisted-18.9.0.tar.bz2 -sha256 294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395 Twisted-18.9.0.tar.bz2 +md5 f2d70f7a66ecdf54152310164cceadfe Twisted-19.10.0.tar.bz2 +sha256 7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d Twisted-19.10.0.tar.bz2 # Locally computed sha256 -sha256 17305fcdb49a4048310be5b43e9f3cfa9525c508a5117089d8b2ee91800c327b LICENSE +sha256 85b798413ba885b06cc1b91efe857a39f694071c29b04e80d23ea26ee271d613 LICENSE diff --git a/buildroot/package/python-twisted/python-twisted.mk b/buildroot/package/python-twisted/python-twisted.mk index a62637f0d..71748fc90 100644 --- a/buildroot/package/python-twisted/python-twisted.mk +++ b/buildroot/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 18.9.0 +PYTHON_TWISTED_VERSION = 19.10.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/5d/0e/a72d85a55761c2c3ff1cb968143a2fd5f360220779ed90e0fadf4106d4f2 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/0b/95/5fff90cd4093c79759d736e5f7c921c8eb7e5057a70d753cdb4e8e5895d7 PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-txdbus/Config.in b/buildroot/package/python-txdbus/Config.in new file mode 100644 index 000000000..f38bbf93f --- /dev/null +++ b/buildroot/package/python-txdbus/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_TXDBUS + bool "python-txdbus" + select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + help + A native Python implementation of the DBus protocol for + Twisted applications. + + https://github.com/cocagne/txdbus diff --git a/buildroot/package/python-txdbus/python-txdbus.hash b/buildroot/package/python-txdbus/python-txdbus.hash new file mode 100644 index 000000000..60740e29d --- /dev/null +++ b/buildroot/package/python-txdbus/python-txdbus.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/txdbus/json +sha256 eefcffa4efbf82ba11222f17f5989fe1b2b6ef57226ef896c4a7084c990ba217 txdbus-1.1.1.tar.gz +md5 ce8a0e0a17cdbada725e3159802ae75f txdbus-1.1.1.tar.gz diff --git a/buildroot/package/python-txdbus/python-txdbus.mk b/buildroot/package/python-txdbus/python-txdbus.mk new file mode 100644 index 000000000..d8e7a7bee --- /dev/null +++ b/buildroot/package/python-txdbus/python-txdbus.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-txdbus +# +################################################################################ + +PYTHON_TXDBUS_VERSION = 1.1.1 +PYTHON_TXDBUS_SOURCE = txdbus-$(PYTHON_TXDBUS_VERSION).tar.gz +PYTHON_TXDBUS_SITE = https://files.pythonhosted.org/packages/4a/68/dfd06f3f349999cbbb31eade239fe76fbff2d6a905eb7d20449666d1b2ce +PYTHON_TXDBUS_SETUP_TYPE = setuptools +PYTHON_TXDBUS_LICENSE = MIT + +$(eval $(python-package)) diff --git a/buildroot/package/python-txtorcon/python-txtorcon.hash b/buildroot/package/python-txtorcon/python-txtorcon.hash index ffc4e8379..803933f1e 100644 --- a/buildroot/package/python-txtorcon/python-txtorcon.hash +++ b/buildroot/package/python-txtorcon/python-txtorcon.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txtorcon/json -md5 7e6ef4d29c2cc51e85614cd2d57bf8df txtorcon-19.0.0.tar.gz -sha256 3731b740653e3f551412744f1fcd7fa6f04aa9fa37c90dc6c9152e619886bf3b txtorcon-19.0.0.tar.gz +md5 fb323f9874298a8145dbe8d43c387932 txtorcon-19.1.0.tar.gz +sha256 25d8e52c3eac45bb90ff958ca7cdd7674fb3284e3a50826a58ab7b9578b15ea5 txtorcon-19.1.0.tar.gz # Locally computed sha256 checksums -sha256 3ada1c32ef38c23d96d7f4e8f4a226c527f51e0202883c7543b06f9cc5228a2b LICENSE +sha256 3ada1c32ef38c23d96d7f4e8f4a226c527f51e0202883c7543b06f9cc5228a2b LICENSE diff --git a/buildroot/package/python-txtorcon/python-txtorcon.mk b/buildroot/package/python-txtorcon/python-txtorcon.mk index 7bf1c252b..a01c0b251 100644 --- a/buildroot/package/python-txtorcon/python-txtorcon.mk +++ b/buildroot/package/python-txtorcon/python-txtorcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXTORCON_VERSION = 19.0.0 +PYTHON_TXTORCON_VERSION = 19.1.0 PYTHON_TXTORCON_SOURCE = txtorcon-$(PYTHON_TXTORCON_VERSION).tar.gz -PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/b7/93/e16d8160bac3a19d13c9ead9ac6b38f837f2534d40884109a334be1f849c +PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/8c/26/d5b2fba4ffbcb23957ff2cee4d7d0a2d667372b9eb04807058bd561c8e8f PYTHON_TXTORCON_SETUP_TYPE = setuptools PYTHON_TXTORCON_LICENSE = MIT PYTHON_TXTORCON_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-typepy/python-typepy.hash b/buildroot/package/python-typepy/python-typepy.hash index 9ecac881e..03f7aef2e 100644 --- a/buildroot/package/python-typepy/python-typepy.hash +++ b/buildroot/package/python-typepy/python-typepy.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/typepy/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/typepy/json md5 b9abd4d661dabe512e95ca69ddb65d55 typepy-0.0.20.tar.gz +# Locally computed sha256 a1a5b9438670d4a5d9f882b7499ea85d06dc384577bb7636cb29d903288bca8c typepy-0.0.20.tar.gz +sha256 bebbdf0524a147f89a615fff53d79bdc90cbc7631550fb4b725cd3f3bdcd24f6 LICENSE diff --git a/buildroot/package/python-typing/python-typing.hash b/buildroot/package/python-typing/python-typing.hash index 5bdb8c62e..8796a4c2e 100644 --- a/buildroot/package/python-typing/python-typing.hash +++ b/buildroot/package/python-typing/python-typing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/typing/json -md5 64614206b4bdc0864fc0e0bccd69efc9 typing-3.6.6.tar.gz -sha256 4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d typing-3.6.6.tar.gz +md5 0a1ebd4af65b4769e33459004eb20345 typing-3.7.4.1.tar.gz +sha256 91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23 typing-3.7.4.1.tar.gz # Locally computed sha256 checksums sha256 ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad LICENSE diff --git a/buildroot/package/python-typing/python-typing.mk b/buildroot/package/python-typing/python-typing.mk index 663227dfc..689448124 100644 --- a/buildroot/package/python-typing/python-typing.mk +++ b/buildroot/package/python-typing/python-typing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TYPING_VERSION = 3.6.6 +PYTHON_TYPING_VERSION = 3.7.4.1 PYTHON_TYPING_SOURCE = typing-$(PYTHON_TYPING_VERSION).tar.gz -PYTHON_TYPING_SITE = https://files.pythonhosted.org/packages/bf/9b/2bf84e841575b633d8d91ad923e198a415e3901f228715524689495b4317 +PYTHON_TYPING_SITE = https://files.pythonhosted.org/packages/67/b0/b2ea2bd67bfb80ea5d12a5baa1d12bda002cab3b6c9b48f7708cd40c34bf PYTHON_TYPING_SETUP_TYPE = setuptools PYTHON_TYPING_LICENSE = Python-2.0, others PYTHON_TYPING_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-u-msgpack/python-u-msgpack.hash b/buildroot/package/python-u-msgpack/python-u-msgpack.hash index e24c9f3f9..70c67c728 100644 --- a/buildroot/package/python-u-msgpack/python-u-msgpack.hash +++ b/buildroot/package/python-u-msgpack/python-u-msgpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/u-msgpack-python/json -md5 ba0ec9036933edbbf33a344a5c72dd14 u-msgpack-python-2.5.0.tar.gz -sha256 7ff18ae3721fa75571f9329c08f7c0120416a6ae36194bd8674f65b3b78d0702 u-msgpack-python-2.5.0.tar.gz +md5 bbeedd924f3d8c8ee90611914b3594e6 u-msgpack-python-2.5.2.tar.gz +sha256 09c85a8af77376034396681e76bf30c249a4fd8e5ebb239f8a468d3655f210d0 u-msgpack-python-2.5.2.tar.gz # Locally computed sha256 sha256 0603a3e697a80b13640e3023bb534727f683ada5c4b0b0149d001ec5272d64f4 LICENSE diff --git a/buildroot/package/python-u-msgpack/python-u-msgpack.mk b/buildroot/package/python-u-msgpack/python-u-msgpack.mk index bcb12b203..6d98e5522 100644 --- a/buildroot/package/python-u-msgpack/python-u-msgpack.mk +++ b/buildroot/package/python-u-msgpack/python-u-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_U_MSGPACK_VERSION = 2.5.0 +PYTHON_U_MSGPACK_VERSION = 2.5.2 PYTHON_U_MSGPACK_SOURCE = u-msgpack-python-$(PYTHON_U_MSGPACK_VERSION).tar.gz -PYTHON_U_MSGPACK_SITE = https://files.pythonhosted.org/packages/f5/97/36d5ac7d71451e282051e48219cc825637f617a8f620a2edf90ab61b7f97 +PYTHON_U_MSGPACK_SITE = https://files.pythonhosted.org/packages/75/c4/d9404382d0f7d9be27b5d13498d033a4faa83f325b3893e1c29a0faa83b9 PYTHON_U_MSGPACK_SETUP_TYPE = setuptools PYTHON_U_MSGPACK_LICENSE = MIT PYTHON_U_MSGPACK_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-ubjson/python-ubjson.hash b/buildroot/package/python-ubjson/python-ubjson.hash index f93ae1acd..a7e954ce5 100644 --- a/buildroot/package/python-ubjson/python-ubjson.hash +++ b/buildroot/package/python-ubjson/python-ubjson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/py-ubjson/json -md5 5dbbecd3dbecd744e45f27f14e2da5e1 py-ubjson-0.12.0.tar.gz -sha256 b796cb5077a06c932f0d148f4eef4ce0f045a05cb14393177a6d034be9f8e364 py-ubjson-0.12.0.tar.gz +md5 26c07be8e4c9f2b0ee7c42a9aca118ed py-ubjson-0.14.0.tar.gz +sha256 f742c87bccc8653329d3f79b8b3f40d44d11d17cce7f6d7025a73c52ebf91c66 py-ubjson-0.14.0.tar.gz # Locally computed sha256 checksums sha256 ca182abcb84ad9984c9af2e30cb70c4fe0e1772674355207e8fcdb85e8c5e75f LICENSE diff --git a/buildroot/package/python-ubjson/python-ubjson.mk b/buildroot/package/python-ubjson/python-ubjson.mk index 477cc400c..58bba2ac7 100644 --- a/buildroot/package/python-ubjson/python-ubjson.mk +++ b/buildroot/package/python-ubjson/python-ubjson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UBJSON_VERSION = 0.12.0 +PYTHON_UBJSON_VERSION = 0.14.0 PYTHON_UBJSON_SOURCE = py-ubjson-$(PYTHON_UBJSON_VERSION).tar.gz -PYTHON_UBJSON_SITE = https://files.pythonhosted.org/packages/68/9c/a6c34e565351f0b04bcf6835e38bc4bd0647269dc48670e12eb99a3f5ef5 +PYTHON_UBJSON_SITE = https://files.pythonhosted.org/packages/10/31/0d8297c33d681aafa3fe900ca072a96d5acb97e79082fbb593e835376c93 PYTHON_UBJSON_LICENSE = Apache-2.0 PYTHON_UBJSON_LICENSE_FILES = LICENSE PYTHON_UBJSON_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-urllib3/python-urllib3.hash b/buildroot/package/python-urllib3/python-urllib3.hash index b3f903891..91b9e4462 100644 --- a/buildroot/package/python-urllib3/python-urllib3.hash +++ b/buildroot/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 1efcddca675b80f3ac110439921fc66b urllib3-1.24.3.tar.gz -sha256 2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4 urllib3-1.24.3.tar.gz +md5 a7504a9fcb7ed4ffa482fe098c80b6d4 urllib3-1.25.6.tar.gz +sha256 9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86 urllib3-1.25.6.tar.gz # Locally computed sha256 checksums -sha256 11db569430ca5ad793f1399297b8df5041a22137abaf90642ea71da21d59121c LICENSE.txt +sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt diff --git a/buildroot/package/python-urllib3/python-urllib3.mk b/buildroot/package/python-urllib3/python-urllib3.mk index 309e18f10..8383cbe8e 100644 --- a/buildroot/package/python-urllib3/python-urllib3.mk +++ b/buildroot/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.24.3 +PYTHON_URLLIB3_VERSION = 1.25.6 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/8a/3c/1bb7ef6c435dea026f06ed9f3ba16aa93f9f4f5d3857a51a35dfa00882f1 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/ff/44/29655168da441dff66de03952880c6e2d17b252836ff1aa4421fba556424 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-urwid/python-urwid.hash b/buildroot/package/python-urwid/python-urwid.hash index c60085164..51a6e12ea 100644 --- a/buildroot/package/python-urwid/python-urwid.hash +++ b/buildroot/package/python-urwid/python-urwid.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/urwid/json, sha256 locally computed -md5 2e1a005cb31368fe21bfeba2d6ad5a5c urwid-1.3.1.tar.gz -sha256 cfcec03e36de25a1073e2e35c2c7b0cc6969b85745715c3a025a31d9786896a1 urwid-1.3.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/urwid/json +md5 c70a7016fa1ad2c2a979dbebd4de78c2 urwid-2.0.1.tar.gz +sha256 644d3e3900867161a2fc9287a9762753d66bd194754679adb26aede559bcccbc urwid-2.0.1.tar.gz +# Locally computed sha256 +sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/buildroot/package/python-urwid/python-urwid.mk b/buildroot/package/python-urwid/python-urwid.mk index 4cfee477e..f8a370234 100644 --- a/buildroot/package/python-urwid/python-urwid.mk +++ b/buildroot/package/python-urwid/python-urwid.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URWID_VERSION = 1.3.1 +PYTHON_URWID_VERSION = 2.0.1 PYTHON_URWID_SOURCE = urwid-$(PYTHON_URWID_VERSION).tar.gz -PYTHON_URWID_SITE = https://pypi.python.org/packages/source/u/urwid +PYTHON_URWID_SITE = https://files.pythonhosted.org/packages/c7/90/415728875c230fafd13d118512bde3184d810d7bf798a631abc05fac09d0 PYTHON_URWID_LICENSE = LGPL-2.1+ PYTHON_URWID_LICENSE_FILES = COPYING PYTHON_URWID_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-uvloop/python-uvloop.hash b/buildroot/package/python-uvloop/python-uvloop.hash index 2eaa92d6d..436babf91 100644 --- a/buildroot/package/python-uvloop/python-uvloop.hash +++ b/buildroot/package/python-uvloop/python-uvloop.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/uvloop/json -md5 9584c5e372755f752e47c2ff8419efe1 uvloop-0.11.3.tar.gz -sha256 fd5042d0a2ea07b92d0e2190f7711feb91cde31cf2bf1829e2e8c4c0fdd1f1aa uvloop-0.11.3.tar.gz +md5 a2f82abb676756f11f544c6b51caf171 uvloop-0.14.0.tar.gz +sha256 123ac9c0c7dd71464f58f1b4ee0bbd81285d96cdda8bc3519281b8973e3a461e uvloop-0.14.0.tar.gz # Locally computed sha256 checksums sha256 2fdc436a67077941295c58647f521fbef8f50e46db0970552fa1a4dd8ae261c6 LICENSE-APACHE sha256 9185f3c77e9f6ef8859a6ba4c94128ac1329876be3e813aad32d7645e51ae409 LICENSE-MIT diff --git a/buildroot/package/python-uvloop/python-uvloop.mk b/buildroot/package/python-uvloop/python-uvloop.mk index 037cca388..3ee8d299a 100644 --- a/buildroot/package/python-uvloop/python-uvloop.mk +++ b/buildroot/package/python-uvloop/python-uvloop.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVLOOP_VERSION = 0.11.3 +PYTHON_UVLOOP_VERSION = 0.14.0 PYTHON_UVLOOP_SOURCE = uvloop-$(PYTHON_UVLOOP_VERSION).tar.gz -PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/46/60/8e46188acba22369848d5e9bcbee3ca04b68a12d0598bd625c1a3994f5df +PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/84/2e/462e7a25b787d2b40cf6c9864a9e702f358349fc9cfb77e83c38acb73048 PYTHON_UVLOOP_SETUP_TYPE = setuptools PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/buildroot/package/python-validators/python-validators.hash b/buildroot/package/python-validators/python-validators.hash index 8c6e3f9ec..1a3aa7998 100644 --- a/buildroot/package/python-validators/python-validators.hash +++ b/buildroot/package/python-validators/python-validators.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/validators/json -md5 9c9583f91972163b3b736033bb929d8a validators-0.12.2.tar.gz -sha256 172ac45f7d1944ce4beca3c5c53ca7c83e9759e39fd3fedc1cf28e2130268706 validators-0.12.2.tar.gz +md5 ae3932b693452b96f037c919e1d7250f validators-0.14.2.tar.gz +sha256 b192e6bde7d617811d59f50584ed240b580375648cd032d106edeb3164099508 validators-0.14.2.tar.gz # Locally computed sha256 checksums sha256 a7fd9d761c7ca1c6508b9baf030f6e21f5752d1caea3e49a270634aa9ef01e6f LICENSE diff --git a/buildroot/package/python-validators/python-validators.mk b/buildroot/package/python-validators/python-validators.mk index e94476f83..e24ce35fd 100644 --- a/buildroot/package/python-validators/python-validators.mk +++ b/buildroot/package/python-validators/python-validators.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_VALIDATORS_VERSION = 0.12.2 +PYTHON_VALIDATORS_VERSION = 0.14.2 PYTHON_VALIDATORS_SOURCE = validators-$(PYTHON_VALIDATORS_VERSION).tar.gz -PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/45/7b/5b7b74208a3e0744d1a0efbfb1935fa46fa4cfe58d3d63f17c49c58c429c +PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/4d/56/9b48c918ef118ea12b90f227c4498ed4703b418bdd8fb49479dfcbeae4ef PYTHON_VALIDATORS_SETUP_TYPE = setuptools PYTHON_VALIDATORS_LICENSE = BSD PYTHON_VALIDATORS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-watchdog/0001-Add-a-workaround-to-support-uClibc-library.patch b/buildroot/package/python-watchdog/0001-Add-a-workaround-to-support-uClibc-library.patch deleted file mode 100644 index c21e6cd08..000000000 --- a/buildroot/package/python-watchdog/0001-Add-a-workaround-to-support-uClibc-library.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c3b3c4581b25d7e62f5c2ce1484133229d5e657a Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Fri, 16 Feb 2018 13:26:23 +0100 -Subject: [PATCH] Add a workaround to support uClibc library - -uClibc based systems provide only libc.so.0 and libc.so.1 -symlinks. - -So try to find libc.so.0 if neither libc.so nor libc.so.6 -could be found. - -Signed-off-by: Yegor Yefremov ---- - src/watchdog/observers/inotify_c.py | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/watchdog/observers/inotify_c.py b/src/watchdog/observers/inotify_c.py -index 5f208b6..0dc7b50 100644 ---- a/src/watchdog/observers/inotify_c.py -+++ b/src/watchdog/observers/inotify_c.py -@@ -45,7 +45,19 @@ def _load_libc(): - try: - return ctypes.CDLL('libc.so') - except (OSError, IOError): -+ pass -+ -+ try: - return ctypes.CDLL('libc.so.6') -+ except (OSError, IOError): -+ pass -+ -+ # uClibc -+ try: -+ return ctypes.CDLL('libc.so.0') -+ except (OSError, IOError) as err: -+ raise err -+ - - libc = _load_libc() - --- -2.1.4 - diff --git a/buildroot/package/python-watchdog/python-watchdog.hash b/buildroot/package/python-watchdog/python-watchdog.hash index 9da2b37a7..701c7991a 100644 --- a/buildroot/package/python-watchdog/python-watchdog.hash +++ b/buildroot/package/python-watchdog/python-watchdog.hash @@ -1,4 +1,7 @@ -# md5 from https://pypi.python.org/pypi/watchdog/json -md5 bb16926bccc98eae2a04535e4512ddf1 watchdog-0.8.3.tar.gz -# sha256 calculated by scanpypi -sha256 7e65882adb7746039b6f3876ee174952f8eaaa34491ba34333ddf1fe35de4162 watchdog-0.8.3.tar.gz +# md5, sha256 from https://pypi.python.org/pypi/watchdog/json +md5 7cdc103f607e72fc32c206301a72d1b2 watchdog-0.9.0.tar.gz +sha256 965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d watchdog-0.9.0.tar.gz + +# Hash for license files +sha256 14e636faf5889138a1bb7a8498ccbb0266aee31d2dc475201a10448e56ed3d96 COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/python-watchdog/python-watchdog.mk b/buildroot/package/python-watchdog/python-watchdog.mk index 3dd92e3a3..44929a65a 100644 --- a/buildroot/package/python-watchdog/python-watchdog.mk +++ b/buildroot/package/python-watchdog/python-watchdog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WATCHDOG_VERSION = 0.8.3 +PYTHON_WATCHDOG_VERSION = 0.9.0 PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz -PYTHON_WATCHDOG_SITE = https://pypi.python.org/packages/54/7d/c7c0ad1e32b9f132075967fc353a244eb2b375a3d2f5b0ce612fd96e107e +PYTHON_WATCHDOG_SITE = https://pypi.python.org/packages/bb/e3/5a55d48a29300160779f0a0d2776d17c1b762a2039b36de528b093b87d5b PYTHON_WATCHDOG_SETUP_TYPE = setuptools PYTHON_WATCHDOG_LICENSE = Apache-2.0 PYTHON_WATCHDOG_LICENSE_FILES = LICENSE COPYING diff --git a/buildroot/package/python-wcwidth/python-wcwidth.hash b/buildroot/package/python-wcwidth/python-wcwidth.hash index a3ab50fae..07ce8508a 100644 --- a/buildroot/package/python-wcwidth/python-wcwidth.hash +++ b/buildroot/package/python-wcwidth/python-wcwidth.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/wcwidth/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/wcwidth/json md5 b3b6a0a08f0c8a34d1de8cf44150a4ad wcwidth-0.1.7.tar.gz -sha256 3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e wcwidth-0.1.7.tar.gz +# Locally computed +sha256 3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e wcwidth-0.1.7.tar.gz +sha256 0eddcc52cd3ef5d30798b8d43a14d3f0f1dcf0a6e4c1d0f2e177c44ce85bb69c LICENSE.txt diff --git a/buildroot/package/python-web2py/0001-gluon-languages.py-import-escape-from-html-instead-o.patch b/buildroot/package/python-web2py/0001-gluon-languages.py-import-escape-from-html-instead-o.patch new file mode 100644 index 000000000..d6321e559 --- /dev/null +++ b/buildroot/package/python-web2py/0001-gluon-languages.py-import-escape-from-html-instead-o.patch @@ -0,0 +1,49 @@ +From cf3c8e6ac8c428151dc191510554b4ee2705958d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 30 Oct 2019 10:08:35 +0100 +Subject: [PATCH] gluon/languages.py: import escape from html instead of cgi + +import escape from html and fallback on current import from cgi to fix +the following build failure with python 3.8: + +/home/buildroot/autobuild/run/instance-2/output-1/host/bin/python -c 'import os; os.chdir("/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2"); from gluon.main import save_password; save_password("web2py",8000)' +Traceback (most recent call last): + File "", line 1, in + File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/__init__.py", line 34, in + from .globals import current + File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/globals.py", line 24, in + from gluon.serializers import json, custom_json + File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/serializers.py", line 10, in + from gluon.languages import lazyT + File "/home/buildroot/autobuild/run/instance-2/output-1/build/python-web2py-2.17.2/gluon/languages.py", line 19, in + from cgi import escape +ImportError: cannot import name 'escape' from 'cgi' (/home/buildroot/autobuild/run/instance-2/output-1/host/lib/python3.8/cgi.py) + +Fixes: + - http://autobuild.buildroot.org/results/fa515627ae888d08fc10074e8d9f6e9dbede91a7 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/web2py/web2py/pull/2272] +--- + gluon/languages.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/gluon/languages.py b/gluon/languages.py +index 9ed60f9c..554d7339 100644 +--- a/gluon/languages.py ++++ b/gluon/languages.py +@@ -16,7 +16,10 @@ import re + import sys + import pkgutil + import logging +-from cgi import escape ++try: ++ from html import escape ++except ImportError: ++ from cgi import escape + from threading import RLock + + from pydal._compat import copyreg, PY2, maketrans, iterkeys, unicodeT, to_unicode, to_bytes, iteritems, to_native, pjoin +-- +2.23.0 + diff --git a/buildroot/package/python-web2py/python-web2py.hash b/buildroot/package/python-web2py/python-web2py.hash index 9a1df0c2a..57ac02c2a 100644 --- a/buildroot/package/python-web2py/python-web2py.hash +++ b/buildroot/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 8205a7a08595ca1a41919750a8dc4e431258966cb46c8021564b25003cf90863 python-web2py-R-2.17.2.tar.gz +sha256 8205a7a08595ca1a41919750a8dc4e431258966cb46c8021564b25003cf90863 python-web2py-2.17.2.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/buildroot/package/python-web2py/python-web2py.mk b/buildroot/package/python-web2py/python-web2py.mk index 922b267b8..8706c8796 100644 --- a/buildroot/package/python-web2py/python-web2py.mk +++ b/buildroot/package/python-web2py/python-web2py.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = R-2.17.2 -PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,$(PYTHON_WEB2PY_VERSION)) +PYTHON_WEB2PY_VERSION = 2.17.2 +PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,R-$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE PYTHON_WEB2PY_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \ @@ -57,9 +57,6 @@ endef define PYTHON_WEB2PY_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/python-web2py/web2py.service \ $(TARGET_DIR)/usr/lib/systemd/system/web2py.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib//systemd/system/web2py.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/web2py.service endef # www-data user and group are used for web2py. Because these user and group diff --git a/buildroot/package/python-webencodings/Config.in b/buildroot/package/python-webencodings/Config.in new file mode 100644 index 000000000..52c723545 --- /dev/null +++ b/buildroot/package/python-webencodings/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_WEBENCODINGS + bool "python-webencodings" + help + Character encoding aliases for legacy web content. + + https://github.com/SimonSapin/python-webencodings diff --git a/buildroot/package/python-webencodings/python-webencodings.hash b/buildroot/package/python-webencodings/python-webencodings.hash new file mode 100644 index 000000000..90f5e6626 --- /dev/null +++ b/buildroot/package/python-webencodings/python-webencodings.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/webencodings/json +md5 32f6e261d52e57bf7e1c4d41546d15b8 webencodings-0.5.1.tar.gz +sha256 b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 webencodings-0.5.1.tar.gz +# Locally computed sha256 checksumms +sha256 c27693b0174d6d04dafd0242857ae72763f5404b675972c777fd865bc3c0abe1 PKG-INFO diff --git a/buildroot/package/python-webencodings/python-webencodings.mk b/buildroot/package/python-webencodings/python-webencodings.mk new file mode 100644 index 000000000..63c6d3737 --- /dev/null +++ b/buildroot/package/python-webencodings/python-webencodings.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-webencodings +# +################################################################################ + +PYTHON_WEBENCODINGS_VERSION = 0.5.1 +PYTHON_WEBENCODINGS_SOURCE = webencodings-$(PYTHON_WEBENCODINGS_VERSION).tar.gz +PYTHON_WEBENCODINGS_SITE = https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47 +PYTHON_WEBENCODINGS_SETUP_TYPE = setuptools +PYTHON_WEBENCODINGS_LICENSE = BSD-3-Clause +PYTHON_WEBENCODINGS_LICENSE_FILES = PKG-INFO + +$(eval $(python-package)) diff --git a/buildroot/package/python-webob/python-webob.hash b/buildroot/package/python-webob/python-webob.hash index 41e8af34f..af3c7a085 100644 --- a/buildroot/package/python-webob/python-webob.hash +++ b/buildroot/package/python-webob/python-webob.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/WebOb/json -md5 afea95e4f08330a0529ae33137caf4f0 WebOb-1.8.1.tar.gz -sha256 54f35073d2fdcddd7a98c2a1dedeede49739150737164a787220f30283139ba6 WebOb-1.8.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/webob/json +md5 1761f416e8cf53f6fb674149cc223bd1 WebOb-1.8.5.tar.gz +sha256 05aaab7975e0ee8af2026325d656e5ce14a71f1883c52276181821d6d5bf7086 WebOb-1.8.5.tar.gz # Locally computed sha256 checksums sha256 27bc4919e7e9e6b6cda40644517ca74d32203e32fba89ef832aba1ed93e457b3 docs/license.txt diff --git a/buildroot/package/python-webob/python-webob.mk b/buildroot/package/python-webob/python-webob.mk index fdf479389..fd9b2d1b3 100644 --- a/buildroot/package/python-webob/python-webob.mk +++ b/buildroot/package/python-webob/python-webob.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBOB_VERSION = 1.8.1 +PYTHON_WEBOB_VERSION = 1.8.5 PYTHON_WEBOB_SOURCE = WebOb-$(PYTHON_WEBOB_VERSION).tar.gz -PYTHON_WEBOB_SITE = https://files.pythonhosted.org/packages/ea/93/675ec37b631c823877718164b74fc057203c8979fd771bf60f711d64550b +PYTHON_WEBOB_SITE = https://files.pythonhosted.org/packages/9d/1a/0c89c070ee2829c934cb6c7082287c822e28236a4fcf90063e6be7c35532 PYTHON_WEBOB_SETUP_TYPE = setuptools PYTHON_WEBOB_LICENSE = MIT PYTHON_WEBOB_LICENSE_FILES = docs/license.txt diff --git a/buildroot/package/python-webpy/Config.in b/buildroot/package/python-webpy/Config.in index 5f4df7832..419a4a180 100644 --- a/buildroot/package/python-webpy/Config.in +++ b/buildroot/package/python-webpy/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_WEBPY bool "python-webpy" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_HASHLIB + depends on BR2_PACKAGE_PYTHON3 # python-cheroot + select BR2_PACKAGE_PYTHON_CHEROOT # runtime + select BR2_PACKAGE_PYTHON_MARKDOWN # runtime help web.py is a web framework for Python that is as simple as it is powerful. diff --git a/buildroot/package/python-webpy/python-webpy.hash b/buildroot/package/python-webpy/python-webpy.hash index 70981e0cb..6af6abeff 100644 --- a/buildroot/package/python-webpy/python-webpy.hash +++ b/buildroot/package/python-webpy/python-webpy.hash @@ -1,4 +1,5 @@ -# Locally computed -sha256 f074241a0b839408a0b9840ade1198e16fbd6aa6393a48a0e84f73b545baab9a python-webpy-webpy-0.39.tar.gz -sha256 3826fd531a9b904841f5e3560fcda7e93f2ab8d11ef124ec65e10625efa26c34 LICENSE.txt -sha256 7347fd17bfd33c4093c31dc77076733e1e0150ce8c13296c56dc042bbecede84 web/wsgiserver/LICENSE.txt +# md5, sha256 from https://pypi.org/pypi/web.py/json +md5 4e7ec89e7ae1e938d01fff01ba752606 web.py-0.40.tar.gz +sha256 dc5e42ffbc42d77d07f75b7acca9975a3368ae609774e49ddebb497a784131f3 web.py-0.40.tar.gz +# Locally computed sha256 checksums +sha256 791bf6e9419435f114a19fc6519ff33738021eb3c41b18490943230ab0894df9 LICENSE.txt diff --git a/buildroot/package/python-webpy/python-webpy.mk b/buildroot/package/python-webpy/python-webpy.mk index 192ba5727..187a48128 100644 --- a/buildroot/package/python-webpy/python-webpy.mk +++ b/buildroot/package/python-webpy/python-webpy.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_WEBPY_VERSION = webpy-0.39 -PYTHON_WEBPY_SITE = $(call github,webpy,webpy,$(PYTHON_WEBPY_VERSION)) +PYTHON_WEBPY_VERSION = 0.40 +PYTHON_WEBPY_SOURCE = web.py-$(PYTHON_WEBPY_VERSION).tar.gz +PYTHON_WEBPY_SITE = https://files.pythonhosted.org/packages/e3/23/ed84b174add09153329c6357984c8433e2f350de91c3859fa48c3cdbf7dc PYTHON_WEBPY_SETUP_TYPE = setuptools -PYTHON_WEBPY_LICENSE = Public Domain, CherryPy License -PYTHON_WEBPY_LICENSE_FILES = LICENSE.txt web/wsgiserver/LICENSE.txt +PYTHON_WEBPY_LICENSE = Public Domain +PYTHON_WEBPY_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) diff --git a/buildroot/package/python-websocket-client/python-websocket-client.hash b/buildroot/package/python-websocket-client/python-websocket-client.hash index 3672ca074..968c1ab21 100644 --- a/buildroot/package/python-websocket-client/python-websocket-client.hash +++ b/buildroot/package/python-websocket-client/python-websocket-client.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/websocket-client/json, sha256 locally computed -md5 790b3ecb5364293ad70c59a1b92debb1 websocket_client-0.47.0.tar.gz -sha256 a453dc4dfa6e0db3d8fd7738a308a88effe6240c59f3226eb93e8f020c216149 websocket_client-0.47.0.tar.gz -sha256 e580b2a1a57c33085dd6a07cff693d828f7c3fa8a11ce56ade2a62c46951930d LICENSE +# md5, sha256 from https://pypi.org/pypi/websocket-client/json +md5 8061820da5e1de26a6a1a6996d4eebd5 websocket_client-0.57.0.tar.gz +sha256 d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010 websocket_client-0.57.0.tar.gz +# Locally computed sha256 checksums +sha256 a47b06717e8a3cf01d1307141287b1b4fa17fe4bb8785633d2fc6f57cb71d05e LICENSE diff --git a/buildroot/package/python-websocket-client/python-websocket-client.mk b/buildroot/package/python-websocket-client/python-websocket-client.mk index 58c8407db..58cb597c2 100644 --- a/buildroot/package/python-websocket-client/python-websocket-client.mk +++ b/buildroot/package/python-websocket-client/python-websocket-client.mk @@ -4,11 +4,14 @@ # ################################################################################ -PYTHON_WEBSOCKET_CLIENT_VERSION = 0.47.0 +PYTHON_WEBSOCKET_CLIENT_VERSION = 0.57.0 PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz -PYTHON_WEBSOCKET_CLIENT_SITE = https://pypi.python.org/packages/c9/bb/8d3dd9063cfe0cd5d03fe6a1f74ddd948f384e9c1eff0eb978f3976a7d27 +PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/8b/0f/52de51b9b450ed52694208ab952d5af6ebbcbce7f166a48784095d930d8c PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools -PYTHON_WEBSOCKET_CLIENT_LICENSE = LGPL-2.1+ +# Project was under LGPL-2.1+, but was relicensed under +# BSD-3-Clause. The LICENSE file contains the BSD-3-Clause text, but +# the source files still contain a LGPL-2.1+ header. +PYTHON_WEBSOCKET_CLIENT_LICENSE = LGPL-2.1+, BSD-3-Clause PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python-websockets/python-websockets.hash b/buildroot/package/python-websockets/python-websockets.hash index 4939c7834..ec387c9ab 100644 --- a/buildroot/package/python-websockets/python-websockets.hash +++ b/buildroot/package/python-websockets/python-websockets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/websockets/json -md5 76cf931a525a3415f5a4f59c133e89c3 websockets-6.0.tar.gz -sha256 8f3b956d11c5b301206382726210dc1d3bee1a9ccf7aadf895aaf31f71c3716c websockets-6.0.tar.gz +md5 a37f0e22c3aa5f1cf12a6a3ae22b36ca websockets-8.0.2.tar.gz +sha256 882a7266fa867a2ebb2c0baaa0f9159cabf131cf18c1b4270d79ad42f9208dc5 websockets-8.0.2.tar.gz # Locally computed sha256 checksums -sha256 2cd4d416e432ca7fda2c103b38b852f8d3cb327d70c3db44410b9fe97e6c4d73 LICENSE +sha256 8a88960c0d6aa8b38faa6ee614597dbf18e0ea22ba20884ef3dd31d34b2a6d09 LICENSE diff --git a/buildroot/package/python-websockets/python-websockets.mk b/buildroot/package/python-websockets/python-websockets.mk index 4d547ada8..013881f95 100644 --- a/buildroot/package/python-websockets/python-websockets.mk +++ b/buildroot/package/python-websockets/python-websockets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKETS_VERSION = 6.0 +PYTHON_WEBSOCKETS_VERSION = 8.0.2 PYTHON_WEBSOCKETS_SOURCE = websockets-$(PYTHON_WEBSOCKETS_VERSION).tar.gz -PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/4e/2a/56e60bb4c3696bc736998cc13c3fa1a36210609d7e1a3f2519857b420245 +PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/79/78/17e97a159dc55308b1468a638c7267f19765281f6205ec9c15253c154022 PYTHON_WEBSOCKETS_SETUP_TYPE = setuptools PYTHON_WEBSOCKETS_LICENSE = BSD-3-Clause PYTHON_WEBSOCKETS_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-werkzeug/python-werkzeug.hash b/buildroot/package/python-werkzeug/python-werkzeug.hash index 4b2075071..cc90fe140 100644 --- a/buildroot/package/python-werkzeug/python-werkzeug.hash +++ b/buildroot/package/python-werkzeug/python-werkzeug.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/Werkzeug/json, sha256 locally computed -md5 e385b2c5a7193cff24c689b31e1124dc Werkzeug-0.12.2.tar.gz -sha256 903a7b87b74635244548b30d30db4c8947fe64c5198f58899ddcd3a13c23bb26 Werkzeug-0.12.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/werkzeug/json +md5 5b23b4953efc4f52b1d0b33af6f7cd2d Werkzeug-0.16.0.tar.gz +sha256 7280924747b5733b246fe23972186c6b348f9ae29724135a6dfc1e53cea433e7 Werkzeug-0.16.0.tar.gz +# Locally computed sha256 checksums +sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/buildroot/package/python-werkzeug/python-werkzeug.mk b/buildroot/package/python-werkzeug/python-werkzeug.mk index 6d478f7c1..fea25f8ee 100644 --- a/buildroot/package/python-werkzeug/python-werkzeug.mk +++ b/buildroot/package/python-werkzeug/python-werkzeug.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 0.12.2 +PYTHON_WERKZEUG_VERSION = 0.16.0 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://pypi.python.org/packages/56/41/c095a77eb2dd69bf278dd664a97d3416af04e9ba1a00b8c138f772741d31 +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/5e/fd/eb19e4f6a806cd6ee34900a687f181001c7a0059ff914752091aba84681f PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause -PYTHON_WERKZEUG_LICENSE_FILES = LICENSE +PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst $(eval $(python-package)) diff --git a/buildroot/package/python-whoosh/python-whoosh.hash b/buildroot/package/python-whoosh/python-whoosh.hash index 0621a2a2d..c615beb9c 100644 --- a/buildroot/package/python-whoosh/python-whoosh.hash +++ b/buildroot/package/python-whoosh/python-whoosh.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/whoosh/json, sha256 locally computed +# md5 from https://pypi.python.org/pypi/whoosh/json md5 c2710105f20b3e29936bd2357383c325 Whoosh-2.7.4.tar.gz -sha256 7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83 Whoosh-2.7.4.tar.gz +# Locally computed +sha256 7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83 Whoosh-2.7.4.tar.gz +sha256 464ef68037a0e5545e4716b4ff99f3f85ca89cf9e9a7ecfd7a02039ba1c34a90 LICENSE.txt diff --git a/buildroot/package/python-wrapt/python-wrapt.hash b/buildroot/package/python-wrapt/python-wrapt.hash index dbf893295..feab3f056 100644 --- a/buildroot/package/python-wrapt/python-wrapt.hash +++ b/buildroot/package/python-wrapt/python-wrapt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/wrapt/json -md5 e1346f31782d50401f81c2345b037076 wrapt-1.10.11.tar.gz -sha256 d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6 wrapt-1.10.11.tar.gz +md5 cc15c001b129f81eb2f79b15eb99ffe5 wrapt-1.11.2.tar.gz +sha256 565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1 wrapt-1.11.2.tar.gz # Locally computed sha256 checksums -sha256 b6d2e5d228202a11bc5e5988661fc5d8acc1ba4f27256c37e19029131a30b1f2 LICENSE +sha256 e37c13f84fb3c9a54161b0fcf75f4d302fb86ce42cd6106147bda79e4197d9f2 LICENSE diff --git a/buildroot/package/python-wrapt/python-wrapt.mk b/buildroot/package/python-wrapt/python-wrapt.mk index dd8b9a58e..91f9d7f52 100644 --- a/buildroot/package/python-wrapt/python-wrapt.mk +++ b/buildroot/package/python-wrapt/python-wrapt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WRAPT_VERSION = 1.10.11 +PYTHON_WRAPT_VERSION = 1.11.2 PYTHON_WRAPT_SOURCE = wrapt-$(PYTHON_WRAPT_VERSION).tar.gz -PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/a0/47/66897906448185fcb77fc3c2b1bc20ed0ecca81a0f2f88eda3fc5a34fc3d +PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/23/84/323c2415280bc4fc880ac5050dddfb3c8062c2552b34c2e512eb4aa68f79 PYTHON_WRAPT_SETUP_TYPE = distutils PYTHON_WRAPT_LICENSE = BSD-2-Clause PYTHON_WRAPT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch b/buildroot/package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch new file mode 100644 index 000000000..07fbb6ccc --- /dev/null +++ b/buildroot/package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch @@ -0,0 +1,55 @@ +From dfe6f65b7078315c32cebb727e9c47ead7603475 Mon Sep 17 00:00:00 2001 +From: Asaf Kahlon +Date: Sun, 13 Oct 2019 16:44:44 +0300 +Subject: [PATCH 1/1] Adjust ws4py for Python 3.7 syntax + +Since Python 3.7, "async" has become a keyword and cannot be used. +Thus, instead of asyncio.async we will use asyncio.ensure_future. + +There's also a pull request with this change: +https://github.com/Lawouach/WebSocket-for-Python/pull/245 + +Signed-off-by: Asaf Kahlon +--- + ws4py/async_websocket.py | 4 ++-- + ws4py/server/tulipserver.py | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ws4py/async_websocket.py b/ws4py/async_websocket.py +index 9e2a4c7..ea296b4 100644 +--- a/ws4py/async_websocket.py ++++ b/ws4py/async_websocket.py +@@ -84,7 +84,7 @@ class WebSocket(_WebSocket): + def closeit(): + yield from self.proto.writer.drain() + self.proto.writer.close() +- asyncio.async(closeit()) ++ asyncio.ensure_future(closeit()) + + def _write(self, data): + """ +@@ -94,7 +94,7 @@ class WebSocket(_WebSocket): + def sendit(data): + self.proto.writer.write(data) + yield from self.proto.writer.drain() +- asyncio.async(sendit(data)) ++ asyncio.ensure_future(sendit(data)) + + @asyncio.coroutine + def run(self): +diff --git a/ws4py/server/tulipserver.py b/ws4py/server/tulipserver.py +index 2786c16..85312a2 100644 +--- a/ws4py/server/tulipserver.py ++++ b/ws4py/server/tulipserver.py +@@ -40,7 +40,7 @@ class WebSocketProtocol(asyncio.StreamReaderProtocol): + #self.stream.set_transport(transport) + asyncio.StreamReaderProtocol.connection_made(self, transport) + # Let make it concurrent for others to tag along +- f = asyncio.async(self.handle_initial_handshake()) ++ f = asyncio.ensure_future(self.handle_initial_handshake()) + f.add_done_callback(self.terminated) + + @property +-- +2.20.1 + diff --git a/buildroot/package/python-ws4py/python-ws4py.hash b/buildroot/package/python-ws4py/python-ws4py.hash index 13469cb03..109768d28 100644 --- a/buildroot/package/python-ws4py/python-ws4py.hash +++ b/buildroot/package/python-ws4py/python-ws4py.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/ws4py/json, sha256 locally computed -md5 f0603ae376707a58d205bd87a67758a2 ws4py-0.4.2.tar.gz -sha256 7ac69ce3e6ec6917a5d678b65f0a18e244a4dc670db6414bc0271b3f4911237f ws4py-0.4.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/ws4py/json +md5 68e0cfae9659dd059ff7e7a8218af548 ws4py-0.5.1.tar.gz +sha256 29d073d7f2e006373e6a848b1d00951a1107eb81f3742952be905429dc5a5483 ws4py-0.5.1.tar.gz +# Locally computed sha256 checksums +sha256 3c98d9e820de01b1ae3be846419700ab9cefa22b09aa0ef441b3bfd5613c3ba1 LICENSE diff --git a/buildroot/package/python-ws4py/python-ws4py.mk b/buildroot/package/python-ws4py/python-ws4py.mk index ec5b4aff3..edfd5d0df 100644 --- a/buildroot/package/python-ws4py/python-ws4py.mk +++ b/buildroot/package/python-ws4py/python-ws4py.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_WS4PY_VERSION = 0.4.2 +PYTHON_WS4PY_VERSION = 0.5.1 PYTHON_WS4PY_SOURCE = ws4py-$(PYTHON_WS4PY_VERSION).tar.gz -PYTHON_WS4PY_SITE = https://pypi.python.org/packages/b8/98/a90f1d96ffcb15dfc220af524ce23e0a5881258dafa197673357ce1683dd +PYTHON_WS4PY_SITE = https://files.pythonhosted.org/packages/53/20/4019a739b2eefe9282d3822ef6a225250af964b117356971bd55e274193c PYTHON_WS4PY_SETUP_TYPE = setuptools PYTHON_WS4PY_LICENSE = BSD-3-Clause -PYTHON_WS4PY_LICENSE_FILES = ws4py/__init__.py +PYTHON_WS4PY_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python-xlib/python-xlib.hash b/buildroot/package/python-xlib/python-xlib.hash index 2c4861af5..e51461fc2 100644 --- a/buildroot/package/python-xlib/python-xlib.hash +++ b/buildroot/package/python-xlib/python-xlib.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/python-xlib/json, sha256 locally computed -md5 cdf342aa145c2be0ccae46cfb7b62551 python-xlib-0.21.tar.bz2 -sha256 25aad0056172920552c01a163e979b02336abaf47b0792dae9c93ecb29500431 python-xlib-0.21.tar.bz2 -sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE +# md5, sha256 from https://pypi.org/pypi/python-xlib/json +md5 ded820dc8e943106bd660801ed7a82f7 python-xlib-0.25.tar.bz2 +sha256 204f280b549352af6cbdaff43405186822ae05749518dd9be209bd88a0088f99 python-xlib-0.25.tar.bz2 +# Locally computed sha256 checksums +sha256 06eb1c441443cf15ac84f309003f4c43c62246939d37c75fc3e056c2d34cd300 LICENSE diff --git a/buildroot/package/python-xlib/python-xlib.mk b/buildroot/package/python-xlib/python-xlib.mk index 0ce6e4342..3ffc4e2ee 100644 --- a/buildroot/package/python-xlib/python-xlib.mk +++ b/buildroot/package/python-xlib/python-xlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLIB_VERSION = 0.21 +PYTHON_XLIB_VERSION = 0.25 PYTHON_XLIB_SOURCE = python-xlib-$(PYTHON_XLIB_VERSION).tar.bz2 -PYTHON_XLIB_SITE = https://pypi.python.org/packages/eb/de/b0eaaea7b8512dc41504db071824eef30293ff55c58d83081ebaebe85a38 +PYTHON_XLIB_SITE = https://files.pythonhosted.org/packages/3c/d9/51fc07ae57f6a44e62e2ee04bd501d763ac169ff05c838403ec7ae556992 PYTHON_XLIB_SETUP_TYPE = setuptools PYTHON_XLIB_LICENSE = LGPL-2.1+ PYTHON_XLIB_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-xlrd/python-xlrd.hash b/buildroot/package/python-xlrd/python-xlrd.hash index 8075605a9..0a66a2112 100644 --- a/buildroot/package/python-xlrd/python-xlrd.hash +++ b/buildroot/package/python-xlrd/python-xlrd.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/xlrd/json -md5 9a91b688cd4945477ac28187a54f9a3b xlrd-1.0.0.tar.gz -# sha256 calculated by scanpypi -sha256 0ff87dd5d50425084f7219cb6f86bb3eb5aa29063f53d50bf270ed007e941069 xlrd-1.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/xlrd/json +md5 e5d5b96924d791b22898b622eb3e918e xlrd-1.2.0.tar.gz +sha256 546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2 xlrd-1.2.0.tar.gz +# locally calculated +sha256 b5a5dbce60265e305a815a6cb83ed07f24519d8ba644f2a307994488bced8815 LICENSE diff --git a/buildroot/package/python-xlrd/python-xlrd.mk b/buildroot/package/python-xlrd/python-xlrd.mk index 5d1363886..c94e054b5 100644 --- a/buildroot/package/python-xlrd/python-xlrd.mk +++ b/buildroot/package/python-xlrd/python-xlrd.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_XLRD_VERSION = 1.0.0 +PYTHON_XLRD_VERSION = 1.2.0 PYTHON_XLRD_SOURCE = xlrd-$(PYTHON_XLRD_VERSION).tar.gz -PYTHON_XLRD_SITE = https://pypi.python.org/packages/42/85/25caf967c2d496067489e0bb32df069a8361e1fd96a7e9f35408e56b3aab +PYTHON_XLRD_SITE = https://files.pythonhosted.org/packages/aa/05/ec9d4fcbbb74bbf4da9f622b3b61aec541e4eccf31d3c60c5422ec027ce2 PYTHON_XLRD_SETUP_TYPE = setuptools PYTHON_XLRD_LICENSE = BSD-3-Clause -PYTHON_XLRD_LICENSE_FILES = xlrd/licences.py +PYTHON_XLRD_LICENSE_FILES = LICENSE $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/buildroot/package/python-xlsxwriter/python-xlsxwriter.hash b/buildroot/package/python-xlsxwriter/python-xlsxwriter.hash index a7d440164..59890b725 100644 --- a/buildroot/package/python-xlsxwriter/python-xlsxwriter.hash +++ b/buildroot/package/python-xlsxwriter/python-xlsxwriter.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/xlsxwriter/json, sha256 locally computed -md5 3c2831e80fae83070f61f0a9226f45ac XlsxWriter-0.9.6.tar.gz -sha256 b51c00a1d6572ba35e8c06e0af8dd14c34977ef0b5022c3d85d5f1de9f1220c3 XlsxWriter-0.9.6.tar.gz +# md5, sha256 from https://pypi.org/pypi/XlsxWriter/json +md5 799bf9c16ff58a7c38509b1895b7bc63 XlsxWriter-1.2.2.tar.gz +sha256 5a5e2195a4672d17db79839bbdf1006a521adb57eaceea1c335ae4b3d19f088f XlsxWriter-1.2.2.tar.gz +# Locally computed sha256 checksums +sha256 777cb44c00ba1c2905686fa32f2ca3ba17422b96fc229be3d8f0f1333bc4ecfe LICENSE.txt diff --git a/buildroot/package/python-xlsxwriter/python-xlsxwriter.mk b/buildroot/package/python-xlsxwriter/python-xlsxwriter.mk index 2c86e5d2b..ccc2fc7eb 100644 --- a/buildroot/package/python-xlsxwriter/python-xlsxwriter.mk +++ b/buildroot/package/python-xlsxwriter/python-xlsxwriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLSXWRITER_VERSION = 0.9.6 +PYTHON_XLSXWRITER_VERSION = 1.2.2 PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz -PYTHON_XLSXWRITER_SITE = https://pypi.python.org/packages/c9/e0/c2b2f57bf53c84af3d2a41a82af7025828cb2bc8a312848a6ab7d018de56 +PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/73/78/3ea62c5ad7255a0ff676c87ea88b152090b2178cb27325ba3bb0bb4122c9 PYTHON_XLSXWRITER_SETUP_TYPE = setuptools PYTHON_XLSXWRITER_LICENSE = BSD-2-Clause PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/python-xlutils/python-xlutils.hash b/buildroot/package/python-xlutils/python-xlutils.hash index 4f99860cb..aa507883a 100644 --- a/buildroot/package/python-xlutils/python-xlutils.hash +++ b/buildroot/package/python-xlutils/python-xlutils.hash @@ -2,3 +2,5 @@ md5 7a6a339ddaacabce244341582ee61353 xlutils-2.0.0.tar.gz # sha256 calculated by scanpypi sha256 7e0e2c233bd185fecf5e2bd3f4e9469ca4a3bd87da64c82cfe5b2af27e7f9e54 xlutils-2.0.0.tar.gz +# Locally computed +sha256 28907976ee86414cc720fafc966563b16eeb6a6aeb1da5f5ed40bac3a8808bcf xlutils/license.txt diff --git a/buildroot/package/python-xlwt/python-xlwt.hash b/buildroot/package/python-xlwt/python-xlwt.hash index 452388705..8b0511fda 100644 --- a/buildroot/package/python-xlwt/python-xlwt.hash +++ b/buildroot/package/python-xlwt/python-xlwt.hash @@ -1,3 +1,5 @@ -# md5 from https://pypi.python.org/pypi/xlwt/json, sha256 locally computed -md5 1f2673a93c221f0195f342c578f04968 xlwt-1.2.0.tar.gz -sha256 505669c1eb6a60823fd3e2e723b60eea95f2c56254113bf163091ed2bedb4ac9 xlwt-1.2.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/xlwt/json +md5 4b1ca8a3cef3261f4b4dc3f138e383a8 xlwt-1.3.0.tar.gz +sha256 c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88 xlwt-1.3.0.tar.gz +# Locally computed +sha256 7f7b66f23fdac4f68fe3b342dd16b329d511017a901784a5ceb83f505f2de7c6 docs/licenses.rst diff --git a/buildroot/package/python-xlwt/python-xlwt.mk b/buildroot/package/python-xlwt/python-xlwt.mk index f8a298a48..aaeeffc50 100644 --- a/buildroot/package/python-xlwt/python-xlwt.mk +++ b/buildroot/package/python-xlwt/python-xlwt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLWT_VERSION = 1.2.0 +PYTHON_XLWT_VERSION = 1.3.0 PYTHON_XLWT_SOURCE = xlwt-$(PYTHON_XLWT_VERSION).tar.gz -PYTHON_XLWT_SITE = https://pypi.python.org/packages/5b/8d/22b9ec552a1d7865de39f54bd15f9db09c72a6bf8ab77b11dcce4ae336bb +PYTHON_XLWT_SITE = https://files.pythonhosted.org/packages/06/97/56a6f56ce44578a69343449aa5a0d98eefe04085d69da539f3034e2cd5c1 PYTHON_XLWT_SETUP_TYPE = setuptools PYTHON_XLWT_LICENSE = BSD-3-Clause, BSD-4-Clause PYTHON_XLWT_LICENSE_FILES = docs/licenses.rst diff --git a/buildroot/package/python-xmltodict/python-xmltodict.hash b/buildroot/package/python-xmltodict/python-xmltodict.hash index 4cb265e9b..16422d78c 100644 --- a/buildroot/package/python-xmltodict/python-xmltodict.hash +++ b/buildroot/package/python-xmltodict/python-xmltodict.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/xmltodict/json, sha256 locally computed -md5 9f955947db085485873ac68154e88069 xmltodict-0.11.0.tar.gz -sha256 8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df xmltodict-0.11.0.tar.gz -sha256 d66d5eb8f83a0ba21d3dd04318b8817588e8764daabea852d1035e3f07ffda55 LICENSE +# md5, sha256 from https://pypi.org/pypi/xmltodict/json +md5 ddb2bd078cef4f7e3021a578034ad941 xmltodict-0.12.0.tar.gz +sha256 50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21 xmltodict-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 d66d5eb8f83a0ba21d3dd04318b8817588e8764daabea852d1035e3f07ffda55 LICENSE diff --git a/buildroot/package/python-xmltodict/python-xmltodict.mk b/buildroot/package/python-xmltodict/python-xmltodict.mk index 66007dfb8..05be4b3c6 100644 --- a/buildroot/package/python-xmltodict/python-xmltodict.mk +++ b/buildroot/package/python-xmltodict/python-xmltodict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XMLTODICT_VERSION = 0.11.0 +PYTHON_XMLTODICT_VERSION = 0.12.0 PYTHON_XMLTODICT_SOURCE = xmltodict-$(PYTHON_XMLTODICT_VERSION).tar.gz -PYTHON_XMLTODICT_SITE = https://pypi.python.org/packages/57/17/a6acddc5f5993ea6eaf792b2e6c3be55e3e11f3b85206c818572585f61e1 +PYTHON_XMLTODICT_SITE = https://files.pythonhosted.org/packages/58/40/0d783e14112e064127063fbf5d1fe1351723e5dfe9d6daad346a305f6c49 PYTHON_XMLTODICT_SETUP_TYPE = setuptools PYTHON_XMLTODICT_LICENSE = MIT PYTHON_XMLTODICT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-yarl/python-yarl.hash b/buildroot/package/python-yarl/python-yarl.hash index 1cb070843..b3910e9af 100644 --- a/buildroot/package/python-yarl/python-yarl.hash +++ b/buildroot/package/python-yarl/python-yarl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/yarl/json -md5 92889c31fce4c8f82b7ee9c2b2ed9cd1 yarl-1.3.0.tar.gz -sha256 024ecdc12bc02b321bc66b41327f930d1c2c543fa9a561b39861da9388ba7aa9 yarl-1.3.0.tar.gz +md5 08ba0d6e18f460b44d9e5459f3d217ba yarl-1.4.2.tar.gz +sha256 58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b yarl-1.4.2.tar.gz # Locally computed sha256 checksums sha256 14c0820503ceef15e814a89b037d9efc066870087018294b6ae0f27163872cc5 LICENSE diff --git a/buildroot/package/python-yarl/python-yarl.mk b/buildroot/package/python-yarl/python-yarl.mk index f18572478..1f9b95a9c 100644 --- a/buildroot/package/python-yarl/python-yarl.mk +++ b/buildroot/package/python-yarl/python-yarl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YARL_VERSION = 1.3.0 +PYTHON_YARL_VERSION = 1.4.2 PYTHON_YARL_SOURCE = yarl-$(PYTHON_YARL_VERSION).tar.gz -PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/fb/84/6d82f6be218c50b547aa29d0315e430cf8a23c52064c92d0a8377d7b7357 +PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/d6/67/6e2507586eb1cfa6d55540845b0cd05b4b77c414f6bca8b00b45483b976e PYTHON_YARL_LICENSE = Apache-2.0 PYTHON_YARL_LICENSE_FILES = LICENSE PYTHON_YARL_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-yieldfrom/python-yieldfrom.hash b/buildroot/package/python-yieldfrom/python-yieldfrom.hash index 2df808532..7730a1e57 100644 --- a/buildroot/package/python-yieldfrom/python-yieldfrom.hash +++ b/buildroot/package/python-yieldfrom/python-yieldfrom.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/yieldfrom/json, sha256 locally computed -md5 1a1c6fd152032d49ccd4ac250aad7746 yieldfrom-1.0.3.tar.gz -sha256 388004d0ee8854c2ed7a2c87e664aad13acd70c9b33d7f3c441182d37357739b yieldfrom-1.0.3.tar.gz -sha256 3695faeb17a2507f445b7e0a454043671f646591795477ced20e29de2359d666 PKG-INFO +# md5, sha256 from https://pypi.org/pypi/yieldfrom/json +md5 fd94120625ac1e69bb5946d5e63182da yieldfrom-1.0.5.tar.gz +sha256 eb75e58641410f06083f85013a438f28bceaabfe5af9c3206d5049362c37aca0 yieldfrom-1.0.5.tar.gz +# Locally computed sha256 checksums +sha256 b3092d61cce29e25f3799285495095d220e5e015b88c1c70e1e72dae052f21e8 LICENSE diff --git a/buildroot/package/python-yieldfrom/python-yieldfrom.mk b/buildroot/package/python-yieldfrom/python-yieldfrom.mk index b1137cdbb..c926936ae 100644 --- a/buildroot/package/python-yieldfrom/python-yieldfrom.mk +++ b/buildroot/package/python-yieldfrom/python-yieldfrom.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_YIELDFROM_VERSION = 1.0.3 +PYTHON_YIELDFROM_VERSION = 1.0.5 PYTHON_YIELDFROM_SOURCE = yieldfrom-$(PYTHON_YIELDFROM_VERSION).tar.gz -PYTHON_YIELDFROM_SITE = https://pypi.python.org/packages/de/2d/05524f368e691846824d962b64f983e3fde9b8c10839e7efbc1b51d42de3 +PYTHON_YIELDFROM_SITE = https://files.pythonhosted.org/packages/4d/f9/395917f574ace618eb234bcbae8df3fabaa9624532d96d1fbd3a20678b1e PYTHON_YIELDFROM_SETUP_TYPE = setuptools PYTHON_YIELDFROM_LICENSE = MIT -PYTHON_YIELDFROM_LICENSE_FILES = PKG-INFO +PYTHON_YIELDFROM_LICENSE_FILES = LICENSE $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/buildroot/package/python-zc-lockfile/Config.in b/buildroot/package/python-zc-lockfile/Config.in new file mode 100644 index 000000000..928f3604b --- /dev/null +++ b/buildroot/package/python-zc-lockfile/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_ZC_LOCKFILE + bool "python-zc-lockfile" + help + Basic inter-process locks. + + https://github.com/zopefoundation/zc.lockfile diff --git a/buildroot/package/python-zc-lockfile/python-zc-lockfile.hash b/buildroot/package/python-zc-lockfile/python-zc-lockfile.hash new file mode 100644 index 000000000..4a9c19488 --- /dev/null +++ b/buildroot/package/python-zc-lockfile/python-zc-lockfile.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/zc.lockfile/json +md5 3895445752278ddcc4578658c3c9a492 zc.lockfile-2.0.tar.gz +sha256 307ad78227e48be260e64896ec8886edc7eae22d8ec53e4d528ab5537a83203b zc.lockfile-2.0.tar.gz +# Locally computed sha256 checksums +sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt diff --git a/buildroot/package/python-zc-lockfile/python-zc-lockfile.mk b/buildroot/package/python-zc-lockfile/python-zc-lockfile.mk new file mode 100644 index 000000000..a4621e6d0 --- /dev/null +++ b/buildroot/package/python-zc-lockfile/python-zc-lockfile.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-zc-lockfile +# +################################################################################ + +PYTHON_ZC_LOCKFILE_VERSION = 2.0 +PYTHON_ZC_LOCKFILE_SOURCE = zc.lockfile-$(PYTHON_ZC_LOCKFILE_VERSION).tar.gz +PYTHON_ZC_LOCKFILE_SITE = https://files.pythonhosted.org/packages/11/98/f21922d501ab29d62665e7460c94f5ed485fd9d8348c126697947643a881 +PYTHON_ZC_LOCKFILE_SETUP_TYPE = setuptools +PYTHON_ZC_LOCKFILE_LICENSE = ZPL-2.1 +PYTHON_ZC_LOCKFILE_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot/package/python-zeroconf/Config.in b/buildroot/package/python-zeroconf/Config.in index ac1acbbd8..a56bf7c16 100644 --- a/buildroot/package/python-zeroconf/Config.in +++ b/buildroot/package/python-zeroconf/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_ZEROCONF bool "python-zeroconf" depends on BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_NETIFACES # runtime + select BR2_PACKAGE_PYTHON_IFADDR # runtime help Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible). diff --git a/buildroot/package/python-zeroconf/python-zeroconf.hash b/buildroot/package/python-zeroconf/python-zeroconf.hash index 1677affa1..a4239b678 100644 --- a/buildroot/package/python-zeroconf/python-zeroconf.hash +++ b/buildroot/package/python-zeroconf/python-zeroconf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zeroconf/json -md5 23124285dbdfcf3cb9cca11b98216cf7 zeroconf-0.20.0.tar.gz -sha256 6e3f1e7b5871e3d1410ac29b9fb85aafc1e2d661ed596b07a6f84559a475efcb zeroconf-0.20.0.tar.gz +md5 1094639f8688f2c5b1938029877eb4f2 zeroconf-0.23.0.tar.gz +sha256 e0c333b967c48f8b2e5cc94a1d4d28893023fb06dfd797ee384a94cdd1d0eef5 zeroconf-0.23.0.tar.gz # Locally computed sha256 checksums sha256 bb117c0fbd7f57f64170b690285d7df07c2371b578e3b3cd3aa2e1155ef461a0 COPYING diff --git a/buildroot/package/python-zeroconf/python-zeroconf.mk b/buildroot/package/python-zeroconf/python-zeroconf.mk index 7000a0da7..55da292b4 100644 --- a/buildroot/package/python-zeroconf/python-zeroconf.mk +++ b/buildroot/package/python-zeroconf/python-zeroconf.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZEROCONF_VERSION = 0.20.0 +PYTHON_ZEROCONF_VERSION = 0.23.0 PYTHON_ZEROCONF_SOURCE = zeroconf-$(PYTHON_ZEROCONF_VERSION).tar.gz -PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/20/d7/418ff6c684ace0f5855ec56c66cfa99ec50443c41693b91e9abcccfa096c +PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/d7/25/8bbdd4857820e0cdc380c7e0c3543dc01a55247a1d831c712571783e74ec PYTHON_ZEROCONF_SETUP_TYPE = setuptools PYTHON_ZEROCONF_LICENSE = LGPL-2.1+ PYTHON_ZEROCONF_LICENSE_FILES = COPYING diff --git a/buildroot/package/python/Config.in.host b/buildroot/package/python/Config.in.host new file mode 100644 index 000000000..724e5e223 --- /dev/null +++ b/buildroot/package/python/Config.in.host @@ -0,0 +1,16 @@ +config BR2_PACKAGE_HOST_PYTHON + bool "host python" + help + The python language interpreter. Host package. + + http://www.python.org/ + +if BR2_PACKAGE_HOST_PYTHON + +config BR2_PACKAGE_HOST_PYTHON_SSL + bool "ssl" + select BR2_PACKAGE_HOST_OPENSSL + help + _ssl module for host Python. + +endif diff --git a/buildroot/package/python/python.mk b/buildroot/package/python/python.mk index 29b9e363b..1c393b255 100644 --- a/buildroot/package/python/python.mk +++ b/buildroot/package/python/python.mk @@ -32,7 +32,6 @@ HOST_PYTHON_CONF_OPTS += \ --disable-bsddb \ --disable-test-modules \ --disable-bz2 \ - --disable-ssl \ --disable-ossaudiodev \ --disable-pyo-build @@ -58,6 +57,12 @@ PYTHON_DEPENDENCIES = host-python libffi $(TARGET_NLS_DEPENDENCIES) HOST_PYTHON_DEPENDENCIES = host-expat host-zlib +ifeq ($(BR2_PACKAGE_HOST_PYTHON_SSL),y) +HOST_PYTHON_DEPENDENCIES += host-openssl +else +HOST_PYTHON_CONF_OPTS += --disable-ssl +endif + PYTHON_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y) @@ -235,7 +240,7 @@ HOST_PYTHON_POST_INSTALL_HOOKS += HOST_PYTHON_INSTALL_PYTHON_SYMLINK endif # Provided to other packages -PYTHON_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/sysconfigdata/ +PYTHON_PATH = $(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/sysconfigdata/ $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/python3-mako/python3-mako.hash b/buildroot/package/python3-mako/python3-mako.hash new file mode 120000 index 000000000..068be91fb --- /dev/null +++ b/buildroot/package/python3-mako/python3-mako.hash @@ -0,0 +1 @@ +../python-mako/python-mako.hash \ No newline at end of file diff --git a/buildroot/package/python3-mako/python3-mako.mk b/buildroot/package/python3-mako/python3-mako.mk new file mode 100644 index 000000000..31df4194e --- /dev/null +++ b/buildroot/package/python3-mako/python3-mako.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# python3-mako +# +################################################################################ + +# Please keep in sync with +# package/python-mako/python-mako.mk +PYTHON3_MAKO_VERSION = 1.1.0 +PYTHON3_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz +PYTHON3_MAKO_SITE = https://files.pythonhosted.org/packages/b0/3c/8dcd6883d009f7cae0f3157fb53e9afb05a0d3d33b3db1268ec2e6f4a56b +PYTHON3_MAKO_SETUP_TYPE = setuptools +PYTHON3_MAKO_LICENSE = MIT +PYTHON3_MAKO_LICENSE_FILES = LICENSE +HOST_PYTHON3_MAKO_DL_SUBDIR = python-mako +HOST_PYTHON3_MAKO_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) diff --git a/buildroot/package/python3-setuptools/python3-setuptools.mk b/buildroot/package/python3-setuptools/python3-setuptools.mk index b6de5d4b2..078cd9b07 100644 --- a/buildroot/package/python3-setuptools/python3-setuptools.mk +++ b/buildroot/package/python3-setuptools/python3-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 40.6.3 +PYTHON3_SETUPTOOLS_VERSION = 41.4.0 PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).zip -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/37/1b/b25507861991beeade31473868463dad0e58b1978c209de27384ae541b0b +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/f4/d5/a6c19dcbcbc267aca376558797f036d9bcdff344c9f785fe7d0fe9a5f2a7 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools diff --git a/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index 84bb881aa..00a688477 100644 --- a/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -1,4 +1,4 @@ -From e568f4deb7c648e3265154574db753601636cdda Mon Sep 17 00:00:00 2001 +From 586a67bb448290a98df45e9f61d803952d2aa761 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:21:31 -0800 Subject: [PATCH] Make the build of pyc files conditional @@ -15,30 +15,30 @@ Signed-off-by: Andrey Smirnov 2 files changed, 8 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 82e830727e..b38bd79121 100644 +index 502317aa0c..f9011c132a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1395,6 +1395,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1455,6 +1455,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi +ifeq (@PYC_BUILD@,yes) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ -@@ -1422,6 +1423,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c + -j0 -d $(LIBDEST) -f \ +@@ -1482,6 +1483,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ + -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +endif -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/configure.ac b/configure.ac -index 962006704f..a76b5444df 100644 +index a189d42c2c..4690cdba9f 100644 --- a/configure.ac +++ b/configure.ac -@@ -1107,6 +1107,12 @@ fi +@@ -1085,6 +1085,12 @@ fi AC_MSG_CHECKING(LDLIBRARY) @@ -52,5 +52,5 @@ index 962006704f..a76b5444df 100644 # library that we build, but we do not want to link against it (we # will find it with a -framework option). For this reason there is an -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch index 36b5af033..95db44a4d 100644 --- a/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -1,4 +1,4 @@ -From 8ec1677d16bef6d6ee5cee4ff004dfa3d0428e88 Mon Sep 17 00:00:00 2001 +From 3b558cfb1670300afece09b957e1e4b7072bce6b Mon Sep 17 00:00:00 2001 From: Vanya Sergeev Date: Wed, 23 Dec 2015 11:30:33 +0100 Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling @@ -10,10 +10,10 @@ Signed-off-by: Vanya Sergeev 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index a76b5444df..5f87c4db5a 100644 +index 4690cdba9f..ffeec102b7 100644 --- a/configure.ac +++ b/configure.ac -@@ -4056,7 +4056,7 @@ fi +@@ -4059,7 +4059,7 @@ fi AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) @@ -23,5 +23,5 @@ index a76b5444df..5f87c4db5a 100644 if test $ipv6 = yes then -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch index 506886210..9bdd9b489 100644 --- a/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ b/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch @@ -1,4 +1,4 @@ -From 2c2afc80831c518e5daf3df6c9e4c4ac0a7be001 Mon Sep 17 00:00:00 2001 +From 36c138c15515e80f72a570b61da324e55ae3e80c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:33:22 -0800 Subject: [PATCH] Add infrastructure to disable the build of certain extensions @@ -40,14 +40,14 @@ Signed-off-by: Andrey Smirnov --- Makefile.pre.in | 6 +++++- configure.ac | 2 ++ - setup.py | 6 +++++- - 3 files changed, 12 insertions(+), 2 deletions(-) + setup.py | 5 ++++- + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index b38bd79121..4ce917ab8d 100644 +index f9011c132a..e8a6bd5c03 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -206,6 +206,8 @@ FILEMODE= 644 +@@ -205,6 +205,8 @@ FILEMODE= 644 # configure script arguments CONFIG_ARGS= @CONFIG_ARGS@ @@ -56,7 +56,7 @@ index b38bd79121..4ce917ab8d 100644 # Subdirectories with code SRCDIRS= @SRCDIRS@ -@@ -619,6 +621,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o +@@ -605,6 +607,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o esac; \ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ @@ -64,7 +64,7 @@ index b38bd79121..4ce917ab8d 100644 $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -@@ -1528,7 +1531,8 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1601,7 +1604,8 @@ libainstall: @DEF_MAKE_RULE@ python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -75,10 +75,10 @@ index b38bd79121..4ce917ab8d 100644 --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ diff --git a/configure.ac b/configure.ac -index 5f87c4db5a..d5ee2aedfb 100644 +index ffeec102b7..7872b4dfee 100644 --- a/configure.ac +++ b/configure.ac -@@ -2966,6 +2966,8 @@ LIBS="$withval $LIBS" +@@ -2952,6 +2952,8 @@ LIBS="$withval $LIBS" PKG_PROG_PKG_CONFIG @@ -88,22 +88,21 @@ index 5f87c4db5a..d5ee2aedfb 100644 AC_MSG_CHECKING(for --with-system-expat) AC_ARG_WITH(system_expat, diff --git a/setup.py b/setup.py -index fe477974bd..86643ae8bf 100644 +index 20d7f35652..d3f2cc1b37 100644 --- a/setup.py +++ b/setup.py -@@ -48,7 +48,11 @@ host_platform = get_platform() - COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) +@@ -24,7 +24,10 @@ from distutils.spawn import find_executable + TEST_EXTENSIONS = True # This global variable is used to hold the list of modules to be disabled. --disabled_module_list = [] +-DISABLED_MODULE_LIST = [] +try: -+ disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ") ++ DISABLED_MODULE_LIST = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ") +except KeyError: -+ disabled_module_list = list() -+ ++ DISABLED_MODULE_LIST = list() - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (after any relative + + def get_platform(): -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch index b3a0e5328..0ac511621 100644 --- a/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch +++ b/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From e359a7a3c4f9e70360a068bef19c95938fdacede Mon Sep 17 00:00:00 2001 +From f5ed27c9b9efb4756630e5799be14fefdc3b2702 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:33:14 +0100 Subject: [PATCH] Adjust library/header paths for cross-compilation @@ -21,7 +21,7 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py -index 74de782d8a..d0c847b365 100644 +index 2d7cdf063f..cba150075c 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -234,7 +234,10 @@ class build_ext(Command): @@ -37,11 +37,11 @@ index 74de782d8a..d0c847b365 100644 # building python standard extensions self.library_dirs.append('.') diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 2bcd1dd288..422c13fa4f 100644 +index b51629eb94..011a437bcd 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py -@@ -17,10 +17,17 @@ import sys - from .errors import DistutilsPlatformError +@@ -18,10 +18,17 @@ from .errors import DistutilsPlatformError + from .util import get_platform, get_host_platform # These are needed in a couple of spots, so just compute them once. -PREFIX = os.path.normpath(sys.prefix) @@ -63,5 +63,5 @@ index 2bcd1dd288..422c13fa4f 100644 # Path to the base directory of the project. On Windows the binary may # live in project/PCbuild/win32 or project/PCbuild/amd64. -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch index 8dd54f8b3..935e0c3b5 100644 --- a/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ b/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch @@ -1,4 +1,4 @@ -From 01b588baf835ec95df7c5696eff1f6c07eaa1108 Mon Sep 17 00:00:00 2001 +From 5bcb991a8de2f1b9bdf44e78894417ed2ee137a5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:00 +0100 Subject: [PATCH] Don't look in /usr/lib/termcap for libraries @@ -9,23 +9,23 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index 86643ae8bf..cd00fbdbda 100644 +index d3f2cc1b37..5d504d7638 100644 --- a/setup.py +++ b/setup.py -@@ -894,12 +894,9 @@ class PyBuildExt(build_ext): +@@ -955,12 +955,9 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) -- elif self.compiler.find_library_file(lib_dirs + +- elif self.compiler.find_library_file(self.lib_dirs + - ['/usr/lib/termcap'], - 'termcap'): -+ elif self.compiler.find_library_file(lib_dirs, 'termcap'): ++ elif self.compiler.find_library_file(self.lib_dirs, 'termcap'): readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) + self.add(Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], + extra_link_args=readline_extra_link_args, + libraries=readline_libs)) else: -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch b/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch index a6ba6a857..ab1e295e7 100644 --- a/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch +++ b/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch @@ -1,4 +1,4 @@ -From 9055171433d5f6beae90815e8c075dc1e0938936 Mon Sep 17 00:00:00 2001 +From b878b174e12a5cb2e1943f1f79d94033c1ee80d7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:27 +0100 Subject: [PATCH] Don't add multiarch paths @@ -17,21 +17,21 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index cd00fbdbda..c956fa08d1 100644 +index 5d504d7638..282a592dc6 100644 --- a/setup.py +++ b/setup.py -@@ -591,10 +591,10 @@ class PyBuildExt(build_ext): - if not cross_compiling: +@@ -654,10 +654,10 @@ class PyBuildExt(build_ext): + if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + self.add_multiarch_paths() # only change this for cross builds for 3.3, issues on Mageia - if cross_compiling: - self.add_gcc_paths() + if CROSS_COMPILING: + self.add_cross_compiling_paths() - self.add_multiarch_paths() + self.add_ldflags_cppflags() - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. + def init_inc_lib_dirs(self): -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0007-Abort-on-failed-module-build.patch b/buildroot/package/python3/0007-Abort-on-failed-module-build.patch index e8de7a541..1dcf8a017 100644 --- a/buildroot/package/python3/0007-Abort-on-failed-module-build.patch +++ b/buildroot/package/python3/0007-Abort-on-failed-module-build.patch @@ -1,4 +1,4 @@ -From 63ab4a20076740bd39985c7dee3d6231cdc74c75 Mon Sep 17 00:00:00 2001 +From fceda5bae52571213b6671ce0220d1a85b38f8c7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:43:24 +0100 Subject: [PATCH] Abort on failed module build @@ -14,10 +14,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index c956fa08d1..b3add2be76 100644 +index 282a592dc6..8fda3b4d47 100644 --- a/setup.py +++ b/setup.py -@@ -402,6 +402,7 @@ class PyBuildExt(build_ext): +@@ -444,6 +444,7 @@ class PyBuildExt(build_ext): print("Failed to build these modules:") print_three_column(failed) print() @@ -26,5 +26,5 @@ index c956fa08d1..b3add2be76 100644 if self.failed_on_import: failed = self.failed_on_import[:] -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0008-Serial-ioctl-workaround.patch b/buildroot/package/python3/0008-Serial-ioctl-workaround.patch index 39d40f025..9303e188c 100644 --- a/buildroot/package/python3/0008-Serial-ioctl-workaround.patch +++ b/buildroot/package/python3/0008-Serial-ioctl-workaround.patch @@ -1,4 +1,4 @@ -From 20767cb868ff271f4501a6e023f367400882d75e Mon Sep 17 00:00:00 2001 +From 91e8058cf9085795db64f43e2c9548926ea46ab0 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 Dec 2015 11:44:02 +0100 Subject: [PATCH] Serial ioctl() workaround @@ -15,7 +15,7 @@ Signed-off-by: Baruch Siach 1 file changed, 2 insertions(+) diff --git a/Modules/termios.c b/Modules/termios.c -index b78d33e688..58b0444565 100644 +index aee7f12c57..ba2ff77d06 100644 --- a/Modules/termios.c +++ b/Modules/termios.c @@ -15,7 +15,9 @@ @@ -27,7 +27,7 @@ index b78d33e688..58b0444565 100644 +#undef TIOCTTYGSTRUCT /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, - * MDTR, MRI, and MRTS (appearantly used internally by some things + * MDTR, MRI, and MRTS (apparently used internally by some things -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch index ce84d11bc..32e3bdfea 100644 --- a/buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch +++ b/buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch @@ -1,4 +1,4 @@ -From 8869b15c754ae615203b65a99e043f56770bacd5 Mon Sep 17 00:00:00 2001 +From 3ec9bbf5bd9cced0005c99d7d65997b119abf2f6 Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 23 Dec 2015 11:44:30 +0100 Subject: [PATCH] Do not adjust the shebang of Python scripts for @@ -31,5 +31,5 @@ index ccc70e6465..d6d54195c1 100644 self.build_dir) updated_files.append(outfile) -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch index 31f237e22..a8ccba778 100644 --- a/buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch +++ b/buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch @@ -1,4 +1,4 @@ -From da3880edac19100f69891f225cc2f07a82be1e52 Mon Sep 17 00:00:00 2001 +From 7b3839bcf9f79988fb944cd65717839cde166cb8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 13:24:59 +0100 Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match @@ -25,7 +25,7 @@ Signed-off-by: Peter Korsgaard 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in -index d1d3275..9e259c0 100644 +index 2602fe24c0..a1bc3cd5f7 100644 --- a/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in @@ -24,18 +24,19 @@ installed_prefix () @@ -53,7 +53,7 @@ index d1d3275..9e259c0 100644 VERSION="@VERSION@" LIBM="@LIBM@" LIBC="@LIBC@" -@@ -48,7 +49,7 @@ OPT="@OPT@" +@@ -49,7 +50,7 @@ OPT="@OPT@" PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" LDVERSION="@LDVERSION@" LIBDEST=${prefix_real}/lib/python${VERSION} @@ -63,5 +63,5 @@ index d1d3275..9e259c0 100644 PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" -- -2.14.3 +2.20.1 diff --git a/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch index 2444c4da3..1a40b74d2 100644 --- a/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch +++ b/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch @@ -1,4 +1,4 @@ -From 660ea434ad8f921db74c0e3f93aa3ff5daac44f3 Mon Sep 17 00:00:00 2001 +From a9affe1f3f98342b682848c9b3f862ee194ff625 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Wed, 23 Dec 2015 11:45:48 +0100 Subject: [PATCH] Override system locale and set to default when adding gcc @@ -20,18 +20,18 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index b3add2be76..29bfd174d2 100644 +index 8fda3b4d47..bb7eb44213 100644 --- a/setup.py +++ b/setup.py -@@ -558,7 +558,7 @@ class PyBuildExt(build_ext): - tmpfile = os.path.join(self.build_temp, 'gccpaths') +@@ -600,7 +600,7 @@ class PyBuildExt(build_ext): + tmpfile = os.path.join(self.build_temp, 'ccpaths') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) -- ret = os.system('%s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) -+ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) +- ret = os.system('%s -E -v - %s 1>/dev/null' % (cc, tmpfile)) ++ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (cc, tmpfile)) is_gcc = False + is_clang = False in_incdirs = False - inc_dirs = [] -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch index 5bc9bf498..aacb6dca6 100644 --- a/buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch +++ b/buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch @@ -1,4 +1,4 @@ -From 9db508467be41bc35f06c0076c855b99a1519d24 Mon Sep 17 00:00:00 2001 +From c50b8e7fb9b2e61d4d195a055cd1bbf993cc455f Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 22 Feb 2017 16:48:49 -0800 Subject: [PATCH] Add importlib fix for PEP 3147 issue @@ -21,14 +21,14 @@ Signed-off-by: Christophe Vu-Brugier [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov --- - Lib/importlib/_bootstrap_external.py | 38 +++++------------------------------- - 1 file changed, 5 insertions(+), 33 deletions(-) + Lib/importlib/_bootstrap_external.py | 44 ++++------------------------ + 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 9feec50842..3550013d58 100644 +index b8ac482994..db034f605a 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py -@@ -283,8 +283,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): +@@ -306,8 +306,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): a True value is the same as setting 'optimization' to the empty string while a False value is equivalent to setting 'optimization' to '1'. @@ -37,7 +37,7 @@ index 9feec50842..3550013d58 100644 """ if debug_override is not None: _warnings.warn('the debug_override parameter is deprecated; use ' -@@ -296,10 +294,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): +@@ -319,10 +317,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): path = _os.fspath(path) head, tail = _path_split(path) base, sep, rest = tail.rpartition('.') @@ -49,12 +49,12 @@ index 9feec50842..3550013d58 100644 if optimization is None: if sys.flags.optimize == 0: optimization = '' -@@ -310,40 +305,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): - if not optimization.isalnum(): - raise ValueError('{!r} is not alphanumeric'.format(optimization)) - almost_filename = '{}.{}{}'.format(almost_filename, _OPT, optimization) -- return _path_join(head, _PYCACHE, almost_filename + BYTECODE_SUFFIXES[0]) -+ return _path_join(head, almost_filename + BYTECODE_SUFFIXES[0]) +@@ -359,46 +354,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): + head.lstrip(path_separators), + filename, + ) +- return _path_join(head, _PYCACHE, filename) ++ return _path_join(head, filename) def source_from_cache(path): @@ -71,23 +71,29 @@ index 9feec50842..3550013d58 100644 - raise NotImplementedError('sys.implementation.cache_tag is None') - path = _os.fspath(path) - head, pycache_filename = _path_split(path) -- head, pycache = _path_split(head) -- if pycache != _PYCACHE: -- raise ValueError('{} not bottom-level directory in ' -- '{!r}'.format(_PYCACHE, path)) +- found_in_pycache_prefix = False +- if sys.pycache_prefix is not None: +- stripped_path = sys.pycache_prefix.rstrip(path_separators) +- if head.startswith(stripped_path + path_sep): +- head = head[len(stripped_path):] +- found_in_pycache_prefix = True +- if not found_in_pycache_prefix: +- head, pycache = _path_split(head) +- if pycache != _PYCACHE: +- raise ValueError(f'{_PYCACHE} not bottom-level directory in ' +- f'{path!r}') - dot_count = pycache_filename.count('.') - if dot_count not in {2, 3}: -- raise ValueError('expected only 2 or 3 dots in ' -- '{!r}'.format(pycache_filename)) +- raise ValueError(f'expected only 2 or 3 dots in {pycache_filename!r}') - elif dot_count == 3: - optimization = pycache_filename.rsplit('.', 2)[-2] - if not optimization.startswith(_OPT): - raise ValueError("optimization portion of filename does not start " -- "with {!r}".format(_OPT)) +- f"with {_OPT!r}") - opt_level = optimization[len(_OPT):] - if not opt_level.isalnum(): -- raise ValueError("optimization level {!r} is not an alphanumeric " -- "value".format(optimization)) +- raise ValueError(f"optimization level {optimization!r} is not an " +- "alphanumeric value") - base_filename = pycache_filename.partition('.')[0] + head, filename = _path_split(path) + base_filename = filename.partition('.')[0] @@ -95,5 +101,5 @@ index 9feec50842..3550013d58 100644 -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch index 355e62f50..d34a2883a 100644 --- a/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch +++ b/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch @@ -1,4 +1,4 @@ -From bba0896a05e6406076893dd2f4c3b330e41082a6 Mon Sep 17 00:00:00 2001 +From 5ee3e5ad62919c431b1f7b5ff91ddf606582df0e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:01:18 -0800 Subject: [PATCH] Add an option to disable installation of test modules @@ -11,15 +11,15 @@ Signed-off-by: Samuel Martin [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov --- - Makefile.pre.in | 55 ++++++++++++++++++++++++++++++++++++------------------- + Makefile.pre.in | 54 ++++++++++++++++++++++++++++++++----------------- configure.ac | 5 +++++ - 2 files changed, 41 insertions(+), 19 deletions(-) + 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4ce917ab8d..4110fff4ac 100644 +index e8a6bd5c03..3abee36f49 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1261,8 +1261,28 @@ maninstall: altmaninstall +@@ -1317,8 +1317,28 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -49,15 +49,11 @@ index 4ce917ab8d..4110fff4ac 100644 + tkinter/test/test_ttk test \ test/audiodata \ test/capath test/data \ - test/cjkencodings test/decimaltestdata test/xmltestdata \ -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 1ff2362..194dbfc 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1336,26 +1336,24 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_importlib/source \ + test/cjkencodings test/decimaltestdata \ +@@ -1376,26 +1396,24 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ test/test_importlib/zipdata01 \ test/test_importlib/zipdata02 \ + test/ziptestdata \ - asyncio \ test/test_asyncio \ - collections concurrent concurrent/futures encodings \ @@ -96,10 +92,10 @@ index 1ff2362..194dbfc 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index d5ee2aedfb..f924937fe1 100644 +index 7872b4dfee..b820d18c7c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3226,6 +3226,11 @@ if test "$posix_threads" = "yes"; then +@@ -3213,6 +3213,11 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -112,5 +108,5 @@ index d5ee2aedfb..f924937fe1 100644 # Check for enable-ipv6 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch index bccd9facf..cdcabc0c1 100644 --- a/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch +++ b/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch @@ -1,4 +1,4 @@ -From 18a754e930e03d143d9392e49174cc370b334cdd Mon Sep 17 00:00:00 2001 +From 13a8be57e79f2657c75391bfa524dc1ba4993b02 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:07:56 -0800 Subject: [PATCH] Add an option to disable pydoc @@ -17,10 +17,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4110fff4ac..badb2af35d 100644 +index 3abee36f49..6fa0549a56 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1231,7 +1231,9 @@ bininstall: altbininstall +@@ -1289,7 +1289,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(BINDIR)/idle3 (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -rm -f $(DESTDIR)$(BINDIR)/pydoc3 @@ -29,8 +29,8 @@ index 4110fff4ac..badb2af35d 100644 +endif -rm -f $(DESTDIR)$(BINDIR)/2to3 (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) - -rm -f $(DESTDIR)$(BINDIR)/pyvenv -@@ -1279,7 +1281,7 @@ LIBSUBDIRS= tkinter site-packages \ + if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ +@@ -1335,7 +1337,7 @@ LIBSUBDIRS= tkinter site-packages \ multiprocessing multiprocessing/dummy \ unittest \ venv venv/scripts venv/scripts/common venv/scripts/posix \ @@ -39,7 +39,7 @@ index 4110fff4ac..badb2af35d 100644 TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk test \ -@@ -1354,6 +1356,10 @@ ifeq (@TEST_MODULES@,yes) +@@ -1414,6 +1416,10 @@ ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif @@ -51,10 +51,10 @@ index 4110fff4ac..badb2af35d 100644 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ diff --git a/configure.ac b/configure.ac -index f924937fe1..1621fa1611 100644 +index b820d18c7c..f53cc86d89 100644 --- a/configure.ac +++ b/configure.ac -@@ -3226,6 +3226,12 @@ if test "$posix_threads" = "yes"; then +@@ -3213,6 +3213,12 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -68,10 +68,10 @@ index f924937fe1..1621fa1611 100644 AC_ARG_ENABLE(test-modules, diff --git a/setup.py b/setup.py -index 29bfd174d2..94dd337fef 100644 +index bb7eb44213..748c269960 100644 --- a/setup.py +++ b/setup.py -@@ -2376,6 +2376,12 @@ def main(): +@@ -2401,6 +2401,12 @@ def main(): # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -84,16 +84,16 @@ index 29bfd174d2..94dd337fef 100644 setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], -@@ -2400,8 +2406,7 @@ def main(): +@@ -2425,8 +2431,7 @@ def main(): # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in - scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", -- "Tools/scripts/2to3", "Tools/scripts/pyvenv"] +- "Tools/scripts/2to3"] + scripts = scripts ) # --install-platlib -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch index fade361fa..03064612a 100644 --- a/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch +++ b/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From c2d279b4a19de7a32e8a73e320423f699d408380 Mon Sep 17 00:00:00 2001 +From 868823f15bab031caf05dc5e8ce2eac076bfc82b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:15:31 -0800 Subject: [PATCH] Add an option to disable lib2to3 @@ -17,20 +17,20 @@ Signed-off-by: Andrey Smirnov 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index badb2af35d..931cc3ed07 100644 +index 6fa0549a56..3e1f130532 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1235,7 +1235,9 @@ ifeq (@PYDOC@,yes) +@@ -1293,7 +1293,9 @@ ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) endif -rm -f $(DESTDIR)$(BINDIR)/2to3 +ifeq (@LIB2TO3@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) +endif - -rm -f $(DESTDIR)$(BINDIR)/pyvenv - (cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv) if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -1272,7 +1274,6 @@ LIBSUBDIRS= tkinter site-packages \ + rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ +@@ -1328,7 +1330,6 @@ LIBSUBDIRS= tkinter site-packages \ html json http dbm xmlrpc \ sqlite3 \ logging csv wsgiref urllib \ @@ -38,7 +38,7 @@ index badb2af35d..931cc3ed07 100644 ctypes ctypes/macholib \ idlelib idlelib/Icons \ distutils distutils/command $(XMLLIBSUBDIRS) \ -@@ -1342,9 +1343,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1402,9 +1403,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_email test/test_email/data \ test/test_json \ sqlite3/test \ @@ -48,7 +48,7 @@ index badb2af35d..931cc3ed07 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1352,6 +1350,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1412,6 +1410,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -63,8 +63,8 @@ index badb2af35d..931cc3ed07 100644 ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif -@@ -1451,10 +1457,12 @@ ifeq (@PYC_BUILD@,yes) - -d $(LIBDEST)/site-packages -f \ +@@ -1511,10 +1517,12 @@ ifeq (@PYC_BUILD@,yes) + -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages endif +ifeq (@LIB2TO3@,yes) @@ -74,13 +74,13 @@ index badb2af35d..931cc3ed07 100644 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt +endif - python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh - @ # Substitution happens here, as the completely-expanded BINDIR + # bpo-21536: Misc/python-config.sh is generated in the build directory + # from $(srcdir)Misc/python-config.sh.in. diff --git a/configure.ac b/configure.ac -index 1621fa1611..13b2edf8b7 100644 +index f53cc86d89..caa8eaf88a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3238,6 +3238,12 @@ AC_ARG_ENABLE(test-modules, +@@ -3225,6 +3225,12 @@ AC_ARG_ENABLE(test-modules, AS_HELP_STRING([--disable-test-modules], [disable test modules]), [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) @@ -94,10 +94,10 @@ index 1621fa1611..13b2edf8b7 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 94dd337fef..76429e1326 100644 +index 748c269960..1669797cad 100644 --- a/setup.py +++ b/setup.py -@@ -2377,10 +2377,11 @@ def main(): +@@ -2402,10 +2402,11 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -112,5 +112,5 @@ index 94dd337fef..76429e1326 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch index ed5e4cb29..4f5e0dbd8 100644 --- a/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch +++ b/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch @@ -1,4 +1,4 @@ -From f2965dfb1aa4f6b3216f3bb1d20f99326f127079 Mon Sep 17 00:00:00 2001 +From 1a1d13a973d9dcbd6660bfef40cf35c7638f779b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:20:45 -0800 Subject: [PATCH] Add option to disable the sqlite3 module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 931cc3ed07..a1ce0712cd 100644 +index 3e1f130532..cf9add0bc7 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1272,7 +1272,6 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1328,7 +1328,6 @@ LIBSUBDIRS= tkinter site-packages \ email email/mime \ ensurepip ensurepip/_bundled \ html json http dbm xmlrpc \ @@ -24,7 +24,7 @@ index 931cc3ed07..a1ce0712cd 100644 logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ -@@ -1342,7 +1341,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ +@@ -1402,7 +1401,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_asyncio \ test/test_email test/test_email/data \ test/test_json \ @@ -32,7 +32,7 @@ index 931cc3ed07..a1ce0712cd 100644 ctypes/test \ idlelib/idle_test \ distutils/tests \ -@@ -1358,6 +1356,11 @@ TESTSUBDIRS += lib2to3/tests \ +@@ -1418,6 +1416,11 @@ TESTSUBDIRS += lib2to3/tests \ lib2to3/tests/data/fixers/myfixes endif @@ -45,10 +45,10 @@ index 931cc3ed07..a1ce0712cd 100644 LIBSUBDIRS += $(TESTSUBDIRS) endif diff --git a/configure.ac b/configure.ac -index 13b2edf8b7..d7582cfea4 100644 +index caa8eaf88a..79a8255f44 100644 --- a/configure.ac +++ b/configure.ac -@@ -3226,6 +3226,15 @@ if test "$posix_threads" = "yes"; then +@@ -3213,6 +3213,15 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -65,5 +65,5 @@ index 13b2edf8b7..d7582cfea4 100644 AC_ARG_ENABLE(pydoc, -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch index 347057e09..b248ecd40 100644 --- a/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch +++ b/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch @@ -1,4 +1,4 @@ -From f96a00d42e714171f1d90501ed73594fddee570f Mon Sep 17 00:00:00 2001 +From c54cb57b3bd80fa2819f6409d5d2b98d82fbfcb2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:23:42 -0800 Subject: [PATCH] Add an option to disable the tk module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index a1ce0712cd..dc1e917cc3 100644 +index cf9add0bc7..5d78419fd4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1266,7 +1266,7 @@ maninstall: altmaninstall +@@ -1322,7 +1322,7 @@ maninstall: altmaninstall # Install the library XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax @@ -25,7 +25,7 @@ index a1ce0712cd..dc1e917cc3 100644 asyncio \ collections concurrent concurrent/futures encodings \ email email/mime \ -@@ -1283,8 +1283,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1339,8 +1339,7 @@ LIBSUBDIRS= tkinter site-packages \ venv venv/scripts venv/scripts/common venv/scripts/posix \ curses @@ -34,8 +34,8 @@ index a1ce0712cd..dc1e917cc3 100644 +TESTSUBDIRS= test \ test/audiodata \ test/capath test/data \ - test/cjkencodings test/decimaltestdata test/xmltestdata \ -@@ -1348,6 +1347,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ + test/cjkencodings test/decimaltestdata \ +@@ -1408,6 +1407,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ test/test_tools test/test_warnings test/test_warnings/data \ unittest/test unittest/test/testmock @@ -49,10 +49,10 @@ index a1ce0712cd..dc1e917cc3 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index d7582cfea4..6a56a5b0c1 100644 +index 79a8255f44..b5922451cc 100644 --- a/configure.ac +++ b/configure.ac -@@ -3235,6 +3235,15 @@ if test "$SQLITE3" = "no" ; then +@@ -3222,6 +3222,15 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -69,5 +69,5 @@ index d7582cfea4..6a56a5b0c1 100644 AC_ARG_ENABLE(pydoc, -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch index 847f55826..d442f7b80 100644 --- a/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch +++ b/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch @@ -1,4 +1,4 @@ -From 404aad42698c6d5cbd78421720f9a2bc0e8ec9fe Mon Sep 17 00:00:00 2001 +From 332373ca25f2dbe5473330666ec49143506a4dc0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:31:51 -0800 Subject: [PATCH] Add an option to disable the curses module @@ -13,10 +13,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index dc1e917cc3..6a6bc082cd 100644 +index 5d78419fd4..660c292765 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1280,8 +1280,7 @@ LIBSUBDIRS= site-packages \ +@@ -1336,8 +1336,7 @@ LIBSUBDIRS= site-packages \ turtledemo \ multiprocessing multiprocessing/dummy \ unittest \ @@ -26,7 +26,7 @@ index dc1e917cc3..6a6bc082cd 100644 TESTSUBDIRS= test \ test/audiodata \ -@@ -1353,6 +1352,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ +@@ -1413,6 +1412,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk endif @@ -38,10 +38,10 @@ index dc1e917cc3..6a6bc082cd 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 6a56a5b0c1..5896b39ff9 100644 +index b5922451cc..ea422a86a9 100644 --- a/configure.ac +++ b/configure.ac -@@ -3244,6 +3244,15 @@ if test "$TK" = "no"; then +@@ -3231,6 +3231,15 @@ if test "$TK" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" fi @@ -58,5 +58,5 @@ index 6a56a5b0c1..5896b39ff9 100644 AC_ARG_ENABLE(pydoc, -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch b/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch index 8855858ec..3015d1e10 100644 --- a/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch +++ b/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From 63fc5bc90cb57460552b544cbed0c2939759ab9e Mon Sep 17 00:00:00 2001 +From d88f2d3430bbbe285ae3de5fbc1bde34da7f0478 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:40:45 -0800 Subject: [PATCH] Add an option to disable expat @@ -20,10 +20,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6a6bc082cd..dc4b92b6fe 100644 +index 660c292765..f49abf8395 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1275,7 +1275,7 @@ LIBSUBDIRS= site-packages \ +@@ -1331,7 +1331,7 @@ LIBSUBDIRS= site-packages \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ @@ -32,7 +32,7 @@ index 6a6bc082cd..dc4b92b6fe 100644 importlib \ turtledemo \ multiprocessing multiprocessing/dummy \ -@@ -1356,6 +1356,10 @@ ifeq (@CURSES@,yes) +@@ -1416,6 +1416,10 @@ ifeq (@CURSES@,yes) LIBSUBDIRS += curses endif @@ -44,10 +44,10 @@ index 6a6bc082cd..dc4b92b6fe 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 5896b39ff9..6f21482207 100644 +index ea422a86a9..3c1e2c088d 100644 --- a/configure.ac +++ b/configure.ac -@@ -2969,13 +2969,21 @@ PKG_PROG_PKG_CONFIG +@@ -2955,13 +2955,21 @@ PKG_PROG_PKG_CONFIG AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library @@ -75,10 +75,10 @@ index 5896b39ff9..6f21482207 100644 # Check for use of the system libffi library AC_MSG_CHECKING(for --with-system-ffi) diff --git a/setup.py b/setup.py -index 76429e1326..38aa5e605e 100644 +index 1669797cad..d2727c0da5 100644 --- a/setup.py +++ b/setup.py -@@ -1529,7 +1529,7 @@ class PyBuildExt(build_ext): +@@ -1576,7 +1576,7 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # @@ -88,5 +88,5 @@ index 76429e1326..38aa5e605e 100644 define_macros = [] extra_compile_args = [] -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch index ee81e0bcf..dfe8614a5 100644 --- a/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch +++ b/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch @@ -1,4 +1,4 @@ -From 3335500cb13a6bc1ab41dfcf00b33e6ade3b9764 Mon Sep 17 00:00:00 2001 +From 347f359b484c8e34b49f71132701252b966d93aa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:49:55 +0100 Subject: [PATCH] Add an option to disable CJK codecs @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 6f21482207..c7742faf41 100644 +index 3c1e2c088d..30a92f9c2e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3243,6 +3243,12 @@ if test "$SQLITE3" = "no" ; then +@@ -3230,6 +3230,12 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -26,5 +26,5 @@ index 6f21482207..c7742faf41 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch b/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch index d38f858be..35bfe5aed 100644 --- a/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch +++ b/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch @@ -1,4 +1,4 @@ -From e52d4868cc1192f7e1c147aebaf4fc6f7de30357 Mon Sep 17 00:00:00 2001 +From ff9bebed083c5d20fe31f94b868f6f1a8c6cc744 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:11 +0100 Subject: [PATCH] Add an option to disable NIS @@ -12,10 +12,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index c7742faf41..42a871bb09 100644 +index 30a92f9c2e..20f326db46 100644 --- a/configure.ac +++ b/configure.ac -@@ -3249,6 +3249,12 @@ AC_ARG_ENABLE(codecs-cjk, +@@ -3236,6 +3236,12 @@ AC_ARG_ENABLE(codecs-cjk, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" fi]) @@ -29,5 +29,5 @@ index c7742faf41..42a871bb09 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch index 17e9861e0..a8ec0e499 100644 --- a/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch +++ b/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch @@ -1,4 +1,4 @@ -From 69d3e8f0438d01adde55e90eeabafa4abefd3b02 Mon Sep 17 00:00:00 2001 +From 47f9caca90e6c8c18736e5dfd0acf47aae27eefb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:50:27 +0100 Subject: [PATCH] Add an option to disable unicodedata @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 42a871bb09..1d610e132b 100644 +index 20f326db46..99bbc37b07 100644 --- a/configure.ac +++ b/configure.ac -@@ -3255,6 +3255,12 @@ AC_ARG_ENABLE(nis, +@@ -3242,6 +3242,12 @@ AC_ARG_ENABLE(nis, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" fi]) @@ -26,5 +26,5 @@ index 42a871bb09..1d610e132b 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch index 4cec31406..bb23879e3 100644 --- a/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch +++ b/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From 5bbd94f014c89665d02a8a32442822ab7c5520d0 Mon Sep 17 00:00:00 2001 +From c3ad1d6fc8f1fa56ee0522389227454710bf7877 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -16,12 +16,12 @@ Signed-off-by: Andrey Smirnov 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index dc4b92b6fe..3e43066d90 100644 +index f49abf8395..bc777e6504 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1229,7 +1229,9 @@ bininstall: altbininstall - -rm -f $(DESTDIR)$(LIBPC)/python3.pc - (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc) +@@ -1287,7 +1287,9 @@ bininstall: altbininstall + -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc + (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 +ifeq (@IDLE@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) @@ -29,7 +29,7 @@ index dc4b92b6fe..3e43066d90 100644 -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -1274,7 +1276,6 @@ LIBSUBDIRS= site-packages \ +@@ -1330,7 +1332,6 @@ LIBSUBDIRS= site-packages \ html json http dbm xmlrpc \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ @@ -37,7 +37,7 @@ index dc4b92b6fe..3e43066d90 100644 distutils distutils/command \ importlib \ turtledemo \ -@@ -1360,6 +1361,10 @@ ifeq (@EXPAT@,yes) +@@ -1420,6 +1421,10 @@ ifeq (@EXPAT@,yes) LIBSUBDIRS += $(XMLLIBSUBDIRS) endif @@ -49,10 +49,10 @@ index dc4b92b6fe..3e43066d90 100644 LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 TESTSUBDIRS += lib2to3/tests \ diff --git a/configure.ac b/configure.ac -index 1d610e132b..2699e7ceb1 100644 +index 99bbc37b07..8c9706582e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3297,6 +3297,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -3284,6 +3284,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) @@ -66,10 +66,10 @@ index 1d610e132b..2699e7ceb1 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 38aa5e605e..d642825c1e 100644 +index d2727c0da5..9f09b3d985 100644 --- a/setup.py +++ b/setup.py -@@ -2377,11 +2377,13 @@ def main(): +@@ -2402,11 +2402,13 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -85,5 +85,5 @@ index 38aa5e605e..d642825c1e 100644 setup(# PyPI Metadata (PEP 301) name = "Python", -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch b/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch index 5e02f0e21..7d96f5c41 100644 --- a/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch +++ b/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch @@ -1,4 +1,4 @@ -From 0870559b9af82b55f1fd8b35528510f563577256 Mon Sep 17 00:00:00 2001 +From c82efeabd2f9b89ff2ecd5261eceeeb3af022ae8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:31 +0100 Subject: [PATCH] Add an option to disable decimal @@ -17,10 +17,10 @@ Signed-off-by: Adam Duskett 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 2699e7ceb1..e2c3b6f25c 100644 +index 8c9706582e..e6255babb6 100644 --- a/configure.ac +++ b/configure.ac -@@ -3020,13 +3020,20 @@ fi +@@ -3006,13 +3006,20 @@ fi AC_SUBST(LIBFFI_INCLUDEDIR) # Check for use of the system libmpdec library @@ -47,11 +47,11 @@ index 2699e7ceb1..e2c3b6f25c 100644 # Check for support for loadable sqlite extensions AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) diff --git a/setup.py b/setup.py -index d642825c1e..5b98255857 100644 +index 9f09b3d985..a7f2e23d87 100644 --- a/setup.py +++ b/setup.py -@@ -2054,7 +2054,7 @@ class PyBuildExt(build_ext): - def _decimal_ext(self): +@@ -2076,7 +2076,7 @@ class PyBuildExt(build_ext): + # Stefan Krah's _decimal module extra_compile_args = [] undef_macros = [] - if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"): @@ -60,5 +60,5 @@ index d642825c1e..5b98255857 100644 libraries = [':libmpdec.so.2'] sources = ['_decimal/_decimal.c'] -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch index b7b195a15..56f56adfc 100644 --- a/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ b/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch @@ -1,4 +1,4 @@ -From a04fb6159e394ec8346cd49993fdf70db3e1b184 Mon Sep 17 00:00:00 2001 +From c68234aba844cb1034fdcfb50aef03da454723f9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:51:58 +0100 Subject: [PATCH] Add an option to disable the ossaudiodev module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index e2c3b6f25c..8e3dded25e 100644 +index e6255babb6..5809233aac 100644 --- a/configure.ac +++ b/configure.ac -@@ -3035,6 +3035,12 @@ else +@@ -3021,6 +3021,12 @@ else fi AC_SUBST(MPDEC) @@ -26,5 +26,5 @@ index e2c3b6f25c..8e3dded25e 100644 AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) AC_ARG_ENABLE(loadable-sqlite-extensions, -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch index 2d569e92d..ced3fa93e 100644 --- a/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch +++ b/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch @@ -1,4 +1,4 @@ -From 4b001683ad1cb1d90b7c389e67447a250fa9c218 Mon Sep 17 00:00:00 2001 +From 8faf197969bf531279d5c59a5bb2bc3a21acc378 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 22 Feb 2017 17:55:59 -0800 Subject: [PATCH] Add an option to disable openssl support. @@ -9,10 +9,10 @@ Signed-off-by: Nicolas Cavallari 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 8e3dded25e..28bcdabd67 100644 +index 5809233aac..6b09bafda4 100644 --- a/configure.ac +++ b/configure.ac -@@ -3274,6 +3274,12 @@ AC_ARG_ENABLE(unicodedata, +@@ -3261,6 +3261,12 @@ AC_ARG_ENABLE(unicodedata, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" fi]) @@ -26,5 +26,5 @@ index 8e3dded25e..28bcdabd67 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch index 1a28dd827..e70c9984e 100644 --- a/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch +++ b/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch @@ -1,4 +1,4 @@ -From d35deaa5c65c29f2a56a29fd5fc1dadadd485eaf Mon Sep 17 00:00:00 2001 +From 6e3923f90497ba7230b62fdd3f2dca1cb79852bf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:29:05 +0100 Subject: [PATCH] Add an option to disable the readline module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 28bcdabd67..484f6ebaca 100644 +index 6b09bafda4..b64518eed5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3280,6 +3280,12 @@ AC_ARG_ENABLE(openssl, +@@ -3267,6 +3267,12 @@ AC_ARG_ENABLE(openssl, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" fi]) @@ -26,5 +26,5 @@ index 28bcdabd67..484f6ebaca 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch index 4bf60fd6c..004b3d1c8 100644 --- a/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch +++ b/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch @@ -1,4 +1,4 @@ -From 9e95f88906f850caa789977dab4b0f256b575254 Mon Sep 17 00:00:00 2001 +From e6f44f93db96ed7f3b2baa0e09ea32a32c78c638 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 23:31:11 +0100 Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac -index 484f6ebaca..79538df0cf 100644 +index b64518eed5..d07e371c57 100644 --- a/configure.ac +++ b/configure.ac -@@ -3286,6 +3286,24 @@ AC_ARG_ENABLE(readline, +@@ -3273,6 +3273,24 @@ AC_ARG_ENABLE(readline, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" fi]) @@ -38,5 +38,5 @@ index 484f6ebaca..79538df0cf 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.13.5 +2.20.1 diff --git a/buildroot/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/buildroot/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch index 0edaebdb6..f69b887c9 100644 --- a/buildroot/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch +++ b/buildroot/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch @@ -1,4 +1,4 @@ -From 21f787cb9bf0c1440981262f03bc881c5b77c0d8 Mon Sep 17 00:00:00 2001 +From e3221e3b714374e1e53dc11c9556733bd2807c2c Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 6 Oct 2017 09:54:15 -0500 Subject: [PATCH] python-config.sh: don't reassign ${prefix} @@ -27,7 +27,7 @@ Signed-off-by: Matthew Weber 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in -index 9e259c0..8b249d9 100644 +index a1bc3cd5f7..164d2d3603 100644 --- a/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in @@ -31,7 +31,7 @@ prefix_real=$(installed_prefix "$0") @@ -39,7 +39,7 @@ index 9e259c0..8b249d9 100644 exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#") exec_prefix_real=${prefix_real} includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#") -@@ -48,7 +48,7 @@ LINKFORSHARED="@LINKFORSHARED@" +@@ -49,7 +49,7 @@ LDLIBRARY="@LDLIBRARY@" OPT="@OPT@" PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" LDVERSION="@LDVERSION@" @@ -49,5 +49,5 @@ index 9e259c0..8b249d9 100644 SO="@EXT_SUFFIX@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -- -2.14.3 +2.20.1 diff --git a/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch index a2dcdb1b0..d39befaf1 100644 --- a/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch +++ b/buildroot/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch @@ -1,4 +1,4 @@ -From ad4537a75c798341824ab18bd1dc622f8dc2bc3a Mon Sep 17 00:00:00 2001 +From 28008e1e4f0349241d22aace3c54f7e9425c6c1f Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 20 Jul 2018 10:17:39 -0400 Subject: [PATCH] Fix cross compiling the uuid module @@ -20,19 +20,19 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 1a7085c5c4..f33d0b57b8 100644 +index a7f2e23d87..b0274a3f67 100644 --- a/setup.py +++ b/setup.py -@@ -1671,7 +1671,8 @@ class PyBuildExt(build_ext): - missing.append('_tkinter') +@@ -1674,7 +1674,8 @@ class PyBuildExt(build_ext): + def detect_uuid(self): # Build the _uuid module if possible -- uuid_incs = find_file("uuid.h", inc_dirs, ["/usr/include/uuid"]) -+ uuid_incs = find_file("uuid.h", inc_dirs, -+ [os.path.join(inc_dir, 'uuid') for inc_dir in inc_dirs]) +- uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"]) ++ uuid_incs = find_file("uuid.h", self.inc_dirs, ++ [os.path.join(inc_dir, 'uuid') for inc_dir in self.inc_dirs]) if uuid_incs is not None: - if self.compiler.find_library_file(lib_dirs, 'uuid'): + if self.compiler.find_library_file(self.lib_dirs, 'uuid'): uuid_libs = ['uuid'] -- -2.14.4 +2.20.1 diff --git a/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch index 1c674b544..a777475c9 100644 --- a/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch +++ b/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch @@ -1,4 +1,4 @@ -From 1fe33c7bee9e6410f56c956ea19efd2f617176ae Mon Sep 17 00:00:00 2001 +From 74007603df0921450f14e8626df36140426cc300 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 18 Aug 2018 10:54:56 +0200 Subject: [PATCH] Add an option to disable uuid module @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index b022460e73..505b7c9be0 100644 +index d07e371c57..55ab6c3c26 100644 --- a/configure.ac +++ b/configure.ac -@@ -3322,6 +3322,15 @@ if test "$CURSES" = "no"; then +@@ -3309,6 +3309,15 @@ if test "$CURSES" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" fi @@ -29,5 +29,5 @@ index b022460e73..505b7c9be0 100644 AC_ARG_ENABLE(pydoc, -- -2.14.4 +2.20.1 diff --git a/buildroot/package/python3/0032-fix-building-on-older-distributions.patch b/buildroot/package/python3/0032-fix-building-on-older-distributions.patch index 0f7ee2a25..69998a36d 100644 --- a/buildroot/package/python3/0032-fix-building-on-older-distributions.patch +++ b/buildroot/package/python3/0032-fix-building-on-older-distributions.patch @@ -1,5 +1,5 @@ -From ba10bac420398270a0b992e85d93383373d5fcac Mon Sep 17 00:00:00 2001 -From: Adam Duskett +From 3ddda00652f809a3bd8b4e3f7b0a3a4270b280a6 Mon Sep 17 00:00:00 2001 +From: Adam Duskett Date: Thu, 16 Aug 2018 14:52:37 -0700 Subject: [PATCH] fix building on older distributions @@ -15,7 +15,7 @@ safe to change os.replace back to os.rename. This change fixes building on older systems such as CentOS7, that only come with python 2. -Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett --- Tools/scripts/update_file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -34,5 +34,5 @@ index 224585c69b..ef458c0c63 100644 os.unlink(new_path) -- -2.14.4 +2.20.1 diff --git a/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index 19a0f23e7..5a5a104dc 100644 --- a/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -1,4 +1,4 @@ -From e1a2c27bcb9091f851ef7a9c7d59822a125a0b8e Mon Sep 17 00:00:00 2001 +From 5932fedd9d1d43a230fa353df434f253e9d2b5a0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Aug 2019 15:53:16 +0200 Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for @@ -29,10 +29,10 @@ Signed-off-by: Peter Korsgaard 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index e5fb7e7b0b..9c64f960d6 100644 +index 55ab6c3c26..4a6d0662ac 100644 --- a/configure.ac +++ b/configure.ac -@@ -724,7 +724,9 @@ then +@@ -700,7 +700,9 @@ then fi @@ -44,5 +44,5 @@ index e5fb7e7b0b..9c64f960d6 100644 AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) -- -2.11.0 +2.20.1 diff --git a/buildroot/package/python3/Config.in.host b/buildroot/package/python3/Config.in.host new file mode 100644 index 000000000..70b5dacdd --- /dev/null +++ b/buildroot/package/python3/Config.in.host @@ -0,0 +1,16 @@ +config BR2_PACKAGE_HOST_PYTHON3 + bool "host python3" + help + The python language interpreter. Host package. + + http://www.python.org/ + +if BR2_PACKAGE_HOST_PYTHON3 + +config BR2_PACKAGE_HOST_PYTHON3_SSL + bool "ssl" + select BR2_PACKAGE_HOST_OPENSSL + help + _ssl module for host Python3. + +endif diff --git a/buildroot/package/python3/python3.hash b/buildroot/package/python3/python3.hash index 6e99cae59..cb7c6b2f2 100644 --- a/buildroot/package/python3/python3.hash +++ b/buildroot/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-376/ -md5 c08fbee72ad5c2c95b0f4e44bf6fd72c Python-3.7.6.tar.xz +# From https://www.python.org/downloads/release/python-382/ +md5 e9d6ebc92183a177b8e8a58cad5b8d67 Python-3.8.2.tar.xz # Locally computed -sha256 55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f Python-3.7.6.tar.xz -sha256 a77d71d6be6f9032e6b6e5d2cf6da68f9eeab9036edfbc043633c8979cd5e82c LICENSE +sha256 2646e7dc233362f59714c6193017bb2d6f7b38d6ab4a0cb5fbac5c36c4d845df Python-3.8.2.tar.xz +sha256 de4d1f2d2ad5ad0cfd1657a106476b31cb5db5ef9d1ff842b237c0c81f0c8a23 LICENSE diff --git a/buildroot/package/python3/python3.mk b/buildroot/package/python3/python3.mk index 7f93372c2..d12237300 100644 --- a/buildroot/package/python3/python3.mk +++ b/buildroot/package/python3/python3.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON3_VERSION_MAJOR = 3.7 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).6 +PYTHON3_VERSION_MAJOR = 3.8 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others @@ -26,8 +26,7 @@ HOST_PYTHON3_CONF_OPTS += \ --enable-unicodedata \ --disable-test-modules \ --disable-idle3 \ - --disable-ossaudiodev \ - --disable-openssl + --disable-ossaudiodev # Make sure that LD_LIBRARY_PATH overrides -rpath. # This is needed because libpython may be installed at the same time that @@ -42,6 +41,12 @@ PYTHON3_DEPENDENCIES = host-python3 libffi HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi +ifeq ($(BR2_PACKAGE_HOST_PYTHON3_SSL),y) +HOST_PYTHON3_DEPENDENCIES += host-openssl +else +HOST_PYTHON3_CONF_OPTS += --disable-openssl +endif + PYTHON3_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_PYTHON3_READLINE),y) @@ -248,7 +253,7 @@ HOST_PYTHON3_POST_INSTALL_HOOKS += HOST_PYTHON3_INSTALL_SYMLINK endif # Provided to other packages -PYTHON3_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ +PYTHON3_PATH = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ # Support for socket.AF_BLUETOOTH ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),y) diff --git a/buildroot/package/qdecoder/0001-fix-make-install.patch b/buildroot/package/qdecoder/0001-fix-make-install.patch deleted file mode 100644 index f35356683..000000000 --- a/buildroot/package/qdecoder/0001-fix-make-install.patch +++ /dev/null @@ -1,40 +0,0 @@ -[PATCH] fix make install to respect DESTDIR - -And also ensure destination directories exist. - -Signed-off-by: Peter Korsgaard ---- - src/Makefile.in | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -Index: qdecoder-r12.0.5/src/Makefile.in -=================================================================== ---- qdecoder-r12.0.5.orig/src/Makefile.in -+++ qdecoder-r12.0.5/src/Makefile.in -@@ -78,17 +78,18 @@ - ${LN_S} -f ${SLIBREALNAME} ${SLIBNAME} - - install: all -- ${INSTALL_DATA} qdecoder.h ${HEADERDIR}/qdecoder.h -- ${INSTALL_DATA} ${LIBNAME} ${LIBDIR}/${LIBNAME} -- ${INSTALL_DATA} ${SLIBREALNAME} ${LIBDIR}/${SLIBREALNAME} -- ( cd ${LIBDIR}; ${LN_S} -f ${SLIBREALNAME} ${SLIBNAME} ) -+ mkdir -p ${DESTDIR}/${HEADERDIR} ${DESTDIR}/${LIBDIR} -+ ${INSTALL_DATA} qdecoder.h ${DESTDIR}/${HEADERDIR}/qdecoder.h -+ ${INSTALL_DATA} ${LIBNAME} ${DESTDIR}/${LIBDIR}/${LIBNAME} -+ ${INSTALL_DATA} ${SLIBREALNAME} ${DESTDIR}/${LIBDIR}/${SLIBREALNAME} -+ ( cd ${DESTDIR}/${LIBDIR}; ${LN_S} -f ${SLIBREALNAME} ${SLIBNAME} ) - - deinstall: uninstall - uninstall: -- ${RM} -f ${HEADERDIR}/qdecoder.h -- ${RM} -f ${LIBDIR}/${LIBNAME} -- ${RM} -f ${LIBDIR}/${SLIBREALNAME} -- ${RM} -f ${LIBDIR}/${SLIBNAME} -+ ${RM} -f ${DESTDIR}/${HEADERDIR}/qdecoder.h -+ ${RM} -f ${DESTDIR}/${LIBDIR}/${LIBNAME} -+ ${RM} -f ${DESTDIR}/${LIBDIR}/${SLIBREALNAME} -+ ${RM} -f ${DESTDIR}/${LIBDIR}/${SLIBNAME} - - doc: - doxygen doxygen.conf diff --git a/buildroot/package/qdecoder/0002-configure.ac-drop-hardcoded-paths.patch b/buildroot/package/qdecoder/0002-configure.ac-drop-hardcoded-paths.patch deleted file mode 100644 index 689d1d912..000000000 --- a/buildroot/package/qdecoder/0002-configure.ac-drop-hardcoded-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] configure.ac: drop hardcoded paths - -Causing problems with cross compilation. - -Signed-off-by: Peter Korsgaard ---- - configure.ac | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -Index: qdecoder-r12.0.5/configure.ac -=================================================================== ---- qdecoder-r12.0.5.orig/configure.ac -+++ qdecoder-r12.0.5/configure.ac -@@ -81,10 +81,7 @@ - AC_CONFIG_HEADER([config.h]) - AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile]) - --## Set path --PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" --CPPFLAGS="$CPPFLAGS -I/usr/include -I/usr/local/include -I./ -D_GNU_SOURCE" --LDFLAGS="$LDFLAGS -L/usr/lib -L/usr/local/lib" -+CPPFLAGS="$CPPFLAGS -I./ -D_GNU_SOURCE" - - ## Set autoconf setting - #AC_CANONICAL_TARGET diff --git a/buildroot/package/qdecoder/0003-errno.patch b/buildroot/package/qdecoder/0003-errno.patch deleted file mode 100644 index 71d5cfd66..000000000 --- a/buildroot/package/qdecoder/0003-errno.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fixes build error - -qcgireq.c: In function '_parse_multipart_value_into_disk': -qcgireq.c:738:60: error: 'errno' undeclared (first use in this function) - DEBUG("I/O error. (errno=%d)", (ioerror == true) ? errno : 0); - -Patch downloaded from upstream repo: -https://github.com/wolkykim/qdecoder/commit/574f0216a51e3e852cd94e2a0a3b52dc64e74548 - -Signed-off-by: Bernd Kuhls - - -From 574f0216a51e3e852cd94e2a0a3b52dc64e74548 Mon Sep 17 00:00:00 2001 -From: nyov -Date: Fri, 5 Sep 2014 18:41:10 +0000 -Subject: [PATCH] add missing header include - -fixes #7 ---- - src/qcgireq.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qcgireq.c b/src/qcgireq.c -index dcb8c57..d34ff83 100644 ---- a/src/qcgireq.c -+++ b/src/qcgireq.c -@@ -139,6 +139,7 @@ - #ifndef _WIN32 - #include - #endif -+#include - #include "qdecoder.h" - #include "internal.h" - diff --git a/buildroot/package/qdecoder/qdecoder.hash b/buildroot/package/qdecoder/qdecoder.hash index 6b3031078..0c95d2c27 100644 --- a/buildroot/package/qdecoder/qdecoder.hash +++ b/buildroot/package/qdecoder/qdecoder.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 641d3df4895626d7a530c5d26724e9b5887e9845d4b47f42c1cbce4a17ebf6af qdecoder-r12.0.5.tar.gz +sha256 01d4852b9343757abe98bbdb9d4bf0dc142ccb602ec921906ddde32c16164376 qdecoder-12.0.7.tar.gz +sha256 17e647523e5c5c75fd02861dcf3ea91a146d918ab303460ee58135c9dd70904e COPYING diff --git a/buildroot/package/qdecoder/qdecoder.mk b/buildroot/package/qdecoder/qdecoder.mk index bbbf42a98..ab95885c3 100644 --- a/buildroot/package/qdecoder/qdecoder.mk +++ b/buildroot/package/qdecoder/qdecoder.mk @@ -4,12 +4,10 @@ # ################################################################################ -QDECODER_VERSION = r12.0.5 -QDECODER_SITE = $(call github,wolkykim,qdecoder,$(QDECODER_VERSION)) +QDECODER_VERSION = 12.0.7 +QDECODER_SITE = $(call github,wolkykim,qdecoder,v$(QDECODER_VERSION)) QDECODER_LICENSE = BSD-2 QDECODER_LICENSE_FILES = COPYING -# we patch configure.ac -QDECODER_AUTORECONF = YES QDECODER_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' QDECODER_INSTALL_STAGING = YES diff --git a/buildroot/package/qemu/3.1.1.1/0002-linux-user-fix-to-handle-variably-sized-SIOCGSTAMP-with-new-kernels.patch b/buildroot/package/qemu/3.1.1.1/0002-linux-user-fix-to-handle-variably-sized-SIOCGSTAMP-with-new-kernels.patch deleted file mode 100644 index a757d1f1a..000000000 --- a/buildroot/package/qemu/3.1.1.1/0002-linux-user-fix-to-handle-variably-sized-SIOCGSTAMP-with-new-kernels.patch +++ /dev/null @@ -1,337 +0,0 @@ -From 6d5d5dde9adb5acb32e6b8e3dfbf47fff0f308d2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Thu, 18 Jul 2019 15:06:41 +0200 -Subject: [PATCH] linux-user: fix to handle variably sized SIOCGSTAMP with new - kernels -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The SIOCGSTAMP symbol was previously defined in the -asm-generic/sockios.h header file. QEMU sees that header -indirectly via sys/socket.h - -In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115 -the asm-generic/sockios.h header no longer defines SIOCGSTAMP. -Instead it provides only SIOCGSTAMP_OLD, which only uses a -32-bit time_t on 32-bit architectures. - -The linux/sockios.h header then defines SIOCGSTAMP using -either SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. If -SIOCGSTAMP_NEW is used, then the tv_sec field is 64-bit even -on 32-bit architectures - -To cope with this we must now convert the old and new type from -the target to the host one. - -Signed-off-by: Daniel P. Berrangé -Signed-off-by: Laurent Vivier -Reviewed-by: Arnd Bergmann -Message-Id: <20190718130641.15294-1-laurent@vivier.eu> -Signed-off-by: Laurent Vivier - -[Retrieved (and backported to 3.1.0) from: -https://github.com/qemu/qemu/commit/6d5d5dde9adb5acb32e6b8e3dfbf47fff0f308d2] -Signed-off-by: Fabrice Fontaine ---- - linux-user/ioctls.h | 21 +++++- - linux-user/syscall.c | 140 +++++++++++++++++++++++++++++-------- - linux-user/syscall_defs.h | 30 +++++++- - linux-user/syscall_types.h | 6 -- - 4 files changed, 159 insertions(+), 38 deletions(-) - -diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h -index 5e84dc7c3a7..3281c97ca26 100644 ---- a/linux-user/ioctls.h -+++ b/linux-user/ioctls.h -@@ -222,8 +222,25 @@ - IOCTL(SIOCGIWNAME, IOC_W | IOC_R, MK_PTR(MK_STRUCT(STRUCT_char_ifreq))) - IOCTL(SIOCSPGRP, IOC_W, MK_PTR(TYPE_INT)) /* pid_t */ - IOCTL(SIOCGPGRP, IOC_R, MK_PTR(TYPE_INT)) /* pid_t */ -- IOCTL(SIOCGSTAMP, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timeval))) -- IOCTL(SIOCGSTAMPNS, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timespec))) -+ -+ /* -+ * We can't use IOCTL_SPECIAL() because it will set -+ * host_cmd to XXX_OLD and XXX_NEW and these macros -+ * are not defined with kernel prior to 5.2. -+ * We must set host_cmd to the same value as in target_cmd -+ * otherwise the consistency check in syscall_init() -+ * will trigger an error. -+ * host_cmd is ignored by the do_ioctl_XXX() helpers. -+ * FIXME: create a macro to define this kind of entry -+ */ -+ { TARGET_SIOCGSTAMP_OLD, TARGET_SIOCGSTAMP_OLD, -+ "SIOCGSTAMP_OLD", IOC_R, do_ioctl_SIOCGSTAMP }, -+ { TARGET_SIOCGSTAMPNS_OLD, TARGET_SIOCGSTAMPNS_OLD, -+ "SIOCGSTAMPNS_OLD", IOC_R, do_ioctl_SIOCGSTAMPNS }, -+ { TARGET_SIOCGSTAMP_NEW, TARGET_SIOCGSTAMP_NEW, -+ "SIOCGSTAMP_NEW", IOC_R, do_ioctl_SIOCGSTAMP }, -+ { TARGET_SIOCGSTAMPNS_NEW, TARGET_SIOCGSTAMPNS_NEW, -+ "SIOCGSTAMPNS_NEW", IOC_R, do_ioctl_SIOCGSTAMPNS }, - - IOCTL(RNDGETENTCNT, IOC_R, MK_PTR(TYPE_INT)) - IOCTL(RNDADDTOENTCNT, IOC_W, MK_PTR(TYPE_INT)) -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 39a37496fed..8367cb138df 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1126,8 +1127,9 @@ static inline abi_long copy_from_user_timeval(struct timeval *tv, - { - struct target_timeval *target_tv; - -- if (!lock_user_struct(VERIFY_READ, target_tv, target_tv_addr, 1)) -+ if (!lock_user_struct(VERIFY_READ, target_tv, target_tv_addr, 1)) { - return -TARGET_EFAULT; -+ } - - __get_user(tv->tv_sec, &target_tv->tv_sec); - __get_user(tv->tv_usec, &target_tv->tv_usec); -@@ -1142,8 +1144,26 @@ static inline abi_long copy_to_user_timeval(abi_ulong target_tv_addr, - { - struct target_timeval *target_tv; - -- if (!lock_user_struct(VERIFY_WRITE, target_tv, target_tv_addr, 0)) -+ if (!lock_user_struct(VERIFY_WRITE, target_tv, target_tv_addr, 0)) { -+ return -TARGET_EFAULT; -+ } -+ -+ __put_user(tv->tv_sec, &target_tv->tv_sec); -+ __put_user(tv->tv_usec, &target_tv->tv_usec); -+ -+ unlock_user_struct(target_tv, target_tv_addr, 1); -+ -+ return 0; -+} -+ -+static inline abi_long copy_to_user_timeval64(abi_ulong target_tv_addr, -+ const struct timeval *tv) -+{ -+ struct target__kernel_sock_timeval *target_tv; -+ -+ if (!lock_user_struct(VERIFY_WRITE, target_tv, target_tv_addr, 0)) { - return -TARGET_EFAULT; -+ } - - __put_user(tv->tv_sec, &target_tv->tv_sec); - __put_user(tv->tv_usec, &target_tv->tv_usec); -@@ -1153,6 +1173,48 @@ static inline abi_long copy_to_user_timeval(abi_ulong target_tv_addr, - return 0; - } - -+static inline abi_long target_to_host_timespec(struct timespec *host_ts, -+ abi_ulong target_addr) -+{ -+ struct target_timespec *target_ts; -+ -+ if (!lock_user_struct(VERIFY_READ, target_ts, target_addr, 1)) { -+ return -TARGET_EFAULT; -+ } -+ __get_user(host_ts->tv_sec, &target_ts->tv_sec); -+ __get_user(host_ts->tv_nsec, &target_ts->tv_nsec); -+ unlock_user_struct(target_ts, target_addr, 0); -+ return 0; -+} -+ -+static inline abi_long host_to_target_timespec(abi_ulong target_addr, -+ struct timespec *host_ts) -+{ -+ struct target_timespec *target_ts; -+ -+ if (!lock_user_struct(VERIFY_WRITE, target_ts, target_addr, 0)) { -+ return -TARGET_EFAULT; -+ } -+ __put_user(host_ts->tv_sec, &target_ts->tv_sec); -+ __put_user(host_ts->tv_nsec, &target_ts->tv_nsec); -+ unlock_user_struct(target_ts, target_addr, 1); -+ return 0; -+} -+ -+static inline abi_long host_to_target_timespec64(abi_ulong target_addr, -+ struct timespec *host_ts) -+{ -+ struct target__kernel_timespec *target_ts; -+ -+ if (!lock_user_struct(VERIFY_WRITE, target_ts, target_addr, 0)) { -+ return -TARGET_EFAULT; -+ } -+ __put_user(host_ts->tv_sec, &target_ts->tv_sec); -+ __put_user(host_ts->tv_nsec, &target_ts->tv_nsec); -+ unlock_user_struct(target_ts, target_addr, 1); -+ return 0; -+} -+ - static inline abi_long copy_from_user_timezone(struct timezone *tz, - abi_ulong target_tz_addr) - { -@@ -4899,6 +4961,54 @@ static abi_long do_ioctl_kdsigaccept(const IOCTLEntry *ie, uint8_t *buf_temp, - return get_errno(safe_ioctl(fd, ie->host_cmd, sig)); - } - -+static abi_long do_ioctl_SIOCGSTAMP(const IOCTLEntry *ie, uint8_t *buf_temp, -+ int fd, int cmd, abi_long arg) -+{ -+ struct timeval tv; -+ abi_long ret; -+ -+ ret = get_errno(safe_ioctl(fd, SIOCGSTAMP, &tv)); -+ if (is_error(ret)) { -+ return ret; -+ } -+ -+ if (cmd == (int)TARGET_SIOCGSTAMP_OLD) { -+ if (copy_to_user_timeval(arg, &tv)) { -+ return -TARGET_EFAULT; -+ } -+ } else { -+ if (copy_to_user_timeval64(arg, &tv)) { -+ return -TARGET_EFAULT; -+ } -+ } -+ -+ return ret; -+} -+ -+static abi_long do_ioctl_SIOCGSTAMPNS(const IOCTLEntry *ie, uint8_t *buf_temp, -+ int fd, int cmd, abi_long arg) -+{ -+ struct timespec ts; -+ abi_long ret; -+ -+ ret = get_errno(safe_ioctl(fd, SIOCGSTAMPNS, &ts)); -+ if (is_error(ret)) { -+ return ret; -+ } -+ -+ if (cmd == (int)TARGET_SIOCGSTAMPNS_OLD) { -+ if (host_to_target_timespec(arg, &ts)) { -+ return -TARGET_EFAULT; -+ } -+ } else{ -+ if (host_to_target_timespec64(arg, &ts)) { -+ return -TARGET_EFAULT; -+ } -+ } -+ -+ return ret; -+} -+ - #ifdef TIOCGPTPEER - static abi_long do_ioctl_tiocgptpeer(const IOCTLEntry *ie, uint8_t *buf_temp, - int fd, int cmd, abi_long arg) -@@ -6271,32 +6381,6 @@ static inline abi_long target_ftruncate64(void *cpu_env, abi_long arg1, - } - #endif - --static inline abi_long target_to_host_timespec(struct timespec *host_ts, -- abi_ulong target_addr) --{ -- struct target_timespec *target_ts; -- -- if (!lock_user_struct(VERIFY_READ, target_ts, target_addr, 1)) -- return -TARGET_EFAULT; -- __get_user(host_ts->tv_sec, &target_ts->tv_sec); -- __get_user(host_ts->tv_nsec, &target_ts->tv_nsec); -- unlock_user_struct(target_ts, target_addr, 0); -- return 0; --} -- --static inline abi_long host_to_target_timespec(abi_ulong target_addr, -- struct timespec *host_ts) --{ -- struct target_timespec *target_ts; -- -- if (!lock_user_struct(VERIFY_WRITE, target_ts, target_addr, 0)) -- return -TARGET_EFAULT; -- __put_user(host_ts->tv_sec, &target_ts->tv_sec); -- __put_user(host_ts->tv_nsec, &target_ts->tv_nsec); -- unlock_user_struct(target_ts, target_addr, 1); -- return 0; --} -- - static inline abi_long target_to_host_itimerspec(struct itimerspec *host_itspec, - abi_ulong target_addr) - { -diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h -index fffa89f2564..06622703008 100644 ---- a/linux-user/syscall_defs.h -+++ b/linux-user/syscall_defs.h -@@ -209,16 +209,34 @@ struct target_linger { - abi_int l_linger; /* How long to linger for */ - }; - -+#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32) -+struct target_timeval { -+ abi_long tv_sec; -+ abi_int tv_usec; -+}; -+#define target__kernel_sock_timeval target_timeval -+#else - struct target_timeval { - abi_long tv_sec; - abi_long tv_usec; - }; - -+struct target__kernel_sock_timeval { -+ abi_llong tv_sec; -+ abi_llong tv_usec; -+}; -+#endif -+ - struct target_timespec { - abi_long tv_sec; - abi_long tv_nsec; - }; - -+struct target__kernel_timespec { -+ abi_llong tv_sec; -+ abi_llong tv_nsec; -+}; -+ - struct target_timezone { - abi_int tz_minuteswest; - abi_int tz_dsttime; -@@ -749,8 +767,16 @@ struct target_pollfd { - #define TARGET_SIOCATMARK 0x8905 - #define TARGET_SIOCGPGRP 0x8904 - #endif --#define TARGET_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ --#define TARGET_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ -+#if defined(TARGET_SH4) -+#define TARGET_SIOCGSTAMP_OLD TARGET_IOR('s', 100, struct target_timeval) -+#define TARGET_SIOCGSTAMPNS_OLD TARGET_IOR('s', 101, struct target_timespec) -+#else -+#define TARGET_SIOCGSTAMP_OLD 0x8906 -+#define TARGET_SIOCGSTAMPNS_OLD 0x8907 -+#endif -+ -+#define TARGET_SIOCGSTAMP_NEW TARGET_IOR(0x89, 0x06, abi_llong[2]) -+#define TARGET_SIOCGSTAMPNS_NEW TARGET_IOR(0x89, 0x07, abi_llong[2]) - - /* Networking ioctls */ - #define TARGET_SIOCADDRT 0x890B /* add routing table entry */ -diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h -index b98a23b0f1b..4e369838262 100644 ---- a/linux-user/syscall_types.h -+++ b/linux-user/syscall_types.h -@@ -14,12 +14,6 @@ STRUCT(serial_icounter_struct, - STRUCT(sockaddr, - TYPE_SHORT, MK_ARRAY(TYPE_CHAR, 14)) - --STRUCT(timeval, -- MK_ARRAY(TYPE_LONG, 2)) -- --STRUCT(timespec, -- MK_ARRAY(TYPE_LONG, 2)) -- - STRUCT(rtentry, - TYPE_ULONG, MK_STRUCT(STRUCT_sockaddr), MK_STRUCT(STRUCT_sockaddr), MK_STRUCT(STRUCT_sockaddr), - TYPE_SHORT, TYPE_SHORT, TYPE_ULONG, TYPE_PTRVOID, TYPE_SHORT, TYPE_PTRVOID, diff --git a/buildroot/package/qemu/3.1.1.1/0004-linux-user-assume-__NR_gettid-always-exists.patch b/buildroot/package/qemu/3.1.1.1/0004-linux-user-assume-__NR_gettid-always-exists.patch deleted file mode 100644 index 3475ad5b1..000000000 --- a/buildroot/package/qemu/3.1.1.1/0004-linux-user-assume-__NR_gettid-always-exists.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 184943d827ce09375284e6fbb9fd5eeb9e369529 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Wed, 20 Mar 2019 16:18:41 +0000 -Subject: [PATCH] linux-user: assume __NR_gettid always exists -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The gettid syscall was introduced in Linux 2.4.11. This is old enough -that we can assume it always exists and thus not bother with the -conditional backcompat logic. - -Signed-off-by: Daniel P. Berrangé -Reviewed-by: Richard Henderson -Reviewed-by: Laurent Vivier -Message-Id: <20190320161842.13908-2-berrange@redhat.com> -Signed-off-by: Laurent Vivier ---- - linux-user/syscall.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 208fd1813d..11729f382c 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -249,15 +249,7 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \ - #define TARGET_NR__llseek TARGET_NR_llseek - #endif - --#ifdef __NR_gettid - _syscall0(int, gettid) --#else --/* This is a replacement for the host gettid() and must return a host -- errno. */ --static int gettid(void) { -- return -ENOSYS; --} --#endif - - /* For the 64-bit guest on 32-bit host case we must emulate - * getdents using getdents64, because otherwise the host --- -2.23.0 - diff --git a/buildroot/package/qemu/3.1.1.1/0005-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch b/buildroot/package/qemu/3.1.1.1/0005-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch deleted file mode 100644 index 8e49bc0c9..000000000 --- a/buildroot/package/qemu/3.1.1.1/0005-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 71ba74f67eaca21b0cc9d96f534ad3b9a7161400 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Wed, 20 Mar 2019 16:18:42 +0000 -Subject: [PATCH] linux-user: rename gettid() to sys_gettid() to avoid clash - with glibc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The glibc-2.29.9000-6.fc31.x86_64 package finally includes the gettid() -function as part of unistd.h when __USE_GNU is defined. This clashes -with linux-user code which unconditionally defines this function name -itself. - -/home/berrange/src/virt/qemu/linux-user/syscall.c:253:16: error: static declaration of ‘gettid’ follows non-static declaration - 253 | _syscall0(int, gettid) - | ^~~~~~ -/home/berrange/src/virt/qemu/linux-user/syscall.c:184:13: note: in definition of macro ‘_syscall0’ - 184 | static type name (void) \ - | ^~~~ -In file included from /usr/include/unistd.h:1170, - from /home/berrange/src/virt/qemu/include/qemu/osdep.h:107, - from /home/berrange/src/virt/qemu/linux-user/syscall.c:20: -/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here - 34 | extern __pid_t gettid (void) __THROW; - | ^~~~~~ - CC aarch64-linux-user/linux-user/signal.o -make[1]: *** [/home/berrange/src/virt/qemu/rules.mak:69: linux-user/syscall.o] Error 1 -make[1]: *** Waiting for unfinished jobs.... -make: *** [Makefile:449: subdir-aarch64-linux-user] Error 2 - -While we could make our definition conditional and rely on glibc's impl, -this patch simply renames our definition to sys_gettid() which is a -common pattern in this file. - -Signed-off-by: Daniel P. Berrangé -Reviewed-by: Richard Henderson -Reviewed-by: Laurent Vivier -Message-Id: <20190320161842.13908-3-berrange@redhat.com> -Signed-off-by: Laurent Vivier ---- - linux-user/syscall.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 11729f382c..96cd4bf86d 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -249,7 +249,8 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \ - #define TARGET_NR__llseek TARGET_NR_llseek - #endif - --_syscall0(int, gettid) -+#define __NR_sys_gettid __NR_gettid -+_syscall0(int, sys_gettid) - - /* For the 64-bit guest on 32-bit host case we must emulate - * getdents using getdents64, because otherwise the host -@@ -5434,7 +5435,7 @@ static void *clone_func(void *arg) - cpu = ENV_GET_CPU(env); - thread_cpu = cpu; - ts = (TaskState *)cpu->opaque; -- info->tid = gettid(); -+ info->tid = sys_gettid(); - task_settid(ts); - if (info->child_tidptr) - put_user_u32(info->tid, info->child_tidptr); -@@ -5579,9 +5580,9 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp, - mapping. We can't repeat the spinlock hack used above because - the child process gets its own copy of the lock. */ - if (flags & CLONE_CHILD_SETTID) -- put_user_u32(gettid(), child_tidptr); -+ put_user_u32(sys_gettid(), child_tidptr); - if (flags & CLONE_PARENT_SETTID) -- put_user_u32(gettid(), parent_tidptr); -+ put_user_u32(sys_gettid(), parent_tidptr); - ts = (TaskState *)cpu->opaque; - if (flags & CLONE_SETTLS) - cpu_set_tls (env, newtls); -@@ -10621,7 +10622,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, - return TARGET_PAGE_SIZE; - #endif - case TARGET_NR_gettid: -- return get_errno(gettid()); -+ return get_errno(sys_gettid()); - #ifdef TARGET_NR_readahead - case TARGET_NR_readahead: - #if TARGET_ABI_BITS == 32 --- -2.23.0 - diff --git a/buildroot/package/qemu/3.1.1.1/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/buildroot/package/qemu/4.2.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch similarity index 95% rename from buildroot/package/qemu/3.1.1.1/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch rename to buildroot/package/qemu/4.2.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch index a0c4a6203..157d28b11 100644 --- a/buildroot/package/qemu/3.1.1.1/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch +++ b/buildroot/package/qemu/4.2.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch @@ -21,7 +21,7 @@ diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 6db0758..2b3d116 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c -@@ -463,7 +463,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, +@@ -506,7 +506,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, #if defined(__NetBSD__) pc = uc->uc_mcontext.__gregs[_REG_R15]; diff --git a/buildroot/package/qemu/3.1.1.1/0003-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch b/buildroot/package/qemu/4.2.0/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch similarity index 100% rename from buildroot/package/qemu/3.1.1.1/0003-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch rename to buildroot/package/qemu/4.2.0/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch diff --git a/buildroot/package/qemu/4.2.0/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch b/buildroot/package/qemu/4.2.0/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch new file mode 100644 index 000000000..46652d829 --- /dev/null +++ b/buildroot/package/qemu/4.2.0/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch @@ -0,0 +1,78 @@ +From 318f83f387678a3c0a2a729b506613011c6830b2 Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada +Date: Fri, 17 Jan 2020 14:09:30 +0000 +Subject: [PATCH] target/arm/arm-semi: fix SYS_OPEN to return nonzero + filehandle + +According to the specification "Semihosting for AArch32 and Aarch64", +the SYS_OPEN operation should return: + + - A nonzero handle if the call is successful + - -1 if the call is not successful + +So, it should never return 0. + +Prior to commit 35e9a0a8ce4b ("target/arm/arm-semi: Make semihosting +code hand out its own file descriptors"), the guest fd matched to the +host fd. It returned a nonzero handle on success since the fd 0 is +already used for stdin. + +Now that the guest fd is the index of guestfd_array, it starts from 0. + +I noticed this issue particularly because Trusted Firmware-A built with +PLAT=qemu is no longer working. Its io_semihosting driver only handles +a positive return value as a valid filehandle. + +Basically, there are two ways to fix this: + + - Use (guestfd - 1) as the index of guestfs_arrary. We need to insert + increment/decrement to convert the guestfd and the array index back + and forth. + + - Keep using guestfd as the index of guestfs_array. The first entry + of guestfs_array is left unused. + +I thought the latter is simpler. We end up with wasting a small piece +of memory for the unused first entry of guestfd_array, but this is +probably not a big deal. + +Fixes: 35e9a0a8ce4b ("target/arm/arm-semi: Make semihosting code hand out its own file descriptors") +Cc: qemu-stable@nongnu.org +Signed-off-by: Masahiro Yamada +Reviewed-by: Richard Henderson +Message-id: 20200109041228.10131-1-masahiroy@kernel.org +Signed-off-by: Peter Maydell + +(cherry picked from commit 21bf9b06cb6d07c6cc437dfd47b47b28c2bb79db) +Signed-off-by: Adrien Grassein +Signed-off-by: Romain Naour +--- + target/arm/arm-semi.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c +index 6f7b6d801b..4275dfc345 100644 +--- a/target/arm/arm-semi.c ++++ b/target/arm/arm-semi.c +@@ -144,7 +144,8 @@ static int alloc_guestfd(void) + guestfd_array = g_array_new(FALSE, TRUE, sizeof(GuestFD)); + } + +- for (i = 0; i < guestfd_array->len; i++) { ++ /* SYS_OPEN should return nonzero handle on success. Start guestfd from 1 */ ++ for (i = 1; i < guestfd_array->len; i++) { + GuestFD *gf = &g_array_index(guestfd_array, GuestFD, i); + + if (gf->type == GuestFDUnused) { +@@ -168,7 +169,7 @@ static GuestFD *do_get_guestfd(int guestfd) + return NULL; + } + +- if (guestfd < 0 || guestfd >= guestfd_array->len) { ++ if (guestfd <= 0 || guestfd >= guestfd_array->len) { + return NULL; + } + +-- +2.24.1 + diff --git a/buildroot/package/qemu/Config.in.host b/buildroot/package/qemu/Config.in.host index f99f3e05c..ea9281c5f 100644 --- a/buildroot/package/qemu/Config.in.host +++ b/buildroot/package/qemu/Config.in.host @@ -3,18 +3,24 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_arm default y if BR2_armeb default y if BR2_aarch64 + default y if BR2_csky default y if BR2_i386 default y if BR2_m68k default y if BR2_microblazeel default y if BR2_microblazebe default y if BR2_mips default y if BR2_mipsel + default y if BR2_nios2 default y if BR2_powerpc default y if BR2_powerpc64 default y if BR2_powerpc64le + default y if BR2_riscv default y if BR2_sh default y if BR2_sparc + default y if BR2_sparc64 + default y if BR2_xtensa default y if BR2_x86_64 + depends on !BR2_x86_steamroller && !BR2_x86_core_avx2 depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970 config BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS @@ -60,6 +66,12 @@ config BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE Enables the build of the user-land emulator, which allows to run user-space applications. + Note that system calls made by the emulated user-land are + serviced by the running host kernel. Therefore, if the + kernel headers used by your target are more recent than + the running host kernel, you may run into invalid system + calls, which may yield surprising effects. + config BR2_PACKAGE_HOST_QEMU_VDE2 bool "VDE2 support" help @@ -73,4 +85,9 @@ config BR2_PACKAGE_HOST_QEMU_VIRTFS Enables support for virtual filesystem in Qemu allowing shared filesystem between Qemu and its emulated target. +config BR2_PACKAGE_HOST_QEMU_USB + bool "USB passthrough support" + help + Enables USB passthrough support from guest to host. + endif diff --git a/buildroot/package/qemu/qemu.hash b/buildroot/package/qemu/qemu.hash index ada80bf61..dae11cb3f 100644 --- a/buildroot/package/qemu/qemu.hash +++ b/buildroot/package/qemu/qemu.hash @@ -1,4 +1,7 @@ # Locally computed, tarball verified with GPG signature -sha256 b148fc3c7382c5addd915db433383160ca7b840bc6ea90bb0d35c6b253526d56 qemu-3.1.1.1.tar.xz +sha256 d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0 qemu-4.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING -sha256 48ffe9fc7f1d5462dbd19340bc4dd1d8a9e37c61ed535813e614cbe4a5f0d4df COPYING.LIB +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB + +# Locally computed +sha256 61091767ffd16002e77f005155d096208094e69dee35e6d5ddcaa6c8a13b5e26 qemu-b517e1dc3125a57555d67a8deed9eac7b42288e2.tar.gz diff --git a/buildroot/package/qemu/qemu.mk b/buildroot/package/qemu/qemu.mk index 6960b8ab5..b2249ed4e 100644 --- a/buildroot/package/qemu/qemu.mk +++ b/buildroot/package/qemu/qemu.mk @@ -4,9 +4,14 @@ # ################################################################################ -QEMU_VERSION = 3.1.1.1 +ifeq ($(BR2_csky),y) +QEMU_VERSION = b517e1dc3125a57555d67a8deed9eac7b42288e2 +QEMU_SITE = $(call github,c-sky,qemu,$(QEMU_VERSION)) +else +QEMU_VERSION = 4.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org +endif QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c QEMU_LICENSE_FILES = COPYING COPYING.LIB # NOTE: there is no top-level license file for non-(L)GPL licenses; @@ -15,8 +20,7 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB #------------------------------------------------------------- # Target-qemu - -QEMU_DEPENDENCIES = host-pkgconf libglib2 zlib pixman +QEMU_DEPENDENCIES = host-pkgconf libglib2 zlib pixman host-python3 # Need the LIBS variable because librt and libm are # not automatically pulled. :-( @@ -85,17 +89,39 @@ else QEMU_OPTS += --disable-seccomp endif -ifeq ($(BR2_PACKAGE_LIBSSH2),y) -QEMU_OPTS += --enable-libssh2 -QEMU_DEPENDENCIES += libssh2 +ifeq ($(BR2_PACKAGE_LIBSSH),y) +QEMU_OPTS += --enable-libssh +QEMU_DEPENDENCIES += libssh else -QEMU_OPTS += --disable-libssh2 +QEMU_OPTS += --disable-libssh +endif + +ifeq ($(BR2_PACKAGE_LIBUSB),y) +QEMU_OPTS += --enable-libusb +QEMU_DEPENDENCIES += libusb +else +QEMU_OPTS += --disable-libusb +endif + +ifeq ($(BR2_PACKAGE_NETTLE),y) +QEMU_OPTS += --enable-nettle +QEMU_DEPENDENCIES += nettle +else +QEMU_OPTS += --disable-nettle +endif + +ifeq ($(BR2_PACKAGE_NUMACTL),y) +QEMU_OPTS += --enable-numa +QEMU_DEPENDENCIES += numactl +else +QEMU_OPTS += --disable-numa endif # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS - ( cd $(@D); \ + unset TARGET_DIR; \ + cd $(@D); \ LIBS='$(QEMU_LIBS)' \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ @@ -105,6 +131,7 @@ define QEMU_CONFIGURE_CMDS --prefix=/usr \ --cross-prefix=$(TARGET_CROSS) \ --audio-drv-list= \ + --python=$(HOST_DIR)/bin/python3 \ --enable-kvm \ --enable-attr \ --enable-vhost-net \ @@ -137,15 +164,16 @@ define QEMU_CONFIGURE_CMDS --disable-capstone \ --disable-git-update \ --disable-opengl \ - $(QEMU_OPTS) \ - ) + $(QEMU_OPTS) endef define QEMU_BUILD_CMDS + unset TARGET_DIR; \ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define QEMU_INSTALL_TARGET_CMDS + unset TARGET_DIR; \ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(QEMU_MAKE_ENV) DESTDIR=$(TARGET_DIR) install endef @@ -154,7 +182,7 @@ $(eval $(generic-package)) #------------------------------------------------------------- # Host-qemu -HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman +HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman host-python3 # BR ARCH qemu # ------- ---- @@ -170,6 +198,7 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman # mipsel mipsel # mips64 mips64 # mips64el mips64el +# nios2 nios2 # powerpc ppc # powerpc64 ppc64 # powerpc64le ppc64 (system) / ppc64le (usermode) @@ -178,8 +207,9 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman # sh4eb sh4eb # sh4a sh4 # sh4aeb sh4eb -# sh64 not supported # sparc sparc +# sparc64 sparc64 +# xtensa xtensa HOST_QEMU_ARCH = $(ARCH) ifeq ($(HOST_QEMU_ARCH),i486) @@ -207,11 +237,21 @@ endif ifeq ($(HOST_QEMU_ARCH),sh4aeb) HOST_QEMU_ARCH = sh4eb endif +ifeq ($(HOST_QEMU_ARCH),csky) +ifeq ($(BR2_ck610),y) +HOST_QEMU_ARCH = cskyv1 +else +HOST_QEMU_ARCH = cskyv2 +endif +endif HOST_QEMU_SYS_ARCH ?= $(HOST_QEMU_ARCH) +HOST_QEMU_CFLAGS = $(HOST_CFLAGS) + ifeq ($(BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE),y) HOST_QEMU_TARGETS += $(HOST_QEMU_SYS_ARCH)-softmmu HOST_QEMU_OPTS += --enable-system --enable-fdt +HOST_QEMU_CFLAGS += -I$(HOST_DIR)/include/libfdt HOST_QEMU_DEPENDENCIES += host-dtc else HOST_QEMU_OPTS += --disable-system @@ -226,28 +266,6 @@ ifneq ($(HOST_QEMU_HOST_SYSTEM_TYPE),Linux) $(error "qemu-user can only be used on Linux hosts") endif -# kernel version as major*256 + minor -HOST_QEMU_HOST_SYSTEM_VERSION = $(shell uname -r | awk -F. '{ print $$1 * 256 + $$2 }') -HOST_QEMU_TARGET_SYSTEM_VERSION = $(shell echo $(BR2_TOOLCHAIN_HEADERS_AT_LEAST) | awk -F. '{ print $$1 * 256 + $$2 }') -HOST_QEMU_COMPARE_VERSION = $(shell test $(HOST_QEMU_HOST_SYSTEM_VERSION) -ge $(HOST_QEMU_TARGET_SYSTEM_VERSION) && echo OK) - -# -# The principle of qemu-user is that it emulates the instructions of -# the target architecture when running the binary, and then when this -# binary does a system call, it converts this system call into a -# system call on the host machine. This mechanism makes an assumption: -# that the target binary will not do system calls that do not exist on -# the host. This basically requires that the target binary should be -# built with kernel headers that are older or the same as the kernel -# version running on the host machine. -# - -ifeq ($(BR_BUILDING),y) -ifneq ($(HOST_QEMU_COMPARE_VERSION),OK) -$(error "Refusing to build qemu-user: target Linux version newer than host's.") -endif -endif # BR_BUILDING - else # BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE HOST_QEMU_OPTS += --disable-linux-user endif # BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE @@ -264,9 +282,17 @@ else HOST_QEMU_OPTS += --disable-virtfs endif +ifeq ($(BR2_PACKAGE_HOST_QEMU_USB),y) +HOST_QEMU_OPTS += --enable-libusb +HOST_QEMU_DEPENDENCIES += host-libusb +else +HOST_QEMU_OPTS += --disable-libusb +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define HOST_QEMU_CONFIGURE_CMDS + unset TARGET_DIR; \ cd $(@D); $(HOST_CONFIGURE_OPTS) CPP="$(HOSTCC) -E" \ ./configure \ --target-list="$(HOST_QEMU_TARGETS)" \ @@ -274,16 +300,19 @@ define HOST_QEMU_CONFIGURE_CMDS --interp-prefix=$(STAGING_DIR) \ --cc="$(HOSTCC)" \ --host-cc="$(HOSTCC)" \ - --extra-cflags="$(HOST_CFLAGS)" \ + --extra-cflags="$(HOST_QEMU_CFLAGS)" \ --extra-ldflags="$(HOST_LDFLAGS)" \ + --python=$(HOST_DIR)/bin/python3 \ $(HOST_QEMU_OPTS) endef define HOST_QEMU_BUILD_CMDS + unset TARGET_DIR; \ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) endef define HOST_QEMU_INSTALL_CMDS + unset TARGET_DIR; \ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install endef diff --git a/buildroot/package/qextserialport/qextserialport.hash b/buildroot/package/qextserialport/qextserialport.hash index 60c0ff322..198ea022b 100644 --- a/buildroot/package/qextserialport/qextserialport.hash +++ b/buildroot/package/qextserialport/qextserialport.hash @@ -1,2 +1,3 @@ # locally computed sha256 23e3b10a8d8a1e2fb071047144222c43d150748ce6670e5d047ba5b0502ad0b2 qextserialport-ada321a9ee463f628e7b781b8ed00ff219152158.tar.gz +sha256 363f34c4e9ee62df5e88788723beb9d0ad2c62fa36625355f261f7e6d672aaf5 LICENSE.md diff --git a/buildroot/package/qhull/qhull.hash b/buildroot/package/qhull/qhull.hash index 4f059f2b5..b97c25a3f 100644 --- a/buildroot/package/qhull/qhull.hash +++ b/buildroot/package/qhull/qhull.hash @@ -1,4 +1,5 @@ -# From http://www.qhull.org/download/qhull-2015.2.md5sum -md5 e6270733a826a6a7c32b796e005ec3dc qhull-2015-src-7.2.0.tgz +# From http://www.qhull.org/download/qhull-2019.1.md5sum +md5 53c04f9c89b491b17b10c7ea1eaa4cc8 qhull-2019-src-7.3.2.tgz # Locally computed -sha256 78b010925c3b577adc3d58278787d7df08f7c8fb02c3490e375eab91bb58a436 qhull-2015-src-7.2.0.tgz +sha256 2b7990558c363076261564f61b74db4d0d73b71869755108a469038c07dc43fb qhull-2019-src-7.3.2.tgz +sha256 34db0c0c4f931861d720555c9cd7a2e228d1290ba29af0f2ee80c41bb2038afb COPYING.txt diff --git a/buildroot/package/qhull/qhull.mk b/buildroot/package/qhull/qhull.mk index 8ea38f01a..fcf517634 100644 --- a/buildroot/package/qhull/qhull.mk +++ b/buildroot/package/qhull/qhull.mk @@ -4,9 +4,9 @@ # ################################################################################ -QHULL_VERSION = 7.2.0 +QHULL_VERSION = 7.3.2 QHULL_SITE = http://www.qhull.org/download -QHULL_SOURCE = qhull-2015-src-$(QHULL_VERSION).tgz +QHULL_SOURCE = qhull-2019-src-$(QHULL_VERSION).tgz QHULL_INSTALL_STAGING = YES QHULL_LICENSE = BSD-Style QHULL_LICENSE_FILES = COPYING.txt diff --git a/buildroot/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch b/buildroot/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch deleted file mode 100644 index a9e34e4c2..000000000 --- a/buildroot/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 254858bbf443bded2e80480e9f9032ce166b923e Mon Sep 17 00:00:00 2001 -From: Zoltan Gyarmati -Date: Fri, 2 Dec 2016 23:00:58 +0100 -Subject: [PATCH] CMake, Qt4: check specifically for QtCore, fixes #96 - -Signed-off-by: Zoltan Gyarmati ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 31d9987..2fde79f 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,7 +62,7 @@ IF (Qt5Core_FOUND) - ELSE() - MESSAGE ("Qt5 not found, searching for Qt4") - # Find Qt4 -- FIND_PACKAGE( Qt4 4.5 REQUIRED ) -+ FIND_PACKAGE( Qt4 4.5 REQUIRED QtCore) - # QStringBuilder is supported since Qt 4.8 for both QString and QByteArray - IF (NOT (${QT_VERSION_MINOR} STRLESS "8")) - MESSAGE ("Enable QStringBuilder") --- -2.7.4 - diff --git a/buildroot/package/qjson/qjson.hash b/buildroot/package/qjson/qjson.hash index d794b4872..ab22350e6 100644 --- a/buildroot/package/qjson/qjson.hash +++ b/buildroot/package/qjson/qjson.hash @@ -1,2 +1,3 @@ # locally computed -sha256 e812617477f3c2bb990561767a4cd8b1d3803a52018d4878da302529552610d4 qjson-0.9.0.tar.gz +sha256 e812617477f3c2bb990561767a4cd8b1d3803a52018d4878da302529552610d4 qjson-0.9.0.tar.gz +sha256 758a0cd48d2bec59cbd04ab616737b7aa0cdceac87508adbc9468715ac90722b COPYING.lib diff --git a/buildroot/package/qlibc/0001-remove-absolute-paths.patch b/buildroot/package/qlibc/0001-remove-absolute-paths.patch deleted file mode 100644 index 5976c3c4d..000000000 --- a/buildroot/package/qlibc/0001-remove-absolute-paths.patch +++ /dev/null @@ -1,19 +0,0 @@ -Remove absolute paths to host locations - -Signed-off-by: Sagaert Johan - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -85,10 +85,8 @@ - - ## Set path - PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" --CPPFLAGS="$CPPFLAGS -I/usr/include -I/usr/local/include" - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --LDFLAGS="$LDFLAGS -L/usr/lib -L/usr/local/lib" - - ## Set autoconf setting - #AC_CANONICAL_TARGET diff --git a/buildroot/package/qlibc/0002-obey-destdir.patch b/buildroot/package/qlibc/0002-obey-destdir.patch deleted file mode 100644 index f007aa4f2..000000000 --- a/buildroot/package/qlibc/0002-obey-destdir.patch +++ /dev/null @@ -1,144 +0,0 @@ -From dbdc772a35244b45c725a72fad5ddade9bd7d521 Mon Sep 17 00:00:00 2001 -From: pcarpent -Date: Tue, 15 Dec 2015 10:23:44 +0100 -Subject: [PATCH] fix makefile - -add DESTDIR variables in install targets - -Signed-off-by: Bernd Kuhls -(downloaded from upstream commit not included in v2.4.1 - https://github.com/wolkykim/qlibc/commit/dbdc772a35244b45c725a72fad5ddade9bd7d521) ---- - src/Makefile.in | 110 ++++++++++++++++++++++++++++---------------------------- - 1 file changed, 55 insertions(+), 55 deletions(-) - -diff --git a/src/Makefile.in b/src/Makefile.in -index 8a7ab43..4e274ed 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -122,70 +122,70 @@ qlibcext: ${QLIBCEXT_OBJS} - install: ${INSTALL_TARGETS} - - install-qlibc: qlibc -- ${MKDIR_P} ${INST_INCDIR}/qlibc -- ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibc.h ${INST_INCDIR}/qlibc/qlibc.h -- ${MKDIR_P} ${INST_INCDIR}/qlibc/containers/ -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qtreetbl.h ${INST_INCDIR}/qlibc/containers/qtreetbl.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhashtbl.h ${INST_INCDIR}/qlibc/containers/qhashtbl.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhasharr.h ${INST_INCDIR}/qlibc/containers/qhasharr.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlisttbl.h ${INST_INCDIR}/qlibc/containers/qlisttbl.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlist.h ${INST_INCDIR}/qlibc/containers/qlist.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qvector.h ${INST_INCDIR}/qlibc/containers/qvector.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qqueue.h ${INST_INCDIR}/qlibc/containers/qqueue.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qstack.h ${INST_INCDIR}/qlibc/containers/qstack.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qgrow.h ${INST_INCDIR}/qlibc/containers/qgrow.h -- ${MKDIR_P} ${INST_INCDIR}/qlibc/utilities/ -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qcount.h ${INST_INCDIR}/qlibc/utilities/qcount.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qencode.h ${INST_INCDIR}/qlibc/utilities/qencode.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qfile.h ${INST_INCDIR}/qlibc/utilities/qfile.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qhash.h ${INST_INCDIR}/qlibc/utilities/qhash.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qio.h ${INST_INCDIR}/qlibc/utilities/qio.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsocket.h ${INST_INCDIR}/qlibc/utilities/qsocket.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qstring.h ${INST_INCDIR}/qlibc/utilities/qstring.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsystem.h ${INST_INCDIR}/qlibc/utilities/qsystem.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qtime.h ${INST_INCDIR}/qlibc/utilities/qtime.h -- ${MKDIR_P} ${INST_INCDIR}/qlibc/ipc/ -- ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qsem.h ${INST_INCDIR}/qlibc/ipc/qsem.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qshm.h ${INST_INCDIR}/qlibc/ipc/qshm.h -- ${MKDIR_P} ${INST_LIBDIR} -- ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_LIBNAME} ${INST_LIBDIR}/${QLIBC_LIBNAME} -- ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_SLIBREALNAME} ${INST_LIBDIR}/${QLIBC_SLIBREALNAME} -- ( cd ${INST_LIBDIR}; ${LN_S} -f ${QLIBC_SLIBREALNAME} ${QLIBC_SLIBNAME} ) -+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibc.h $(DESTDIR)/${INST_INCDIR}/qlibc/qlibc.h -+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/containers/ -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qtreetbl.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qtreetbl.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhashtbl.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qhashtbl.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhasharr.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qhasharr.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlisttbl.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qlisttbl.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlist.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qlist.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qvector.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qvector.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qqueue.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qqueue.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qstack.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qstack.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qgrow.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qgrow.h -+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/ -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qcount.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qcount.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qencode.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qencode.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qfile.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qfile.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qhash.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qhash.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qio.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qio.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsocket.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qsocket.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qstring.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qstring.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsystem.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qsystem.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qtime.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qtime.h -+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/ipc/ -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qsem.h $(DESTDIR)/${INST_INCDIR}/qlibc/ipc/qsem.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qshm.h $(DESTDIR)/${INST_INCDIR}/qlibc/ipc/qshm.h -+ ${MKDIR_P} $(DESTDIR)/${INST_LIBDIR} -+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_LIBNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBC_LIBNAME} -+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_SLIBREALNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBC_SLIBREALNAME} -+ ( cd $(DESTDIR)/${INST_LIBDIR}; ${LN_S} -f ${QLIBC_SLIBREALNAME} ${QLIBC_SLIBNAME} ) - - uninstall-qlibc: -- ${RM} -f ${INST_INCDIR}/qlibc/qlibc.h -- ${RM} -rf ${INST_INCDIR}/qlibc/containers -- ${RM} -rf ${INST_INCDIR}/qlibc/utilities -- ${RM} -rf ${INST_INCDIR}/qlibc/ipc -- ${RM} -f ${INST_LIBDIR}/${QLIBC_LIBNAME} -- ${RM} -f ${INST_LIBDIR}/${QLIBC_SLIBREALNAME} -- ${RM} -f ${INST_LIBDIR}/${QLIBC_SLIBNAME} -+ ${RM} -f $(DESTDIR)/${INST_INCDIR}/qlibc/qlibc.h -+ ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/containers -+ ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/utilities -+ ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/ipc -+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBC_LIBNAME} -+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBC_SLIBREALNAME} -+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBC_SLIBNAME} - - install-qlibcext: qlibcext -- ${MKDIR_P} ${INST_INCDIR}/qlibc -- ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext.h ${INST_INCDIR}/qlibc/qlibcext.h -- ${MKDIR_P} ${INST_INCDIR}/qlibc/extensions/ -- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qconfig.h ${INST_INCDIR}/qlibc/extensions/qconfig.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qaconf.h ${INST_INCDIR}/qlibc/extensions/qaconf.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qlog.h ${INST_INCDIR}/qlibc/extensions/qlog.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qhttpclient.h ${INST_INCDIR}/qlibc/extensions/qhttpclient.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qdatabase.h ${INST_INCDIR}/qlibc/extensions/qdatabase.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qtokenbucket.h ${INST_INCDIR}/qlibc/extensions/qtokenbucket.h -- ${MKDIR_P} ${INST_LIBDIR} -- ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_LIBNAME} ${INST_LIBDIR}/${QLIBCEXT_LIBNAME} -- ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_SLIBREALNAME} ${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME} -- ( cd ${INST_LIBDIR}; ${LN_S} -f ${QLIBCEXT_SLIBREALNAME} ${QLIBCEXT_SLIBNAME} ) -+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext.h $(DESTDIR)/${INST_INCDIR}/qlibc/qlibcext.h -+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/ -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qconfig.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qconfig.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qaconf.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qaconf.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qlog.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qlog.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qhttpclient.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qhttpclient.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qdatabase.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qdatabase.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qtokenbucket.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qtokenbucket.h -+ ${MKDIR_P} $(DESTDIR)/${INST_LIBDIR} -+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_LIBNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_LIBNAME} -+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_SLIBREALNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME} -+ ( cd $(DESTDIR)/${INST_LIBDIR}; ${LN_S} -f ${QLIBCEXT_SLIBREALNAME} ${QLIBCEXT_SLIBNAME} ) - - uninstall-qlibcext: -- ${RM} -f ${INST_INCDIR}/qlibc/qlibcext.h -- ${RM} -rf ${INST_INCDIR}/qlibc/extensions -- ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_LIBNAME} -- ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME} -- ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_SLIBNAME} -+ ${RM} -f $(DESTDIR)/${INST_INCDIR}/qlibc/qlibcext.h -+ ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/extensions -+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_LIBNAME} -+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME} -+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_SLIBNAME} - - deinstall: uninstall - uninstall: uninstall-qlibc uninstall-qlibcext -- ${RMDIR} ${INST_INCDIR}/qlibc -+ ${RMDIR} $(DESTDIR)/${INST_INCDIR}/qlibc - - clean: - ${RM} -f ${QLIBC_OBJS} diff --git a/buildroot/package/qlibc/0003-fix-openssl-mysql-checks.patch b/buildroot/package/qlibc/0003-fix-openssl-mysql-checks.patch deleted file mode 100644 index bb609b244..000000000 --- a/buildroot/package/qlibc/0003-fix-openssl-mysql-checks.patch +++ /dev/null @@ -1,36 +0,0 @@ -Allow to explicitly disable openssl and mysql - -AC_ARG_WITH() is being incorrectly used: the third argument indicates -the action that needs to be taken when a value was passed, when not -the option is enabled. Therefore, the result of the existing code was -that when you passed --without-mysql or --without-openssl, the -$withval variable would get the value 'yes', which is obviously wrong. - -Instead, we simply empty this third argument, because $withval is -already properly filled with 'yes' or 'no' by the AC_ARG_WITH() -function. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -170,7 +170,7 @@ - ## --with section - ## - --AC_ARG_WITH([openssl],[AS_HELP_STRING([--with-openssl], [This will enable HTTPS support in qhttpclient extension API. When it's enabled, user applications will need to link openssl library with -lssl option.])],[withval=yes],[withval=no]) -+AC_ARG_WITH([openssl],[AS_HELP_STRING([--with-openssl], [This will enable HTTPS support in qhttpclient extension API. When it's enabled, user applications will need to link openssl library with -lssl option.])],[],[withval=no]) - if test "$withval" = yes; then - if test "$with_openssl" = yes; then - with_openssl="/usr/include" -@@ -185,7 +185,7 @@ - fi - fi - --AC_ARG_WITH([mysql],[AS_HELP_STRING([--with-mysql], [This will enable MySQL database support in qdatabase extension API. When it's enabled, user applications need to link mysql client library. (ex: -lmysqlclient)])],[withval=yes],[withval=no]) -+AC_ARG_WITH([mysql],[AS_HELP_STRING([--with-mysql], [This will enable MySQL database support in qdatabase extension API. When it's enabled, user applications need to link mysql client library. (ex: -lmysqlclient)])],[],[withval=no]) - if test "$withval" = yes; then - if test "$with_mysql" = yes; then - with_mysql="/usr/include/mysql" diff --git a/buildroot/package/qlibc/qlibc.hash b/buildroot/package/qlibc/qlibc.hash index 6b8e4d894..616194f8d 100644 --- a/buildroot/package/qlibc/qlibc.hash +++ b/buildroot/package/qlibc/qlibc.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1f9aa5eefd28c45d409130a35104816d41405da64fe900f70a1c41150891501a qlibc-v2.4.1.tar.gz +sha256 93512e2203aaadda7aa62039b29500d9236b878e16f070328c58dc9d23da94d7 qlibc-2.4.4.tar.gz +sha256 7c9d03656af4c0acf0a35e29459086498dd64080eac6d2945bc1c064aaf18132 LICENSE diff --git a/buildroot/package/qlibc/qlibc.mk b/buildroot/package/qlibc/qlibc.mk index 55c7aa3b0..1b234f7e4 100644 --- a/buildroot/package/qlibc/qlibc.mk +++ b/buildroot/package/qlibc/qlibc.mk @@ -4,13 +4,11 @@ # ################################################################################ -QLIBC_VERSION = v2.4.1 -QLIBC_SITE = $(call github,wolkykim,qlibc,$(QLIBC_VERSION)) +QLIBC_VERSION = 2.4.4 +QLIBC_SITE = $(call github,wolkykim,qlibc,v$(QLIBC_VERSION)) QLIBC_LICENSE = BSD-2-Clause QLIBC_LICENSE_FILES = LICENSE -# We're patching configure.ac -QLIBC_AUTORECONF = YES QLIBC_INSTALL_STAGING = YES QLIBC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) diff --git a/buildroot/package/qpdf/0001-libtests-cxx11.cc-fix-build-with-gcc-4.8.patch b/buildroot/package/qpdf/0001-libtests-cxx11.cc-fix-build-with-gcc-4.8.patch new file mode 100644 index 000000000..76504c747 --- /dev/null +++ b/buildroot/package/qpdf/0001-libtests-cxx11.cc-fix-build-with-gcc-4.8.patch @@ -0,0 +1,38 @@ +From e70c2605a11d12a8eeee3e7eec46077956e11e1f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 17 Feb 2020 22:36:08 +0100 +Subject: [PATCH] libtests/cxx11.cc: fix build with gcc 4.8 + +Build fails on gcc 4.8 since version 9.1.1 and commit +752416554086d5d34323bc14164d5084db83cfbd: + +libtests/cxx11.cc: In function 'void do_regex()': +libtests/cxx11.cc:347:42: error: 'strlen' is not a member of 'std' + std::cregex_iterator m3(str7, str7 + std::strlen(str7), expr4); + ^ + +To fix the build failure, add missing include on cstring + +Fixes: + - http://autobuild.buildroot.org/results/ad7fb68ae87850a85509eed80fd0cae8721b10c5 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/qpdf/qpdf/pull/400] +--- + libtests/cxx11.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libtests/cxx11.cc b/libtests/cxx11.cc +index fa1dc6b..91ed7b1 100644 +--- a/libtests/cxx11.cc ++++ b/libtests/cxx11.cc +@@ -1,5 +1,6 @@ + #include + #include ++#include + #include + #include + #include +-- +2.24.1 + diff --git a/buildroot/package/qpdf/Config.in b/buildroot/package/qpdf/Config.in index 3a4fa6072..56a96e4f4 100644 --- a/buildroot/package/qpdf/Config.in +++ b/buildroot/package/qpdf/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_QPDF bool "qpdf" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 select BR2_PACKAGE_ZLIB select BR2_PACKAGE_JPEG help @@ -13,5 +15,6 @@ config BR2_PACKAGE_QPDF http://qpdf.sourceforge.net/ -comment "qpdf needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "qpdf needs a toolchain w/ C++, wchar, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/buildroot/package/qpdf/qpdf.hash b/buildroot/package/qpdf/qpdf.hash index 610930672..050c9d9a4 100644 --- a/buildroot/package/qpdf/qpdf.hash +++ b/buildroot/package/qpdf/qpdf.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/qpdf/files/qpdf/8.2.1/qpdf-8.2.1.sha512/download -sha512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c qpdf-8.2.1.tar.gz +# From https://sourceforge.net/projects/qpdf/files/qpdf/9.1.1/qpdf-9.1.1.sha512/download +sha512 008a11fef663a57ca173631f2053988023babea6c333cfe01db0ef955c8cd36d387ed9f2039f55bd5f9ca94c7a8e400461a09a15c5f89e03bc0817fdd0d3d585 qpdf-9.1.1.tar.gz # Locally computed: sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt sha256 fb929ac30decb4dc3a2eea2bec6c43296a797c5d2d602deb3784ee39430583d5 Artistic-2.0 diff --git a/buildroot/package/qpdf/qpdf.mk b/buildroot/package/qpdf/qpdf.mk index db46b99a1..ac703d716 100644 --- a/buildroot/package/qpdf/qpdf.mk +++ b/buildroot/package/qpdf/qpdf.mk @@ -4,13 +4,20 @@ # ################################################################################ -QPDF_VERSION = 8.2.1 +QPDF_VERSION = 9.1.1 QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION) QPDF_INSTALL_STAGING = YES QPDF_LICENSE = Apache-2.0 or Artistic-2.0 QPDF_LICENSE_FILES = LICENSE.txt Artistic-2.0 -QPDF_DEPENDENCIES = zlib jpeg +QPDF_DEPENDENCIES = host-pkgconf zlib jpeg QPDF_CONF_OPTS = --without-random +ifeq ($(BR2_PACKAGE_GNUTLS),y) +QPDF_CONF_OPTS += --enable-crypto-gnutls +QPDF_DEPENDENCIES += gnutls +else +QPDF_CONF_OPTS += --disable-crypto-gnutls +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/qpid-proton/qpid-proton.hash b/buildroot/package/qpid-proton/qpid-proton.hash index 8c2cc4f35..1ee72eef7 100644 --- a/buildroot/package/qpid-proton/qpid-proton.hash +++ b/buildroot/package/qpid-proton/qpid-proton.hash @@ -1,2 +1,4 @@ # Hash from: http://www.apache.org/dist/qpid/proton/0.9.1/qpid-proton-0.9.1.tar.gz.sha sha1 98008d90acd0d47cbd7ac1572a2bb50b452338ed qpid-proton-0.9.1.tar.gz +# Locally computed +sha256 9fade5e12873678456137b36cfa4a5983c3793836d41c011f2c2abb02ca36a66 LICENSE diff --git a/buildroot/package/qt-webkit-kiosk/Config.in b/buildroot/package/qt-webkit-kiosk/Config.in index 13ed9bd22..46688a227 100644 --- a/buildroot/package/qt-webkit-kiosk/Config.in +++ b/buildroot/package/qt-webkit-kiosk/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK depends on BR2_PACKAGE_QT5 depends on !BR2_STATIC_LIBS # qt5webkit depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5webkit - depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5webkit -> icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5webkit -> icu depends on !BR2_BINFMT_FLAT # qt5webkit -> icu depends on !BR2_MIPS_SOFT_FLOAT # qt5webkit @@ -26,9 +25,8 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS endif -comment "qt-webkit-kiosk needs a toolchain w/ dynamic library, gcc >= 4.8, host gcc >= 4.8" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ - !BR2_HOST_GCC_AT_LEAST_4_8 +comment "qt-webkit-kiosk needs a toolchain w/ dynamic library, gcc >= 4.8" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on !BR2_BINFMT_FLAT depends on !BR2_MIPS_SOFT_FLOAT diff --git a/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash b/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash index 666cb6ce5..1e56b4eba 100644 --- a/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash +++ b/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 07fbc3f5053f55e4ef6566a15b42b74895314b48a0dfd46f0984f96f0fbb3e02 qt-webkit-kiosk-a7720e50f2bd70aad99e0b465f5c4a57aca48127.tar.gz +sha256 07fbc3f5053f55e4ef6566a15b42b74895314b48a0dfd46f0984f96f0fbb3e02 qt-webkit-kiosk-a7720e50f2bd70aad99e0b465f5c4a57aca48127.tar.gz +sha256 de59ec6c939f4c4def79c0a996b3bd5626895fcbd1ae108e7bddb1dac8218381 doc/lgpl.html diff --git a/buildroot/package/qt5/Config.in b/buildroot/package/qt5/Config.in index a50b57a82..367eb3a79 100644 --- a/buildroot/package/qt5/Config.in +++ b/buildroot/package/qt5/Config.in @@ -11,14 +11,22 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE # ARM needs BLX, so v5t+ depends on !BR2_ARM_CPU_ARMV4 -comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "Qt5 needs a toolchain w/ gcc >= 4.8, wchar, NPTL, C++, dynamic library" + depends on !BR2_ARM_CPU_ARMV4 + depends on !BR2_arc + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 menuconfig BR2_PACKAGE_QT5 bool "Qt5" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ + # no built-in double-conversion support + depends on !BR2_arc depends on !BR2_STATIC_LIBS select BR2_PACKAGE_QT5BASE help @@ -29,32 +37,9 @@ menuconfig BR2_PACKAGE_QT5 if BR2_PACKAGE_QT5 -choice - prompt "Qt5 version" - config BR2_PACKAGE_QT5_VERSION_LATEST - bool "Latest (5.11)" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 - depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ - # no built-in double-conversion support - depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa - help - This option builds Qt 5.11, which is licensed under - (L)GPL-3.0+. - -comment "Latest Qt version needs host/toolchain w/ gcc >= 4.8" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8 - depends on !BR2_ARM_CPU_ARMV4 - depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa - -config BR2_PACKAGE_QT5_VERSION_5_6 - bool "LTS (5.6)" - help - This option builds Qt 5.6, which is licensed under - (L)GPL-2.0+. - -endchoice + bool + default y source "package/qt5/qt53d/Config.in" source "package/qt5/qt5base/Config.in" @@ -83,6 +68,7 @@ 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/qt5webview/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" endif diff --git a/buildroot/package/qt5/qt5.mk b/buildroot/package/qt5/qt5.mk index c8c07a988..7805b575f 100644 --- a/buildroot/package/qt5/qt5.mk +++ b/buildroot/package/qt5/qt5.mk @@ -4,33 +4,12 @@ # ################################################################################ -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5_VERSION_MAJOR = 5.11 -QT5_VERSION = $(QT5_VERSION_MAJOR).3 +QT5_VERSION_MAJOR = 5.12 +QT5_VERSION = $(QT5_VERSION_MAJOR).7 QT5_SOURCE_TARBALL_PREFIX = everywhere-src -else -QT5_VERSION_MAJOR = 5.6 -QT5_VERSION = $(QT5_VERSION_MAJOR).3 -QT5_SOURCE_TARBALL_PREFIX = opensource-src -endif QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules include $(sort $(wildcard package/qt5/*/*.mk)) -define QT5_LA_PRL_FILES_FIXUP - for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.la"); do \ - $(SED) "s:$(BASE_DIR):@BASE_DIR@:g" \ - -e "s:$(STAGING_DIR):@STAGING_DIR@:g" \ - -e "s:\(['= ]\)/usr:\\1@STAGING_DIR@/usr:g" \ - -e "s:@STAGING_DIR@:$(STAGING_DIR):g" \ - -e "s:@BASE_DIR@:$(BASE_DIR):g" \ - $$i ; \ - $(SED) "/^dependency_libs=/s%-L/usr/lib %%g" $$i ; \ - done - for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.prl"); do \ - $(SED) "s%-L/usr/lib%%" $$i; \ - done -endef - # Variable for other Qt applications to use QT5_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ diff --git a/buildroot/package/qt5/qt53d/qt53d.hash b/buildroot/package/qt5/qt53d/qt53d.hash index 2da550050..1ccc9f00e 100644 --- a/buildroot/package/qt5/qt53d/qt53d.hash +++ b/buildroot/package/qt5/qt53d/qt53d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qt3d-everywhere-src-5.11.3.tar.xz.sha256 -sha256 04a55c21f365d897ec75042ee83f9ad59a847992c6f55fae0763ad2701d99eab qt3d-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qt3d-everywhere-src-5.12.7.tar.xz.sha256 +sha256 2030de3dc93fd4062f677f61938229af9cd7aa4c3d2932cdda2ccb663d681126 qt3d-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/buildroot/package/qt5/qt53d/qt53d.mk b/buildroot/package/qt5/qt53d/qt53d.mk index 48a931d60..7674b4455 100644 --- a/buildroot/package/qt5/qt53d/qt53d.mk +++ b/buildroot/package/qt5/qt53d/qt53d.mk @@ -27,7 +27,6 @@ endef define QT53D_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) diff --git a/buildroot/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch b/buildroot/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch new file mode 100644 index 000000000..769a34da2 --- /dev/null +++ b/buildroot/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch @@ -0,0 +1,27 @@ +From cfac9a39658906b06f28208ee1d129f042760416 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 10 Mar 2020 09:01:31 +0100 +Subject: [PATCH] double-conversion: enable for xtensa + +[Upstream: https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa] +Signed-off-by: Peter Seiderer +--- + .../double-conversion/include/double-conversion/utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h +index 55ca5bf5..95b08a4e 100644 +--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -96,7 +96,7 @@ int main(int argc, char** argv) { + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || defined(__EMSCRIPTEN__) || \ + defined(__or1k__) || \ +- defined(__microblaze__) ++ defined(__microblaze__) || defined(__XTENSA__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) || \ + defined(__pnacl__) || defined(__native_client__) +-- +2.25.1 + diff --git a/buildroot/package/qt5/qt5base/5.11.3/0002-double-conversion-enable-for-aarch64_be.patch b/buildroot/package/qt5/qt5base/5.11.3/0002-double-conversion-enable-for-aarch64_be.patch deleted file mode 100644 index 838f4dd7a..000000000 --- a/buildroot/package/qt5/qt5base/5.11.3/0002-double-conversion-enable-for-aarch64_be.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e81ba4e0de16ff741417ae7ed7dfe7b5a83d66e2 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 13 Aug 2018 20:15:05 +0200 -Subject: [PATCH] double-conversion: enable for aarch64_be - -Signed-off-by: Peter Seiderer ---- - .../double-conversion/include/double-conversion/utils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 20bfd36c84..77baa2861a 100644 ---- a/src/3rdparty/double-conversion/include/double-conversion/utils.h -+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -65,7 +65,7 @@ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ -- defined(__AARCH64EL__) -+ defined(__AARCH64EL__) || defined(__AARCH64EB__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) --- -2.18.0 - diff --git a/buildroot/package/qt5/qt5base/5.11.3/0003-double-conversion-enable-for-or1k.patch b/buildroot/package/qt5/qt5base/5.11.3/0003-double-conversion-enable-for-or1k.patch deleted file mode 100644 index 53c5a3183..000000000 --- a/buildroot/package/qt5/qt5base/5.11.3/0003-double-conversion-enable-for-or1k.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f9920819e6600a68829fb4600f11b70ebc2a33e7 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sat, 18 Aug 2018 23:44:20 +0200 -Subject: [PATCH] double-conversion: enable for or1k - -Signed-off-by: Peter Seiderer ---- - .../double-conversion/include/double-conversion/utils.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 77baa2861a..b0a7d5d4f4 100644 ---- a/src/3rdparty/double-conversion/include/double-conversion/utils.h -+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -65,7 +65,8 @@ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ -- defined(__AARCH64EL__) || defined(__AARCH64EB__) -+ defined(__AARCH64EL__) || defined(__AARCH64EB__) || \ -+ defined(__or1k__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) --- -2.18.0 - diff --git a/buildroot/package/qt5/qt5base/5.11.3/0004-double-conversion-enable-for-microblaze.patch b/buildroot/package/qt5/qt5base/5.11.3/0004-double-conversion-enable-for-microblaze.patch deleted file mode 100644 index 2d7164b67..000000000 --- a/buildroot/package/qt5/qt5base/5.11.3/0004-double-conversion-enable-for-microblaze.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 372d33fbe549ea73318c187505716ac99fbf3054 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Tue, 21 Aug 2018 21:11:40 +0200 -Subject: [PATCH] double-conversion: enable for microblaze - -Signed-off-by: Peter Seiderer ---- - .../double-conversion/include/double-conversion/utils.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index b0a7d5d4f4..485f680180 100644 ---- a/src/3rdparty/double-conversion/include/double-conversion/utils.h -+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -66,7 +66,8 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || defined(__AARCH64EB__) || \ -- defined(__or1k__) -+ defined(__or1k__) || \ -+ defined(__microblaze__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) --- -2.18.0 - diff --git a/buildroot/package/qt5/qt5base/5.11.3/0005-double-conversion-enable-for-riscv.patch b/buildroot/package/qt5/qt5base/5.11.3/0005-double-conversion-enable-for-riscv.patch deleted file mode 100644 index 0bdfd4918..000000000 --- a/buildroot/package/qt5/qt5base/5.11.3/0005-double-conversion-enable-for-riscv.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 982801a21c3abad7025a7110275a49e200bc460f Mon Sep 17 00:00:00 2001 -From: Stefan O'Rear -Date: Thu, 17 Nov 2016 09:54:33 -0800 -Subject: [PATCH] double-conversion: enable for riscv - -Original double conversion patch [1] 'Add support for RISC-V' ported -to qtbase-5.11.3. - -[1] Upstream: https://github.com/google/double-conversion/commit/8316ed5bf405835558a476e528d8e1d0adf69dd9 - -Change-Id: Id88a356940f4d61dbcec3741a74db695e47af3f0 -Signed-off-by: Peter Seiderer ---- - src/3rdparty/double-conversion/include/double-conversion/utils.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 485f680180..a736b14d1e 100644 ---- a/src/3rdparty/double-conversion/include/double-conversion/utils.h -+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -66,6 +66,7 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || defined(__AARCH64EB__) || \ -+ defined(__riscv) || \ - defined(__or1k__) || \ - defined(__microblaze__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 --- -2.20.1 - diff --git a/buildroot/package/qt5/qt5base/5.11.3/0006-Fix-compile-issue-with-gcc-9.patch b/buildroot/package/qt5/qt5base/5.11.3/0006-Fix-compile-issue-with-gcc-9.patch deleted file mode 100644 index 0a5507456..000000000 --- a/buildroot/package/qt5/qt5base/5.11.3/0006-Fix-compile-issue-with-gcc-9.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e094806951ff7337b5b0c534db479e3808f153a7 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Tue, 13 Nov 2018 16:00:23 +0100 -Subject: [PATCH] Fix compile issue with gcc 9 - -It appears messenne_twisters in the latest libstdc++ has one more -requirement before it is willing to construct with our -SystemGenerator struct as an sseq provider. - -Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe -Reviewed-by: Giuseppe D'Angelo -Reviewed-by: Thiago Macieira -Signed-off-by: Julien Beraud ---- - src/corelib/global/qrandom.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index ebf9864b15..577736a867 100644 ---- a/src/corelib/global/qrandom.cpp -+++ b/src/corelib/global/qrandom.cpp -@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator - #endif // Q_OS_WINRT - - static SystemGenerator &self(); -+ typedef quint32 result_type; - void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept); - - // For std::mersenne_twister_engine implementations that use something --- -2.23.0 - diff --git a/buildroot/package/qt5/qt5base/5.11.3/qt5base.hash b/buildroot/package/qt5/qt5base/5.11.3/qt5base.hash deleted file mode 100644 index 964bcf1ab..000000000 --- a/buildroot/package/qt5/qt5base/5.11.3/qt5base.hash +++ /dev/null @@ -1,11 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz.sha256 -sha256 c6bf887732b83ce072eb72eddb7497bedcdf9ca794e7ed91261a93f063623e1c qtbase-everywhere-src-5.11.3.tar.xz - -# Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 1f4fa3d202198f5d836993748eac9d91157e2cec7fb8426f56000a02a677cdc5 header.BSD -sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/buildroot/package/qt5/qt5base/5.11.3/0001-qtbase-Fix-build-error-when-using-EGL.patch b/buildroot/package/qt5/qt5base/5.12.7/0001-qtbase-Fix-build-error-when-using-EGL.patch similarity index 100% rename from buildroot/package/qt5/qt5base/5.11.3/0001-qtbase-Fix-build-error-when-using-EGL.patch rename to buildroot/package/qt5/qt5base/5.12.7/0001-qtbase-Fix-build-error-when-using-EGL.patch diff --git a/buildroot/package/qt5/qt5base/5.12.7/0002-double-conversion-enable-for-microblaze.patch b/buildroot/package/qt5/qt5base/5.12.7/0002-double-conversion-enable-for-microblaze.patch new file mode 100644 index 000000000..c91d81269 --- /dev/null +++ b/buildroot/package/qt5/qt5base/5.12.7/0002-double-conversion-enable-for-microblaze.patch @@ -0,0 +1,29 @@ +From 014958d2d17045dd63d93cb3061d1e40b15725b7 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 21 Aug 2018 21:11:40 +0200 +Subject: [PATCH] double-conversion: enable for microblaze + +Signed-off-by: Peter Seiderer +[Rebased for Qt5.12.0] +Signed-off-by: Peter Seiderer +--- + .../double-conversion/include/double-conversion/utils.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h +index 7622fe6162..d29de95094 100644 +--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -94,7 +94,8 @@ int main(int argc, char** argv) { + defined(_MIPS_ARCH_MIPS32R2) || \ + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || defined(__EMSCRIPTEN__) || \ +- defined(__or1k__) ++ defined(__or1k__) || \ ++ defined(__microblaze__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) || \ + defined(__pnacl__) || defined(__native_client__) +-- +2.19.2 + diff --git a/buildroot/package/qt5/qt5base/5.12.7/0003-double-conversion-enable-for-nios2.patch b/buildroot/package/qt5/qt5base/5.12.7/0003-double-conversion-enable-for-nios2.patch new file mode 100644 index 000000000..79e276b17 --- /dev/null +++ b/buildroot/package/qt5/qt5base/5.12.7/0003-double-conversion-enable-for-nios2.patch @@ -0,0 +1,26 @@ +From e3f63db3124caf5bde9cf688eba563f7f025662d Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 8 Mar 2020 18:08:26 +0100 +Subject: [PATCH] double-conversion: enable for nios2 + +[Upstream: https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa] +Signed-off-by: Peter Seiderer +--- + src/3rdparty/double-conversion/include/double-conversion/utils.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h +index d29de950..55ca5bf5 100644 +--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -87,6 +87,7 @@ int main(int argc, char** argv) { + defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ ++ defined(__nios2__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ + defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ +-- +2.25.1 + diff --git a/buildroot/package/qt5/qt5base/5.12.7/qt5base.hash b/buildroot/package/qt5/qt5base/5.12.7/qt5base.hash new file mode 100644 index 000000000..0697464cb --- /dev/null +++ b/buildroot/package/qt5/qt5base/5.12.7/qt5base.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtbase-everywhere-src-5.12.7.tar.xz.sha256 +sha256 b18939cb25d90aef8721fb12ec34c3632d3490ced958e41f6c7a52064643665d qtbase-everywhere-src-5.12.7.tar.xz + +# Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 1f4fa3d202198f5d836993748eac9d91157e2cec7fb8426f56000a02a677cdc5 header.BSD +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/buildroot/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch b/buildroot/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch new file mode 100644 index 000000000..4acd42f00 --- /dev/null +++ b/buildroot/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch @@ -0,0 +1,32 @@ +From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001 +From: Olivier Goffart +Date: Fri, 8 Nov 2019 11:30:40 +0100 +Subject: [PATCH] Do not load plugin from the $PWD + +I see no reason why this would make sense to look for plugins in the current +directory. And when there are plugins there, it may actually be wrong + +Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5 +Reviewed-by: Thiago Macieira + +Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=bf131e8d2181b3404f5293546ed390999f760404 +Signed-off-by: Peter Seiderer +--- + src/corelib/plugin/qpluginloader.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp +index cadff4f32b..c2443dbdda 100644 +--- a/src/corelib/plugin/qpluginloader.cpp ++++ b/src/corelib/plugin/qpluginloader.cpp +@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName) + paths.append(fileName.left(slash)); // don't include the '/' + } else { + paths = QCoreApplication::libraryPaths(); +- paths.prepend(QStringLiteral(".")); // search in current dir first + } + + for (const QString &path : qAsConst(paths)) { +-- +2.25.0 + diff --git a/buildroot/package/qt5/qt5base/Config.in b/buildroot/package/qt5/qt5base/Config.in index 696e68975..2b4ed1387 100644 --- a/buildroot/package/qt5/qt5base/Config.in +++ b/buildroot/package/qt5/qt5base/Config.in @@ -236,7 +236,9 @@ config BR2_PACKAGE_QT5BASE_FONTCONFIG config BR2_PACKAGE_QT5BASE_HARFBUZZ bool "harfbuzz support" - select BR2_PACKAGE_HARFBUZZ if BR2_TOOLCHAIN_HAS_SYNC_4 + select BR2_PACKAGE_HARFBUZZ if \ + BR2_TOOLCHAIN_HAS_SYNC_4 && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 help This option enables HarfBuzz support (either system harfbuzz if the toolchain supports __sync for 4 bytes, or the qt @@ -273,7 +275,6 @@ config BR2_PACKAGE_QT5BASE_DBUS config BR2_PACKAGE_QT5BASE_ICU bool "Enable ICU support" - depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu depends on !BR2_BINFMT_FLAT # icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu select BR2_PACKAGE_ICU @@ -281,10 +282,9 @@ config BR2_PACKAGE_QT5BASE_ICU This option enables ICU support in Qt5. This is for example needed for Qt5Webkit. -comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8" +comment "icu support needs a toolchain w/ gcc >= 4.8" depends on !BR2_BINFMT_FLAT - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ - !BR2_HOST_GCC_AT_LEAST_4_8 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 config BR2_PACKAGE_QT5BASE_OPENSSL bool diff --git a/buildroot/package/qt5/qt5base/qmake.conf.in b/buildroot/package/qt5/qt5base/qmake.conf.in index 2eb564e17..024c07492 100644 --- a/buildroot/package/qt5/qt5base/qmake.conf.in +++ b/buildroot/package/qt5/qt5base/qmake.conf.in @@ -15,10 +15,15 @@ QMAKE_CXX = $${CROSS_COMPILE}g++ # modifications to gcc-base.conf QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} +# Remove all optimisation flags, we really only want our own. QMAKE_CFLAGS_OPTIMIZE = QMAKE_CFLAGS_OPTIMIZE_DEBUG = QMAKE_CFLAGS_OPTIMIZE_FULL = QMAKE_CFLAGS_OPTIMIZE_SIZE = +QMAKE_CFLAGS_DEBUG = +QMAKE_CXXFLAGS_DEBUG = +QMAKE_CFLAGS_RELEASE = +QMAKE_CXXFLAGS_RELEASE = CONFIG += nostrip QMAKE_LIBS += -lrt -lpthread -ldl diff --git a/buildroot/package/qt5/qt5base/qt.conf.in b/buildroot/package/qt5/qt5base/qt.conf.in index 9a0b9cd53..2215cbd4e 100644 --- a/buildroot/package/qt5/qt5base/qt.conf.in +++ b/buildroot/package/qt5/qt5base/qt.conf.in @@ -1,19 +1,7 @@ [Paths] -Prefix=@@HOST_DIR@@ +Prefix=/usr +HostPrefix=@@HOST_DIR@@ Sysroot=@@STAGING_DIR@@ Headers=/usr/include/qt5 -Libraries=/usr/lib -LibraryExecutables=/usr/libexec -Binaries=/usr/bin Plugins=/usr/lib/qt/plugins Examples=/usr/lib/qt/examples -Qml2Imports=/usr/qml -Imports=/usr/imports -Translations=/usr/translations -Examples=/usr/lib/qt/examples -Demos=/usr/lib/qt/examples -Tests=/usr/tests -Settings=/usr -Documentation=/usr/doc -ArchData=/usr -Data=/usr diff --git a/buildroot/package/qt5/qt5base/qt5base.mk b/buildroot/package/qt5/qt5base/qt5base.mk index da1a11b26..774c771bc 100644 --- a/buildroot/package/qt5/qt5base/qt5base.mk +++ b/buildroot/package/qt5/qt5base/qt5base.mk @@ -34,6 +34,14 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5BASE_CONFIGURE_OPTS += -no-optimize-debug endif +QT5BASE_CFLAGS = $(TARGET_CFLAGS) +QT5BASE_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_90620),y) +QT5BASE_CFLAGS += -O0 +QT5BASE_CXXFLAGS += -O0 +endif + ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) QT5BASE_DEPENDENCIES += pcre else @@ -70,6 +78,12 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) QT5BASE_CONFIGURE_OPTS += -gbm QT5BASE_DEPENDENCIES += mesa3d +else ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y) +QT5BASE_CONFIGURE_OPTS += -gbm +QT5BASE_DEPENDENCIES += gcnano-binaries +else ifeq ($(BR2_PACKAGE_TI_SGX_LIBGBM),y) +QT5BASE_CONFIGURE_OPTS += -gbm +QT5BASE_DEPENDENCIES += ti-sgx-libgbm else QT5BASE_CONFIGURE_OPTS += -no-gbm endif @@ -93,7 +107,7 @@ QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3-Clause (examples) +QT5BASE_LICENSE += , BSD-3-Clause (examples) QT5BASE_LICENSE_FILES += header.BSD endif @@ -145,7 +159,7 @@ QT5BASE_DEPENDENCIES += harfbuzz else # qt harfbuzz otherwise (using QAtomic instead) QT5BASE_CONFIGURE_OPTS += -qt-harfbuzz -QT5BASE_LICENSE := $(QT5BASE_LICENSE), MIT (harfbuzz) +QT5BASE_LICENSE += , MIT (harfbuzz) QT5BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING endif else @@ -160,7 +174,13 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon +QT5BASE_CONFIGURE_OPTS += -xcb +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) +QT5BASE_CONFIGURE_OPTS += -system-xkbcommon-x11 +else +QT5BASE_CONFIGURE_OPTS += -xkbcommon +endif + QT5BASE_DEPENDENCIES += \ libxcb \ xcb-util-wm \ @@ -254,6 +274,13 @@ QT5BASE_CONFIGURE_OPTS += -no-gtk endif endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +QT5BASE_CONFIGURE_OPTS += -journald +QT5BASE_DEPENDENCIES += systemd +else +QT5BASE_CONFIGURE_OPTS += -no-journald +endif + # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa @@ -268,6 +295,9 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegrat ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport endif +ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y) +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport +endif else QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration endif @@ -282,7 +312,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv -else ifeq ($(BR2_PACKAGE_SUNXI_MALI)$(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) +else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) # use mali backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali endif @@ -338,8 +368,8 @@ define QT5BASE_CONFIGURE_CMDS -nomake tests \ -device buildroot \ -device-option CROSS_COMPILE="$(TARGET_CROSS)" \ - -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS)" \ - -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS)" \ + -device-option BR_COMPILER_CFLAGS="$(QT5BASE_CFLAGS)" \ + -device-option BR_COMPILER_CXXFLAGS="$(QT5BASE_CXXFLAGS)" \ $(QT5BASE_CONFIGURE_OPTS) \ ) endef @@ -357,7 +387,6 @@ endef define QT5BASE_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) $(QT5BASE_INSTALL_QT_CONF) endef diff --git a/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash b/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash index 4fc7c613b..2c7046a87 100644 --- a/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ b/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtcanvas3d-everywhere-src-5.11.3.tar.xz.sha256 -sha256 d5a004848588c1c53ea7ed9d36bb5bfe3a813ffc45290066d2f6cfcace072138 qtcanvas3d-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtcanvas3d-everywhere-src-5.12.7.tar.xz.sha256 +sha256 b63a513a2ee11548b122e0fd640b1fa22d3eb83cdc51ddfdf3b97c2ecd0d0c50 qtcanvas3d-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk b/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk index ef5b373d0..b550ff00f 100644 --- a/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk +++ b/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk @@ -28,7 +28,6 @@ endef define QT5CANVAS3D_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) diff --git a/buildroot/package/qt5/qt5charts/qt5charts.hash b/buildroot/package/qt5/qt5charts/qt5charts.hash index 2519b8f13..fb077b95a 100644 --- a/buildroot/package/qt5/qt5charts/qt5charts.hash +++ b/buildroot/package/qt5/qt5charts/qt5charts.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f qtcharts-opensource-src-2.1.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtcharts-everywhere-src-5.11.3.tar.xz.sha256 -sha256 4798f3ebc4d937d1c190db7ff718ad5affa907caa56b5557e593f6b5a60d95dc qtcharts-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtcharts-everywhere-src-5.12.7.tar.xz.sha256 +sha256 434065526d0b1d8921e96cc1827b1a3579e073b930fe536455c4c1da2f15cf5f qtcharts-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/buildroot/package/qt5/qt5charts/qt5charts.mk b/buildroot/package/qt5/qt5charts/qt5charts.mk index 9e2e6de88..e35974750 100644 --- a/buildroot/package/qt5/qt5charts/qt5charts.mk +++ b/buildroot/package/qt5/qt5charts/qt5charts.mk @@ -34,7 +34,6 @@ endef define QT5CHARTS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_STATIC_LIBS),) diff --git a/buildroot/package/qt5/qt5connectivity/5.11.3/qt5connectivity.hash b/buildroot/package/qt5/qt5connectivity/5.11.3/qt5connectivity.hash deleted file mode 100644 index 54fda648c..000000000 --- a/buildroot/package/qt5/qt5connectivity/5.11.3/qt5connectivity.hash +++ /dev/null @@ -1,9 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtconnectivity-everywhere-src-5.11.3.tar.xz.sha256 -sha256 148cfcbceb3d0a70059f4d92fa069baf56babb627b16a4203b318ca6f0d0b32a qtconnectivity-everywhere-src-5.11.3.tar.xz - -# Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5connectivity/5.12.7/qt5connectivity.hash b/buildroot/package/qt5/qt5connectivity/5.12.7/qt5connectivity.hash new file mode 100644 index 000000000..9af3a57c1 --- /dev/null +++ b/buildroot/package/qt5/qt5connectivity/5.12.7/qt5connectivity.hash @@ -0,0 +1,9 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtconnectivity-everywhere-src-5.12.7.tar.xz.sha256 +sha256 647148b9b1a0d3e54f788b66797b81bb87434faf6fb12ac481f9165eda0d071a qtconnectivity-everywhere-src-5.12.7.tar.xz + +# Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5connectivity/Config.in b/buildroot/package/qt5/qt5connectivity/Config.in index 8bda8de66..182fe3ea9 100644 --- a/buildroot/package/qt5/qt5connectivity/Config.in +++ b/buildroot/package/qt5/qt5connectivity/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_QT5CONNECTIVITY bool "qt5connectivity" - depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS + depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_DBUS @@ -14,6 +14,5 @@ config BR2_PACKAGE_QT5CONNECTIVITY http://doc.qt.io/qt-5/qtbluetooth-index.html http://doc.qt.io/qt-5/qtnfc-index.html -comment "qt5connectivity needs neard and/or bluez(5)_utils" - depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ_UTILS && \ - !BR2_PACKAGE_BLUEZ5_UTILS +comment "qt5connectivity needs neard and/or bluez5_utils" + depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ5_UTILS diff --git a/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk b/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk index 6de1536b7..0ade9876d 100644 --- a/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk @@ -18,11 +18,10 @@ QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL- QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5CONNECTIVITY_LICENSE := $(QT5CONNECTIVITY_LICENSE), BSD-3-Clause (examples) +QT5CONNECTIVITY_LICENSE += , BSD-3-Clause (examples) endif QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarative) -QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils) QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_NEARD),neard) @@ -36,11 +35,10 @@ endef define QT5CONNECTIVITY_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -ifneq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_BLUEZ5_UTILS),) +ifneq ($(BR2_PACKAGE_BLUEZ5_UTILS),) define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/ endef @@ -52,7 +50,7 @@ endef endif endif -ifneq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_BLUEZ5_UTILS),) +ifneq ($(BR2_PACKAGE_BLUEZ5_UTILS),) define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH cp -dpf $(STAGING_DIR)/usr/lib/libQt5Bluetooth.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/bin/sdpscanner $(TARGET_DIR)/usr/bin diff --git a/buildroot/package/qt5/qt5declarative/5.11.3/0001-qsgtexture-fix-debug-build-with-uclibc.patch b/buildroot/package/qt5/qt5declarative/5.12.7/0001-qsgtexture-fix-debug-build-with-uclibc.patch similarity index 100% rename from buildroot/package/qt5/qt5declarative/5.11.3/0001-qsgtexture-fix-debug-build-with-uclibc.patch rename to buildroot/package/qt5/qt5declarative/5.12.7/0001-qsgtexture-fix-debug-build-with-uclibc.patch diff --git a/buildroot/package/qt5/qt5declarative/qt5declarative.hash b/buildroot/package/qt5/qt5declarative/qt5declarative.hash index 3ce4e5025..71e9cb211 100644 --- a/buildroot/package/qt5/qt5declarative/qt5declarative.hash +++ b/buildroot/package/qt5/qt5declarative/qt5declarative.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtdeclarative-everywhere-src-5.11.3.tar.xz.sha256 -sha256 8e263621d706f1c4def5d71212a6ae37b0d3c378da89d9e3e5fc0b5557721ae6 qtdeclarative-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtdeclarative-everywhere-src-5.12.7.tar.xz.sha256 +sha256 5cdc05a035f240ab73b6b37dd3831c1350cd80e5799da47929974085f6eae9bd qtdeclarative-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5declarative/qt5declarative.mk b/buildroot/package/qt5/qt5declarative/qt5declarative.mk index 2fe72b3be..621061196 100644 --- a/buildroot/package/qt5/qt5declarative/qt5declarative.mk +++ b/buildroot/package/qt5/qt5declarative/qt5declarative.mk @@ -28,7 +28,6 @@ endef define QT5DECLARATIVE_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_STATIC_LIBS),) diff --git a/buildroot/package/qt5/qt5enginio/qt5enginio.mk b/buildroot/package/qt5/qt5enginio/qt5enginio.mk index 38f309646..ebd99e4cb 100644 --- a/buildroot/package/qt5/qt5enginio/qt5enginio.mk +++ b/buildroot/package/qt5/qt5enginio/qt5enginio.mk @@ -15,7 +15,7 @@ QT5ENGINIO_INSTALL_STAGING = YES QT5ENGINIO_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5ENGINIO_LICENSE := $(QT5ENGINIO_LICENSE), BSD-3-Clause (examples) +QT5ENGINIO_LICENSE += , BSD-3-Clause (examples) endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) @@ -32,7 +32,6 @@ endef define QT5ENGINIO_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) diff --git a/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 36dd34526..8e327de29 100644 --- a/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz.mirrorlist sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtgraphicaleffects-everywhere-src-5.11.3.tar.xz.sha256 -sha256 14d86983fcdd119daefad235ffee7d8ca691e6074ef360cb6347b8aae66f57e2 qtgraphicaleffects-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtgraphicaleffects-everywhere-src-5.12.7.tar.xz.sha256 +sha256 02f0328420c623da8f9ae949fec01e99ba84213dd2ad559cb00c204502bbcace qtgraphicaleffects-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash b/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash index 1c1f81bbe..de977f15b 100644 --- a/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtimageformats-everywhere-src-5.11.3.tar.xz.sha256 -sha256 04b261bc3d7a277fbe9ac8619ecd037d7089b356eaee41b2d41d7a2ff58b087f qtimageformats-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtimageformats-everywhere-src-5.12.7.tar.xz.sha256 +sha256 9bd19ee24fb85f249d01c78e637c95377dd738feb61da0deeee6b770fa62f70b qtimageformats-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/buildroot/package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch b/buildroot/package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch deleted file mode 100644 index f893c33d5..000000000 --- a/buildroot/package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ad78b1a671edac369ede86bff376ec8af2cafbf2 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 5 Sep 2018 12:51:41 +0200 -Subject: [PATCH] qdeclarativegeomap: fix building with GCC < 5.x - -With GCC < 5.x implicit casts don't work as expected, in particular -QPointer in m_map QDeclarativeGeoMap class when passed to -connect(m_map, ...) should directly cast to m_map.data(). - -Workaround this using connect(m_map.data(), ...). - -Signed-off-by: Giulio Benetti ---- - src/location/declarativemaps/qdeclarativegeomap.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp -index 09f9d01c..dc5a32ed 100644 ---- a/src/location/declarativemaps/qdeclarativegeomap.cpp -+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp -@@ -694,11 +694,11 @@ void QDeclarativeGeoMap::mappingManagerInitialized() - QImage copyrightImage; - if (!m_initialized && width() > 0 && height() > 0) { - QMetaObject::Connection copyrightStringCatcherConnection = -- connect(m_map, -+ connect(m_map.data(), - QOverload::of(&QGeoMap::copyrightsChanged), - [©rightString](const QString ©){ copyrightString = copy; }); - QMetaObject::Connection copyrightImageCatcherConnection = -- connect(m_map, -+ connect(m_map.data(), - QOverload::of(&QGeoMap::copyrightsChanged), - [©rightImage](const QImage ©){ copyrightImage = copy; }); - m_map->setViewportSize(QSize(width(), height())); -@@ -719,8 +719,8 @@ void QDeclarativeGeoMap::mappingManagerInitialized() - emit m_map->copyrightsChanged(copyrightImage); - - -- connect(m_map, &QGeoMap::sgNodeChanged, this, &QQuickItem::update); -- connect(m_map, &QGeoMap::cameraCapabilitiesChanged, this, &QDeclarativeGeoMap::onCameraCapabilitiesChanged); -+ connect(m_map.data(), &QGeoMap::sgNodeChanged, this, &QQuickItem::update); -+ connect(m_map.data(), &QGeoMap::cameraCapabilitiesChanged, this, &QDeclarativeGeoMap::onCameraCapabilitiesChanged); - - // This prefetches a buffer around the map - m_map->prefetchData(); --- -2.17.1 - diff --git a/buildroot/package/qt5/qt5location/qt5location.hash b/buildroot/package/qt5/qt5location/qt5location.hash index be0ac7c31..80bcfaf0a 100644 --- a/buildroot/package/qt5/qt5location/qt5location.hash +++ b/buildroot/package/qt5/qt5location/qt5location.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz.sha256 -sha256 58e498a5b496e3a38925398b244bbd57ba68cbb482f2a0d2ae51572e037100eb qtlocation-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtlocation-everywhere-src-5.12.7.tar.xz.sha256 +sha256 d1e905b80befda3c9aaad92ea984e6dbf722568b5c91e8d15b027bc5bc22781f qtlocation-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5location/qt5location.mk b/buildroot/package/qt5/qt5location/qt5location.mk index da0aad796..a69e8f41a 100644 --- a/buildroot/package/qt5/qt5location/qt5location.mk +++ b/buildroot/package/qt5/qt5location/qt5location.mk @@ -32,7 +32,6 @@ endef define QT5LOCATION_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) diff --git a/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash b/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash index 851cbc353..016ec44ce 100644 --- a/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtmultimedia-everywhere-src-5.11.3.tar.xz.sha256 -sha256 728078eff7dc21495d704a7cd17c604d74604604b45a3c58271608f90dea3c41 qtmultimedia-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtmultimedia-everywhere-src-5.12.7.tar.xz.sha256 +sha256 28bdaa81371f922223775ae5171c4d589a2c07f255abbe5ccf130ecbbdb4db1d qtmultimedia-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk b/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk index d044b7b96..e598140a9 100644 --- a/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk @@ -44,7 +44,6 @@ endef define QT5MULTIMEDIA_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_STATIC_LIBS),) @@ -71,7 +70,7 @@ endef endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5MULTIMEDIA_LICENSE := $(QT5MULTIMEDIA_LICENSE), LGPL-2.1+ (examples/multimedia/spectrum/3rdparty/fftreal) +QT5MULTIMEDIA_LICENSE += , LGPL-2.1+ (examples/multimedia/spectrum/3rdparty/fftreal) QT5MULTIMEDIA_LICENSE_FILES += examples/multimedia/spectrum/3rdparty/fftreal/license.txt define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/multimedia* $(TARGET_DIR)/usr/lib/qt/examples/ diff --git a/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 25c41c6e3..9ae6ac76d 100644 --- a/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols-everywhere-src-5.11.3.tar.xz.sha256 -sha256 4e4e5da02ab0b06d35b09356170013cfe36a773d15f92281f7e6d085c3f07537 qtquickcontrols-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols-everywhere-src-5.12.7.tar.xz.sha256 +sha256 1038bbc76bba53f9634f40cd9c8ebf0ed8ae82e791f727b228bd81bdcf1859e5 qtquickcontrols-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/buildroot/package/qt5/qt5quickcontrols2/5.11.3/qt5quickcontrols2.hash b/buildroot/package/qt5/qt5quickcontrols2/5.11.3/qt5quickcontrols2.hash deleted file mode 100644 index b1caf464a..000000000 --- a/buildroot/package/qt5/qt5quickcontrols2/5.11.3/qt5quickcontrols2.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols2-everywhere-src-5.11.3.tar.xz.sha256 -sha256 f45630b652585b62204405b28432977e67c148ca5f1789a794654fd6c1bad086 qtquickcontrols2-everywhere-src-5.11.3.tar.xz - -# Hashes for license files: -sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 -sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash b/buildroot/package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash new file mode 100644 index 000000000..689a7e528 --- /dev/null +++ b/buildroot/package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash @@ -0,0 +1,7 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols2-everywhere-src-5.12.7.tar.xz.sha256 +sha256 3a9526e5ad01edbfb796a6631983c391ea1b7e22ae6e07840048156a9e92a237 qtquickcontrols2-everywhere-src-5.12.7.tar.xz + +# Hashes for license files: +sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 +sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5script/qt5script.hash b/buildroot/package/qt5/qt5script/qt5script.hash index 245d66be6..bddcceb81 100644 --- a/buildroot/package/qt5/qt5script/qt5script.hash +++ b/buildroot/package/qt5/qt5script/qt5script.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtscript-everywhere-src-5.11.3.tar.xz.sha256 -sha256 bb84f3cc581078df4ff76705c5623cd88287f70f7405cbccf99e6fb6dedbec08 qtscript-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtscript-everywhere-src-5.12.7.tar.xz.sha256 +sha256 ca1dbc66d4125a678638dd0c9c030b72fdfc4ec2c229b9316a8bc80a86104019 qtscript-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/buildroot/package/qt5/qt5script/qt5script.mk b/buildroot/package/qt5/qt5script/qt5script.mk index 4a292c95a..a3b8cb7e3 100644 --- a/buildroot/package/qt5/qt5script/qt5script.mk +++ b/buildroot/package/qt5/qt5script/qt5script.mk @@ -37,7 +37,6 @@ endef define QT5SCRIPT_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_STATIC_LIBS),) diff --git a/buildroot/package/qt5/qt5scxml/qt5scxml.hash b/buildroot/package/qt5/qt5scxml/qt5scxml.hash index d2184c94e..83ba0da83 100644 --- a/buildroot/package/qt5/qt5scxml/qt5scxml.hash +++ b/buildroot/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtscxml-everywhere-src-5.11.3.tar.xz.sha256 -sha256 13172767eda404f1b71ab35998a95af6633d700d2417fff3648d8c6dc6af68d7 qtscxml-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtscxml-everywhere-src-5.12.7.tar.xz.sha256 +sha256 afa950bc95f881c90eea564511f3e9918d53fddf0823afb641d20dc6f794fbb6 qtscxml-everywhere-src-5.12.7.tar.xz # Hashes for license files: diff --git a/buildroot/package/qt5/qt5scxml/qt5scxml.mk b/buildroot/package/qt5/qt5scxml/qt5scxml.mk index de9ece597..c0776314d 100644 --- a/buildroot/package/qt5/qt5scxml/qt5scxml.mk +++ b/buildroot/package/qt5/qt5scxml/qt5scxml.mk @@ -13,7 +13,7 @@ QT5SCXML_INSTALL_STAGING = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5SCXML_LICENSE := $(QT5SCXML_LICENSE), BSD-3-Clause (examples) +QT5SCXML_LICENSE += , BSD-3-Clause (examples) endif define QT5SCXML_CONFIGURE_CMDS @@ -26,7 +26,6 @@ endef define QT5SCXML_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_STATIC_LIBS),) diff --git a/buildroot/package/qt5/qt5sensors/qt5sensors.hash b/buildroot/package/qt5/qt5sensors/qt5sensors.hash index a8d325d32..1e298d167 100644 --- a/buildroot/package/qt5/qt5sensors/qt5sensors.hash +++ b/buildroot/package/qt5/qt5sensors/qt5sensors.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz.mirrorlist sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtsensors-everywhere-src-5.11.3.tar.xz.sha256 -sha256 a75753d1d5607d4cb27b1849ea9612a65bb3a5271bb31bf0817edd143b620859 qtsensors-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtsensors-everywhere-src-5.12.7.tar.xz.sha256 +sha256 2b9aea9f4e2f681b4067f2b9d97c5073c135e41d26601c71f18f199bc980e740 qtsensors-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5sensors/qt5sensors.mk b/buildroot/package/qt5/qt5sensors/qt5sensors.mk index 2d5cf327a..10498a497 100644 --- a/buildroot/package/qt5/qt5sensors/qt5sensors.mk +++ b/buildroot/package/qt5/qt5sensors/qt5sensors.mk @@ -32,7 +32,6 @@ endef define QT5SENSORS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_STATIC_LIBS),) diff --git a/buildroot/package/qt5/qt5serialbus/5.11.3/qt5serialbus.hash b/buildroot/package/qt5/qt5serialbus/5.11.3/qt5serialbus.hash deleted file mode 100644 index 7d8d9b341..000000000 --- a/buildroot/package/qt5/qt5serialbus/5.11.3/qt5serialbus.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtserialbus-everywhere-src-5.11.3.tar.xz.sha256 -sha256 5664def35d4ad4aedef14bc529679851450262ea81477a69031ba81aa614c16d qtserialbus-everywhere-src-5.11.3.tar.xz - -# Hashes for license files: -sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5serialbus/5.12.7/qt5serialbus.hash b/buildroot/package/qt5/qt5serialbus/5.12.7/qt5serialbus.hash new file mode 100644 index 000000000..fa3ccc147 --- /dev/null +++ b/buildroot/package/qt5/qt5serialbus/5.12.7/qt5serialbus.hash @@ -0,0 +1,8 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtserialbus-everywhere-src-5.12.7.tar.xz.sha256 +sha256 82201edf971e957d849b041ab2914f7497226939c62884ec2906b37576987eae qtserialbus-everywhere-src-5.12.7.tar.xz + +# Hashes for license files: +sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch b/buildroot/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch new file mode 100644 index 000000000..8573e304f --- /dev/null +++ b/buildroot/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch @@ -0,0 +1,36 @@ +From 43d746c2c0c87c8694e835f3b052317c8fa02482 Mon Sep 17 00:00:00 2001 +From: Andre Hartmann +Date: Mon, 8 Jul 2019 21:35:12 +0200 +Subject: =?UTF-8?q?SocketCAN:=20Fix=20compiler=20error=20"=E2=80=98SIOCGST?= + =?UTF-8?q?AMP=E2=80=99=20was=20not=20declared"?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: QTBUG-76957 +Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b +Reviewed-by: Alex Blasche +Reviewed-by: Denis Shienkov + +[Retrieved from: +https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=43d746c2c0c87c8694e835f3b052317c8fa02482] +Signed-off-by: Fabrice Fontaine +--- + src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp +index 74b0d1d..a2da146 100644 +--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp ++++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp +@@ -45,6 +45,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +cgit v1.2.1 + diff --git a/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk b/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk index 98c4466cb..be8bb8b23 100644 --- a/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk @@ -23,7 +23,6 @@ endef define QT5SERIALBUS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_STATIC_LIBS),) diff --git a/buildroot/package/qt5/qt5serialport/5.11.3/qt5serialport.hash b/buildroot/package/qt5/qt5serialport/5.11.3/qt5serialport.hash deleted file mode 100644 index 63e0cb61c..000000000 --- a/buildroot/package/qt5/qt5serialport/5.11.3/qt5serialport.hash +++ /dev/null @@ -1,9 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtserialport-everywhere-src-5.11.3.tar.xz.mirrorlist -sha256 96c45e6d0d470626815f82b38ee48bf941e1bbfc10863087b69cc5f7bb766bda qtserialport-everywhere-src-5.11.3.tar.xz - -# Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5serialport/5.12.7/qt5serialport.hash b/buildroot/package/qt5/qt5serialport/5.12.7/qt5serialport.hash new file mode 100644 index 000000000..43136542d --- /dev/null +++ b/buildroot/package/qt5/qt5serialport/5.12.7/qt5serialport.hash @@ -0,0 +1,9 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtserialport-everywhere-src-5.12.7.tar.xz.sha256 +sha256 224c282ebed750f46b72dfe18260c3d26fbb74e928dec64bd8c51e7beed8721f qtserialport-everywhere-src-5.12.7.tar.xz + +# Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5serialport/qt5serialport.mk b/buildroot/package/qt5/qt5serialport/qt5serialport.mk index 2b0953586..5c2abd82d 100644 --- a/buildroot/package/qt5/qt5serialport/qt5serialport.mk +++ b/buildroot/package/qt5/qt5serialport/qt5serialport.mk @@ -28,7 +28,6 @@ endef define QT5SERIALPORT_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_STATIC_LIBS),) diff --git a/buildroot/package/qt5/qt5svg/qt5svg.hash b/buildroot/package/qt5/qt5svg/qt5svg.hash index 3c2f0fe47..5a3447953 100644 --- a/buildroot/package/qt5/qt5svg/qt5svg.hash +++ b/buildroot/package/qt5/qt5svg/qt5svg.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz.mirrorlist sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtsvg-everywhere-src-5.11.3.tar.xz.sha256 -sha256 21ea2c9c4e78101e98163bc19e463b8d8cdffa20e1ccd523ccc925b9f2cd4491 qtsvg-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtsvg-everywhere-src-5.12.7.tar.xz.sha256 +sha256 4bf60916d4e398d9609f1b3a17fc7345a0e13c7c1cc407298df20da4c7c67bb8 qtsvg-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5svg/qt5svg.mk b/buildroot/package/qt5/qt5svg/qt5svg.mk index 48ff04bd7..cb91844ef 100644 --- a/buildroot/package/qt5/qt5svg/qt5svg.mk +++ b/buildroot/package/qt5/qt5svg/qt5svg.mk @@ -28,7 +28,6 @@ endef define QT5SVG_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) diff --git a/buildroot/package/qt5/qt5tools/Config.in b/buildroot/package/qt5/qt5tools/Config.in index 20f00f6b2..60106c1ee 100644 --- a/buildroot/package/qt5/qt5tools/Config.in +++ b/buildroot/package/qt5/qt5tools/Config.in @@ -17,6 +17,21 @@ config BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS This option enables the linguist host tools lconvert, lrelease and lupdate. +config BR2_PACKAGE_QT5TOOLS_QDOC_TOOL + bool "qdoc host tool" + # Needs llvm-config and libclang for the host, which is not + # currently supported in Buildroot, unless the target is + # already supported by llvm. + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm, clang + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # llvm, clang + depends on BR2_TOOLCHAIN_HAS_THREADS # llvm, clang + depends on BR2_INSTALL_LIBSTDCPP # llvm, clang + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # llvm, clang + depends on !BR2_STATIC_LIBS # llvm, clang + depends on BR2_USE_WCHAR # llvm, clang + help + This option enables the qdoc host tool. + config BR2_PACKAGE_QT5TOOLS_PIXELTOOL bool "pixeltool" select BR2_PACKAGE_QT5BASE_GUI diff --git a/buildroot/package/qt5/qt5tools/qt5tools.hash b/buildroot/package/qt5/qt5tools/qt5tools.hash index 94f1254b0..5fb75d9fa 100644 --- a/buildroot/package/qt5/qt5tools/qt5tools.hash +++ b/buildroot/package/qt5/qt5tools/qt5tools.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz.mirrorlist sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz.sha256 -sha256 c205e81bba9b87c6186604a05ab48e4e6cac0cd511525749dfd00b107b6f9f8e qttools-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qttools-everywhere-src-5.12.7.tar.xz.sha256 +sha256 860a97114d518f83c0a9ab3742071da16bb018e6eb387179d5764a8dcca03948 qttools-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5tools/qt5tools.mk b/buildroot/package/qt5/qt5tools/qt5tools.mk index a972756d3..0d0002299 100644 --- a/buildroot/package/qt5/qt5tools/qt5tools.mk +++ b/buildroot/package/qt5/qt5tools/qt5tools.mk @@ -29,11 +29,13 @@ endif QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \ linguist/lconvert linguist/lrelease linguist/lupdate -ifeq ($(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS),y) -# use install target to copy cmake module files -define QT5TOOLS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/linguist install -endef +QT5TOOLS_INSTALL_STAGING_DIR_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \ + linguist + +ifeq ($(BR2_PACKAGE_QT5TOOLS_QDOC_TOOL),y) +QT5TOOLS_BUILD_DIRS_y += qdoc +QT5TOOLS_INSTALL_STAGING_DIR_y += qdoc +QT5TOOLS_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5_VERSION_LATEST),host-clang) endif QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool @@ -58,6 +60,12 @@ define QT5TOOLS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/$(p)$(sep)) endef +# use install target to copy cmake module files +define QT5TOOLS_INSTALL_STAGING_CMDS + $(foreach p,$(QT5TOOLS_INSTALL_STAGING_DIR_y), \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/$(p) install$(sep)) +endef + define QT5TOOLS_INSTALL_TARGET_CMDS $(foreach p,$(QT5TOOLS_INSTALL_TARGET_y), \ $(INSTALL) -D -m0755 $(@D)/bin/$(p) $(TARGET_DIR)/usr/bin/$(p)$(sep)) diff --git a/buildroot/package/qt5/qt5virtualkeyboard/5.11.3/qt5virtualkeyboard.hash b/buildroot/package/qt5/qt5virtualkeyboard/5.11.3/qt5virtualkeyboard.hash deleted file mode 100644 index c7d27870b..000000000 --- a/buildroot/package/qt5/qt5virtualkeyboard/5.11.3/qt5virtualkeyboard.hash +++ /dev/null @@ -1,9 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz.sha256 -sha256 8c5c40245a9dd2e9e504ce2d47d45079d8280436146797b24b8115ef163b4b9e qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz - -# Hashes for license files: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt -sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/virtualkeyboard/3rdparty/openwnn/NOTICE -sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/virtualkeyboard/3rdparty/pinyin/NOTICE -sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/virtualkeyboard/3rdparty/tcime/COPYING diff --git a/buildroot/package/qt5/qt5virtualkeyboard/5.12.7/qt5virtualkeyboard.hash b/buildroot/package/qt5/qt5virtualkeyboard/5.12.7/qt5virtualkeyboard.hash new file mode 100644 index 000000000..668f971be --- /dev/null +++ b/buildroot/package/qt5/qt5virtualkeyboard/5.12.7/qt5virtualkeyboard.hash @@ -0,0 +1,9 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz.sha256 +sha256 aaa52aaff923df22de8472d71843dadb80f3f6fe0312122e64ffe5436db40daa qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz + +# Hashes for license files: +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt +sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE +sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE +sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING diff --git a/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 8ce316977..c13fa699a 100644 --- a/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -25,31 +25,43 @@ ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" ifneq ($(filter ja_JP all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) -QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), Apache-2.0 (openwnn) +QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (openwnn) +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/openwnn/NOTICE +else +QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/openwnn/3rdparty/openwnn/NOTICE +endif endif ifneq ($(filter zh_CN all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) +QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (pinyin) +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES -QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), Apache-2.0 (pinyin) QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/pinyin/NOTICE +else +QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/pinyin/3rdparty/pinyin/NOTICE +endif endif ifneq ($(filter zh_TW all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) +QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (tcime), BSD-3-Clause (tcime) +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES -QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), Apache-2.0 (tcime), BSD-3-Clause (tcime) QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/tcime/COPYING +else +QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/tcime/3rdparty/tcime/COPYING +endif endif endif ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING),y) QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=handwriting -QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), MIT (lipi-toolkit) +QT5VIRTUALKEYBOARD_LICENSE += , MIT (lipi-toolkit) ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt else -QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt +QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt endif endif @@ -57,7 +69,7 @@ ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION),y) QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=arrow-key-navigation endif -ifdef QT5VIRTUALKEYBOARD_3RDPARTY_PARTS +ifeq ($(QT5VIRTUALKEYBOARD_3RDPARTY_PARTS),YES) define QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS cp -dpfr $(STAGING_DIR)/usr/qtvirtualkeyboard $(TARGET_DIR)/usr endef @@ -93,10 +105,17 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES endef endif +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST):$(BR2_STATIC_LIBS),y:) +define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib +endef +endif + define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \ $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts + $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES) diff --git a/buildroot/package/qt5/qt5wayland/qt5wayland.hash b/buildroot/package/qt5/qt5wayland/qt5wayland.hash index 40d1bb0b2..43ca77a39 100644 --- a/buildroot/package/qt5/qt5wayland/qt5wayland.hash +++ b/buildroot/package/qt5/qt5wayland/qt5wayland.hash @@ -1,8 +1,8 @@ # hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwayland-everywhere-src-5.11.3.tar.xz.sha256 -sha256 62c94f29e461c849e479f39d21577b0c72f0f084250e126021edcf0719271fb2 qtwayland-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwayland-everywhere-src-5.12.7.tar.xz.sha256 +sha256 fc1ab8e25461580e37090e4f82422411dee71a3de48a54be1f4b6569e00f66c5 qtwayland-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5wayland/qt5wayland.mk b/buildroot/package/qt5/qt5wayland/qt5wayland.mk index d6fb6e188..4790efc66 100644 --- a/buildroot/package/qt5/qt5wayland/qt5wayland.mk +++ b/buildroot/package/qt5/qt5wayland/qt5wayland.mk @@ -40,7 +40,6 @@ endef define QT5WAYLAND_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y) @@ -53,19 +52,33 @@ define QT5WAYLAND_INSTALL_COMPOSITOR cp -dpf $(STAGING_DIR)/usr/lib/libQt5Compositor.so* $(TARGET_DIR)/usr/lib endef endif +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy) +define QT5WAYLAND_INSTALL_COMPOSITOR_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtWayland $(TARGET_DIR)/usr/qml/ +endef +endif endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y) define QT5WAYLAND_INSTALL_TARGET_EXAMPLES cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/wayland $(TARGET_DIR)/usr/lib/qt/examples/ endef endif +else +define QT5WAYLAND_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/wayland $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif +endif define QT5WAYLAND_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandClient.so* $(TARGET_DIR)/usr/lib cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland* $(TARGET_DIR)/usr/lib/qt/plugins cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland* $(TARGET_DIR)/usr/lib/qt/plugins/platforms $(QT5WAYLAND_INSTALL_COMPOSITOR) + $(QT5WAYLAND_INSTALL_COMPOSITOR_QMLS) $(QT5WAYLAND_INSTALL_TARGET_EXAMPLES) endef diff --git a/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash b/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash index 7c87683ba..c863a6ea6 100644 --- a/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebchannel-everywhere-src-5.11.3.tar.xz.sha256 -sha256 3c254fa41b1af09c1e951131f3a1336dee70a15cbb8a82112488b38d29572df3 qtwebchannel-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebchannel-everywhere-src-5.12.7.tar.xz.sha256 +sha256 b0ae72e5957aa4b281a37d2e169fcf91f92382bc36bd0cf09c80b2bb961bce75 qtwebchannel-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk b/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk index f1c08532c..22523036e 100644 --- a/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk @@ -18,7 +18,7 @@ QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3. QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5WEBCHANNEL_LICENSE := $(QT5WEBCHANNEL_LICENSE), BSD-3-Clause (examples) +QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples) endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) @@ -35,7 +35,6 @@ endef define QT5WEBCHANNEL_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) diff --git a/buildroot/package/qt5/qt5webengine/5.12.7/0001-pkg_config-Fixes-when-use_sysroot-false.patch b/buildroot/package/qt5/qt5webengine/5.12.7/0001-pkg_config-Fixes-when-use_sysroot-false.patch new file mode 100644 index 000000000..a0fdad4da --- /dev/null +++ b/buildroot/package/qt5/qt5webengine/5.12.7/0001-pkg_config-Fixes-when-use_sysroot-false.patch @@ -0,0 +1,57 @@ +From cc35cac78c053c14da01d6b1e5b05b0615360148 Mon Sep 17 00:00:00 2001 +From: Tom Anderson +Date: Thu, 2 Aug 2018 01:59:28 +0000 +Subject: [PATCH] pkg_config: Fixes when use_sysroot=false + +This CL introduces 2 changes to the behavior of pkg_config when +use_sysroot=false: + +1. The path is not made relative to the build directory. This fixes the case +where your src directory may be mounted at different locations. + +2. -I is used instead of -isystem. When -isystem is used, dep files do not +reference the system header files. This is OK when using the sysroot because +the CR_SYSROOT_HASH macro contains the sysroot revision so any source files will +be rebuilt when the sysroot updates. + +R=dpranke + +Change-Id: Ia3d7df51880205fee888923283b76078ccb3112f +Reviewed-on: https://chromium-review.googlesource.com/1159689 +Reviewed-by: Dirk Pranke +Commit-Queue: Thomas Anderson +Cr-Original-Commit-Position: refs/heads/master@{#580030} +Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src +Cr-Mirrored-Commit: a8c8396fd20d98666d517c45b358c63736e345ef +Signed-off-by: Bartosz Bilas +--- + src/3rdparty/chromium/build/config/linux/pkg_config.gni | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/3rdparty/chromium/build/config/linux/pkg_config.gni b/src/3rdparty/chromium/build/config/linux/pkg_config.gni +index 53ee353af..428e44ac0 100644 +--- a/src/3rdparty/chromium/build/config/linux/pkg_config.gni ++++ b/src/3rdparty/chromium/build/config/linux/pkg_config.gni +@@ -103,11 +103,15 @@ template("pkg_config") { + pkgresult = exec_script(pkg_config_script, args, "value") + cflags = pkgresult[1] + +- # We want the system include paths to use -isystem instead of -I to suppress +- # warnings in those headers. + foreach(include, pkgresult[0]) { +- include_relativized = rebase_path(include, root_build_dir) +- cflags += [ "-isystem$include_relativized" ] ++ if (use_sysroot) { ++ # We want the system include paths to use -isystem instead of -I to ++ # suppress warnings in those headers. ++ include_relativized = rebase_path(include, root_build_dir) ++ cflags += [ "-isystem$include_relativized" ] ++ } else { ++ cflags += [ "-I$include" ] ++ } + } + + if (!defined(invoker.ignore_libs) || !invoker.ignore_libs) { +-- +2.21.0 + diff --git a/buildroot/package/qt5/qt5webengine/5.12.7/qt5webengine.hash b/buildroot/package/qt5/qt5webengine/5.12.7/qt5webengine.hash new file mode 100644 index 000000000..8308ef492 --- /dev/null +++ b/buildroot/package/qt5/qt5webengine/5.12.7/qt5webengine.hash @@ -0,0 +1,458 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebengine-everywhere-src-5.12.7.tar.xz.sha256 +sha256 83b754dca3dafeb21be6c7cb5ea99f11f5dbe9055bc1680f5bd7159224bb46fa qtwebengine-everywhere-src-5.12.7.tar.xz + +# Locally calculated +sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 + +# Locally calculated with: +# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 d04360743ae3338bb08ab2106b51e24309e3ca4b1c6b1186139531ade351b7e3 src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE +sha256 d3e2f59e1d71176dfdb555ece6a41f7a5aa0f52ff21211010ace314f57695f6b src/3rdparty/chromium/third_party/abseil-cpp/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 29028ec63522121b5545046e0c4d3ccc1e01fc8d9aaa3272554f74829cdacf84 src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2/lighthouse/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2_worker/lighthouse/LICENSE +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE +sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE_python +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm_modes/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/formatter_worker/acorn/LICENSE +sha256 1490793b8913f0fa78af7bf2e70076f54272748e278f065c50794529eaed8e74 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/terminal/xterm.js/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/blink/renderer/devtools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/devtools/scripts/closure/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/LICENSE +sha256 4165ae4c9c71da3e655a9acee8ee3368bba20f0702f4dcc994da315132ab90de src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 63478682e84e8c98f4c46308995f1f521a6886976e25421827d2a2be03581328 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE +sha256 201d494a3f42450a28df2f0919a147e9a5296e841df5d415172a0ca8b558d0a8 src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE +sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 +sha256 5a12a0c01bfcdbc90b550c9cd8bfc3e90e6be9c9bbfdb58bfb5daaf6817eb78f src/3rdparty/chromium/third_party/chromevox/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 src/3rdparty/chromium/third_party/chromevox/third_party/closure-library/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/chromevox/third_party/sre/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE +sha256 10054db83ace18e5a455749d0d247857ec50508cecda79a5abe66fe4778d7721 src/3rdparty/chromium/third_party/d3/src/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-node-modules/LICENSE +sha256 a19859c623cc60b717560cafb5fe64244735022c1200b65a649a3c2eef912fb4 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/LICENSE +sha256 491b4012bfc95982e66859c59641be20f4fd2c9b3bc2b6a7f26b6166e462dda1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/node_modules/acorn/LICENSE +sha256 e2ddad70d6b6bcfec887c32d7143a77ccbdb58e38d9c43f5b7f30f715b874b80 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn/LICENSE +sha256 a25dce9c94c3ad622574cffbefd4b8845b418aa65df966d97e3204ad276ed240 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv-keywords/LICENSE +sha256 4969b0ff94c4f2ad3f1613d95b3966cb4c3147d8b893654aced81029241de176 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-escapes/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-regex/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-styles/LICENSE +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-union/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-uniq/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/arrify/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/chalk/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/strip-ansi/LICENSE +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/balanced-match/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/ansi-styles/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/supports-color/LICENSE +sha256 7d043a9e52b7e1e3acab9ca3377e30ca72d25d39ad6e6c5a22b407fe39c6d703 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chardet/LICENSE +sha256 aa7c48d39d3bb837efa4fce39f971fa6ae8e5cb148724af8867a7a4a7121ad6a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/circular-json/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-cursor/LICENSE +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-width/LICENSE +sha256 29f4d474804f60aae177d7fed67d0d613d00006640cc9cf80077eef03fb9a2cc src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/co/LICENSE +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-name/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-map/LICENSE +sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-stream/LICENSE +sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/core-util-is/LICENSE +sha256 b1344bd78ebcbf8a359225ec444d038a653c6a5f9ecf405a50d4a5c11fbf27d1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cross-spawn/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/debug/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/deep-is/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/del/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE.esprima +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/escape-string-regexp/LICENSE +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint/LICENSE +sha256 8be44da6cc59e890c406d6d05c3ce1850f29bb2e0da2a2d686d593e5ad3ecf59 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint-scope/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/espree/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esprima/LICENSE +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esquery/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/estraverse/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esutils/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/external-editor/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-deep-equal/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-levenshtein/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/figures/LICENSE +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/file-entry-cache/LICENSE +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/flat-cache/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/functional-red-black-tree/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globals/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globby/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/glob/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/graceful-fs/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-ansi/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-flag/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/iconv-lite/LICENSE +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inherits/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/isexe/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-fullwidth-code-point/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-path-inside/LICENSE +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-promise/LICENSE +sha256 4ceea53e36c7ff67a946e9905e50b41f350ef7b107c59afec9b91cbe97fbcaea src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-resolvable/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 e8d64ff1e54883c69759db53d10adfaa8e09b6ef628788885fe8068bc1fdb1b7 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-yaml/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/levn/LICENSE +sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lodash/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lru-cache/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mimic-fn/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimist/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mkdirp/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ms/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mute-stream/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/object-assign/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/once/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/onetime/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/optionator/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/os-tmpdir/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-absolute/LICENSE +sha256 0e356f8c0a756758ce04a143b1871585402b6bcf8f8e6a26873beb9992242e7a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-inside/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pify/LICENSE +sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie/LICENSE +sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie-promise/LICENSE +sha256 5822e0d816e53e3537b306a4132cb7a70881897cf51bf483282148a602979076 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pluralize/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/prelude-ls/LICENSE +sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/process-nextick-args/LICENSE +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/progress/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pseudomap/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/readable-stream/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/require-uncached/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/resolve-from/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/restore-cursor/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/rimraf/LICENSE +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/run-async/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/safe-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/semver/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-command/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-regex/LICENSE +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/signal-exit/LICENSE +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/slice-ansi/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/sprintf-js/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string_decoder/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string-width/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/node_modules/ansi-regex/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-json-comments/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/supports-color/LICENSE +sha256 ef088ddea300fe4ea038bc47db929e320033b66981cf12a20b517d6b66a2fa3e src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/table/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/text-table/LICENSE +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE.MIT +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/tmp/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/type-check/LICENSE +sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/typedarray/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/util-deprecate/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/which/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wordwrap/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wrappy/LICENSE +sha256 daca23d50b0f54d36d6da1b16c82dfea6461e2ae20de0e869957e44cc6d34781 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/write/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/yallist/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/errorprone/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE +sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/files/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/feed/LICENSE +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md +sha256 5d0c892ea452c3828f1e311637cde4e3a04eb6431554308b3fcdac8c1b330168 src/3rdparty/chromium/third_party/fips181/COPYING +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c src/3rdparty/chromium/third_party/flot/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 9f5db2544e04e3e0fb39ea277b9bb6f8efcc8bb84f6264630978ce4708495535 src/3rdparty/chromium/third_party/gestures/gestures/LICENSE +sha256 4bd9e329f9b268bd0dec2df0560a03382fe426adf83daa7b314d2f46b9b22c9a src/3rdparty/chromium/third_party/gestures/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/gson/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE +sha256 9f45b3cf29b76b5bf4ad467938b0e61a720eec6ef6c219c566f7c262b0cc7854 src/3rdparty/chromium/third_party/haha/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING +sha256 ec20cbe051200fc846caf4dc253cf660e874a2d9e4f3a682e08354b567fae409 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-ucdn/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE +sha256 4eac19453ddf356478db3be6b101a6d872d0046cdc8222df1ff5c997dd4b9fbe src/3rdparty/chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/intellij/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/javax_inject/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE +sha256 923e74e5ae41345038da0a56dfdc983356917fbbb139176e654d1b33100b723f src/3rdparty/chromium/third_party/jmake/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/leakcanary/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE +sha256 fb3ab1e1621c6c469499a6ba1e926c027f32af3063c0456282f89382591cc46a src/3rdparty/chromium/third_party/libevdev/LICENSE +sha256 721cb11de618fcf9bbb7d25a389207bf2227357e6694bc326ab32a6699f9b951 src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE +sha256 19af539b1ec692ea9ccf71b6ea97d602bcf7187eab27b0ea806aea1cd10b0b13 src/3rdparty/chromium/third_party/libjpeg/LICENSE +sha256 fffd497be5f4ae0a10b8258e191125fb58b90250ecbf3c79398d79604dd00b7d src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE +sha256 913b3eb6f19defc77c00e2bebbbce464326331b0b59eb6d1d1b23d68a8c27f6b src/3rdparty/chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE +sha256 7973776647df23457a9910075547e3f345fbc5e0e41147b4586d714582dfdd76 src/3rdparty/chromium/third_party/mach_override/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE +sha256 c93465d6a75e6ade8785edb4ec125ece083ab0910ed0417b4ff346792ba0f851 src/3rdparty/chromium/third_party/mesa/LICENSE +sha256 e8800bd573e8f844a5b87cf43cc4d55767314b4e95a6092cf26ce9c6ed00b877 src/3rdparty/chromium/third_party/mesa/src/docs/COPYING +sha256 1efd6dec259877be94db3dbd005c93a5c94a73a492bd85eede6e14885e480e0e src/3rdparty/chromium/third_party/mesa/src/docs/license.html +sha256 704179825bb7c4600acbff3d1fcd95f1eb61b2c4a11b66bb150d7cefea8f6371 src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE +sha256 e075583a46bca13a3f25af4181e2a0064f442c1f55c4312275cbcf05b892d3f4 src/3rdparty/chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE +sha256 5f593432ef4e7ecefa6326042babb8a03d8d6ce502b4f0b78b105e18d19f8052 src/3rdparty/chromium/third_party/molokocacao/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE +sha256 1599cc232dbd003e6691c7f4e360f2068f84ebaef6510a26ab919c3a7fec27fd src/3rdparty/chromium/third_party/openmax_dl/LICENSE +sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE +sha256 b578cdd2345840ada550bd12519533812320d5f1d21cf4c1c7e1b1b0a31c98b7 src/3rdparty/chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE +sha256 685b3b09870f1361f8db2d3f37acdb765d5da1722a18b182765da4b79a8f63ff src/3rdparty/chromium/third_party/ply/license.patch +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE +sha256 af67c58de2e18677a0b8cb5fffbe2232aabb8eb2930e8cd684769cef3d74a262 src/3rdparty/chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE +sha256 e88ae39d2e7c9ae8f5470bb23fdd7ce55fe58aca06f3d4399182f5bb0ffcf1dd src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md +sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE +sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/COPYING.txt +sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 19096ed2f05a693b92433405a6bf1018044b31ed5fa8883ab865cf2cd166f6e9 src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/LICENSE +sha256 3e3a91ec5c3fa243ad1f5a25cedee0abafd9824d061378cd3c81c541b044bf09 src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/patched/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/patched/LICENSE.md +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt +sha256 a63ee63574ed21e930765c4418a4fa2fa571b72c47cd023ee588dbf8b21fb4ee src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT +sha256 a012d664e4e01df52a65b2eeafdfb8aeb856fec0e6c372265d01b0109c3f5e2a src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT +sha256 0a731c5e376f4b604b9fd099d4797d64a5c0bc6e3770baf17b55988cb7737e2e src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT +sha256 a63ee63574ed21e930765c4418a4fa2fa571b72c47cd023ee588dbf8b21fb4ee src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT +sha256 9c9a05118ed1b6d96781a2e52335f7d4ec3dd6e7139340a8aa95fbf7eb4f199a src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT +sha256 b2d24d77041fbf66b93519758cd80671425c55614b2f65262046fdbe8c3247a8 src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt +sha256 c55ce1e876843853a8a2e5c936df6dc8dd3d185f83d85e6d113143b8c24f542e src/3rdparty/chromium/third_party/swiftshader/third_party/subzero/LICENSE.TXT +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/gperftools-2.0/vendor/COPYING +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING +sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l +sha256 846f295f64194ebcf615d6e35e445990645583764b52295177fc09a69051df1f src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt +sha256 3ee0b54b13060355b0f5d0d1476536d25ad10552211098cc4086a46fb8c61f42 src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE +sha256 efdabc1c1f655528b8c3a59b03668d446746d87273fab76f8af800b6e8891bd2 src/3rdparty/chromium/third_party/yara/src/COPYING +sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE +sha256 70eb89e4cb460d1b27173348c9f9fca5cf67c09d722ddaa07c5d0fcd6262a97e src/3rdparty/chromium/tools/gyp/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE +sha256 4fde1ca31ffe4e16a76098f56170166c61a5493d3bafcc6a5903d3cb60aa7560 src/3rdparty/chromium/tools/symsrc/COPYING-pefile +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt +sha256 5426333ff30d2ba9127bfe11ba51ca98be02d704ddac48afd19de47dc7748ee6 src/3rdparty/chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 +sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE +sha256 b1b379fcaf3219593a4c433feb1b35c780bed23fafaae440b1ae2771a9521e3a src/3rdparty/chromium/v8/third_party/antlr4/LICENSE.txt +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/buildroot/package/qt5/qt5webengine/5.6.3/qt5webengine.hash b/buildroot/package/qt5/qt5webengine/5.6.3/qt5webengine.hash new file mode 100644 index 000000000..f062ae163 --- /dev/null +++ b/buildroot/package/qt5/qt5webengine/5.6.3/qt5webengine.hash @@ -0,0 +1,258 @@ +# 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 + +# Locally calculated +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 + +# Locally calculated with: +# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 d04360743ae3338bb08ab2106b51e24309e3ca4b1c6b1186139531ade351b7e3 src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE +sha256 4074881f47972aedda83940935bb1d03fa74a56f94445945ce80fe952eed6834 src/3rdparty/chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE +sha256 5a12a0c01bfcdbc90b550c9cd8bfc3e90e6be9c9bbfdb58bfb5daaf6817eb78f src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE +sha256 dd6019aa7edc5b25a220306cd480da21c206964f86b30d08b8db8e4659b65c58 src/3rdparty/chromium/crypto/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE +sha256 891970cf216f708de2bfd77184b3e32d5cdba8dc4c3a75e60628c0375f5657e4 src/3rdparty/chromium/sdch/open-vcdiff/COPYING +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/testing/gmock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/testing/gtest/LICENSE +sha256 77af9c9fc2710ee66b8282291a9392a9a61f1d5b3ad6e478d0b6c544de5f9aca src/3rdparty/chromium/third_party/angle/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 d8a0f4dab052ff6f56e9d6fa68efb66de8ff3956a805110930f8ee297376047f src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE +sha256 fddff1da5115ebb2f735b31fd17bac3166bf0c67d941287dfd490a111bca1c52 src/3rdparty/chromium/third_party/appurify-python/LICENSE +sha256 f53f4201f4bd4b7a07b5e5830d89d75219211fa76214b761bcb181e5c95a56ce src/3rdparty/chromium/third_party/bintrees/LICENSE.txt +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE +sha256 def7352915ac84bea5e2ed16f6fff712d35de519799777bf927e2a567ab53b7e src/3rdparty/chromium/third_party/boringssl/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/brotli/LICENSE +sha256 0af2a39b2cb31f540a1178f176367761751454779431be92a73a62f87df91440 src/3rdparty/chromium/third_party/bspatch/LICENSE +sha256 d415cefbadc3a8083475e30d8690a1103a2601226f725abf43a263c516345190 src/3rdparty/chromium/third_party/cardboard-java/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 +sha256 0acbdae3346bc7593c57471aaf47fb45326a26b3c29cfbbf8ce729d99a7e458a src/3rdparty/chromium/third_party/class-dump/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/cld/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 src/3rdparty/chromium/third_party/closure_linter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cctools/cctools/APPLE_LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE +sha256 10054db83ace18e5a455749d0d247857ec50508cecda79a5abe66fe4778d7721 src/3rdparty/chromium/third_party/d3/src/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE +sha256 8545f6c8d9497acf953ca93b9264032616e6430eb536e21142a381455c8085df src/3rdparty/chromium/third_party/drmemory/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/errorprone/LICENSE +sha256 e2fa3a3e38af6d7d0cb374883a89b3507fe3b053faef16485f37ff3c9d93a5d2 src/3rdparty/chromium/third_party/expat/files/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 cb77a08f3ee3deb5240a8b3d197436710621ee87f4f0fed03947f825e082fb28 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md +sha256 5d0c892ea452c3828f1e311637cde4e3a04eb6431554308b3fcdac8c1b330168 src/3rdparty/chromium/third_party/fips181/COPYING +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL +sha256 0b1975de0a048180c5ea7179be1a3e751e05f79d225ac4be6481141970527e69 src/3rdparty/chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL +sha256 eafd0d3fac93964d4274a2f99be928d41c167a925a9ddb8621ab9aee065f8fee src/3rdparty/chromium/third_party/flac/COPYING.Xiph +sha256 e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c src/3rdparty/chromium/third_party/flot/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING +sha256 246491bb21ec320b0396d218339305d8b7073c7cb94fa5adb77ebb9c84a87a0b src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT +sha256 32ce83e370dc31db74f20d8bb0febbb5f61b099f0e0212587e81fdc11ae7fcbc src/3rdparty/chromium/third_party/gardiner_mod/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING +sha256 1e33ef99129bb6e84b6bb84e8c9edb4c6dba9f876bc16bc143cb9a136627cdeb src/3rdparty/chromium/third_party/hunspell/COPYING +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL +sha256 93720ce4be6cca7dbfdd55f9cc9e1614865a4578b474612713fdbe06c3d34002 src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell +sha256 dcda061adeed22b26f276c01ec374f930789ae0d684e5aa8f8be309dd680ff20 src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/hwcplus/LICENSE +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE +sha256 28d1d994f6f85ce2f605e214609a3a7925278039aa7a870b5cd089ef95b82445 src/3rdparty/chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu/LICENSE +sha256 7d149647f825d89af1268d9a53ebb414af1354a1815e26f8e44ef99820ba21db src/3rdparty/chromium/third_party/icu/license.html +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE +sha256 923e74e5ae41345038da0a56dfdc983356917fbbb139176e654d1b33100b723f src/3rdparty/chromium/third_party/jmake/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/lcov/COPYING +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE +sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 src/3rdparty/chromium/third_party/libexif/sources/COPYING +sha256 0382f4433a2b1b0b5c0af8cc769de0c7302c1b663ea569e67c0b5452e374e142 src/3rdparty/chromium/third_party/libjingle/source/talk/COPYING +sha256 dea8cf0d3604b861d3a89dd1d193b02404414957b6ee7ab6ebeacf47daece976 src/3rdparty/chromium/third_party/libjingle/source/talk/LICENSE_THIRD_PARTY +sha256 19af539b1ec692ea9ccf71b6ea97d602bcf7187eab27b0ea806aea1cd10b0b13 src/3rdparty/chromium/third_party/libjpeg/LICENSE +sha256 0570fc4ebfee96ed20720ed8f2cd5b928930bdd7340dfdfa96bb00e8c4f89677 src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.txt +sha256 5fe714f37f27dcc5d59dee2601ac3e7fe1cf2e497e5fcdba00ddb9b1297f61cb src/3rdparty/chromium/third_party/libpng/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE +sha256 8defed37d52096ae14b60adc499c33d43975109bc265552ee67e9a888c634b93 src/3rdparty/chromium/third_party/libsrtp/srtp/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING +sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de src/3rdparty/chromium/third_party/libva/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE +sha256 d62df95ee2ada2637151bc125cadbe2703ef07ed5d9cbe163eaa53bda3949af4 src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY +sha256 90d1f3701813c3cd65eee2dc736746fe46b465918f3f7d6d31463a2018b33fa5 src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE +sha256 7973776647df23457a9910075547e3f345fbc5e0e41147b4586d714582dfdd76 src/3rdparty/chromium/third_party/mach_override/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE +sha256 c93465d6a75e6ade8785edb4ec125ece083ab0910ed0417b4ff346792ba0f851 src/3rdparty/chromium/third_party/mesa/LICENSE +sha256 e8800bd573e8f844a5b87cf43cc4d55767314b4e95a6092cf26ce9c6ed00b877 src/3rdparty/chromium/third_party/mesa/src/docs/COPYING +sha256 1efd6dec259877be94db3dbd005c93a5c94a73a492bd85eede6e14885e480e0e src/3rdparty/chromium/third_party/mesa/src/docs/license.html +sha256 704179825bb7c4600acbff3d1fcd95f1eb61b2c4a11b66bb150d7cefea8f6371 src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE +sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/mojo/LICENSE +sha256 5f593432ef4e7ecefa6326042babb8a03d8d6ce502b4f0b78b105e18d19f8052 src/3rdparty/chromium/third_party/molokocacao/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE +sha256 c69a473064e2246a3123066eaec702b454422b2701934187f0e433f773c57305 src/3rdparty/chromium/third_party/mt19937ar/LICENSE +sha256 7c7f6dc97beb9eac776c285bee22a58b83aba1d26e1d4e949e509717b5124540 src/3rdparty/chromium/third_party/npapi/LICENSE +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 src/3rdparty/chromium/third_party/nss/nspr/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/third_party/nss/nss/COPYING +sha256 74ab31565472f8347d36849b6b330e5f741f6e2dff5d9147b93ba0a900a4a577 src/3rdparty/chromium/third_party/ocmock/License.txt +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE +sha256 1599cc232dbd003e6691c7f4e360f2068f84ebaef6510a26ab919c3a7fec27fd src/3rdparty/chromium/third_party/openmax_dl/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 984523ee987f4e8b72d61df37d8f1189a7077cd4b77e41a397e35593b297a29d src/3rdparty/chromium/third_party/ots/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE +sha256 685b3b09870f1361f8db2d3f37acdb765d5da1722a18b182765da4b79a8f63ff src/3rdparty/chromium/third_party/ply/license.patch +sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE +sha256 31c7505c31a1ea8557a5362cd69946dc9f5ee80fac8fa1d1b1531c08530497b0 src/3rdparty/chromium/third_party/protobuf/COPYING.txt +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE +sha256 e88ae39d2e7c9ae8f5470bb23fdd7ce55fe58aca06f3d4399182f5bb0ffcf1dd src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt +sha256 90d1f3701813c3cd65eee2dc736746fe46b465918f3f7d6d31463a2018b33fa5 src/3rdparty/chromium/third_party/python_gflags/COPYING +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md +sha256 9b17bd282aac6d5729c700c823ddaaa6fa0e048d88e321f46252646f28791752 src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE +sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 1af74cc402d50be09edd134ed5c31ade063fc0e7546670bc23ceeecc0004c142 src/3rdparty/chromium/third_party/safe_browsing/testing/LICENSE +sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/COPYING.txt +sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/sfntly/src/java/COPYING +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE +sha256 1f04103e3a61b91343b3f9d2ed2cc8543062917e2cc7d52a739ffe6429ccaf61 src/3rdparty/chromium/third_party/skia/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE +sha256 99750e3fa5e132e1b93a56538ab9c585f8fc62b9e11ab62adec0cd3803315c70 src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE +sha256 5221a36a801b981fbdfda7b87db64cff231a3b88223a066c325411b539df796f src/3rdparty/chromium/third_party/snappy/src/COPYING +sha256 bd2368428b63facfc9586d4be1bd6efb6abce76a9339ba058dd9f399f3efb3b4 src/3rdparty/chromium/third_party/speech-dispatcher/COPYING +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/autoconf/tea/license.terms +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE +sha256 0cd682f22d04b97de1a6ce05c27c4ae5fddec1e330babc46f5f4f6c586c19f17 src/3rdparty/chromium/third_party/swiftshader/LICENSE +sha256 0eff14f27fd948e2382ef5751b9b6ed596fc59369260510bd9230d08f9404f3e src/3rdparty/chromium/third_party/talloc/LICENSE +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE +sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a src/3rdparty/chromium/third_party/typ/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 650cb519e09f781bf4fbd65fa6fc64449ea0d86d62d95172acdf5da74ca0eaf6 src/3rdparty/chromium/third_party/v4l2capture/LICENSE +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l +sha256 778a9c936b9fa24f3842b6071e3cc5c794d3f7cc6d6fddbf356b6f2202afb6a0 src/3rdparty/chromium/third_party/wayland/LICENSE +sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 src/3rdparty/chromium/third_party/wayland-protocols/LICENSE +sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING +sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 src/3rdparty/chromium/third_party/wayland/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE +sha256 7de3660b411bdcb1c690c0e0a907ed94626792a1b5139f1cedd3d919b968ecc8 src/3rdparty/chromium/third_party/WebKit/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/LICENSE +sha256 c7bae4ff453a099c61e5906014d3644319181834a47db839696dca0a85a76378 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE +sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python +sha256 c7bae4ff453a099c61e5906014d3644319181834a47db839696dca0a85a76378 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE +sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING +sha256 32b824d99c7e31f7035b6a9b39eac8e8205bfc54cf8573cfe830a367a8735161 src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE +sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE +sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/webpagereplay/COPYING +sha256 ac611349a262c2ceab06cd7c4fa104b794986486d3898c4d234a0fbc49e9bf07 src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING +sha256 b3055a036e3bc37a1b9ff2b8316723d06df3997273aa9cb79223a85a48ad6dee src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE +sha256 2feb814384635271a0a43dec65955439a8b659ddf0a5adae5b5333264dc6518a src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/chromium/third_party/webtreemap/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE +sha256 1df4adc57d45b1639d3edb2127ee9e33e54b5a4b0809e9dc83ddaff5a62d9ae1 src/3rdparty/chromium/third_party/x86inc/LICENSE +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE +sha256 9dc0f229412e40d7f1fc4d94de07fcc812a6f31e27718b4dae315305408160fa src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING +sha256 282644c64aa8c4f0a4a589fd38d2213e41f37b4e0e4f639e01149d09b67117db src/3rdparty/chromium/third_party/zlib/LICENSE +sha256 70eb89e4cb460d1b27173348c9f9fca5cf67c09d722ddaa07c5d0fcd6262a97e src/3rdparty/chromium/tools/gyp/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt +sha256 2337a9caeb13854242af8d0022f8e57389e5eae56fa3bf7887f5f38492b57199 src/3rdparty/chromium/v8/LICENSE +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 +sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/src/third_party/fdlibm/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/buildroot/package/qt5/qt5webengine/Config.in b/buildroot/package/qt5/qt5webengine/Config.in index 744d65956..0e776ecb6 100644 --- a/buildroot/package/qt5/qt5webengine/Config.in +++ b/buildroot/package/qt5/qt5webengine/Config.in @@ -10,28 +10,21 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT # qt5base-icu depends on BR2_USE_MMU # libglib2, qt5base-dbus -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 4.8, host gcc >= 4.8, threads, wchar" +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 4.8, threads, wchar" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR comment "qt5webengine needs an OpenGL and EGL-capable backend" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_QT5_GL_AVAILABLE || !BR2_PACKAGE_HAS_LIBEGL -comment "qt5webengine needs a toolchain not affected by GCC bug 85862" - depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS - depends on !BR2_PACKAGE_QT5_VERSION_5_6 - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # libnss - config BR2_PACKAGE_QT5WEBENGINE bool "qt5webengine" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo - depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5base-icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs diff --git a/buildroot/package/qt5/qt5webengine/chromium-latest.inc b/buildroot/package/qt5/qt5webengine/chromium-latest.inc index 671b2383a..b7a195569 100644 --- a/buildroot/package/qt5/qt5webengine/chromium-latest.inc +++ b/buildroot/package/qt5/qt5webengine/chromium-latest.inc @@ -1,431 +1,451 @@ +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find src/3rdparty/ -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-latest.inc QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/tools/symsrc/COPYING-pefile \ - src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ - src/3rdparty/chromium/tools/gyp/LICENSE \ - src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ - src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.fdlibm \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ src/3rdparty/chromium/base/third_party/icu/LICENSE \ src/3rdparty/chromium/base/third_party/libevent/LICENSE \ + src/3rdparty/chromium/base/third_party/nspr/LICENSE \ + src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ + src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ + src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ + src/3rdparty/chromium/buildtools/LICENSE \ + src/3rdparty/chromium/LICENSE \ + src/3rdparty/chromium/LICENSE.chromium_os \ + src/3rdparty/chromium/mojo/public/LICENSE \ + src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ + src/3rdparty/chromium/net/third_party/nss/LICENSE \ src/3rdparty/chromium/ppapi/LICENSE \ - src/3rdparty/chromium/third_party/hamcrest/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/fips181/COPYING \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/pdfium/LICENSE \ - src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ - src/3rdparty/chromium/third_party/libevdev/LICENSE \ - src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE \ - src/3rdparty/chromium/third_party/s2cellid/LICENSE \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/leakcanary/LICENSE \ - src/3rdparty/chromium/third_party/errorprone/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/bazel/LICENSE \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ - src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ - src/3rdparty/chromium/third_party/openvr/src/LICENSE \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/vulkan/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ - src/3rdparty/chromium/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/mach_override/LICENSE \ - src/3rdparty/chromium/third_party/mesa/LICENSE \ - src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ - src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ - src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/guava/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/license_template.txt \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ - src/3rdparty/chromium/third_party/yara/src/COPYING \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/flot/LICENSE.txt \ - src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \ - src/3rdparty/chromium/third_party/protobuf/LICENSE \ - src/3rdparty/chromium/third_party/typ/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/expat/files/COPYING \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \ - src/3rdparty/chromium/third_party/intellij/LICENSE \ - src/3rdparty/chromium/third_party/glslang/LICENSE \ - src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/NonCopyingSort.h \ - src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/dtoa/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/dtoa/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/audits2/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/audits2_worker/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/terminal/xterm.js/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/license.py \ - src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/html5lib/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE.md \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/icu4j/LICENSE \ - src/3rdparty/chromium/third_party/molokocacao/LICENSE \ - src/3rdparty/chromium/third_party/wayland/LICENSE \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt \ - src/3rdparty/chromium/third_party/swiftshader/third_party/subzero/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT \ - src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/pystache/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT \ - src/3rdparty/chromium/third_party/haha/LICENSE \ - src/3rdparty/chromium/third_party/wds/LICENSE \ - src/3rdparty/chromium/third_party/wds/src/COPYING \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/signal-exit/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-yaml/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/functional-red-black-tree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/escape-string-regexp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/figures/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/write/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/run-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/co/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esquery/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/require-uncached/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/type-check/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-tokens/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-absolute/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/slice-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-path-inside/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/iconv-lite/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/optionator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inflight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/supports-color/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pluralize/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-levenshtein/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-json-stable-stringify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/espree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/estraverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globals/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mimic-fn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pseudomap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-flag/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/which/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/prelude-ls/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-union/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-json-comments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esutils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/graceful-fs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/resolve-from/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-resolvable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ms/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chardet/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/arrify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/util-deprecate/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-inside/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/argparse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/object-assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/levn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-fullwidth-code-point/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/chalk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/strip-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE.MIT \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/typedarray/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lru-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/supports-color/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/ansi-styles/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/text-table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/core-util-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/file-entry-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-command/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/balanced-match/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/onetime/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/yallist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wrappy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-deep-equal/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globby/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/sprintf-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-stable-stringify-without-jsonify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/progress/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mkdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/external-editor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/os-tmpdir/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esprima/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fs.realpath/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/node_modules/ansi-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-uniq/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/deep-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mute-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE.esprima \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-schema-traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/flat-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/del/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv-keywords/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/circular-json/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cross-spawn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-escapes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/isexe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/restore-cursor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/process-nextick-args/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-cursor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-styles/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/LICENSE \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ - src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/jmake/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ - src/3rdparty/chromium/third_party/ced/LICENSE \ - src/3rdparty/chromium/third_party/ced/src/LICENSE \ - src/3rdparty/chromium/third_party/gestures/gestures/LICENSE \ - src/3rdparty/chromium/third_party/gestures/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/LICENSE \ - src/3rdparty/chromium/third_party/javax_inject/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE \ - src/3rdparty/chromium/third_party/gson/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ - src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ - src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ - src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ - src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ - src/3rdparty/chromium/third_party/netty4/LICENSE \ - src/3rdparty/chromium/third_party/objenesis/LICENSE \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/xstream/LICENSE \ - src/3rdparty/chromium/third_party/libsrtp/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/mt19937ar/LICENSE \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ - src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/LICENSE \ - src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ + src/3rdparty/chromium/third_party/abseil-cpp/LICENSE \ + src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE \ src/3rdparty/chromium/third_party/angle/LICENSE \ src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ - src/3rdparty/chromium/third_party/content_shell_fonts/LICENSE \ - src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ + src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE \ + src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE \ + src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ + src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ + src/3rdparty/chromium/third_party/axe-core/LICENSE \ + src/3rdparty/chromium/third_party/bazel/LICENSE \ + src/3rdparty/chromium/third_party/blanketjs/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE \ + src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ + src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2/lighthouse/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2_worker/lighthouse/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE_python \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm_modes/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/formatter_worker/acorn/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/terminal/xterm.js/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/scripts/closure/COPYING \ + src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ + src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/COPYING \ + src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/LICENSE \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ + src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ + src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ + src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ + src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ + src/3rdparty/chromium/third_party/breakpad/LICENSE \ + src/3rdparty/chromium/third_party/brotli/LICENSE \ + src/3rdparty/chromium/third_party/bspatch/LICENSE \ + src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ + src/3rdparty/chromium/third_party/ced/LICENSE \ + src/3rdparty/chromium/third_party/ced/src/LICENSE \ + src/3rdparty/chromium/third_party/chaijs/LICENSE \ src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ + src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ + src/3rdparty/chromium/third_party/chromevox/LICENSE \ + src/3rdparty/chromium/third_party/chromevox/third_party/closure-library/LICENSE \ + src/3rdparty/chromium/third_party/chromevox/third_party/sre/LICENSE \ + src/3rdparty/chromium/third_party/cld_3/LICENSE \ + src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ + src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ + src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ + src/3rdparty/chromium/third_party/d3/src/LICENSE \ + src/3rdparty/chromium/third_party/decklink/LICENSE \ + src/3rdparty/chromium/third_party/devscripts/COPYING \ + src/3rdparty/chromium/third_party/devtools-node-modules/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/node_modules/acorn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv-keywords/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-escapes/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-styles/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/argparse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-union/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-uniq/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/arrify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/chalk/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/strip-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/balanced-match/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/ansi-styles/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/supports-color/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chardet/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/circular-json/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-cursor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-width/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/co/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-convert/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/core-util-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cross-spawn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/deep-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/del/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE.esprima \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/escape-string-regexp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint-scope/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/espree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esprima/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esquery/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/estraverse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esutils/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/external-editor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-deep-equal/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-json-stable-stringify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-levenshtein/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/figures/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/file-entry-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/flat-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fs.realpath/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/functional-red-black-tree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globals/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globby/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/graceful-fs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-flag/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/iconv-lite/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inflight/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inherits/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/isexe/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-fullwidth-code-point/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-path-inside/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-promise/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-resolvable/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-schema-traverse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-tokens/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-yaml/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/levn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lodash/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lru-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mimic-fn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimatch/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mkdirp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ms/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mute-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/object-assign/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/once/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/onetime/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/optionator/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/os-tmpdir/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-absolute/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-inside/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie-promise/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pluralize/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/prelude-ls/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/process-nextick-args/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/progress/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pseudomap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/readable-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/require-uncached/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/resolve-from/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/restore-cursor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/rimraf/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/run-async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/semver/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-command/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/signal-exit/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/slice-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/sprintf-js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string_decoder/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string-width/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/node_modules/ansi-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-json-comments/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/supports-color/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/table/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/text-table/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE.MIT \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/tmp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/type-check/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/typedarray/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/util-deprecate/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/which/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wordwrap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wrappy/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/write/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/yallist/LICENSE \ + src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ + src/3rdparty/chromium/third_party/errorprone/LICENSE \ + src/3rdparty/chromium/third_party/espresso/LICENSE \ + src/3rdparty/chromium/third_party/expat/files/COPYING \ + src/3rdparty/chromium/third_party/feed/LICENSE \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ + src/3rdparty/chromium/third_party/fips181/COPYING \ + src/3rdparty/chromium/third_party/flac/COPYING.FDL \ src/3rdparty/chromium/third_party/flac/COPYING.GPL \ src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/sqlite/sqlite-src-3210000/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/libovr/LICENSE \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ - src/3rdparty/chromium/third_party/libudev/LICENSE \ - src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE \ - src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ + src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ + src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ + src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ + src/3rdparty/chromium/third_party/flot/LICENSE.txt \ + src/3rdparty/chromium/third_party/fontconfig/LICENSE \ + src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ + src/3rdparty/chromium/third_party/gestures/gestures/LICENSE \ + src/3rdparty/chromium/third_party/gestures/LICENSE \ + src/3rdparty/chromium/third_party/gif_player/LICENSE \ + src/3rdparty/chromium/third_party/glslang/LICENSE \ + src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ + src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ + src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ + src/3rdparty/chromium/third_party/googletest/src/LICENSE \ + src/3rdparty/chromium/third_party/google-truth/LICENSE \ + src/3rdparty/chromium/third_party/gson/LICENSE \ + src/3rdparty/chromium/third_party/guava/LICENSE \ + src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ + src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ + src/3rdparty/chromium/third_party/haha/LICENSE \ + src/3rdparty/chromium/third_party/hamcrest/LICENSE \ + src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ + src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-ucdn/COPYING \ + src/3rdparty/chromium/third_party/hunspell/COPYING \ + src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ + src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ + src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ + src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ + src/3rdparty/chromium/third_party/icu4j/LICENSE \ + src/3rdparty/chromium/third_party/icu/LICENSE \ + src/3rdparty/chromium/third_party/icu/license.html \ + src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ + src/3rdparty/chromium/third_party/ijar/LICENSE \ + src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ + src/3rdparty/chromium/third_party/intellij/LICENSE \ + src/3rdparty/chromium/third_party/isimpledom/LICENSE \ + src/3rdparty/chromium/third_party/javax_inject/LICENSE \ + src/3rdparty/chromium/third_party/jinja2/LICENSE \ + src/3rdparty/chromium/third_party/jmake/LICENSE \ + src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ + src/3rdparty/chromium/third_party/jstemplate/COPYING \ + src/3rdparty/chromium/third_party/khronos/LICENSE \ + src/3rdparty/chromium/third_party/leakcanary/LICENSE \ src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/node/LICENSE \ - src/3rdparty/chromium/third_party/libxml/src/COPYING \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ + src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ + src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ + src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ + src/3rdparty/chromium/third_party/libevdev/LICENSE \ + src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ + src/3rdparty/chromium/third_party/libjpeg/LICENSE \ + src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ + src/3rdparty/chromium/third_party/libovr/LICENSE \ + src/3rdparty/chromium/third_party/libpng/LICENSE \ + src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ + src/3rdparty/chromium/third_party/libsecret/LICENSE \ + src/3rdparty/chromium/third_party/libsrtp/LICENSE \ src/3rdparty/chromium/third_party/libsync/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ + src/3rdparty/chromium/third_party/libudev/LICENSE \ + src/3rdparty/chromium/third_party/libusb/src/COPYING \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ + src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libwebp/LICENSE \ + src/3rdparty/chromium/third_party/libxml/src/COPYING \ + src/3rdparty/chromium/third_party/libxml/src/Copyright \ + src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ + src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ + src/3rdparty/chromium/third_party/libxslt/src/Copyright \ + src/3rdparty/chromium/third_party/libyuv/LICENSE \ + src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ + src/3rdparty/chromium/third_party/mach_override/LICENSE \ + src/3rdparty/chromium/third_party/markupsafe/LICENSE \ + src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ + src/3rdparty/chromium/third_party/mesa/LICENSE \ + src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ + src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ + src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ + src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ + src/3rdparty/chromium/third_party/minigbm/LICENSE \ + src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ + src/3rdparty/chromium/third_party/minizip/src/LICENSE \ + src/3rdparty/chromium/third_party/mocha/LICENSE \ + src/3rdparty/chromium/third_party/mockito/LICENSE \ + src/3rdparty/chromium/third_party/modp_b64/LICENSE \ + src/3rdparty/chromium/third_party/molokocacao/LICENSE \ + src/3rdparty/chromium/third_party/motemplate/LICENSE \ src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ + src/3rdparty/chromium/third_party/netty4/LICENSE \ + src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ + src/3rdparty/chromium/third_party/node/LICENSE \ + src/3rdparty/chromium/third_party/objenesis/LICENSE \ + src/3rdparty/chromium/third_party/ocmock/License.txt \ + src/3rdparty/chromium/third_party/openh264/src/LICENSE \ + src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ + src/3rdparty/chromium/third_party/openvr/src/LICENSE \ + src/3rdparty/chromium/third_party/opus/src/COPYING \ + src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + src/3rdparty/chromium/third_party/ots/LICENSE \ + src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ + src/3rdparty/chromium/third_party/pdfium/LICENSE \ + src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ + src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + src/3rdparty/chromium/third_party/pexpect/LICENSE \ + src/3rdparty/chromium/third_party/ply/LICENSE \ + src/3rdparty/chromium/third_party/ply/license.patch \ + src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ + src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ + src/3rdparty/chromium/third_party/proguard/LICENSE \ + src/3rdparty/chromium/third_party/protobuf/LICENSE \ + src/3rdparty/chromium/third_party/pycoverage/LICENSE \ + src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ + src/3rdparty/chromium/third_party/pyelftools/LICENSE \ + src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ + src/3rdparty/chromium/third_party/pyjson5/src/LICENSE \ + src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ + src/3rdparty/chromium/third_party/pystache/LICENSE \ + src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ + src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ + src/3rdparty/chromium/third_party/qcms/src/COPYING \ + src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ + src/3rdparty/chromium/third_party/qunit/LICENSE \ + src/3rdparty/chromium/third_party/r8/LICENSE \ + src/3rdparty/chromium/third_party/re2/LICENSE \ + src/3rdparty/chromium/third_party/re2/src/LICENSE \ + src/3rdparty/chromium/third_party/requests/LICENSE \ + src/3rdparty/chromium/third_party/rnnoise/COPYING \ + src/3rdparty/chromium/third_party/robolectric/LICENSE \ + src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ + src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + src/3rdparty/chromium/third_party/s2cellid/LICENSE \ + src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ + src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ + src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ + src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ + src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ + src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ + src/3rdparty/chromium/third_party/sinonjs/LICENSE \ + src/3rdparty/chromium/third_party/skia/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ + src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ + src/3rdparty/chromium/third_party/smhasher/LICENSE \ + src/3rdparty/chromium/third_party/snappy/src/COPYING \ + src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ + src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ + src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ + src/3rdparty/chromium/third_party/sqlite/LICENSE \ + src/3rdparty/chromium/third_party/sqlite/patched/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/sqlite/patched/LICENSE.md \ + src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ + src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt \ + src/3rdparty/chromium/third_party/swiftshader/third_party/subzero/LICENSE.TXT \ + src/3rdparty/chromium/third_party/tcmalloc/gperftools-2.0/vendor/COPYING \ + src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ + src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ + src/3rdparty/chromium/third_party/test_fonts/LICENSE \ + src/3rdparty/chromium/third_party/tlslite/LICENSE \ + src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ + src/3rdparty/chromium/third_party/unrar/LICENSE \ + src/3rdparty/chromium/third_party/unrar/src/license.txt \ + src/3rdparty/chromium/third_party/usb_ids/LICENSE \ + src/3rdparty/chromium/third_party/usrsctp/LICENSE \ + src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ + src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE \ + src/3rdparty/chromium/third_party/wds/LICENSE \ + src/3rdparty/chromium/third_party/wds/src/COPYING \ + src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ + src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ + src/3rdparty/chromium/third_party/webdriver/COPYING \ + src/3rdparty/chromium/third_party/webdriver/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ + src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/license_template.txt \ + src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \ + src/3rdparty/chromium/third_party/woff2/LICENSE \ + src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ + src/3rdparty/chromium/third_party/xstream/LICENSE \ + src/3rdparty/chromium/third_party/yara/src/COPYING \ + src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ + src/3rdparty/chromium/third_party/zlib/LICENSE \ + src/3rdparty/chromium/tools/gyp/LICENSE \ + src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ + src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ + src/3rdparty/chromium/tools/symsrc/COPYING-pefile \ + src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ + src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ + src/3rdparty/chromium/v8/LICENSE \ + src/3rdparty/chromium/v8/LICENSE.fdlibm \ + src/3rdparty/chromium/v8/LICENSE.strongtalk \ + src/3rdparty/chromium/v8/LICENSE.v8 \ + src/3rdparty/chromium/v8/LICENSE.valgrind \ + src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ + src/3rdparty/chromium/v8/third_party/antlr4/LICENSE.txt \ + src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ + src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ + src/3rdparty/gn/base/third_party/icu/LICENSE \ + src/3rdparty/gn/LICENSE \ src/3rdparty/ninja/COPYING diff --git a/buildroot/package/qt5/qt5webengine/chromium-lts.inc b/buildroot/package/qt5/qt5webengine/chromium-lts.inc index d45e9692d..fbc1f9b63 100644 --- a/buildroot/package/qt5/qt5webengine/chromium-lts.inc +++ b/buildroot/package/qt5/qt5webengine/chromium-lts.inc @@ -1,248 +1,253 @@ +# Generated with: +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find src/3rdparty/ -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \)\ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-lts.inc QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/sdch/open-vcdiff/COPYING \ - src/3rdparty/chromium/tools/gyp/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/fdlibm/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ src/3rdparty/chromium/base/third_party/icu/LICENSE \ src/3rdparty/chromium/base/third_party/libevent/LICENSE \ + src/3rdparty/chromium/base/third_party/nspr/LICENSE \ + src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ - src/3rdparty/chromium/testing/gtest/LICENSE \ - src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE \ - src/3rdparty/chromium/testing/gmock/LICENSE \ + src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ + src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ + src/3rdparty/chromium/buildtools/LICENSE \ + src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \ + src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \ + src/3rdparty/chromium/crypto/third_party/nss/LICENSE \ + src/3rdparty/chromium/LICENSE \ + src/3rdparty/chromium/LICENSE.chromium_os \ + src/3rdparty/chromium/mojo/public/LICENSE \ + src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ + src/3rdparty/chromium/net/third_party/nss/LICENSE \ src/3rdparty/chromium/ppapi/LICENSE \ + src/3rdparty/chromium/sdch/open-vcdiff/COPYING \ + src/3rdparty/chromium/testing/gmock/LICENSE \ + src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE \ + src/3rdparty/chromium/testing/gtest/LICENSE \ + src/3rdparty/chromium/third_party/angle/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE \ + src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ + src/3rdparty/chromium/third_party/appurify-python/LICENSE \ + src/3rdparty/chromium/third_party/bintrees/LICENSE.txt \ + src/3rdparty/chromium/third_party/blanketjs/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ + src/3rdparty/chromium/third_party/brotli/LICENSE \ + src/3rdparty/chromium/third_party/bspatch/LICENSE \ + src/3rdparty/chromium/third_party/cardboard-java/LICENSE \ + src/3rdparty/chromium/third_party/chaijs/LICENSE \ + src/3rdparty/chromium/third_party/checkstyle/LICENSE \ + src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ src/3rdparty/chromium/third_party/class-dump/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/webtreemap/src/COPYING \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ + src/3rdparty/chromium/third_party/cld/LICENSE \ + src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ + src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ + src/3rdparty/chromium/third_party/closure_linter/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cctools/cctools/APPLE_LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/fips181/COPYING \ - src/3rdparty/chromium/third_party/talloc/LICENSE \ - src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/cld/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/bintrees/LICENSE.txt \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/libva/COPYING \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/v4l2capture/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/cardboard-java/LICENSE \ - src/3rdparty/chromium/third_party/errorprone/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/python_gflags/COPYING \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/libexif/sources/COPYING \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/lcov/COPYING \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/speech-dispatcher/COPYING \ - src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/drmemory/LICENSE \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/mach_override/LICENSE \ - src/3rdparty/chromium/third_party/mesa/LICENSE \ - src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ - src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ - src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ - src/3rdparty/chromium/third_party/mesa/src/src/mapi/glapi/gen/license.py \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/flot/LICENSE.txt \ - src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ - src/3rdparty/chromium/third_party/safe_browsing/testing/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \ - src/3rdparty/chromium/third_party/protobuf/COPYING.txt \ - src/3rdparty/chromium/third_party/typ/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.txt \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/expat/files/COPYING \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \ - src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ - src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/license.py \ - src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/WebKit/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/molokocacao/LICENSE \ - src/3rdparty/chromium/third_party/wayland/LICENSE \ - src/3rdparty/chromium/third_party/wayland/src/COPYING \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE \ - src/3rdparty/chromium/third_party/hwcplus/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/nss/nspr/LICENSE \ - src/3rdparty/chromium/third_party/nss/nss/COPYING \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell \ - src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/jmake/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ - src/3rdparty/chromium/third_party/closure_linter/LICENSE \ - src/3rdparty/chromium/third_party/webpagereplay/COPYING \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/libsrtp/srtp/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/mt19937ar/LICENSE \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ - src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ - src/3rdparty/chromium/third_party/sfntly/src/java/COPYING \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/LICENSE \ src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ - src/3rdparty/chromium/third_party/angle/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ - src/3rdparty/chromium/third_party/npapi/LICENSE \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/appurify-python/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ + src/3rdparty/chromium/third_party/d3/src/LICENSE \ + src/3rdparty/chromium/third_party/decklink/LICENSE \ + src/3rdparty/chromium/third_party/devscripts/COPYING \ src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ + src/3rdparty/chromium/third_party/drmemory/LICENSE \ + src/3rdparty/chromium/third_party/errorprone/LICENSE \ + src/3rdparty/chromium/third_party/expat/files/COPYING \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ + src/3rdparty/chromium/third_party/fips181/COPYING \ + src/3rdparty/chromium/third_party/flac/COPYING.FDL \ src/3rdparty/chromium/third_party/flac/COPYING.GPL \ src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE \ - src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ + src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ + src/3rdparty/chromium/third_party/flot/LICENSE.txt \ + src/3rdparty/chromium/third_party/fontconfig/LICENSE \ + src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ + src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT \ + src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \ + src/3rdparty/chromium/third_party/gif_player/LICENSE \ + src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \ + src/3rdparty/chromium/third_party/hunspell/COPYING \ + src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL \ + src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ + src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell \ + src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell \ + src/3rdparty/chromium/third_party/hwcplus/LICENSE \ + src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ + src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ + src/3rdparty/chromium/third_party/icu/LICENSE \ + src/3rdparty/chromium/third_party/icu/license.html \ + src/3rdparty/chromium/third_party/ijar/LICENSE \ + src/3rdparty/chromium/third_party/isimpledom/LICENSE \ + src/3rdparty/chromium/third_party/jinja2/LICENSE \ + src/3rdparty/chromium/third_party/jmake/LICENSE \ + src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ + src/3rdparty/chromium/third_party/jstemplate/COPYING \ + src/3rdparty/chromium/third_party/khronos/LICENSE \ + src/3rdparty/chromium/third_party/lcov/COPYING \ + src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ + src/3rdparty/chromium/third_party/libexif/sources/COPYING \ + src/3rdparty/chromium/third_party/libjingle/source/talk/COPYING \ + src/3rdparty/chromium/third_party/libjingle/source/talk/LICENSE_THIRD_PARTY \ + src/3rdparty/chromium/third_party/libjpeg/LICENSE \ + src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.txt \ + src/3rdparty/chromium/third_party/libpng/LICENSE \ + src/3rdparty/chromium/third_party/libsecret/LICENSE \ + src/3rdparty/chromium/third_party/libsrtp/srtp/LICENSE \ src/3rdparty/chromium/third_party/libudev/LICENSE \ + src/3rdparty/chromium/third_party/libusb/src/COPYING \ + src/3rdparty/chromium/third_party/libva/COPYING \ + src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/LICENSE \ + src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/googletest/src/LICENSE \ + src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/libwebm/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE \ + src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libwebp/LICENSE \ + src/3rdparty/chromium/third_party/libxml/src/Copyright \ + src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ + src/3rdparty/chromium/third_party/libxslt/Copyright \ + src/3rdparty/chromium/third_party/libyuv/LICENSE \ src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \ src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ + src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ + src/3rdparty/chromium/third_party/mach_override/LICENSE \ + src/3rdparty/chromium/third_party/markupsafe/LICENSE \ + src/3rdparty/chromium/third_party/mesa/LICENSE \ + src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ + src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ + src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ + src/3rdparty/chromium/third_party/minigbm/LICENSE \ + src/3rdparty/chromium/third_party/mocha/LICENSE \ + src/3rdparty/chromium/third_party/mockito/LICENSE \ + src/3rdparty/chromium/third_party/modp_b64/LICENSE \ src/3rdparty/chromium/third_party/mojo/LICENSE \ - src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ + src/3rdparty/chromium/third_party/molokocacao/LICENSE \ + src/3rdparty/chromium/third_party/motemplate/LICENSE \ src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/libjingle/source/talk/LICENSE_THIRD_PARTY \ - src/3rdparty/chromium/third_party/libjingle/source/talk/COPYING \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/crypto/third_party/nss/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ + src/3rdparty/chromium/third_party/mt19937ar/LICENSE \ + src/3rdparty/chromium/third_party/npapi/LICENSE \ + src/3rdparty/chromium/third_party/nss/nspr/LICENSE \ + src/3rdparty/chromium/third_party/nss/nss/COPYING \ + src/3rdparty/chromium/third_party/ocmock/License.txt \ + src/3rdparty/chromium/third_party/openh264/src/LICENSE \ + src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ + src/3rdparty/chromium/third_party/opus/src/COPYING \ + src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + src/3rdparty/chromium/third_party/ots/LICENSE \ + src/3rdparty/chromium/third_party/pexpect/LICENSE \ + src/3rdparty/chromium/third_party/ply/LICENSE \ + src/3rdparty/chromium/third_party/ply/license.patch \ + src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ + src/3rdparty/chromium/third_party/proguard/LICENSE \ + src/3rdparty/chromium/third_party/protobuf/COPYING.txt \ + src/3rdparty/chromium/third_party/pycoverage/LICENSE \ + src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ + src/3rdparty/chromium/third_party/pyelftools/LICENSE \ + src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ + src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ + src/3rdparty/chromium/third_party/python_gflags/COPYING \ + src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ + src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE \ + src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ + src/3rdparty/chromium/third_party/qcms/src/COPYING \ + src/3rdparty/chromium/third_party/qunit/LICENSE \ + src/3rdparty/chromium/third_party/re2/LICENSE \ + src/3rdparty/chromium/third_party/re2/src/LICENSE \ + src/3rdparty/chromium/third_party/requests/LICENSE \ + src/3rdparty/chromium/third_party/robolectric/LICENSE \ + src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ + src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + src/3rdparty/chromium/third_party/safe_browsing/testing/LICENSE \ + src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ + src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ + src/3rdparty/chromium/third_party/sfntly/src/java/COPYING \ + src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ + src/3rdparty/chromium/third_party/sinonjs/LICENSE \ + src/3rdparty/chromium/third_party/skia/LICENSE \ + src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE \ + src/3rdparty/chromium/third_party/smhasher/LICENSE \ + src/3rdparty/chromium/third_party/snappy/src/COPYING \ + src/3rdparty/chromium/third_party/speech-dispatcher/COPYING \ + src/3rdparty/chromium/third_party/sqlite/LICENSE \ + src/3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ + src/3rdparty/chromium/third_party/swiftshader/LICENSE \ + src/3rdparty/chromium/third_party/talloc/LICENSE \ + src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ + src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ + src/3rdparty/chromium/third_party/tlslite/LICENSE \ + src/3rdparty/chromium/third_party/typ/LICENSE \ + src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ + src/3rdparty/chromium/third_party/usb_ids/LICENSE \ + src/3rdparty/chromium/third_party/usrsctp/LICENSE \ + src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + src/3rdparty/chromium/third_party/v4l2capture/LICENSE \ + src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ + src/3rdparty/chromium/third_party/wayland/LICENSE \ + src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \ + src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \ + src/3rdparty/chromium/third_party/wayland/src/COPYING \ + src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ + src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ + src/3rdparty/chromium/third_party/webdriver/COPYING \ + src/3rdparty/chromium/third_party/webdriver/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \ + src/3rdparty/chromium/third_party/webpagereplay/COPYING \ + src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE \ + src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING \ + src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \ + src/3rdparty/chromium/third_party/webtreemap/src/COPYING \ + src/3rdparty/chromium/third_party/woff2/LICENSE \ + src/3rdparty/chromium/third_party/x86inc/LICENSE \ + src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ + src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ + src/3rdparty/chromium/third_party/zlib/LICENSE \ + src/3rdparty/chromium/tools/gyp/LICENSE \ + src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ + src/3rdparty/chromium/v8/LICENSE \ + src/3rdparty/chromium/v8/LICENSE.strongtalk \ + src/3rdparty/chromium/v8/LICENSE.v8 \ + src/3rdparty/chromium/v8/LICENSE.valgrind \ + src/3rdparty/chromium/v8/src/third_party/fdlibm/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ src/3rdparty/ninja/COPYING diff --git a/buildroot/package/qt5/qt5webengine/qt5webengine.hash b/buildroot/package/qt5/qt5webengine/qt5webengine.hash deleted file mode 100644 index 730352611..000000000 --- a/buildroot/package/qt5/qt5webengine/qt5webengine.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebengine-everywhere-src-5.11.3.tar.xz.sha256 -sha256 5bb49ead71b851db4dc56f8fd97e0db72a268b22104129a06bac201d55d3b8fe qtwebengine-everywhere-src-5.11.3.tar.xz diff --git a/buildroot/package/qt5/qt5webengine/qt5webengine.mk b/buildroot/package/qt5/qt5webengine/qt5webengine.mk index a3cfcec26..898725937 100644 --- a/buildroot/package/qt5/qt5webengine/qt5webengine.mk +++ b/buildroot/package/qt5/qt5webengine/qt5webengine.mk @@ -73,7 +73,6 @@ endef define QT5WEBENGINE_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef define QT5WEBENGINE_INSTALL_TARGET_QMLS @@ -91,8 +90,8 @@ define QT5WEBENGINE_INSTALL_TARGET_LIBS cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebEngine*.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/libexec/QtWebEngineProcess $(TARGET_DIR)/usr/libexec/ cp -dpfr $(STAGING_DIR)/usr/resources/ $(TARGET_DIR)/usr/ - mkdir -p $(TARGET_DIR)/usr/translations/qtwebengine_locales/ - cp -dpfr $(STAGING_DIR)/usr/translations/qtwebengine_locales $(TARGET_DIR)/usr/translations/qtwebengine_locales/ + mkdir -p $(TARGET_DIR)/usr/translations/ + cp -dpfr $(STAGING_DIR)/usr/translations/qtwebengine_locales $(TARGET_DIR)/usr/translations/ endef endif diff --git a/buildroot/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch b/buildroot/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch new file mode 100644 index 000000000..30aab3016 --- /dev/null +++ b/buildroot/package/qt5/qt5webkit-examples/0002-Fix-QWebView-path.patch @@ -0,0 +1,73 @@ +From 9fa73707216bd55dff380031a33aca701a7d9c8b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 12 May 2019 23:29:05 +0200 +Subject: [PATCH] Fix QWebView path + +QWebView is installed under QtWebKitWidgets + +Fixes: + - http://autobuild.buildroot.org/results/68dd6f1ffed49f8e2570f7364e5e635573807d3e + +Signed-off-by: Fabrice Fontaine +--- + examples/webkitwidgets/formextractor/formextractor.ui | 2 +- + examples/webkitwidgets/previewer/previewer.ui | 2 +- + examples/webkitwidgets/simpleselector/window.ui | 2 +- + .../xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/examples/webkitwidgets/formextractor/formextractor.ui b/examples/webkitwidgets/formextractor/formextractor.ui +index 5c4afec..a38bdd5 100644 +--- a/examples/webkitwidgets/formextractor/formextractor.ui ++++ b/examples/webkitwidgets/formextractor/formextractor.ui +@@ -151,7 +151,7 @@ + + QWebView + QWidget +-
        QtWebKit/QWebView
        ++
        QtWebKitWidgets/QWebView
        +
        + + +diff --git a/examples/webkitwidgets/previewer/previewer.ui b/examples/webkitwidgets/previewer/previewer.ui +index d4c9992..69adb2e 100644 +--- a/examples/webkitwidgets/previewer/previewer.ui ++++ b/examples/webkitwidgets/previewer/previewer.ui +@@ -74,7 +74,7 @@ + + QWebView + QWidget +-
        QtWebKit/QWebView
        ++
        QtWebKitWidgets/QWebView
        +
        + + +diff --git a/examples/webkitwidgets/simpleselector/window.ui b/examples/webkitwidgets/simpleselector/window.ui +index aa824df..7906186 100644 +--- a/examples/webkitwidgets/simpleselector/window.ui ++++ b/examples/webkitwidgets/simpleselector/window.ui +@@ -64,7 +64,7 @@ + + QWebView + QWidget +-
        QtWebKit/QWebView
        ++
        QtWebKitWidgets/QWebView
        +
        + + +diff --git a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui +index ad43284..000cae7 100644 +--- a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui ++++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui +@@ -188,7 +188,7 @@ p, li { white-space: pre-wrap; } + + QWebView + QWidget +-
        QtWebKit/QWebView
        ++
        QtWebKitWidgets/QWebView
        +
        + + +-- +2.20.1 + diff --git a/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash index 6e4c090fd..0d48ecdff 100644 --- a/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash +++ b/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash @@ -1,5 +1,11 @@ # Hash from: https://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 +sha256 2d6ce7146298d03b443cca4390bbfee17c4c0b08a31efcbf9fe0732291a6169e qtwebkit-examples-opensource-src-5.6.3.tar.xz # Hash from: https://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 +sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz + +# Locally computed +sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21 +sha256 04505ee290cbe7b29b3766e00ff81987e84658f620cb43bd6e7bb52ee4234e1b LICENSE.LGPLv3 +sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 +sha256 d3d9052b838761dbe00067168ed9ebc437734d53ebf71dea1c8e9f7532a5333b LICENSE.GPLv3 diff --git a/buildroot/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch b/buildroot/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch new file mode 100644 index 000000000..92aab5711 --- /dev/null +++ b/buildroot/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch @@ -0,0 +1,49 @@ +From 7d763d441fd4fa78553a818ee75ac477eb6dbcbe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= +Date: Sun, 2 Feb 2020 10:48:50 +0100 +Subject: [PATCH] Fix installation of class headers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since Qt 5.11 (see commit [1]), the key word HEADER_CLASSES has been +removed. It has been replaced by a new variable GENERATED_HEADER_FILES. + +The class headers were not generated, this commit moves them directly to +HEADER_FILES. + +[1]: https://github.com/qt/qtbase/commit/9c4c136bc9f29bab1cc9684dfced55a92a8bbe96 + +Signed-off-by: Gaël PORTAY +[Converted to git formated patch] +Signed-off-by: Peter Seiderer +--- + include/QtWebKit/headers.pri | 3 +-- + include/QtWebKitWidgets/headers.pri | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/include/QtWebKit/headers.pri b/include/QtWebKit/headers.pri +index 6775f3a6..3a5c14cd 100644 +--- a/include/QtWebKit/headers.pri ++++ b/include/QtWebKit/headers.pri +@@ -1,5 +1,4 @@ +-SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit +-SYNCQT.HEADER_CLASSES = ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion ++SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion + SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/Api/qhttpheader_p.h WebKit/qt/Api/qwebdatabase_p.h WebKit/qt/Api/qwebelement_p.h WebKit/qt/Api/qwebhistory_p.h WebKit/qt/Api/qwebplugindatabase_p.h WebKit/qt/Api/qwebscriptworld.h WebKit/qt/Api/qwebscriptworld_p.h WebKit/qt/Api/qwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h WebKit2/UIProcess/API/qt/qquickwebview_p.h WebKit2/UIProcess/API/qt/qquickwebview_p_p.h WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h WebKit2/UIProcess/API/qt/qwebkittest_p.h WebKit2/UIProcess/API/qt/qwebloadrequest_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h WebKit2/UIProcess/API/qt/tests/testwindow.h WebKit2/UIProcess/API/qt/tests/util.h + SYNCQT.INJECTED_PRIVATE_HEADER_FILES = + SYNCQT.QPA_HEADER_FILES = +diff --git a/include/QtWebKitWidgets/headers.pri b/include/QtWebKitWidgets/headers.pri +index 9d386e29..2b8b095c 100644 +--- a/include/QtWebKitWidgets/headers.pri ++++ b/include/QtWebKitWidgets/headers.pri +@@ -1,5 +1,4 @@ +-SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets +-SYNCQT.HEADER_CLASSES = ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion ++SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion + SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/WidgetApi/qwebframe_p.h WebKit/qt/WidgetApi/qwebinspector_p.h WebKit/qt/WidgetApi/qwebpage_p.h WebKit/qt/WidgetApi/qwebviewaccessible_p.h + SYNCQT.INJECTED_PRIVATE_HEADER_FILES = + SYNCQT.QPA_HEADER_FILES = +-- +2.25.0 + diff --git a/buildroot/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch b/buildroot/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch new file mode 100644 index 000000000..1a99eb7f8 --- /dev/null +++ b/buildroot/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch @@ -0,0 +1,67 @@ +From 38e3436db7222ac403a405db7e0fd1d472f1704a Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 2 Feb 2020 10:51:00 +0100 +Subject: [PATCH] Fix ICU related compile failures. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The ICU macro U16_NEXT() needs a trailing semicolon. + +Fixes: + + platform/graphics/SegmentedFontData.cpp:65:9: error: expected ‘;’ before ‘if’ + dom/Document.cpp:3850:5: error: expected ‘;’ before ‘if’ + dom/Document.cpp:3855:9: error: expected ‘;’ before ‘if’ + dom/Document.cpp:3918:9: error: expected ‘;’ before ‘if’ + +Signed-off-by: Peter Seiderer +--- + Source/WebCore/dom/Document.cpp | 6 +++--- + Source/WebCore/platform/graphics/SegmentedFontData.cpp | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp +index af63b141..26f7312b 100644 +--- a/Source/WebCore/dom/Document.cpp ++++ b/Source/WebCore/dom/Document.cpp +@@ -3846,12 +3846,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) + unsigned i = 0; + + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNameStart(c)) + return false; + + while (i < length) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNamePart(c)) + return false; + } +@@ -3914,7 +3914,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S + const UChar* s = qualifiedName.characters(); + for (unsigned i = 0; i < length;) { + UChar32 c; +- U16_NEXT(s, i, length, c) ++ U16_NEXT(s, i, length, c); + if (c == ':') { + if (sawColon) { + ec = NAMESPACE_ERR; +diff --git a/Source/WebCore/platform/graphics/SegmentedFontData.cpp b/Source/WebCore/platform/graphics/SegmentedFontData.cpp +index efb20a8c..99b3e86c 100644 +--- a/Source/WebCore/platform/graphics/SegmentedFontData.cpp ++++ b/Source/WebCore/platform/graphics/SegmentedFontData.cpp +@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar* characters, int length) + { + UChar32 c; + for (int i = 0; i < length; ) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!containsCharacter(c)) + return false; + } +-- +2.25.0 + diff --git a/buildroot/package/qt5/qt5webkit/5.9.1/0005-Fix-installation-of-class-headers.patch b/buildroot/package/qt5/qt5webkit/5.9.1/0005-Fix-installation-of-class-headers.patch deleted file mode 100644 index abddfe5d1..000000000 --- a/buildroot/package/qt5/qt5webkit/5.9.1/0005-Fix-installation-of-class-headers.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix installation of class headers - -Since Qt 5.11 (see commit [1]), the key word HEADER_CLASSES has been -removed. It has been replaced by a new variable GENERATED_HEADER_FILES. - -The class headers were not generated, this commit moves them directly to -HEADER_FILES. - -[1]: https://github.com/qt/qtbase/commit/9c4c136bc9f29bab1cc9684dfced55a92a8bbe96 - -Signed-off-by: Gaël PORTAY -diff -Nurd qtwebkit-opensource-src-5.9.1.orig/include/QtWebKit/headers.pri qtwebkit-opensource-src-5.9.1/include/QtWebKit/headers.pri ---- qtwebkit-opensource-src-5.9.1.orig/include/QtWebKit/headers.pri 2018-06-29 09:21:06.395038976 -0400 -+++ qtwebkit-opensource-src-5.9.1/include/QtWebKit/headers.pri 2018-06-29 17:37:52.500020060 -0400 -@@ -1,5 +1,4 @@ --SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit --SYNCQT.HEADER_CLASSES = ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion -+SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion - SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/Api/qhttpheader_p.h WebKit/qt/Api/qwebdatabase_p.h WebKit/qt/Api/qwebelement_p.h WebKit/qt/Api/qwebhistory_p.h WebKit/qt/Api/qwebplugindatabase_p.h WebKit/qt/Api/qwebscriptworld.h WebKit/qt/Api/qwebscriptworld_p.h WebKit/qt/Api/qwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h WebKit2/UIProcess/API/qt/qquickwebview_p.h WebKit2/UIProcess/API/qt/qquickwebview_p_p.h WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h WebKit2/UIProcess/API/qt/qwebkittest_p.h WebKit2/UIProcess/API/qt/qwebloadrequest_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h WebKit2/UIProcess/API/qt/tests/testwindow.h WebKit2/UIProcess/API/qt/tests/util.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES = - SYNCQT.QPA_HEADER_FILES = -diff -Nurd qtwebkit-opensource-src-5.9.1.orig/include/QtWebKitWidgets/headers.pri qtwebkit-opensource-src-5.9.1/include/QtWebKitWidgets/headers.pri ---- qtwebkit-opensource-src-5.9.1.orig/include/QtWebKitWidgets/headers.pri 2018-06-29 09:21:06.391705602 -0400 -+++ qtwebkit-opensource-src-5.9.1/include/QtWebKitWidgets/headers.pri 2018-06-29 17:38:47.660648435 -0400 -@@ -1,5 +1,4 @@ --SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets --SYNCQT.HEADER_CLASSES = ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion -+SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion - SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/WidgetApi/qwebframe_p.h WebKit/qt/WidgetApi/qwebinspector_p.h WebKit/qt/WidgetApi/qwebpage_p.h WebKit/qt/WidgetApi/qwebviewaccessible_p.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES = - SYNCQT.QPA_HEADER_FILES = diff --git a/buildroot/package/qt5/qt5webkit/Config.in b/buildroot/package/qt5/qt5webkit/Config.in index e8008f7ba..e071dff20 100644 --- a/buildroot/package/qt5/qt5webkit/Config.in +++ b/buildroot/package/qt5/qt5webkit/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_QT5WEBKIT bool "qt5webkit" depends on !BR2_STATIC_LIBS depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu depends on BR2_INSTALL_LIBSTDCPP # leveldb depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu depends on BR2_TOOLCHAIN_HAS_THREADS # leveldb @@ -32,9 +31,8 @@ config BR2_PACKAGE_QT5WEBKIT http://doc.qt.io/archives/qt-5.5/qtwebkit-index.html -comment "qt5webkit needs a toolchain w/ dynamic library, gcc >= 4.8, host gcc >= 4.8" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ - !BR2_HOST_GCC_AT_LEAST_4_8 +comment "qt5webkit needs a toolchain w/ dynamic library, gcc >= 4.8" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on !BR2_BINFMT_FLAT depends on !BR2_MIPS_SOFT_FLOAT diff --git a/buildroot/package/qt5/qt5webkit/qt5webkit.mk b/buildroot/package/qt5/qt5webkit/qt5webkit.mk index a0a0998d1..25c549548 100644 --- a/buildroot/package/qt5/qt5webkit/qt5webkit.mk +++ b/buildroot/package/qt5/qt5webkit/qt5webkit.mk @@ -54,7 +54,6 @@ endef define QT5WEBKIT_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) diff --git a/buildroot/package/qt5/qt5websockets/qt5websockets.hash b/buildroot/package/qt5/qt5websockets/qt5websockets.hash index 0df4ac98f..3bb6297f3 100644 --- a/buildroot/package/qt5/qt5websockets/qt5websockets.hash +++ b/buildroot/package/qt5/qt5websockets/qt5websockets.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebsockets-everywhere-src-5.11.3.tar.xz.sha256 -sha256 021090c1a92f11fcf2914168741c1364235896793685b7fae2bc23e3dd55d5b9 qtwebsockets-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebsockets-everywhere-src-5.12.7.tar.xz.sha256 +sha256 6fd13c2558f532a32f20d977b44c0146107a0e93861df84978e4fd72af283b17 qtwebsockets-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5websockets/qt5websockets.mk b/buildroot/package/qt5/qt5websockets/qt5websockets.mk index c67db198d..6e734a3bf 100644 --- a/buildroot/package/qt5/qt5websockets/qt5websockets.mk +++ b/buildroot/package/qt5/qt5websockets/qt5websockets.mk @@ -18,7 +18,7 @@ QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0 QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5WEBSOCKETS_LICENSE := $(QT5WEBSOCKETS_LICENSE), BSD-3-Clause (examples) +QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples) endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) @@ -35,7 +35,6 @@ endef define QT5WEBSOCKETS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) diff --git a/buildroot/package/qt5/qt5webview/Config.in b/buildroot/package/qt5/qt5webview/Config.in new file mode 100644 index 000000000..3a165c50f --- /dev/null +++ b/buildroot/package/qt5/qt5webview/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_QT5WEBVIEW + bool "qt5webview" + depends on BR2_PACKAGE_QT5WEBENGINE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt WebView provides a way to display web content in + a QML application without necessarily including + a full web browser stack by using native APIs where + it makes sense. + + https://doc.qt.io/qt-5/qtwebview-index.html + +comment "qt5webview needs qt5webengine module" + depends on !BR2_PACKAGE_QT5WEBENGINE diff --git a/buildroot/package/qt5/qt5webview/qt5webview.hash b/buildroot/package/qt5/qt5webview/qt5webview.hash new file mode 100644 index 000000000..d9d340479 --- /dev/null +++ b/buildroot/package/qt5/qt5webview/qt5webview.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/archive/qt/5.6/5.6.3/submodules/qtwebview-opensource-src-5.6.3.tar.xz.sha256 +sha256 768a456e89f0fd7cbf39ac6b282e078a098e7426651c0b3d453b10c5c44bd81c qtwebview-opensource-src-5.6.3.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebview-everywhere-src-5.12.7.tar.xz.sha256 +sha256 d3f82d2ceab59dc4dee3b6f54f4b70869c199d63f4534b299d900cdacc9b7be7 qtwebview-everywhere-src-5.12.7.tar.xz + +# Hashes for license files: +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 diff --git a/buildroot/package/qt5/qt5webview/qt5webview.mk b/buildroot/package/qt5/qt5webview/qt5webview.mk new file mode 100644 index 000000000..0a80dba61 --- /dev/null +++ b/buildroot/package/qt5/qt5webview/qt5webview.mk @@ -0,0 +1,56 @@ +################################################################################ +# +# qt5webview +# +################################################################################ + +QT5WEBVIEW_VERSION = $(QT5_VERSION) +QT5WEBVIEW_SITE = $(QT5_SITE) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_DEPENDENCIES = qt5base qt5webengine +QT5WEBVIEW_INSTALL_STAGING = YES +QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) +QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL + +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples) +endif + +define QT5WEBVIEW_CONFIGURE_CMDS + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) +endef + +define QT5WEBVIEW_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5WEBVIEW_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install +endef + +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) +define QT5WEBVIEW_INSTALL_TARGET_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtWebView $(TARGET_DIR)/usr/qml/ +endef +endif + +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5WEBVIEW_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/webview $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif + +ifneq ($(BR2_STATIC_LIBS),y) +define QT5WEBVIEW_INSTALL_TARGET_LIBS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebView.so.* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/webview $(TARGET_DIR)/usr/lib/qt/plugins +endef +endif + +define QT5WEBVIEW_INSTALL_TARGET_CMDS + $(QT5WEBVIEW_INSTALL_TARGET_LIBS) + $(QT5WEBVIEW_INSTALL_TARGET_QMLS) + $(QT5WEBVIEW_INSTALL_TARGET_EXAMPLES) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/qt5/qt5x11extras/5.11.3/qt5x11extras.hash b/buildroot/package/qt5/qt5x11extras/5.11.3/qt5x11extras.hash deleted file mode 100644 index 9a0e85d8f..000000000 --- a/buildroot/package/qt5/qt5x11extras/5.11.3/qt5x11extras.hash +++ /dev/null @@ -1,9 +0,0 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtx11extras-everywhere-src-5.11.3.tar.xz.mirrorlist -sha256 f99eebe685f7cdbb71cd62903c2b2511548345535841bcc3f6b662205815cd85 qtx11extras-everywhere-src-5.11.3.tar.xz - -# Hashes for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 -sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5x11extras/5.12.7/qt5x11extras.hash b/buildroot/package/qt5/qt5x11extras/5.12.7/qt5x11extras.hash new file mode 100644 index 000000000..06cdb9c87 --- /dev/null +++ b/buildroot/package/qt5/qt5x11extras/5.12.7/qt5x11extras.hash @@ -0,0 +1,9 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtx11extras-everywhere-src-5.12.7.tar.xz.sha256 +sha256 23895f4b1e84f3783526b9e17680df38c587601d4dfa6ff1b81ace432c480b96 qtx11extras-everywhere-src-5.12.7.tar.xz + +# Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk b/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk index 9d54c1106..6acc9462c 100644 --- a/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk @@ -28,7 +28,6 @@ endef define QT5X11EXTRAS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_STATIC_LIBS),) diff --git a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 5c66a54ee..0366baa0b 100644 --- a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtxmlpatterns-everywhere-src-5.11.3.tar.xz.sha256 -sha256 8bd00be30722570d22382b99679d07787a2d62d4891d1c47d738d634e2db0eee qtxmlpatterns-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtxmlpatterns-everywhere-src-5.12.7.tar.xz.sha256 +sha256 9002014129a1f2a44700df333a7776e23bdfd689e7a619c3540fd9f6819b417b qtxmlpatterns-everywhere-src-5.12.7.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 0a8b47ac5..6ed247fd5 100644 --- a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -18,7 +18,7 @@ QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1. QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5XMLPATTERNS_LICENSE := $(QT5XMLPATTERNS_LICENSE), BSD-3-Clause (examples) +QT5XMLPATTERNS_LICENSE += , BSD-3-Clause (examples) endif define QT5XMLPATTERNS_CONFIGURE_CMDS @@ -31,7 +31,6 @@ endef define QT5XMLPATTERNS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) endef ifeq ($(BR2_STATIC_LIBS),) diff --git a/buildroot/package/qt5cinex/qt5cinex.hash b/buildroot/package/qt5cinex/qt5cinex.hash index 637f388b7..ac62ee226 100644 --- a/buildroot/package/qt5cinex/qt5cinex.hash +++ b/buildroot/package/qt5cinex/qt5cinex.hash @@ -1,3 +1,4 @@ # Locally computed -sha256 0dd602983ced5f7c0cfd5ad0fbfe2b0b7e3c9ff715e4ef23eef818ccc2b6c60b Qt5_CinematicExperience_rpi_1.0.tgz -sha256 0e547e0259667915a24e84ade5efdcd0c553f81786734452c2c8dbce19a19f44 Qt5_CinematicExperience_1.0.tgz +sha256 0dd602983ced5f7c0cfd5ad0fbfe2b0b7e3c9ff715e4ef23eef818ccc2b6c60b Qt5_CinematicExperience_rpi_1.0.tgz +sha256 0e547e0259667915a24e84ade5efdcd0c553f81786734452c2c8dbce19a19f44 Qt5_CinematicExperience_1.0.tgz +sha256 bf6206061bcffb43c82999b8845360f223ac5cb4f574219fe95543ffd6755614 README diff --git a/buildroot/package/quagga/quagga.hash b/buildroot/package/quagga/quagga.hash index 93fc42c8f..293cee4d5 100644 --- a/buildroot/package/quagga/quagga.hash +++ b/buildroot/package/quagga/quagga.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 ee2c0907a106902abbdcaf63b4f28c67241c4f3396989ed54da7b4976eecad31 quagga-1.2.3.tar.gz +sha256 e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3 quagga-1.2.4.tar.gz # Hash for license file sha256 b39c1bad4e51e2a3389cd25fc4addebe41a3ae7c11100795683f9330de1536e5 COPYING diff --git a/buildroot/package/quagga/quagga.mk b/buildroot/package/quagga/quagga.mk index ef18c42a8..0b352aa36 100644 --- a/buildroot/package/quagga/quagga.mk +++ b/buildroot/package/quagga/quagga.mk @@ -4,8 +4,9 @@ # ################################################################################ -QUAGGA_VERSION = 1.2.3 +QUAGGA_VERSION = 1.2.4 QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga +QUAGGA_INSTALL_STAGING = YES QUAGGA_DEPENDENCIES = host-gawk host-pkgconf QUAGGA_LICENSE = GPL-2.0+ QUAGGA_LICENSE_FILES = COPYING diff --git a/buildroot/package/quazip/0001-fix-qztest-build-error.patch b/buildroot/package/quazip/0001-fix-qztest-build-error.patch new file mode 100644 index 000000000..6bbe820a0 --- /dev/null +++ b/buildroot/package/quazip/0001-fix-qztest-build-error.patch @@ -0,0 +1,36 @@ +From df8a2c4f18293cb2eafcf81e5dc169a06dccf304 Mon Sep 17 00:00:00 2001 +From: tsteven4 <13596209+tsteven4@users.noreply.github.com> +Date: Tue, 9 Jul 2019 16:42:28 -0600 +Subject: [PATCH] fix qztest build error. + +If int is bigger than quint16 then you will get the following +linker error: + +.obj/testquazip.o: In function `TestQuaZip::setOsCode()': +testquazip.cpp:(.text+0x42bd): undefined reference to `bool QTest::qCompare(int const&, unsigned short const&, char const*, char const*, char const*, int)' +collect2: error: ld returned 1 exit status + +This error indicates the two parameters of QCOMPARE do not have the same type. + +This occurs because integral promotions can be applied to fi.versionCreated. + +[Retrieved from: +https://github.com/stachenov/quazip/commit/df8a2c4f18293cb2eafcf81e5dc169a06dccf304] +Signed-off-by: Fabrice Fontaine +--- + qztest/testquazip.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qztest/testquazip.cpp b/qztest/testquazip.cpp +index 70a64fc..86f6556 100644 +--- a/qztest/testquazip.cpp ++++ b/qztest/testquazip.cpp +@@ -233,7 +233,7 @@ void TestQuaZip::setOsCode() + checkZip.goToFirstFile(); + QuaZipFileInfo64 fi; + QVERIFY(checkZip.getCurrentFileInfo(&fi)); +- QCOMPARE(fi.versionCreated >> 8, static_cast(osCode)); ++ QCOMPARE(static_cast(fi.versionCreated) >> 8, osCode); + } + + void TestQuaZip::setDataDescriptorWritingEnabled() diff --git a/buildroot/package/quazip/quazip.hash b/buildroot/package/quazip/quazip.hash index 9f43643d6..e0a8206c5 100644 --- a/buildroot/package/quazip/quazip.hash +++ b/buildroot/package/quazip/quazip.hash @@ -1,2 +1,3 @@ -# From github release page -sha256 4118a830a375a81211956611cc34b1b5b4ddc108c126287b91b40c2493046b70 quazip-0.7.6.tar.gz +# Locally computed +sha256 4fda4d4248e08015b5090d0369ef9e68bdc4475aa12494f7c0f6d79e43270d14 quazip-0.8.1.tar.gz +sha256 d2a653b46b87963f29a7f1523e7c39bafdbb3592dfa01725e61a523387148e72 COPYING diff --git a/buildroot/package/quazip/quazip.mk b/buildroot/package/quazip/quazip.mk index aba827450..53042f6c4 100644 --- a/buildroot/package/quazip/quazip.mk +++ b/buildroot/package/quazip/quazip.mk @@ -4,8 +4,8 @@ # ################################################################################ -QUAZIP_VERSION = 0.7.6 -QUAZIP_SITE = $(call github,stachenov,quazip,$(QUAZIP_VERSION)) +QUAZIP_VERSION = 0.8.1 +QUAZIP_SITE = $(call github,stachenov,quazip,v$(QUAZIP_VERSION)) QUAZIP_INSTALL_STAGING = YES QUAZIP_DEPENDENCIES = \ zlib \ diff --git a/buildroot/package/quota/0001-configure.ac-add-disable-pie-option.patch b/buildroot/package/quota/0001-configure.ac-add-disable-pie-option.patch new file mode 100644 index 000000000..c3b57fea6 --- /dev/null +++ b/buildroot/package/quota/0001-configure.ac-add-disable-pie-option.patch @@ -0,0 +1,55 @@ +From cb20e19028a8996de9305502ba5e5da3bd1181bf Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 2 Apr 2019 09:19:36 +0200 +Subject: [PATCH] configure.ac: add --disable-pie option + +PIE is not necessarily supported on all architectures, so add an option +to allow the user to disable the PIE. + +This fixes the build on the m68k architecture: + - http://autobuild.buildroot.org/results/25985bbc160e3d62b23c4c613b2a81f3711621e3 + +Signed-off-by: Fabrice Fontaine +[Upstream status: merged] +--- + Makefile.am | 2 +- + configure.ac | 12 ++++++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 638198d..332bd67 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,5 @@ + ACLOCAL_AMFLAGS = -I m4 +-AM_LDFLAGS = -pie ++AM_LDFLAGS = @PIE_LDFLAGS@ + + doc_DATA = \ + README.mailserver \ +diff --git a/configure.ac b/configure.ac +index 095ff86..5af4235 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,6 +55,18 @@ AS_IF([test "x${prefix}" = "xNONE"], [ + AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/share/locale", [Locale-specific data directory]) + ]) + ++# ================ ++# Check for ldflags ++# ================ ++AC_ARG_ENABLE([pie], ++ [AS_HELP_STRING([--disable-pie], [Disable Position Independent Executable])], ++ [enable_pie="$enableval"], ++ [enable_pie=yes] ++) ++AS_IF([test x"$enable_pie" != "xno"], [ ++ PIE_LDFLAGS="-pie" ++]) ++AC_SUBST([PIE_LDFLAGS]) + + # ================ + # Check for cflags +-- +2.14.1 + diff --git a/buildroot/package/quota/0001-tools-getrpcbynumber.patch b/buildroot/package/quota/0001-tools-getrpcbynumber.patch deleted file mode 100644 index 899db914f..000000000 --- a/buildroot/package/quota/0001-tools-getrpcbynumber.patch +++ /dev/null @@ -1,42 +0,0 @@ -allow usage of getrpcbynumber() instead of getrpcbynumber_r() - -libtirpc does not implement the reentrant function getrpcbynumber_r(), -so allow quota to use the non-reentrant version getrpcbynumber(). This -should not be a problem as quota tools are not multi-threaded. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -182,6 +182,12 @@ - AC_C_CONST - AC_C_INLINE - -+AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r]) -+ -+if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then -+ AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available]) -+fi -+ - AC_ARG_ENABLE(rpc, - [ --enable-rpc=[yes/no] Enable RPC support [default=yes].], - , -Index: b/svc_socket.c -=================================================================== ---- a/svc_socket.c -+++ b/svc_socket.c -@@ -55,7 +55,12 @@ - addr.sin_family = AF_INET; - - if (!port) { -+#if HAVE_GETRPCBYNUMBER_R - ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp); -+#else -+ rpcp = getrpcbynumber(number); -+ ret = 0; -+#endif - if (ret == 0 && rpcp != NULL) { - /* First try name */ - ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, diff --git a/buildroot/package/quota/0002-fix-static-linking.patch b/buildroot/package/quota/0002-fix-static-linking.patch deleted file mode 100644 index fd73f64eb..000000000 --- a/buildroot/package/quota/0002-fix-static-linking.patch +++ /dev/null @@ -1,55 +0,0 @@ -Use $(LIBS) properly - -This patch makes sure the quota build system uses $(LIBS) where -appropriate, so that it can be used to link with additional libraries, -which is needed when linking statically. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile.in -=================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -105,30 +105,40 @@ - -$(INSTALL) -m $(DEF_MAN_MODE) *.8 $(ROOTDIR)$(mandir)/man8 - - quotaon: quotaon.o quotaon_xfs.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - quotacheck: quotacheck.o quotacheck_v1.o quotacheck_v2.o quotaops.o $(LIBOBJS) -- $(CC) $(LDFLAGS) -o $@ $^ $(EXT2LIBS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(EXT2LIBS) $(LIBS) - - quota: quota.o quotaops.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - quotasync: quotasync.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - quot: quot.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - repquota: repquota.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - warnquota: warnquota.o $(LIBOBJS) -- $(CC) $(LDFLAGS) -o $@ $^ $(LDAPLIBS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LDAPLIBS) $(LIBS) - - quotastats: quotastats.o common.o pot.o -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - xqmstats: xqmstats.o common.o pot.o -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - edquota: edquota.o quotaops.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - setquota: setquota.o quotaops.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - convertquota: convertquota.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - rpc.rquotad: rquota_server.o rquota_svc.o svc_socket.o $(LIBOBJS) - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) diff --git a/buildroot/package/quota/0003-remove-non-posix-types.patch b/buildroot/package/quota/0003-remove-non-posix-types.patch deleted file mode 100644 index 869c85f23..000000000 --- a/buildroot/package/quota/0003-remove-non-posix-types.patch +++ /dev/null @@ -1,200 +0,0 @@ -Use proper C99 integer types - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -[Thomas: borrowed from OpenEmbedded.] -Signed-off-by: Thomas Petazzoni - -Index: quota-tools/bylabel.c -=================================================================== ---- quota-tools.orig/bylabel.c -+++ quota-tools/bylabel.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - #include "bylabel.h" - #include "common.h" -@@ -37,32 +38,32 @@ static struct uuidCache_s { - - #define EXT2_SUPER_MAGIC 0xEF53 - struct ext2_super_block { -- u_char s_dummy1[56]; -- u_char s_magic[2]; -- u_char s_dummy2[46]; -- u_char s_uuid[16]; -- u_char s_volume_name[16]; -+ uint8_t s_dummy1[56]; -+ uint8_t s_magic[2]; -+ uint8_t s_dummy2[46]; -+ uint8_t s_uuid[16]; -+ uint8_t s_volume_name[16]; - }; - --#define ext2magic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8)) -+#define ext2magic(s) ((uint32_t) s.s_magic[0] + (((uint32_t) s.s_magic[1]) << 8)) - - #define XFS_SUPER_MAGIC "XFSB" - #define XFS_SUPER_MAGIC2 "BSFX" - struct xfs_super_block { -- u_char s_magic[4]; -- u_char s_dummy[28]; -- u_char s_uuid[16]; -- u_char s_dummy2[60]; -- u_char s_fsname[12]; -+ uint8_t s_magic[4]; -+ uint8_t s_dummy[28]; -+ uint8_t s_uuid[16]; -+ uint8_t s_dummy2[60]; -+ uint8_t s_fsname[12]; - }; - - #define REISER_SUPER_MAGIC "ReIsEr2Fs" - struct reiserfs_super_block { -- u_char s_dummy1[52]; -- u_char s_magic[10]; -- u_char s_dummy2[22]; -- u_char s_uuid[16]; -- u_char s_volume_name[16]; -+ uint8_t s_dummy1[52]; -+ uint8_t s_magic[10]; -+ uint8_t s_dummy2[22]; -+ uint8_t s_uuid[16]; -+ uint8_t s_volume_name[16]; - }; - - static inline unsigned short swapped(unsigned short a) -@@ -222,7 +223,7 @@ static char *get_spec_by_x(int n, const - return NULL; - } - --static u_char fromhex(char c) -+static uint8_t fromhex(char c) - { - if (isdigit(c)) - return (c - '0'); -@@ -234,7 +235,7 @@ static u_char fromhex(char c) - - static char *get_spec_by_uuid(const char *s) - { -- u_char uuid[16]; -+ uint8_t uuid[16]; - int i; - - if (strlen(s) != 36 || s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-') -Index: quota-tools/quot.c -=================================================================== ---- quota-tools.orig/quot.c -+++ quota-tools/quot.c -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - #include "pot.h" - #include "quot.h" -@@ -56,8 +57,8 @@ - #include "quotasys.h" - - #define TSIZE 500 --static __uint64_t sizes[TSIZE]; --static __uint64_t overflow; -+static uint64_t sizes[TSIZE]; -+static uint64_t overflow; - - static int aflag; - static int cflag; -@@ -72,7 +73,7 @@ static time_t now; - char *progname; - - static void mounttable(void); --static char *idname(__uint32_t, int); -+static char *idname(uint32_t, int); - static void report(const char *, const char *, int); - static void creport(const char *, const char *); - -@@ -173,7 +174,7 @@ static int qcmp(du_t * p1, du_t * p2) - static void creport(const char *file, const char *fsdir) - { - int i; -- __uint64_t t = 0; -+ uint64_t t = 0; - - printf(_("%s (%s):\n"), file, fsdir); - for (i = 0; i < TSIZE - 1; i++) -@@ -219,7 +220,7 @@ static void report(const char *file, con - } - } - --static idcache_t *getnextent(int type, __uint32_t id, int byid) -+static idcache_t *getnextent(int type, uint32_t id, int byid) - { - struct passwd *pw; - struct group *gr; -@@ -240,7 +241,7 @@ static idcache_t *getnextent(int type, _ - return &idc; - } - --static char *idname(__uint32_t id, int type) -+static char *idname(uint32_t id, int type) - { - idcache_t *ncp, *idp; - static idcache_t nc[2][NID]; -@@ -286,8 +287,8 @@ static void acctXFS(xfs_bstat_t *p) - { - register du_t *dp; - du_t **hp; -- __uint64_t size; -- __uint32_t i, id; -+ uint64_t size; -+ uint32_t i, id; - - if ((p->bs_mode & S_IFMT) == 0) - return; -Index: quota-tools/quot.h -=================================================================== ---- quota-tools.orig/quot.h -+++ quota-tools/quot.h -@@ -35,18 +35,18 @@ - #define SEC24HR (60*60*24) /* seconds per day */ - - typedef struct { -- __uint32_t id; -+ uint32_t id; - char name[UT_NAMESIZE + 1]; - } idcache_t; - - typedef struct du { - struct du *next; -- __uint64_t blocks; -- __uint64_t blocks30; -- __uint64_t blocks60; -- __uint64_t blocks90; -- __uint64_t nfiles; -- __uint32_t id; -+ uint64_t blocks; -+ uint64_t blocks30; -+ uint64_t blocks60; -+ uint64_t blocks90; -+ uint64_t nfiles; -+ uint32_t id; - } du_t; - - #define NDU 60000 -Index: quota-tools/rquota_server.c -=================================================================== ---- quota-tools.orig/rquota_server.c -+++ quota-tools/rquota_server.c -@@ -60,7 +60,7 @@ extern char nfs_pseudoroot[PATH_MAX]; - */ - extern struct authunix_parms *unix_cred; - --int in_group(gid_t * gids, u_int len, gid_t gid) -+int in_group(gid_t * gids, uint32_t len, gid_t gid) - { - gid_t *gidsp = gids + len; - diff --git a/buildroot/package/quota/0004-import-sys-cdefs.patch b/buildroot/package/quota/0004-import-sys-cdefs.patch deleted file mode 100644 index 9acd1fe4f..000000000 --- a/buildroot/package/quota/0004-import-sys-cdefs.patch +++ /dev/null @@ -1,18 +0,0 @@ -Add missing include - -quota.h uses the __P definition, so it must include . - -Signed-off-by: Thomas Petazzoni - -Index: b/quota.h -=================================================================== ---- a/quota.h -+++ b/quota.h -@@ -2,6 +2,7 @@ - #define GUARD_QUOTA_H - - #include -+#include - - typedef u_int32_t qid_t; /* Type in which we store ids in memory */ - typedef int64_t qsize_t; /* Type in which we store size limitations */ diff --git a/buildroot/package/quota/0005-include-fcntl.patch b/buildroot/package/quota/0005-include-fcntl.patch deleted file mode 100644 index fe7ea9883..000000000 --- a/buildroot/package/quota/0005-include-fcntl.patch +++ /dev/null @@ -1,20 +0,0 @@ -Include to get loff_t definition - -Fixes the following build issue with musl: - -dqblk_v2.h:32:2: error: unknown type name ‘loff_t’ - -Signed-off-by: Thomas Petazzoni - -Index: b/dqblk_v2.h -=================================================================== ---- a/dqblk_v2.h -+++ b/dqblk_v2.h -@@ -8,6 +8,7 @@ - #define GUARD_DQBLK_V2_H - - #include -+#include - #include "quota_tree.h" - - #define Q_V2_GETQUOTA 0x0D00 /* Get limits and usage */ diff --git a/buildroot/package/quota/quota.hash b/buildroot/package/quota/quota.hash index 5e4969364..d9f42e51c 100644 --- a/buildroot/package/quota/quota.hash +++ b/buildroot/package/quota/quota.hash @@ -1,3 +1,7 @@ -# From http://sourceforge.net/projects/linuxquota/files/quota-tools/4.01/ (click on info button) -md5 5c2c31e321d2e1322ce12d69ae5c66d6 quota-4.01.tar.gz -sha1 64d2ab8b039cfea1aa4bd9e77e8c373488a7f0bf quota-4.01.tar.gz +# From http://sourceforge.net/projects/linuxquota/files/quota-tools/4.05/ (click on info button) +md5 1c1dbd2cd3d680ccac661239b067e147 quota-4.05.tar.gz +sha1 d23711f3b204e0a86b8378c32545c95fb149168d quota-4.05.tar.gz + +# Locally calculated +sha256 ef3b5b5d1014ed1344b46c1826145e20cbef8db967b522403c9a060761cf7ab9 quota-4.05.tar.gz +sha256 35b2d9797b83bce16076da9c3273f264f50b8d02f492ee32cd4c51ba6897bceb COPYING diff --git a/buildroot/package/quota/quota.mk b/buildroot/package/quota/quota.mk index 38e18a60c..f4bf9e5c5 100644 --- a/buildroot/package/quota/quota.mk +++ b/buildroot/package/quota/quota.mk @@ -4,41 +4,40 @@ # ################################################################################ -QUOTA_VERSION = 4.01 +QUOTA_VERSION = 4.05 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-nfs-utils -QUOTA_AUTORECONF = YES QUOTA_LICENSE = GPL-2.0+ -QUOTA_CONF_OPTS = --disable-strip-binaries -QUOTA_LIBS = $(TARGET_NLS_LIBS) +QUOTA_LICENSE_FILES = COPYING +# We're patching configure.ac +QUOTA_AUTORECONF = YES +QUOTA_GETTEXTIZE = YES +QUOTA_CONF_ENV = LIBS="$(TARGET_NLS_LIBS)" +QUOTA_CONF_OPTS = --disable-pie -QUOTA_CFLAGS = $(TARGET_CFLAGS) +ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_LIBNL),yy) +QUOTA_DEPENDENCIES += host-pkgconf dbus libnl +QUOTA_CONF_OPTS += --enable-netlink +else +QUOTA_CONF_OPTS += --disable-netlink +endif ifeq ($(BR2_PACKAGE_E2FSPROGS),y) -QUOTA_DEPENDENCIES += e2fsprogs +QUOTA_DEPENDENCIES += host-pkgconf e2fsprogs QUOTA_CONF_OPTS += --enable-ext2direct -# quote does not use pkg-config to find e2fsprogs, so it does not know it -# may require -pthreads in case of static build -ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy) -QUOTA_LIBS += -pthread -endif else QUOTA_CONF_OPTS += --disable-ext2direct endif ifeq ($(BR2_PACKAGE_LIBTIRPC),y) QUOTA_DEPENDENCIES += libtirpc host-pkgconf -QUOTA_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` -QUOTA_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` endif -QUOTA_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LIBS="$(QUOTA_LIBS)" -QUOTA_CONF_ENV = \ - CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LIBS="$(QUOTA_LIBS)" - -# Package uses autoconf but not automake. -QUOTA_INSTALL_TARGET_OPTS = \ - ROOTDIR=$(TARGET_DIR) \ - install +ifeq ($(BR2_PACKAGE_OPENLDAP):$(BR2_STATIC_LIBS),y:) +QUOTA_DEPENDENCIES += openldap +QUOTA_CONF_OPTS += --enable-ldapmail +else +QUOTA_CONF_OPTS += --disable-ldapmail +endif $(eval $(autotools-package)) diff --git a/buildroot/package/qwt/qwt.hash b/buildroot/package/qwt/qwt.hash index a0077a680..95e910e5e 100644 --- a/buildroot/package/qwt/qwt.hash +++ b/buildroot/package/qwt/qwt.hash @@ -1,3 +1,7 @@ -# From https://sourceforge.net/projects/qwt/files/qwt/6.1.3/ -sha1 90ec21bc42f7fae270482e1a0df3bc79cb10e5c7 qwt-6.1.3.tar.bz2 -md5 19d1f5fa5e22054d22ee3accc37c54ba qwt-6.1.3.tar.bz2 +# From https://sourceforge.net/projects/qwt/files/qwt/6.1.4/ +sha1 a1028cb0a33322920266fb183869023b8ed30394 qwt-6.1.4.tar.bz2 +md5 4fb1852f694420e3ab9c583526edecc5 qwt-6.1.4.tar.bz2 + +# Locally computed +sha256 1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9 qwt-6.1.4.tar.bz2 +sha256 d8737db330e1eeb439962e11654ab7f1aece3561d9415454a8c538643824ede6 COPYING diff --git a/buildroot/package/qwt/qwt.mk b/buildroot/package/qwt/qwt.mk index f381ebbb7..a82c786cb 100644 --- a/buildroot/package/qwt/qwt.mk +++ b/buildroot/package/qwt/qwt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QWT_VERSION = 6.1.3 +QWT_VERSION = 6.1.4 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION) QWT_INSTALL_STAGING = YES @@ -19,6 +19,7 @@ QWT_CONFIG += -e 's%/features%/mkspecs/features%' ifeq ($(BR2_PACKAGE_QWT_SVG),y) QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/' +QWT_DEPENDENCIES += qt5svg else QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/' endif diff --git a/buildroot/package/rabbitmq-server/rabbitmq-server.hash b/buildroot/package/rabbitmq-server/rabbitmq-server.hash index 3cd412dd0..3c552820c 100644 --- a/buildroot/package/rabbitmq-server/rabbitmq-server.hash +++ b/buildroot/package/rabbitmq-server/rabbitmq-server.hash @@ -1,2 +1,18 @@ # Locally computed -sha256 395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e rabbitmq-server-3.6.6.tar.xz +sha256 395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e rabbitmq-server-3.6.6.tar.xz +sha256 f3a296f863a2729506bf0e9f1b3f219e63ede4906a88790fdd4d696f825b70ba LICENSE-MPL-RabbitMQ +sha256 2d6485b111c3ef40900d5accb40388fbf99d4b018274b3617e1c92b86d95c985 LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE-APACHE2-ExplorerCanvas +sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE-APL2-Rebar +sha256 b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841 LICENSE-APL2-Stomp-Websocket +sha256 cdc8c5132e24712732282867575b23b951f277fe9641d72e730a264e8d8add2f LICENSE-BSD-base64js +sha256 2c7784c174b3eff8507a8cb815c721800882f6d53860c2f2ecf34c8ce2d510f1 LICENSE-BSD-glMatrix +sha256 a97b529abfed8dea9f644e1d3294a14beba6aaf3a8e2f0db6a347e01ceb623cd LICENSE-EPL-OTP +sha256 b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1 LICENSE-MIT-EJS10 +sha256 e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c LICENSE-MIT-Flot +sha256 f10e24a690fa6f8a2154dd0b8623e0431c6c049482f139d0980664de612a7d5b LICENSE-MIT-jQuery164 +sha256 fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692 LICENSE-MIT-Mochi +sha256 363a3b367503176fad7fd794168193ff9add85c3d28b73af804b67ff11c59115 LICENSE-MIT-Mochiweb +sha256 cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed LICENSE-MIT-Sammy060 +sha256 c29e506dd734930964382e52e98f60ab7a46c2be639165a3a25083272c8fc29f LICENSE-MIT-SockJS +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE-MPL2 diff --git a/buildroot/package/rabbitmq-server/rabbitmq-server.mk b/buildroot/package/rabbitmq-server/rabbitmq-server.mk index 6df770793..f9c28e667 100644 --- a/buildroot/package/rabbitmq-server/rabbitmq-server.mk +++ b/buildroot/package/rabbitmq-server/rabbitmq-server.mk @@ -36,11 +36,6 @@ endef define RABBITMQ_SERVER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/rabbitmq-server/rabbitmq-server.service \ $(TARGET_DIR)/usr/lib/systemd/system/rabbitmq-server.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/rabbitmq-server.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rabbitmq-server.service endef define RABBITMQ_SERVER_INSTALL_INIT_SYSV diff --git a/buildroot/package/racehound/racehound.hash b/buildroot/package/racehound/racehound.hash index d9a7f061f..fc6424304 100644 --- a/buildroot/package/racehound/racehound.hash +++ b/buildroot/package/racehound/racehound.hash @@ -1,2 +1,3 @@ # locally computed sha256 935bc4a7c7b645dee5b905f6e97d0db3f0ac4f48e71d15f4e3982811017ac43c racehound-f09f06fcc3c77c8c5541be3ba5be80aa8148ce0c.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/radvd/50-radvd.preset b/buildroot/package/radvd/50-radvd.preset new file mode 100644 index 000000000..90d0ee4bb --- /dev/null +++ b/buildroot/package/radvd/50-radvd.preset @@ -0,0 +1 @@ +disable radvd.service diff --git a/buildroot/package/radvd/Config.in b/buildroot/package/radvd/Config.in index 48aeedc08..f1df0c3cb 100644 --- a/buildroot/package/radvd/Config.in +++ b/buildroot/package/radvd/Config.in @@ -1,8 +1,15 @@ config BR2_PACKAGE_RADVD bool "radvd" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_FLEX help IPv6 Router Advertisement Daemon. + On busybox and sysvinit systems, radvd will be started only if + a /etc/radvd.conf exists. + + To enable it at build time with systemd, add /etc/radvd.conf + and a /etc/systemd/system-preset/40-radvd.preset file with + + enable radvd.service + http://www.litech.org/radvd/ diff --git a/buildroot/package/radvd/S50radvd b/buildroot/package/radvd/S50radvd index 9f1407c95..f73ce24ed 100644 --- a/buildroot/package/radvd/S50radvd +++ b/buildroot/package/radvd/S50radvd @@ -1,18 +1,59 @@ #!/bin/sh -RADVD=/usr/sbin/radvd +DAEMON="radvd" +PIDFILE="/var/run/$DAEMON.pid" -echo "1" > /proc/sys/net/ipv6/conf/all/forwarding +RADVD_ARGS="-m syslog" -printf "Starting radvd: " -if [ ! -x "${RADVD}" ]; then - echo "missing" +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +[ -f /etc/radvd.conf ] || exit 0 + +[ -f /proc/sys/net/ipv6/conf/all/forwarding ] || { + echo "Error: radvd requires IPv6 forwarding support." exit 1 -fi +} -if ${RADVD} ; then - echo "done" -else - echo "failed" - exit 1 -fi +start() { + printf 'Starting %s: ' "$DAEMON" + echo "1" > /proc/sys/net/ipv6/conf/all/forwarding + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $RADVD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop) + "$1";; + restart|reload) + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/radvd/radvd.hash b/buildroot/package/radvd/radvd.hash index ac6014b77..9ade027d2 100644 --- a/buildroot/package/radvd/radvd.hash +++ b/buildroot/package/radvd/radvd.hash @@ -1,2 +1,3 @@ -# From http://www.litech.org/radvd/dist/radvd-2.12.tar.gz.sha256 -sha256 b070e77238e789e298a82cba2b1bfb0b0180b4ebc1adfc4e75058adfdbff747b radvd-2.12.tar.xz +# From http://www.litech.org/radvd/dist/radvd-2.18.tar.gz.sha256 +sha256 4f573e36b96ba92d03b5abbbd5f059b9c8994967812c77852f44049ac5a448fd radvd-2.18.tar.gz +sha256 40a6db00cf0b97f031eaa6c6e87157788f40ced1b88e3ea6d78779bd2a39dc80 COPYRIGHT diff --git a/buildroot/package/radvd/radvd.mk b/buildroot/package/radvd/radvd.mk index 88221875a..ba0c78bd1 100644 --- a/buildroot/package/radvd/radvd.mk +++ b/buildroot/package/radvd/radvd.mk @@ -4,10 +4,9 @@ # ################################################################################ -RADVD_VERSION = 2.12 -RADVD_SOURCE = radvd-$(RADVD_VERSION).tar.xz +RADVD_VERSION = 2.18 RADVD_SITE = http://www.litech.org/radvd/dist -RADVD_DEPENDENCIES = host-bison flex host-flex host-pkgconf +RADVD_DEPENDENCIES = host-bison host-flex host-pkgconf # We need to ignore , because radvd already includes # , which conflicts with . RADVD_CONF_ENV = \ @@ -18,6 +17,12 @@ RADVD_AUTORECONF = YES RADVD_LICENSE = BSD-4-Clause-like RADVD_LICENSE_FILES = COPYRIGHT +# We don't provide /etc/radvd.conf, so disable the service by default. +define RADVD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 package/radvd/50-radvd.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-radvd.preset +endef + define RADVD_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/radvd/S50radvd $(TARGET_DIR)/etc/init.d/S50radvd endef diff --git a/buildroot/package/ramsmp/ramsmp.hash b/buildroot/package/ramsmp/ramsmp.hash index 46aa3f10e..c5e29a390 100644 --- a/buildroot/package/ramsmp/ramsmp.hash +++ b/buildroot/package/ramsmp/ramsmp.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 39fb15493fb3c293575746d56f6ab9faaa1d876d8b1f0d8e5a4042d2ace95839 ramsmp-3.5.0.tar.gz +sha256 39fb15493fb3c293575746d56f6ab9faaa1d876d8b1f0d8e5a4042d2ace95839 ramsmp-3.5.0.tar.gz +sha256 2c308cffbab01762f8f6b11725725a227080746ef865f2756c9c9e1591dddaad LICENCE diff --git a/buildroot/package/ramspeed/ramspeed.hash b/buildroot/package/ramspeed/ramspeed.hash index 71052a349..5a6bfe3eb 100644 --- a/buildroot/package/ramspeed/ramspeed.hash +++ b/buildroot/package/ramspeed/ramspeed.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 f84e2e42b2b6b221ef9b586f6ae63d863db4ff21858e0ce7c84622a7c9522950 ramspeed-2.6.0.tar.gz +sha256 f84e2e42b2b6b221ef9b586f6ae63d863db4ff21858e0ce7c84622a7c9522950 ramspeed-2.6.0.tar.gz +sha256 2c308cffbab01762f8f6b11725725a227080746ef865f2756c9c9e1591dddaad LICENCE diff --git a/buildroot/package/ranger/ranger.hash b/buildroot/package/ranger/ranger.hash index 30bdbede0..dee088f22 100644 --- a/buildroot/package/ranger/ranger.hash +++ b/buildroot/package/ranger/ranger.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 94f6e342daee4445f15db5a7440a11138487c49cc25da0c473bbf1b8978f5b79 ranger-1.7.2.tar.gz +sha256 94f6e342daee4445f15db5a7440a11138487c49cc25da0c473bbf1b8978f5b79 ranger-1.7.2.tar.gz +# Locally computed +sha256 fa3b40d44066b033ac8a134b792a4a4a1915aa7bc7757098e0f67080648a3271 AUTHORS diff --git a/buildroot/package/rapidjson/rapidjson.hash b/buildroot/package/rapidjson/rapidjson.hash index a4b02cffb..e8b2c4d54 100644 --- a/buildroot/package/rapidjson/rapidjson.hash +++ b/buildroot/package/rapidjson/rapidjson.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e rapidjson-v1.1.0.tar.gz +sha256 bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e rapidjson-1.1.0.tar.gz sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 license.txt diff --git a/buildroot/package/rapidjson/rapidjson.mk b/buildroot/package/rapidjson/rapidjson.mk index 4d69bc345..9f1c82ce4 100644 --- a/buildroot/package/rapidjson/rapidjson.mk +++ b/buildroot/package/rapidjson/rapidjson.mk @@ -4,8 +4,8 @@ # ################################################################################ -RAPIDJSON_VERSION = v1.1.0 -RAPIDJSON_SITE = $(call github,miloyip,rapidjson,$(RAPIDJSON_VERSION)) +RAPIDJSON_VERSION = 1.1.0 +RAPIDJSON_SITE = $(call github,miloyip,rapidjson,v$(RAPIDJSON_VERSION)) RAPIDJSON_LICENSE = MIT RAPIDJSON_LICENSE_FILES = license.txt diff --git a/buildroot/package/rapidxml/rapidxml.hash b/buildroot/package/rapidxml/rapidxml.hash index 81919f037..398bc147c 100644 --- a/buildroot/package/rapidxml/rapidxml.hash +++ b/buildroot/package/rapidxml/rapidxml.hash @@ -3,4 +3,5 @@ sha1 f5fd4fbc5ad7e96045313697811d65ea8089a950 rapidxml-1.13.zip md5 7b4b42c9331c90aded23bb55dc725d6a rapidxml-1.13.zip # Locally calculated -sha256 c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571 rapidxml-1.13.zip +sha256 c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571 rapidxml-1.13.zip +sha256 794bf3b2ecf5cf0c740ac6c524d66ce6284c4b1de1f983d21a242b8abbeb9720 license.txt diff --git a/buildroot/package/raptor/raptor.hash b/buildroot/package/raptor/raptor.hash index ee7a71b4c..2a54bf270 100644 --- a/buildroot/package/raptor/raptor.hash +++ b/buildroot/package/raptor/raptor.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed raptor2-2.0.15.tar.gz +sha256 ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed raptor2-2.0.15.tar.gz +sha256 6b926a47abfb87451c436fbd4a868defec963d0232c70b806ac02d4a2a6e1968 LICENSE.txt diff --git a/buildroot/package/raspi-gpio/Config.in b/buildroot/package/raspi-gpio/Config.in new file mode 100644 index 000000000..32a944833 --- /dev/null +++ b/buildroot/package/raspi-gpio/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_RASPI_GPIO + bool "raspi-gpio" + help + Tool to help debug / hack at the BCM283x GPIO. You can dump + the state of a GPIO or (all GPIOs). You can change a GPIO + mode and pulls (and level if set as an output). + + Beware this tool writes directly to the BCM283x GPIO + registers, ignoring anything else that may be using them + (like Linux drivers). + + https://github.com/RPi-Distro/raspi-gpio diff --git a/buildroot/package/raspi-gpio/raspi-gpio.hash b/buildroot/package/raspi-gpio/raspi-gpio.hash new file mode 100644 index 000000000..41d885f31 --- /dev/null +++ b/buildroot/package/raspi-gpio/raspi-gpio.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 2526dcec1e5a171b13c44b1fb6f2faed5ec849f08021278e2be09bc18264a2fd raspi-gpio-4edfde183ff3ac9ed66cdc015ae25e45f3a5502d.tar.gz +sha256 6e02227e1fb942687163996678d94add7911890c50025912d0ae7ee66d256bb2 LICENSE diff --git a/buildroot/package/raspi-gpio/raspi-gpio.mk b/buildroot/package/raspi-gpio/raspi-gpio.mk new file mode 100644 index 000000000..d12410821 --- /dev/null +++ b/buildroot/package/raspi-gpio/raspi-gpio.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# raspi-gpio +# +################################################################################ + +RASPI_GPIO_VERSION = 4edfde183ff3ac9ed66cdc015ae25e45f3a5502d +RASPI_GPIO_SITE = $(call github,RPi-Distro,raspi-gpio,$(RASPI_GPIO_VERSION)) +RASPI_GPIO_LICENSE = BSD-3-Clause +RASPI_GPIO_LICENSE_FILES = LICENSE + +$(eval $(autotools-package)) diff --git a/buildroot/package/ratpoison/ratpoison.hash b/buildroot/package/ratpoison/ratpoison.hash index 44781b07a..d003fadff 100644 --- a/buildroot/package/ratpoison/ratpoison.hash +++ b/buildroot/package/ratpoison/ratpoison.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 d98fa4be025ecca453c407ff311ab3949f29f20d6d8abedf8f0716b85fc8d1f1 ratpoison-1.4.9.tar.xz +sha256 d98fa4be025ecca453c407ff311ab3949f29f20d6d8abedf8f0716b85fc8d1f1 ratpoison-1.4.9.tar.xz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/rauc/Config.in b/buildroot/package/rauc/Config.in index 5091dc72a..676ff42b5 100644 --- a/buildroot/package/rauc/Config.in +++ b/buildroot/package/rauc/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_RAUC depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_DBUS # run-time dependency + select BR2_PACKAGE_DBUS select BR2_PACKAGE_SQUASHFS # run-time dependency select BR2_PACKAGE_UBOOT_TOOLS if BR2_TARGET_UBOOT # run-time dependency select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV if BR2_TARGET_UBOOT diff --git a/buildroot/package/rauc/rauc.hash b/buildroot/package/rauc/rauc.hash index 54c6c9322..54760347c 100644 --- a/buildroot/package/rauc/rauc.hash +++ b/buildroot/package/rauc/rauc.hash @@ -1,3 +1,4 @@ # Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v0.4/rauc-0.4.tar.xz.asc -sha256 8875ab0d02b4cb38a211b236855361c18b874b385e6f18dde394ac699f2cf2aa rauc-1.0.tar.xz +# https://github.com/rauc/rauc/releases/download/v1.2/rauc-1.2.tar.xz.asc +sha256 224683fc1fac50ccb89128aa786445cd8e26bb25deafd4410e0807187376e661 rauc-1.2.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/rauc/rauc.mk b/buildroot/package/rauc/rauc.mk index 3848a010b..5a208e07a 100644 --- a/buildroot/package/rauc/rauc.mk +++ b/buildroot/package/rauc/rauc.mk @@ -4,11 +4,12 @@ # ################################################################################ -RAUC_VERSION = 1.0 +RAUC_VERSION = 1.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 -RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 +RAUC_LICENSE_FILES = COPYING +RAUC_DEPENDENCIES = host-pkgconf openssl libglib2 dbus ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y) RAUC_CONF_OPTS += --enable-network @@ -29,8 +30,23 @@ ifeq ($(BR2_PACKAGE_SYSTEMD),y) RAUC_DEPENDENCIES += systemd endif -HOST_RAUC_DEPENDENCIES = host-pkgconf host-openssl host-libglib2 host-squashfs -HOST_RAUC_CONF_OPTS += --disable-network --disable-json --disable-service +define RAUC_INSTALL_INIT_SYSTEMD + mkdir $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d + printf '[Install]\nWantedBy=multi-user.target\n' \ + >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf +endef + +HOST_RAUC_DEPENDENCIES = \ + host-pkgconf \ + host-openssl \ + host-libglib2 \ + host-squashfs \ + $(if $(BR2_PACKAGE_HOST_LIBP11),host-libp11) +HOST_RAUC_CONF_OPTS += \ + --disable-network \ + --disable-json \ + --disable-service \ + --without-dbuspolicydir $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/rcw/Config.in.host b/buildroot/package/rcw/Config.in.host index ba40f76de..a9253958d 100644 --- a/buildroot/package/rcw/Config.in.host +++ b/buildroot/package/rcw/Config.in.host @@ -10,3 +10,19 @@ config BR2_PACKAGE_HOST_RCW then use this toolset and examples. https://source.codeaurora.org/external/qoriq/qoriq-components/rcw/ + +if BR2_PACKAGE_HOST_RCW + +config BR2_PACKAGE_HOST_RCW_CUSTOM_PATH + string "RCW Source file paths" + help + Space-separated list of .rcw and .rcwi files, that will be + used to generate a RCW binary. The entire list of .rcwi files + used by the .rcw file must be specified. There must be a + single .rcw file in the list. + + This is optional. If left empty, the rcw package will be + included for use in the SDK or with post scripts but no + RCW binary will not be generated. + +endif diff --git a/buildroot/package/rcw/rcw.mk b/buildroot/package/rcw/rcw.mk index f4570b9bd..dbfeae7b2 100644 --- a/buildroot/package/rcw/rcw.mk +++ b/buildroot/package/rcw/rcw.mk @@ -10,11 +10,53 @@ RCW_SITE_METHOD = git RCW_LICENSE = BSD-3-Clause RCW_LICENSE_FILES = LICENSE +HOST_RCW_DEPENDENCIES = host-python + +RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_RCW_CUSTOM_PATH)) + +ifneq ($(RCW_FILES),) +RCW_INCLUDES = $(filter-out %.rcw,$(RCW_FILES)) +# Get the name of the custom rcw file from the custom list +RCW_PROJECT = $(notdir $(filter %.rcw,$(RCW_FILES))) + +# Error if there are no or more than one .rcw file +ifeq ($(BR_BUILDING),y) +ifneq ($(words $(RCW_PROJECT)),1) +$(error BR2_PACKAGE_HOST_RCW_CUSTOM_PATH must have exactly one .rcw file) +endif +endif + +ifneq ($(RCW_INCLUDES),) +define HOST_RCW_ADD_CUSTOM_RCW_INCLUDES + mkdir -p $(@D)/custom_board + cp -f $(RCW_INCLUDES) $(@D)/custom_board +endef +HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_INCLUDES +endif + +define HOST_RCW_ADD_CUSTOM_RCW_FILES + mkdir -p $(@D)/custom_board/rcw + cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw +endef +HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES + +define HOST_RCW_BUILD_CMDS + $(HOST_DIR)/bin/python $(@D)/rcw.py \ + -i $(@D)/custom_board/rcw/$(RCW_PROJECT) \ + -I $(@D)/custom_board -o $(@D)/PBL.bin +endef + +define HOST_RCW_INSTALL_DELIVERY_FILE + $(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin +endef +endif + # Copy source files and script into $(HOST_DIR)/share/rcw/ so a developer # could use a post image or SDK to build/install PBL files. define HOST_RCW_INSTALL_CMDS mkdir -p $(HOST_DIR)/share/rcw cp -a $(@D)/* $(HOST_DIR)/share/rcw + $(HOST_RCW_INSTALL_DELIVERY_FILE) endef $(eval $(host-generic-package)) diff --git a/buildroot/package/rdesktop/rdesktop.hash b/buildroot/package/rdesktop/rdesktop.hash index a43fab76f..d42ab59be 100644 --- a/buildroot/package/rdesktop/rdesktop.hash +++ b/buildroot/package/rdesktop/rdesktop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 516f04df92f16eba04c96bbf9aeb05b9da686689c2bb5c107e0941583e09f933 rdesktop-1.8.4.tar.gz -sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING +sha256 ffb9f8e2f0b7a06e383e550698bdc9734ae33eb3ec971b0a094078434a4bba6d rdesktop-1.8.6.tar.gz +sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/buildroot/package/rdesktop/rdesktop.mk b/buildroot/package/rdesktop/rdesktop.mk index d97422cf1..f40521d2b 100644 --- a/buildroot/package/rdesktop/rdesktop.mk +++ b/buildroot/package/rdesktop/rdesktop.mk @@ -4,12 +4,13 @@ # ################################################################################ -RDESKTOP_VERSION = 1.8.4 +RDESKTOP_VERSION = 1.8.6 RDESKTOP_SITE = $(call github,rdesktop,rdesktop,v$(RDESKTOP_VERSION)) RDESKTOP_DEPENDENCIES = host-pkgconf openssl xlib_libX11 xlib_libXt \ $(if $(BR2_PACKAGE_ALSA_LIB_PCM),alsa-lib) \ $(if $(BR2_PACKAGE_LIBAO),libao) \ - $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) + $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \ + $(if $(BR2_PACKAGE_XLIB_LIBXRANDR),xlib_libXrandr) RDESKTOP_CONF_OPTS = --with-openssl=$(STAGING_DIR)/usr --disable-credssp RDESKTOP_LICENSE = GPL-3.0+ RDESKTOP_LICENSE_FILES = COPYING diff --git a/buildroot/package/read-edid/read-edid.hash b/buildroot/package/read-edid/read-edid.hash index 30052171e..d09110949 100644 --- a/buildroot/package/read-edid/read-edid.hash +++ b/buildroot/package/read-edid/read-edid.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f read-edid-3.0.2.tar.gz +sha256 c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f read-edid-3.0.2.tar.gz +sha256 1f8e8a59865d73076ab0a015330bc5bde7332384281260093878a3c366b778b7 LICENSE diff --git a/buildroot/package/reaver/reaver.hash b/buildroot/package/reaver/reaver.hash index 6d2baccdc..fad81fe32 100644 --- a/buildroot/package/reaver/reaver.hash +++ b/buildroot/package/reaver/reaver.hash @@ -1,3 +1,3 @@ # locally computed -sha256 350a89b068f8b461e6459b739d4f5f301db01f115d75f4d698a1f2830149c412 reaver-9bae55bd30b6d46b42da3a09dc23c8b0f9341996.tar.gz +sha256 e6761d2d4ef9cb2b45fe0a60d6b94048ce4442e4ac209904fe89506ff1e94c44 reaver-1.6.5.tar.gz sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE diff --git a/buildroot/package/reaver/reaver.mk b/buildroot/package/reaver/reaver.mk index d9a621a84..093ac935a 100644 --- a/buildroot/package/reaver/reaver.mk +++ b/buildroot/package/reaver/reaver.mk @@ -5,9 +5,9 @@ ################################################################################ # Older repos for this project will not cross-compile easily -# while this one works right away -REAVER_VERSION = 9bae55bd30b6d46b42da3a09dc23c8b0f9341996 -REAVER_SITE = $(call github,t6x,reaver-wps-fork-t6x,$(REAVER_VERSION)) +# while this one works right away +REAVER_VERSION = 1.6.5 +REAVER_SITE = $(call github,t6x,reaver-wps-fork-t6x,v$(REAVER_VERSION)) REAVER_LICENSE = GPL-2.0+ REAVER_LICENSE_FILES = docs/LICENSE diff --git a/buildroot/package/redis/0001-uclibc.patch b/buildroot/package/redis/0001-uclibc.patch index a0534d574..3329a60ed 100644 --- a/buildroot/package/redis/0001-uclibc.patch +++ b/buildroot/package/redis/0001-uclibc.patch @@ -8,6 +8,8 @@ against uclibc. Patch originates from: Signed-off-by: Daniel Price [Martin: adapt to 3.0.3] Signed-off-by: Martin Bark +[Titouan: adapt to 5.0.4] +Signed-off-by: Titouan Christophe ========================================================================= diff -ur old/src/config.h new/src/config.h @@ -17,7 +19,8 @@ diff -ur old/src/config.h new/src/config.h #endif /* Test for backtrace() */ --#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) -+#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__) && !defined(__UCLIBC__)) +-#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || \ ++#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__) && !defined(__UCLIBC__)) || \ + defined(__FreeBSD__) || (defined(__OpenBSD__) && defined(USE_BACKTRACE))\ + || defined(__DragonFly__) #define HAVE_BACKTRACE 1 - #endif diff --git a/buildroot/package/redis/redis.hash b/buildroot/package/redis/redis.hash index 59c16e12e..ee15b75e0 100644 --- a/buildroot/package/redis/redis.hash +++ b/buildroot/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/antirez/redis-hashes/blob/master/README -sha256 1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a087587e93a7 redis-4.0.14.tar.gz +sha256 f3c7eac42f433326a8d981b50dba0169fdfaf46abb23fcda2f933a7552ee4ed7 redis-5.0.8.tar.gz # Locally calculated sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063 COPYING diff --git a/buildroot/package/redis/redis.mk b/buildroot/package/redis/redis.mk index 783f2c5c4..d3954d87c 100644 --- a/buildroot/package/redis/redis.mk +++ b/buildroot/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 4.0.14 +REDIS_VERSION = 5.0.8 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING @@ -49,9 +49,6 @@ endef define REDIS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/redis/redis.service \ $(TARGET_DIR)/usr/lib/systemd/system/redis.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/redis.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/redis.service endef $(eval $(generic-package)) diff --git a/buildroot/package/refpolicy/Config.in b/buildroot/package/refpolicy/Config.in index 954dc3a09..b50b2f09f 100644 --- a/buildroot/package/refpolicy/Config.in +++ b/buildroot/package/refpolicy/Config.in @@ -1,12 +1,10 @@ config BR2_PACKAGE_REFPOLICY bool "refpolicy" - depends on BR2_TOOLCHAIN_HAS_THREADS # policycoreutils - depends on BR2_TOOLCHAIN_USES_GLIBC # policycoreutils - depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # policycoreutils - depends on !BR2_STATIC_LIBS # policycoreutils - depends on !BR2_arc # policycoreutils - select BR2_PACKAGE_POLICYCOREUTILS - select BR2_PACKAGE_BUSYBOX_SELINUX if BR2_PACKAGE_BUSYBOX + depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol + # Even though libsepol is not necessary for building, we get + # the policy version from libsepol, so we select it, and treat + # it like a runtime dependency. + select BR2_PACKAGE_LIBSEPOL help The SELinux Reference Policy project (refpolicy) is a complete SELinux policy that can be used as the system @@ -28,18 +26,8 @@ config BR2_PACKAGE_REFPOLICY https://github.com/TresysTechnology/refpolicy -comment "refpolicy needs a glibc toolchain w/ threads, dynamic library" - depends on !BR2_arc - depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_USES_GLIBC - if BR2_PACKAGE_REFPOLICY -config BR2_PACKAGE_REFPOLICY_POLICY_VERSION - string "Policy version" - default "30" - choice prompt "SELinux default state" default BR2_PACKAGE_REFPOLICY_POLICY_STATE_PERMISSIVE @@ -67,3 +55,6 @@ config BR2_PACKAGE_REFPOLICY_POLICY_STATE default "disabled" if BR2_PACKAGE_REFPOLICY_POLICY_STATE_DISABLED endif + +comment "refpolicy needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/refpolicy/refpolicy.hash b/buildroot/package/refpolicy/refpolicy.hash index f341566f2..0c77b626c 100644 --- a/buildroot/package/refpolicy/refpolicy.hash +++ b/buildroot/package/refpolicy/refpolicy.hash @@ -1,5 +1,5 @@ -# From https://github.com/TresysTechnology/refpolicy/wiki/DownloadRelease -sha256 e826f7d7f899a548e538964487e9fc1bc67ca94756ebdce0bfb6532b4eb0d06b refpolicy-2.20180114.tar.bz2 +# From https://github.com/SELinuxProject/refpolicy/releases +sha256 67bd1213e9d014ada15512028bb7f35ef6610c2d209cc5117b8577474aa6147f refpolicy-2.20190609.tar.bz2 # Locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/refpolicy/refpolicy.mk b/buildroot/package/refpolicy/refpolicy.mk index 590e0ebd9..1a5fefff0 100644 --- a/buildroot/package/refpolicy/refpolicy.mk +++ b/buildroot/package/refpolicy/refpolicy.mk @@ -4,9 +4,9 @@ # ################################################################################ -REFPOLICY_VERSION = 2.20180114 +REFPOLICY_VERSION = 2.20190609 REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 -REFPOLICY_SITE = https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files +REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190609 REFPOLICY_LICENSE = GPL-2.0 REFPOLICY_LICENSE_FILES = COPYING REFPOLICY_INSTALL_STAGING = YES @@ -14,24 +14,18 @@ REFPOLICY_DEPENDENCIES = \ host-m4 \ host-checkpolicy \ host-policycoreutils \ + host-python3 \ host-setools \ - host-gawk \ - policycoreutils - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -REFPOLICY_DEPENDENCIES += host-python3 -else -REFPOLICY_DEPENDENCIES += host-python -endif + host-gawk # Cannot use multiple threads to build the reference policy REFPOLICY_MAKE = \ + PYTHON=$(HOST_DIR)/usr/bin/python3 \ TEST_TOOLCHAIN=$(HOST_DIR) \ $(TARGET_MAKE_ENV) \ $(MAKE1) -REFPOLICY_POLICY_VERSION = \ - $(call qstrip,$(BR2_PACKAGE_REFPOLICY_POLICY_VERSION)) +REFPOLICY_POLICY_VERSION = $(BR2_PACKAGE_LIBSEPOL_POLICY_VERSION) REFPOLICY_POLICY_STATE = \ $(call qstrip,$(BR2_PACKAGE_REFPOLICY_POLICY_STATE)) diff --git a/buildroot/package/restclient-cpp/Config.in b/buildroot/package/restclient-cpp/Config.in new file mode 100644 index 000000000..9bf224082 --- /dev/null +++ b/buildroot/package/restclient-cpp/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_RESTCLIENT_CPP + bool "restclient-cpp" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + select BR2_PACKAGE_LIBCURL + help + restclient-cpp is a C++ client library for + making HTTP/REST requests + + http://code.mrtazz.com/restclient-cpp/ + +comment "restclient-cpp needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/buildroot/package/restclient-cpp/restclient-cpp.hash b/buildroot/package/restclient-cpp/restclient-cpp.hash new file mode 100644 index 000000000..428ec51f5 --- /dev/null +++ b/buildroot/package/restclient-cpp/restclient-cpp.hash @@ -0,0 +1,3 @@ +# Computed locally +sha256 6ae98c65333214d13d765d8fde04ec696f88ce349a419df0fbfc4564bc779df3 restclient-cpp-0.5.1.tar.gz +sha256 1c2f79e825a39eb61d8919044776627f4d079ff38975410a3bde340154fc94a4 LICENSE diff --git a/buildroot/package/restclient-cpp/restclient-cpp.mk b/buildroot/package/restclient-cpp/restclient-cpp.mk new file mode 100644 index 000000000..939333309 --- /dev/null +++ b/buildroot/package/restclient-cpp/restclient-cpp.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# restclient-cpp +# +################################################################################ + +RESTCLIENT_CPP_VERSION = 0.5.1 +RESTCLIENT_CPP_SITE = $(call github,mrtazz,restclient-cpp,$(RESTCLIENT_CPP_VERSION)) +RESTCLIENT_CPP_LICENSE = MIT +RESTCLIENT_CPP_LICENSE_FILES = LICENSE +RESTCLIENT_CPP_INSTALL_STAGING = YES + +# Source from github, no configure script provided +RESTCLIENT_CPP_AUTORECONF = YES + +RESTCLIENT_CPP_DEPENDENCIES = libcurl + +$(eval $(autotools-package)) diff --git a/buildroot/package/restorecond/Config.in b/buildroot/package/restorecond/Config.in index 54a5545a1..31f85f288 100644 --- a/buildroot/package/restorecond/Config.in +++ b/buildroot/package/restorecond/Config.in @@ -1,11 +1,9 @@ config BR2_PACKAGE_RESTORECOND bool "restorecond" - depends on !BR2_arc depends on BR2_USE_MMU # libglib2 depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on !BR2_STATIC_LIBS # libselinux - depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_LIBGLIB2 @@ -19,6 +17,5 @@ config BR2_PACKAGE_RESTORECOND comment "restorecond needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_arc depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_USES_GLIBC + BR2_STATIC_LIBS diff --git a/buildroot/package/restorecond/restorecond.hash b/buildroot/package/restorecond/restorecond.hash index d171c5052..7a82bda37 100644 --- a/buildroot/package/restorecond/restorecond.hash +++ b/buildroot/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 323cab1128e5308cd85fea0e5c98e3c8973e1ada0b659f2fce76187e192271bf restorecond-2.8.tar.gz +sha256 cbf9820583e641ee0462fa7bc89e6024676af281e025703e17b2d019b1a25a4f restorecond-2.9.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/restorecond/restorecond.mk b/buildroot/package/restorecond/restorecond.mk index 7e43d9c8d..c519b5de2 100644 --- a/buildroot/package/restorecond/restorecond.mk +++ b/buildroot/package/restorecond/restorecond.mk @@ -4,8 +4,8 @@ # ################################################################################ -RESTORECOND_VERSION = 2.8 -RESTORECOND_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524 +RESTORECOND_VERSION = 2.9 +RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = COPYING diff --git a/buildroot/package/riemann-c-client/Config.in b/buildroot/package/riemann-c-client/Config.in index c241487c7..e9982b2fb 100644 --- a/buildroot/package/riemann-c-client/Config.in +++ b/buildroot/package/riemann-c-client/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT depends on BR2_INSTALL_LIBSTDCPP # protobuf-c depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c - depends on BR2_HOST_GCC_AT_LEAST_4_8 # protobuf-c select BR2_PACKAGE_PROTOBUF_C help Riemann-c-client is a C client library for the Riemann @@ -13,7 +12,6 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT https://github.com/algernon/riemann-c-client -comment "riemann-c-client needs a toolchain w/ C++, threads, host gcc >= 4.8" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_HOST_GCC_AT_LEAST_4_8 +comment "riemann-c-client needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" diff --git a/buildroot/package/riemann-c-client/riemann-c-client.hash b/buildroot/package/riemann-c-client/riemann-c-client.hash index 090288156..6d4d634d7 100644 --- a/buildroot/package/riemann-c-client/riemann-c-client.hash +++ b/buildroot/package/riemann-c-client/riemann-c-client.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 4b18804f489834fa953f4af887290173c745b471a5993bb108a9142c867de457 riemann-c-client-1.9.1.tar.xz +sha256 334874f0b9a507a8abbc7138df719cba4f28f12c02c39d5e55090b8edb86f9d2 riemann-c-client-1.10.4.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE diff --git a/buildroot/package/riemann-c-client/riemann-c-client.mk b/buildroot/package/riemann-c-client/riemann-c-client.mk index b051145f4..6fbb3caf5 100644 --- a/buildroot/package/riemann-c-client/riemann-c-client.mk +++ b/buildroot/package/riemann-c-client/riemann-c-client.mk @@ -4,13 +4,15 @@ # ################################################################################ -RIEMANN_C_CLIENT_VERSION = 1.9.1 -RIEMANN_C_CLIENT_SOURCE = riemann-c-client-$(RIEMANN_C_CLIENT_VERSION).tar.xz -RIEMANN_C_CLIENT_SITE = https://github.com/algernon/riemann-c-client/releases/download/riemann-c-client-$(RIEMANN_C_CLIENT_VERSION) +RIEMANN_C_CLIENT_VERSION = 1.10.4 +RIEMANN_C_CLIENT_SITE = \ + $(call github,algernon,riemann-c-client,riemann-c-client-$(RIEMANN_C_CLIENT_VERSION)) RIEMANN_C_CLIENT_LICENSE = LGPL-3.0+ RIEMANN_C_CLIENT_LICENSE_FILES = LICENSE RIEMANN_C_CLIENT_INSTALL_STAGING = YES RIEMANN_C_CLIENT_MAKE = $(MAKE1) +# From git +RIEMANN_C_CLIENT_AUTORECONF = YES RIEMANN_C_CLIENT_DEPENDENCIES = \ host-pkgconf protobuf-c \ $(if $(BR2_PACKAGE_GNUTLS),gnutls) \ diff --git a/buildroot/package/ripgrep/Config.in b/buildroot/package/ripgrep/Config.in new file mode 100644 index 000000000..5446ad046 --- /dev/null +++ b/buildroot/package/ripgrep/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_RIPGREP + bool "ripgrep" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_CARGO + help + ripgrep is a line-oriented search tool that + recursively searches your current directory + for a regex pattern while respecting your gitignore + rules. + + ripgrep is similar to other popular search tools like + The Silver Searcher, ack and grep. + + https://github.com/BurntSushi/ripgrep diff --git a/buildroot/package/ripgrep/ripgrep.hash b/buildroot/package/ripgrep/ripgrep.hash new file mode 100644 index 000000000..0841c0185 --- /dev/null +++ b/buildroot/package/ripgrep/ripgrep.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7035379fce0c1e32552e8ee528b92c3d01b8d3935ea31d26c51a73287be74bb3 ripgrep-0.8.1.tar.gz +sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT diff --git a/buildroot/package/ripgrep/ripgrep.mk b/buildroot/package/ripgrep/ripgrep.mk new file mode 100644 index 000000000..0bb7017a9 --- /dev/null +++ b/buildroot/package/ripgrep/ripgrep.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# ripgrep +# +################################################################################ + +RIPGREP_VERSION = 0.8.1 +RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) +RIPGREP_LICENSE = MIT +RIPGREP_LICENSE_FILES = LICENSE-MIT + +RIPGREP_DEPENDENCIES = host-cargo +RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo +RIPGREP_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release) + +RIPGREP_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(RIPGREP_CARGO_MODE) + +RIPGREP_CARGO_OPTS = \ + --$(RIPGREP_CARGO_MODE) \ + --target=$(RUSTC_TARGET_NAME) \ + --manifest-path=$(@D)/Cargo.toml + +define RIPGREP_BUILD_CMDS + $(TARGET_MAKE_ENV) $(RIPGREP_CARGO_ENV) \ + cargo build $(RIPGREP_CARGO_OPTS) +endef + +define RIPGREP_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/$(RIPGREP_BIN_DIR)/rg \ + $(TARGET_DIR)/usr/bin/rg +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/rng-tools/0001-rngd-exit-code.patch b/buildroot/package/rng-tools/0001-rngd-exit-code.patch deleted file mode 100644 index 709e20c70..000000000 --- a/buildroot/package/rng-tools/0001-rngd-exit-code.patch +++ /dev/null @@ -1,22 +0,0 @@ -Exit with a special value when RNG modules are not available - -Instead of returning with an error, exit with a special value when the -RNG kernel modules are not present in the kernel. This is not really a -hard failure. - -Patch borrowed from Fedora, at -http://pkgs.fedoraproject.org/cgit/rng-tools.git/tree/rngd-exit-code.patch. - -Signed-off-by: Maxim Mikityanskiy - ---- a/rngd.c -+++ b/rngd.c -@@ -319,7 +319,7 @@ int main(int argc, char **argv) - message(LOG_DAEMON|LOG_ERR, - "Maybe RNG device modules are not loaded\n"); - } -- return 1; -+ return 66; - } - - if (arguments->verbose) { diff --git a/buildroot/package/rng-tools/Config.in b/buildroot/package/rng-tools/Config.in index b00477d33..71514260e 100644 --- a/buildroot/package/rng-tools/Config.in +++ b/buildroot/package/rng-tools/Config.in @@ -1,10 +1,17 @@ config BR2_PACKAGE_RNG_TOOLS bool "rng-tools" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS || !(BR2_i386 || BR2_x86_64) # libgcrypt + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS || !(BR2_i386 || BR2_x86_64 || BR2_powerpc64le) # libgcrypt + # pthread_setaffinity_np + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - # For rdrand ligcrypt is required and it's not obvious to users - select BR2_PACKAGE_LIBGCRYPT if BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_JITTERENTROPY_LIBRARY + # For rdrand & darn ligcrypt is required and it's not obvious to users + select BR2_PACKAGE_LIBGCRYPT if BR2_i386 || BR2_x86_64 || BR2_powerpc64le + select BR2_PACKAGE_LIBSYSFS help Daemon to use hardware random number generators. http://sourceforge.net/projects/gkernel/ + +comment "rng-tools needs a toolchain w/ NPTL" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/buildroot/package/rng-tools/rng-tools.hash b/buildroot/package/rng-tools/rng-tools.hash index 09769e462..b5194523e 100644 --- a/buildroot/package/rng-tools/rng-tools.hash +++ b/buildroot/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ -# From http://sourceforge.net/projects/gkernel/files/rng-tools/5/ -md5 6726cdc6fae1f5122463f24ae980dd68 rng-tools-5.tar.gz -sha1 3092768ac45315a5dcc0170d05566d1d00dbad96 rng-tools-5.tar.gz +# Locally computed +sha256 a57a7f51a2e3c0faa8afb979709a4c0cbea36d0b52fd835b104f8fb4fd1fa610 rng-tools-6.9.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/rng-tools/rng-tools.mk b/buildroot/package/rng-tools/rng-tools.mk index bbb1a64c1..5338e9559 100644 --- a/buildroot/package/rng-tools/rng-tools.mk +++ b/buildroot/package/rng-tools/rng-tools.mk @@ -4,10 +4,17 @@ # ################################################################################ -RNG_TOOLS_VERSION = 5 -RNG_TOOLS_SITE = http://downloads.sourceforge.net/project/gkernel/rng-tools/$(RNG_TOOLS_VERSION) +RNG_TOOLS_VERSION = 6.9 +RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING +RNG_TOOLS_DEPENDENCIES = libsysfs jitterentropy-library host-pkgconf +# From git +RNG_TOOLS_AUTORECONF = YES + +RNG_TOOLS_CONF_OPTS = \ + --without-nistbeacon \ + --without-pkcs11 # Work around for uClibc or musl toolchains which lack argp_*() # functions. @@ -30,9 +37,6 @@ endef define RNG_TOOLS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/rng-tools/rngd.service \ $(TARGET_DIR)/usr/lib/systemd/system/rngd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/rngd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rngd.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/rng-tools/rngd.service b/buildroot/package/rng-tools/rngd.service index c0bcffe59..11386d1e5 100644 --- a/buildroot/package/rng-tools/rngd.service +++ b/buildroot/package/rng-tools/rngd.service @@ -3,7 +3,6 @@ Description=Hardware RNG Entropy Gatherer Daemon [Service] ExecStart=/usr/sbin/rngd -f $DAEMON_ARGS -SuccessExitStatus=66 EnvironmentFile=-/etc/default/rngd [Install] diff --git a/buildroot/package/rocksdb/0001-Check-for-sys-auxv.h.patch b/buildroot/package/rocksdb/0001-Check-for-sys-auxv.h.patch new file mode 100644 index 000000000..eccd27919 --- /dev/null +++ b/buildroot/package/rocksdb/0001-Check-for-sys-auxv.h.patch @@ -0,0 +1,111 @@ +From ad4cb0403c58430bf34a15e72f2edcf0f4317977 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 1 Feb 2020 23:38:11 +0100 +Subject: [PATCH] Check for sys/auxv.h + +Check for sys/auxv.h and getauxval before using them as they are not +always available (for example on uclibc) + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/facebook/rocksdb/pull/6359] +--- + CMakeLists.txt | 5 +++++ + build_tools/build_detect_platform | 14 ++++++++++++++ + util/crc32c.cc | 4 +++- + util/crc32c_arm64.cc | 6 ++++++ + 4 files changed, 28 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 017fe8675..32fc5cb30 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -481,6 +481,11 @@ if(HAVE_SCHED_GETCPU) + add_definitions(-DROCKSDB_SCHED_GETCPU_PRESENT) + endif() + ++check_cxx_symbol_exists(getauxval auvx.h HAVE_AUXV_GETAUXVAL) ++if(HAVE_AUXV_GETAUXVAL) ++ add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT) ++endif() ++ + include_directories(${PROJECT_SOURCE_DIR}) + include_directories(${PROJECT_SOURCE_DIR}/include) + include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third-party/gtest-1.8.1/fused-src) +diff --git a/build_tools/build_detect_platform b/build_tools/build_detect_platform +index 36a013f6f..2535d8124 100755 +--- a/build_tools/build_detect_platform ++++ b/build_tools/build_detect_platform +@@ -506,6 +506,20 @@ EOF + fi + fi + ++ if ! test $ROCKSDB_DISABLE_AUXV_GETAUXVAL; then ++ # Test whether getauxval is supported ++ $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null < ++ int main() { ++ uint64_t auxv = getauxval(AT_HWCAP); ++ (void)auxv; ++ } ++EOF ++ if [ "$?" = 0 ]; then ++ COMMON_FLAGS="$COMMON_FLAGS -DROCKSDB_AUXV_GETAUXVAL_PRESENT" ++ fi ++ fi ++ + if ! test $ROCKSDB_DISABLE_ALIGNED_NEW; then + # Test whether c++17 aligned-new is supported + $CXX $PLATFORM_CXXFLAGS -faligned-new -x c++ - -o /dev/null 2>/dev/null < ++#endif + + #ifndef PPC_FEATURE2_VEC_CRYPTO + #define PPC_FEATURE2_VEC_CRYPTO 0x02000000 +@@ -451,7 +453,7 @@ uint32_t ExtendPPCImpl(uint32_t crc, const char *buf, size_t size) { + static int arch_ppc_probe(void) { + arch_ppc_crc32 = 0; + +-#if defined(__powerpc64__) ++#if defined(__powerpc64__) && defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) + if (getauxval(AT_HWCAP2) & PPC_FEATURE2_VEC_CRYPTO) arch_ppc_crc32 = 1; + #endif /* __powerpc64__ */ + +diff --git a/util/crc32c_arm64.cc b/util/crc32c_arm64.cc +index 591c623a5..61b2ccaba 100644 +--- a/util/crc32c_arm64.cc ++++ b/util/crc32c_arm64.cc +@@ -8,7 +8,9 @@ + #if defined(__linux__) && defined(HAVE_ARM64_CRC) + + #include ++#ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT + #include ++#endif + #ifndef HWCAP_CRC32 + #define HWCAP_CRC32 (1 << 7) + #endif +@@ -34,8 +36,12 @@ + #endif + + uint32_t crc32c_runtime_check(void) { ++#ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT + uint64_t auxv = getauxval(AT_HWCAP); + return (auxv & HWCAP_CRC32) != 0; ++#else ++ return 0; ++#endif + } + + uint32_t crc32c_arm64(uint32_t crc, unsigned char const *data, +-- +2.24.1 + diff --git a/buildroot/package/rocksdb/0002-build_tools-build_detect_platform-fix-C-tests.patch b/buildroot/package/rocksdb/0002-build_tools-build_detect_platform-fix-C-tests.patch new file mode 100644 index 000000000..0b1118a2b --- /dev/null +++ b/buildroot/package/rocksdb/0002-build_tools-build_detect_platform-fix-C-tests.patch @@ -0,0 +1,279 @@ +From 23739c6f9694d7fc436967439f170173dbb4c6b4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 24 Feb 2020 10:22:13 +0100 +Subject: [PATCH] build_tools/build_detect_platform: fix C++ tests + +Replace -o /dev/null by -o test.o when testing for C++ features such as +-faligned-new otherwise tests will fail with some bugged binutils +(https://sourceware.org/bugzilla/show_bug.cgi?id=19526): + +output/host/bin/xtensa-buildroot-linux-uclibc-g++ -faligned-new -x c++ - -o /dev/null < +--- + build_tools/build_detect_platform | 58 +++++++++++++++---------------- + 1 file changed, 29 insertions(+), 29 deletions(-) + +diff --git a/build_tools/build_detect_platform b/build_tools/build_detect_platform +index 2535d8124..64a0ae76c 100755 +--- a/build_tools/build_detect_platform ++++ b/build_tools/build_detect_platform +@@ -245,7 +245,7 @@ if [ "$CROSS_COMPILE" = "true" -o "$FBCODE_BUILD" = "true" ]; then + else + if ! test $ROCKSDB_DISABLE_FALLOCATE; then + # Test whether fallocate is available +- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < + #include + int main() { +@@ -261,7 +261,7 @@ EOF + if ! test $ROCKSDB_DISABLE_SNAPPY; then + # Test whether Snappy library is installed + # http://code.google.com/p/snappy/ +- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < + int main() {} + EOF +@@ -276,7 +276,7 @@ EOF + # Test whether gflags library is installed + # http://gflags.github.io/gflags/ + # check if the namespace is gflags +- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null << EOF ++ $CXX $CFLAGS -x c++ - -o test.o 2>/dev/null << EOF + #include + int main() {} + EOF +@@ -285,7 +285,7 @@ EOF + PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags" + else + # check if namespace is google +- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null << EOF ++ $CXX $CFLAGS -x c++ - -o test.o 2>/dev/null << EOF + #include + using namespace google; + int main() {} +@@ -299,7 +299,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_ZLIB; then + # Test whether zlib library is installed +- $CXX $CFLAGS $COMMON_FLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < + int main() {} + EOF +@@ -312,7 +312,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_BZIP; then + # Test whether bzip library is installed +- $CXX $CFLAGS $COMMON_FLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < + int main() {} + EOF +@@ -325,7 +325,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_LZ4; then + # Test whether lz4 library is installed +- $CXX $CFLAGS $COMMON_FLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < + #include + int main() {} +@@ -339,7 +339,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_ZSTD; then + # Test whether zstd library is installed +- $CXX $CFLAGS $COMMON_FLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < + int main() {} + EOF +@@ -352,7 +352,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_NUMA; then + # Test whether numa is available +- $CXX $CFLAGS -x c++ - -o /dev/null -lnuma 2>/dev/null </dev/null < + #include + int main() {} +@@ -366,7 +366,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_TBB; then + # Test whether tbb is available +- $CXX $CFLAGS $LDFLAGS -x c++ - -o /dev/null -ltbb 2>/dev/null </dev/null < + int main() {} + EOF +@@ -379,7 +379,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_JEMALLOC; then + # Test whether jemalloc is available +- if echo 'int main() {}' | $CXX $CFLAGS -x c++ - -o /dev/null -ljemalloc \ ++ if echo 'int main() {}' | $CXX $CFLAGS -x c++ - -o test.o -ljemalloc \ + 2>/dev/null; then + # This will enable some preprocessor identifiers in the Makefile + JEMALLOC=1 +@@ -400,7 +400,7 @@ EOF + fi + if ! test $JEMALLOC && ! test $ROCKSDB_DISABLE_TCMALLOC; then + # jemalloc is not available. Let's try tcmalloc +- if echo 'int main() {}' | $CXX $CFLAGS -x c++ - -o /dev/null \ ++ if echo 'int main() {}' | $CXX $CFLAGS -x c++ - -o test.o \ + -ltcmalloc 2>/dev/null; then + PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -ltcmalloc" + JAVA_LDFLAGS="$JAVA_LDFLAGS -ltcmalloc" +@@ -409,7 +409,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_MALLOC_USABLE_SIZE; then + # Test whether malloc_usable_size is available +- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < + int main() { + size_t res = malloc_usable_size(0); +@@ -424,7 +424,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_PTHREAD_MUTEX_ADAPTIVE_NP; then + # Test whether PTHREAD_MUTEX_ADAPTIVE_NP mutex type is available +- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < + int main() { + int x = PTHREAD_MUTEX_ADAPTIVE_NP; +@@ -439,7 +439,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_BACKTRACE; then + # Test whether backtrace is available +- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < + int main() { + void* frames[1]; +@@ -451,7 +451,7 @@ EOF + COMMON_FLAGS="$COMMON_FLAGS -DROCKSDB_BACKTRACE" + else + # Test whether execinfo library is installed +- $CXX $CFLAGS -lexecinfo -x c++ - -o /dev/null 2>/dev/null </dev/null < + int main() { + void* frames[1]; +@@ -468,7 +468,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_PG; then + # Test if -pg is supported +- $CXX $CFLAGS -pg -x c++ - -o /dev/null 2>/dev/null </dev/null </dev/null </dev/null < + int main() { + int fd = open("/dev/null", 0); +@@ -494,7 +494,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_SCHED_GETCPU; then + # Test whether sched_getcpu is supported +- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < + int main() { + int cpuid = sched_getcpu(); +@@ -508,7 +508,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_AUXV_GETAUXVAL; then + # Test whether getauxval is supported +- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < + int main() { + uint64_t auxv = getauxval(AT_HWCAP); +@@ -522,7 +522,7 @@ EOF + + if ! test $ROCKSDB_DISABLE_ALIGNED_NEW; then + # Test whether c++17 aligned-new is supported +- $CXX $PLATFORM_CXXFLAGS -faligned-new -x c++ - -o /dev/null 2>/dev/null </dev/null </dev/null </dev/null </dev/null </dev/null < + #include + int main() { +@@ -617,7 +617,7 @@ elif test "$USE_SSE"; then + echo "warning: USE_SSE specified but compiler could not use SSE intrinsics, disabling" >&2 + fi + +-$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_PCLMUL -x c++ - -o /dev/null 2>/dev/null </dev/null < + #include + int main() { +@@ -634,7 +634,7 @@ elif test "$USE_SSE"; then + echo "warning: USE_SSE specified but compiler could not use PCLMUL intrinsics, disabling" >&2 + fi + +-$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_AVX2 -x c++ - -o /dev/null 2>/dev/null </dev/null < + #include + int main() { +@@ -649,7 +649,7 @@ elif test "$USE_SSE"; then + echo "warning: USE_SSE specified but compiler could not use AVX2 intrinsics, disabling" >&2 + fi + +-$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < + int main() { + uint64_t a = 0xffffFFFFffffFFFF; +@@ -666,7 +666,7 @@ fi + # succeed because the cross-compiler flags are added by the Makefile, not this + # script. + if [ "$PLATFORM" != IOS ]; then +- $CXX $COMMON_FLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null </dev/null ++ $CXX $COMMON_FLAGS $PLATFORM_SHARED_LDFLAGS test_dl.o -o test.o 2>/dev/null + if [ "$?" = 0 ]; then + EXEC_LDFLAGS+="-ldl" + rm -f test_dl.o +-- +2.25.0 + diff --git a/buildroot/package/rocksdb/Config.in b/buildroot/package/rocksdb/Config.in new file mode 100644 index 000000000..c55170c1d --- /dev/null +++ b/buildroot/package/rocksdb/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_ROCKSDB + bool "rocksdb" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future + help + The RocksDB library provides a persistent key value store. + Keys and values are arbitrary byte arrays. The keys are + ordered within the key value store according to a + user-specified comparator function. + + The library is maintained by the Facebook Database Engineering + Team, and is based on LevelDB, by Sanjay Ghemawat and Jeff + Dean at Google. + + http://rocksdb.org + +comment "rocksdb needs a toolchain w/ C++, threads, wchar, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + +comment "rocksdb needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/rocksdb/rocksdb.hash b/buildroot/package/rocksdb/rocksdb.hash new file mode 100644 index 000000000..2e4071298 --- /dev/null +++ b/buildroot/package/rocksdb/rocksdb.hash @@ -0,0 +1,8 @@ +# Locally computed: +sha256 feab859ee355fbe7beffd7085904b63f560417f450f83cc34310e6dadff936f6 rocksdb-6.6.4.tar.gz + +# Hash for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.Apache +sha256 b568f1f37a5a1d37a3e981e7c8b7fc4856ca33b2ca0a45bc8e847aaaf7afe485 LICENSE.leveldb +sha256 112d88749baec5ddecba47057216465e91e22352aac7677c50bd237a27614083 README.md diff --git a/buildroot/package/rocksdb/rocksdb.mk b/buildroot/package/rocksdb/rocksdb.mk new file mode 100644 index 000000000..31a9f98b5 --- /dev/null +++ b/buildroot/package/rocksdb/rocksdb.mk @@ -0,0 +1,99 @@ +################################################################################ +# +# rocksdb +# +################################################################################ + +ROCKSDB_VERSION = 6.6.4 +ROCKSDB_SITE = $(call github,facebook,rocksdb,v$(ROCKSDB_VERSION)) +ROCKSDB_LICENSE = GPL-2.0 or Apache-2.0 +ROCKSDB_LICENSE_FILES = COPYING LICENSE.Apache LICENSE.leveldb README.md +ROCKSDB_INSTALL_STAGING = YES + +ROCKSDB_MAKE_OPTS = PORTABLE=1 + +# Internal error, aborting at dwarf2cfi.c:2802 in connect_traces +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 +ifeq ($(BR2_m68k_cf),y) +ROCKSDB_EXTRA_CXXFLAGS += -fno-defer-pop +endif + +ifeq ($(BR2_PACKAGE_BZIP2),y) +ROCKSDB_DEPENDENCIES += bzip2 +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_BZ2=0 +else +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_BZ2=1 +endif + +ifeq ($(BR2_PACKAGE_GFLAGS),y) +ROCKSDB_DEPENDENCIES += gflags +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_GFLAGS=0 +else +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_GFLAGS=1 +endif + +ifeq ($(BR2_PACKAGE_JEMALLOC),y) +ROCKSDB_DEPENDENCIES += jemalloc +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_JEMALLOC=0 +else +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_JEMALLOC=1 +endif + +ifeq ($(BR2_PACKAGE_LZ4),y) +ROCKSDB_DEPENDENCIES += lz4 +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_LZ4=0 +else +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_LZ4=1 +endif + +ifeq ($(BR2_PACKAGE_SNAPPY),y) +ROCKSDB_DEPENDENCIES += snappy +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_SNAPPY=0 +else +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_SNAPPY=1 +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +ROCKSDB_DEPENDENCIES += zlib +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_ZLIB=0 +else +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_ZLIB=1 +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +ROCKSDB_DEPENDENCIES += zstd +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_ZSTD=0 +else +ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_ZSTD=1 +endif + +ifeq ($(BR2_STATIC_LIBS),y) +ROCKSDB_BUILD_TARGETS += static_lib +ROCKSDB_INSTALL_TARGETS += install-static +ROCKSDB_EXTRA_CXXFLAGS += -DROCKSDB_NO_DYNAMIC_EXTENSION +else ifeq ($(BR2_SHARED_LIBS),y) +ROCKSDB_BUILD_TARGETS += shared_lib +ROCKSDB_INSTALL_TARGETS += install-shared +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ROCKSDB_BUILD_TARGETS += shared_lib static_lib +ROCKSDB_INSTALL_TARGETS += install-shared install-static +endif + +ROCKSDB_MAKE_OPTS += EXTRA_CXXFLAGS="$(ROCKSDB_EXTRA_CXXFLAGS)" + +define ROCKSDB_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ROCKSDB_MAKE_OPTS) -C $(@D) \ + $(ROCKSDB_BUILD_TARGETS) +endef + +define ROCKSDB_INSTALL_STAGING_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ROCKSDB_MAKE_OPTS) -C $(@D) \ + INSTALL_PATH=$(STAGING_DIR) $(ROCKSDB_INSTALL_TARGETS) +endef + +define ROCKSDB_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ROCKSDB_MAKE_OPTS) -C $(@D) \ + INSTALL_PATH=$(TARGET_DIR) $(ROCKSDB_INSTALL_TARGETS) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/rp-pppoe/rp-pppoe.hash b/buildroot/package/rp-pppoe/rp-pppoe.hash index 0cf85a089..3f7af6055 100644 --- a/buildroot/package/rp-pppoe/rp-pppoe.hash +++ b/buildroot/package/rp-pppoe/rp-pppoe.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2 rp-pppoe-3.12.tar.gz +sha256 00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2 rp-pppoe-3.12.tar.gz +# Locally computed +sha256 464006ba771074f4022db14f58a29a0b447b6fdde9529cf0331be396b6279162 doc/LICENSE diff --git a/buildroot/package/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch b/buildroot/package/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch deleted file mode 100644 index 6145514be..000000000 --- a/buildroot/package/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Mon, 2 Nov 2015 17:05:18 -0500 -Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly - -In the latest libtirpc version to access the xp_auth -one must use the SVC_XP_AUTH macro. To be backwards -compatible a couple ifdefs were added to use the -macro when it exists. - -Signed-off-by: Steve Dickson -[peda@axentia.se: backport from upstream] -Signed-off-by: Peter Rosin ---- - src/rpcb_svc_com.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c -index 4ae93f1..22d6c84 100644 ---- a/src/rpcb_svc_com.c -+++ b/src/rpcb_svc_com.c -@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt) - a.rmt_localvers = fi->versnum; - - xprt_set_caller(xprt, fi); -+#if defined(SVC_XP_AUTH) -+ SVC_XP_AUTH(xprt) = svc_auth_none; -+#else - xprt->xp_auth = &svc_auth_none; -+#endif - svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a); -+#if !defined(SVC_XP_AUTH) - SVCAUTH_DESTROY(xprt->xp_auth); - xprt->xp_auth = NULL; -+#endif -+ - done: - if (buffer) - free(buffer); --- -2.5.3 - diff --git a/buildroot/package/rpcbind/0003-src-remove-use-of-the-__P-macro.patch b/buildroot/package/rpcbind/0003-src-remove-use-of-the-__P-macro.patch deleted file mode 100644 index 72fda880c..000000000 --- a/buildroot/package/rpcbind/0003-src-remove-use-of-the-__P-macro.patch +++ /dev/null @@ -1,243 +0,0 @@ -From 2f7d15304e0544e4c693c86d8ab8b2f08b9e9886 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 15 Aug 2016 16:36:40 +0200 -Subject: [PATCH] src: remove use of the __P() macro - -The __P() macro is a legacy compatibility macro aimed making pre-ANSI -(i.e. K&R) compilers that do not support function prototypes happy, -while still allowing such prototypes for ANSI-compliant compilers. - -Since virtually all compilers have been ANSI-compliant for a few decades -now, use of __P() is totally useless. - -Furthermore, __P() is defined in the non-standard sys/cdefs.h header. -This header is present in glibc and uClibc, and both have it included -from many of their headers. So, sys/cdefs.h is automagically included in -most cases and its macros are available. - -However, the musl C library does not provide this sys/cdefs.h header. -Thus, the build breaks on musl. - -For all the above reasons, get rid of __P() wherever it is used; just -always declare real function prototypes. - -Signed-off-by: "Yann E. MORIN" -Cc: Chuck Lever -Cc: Steve Dickson ---- - src/check_bound.c | 2 +- - src/pmap_svc.c | 10 +++++----- - src/rpcb_svc.c | 10 +++++----- - src/rpcb_svc_4.c | 14 ++++++-------- - src/rpcb_svc_com.c | 46 +++++++++++++++++++++++----------------------- - src/rpcbind.c | 12 ++++++------ - src/util.c | 2 +- - src/warmstart.c | 4 ++-- - 8 files changed, 49 insertions(+), 51 deletions(-) - -diff --git a/src/check_bound.c b/src/check_bound.c -index c70b845..92bfd36 100644 ---- a/src/check_bound.c -+++ b/src/check_bound.c -@@ -70,7 +70,7 @@ static struct fdlist *fdhead; /* Link list of the check fd's */ - static struct fdlist *fdtail; - static char *nullstring = ""; - --static bool_t check_bound __P((struct fdlist *, char *uaddr)); -+static bool_t check_bound(struct fdlist *, char *uaddr); - - /* - * Returns 1 if the given address is bound for the given addr & transport -diff --git a/src/pmap_svc.c b/src/pmap_svc.c -index ad28b93..4c744fe 100644 ---- a/src/pmap_svc.c -+++ b/src/pmap_svc.c -@@ -60,11 +60,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro"; - #include "rpcbind.h" - #include "xlog.h" - #include /* svc_getcaller routine definition */ --static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t, -- rpcprot_t)); --static bool_t pmapproc_change __P((struct svc_req *, SVCXPRT *, u_long)); --static bool_t pmapproc_getport __P((struct svc_req *, SVCXPRT *)); --static bool_t pmapproc_dump __P((struct svc_req *, SVCXPRT *)); -+static struct pmaplist *find_service_pmap(rpcprog_t, rpcvers_t, -+ rpcprot_t); -+static bool_t pmapproc_change(struct svc_req *, SVCXPRT *, u_long); -+static bool_t pmapproc_getport(struct svc_req *, SVCXPRT *); -+static bool_t pmapproc_dump(struct svc_req *, SVCXPRT *); - - /* - * Called for all the version 2 inquiries. -diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c -index bd92201..709e3fb 100644 ---- a/src/rpcb_svc.c -+++ b/src/rpcb_svc.c -@@ -53,10 +53,10 @@ - #include "rpcbind.h" - #include "xlog.h" - --static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *, -- rpcvers_t)); --static void *rpcbproc_dump_3_local __P((void *, struct svc_req *, SVCXPRT *, -- rpcvers_t)); -+static void *rpcbproc_getaddr_3_local(void *, struct svc_req *, SVCXPRT *, -+ rpcvers_t); -+static void *rpcbproc_dump_3_local(void *, struct svc_req *, SVCXPRT *, -+ rpcvers_t); - - /* - * Called by svc_getreqset. There is a separate server handle for -@@ -75,7 +75,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp) - } argument; - char *result; - xdrproc_t xdr_argument, xdr_result; -- void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); -+ void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t); - rpcprog_t setprog = 0; - - rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc); -diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c -index b673452..5094879 100644 ---- a/src/rpcb_svc_4.c -+++ b/src/rpcb_svc_4.c -@@ -54,13 +54,11 @@ - #include "rpcbind.h" - #include "xlog.h" - --static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, -- rpcvers_t)); --static void *rpcbproc_getversaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); --static void *rpcbproc_getaddrlist_4_local -- __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); --static void free_rpcb_entry_list __P((rpcb_entry_list_ptr *)); --static void *rpcbproc_dump_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); -+static void *rpcbproc_getaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); -+static void *rpcbproc_getversaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); -+static void *rpcbproc_getaddrlist_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); -+static void free_rpcb_entry_list(rpcb_entry_list_ptr *); -+static void *rpcbproc_dump_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); - - /* - * Called by svc_getreqset. There is a separate server handle for -@@ -78,7 +76,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp) - } argument; - char *result; - xdrproc_t xdr_argument, xdr_result; -- void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); -+ void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t); - rpcprog_t setprog = 0; - - rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc); -diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c -index 148fe42..5862c26 100644 ---- a/src/rpcb_svc_com.c -+++ b/src/rpcb_svc_com.c -@@ -100,29 +100,29 @@ struct finfo { - static struct finfo FINFO[NFORWARD]; - - --static bool_t xdr_encap_parms __P((XDR *, struct encap_parms *)); --static bool_t xdr_rmtcall_args __P((XDR *, struct r_rmtcall_args *)); --static bool_t xdr_rmtcall_result __P((XDR *, struct r_rmtcall_args *)); --static bool_t xdr_opaque_parms __P((XDR *, struct r_rmtcall_args *)); --static int find_rmtcallfd_by_netid __P((char *)); --static SVCXPRT *find_rmtcallxprt_by_fd __P((int)); --static int forward_register __P((u_int32_t, struct netbuf *, int, char *, -- rpcproc_t, rpcvers_t, u_int32_t *)); --static struct finfo *forward_find __P((u_int32_t)); --static int free_slot_by_xid __P((u_int32_t)); --static int free_slot_by_index __P((int)); --static int netbufcmp __P((struct netbuf *, struct netbuf *)); --static struct netbuf *netbufdup __P((struct netbuf *)); --static void netbuffree __P((struct netbuf *)); --static int check_rmtcalls __P((struct pollfd *, int)); --static void xprt_set_caller __P((SVCXPRT *, struct finfo *)); --static void send_svcsyserr __P((SVCXPRT *, struct finfo *)); --static void handle_reply __P((int, SVCXPRT *)); --static void find_versions __P((rpcprog_t, char *, rpcvers_t *, rpcvers_t *)); --static rpcblist_ptr find_service __P((rpcprog_t, rpcvers_t, char *)); --static char *getowner __P((SVCXPRT *, char *, size_t)); --static int add_pmaplist __P((RPCB *)); --static int del_pmaplist __P((RPCB *)); -+static bool_t xdr_encap_parms(XDR *, struct encap_parms *); -+static bool_t xdr_rmtcall_args(XDR *, struct r_rmtcall_args *); -+static bool_t xdr_rmtcall_result(XDR *, struct r_rmtcall_args *); -+static bool_t xdr_opaque_parms(XDR *, struct r_rmtcall_args *); -+static int find_rmtcallfd_by_netid(char *); -+static SVCXPRT *find_rmtcallxprt_by_fd(int); -+static int forward_register(u_int32_t, struct netbuf *, int, char *, -+ rpcproc_t, rpcvers_t, u_int32_t *); -+static struct finfo *forward_find(u_int32_t); -+static int free_slot_by_xid(u_int32_t); -+static int free_slot_by_index(int); -+static int netbufcmp(struct netbuf *, struct netbuf *); -+static struct netbuf *netbufdup(struct netbuf *); -+static void netbuffree(struct netbuf *); -+static int check_rmtcalls(struct pollfd *, int); -+static void xprt_set_caller(SVCXPRT *, struct finfo *); -+static void send_svcsyserr(SVCXPRT *, struct finfo *); -+static void handle_reply(int, SVCXPRT *); -+static void find_versions(rpcprog_t, char *, rpcvers_t *, rpcvers_t *); -+static rpcblist_ptr find_service(rpcprog_t, rpcvers_t, char *); -+static char *getowner(SVCXPRT *, char *, size_t); -+static int add_pmaplist(RPCB *); -+static int del_pmaplist(RPCB *); - - /* - * Set a mapping of program, version, netid -diff --git a/src/rpcbind.c b/src/rpcbind.c -index c4265cd..87ccdc2 100644 ---- a/src/rpcbind.c -+++ b/src/rpcbind.c -@@ -136,13 +136,13 @@ char *tcp_uaddr; /* Universal TCP address */ - static char servname[] = "rpcbind"; - static char superuser[] = "superuser"; - --int main __P((int, char *[])); -+int main(int, char *[]); - --static int init_transport __P((struct netconfig *)); --static void rbllist_add __P((rpcprog_t, rpcvers_t, struct netconfig *, -- struct netbuf *)); --static void terminate __P((int)); --static void parseargs __P((int, char *[])); -+static int init_transport(struct netconfig *); -+static void rbllist_add(rpcprog_t, rpcvers_t, struct netconfig *, -+ struct netbuf *); -+static void terminate(int); -+static void parseargs(int, char *[]); - - int - main(int argc, char *argv[]) -diff --git a/src/util.c b/src/util.c -index a6c835b..74b0284 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -70,7 +70,7 @@ static struct sockaddr_in *local_in4; - static struct sockaddr_in6 *local_in6; - #endif - --static int bitmaskcmp __P((void *, void *, void *, int)); -+static int bitmaskcmp(void *, void *, void *, int); - - /* - * For all bits set in "mask", compare the corresponding bits in -diff --git a/src/warmstart.c b/src/warmstart.c -index b6eb73e..122a058 100644 ---- a/src/warmstart.c -+++ b/src/warmstart.c -@@ -58,8 +58,8 @@ - #define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr" - #endif - --static bool_t write_struct __P((char *, xdrproc_t, void *)); --static bool_t read_struct __P((char *, xdrproc_t, void *)); -+static bool_t write_struct(char *, xdrproc_t, void *); -+static bool_t read_struct(char *, xdrproc_t, void *); - - static bool_t - write_struct(char *filename, xdrproc_t structproc, void *list) --- -2.7.4 - diff --git a/buildroot/package/rpcbind/0004-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch b/buildroot/package/rpcbind/0004-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch deleted file mode 100644 index 130e5d77c..000000000 --- a/buildroot/package/rpcbind/0004-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch +++ /dev/null @@ -1,231 +0,0 @@ -From 093bf65c79af417cffa09d6475f58923540eebcc Mon Sep 17 00:00:00 2001 -From: Doran Moppert -Date: Thu, 11 May 2017 11:42:54 -0400 -Subject: [PATCH] rpcbind: pair all svc_getargs() calls with svc_freeargs() to - avoid memory leak - -This patch is to address CVE-2017-8779 "rpcbomb" in rpcbind, discussed -at [1], [2], [3]. The last link suggests this issue is actually a bug -in rpcbind, which led me here. - -The leak caused by the reproducer at [4] appears to come from -rpcb_service_4(), in the case where svc_getargs() returns false and the -function had an early return, rather than passing through the cleanup -path at done:, as would otherwise occur. - -It also addresses a couple of other locations where the same fault seems -to exist, though I haven't been able to exercise those. I hope someone -more intimate with rpc(3) can confirm my understanding is correct, and -that I haven't introduced any new bugs. - -Without this patch, using the reproducer (and variants) repeatedly -against rpcbind with a numBytes argument of 1_000_000_000, /proc/$(pidof -rpcbind)/status reports VmSize increase of 976564 kB each call, and -VmRSS increase of around 260 kB every 33 calls - the specific numbers -are probably an artifact of my rhel/glibc version. With the patch, -there is a small (~50 kB) VmSize increase with the first message, but -thereafter both VmSize and VmRSS remain steady. - -[1]: http://seclists.org/oss-sec/2017/q2/209 -[2]: https://bugzilla.redhat.com/show_bug.cgi?id=1448124 -[3]: https://sourceware.org/ml/libc-alpha/2017-05/msg00129.html -[4]: https://github.com/guidovranken/rpcbomb/ - -Signed-off-by: Doran Moppert -Signed-off-by: Steve Dickson -(cherry picked from commit 7ea36eeece56b59f98e469934e4c20b4da043346) -[Peter: unconditionally include syslog.h for LOG_DEBUG] -Signed-off-by: Peter Korsgaard ---- - src/pmap_svc.c | 58 ++++++++++++++++++++++++++++++++++++++++++++---------- - src/rpcb_svc.c | 2 +- - src/rpcb_svc_4.c | 2 +- - src/rpcb_svc_com.c | 8 ++++++++ - 4 files changed, 58 insertions(+), 12 deletions(-) - -diff --git a/src/pmap_svc.c b/src/pmap_svc.c -index ad28b93..f730bed 100644 ---- a/src/pmap_svc.c -+++ b/src/pmap_svc.c -@@ -53,8 +53,8 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro"; - #include - #include - #include --#ifdef RPCBIND_DEBUG - #include -+#ifdef RPCBIND_DEBUG - #include - #endif - #include "rpcbind.h" -@@ -175,6 +175,7 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long - long ans; - uid_t uid; - char uidbuf[32]; -+ int rc = TRUE; - - /* - * Can't use getpwnam here. We might end up calling ourselves -@@ -194,7 +195,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long - - if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) { - svcerr_decode(xprt); -- return (FALSE); -+ rc = FALSE; -+ goto done; - } - #ifdef RPCBIND_DEBUG - if (debugging) -@@ -205,7 +207,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long - - if (!check_access(xprt, op, reg.pm_prog, PMAPVERS)) { - svcerr_weakauth(xprt); -- return (FALSE); -+ rc = (FALSE); -+ goto done; - } - - rpcbreg.r_prog = reg.pm_prog; -@@ -258,7 +261,16 @@ done_change: - rpcbs_set(RPCBVERS_2_STAT, ans); - else - rpcbs_unset(RPCBVERS_2_STAT, ans); -- return (TRUE); -+done: -+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) { -+ if (debugging) { -+ (void) xlog(LOG_DEBUG, "unable to free arguments\n"); -+ if (doabort) { -+ rpcbind_abort(); -+ } -+ } -+ } -+ return (rc); - } - - /* ARGSUSED */ -@@ -272,15 +284,18 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt) - #ifdef RPCBIND_DEBUG - char *uaddr; - #endif -+ int rc = TRUE; - - if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) { - svcerr_decode(xprt); -- return (FALSE); -+ rc = FALSE; -+ goto done; - } - - if (!check_access(xprt, PMAPPROC_GETPORT, reg.pm_prog, PMAPVERS)) { - svcerr_weakauth(xprt); -- return FALSE; -+ rc = FALSE; -+ goto done; - } - - #ifdef RPCBIND_DEBUG -@@ -330,21 +345,34 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt) - pmap_ipprot2netid(reg.pm_prot) ?: "", - port ? udptrans : ""); - -- return (TRUE); -+done: -+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) { -+ if (debugging) { -+ (void) xlog(LOG_DEBUG, "unable to free arguments\n"); -+ if (doabort) { -+ rpcbind_abort(); -+ } -+ } -+ } -+ return (rc); - } - - /* ARGSUSED */ - static bool_t - pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt) - { -+ int rc = TRUE; -+ - if (!svc_getargs(xprt, (xdrproc_t)xdr_void, NULL)) { - svcerr_decode(xprt); -- return (FALSE); -+ rc = FALSE; -+ goto done; - } - - if (!check_access(xprt, PMAPPROC_DUMP, 0, PMAPVERS)) { - svcerr_weakauth(xprt); -- return FALSE; -+ rc = FALSE; -+ goto done; - } - - if ((!svc_sendreply(xprt, (xdrproc_t) xdr_pmaplist_ptr, -@@ -354,7 +382,17 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt) - rpcbind_abort(); - } - } -- return (TRUE); -+ -+done: -+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)NULL)) { -+ if (debugging) { -+ (void) xlog(LOG_DEBUG, "unable to free arguments\n"); -+ if (doabort) { -+ rpcbind_abort(); -+ } -+ } -+ } -+ return (rc); - } - - int pmap_netid2ipprot(const char *netid) -diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c -index bd92201..0c22a9d 100644 ---- a/src/rpcb_svc.c -+++ b/src/rpcb_svc.c -@@ -166,7 +166,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp) - svcerr_decode(transp); - if (debugging) - (void) xlog(LOG_DEBUG, "rpcbind: could not decode"); -- return; -+ goto done; - } - - if (rqstp->rq_proc == RPCBPROC_SET -diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c -index b673452..3e37b54 100644 ---- a/src/rpcb_svc_4.c -+++ b/src/rpcb_svc_4.c -@@ -220,7 +220,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp) - svcerr_decode(transp); - if (debugging) - (void) xlog(LOG_DEBUG, "rpcbind: could not decode\n"); -- return; -+ goto done; - } - - if (rqstp->rq_proc == RPCBPROC_SET -diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c -index ff9ce6b..98ede61 100644 ---- a/src/rpcb_svc_com.c -+++ b/src/rpcb_svc_com.c -@@ -931,6 +931,14 @@ error: - if (call_msg.rm_xid != 0) - (void) free_slot_by_xid(call_msg.rm_xid); - out: -+ if (!svc_freeargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) { -+ if (debugging) { -+ (void) xlog(LOG_DEBUG, "unable to free arguments\n"); -+ if (doabort) { -+ rpcbind_abort(); -+ } -+ } -+ } - if (local_uaddr) - free(local_uaddr); - if (buf_alloc) --- -2.11.0 - diff --git a/buildroot/package/rpcbind/0005-rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch b/buildroot/package/rpcbind/0005-rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch deleted file mode 100644 index c482af5da..000000000 --- a/buildroot/package/rpcbind/0005-rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 4e201b75928ff7d4894cd30ab0f5f67b9cd95f5c Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Thu, 18 Jan 2018 17:33:56 +0000 -Subject: [PATCH] rpcbproc_callit_com: Stop freeing a static pointer - -commit 7ea36ee introduced a svc_freeargs() call -that ended up freeing static pointer. - -It turns out the allocations for the rmt_args -is not necessary . The xdr routines (xdr_bytes) will -handle the memory management and the largest -possible message size is UDPMSGSIZE (due to UDP only) -which is smaller than RPC_BUF_MAX - -Signed-off-by: Steve Dickson -(cherry picked from commit 7c7590ad536c0e24bef790cb1e65702fc54db566) -Signed-off-by: Ed Blake ---- - src/rpcb_svc_com.c | 39 ++++++--------------------------------- - 1 file changed, 6 insertions(+), 33 deletions(-) - -diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c -index 0432b6f..64f1104 100644 ---- a/src/rpcb_svc_com.c -+++ b/src/rpcb_svc_com.c -@@ -616,9 +616,9 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp, - struct netconfig *nconf; - struct netbuf *caller; - struct r_rmtcall_args a; -- char *buf_alloc = NULL, *outbufp; -+ char *outbufp; - char *outbuf_alloc = NULL; -- char buf[RPC_BUF_MAX], outbuf[RPC_BUF_MAX]; -+ char outbuf[RPC_BUF_MAX]; - struct netbuf *na = (struct netbuf *) NULL; - struct rpc_msg call_msg; - int outlen; -@@ -639,36 +639,10 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp, - } - if (si.si_socktype != SOCK_DGRAM) - return; /* Only datagram type accepted */ -- sendsz = __rpc_get_t_size(si.si_af, si.si_proto, UDPMSGSIZE); -- if (sendsz == 0) { /* data transfer not supported */ -- if (reply_type == RPCBPROC_INDIRECT) -- svcerr_systemerr(transp); -- return; -- } -- /* -- * Should be multiple of 4 for XDR. -- */ -- sendsz = ((sendsz + 3) / 4) * 4; -- if (sendsz > RPC_BUF_MAX) { --#ifdef notyet -- buf_alloc = alloca(sendsz); /* not in IDR2? */ --#else -- buf_alloc = malloc(sendsz); --#endif /* notyet */ -- if (buf_alloc == NULL) { -- if (debugging) -- xlog(LOG_DEBUG, -- "rpcbproc_callit_com: No Memory!\n"); -- if (reply_type == RPCBPROC_INDIRECT) -- svcerr_systemerr(transp); -- return; -- } -- a.rmt_args.args = buf_alloc; -- } else { -- a.rmt_args.args = buf; -- } -+ sendsz = UDPMSGSIZE; - - call_msg.rm_xid = 0; /* For error checking purposes */ -+ memset(&a, 0, sizeof(a)); /* Zero out the input buffer */ - if (!svc_getargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) { - if (reply_type == RPCBPROC_INDIRECT) - svcerr_decode(transp); -@@ -708,7 +682,8 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp, - if (rbl == (rpcblist_ptr)NULL) { - #ifdef RPCBIND_DEBUG - if (debugging) -- xlog(LOG_DEBUG, "not found\n"); -+ xlog(LOG_DEBUG, "prog %lu vers %lu: not found\n", -+ a.rmt_prog, a.rmt_vers); - #endif - if (reply_type == RPCBPROC_INDIRECT) - svcerr_noprog(transp); -@@ -941,8 +916,6 @@ out: - } - if (local_uaddr) - free(local_uaddr); -- if (buf_alloc) -- free(buf_alloc); - if (outbuf_alloc) - free(outbuf_alloc); - if (na) { --- -2.11.0 - diff --git a/buildroot/package/rpcbind/0006-pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch b/buildroot/package/rpcbind/0006-pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch deleted file mode 100644 index 11ce6a84a..000000000 --- a/buildroot/package/rpcbind/0006-pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d3f1f55e50e3c436a2ea91d60da84c3a94e6c53f Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Thu, 18 Jan 2018 17:41:49 +0000 -Subject: [PATCH] pmapproc_dump: Fixed typo in memory leak patch - -commit 7ea36eee introduce a typo that caused -NIS (aka ypbind) to fail. - -Signed-off-by: Steve Dickson -(cherry picked from commit c49a7ea639eb700823e174fd605bbbe183e229aa) -Signed-off-by: Ed Blake ---- - src/pmap_svc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pmap_svc.c b/src/pmap_svc.c -index bb57b05..ffca7df 100644 ---- a/src/pmap_svc.c -+++ b/src/pmap_svc.c -@@ -384,7 +384,7 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt) - } - - done: -- if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)NULL)) { -+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_void, (char *)NULL)) { - if (debugging) { - (void) xlog(LOG_DEBUG, "unable to free arguments\n"); - if (doabort) { --- -2.11.0 - diff --git a/buildroot/package/rpcbind/S30rpcbind b/buildroot/package/rpcbind/S30rpcbind index 532d3f886..b224322e1 100644 --- a/buildroot/package/rpcbind/S30rpcbind +++ b/buildroot/package/rpcbind/S30rpcbind @@ -6,7 +6,7 @@ start() { printf "Starting rpcbind: " umask 077 - start-stop-daemon -S -q -p /var/run/rpcbind.pid --exec /usr/bin/rpcbind + start-stop-daemon -S -q -p /var/run/rpcbind.pid --exec /usr/sbin/rpcbind echo "OK" } stop() { diff --git a/buildroot/package/rpcbind/rpcbind.hash b/buildroot/package/rpcbind/rpcbind.hash index 5c9ecd142..1960b86c1 100644 --- a/buildroot/package/rpcbind/rpcbind.hash +++ b/buildroot/package/rpcbind/rpcbind.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 9897823a9d820ea011d9ea02054d5ab99469b9ca5346265fee380713c8fed27b rpcbind-0.2.3.tar.bz2 +sha256 2ce360683963b35c19c43f0ee2c7f18aa5b81ef41c3fdbd15ffcb00b8bffda7a rpcbind-1.2.5.tar.bz2 +sha256 2b9477d2f4ab277b29702958f0058546edc120aae4b5fb8b8d1a9652104e1ba3 COPYING diff --git a/buildroot/package/rpcbind/rpcbind.mk b/buildroot/package/rpcbind/rpcbind.mk index d69735d32..cce84cfa8 100644 --- a/buildroot/package/rpcbind/rpcbind.mk +++ b/buildroot/package/rpcbind/rpcbind.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPCBIND_VERSION = 0.2.3 +RPCBIND_VERSION = 1.2.5 RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION) RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2 RPCBIND_LICENSE = BSD-3-Clause @@ -27,9 +27,6 @@ define RPCBIND_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.service $(INSTALL) -m 0644 -D package/rpcbind/rpcbind.socket \ $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.socket - mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants - ln -fs ../../../../usr/lib/systemd/system/rpcbind.socket \ - $(TARGET_DIR)/etc/systemd/system/sockets.target.wants/rpcbind.socket endef define RPCBIND_INSTALL_INIT_SYSV diff --git a/buildroot/package/rpcbind/rpcbind.service b/buildroot/package/rpcbind/rpcbind.service index b7a32a19d..e41931df4 100644 --- a/buildroot/package/rpcbind/rpcbind.service +++ b/buildroot/package/rpcbind/rpcbind.service @@ -4,7 +4,7 @@ Requires=rpcbind.socket [Service] Type=forking -ExecStart=/usr/bin/rpcbind +ExecStart=/usr/sbin/rpcbind [Install] Also=rpcbind.socket diff --git a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash index eeb7b605f..a3c7281d7 100644 --- a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 155ebd5f08b819e0ce4e1950fcc972b2086cee3c16d36aba348beba1910c1fd2 rpi-bt-firmware-8c1e2bff1da9850f68efcfff3da5d939ec27a2ee.tar.gz +sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-bt-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk index f9f300da4..23923453c 100644 --- a/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ b/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = 8c1e2bff1da9850f68efcfff3da5d939ec27a2ee +RPI_BT_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327 RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx diff --git a/buildroot/package/rpi-firmware/Config.in b/buildroot/package/rpi-firmware/Config.in index 143ef4c71..7cebc5e7c 100644 --- a/buildroot/package/rpi-firmware/Config.in +++ b/buildroot/package/rpi-firmware/Config.in @@ -11,6 +11,24 @@ config BR2_PACKAGE_RPI_FIRMWARE if BR2_PACKAGE_RPI_FIRMWARE +choice + bool "rpi variant" + help + The Raspberry Pi 4 introduced a slightly different naming + convention and set of boot files. This option controls which + format to use. + +config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI + bool "rpi 0/1/2/3" + help + The default set of files, for versions pre-4 + +config BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 + bool "rpi 4" + help + The Raspberry Pi 4 files +endchoice + choice bool "Firmware to boot" default BR2_PACKAGE_RPI_FIRMWARE_DEFAULT @@ -40,19 +58,15 @@ config BR2_PACKAGE_RPI_FIRMWARE_CD The cut-down firmware, for emergency situations, with only features required to boot a Linux kernel. -config BR2_PACKAGE_RPI_FIRMWARE_PI4 - bool "Pi 4" - help - The Raspberry Pi 4 boot files - endchoice config BR2_PACKAGE_RPI_FIRMWARE_BOOT string default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT - default "4" if BR2_PACKAGE_RPI_FIRMWARE_PI4 - default "_x" if BR2_PACKAGE_RPI_FIRMWARE_X - default "_cd" if BR2_PACKAGE_RPI_FIRMWARE_CD + default "_x" if BR2_PACKAGE_RPI_FIRMWARE_X && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI + default "x" if BR2_PACKAGE_RPI_FIRMWARE_X && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 + default "_cd" if BR2_PACKAGE_RPI_FIRMWARE_CD && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI + default "cd" if BR2_PACKAGE_RPI_FIRMWARE_CD && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS bool "Install Device Tree Blobs (DTBs)" diff --git a/buildroot/package/rpi-firmware/rpi-firmware.hash b/buildroot/package/rpi-firmware/rpi-firmware.hash index 78e879849..e3ba1bf99 100644 --- a/buildroot/package/rpi-firmware/rpi-firmware.hash +++ b/buildroot/package/rpi-firmware/rpi-firmware.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 06e6cd4df5f6543a962a434668883e50f33e22a1f4964ece63432c947291cf50 rpi-firmware-dd8cbec5a6d27090e5eb080e13d83c35fdd759f7.tar.gz +sha256 06e6cd4df5f6543a962a434668883e50f33e22a1f4964ece63432c947291cf50 rpi-firmware-dd8cbec5a6d27090e5eb080e13d83c35fdd759f7.tar.gz +sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/buildroot/package/rpi-firmware/rpi-firmware.mk b/buildroot/package/rpi-firmware/rpi-firmware.mk index 6452687f3..2177ca985 100644 --- a/buildroot/package/rpi-firmware/rpi-firmware.mk +++ b/buildroot/package/rpi-firmware/rpi-firmware.mk @@ -41,12 +41,24 @@ define RPI_FIRMWARE_INSTALL_TARGET_CMDS endef endif # INSTALL_VCDBG -define RPI_FIRMWARE_INSTALL_IMAGES_CMDS +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4),y) +# bootcode.bin is not used on rpi4, because it has been replaced by boot code in the onboard EEPROM +define RPI_FIRMWARE_INSTALL_BOOT + $(INSTALL) -D -m 0644 $(@D)/boot/start4$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start4.elf + $(INSTALL) -D -m 0644 $(@D)/boot/fixup4$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup4.dat +endef +else +define RPI_FIRMWARE_INSTALL_BOOT $(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin - $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf - $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat + $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf + $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat +endef +endif + +define RPI_FIRMWARE_INSTALL_IMAGES_CMDS $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt + $(RPI_FIRMWARE_INSTALL_BOOT) $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) endef diff --git a/buildroot/package/rpi-userland/0003-Disable-Werror-everywhere.patch b/buildroot/package/rpi-userland/0003-Disable-Werror-everywhere.patch index 7fb2f9797..27c8acdd4 100644 --- a/buildroot/package/rpi-userland/0003-Disable-Werror-everywhere.patch +++ b/buildroot/package/rpi-userland/0003-Disable-Werror-everywhere.patch @@ -1,4 +1,4 @@ -From 8275a380658070336df0c404f0ff585d27681836 Mon Sep 17 00:00:00 2001 +From cc9ac86bcff79697d354cc51d3a984fd0f362868 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 22 Sep 2016 22:59:11 +0200 Subject: [PATCH] Disable Werror everywhere @@ -15,6 +15,9 @@ Signed-off-by: Peter Seiderer [Rebased for rpi-userland-8f0abfb07b96e7ee85f46e59d895014ec5e25f5e] Signed-off-by: Peter Seiderer + +[Rebased for rpi-userland-5070cb7fc150fc98f1ed64a7739c3356970d9f76] +Signed-off-by: Peter Seiderer --- host_applications/android/apps/vidtex/CMakeLists.txt | 2 +- host_applications/linux/apps/gencmd/CMakeLists.txt | 2 +- @@ -26,8 +29,7 @@ Signed-off-by: Peter Seiderer interface/vcos/CMakeLists.txt | 2 +- interface/vcos/pthreads/CMakeLists.txt | 2 +- interface/vmcs_host/CMakeLists.txt | 2 +- - interface/vmcs_host/linux/vcfiled/CMakeLists.txt | 2 +- - 11 files changed, 11 insertions(+), 11 deletions(-) + 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/host_applications/android/apps/vidtex/CMakeLists.txt b/host_applications/android/apps/vidtex/CMakeLists.txt index 6d66d69..06a3192 100644 @@ -55,7 +57,7 @@ index f95d1a1..034bf20 100644 include_directories( ../../../.. diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt -index 42636e8..d778f09 100644 +index f7db21e..b94bdc3 100644 --- a/host_applications/linux/apps/raspicam/CMakeLists.txt +++ b/host_applications/linux/apps/raspicam/CMakeLists.txt @@ -1,7 +1,7 @@ @@ -107,7 +109,7 @@ index 5ce5aca..02aea7c 100644 include_directories( ../../../.. diff --git a/interface/mmal/CMakeLists.txt b/interface/mmal/CMakeLists.txt -index 37ae757..78b24a9 100644 +index 46f149d..06273dc 100644 --- a/interface/mmal/CMakeLists.txt +++ b/interface/mmal/CMakeLists.txt @@ -3,7 +3,7 @@ if (NOT DEFINED LIBRARY_TYPE) @@ -146,7 +148,7 @@ index 1d81ca3..b35cd8e 100644 endif () diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt -index fde18da..802c158 100755 +index a157db1..dc384ca 100755 --- a/interface/vmcs_host/CMakeLists.txt +++ b/interface/vmcs_host/CMakeLists.txt @@ -2,7 +2,7 @@ @@ -158,17 +160,6 @@ index fde18da..802c158 100755 # vc_vchi_gencmd.c has a type-punning problem in vc_gencmd_read_response add_definitions(-fno-strict-aliasing) -diff --git a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -index aed0e83..d834b3f 100644 ---- a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -+++ b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -@@ -1,5 +1,5 @@ - --add_definitions(-Werror) -+add_definitions() - - # vcfiled - serves files to videocore. used for media handlers from - # OpenMAX/IL and loading VLLs. -- -2.19.0 +2.23.0 diff --git a/buildroot/package/rpi-userland/Config.in b/buildroot/package/rpi-userland/Config.in index 8d349f21e..342faf26e 100644 --- a/buildroot/package/rpi-userland/Config.in +++ b/buildroot/package/rpi-userland/Config.in @@ -32,13 +32,6 @@ config BR2_PACKAGE_PROVIDES_LIBOPENVG config BR2_PACKAGE_PROVIDES_LIBOPENMAX default "rpi-userland" -config BR2_PACKAGE_RPI_USERLAND_START_VCFILED - bool "Start vcfiled" - depends on BR2_INIT_SYSV || BR2_INIT_BUSYBOX - help - vcfiled is a daemon serving files to VideoCore from the host - file system. - config BR2_PACKAGE_RPI_USERLAND_HELLO bool "hello_pi examples" help diff --git a/buildroot/package/rpi-userland/S94vcfiled b/buildroot/package/rpi-userland/S94vcfiled deleted file mode 100644 index 4d27b91ba..000000000 --- a/buildroot/package/rpi-userland/S94vcfiled +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -NAME=vcfiled -DESC="VideoCore file server daemon $NAME" -DAEMON="/usr/sbin/$NAME" -DAEMON_ARGS="" -CFGFILE="/etc/default/$NAME" -PIDFILE="/var/run/$NAME.pid" - -# Read configuration variable file if it is present -[ -r "$CFGFILE" ] && . "$CFGFILE" - -start() -{ - printf "Starting $DESC: " - start-stop-daemon -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS && - echo "done" || echo "failed" -} - -stop() -{ - printf "Stopping $DESC: " - if start-stop-daemon -K -q -R TERM/30/KILL/5 -p "$PIDFILE" -n "$NAME"; then - # This daemon does not remove its PID file when it exits. - rm -f "$PIDFILE" - echo "done" - else - echo "failed" - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" >&2 - exit 1 - ;; -esac diff --git a/buildroot/package/rpi-userland/rpi-userland.hash b/buildroot/package/rpi-userland/rpi-userland.hash index 44d446ea3..b6d9b99b3 100644 --- a/buildroot/package/rpi-userland/rpi-userland.hash +++ b/buildroot/package/rpi-userland/rpi-userland.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 9424ffa45ef888fb61483c63fd66532c1c648e071fea72c93762efbb3c2a8669 rpi-userland-e5803f2c986cbf8c919c60278b3231dcdf4271a6.tar.gz +sha256 cf4dff40a2f4ec38bc7e42a80b989df1bf88e12d714f7e681f83c4e5a588f5c9 rpi-userland-06bc6daa02137ca72b7a2104afad81e82a44de17.tar.gz +sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE diff --git a/buildroot/package/rpi-userland/rpi-userland.mk b/buildroot/package/rpi-userland/rpi-userland.mk index 20ef2fca9..7dd29e88e 100644 --- a/buildroot/package/rpi-userland/rpi-userland.mk +++ b/buildroot/package/rpi-userland/rpi-userland.mk @@ -4,31 +4,15 @@ # ################################################################################ -RPI_USERLAND_VERSION = e5803f2c986cbf8c919c60278b3231dcdf4271a6 +RPI_USERLAND_VERSION = 06bc6daa02137ca72b7a2104afad81e82a44de17 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE RPI_USERLAND_INSTALL_STAGING = YES -RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) \ - -DVCFILED_LOCKFILE=\\\"/var/run/vcfiled.pid\\\"" +RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg -ifeq ($(BR2_PACKAGE_RPI_USERLAND_START_VCFILED),y) -define RPI_USERLAND_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/rpi-userland/S94vcfiled \ - $(TARGET_DIR)/etc/init.d/S94vcfiled -endef -define RPI_USERLAND_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/rpi-userland/vcfiled.service \ - $(TARGET_DIR)/usr/lib/systemd/system/vcfiled.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/vcfiled.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vcfiled.service -endef -endif - ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON @@ -54,9 +38,6 @@ RPI_USERLAND_CONF_OPTS += -DALL_APPS=OFF endif # BR2_PACKAGE_RPI_USERLAND_HELLO define RPI_USERLAND_POST_TARGET_CLEANUP - rm -f $(TARGET_DIR)/etc/init.d/vcfiled - rm -f $(TARGET_DIR)/usr/share/install/vcfiled - rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/install rm -Rf $(TARGET_DIR)/usr/src endef RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP diff --git a/buildroot/package/rpi-userland/vcfiled.service b/buildroot/package/rpi-userland/vcfiled.service deleted file mode 100644 index b09aa6277..000000000 --- a/buildroot/package/rpi-userland/vcfiled.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=VideoCore file server daemon - -[Service] -ExecStart=/usr/sbin/vcfiled --foreground -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/buildroot/package/rpm/0001-configure-ac-prefer-pkg-config-to-find-libgcrypt.patch b/buildroot/package/rpm/0001-configure-ac-prefer-pkg-config-to-find-libgcrypt.patch new file mode 100644 index 000000000..035fe154d --- /dev/null +++ b/buildroot/package/rpm/0001-configure-ac-prefer-pkg-config-to-find-libgcrypt.patch @@ -0,0 +1,52 @@ +From 22ed98efe3d5198e4141948af7569cfa10d9d25f Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Wed, 20 Nov 2019 13:06:51 +0000 +Subject: [PATCH] configure.ac: prefer pkg-config to find libgcrypt + +libgcrypt from 1.8.5 provides a pkg-config file as well as the traditional +libgcrypt-config script. As pkg-config is more resiliant in the face of +complicated build environments (for example cross-compilation and sysroots) +prefer the pkg-config file, falling back to libgcrypt-config if that doesn't +exist. + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/rpm-software-management/rpm/commit/22ed98efe3d5198e4141948af7569cfa10d9d25f] +--- + configure.ac | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0a3a9bbf4..6a3ea3615 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -395,14 +395,21 @@ AC_SUBST(WITH_OPENSSL_LIB) + WITH_LIBGCRYPT_INCLUDE= + WITH_LIBGCRYPT_LIB= + if test "$with_crypto" = libgcrypt ; then +-AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, notfound) +-if test notfound != "$LIBGCRYPT_CONFIG" ; then +-WITH_LIBGCRYPT_INCLUDE=`$LIBGCRYPT_CONFIG --cflags` +-WITH_LIBGCRYPT_LIB=`$LIBGCRYPT_CONFIG --libs` +-fi +-if test -z "$WITH_LIBGCRYPT_LIB" ; then +-AC_MSG_ERROR([libgcrypt not found]) +-fi ++ # libgcrypt 1.8.5 onwards ships a pkg-config file so prefer that ++ PKG_CHECK_MODULES([LIBGCRYPT], [libgcrypt], [have_libgcrypt=yes], [have_libgcrypt=no]) ++ if test "$have_libgcrypt" = "yes"; then ++ WITH_LIBGCRYPT_INCLUDE="$LIBGCRYPT_CFLAGS" ++ WITH_LIBGCRYPT_LIB="$LIBGCRYPT_LIBS" ++ else ++ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, notfound) ++ if test notfound != "$LIBGCRYPT_CONFIG" ; then ++ WITH_LIBGCRYPT_INCLUDE=`$LIBGCRYPT_CONFIG --cflags` ++ WITH_LIBGCRYPT_LIB=`$LIBGCRYPT_CONFIG --libs` ++ fi ++ if test -z "$WITH_LIBGCRYPT_LIB" ; then ++ AC_MSG_ERROR([libgcrypt not found]) ++ fi ++ fi + fi + + AM_CONDITIONAL([WITH_LIBGCRYPT],[test "$with_crypto" = libgcrypt]) diff --git a/buildroot/package/rpm/0002-rpmio-digest_nss.c-fix-build-on-musl.patch b/buildroot/package/rpm/0002-rpmio-digest_nss.c-fix-build-on-musl.patch deleted file mode 100644 index 66aeb6478..000000000 --- a/buildroot/package/rpm/0002-rpmio-digest_nss.c-fix-build-on-musl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 817dbe77e3e5a6d89540000a48584358efb4b03a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 1 Apr 2019 07:33:19 +0200 -Subject: [PATCH] rpmio/digest_nss.c: fix build on musl - -signal.h must be included to be able to use sigaction - -Fixes: - - http://autobuild.buildroot.org/results/395fd44a930dfc2ad380bc735c26d9ce62344295 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://github.com/rpm-software-management/rpm/pull/650] ---- - rpmio/digest_nss.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/rpmio/digest_nss.c b/rpmio/digest_nss.c -index 50f8c8e90..1692a9221 100644 ---- a/rpmio/digest_nss.c -+++ b/rpmio/digest_nss.c -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.14.1 - diff --git a/buildroot/package/rpm/Config.in b/buildroot/package/rpm/Config.in index aa857ef2b..fc702c309 100644 --- a/buildroot/package/rpm/Config.in +++ b/buildroot/package/rpm/Config.in @@ -7,9 +7,9 @@ config BR2_PACKAGE_RPM bool "rpm" depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - depends on BR2_TOOLCHAIN_HAS_THREADS # beecrypt + depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_BEECRYPT if !BR2_PACKAGE_LIBNSS + select BR2_PACKAGE_BEECRYPT if !BR2_PACKAGE_LIBGCRYPT && !BR2_PACKAGE_LIBNSS && !BR2_PACKAGE_OPENSSL select BR2_PACKAGE_BERKELEYDB select BR2_PACKAGE_FILE select BR2_PACKAGE_POPT diff --git a/buildroot/package/rpm/rpm.hash b/buildroot/package/rpm/rpm.hash index f7cbd0cbc..cdb20e3b8 100644 --- a/buildroot/package/rpm/rpm.hash +++ b/buildroot/package/rpm/rpm.hash @@ -1,5 +1,5 @@ -# From https://rpm.org/wiki/Releases/4.14.2.1.html -sha256 1139c24b7372f89c0a697096bf9809be70ba55e006c23ff47305c1849d98acda rpm-4.14.2.1.tar.bz2 +# From https://rpm.org/wiki/Releases/4.15.1.html +sha256 ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230 rpm-4.15.1.tar.bz2 # Hash for license file sha256 d56f4f1f290f6920cb053aef0dbcd0b853cda289e2568b364ddbfce220a6f3e0 COPYING diff --git a/buildroot/package/rpm/rpm.mk b/buildroot/package/rpm/rpm.mk index b1ce4ad44..d29c3feba 100644 --- a/buildroot/package/rpm/rpm.mk +++ b/buildroot/package/rpm/rpm.mk @@ -4,21 +4,30 @@ # ################################################################################ -RPM_VERSION_MAJOR = 4.14 -RPM_VERSION = $(RPM_VERSION_MAJOR).2.1 +RPM_VERSION_MAJOR = 4.15 +RPM_VERSION = $(RPM_VERSION_MAJOR).1 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x -RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib \ +RPM_DEPENDENCIES = \ + host-pkgconf \ + berkeleydb \ + $(if $(BR2_PACKAGE_BZIP2),bzip2) \ + $(if $(BR2_PACKAGE_ELFUTILS),elfutils) \ + file \ + popt \ + $(if $(BR2_PACKAGE_XZ),xz) \ + zlib \ $(TARGET_NLS_DEPENDENCIES) RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only) RPM_LICENSE_FILES = COPYING +# We're patching configure.ac +RPM_AUTORECONF = YES RPM_CONF_OPTS = \ --disable-python \ --disable-rpath \ --with-external-db \ --with-gnu-ld \ - --without-cap \ --without-hackingdocs \ --without-lua @@ -29,14 +38,34 @@ else RPM_CONF_OPTS += --without-acl endif -ifeq ($(BR2_PACKAGE_LIBNSS),y) +ifeq ($(BR2_PACKAGE_DBUS),y) +RPM_DEPENDENCIES += dbus +RPM_CONF_OPTS += --enable-plugins +else +RPM_CONF_OPTS += --disable-plugins +endif + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +RPM_DEPENDENCIES += libcap +RPM_CONF_OPTS += --with-cap +else +RPM_CONF_OPTS += --without-cap +endif + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +RPM_DEPENDENCIES += libgcrypt +RPM_CONF_OPTS += --with-crypto=libgcrypt +else ifeq ($(BR2_PACKAGE_LIBNSS),y) RPM_DEPENDENCIES += libnss RPM_CONF_OPTS += --with-crypto=nss RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr -else +else ifeq ($(BR2_PACKAGE_BEECRYPT),y) RPM_DEPENDENCIES += beecrypt RPM_CONF_OPTS += --with-crypto=beecrypt RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/beecrypt +else +RPM_DEPENDENCIES += openssl +RPM_CONF_OPTS += --with-crypto=openssl endif ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y) @@ -59,14 +88,17 @@ else RPM_CONF_OPTS += --without-selinux endif -# For the elfutils and binutils dependencies, there are no -# configuration options to explicitly enable/disable them. -ifeq ($(BR2_PACKAGE_ELFUTILS),y) -RPM_DEPENDENCIES += elfutils +ifeq ($(BR2_PACKAGE_ZSTD),y) +RPM_DEPENDENCIES += zstd +RPM_CONF_OPTS += --enable-zstd +else +RPM_CONF_OPTS += --disable-zstd endif -ifeq ($(BR2_PACKAGE_BINUTILS),y) -RPM_DEPENDENCIES += binutils +ifeq ($(BR2_TOOLCHAIN_HAS_OPENMP),y) +RPM_CONF_OPTS += --enable-openmp +else +RPM_CONF_OPTS += --disable-openmp endif # ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`). diff --git a/buildroot/package/rrdtool/Config.in b/buildroot/package/rrdtool/Config.in index 631ed3284..545135314 100644 --- a/buildroot/package/rrdtool/Config.in +++ b/buildroot/package/rrdtool/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_RRDTOOL_RRDGRAPH bool "rrd_graph" default y depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # freetype support from pango select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PDF @@ -27,8 +28,10 @@ config BR2_PACKAGE_RRDTOOL_RRDGRAPH This enables the graphing capabilities ('rrdgraph'). Without this it will only act as a database backend. -comment "rrd_graph support needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "rrd_graph support needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 endif diff --git a/buildroot/package/rrdtool/rrdtool.hash b/buildroot/package/rrdtool/rrdtool.hash index 664067344..6418c25a5 100644 --- a/buildroot/package/rrdtool/rrdtool.hash +++ b/buildroot/package/rrdtool/rrdtool.hash @@ -1,4 +1,4 @@ -# Locally calculated sha256 -sha256 f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b rrdtool-1.7.0.tar.gz -sha256 884385795ee48cd820082e8823bc748cd20574112da2cc7d2ef505b47b1058c3 COPYRIGHT -sha256 14079d501f3092405a192463603f66e13da88fc5894981e2962e2e6aec4ab178 LICENSE +# Locally calculated +sha256 a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db rrdtool-1.7.2.tar.gz +sha256 ab6b4646e9e01f1ec287c29c351c886c4cb7f945c11efc0a1be9f6e5e6cc5320 COPYRIGHT +sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 LICENSE diff --git a/buildroot/package/rrdtool/rrdtool.mk b/buildroot/package/rrdtool/rrdtool.mk index 144bbcfb1..2731b7b39 100644 --- a/buildroot/package/rrdtool/rrdtool.mk +++ b/buildroot/package/rrdtool/rrdtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -RRDTOOL_VERSION = 1.7.0 +RRDTOOL_VERSION = 1.7.2 RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub RRDTOOL_LICENSE = GPL-2.0+ with FLOSS license exceptions as explained in COPYRIGHT RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE diff --git a/buildroot/package/rs485conf/rs485conf.hash b/buildroot/package/rs485conf/rs485conf.hash index e2ccbfd43..315f90a37 100644 --- a/buildroot/package/rs485conf/rs485conf.hash +++ b/buildroot/package/rs485conf/rs485conf.hash @@ -1,2 +1,3 @@ # Locally computed sha256 f163f81cd50aae6fa39cbb4f6408a3699da7a87a56649c4b96d6f168c9be6a7d rs485conf-5c8d00cf70950fab3454549b81dea843d844492a.tar.gz +sha256 3e5c80d50879a9572ac9e463215a942490a67b56dfd8a3e27004d7c62e0493c8 LICENSE diff --git a/buildroot/package/rsh-redone/rsh-redone.hash b/buildroot/package/rsh-redone/rsh-redone.hash index ba85607df..559ed42d4 100644 --- a/buildroot/package/rsh-redone/rsh-redone.hash +++ b/buildroot/package/rsh-redone/rsh-redone.hash @@ -1,2 +1,4 @@ # From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/r/rsh-redone/rsh-redone_85-2.dsc -sha256 55ac8ee2acacbc3490f073e3922c0cde46ffe4ea3c593e05c48fed4c1e1a8811 rsh-redone_85.orig.tar.gz +sha256 55ac8ee2acacbc3490f073e3922c0cde46ffe4ea3c593e05c48fed4c1e1a8811 rsh-redone_85.orig.tar.gz +# Locally computed +sha256 92c3a6a0efe5347c282081c6f67aebfec0f33b880c9efb87eb5232dcdd748369 rsh.c diff --git a/buildroot/package/rsyslog/rsyslog.hash b/buildroot/package/rsyslog/rsyslog.hash index 4fe6a0e26..22372a92a 100644 --- a/buildroot/package/rsyslog/rsyslog.hash +++ b/buildroot/package/rsyslog/rsyslog.hash @@ -1,2 +1,7 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 06e2884181333dccecceaca82827ae24ca7a258b4fbf7b1e07a80d4caae640ca rsyslog-8.22.0.tar.gz +sha256 e1f4776b1c62ad7220f4d624a89a96b0c3d4738006899356eaaef0f1f91ee104 rsyslog-8.1911.0.tar.gz + +# Locally calculated +sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING +sha256 8743ad560dea1229d4f46cd603e10874db41a27f3c74f64e958ef123f3943fab COPYING.ASL20 +sha256 4038442ca5bde8ffd243cfc235cb4455e7d618d47558ea3d8284733f71d904ed COPYING.LESSER diff --git a/buildroot/package/rsyslog/rsyslog.mk b/buildroot/package/rsyslog/rsyslog.mk index fcd476cee..c4446c210 100644 --- a/buildroot/package/rsyslog/rsyslog.mk +++ b/buildroot/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.22.0 +RSYSLOG_VERSION = 8.1911.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 @@ -17,6 +17,15 @@ RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \ RSYSLOG_CONF_OPTS = --disable-generate-man-pages \ $(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x)) +# Disable items requiring libcurl +RSYSLOG_CONF_OPTS += --disable-elasticsearch \ + --disable-clickhouse \ + --disable-omhttp \ + --disable-fmhttp \ + --disable-imdocker \ + --disable-omhttpfs \ + --disable-mmkubernetes + ifeq ($(BR2_PACKAGE_GNUTLS),y) RSYSLOG_DEPENDENCIES += gnutls RSYSLOG_CONF_OPTS += --enable-gnutls @@ -76,20 +85,6 @@ define RSYSLOG_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S01rsyslogd endef -# The rsyslog.service is installed by rsyslog, but the link is not created -# so the service is not enabled. -# We need to create another link which is due to the fact that the -# rsyslog.service contains an Alias= -# If we were to use systemctl enable to enable the service, it would -# create both, so we mimic that. -define RSYSLOG_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/rsyslog.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rsyslog.service - ln -sf ../../../usr/lib/systemd/system/rsyslog.service \ - $(TARGET_DIR)/etc/systemd/system/syslog.service -endef - define RSYSLOG_INSTALL_CONF $(INSTALL) -m 0644 -D $(@D)/platform/redhat/rsyslog.conf \ $(TARGET_DIR)/etc/rsyslog.conf diff --git a/buildroot/package/rt-tests/rt-tests.hash b/buildroot/package/rt-tests/rt-tests.hash index f37af4384..7da6ed2c3 100644 --- a/buildroot/package/rt-tests/rt-tests.hash +++ b/buildroot/package/rt-tests/rt-tests.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 aea85fd8eda8c1d96e9d32a019bfd4a1d2e0d362971d97838996f49d1af2d470 rt-tests-1.0.tar.xz +sha256 bcb94448324116f29c248b14a6051c7ab72a0135234e714685a2a3a3e7d531f8 rt-tests-1.6.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/rt-tests/rt-tests.mk b/buildroot/package/rt-tests/rt-tests.mk index 273949a98..abc32f4fb 100644 --- a/buildroot/package/rt-tests/rt-tests.mk +++ b/buildroot/package/rt-tests/rt-tests.mk @@ -6,12 +6,12 @@ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 1.0 +RT_TESTS_VERSION = 1.6 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_PYTHON),y) -RT_TESTS_DEPENDENCIES = python +ifeq ($(BR2_PACKAGE_PYTHON3),y) +RT_TESTS_DEPENDENCIES = python3 endif define RT_TESTS_BUILD_CMDS @@ -25,7 +25,7 @@ define RT_TESTS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ DESTDIR="$(TARGET_DIR)" \ prefix=/usr \ - $(if $(BR2_PACKAGE_PYTHON),PYLIB=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/,PYLIB="") \ + PYLIB="$(if $(BR2_PACKAGE_PYTHON3),/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/)" \ install endef diff --git a/buildroot/package/rtl8188eu/rtl8188eu.hash b/buildroot/package/rtl8188eu/rtl8188eu.hash index 9ec2ffee8..88c128aa3 100644 --- a/buildroot/package/rtl8188eu/rtl8188eu.hash +++ b/buildroot/package/rtl8188eu/rtl8188eu.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 cc872aa0991c044d35abfcc81543bad950c6aae487e37d5a09d1cbf8c4cb3058 rtl8188eu-4b0ecca485b9f11f58670b69aa9f90ecad7da02f.tar.gz +sha256 cc872aa0991c044d35abfcc81543bad950c6aae487e37d5a09d1cbf8c4cb3058 rtl8188eu-4b0ecca485b9f11f58670b69aa9f90ecad7da02f.tar.gz +sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/buildroot/package/rtl8189fs/rtl8189fs.hash b/buildroot/package/rtl8189fs/rtl8189fs.hash index d6ce6c1e8..f1524a6fc 100644 --- a/buildroot/package/rtl8189fs/rtl8189fs.hash +++ b/buildroot/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 93472471e1769f92984792f40a0898dd8dd02122d745d48e8edd1a8cc869bc82 rtl8189fs-569bdb91f2cc76e2f5b77df42471db2a62fd2376.tar.gz +sha256 f3f8bcc1e75f095350f12c36f7b8af88eebf3913d4bc921083489f1758cb5068 rtl8189fs-54bd6808e38f213126e7d6447ae9d80c656179f3.tar.gz diff --git a/buildroot/package/rtl8189fs/rtl8189fs.mk b/buildroot/package/rtl8189fs/rtl8189fs.mk index d463bba7e..39122bc78 100644 --- a/buildroot/package/rtl8189fs/rtl8189fs.mk +++ b/buildroot/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = 569bdb91f2cc76e2f5b77df42471db2a62fd2376 +RTL8189FS_VERSION = 54bd6808e38f213126e7d6447ae9d80c656179f3 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 diff --git a/buildroot/package/rtl8821au/rtl8821au.hash b/buildroot/package/rtl8821au/rtl8821au.hash index f35d57910..de84332f7 100644 --- a/buildroot/package/rtl8821au/rtl8821au.hash +++ b/buildroot/package/rtl8821au/rtl8821au.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 23889fe4bf518dbadcbfac613f64a74bbce177267d9337a98843e4e7de8f1896 rtl8821au-b018b446fb0729fa659e7eead475d6c13f192642.tar.gz +sha256 9c8e127dcf2b4d87df546f7f51afdbca0a0561cdba9bcc2689722e1090c46204 rtl8821au-4235b0ec7d7220a6364586d8e25b1e8cb99c36f1.tar.gz +sha256 6d66dec8f6c253a1af2ffd858167c722b1ce3218215446172c81355d0a49e7fc LICENSE diff --git a/buildroot/package/rtl8821au/rtl8821au.mk b/buildroot/package/rtl8821au/rtl8821au.mk index b6ad431b8..5f4ba3eb7 100644 --- a/buildroot/package/rtl8821au/rtl8821au.mk +++ b/buildroot/package/rtl8821au/rtl8821au.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8821AU_VERSION = b018b446fb0729fa659e7eead475d6c13f192642 +RTL8821AU_VERSION = 4235b0ec7d7220a6364586d8e25b1e8cb99c36f1 RTL8821AU_SITE = $(call github,abperiasamy,rtl8812AU_8821AU_linux,$(RTL8821AU_VERSION)) RTL8821AU_LICENSE = GPL-2.0 RTL8821AU_LICENSE_FILES = LICENSE diff --git a/buildroot/package/rtmpdump/0001-include-limits.h.patch b/buildroot/package/rtmpdump/0001-include-limits.h.patch new file mode 100644 index 000000000..172a9630f --- /dev/null +++ b/buildroot/package/rtmpdump/0001-include-limits.h.patch @@ -0,0 +1,39 @@ +From b9d010d2c07e07eeffa510f14ff833ecb10dc0c8 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Mon, 24 Jun 2019 21:11:33 +0200 +Subject: [PATCH] include + +Needed after +https://repo.or.cz/rtmpdump.git/commitdiff/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3 + +to fix + +rtmp.c: In function 'HTTP_read': +rtmp.c:4459:26: error: 'INT_MAX' undeclared (first use in this function); did you mean 'INT8_MAX'? + +reported by buildroot autobuilders: +http://autobuild.buildroot.net/?reason=rtmpdump-c5f04a58fc2aeea6296ca7c44ee4734c18401aa3 + +Patch sent upstream by e-mail to author of +https://repo.or.cz/rtmpdump.git/patch/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3 + +Signed-off-by: Bernd Kuhls +--- + librtmp/rtmp.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h +index 6d7dd89..48d4fc3 100644 +--- a/librtmp/rtmp.h ++++ b/librtmp/rtmp.h +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include "amf.h" + +-- +2.20.1 + diff --git a/buildroot/package/rtmpdump/rtmpdump.hash b/buildroot/package/rtmpdump/rtmpdump.hash new file mode 100644 index 000000000..6e85a5841 --- /dev/null +++ b/buildroot/package/rtmpdump/rtmpdump.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 b98fceba5155c5a1ee3f26550ea94144c72d8b8c5a050c213bb55dab330ad6ff rtmpdump-c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz +sha256 03fe7ca91cc28e99b4003d5b3bd4ce3b084d4c475fdf9975cf0e7fdf4dc739cd librtmp/COPYING diff --git a/buildroot/package/rtmpdump/rtmpdump.mk b/buildroot/package/rtmpdump/rtmpdump.mk index 03cdd9d00..bc68b7a83 100644 --- a/buildroot/package/rtmpdump/rtmpdump.mk +++ b/buildroot/package/rtmpdump/rtmpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTMPDUMP_VERSION = fa8646daeb19dfd12c181f7d19de708d623704c0 +RTMPDUMP_VERSION = c5f04a58fc2aeea6296ca7c44ee4734c18401aa3 RTMPDUMP_SITE = git://git.ffmpeg.org/rtmpdump RTMPDUMP_INSTALL_STAGING = YES # Note that rtmpdump is GPL-2.0 but librtmp has its own license and since we only diff --git a/buildroot/package/rtorrent/0001-cross_compile.patch b/buildroot/package/rtorrent/0001-cross_compile.patch deleted file mode 100644 index 1c40eaebb..000000000 --- a/buildroot/package/rtorrent/0001-cross_compile.patch +++ /dev/null @@ -1,54 +0,0 @@ -From d62f7474289970d5be3fd658dd6ace4489408bdf Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Mon, 5 Oct 2015 00:52:26 +0100 -Subject: [PATCH] Fix cross compilation, based on OpenWRT patch. - -[Vincent: tweak the patch for version 0.9.6] -[Bernd: tweak the patch for version 0.9.7] - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Vicente Olivert Riera -Signed-off-by: Bernd Kuhls ---- - scripts/checks.m4 | 2 +- - scripts/common.m4 | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/checks.m4 b/scripts/checks.m4 -index 8d77fc5..c446995 100644 ---- a/scripts/checks.m4 -+++ b/scripts/checks.m4 -@@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ - AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ - AC_MSG_CHECKING(whether kqueue supports pipes and ptys) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - #include - #include -diff --git a/scripts/common.m4 b/scripts/common.m4 -index 9885b03..a0af7e7 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses the stuff defined by the system. - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], -@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { - char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; --- -2.18.0 - diff --git a/buildroot/package/rtorrent/rtorrent.hash b/buildroot/package/rtorrent/rtorrent.hash index 9f5ef2b4f..a20e63782 100644 --- a/buildroot/package/rtorrent/rtorrent.hash +++ b/buildroot/package/rtorrent/rtorrent.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5d9842fe48c9582fbea2c7bf9f51412c1ccbba07d059b257039ad53b863fe8bb rtorrent-0.9.7.tar.gz +sha256 9edf0304bf142215d3bc85a0771446b6a72d0ad8218efbe184b41e4c9c7542af rtorrent-0.9.8.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/rtorrent/rtorrent.mk b/buildroot/package/rtorrent/rtorrent.mk index aaf86be64..bc3afe806 100644 --- a/buildroot/package/rtorrent/rtorrent.mk +++ b/buildroot/package/rtorrent/rtorrent.mk @@ -4,10 +4,9 @@ # ################################################################################ -RTORRENT_VERSION = 0.9.7 +RTORRENT_VERSION = 0.9.8 RTORRENT_SITE = http://rtorrent.net/downloads RTORRENT_DEPENDENCIES = host-pkgconf libcurl libtorrent ncurses -RTORRENT_AUTORECONF = YES RTORRENT_LICENSE = GPL-2.0 RTORRENT_LICENSE_FILES = COPYING diff --git a/buildroot/package/rtptools/0001-host2ip.c-disable-NIS-support-for-toolchains-lacking.patch b/buildroot/package/rtptools/0001-host2ip.c-disable-NIS-support-for-toolchains-lacking.patch deleted file mode 100644 index 1bf7c1349..000000000 --- a/buildroot/package/rtptools/0001-host2ip.c-disable-NIS-support-for-toolchains-lacking.patch +++ /dev/null @@ -1,73 +0,0 @@ -From f8ffde6c0c0a9008cd65601f6c9712899106e42c Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 11 Apr 2016 23:03:48 +0200 -Subject: [PATCH] host2ip.c: disable NIS support for toolchains lacking SUN RPC - -Some toolchains are missing SUN RPC; this is the case for toolchains -based on uClibc, and some glibc-based toolchains (when SUN RPC headers -were taken out of glibc). - -Add a configure check for the required SUN RPC header, and make the code -using SUN RPC conditional on the result. - -Also drop the legacy AM_C_PROTOTYPES: it is no longer supported by -autoconf and breaks autoreconf. - -Signed-off-by: Peter Korsgaard -[yann.morin.1998@free.fr: add the ./configure check; do not include - features.h; do not check specifically for uClibc] -Signed-off-by: "Yann E. MORIN" ---- - configure.in | 3 ++- - host2ip.c | 5 +++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index de394cf..889e6ed 100644 ---- a/configure.in -+++ b/configure.in -@@ -39,9 +39,10 @@ CU_CHECK_LIB(socket, socket) - dnl Checks for header files. - AC_HEADER_STDC - AC_CHECK_HEADERS(search.h sys/time.h unistd.h) -+AC_CHECK_HEADER([rpcsvc/ypclnt.h], -+ [AC_DEFINE([HAVE_YP],[1],[Define to 1 if you have rpcsvc/ypclnt.h])]) - - dnl Checks for typedefs, structures, and compiler characteristics. --AM_C_PROTOTYPES - AC_C_CONST - AC_C_BIGENDIAN - AC_TYPE_UID_T -diff --git a/host2ip.c b/host2ip.c -index b094343..95014cd 100644 ---- a/host2ip.c -+++ b/host2ip.c -@@ -3,7 +3,10 @@ - #include /* gethostbyname() */ - #include /* sockaddr_in */ - #include /* inet_addr() */ -+#ifdef HAVE_YP - #include /* YP */ -+#endif -+ - #include /* strlen() added by Akira 12/27/01 */ - #include "sysdep.h" - -@@ -28,6 +31,7 @@ struct in_addr host2ip(char *host) - else if ((hep = gethostbyname(host))) { - in = *(struct in_addr *)(hep->h_addr_list[0]); - } -+#ifdef HAVE_YP - /* As a last resort, try YP. */ - else { - static char *domain = 0; /* YP domain */ -@@ -39,5 +43,6 @@ struct in_addr host2ip(char *host) - in.s_addr = inet_addr(value); - } - } -+#endif - return in; - } /* host2ip */ --- -1.9.1 - diff --git a/buildroot/package/rtptools/rtptools.hash b/buildroot/package/rtptools/rtptools.hash index bf5b4a6f0..11c8c2ab4 100644 --- a/buildroot/package/rtptools/rtptools.hash +++ b/buildroot/package/rtptools/rtptools.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 99d681f6e328486fa1fc16581b0a5974e31eb2708101683ee9c8a0b6bed31050 rtptools-1.20.tar.gz +sha256 2c76b2a423fb943820c91194372133a44cbdc456ebf69c51616ec50eeb068c28 rtptools-1.22.tar.gz +sha256 f864592065e232c0b444ae9682a7a1a2c6aafe96712999f794bec24d4441a6a9 LICENSE diff --git a/buildroot/package/rtptools/rtptools.mk b/buildroot/package/rtptools/rtptools.mk index 7990e8f1c..2148b759a 100644 --- a/buildroot/package/rtptools/rtptools.mk +++ b/buildroot/package/rtptools/rtptools.mk @@ -4,10 +4,10 @@ # ################################################################################ -RTPTOOLS_VERSION = 1.20 +RTPTOOLS_VERSION = 1.22 RTPTOOLS_SITE = http://www.cs.columbia.edu/irt/software/rtptools/download -RTPTOOLS_LICENSE = MIT-like (research and education only) -RTPTOOLS_LICENSE_FILES = COPYRIGHT -RTPTOOLS_AUTORECONF = YES +RTPTOOLS_LICENSE = BSD-3-Clause +RTPTOOLS_LICENSE_FILES = LICENSE +RTPTOOLS_CONF_ENV = ac_cv_prog_FOUND_CLANG=no $(eval $(autotools-package)) diff --git a/buildroot/package/rubix/Config.in b/buildroot/package/rubix/Config.in index 7afc0ae7b..e814a95f5 100644 --- a/buildroot/package/rubix/Config.in +++ b/buildroot/package/rubix/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_RUBIX help A 3D rubiks cube game for X - http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix + http://sed.free.fr/rubix diff --git a/buildroot/package/rubix/rubix.hash b/buildroot/package/rubix/rubix.hash index 90fc9cd11..3992110c3 100644 --- a/buildroot/package/rubix/rubix.hash +++ b/buildroot/package/rubix/rubix.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 d3c6bf8bfa891e72baac0250a79d26045ddb4412b72d90de7c46091c07516b43 rubix-1.0.5.tar.bz2 +sha256 ccff4c98373f76c6bab751f5f5a60df7ad8691c79b56157e4aba2dd76f501a87 rubix-1.0.6.tar.bz2 +sha256 429d04118c02bc92d834c430601f8c0c8df1ab27e3617ec73ad3f66c5953475d LICENCE diff --git a/buildroot/package/rubix/rubix.mk b/buildroot/package/rubix/rubix.mk index b808bc0b8..937339f54 100644 --- a/buildroot/package/rubix/rubix.mk +++ b/buildroot/package/rubix/rubix.mk @@ -4,9 +4,9 @@ # ################################################################################ -RUBIX_VERSION = 1.0.5 +RUBIX_VERSION = 1.0.6 RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2 -RUBIX_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix +RUBIX_SITE = http://sed.free.fr/rubix RUBIX_LICENSE = Public Domain RUBIX_LICENSE_FILES = LICENCE RUBIX_DEPENDENCIES = xlib_libX11 @@ -18,4 +18,13 @@ RUBIX_MAKE_OPTS = \ RUBIX_INSTALL_TARGET_OPTS = GAMESDIR=$(TARGET_DIR)/usr/games install -$(eval $(autotools-package)) +define RUBIX_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(RUBIX_MAKE_OPTS) rubix +endef + +define RUBIX_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(RUBIX_MAKE_OPTS) \ + $(RUBIX_INSTALL_TARGET_OPTS) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/ruby/ruby.mk b/buildroot/package/ruby/ruby.mk index 1899d1479..0ac116433 100644 --- a/buildroot/package/ruby/ruby.mk +++ b/buildroot/package/ruby/ruby.mk @@ -48,6 +48,12 @@ endif ifeq ($(BR2_PACKAGE_BERKELEYDB),y) RUBY_DEPENDENCIES += berkeleydb endif +ifeq ($(BR2_PACKAGE_LIBFFI),y) +RUBY_DEPENDENCIES += libffi +else +# Disable fiddle to avoid a build failure with bundled-libffi on MIPS +RUBY_CONF_OPTS += --with-out-ext=fiddle +endif ifeq ($(BR2_PACKAGE_GDBM),y) RUBY_DEPENDENCIES += gdbm endif diff --git a/buildroot/package/runc/Config.in b/buildroot/package/runc/Config.in index 47c850ef3..f181ee334 100644 --- a/buildroot/package/runc/Config.in +++ b/buildroot/package/runc/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_RUNC bool "runc" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve help @@ -10,7 +10,7 @@ config BR2_PACKAGE_RUNC https://github.com/opencontainers/runc -comment "runc needs a glibc or musl toolchain toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS && \ - BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS +comment "runc needs a glibc or musl toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \ + BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAN_USES_UCLIBC diff --git a/buildroot/package/runc/runc.hash b/buildroot/package/runc/runc.hash index 3e8eff3cc..b895f6fcc 100644 --- a/buildroot/package/runc/runc.hash +++ b/buildroot/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2ec69c25df9f02c6fd38eb287145f8afba6772f809abe01df4534b5bfd68e8d4 runc-1.0.0-rc9.tar.gz +sha256 6b44985023347fb9c5a2cc6f761df8c41cc2c84a7a68a6e6acf834dff6653a9a runc-1.0.0-rc10.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/buildroot/package/runc/runc.mk b/buildroot/package/runc/runc.mk index 3432dd5fe..5982f62c4 100644 --- a/buildroot/package/runc/runc.mk +++ b/buildroot/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.0.0-rc9 +RUNC_VERSION = 1.0.0-rc10 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE diff --git a/buildroot/package/rust-bin/rust-bin.hash b/buildroot/package/rust-bin/rust-bin.hash index 36f959f25..96d81a347 100644 --- a/buildroot/package/rust-bin/rust-bin.hash +++ b/buildroot/package/rust-bin/rust-bin.hash @@ -1,33 +1,48 @@ -# From https://static.rust-lang.org/dist/rustc-1.29.2-i686-unknown-linux-gnu.tar.xz.sha256 -sha256 d251b3ade6a66856ff62ea86ed8d34f8cc2a9cd683bf42c3b0c0345f0d955b7c rustc-1.29.2-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rustc-1.29.2-x86_64-unknown-linux-gnu.tar.xz.sha256 -sha256 b0ea41cd20caf9af62394601b09d2c8b12814293f3cc1247a8c61fb672477499 rustc-1.29.2-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-aarch64-unknown-linux-gnu.tar.xz.sha256 -sha256 df62bdb6839e313f8f9c3a92b4de63ba2c37b9c7b534449a392db1ede0f6a741 rust-std-1.29.2-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-arm-unknown-linux-gnueabi.tar.xz.sha256 -sha256 7729765dab2945c688d0f10faf313c14aed22f6cfdc96a0a07292292662f260a rust-std-1.29.2-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-arm-unknown-linux-gnueabihf.tar.xz.sha256 -sha256 5e4f02edccd013b19b6d03c2a28bff4f81b9cdf7475882e1480aeb21378f93cf rust-std-1.29.2-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -sha256 d7e6ba57e790fc4e5d02c0b4b0471178b05341cf932bfc349b90ced9b939209e rust-std-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-i686-unknown-linux-gnu.tar.xz.sha256 -sha256 4e8c54a54b3060cde9e24d0c32585360098cc75a120543429ccf498d8b83b5d0 rust-std-1.29.2-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-mips-unknown-linux-gnu.tar.xz.sha256 -sha256 556596ac7e2dc462573e8379fd1596dc59394044b3a11f0c50f54642439cf8ab rust-std-1.29.2-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -sha256 8dac2dfc4db7932e6214e98494824453a7be8bb42cf29d5395cc2363fc2fb0c2 rust-std-1.29.2-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -sha256 361d70abfc27b7fdbe8642bc7413f9b55463e90350465de96183ff048fcf149f rust-std-1.29.2-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-mipsel-unknown-linux-gnu.tar.xz.sha256 -sha256 8005463e56932bdf272a047281cc20087db68d8fef4cbcf8cf4edf9a2260f8cc rust-std-1.29.2-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-powerpc-unknown-linux-gnu.tar.xz.sha256 -sha256 6cda45f5ee39dbfef95d516a1e0e25744b11d1a8147188b71c21f85f65bca9a9 rust-std-1.29.2-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-powerpc64-unknown-linux-gnu.tar.xz.sha256 -sha256 612f175c895a495e401205025805a9e8dffa53b2f105a55f92894b159a87fe28 rust-std-1.29.2-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -sha256 16034975bd09b57eb1579b659010f83b869733c9c018c2a189a385fa77923875 rust-std-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.29.2-x86_64-unknown-linux-gnu.tar.xz.sha256 -sha256 be16e9db4e39e5e1af0621eea715d13e0fdc56f7b14c3d7310905dc34dfa618a rust-std-1.29.2-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.33.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 90b6414eddbce4a245cdcaea8353d3a637ef565d2bd119e25a6c2bf3e38cdf63 rustc-1.33.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 57c5ced1a826d34f26e50adf041528dd0000f2a59e8be32d2359386843382ce1 rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 3e3449dada8306b3ff91f23c7803c7312a47e93af140f757b29b74f1e226a505 rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 ddb372a43fb2ba9949e78643df43d6ae447b70cefd440ccdd6b9f6c2ff929ea7 rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 1142d5064d8cbfab16ab71130e5a84804a1ebdfeb10173e6238adc0d757937b6 rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 8492b5c91a9ea7ee7e22881382c1b9ad8bb9a4147aff0dfee09940b34783e3d5 rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 e945dd37ab9b143dbcbcdbeaba63b8de47411a4ff815d2e178f745e183078127 rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 abf6b7050c1cdef092ecfde5128067434bb7989def19cfe95c06bfd71de07ba0 rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 9cad816c989c991ffd342d03956b54209d7d32743ebb9b0624b2d36d5bbd525f rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 c7ac98e7a7c3757b5bb8bde596455d50a8787236e290bc1f49e2d59d486ae564 rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 4ec3cade12e2e527f81d0b315e6a37152bf73938aab4a9216aef7d06ef913eb6 rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 0ab78e0cb710f35d108abce90bbf426947fed6222d2f6c04c9eba4ca00adea06 rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 4bc32bf4660a9fc5cd2af9e09f1bfb668b335442097fed6f3892b50950e97d3c rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 984d3ca2a47db04345a2bddd657761f66d209ef95a02097ad4bd549f45a0dc9f rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 6f20343ed73faf5fdfc423bec38a9bb1910a0a962af6f2dddd7184407543ed0e rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz # Locally generated sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/buildroot/package/rust-bin/rust-bin.mk b/buildroot/package/rust-bin/rust-bin.mk index 624ec94b4..a374215e2 100644 --- a/buildroot/package/rust-bin/rust-bin.mk +++ b/buildroot/package/rust-bin/rust-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_BIN_VERSION = 1.29.2 +RUST_BIN_VERSION = 1.33.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT @@ -28,8 +28,9 @@ define HOST_RUST_BIN_LIBSTD_EXTRACT $(call suitable-extractor,$(f)) $(HOST_RUST_BIN_DL_DIR)/$(f) | \ $(TAR) -C $(@D)/std $(TAR_OPTIONS) - ) - cd $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME); \ - ln -sf ../../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib + mkdir -p $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib + cd $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib; \ + ln -sf ../../../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib/* . endef HOST_RUST_BIN_POST_EXTRACT_HOOKS += HOST_RUST_BIN_LIBSTD_EXTRACT diff --git a/buildroot/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch b/buildroot/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch new file mode 100644 index 000000000..0c756e302 --- /dev/null +++ b/buildroot/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch @@ -0,0 +1,264 @@ +From 2d21df8a3fd7a68ba9f52389ead7f06f13190c12 Mon Sep 17 00:00:00 2001 +From: Mark Rousskov +Date: Mon, 21 Jan 2019 17:47:57 -0700 +Subject: [PATCH] Workaround presence of LLVM library in stage0/lib + +This commit works around the newly-introduced LLVM shared library. + +This is needed such that llvm-config run from +librustc_llvm's build script can correctly locate it's own LLVM, not the +one in stage0/lib. The LLVM build system uses the DT_RUNPATH/RUNPATH +header within the llvm-config binary, which we want to use, but because +Cargo always adds the host compiler's "libdir" (stage0/lib in our +case) to the dynamic linker's search path, we weren't properly finding +the freshly-built LLVM in llvm/lib. By restoring the environment +variable setting the search path to what bootstrap sees, the problem is +resolved and librustc_llvm correctly links and finds the appropriate +LLVM. + +Several run-make-fulldeps tests are also updated with similar handling. + +Signed-off-by: Eric Le Bihan +--- + src/bootstrap/builder.rs | 9 ++++++++- + src/bootstrap/compile.rs | 1 + + src/bootstrap/util.rs | 6 +++++- + src/build_helper/lib.rs | 19 +++++++++++++++++++ + src/librustc_asan/build.rs | 2 ++ + src/librustc_llvm/build.rs | 2 ++ + src/librustc_lsan/build.rs | 2 ++ + src/librustc_msan/build.rs | 2 ++ + src/librustc_tsan/build.rs | 2 ++ + .../cross-lang-lto-upstream-rlibs/Makefile | 4 ++-- + .../run-make-fulldeps/cross-lang-lto/Makefile | 19 ++++++++++--------- + 11 files changed, 55 insertions(+), 13 deletions(-) + +diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs +index a69ba20749..f742bce180 100644 +--- a/src/bootstrap/builder.rs ++++ b/src/bootstrap/builder.rs +@@ -21,7 +21,7 @@ use crate::install; + use crate::native; + use crate::test; + use crate::tool; +-use crate::util::{add_lib_path, exe, libdir}; ++use crate::util::{self, add_lib_path, exe, libdir}; + use crate::{Build, DocTests, Mode, GitRepo}; + + pub use crate::Compiler; +@@ -791,6 +791,13 @@ impl<'a> Builder<'a> { + .env("CARGO_TARGET_DIR", out_dir) + .arg(cmd); + ++ // See comment in librustc_llvm/build.rs for why this is necessary, largely llvm-config ++ // needs to not accidentally link to libLLVM in stage0/lib. ++ cargo.env("REAL_LIBRARY_PATH_VAR", &util::dylib_path_var()); ++ if let Some(e) = env::var_os(util::dylib_path_var()) { ++ cargo.env("REAL_LIBRARY_PATH", e); ++ } ++ + if cmd != "install" { + cargo.arg("--target") + .arg(target); +diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs +index b581271663..ec04dee6c3 100644 +--- a/src/bootstrap/compile.rs ++++ b/src/bootstrap/compile.rs +@@ -712,6 +712,7 @@ pub fn build_codegen_backend(builder: &Builder, + if builder.is_rust_llvm(target) && backend != "emscripten" { + cargo.env("LLVM_RUSTLLVM", "1"); + } ++ + cargo.env("LLVM_CONFIG", &llvm_config); + if backend != "emscripten" { + let target_config = builder.config.target_config.get(&target); +diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs +index 2880f1a084..37c6c040da 100644 +--- a/src/bootstrap/util.rs ++++ b/src/bootstrap/util.rs +@@ -70,7 +70,11 @@ pub fn dylib_path_var() -> &'static str { + /// Parses the `dylib_path_var()` environment variable, returning a list of + /// paths that are members of this lookup path. + pub fn dylib_path() -> Vec { +- env::split_paths(&env::var_os(dylib_path_var()).unwrap_or_default()).collect() ++ let var = match env::var_os(dylib_path_var()) { ++ Some(v) => v, ++ None => return vec![], ++ }; ++ env::split_paths(&var).collect() + } + + /// `push` all components to `buf`. On windows, append `.exe` to the last component. +diff --git a/src/build_helper/lib.rs b/src/build_helper/lib.rs +index 5a704e5577..c66c5c9249 100644 +--- a/src/build_helper/lib.rs ++++ b/src/build_helper/lib.rs +@@ -23,6 +23,25 @@ macro_rules! t { + }; + } + ++// Because Cargo adds the compiler's dylib path to our library search path, llvm-config may ++// break: the dylib path for the compiler, as of this writing, contains a copy of the LLVM ++// shared library, which means that when our freshly built llvm-config goes to load it's ++// associated LLVM, it actually loads the compiler's LLVM. In particular when building the first ++// compiler (i.e., in stage 0) that's a problem, as the compiler's LLVM is likely different from ++// the one we want to use. As such, we restore the environment to what bootstrap saw. This isn't ++// perfect -- we might actually want to see something from Cargo's added library paths -- but ++// for now it works. ++pub fn restore_library_path() { ++ println!("cargo:rerun-if-env-changed=REAL_LIBRARY_PATH_VAR"); ++ println!("cargo:rerun-if-env-changed=REAL_LIBRARY_PATH"); ++ let key = env::var_os("REAL_LIBRARY_PATH_VAR").expect("REAL_LIBRARY_PATH_VAR"); ++ if let Some(env) = env::var_os("REAL_LIBRARY_PATH") { ++ env::set_var(&key, &env); ++ } else { ++ env::remove_var(&key); ++ } ++} ++ + pub fn run(cmd: &mut Command) { + println!("running: {:?}", cmd); + run_silent(cmd); +diff --git a/src/librustc_asan/build.rs b/src/librustc_asan/build.rs +index 2d921b6669..b42d775deb 100644 +--- a/src/librustc_asan/build.rs ++++ b/src/librustc_asan/build.rs +@@ -8,6 +8,8 @@ use cmake::Config; + + fn main() { + if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { ++ build_helper::restore_library_path(); ++ + let (native, target) = match sanitizer_lib_boilerplate("asan") { + Ok(native) => native, + _ => return, +diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs +index ec3dff783c..cd91fcb299 100644 +--- a/src/librustc_llvm/build.rs ++++ b/src/librustc_llvm/build.rs +@@ -24,6 +24,8 @@ fn main() { + return; + } + ++ build_helper::restore_library_path(); ++ + let target = env::var("TARGET").expect("TARGET was not set"); + let llvm_config = env::var_os("LLVM_CONFIG") + .map(PathBuf::from) +diff --git a/src/librustc_lsan/build.rs b/src/librustc_lsan/build.rs +index 470f2bb3e5..ad528bb039 100644 +--- a/src/librustc_lsan/build.rs ++++ b/src/librustc_lsan/build.rs +@@ -8,6 +8,8 @@ use cmake::Config; + + fn main() { + if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { ++ build_helper::restore_library_path(); ++ + let (native, target) = match sanitizer_lib_boilerplate("lsan") { + Ok(native) => native, + _ => return, +diff --git a/src/librustc_msan/build.rs b/src/librustc_msan/build.rs +index e1140278f2..085514b5a0 100644 +--- a/src/librustc_msan/build.rs ++++ b/src/librustc_msan/build.rs +@@ -8,6 +8,8 @@ use cmake::Config; + + fn main() { + if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { ++ build_helper::restore_library_path(); ++ + let (native, target) = match sanitizer_lib_boilerplate("msan") { + Ok(native) => native, + _ => return, +diff --git a/src/librustc_tsan/build.rs b/src/librustc_tsan/build.rs +index f63bb46b87..0db3db392d 100644 +--- a/src/librustc_tsan/build.rs ++++ b/src/librustc_tsan/build.rs +@@ -8,6 +8,8 @@ use cmake::Config; + + fn main() { + if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { ++ build_helper::restore_library_path(); ++ + let (native, target) = match sanitizer_lib_boilerplate("tsan") { + Ok(native) => native, + _ => return, +diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile +index 0a6f226a02..6992dab1a1 100644 +--- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile ++++ b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile +@@ -9,7 +9,7 @@ all: staticlib.rs upstream.rs + + # Check No LTO + $(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -L. -o $(TMPDIR)/staticlib.a +- (cd $(TMPDIR); llvm-ar x ./staticlib.a) ++ (cd $(TMPDIR); $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x ./staticlib.a) + # Make sure the upstream object file was included + ls $(TMPDIR)/upstream.*.rcgu.o + +@@ -19,5 +19,5 @@ all: staticlib.rs upstream.rs + # Check ThinLTO + $(RUSTC) upstream.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin + $(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin -L. -o $(TMPDIR)/staticlib.a +- (cd $(TMPDIR); llvm-ar x ./staticlib.a) ++ (cd $(TMPDIR); $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x ./staticlib.a) + ls $(TMPDIR)/upstream.*.rcgu.o +diff --git a/src/test/run-make-fulldeps/cross-lang-lto/Makefile b/src/test/run-make-fulldeps/cross-lang-lto/Makefile +index 1d072e03de..4d1fb7b953 100644 +--- a/src/test/run-make-fulldeps/cross-lang-lto/Makefile ++++ b/src/test/run-make-fulldeps/cross-lang-lto/Makefile +@@ -5,8 +5,9 @@ + # LLVM bitcode files (as used by linker LTO plugins) when compiling with + # -Z cross-lang-lto. + +-ASSERT_IS_BITCODE_OBJ=llvm-bcanalyzer # this only succeeds for bitcode files +-EXTRACT_OBJS=(cd $(TMPDIR); rm -f ./*.o; llvm-ar x $(1)) ++# this only succeeds for bitcode files ++ASSERT_IS_BITCODE_OBJ=($(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-bcanalyzer $(1)) ++EXTRACT_OBJS=(cd $(TMPDIR); rm -f ./*.o; $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x $(1)) + + BUILD_LIB=$(RUSTC) lib.rs -Copt-level=2 -Z cross-lang-lto=on -Ccodegen-units=1 + BUILD_EXE=$(RUSTC) main.rs -Copt-level=2 -Z cross-lang-lto=on -Ccodegen-units=1 --emit=obj +@@ -16,31 +17,31 @@ all: staticlib staticlib-fat-lto staticlib-thin-lto rlib exe cdylib rdylib + staticlib: lib.rs + $(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib.a + $(call EXTRACT_OBJS, liblib.a) +- for file in $(TMPDIR)/liblib.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done ++ for file in $(TMPDIR)/liblib.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done + + staticlib-fat-lto: lib.rs + $(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib-fat-lto.a -Clto=fat + $(call EXTRACT_OBJS, liblib-fat-lto.a) +- for file in $(TMPDIR)/liblib-fat-lto.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done ++ for file in $(TMPDIR)/liblib-fat-lto.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done + + staticlib-thin-lto: lib.rs + $(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib-thin-lto.a -Clto=thin + $(call EXTRACT_OBJS, liblib-thin-lto.a) +- for file in $(TMPDIR)/liblib-thin-lto.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done ++ for file in $(TMPDIR)/liblib-thin-lto.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done + + rlib: lib.rs + $(BUILD_LIB) --crate-type=rlib -o $(TMPDIR)/liblib.rlib + $(call EXTRACT_OBJS, liblib.rlib) +- for file in $(TMPDIR)/liblib.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done ++ for file in $(TMPDIR)/liblib.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done + + cdylib: lib.rs + $(BUILD_LIB) --crate-type=cdylib --emit=obj -o $(TMPDIR)/cdylib.o +- $(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/cdylib.o ++ $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/cdylib.o) + + rdylib: lib.rs + $(BUILD_LIB) --crate-type=dylib --emit=obj -o $(TMPDIR)/rdylib.o +- $(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/rdylib.o ++ $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/rdylib.o) + + exe: lib.rs + $(BUILD_EXE) -o $(TMPDIR)/exe.o +- $(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/exe.o ++ $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/exe.o) +-- +2.17.2 + diff --git a/buildroot/package/rust/rust.hash b/buildroot/package/rust/rust.hash index 1caab5a4c..62e2e1855 100644 --- a/buildroot/package/rust/rust.hash +++ b/buildroot/package/rust/rust.hash @@ -1,5 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.29.2-src.tar.xz.sha256 -sha256 bc7b9d4c041fe8454892a4211a116a4d5243cb04583a18c5292914fc829cb2f6 rustc-1.29.2-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz.asc +sha256 f4b1a72f1a29b23dcc9d7be5f60878f0434560513273906aa93dcd5c0de39b71 rustc-1.33.0-src.tar.xz # Locally generated sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/buildroot/package/rust/rust.mk b/buildroot/package/rust/rust.mk index bf110f8ad..5d14fc668 100644 --- a/buildroot/package/rust/rust.mk +++ b/buildroot/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.29.2 +RUST_VERSION = 1.33.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT @@ -16,17 +16,10 @@ HOST_RUST_DEPENDENCIES = \ toolchain \ host-rust-bin \ host-cargo-bin \ + host-openssl \ host-python \ $(BR2_CMAKE_HOST_DEPENDENCY) -ifeq ($(BR2_PACKAGE_JEMALLOC),y) -HOST_RUST_DEPENDENCIES += jemalloc -HOST_RUST_JEMALLOC_ENABLED = true -HOST_RUST_JEMALLOC_CONF = 'jemalloc = "$(STAGING_DIR)/usr/lib/libjemalloc_pic.a"' -else -HOST_RUST_JEMALLOC_ENABLED = false -endif - HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) # Some vendor crates contain Cargo.toml.orig files. The associated @@ -60,7 +53,6 @@ define HOST_RUST_CONFIGURE_CMDS echo '[install]'; \ echo 'prefix = "$(HOST_DIR)"'; \ echo '[rust]'; \ - echo 'use-jemalloc = $(HOST_RUST_JEMALLOC_ENABLED)'; \ echo 'channel = "stable"'; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \ diff --git a/buildroot/package/rustc/Config.in.host b/buildroot/package/rustc/Config.in.host index c58ffdf35..d595efbc6 100644 --- a/buildroot/package/rustc/Config.in.host +++ b/buildroot/package/rustc/Config.in.host @@ -49,7 +49,6 @@ choice config BR2_PACKAGE_HOST_RUST bool "host rust" - depends on BR2_HOST_GCC_AT_LEAST_4_7 # required by LLVM # triggers ICE on trunc_int_for_mode, at explow.c:56 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_aarch64 help @@ -61,9 +60,6 @@ comment "host-rust needs a toolchain w/ gcc >= 5" depends on BR2_aarch64 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 -comment "host-rust needs host gcc >= 4.7" - depends on !BR2_HOST_GCC_AT_LEAST_4_7 - config BR2_PACKAGE_HOST_RUST_BIN bool "host rust (pre-built)" help diff --git a/buildroot/package/rygel/rygel.mk b/buildroot/package/rygel/rygel.mk index de5cacd12..d87beda8c 100644 --- a/buildroot/package/rygel/rygel.mk +++ b/buildroot/package/rygel/rygel.mk @@ -66,9 +66,6 @@ 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/buildroot/package/s6-dns/s6-dns.hash b/buildroot/package/s6-dns/s6-dns.hash index 483d4f0e4..5ee12ae27 100644 --- a/buildroot/package/s6-dns/s6-dns.hash +++ b/buildroot/package/s6-dns/s6-dns.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 a828583e48741927c88de3822283c317c792ffc15d5e9043f29625b87ba38740 s6-dns-2.3.0.0.tar.gz -sha256 6ee77e7199d69b707ab864ea7a838f9562717aaa41c89413bdb2cf835f95052f COPYING +sha256 415e3e8a8baaa39b3eac57eef8b3023d63bcdb33d9f9b03bcb298fd940589132 s6-dns-2.3.1.1.tar.gz +sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING diff --git a/buildroot/package/s6-dns/s6-dns.mk b/buildroot/package/s6-dns/s6-dns.mk index 42639aa9c..7384f0724 100644 --- a/buildroot/package/s6-dns/s6-dns.mk +++ b/buildroot/package/s6-dns/s6-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_DNS_VERSION = 2.3.0.0 +S6_DNS_VERSION = 2.3.1.1 S6_DNS_SITE = http://skarnet.org/software/s6-dns S6_DNS_LICENSE = ISC S6_DNS_LICENSE_FILES = COPYING diff --git a/buildroot/package/s6-linux-init/s6-linux-init.hash b/buildroot/package/s6-linux-init/s6-linux-init.hash index 8f3c7fa29..bc2f7072c 100644 --- a/buildroot/package/s6-linux-init/s6-linux-init.hash +++ b/buildroot/package/s6-linux-init/s6-linux-init.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 d4ac9b8bde3e678353c85dad1a2a25066a40f843c53840c4210839068635ed7e s6-linux-init-0.4.0.0.tar.gz -sha256 1377d3b18a31de11e8bb06f0f46888a23bc16cbc57285035793bf7e7943bbcb3 COPYING +sha256 216af5589c2bc5dbdea6b6c94d55575c12e31f57b2e0fde5c534a840aeed02fb s6-linux-init-1.0.3.1.tar.gz +sha256 487e89990a571700bcdf7c0cbbde2859446f79e85e8b59791adab98fff6b1889 COPYING diff --git a/buildroot/package/s6-linux-init/s6-linux-init.mk b/buildroot/package/s6-linux-init/s6-linux-init.mk index d25504ae5..71c727de0 100644 --- a/buildroot/package/s6-linux-init/s6-linux-init.mk +++ b/buildroot/package/s6-linux-init/s6-linux-init.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_LINUX_INIT_VERSION = 0.4.0.0 +S6_LINUX_INIT_VERSION = 1.0.3.1 S6_LINUX_INIT_SITE = http://skarnet.org/software/s6-linux-init S6_LINUX_INIT_LICENSE = ISC S6_LINUX_INIT_LICENSE_FILES = COPYING diff --git a/buildroot/package/s6-linux-utils/s6-linux-utils.hash b/buildroot/package/s6-linux-utils/s6-linux-utils.hash index 20af7328d..638b6b816 100644 --- a/buildroot/package/s6-linux-utils/s6-linux-utils.hash +++ b/buildroot/package/s6-linux-utils/s6-linux-utils.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 78571574464c76fc623ef50dc14800138b4fd98c5fa877af6850fdd9c2f90213 s6-linux-utils-2.5.0.0.tar.gz -sha256 3eadcf980c40da0f257b8292d805ff41e5e5a908c1942315d9a627732e1aa012 COPYING +sha256 25f61961f3247b9a833536ebd1e19f3b024fa095fce30f93d82fdfd4e015dc02 s6-linux-utils-2.5.1.1.tar.gz +sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING diff --git a/buildroot/package/s6-linux-utils/s6-linux-utils.mk b/buildroot/package/s6-linux-utils/s6-linux-utils.mk index 619f4c373..926ec523a 100644 --- a/buildroot/package/s6-linux-utils/s6-linux-utils.mk +++ b/buildroot/package/s6-linux-utils/s6-linux-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_LINUX_UTILS_VERSION = 2.5.0.0 +S6_LINUX_UTILS_VERSION = 2.5.1.1 S6_LINUX_UTILS_SITE = http://skarnet.org/software/s6-linux-utils S6_LINUX_UTILS_LICENSE = ISC S6_LINUX_UTILS_LICENSE_FILES = COPYING diff --git a/buildroot/package/s6-networking/s6-networking.hash b/buildroot/package/s6-networking/s6-networking.hash index 46f88e038..41ceda0c0 100644 --- a/buildroot/package/s6-networking/s6-networking.hash +++ b/buildroot/package/s6-networking/s6-networking.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 d81968756abbcecde6a872c89d82f643cd621a0c295c2c57650705dbe875481a s6-networking-2.3.0.2.tar.gz -sha256 6ee77e7199d69b707ab864ea7a838f9562717aaa41c89413bdb2cf835f95052f COPYING +sha256 9d411b5f742529be8e14da0a21635fcc304a4d7ac05fe0e45cf2355e5e3cf188 s6-networking-2.3.1.1.tar.gz +sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING diff --git a/buildroot/package/s6-networking/s6-networking.mk b/buildroot/package/s6-networking/s6-networking.mk index b621eb225..c23445b96 100644 --- a/buildroot/package/s6-networking/s6-networking.mk +++ b/buildroot/package/s6-networking/s6-networking.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_NETWORKING_VERSION = 2.3.0.2 +S6_NETWORKING_VERSION = 2.3.1.1 S6_NETWORKING_SITE = http://skarnet.org/software/s6-networking S6_NETWORKING_LICENSE = ISC S6_NETWORKING_LICENSE_FILES = COPYING diff --git a/buildroot/package/s6-portable-utils/s6-portable-utils.hash b/buildroot/package/s6-portable-utils/s6-portable-utils.hash index f27d0b8cc..83823b343 100644 --- a/buildroot/package/s6-portable-utils/s6-portable-utils.hash +++ b/buildroot/package/s6-portable-utils/s6-portable-utils.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 6ae239d2c458a81c92b5d616129e443874f925bf3da02589913a1a3b708c4531 s6-portable-utils-2.2.1.1.tar.gz -sha256 6ee77e7199d69b707ab864ea7a838f9562717aaa41c89413bdb2cf835f95052f COPYING +sha256 1e473224350c6ebedd7adf162b68303e2e0a32ca2e99d7afee7573d9e78f931c s6-portable-utils-2.2.2.1.tar.gz +sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING diff --git a/buildroot/package/s6-portable-utils/s6-portable-utils.mk b/buildroot/package/s6-portable-utils/s6-portable-utils.mk index a15bca1ed..8b60bf43e 100644 --- a/buildroot/package/s6-portable-utils/s6-portable-utils.mk +++ b/buildroot/package/s6-portable-utils/s6-portable-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_PORTABLE_UTILS_VERSION = 2.2.1.1 +S6_PORTABLE_UTILS_VERSION = 2.2.2.1 S6_PORTABLE_UTILS_SITE = http://skarnet.org/software/s6-portable-utils S6_PORTABLE_UTILS_LICENSE = ISC S6_PORTABLE_UTILS_LICENSE_FILES = COPYING diff --git a/buildroot/package/s6-rc/s6-rc.hash b/buildroot/package/s6-rc/s6-rc.hash index e8bb7ae36..918dc0fd2 100644 --- a/buildroot/package/s6-rc/s6-rc.hash +++ b/buildroot/package/s6-rc/s6-rc.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 4b4b6205e31e85be583a165a994552d0f30ebcdabbdd919f9f469815d7679e5c s6-rc-0.4.0.1.tar.gz -sha256 1377d3b18a31de11e8bb06f0f46888a23bc16cbc57285035793bf7e7943bbcb3 COPYING +sha256 257e2c428336c2b57cd17b65382bc55592759acc65e053e23ad646444f28af52 s6-rc-0.5.1.1.tar.gz +sha256 487e89990a571700bcdf7c0cbbde2859446f79e85e8b59791adab98fff6b1889 COPYING diff --git a/buildroot/package/s6-rc/s6-rc.mk b/buildroot/package/s6-rc/s6-rc.mk index 222ba139c..304434137 100644 --- a/buildroot/package/s6-rc/s6-rc.mk +++ b/buildroot/package/s6-rc/s6-rc.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_RC_VERSION = 0.4.0.1 +S6_RC_VERSION = 0.5.1.1 S6_RC_SITE = http://skarnet.org/software/s6-rc S6_RC_LICENSE = ISC S6_RC_LICENSE_FILES = COPYING diff --git a/buildroot/package/s6/s6.hash b/buildroot/package/s6/s6.hash index 12791a976..9b355351e 100644 --- a/buildroot/package/s6/s6.hash +++ b/buildroot/package/s6/s6.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 f37547f2890eb50bcb4cd46ffa38bad5ec9e6fd6bc7b73a8df0bdf0cf11f01a9 s6-2.7.1.1.tar.gz -sha256 3eadcf980c40da0f257b8292d805ff41e5e5a908c1942315d9a627732e1aa012 COPYING +sha256 e0cdbaf26e3ba1c41ecc0a8d1f45fb78194f96109b55cabeb849528b7e966c57 s6-2.9.0.1.tar.gz +sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING diff --git a/buildroot/package/s6/s6.mk b/buildroot/package/s6/s6.mk index 83945b08d..ec1407381 100644 --- a/buildroot/package/s6/s6.mk +++ b/buildroot/package/s6/s6.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_VERSION = 2.7.1.1 +S6_VERSION = 2.9.0.1 S6_SITE = http://skarnet.org/software/s6 S6_LICENSE = ISC S6_LICENSE_FILES = COPYING diff --git a/buildroot/package/safeclib/0001-Add-disable-doc-option.patch b/buildroot/package/safeclib/0001-Add-disable-doc-option.patch deleted file mode 100644 index 5d71173f1..000000000 --- a/buildroot/package/safeclib/0001-Add-disable-doc-option.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0d56b6327f6b652511c3e4c72382f4dc4d194e10 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Mar 2018 20:12:28 +0100 -Subject: [PATCH] Add --disable-doc option - -This option allows the user to disable man pages even if pod2man and -doxygen programs are found - -Signed-off-by: Fabrice Fontaine -Upstream-status: Accepted (https://github.com/rurban/safeclib/commit/86404f0e2a7f2a9cad9c916b643594d4d07721d1) ---- - Makefile.am | 2 ++ - configure.ac | 10 ++++++++++ - 2 files changed, 12 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 0f65c5c1..ce1424bb 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -104,6 +104,7 @@ LIBTOOL_DISTCLEAN_FILES = \ - build-tools/test-driver - DISTCLEANFILES = .version - -+if ENABLE_DOC - MAN1_SOURCES = doc/man/man1/check_for_unsafe_apis.1 - dist_man_MANS = - if HAVE_POD2MAN -@@ -560,6 +561,7 @@ clean-local: - rm -rf $(builddir)/doc/html - rm -rf $(builddir)/doc/man - endif -+endif - - if ENABLE_GCOV - gcov: check -diff --git a/configure.ac b/configure.ac -index 0e4e5eea..33ed7326 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -339,6 +339,16 @@ else - AC_MSG_RESULT([no (default)]) - fi - -+AC_ARG_ENABLE(doc, -+ AS_HELP_STRING([--disable-doc], -+ [disable documentation @<:@default=no@:>@]), -+ [case "${enableval}" in -+ yes) enable_doc=true ;; -+ no) enable_doc=false ;; -+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-doc]) ;; -+ esac], [enable_doc=true]) -+AM_CONDITIONAL(ENABLE_DOC, test "x$enable_doc" = "xtrue") -+ - dnl for windows dllimport. checking pic_flag DLL_EXPORT would be better, - dnl but this is only enabled for the shared objs, and we need it in the config - dnl for our tests. --- -2.14.1 - diff --git a/buildroot/package/safeclib/0002-add-pic_flag-to-RETPOLINE-cflags-and-ldflags.patch b/buildroot/package/safeclib/0002-add-pic_flag-to-RETPOLINE-cflags-and-ldflags.patch deleted file mode 100644 index f4f4eaab9..000000000 --- a/buildroot/package/safeclib/0002-add-pic_flag-to-RETPOLINE-cflags-and-ldflags.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 23ae79fe84a3fa5d995b8c6b9be70587e37a6cd8 Mon Sep 17 00:00:00 2001 -From: Reini Urban -Date: Mon, 26 Mar 2018 18:31:30 +0200 -Subject: [PATCH] add pic_flag to RETPOLINE cflags and ldflags - -This fixes the linke probe, and fixes #55. -Also: libtool is stripping pic_flags from the shared link cmd. - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/rurban/safeclib/commit/23ae79fe84a3fa5d995b8c6b9be70587e37a6cd8] ---- - configure.ac | 2 +- - m4/ax_compiler_flags_cflags.m4 | 4 ++-- - m4/ax_compiler_flags_ldflags.m4 | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 33ed7326..10325dc6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,7 @@ - # 2017 Reini Urban - # - # Copyright (c) 2012, 2013 Cisco Systems --# Copyright (c) 2017 Reini Urban -+# Copyright (c) 2017, 2018 Reini Urban - # All rights reserved. - # - # Permission is hereby granted, free of charge, to any person -diff --git a/m4/ax_compiler_flags_cflags.m4 b/m4/ax_compiler_flags_cflags.m4 -index 31e3ba8c..1dec00b2 100644 ---- a/m4/ax_compiler_flags_cflags.m4 -+++ b/m4/ax_compiler_flags_cflags.m4 -@@ -66,12 +66,12 @@ AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[ - ]) - - # retpoline: clang-7. Note: requires lld-7 linker support -- AX_APPEND_COMPILE_FLAGS(["-mretpoline -DRETPOLINE"], -+ AX_APPEND_COMPILE_FLAGS(["-mretpoline -DRETPOLINE $lt_prog_compiler_pic"], - [RETPOLINE_CFLAGS],[$ax_compiler_flags_test]) - # or the equivalent gcc-7.3 variant - if test -z "$RETPOLINE_CFLAGS"; then - AX_APPEND_COMPILE_FLAGS( -- ["-mindirect-branch=thunk-extern -mfunction-return=thunk-extern -mindirect-branch-register -DRETPOLINE"], -+ ["-mindirect-branch=thunk-extern -mfunction-return=thunk-extern -mindirect-branch-register $lt_prog_compiler_pic -DRETPOLINE"], - [RETPOLINE_CFLAGS],[$ax_compiler_flags_test]) - fi - -diff --git a/m4/ax_compiler_flags_ldflags.m4 b/m4/ax_compiler_flags_ldflags.m4 -index d0287852..193f412e 100644 ---- a/m4/ax_compiler_flags_ldflags.m4 -+++ b/m4/ax_compiler_flags_ldflags.m4 -@@ -66,7 +66,7 @@ AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[ - dnl /usr/bin/ld: warning: -z retpolineplt ignored. - case $RETPOLINE_CFLAGS in - *-mretpoline*|*-mindirect-branch=thunk-extern*) -- AX_APPEND_LINK_FLAGS([-Wl,-z,retpolineplt], -+ AX_APPEND_LINK_FLAGS(["$RETPOLINE_CFLAGS -Wl,-z,retpolineplt"], - [RETPOLINE_LDFLAGS],[$ax_compiler_flags_test]) - if test -n "$RETPOLINE_LDFLAGS"; then - AM_CFLAGS="$AM_CFLAGS $RETPOLINE_CFLAGS" diff --git a/buildroot/package/safeclib/0003-Define-_GNU_SOURCE-when-needed.patch b/buildroot/package/safeclib/0003-Define-_GNU_SOURCE-when-needed.patch deleted file mode 100644 index cc9e58079..000000000 --- a/buildroot/package/safeclib/0003-Define-_GNU_SOURCE-when-needed.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 94c7b765202fe50894425364834beca79e52b255 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 28 Oct 2019 17:09:43 +0100 -Subject: [PATCH] Define _GNU_SOURCE when needed - -Define _GNU_SOURCE to fix build with musl otherwise we'll got the -following build failures due to localtime_r, strnlen, gmtime_r and -asctime_r being undefined: - -os/localtime_s.c:124:12: error: implicit declaration of function 'localtime_r'; did you mean 'localtime_s'? [-Werror=implicit-function-declaration] - dest = localtime_r(timer, dest); - ^~~~~~~~~~~ - -io/gets_s.c:144:32: error: implicit declaration of function 'strnlen'; did you mean 'strlen'? [-Werror=implicit-function-declaration] - rsize_t len = (rsize_t)strnlen(dest, dmax); - ^~~~~~~ - strlen - -An other option would be to define AC_GNU_SOURCE in the configure.ac but -it seems that there is some handling of _GNU_SOURCE in -safeclib_private.h - -Fixes: - - http://autobuild.buildroot.net/results/31a4b647ec0dcd9f517f313ec6c7c8f56da1ee47 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/rurban/safeclib/commit/94c7b765202fe50894425364834beca79e52b255] ---- - src/extmem/memzero_s.c | 2 ++ - src/io/gets_s.c | 2 ++ - src/os/asctime_s.c | 2 ++ - src/os/ctime_s.c | 2 ++ - src/os/gmtime_s.c | 2 ++ - src/os/localtime_s.c | 2 ++ - 6 files changed, 12 insertions(+) - -diff --git a/src/extmem/memzero_s.c b/src/extmem/memzero_s.c -index 75107215..20cb2784 100644 ---- a/src/extmem/memzero_s.c -+++ b/src/extmem/memzero_s.c -@@ -31,6 +31,8 @@ - *------------------------------------------------------------------ - */ - -+#define _GNU_SOURCE -+ - #ifdef FOR_DOXYGEN - #include "safe_mem_lib.h" - #else -diff --git a/src/io/gets_s.c b/src/io/gets_s.c -index 09350b3d..be875a1c 100644 ---- a/src/io/gets_s.c -+++ b/src/io/gets_s.c -@@ -29,6 +29,8 @@ - *------------------------------------------------------------------ - */ - -+#define _GNU_SOURCE -+ - #ifdef FOR_DOXYGEN - #include "safe_lib.h" - #else -diff --git a/src/os/asctime_s.c b/src/os/asctime_s.c -index 42669844..01cefd8f 100644 ---- a/src/os/asctime_s.c -+++ b/src/os/asctime_s.c -@@ -29,6 +29,8 @@ - *------------------------------------------------------------------ - */ - -+#define _GNU_SOURCE -+ - #ifdef FOR_DOXYGEN - #include "safe_lib.h" - #else -diff --git a/src/os/ctime_s.c b/src/os/ctime_s.c -index 01b31f63..7a1a138c 100644 ---- a/src/os/ctime_s.c -+++ b/src/os/ctime_s.c -@@ -29,6 +29,8 @@ - *------------------------------------------------------------------ - */ - -+#define _GNU_SOURCE -+ - #ifdef FOR_DOXYGEN - #include "safe_lib.h" - #else -diff --git a/src/os/gmtime_s.c b/src/os/gmtime_s.c -index ff9a0e24..cd8f064f 100644 ---- a/src/os/gmtime_s.c -+++ b/src/os/gmtime_s.c -@@ -29,6 +29,8 @@ - *------------------------------------------------------------------ - */ - -+#define _GNU_SOURCE -+ - #ifdef FOR_DOXYGEN - #include "safe_lib.h" - #else -diff --git a/src/os/localtime_s.c b/src/os/localtime_s.c -index 0ce3324b..92ea21b9 100644 ---- a/src/os/localtime_s.c -+++ b/src/os/localtime_s.c -@@ -29,6 +29,8 @@ - *------------------------------------------------------------------ - */ - -+#define _GNU_SOURCE -+ - #ifdef FOR_DOXYGEN - #include "safe_lib.h" - #else diff --git a/buildroot/package/safeclib/safeclib.hash b/buildroot/package/safeclib/safeclib.hash index 2a6fe86a5..7e1c6794e 100644 --- a/buildroot/package/safeclib/safeclib.hash +++ b/buildroot/package/safeclib/safeclib.hash @@ -1,3 +1,5 @@ -# Locally computed: -sha256 51f66832853322a4fbe677e196ab4c68317261829edb5e56725ed96a07ea50e6 safeclib-v03032018.tar.gz +# From https://github.com/rurban/safeclib/releases/tag/v08112019 +sha256 bc2f25875522c50a3a5901981020d906db0b6a7d365619b8d72412c126be3923 libsafec-08112019.0-gad76c7.tar.bz2 + +# Hash for license file sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b COPYING diff --git a/buildroot/package/safeclib/safeclib.mk b/buildroot/package/safeclib/safeclib.mk index e4aaa3ff5..3af8fbb16 100644 --- a/buildroot/package/safeclib/safeclib.mk +++ b/buildroot/package/safeclib/safeclib.mk @@ -4,12 +4,12 @@ # ################################################################################ -SAFECLIB_VERSION = v03032018 -SAFECLIB_SITE = $(call github,rurban,safeclib,$(SAFECLIB_VERSION)) +SAFECLIB_VERSION = 08112019 +SAFECLIB_SITE = \ + https://github.com/rurban/safeclib/releases/download/v$(SAFECLIB_VERSION) +SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).0-gad76c7.tar.bz2 SAFECLIB_LICENSE = MIT SAFECLIB_LICENSE_FILES = COPYING SAFECLIB_INSTALL_STAGING = YES -# From git -SAFECLIB_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/samba4/0001-libreplace-disable-libbsd-support.patch b/buildroot/package/samba4/0001-libreplace-disable-libbsd-support.patch index ae46c447f..a303fa666 100644 --- a/buildroot/package/samba4/0001-libreplace-disable-libbsd-support.patch +++ b/buildroot/package/samba4/0001-libreplace-disable-libbsd-support.patch @@ -1,4 +1,4 @@ -From fc0304ba92ec7ae9a2f75fbc31d97fee39d19665 Mon Sep 17 00:00:00 2001 +From 4df82c9e03b68dc1621fe4c9ac6a29ae3e64e07e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 7 Sep 2016 23:03:43 -0300 Subject: [PATCH] libreplace: disable libbsd support @@ -16,10 +16,10 @@ Signed-off-by: Bernd Kuhls 1 file changed, 15 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 6c7de5953f0..ac230d719f7 100644 +index 240d730cbee..c6d8df43c74 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -304,21 +304,6 @@ def configure(conf): +@@ -381,21 +381,6 @@ def configure(conf): strlcpy_in_bsd = False @@ -42,5 +42,5 @@ index 6c7de5953f0..ac230d719f7 100644 struct ucred cred; socklen_t cred_len; -- -2.18.0 +2.20.1 diff --git a/buildroot/package/samba4/0002-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch b/buildroot/package/samba4/0002-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch deleted file mode 100644 index c1418bd88..000000000 --- a/buildroot/package/samba4/0002-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 5627ea3826a00c149ff3d49c40706217043a014d Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 28 Jan 2018 11:57:11 +0100 -Subject: [PATCH] Fix uClibc build on 64bit platforms by including stdint.h - -Fixes an error detected by buildroot autobuilders: -http://autobuild.buildroot.net/results/573/573e2268e205e10d1352fa81122d8f225fdb4575/build-end.log - -/home/rclinux/rc-buildroot-test/scripts/instance-1/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27: -error: conflicting types for 'uintptr_t' - typedef unsigned long int uintptr_t; - ^ -In file included from ../lib/ldb/tests/ldb_msg.c:17:0: -../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here - typedef unsigned int uintptr_t; - -The define __WORDSIZE is missing when cmocka.h decides how to -define uintptr_t, this patch includes stdint.h when needed. - -Patch sent upstream: -https://lists.samba.org/archive/samba-technical/2018-January/125306.html - -[updated for samba-4.8.4, v2 sent upstream - https://lists.samba.org/archive/samba-technical/2018-August/129732.html, - updated for samba-4.9.1] - -Signed-off-by: Bernd Kuhls ---- - lib/ldb/tests/ldb_kv_ops_test.c | 1 + - lib/ldb/tests/ldb_mod_op_test.c | 1 + - lib/ldb/tests/ldb_msg.c | 1 + - lib/ldb/tests/ldb_tdb_test.c | 1 + - lib/ldb/tests/test_ldb_qsort.c | 1 + - lib/util/tests/test_ms_fnmatch.c | 1 + - libcli/auth/tests/ntlm_check.c | 1 + - libcli/smb/test_smb1cli_session.c | 1 + - source3/lib/test_tldap.c | 1 + - 9 files changed, 9 insertions(+) - -diff --git a/lib/ldb/tests/ldb_kv_ops_test.c b/lib/ldb/tests/ldb_kv_ops_test.c -index 30ce019fac8..3ac7763b307 100644 ---- a/lib/ldb/tests/ldb_kv_ops_test.c -+++ b/lib/ldb/tests/ldb_kv_ops_test.c -@@ -46,6 +46,7 @@ - */ - #include - #include -+#include - #include - #include - -diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c -index 01667af3865..a1a20d38f28 100644 ---- a/lib/ldb/tests/ldb_mod_op_test.c -+++ b/lib/ldb/tests/ldb_mod_op_test.c -@@ -13,6 +13,7 @@ - */ - #include - #include -+#include - #include - #include - -diff --git a/lib/ldb/tests/ldb_msg.c b/lib/ldb/tests/ldb_msg.c -index f8de418e0dc..31786a9a318 100644 ---- a/lib/ldb/tests/ldb_msg.c -+++ b/lib/ldb/tests/ldb_msg.c -@@ -13,6 +13,7 @@ - */ - #include - #include -+#include - #include - #include - -diff --git a/lib/ldb/tests/ldb_tdb_test.c b/lib/ldb/tests/ldb_tdb_test.c -index 686a35104ea..2e312e60a3c 100644 ---- a/lib/ldb/tests/ldb_tdb_test.c -+++ b/lib/ldb/tests/ldb_tdb_test.c -@@ -40,6 +40,7 @@ - */ - #include - #include -+#include - #include - #include - -diff --git a/lib/ldb/tests/test_ldb_qsort.c b/lib/ldb/tests/test_ldb_qsort.c -index 06e80d94379..663cf0e7564 100644 ---- a/lib/ldb/tests/test_ldb_qsort.c -+++ b/lib/ldb/tests/test_ldb_qsort.c -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/lib/util/tests/test_ms_fnmatch.c b/lib/util/tests/test_ms_fnmatch.c -index 7fe8ed05e28..d11c7bed4be 100644 ---- a/lib/util/tests/test_ms_fnmatch.c -+++ b/lib/util/tests/test_ms_fnmatch.c -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/libcli/auth/tests/ntlm_check.c b/libcli/auth/tests/ntlm_check.c -index e87a0a276d4..65c7b086008 100644 ---- a/libcli/auth/tests/ntlm_check.c -+++ b/libcli/auth/tests/ntlm_check.c -@@ -40,6 +40,7 @@ - */ - #include - #include -+#include - #include - #include - -diff --git a/libcli/smb/test_smb1cli_session.c b/libcli/smb/test_smb1cli_session.c -index d1e21d5431e..6a526c96b61 100644 ---- a/libcli/smb/test_smb1cli_session.c -+++ b/libcli/smb/test_smb1cli_session.c -@@ -1,5 +1,6 @@ - #include - #include -+#include - #include - #include - -diff --git a/source3/lib/test_tldap.c b/source3/lib/test_tldap.c -index a6c2f2117cb..659c5a7371a 100644 ---- a/source3/lib/test_tldap.c -+++ b/source3/lib/test_tldap.c -@@ -20,6 +20,7 @@ - - #include - #include -+#include - #include - #include - --- -2.19.0 - diff --git a/buildroot/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/buildroot/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch new file mode 100644 index 000000000..563b274d5 --- /dev/null +++ b/buildroot/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch @@ -0,0 +1,86 @@ +From e002d2ef2688d5433d2bd03aa4d77a0ec5ac4e63 Mon Sep 17 00:00:00 2001 +From: Uri Simchoni +Date: Sun, 20 Oct 2019 00:03:14 +0300 +Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded + heimdal + +This patch fixes the case of finding asn1_compile and compile_et for +building embedded heimdal, by setting +--bundled-libraries='!asn1_compile,!compile_et' as configure flags. + +The Heimdal build tools compile_et and asn1_compile are needed *only* +if we use the embedded heimdal (otherwise we don't build heimdal and +use headers that have been generated by those tools elsewhere). + +For cross-compilation with embedded heimdal, it is vital to use host build +tools, and so asn1_compile and compile_et must be supplied and not +built. One way of doing this would be to set the COMPILE_ET and +ASN1_COMPILE env vars to the location of supplied binaries. Another way, +which is more commonly used, is to exclude asn1_compile and compile_et +from bundled packages via the switch +-bundled-libraries='!asn1_compile,!compile_et'. When this is done, +the build script searches the path for those tools and sets the +ASN1_COMPILE and COMPILE_ET vars accordingly. (this is admittedly +kind of a round-about way of doing things but this has become the +de-facto standard amongst embedded distro builders). + +In commit 8061983d4882f3ba3f12da71443b035d7b672eec, this process of +finding the binaris has been moved to be carried out only in the +system heimdal case. As explained above, we only need these tools, +and hence the check, in bundled mode. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 + +Signed-off-by: Uri Simchoni +Signed-off-by: Bernd Kuhls +--- + wscript_configure_embedded_heimdal | 11 +++++++++++ + wscript_configure_system_heimdal | 11 ----------- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal +index 8c55ae2a938..4fdae8062c5 100644 +--- a/wscript_configure_embedded_heimdal ++++ b/wscript_configure_embedded_heimdal +@@ -1 +1,12 @@ + conf.RECURSE('source4/heimdal_build') ++ ++def check_system_heimdal_binary(name): ++ if conf.LIB_MAY_BE_BUNDLED(name): ++ return False ++ if not conf.find_program(name, var=name.upper()): ++ return False ++ conf.define('USING_SYSTEM_%s' % name.upper(), 1) ++ return True ++ ++check_system_heimdal_binary("compile_et") ++check_system_heimdal_binary("asn1_compile") +diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal +index 0ff6dad2f55..f77c177442f 100644 +--- a/wscript_configure_system_heimdal ++++ b/wscript_configure_system_heimdal +@@ -36,14 +36,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): + conf.define('USING_SYSTEM_%s' % name.upper(), 1) + return True + +-def check_system_heimdal_binary(name): +- if conf.LIB_MAY_BE_BUNDLED(name): +- return False +- if not conf.find_program(name, var=name.upper()): +- return False +- conf.define('USING_SYSTEM_%s' % name.upper(), 1) +- return True +- + check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") + + if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): +@@ -88,7 +88,4 @@ + #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): + # conf.define('USING_SYSTEM_TOMMATH', 1) + +-check_system_heimdal_binary("compile_et") +-check_system_heimdal_binary("asn1_compile") +- + conf.define('USING_SYSTEM_KRB5', 1) +-- +2.20.1 diff --git a/buildroot/package/samba4/0003-Fix-unistd.h-include.patch b/buildroot/package/samba4/0003-Fix-unistd.h-include.patch new file mode 100644 index 000000000..f01b899a1 --- /dev/null +++ b/buildroot/package/samba4/0003-Fix-unistd.h-include.patch @@ -0,0 +1,38 @@ +From 85c33f89df8607ace0707e1360ff0f79f3e8f5f3 Mon Sep 17 00:00:00 2001 +From: Andy Walsh +Date: Wed, 6 Nov 2019 19:28:30 +0100 +Subject: [PATCH] Fix unistd.h include + +Fixes build error + +source4/heimdal/lib/asn1/asn1_err.c:47:23: error: 'link' redeclared as different kind of symbol + static struct et_list link = { 0, 0 }; + +Downloaded from +https://github.com/Andy2244/openwrt-extra/blob/samba-4.10/samba4/patches/006-samba-4-10-musl_rm_unistd_incl.patch + +Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=13856 + +Signed-off-by: Bernd Kuhls +--- + lib/replace/replace.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/lib/replace/replace.h b/lib/replace/replace.h +index 1658465866e..e6768c4ae51 100644 +--- a/lib/replace/replace.h ++++ b/lib/replace/replace.h +@@ -168,10 +168,6 @@ + #include + #endif + +-#ifdef HAVE_UNISTD_H +-#include +-#endif +- + #ifdef HAVE_STRING_H + #include + #endif +-- +2.20.1 + diff --git a/buildroot/package/samba4/0003-test_regfio.c-include-stdint.h-before-cmoka.h.patch b/buildroot/package/samba4/0003-test_regfio.c-include-stdint.h-before-cmoka.h.patch deleted file mode 100644 index 2415d57d7..000000000 --- a/buildroot/package/samba4/0003-test_regfio.c-include-stdint.h-before-cmoka.h.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bed8720dce64181c188c23a28506a88cd2e1ee4f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 11 May 2019 00:07:50 +0200 -Subject: [PATCH] test_regfio.c: include stdint.h before cmoka.h - -This fix the following build failure on mips64el: -/usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27: error: conflicting types for 'uintptr_t' - typedef unsigned long int uintptr_t; - ^ -In file included from ../source3/registry/tests/test_regfio.c:23:0: -../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here - typedef unsigned int uintptr_t; - -Fixes: - - http://autobuild.buildroot.org/results/bae0508e84c905dc23ad7cf1153cd1e9d8e4d734 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.com/samba-team/samba/merge_requests/442] ---- - source3/registry/tests/test_regfio.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/source3/registry/tests/test_regfio.c b/source3/registry/tests/test_regfio.c -index 86a217661f3..f945e653708 100644 ---- a/source3/registry/tests/test_regfio.c -+++ b/source3/registry/tests/test_regfio.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - - #include --- -2.20.1 - diff --git a/buildroot/package/samba4/Config.in b/buildroot/package/samba4/Config.in index 4ccd22aa2..a34eaa808 100644 --- a/buildroot/package/samba4/Config.in +++ b/buildroot/package/samba4/Config.in @@ -9,14 +9,15 @@ config BR2_PACKAGE_SAMBA4 depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR # python depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # python -> libffi - depends on !BR2_STATIC_LIBS # python, gnutls + depends on !BR2_STATIC_LIBS # cmocka, python, gnutls depends on !BR2_nios2 # binary too large, relocations don't fit depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_CMOCKA select BR2_PACKAGE_E2FSPROGS + select BR2_PACKAGE_GNUTLS select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_PACKAGE_POPT - select BR2_PACKAGE_PYTHON select BR2_PACKAGE_ZLIB help Provides secure, stable and fast file and print services @@ -29,11 +30,14 @@ if BR2_PACKAGE_SAMBA4 config BR2_PACKAGE_SAMBA4_AD_DC bool "AD DC" - select BR2_PACKAGE_GNUTLS + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_JANSSON help Enable Active Directory Domain Controller functionality. +comment "AD DC depends on python3" + depends on !BR2_PACKAGE_PYTHON3 + config BR2_PACKAGE_SAMBA4_ADS bool "ADS" select BR2_PACKAGE_OPENLDAP diff --git a/buildroot/package/samba4/samba4.hash b/buildroot/package/samba4/samba4.hash index 27b5551ad..8948c41ea 100644 --- a/buildroot/package/samba4/samba4.hash +++ b/buildroot/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.9.17.tar.asc -sha256 42467af2efab4793c7988561644a84de4000e96a87ce8239362c6d10abace295 samba-4.9.17.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.11.7.tar.asc +sha256 79b6f9ebc357373f885153e2d5d26dc6def9f4511ee4bcbe8a8e2622acc42143 samba-4.11.7.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/samba4/samba4.mk b/buildroot/package/samba4/samba4.mk index e15d0742e..582b30bcd 100644 --- a/buildroot/package/samba4/samba4.mk +++ b/buildroot/package/samba4/samba4.mk @@ -4,15 +4,15 @@ # ################################################################################ -SAMBA4_VERSION = 4.9.17 +SAMBA4_VERSION = 4.11.7 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES SAMBA4_LICENSE = GPL-3.0+ SAMBA4_LICENSE_FILES = COPYING SAMBA4_DEPENDENCIES = \ - host-e2fsprogs host-heimdal host-python host-nfs-utils \ - e2fsprogs popt python zlib \ + host-e2fsprogs host-heimdal host-nfs-utils host-python3 \ + cmocka e2fsprogs gnutls popt zlib \ $(if $(BR2_PACKAGE_LIBAIO),libaio) \ $(if $(BR2_PACKAGE_LIBCAP),libcap) \ $(if $(BR2_PACKAGE_READLINE),readline) \ @@ -22,7 +22,16 @@ SAMBA4_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) SAMBA4_CONF_ENV = \ CFLAGS="$(SAMBA4_CFLAGS)" \ LDFLAGS="$(SAMBA4_LDFLAGS)" \ - XSLTPROC=false + XSLTPROC=false \ + WAF_NO_PREFORK=1 + +SAMBA4_PYTHON = PYTHON="$(HOST_DIR)/bin/python3" +ifeq ($(BR2_PACKAGE_PYTHON3),y) +SAMBA4_PYTHON += PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config" +SAMBA4_DEPENDENCIES += python3 +else +SAMBA4_CONF_OPTS += --disable-python +endif ifeq ($(BR2_PACKAGE_LIBTIRPC),y) SAMBA4_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` @@ -63,13 +72,6 @@ else SAMBA4_CONF_OPTS += --without-fam endif -ifeq ($(BR2_PACKAGE_GNUTLS),y) -SAMBA4_CONF_OPTS += --enable-gnutls -SAMBA4_DEPENDENCIES += gnutls -else -SAMBA4_CONF_OPTS += --disable-gnutls -endif - ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) SAMBA4_CONF_OPTS += --with-libarchive SAMBA4_DEPENDENCIES += libarchive @@ -97,7 +99,7 @@ define SAMBA4_CONFIGURE_CMDS $(INSTALL) -m 0644 package/samba4/samba4-cache.txt $(@D)/cache.txt; echo 'Checking uname machine type: $(BR2_ARCH)' >>$(@D)/cache.txt; (cd $(@D); \ - PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python-config" \ + $(SAMBA4_PYTHON) \ python_LDFLAGS="" \ python_LIBDIR="" \ $(TARGET_CONFIGURE_OPTS) \ @@ -126,21 +128,21 @@ define SAMBA4_CONFIGURE_CMDS endef define SAMBA4_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(SAMBA4_PYTHON) $(MAKE) -C $(@D) endef define SAMBA4_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(SAMBA4_PYTHON) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define SAMBA4_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(SAMBA4_PYTHON) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef ifeq ($(BR2_PACKAGE_SAMBA4_AD_DC),y) SAMBA4_DEPENDENCIES += jansson else -SAMBA4_CONF_OPTS += --without-ad-dc --without-json-audit +SAMBA4_CONF_OPTS += --without-ad-dc --without-json endif ifeq ($(BR2_PACKAGE_SAMBA4_ADS),y) @@ -168,13 +170,6 @@ SAMBA4_DEPENDENCIES += systemd endif define SAMBA4_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/nmb.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nmb.service - ln -sf ../../../../usr/lib/systemd/system/smb.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/smb.service - ln -sf ../../../../usr/lib/systemd/system/winbind.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/winbind.service $(INSTALL) -D -m 644 $(@D)/packaging/systemd/samba.conf.tmp \ $(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf printf "d /var/log/samba 755 root root\n" >>$(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf diff --git a/buildroot/package/sane-backends/0001-qcam-x86.patch b/buildroot/package/sane-backends/0001-qcam-x86.patch deleted file mode 100644 index f14dd0e98..000000000 --- a/buildroot/package/sane-backends/0001-qcam-x86.patch +++ /dev/null @@ -1,61 +0,0 @@ -[PATCH] backend/qcam.c: fix build on !x86 - -inb/outb/ioperm are x86 specific interfaces, so replace with noops on -!x86. - -Inspired by similar patch in openwrt: -https://dev.openwrt.org/ticket/5689 - -Signed-off-by: Peter Korsgaard ---- - backend/qcam.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -Index: sane-backends-1.0.22/backend/qcam.c -=================================================================== ---- sane-backends-1.0.22.orig/backend/qcam.c -+++ sane-backends-1.0.22/backend/qcam.c -@@ -205,12 +205,20 @@ - - #endif /* || || */ - -+/* inb / outb only exist on x86 */ -+#if defined(__i386__) || defined(__x86_64__) - #define read_lpdata(d) inb ((d)->port) - #define read_lpstatus(d) inb ((d)->port + 1) - #define read_lpcontrol(d) inb ((d)->port + 2) - #define write_lpdata(d,v) outb ((v), (d)->port) - #define write_lpcontrol(d,v) outb ((v), (d)->port + 2) -- -+#else -+#define read_lpdata(d) 0 -+#define read_lpstatus(d) 0 -+#define read_lpcontrol(d) 0 -+#define write_lpdata(d,v) -+#define write_lpcontrol(d,v) -+#endif - - static SANE_Status - enable_ports (QC_Device * q) -@@ -219,8 +227,10 @@ - if (q->port < 0x278 || q->port > 0x3bc) - return SANE_STATUS_INVAL; - -+#if defined(__i386__) || defined(__x86_64__) - if (ioperm (q->port, 3, 1) < 0) - return SANE_STATUS_INVAL; -+#endif - - return SANE_STATUS_GOOD; - } -@@ -228,8 +238,10 @@ - static SANE_Status - disable_ports (QC_Device * q) - { -+#if defined(__i386__) || defined(__x86_64__) - if (ioperm (q->port, 3, 0) < 0) - return SANE_STATUS_INVAL; -+#endif - - return SANE_STATUS_GOOD; - } diff --git a/buildroot/package/sane-backends/0002-sane_backend-add-missing-config.h.patch b/buildroot/package/sane-backends/0001-sane_backend-add-missing-config.h.patch similarity index 100% rename from buildroot/package/sane-backends/0002-sane_backend-add-missing-config.h.patch rename to buildroot/package/sane-backends/0001-sane_backend-add-missing-config.h.patch diff --git a/buildroot/package/sane-backends/sane-backends.mk b/buildroot/package/sane-backends/sane-backends.mk index 092123e19..52e03da51 100644 --- a/buildroot/package/sane-backends/sane-backends.mk +++ b/buildroot/package/sane-backends/sane-backends.mk @@ -66,14 +66,8 @@ endef define SANE_BACKENDS_INSTALL_INIT_SYSTEMD $(INSTALL) -m 0644 -D package/sane-backends/saned.socket \ $(TARGET_DIR)/usr/lib/systemd/system/saned.socket - mkdir -p $(TARGET_DIR)/etc/systemd/system/socket.target.wants - ln -sf ../../../../usr/lib/systemd/system/saned.socket \ - $(TARGET_DIR)/etc/systemd/system/socket.target.wants/saned.socket $(INSTALL) -m 0644 -D package/sane-backends/saned@.service \ $(TARGET_DIR)/usr/lib/systemd/system/saned@.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/saned@.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/saned@.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/sbc/sbc.hash b/buildroot/package/sbc/sbc.hash index be3c8f76f..d703f2343 100644 --- a/buildroot/package/sbc/sbc.hash +++ b/buildroot/package/sbc/sbc.hash @@ -1,2 +1,6 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256 e61022cf576f14190241e7071753fdacdce5d1dea89ffd704110fc50be689309 sbc-1.3.tar.xz +sha256 518bf46e6bb3dc808a95e1eabad26fdebe8a099c1e781c27ed7fca6c2f4a54c9 sbc-1.4.tar.xz + +# sha256 locally computed +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING +sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/buildroot/package/sbc/sbc.mk b/buildroot/package/sbc/sbc.mk index 77661c189..73e4aceb8 100644 --- a/buildroot/package/sbc/sbc.mk +++ b/buildroot/package/sbc/sbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -SBC_VERSION = 1.3 +SBC_VERSION = 1.4 SBC_SOURCE = sbc-$(SBC_VERSION).tar.xz SBC_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth SBC_INSTALL_STAGING = YES diff --git a/buildroot/package/sconeserver/Config.in b/buildroot/package/sconeserver/Config.in index e984801de..a42abd70b 100644 --- a/buildroot/package/sconeserver/Config.in +++ b/buildroot/package/sconeserver/Config.in @@ -44,17 +44,21 @@ config BR2_PACKAGE_SCONESERVER_MYSQL config BR2_PACKAGE_SCONESERVER_BLUETOOTH bool "bluetooth" - depends on BR2_USE_WCHAR # bluez->libglib2 - depends on BR2_USE_MMU # bluez->dbus - depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus, bluez->libglib2 - depends on !BR2_STATIC_LIBS # bluez_utils - select BR2_PACKAGE_BLUEZ_UTILS + depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 + depends on BR2_USE_MMU # bluez5_utils -> dbus + depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, libglib2 + depends on !BR2_STATIC_LIBS # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils + select BR2_PACKAGE_BLUEZ5_UTILS help Bluetooth module for Sconeserver -comment "bluetooth support needs a toolchain w/ wchar, threads, dynamic library" +comment "bluetooth support needs a toolchain w/ wchar, threads, dynamic library, headers >= 3.4" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 config BR2_PACKAGE_SCONESERVER_RSS bool "rss" diff --git a/buildroot/package/sconeserver/sconeserver.mk b/buildroot/package/sconeserver/sconeserver.mk index c160c8bf7..9d4713afe 100644 --- a/buildroot/package/sconeserver/sconeserver.mk +++ b/buildroot/package/sconeserver/sconeserver.mk @@ -25,9 +25,6 @@ endif ifeq ($(BR2_PACKAGE_OPENSSL),y) SCONESERVER_DEPENDENCIES += openssl SCONESERVER_CONF_OPTS += --with-ssl -ifeq ($(BR2_STATIC_LIBS),y) -SCONESERVER_CONF_ENV += SSL_LIBADD=-lz -endif else SCONESERVER_CONF_OPTS += --without-ssl endif @@ -65,7 +62,7 @@ SCONESERVER_CONF_OPTS += --without-mysql endif ifeq ($(BR2_PACKAGE_SCONESERVER_BLUETOOTH),y) -SCONESERVER_DEPENDENCIES += bluez_utils +SCONESERVER_DEPENDENCIES += bluez5_utils SCONESERVER_CONF_OPTS += --with-bluetooth else SCONESERVER_CONF_OPTS += --without-bluetooth diff --git a/buildroot/package/scons/scons.hash b/buildroot/package/scons/scons.hash index b3cdea0d7..a72fbaee5 100644 --- a/buildroot/package/scons/scons.hash +++ b/buildroot/package/scons/scons.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 0b25218ae7b46a967db42f2a53721645b3d42874a65f9552ad16ce26d30f51f2 scons-2.5.1.tar.gz +sha256 7801f3f62f654528e272df780be10c0e9337e897650b62ddcee9f39fde13f8fb scons-3.1.2.tar.gz +sha256 72ed889165fb28378cadac14552be4a959f1ebab6b148abb5dd2b49712c3c6f6 LICENSE.txt diff --git a/buildroot/package/scons/scons.mk b/buildroot/package/scons/scons.mk index 14be589e2..da2ccceb0 100644 --- a/buildroot/package/scons/scons.mk +++ b/buildroot/package/scons/scons.mk @@ -4,18 +4,16 @@ # ################################################################################ -SCONS_VERSION = 2.5.1 +SCONS_VERSION = 3.1.2 SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION) SCONS_LICENSE = MIT SCONS_LICENSE_FILES = LICENSE.txt SCONS_SETUP_TYPE = distutils -HOST_SCONS_NEEDS_HOST_PYTHON = python2 - HOST_SCONS_INSTALL_OPTS = \ --install-lib=$(HOST_DIR)/lib/scons-$(SCONS_VERSION) $(eval $(host-python-package)) # variables used by other packages -SCONS = $(HOST_DIR)/bin/python2 $(HOST_DIR)/bin/scons $(if $(QUIET),-s) +SCONS = $(HOST_DIR)/bin/scons $(if $(QUIET),-s) diff --git a/buildroot/package/screen/0001-compiler-sanity-checks.patch b/buildroot/package/screen/0001-compiler-sanity-checks.patch deleted file mode 100644 index fe6c3fdbc..000000000 --- a/buildroot/package/screen/0001-compiler-sanity-checks.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Maarten ter Huurne -Date: Sat, 13 Sep 2014 10:27:27 +0200 -Subject: Removed redundant compiler sanity checks - -AC_PROG_CC already performs sanity checks. And unlike the removed -checks, it does so in a way that supports cross compilation. - -Signed-off-by: Maarten ter Huurne -[Ricardo: rebase on top of 4.3.1] -Signed-off-by: Ricardo Martincoski ---- - configure.ac | 27 --------------------------- - 1 file changed, 27 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ffe2e37..27690a6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -48,31 +48,6 @@ AC_PROG_GCC_TRADITIONAL - AC_ISC_POSIX - AC_USE_SYSTEM_EXTENSIONS - --AC_TRY_RUN(main(){exit(0);},,[ --if test $CC != cc ; then --AC_NOTE(Your $CC failed - restarting with CC=cc) --AC_NOTE() --CC=cc --export CC --exec $0 $configure_args --fi --]) -- --AC_TRY_RUN(main(){exit(0);},, --exec 5>&2 --eval $ac_link --AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;) --AC_NOTE($ac_compile) --AC_MSG_ERROR(Can't run the compiler - sorry)) -- --AC_TRY_RUN([ --main() --{ -- int __something_strange_(); -- __something_strange_(0); --} --],AC_MSG_ERROR(Your compiler does not set the exit status - sorry)) -- - AC_PROG_AWK - - AC_PROG_INSTALL -@@ -1300,8 +1275,6 @@ fi - dnl Ptx bug workaround -- insert -lc after -ltermcap - test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq" - --AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.)) -- - ETCSCREENRC= - AC_MSG_CHECKING(for the global screenrc file) - AC_ARG_WITH(sys-screenrc, [ --with-sys-screenrc=path to the global screenrc file], [ ETCSCREENRC="${withval}" ]) --- -1.8.4.5 - diff --git a/buildroot/package/screen/0001-no-memcpy-fallback.patch b/buildroot/package/screen/0001-no-memcpy-fallback.patch new file mode 100644 index 000000000..213790719 --- /dev/null +++ b/buildroot/package/screen/0001-no-memcpy-fallback.patch @@ -0,0 +1,126 @@ +From: Maarten ter Huurne +Date: Sat, 13 Sep 2014 11:37:59 +0200 +Subject: Do not use memcpy as an alternative for bcopy/memmove + +The configure script runs a small test program to check whether +memcpy can handle overlapping memory areas. However, it is not valid +to conclude that if a single case of overlapping memory is handled +correctly, all cases will be handled correctly. + +Since screen already has its own bcopy implementation as a fallback +for the case that bcopy and memmove are unusable, removing the memcpy +option should not break any systems. + +Signed-off-by: Maarten ter Huurne +[Ricardo: rebase on top of 4.3.1] +Signed-off-by: Ricardo Martincoski +[Bernd: rebase on top of 4.7.0] +Signed-off-by: Bernd Kuhls +--- + acconfig.h | 3 +-- + configure.ac | 18 +----------------- + os.h | 8 ++------ + osdef.h.in | 10 +--------- + 4 files changed, 5 insertions(+), 34 deletions(-) + +diff --git a/acconfig.h b/acconfig.h +index 2e46985..9b0b9d4 100644 +--- a/acconfig.h ++++ b/acconfig.h +@@ -476,7 +476,7 @@ + #undef GETTTYENT + + /* +- * Define USEBCOPY if the bcopy/memcpy from your system's C library ++ * Define USEBCOPY if the bcopy from your system's C library + * supports the overlapping of source and destination blocks. When + * undefined, screen uses its own (probably slower) version of bcopy(). + * +@@ -487,7 +487,6 @@ + * Their memove fails the test in the configure script. Sigh. (Juergen) + */ + #undef USEBCOPY +-#undef USEMEMCPY + #undef USEMEMMOVE + + /* +diff --git a/configure.ac b/configure.ac +index 27690a6..b8e3bec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1145,7 +1145,7 @@ AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) + AC_CHECKING(fdwalk) + AC_TRY_LINK([#include ], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK)) + +-AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments) ++AC_CHECKING(whether memmove/bcopy handles overlapping arguments) + AC_TRY_RUN([ + main() { + char buf[10]; +@@ -1175,22 +1175,6 @@ main() { + exit(0); /* libc version works properly. */ + }], AC_DEFINE(USEMEMMOVE)) + +- +-AC_TRY_RUN([ +-#define bcopy(s,d,l) memcpy(d,s,l) +-main() { +- char buf[10]; +- strcpy(buf, "abcdefghi"); +- bcopy(buf, buf + 2, 3); +- if (strncmp(buf, "ababcf", 6)) +- exit(1); +- strcpy(buf, "abcdefghi"); +- bcopy(buf + 2, buf, 3); +- if (strncmp(buf, "cdedef", 6)) +- exit(1); +- exit(0); /* libc version works properly. */ +-}], AC_DEFINE(USEMEMCPY),,:) +- + AC_SYS_LONG_FILE_NAMES + + AC_MSG_CHECKING(for vsprintf) +diff --git a/os.h b/os.h +index e827ac9..0b41fb9 100644 +--- a/os.h ++++ b/os.h +@@ -142,12 +142,8 @@ extern int errno; + # ifdef USEMEMMOVE + # define bcopy(s,d,len) memmove(d,s,len) + # else +-# ifdef USEMEMCPY +-# define bcopy(s,d,len) memcpy(d,s,len) +-# else +-# define NEED_OWN_BCOPY +-# define bcopy xbcopy +-# endif ++# define NEED_OWN_BCOPY ++# define bcopy xbcopy + # endif + #endif + +diff --git a/osdef.h.in b/osdef.h.in +index 8687b60..e4057a0 100644 +--- a/osdef.h.in ++++ b/osdef.h.in +@@ -58,16 +58,8 @@ extern int bcmp __P((char *, char *, int)); + extern int killpg __P((int, int)); + #endif + +-#ifndef USEBCOPY +-# ifdef USEMEMCPY +-extern void memcpy __P((char *, char *, int)); +-# else +-# ifdef USEMEMMOVE ++#if defined(USEMEMMOVE) && !defined(USEBCOPY) + extern void memmove __P((char *, char *, int)); +-# else +-extern void bcopy __P((char *, char *, int)); +-# endif +-# endif + #else + extern void bcopy __P((char *, char *, int)); + #endif +-- +1.8.4.5 + diff --git a/buildroot/package/screen/0006-install-no-backup-binary.patch b/buildroot/package/screen/0002-install-no-backup-binary.patch similarity index 100% rename from buildroot/package/screen/0006-install-no-backup-binary.patch rename to buildroot/package/screen/0002-install-no-backup-binary.patch diff --git a/buildroot/package/screen/0002-no-memcpy-fallback.patch b/buildroot/package/screen/0002-no-memcpy-fallback.patch deleted file mode 100644 index f3a6a70d2..000000000 --- a/buildroot/package/screen/0002-no-memcpy-fallback.patch +++ /dev/null @@ -1,124 +0,0 @@ -From: Maarten ter Huurne -Date: Sat, 13 Sep 2014 11:37:59 +0200 -Subject: Do not use memcpy as an alternative for bcopy/memmove - -The configure script runs a small test program to check whether -memcpy can handle overlapping memory areas. However, it is not valid -to conclude that if a single case of overlapping memory is handled -correctly, all cases will be handled correctly. - -Since screen already has its own bcopy implementation as a fallback -for the case that bcopy and memmove are unusable, removing the memcpy -option should not break any systems. - -Signed-off-by: Maarten ter Huurne -[Ricardo: rebase on top of 4.3.1] -Signed-off-by: Ricardo Martincoski ---- - acconfig.h | 3 +-- - configure.ac | 18 +----------------- - os.h | 8 ++------ - osdef.h.in | 10 +--------- - 4 files changed, 5 insertions(+), 34 deletions(-) - -diff --git a/acconfig.h b/acconfig.h -index 2e46985..9b0b9d4 100644 ---- a/acconfig.h -+++ b/acconfig.h -@@ -476,7 +476,7 @@ - #undef GETTTYENT - - /* -- * Define USEBCOPY if the bcopy/memcpy from your system's C library -+ * Define USEBCOPY if the bcopy from your system's C library - * supports the overlapping of source and destination blocks. When - * undefined, screen uses its own (probably slower) version of bcopy(). - * -@@ -487,7 +487,6 @@ - * Their memove fails the test in the configure script. Sigh. (Juergen) - */ - #undef USEBCOPY --#undef USEMEMCPY - #undef USEMEMMOVE - - /* -diff --git a/configure.ac b/configure.ac -index 27690a6..b8e3bec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1145,7 +1145,7 @@ AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) - AC_CHECKING(fdwalk) - AC_TRY_LINK([#include ], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK)) - --AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments) -+AC_CHECKING(whether memmove/bcopy handles overlapping arguments) - AC_TRY_RUN([ - main() { - char buf[10]; -@@ -1175,22 +1175,6 @@ main() { - exit(0); /* libc version works properly. */ - }], AC_DEFINE(USEMEMMOVE)) - -- --AC_TRY_RUN([ --#define bcopy(s,d,l) memcpy(d,s,l) --main() { -- char buf[10]; -- strcpy(buf, "abcdefghi"); -- bcopy(buf, buf + 2, 3); -- if (strncmp(buf, "ababcf", 6)) -- exit(1); -- strcpy(buf, "abcdefghi"); -- bcopy(buf + 2, buf, 3); -- if (strncmp(buf, "cdedef", 6)) -- exit(1); -- exit(0); /* libc version works properly. */ --}], AC_DEFINE(USEMEMCPY)) -- - AC_SYS_LONG_FILE_NAMES - - AC_MSG_CHECKING(for vsprintf) -diff --git a/os.h b/os.h -index e827ac9..0b41fb9 100644 ---- a/os.h -+++ b/os.h -@@ -142,12 +142,8 @@ extern int errno; - # ifdef USEMEMMOVE - # define bcopy(s,d,len) memmove(d,s,len) - # else --# ifdef USEMEMCPY --# define bcopy(s,d,len) memcpy(d,s,len) --# else --# define NEED_OWN_BCOPY --# define bcopy xbcopy --# endif -+# define NEED_OWN_BCOPY -+# define bcopy xbcopy - # endif - #endif - -diff --git a/osdef.h.in b/osdef.h.in -index 8687b60..e4057a0 100644 ---- a/osdef.h.in -+++ b/osdef.h.in -@@ -58,16 +58,8 @@ extern int bcmp __P((char *, char *, int)); - extern int killpg __P((int, int)); - #endif - --#ifndef USEBCOPY --# ifdef USEMEMCPY --extern void memcpy __P((char *, char *, int)); --# else --# ifdef USEMEMMOVE -+#if defined(USEMEMMOVE) && !defined(USEBCOPY) - extern void memmove __P((char *, char *, int)); --# else --extern void bcopy __P((char *, char *, int)); --# endif --# endif - #else - extern void bcopy __P((char *, char *, int)); - #endif --- -1.8.4.5 - diff --git a/buildroot/package/screen/0003-cross-compilation-AC_TRY_RUN.patch b/buildroot/package/screen/0003-cross-compilation-AC_TRY_RUN.patch deleted file mode 100644 index eafe3d5ad..000000000 --- a/buildroot/package/screen/0003-cross-compilation-AC_TRY_RUN.patch +++ /dev/null @@ -1,125 +0,0 @@ -From: Maarten ter Huurne -Date: Sat, 13 Sep 2014 12:04:41 +0200 -Subject: Provide cross compilation alternatives for all AC_TRY_RUN uses - -Signed-off-by: Maarten ter Huurne -[Ricardo: rebase on top of 4.3.1] -Signed-off-by: Ricardo Martincoski ---- - configure.ac | 30 +++++++++++++++++++----------- - 1 file changed, 19 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b8e3bec..c4b7cd4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -348,7 +348,8 @@ main() - exit(0); - } - ], AC_NOTE(- your fifos are usable) fifo=1, --AC_NOTE(- your fifos are not usable)) -+AC_NOTE(- your fifos are not usable), -+AC_NOTE(- skipping check because we are cross compiling; assuming fifos are usable) fifo=1) - rm -f /tmp/conftest* - - if test -n "$fifo"; then -@@ -396,7 +397,8 @@ main() - exit(0); - } - ], AC_NOTE(- your implementation is ok), --AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1) -+AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1, -+AC_NOTE(- skipping check because we are cross compiling; assuming fifo implementation is ok)) - rm -f /tmp/conftest* - fi - -@@ -458,7 +460,8 @@ main() - exit(0); - } - ], AC_NOTE(- your sockets are usable) sock=1, --AC_NOTE(- your sockets are not usable)) -+AC_NOTE(- your sockets are not usable), -+AC_NOTE(- skipping check because we are cross compiling; assuming sockets are usable) sock=1) - rm -f /tmp/conftest* - - if test -n "$sock"; then -@@ -497,7 +500,8 @@ main() - } - ],AC_NOTE(- you are normal), - AC_NOTE(- unix domain sockets are not kept in the filesystem) --AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1) -+AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1, -+AC_NOTE(- skipping check because we are cross compiling; assuming sockets are normal)) - rm -f /tmp/conftest* - fi - -@@ -624,7 +628,8 @@ main() - exit(0); - } - ],AC_NOTE(- select is ok), --AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN)) -+AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN), -+AC_NOTE(- skipping check because we are cross compiling; assuming select is ok)) - - dnl - dnl **** termcap or terminfo **** -@@ -666,7 +671,8 @@ main() - { - exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); - }], AC_NOTE(- you use the termcap database), --AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO)) -+AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO), -+AC_NOTE(- skipping check because we are cross compiling; assuming terminfo database is used) AC_DEFINE(TERMINFO)) - AC_CHECKING(ospeed) - AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED)) - -@@ -801,7 +807,8 @@ main() - else - AC_NOTE(- can't determine - assume ptys are world accessable) - fi -- ] -+ ], -+ AC_NOTE(- skipping check because we are cross compiling; assuming ptys are world accessable) - ) - rm -f conftest_grp - fi -@@ -885,7 +892,7 @@ AC_EGREP_CPP(yes, - #endif - ], load=1) - fi --if test -z "$load" ; then -+if test -z "$load" && test "$cross_compiling" = no ; then - AC_CHECKING(for kernelfile) - for core in /unix /vmunix /dynix /hp-ux /xelos /dev/ksyms /kernel/unix /kernel/genunix /unicos /mach /netbsd /386bsd /dgux /bsd /stand/vmunix; do - if test -f $core || test -c $core; then -@@ -1078,7 +1085,7 @@ main() - #endif - exit(0); - } --],,AC_DEFINE(SYSVSIGS)) -+],,AC_DEFINE(SYSVSIGS),:) - - fi - -@@ -1158,7 +1165,7 @@ main() { - if (strncmp(buf, "cdedef", 6)) - exit(1); - exit(0); /* libc version works properly. */ --}], AC_DEFINE(USEBCOPY)) -+}], AC_DEFINE(USEBCOPY),,:) - - AC_TRY_RUN([ - #define bcopy(s,d,l) memmove(d,s,l) -@@ -1173,7 +1180,8 @@ main() { - if (strncmp(buf, "cdedef", 6)) - exit(1); - exit(0); /* libc version works properly. */ --}], AC_DEFINE(USEMEMMOVE)) -+}], AC_DEFINE(USEMEMMOVE),, -+ AC_NOTE(- skipping check because we are cross compiling; use memmove) AC_DEFINE(USEMEMMOVE)) - - AC_SYS_LONG_FILE_NAMES - --- -1.8.4.5 - diff --git a/buildroot/package/screen/0007-install-always-chmod.patch b/buildroot/package/screen/0003-install-always-chmod.patch similarity index 100% rename from buildroot/package/screen/0007-install-always-chmod.patch rename to buildroot/package/screen/0003-install-always-chmod.patch diff --git a/buildroot/package/screen/0004-cross-compilation-ignore-host-fs.patch b/buildroot/package/screen/0004-cross-compilation-ignore-host-fs.patch deleted file mode 100644 index fa698ef1f..000000000 --- a/buildroot/package/screen/0004-cross-compilation-ignore-host-fs.patch +++ /dev/null @@ -1,132 +0,0 @@ -From: Maarten ter Huurne -Date: Sun, 14 Sep 2014 07:10:59 +0200 -Subject: When cross-compiling, skip checks that look in the host file system - -Signed-off-by: Maarten ter Huurne -[Ricardo: rebase on top of 4.3.1] -Signed-off-by: Ricardo Martincoski ---- - configure.ac | 23 +++++++++++++++++++---- - 1 file changed, 19 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c4b7cd4..9cf7cee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -85,7 +85,7 @@ AC_ARG_ENABLE(socket-dir, - dnl - dnl **** special unix variants **** - dnl --if test -n "$ISC"; then -+if test "$cross_compiling" = no && test -n "$ISC" ; then - AC_DEFINE(ISC) LIBS="$LIBS -linet" - fi - -@@ -96,10 +96,11 @@ dnl AC_DEFINE(OSF1) # this disables MIPS again.... - dnl fi - dnl fi - --if test -f /sysV68 ; then -+if test "$cross_compiling" = no && test -f /sysV68 ; then - AC_DEFINE(sysV68) - fi - -+if test "$cross_compiling" = no ; then - AC_CHECKING(for MIPS) - if test -f /lib/libmld.a || test -f /usr/lib/libmld.a || test -f /usr/lib/cmplrs/cc/libmld.a; then - oldlibs="$LIBS" -@@ -123,6 +124,7 @@ AC_DEFINE(USE_WAIT2) LIBS="$LIBS -lbsd" ; CC="$CC -I/usr/include/bsd" - )) - fi - fi -+fi - - - AC_CHECKING(for Ultrix) -@@ -132,7 +134,7 @@ AC_EGREP_CPP(yes, - #endif - ], ULTRIX=1) - --if test -f /usr/lib/libpyr.a ; then -+if test "$cross_compiling" = no && test -f /usr/lib/libpyr.a ; then - oldlibs="$LIBS" - LIBS="$LIBS -lpyr" - AC_CHECKING(Pyramid OSX) -@@ -679,17 +681,21 @@ AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED)) - dnl - dnl **** PTY specific things **** - dnl -+if test "$cross_compiling" = no ; then - AC_CHECKING(for /dev/ptc) - if test -r /dev/ptc; then - AC_DEFINE(HAVE_DEV_PTC) - fi -+fi - -+if test "$cross_compiling" = no ; then - AC_CHECKING(for SVR4 ptys) - sysvr4ptys= - if test -c /dev/ptmx ; then - AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS) - sysvr4ptys=1]) - fi -+fi - - AC_CHECK_FUNCS(getpt) - -@@ -699,6 +705,7 @@ AC_CHECK_FUNCS(openpty,, - [AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"])]) - fi - -+if test "$cross_compiling" = no ; then - AC_CHECKING(for ptyranges) - if test -d /dev/ptym ; then - pdir='/dev/ptym' -@@ -722,6 +729,7 @@ p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\ - AC_DEFINE_UNQUOTED(PTYRANGE0,"$p0") - AC_DEFINE_UNQUOTED(PTYRANGE1,"$p1") - fi -+fi - - dnl **** pty mode/group handling **** - dnl -@@ -869,14 +877,16 @@ fi - dnl - dnl **** loadav **** - dnl -+if test "$cross_compiling" = no ; then - AC_CHECKING(for libutil(s)) - test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils" - test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil" -+fi - - AC_CHECKING(getloadavg) - AC_TRY_LINK(,[getloadavg((double *)0, 0);], - AC_DEFINE(LOADAV_GETLOADAVG) load=1, --if test -f /usr/lib/libkvm.a ; then -+if test "$cross_compiling" = no && test -f /usr/lib/libkvm.a ; then - olibs="$LIBS" - LIBS="$LIBS -lkvm" - AC_CHECKING(getloadavg with -lkvm) -@@ -1094,13 +1104,18 @@ dnl **** libraries **** - dnl - - AC_CHECKING(for crypt and sec libraries) -+if test "$cross_compiling" = no ; then - test -f /lib/libcrypt_d.a || test -f /usr/lib/libcrypt_d.a && LIBS="$LIBS -lcrypt_d" -+fi - oldlibs="$LIBS" - LIBS="$LIBS -lcrypt" - AC_CHECKING(crypt) - AC_TRY_LINK(,,,LIBS="$oldlibs") -+if test "$cross_compiling" = no ; then - test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec" - test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow" -+fi -+ - oldlibs="$LIBS" - LIBS="$LIBS -lsun" - AC_CHECKING(IRIX sun library) --- -1.8.4.5 - diff --git a/buildroot/package/screen/0008-install-nonversioned-binary.patch b/buildroot/package/screen/0004-install-nonversioned-binary.patch similarity index 100% rename from buildroot/package/screen/0008-install-nonversioned-binary.patch rename to buildroot/package/screen/0004-install-nonversioned-binary.patch diff --git a/buildroot/package/screen/0005-avoid-identifying-as-SVR4.patch b/buildroot/package/screen/0005-avoid-identifying-as-SVR4.patch deleted file mode 100644 index 745ef4193..000000000 --- a/buildroot/package/screen/0005-avoid-identifying-as-SVR4.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Maarten ter Huurne -Date: Sun, 14 Sep 2014 11:16:58 +0200 -Subject: Avoid mis-identifying systems as SVR4 - -My openSUSE 13.1 Linux system was detected as SVR4 because it had -libelf installed. This leads to linking with libelf, even though no -symbols from that library were actually used, and to a workaround for -a buggy getlogin() being enabled. - -It is not documented which exact SVR4 system had the bug that the -workaround was added for, so all I could do is make an educated guess -at the #defines its compiler would be likely to set. - -Signed-off-by: Maarten ter Huurne -[Ricardo: rebase on top of 4.3.1] -Signed-off-by: Ricardo Martincoski ---- - configure.ac | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9cf7cee..e09e4cf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -179,14 +179,24 @@ AC_EGREP_CPP(yes, - #endif - ], LIBS="$LIBS -lsocket -linet";seqptx=1) - -+AC_CHECKING(SVR4) -+AC_EGREP_CPP(yes, -+[main () { -+#if defined(SVR4) || defined(__SVR4) -+ yes; -+#endif -+], AC_NOTE(- you have a SVR4 system) AC_DEFINE(SVR4) svr4=1) -+if test -n "$svr4" ; then - oldlibs="$LIBS" - LIBS="$LIBS -lelf" - AC_CHECKING(SVR4) - AC_TRY_LINK([#include - ],, --[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN), --[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])] -+[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(BUGGYGETLOGIN), -+[AC_CHECK_HEADER(elf.h, AC_DEFINE(BUGGYGETLOGIN))])] - ,LIBS="$oldlibs") -+fi -+ - AC_CHECK_HEADERS([stropts.h string.h strings.h]) - - AC_CHECKING(for Solaris 2.x) --- -1.8.4.5 - diff --git a/buildroot/package/screen/0005-rename-sched_h.patch b/buildroot/package/screen/0005-rename-sched_h.patch new file mode 100644 index 000000000..9b29b76e0 --- /dev/null +++ b/buildroot/package/screen/0005-rename-sched_h.patch @@ -0,0 +1,142 @@ +From: Maarten ter Huurne +Date: Mon, 15 Sep 2014 00:24:41 +0200 +Subject: Renamed sched.h to eventqueue.h + +There is a system header that got shadowed by "sched.h". +While Screen itself doesn't include , other system headers +might include it indirectly. This broke the build when using uClibc +with pthread support. + +Signed-off-by: Maarten ter Huurne +--- + eventqueue.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + sched.h | 48 ------------------------------------------------ + screen.h | 2 +- + 3 files changed, 49 insertions(+), 49 deletions(-) + create mode 100644 eventqueue.h + delete mode 100644 sched.h + +diff --git a/eventqueue.h b/eventqueue.h +new file mode 100644 +index 0000000..fdc3fc4 +--- /dev/null ++++ b/eventqueue.h +@@ -0,0 +1,48 @@ ++/* Copyright (c) 2008, 2009 ++ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) ++ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) ++ * Micah Cowan (micah@cowan.name) ++ * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) ++ * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 ++ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) ++ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) ++ * Copyright (c) 1987 Oliver Laumann ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 3, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program (see the file COPYING); if not, see ++ * https://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA ++ * ++ **************************************************************** ++ * $Id$ GNU ++ */ ++ ++struct event ++{ ++ struct event *next; ++ void (*handler) __P((struct event *, char *)); ++ char *data; ++ int fd; ++ int type; ++ int pri; ++ struct timeval timeout; ++ int queued; /* in evs queue */ ++ int active; /* in fdset */ ++ int *condpos; /* only active if condpos - condneg > 0 */ ++ int *condneg; ++}; ++ ++#define EV_TIMEOUT 0 ++#define EV_READ 1 ++#define EV_WRITE 2 ++#define EV_ALWAYS 3 +diff --git a/sched.h b/sched.h +deleted file mode 100644 +index fdc3fc4..0000000 +--- a/sched.h ++++ /dev/null +@@ -1,48 +0,0 @@ +-/* Copyright (c) 2008, 2009 +- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) +- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) +- * Micah Cowan (micah@cowan.name) +- * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) +- * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 +- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) +- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) +- * Copyright (c) 1987 Oliver Laumann +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 3, or (at your option) +- * any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program (see the file COPYING); if not, see +- * https://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA +- * +- **************************************************************** +- * $Id$ GNU +- */ +- +-struct event +-{ +- struct event *next; +- void (*handler) __P((struct event *, char *)); +- char *data; +- int fd; +- int type; +- int pri; +- struct timeval timeout; +- int queued; /* in evs queue */ +- int active; /* in fdset */ +- int *condpos; /* only active if condpos - condneg > 0 */ +- int *condneg; +-}; +- +-#define EV_TIMEOUT 0 +-#define EV_READ 1 +-#define EV_WRITE 2 +-#define EV_ALWAYS 3 +diff --git a/screen.h b/screen.h +index 603ca3f..34238c8 100644 +--- a/screen.h ++++ b/screen.h +@@ -43,7 +43,7 @@ + #include "osdef.h" + + #include "ansi.h" +-#include "sched.h" ++#include "eventqueue.h" + #include "acls.h" + #include "comm.h" + #include "layer.h" +-- +1.8.4.5 + diff --git a/buildroot/package/screen/0010-comm-h-now-depends-on-term-h.patch b/buildroot/package/screen/0006-comm-h-now-depends-on-term-h.patch similarity index 100% rename from buildroot/package/screen/0010-comm-h-now-depends-on-term-h.patch rename to buildroot/package/screen/0006-comm-h-now-depends-on-term-h.patch diff --git a/buildroot/package/screen/0011-comm.h-needed-for-list_-display-generic-.o.patch b/buildroot/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch similarity index 100% rename from buildroot/package/screen/0011-comm.h-needed-for-list_-display-generic-.o.patch rename to buildroot/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch diff --git a/buildroot/package/screen/0009-rename-sched_h.patch b/buildroot/package/screen/0009-rename-sched_h.patch deleted file mode 100644 index cdbb0335f..000000000 --- a/buildroot/package/screen/0009-rename-sched_h.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Maarten ter Huurne -Date: Mon, 15 Sep 2014 00:24:41 +0200 -Subject: Renamed sched.h to eventqueue.h - -There is a system header that got shadowed by "sched.h". -While Screen itself doesn't include , other system headers -might include it indirectly. This broke the build when using uClibc -with pthread support. - -Signed-off-by: Maarten ter Huurne ---- - eventqueue.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - sched.h | 48 ------------------------------------------------ - screen.h | 2 +- - 3 files changed, 49 insertions(+), 49 deletions(-) - create mode 100644 eventqueue.h - delete mode 100644 sched.h - -diff --git a/eventqueue.h b/eventqueue.h -new file mode 100644 -index 0000000..fdc3fc4 ---- /dev/null -+++ b/eventqueue.h -@@ -0,0 +1,48 @@ -+/* Copyright (c) 2008, 2009 -+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -+ * Micah Cowan (micah@cowan.name) -+ * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) -+ * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 -+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -+ * Copyright (c) 1987 Oliver Laumann -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 3, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program (see the file COPYING); if not, see -+ * http://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA -+ * -+ **************************************************************** -+ * $Id$ GNU -+ */ -+ -+struct event -+{ -+ struct event *next; -+ void (*handler) __P((struct event *, char *)); -+ char *data; -+ int fd; -+ int type; -+ int pri; -+ struct timeval timeout; -+ int queued; /* in evs queue */ -+ int active; /* in fdset */ -+ int *condpos; /* only active if condpos - condneg > 0 */ -+ int *condneg; -+}; -+ -+#define EV_TIMEOUT 0 -+#define EV_READ 1 -+#define EV_WRITE 2 -+#define EV_ALWAYS 3 -diff --git a/sched.h b/sched.h -deleted file mode 100644 -index fdc3fc4..0000000 ---- a/sched.h -+++ /dev/null -@@ -1,48 +0,0 @@ --/* Copyright (c) 2008, 2009 -- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -- * Micah Cowan (micah@cowan.name) -- * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) -- * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 -- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -- * Copyright (c) 1987 Oliver Laumann -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 3, or (at your option) -- * any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program (see the file COPYING); if not, see -- * http://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA -- * -- **************************************************************** -- * $Id$ GNU -- */ -- --struct event --{ -- struct event *next; -- void (*handler) __P((struct event *, char *)); -- char *data; -- int fd; -- int type; -- int pri; -- struct timeval timeout; -- int queued; /* in evs queue */ -- int active; /* in fdset */ -- int *condpos; /* only active if condpos - condneg > 0 */ -- int *condneg; --}; -- --#define EV_TIMEOUT 0 --#define EV_READ 1 --#define EV_WRITE 2 --#define EV_ALWAYS 3 -diff --git a/screen.h b/screen.h -index 603ca3f..34238c8 100644 ---- a/screen.h -+++ b/screen.h -@@ -43,7 +43,7 @@ - #include "osdef.h" - - #include "ansi.h" --#include "sched.h" -+#include "eventqueue.h" - #include "acls.h" - #include "comm.h" - #include "layer.h" --- -1.8.4.5 - diff --git a/buildroot/package/screen/screen.hash b/buildroot/package/screen/screen.hash index 0e1613b28..ca74ba891 100644 --- a/buildroot/package/screen/screen.hash +++ b/buildroot/package/screen/screen.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/screen/screen-4.6.2.tar.gz.sig -sha256 1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a screen-4.6.2.tar.gz +# https://ftp.gnu.org/gnu/screen/screen-4.8.0.tar.gz.sig +sha256 6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 screen-4.8.0.tar.gz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/screen/screen.mk b/buildroot/package/screen/screen.mk index 37d43366c..c1705f742 100644 --- a/buildroot/package/screen/screen.mk +++ b/buildroot/package/screen/screen.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCREEN_VERSION = 4.6.2 +SCREEN_VERSION = 4.8.0 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING @@ -14,6 +14,13 @@ SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" SCREEN_CONF_OPTS = --enable-colors256 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +SCREEN_DEPENDENCIES += linux-pam +SCREEN_CONF_OPTS += --enable-pam +else +SCREEN_CONF_OPTS += --disable-pam +endif + define SCREEN_INSTALL_SCREENRC $(INSTALL) -m 0755 -D $(@D)/etc/screenrc $(TARGET_DIR)/etc/screenrc endef diff --git a/buildroot/package/scrypt/scrypt.hash b/buildroot/package/scrypt/scrypt.hash index 669445676..8a20d42be 100644 --- a/buildroot/package/scrypt/scrypt.hash +++ b/buildroot/package/scrypt/scrypt.hash @@ -1,2 +1,4 @@ # From http://www.tarsnap.com/scrypt/scrypt-sigs-1.2.0.asc -sha256 1754bc89405277c8ac14220377a4c240ddc34b1ce70882aa92cd01bfdc8569d4 scrypt-1.2.0.tgz +sha256 1754bc89405277c8ac14220377a4c240ddc34b1ce70882aa92cd01bfdc8569d4 scrypt-1.2.0.tgz +# Locally computed +sha256 e9d3ce691acc974c05d54bdea919fa03018fcdb5abd82eab5cdb78f07c451e0a main.c diff --git a/buildroot/package/sdbusplus/Config.in b/buildroot/package/sdbusplus/Config.in new file mode 100644 index 000000000..c66203c46 --- /dev/null +++ b/buildroot/package/sdbusplus/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_SDBUSPLUS + bool "sdbusplus" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_SYSTEMD + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + help + A C++ library for sd-bus with a bindings and doc generator. + + This will build the target library. See the host package for + the bindings and documentation generation program. + + https://github.com/openbmc/sdbusplus + +comment "sdbusplus needs systemd and a toolchain w/ C++, gcc >= 7" + depends on !BR2_PACKAGE_SYSTEMD || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/buildroot/package/sdbusplus/Config.in.host b/buildroot/package/sdbusplus/Config.in.host new file mode 100644 index 000000000..2b1d1ce31 --- /dev/null +++ b/buildroot/package/sdbusplus/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_SDBUSPLUS + bool "host-sdbusplus" + select BR2_PACKAGE_HOST_PKGCONF + help + A C++ library for sd-bus with a bindings and doc generator. + + This will build the Python host side generation tool for + bindings and documentation. + + https://github.com/openbmc/sdbusplus diff --git a/buildroot/package/sdbusplus/sdbusplus.hash b/buildroot/package/sdbusplus/sdbusplus.hash new file mode 100644 index 000000000..b21d2ddd2 --- /dev/null +++ b/buildroot/package/sdbusplus/sdbusplus.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 c67b8f3d9b74fd0d70eb6eec3b2ec2d496d0f169deedf6fc07dbff2c2f275d2b sdbusplus-4212292bcf136d04b38ba5116aa568b0fa312798.tar.gz + +# License file, locally calculated +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/buildroot/package/sdbusplus/sdbusplus.mk b/buildroot/package/sdbusplus/sdbusplus.mk new file mode 100644 index 000000000..f4e258089 --- /dev/null +++ b/buildroot/package/sdbusplus/sdbusplus.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# sdbusplus +# +################################################################################ + +SDBUSPLUS_VERSION = 4212292bcf136d04b38ba5116aa568b0fa312798 +SDBUSPLUS_SITE = $(call github,openbmc,sdbusplus,$(SDBUSPLUS_VERSION)) +SDBUSPLUS_DEPENDENCIES = host-autoconf-archive host-pkgconf systemd +HOST_SDBUSPLUS_DEPENDENCIES = \ + host-autoconf-archive \ + host-pkgconf \ + $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \ + host-python-inflection \ + host-python-mako \ + host-python-pyyaml +SDBUSPLUS_CONF_OPTS = --disable-sdbuspp +HOST_SDBUSPLUS_CONF_OPTS = --disable-libsdbusplus +SDBUSPLUS_AUTORECONF = YES +SDBUSPLUS_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive +SDBUSPLUS_INSTALL_STAGING = YES +SDBUSPLUS_LICENSE = Apache-2.0 +SDBUSPLUS_LICENSE_FILES = LICENSE + +# Autoreconf is missing the m4/ directory, which might actually be missing +# iff it was the first argument, but unfortunately we are overriding the +# first include directory above. Thus we need that hook here. +define SDBUSPLUS_CREATE_M4 + mkdir -p $(@D)/m4 +endef +SDBUSPLUS_POST_PATCH_HOOKS += SDBUSPLUS_CREATE_M4 +HOST_SDBUSPLUS_POST_PATCH_HOOKS += SDBUSPLUS_CREATE_M4 + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/buildroot/package/sdl/sdl.hash b/buildroot/package/sdl/sdl.hash index ad59b9004..2c46975dc 100644 --- a/buildroot/package/sdl/sdl.hash +++ b/buildroot/package/sdl/sdl.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature sha256 d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 SDL-1.2.15.tar.gz +# Locally computed +sha256 bb117c0fbd7f57f64170b690285d7df07c2371b578e3b3cd3aa2e1155ef461a0 COPYING diff --git a/buildroot/package/sdl2/0001-fix-build-with-disable-threads.patch b/buildroot/package/sdl2/0001-fix-build-with-disable-threads.patch deleted file mode 100644 index 81f7d7446..000000000 --- a/buildroot/package/sdl2/0001-fix-build-with-disable-threads.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 26646028f79d7f3d857df9b46cd6d0285796c699 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 21 Nov 2018 22:31:09 +0100 -Subject: [PATCH] fix build with --disable-threads - -SDL_LinuxSetThreadPriority() has been added since version 2.0.9 and -https://github.com/SDL-mirror/SDL/commit/f25a7fa870bdceb339e5105973f689606bcb9086 - -However, this function is used in src/dynapi/SDL_dynapi_procs.h even -when SDL_THREADS_DISABLED - -However, when SDL_THREADS_DISABLED is set, SDL_LinuxSetThreadPriority is -not defined because thread/pthread/SDL_systhread.c is not built - -So check SDL_THREADS_DISABLED in addition to __LINUX__ - -Fixes: - - http://autobuild.buildroot.org/results/539cb9ab6c605dc6be73ebe90debab1a998f2451 - -Signed-off-by: Fabrice Fontaine ---- - include/SDL_system.h | 4 ++-- - src/dynapi/SDL_dynapi_procs.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/SDL_system.h b/include/SDL_system.h -index 4dc372d6b..0513d7fa5 100644 ---- a/include/SDL_system.h -+++ b/include/SDL_system.h -@@ -77,7 +77,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *a - - - /* Platform specific functions for Linux */ --#ifdef __LINUX__ -+#if defined(__LINUX__) && !defined(SDL_THREADS_DISABLED) - - /** - \brief Sets the UNIX nice value for a thread, using setpriority() if possible, and RealtimeKit if available. -@@ -86,7 +86,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *a - */ - extern DECLSPEC int SDLCALL SDL_LinuxSetThreadPriority(Sint64 threadID, int priority); - --#endif /* __LINUX__ */ -+#endif /* defined(__LINUX__) && !defined(SDL_THREADS_DISABLED) */ - - /* Platform specific functions for iOS */ - #if defined(__IPHONEOS__) && __IPHONEOS__ -diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h -index c95cf708b..ee9bf60a6 100644 ---- a/src/dynapi/SDL_dynapi_procs.h -+++ b/src/dynapi/SDL_dynapi_procs.h -@@ -708,7 +708,7 @@ SDL_DYNAPI_PROC(SDL_bool,SDL_IsAndroidTV,(void),(),return) - SDL_DYNAPI_PROC(double,SDL_log10,(double a),(a),return) - SDL_DYNAPI_PROC(float,SDL_log10f,(float a),(a),return) - SDL_DYNAPI_PROC(char*,SDL_GameControllerMappingForDeviceIndex,(int a),(a),return) --#ifdef __LINUX__ -+#if defined(__LINUX__) && !defined(SDL_THREADS_DISABLED) - SDL_DYNAPI_PROC(int,SDL_LinuxSetThreadPriority,(Sint64 a, int b),(a,b),return) - #endif - SDL_DYNAPI_PROC(SDL_bool,SDL_HasAVX512F,(void),(),return) --- -2.17.1 - diff --git a/buildroot/package/sdl2/0001-src-core-linux-SDL_threadprio.c-fix-build-without-th.patch b/buildroot/package/sdl2/0001-src-core-linux-SDL_threadprio.c-fix-build-without-th.patch new file mode 100644 index 000000000..1165edc66 --- /dev/null +++ b/buildroot/package/sdl2/0001-src-core-linux-SDL_threadprio.c-fix-build-without-th.patch @@ -0,0 +1,35 @@ +From cb51ec369186628e016a10ccf25b2b26d5d2ef85 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 10 Feb 2020 21:31:36 +0100 +Subject: [PATCH] src/core/linux/SDL_threadprio.c: fix build without threads + +Add an include on SDL_error.h to avoid the following build failure +without threads: + +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: build/.libs/SDL_threadprio.o: in function `SDL_LinuxSetThreadPriority_REAL': +SDL_threadprio.c:(.text+0x0): undefined reference to `SDL_Unsupported' + +Fixes: + - http://autobuild.buildroot.org/results/7f7712c5bd47de4a3fcec1e0d0526fd5a3ecd532 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://bugzilla.libsdl.org/show_bug.cgi?id=4971] +--- + src/core/linux/SDL_threadprio.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/core/linux/SDL_threadprio.c b/src/core/linux/SDL_threadprio.c +index 162b1a3f1..2cbc4cb48 100644 +--- a/src/core/linux/SDL_threadprio.c ++++ b/src/core/linux/SDL_threadprio.c +@@ -22,6 +22,7 @@ + + #ifdef __LINUX__ + ++#include "SDL_error.h" + #include "SDL_stdinc.h" + + #if !SDL_THREADS_DISABLED +-- +2.24.1 + diff --git a/buildroot/package/sdl2/sdl2.hash b/buildroot/package/sdl2/sdl2.hash index 0668883f0..9e968e0af 100644 --- a/buildroot/package/sdl2/sdl2.hash +++ b/buildroot/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.9.tar.gz.sig -sha256 255186dc676ecd0c1dbf10ec8a2cc5d6869b5079d8a38194c2aecdff54b324b1 SDL2-2.0.9.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.10.tar.gz.sig +sha256 b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57 SDL2-2.0.10.tar.gz # Locally calculated -sha256 61e627031e1160bf8b9bdbc9cda27656d422ea8eaab199b64b4a4a4168437154 COPYING.txt +sha256 a7c8d0b3167c502921192585a582eb8477ad9862330f4d8b9e4a8bb4c1a9d29e COPYING.txt diff --git a/buildroot/package/sdl2/sdl2.mk b/buildroot/package/sdl2/sdl2.mk index d2fba9d81..e39c51d4d 100644 --- a/buildroot/package/sdl2/sdl2.mk +++ b/buildroot/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.0.9 +SDL2_VERSION = 2.0.10 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib diff --git a/buildroot/package/sdl2_gfx/sdl2_gfx.hash b/buildroot/package/sdl2_gfx/sdl2_gfx.hash index 4cb07ee93..190c997d3 100644 --- a/buildroot/package/sdl2_gfx/sdl2_gfx.hash +++ b/buildroot/package/sdl2_gfx/sdl2_gfx.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 d69bcbceb811b4e5712fbad3ede737166327f44b727f1388c32581dbbe8c599a SDL2_gfx-1.0.1.tar.gz +sha256 63e0e01addedc9df2f85b93a248f06e8a04affa014a835c2ea34bfe34e576262 SDL2_gfx-1.0.4.tar.gz +sha256 ec9036525fe1adde787041cce6c4b7fbb262863c238bb9051037e29a57e27bfc COPYING +sha256 18e6fad60b809b0e30bd2576a0d33c179ca2ac694504a849d05b6579e3c481dd SDL2_framerate.h diff --git a/buildroot/package/sdl2_gfx/sdl2_gfx.mk b/buildroot/package/sdl2_gfx/sdl2_gfx.mk index 1ec138714..6817391b2 100644 --- a/buildroot/package/sdl2_gfx/sdl2_gfx.mk +++ b/buildroot/package/sdl2_gfx/sdl2_gfx.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_GFX_VERSION = 1.0.1 +SDL2_GFX_VERSION = 1.0.4 SDL2_GFX_SOURCE = SDL2_gfx-$(SDL2_GFX_VERSION).tar.gz SDL2_GFX_SITE = http://www.ferzkopp.net/Software/SDL2_gfx SDL2_GFX_LICENSE = Zlib diff --git a/buildroot/package/sdl2_image/sdl2_image.hash b/buildroot/package/sdl2_image/sdl2_image.hash index cf3253526..621a92021 100644 --- a/buildroot/package/sdl2_image/sdl2_image.hash +++ b/buildroot/package/sdl2_image/sdl2_image.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3510c25da735ffcd8ce3b65073150ff4f7f9493b866e85b83738083b556d2368 SDL2_image-2.0.3.tar.gz -sha256 13240ed78c8726c510b9634976430d3d3a9ea2d1ced3214119766e9e71568a35 COPYING.txt +sha256 bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0 SDL2_image-2.0.5.tar.gz +sha256 45079362e2230154205413a6940544ca94e3479ccf76205c71c4f542a6815d25 COPYING.txt diff --git a/buildroot/package/sdl2_image/sdl2_image.mk b/buildroot/package/sdl2_image/sdl2_image.mk index 8c1c5f6e1..68572b3f9 100644 --- a/buildroot/package/sdl2_image/sdl2_image.mk +++ b/buildroot/package/sdl2_image/sdl2_image.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_IMAGE_VERSION = 2.0.3 +SDL2_IMAGE_VERSION = 2.0.5 SDL2_IMAGE_SOURCE = SDL2_image-$(SDL2_IMAGE_VERSION).tar.gz SDL2_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release SDL2_IMAGE_INSTALL_STAGING = YES diff --git a/buildroot/package/sdl2_mixer/sdl2_mixer.hash b/buildroot/package/sdl2_mixer/sdl2_mixer.hash index 48bc887a4..f3bab151f 100644 --- a/buildroot/package/sdl2_mixer/sdl2_mixer.hash +++ b/buildroot/package/sdl2_mixer/sdl2_mixer.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f SDL2_mixer-2.0.1.tar.gz +sha256 b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419 SDL2_mixer-2.0.4.tar.gz +sha256 113727180e7956cb9718b03b41da85b63ea54743a33047071a623bf672895a10 COPYING.txt diff --git a/buildroot/package/sdl2_mixer/sdl2_mixer.mk b/buildroot/package/sdl2_mixer/sdl2_mixer.mk index c99084797..f349b8ca8 100644 --- a/buildroot/package/sdl2_mixer/sdl2_mixer.mk +++ b/buildroot/package/sdl2_mixer/sdl2_mixer.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_MIXER_VERSION = 2.0.1 +SDL2_MIXER_VERSION = 2.0.4 SDL2_MIXER_SOURCE = SDL2_mixer-$(SDL2_MIXER_VERSION).tar.gz SDL2_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release SDL2_MIXER_LICENSE = Zlib @@ -12,9 +12,7 @@ SDL2_MIXER_LICENSE_FILES = COPYING.txt SDL2_MIXER_INSTALL_STAGING = YES SDL2_MIXER_DEPENDENCIES = sdl2 host-pkgconf -SDL2_MIXER_CONF_OPTS = \ - --disable-fluidsynth \ - --disable-music-mp3 +SDL2_MIXER_CONF_OPTS = --disable-music-mp3 ifeq ($(BR2_PACKAGE_FLAC),y) SDL2_MIXER_CONF_OPTS += --enable-music-flac @@ -23,6 +21,13 @@ else SDL2_MIXER_CONF_OPTS += --disable-music-flac endif +ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y) +SDL2_MIXER_CONF_OPTS += --enable-music-midi-fluidsynth +SDL2_MIXER_DEPENDENCIES += fluidsynth +else +SDL2_MIXER_CONF_OPTS += --disable-music-midi-fluidsynth +endif + ifeq ($(BR2_PACKAGE_LIBMODPLUG),y) SDL2_MIXER_CONF_OPTS += --enable-music-mod-modplug SDL2_MIXER_DEPENDENCIES += libmodplug @@ -30,6 +35,13 @@ else SDL2_MIXER_CONF_OPTS += --disable-music-mod-modplug endif +ifeq ($(BR2_PACKAGE_OPUSFILE),y) +SDL2_MIXER_CONF_OPTS += --enable-music-opus +SDL2_MIXER_DEPENDENCIES += opusfile +else +SDL2_MIXER_CONF_OPTS += --disable-music-opus +endif + ifeq ($(BR2_PACKAGE_TREMOR),y) SDL2_MIXER_CONF_OPTS += --enable-music-ogg-tremor SDL2_MIXER_DEPENDENCIES += tremor diff --git a/buildroot/package/sdl2_net/sdl2_net.hash b/buildroot/package/sdl2_net/sdl2_net.hash index c5f443383..a58e3c96c 100644 --- a/buildroot/package/sdl2_net/sdl2_net.hash +++ b/buildroot/package/sdl2_net/sdl2_net.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21 SDL2_net-2.0.1.tar.gz +sha256 15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21 SDL2_net-2.0.1.tar.gz +sha256 f09845a238245402a8b8388db6634d8a5b2c3e1dc098f16f9d8c74a276ef4594 COPYING.txt diff --git a/buildroot/package/sdl2_ttf/0001-fix-opengl-detection.patch b/buildroot/package/sdl2_ttf/0001-fix-opengl-detection.patch deleted file mode 100644 index 06e0abf8b..000000000 --- a/buildroot/package/sdl2_ttf/0001-fix-opengl-detection.patch +++ /dev/null @@ -1,37 +0,0 @@ -# HG changeset patch -# User Sam Lantinga -# Date 1485568474 28800 -# Node ID 3b93536d291a34183592fd29ef1df9cf1416ac09 -# Parent 184c34c673d479477d34194e3c0b1abe7ca5d828 -Make sure we can link with OpenGL libraries in the OpenGL configure test - -[yann.morin.1998@free.fr: - - backported from upstream - - drop the configure hunk for autoreconf -] -Signed-off-by: "Yann E. MORIN" - -diff -r 184c34c673d4 -r 3b93536d291a configure.in ---- a/configure.in Sun Jan 01 18:46:38 2017 -0800 -+++ b/configure.in Fri Jan 27 17:54:34 2017 -0800 -@@ -164,14 +164,17 @@ - esac - AC_MSG_CHECKING(for OpenGL support) - have_opengl=no --AC_TRY_COMPILE([ -+save_LIBS="$LIBS" -+LIBS="$LIBS $SYS_GL_LIBS" -+AC_TRY_LINK([ - #include "SDL_opengl.h" - ],[ -- GLuint texture; -+ glOrtho( -2.0, 2.0, -2.0, 2.0, -20.0, 20.0 ); - ],[ - have_opengl=yes - ]) - AC_MSG_RESULT($have_opengl) -+LIBS="$save_LIBS" - if test x$have_opengl = xyes; then - CFLAGS="$CFLAGS -DHAVE_OPENGL" - GL_LIBS="$SYS_GL_LIBS" - diff --git a/buildroot/package/sdl2_ttf/0002-fix-autoreconf.patch b/buildroot/package/sdl2_ttf/0002-fix-autoreconf.patch deleted file mode 100644 index 88543a949..000000000 --- a/buildroot/package/sdl2_ttf/0002-fix-autoreconf.patch +++ /dev/null @@ -1,30 +0,0 @@ -# HG changeset patch -# User "Yann E. MORIN" -# Date 1485597428 -3600 -# Node ID 26376ce4a3e6565885fd984b3fe5a39a6895dcdd -# Parent 3b93536d291a34183592fd29ef1df9cf1416ac09 -configure: fix autoreconf - -Signed-off-by: "Yann E. MORIN" - -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -1,5 +1,6 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(README.txt) -+dnl The version string must be a literal -+AC_INIT([SDL2_ttf],[2.0.14]) - - dnl Set various version strings - taken gratefully from the GTk sources - -@@ -42,7 +42,7 @@ - AC_CANONICAL_HOST - - dnl Setup for automake --AM_INIT_AUTOMAKE(SDL2_ttf, $VERSION) -+AM_INIT_AUTOMAKE([foreign]) - - dnl Check for tools - AC_PROG_LIBTOOL - diff --git a/buildroot/package/sdl2_ttf/sdl2_ttf.hash b/buildroot/package/sdl2_ttf/sdl2_ttf.hash index 515189afd..16459e4a5 100644 --- a/buildroot/package/sdl2_ttf/sdl2_ttf.hash +++ b/buildroot/package/sdl2_ttf/sdl2_ttf.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276 SDL2_ttf-2.0.14.tar.gz +sha256 a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33 SDL2_ttf-2.0.15.tar.gz +sha256 f6370809c9f644760920d9945c5be07aed17664975f2e4741013d4d9a2ec696f COPYING.txt diff --git a/buildroot/package/sdl2_ttf/sdl2_ttf.mk b/buildroot/package/sdl2_ttf/sdl2_ttf.mk index dbe30dd54..326cb9936 100644 --- a/buildroot/package/sdl2_ttf/sdl2_ttf.mk +++ b/buildroot/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.14 +SDL2_TTF_VERSION = 2.0.15 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib @@ -12,9 +12,6 @@ SDL2_TTF_LICENSE_FILES = COPYING.txt SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf -# Two patches touching configure.in -SDL2_TTF_AUTORECONF = YES - SDL2_TTF_CONF_ENV = \ FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config diff --git a/buildroot/package/sdl_gfx/sdl_gfx.hash b/buildroot/package/sdl_gfx/sdl_gfx.hash index 8c2be96ff..afd465366 100644 --- a/buildroot/package/sdl_gfx/sdl_gfx.hash +++ b/buildroot/package/sdl_gfx/sdl_gfx.hash @@ -1,3 +1,6 @@ # From http://sourceforge.net/projects/sdlgfx/files/ md5 fcc3c4f2d1b4943409bf7e67dd65d03a SDL_gfx-2.0.23.tar.gz sha1 aae60e7fed539f3f8a0a0bd6da3bbcf625642596 SDL_gfx-2.0.23.tar.gz +# Locally computed +sha256 4f5df842266c59b2d7e6ef35b53d7f37b13795d93baf3ed211f502c216f7bc89 COPYING +sha256 5f3bc98e0bd2de83279bd62868d4bc0c2b4f811ab828b036d36a4a6d1cd5672d LICENSE diff --git a/buildroot/package/sdl_image/sdl_image.hash b/buildroot/package/sdl_image/sdl_image.hash index 836223489..90e3040a1 100644 --- a/buildroot/package/sdl_image/sdl_image.hash +++ b/buildroot/package/sdl_image/sdl_image.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699 SDL_image-1.2.12.tar.gz +sha256 0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699 SDL_image-1.2.12.tar.gz +sha256 653649692218d56e5807bdc5b72f51aa6067bc44d30b757e18c03b32bcaf98da COPYING diff --git a/buildroot/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch b/buildroot/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch new file mode 100644 index 000000000..841cef4ef --- /dev/null +++ b/buildroot/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch @@ -0,0 +1,33 @@ +From fb8e7c535a88838cc8ae364cd2a099df6316d3b0 Mon Sep 17 00:00:00 2001 +From: Paul Cercueil +Date: Tue, 30 Apr 2019 23:12:15 +0200 +Subject: [PATCH] Fix include of modplug.h + +The include path should be , since the library +doesn't provide any specific include path in its pkg-config file. + +This patch was obtained from this bug report: +https://bugzilla.libsdl.org/show_bug.cgi?id=4893 + +Signed-off-by: Paul Cercueil + +--- + music_modplug.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/music_modplug.h b/music_modplug.h +index 92cbafd..49abbb0 100644 +--- a/music_modplug.h ++++ b/music_modplug.h +@@ -1,6 +1,7 @@ + #ifdef MODPLUG_MUSIC + +-#include "modplug.h" ++#include ++ + #include "SDL_rwops.h" + #include "SDL_audio.h" + #include "SDL_mixer.h" +-- +2.21.0.593.g511ec345e18 + diff --git a/buildroot/package/sdl_mixer/0004-configure__set_macro_directory.patch b/buildroot/package/sdl_mixer/0004-configure__set_macro_directory.patch new file mode 100644 index 000000000..5b47f0e80 --- /dev/null +++ b/buildroot/package/sdl_mixer/0004-configure__set_macro_directory.patch @@ -0,0 +1,34 @@ +# HG changeset patch +# User "Yann E. MORIN" +# Date 1581183281 -3600 +# Sat Feb 08 18:34:41 2020 +0100 +# Node ID 753a1f394620056c35790a571ff5f7c248445943 +# Parent eb5f08bf9994bf5164ca68015f2e030c2c9dddcd +configure: set macro directory + +Setting the macro directory in configure.in, rather than specifying it +on the command line, ensures that it is properly searched in the correct +order, and that autoreconf properly updates our macros with the newer +system ones, if any. + +Fixes: + http://autobuild.buildroot.org/results/63a/63ae0bddb3c4436efe967c318e299047f496c5a5/build-end.log + + libtool: Version mismatch error. This is libtool 2.4.6, but the + libtool: definition of this LT_INIT comes from libtool 2.2.6. + libtool: You should recreate aclocal.m4 with macros from libtool 2.4.6 + libtool: and run autoconf again. + +Signed-off-by: Yann E. MORIN + +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -1,6 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(README) + AC_CONFIG_AUX_DIR(build-scripts) ++AC_CONFIG_MACRO_DIR([acinclude]) + + dnl Set various version strings - taken gratefully from the GTk sources + diff --git a/buildroot/package/sdl_mixer/sdl_mixer.hash b/buildroot/package/sdl_mixer/sdl_mixer.hash index cfe8b07cb..5d7e7836c 100644 --- a/buildroot/package/sdl_mixer/sdl_mixer.hash +++ b/buildroot/package/sdl_mixer/sdl_mixer.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a SDL_mixer-1.2.12.tar.gz +sha256 bc4c3bc32b311044d81c32b5e5402a6bc971a3b235850bb63445ec14bb6fe59e COPYING diff --git a/buildroot/package/sdl_mixer/sdl_mixer.mk b/buildroot/package/sdl_mixer/sdl_mixer.mk index 9183a4aa8..73eb821ff 100644 --- a/buildroot/package/sdl_mixer/sdl_mixer.mk +++ b/buildroot/package/sdl_mixer/sdl_mixer.mk @@ -18,7 +18,6 @@ SDL_MIXER_DEPENDENCIES = sdl # We're patching configure.in, so we need to autoreconf SDL_MIXER_AUTORECONF = YES -SDL_MIXER_AUTORECONF_OPTS = -Iacinclude SDL_MIXER_CONF_OPTS = \ --without-x \ @@ -35,7 +34,17 @@ else SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl endif -ifeq ($(BR2_PACKAGE_LIBVORBIS),y) +ifeq ($(BR2_PACKAGE_LIBMODPLUG),y) +SDL_MIXER_CONF_OPTS += --enable-music-mod-modplug +SDL_MIXER_DEPENDENCIES += host-pkgconf libmodplug +else +SDL_MIXER_CONF_OPTS += --disable-music-mod-modplug +endif + +ifeq ($(BR2_PACKAGE_TREMOR),y) +SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor +SDL_MIXER_DEPENDENCIES += tremor +else ifeq ($(BR2_PACKAGE_LIBVORBIS),y) SDL_MIXER_CONF_OPTS += --enable-music-ogg SDL_MIXER_DEPENDENCIES += libvorbis else diff --git a/buildroot/package/sdl_net/sdl_net.hash b/buildroot/package/sdl_net/sdl_net.hash index 56a748428..4f2e1ae76 100644 --- a/buildroot/package/sdl_net/sdl_net.hash +++ b/buildroot/package/sdl_net/sdl_net.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4 SDL_net-1.2.8.tar.gz +sha256 5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4 SDL_net-1.2.8.tar.gz +sha256 e542f822a6cd82deccf82cf0f50192917b0158d725a6bc6348ab1ccdd890ecbe COPYING diff --git a/buildroot/package/sdl_sound/sdl_sound.hash b/buildroot/package/sdl_sound/sdl_sound.hash index a54862791..1ea76b0b0 100644 --- a/buildroot/package/sdl_sound/sdl_sound.hash +++ b/buildroot/package/sdl_sound/sdl_sound.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df SDL_sound-1.0.3.tar.gz +sha256 3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df SDL_sound-1.0.3.tar.gz +sha256 2a781dd2f8c5435c59cfa3b79dfea1c1d7df676ed318ecc802139f76ac345d07 COPYING diff --git a/buildroot/package/sdl_ttf/sdl_ttf.hash b/buildroot/package/sdl_ttf/sdl_ttf.hash index ac7d6a6be..86a15d6dd 100644 --- a/buildroot/package/sdl_ttf/sdl_ttf.hash +++ b/buildroot/package/sdl_ttf/sdl_ttf.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7 SDL_ttf-2.0.11.tar.gz +sha256 724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7 SDL_ttf-2.0.11.tar.gz +sha256 b609721d3d4ac67facaf86f068c8b311b6c5f6cef89b6d84268aa38b7867ab7b COPYING diff --git a/buildroot/package/sdparm/sdparm.hash b/buildroot/package/sdparm/sdparm.hash index 050785ab7..22d6b5b87 100644 --- a/buildroot/package/sdparm/sdparm.hash +++ b/buildroot/package/sdparm/sdparm.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 7dc9e148cef22744e00809dad21b59ac544e3615001bc1b2399978f73e1d58ca sdparm-1.10.tar.xz +sha256 7dc9e148cef22744e00809dad21b59ac544e3615001bc1b2399978f73e1d58ca sdparm-1.10.tar.xz +sha256 4f98444e14adb18a94a65c3ded5f0dad42d382c6a2288b593a2d5bd5ecc4f46d COPYING diff --git a/buildroot/package/selinux-python/Config.in b/buildroot/package/selinux-python/Config.in index b9fab9aaa..5b6cbc80e 100644 --- a/buildroot/package/selinux-python/Config.in +++ b/buildroot/package/selinux-python/Config.in @@ -1,4 +1,4 @@ -menuconfig BR2_PACKAGE_SELINUX_PYTHON +config BR2_PACKAGE_SELINUX_PYTHON bool "selinux-python" depends on BR2_USE_MMU depends on BR2_USE_WCHAR @@ -9,18 +9,13 @@ menuconfig BR2_PACKAGE_SELINUX_PYTHON A set of SELinux tools written in python that help with managing a system with SELinux enabled. If no packages are selected nothing will actually be built. + https://github.com/SELinuxProject/selinux/wiki if BR2_PACKAGE_SELINUX_PYTHON config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW bool "audit2allow" - depends on BR2_USE_WCHAR # sepolgen - depends on BR2_USE_MMU # sepolgen - depends on BR2_TOOLCHAIN_HAS_THREADS # sepolgen, checkpolicy - depends on !BR2_STATIC_LIBS # sepolgen - depends on BR2_TOOLCHAIN_USES_GLIBC # checkpolicy - depends on !BR2_arc # checkpolicy select BR2_PACKAGE_CHECKPOLICY select BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN select BR2_PACKAGE_SEMODULE_UTILS @@ -33,28 +28,13 @@ config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW audit2why - translates SELinux audit messages into a description of why the access was denied (audit2allow -w) -comment "audit2allow needs a glibc toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_arc - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - config BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN bool "sepolgen" - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS select BR2_PACKAGE_SEMODULE_UTILS help This package contains a Python module that allows you to generate an initial SELinux policy module template. -comment "sepolgen needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - endif comment "selinux-python packages needs a toolchain w/ wchar, threads, dynamic library" diff --git a/buildroot/package/selinux-python/selinux-python.hash b/buildroot/package/selinux-python/selinux-python.hash index 99965004f..8cbac3701 100644 --- a/buildroot/package/selinux-python/selinux-python.hash +++ b/buildroot/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 e69f5e24820cb247a3d881a9c90efba1e64d76af863c82fb81bc3b87ed71e238 selinux-python-2.8.tar.gz +sha256 3650b5393b0d1790cac66db00e34f059aa91c23cfe3c2559676594e295d75fde selinux-python-2.9.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/selinux-python/selinux-python.mk b/buildroot/package/selinux-python/selinux-python.mk index 2de55f33c..978bee7c8 100644 --- a/buildroot/package/selinux-python/selinux-python.mk +++ b/buildroot/package/selinux-python/selinux-python.mk @@ -4,8 +4,8 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 2.8 -SELINUX_PYTHON_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524 +SELINUX_PYTHON_VERSION = 2.9 +SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = COPYING diff --git a/buildroot/package/semodule-utils/semodule-utils.hash b/buildroot/package/semodule-utils/semodule-utils.hash index be40918de..386b44261 100644 --- a/buildroot/package/semodule-utils/semodule-utils.hash +++ b/buildroot/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 44f59c13070c637440b143ceab4dfe1efb9018b1e47828dd8789def74c1ccadf semodule-utils-2.8.tar.gz +sha256 8083679ee634570f6e9a18632f2c2862b9134fa308b689b2e1952a369ae5d907 semodule-utils-2.9.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/buildroot/package/semodule-utils/semodule-utils.mk b/buildroot/package/semodule-utils/semodule-utils.mk index 480e157c6..7102dbc5e 100644 --- a/buildroot/package/semodule-utils/semodule-utils.mk +++ b/buildroot/package/semodule-utils/semodule-utils.mk @@ -4,8 +4,8 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 2.8 -SEMODULE_UTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524 +SEMODULE_UTILS_VERSION = 2.9 +SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = COPYING SEMODULE_UTILS_DEPENDENCIES = libsepol diff --git a/buildroot/package/ser2net/Config.in b/buildroot/package/ser2net/Config.in index cb4d69f74..3d110b70f 100644 --- a/buildroot/package/ser2net/Config.in +++ b/buildroot/package/ser2net/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_SER2NET bool "ser2net" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_GENSIO + select BR2_PACKAGE_LIBYAML help Ser2net provides a way for a user to connect from a network connection to a serial port. diff --git a/buildroot/package/ser2net/S50ser2net b/buildroot/package/ser2net/S50ser2net index 200dfd0e4..1b178c18f 100644 --- a/buildroot/package/ser2net/S50ser2net +++ b/buildroot/package/ser2net/S50ser2net @@ -5,7 +5,7 @@ start() { printf "Starting ser2net: " - if [ ! -f /etc/ser2net.conf ] ; then + if [ ! -f /etc/ser2net.conf ] && [ ! -f /etc/ser2net/ser2net.yaml ] ; then echo "no configuration file" exit 1 fi diff --git a/buildroot/package/ser2net/ser2net.hash b/buildroot/package/ser2net/ser2net.hash index c736c726a..5bd927d7d 100644 --- a/buildroot/package/ser2net/ser2net.hash +++ b/buildroot/package/ser2net/ser2net.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 e10e7c8c97e5bade5e85ce6e89bdf1f4 ser2net-3.5.tar.gz -sha1 0ad0affd37ef544c23f42a3f46d09e969d0d9116 ser2net-3.5.tar.gz +md5 44a69f573677d9f2bde87b3611db5817 ser2net-4.1.1.tar.gz +sha1 502e11c3bee429de6550db459d83c9a0991cfc5c ser2net-4.1.1.tar.gz # Locally computed: -sha256 ba9e1d60a89fd7ed075553b4a2074352902203f7fbd9b65b15048c05f0e3f3be ser2net-3.5.tar.gz +sha256 ad6c8fb34d01be177570323899d840a44c8774399d594595393708162fc61e22 ser2net-4.1.1.tar.gz sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING diff --git a/buildroot/package/ser2net/ser2net.mk b/buildroot/package/ser2net/ser2net.mk index 5ab5c4d2a..94035b218 100644 --- a/buildroot/package/ser2net/ser2net.mk +++ b/buildroot/package/ser2net/ser2net.mk @@ -4,10 +4,11 @@ # ################################################################################ -SER2NET_VERSION = 3.5 +SER2NET_VERSION = 4.1.1 SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPL-2.0+ SER2NET_LICENSE_FILES = COPYING +SER2NET_DEPENDENCIES = gensio libyaml ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) SER2NET_CONF_OPTS += --with-pthreads @@ -15,6 +16,11 @@ else SER2NET_CONF_OPTS += --without-pthreads endif +# fix gensio detection with openssl enabled +ifeq ($(BR2_PACKAGE_OPENSSL),y) +SER2NET_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`" +endif + define SER2NET_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/ser2net/S50ser2net \ $(TARGET_DIR)/etc/init.d/S50ser2net diff --git a/buildroot/package/setools/0001-remove-werror-flag-from-setup.patch b/buildroot/package/setools/0001-remove-werror-flag-from-setup.patch index b1446e2ec..4f6d2efb9 100644 --- a/buildroot/package/setools/0001-remove-werror-flag-from-setup.patch +++ b/buildroot/package/setools/0001-remove-werror-flag-from-setup.patch @@ -1,12 +1,12 @@ From b2fe84bfd00117d4897f1f2e8f83d3410eb188b8 Mon Sep 17 00:00:00 2001 -From: Adam Duskett +From: Adam Duskett Date: Thu, 12 Oct 2017 22:04:58 -0400 Subject: [PATCH] remove werror flag from setup Compilers older than gcc6 will generate uninitialized variable warnings which will cause compiling to fail. -Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch b/buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch index 1ef1cd69b..508087ff2 100644 --- a/buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch +++ b/buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch @@ -12,7 +12,7 @@ Therefore it's better to use setools.infoflow.InfoFlowAnalysis and setools.dta.DomainTransitionAnalysis and let the package containing sedta and seinfoflow to require python3-networkx -Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett --- sedta | 3 ++- seinfoflow | 3 ++- diff --git a/buildroot/package/setools/Config.in b/buildroot/package/setools/Config.in index 0a7899b5e..56a85b01c 100644 --- a/buildroot/package/setools/Config.in +++ b/buildroot/package/setools/Config.in @@ -1,10 +1,8 @@ config BR2_PACKAGE_SETOOLS bool "setools" - depends on !BR2_arc # arc: libselinux not available depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux depends on BR2_USE_MMU select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3 @@ -22,8 +20,7 @@ config BR2_PACKAGE_SETOOLS https://github.com/TresysTechnology/setools -comment "setools needs a glibc toolchain w/ threads, C++, wchar, dynamic library" - depends on BR2_USE_MMU && !BR2_arc +comment "setools needs a toolchain w/ threads, C++, wchar, dynamic library" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_INSTALL_LIBSTDCPP + !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/sg3_utils/sg3_utils.mk b/buildroot/package/sg3_utils/sg3_utils.mk index 79521fd06..7070d6f83 100644 --- a/buildroot/package/sg3_utils/sg3_utils.mk +++ b/buildroot/package/sg3_utils/sg3_utils.mk @@ -10,7 +10,7 @@ SG3_UTILS_SITE = http://sg.danny.cz/sg/p SG3_UTILS_LICENSE = BSD-3-Clause (library) # Some utils progs are GPL-2.0+ licensed while others are BSD-3-Clause ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y) -SG3_UTILS_LICENSE := $(SG3_UTILS_LICENSE), GPL-2.0+ (programs), BSD-3-Clause (programs) +SG3_UTILS_LICENSE += , GPL-2.0+ (programs), BSD-3-Clause (programs) endif SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE diff --git a/buildroot/package/shadowsocks-libev/0001-configure.ac-fix-static-build-with-netfilter_conntra.patch b/buildroot/package/shadowsocks-libev/0001-configure.ac-fix-static-build-with-netfilter_conntra.patch deleted file mode 100644 index 7ddb140e8..000000000 --- a/buildroot/package/shadowsocks-libev/0001-configure.ac-fix-static-build-with-netfilter_conntra.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9b4aebc840f444e5aa83633838e3890cec523017 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 18 Jan 2019 21:05:34 +0100 -Subject: [PATCH] configure.ac: fix static build with netfilter_conntrack - -Fixes: - - http://autobuild.buildroot.org/results/22a28e8fd8182e1c908541dbc5b0ee087c3803e6 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://github.com/shadowsocks/shadowsocks-libev/pull/2270] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a706591..c6dab8b 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -256,7 +256,7 @@ if test x"$enable_connmarktos" = "xyes" ; then - if test x"$enable_connmarktos" = "xyes"; then - AC_MSG_ERROR([--enable-connmarktos specified but libnetfilter-conntrack library not found]) - fi -- with_netfilter_conntrack=no]) -+ with_netfilter_conntrack=no], [-lnfnetlink]) - AC_CHECK_HEADERS([libnetfilter_conntrack/libnetfilter_conntrack.h \ - libnetfilter_conntrack/libnetfilter_conntrack_tcp.h],,[ - if test x"$enable_connmarktos" = "xyes"; then --- -2.14.1 - diff --git a/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash b/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash index a7c0dc071..76928ebb4 100644 --- a/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash +++ b/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 2befc27b1cc62af0450702343d17e347936f0d4e3d4b04ba9246c4f9b409b742 shadowsocks-libev-3.2.3.tar.gz +sha256 677356a5ed6b5ae9e32a898061db2587158ff27e245db03f4bde9b006ef12dc9 shadowsocks-libev-3.3.3.tar.gz # License files, locally calculated sha256 736883f97d44dbec288bb82819f18f4f86d02ae3192f6a9abefa00db76bace41 COPYING diff --git a/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk b/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk index c2c33b7aa..4b0b963ee 100644 --- a/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk +++ b/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk @@ -4,14 +4,12 @@ # ################################################################################ -SHADOWSOCKS_LIBEV_VERSION = 3.2.3 +SHADOWSOCKS_LIBEV_VERSION = 3.3.3 SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION) SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause (libbloom), BSD-3-Clause (libcork, libipset) SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE libcork/COPYING SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES -# We're patching configure.ac -SHADOWSOCKS_LIBEV_AUTORECONF = YES SHADOWSOCKS_LIBEV_CONF_OPTS = \ --with-pcre=$(STAGING_DIR)/usr \ --disable-ssp diff --git a/buildroot/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch b/buildroot/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch deleted file mode 100644 index 32c52add3..000000000 --- a/buildroot/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5101ab2d13e2b89ea3c1276df5fb7413634eeccd Mon Sep 17 00:00:00 2001 -From: Mike Brady -Date: Sat, 25 Aug 2018 13:08:37 +0100 -Subject: [PATCH] Sometimes libsoxr is built to rely on libavutil. If libavutil - is detected, link to it when building libsoxr. Add pgk_config support to soxr - selection. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The Buildroot autobuilder detected a build issue [0] when building -shairport-sync statically: - -``` -arm-buildroot-linux-uclibcgnueabi/sysroot/usr//lib/libsoxr.a(soxr.c.o): In function `soxr_create': -soxr.c:(.text+0xd4c): undefined reference to `av_get_cpu_flags' -collect2: error: ld returned 1 exit status -``` - -A quick look at the soxr source code shows that `soxr_create()` might use -`av_get_cpu_flags()` depending on the architecture. - -For the sake of simplicity link with `-lavutil` if it is found when using soxr. - -Even better, as soxr provides a pkg-config file, this should be prefered. - -[0] http://autobuild.buildroot.org/results/53d/53d21686780aa2485745b59e812b6280dd39f1c5 - -Upstream status: 5101ab2d13e2b89ea3c1276df5fb7413634eeccd - -Signed-off-by: Jörg Krause ---- - configure.ac | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0c917a4..2b6fddb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -176,7 +176,20 @@ AC_ARG_WITH(ssl, [ choose --with-ssl=openssl, --with-ssl=mbedtls or --with-ssl=p - # Look for soxr flag - AC_ARG_WITH(soxr, [ --with-soxr = choose libsoxr for high-quality interpolation], [ - AC_MSG_RESULT(>>Including support for soxr-based interpolation) -- AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!))], ) -+ if test "x${with_pkg_config}" = xyes ; then -+ PKG_CHECK_MODULES( -+ [SOXR], [soxr], -+ [LIBS="${SOXR_LIBS} ${LIBS}"]) -+ else -+ AC_CHECK_LIB([avutil],[av_get_cpu_flags]) -+ if test "x${ac_cv_lib_avutil_av_get_cpu_flags}" = xyes ; then -+ # soxr may link against libavutil, depending on the architecture, but for the sake of simplicity link with it if it is found -+ AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!), [-lavutil]) -+ else -+ AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!)) -+ fi -+ fi -+], ) - - # Look for metadata flag -- set flag for conditional compilation - AC_ARG_WITH(metadata, [ --with-metadata = include support for a metadata feed], [ --- -2.18.0 diff --git a/buildroot/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch b/buildroot/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch deleted file mode 100644 index 66ce961ab..000000000 --- a/buildroot/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9 Mon Sep 17 00:00:00 2001 -From: Mike Brady -Date: Sat, 8 Sep 2018 15:06:18 +0100 -Subject: [PATCH] Include a definition of HAVE_LIBSOXR with using pkg_config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit e047dee241fe0660d92311a124757065c6c4c93d adds an upstream patch -to fix a build issue with soxr. The patch also adds detecting soxr -using pkg-config. Upstream detected a config issue [1], where the -resulting binary lacks soxr support, although libsoxr was correctly -detected. - -Backported from: cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9 - -Signed-off-by: Jörg Krause ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index ceec4af..690a774 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -180,6 +180,7 @@ AC_ARG_WITH(soxr, [ --with-soxr = choose libsoxr for high-quality interpolation - PKG_CHECK_MODULES( - [SOXR], [soxr], - [LIBS="${SOXR_LIBS} ${LIBS}"]) -+ AC_DEFINE([HAVE_LIBSOXR],[1],[Define to 1 if you are including support for soxr interpolation]) - else - AC_CHECK_LIB([avutil],[av_get_cpu_flags]) - if test "x${ac_cv_lib_avutil_av_get_cpu_flags}" = xyes ; then --- -2.18.0 diff --git a/buildroot/package/shairport-sync/Config.in b/buildroot/package/shairport-sync/Config.in index 5df4c194c..528767ba9 100644 --- a/buildroot/package/shairport-sync/Config.in +++ b/buildroot/package/shairport-sync/Config.in @@ -1,12 +1,10 @@ config BR2_PACKAGE_SHAIRPORT_SYNC bool "shairport-sync" - depends on BR2_USE_MMU # libdaemon depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_ALSA_LIB_MIXER select BR2_PACKAGE_LIBCONFIG - select BR2_PACKAGE_LIBDAEMON select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS select BR2_PACKAGE_POPT help @@ -22,6 +20,26 @@ config BR2_PACKAGE_SHAIRPORT_SYNC if BR2_PACKAGE_SHAIRPORT_SYNC +config BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION + bool "convolution support" + select BR2_PACKAGE_LIBSNDFILE + help + Enable audio DSP convolution support. + +config BR2_PACKAGE_SHAIRPORT_SYNC_DBUS + bool "dbus support" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_LIBGLIB2 + help + Enable support for support for the MPRIS and native + Shairport Sync D-Bus interface. + +comment "shairport-sync dbus support needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR bool "libsoxr support" select BR2_PACKAGE_LIBSOXR @@ -34,6 +52,23 @@ config BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR can be heard in some circumstances. Libsoxr allows this interpolation to be done much more smoothly and subtly. +config BR2_PACKAGE_SHAIRPORT_SYNC_MQTT + bool "mqtt support" + depends on BR2_USE_MMU # avahi + depends on BR2_TOOLCHAIN_HAS_THREADS # avahi + depends on !BR2_STATIC_LIBS # avahi + select BR2_PACKAGE_AVAHI + select BR2_PACKAGE_AVAHI_DAEMON + select BR2_PACKAGE_DBUS + select BR2_PACKAGE_MOSQUITTO + help + Enable support for the MQTT, the Message Queuing Telemetry + Transport protocol. + +comment "shairport-sync mqtt support needs a toolchain w/ dynamic library, threads" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + endif comment "shairport-sync needs a toolchain w/ C++, NPTL" diff --git a/buildroot/package/shairport-sync/shairport-sync.hash b/buildroot/package/shairport-sync/shairport-sync.hash index 076f0a213..b072fad04 100644 --- a/buildroot/package/shairport-sync/shairport-sync.hash +++ b/buildroot/package/shairport-sync/shairport-sync.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1fe16856ec828704b086c571038a3b2eb907a3cf0a3847ed1b721b517554659d shairport-sync-3.2.1.tar.gz +sha256 9757dd7f19c0bc28cb06a6753305c3ed89da2d271d069b36d1b12173309c1459 shairport-sync-3.3.5.tar.gz +sha256 1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f LICENSES diff --git a/buildroot/package/shairport-sync/shairport-sync.mk b/buildroot/package/shairport-sync/shairport-sync.mk index f1857b0da..880a05890 100644 --- a/buildroot/package/shairport-sync/shairport-sync.mk +++ b/buildroot/package/shairport-sync/shairport-sync.mk @@ -4,12 +4,12 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 3.2.1 +SHAIRPORT_SYNC_VERSION = 3.3.5 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause SHAIRPORT_SYNC_LICENSE_FILES = LICENSES -SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig libdaemon popt host-pkgconf +SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig popt host-pkgconf # git clone, no configure SHAIRPORT_SYNC_AUTORECONF = YES @@ -33,6 +33,11 @@ else SHAIRPORT_SYNC_CONF_OPTS += --with-tinysvcmdns endif +ifeq ($(BR2_PACKAGE_LIBDAEMON),y) +SHAIRPORT_SYNC_DEPENDENCIES += libdaemon +SHAIRPORT_SYNC_CONF_OPTS += --with-libdaemon +endif + # OpenSSL or mbedTLS ifeq ($(BR2_PACKAGE_OPENSSL),y) SHAIRPORT_SYNC_DEPENDENCIES += openssl @@ -46,11 +51,26 @@ SHAIRPORT_SYNC_CONF_LIBS += -lz endif endif +ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION),y) +SHAIRPORT_SYNC_DEPENDENCIES += libsndfile +SHAIRPORT_SYNC_CONF_OPTS += --with-convolution +endif + +ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y) +SHAIRPORT_SYNC_DEPENDENCIES += libglib2 +SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface +endif + ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR),y) SHAIRPORT_SYNC_DEPENDENCIES += libsoxr SHAIRPORT_SYNC_CONF_OPTS += --with-soxr endif +ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_MQTT),y) +SHAIRPORT_SYNC_DEPENDENCIES += avahi dbus mosquitto +SHAIRPORT_SYNC_CONF_OPTS += --with-mqtt-client +endif + define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/shairport-sync \ $(TARGET_DIR)/usr/bin/shairport-sync diff --git a/buildroot/package/shapelib/Config.in b/buildroot/package/shapelib/Config.in index 553d3483a..7c7b9c76c 100644 --- a/buildroot/package/shapelib/Config.in +++ b/buildroot/package/shapelib/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_SHAPELIB bool "shapelib" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_PROJ help The Shapefile C Library provides the ability to write simple C programs for reading, writing and updating (to a limited diff --git a/buildroot/package/shapelib/shapelib.hash b/buildroot/package/shapelib/shapelib.hash index 6abddb2a7..d1f6fa977 100644 --- a/buildroot/package/shapelib/shapelib.hash +++ b/buildroot/package/shapelib/shapelib.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 a4c94817365761a3a4c21bb3ca1c680a6bdfd3edd61df9fdd291d3e7645923b3 shapelib-1.4.1.tar.gz +sha256 1fc0a480982caef9e7b9423070b47750ba34cd0ba82668f2e638fab1d07adae1 shapelib-1.5.0.tar.gz sha256 7eb803a70990017a1c4e38a8342d7413c5dfeec3ed1ac407e15ae2c274e560ff COPYING sha256 a638278f7f1cb7d0cdc73b47a6c87261b882e356a8e79922e90d44d7ef1dd2c7 web/license.html diff --git a/buildroot/package/shapelib/shapelib.mk b/buildroot/package/shapelib/shapelib.mk index b76c3bb2d..bedd15dc3 100644 --- a/buildroot/package/shapelib/shapelib.mk +++ b/buildroot/package/shapelib/shapelib.mk @@ -4,11 +4,10 @@ # ################################################################################ -SHAPELIB_VERSION = 1.4.1 +SHAPELIB_VERSION = 1.5.0 SHAPELIB_SITE = http://download.osgeo.org/shapelib SHAPELIB_LICENSE = MIT or LGPL-2.0 SHAPELIB_LICENSE_FILES = web/license.html COPYING SHAPELIB_INSTALL_STAGING = YES -SHAPELIB_DEPENDENCIES = proj $(eval $(autotools-package)) diff --git a/buildroot/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch b/buildroot/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch index a0d3fb0fb..4fe7f5217 100644 --- a/buildroot/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch +++ b/buildroot/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch @@ -23,6 +23,8 @@ This patch is similar to the patch used by the Yocto Project at http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch. Signed-off-by: Thomas Petazzoni +[Upstream status: +https://gitlab.freedesktop.org/xdg/shared-mime-info/merge_requests/18] --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot/package/shared-mime-info/shared-mime-info.hash b/buildroot/package/shared-mime-info/shared-mime-info.hash index cf6c8f3eb..b86499cd5 100644 --- a/buildroot/package/shared-mime-info/shared-mime-info.hash +++ b/buildroot/package/shared-mime-info/shared-mime-info.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 2af55ef1a0319805b74ab40d331a3962c905477d76c086f49e34dc96363589e9 shared-mime-info-1.8.tar.xz +sha256 18b2f0fe07ed0d6f81951a5fd5ece44de9c8aeb4dc5bb20d4f595f6cc6bd403e shared-mime-info-1.12.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/shared-mime-info/shared-mime-info.mk b/buildroot/package/shared-mime-info/shared-mime-info.mk index e68d631a2..9932bd2db 100644 --- a/buildroot/package/shared-mime-info/shared-mime-info.mk +++ b/buildroot/package/shared-mime-info/shared-mime-info.mk @@ -4,9 +4,10 @@ # ################################################################################ -SHARED_MIME_INFO_VERSION = 1.8 +SHARED_MIME_INFO_VERSION = 1.12 SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.xz -SHARED_MIME_INFO_SITE = https://people.freedesktop.org/~hadess +SHARED_MIME_INFO_SITE = \ + https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51 SHARED_MIME_INFO_INSTALL_STAGING = YES # 0001-Remove-incorrect-dependency-from-install-data-hook.patch SHARED_MIME_INFO_AUTORECONF = YES diff --git a/buildroot/package/shellinabox/0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch b/buildroot/package/shellinabox/0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch new file mode 100644 index 000000000..4b15f419e --- /dev/null +++ b/buildroot/package/shellinabox/0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch @@ -0,0 +1,26 @@ +From 7f47efe1717c381f86566fabe0b1ced8cb98fe8f Mon Sep 17 00:00:00 2001 +From: irsl +Date: Fri, 26 Oct 2018 11:51:15 +0200 +Subject: [PATCH] fix for broken multipart/form-data + +Malformed multipart/form-data payload results in infinite loop and thus denial of service +[Upstream status: https://github.com/shellinabox/shellinabox/pull/446] +Signed-off-by: Fabrice Fontaine +--- + libhttp/url.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libhttp/url.c b/libhttp/url.c +index ed29475..4177871 100644 +--- a/libhttp/url.c ++++ b/libhttp/url.c +@@ -312,6 +312,9 @@ static void urlParsePostBody(struct URL *url, + } + } + } ++ } else { ++ warn("[http] broken multipart/form-data!"); ++ break; + } + } + if (lastPart) { diff --git a/buildroot/package/shellinabox/shellinabox.hash b/buildroot/package/shellinabox/shellinabox.hash index 6e1920706..634aa7345 100644 --- a/buildroot/package/shellinabox/shellinabox.hash +++ b/buildroot/package/shellinabox/shellinabox.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 27a5ec6c3439f87aee238c47cc56e7357a6249e5ca9ed0f044f0057ef389d81e shellinabox-v2.20.tar.gz +sha256 27a5ec6c3439f87aee238c47cc56e7357a6249e5ca9ed0f044f0057ef389d81e shellinabox-2.20.tar.gz sha256 04ef60ab9b83cde6f0862ea18474454477efb34c52ebce1f8d8260a398a39362 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL-2 diff --git a/buildroot/package/shellinabox/shellinabox.mk b/buildroot/package/shellinabox/shellinabox.mk index 70db551e3..4c93fdcce 100644 --- a/buildroot/package/shellinabox/shellinabox.mk +++ b/buildroot/package/shellinabox/shellinabox.mk @@ -4,11 +4,14 @@ # ################################################################################ -SHELLINABOX_VERSION = v2.20 -SHELLINABOX_SITE = $(call github,shellinabox,shellinabox,$(SHELLINABOX_VERSION)) +SHELLINABOX_VERSION = 2.20 +SHELLINABOX_SITE = $(call github,shellinabox,shellinabox,v$(SHELLINABOX_VERSION)) SHELLINABOX_LICENSE = GPL-2.0 with OpenSSL exception SHELLINABOX_LICENSE_FILES = COPYING GPL-2 +# 0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch +SHELLINABOX_IGNORE_CVES += CVE-2018-16789 + # Fetching from Github, and patching Makefile.am, so we need to autoreconf SHELLINABOX_AUTORECONF = YES diff --git a/buildroot/package/sigrok-cli/sigrok-cli.hash b/buildroot/package/sigrok-cli/sigrok-cli.hash index 42bbdc185..63a3dd80a 100644 --- a/buildroot/package/sigrok-cli/sigrok-cli.hash +++ b/buildroot/package/sigrok-cli/sigrok-cli.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 5669d968c2de3dfc6adfda76e83789b6ba76368407c832438cef5e7099a65e1c sigrok-cli-0.7.0.tar.gz +sha256 5669d968c2de3dfc6adfda76e83789b6ba76368407c832438cef5e7099a65e1c sigrok-cli-0.7.0.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/sispmctl/0001-configure-add-pkg-config-support.patch b/buildroot/package/sispmctl/0001-configure-add-pkg-config-support.patch deleted file mode 100644 index 946608064..000000000 --- a/buildroot/package/sispmctl/0001-configure-add-pkg-config-support.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 8002a7e6fa965dfd304d098fbc64b0f1a6e3b465 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 24 Aug 2014 22:34:29 +0200 -Subject: [PATCH 1/1] configure: add pkg-config support - -The static linking doesn't works with libusb-compat when using libusb-config. -Also the CFLAGS initialization with libusb-config --cflags is comented out. - -Based on libftdi's patch, add the support for pkg-config to link sispmctl -correctly. - -This allow to add correct include directory to CFLAGS -(Add -I$(STAGING_DIR)/usr/include and -I$(STAGING_DIR)/usr/include/libusb-1.0) -Also add needed libraries during static linking (-lusb -lusb-1.0 and -pthread) - -Signed-off-by: Romain Naour ---- - configure.in | 36 +++++++++++------------------------- - 1 file changed, 11 insertions(+), 25 deletions(-) - -diff --git a/configure.in b/configure.in -index 08d39ea..65d0c1d 100644 ---- a/configure.in -+++ b/configure.in -@@ -23,31 +23,17 @@ AC_SUBST(WEBDIR) - AC_ARG_WITH(bindaddr,[ --with-bindaddr=IP bind listening socket to IP], [BINDADDR="$withval"]) - AC_SUBST(BINDADDR) - -- --# Checks for libraries. --dnl check for libusb-config --AC_PATH_PROG(HAVELIBUSB, libusb-config, $PATH) -- --if test -e "$HAVELIBUSB"; then -- dnl LIBUSB_CFLAGS=`$HAVELIBUSB --cflags` -- LIBUSB_LIBS=`$HAVELIBUSB --libs` -- CFLAGS="$CFLAGS $LIBUSB_CFLAGS" -- LIBS="$LIBS $LIBUSB_LIBS" --else -- AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation. Version >=0.1.7]) --fi -- --dnl check for version of libusb --AC_MSG_CHECKING([if libusb version is >= 0.1.9]) --libusb_version_needed="1009" --libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` -- --if test $libusb_version -lt $libusb_version_needed; then -- AC_MSG_RESULT(no) -- AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.9.]) --else -- AC_MSG_RESULT(yes) --fi -+dnl check for libusb -+PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.11) -+CFLAGS="$CFLAGS $LIBUSB_CFLAGS" -+LIBS="$LIBS $LIBUSB_LIBS" -+ -+dnl Check for recent pkg-config which supports Requires.private -+case `$PKG_CONFIG --version` in -+0.?|0.1[0-7]) PKGCONFIG_REQUIRES="Requires"; ;; -+*) PKGCONFIG_REQUIRES="Requires.private"; ;; -+esac -+AC_SUBST(PKGCONFIG_REQUIRES) - - # Checks for header files. - AC_HEADER_STDC --- -1.9.3 - diff --git a/buildroot/package/sispmctl/sispmctl.hash b/buildroot/package/sispmctl/sispmctl.hash index 9f34b4399..f1090c4b8 100644 --- a/buildroot/package/sispmctl/sispmctl.hash +++ b/buildroot/package/sispmctl/sispmctl.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 e9a99cc81ef0a93f3484e5093efd14d93cc967221fcd22c151f0bea32eb91da7 sispmctl-3.1.tar.gz +sha256 bf5177e085cb0168e18e4cfb69645c3095da149ed46f5659d6e757bde3548e40 sispmctl-4.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/sispmctl/sispmctl.mk b/buildroot/package/sispmctl/sispmctl.mk index 85c03382c..93e7de769 100644 --- a/buildroot/package/sispmctl/sispmctl.mk +++ b/buildroot/package/sispmctl/sispmctl.mk @@ -4,15 +4,12 @@ # ################################################################################ -SISPMCTL_VERSION = 3.1 +SISPMCTL_VERSION = 4.1 SISPMCTL_SITE = http://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION) SISPMCTL_LICENSE = GPL-2.0+ -SISPMCTL_LICENSE_FILES = LICENCE +SISPMCTL_LICENSE_FILES = COPYING SISPMCTL_DEPENDENCIES = libusb-compat SISPMCTL_CONF_OPTS = --enable-webless -# We're patching configure.in -SISPMCTL_AUTORECONF = YES - $(eval $(autotools-package)) diff --git a/buildroot/package/skalibs/0001-Make-linker-use-dummy-file-when-testing-libs.patch b/buildroot/package/skalibs/0001-Make-linker-use-dummy-file-when-testing-libs.patch new file mode 100644 index 000000000..17376210f --- /dev/null +++ b/buildroot/package/skalibs/0001-Make-linker-use-dummy-file-when-testing-libs.patch @@ -0,0 +1,44 @@ +From ca69c0d48e65acadccfe65e3adf16c34a744627b Mon Sep 17 00:00:00 2001 +From: Eric Le Bihan +Date: Tue, 10 Oct 2017 19:51:34 +0200 +Subject: [PATCH] Make linker use dummy file when testing libs + +For some architectures, like Xtensa or HPPA, ld from binutils requires +the output file to be a regular file, as mentioned in a bug report on +the mailing list [1]. + +So, use a dummy file as output file for ld in trylibs(), instead of +/dev/null. + +[1] https://sourceware.org/bugzilla/show_bug.cgi?id=19526 + +Signed-off-by: Eric Le Bihan +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 54d755b..64a061a 100755 +--- a/configure ++++ b/configure +@@ -230,7 +230,7 @@ trylibs () { + echo "Checking whether system has $2..." >&3 + shift 2 + if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -c -o try$name.o src/sysdeps/try$name.c 2>/dev/null ; then +- until $CC_AUTO $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o /dev/null try$name.o $args 2>/dev/null ; do ++ until $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -o try$name try$name.o $args 2>/dev/null ; do + if test -z "$*" ; then + rm -f try$name.o + echo +@@ -246,7 +246,7 @@ trylibs () { + else + echo " ... yes, with$args" >&3 + fi +- rm -f try$name.o ++ rm -f try$name.o try$name + return 0 + else + echo +-- +2.17.2 + diff --git a/buildroot/package/skalibs/0001-No-runtime-tests-for-endianness.patch b/buildroot/package/skalibs/0001-No-runtime-tests-for-endianness.patch deleted file mode 100644 index eb70b4ed5..000000000 --- a/buildroot/package/skalibs/0001-No-runtime-tests-for-endianness.patch +++ /dev/null @@ -1,96 +0,0 @@ -From d3920dce139734e00bbe4447a16ef24dfe4d704a Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Tue, 10 Oct 2017 19:51:02 +0200 -Subject: [PATCH] No runtime tests for endianness - -Replace build and execution of runtime test programs for determining -the endianness of the target with compile time test programs. - -This improves support for cross-compilation. - -Signed-off-by: Eric Le Bihan ---- - configure | 13 ++++++++++--- - src/sysdeps/trybigendian.c | 16 ++++++++++++++++ - src/sysdeps/trylittleendian.c | 19 +++++++++++++++++++ - 3 files changed, 45 insertions(+), 3 deletions(-) - create mode 100644 src/sysdeps/trybigendian.c - create mode 100644 src/sysdeps/trylittleendian.c - -diff --git a/configure b/configure -index f34dcd0..f2a77f3 100755 ---- a/configure -+++ b/configure -@@ -478,12 +478,19 @@ EOF - exec 3>&- - - echo "Checking system endianness..." -- $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o tryendianness src/sysdeps/tryendianness.c -- endianness=$(./tryendianness) || fail "$0: unable to determine endianness" -+ if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o trybigendian src/sysdeps/trybigendian.c 2>/dev/null; then -+ endianness=big -+ else -+ if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o trylittleendian src/sysdeps/trylittleendian.c 2>/dev/null; then -+ endianness=little -+ else -+ fail "$0: unable to determine endianness" -+ fi -+ fi - echo "endianness: $endianness" >> $sysdeps/sysdeps - echo "#define ${package_macro_name}_ENDIANNESS \"$endianness\"" >> $sysdeps/sysdeps.h - echo " ... $endianness" -- rm -f tryendianness -+ rm -f trybigendian trylittleendian - - trytypes - choose clr accept4 ACCEPT4 'accept4()' -diff --git a/src/sysdeps/trybigendian.c b/src/sysdeps/trybigendian.c -new file mode 100644 -index 0000000..d857572 ---- /dev/null -+++ b/src/sysdeps/trybigendian.c -@@ -0,0 +1,16 @@ -+#if defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN) || \ -+ defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) || \ -+ defined(__BIG_ENDIAN) || \ -+ defined(__ARMEB__) || \ -+ defined(__THUMBEB__) || \ -+ defined(__AARCH64EB__) || \ -+ defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__) -+#define YEAH -+#else -+#error "not big endian" -+#endif -+ -+int main(void) -+{ -+ return 0; -+} -diff --git a/src/sysdeps/trylittleendian.c b/src/sysdeps/trylittleendian.c -new file mode 100644 -index 0000000..68b93c1 ---- /dev/null -+++ b/src/sysdeps/trylittleendian.c -@@ -0,0 +1,19 @@ -+#if defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN) || \ -+ defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || \ -+ defined(__LITTLE_ENDIAN) || \ -+ defined(__ARMEL__) || \ -+ defined(__THUMBEL__) || \ -+ defined(__AARCH64EL__) || \ -+ defined(__i386) || defined(__i386__) || \ -+ defined(__amd64) || defined(__amd64__) || \ -+ defined(__x86_64) || defined(__x86_64__) || \ -+ defined(_MIPSEL) || defined(__MIPSEL) || defined(__MIPSEL__) -+#define YEAH -+#else -+#error "not little endian" -+#endif -+ -+int main(void) -+{ -+ return 0; -+} --- -2.13.6 - diff --git a/buildroot/package/skalibs/0002-No-runtime-tests-for-type-sizes.patch b/buildroot/package/skalibs/0002-No-runtime-tests-for-type-sizes.patch deleted file mode 100644 index ad3b19eb7..000000000 --- a/buildroot/package/skalibs/0002-No-runtime-tests-for-type-sizes.patch +++ /dev/null @@ -1,115 +0,0 @@ -From f411b502222c8fe442d7b3beb00b530c9e16b7a2 Mon Sep 17 00:00:00 2001 -From: "Van Bemten, Lionel (Nokia - BE/Antwerp)" -Date: Sun, 29 Apr 2018 19:53:40 +0200 -Subject: [PATCH] No runtime tests for type sizes - -Replace build and execution of runtime test programs for determining -some type sizes of the target with compile time test programs. - -This improves support for cross-compilation. - -Signed-off-by: "Van Bemten, Lionel (Nokia - BE/Antwerp)" -Signed-off-by: Eric Le Bihan ---- - configure | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 60 insertions(+), 15 deletions(-) - -diff --git a/configure b/configure -index 434eec8..c09e9c8 100755 ---- a/configure -+++ b/configure -@@ -155,23 +155,69 @@ choose () { - fi - } - -+findtypesize () { -+ typ=$1 -+ abbr=$2 -+ r=false -+ type_size=0 -+ while true; do -+ cat>trysizeof${abbr}.c< -+ -+int main(void) -+{ -+ static int v = 1 / !!((sizeof($typ) == $type_size)); -+ return 0; -+} -+EOF -+ if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o trysizeof${abbr} trysizeof${abbr}.c 2>/dev/null; then -+ r=true -+ break -+ fi -+ type_size=$(expr $type_size + 1) -+ test $type_size -le 16 || break -+ done -+ rm -f trysizeof${abbr} trysizeof${abbr}.c -+ test $r = true || fail "$0: unable to determine size of $typ" -+ caps=$(echo "sizeof${abbr}" | tr a-z A-Z) -+ echo "#define ${package_macro_name}_${caps} $type_size" >> $sysdeps/sysdeps.h -+ echo "sizeof${abbr}: $type_size" >> $sysdeps/sysdeps -+} -+ -+findtypesign () { -+ typ=$1 -+ abbr=$2 -+ caps=$(echo "signed${abbr}" | tr a-z A-Z) -+ cat>trysignof${abbr}.c< -+ -+int main(void) -+{ -+ static int v = 1 / !!(((($typ) -1) < 0)); -+ return 0; -+} -+EOF -+ if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o trysignof${abbr} trysignof${abbr}.c 2>/dev/null; then -+ echo "#define ${package_macro_name}_HAS${caps}" >> $sysdeps/sysdeps.h -+ echo "#undef ${package_macro_name}_HASUN${caps}" >> $sysdeps/sysdeps.h -+ echo "signed${abbr}: yes" >> $sysdeps/sysdeps -+ else -+ echo "#undef ${package_macro_name}_HAS${caps}" >> $sysdeps/sysdeps.h -+ echo "#define ${package_macro_name}_HASUN${caps}" >> $sysdeps/sysdeps.h -+ echo "signed${abbr}: no" >> $sysdeps/sysdeps -+ fi -+ rm -f trysignof${abbr} trysignof${abbr}.c -+} -+ - trytypes () { - echo "Checking size and signedness of standard types..." -- $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o output-types src/sysdeps/output-types.c -- ./output-types >> $sysdeps/sysdeps -- ./output-types | grep -F sizeof | while read key value ; do -- caps=$(echo $key | sed s/:\$// | tr a-z A-Z) -- echo "#define ${package_macro_name}_${caps} $value" >> $sysdeps/sysdeps.h -+ for t in "unsigned short" "unsigned int" "unsigned long"; do -+ abbr=$(echo "$t" | sed -e 's/nsigned //') -+ findtypesize "$t" "${abbr}" - done -- ./output-types | grep -F signed | while read key value ; do -- caps=$(echo $key | sed s/:\$// | tr a-z A-Z) -- if test $value = yes ; then -- echo "#define ${package_macro_name}_HAS${caps}" -- echo "#undef ${package_macro_name}_HASUN${caps}" -- else -- echo "#undef ${package_macro_name}_HAS${caps}" -- echo "#define ${package_macro_name}_HASUN${caps}" -- fi >> $sysdeps/sysdeps.h -+ for t in size uid gid pid time dev ino; do -+ findtypesize "${t}_t" "$t" -+ findtypesign "${t}_t" "$t" - done - rm -f output-types - echo " ... done" -@@ -548,7 +594,6 @@ EOF - choose cl itimer ITIMER 'setitimer()' - choose cl namespaces NAMESPACES 'namespaces' - choose cl nsgetparent NSGETPARENT 'NS_GET_PARENT' -- choose cl explicit_bzero EXPLICIT_BZERO 'explicit_bzero()' - - echo '#endif' >> $sysdeps/sysdeps.h - fi --- -2.14.3 - diff --git a/buildroot/package/skalibs/0003-Make-linker-use-dummy-file-when-testing-libs.patch b/buildroot/package/skalibs/0003-Make-linker-use-dummy-file-when-testing-libs.patch deleted file mode 100644 index 084117936..000000000 --- a/buildroot/package/skalibs/0003-Make-linker-use-dummy-file-when-testing-libs.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 02ef4599179ead87cc6d154a32acaa6627cbfca2 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Tue, 10 Oct 2017 19:51:34 +0200 -Subject: [PATCH] Make linker use dummy file when testing libs - -For some architectures, like Xtensa or HPPA, ld from binutils requires -the output file to be a regular file, as mentioned in a bug report on -the mailing list [1]. - -So, use a dummy file as output file for ld in trylibs(), instead of -/dev/null. - -[1] https://sourceware.org/bugzilla/show_bug.cgi?id=19526 - -Signed-off-by: Eric Le Bihan ---- - configure | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 8348b1f..62e5981 100755 ---- a/configure -+++ b/configure -@@ -227,7 +227,7 @@ trylibs () { - echo "Checking whether system has $2..." >&3 - shift 2 - if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -c -o try$name.o src/sysdeps/try$name.c 2>/dev/null ; then -- until $CC_AUTO $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o /dev/null try$name.o $args 2>/dev/null ; do -+ until $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -o try$name try$name.o $args 2>/dev/null ; do - if test -z "$*" ; then - rm -f try$name.o - echo -@@ -243,7 +243,7 @@ trylibs () { - else - echo " ... yes, with$args" >&3 - fi -- rm -f try$name.o -+ rm -f try$name.o try$name - return 0 - else - echo --- -2.13.6 - diff --git a/buildroot/package/skalibs/skalibs.hash b/buildroot/package/skalibs/skalibs.hash index 0646dbc0e..bb5a60212 100644 --- a/buildroot/package/skalibs/skalibs.hash +++ b/buildroot/package/skalibs/skalibs.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 30ac73f1e8da6387fcfa19cfe1e326a143b4d811aaf532988b280daefa56dcc7 skalibs-2.6.4.0.tar.gz -sha256 3eadcf980c40da0f257b8292d805ff41e5e5a908c1942315d9a627732e1aa012 COPYING +sha256 d3b204afc462b9659e0c16f6df1c796e7612534f537eec053529f67ddcd086a5 skalibs-2.9.1.0.tar.gz +sha256 d8e17a6418d26867c13801810903a1f78beac8cfe8f92c2a85afe59f3c3fc48c COPYING diff --git a/buildroot/package/skalibs/skalibs.mk b/buildroot/package/skalibs/skalibs.mk index 7672b0d31..8b995f796 100644 --- a/buildroot/package/skalibs/skalibs.mk +++ b/buildroot/package/skalibs/skalibs.mk @@ -4,7 +4,7 @@ # ################################################################################ -SKALIBS_VERSION = 2.6.4.0 +SKALIBS_VERSION = 2.9.1.0 SKALIBS_SITE = http://skarnet.org/software/skalibs SKALIBS_LICENSE = ISC SKALIBS_LICENSE_FILES = COPYING @@ -13,6 +13,7 @@ SKALIBS_INSTALL_STAGING = YES SKALIBS_CONF_OPTS = \ --prefix=/usr \ --with-default-path=/sbin:/usr/sbin:/bin:/usr/bin \ + --with-sysdep-devurandom=yes \ $(SHARED_STATIC_LIBS_OPTS) define SKALIBS_CONFIGURE_CMDS diff --git a/buildroot/package/skeleton-init-common/skeleton-init-common.mk b/buildroot/package/skeleton-init-common/skeleton-init-common.mk index e429b13d7..4a67f51c1 100644 --- a/buildroot/package/skeleton-init-common/skeleton-init-common.mk +++ b/buildroot/package/skeleton-init-common/skeleton-init-common.mk @@ -95,6 +95,8 @@ SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_ADD_SH_TO_SHE ifneq ($(SKELETON_INIT_COMMON_BIN_SH),) define SKELETON_INIT_COMMON_SET_BIN_SH ln -sf $(SKELETON_INIT_COMMON_BIN_SH) $(TARGET_DIR)/bin/sh + $(SED) '/^root:/s,[^/]*$$,$(SKELETON_INIT_COMMON_BIN_SH),' \ + $(TARGET_DIR)/etc/passwd endef endif endif diff --git a/buildroot/package/skeleton-init-openrc/Config.in b/buildroot/package/skeleton-init-openrc/Config.in new file mode 100644 index 000000000..8f4dd17eb --- /dev/null +++ b/buildroot/package/skeleton-init-openrc/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_SKELETON_INIT_OPENRC + bool + select BR2_PACKAGE_HAS_SKELETON + select BR2_PACKAGE_SKELETON_INIT_COMMON + +config BR2_PACKAGE_PROVIDES_SKELETON + default "skeleton-init-openrc" if BR2_PACKAGE_SKELETON_INIT_OPENRC diff --git a/buildroot/package/skeleton-init-openrc/skeleton-init-openrc.mk b/buildroot/package/skeleton-init-openrc/skeleton-init-openrc.mk new file mode 100644 index 000000000..b0538ad03 --- /dev/null +++ b/buildroot/package/skeleton-init-openrc/skeleton-init-openrc.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# skeleton-init-openrc +# +################################################################################ + +# The skeleton can't depend on the toolchain, since all packages depends on the +# skeleton and the toolchain is a target package, as is skeleton. +# Hence, skeleton would depends on the toolchain and the toolchain would depend +# on skeleton. +SKELETON_INIT_OPENRC_ADD_TOOLCHAIN_DEPENDENCY = NO +SKELETON_INIT_OPENRC_ADD_SKELETON_DEPENDENCY = NO + +SKELETON_INIT_OPENRC_DEPENDENCIES = skeleton-init-common + +SKELETON_INIT_OPENRC_PROVIDES = skeleton + +ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y) +# Comment /dev/root entry in fstab. When openrc does not find fstab entry for +# "/", it will try to remount "/" as "rw". +define SKELETON_INIT_OPENRC_ROOT_RO_OR_RW + $(SED) '\:^/dev/root[[:blank:]]:s/^/# /' $(TARGET_DIR)/etc/fstab +endef +else +# Uncomment /dev/root entry in fstab which has "ro" option so openrc notices +# it and doesn't remount root to rw. +define SKELETON_INIT_OPENRC_ROOT_RO_OR_RW + $(SED) '\:^#[[:blank:]]*/dev/root[[:blank:]]:s/^# //' $(TARGET_DIR)/etc/fstab +endef +endif # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW + +define SKELETON_INIT_OPENRC_INSTALL_TARGET_CMDS + $(call SYSTEM_RSYNC,$(SKELETON_INIT_OPENRC_PKGDIR)/skeleton,$(TARGET_DIR)) + $(SKELETON_INIT_OPENRC_ROOT_RO_OR_RW) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/skeleton-init-openrc/skeleton/dev/log b/buildroot/package/skeleton-init-openrc/skeleton/dev/log new file mode 120000 index 000000000..d96b3b1cb --- /dev/null +++ b/buildroot/package/skeleton-init-openrc/skeleton/dev/log @@ -0,0 +1 @@ +../tmp/log \ No newline at end of file diff --git a/buildroot/package/skeleton-init-openrc/skeleton/etc/conf.d/.empty b/buildroot/package/skeleton-init-openrc/skeleton/etc/conf.d/.empty new file mode 100644 index 000000000..e69de29bb diff --git a/buildroot/package/skeleton-init-openrc/skeleton/etc/fstab b/buildroot/package/skeleton-init-openrc/skeleton/etc/fstab new file mode 100644 index 000000000..21cf49ba5 --- /dev/null +++ b/buildroot/package/skeleton-init-openrc/skeleton/etc/fstab @@ -0,0 +1,4 @@ +# +/dev/root / ext2 ro,noauto 0 0 +tmpfs /tmp tmpfs mode=1777 0 0 +tmpfs /run tmpfs mode=0755,nosuid,nodev 0 0 diff --git a/buildroot/package/skeleton-init-openrc/skeleton/etc/runlevels/default/.empty b/buildroot/package/skeleton-init-openrc/skeleton/etc/runlevels/default/.empty new file mode 100644 index 000000000..e69de29bb diff --git a/buildroot/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs b/buildroot/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs new file mode 120000 index 000000000..ef5e00823 --- /dev/null +++ b/buildroot/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs @@ -0,0 +1 @@ +/etc/init.d/sysv-rcs \ No newline at end of file diff --git a/buildroot/package/skeleton-init-openrc/skeleton/var/cache b/buildroot/package/skeleton-init-openrc/skeleton/var/cache new file mode 120000 index 000000000..1431b0e43 --- /dev/null +++ b/buildroot/package/skeleton-init-openrc/skeleton/var/cache @@ -0,0 +1 @@ +../tmp \ No newline at end of file diff --git a/buildroot/package/skeleton-init-openrc/skeleton/var/lib/misc b/buildroot/package/skeleton-init-openrc/skeleton/var/lib/misc new file mode 120000 index 000000000..f1fde8c10 --- /dev/null +++ b/buildroot/package/skeleton-init-openrc/skeleton/var/lib/misc @@ -0,0 +1 @@ +../../tmp \ No newline at end of file diff --git a/buildroot/package/skeleton-init-openrc/skeleton/var/lock b/buildroot/package/skeleton-init-openrc/skeleton/var/lock new file mode 120000 index 000000000..1431b0e43 --- /dev/null +++ b/buildroot/package/skeleton-init-openrc/skeleton/var/lock @@ -0,0 +1 @@ +../tmp \ No newline at end of file diff --git a/buildroot/package/skeleton-init-openrc/skeleton/var/log b/buildroot/package/skeleton-init-openrc/skeleton/var/log new file mode 120000 index 000000000..1431b0e43 --- /dev/null +++ b/buildroot/package/skeleton-init-openrc/skeleton/var/log @@ -0,0 +1 @@ +../tmp \ No newline at end of file diff --git a/buildroot/package/skeleton-init-openrc/skeleton/var/run b/buildroot/package/skeleton-init-openrc/skeleton/var/run new file mode 120000 index 000000000..84ba55b91 --- /dev/null +++ b/buildroot/package/skeleton-init-openrc/skeleton/var/run @@ -0,0 +1 @@ +../run \ No newline at end of file diff --git a/buildroot/package/skeleton-init-openrc/skeleton/var/spool b/buildroot/package/skeleton-init-openrc/skeleton/var/spool new file mode 120000 index 000000000..1431b0e43 --- /dev/null +++ b/buildroot/package/skeleton-init-openrc/skeleton/var/spool @@ -0,0 +1 @@ +../tmp \ No newline at end of file diff --git a/buildroot/package/skeleton-init-openrc/skeleton/var/tmp b/buildroot/package/skeleton-init-openrc/skeleton/var/tmp new file mode 120000 index 000000000..1431b0e43 --- /dev/null +++ b/buildroot/package/skeleton-init-openrc/skeleton/var/tmp @@ -0,0 +1 @@ +../tmp \ No newline at end of file diff --git a/buildroot/package/skeleton-init-sysv/skeleton-init-sysv.mk b/buildroot/package/skeleton-init-sysv/skeleton-init-sysv.mk index c89c2dc1f..009dc100e 100644 --- a/buildroot/package/skeleton-init-sysv/skeleton-init-sysv.mk +++ b/buildroot/package/skeleton-init-sysv/skeleton-init-sysv.mk @@ -19,4 +19,15 @@ define SKELETON_INIT_SYSV_INSTALL_TARGET_CMDS $(call SYSTEM_RSYNC,$(SKELETON_INIT_SYSV_PKGDIR)/skeleton,$(TARGET_DIR)) endef +# enable/disable swapon/off calls depending on availability of the commands +define SKELETON_INIT_SYSV_SWAPON_SWAPOFF_INITTAB + if [ -x $(TARGET_DIR)/sbin/swapon -a -x $(TARGET_DIR)/sbin/swapoff ]; then \ + $(SED) '/^#.*\/sbin\/swap/s/^#\+[[:blank:]]*//' $(TARGET_DIR)/etc/inittab; \ + else \ + $(SED) '/^[^#].*\/sbin\/swap/s/^/#/' $(TARGET_DIR)/etc/inittab; \ + fi +endef + +SKELETON_INIT_SYSV_TARGET_FINALIZE_HOOKS += SKELETON_INIT_SYSV_SWAPON_SWAPOFF_INITTAB + $(eval $(generic-package)) diff --git a/buildroot/package/sl/sl.hash b/buildroot/package/sl/sl.hash index be74670ff..908b1bd91 100644 --- a/buildroot/package/sl/sl.hash +++ b/buildroot/package/sl/sl.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1e5996757f879c81f202a18ad8e982195cf51c41727d3fea4af01fdcbbb5563a sl-5.02.tar.gz +sha256 1e5996757f879c81f202a18ad8e982195cf51c41727d3fea4af01fdcbbb5563a sl-5.02.tar.gz +sha256 72c7d262e2c9ddf019edc90af852a01a410338efff4e75e1c005b77ada4be7c4 LICENSE diff --git a/buildroot/package/slang/slang.hash b/buildroot/package/slang/slang.hash index bd806e8a4..faa34c820 100644 --- a/buildroot/package/slang/slang.hash +++ b/buildroot/package/slang/slang.hash @@ -1,6 +1,6 @@ # sha1 from http://www.jedsoft.org/releases/slang/, sha256 locally computed -sha1 a8ea7f1b5736160a94efb67b137a0f5b9916bdf2 slang-2.3.1a.tar.bz2 -sha256 54f0c3007fde918039c058965dffdfd6c5aec0bad0f4227192cc486021f08c36 slang-2.3.1a.tar.bz2 +sha1 bbf7f2dcc14e7c7fca40868fd4b411a2bd9e2655 slang-2.3.2.tar.bz2 +sha256 fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a slang-2.3.2.tar.bz2 # License file, locally computed sha256 ff05a90962e7773f8bdc47b2a9585130526039102759b524c1dffbd57cfe469b COPYING diff --git a/buildroot/package/slang/slang.mk b/buildroot/package/slang/slang.mk index d0c0e7632..44a014808 100644 --- a/buildroot/package/slang/slang.mk +++ b/buildroot/package/slang/slang.mk @@ -4,7 +4,7 @@ # ################################################################################ -SLANG_VERSION = 2.3.1a +SLANG_VERSION = 2.3.2 SLANG_SOURCE = slang-$(SLANG_VERSION).tar.bz2 SLANG_SITE = http://www.jedsoft.org/releases/slang SLANG_LICENSE = GPL-2.0+ diff --git a/buildroot/package/smack/smack.hash b/buildroot/package/smack/smack.hash index 2c1f44625..a753f93fb 100644 --- a/buildroot/package/smack/smack.hash +++ b/buildroot/package/smack/smack.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 1a607da3b1a661dc76b7a5b8571f4a2d56b4d61d78376088d19f2d8637dc6822 smack-1.3.1.tar.gz +sha256 1a607da3b1a661dc76b7a5b8571f4a2d56b4d61d78376088d19f2d8637dc6822 smack-1.3.1.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/smartmontools/smartmontools.hash b/buildroot/package/smartmontools/smartmontools.hash index 2f2b7aa09..ffa1e8f97 100644 --- a/buildroot/package/smartmontools/smartmontools.hash +++ b/buildroot/package/smartmontools/smartmontools.hash @@ -1,3 +1,5 @@ # From http://sourceforge.net/projects/smartmontools/files/smartmontools/6.5/ md5 093aeec3f8f39fa9a37593c4012d3156 smartmontools-6.5.tar.gz sha1 7e788b429534a4ae627858fbcc826b93402cee7e smartmontools-6.5.tar.gz +# Locally computed +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/smartmontools/smartmontools.mk b/buildroot/package/smartmontools/smartmontools.mk index 137c00a50..bad7da2d1 100644 --- a/buildroot/package/smartmontools/smartmontools.mk +++ b/buildroot/package/smartmontools/smartmontools.mk @@ -9,4 +9,18 @@ SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smar SMARTMONTOOLS_LICENSE = GPL-2.0+ SMARTMONTOOLS_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) +SMARTMONTOOLS_CONF_OPTS += --with-libcap-ng +SMARTMONTOOLS_DEPENDENCIES += libcap-ng +else +SMARTMONTOOLS_CONF_OPTS += --without-libcap-ng +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +SMARTMONTOOLS_CONF_OPTS += --with-selinux +SMARTMONTOOLS_DEPENDENCIES += libselinux +else +SMARTMONTOOLS_CONF_OPTS += --without-selinux +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/smcroute/smcroute.hash b/buildroot/package/smcroute/smcroute.hash index e5929bff7..f79ce167e 100644 --- a/buildroot/package/smcroute/smcroute.hash +++ b/buildroot/package/smcroute/smcroute.hash @@ -1,5 +1,5 @@ # Locally generated -sha256 d8c6abb45f5e13c8c557ad143f05e79778641eebef9bb28ef6eadb583d2a225e smcroute-2.4.2.tar.xz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -# From https://github.com/troglobit/smcroute/releases/download/2.4.2/smcroute-2.4.2.tar.xz.md5 -md5 85b8bbdf2dccecfea770bcd17a731cc7 smcroute-2.4.2.tar.xz +sha256 431be94c46646767f69c85fee445277b7e765a55177d3ee29522416cfe2cc067 smcroute-2.4.4.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +# From https://github.com/troglobit/smcroute/releases/download/2.4.4/smcroute-2.4.4.tar.xz.md5 +md5 a1dc8c54c684e8c8de139444f73a0ba3 smcroute-2.4.4.tar.xz diff --git a/buildroot/package/smcroute/smcroute.mk b/buildroot/package/smcroute/smcroute.mk index aacf21138..1a36c75d4 100644 --- a/buildroot/package/smcroute/smcroute.mk +++ b/buildroot/package/smcroute/smcroute.mk @@ -4,7 +4,7 @@ # ################################################################################ -SMCROUTE_VERSION = 2.4.2 +SMCROUTE_VERSION = 2.4.4 SMCROUTE_SOURCE = smcroute-$(SMCROUTE_VERSION).tar.xz SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION) SMCROUTE_LICENSE = GPL-2.0+ diff --git a/buildroot/package/smstools3/smstools3.hash b/buildroot/package/smstools3/smstools3.hash index b0b521f74..9eb73e938 100644 --- a/buildroot/package/smstools3/smstools3.hash +++ b/buildroot/package/smstools3/smstools3.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59 smstools3-3.1.15.tar.gz +sha256 ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59 smstools3-3.1.15.tar.gz +sha256 61ae4d83c30236cc7df40b1ccbbe6be07d334f9579b8d0facecc34334fe15b61 doc/license.html +sha256 786b4da4dd900cad87a7dc17769458607bdeae575d62e6e98ad7144e9225f8d3 LICENSE diff --git a/buildroot/package/sngrep/sngrep.hash b/buildroot/package/sngrep/sngrep.hash index f751a1463..a751d9539 100644 --- a/buildroot/package/sngrep/sngrep.hash +++ b/buildroot/package/sngrep/sngrep.hash @@ -2,5 +2,5 @@ md5 094e76786b118258bac69e1514aac826 sngrep-1.4.6.tar.gz # Locally computed -sha256 638d6557dc68db401b07d73b2e7f8276800281f021fe0c942992566d6b59a48a sngrep-v1.4.6.tar.gz +sha256 638d6557dc68db401b07d73b2e7f8276800281f021fe0c942992566d6b59a48a sngrep-1.4.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/buildroot/package/sngrep/sngrep.mk b/buildroot/package/sngrep/sngrep.mk index c6d2a292b..1cb3814c9 100644 --- a/buildroot/package/sngrep/sngrep.mk +++ b/buildroot/package/sngrep/sngrep.mk @@ -4,8 +4,8 @@ # ################################################################################ -SNGREP_VERSION = v1.4.6 -SNGREP_SITE = $(call github,irontec,sngrep,$(SNGREP_VERSION)) +SNGREP_VERSION = 1.4.6 +SNGREP_SITE = $(call github,irontec,sngrep,v$(SNGREP_VERSION)) SNGREP_LICENSE = GPL-3.0+ SNGREP_LICENSE_FILES = LICENSE SNGREP_AUTORECONF = YES diff --git a/buildroot/package/snmpclitools/Config.in b/buildroot/package/snmpclitools/Config.in new file mode 100644 index 000000000..00bf5994d --- /dev/null +++ b/buildroot/package/snmpclitools/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_SNMPCLITOOLS + bool "snmpclitools" + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PYSMI # runtime + select BR2_PACKAGE_PYTHON_PYSNMP # runtime + help + SNMP command-line tools. + + https://github.com/etingof/snmpclitools diff --git a/buildroot/package/snmpclitools/snmpclitools.hash b/buildroot/package/snmpclitools/snmpclitools.hash new file mode 100644 index 000000000..4dcbdcb6e --- /dev/null +++ b/buildroot/package/snmpclitools/snmpclitools.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/snmpclitools/json +md5 132b100f5e7b80715e6c1d424e89687c snmpclitools-0.6.4.tar.gz +sha256 820c45de419bf355c845a96610a395ec18a15176ac0362d388da7740266ea1ac snmpclitools-0.6.4.tar.gz +# Locally computed sha256 checksums +sha256 ed5561a0f5b75e93aa026c1b9fdef58e7ccbf6b2e9a2458be732afc288209d23 PKG-INFO diff --git a/buildroot/package/snmpclitools/snmpclitools.mk b/buildroot/package/snmpclitools/snmpclitools.mk new file mode 100644 index 000000000..a4a90e5bf --- /dev/null +++ b/buildroot/package/snmpclitools/snmpclitools.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# snmpclitools +# +################################################################################ + +SNMPCLITOOLS_VERSION = 0.6.4 +SNMPCLITOOLS_SITE = https://files.pythonhosted.org/packages/03/2a/8488828e92a82c5416e33fba6089283162937b0f73e5b15205fb6ec3bbea +SNMPCLITOOLS_SETUP_TYPE = setuptools +SNMPCLITOOLS_LICENSE = BSD-2-Clause +SNMPCLITOOLS_LICENSE_FILES = PKG-INFO + +$(eval $(python-package)) diff --git a/buildroot/package/snmppp/snmppp.hash b/buildroot/package/snmppp/snmppp.hash index 5c8feee15..bc54d8c6b 100644 --- a/buildroot/package/snmppp/snmppp.hash +++ b/buildroot/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6827adb6a6a68a7f32c41fa12bdfd0aa48f4825b8773f63fc4d5c8482d4ed481 snmp++-3.3.10.tar.gz -sha256 d00d5deb9ce44fa01ddf6f882de3ea8b9e8402f776b546dd982d55367ebbd392 src/v3.cpp +sha256 06a2af44b2976b61667756e3f74604820fce0ef8bfc7f31280308f1eeb7633f3 snmp++-3.3.11a.tar.gz +sha256 5538f9efc2559a35025df5d6bf19dc85c2bfe54dca6e8409d5690d4f7c69166a src/v3.cpp diff --git a/buildroot/package/snmppp/snmppp.mk b/buildroot/package/snmppp/snmppp.mk index 4ceb61c9f..0e862faa4 100644 --- a/buildroot/package/snmppp/snmppp.mk +++ b/buildroot/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.3.10 +SNMPPP_VERSION = 3.3.11a SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch b/buildroot/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch new file mode 100644 index 000000000..ce9d5526c --- /dev/null +++ b/buildroot/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch @@ -0,0 +1,34 @@ +From dc2f54097da3cd493b8f4d06a14ef40be484d24f Mon Sep 17 00:00:00 2001 +From: Sergio Prado +Date: Thu, 21 Feb 2019 15:02:08 -0300 +Subject: [PATCH] Fix compile error when building against uclibc or musl + +The build fails when dereferencing the rpcent structure with uclibc or musl C libraries. + +../../../src/dynamic-preprocessors/appid/service_plugins/service_rpc.c:241:20: +error: dereferencing pointer to incomplete type ‘struct rpcent’ + if (rpc->r_name) + +That's because rpc.h should be included when using these C libraries. + +Signed-off-by: Sergio Prado +--- + src/dynamic-preprocessors/appid/service_plugins/service_rpc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c b/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c +index 81bc8a5db8ab..2e45246083a8 100644 +--- a/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c ++++ b/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c +@@ -32,7 +32,7 @@ + #include "flow.h" + #include "service_api.h" + +-#if defined(FREEBSD) || defined(OPENBSD) ++#if defined(FREEBSD) || defined(OPENBSD) || (defined(LINUX) && defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__)) + #include "rpc/rpc.h" + #endif + +-- +2.7.4 + diff --git a/buildroot/package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch b/buildroot/package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch new file mode 100644 index 000000000..afe9672a3 --- /dev/null +++ b/buildroot/package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch @@ -0,0 +1,51 @@ +From eae97632157b73f0ca7c099232617b2777d0fa54 Mon Sep 17 00:00:00 2001 +From: Sergio Prado +Date: Sat, 21 Dec 2019 12:00:42 -0300 +Subject: [PATCH] Fix error when building on a Fedora host machine. + +Remove the code that adds unsafe header/library path when +cross-compiling on a Fedora host machine. + +Signed-off-by: Sergio Prado +--- + configure.in | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/configure.in b/configure.in +index e6586f399898..fb35d4d7e3e3 100644 +--- a/configure.in ++++ b/configure.in +@@ -957,30 +957,6 @@ if test "x$enable_dlclose" = "xno"; then + AC_DEFINE([DISABLE_DLCLOSE_FOR_VALGRIND_TESTING],[1],[Don't close opened shared objects for valgrind leak testing of dynamic libraries]) + fi + +-################################################## +-# Fedora 28+ does not have inbuilt SunRPC support# +-# in glibc and is separately availble in tirpc # +-# package. Make sure we've got the library and # +-# link it # +-################################################## +- +-if test -f /etc/fedora-release ; then +- DISTRO_VERSION=$(awk '{ print $3 }' /etc/fedora-release) +- if test $DISTRO_VERSION -ge 28 ; then +- TIRPC="" +- AC_CHECK_LIB(tirpc,bindresvport,, TIRPC="no") +- echo "$TIRPC" +- if test "x$TIRPC" = "xno"; then +- echo +- echo " ERROR! tirpc not found, get it by running " +- echo " yum install libtirpc-devel " +- exit +- fi +- LIBS="${LIBS} -ltirpc" +- extra_incl="-I/usr/include/tirpc" +- fi +-fi +- + Z_LIB="" + AC_CHECK_HEADERS(zlib.h,, Z_LIB="no") + if test "x$Z_LIB" = "xno"; then +-- +2.17.1 + diff --git a/buildroot/package/snort/Config.in b/buildroot/package/snort/Config.in index 7d2c52c3f..fc74efcfe 100644 --- a/buildroot/package/snort/Config.in +++ b/buildroot/package/snort/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_SNORT select BR2_PACKAGE_DAQ select BR2_PACKAGE_PCRE select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_PACKAGE_ZLIB help Snort is a free and open source network intrusion prevention system (IPS) and network intrusion detection diff --git a/buildroot/package/snort/snort.hash b/buildroot/package/snort/snort.hash index 211e862b7..7364df133 100644 --- a/buildroot/package/snort/snort.hash +++ b/buildroot/package/snort/snort.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 9f6b3aeac5a109f55504bd370564ac431cb1773507929dc461626898f33f46cd snort-2.9.11.1.tar.gz +sha256 2cccfc1d1a706586cd47ae9f085a7d5e4e36390b8e9c28cd2020b4b5b587f6c3 snort-2.9.15.1.tar.gz # Hash for license files: sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE diff --git a/buildroot/package/snort/snort.mk b/buildroot/package/snort/snort.mk index 568393468..0f1d6b13d 100644 --- a/buildroot/package/snort/snort.mk +++ b/buildroot/package/snort/snort.mk @@ -4,12 +4,12 @@ # ################################################################################ -SNORT_VERSION = 2.9.11.1 +SNORT_VERSION = 2.9.15.1 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING -SNORT_DEPENDENCIES = libpcap libdnet daq pcre +SNORT_DEPENDENCIES = libpcap libdnet daq pcre zlib host-pkgconf # patching configure.in SNORT_AUTORECONF = YES @@ -20,12 +20,25 @@ SNORT_CONF_OPTS = \ --with-libpcap-includes=$(STAGING_DIR)/usr/include/pcap \ --disable-static-daq +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +SNORT_CFLAGS += -O0 +endif + ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -SNORT_DEPENDENCIES += libtirpc host-pkgconf +SNORT_DEPENDENCIES += libtirpc SNORT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` SNORT_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` endif +# luajit and openssl should be enabled to build with +# OpenAppID support +ifeq ($(BR2_PACKAGE_LUAJIT)$(BR2_PACKAGE_OPENSSL),yy) +SNORT_DEPENDENCIES += luajit openssl +SNORT_CONF_OPTS += --enable-open-appid +else +SNORT_CONF_OPTS += --disable-open-appid +endif + SNORT_CONF_ENV = \ CFLAGS="$(TARGET_CFLAGS) $(SNORT_CFLAGS)" \ LIBS="$(SNORT_LIBS)" \ diff --git a/buildroot/package/socat/0003-compat-set-NETDB_INTERNAL.patch b/buildroot/package/socat/0002-compat-set-NETDB_INTERNAL.patch similarity index 100% rename from buildroot/package/socat/0003-compat-set-NETDB_INTERNAL.patch rename to buildroot/package/socat/0002-compat-set-NETDB_INTERNAL.patch diff --git a/buildroot/package/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch b/buildroot/package/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch deleted file mode 100644 index acae641b3..000000000 --- a/buildroot/package/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 99c55f2694fe8621ca2344eb002610dac7f9c969 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 2 Feb 2016 09:34:24 -0300 -Subject: [PATCH] ptrdiff_t is defined in stddef.h - -Status: sent upstream via email. - -Signed-off-by: Gustavo Zacarias ---- - nestlex.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/nestlex.c b/nestlex.c -index f7950f0..f49482d 100644 ---- a/nestlex.c -+++ b/nestlex.c -@@ -4,6 +4,8 @@ - - /* a function for lexical scanning of nested character patterns */ - -+#include /* ptrdiff_t */ -+ - #include "config.h" - #include "mytypes.h" - --- -2.4.10 - diff --git a/buildroot/package/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch b/buildroot/package/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch deleted file mode 100644 index 7704123f3..000000000 --- a/buildroot/package/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 1c141194e3587cc8124e5f4512dc3030e5a104b1 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 28 Aug 2016 22:06:09 +0200 -Subject: [PATCH] xio-tun: remove if_tun.h kernel header - -xio-tun mixes userspace and kernel headers. - -http://wiki.musl-libc.org/wiki/FAQ#Q:_why_am_i_getting_.22error:_redefinition_of_struct_ethhdr.2Ftcphdr.2Fetc.22_.3F - -Signed-off-by: Romain Naour ---- - config.h.in | 3 --- - configure.in | 8 +------- - sysincludes.h | 3 --- - xio-tun.c | 6 ++++++ - 4 files changed, 7 insertions(+), 13 deletions(-) - -diff --git a/config.h.in b/config.h.in -index 9058bf8..ed0962c 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -258,9 +258,6 @@ - /* Define if you have the header file. */ - #undef HAVE_LINUX_ERRQUEUE_H - --/* Define if you have the header file. */ --#undef HAVE_LINUX_IF_TUN_H -- - /* Define if you have the header file. */ - #undef HAVE_NETPACKET_PACKET_H - -diff --git a/configure.in b/configure.in -index 1d2e76f..27bb3d5 100644 ---- a/configure.in -+++ b/configure.in -@@ -78,7 +78,7 @@ AC_CHECK_HEADERS(arpa/nameser.h) - - AC_HEADER_RESOLV() - --AC_CHECK_HEADERS(termios.h linux/if_tun.h) -+AC_CHECK_HEADERS(termios.h) - AC_CHECK_HEADERS(net/if_dl.h) - AC_CHECK_HEADERS(linux/types.h) - AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include -@@ -680,12 +680,6 @@ AC_ARG_ENABLE(tun, [ --disable-tun disable TUN/TAP support], - esac], - [AC_MSG_RESULT(yes); WITH_TUN=1 ]) - --# --if ! test "$ac_cv_header_linux_if_tun_h" = 'yes'; then -- AC_MSG_WARN(include file linux/if_tun.h not found, disabling TUN) -- WITH_TUN= --fi --# - if test -n "$WITH_TUN"; then - AC_DEFINE(WITH_TUN) - fi -diff --git a/sysincludes.h b/sysincludes.h -index 98dff77..28067f4 100644 ---- a/sysincludes.h -+++ b/sysincludes.h -@@ -142,9 +142,6 @@ - #if HAVE_NETINET_IF_ETHER_H - #include - #endif --#if HAVE_LINUX_IF_TUN_H --#include --#endif - - #if HAVE_TERMIOS_H && _WITH_TERMIOS - #include -diff --git a/xio-tun.c b/xio-tun.c -index 0628d27..f965a7e 100644 ---- a/xio-tun.c -+++ b/xio-tun.c -@@ -14,6 +14,12 @@ - - #include "xio-tun.h" - -+/* TUNSETIFF flags from if_tun.h kernel header */ -+#define IFF_TUN 0x0001 -+#define IFF_TAP 0x0002 -+#define IFF_NO_PI 0x1000 -+ -+#define TUNSETIFF _IOW('T', 202, int) - - static int xioopen_tun(int argc, const char *argv[], struct opt *opts, int xioflags, xiofile_t *fd, unsigned groups, int dummy1, int dummy2, int dummy3); - --- -2.5.5 - diff --git a/buildroot/package/socat/socat.hash b/buildroot/package/socat/socat.hash index 77abcf29a..e5b65925d 100644 --- a/buildroot/package/socat/socat.hash +++ b/buildroot/package/socat/socat.hash @@ -1,7 +1,7 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 607a24c15bd2cb54e9328bfbbd3a1ae9 socat-1.7.3.2.tar.bz2 -# Calculated based on the hash above -sha256 e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251 socat-1.7.3.2.tar.bz2 +md5 3cca4f8cd9d2d1caabd9cc099451bac9 socat-1.7.3.4.tar.bz2 +# From http://www.dest-unreach.org/socat/download.sha256sum +sha256 972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc socat-1.7.3.4.tar.bz2 # Locally calculated sha256 4846488cea98a2905dc75b7aa5eea721568e372447efe06b85bd896ee8c54f10 README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/socat/socat.mk b/buildroot/package/socat/socat.mk index e4595007d..4bfdc18f9 100644 --- a/buildroot/package/socat/socat.mk +++ b/buildroot/package/socat/socat.mk @@ -4,14 +4,12 @@ # ################################################################################ -SOCAT_VERSION = 1.7.3.2 +SOCAT_VERSION = 1.7.3.4 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception SOCAT_LICENSE_FILES = README COPYING COPYING.OpenSSL -SOCAT_CONF_ENV = sc_cv_termios_ispeed=no - ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) SOCAT_CONF_ENV += \ sc_cv_sys_crdly_shift=12 \ @@ -39,7 +37,7 @@ SOCAT_CONF_OPTS += --disable-openssl endif define SOCAT_RUN_AUTOCONF - (cd $(@D); $(HOST_DIR)/bin/autoconf) + (cd $(@D); $(AUTOCONF)) endef SOCAT_PRE_CONFIGURE_HOOKS += SOCAT_RUN_AUTOCONF diff --git a/buildroot/package/socketcand/socketcand.hash b/buildroot/package/socketcand/socketcand.hash index 6398d6dd8..6ee0c314a 100644 --- a/buildroot/package/socketcand/socketcand.hash +++ b/buildroot/package/socketcand/socketcand.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 7e9a02fdd61be8780ca3ff8678a37f8574fdcf74b1ab9de79bbb65257daf05db socketcand-df7fb4ff8a4439d7737fe2df3540e1ab7465721a.tar.gz +sha256 3c5cc7af4ff707ac344e62d2e37a74b59aeccd14b88e837cc142c52b69d64a39 socketcand-69e2201222f015a1abe7a58ecf61325012cd91b1.tar.gz +sha256 b32028a4080be38208ee951c6e8afc6f3bfb3d5496559b260ab0dce9472740f6 socketcand.c diff --git a/buildroot/package/socketcand/socketcand.mk b/buildroot/package/socketcand/socketcand.mk index aeb052c8a..b11aa3c91 100644 --- a/buildroot/package/socketcand/socketcand.mk +++ b/buildroot/package/socketcand/socketcand.mk @@ -4,8 +4,8 @@ # ################################################################################ -SOCKETCAND_VERSION = df7fb4ff8a4439d7737fe2df3540e1ab7465721a -SOCKETCAND_SITE = $(call github,dschanoeh,socketcand,$(SOCKETCAND_VERSION)) +SOCKETCAND_VERSION = 69e2201222f015a1abe7a58ecf61325012cd91b1 +SOCKETCAND_SITE = $(call github,linux-can,socketcand,$(SOCKETCAND_VERSION)) SOCKETCAND_AUTORECONF = YES SOCKETCAND_LICENSE = BSD-3-Clause or GPL-2.0 SOCKETCAND_LICENSE_FILES = socketcand.c diff --git a/buildroot/package/sofia-sip/sofia-sip.hash b/buildroot/package/sofia-sip/sofia-sip.hash index fe9c4b11c..6e81ec878 100644 --- a/buildroot/package/sofia-sip/sofia-sip.hash +++ b/buildroot/package/sofia-sip/sofia-sip.hash @@ -1,2 +1,4 @@ # Locally computed -sha256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 sofia-sip-1.12.11.tar.gz +sha256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 sofia-sip-1.12.11.tar.gz +sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING +sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/buildroot/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch b/buildroot/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch index 3f17a74db..92c2885a6 100644 --- a/buildroot/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch +++ b/buildroot/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch @@ -28,6 +28,8 @@ NB: http://www.gnu.org/software/autoconf-archive/ [Upstream commit: https://github.com/dajhorn/SoftEtherVPN/commit/c5e5d7e93c6f3302adf5821c29c4efdb7630e418] Signed-off-by: Thomas Petazzoni +[Fabrice: update for 4.30-9700-beta] +Signed-off-by: Fabrice Fontaine --- Makefile.am | 21 ++ autotools/ax_check_openssl.m4 | 124 ++++++++++ @@ -1502,12 +1504,12 @@ index 00000000..4a3fc2ba -echo '---------------------------------------------------------------------' -echo 'SoftEther VPN for Unix' -echo --echo 'Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan.' --echo 'Copyright (c) Daiyuu Nobori. All Rights Reserved.' +-echo 'Copyright (c) Daiyuu Nobori.' +-echo 'Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.' +-echo 'Copyright (c) SoftEther Corporation.' +-echo 'Copyright (c) all contributors on SoftEther VPN project in GitHub.' -echo --echo 'This program is free software; you can redistribute it and/or' --echo 'modify it under the terms of the GNU General Public License' --echo 'version 2 as published by the Free Software Foundation.' +-echo 'License: The Apache License, Version 2.0' -echo -echo 'Read and understand README.TXT, LICENSE.TXT and WARNING.TXT before use.' -echo '---------------------------------------------------------------------' diff --git a/buildroot/package/softether/0010-Encrypt-set-default-RSA-key-size-to-1024-everywhere-.patch b/buildroot/package/softether/0010-Encrypt-set-default-RSA-key-size-to-1024-everywhere-.patch deleted file mode 100644 index 20a1f0622..000000000 --- a/buildroot/package/softether/0010-Encrypt-set-default-RSA-key-size-to-1024-everywhere-.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1fad008e1adba5cb596da6f9ec6a244d49a585cf Mon Sep 17 00:00:00 2001 -From: Davide Beatrici -Date: Mon, 9 Apr 2018 22:02:34 +0200 -Subject: [PATCH] Encrypt: set default RSA key size to 1024 everywhere, using - the RSA_KEY_SIZE macro - -This commit also fixes the problem described in #31, which was caused by the test key generated in RsaCheck() being too small for newer OpenSSL versions. - -Failure looks like --- Alert: RsaCheck() -- -OpenSSL Library Init Failed. (too old?) -Please install the latest version of OpenSSL. - -Upstream: https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/commit/1fad008e1adba5cb596da6f9ec6a244d49a585cf -(Currently still on an active pull request https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/pull/1) - -Signed-off-by: Matthew Weber ---- - src/Mayaqua/Encrypt.c | 8 ++++---- - src/Mayaqua/Encrypt.h | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/Mayaqua/Encrypt.c b/src/Mayaqua/Encrypt.c -index 381d1c5..a557052 100644 ---- a/src/Mayaqua/Encrypt.c -+++ b/src/Mayaqua/Encrypt.c -@@ -2194,7 +2194,7 @@ bool RsaVerifyEx(void *data, UINT data_size, void *sign, K *k, UINT bits) - } - if (bits == 0) - { -- bits = 1024; -+ bits = RSA_KEY_SIZE; - } - - // Hash the data -@@ -2233,7 +2233,7 @@ bool RsaSignEx(void *dst, void *src, UINT size, K *k, UINT bits) - } - if (bits == 0) - { -- bits = 1024; -+ bits = RSA_KEY_SIZE; - } - - Zero(dst, bits / 8); -@@ -2302,7 +2302,7 @@ bool RsaCheck() - BIO *bio; - char errbuf[MAX_SIZE]; - UINT size = 0; -- UINT bit = 32; -+ UINT bit = RSA_KEY_SIZE; - // Validate arguments - - // Key generation -@@ -2372,7 +2372,7 @@ bool RsaGen(K **priv, K **pub, UINT bit) - } - if (bit == 0) - { -- bit = 1024; -+ bit = RSA_KEY_SIZE; - } - - // Key generation -diff --git a/src/Mayaqua/Encrypt.h b/src/Mayaqua/Encrypt.h -index d795d2d..0c48161 100644 ---- a/src/Mayaqua/Encrypt.h -+++ b/src/Mayaqua/Encrypt.h -@@ -128,7 +128,7 @@ void RAND_Free_For_SoftEther(); - #define DES_IV_SIZE 8 // DES IV size - #define DES_BLOCK_SIZE 8 // DES block size - #define DES3_KEY_SIZE (8 * 3) // 3DES key size --#define RSA_KEY_SIZE 128 // RSA key size -+#define RSA_KEY_SIZE 1024 // RSA key size - #define DH_KEY_SIZE 128 // DH key size - #define RSA_MIN_SIGN_HASH_SIZE (15 + SHA1_HASH_SIZE) // Minimum RSA hash size - #define RSA_SIGN_HASH_SIZE (RSA_MIN_SIGN_HASH_SIZE) // RSA hash size --- -1.9.1 - diff --git a/buildroot/package/softether/softether.hash b/buildroot/package/softether/softether.hash index fdbbbca39..01bdc629f 100644 --- a/buildroot/package/softether/softether.hash +++ b/buildroot/package/softether/softether.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fbf6e04c4451d0cb1555c3a53c178b5453c7d761119f82fd693538c9f115fecb softether-v4.28-9669-beta.tar.gz -sha256 0a889e7e7a277397d0a2d56c37814eefd8c6b6129d8b74ee2d27fc3415fad561 LICENSE +sha256 f579fa938f6d5d0622f23b3c163b3de5dc171e30175e44511bf269b3bb9fb1fc softether-4.30-9700-beta.tar.gz +sha256 5da6241ddb987c4543bf1cbba6b40a3cd3ecb624dbd4a63daf04440911656bde LICENSE diff --git a/buildroot/package/softether/softether.mk b/buildroot/package/softether/softether.mk index 1a31abd4b..2dbe7edbf 100644 --- a/buildroot/package/softether/softether.mk +++ b/buildroot/package/softether/softether.mk @@ -4,9 +4,9 @@ # ################################################################################ -SOFTETHER_VERSION = v4.28-9669-beta -SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN_stable,$(SOFTETHER_VERSION)) -SOFTETHER_LICENSE = GPL-2.0 +SOFTETHER_VERSION = 4.30-9700-beta +SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN_stable,v$(SOFTETHER_VERSION)) +SOFTETHER_LICENSE = Apache-2.0 SOFTETHER_LICENSE_FILES = LICENSE SOFTETHER_DEPENDENCIES = host-pkgconf host-softether libopenssl readline SOFTETHER_AUTORECONF = YES diff --git a/buildroot/package/solarus/Config.in b/buildroot/package/solarus/Config.in index 359ad15e0..6bed38a6f 100644 --- a/buildroot/package/solarus/Config.in +++ b/buildroot/package/solarus/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_SOLARUS select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG # runtime select BR2_PACKAGE_LIBVORBIS - select BR2_PACKAGE_LUAJIT + select BR2_PACKAGE_LUAJIT if !BR2_PACKAGE_LUA_5_1 select BR2_PACKAGE_OPENAL select BR2_PACKAGE_PHYSFS select BR2_PACKAGE_SDL2 @@ -26,7 +26,7 @@ config BR2_PACKAGE_SOLARUS https://github.com/solarus-games/solarus comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library" - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS || BR2_PACKAGE_LUA_5_1 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/buildroot/package/solarus/solarus.hash b/buildroot/package/solarus/solarus.hash index dab8d1a1f..3092b1350 100644 --- a/buildroot/package/solarus/solarus.hash +++ b/buildroot/package/solarus/solarus.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d800fdf388f860732f2d40c8dd635c34fd1c452857f75bf9b3a421e3ef5ee751 solarus-1.6.0-src.tar.gz +sha256 c14cd97bad6e12310b938d90abd4e8ebdd0abb403cdcc015d5add82dfc5a085b solarus-v1.6.2.tar.bz2 sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f license.txt diff --git a/buildroot/package/solarus/solarus.mk b/buildroot/package/solarus/solarus.mk index fd7bbea2c..6f5853e90 100644 --- a/buildroot/package/solarus/solarus.mk +++ b/buildroot/package/solarus/solarus.mk @@ -4,9 +4,10 @@ # ################################################################################ -SOLARUS_VERSION = 1.6.0 -SOLARUS_SITE = http://www.solarus-games.org/downloads/solarus -SOLARUS_SOURCE = solarus-$(SOLARUS_VERSION)-src.tar.gz +SOLARUS_VERSION = 1.6.2 +SOLARUS_SITE = \ + https://gitlab.com/solarus-games/solarus/-/archive/v$(SOLARUS_VERSION) +SOLARUS_SOURCE = solarus-v$(SOLARUS_VERSION).tar.bz2 SOLARUS_LICENSE = GPL-3.0 (code), CC-BY-SA-4.0 (Solarus logos and icons), \ CC-BY-SA-3.0 (GUI icons) @@ -15,10 +16,20 @@ SOLARUS_LICENSE_FILES = license.txt # Install libsolarus.so SOLARUS_INSTALL_STAGING = YES -SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis luajit openal physfs sdl2 \ +SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis openal physfs sdl2 \ sdl2_image sdl2_ttf # Disable launcher GUI (requires Qt5) -SOLARUS_CONF_OPTS = -DSOLARUS_GUI=OFF +SOLARUS_CONF_OPTS = \ + -DSOLARUS_GUI=OFF \ + -DSOLARUS_TESTS=OFF + +ifeq ($(BR2_PACKAGE_LUAJIT),y) +SOLARUS_CONF_OPTS += -DSOLARUS_USE_LUAJIT=ON +SOLARUS_DEPENDENCIES += luajit +else +SOLARUS_CONF_OPTS += -DSOLARUS_USE_LUAJIT=OFF +SOLARUS_DEPENDENCIES += lua +endif $(eval $(cmake-package)) diff --git a/buildroot/package/sox/sox.hash b/buildroot/package/sox/sox.hash index 2f8069b69..1a4a7dbf7 100644 --- a/buildroot/package/sox/sox.hash +++ b/buildroot/package/sox/sox.hash @@ -1,3 +1,6 @@ # From http://sourceforge.net/projects/sox/files/sox/14.4.2/ md5 ba804bb1ce5c71dd484a102a5b27d0dd sox-14.4.2.tar.bz2 sha1 dc9668256b9d81ef25d672f14f12ec026b0b4087 sox-14.4.2.tar.bz2 +# Locally computed +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a LICENSE.LGPL diff --git a/buildroot/package/sp-oops-extract/sp-oops-extract.hash b/buildroot/package/sp-oops-extract/sp-oops-extract.hash index 835bfe891..666cce784 100644 --- a/buildroot/package/sp-oops-extract/sp-oops-extract.hash +++ b/buildroot/package/sp-oops-extract/sp-oops-extract.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 85601a569af1f4584db75fad21d3a70e377ce12d1bccad7dbe1112abd3b43d93 sp-oops-extract_0.0.7-1.tar.gz +sha256 85601a569af1f4584db75fad21d3a70e377ce12d1bccad7dbe1112abd3b43d93 sp-oops-extract_0.0.7-1.tar.gz +sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/buildroot/package/spawn-fcgi/spawn-fcgi.hash b/buildroot/package/spawn-fcgi/spawn-fcgi.hash index c1911e4e9..b5c5c7423 100644 --- a/buildroot/package/spawn-fcgi/spawn-fcgi.hash +++ b/buildroot/package/spawn-fcgi/spawn-fcgi.hash @@ -1,2 +1,4 @@ # From http://redmine.lighttpd.net/news/9 -sha256 a3cfc7c9581b6ddc31084b379c9160323fa345d357ace6cd2d3d3af3593e2873 spawn-fcgi-1.6.4.tar.bz2 +sha256 a3cfc7c9581b6ddc31084b379c9160323fa345d357ace6cd2d3d3af3593e2873 spawn-fcgi-1.6.4.tar.bz2 +# Locally computed +sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/buildroot/package/spdlog/Config.in b/buildroot/package/spdlog/Config.in new file mode 100644 index 000000000..4aee1f7dd --- /dev/null +++ b/buildroot/package/spdlog/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_SPDLOG + bool "spdlog" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR # fmt + select BR2_PACKAGE_FMT + help + Very fast, header only, C++ logging library. + + https://github.com/gabime/spdlog + +comment "spdlog needs a toolchain w/ C++, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_USE_WCHAR diff --git a/buildroot/package/spdlog/spdlog.hash b/buildroot/package/spdlog/spdlog.hash new file mode 100644 index 000000000..2b51877aa --- /dev/null +++ b/buildroot/package/spdlog/spdlog.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a spdlog-1.5.0.tar.gz +sha256 7d40b1967fca203d22b0eaf75f54566167ded823863abedf4de869fcea057038 LICENSE diff --git a/buildroot/package/spdlog/spdlog.mk b/buildroot/package/spdlog/spdlog.mk new file mode 100644 index 000000000..f8eb9bc0f --- /dev/null +++ b/buildroot/package/spdlog/spdlog.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# spdlog +# +################################################################################ + +SPDLOG_VERSION = 1.5.0 +SPDLOG_SITE = $(call github,gabime,spdlog,v$(SPDLOG_VERSION)) +SPDLOG_LICENSE = MIT +SPDLOG_LICENSE_FILES = LICENSE +SPDLOG_DEPENDENCIES = fmt +SPDLOG_CONF_OPTS += \ + -DSPDLOG_BUILD_TESTS=OFF \ + -DSPDLOG_BUILD_EXAMPLE=OFF \ + -DSPDLOG_BUILD_BENCH=OFF \ + -DSPDLOG_FMT_EXTERNAL=ON + +# Header-only library +SPDLOG_INSTALL_STAGING = YES +SPDLOG_INSTALL_TARGET = NO + +$(eval $(cmake-package)) diff --git a/buildroot/package/speexdsp/0001-port-resample-neon-to-aarch64.patch b/buildroot/package/speexdsp/0001-port-resample-neon-to-aarch64.patch deleted file mode 100644 index 7f3da9c40..000000000 --- a/buildroot/package/speexdsp/0001-port-resample-neon-to-aarch64.patch +++ /dev/null @@ -1,250 +0,0 @@ -From: Frank Barchard -Date: Thu, 21 Jul 2016 23:01:19 +0000 (-0700) -Subject: resample: port resample_neon.h to aarch64 -X-Git-Url: https://git.xiph.org/?p=speexdsp.git;a=commitdiff_plain;h=3282cc7c3cd30cd1c092ad1e7ff03bd20d75c088 - -resample: port resample_neon.h to aarch64 - -port optimized inner_product_single and WORD2INT(x) for fixed -and floating point from 32 bit armv7 NEON to aarch64 NEON. - -Patch downloaded from upstream repo to fix aarch64 build error: -https://git.xiph.org/?p=speexdsp.git;a=commitdiff;h=3282cc7c3cd30cd1c092ad1e7ff03bd20d75c088#patch1 - -Signed-off-by: Bernd Kuhls ---- - -diff --git a/libspeexdsp/resample_neon.h b/libspeexdsp/resample_neon.h -index 0acbd27..e14ffe1 100644 ---- a/libspeexdsp/resample_neon.h -+++ b/libspeexdsp/resample_neon.h -@@ -36,14 +36,24 @@ - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include -- - #ifdef FIXED_POINT --#ifdef __thumb2__ -+#if defined(__aarch64__) -+static inline int32_t saturate_32bit_to_16bit(int32_t a) { -+ int32_t ret; -+ asm ("fmov s0, %w[a]\n" -+ "sqxtn h0, s0\n" -+ "sxtl v0.4s, v0.4h\n" -+ "fmov %w[ret], s0\n" -+ : [ret] "=r" (ret) -+ : [a] "r" (a) -+ : "v0" ); -+ return ret; -+} -+#elif defined(__thumb2__) - static inline int32_t saturate_32bit_to_16bit(int32_t a) { - int32_t ret; - asm ("ssat %[ret], #16, %[a]" -- : [ret] "=&r" (ret) -+ : [ret] "=r" (ret) - : [a] "r" (a) - : ); - return ret; -@@ -54,7 +64,7 @@ static inline int32_t saturate_32bit_to_16bit(int32_t a) { - asm ("vmov.s32 d0[0], %[a]\n" - "vqmovn.s32 d0, q0\n" - "vmov.s16 %[ret], d0[0]\n" -- : [ret] "=&r" (ret) -+ : [ret] "=r" (ret) - : [a] "r" (a) - : "q0"); - return ret; -@@ -64,7 +74,63 @@ static inline int32_t saturate_32bit_to_16bit(int32_t a) { - #define WORD2INT(x) (saturate_32bit_to_16bit(x)) - - #define OVERRIDE_INNER_PRODUCT_SINGLE --/* Only works when len % 4 == 0 */ -+/* Only works when len % 4 == 0 and len >= 4 */ -+#if defined(__aarch64__) -+static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, unsigned int len) -+{ -+ int32_t ret; -+ uint32_t remainder = len % 16; -+ len = len - remainder; -+ -+ asm volatile (" cmp %w[len], #0\n" -+ " b.ne 1f\n" -+ " ld1 {v16.4h}, [%[b]], #8\n" -+ " ld1 {v20.4h}, [%[a]], #8\n" -+ " subs %w[remainder], %w[remainder], #4\n" -+ " smull v0.4s, v16.4h, v20.4h\n" -+ " b.ne 4f\n" -+ " b 5f\n" -+ "1:" -+ " ld1 {v16.4h, v17.4h, v18.4h, v19.4h}, [%[b]], #32\n" -+ " ld1 {v20.4h, v21.4h, v22.4h, v23.4h}, [%[a]], #32\n" -+ " subs %w[len], %w[len], #16\n" -+ " smull v0.4s, v16.4h, v20.4h\n" -+ " smlal v0.4s, v17.4h, v21.4h\n" -+ " smlal v0.4s, v18.4h, v22.4h\n" -+ " smlal v0.4s, v19.4h, v23.4h\n" -+ " b.eq 3f\n" -+ "2:" -+ " ld1 {v16.4h, v17.4h, v18.4h, v19.4h}, [%[b]], #32\n" -+ " ld1 {v20.4h, v21.4h, v22.4h, v23.4h}, [%[a]], #32\n" -+ " subs %w[len], %w[len], #16\n" -+ " smlal v0.4s, v16.4h, v20.4h\n" -+ " smlal v0.4s, v17.4h, v21.4h\n" -+ " smlal v0.4s, v18.4h, v22.4h\n" -+ " smlal v0.4s, v19.4h, v23.4h\n" -+ " b.ne 2b\n" -+ "3:" -+ " cmp %w[remainder], #0\n" -+ " b.eq 5f\n" -+ "4:" -+ " ld1 {v18.4h}, [%[b]], #8\n" -+ " ld1 {v22.4h}, [%[a]], #8\n" -+ " subs %w[remainder], %w[remainder], #4\n" -+ " smlal v0.4s, v18.4h, v22.4h\n" -+ " b.ne 4b\n" -+ "5:" -+ " saddlv d0, v0.4s\n" -+ " sqxtn s0, d0\n" -+ " sqrshrn h0, s0, #15\n" -+ " sxtl v0.4s, v0.4h\n" -+ " fmov %w[ret], s0\n" -+ : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b), -+ [len] "+r" (len), [remainder] "+r" (remainder) -+ : -+ : "cc", "v0", -+ "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23"); -+ return ret; -+} -+#else - static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, unsigned int len) - { - int32_t ret; -@@ -112,33 +178,104 @@ static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, u - " vqmovn.s64 d0, q0\n" - " vqrshrn.s32 d0, q0, #15\n" - " vmov.s16 %[ret], d0[0]\n" -- : [ret] "=&r" (ret), [a] "+r" (a), [b] "+r" (b), -+ : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b), - [len] "+r" (len), [remainder] "+r" (remainder) - : - : "cc", "q0", -- "d16", "d17", "d18", "d19", -- "d20", "d21", "d22", "d23"); -+ "d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23"); - - return ret; - } --#elif defined(FLOATING_POINT) -+#endif // !defined(__aarch64__) - -+#elif defined(FLOATING_POINT) -+#if defined(__aarch64__) -+static inline int32_t saturate_float_to_16bit(float a) { -+ int32_t ret; -+ asm ("fcvtas s1, %s[a]\n" -+ "sqxtn h1, s1\n" -+ "sxtl v1.4s, v1.4h\n" -+ "fmov %w[ret], s1\n" -+ : [ret] "=r" (ret) -+ : [a] "w" (a) -+ : "v1"); -+ return ret; -+} -+#else - static inline int32_t saturate_float_to_16bit(float a) { - int32_t ret; - asm ("vmov.f32 d0[0], %[a]\n" - "vcvt.s32.f32 d0, d0, #15\n" - "vqrshrn.s32 d0, q0, #15\n" - "vmov.s16 %[ret], d0[0]\n" -- : [ret] "=&r" (ret) -+ : [ret] "=r" (ret) - : [a] "r" (a) - : "q0"); - return ret; - } -+#endif -+ - #undef WORD2INT - #define WORD2INT(x) (saturate_float_to_16bit(x)) - - #define OVERRIDE_INNER_PRODUCT_SINGLE --/* Only works when len % 4 == 0 */ -+/* Only works when len % 4 == 0 and len >= 4 */ -+#if defined(__aarch64__) -+static inline float inner_product_single(const float *a, const float *b, unsigned int len) -+{ -+ float ret; -+ uint32_t remainder = len % 16; -+ len = len - remainder; -+ -+ asm volatile (" cmp %w[len], #0\n" -+ " b.ne 1f\n" -+ " ld1 {v16.4s}, [%[b]], #16\n" -+ " ld1 {v20.4s}, [%[a]], #16\n" -+ " subs %w[remainder], %w[remainder], #4\n" -+ " fmul v1.4s, v16.4s, v20.4s\n" -+ " b.ne 4f\n" -+ " b 5f\n" -+ "1:" -+ " ld1 {v16.4s, v17.4s, v18.4s, v19.4s}, [%[b]], #64\n" -+ " ld1 {v20.4s, v21.4s, v22.4s, v23.4s}, [%[a]], #64\n" -+ " subs %w[len], %w[len], #16\n" -+ " fmul v1.4s, v16.4s, v20.4s\n" -+ " fmul v2.4s, v17.4s, v21.4s\n" -+ " fmul v3.4s, v18.4s, v22.4s\n" -+ " fmul v4.4s, v19.4s, v23.4s\n" -+ " b.eq 3f\n" -+ "2:" -+ " ld1 {v16.4s, v17.4s, v18.4s, v19.4s}, [%[b]], #64\n" -+ " ld1 {v20.4s, v21.4s, v22.4s, v23.4s}, [%[a]], #64\n" -+ " subs %w[len], %w[len], #16\n" -+ " fmla v1.4s, v16.4s, v20.4s\n" -+ " fmla v2.4s, v17.4s, v21.4s\n" -+ " fmla v3.4s, v18.4s, v22.4s\n" -+ " fmla v4.4s, v19.4s, v23.4s\n" -+ " b.ne 2b\n" -+ "3:" -+ " fadd v16.4s, v1.4s, v2.4s\n" -+ " fadd v17.4s, v3.4s, v4.4s\n" -+ " cmp %w[remainder], #0\n" -+ " fadd v1.4s, v16.4s, v17.4s\n" -+ " b.eq 5f\n" -+ "4:" -+ " ld1 {v18.4s}, [%[b]], #16\n" -+ " ld1 {v22.4s}, [%[a]], #16\n" -+ " subs %w[remainder], %w[remainder], #4\n" -+ " fmla v1.4s, v18.4s, v22.4s\n" -+ " b.ne 4b\n" -+ "5:" -+ " faddp v1.4s, v1.4s, v1.4s\n" -+ " faddp %[ret].4s, v1.4s, v1.4s\n" -+ : [ret] "=w" (ret), [a] "+r" (a), [b] "+r" (b), -+ [len] "+r" (len), [remainder] "+r" (remainder) -+ : -+ : "cc", "v1", "v2", "v3", "v4", -+ "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23"); -+ return ret; -+} -+#else - static inline float inner_product_single(const float *a, const float *b, unsigned int len) - { - float ret; -@@ -191,11 +328,12 @@ static inline float inner_product_single(const float *a, const float *b, unsigne - " vadd.f32 d0, d0, d1\n" - " vpadd.f32 d0, d0, d0\n" - " vmov.f32 %[ret], d0[0]\n" -- : [ret] "=&r" (ret), [a] "+r" (a), [b] "+r" (b), -+ : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b), - [len] "+l" (len), [remainder] "+l" (remainder) - : -- : "cc", "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7", "q8", -- "q9", "q10", "q11"); -+ : "cc", "q0", "q1", "q2", "q3", -+ "q4", "q5", "q6", "q7", "q8", "q9", "q10", "q11"); - return ret; - } -+#endif // defined(__aarch64__) - #endif diff --git a/buildroot/package/speexdsp/speexdsp.hash b/buildroot/package/speexdsp/speexdsp.hash index 5c3d6b96f..955c4c0a0 100644 --- a/buildroot/package/speexdsp/speexdsp.hash +++ b/buildroot/package/speexdsp/speexdsp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e896489e045d11933723a94b9dd6f8e7d3d4e0d4b34c9612bcb2f4204261130c speexdsp-20ed3452074664ad07e380e51321b148acebdf20.tar.gz +sha256 3f3997997f3af3e7382b44abc9d2a55db5bd8754b22e798e2d16ac309cd6474a speexdsp-SpeexDSP-1.2.0.tar.gz sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING diff --git a/buildroot/package/speexdsp/speexdsp.mk b/buildroot/package/speexdsp/speexdsp.mk index 09c828568..901f22b9e 100644 --- a/buildroot/package/speexdsp/speexdsp.mk +++ b/buildroot/package/speexdsp/speexdsp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPEEXDSP_VERSION = 20ed3452074664ad07e380e51321b148acebdf20 +SPEEXDSP_VERSION = SpeexDSP-1.2.0 SPEEXDSP_SITE = https://git.xiph.org/speexdsp.git SPEEXDSP_SITE_METHOD = git SPEEXDSP_LICENSE = BSD-3-Clause @@ -13,10 +13,4 @@ SPEEXDSP_INSTALL_STAGING = YES SPEEXDSP_DEPENDENCIES = host-pkgconf SPEEXDSP_AUTORECONF = YES -# Autoreconf step fails due to missing m4 directory -define SPEEXDSP_CREATE_M4_DIR - mkdir -p $(@D)/m4 -endef -SPEEXDSP_PRE_CONFIGURE_HOOKS += SPEEXDSP_CREATE_M4_DIR - $(eval $(autotools-package)) diff --git a/buildroot/package/sphinxbase/sphinxbase.hash b/buildroot/package/sphinxbase/sphinxbase.hash index 9fbb6dfd7..433fba685 100644 --- a/buildroot/package/sphinxbase/sphinxbase.hash +++ b/buildroot/package/sphinxbase/sphinxbase.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 06971dbe272d2f73bde0ef7b3538c0c8f8ea885cb171fd6b17a5975bced66e64 sphinxbase-5prealpha.tar.gz +sha256 06971dbe272d2f73bde0ef7b3538c0c8f8ea885cb171fd6b17a5975bced66e64 sphinxbase-5prealpha.tar.gz +sha256 26f12e0152a5d58c69904e439761a1b2fbb9267b5f04674dbf93667e3e6dd043 src/libsphinxbase/util/bio.c diff --git a/buildroot/package/spi-tools/spi-tools.hash b/buildroot/package/spi-tools/spi-tools.hash index 8fe2d3e6b..eb8073f78 100644 --- a/buildroot/package/spi-tools/spi-tools.hash +++ b/buildroot/package/spi-tools/spi-tools.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 1f29548187c5a57ca5902d260b01ca9ce04d93e4406ff77f317e1d6423ed3610 spi-tools-0.8.3.tar.gz +sha256 201ffcb53e64f28a05aa0a8de5686f7ac644268da1305c0d5f70a3d96b4a22ce spi-tools-0.8.4.tar.gz sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE diff --git a/buildroot/package/spi-tools/spi-tools.mk b/buildroot/package/spi-tools/spi-tools.mk index d21e4d64d..c25521a07 100644 --- a/buildroot/package/spi-tools/spi-tools.mk +++ b/buildroot/package/spi-tools/spi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPI_TOOLS_VERSION = 0.8.3 +SPI_TOOLS_VERSION = 0.8.4 SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) # autoreconf must be run as specified in package documentation SPI_TOOLS_AUTORECONF = YES diff --git a/buildroot/package/spice/spice.mk b/buildroot/package/spice/spice.mk index 8c421abf2..bed6931c2 100644 --- a/buildroot/package/spice/spice.mk +++ b/buildroot/package/spice/spice.mk @@ -32,13 +32,6 @@ SPICE_CONF_OPTS = \ SPICE_DEPENDENCIES += host-pkgconf -ifeq ($(BR2_PACKAGE_CELT051),y) -SPICE_CONF_OPTS += --enable-celt051 -SPICE_DEPENDENCIES += celt051 -else -SPICE_CONF_OPTS += --disable-celt051 -endif - ifeq ($(BR2_PACKAGE_LZ4),y) SPICE_CONF_OPTS += --enable-lz4 SPICE_DEPENDENCIES += lz4 diff --git a/buildroot/package/spidermonkey/0001-allow-newer-autoconf-versions.patch b/buildroot/package/spidermonkey/0001-allow-newer-autoconf-versions.patch new file mode 100644 index 000000000..61becb68f --- /dev/null +++ b/buildroot/package/spidermonkey/0001-allow-newer-autoconf-versions.patch @@ -0,0 +1,61 @@ +From 646a78262b18e19721cd41ee515215221dd241b6 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 12 Jul 2018 18:12:42 +0800 +Subject: [PATCH] allow newer autoconf versions + +Spidermonkey is hardcoded to use Autoconf 2.13, which is from 1999! +The reasoning behind using 2.13 is because newer versions of Autoconf at the +time did not work correctly with the custom m4 macros in the source code. +However: Because we are building just the spidermonkey engine instead of the +entire firefox package, and we are using a tarball with a pre-setup +old-configure file, there is no need for the old version of autoconf. + +See: https://bugzilla.mozilla.org/show_bug.cgi?id=104642 + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Hongxu Jia +Signed-off-by: Adam Duskett +--- + build/moz.configure/old.configure | 4 ++-- + js/src/old-configure | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure +index 17d0c5bf..436fcc5e 100644 +--- a/build/moz.configure/old.configure ++++ b/build/moz.configure/old.configure +@@ -33,7 +33,7 @@ def autoconf(mozconfig, autoconf): + autoconf = autoconf[0] if autoconf else None + + for ac in (mozconfig_autoconf, autoconf, 'autoconf-2.13', 'autoconf2.13', +- 'autoconf213'): ++ 'autoconf213', 'autoconf'): + if ac: + autoconf = find_program(ac) + if autoconf: +@@ -87,7 +87,7 @@ def prepare_configure(old_configure, mozconfig, autoconf, build_env, shell, + old_configure = os.path.join(old_configure_dir, 'js', 'src', + os.path.basename(old_configure)) + +- refresh = True ++ refresh = False + if exists(old_configure): + mtime = getmtime(old_configure) + aclocal = os.path.join(build_env.topsrcdir, 'build', 'autoconf', +diff --git a/js/src/old-configure b/js/src/old-configure +index 58cc646f..ebd2646e 100644 +--- a/js/src/old-configure ++++ b/js/src/old-configure +@@ -587,7 +587,7 @@ if test -z "$srcdir"; then + ac_prog=$0 + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. +- srcdir=$ac_confdir ++ srcdir="$ac_confdir/../../" + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. + fi +-- +2.23.0 + diff --git a/buildroot/package/spidermonkey/0002-allow-building-in-tree.patch b/buildroot/package/spidermonkey/0002-allow-building-in-tree.patch new file mode 100644 index 000000000..533747cb4 --- /dev/null +++ b/buildroot/package/spidermonkey/0002-allow-building-in-tree.patch @@ -0,0 +1,47 @@ +From 07d40f72e1ed1d84a5ddd98ae8490d41a2e19c46 Mon Sep 17 00:00:00 2001 +From: Arjan van de Ven +Date: Wed, 5 Sep 2018 11:39:01 +0000 +Subject: [PATCH] allow building in tree + +By default, spidermonkey must be configured and built out-of-tree, +otherwise the following error occurs: + +FATAL ERROR PROCESSING MOZBUILD FILE +============================== + +The error occurred while processing the following file or one of the files it +includes: + js/src/shell/moz.build + +The error occurred when validating the result of the execution. The reported +error is: + Path specified in LOCAL_INCLUDES is not allowed: + .. (resolved to js/src) + +Remove this check, as spidermonkey builds without issue in-tree. + +Signed-off-by: Arjan van de Ven +Signed-off-by: Adam Duskett +--- + python/mozbuild/mozbuild/frontend/emitter.py | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py +index 642b381c..c37fbf5d 100644 +--- a/python/mozbuild/mozbuild/frontend/emitter.py ++++ b/python/mozbuild/mozbuild/frontend/emitter.py +@@ -1127,11 +1127,6 @@ class TreeMetadataEmitter(LoggingMixin): + raise SandboxValidationError('Path specified in LOCAL_INCLUDES ' + 'does not exist: %s (resolved to %s)' % (local_include, + full_path), context) +- if (full_path == context.config.topsrcdir or +- full_path == context.config.topobjdir): +- raise SandboxValidationError('Path specified in LOCAL_INCLUDES ' +- 'is not allowed: %s (resolved to %s)' % (local_include, +- full_path), context) + include_obj = LocalInclude(context, local_include) + local_includes.append(include_obj.path.full_path) + yield include_obj +-- +2.23.0 + diff --git a/buildroot/package/spidermonkey/0003-allow-unknown-configuration-options.patch b/buildroot/package/spidermonkey/0003-allow-unknown-configuration-options.patch new file mode 100644 index 000000000..b489075a9 --- /dev/null +++ b/buildroot/package/spidermonkey/0003-allow-unknown-configuration-options.patch @@ -0,0 +1,35 @@ +From 4a06a1a6a71293decb83aee7adb74bc709493106 Mon Sep 17 00:00:00 2001 +From: Philip Chimento +Date: Wed, 5 Jul 2017 22:57:09 -0700 +Subject: [PATCH] allow unknown configuration options + +By default, if an unknown parameter is passed to configure, an error is raised. +Replace the raise with a pass and continue. + +Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1379540 + +Signed-off-by: Philip Chimento +Signed-off-by: Adam Duskett +--- + js/src/configure | 9 +++++++++ + python/mozbuild/mozbuild/configure/__init__.py | 2 +- + python/mozbuild/mozbuild/configure/options.py | 6 +++++- + 3 files changed, 15 insertions(+), 2 deletions(-) + create mode 100755 js/src/configure + +diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py +index 0fe640ca..09b460d3 100644 +--- a/python/mozbuild/mozbuild/configure/__init__.py ++++ b/python/mozbuild/mozbuild/configure/__init__.py +@@ -421,7 +421,7 @@ def run(self, path=None): + # All options should have been removed (handled) by now. + for arg in self._helper: + without_value = arg.split('=', 1)[0] +- raise InvalidOptionError('Unknown option: %s' % without_value) ++ pass + + # Run the execution queue + for func, args in self._execution_queue: +-- +2.23.0 + diff --git a/buildroot/package/spidermonkey/0004-fix-building-with-musl.patch b/buildroot/package/spidermonkey/0004-fix-building-with-musl.patch new file mode 100644 index 000000000..8d8b10fb7 --- /dev/null +++ b/buildroot/package/spidermonkey/0004-fix-building-with-musl.patch @@ -0,0 +1,133 @@ +From 0c9e8f586ba52a9aef5ed298e8315b2598b8fb72 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 25 May 2019 16:54:45 -0700 +Subject: [PATCH] fix building with musl + +The MIPS specific header is not provided by musl +linux kernel headers provide which has same definitions + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +Signed-off-by: Adam Duskett +--- +--- + js/src/jsmath.cpp | 2 +- + memory/build/Mutex.h | 4 ++-- + mozglue/misc/TimeStamp_darwin.cpp | 1 - + mozglue/misc/TimeStamp_posix.cpp | 1 - + nsprpub/pr/src/misc/prsystem.c | 1 - + third_party/python/psutil/psutil/_psutil_bsd.c | 1 - + third_party/python/psutil/psutil/_psutil_osx.c | 1 - + third_party/python/psutil/psutil/arch/osx/process_info.c | 1 - + 8 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp +index a28968be..8facaa81 100644 +--- a/js/src/jsmath.cpp ++++ b/js/src/jsmath.cpp +@@ -71,7 +71,7 @@ + #elif defined(__s390__) + #define GETRANDOM_NR 349 + #elif defined(__mips__) +-#include ++#include + #if _MIPS_SIM == _MIPS_SIM_ABI32 + #define GETRANDOM_NR 4353 + #elif _MIPS_SIM == _MIPS_SIM_ABI64 +diff --git a/memory/build/Mutex.h b/memory/build/Mutex.h +index cb8b1e7d..7b9eb1de 100644 +--- a/memory/build/Mutex.h ++++ b/memory/build/Mutex.h +@@ -42,7 +42,7 @@ struct Mutex { + if (pthread_mutexattr_init(&attr) != 0) { + return false; + } +- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_STALLED); + if (pthread_mutex_init(&mMutex, &attr) != 0) { + pthread_mutexattr_destroy(&attr); + return false; +@@ -102,7 +102,7 @@ typedef Mutex StaticMutex; + + #if defined(XP_DARWIN) + #define STATIC_MUTEX_INIT OS_SPINLOCK_INIT +-#elif defined(XP_LINUX) && !defined(ANDROID) ++#elif defined(XP_LINUX) && !defined(ANDROID) && defined(__GLIBC__) + #define STATIC_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP + #else + #define STATIC_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER +diff --git a/mozglue/misc/TimeStamp_darwin.cpp b/mozglue/misc/TimeStamp_darwin.cpp +index d2abe9a5..d065649c 100644 +--- a/mozglue/misc/TimeStamp_darwin.cpp ++++ b/mozglue/misc/TimeStamp_darwin.cpp +@@ -19,7 +19,6 @@ + + #include + #include +-#include + #include + #include + +diff --git a/mozglue/misc/TimeStamp_posix.cpp b/mozglue/misc/TimeStamp_posix.cpp +index 86c7609a..a37bd93a 100644 +--- a/mozglue/misc/TimeStamp_posix.cpp ++++ b/mozglue/misc/TimeStamp_posix.cpp +@@ -21,7 +21,6 @@ + #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ + defined(__OpenBSD__) + #include +-#include + #endif + + #if defined(__DragonFly__) || defined(__FreeBSD__) +diff --git a/nsprpub/pr/src/misc/prsystem.c b/nsprpub/pr/src/misc/prsystem.c +index eba85fb0..54b57bb9 100644 +--- a/nsprpub/pr/src/misc/prsystem.c ++++ b/nsprpub/pr/src/misc/prsystem.c +@@ -27,7 +27,6 @@ + || defined(OPENBSD) || defined(DRAGONFLY) || defined(DARWIN) + #define _PR_HAVE_SYSCTL + #include +-#include + #endif + + #if defined(DARWIN) +diff --git a/third_party/python/psutil/psutil/_psutil_bsd.c b/third_party/python/psutil/psutil/_psutil_bsd.c +index 9a2ed04b..9e0d34cb 100644 +--- a/third_party/python/psutil/psutil/_psutil_bsd.c ++++ b/third_party/python/psutil/psutil/_psutil_bsd.c +@@ -29,7 +29,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/third_party/python/psutil/psutil/_psutil_osx.c b/third_party/python/psutil/psutil/_psutil_osx.c +index 55dd64ca..ec356339 100644 +--- a/third_party/python/psutil/psutil/_psutil_osx.c ++++ b/third_party/python/psutil/psutil/_psutil_osx.c +@@ -13,7 +13,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/third_party/python/psutil/psutil/arch/osx/process_info.c b/third_party/python/psutil/psutil/arch/osx/process_info.c +index 40c79a2c..8de0dcbd 100644 +--- a/third_party/python/psutil/psutil/arch/osx/process_info.c ++++ b/third_party/python/psutil/psutil/arch/osx/process_info.c +@@ -16,7 +16,6 @@ + #include + #include + #include +-#include + #include + + #include "process_info.h" +-- +2.23.0 diff --git a/buildroot/package/spidermonkey/0005-add-riscv-support.patch b/buildroot/package/spidermonkey/0005-add-riscv-support.patch new file mode 100644 index 000000000..6b7ea3265 --- /dev/null +++ b/buildroot/package/spidermonkey/0005-add-riscv-support.patch @@ -0,0 +1,121 @@ +From 64ad80e6d95871f17be4cd01da15581f41ac0b2b Mon Sep 17 00:00:00 2001 +From: Stefan O'Rear +Date: Fri, 11 Nov 2016 21:10:34 -0700 +Subject: [PATCH] Add RISC-V support + +These changes allow spidermonkey to cross-compile for riscv64 and riscv32. + +Upstream-status: Submitted +See: https://bugzilla.mozilla.org/show_bug.cgi?id=1318905 + +Signed-off-by: Stefan O'Rear +Signed-off-by: Ricardo Salveti +Signed-off-by: Adam Duskett +--- + build/autoconf/config.guess | 3 +++ + build/moz.configure/init.configure | 3 +++ + js/src/jit/AtomicOperations.h | 2 ++ + js/src/jit/none/AtomicOperations-feeling-lucky.h | 8 ++++++++ + mfbt/tests/TestPoisonArea.cpp | 3 +++ + python/mozbuild/mozbuild/configure/constants.py | 4 ++++ + 6 files changed, 23 insertions(+) + +diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess +index d5d667d4..1277a862 100755 +--- a/build/autoconf/config.guess ++++ b/build/autoconf/config.guess +@@ -1029,6 +1029,9 @@ EOF + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; ++ riscv32:Linux:*:* | riscv64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 83b8d705..ef33db50 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -676,6 +676,9 @@ def split_triplet(triplet, allow_unknown=False): + elif cpu == 'sh4': + canonical_cpu = 'sh4' + endianness = 'little' ++ elif cpu in ('riscv32', 'riscv64'): ++ canonical_cpu = cpu ++ endianness = 'little' + elif allow_unknown: + canonical_cpu = cpu + endianness = 'unknown' +diff --git a/js/src/jit/AtomicOperations.h b/js/src/jit/AtomicOperations.h +index 3501e65b..fda0b148 100644 +--- a/js/src/jit/AtomicOperations.h ++++ b/js/src/jit/AtomicOperations.h +@@ -393,6 +393,8 @@ inline bool AtomicOperations::isLockfreeJS(int32_t size) { + #include "jit/none/AtomicOperations-feeling-lucky.h" + #elif defined(__s390__) || defined(__s390x__) + #include "jit/none/AtomicOperations-feeling-lucky.h" ++#elif defined(__riscv) ++#include "jit/none/AtomicOperations-feeling-lucky.h" + #else + #error "No AtomicOperations support provided for this platform" + #endif +diff --git a/js/src/jit/none/AtomicOperations-feeling-lucky.h b/js/src/jit/none/AtomicOperations-feeling-lucky.h +index c0b43699..42b1f3e0 100644 +--- a/js/src/jit/none/AtomicOperations-feeling-lucky.h ++++ b/js/src/jit/none/AtomicOperations-feeling-lucky.h +@@ -80,6 +80,14 @@ + #define GNUC_COMPATIBLE + #endif + ++#ifdef __riscv ++#define GNUC_COMPATIBLE ++#ifdef __riscv_xlen == 64 ++#define HAS_64BIT_ATOMICS ++#define HAS_64BIT_LOCKFREE ++#endif ++#endif ++ + // The default implementation tactic for gcc/clang is to use the newer + // __atomic intrinsics added for use in C++11 . Where that + // isn't available, we use GCC's older __sync functions instead. +diff --git a/mfbt/tests/TestPoisonArea.cpp b/mfbt/tests/TestPoisonArea.cpp +index 06c24ed0..fba9263c 100644 +--- a/mfbt/tests/TestPoisonArea.cpp ++++ b/mfbt/tests/TestPoisonArea.cpp +@@ -168,6 +168,9 @@ static const ia64_instr _return_instr = + #define RETURN_INSTR _return_instr + #define RETURN_INSTR_TYPE ia64_instr + ++#elif defined __riscv ++#define RETURN_INSTR 0x80828082 /* ret; ret */ ++ + #else + #error "Need return instruction for this architecture" + #endif +diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py +index 33ae5a45..1067b6a4 100644 +--- a/python/mozbuild/mozbuild/configure/constants.py ++++ b/python/mozbuild/mozbuild/configure/constants.py +@@ -50,6 +50,8 @@ CPU_bitness = { + 'mips64': 64, + 'ppc': 32, + 'ppc64': 64, ++ 'riscv32': 32, ++ 'riscv64': 64, + 's390': 32, + 's390x': 64, + 'sh4': 32, +@@ -82,6 +84,8 @@ CPU_preprocessor_checks = OrderedDict(( + ('s390', '__s390__'), + ('ppc64', '__powerpc64__'), + ('ppc', '__powerpc__'), ++ ('riscv32', '__riscv && __SIZEOF_POINTER__ == 4'), ++ ('riscv64', '__riscv && __SIZEOF_POINTER__ == 8'), + ('Alpha', '__alpha__'), + ('hppa', '__hppa__'), + ('sparc64', '__sparc__ && __arch64__'), +-- +2.23.0 + diff --git a/buildroot/package/spidermonkey/0006-copy-headers-on-install-instead-of-symlinking.patch b/buildroot/package/spidermonkey/0006-copy-headers-on-install-instead-of-symlinking.patch new file mode 100644 index 000000000..10ca54c70 --- /dev/null +++ b/buildroot/package/spidermonkey/0006-copy-headers-on-install-instead-of-symlinking.patch @@ -0,0 +1,34 @@ +From 903a79a1efff18fc7cc50db09a3fe5d768adc9a8 Mon 19 Mar 2018 09:58:06 +0100 +From: Rico Tzschichholz +Date: Wed, 5 Jul 2017 22:45:59 -0700 +Subject: build: Copy headers on install instead of symlinking + +Patch ported from mozjs52 by Philip Chimento + +Signed-off-by: Rico Tzschichholz +Signed-off-by: Adam Duskett +--- + python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py +index dd9020d..6918ef8 100644 +--- a/python/mozbuild/mozbuild/backend/recursivemake.py ++++ b/python/mozbuild/mozbuild/backend/recursivemake.py +@@ -1427,11 +1427,11 @@ class RecursiveMakeBackend(CommonBackend): + raise Exception("Wildcards are only supported in the filename part of " + "srcdir-relative or absolute paths.") + +- install_manifest.add_pattern_link(basepath, wild, path) ++ install_manifest.add_pattern_copy(basepath, wild, path) + else: +- install_manifest.add_pattern_link(f.srcdir, f, path) ++ install_manifest.add_pattern_copy(f.srcdir, f, path) + else: +- install_manifest.add_link(f.full_path, dest) ++ install_manifest.add_copy(f.full_path, dest) + else: + install_manifest.add_optional_exists(dest) + backend_file.write('%s_FILES += %s\n' % ( +-- +2.23.0 diff --git a/buildroot/package/spidermonkey/0007-ensure-proper-running-on-64-bit-and-32-bit-be-platforms.patch b/buildroot/package/spidermonkey/0007-ensure-proper-running-on-64-bit-and-32-bit-be-platforms.patch new file mode 100644 index 000000000..9ffd69380 --- /dev/null +++ b/buildroot/package/spidermonkey/0007-ensure-proper-running-on-64-bit-and-32-bit-be-platforms.patch @@ -0,0 +1,144 @@ +From f66d410f3ba767efb91c6b9545d373267cd975f2 Mon Sep 17 00:00:00 2001 +From: Philip Chimento +Date: Sat, 7 Sep 2019 20:43:40 +0200 +Subject: [PATCH] ensure proper running on 64-bit and 32-bit BE platforms + +See: https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/jsproperty-endian.patch + +Signed-off-by: Philip Chimento +Signed-off-by: Adam Duskett +--- + js/src/gc/Marking-inl.h | 16 ++++++++++++++++ + js/src/gc/RelocationOverlay.h | 13 ++++++++++++- + js/src/jsfriendapi.h | 8 ++++++++ + js/src/vm/StringType.h | 13 +++++++++++++ + 4 files changed, 49 insertions(+), 1 deletion(-) + +diff --git a/js/src/gc/Marking-inl.h b/js/src/gc/Marking-inl.h +index 6d2a4c7..c773c21 100644 +--- a/js/src/gc/Marking-inl.h ++++ b/js/src/gc/Marking-inl.h +@@ -82,12 +82,28 @@ inline void RelocationOverlay::forwardTo(Cell* cell) { + MOZ_ASSERT(!isForwarded()); + // The location of magic_ is important because it must never be valid to see + // the value Relocated there in a GC thing that has not been moved. ++#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 ++ // On 32-bit, the magic_ aliases with whatever comes after the first ++ // pointer; on little-endian 64-bit, the magic_ aliases with the ++ // 32 most significant bits of the pointer, which are the second half. + static_assert(offsetof(RelocationOverlay, magic_) == + offsetof(JSObject, group_) + sizeof(uint32_t), + "RelocationOverlay::magic_ is in the wrong location"); + static_assert(offsetof(RelocationOverlay, magic_) == + offsetof(js::Shape, base_) + sizeof(uint32_t), + "RelocationOverlay::magic_ is in the wrong location"); ++#elif JS_BITS_PER_WORD == 64 ++ // On big-endian 64-bit, the magic_ aliases with the 32 most ++ // significant bits of the pointer, but now that's the first half. ++ static_assert(offsetof(RelocationOverlay, magic_) == ++ offsetof(JSObject, group_), ++ "RelocationOverlay::magic_ is in the wrong location"); ++ static_assert(offsetof(RelocationOverlay, magic_) == ++ offsetof(js::Shape, base_), ++ "RelocationOverlay::magic_ is in the wrong location"); ++#else ++# error "Unknown endianness or word size" ++#endif + static_assert( + offsetof(RelocationOverlay, magic_) == offsetof(JSString, d.u1.length), + "RelocationOverlay::magic_ is in the wrong location"); +diff --git a/js/src/gc/RelocationOverlay.h b/js/src/gc/RelocationOverlay.h +index a568843..399a541 100644 +--- a/js/src/gc/RelocationOverlay.h ++++ b/js/src/gc/RelocationOverlay.h +@@ -33,14 +33,25 @@ class RelocationOverlay { + /* See comment in js/public/HeapAPI.h. */ + static const uint32_t Relocated = js::gc::Relocated; + ++#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 + /* +- * Keep the low 32 bits untouched. Use them to distinguish strings from ++ * Keep the first 32 bits untouched. Use them to distinguish strings from + * objects in the nursery. + */ + uint32_t preserve_; + + /* Set to Relocated when moved. */ + uint32_t magic_; ++#elif JS_BITS_PER_WORD == 64 ++ /* ++ * On big-endian, we need to reorder to keep preserve_ lined up with the ++ * low 32 bits of the aligned group_ pointer in JSObject. ++ */ ++ uint32_t magic_; ++ uint32_t preserve_; ++#else ++# error "Unknown endianness or word size" ++#endif + + /* The location |this| was moved to. */ + Cell* newLocation_; +diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h +index 4b8d18a..70ce0a1 100644 +--- a/js/src/jsfriendapi.h ++++ b/js/src/jsfriendapi.h +@@ -9,6 +9,7 @@ + + #include "mozilla/Atomics.h" + #include "mozilla/Casting.h" ++#include "mozilla/EndianUtils.h" + #include "mozilla/Maybe.h" + #include "mozilla/MemoryReporting.h" + #include "mozilla/UniquePtr.h" +@@ -609,8 +610,15 @@ struct String { + static const uint32_t LATIN1_CHARS_BIT = JS_BIT(6); + static const uint32_t EXTERNAL_FLAGS = LINEAR_BIT | NON_ATOM_BIT | JS_BIT(5); + static const uint32_t TYPE_FLAGS_MASK = JS_BIT(6) - 1; ++#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 + uint32_t flags; + uint32_t length; ++#elif JS_BITS_PER_WORD == 64 ++ uint32_t length; ++ uint32_t flags; ++#else ++# error "Unknown endianness or word size" ++#endif + union { + const JS::Latin1Char* nonInlineCharsLatin1; + const char16_t* nonInlineCharsTwoByte; +diff --git a/js/src/vm/StringType.h b/js/src/vm/StringType.h +index cde3427..c3400db 100644 +--- a/js/src/vm/StringType.h ++++ b/js/src/vm/StringType.h +@@ -7,6 +7,7 @@ + #ifndef vm_StringType_h + #define vm_StringType_h + ++#include "mozilla/EndianUtils.h" + #include "mozilla/MemoryReporting.h" + #include "mozilla/PodOperations.h" + #include "mozilla/Range.h" +@@ -168,8 +169,20 @@ class JSString : public js::gc::Cell { + struct Data { + union { + struct { ++#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 + uint32_t flags; /* JSString */ + uint32_t length; /* JSString */ ++#elif JS_BITS_PER_WORD == 64 ++ /* ++ * On big-endian, we need to reorder to keep flags lined up ++ * with the low 32 bits of the aligned group_ pointer in ++ * JSObject. ++ */ ++ uint32_t length; /* JSString */ ++ uint32_t flags; /* JSString */ ++#else ++# error "Unknown endianness or word size" ++#endif + }; + uintptr_t flattenData; /* JSRope (temporary while flattening) */ + } u1; +-- +2.23.0 + diff --git a/buildroot/package/spidermonkey/0008-save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-obje.patch b/buildroot/package/spidermonkey/0008-save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-obje.patch new file mode 100644 index 000000000..9fd4340ff --- /dev/null +++ b/buildroot/package/spidermonkey/0008-save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-obje.patch @@ -0,0 +1,66 @@ +From 903a79a1efff18fc7cc50db09a3fe5d768adc9a8 Mon 19 Mar 2018 09:58:06 +0100 +From: Lars T Hansen +Date: Fri, 23 Mar 2018 22:01:33 +0000 +Subject: [PATCH] save and restore non-volatile x28 on ARM64 for generated unboxed object constructor + +Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1375074 + +Upsream-status: Applied +See: https://hg.mozilla.org/mozilla-central/rev/800abe66894d + +Signed-off-by: Lars T Hansen +Signed-off-by: Adam Duskett +--- + js/src/vm/UnboxedObject.cpp | 30 ++++++++++++++++++++++++++---- + 1 file changed, 26 insertions(+), 4 deletions(-) + +diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp +index 35ca20d7405f..1c20a1093d13 100644 +--- a/js/src/vm/UnboxedObject.cpp ++++ b/js/src/vm/UnboxedObject.cpp +@@ -86,9 +86,16 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1; + #endif + + #ifdef JS_CODEGEN_ARM64 +- // ARM64 communicates stack address via sp, but uses a pseudo-sp for +- // addressing. +- masm.initStackPtr(); ++ // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for ++ // addressing. The register we use for PSP may however also be used by ++ // calling code, and it is nonvolatile, so save it. Do this as a special ++ // case first because the generic save/restore code needs the PSP to be ++ // initialized already. ++ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64())); ++ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex)); ++ ++ // Initialize the PSP from the SP. ++ masm.initStackPtr(); + #endif + + MOZ_ASSERT(propertiesReg.volatile_()); +@@ -239,7 +246,22 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1; + if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg); + masm.PopRegsInMask(savedNonVolatileRegisters); + +- masm.abiret(); ++#ifdef JS_CODEGEN_ARM64 ++ // Now restore the value that was in the PSP register on entry, and return. ++ ++ // Obtain the correct SP from the PSP. ++ masm.Mov(sp, PseudoStackPointer64); ++ ++ // Restore the saved value of the PSP register, this value is whatever the ++ // caller had saved in it, not any actual SP value, and it must not be ++ // overwritten subsequently. ++ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex)); ++ ++ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong. ++ masm.Ret(vixl::lr); ++#else ++ masm.abiret(); ++#endif + + masm.bind(&failureStoreOther); + +-- +2.23.0 diff --git a/buildroot/package/spidermonkey/0009-save-x28-before-clobbering-it-in-the-regex-compiler.patch b/buildroot/package/spidermonkey/0009-save-x28-before-clobbering-it-in-the-regex-compiler.patch new file mode 100644 index 000000000..b4623c596 --- /dev/null +++ b/buildroot/package/spidermonkey/0009-save-x28-before-clobbering-it-in-the-regex-compiler.patch @@ -0,0 +1,100 @@ +From 903a79a1efff18fc7cc50db09a3fe5d768adc9a8 Mon 19 Mar 2018 09:58:06 +0100 +From: Lars T Hansen +Date: Fri, 23 Mar 2018 22:01:33 +0000 +Subject: [PATCH] save x28 before clobbering it in the regex compiler + +Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1445907 + +Upsream-status: Applied +See: https://hg.mozilla.org/mozilla-central/rev/903a79a1efff + +Signed-off-by: Lars T Hansen +Signed-off-by: Adam Duskett +--- +diff --git a/js/src/irregexp/NativeRegExpMacroAssembler.cpp b/js/src/irregexp/NativeRegExpMacroAssembler.cpp +--- a/js/src/irregexp/NativeRegExpMacroAssembler.cpp ++++ b/js/src/irregexp/NativeRegExpMacroAssembler.cpp +@@ -118,17 +118,25 @@ NativeRegExpMacroAssembler::GenerateCode + + Label return_temp0; + + // Finalize code - write the entry point code now we know how many + // registers we need. + masm.bind(&entry_label_); + + #ifdef JS_CODEGEN_ARM64 +- // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing. ++ // ARM64 communicates stack address via SP, but uses a pseudo-sp (PSP) for ++ // addressing. The register we use for PSP may however also be used by ++ // calling code, and it is nonvolatile, so save it. Do this as a special ++ // case first because the generic save/restore code needs the PSP to be ++ // initialized already. ++ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64())); ++ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex)); ++ ++ // Initialize the PSP from the SP. + masm.initStackPtr(); + #endif + + // Push non-volatile registers which might be modified by jitcode. + size_t pushedNonVolatileRegisters = 0; + for (GeneralRegisterForwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter) { + masm.Push(*iter); + pushedNonVolatileRegisters++; +@@ -416,17 +424,32 @@ NativeRegExpMacroAssembler::GenerateCode + masm.pop(temp0); + masm.movePtr(temp0, StackPointer); + #endif + + // Restore non-volatile registers which were saved on entry. + for (GeneralRegisterBackwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter) + masm.Pop(*iter); + ++#ifdef JS_CODEGEN_ARM64 ++ // Now restore the value that was in the PSP register on entry, and return. ++ ++ // Obtain the correct SP from the PSP. ++ masm.Mov(sp, PseudoStackPointer64); ++ ++ // Restore the saved value of the PSP register, this value is whatever the ++ // caller had saved in it, not any actual SP value, and it must not be ++ // overwritten subsequently. ++ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex)); ++ ++ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong. ++ masm.Ret(vixl::lr); ++#else + masm.abiret(); ++#endif + + // Backtrack code (branch target for conditional backtracks). + if (backtrack_label_.used()) { + masm.bind(&backtrack_label_); + Backtrack(); + } + + // Backtrack stack overflow code. +diff --git a/js/src/jit-test/tests/regexp/bug1445907.js b/js/src/jit-test/tests/regexp/bug1445907.js +new file mode 100644 +--- /dev/null ++++ b/js/src/jit-test/tests/regexp/bug1445907.js +@@ -0,0 +1,15 @@ ++// On ARM64, we failed to save x28 properly when generating code for the regexp ++// matcher. ++// ++// There's wasm and Debugger code here because the combination forces the use of ++// x28 and exposes the bug when running on the simulator. ++ ++if (!wasmIsSupported()) ++ quit(); ++ ++var g = newGlobal(''); ++var dbg = new Debugger(g); ++g.eval(`var m = new WebAssembly.Instance(new WebAssembly.Module(wasmTextToBinary('(module (func (export "test")))')))`); ++var re = /./; ++dbg.onEnterFrame = function(frame) { re.exec("x") }; ++result = g.eval("m.exports.test()"); + +-- +2.23.0 + diff --git a/buildroot/package/spidermonkey/0010-always-use-the-equivalent-year-to-determine-the-time-zone.patch b/buildroot/package/spidermonkey/0010-always-use-the-equivalent-year-to-determine-the-time-zone.patch new file mode 100644 index 000000000..7ebe80a8a --- /dev/null +++ b/buildroot/package/spidermonkey/0010-always-use-the-equivalent-year-to-determine-the-time-zone.patch @@ -0,0 +1,103 @@ +From 903a79a1efff18fc7cc50db09a3fe5d768adc9a8 Mon 19 Mar 2018 09:58:06 +0100 +From: André Bargull +Date: Wed, 8 Nov 2017 03:23:41 -0800 +Subject: always use the equivalent year to determine the time zone offset and + name + +Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1415202 + +Upsream-status: Applied +See: https://hg.mozilla.org/mozilla-central/rev/ce9f1466ec78 + +Reviewed-by: Jeff Walden +Signed-off-by: André Bargull +Signed-off-by: Adam Duskett +--- + js/src/jsdate.cpp | 11 +++++++---- + js/src/vm/Time.cpp | 14 ++++---------- + js/src/vm/Time.h | 2 +- + 3 files changed, 12 insertions(+), 15 deletions(-) + +diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp +index 07af3d18c865..ff8fd6c3763c 100644 +--- a/js/src/jsdate.cpp ++++ b/js/src/jsdate.cpp +@@ -2353,12 +2353,15 @@ static PRMJTime ToPRMJTime(double localTime, double utcTime) { + static size_t FormatTime(char* buf, int buflen, const char* fmt, double utcTime, + double localTime) { + PRMJTime prtm = ToPRMJTime(localTime, utcTime); +- int eqivalentYear = IsRepresentableAsTime32(utcTime) +- ? prtm.tm_year +- : EquivalentYearForDST(prtm.tm_year); ++ // If an equivalent year was used to compute the date/time components, use ++ // the same equivalent year to determine the time zone name and offset in ++ // PRMJ_FormatTime(...). ++ int timeZoneYear = IsRepresentableAsTime32(utcTime) ++ ? prtm.tm_year ++ : EquivalentYearForDST(prtm.tm_year); + int offsetInSeconds = (int)floor((localTime - utcTime) / msPerSecond); + +- return PRMJ_FormatTime(buf, buflen, fmt, &prtm, eqivalentYear, ++ return PRMJ_FormatTime(buf, buflen, fmt, &prtm, timeZoneYear, + offsetInSeconds); + } + +diff --git a/js/src/vm/Time.cpp b/js/src/vm/Time.cpp +index f59977f0d0e9..5ee4794b3e83 100644 +--- a/js/src/vm/Time.cpp ++++ b/js/src/vm/Time.cpp +@@ -247,7 +247,7 @@ static void PRMJ_InvalidParameterHandler(const wchar_t* expression, + + /* Format a time value into a buffer. Same semantics as strftime() */ + size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt, +- const PRMJTime* prtm, int equivalentYear, ++ const PRMJTime* prtm, int timeZoneYear, + int offsetInSeconds) { + size_t result = 0; + #if defined(XP_UNIX) || defined(XP_WIN) +@@ -280,7 +280,8 @@ size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt, + * Fill out |td| to the time represented by |prtm|, leaving the + * timezone fields zeroed out. localtime_r will then fill in the + * timezone fields for that local time according to the system's +- * timezone parameters. ++ * timezone parameters. Use |timeZoneYear| for the year to ensure the ++ * time zone name matches the time zone offset used by the caller. + */ + struct tm td; + memset(&td, 0, sizeof(td)); +@@ -290,19 +291,12 @@ size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt, + td.tm_mday = prtm->tm_mday; + td.tm_mon = prtm->tm_mon; + td.tm_wday = prtm->tm_wday; +- td.tm_year = prtm->tm_year - 1900; ++ td.tm_year = timeZoneYear - 1900; + td.tm_yday = prtm->tm_yday; + td.tm_isdst = prtm->tm_isdst; + + time_t t = mktime(&td); + +- // If |prtm| cannot be represented in |time_t| the year is probably +- // out of range, try again with the DST equivalent year. +- if (t == static_cast(-1)) { +- td.tm_year = equivalentYear - 1900; +- t = mktime(&td); +- } +- + // If either mktime or localtime_r failed, fill in the fallback time + // zone offset |offsetInSeconds| and set the time zone identifier to + // the empty string. +diff --git a/js/src/vm/Time.h b/js/src/vm/Time.h +index 3a51d869c922..37b7faeec028 100644 +--- a/js/src/vm/Time.h ++++ b/js/src/vm/Time.h +@@ -49,7 +49,7 @@ inline void PRMJ_NowShutdown() {} + + /* Format a time value into a buffer. Same semantics as strftime() */ + extern size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt, +- const PRMJTime* tm, int equivalentYear, ++ const PRMJTime* tm, int timeZoneYear, + int offsetInSeconds); + + /** +-- +2.23.0 diff --git a/buildroot/package/spidermonkey/0011-js-src-Makefile.in-install-shell-only-if-it-s-built.patch b/buildroot/package/spidermonkey/0011-js-src-Makefile.in-install-shell-only-if-it-s-built.patch new file mode 100644 index 000000000..f6092af7e --- /dev/null +++ b/buildroot/package/spidermonkey/0011-js-src-Makefile.in-install-shell-only-if-it-s-built.patch @@ -0,0 +1,28 @@ +From b5e4a9926cf50d12e9c5c05c6d1b161e5b662d62 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sat, 7 Mar 2020 23:42:02 -0300 +Subject: [PATCH] js/src/Makefile.in: install shell only if it's built + +Prevents an installation error if we configure with --disable-js-shell. + +Signed-off-by: Carlos Santos +--- + js/src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/Makefile.in b/js/src/Makefile.in +index 4ac9f48..9c8fb64 100644 +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -136,7 +136,7 @@ endif + + install:: + $(MAKE) -C build install +- $(MAKE) -C shell install ++ if [ -d shell ]; then $(MAKE) -C shell install; fi + + ifdef HAVE_DTRACE + javascript-trace.h: $(srcdir)/devtools/javascript-trace.d +-- +2.18.2 + diff --git a/buildroot/package/spidermonkey/Config.in b/buildroot/package/spidermonkey/Config.in new file mode 100644 index 000000000..e015e84ad --- /dev/null +++ b/buildroot/package/spidermonkey/Config.in @@ -0,0 +1,60 @@ +config BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_sh4 || BR2_sh4a + default y if BR2_sparc || BR2_sparc64 + depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr + +config BR2_PACKAGE_SPIDERMONKEY_JIT_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 + +config BR2_PACKAGE_SPIDERMONKEY + bool "spidermonkey" + depends on BR2_HOST_GCC_AT_LEAST_4_9 + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # needs pthread_getattr_np() + depends on BR2_USE_MMU # fork in executable tools. + depends on BR2_USE_WCHAR + depends on !BR2_TOOLCHAIN_USES_UCLIBC # No way to check for fenv support. + depends on !BR2_STATIC_LIBS # dlopen + select BR2_PACKAGE_HOST_PYTHON + select BR2_PACKAGE_HOST_PYTHON_SSL + select BR2_PACKAGE_LIBNSPR + select BR2_PACKAGE_ZLIB + help + SpiderMonkey is the code-name for Mozilla Firefox's C++ + implementation of JavaScript. It is intended to be embedded in + other applications that provide host environments for + JavaScript. + + https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey + +if BR2_PACKAGE_SPIDERMONKEY + +config BR2_PACKAGE_SPIDERMONKEY_JS_SHELL + bool "JS shell" + help + Build the JavaScript shell. + + WARNING: increases target image size by around 24 MiB. + +endif + +comment "spidermonkey needs a glibc or musl toolchain with C++, wchar, dynamic library, NPTL, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_INSTALL_LIBSTDCPP || \ + BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + !BR2_HOST_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_USE_WCHAR diff --git a/buildroot/package/spidermonkey/spidermonkey.hash b/buildroot/package/spidermonkey/spidermonkey.hash new file mode 100644 index 000000000..ccb026586 --- /dev/null +++ b/buildroot/package/spidermonkey/spidermonkey.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 f51039c997415fd0f13f8e01966b4a8ff80cbf90deb8b14c18827104a369cc0d mozjs-60.5.2.tar.bz2 +sha256 aaac93a33bec26d5d1a9c5efc1e7dc6bd215d8a4f1e1a7fc5315a67adfd51338 moz.configure diff --git a/buildroot/package/spidermonkey/spidermonkey.mk b/buildroot/package/spidermonkey/spidermonkey.mk new file mode 100644 index 000000000..50afdc175 --- /dev/null +++ b/buildroot/package/spidermonkey/spidermonkey.mk @@ -0,0 +1,64 @@ +################################################################################ +# +# spidermonkey +# +################################################################################ + +# Use a tarball with only the spidermonkey source code and a pre-setup +# old-configure in src/js.This prevents having to use autoconf 2.13 and +# makes the package much 31M instead of 257M +SPIDERMONKEY_VERSION = 60.5.2 +SPIDERMONKEY_SOURCE = mozjs-$(SPIDERMONKEY_VERSION).tar.bz2 +SPIDERMONKEY_SITE = https://gentoo.osuosl.org/distfiles/9a +SPIDERMONKEY_SUBDIR = js/src +SPIDERMONKEY_LICENSE = MPL-2.0 +SPIDERMONKEY_LICENSE_FILES = moz.configure +SPIDERMONKEY_INSTALL_STAGING = YES + +SPIDERMONKEY_DEPENDENCIES = \ + host-python \ + libnspr \ + zlib + +SPIDERMONKEY_CONF_ENV = \ + PYTHON="$(HOST_DIR)/bin/python2" + +# spidermonkey mixes up target and host. +# spidermonkey does not allow building against a system jemalloc, +# as it causes a conflict with glibc. +SPIDERMONKEY_CONF_OPTS = \ + --host=$(GNU_HOST_NAME) \ + --target=$(GNU_TARGET_NAME) \ + --disable-jemalloc \ + --enable-shared-js \ + --with-system-zlib \ + --with-system-nspr \ + --with-nspr-exec-prefix="$(STAGING_DIR)/usr" + +ifeq ($(BR2_PACKAGE_SPIDERMONKEY_JIT_ARCH_SUPPORTS),y) +SPIDERMONKEY_CONF_OPTS += --enable-ion +else +SPIDERMONKEY_CONF_OPTS += --disable-ion +endif + +ifeq ($(BR2_PACKAGE_SPIDERMONKEY_JS_SHELL),y) +SPIDERMONKEY_CONF_OPTS += --enable-js-shell +else +SPIDERMONKEY_CONF_OPTS += --disable-js-shell +endif + +ifeq ($(BR2_PACKAGE_READLINE),y) +SPIDERMONKEY_CONF_OPTS += --enable-readline +SPIDERMONKEY_DEPENDENCIES += readline +else +SPIDERMONKEY_CONF_OPTS += --disable-readline +endif + +# Remove unneeded files +define SPIDERMONKEY_CLEANUP + rm -rf $(TARGET_DIR)/usr/lib/libjs_static.ajs + rm -rf $(TARGET_DIR)/usr/bin/js60-config +endef +SPIDERMONKEY_POST_INSTALL_TARGET_HOOKS += SPIDERMONKEY_CLEANUP + +$(eval $(autotools-package)) diff --git a/buildroot/package/spidev_test/spidev_test.mk b/buildroot/package/spidev_test/spidev_test.mk index bf8170cd2..80998f340 100644 --- a/buildroot/package/spidev_test/spidev_test.mk +++ b/buildroot/package/spidev_test/spidev_test.mk @@ -11,15 +11,15 @@ # Note that the location of spidev_test.c changes from v4.5 onwards. ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y) -SPIDEV_TEST_VERSION = v4.10 +SPIDEV_TEST_VERSION = 4.10 SPIDEV_TEST_PATH = tools/spi else -SPIDEV_TEST_VERSION = v3.0 +SPIDEV_TEST_VERSION = 3.0 SPIDEV_TEST_PATH = Documentation/spi endif SPIDEV_TEST_SITE = http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/$(SPIDEV_TEST_PATH) -SPIDEV_TEST_SOURCE = spidev_test.c?id=$(SPIDEV_TEST_VERSION) +SPIDEV_TEST_SOURCE = spidev_test.c?id=v$(SPIDEV_TEST_VERSION) SPIDEV_TEST_LICENSE = GPL-2.0 # musl libc requires linux/ioctl.h for _IOC_SIZEBITS. Do a sed patch to keep diff --git a/buildroot/package/sqlcipher/0001-Support-OpenSSL-1.1.0-and-prior.patch b/buildroot/package/sqlcipher/0001-Support-OpenSSL-1.1.0-and-prior.patch deleted file mode 100644 index 4fa3e3c76..000000000 --- a/buildroot/package/sqlcipher/0001-Support-OpenSSL-1.1.0-and-prior.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 43f71fa7b4c6a20f4078b9098369abb8d38a5617 Mon Sep 17 00:00:00 2001 -From: Nick Parker -Date: Fri, 9 Dec 2016 11:47:39 -0600 -Subject: [PATCH] Support OpenSSL 1.1.0 and prior - -(cherry picked from commit 939c83a007e4724436c3955ae2afd8b11b92d867) -Signed-off-by: Matt Weber ---- - src/crypto_openssl.c | 53 +++++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 38 insertions(+), 15 deletions(-) - -diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c -index 150ab92..6822325 100644 ---- a/src/crypto_openssl.c -+++ b/src/crypto_openssl.c -@@ -47,6 +47,29 @@ static unsigned int openssl_external_init = 0; - static unsigned int openssl_init_count = 0; - static sqlite3_mutex* openssl_rand_mutex = NULL; - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+static HMAC_CTX *HMAC_CTX_new(void) -+{ -+ HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); -+ if (ctx != NULL) { -+ HMAC_CTX_init(ctx); -+ } -+ return ctx; -+} -+ -+// Per 1.1.0 (https://wiki.openssl.org/index.php/1.1_API_Changes) -+// HMAC_CTX_free should call HMAC_CTX_cleanup, then EVP_MD_CTX_Cleanup. -+// HMAC_CTX_cleanup internally calls EVP_MD_CTX_cleanup so these -+// calls are not needed. -+static void HMAC_CTX_free(HMAC_CTX *ctx) -+{ -+ if (ctx != NULL) { -+ HMAC_CTX_cleanup(ctx); -+ OPENSSL_free(ctx); -+ } -+} -+#endif -+ - static int sqlcipher_openssl_add_random(void *ctx, void *buffer, int length) { - #ifndef SQLCIPHER_OPENSSL_NO_MUTEX_RAND - sqlite3_mutex_enter(openssl_rand_mutex); -@@ -143,14 +166,14 @@ static int sqlcipher_openssl_random (void *ctx, void *buffer, int length) { - } - - static int sqlcipher_openssl_hmac(void *ctx, unsigned char *hmac_key, int key_sz, unsigned char *in, int in_sz, unsigned char *in2, int in2_sz, unsigned char *out) { -- HMAC_CTX hctx; - unsigned int outlen; -- HMAC_CTX_init(&hctx); -- HMAC_Init_ex(&hctx, hmac_key, key_sz, EVP_sha1(), NULL); -- HMAC_Update(&hctx, in, in_sz); -- HMAC_Update(&hctx, in2, in2_sz); -- HMAC_Final(&hctx, out, &outlen); -- HMAC_CTX_cleanup(&hctx); -+ HMAC_CTX* hctx = HMAC_CTX_new(); -+ if(hctx == NULL) return SQLITE_ERROR; -+ HMAC_Init_ex(hctx, hmac_key, key_sz, EVP_sha1(), NULL); -+ HMAC_Update(hctx, in, in_sz); -+ HMAC_Update(hctx, in2, in2_sz); -+ HMAC_Final(hctx, out, &outlen); -+ HMAC_CTX_free(hctx); - return SQLITE_OK; - } - -@@ -160,18 +183,18 @@ static int sqlcipher_openssl_kdf(void *ctx, const unsigned char *pass, int pass_ - } - - static int sqlcipher_openssl_cipher(void *ctx, int mode, unsigned char *key, int key_sz, unsigned char *iv, unsigned char *in, int in_sz, unsigned char *out) { -- EVP_CIPHER_CTX ectx; - int tmp_csz, csz; -- -- EVP_CipherInit(&ectx, ((openssl_ctx *)ctx)->evp_cipher, NULL, NULL, mode); -- EVP_CIPHER_CTX_set_padding(&ectx, 0); // no padding -- EVP_CipherInit(&ectx, NULL, key, iv, mode); -- EVP_CipherUpdate(&ectx, out, &tmp_csz, in, in_sz); -+ EVP_CIPHER_CTX* ectx = EVP_CIPHER_CTX_new(); -+ if(ectx == NULL) return SQLITE_ERROR; -+ EVP_CipherInit_ex(ectx, ((openssl_ctx *)ctx)->evp_cipher, NULL, NULL, NULL, mode); -+ EVP_CIPHER_CTX_set_padding(ectx, 0); // no padding -+ EVP_CipherInit_ex(ectx, NULL, NULL, key, iv, mode); -+ EVP_CipherUpdate(ectx, out, &tmp_csz, in, in_sz); - csz = tmp_csz; - out += tmp_csz; -- EVP_CipherFinal(&ectx, out, &tmp_csz); -+ EVP_CipherFinal_ex(ectx, out, &tmp_csz); - csz += tmp_csz; -- EVP_CIPHER_CTX_cleanup(&ectx); -+ EVP_CIPHER_CTX_free(ectx); - assert(in_sz == csz); - return SQLITE_OK; - } --- -1.9.1 - diff --git a/buildroot/package/sqlcipher/0002-Guard-OpenSSL-init-and-cleanup-routines-on-versions-.patch b/buildroot/package/sqlcipher/0002-Guard-OpenSSL-init-and-cleanup-routines-on-versions-.patch deleted file mode 100644 index 1585b8d45..000000000 --- a/buildroot/package/sqlcipher/0002-Guard-OpenSSL-init-and-cleanup-routines-on-versions-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6b4dbecbcfe35d36fea264c04c41b338852d4e88 Mon Sep 17 00:00:00 2001 -From: Nick Parker -Date: Wed, 1 Mar 2017 15:35:43 -0600 -Subject: [PATCH] Guard OpenSSL init and cleanup routines on versions less - than 1.1.0 - -(cherry picked from commit 1c495b933cee3381f1ea6a70edcbcda1754d7409) -Signed-off-by: Matt Weber - -Conflicts: - src/crypto_openssl.c ---- - src/crypto_openssl.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c -index 6822325..09bc2a2 100644 ---- a/src/crypto_openssl.c -+++ b/src/crypto_openssl.c -@@ -102,7 +102,9 @@ static int sqlcipher_openssl_activate(void *ctx) { - - if(openssl_init_count == 0 && openssl_external_init == 0) { - /* if the library was not externally initialized, then should be now */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - OpenSSL_add_all_algorithms(); -+#endif - } - - #ifndef SQLCIPHER_OPENSSL_NO_MUTEX_RAND -@@ -131,7 +133,9 @@ static int sqlcipher_openssl_deactivate(void *ctx) { - Note: this code will only be reached if OpensSSL_add_all_algorithms() - is called by SQLCipher internally. This should prevent SQLCipher from - "cleaning up" openssl when it was initialized externally by the program */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - EVP_cleanup(); -+#endif - } - #ifndef SQLCIPHER_OPENSSL_NO_MUTEX_RAND - sqlite3_mutex_free(openssl_rand_mutex); --- -1.9.1 - diff --git a/buildroot/package/sqlcipher/0003-correct-compliation-under-openssl-1.1.x.patch b/buildroot/package/sqlcipher/0003-correct-compliation-under-openssl-1.1.x.patch deleted file mode 100644 index b15fabcbe..000000000 --- a/buildroot/package/sqlcipher/0003-correct-compliation-under-openssl-1.1.x.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3da532754fb2bb7d379d4386a8c3339742edfb0b Mon Sep 17 00:00:00 2001 -From: Stephen Lombardo -Date: Wed, 10 Oct 2018 15:55:49 -0400 -Subject: [PATCH] correct compliation under openssl 1.1.x - -(cherry picked from commit 57ea35296ce7f2c1c93ce79194eea19a008b69ae) -Signed-off-by: Matt Weber - -Conflicts: - src/crypto_openssl.c ---- - src/crypto_openssl.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c -index 09bc2a2..57a1104 100644 ---- a/src/crypto_openssl.c -+++ b/src/crypto_openssl.c -@@ -47,7 +47,7 @@ static unsigned int openssl_external_init = 0; - static unsigned int openssl_init_count = 0; - static sqlite3_mutex* openssl_rand_mutex = NULL; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - static HMAC_CTX *HMAC_CTX_new(void) - { - HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); -@@ -102,7 +102,7 @@ static int sqlcipher_openssl_activate(void *ctx) { - - if(openssl_init_count == 0 && openssl_external_init == 0) { - /* if the library was not externally initialized, then should be now */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - OpenSSL_add_all_algorithms(); - #endif - } -@@ -133,7 +133,7 @@ static int sqlcipher_openssl_deactivate(void *ctx) { - Note: this code will only be reached if OpensSSL_add_all_algorithms() - is called by SQLCipher internally. This should prevent SQLCipher from - "cleaning up" openssl when it was initialized externally by the program */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - EVP_cleanup(); - #endif - } --- -1.9.1 - diff --git a/buildroot/package/sqlcipher/Config.in b/buildroot/package/sqlcipher/Config.in index b26bc7709..332754b15 100644 --- a/buildroot/package/sqlcipher/Config.in +++ b/buildroot/package/sqlcipher/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_SQLCIPHER depends on !BR2_PACKAGE_SQLITE depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help SQLCipher is an SQLite extension that provides 256 bits AES encryption of database files. Note that it is a fork of diff --git a/buildroot/package/sqlcipher/sqlcipher.hash b/buildroot/package/sqlcipher/sqlcipher.hash index 8632cd7a5..c37db7a20 100644 --- a/buildroot/package/sqlcipher/sqlcipher.hash +++ b/buildroot/package/sqlcipher/sqlcipher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 25fa4f4cb38dcf9e52e4d1f46be8fee9c7aaef35b6df96912a216b289e22c2af sqlcipher-v3.2.0.tar.gz +sha256 fccb37e440ada898902b294d02cde7af9e8706b185d77ed9f6f4d5b18b4c305f sqlcipher-4.3.0.tar.gz sha256 3eee3c7964a9becc94d747bd36703d31fc86eb994680b06a61bfd4f2661eaac8 LICENSE diff --git a/buildroot/package/sqlcipher/sqlcipher.mk b/buildroot/package/sqlcipher/sqlcipher.mk index 812ae7fa4..14290745a 100644 --- a/buildroot/package/sqlcipher/sqlcipher.mk +++ b/buildroot/package/sqlcipher/sqlcipher.mk @@ -4,11 +4,11 @@ # ################################################################################ -SQLCIPHER_VERSION = v3.2.0 -SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,$(SQLCIPHER_VERSION)) +SQLCIPHER_VERSION = 4.3.0 +SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,v$(SQLCIPHER_VERSION)) SQLCIPHER_LICENSE = BSD-3-Clause SQLCIPHER_LICENSE_FILES = LICENSE -SQLCIPHER_DEPENDENCIES = openssl host-tcl +SQLCIPHER_DEPENDENCIES = host-pkgconf openssl host-tcl SQLCIPHER_INSTALL_STAGING = YES SQLCIPHER_CONF_ENV = \ @@ -20,7 +20,7 @@ SQLCIPHER_CONF_OPTS = \ --disable-tcl SQLCIPHER_CFLAGS += -DSQLITE_HAS_CODEC # Required according to the README -SQLCIPHER_CONF_ENV += LIBS="-lcrypto -lz" +SQLCIPHER_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` ifeq ($(BR2_PACKAGE_SQLCIPHER_STAT3),y) SQLCIPHER_CFLAGS += -DSQLITE_ENABLE_STAT3 @@ -33,4 +33,10 @@ else SQLCIPHER_CONF_OPTS += --disable-readline endif +ifeq ($(BR2_STATIC_LIBS),y) +SQLCIPHER_CONF_OPTS += --disable-load-extension +else +SQLCIPHER_CONF_OPTS += --enable-load-extension +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/sqlite/Config.in b/buildroot/package/sqlite/Config.in index 517af50e6..87c0f6c07 100644 --- a/buildroot/package/sqlite/Config.in +++ b/buildroot/package/sqlite/Config.in @@ -9,8 +9,8 @@ config BR2_PACKAGE_SQLITE if BR2_PACKAGE_SQLITE -config BR2_PACKAGE_SQLITE_STAT3 - bool "Additional query optimizations (stat3)" +config BR2_PACKAGE_SQLITE_STAT4 + bool "Additional query optimizations (stat4)" help Adds additional logic to the ANALYZE command and to the query planner that can help SQLite to choose a better query diff --git a/buildroot/package/sqlite/sqlite.hash b/buildroot/package/sqlite/sqlite.hash index 9b7efe71d..1d4bd03ed 100644 --- a/buildroot/package/sqlite/sqlite.hash +++ b/buildroot/package/sqlite/sqlite.hash @@ -1,6 +1,6 @@ # From https://www.sqlite.org/download.html -sha1 01b9d8fc77085e144dddc87456c9783e53d09a53 sqlite-autoconf-3280000.tar.gz +sha1 8383f29d53fa1d4383e4c8eb3e087f2ed940a9e0 sqlite-autoconf-3300100.tar.gz # Calculated based on the hash above -sha256 d61b5286f062adfce5125eaf544d495300656908e61fca143517afcc0a89b7c3 sqlite-autoconf-3280000.tar.gz +sha256 8c5a50db089bd2a1b08dbc5b00d2027602ca7ff238ba7658fabca454d4298e60 sqlite-autoconf-3300100.tar.gz # Locally calculated sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/buildroot/package/sqlite/sqlite.mk b/buildroot/package/sqlite/sqlite.mk index 7e97c966b..c5cf9607a 100644 --- a/buildroot/package/sqlite/sqlite.mk +++ b/buildroot/package/sqlite/sqlite.mk @@ -4,15 +4,15 @@ # ################################################################################ -SQLITE_VERSION = 3280000 +SQLITE_VERSION = 3300100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2019 SQLITE_LICENSE = Public domain SQLITE_LICENSE_FILES = tea/license.terms SQLITE_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_SQLITE_STAT3),y) -SQLITE_CFLAGS += -DSQLITE_ENABLE_STAT3 +ifeq ($(BR2_PACKAGE_SQLITE_STAT4),y) +SQLITE_CFLAGS += -DSQLITE_ENABLE_STAT4 endif ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA),y) @@ -39,8 +39,14 @@ ifeq ($(BR2_PACKAGE_SQLITE_NO_SYNC),y) SQLITE_CFLAGS += -DSQLITE_NO_SYNC endif +# Building with Microblaze Gcc 4.9 makes compiling to hang. +# Work around using -O0 +ifeq ($(BR2_microblaze):$(BR2_TOOLCHAIN_GCC_AT_LEAST_5),y:) +SQLITE_CFLAGS += $(TARGET_CFLAGS) -O0 +else # fallback to standard -O3 when -Ofast is present to avoid -ffast-math SQLITE_CFLAGS += $(subst -Ofast,-O3,$(TARGET_CFLAGS)) +endif SQLITE_CONF_ENV = CFLAGS="$(SQLITE_CFLAGS)" diff --git a/buildroot/package/squashfs/0001-include-sysmacros.patch b/buildroot/package/squashfs/0001-include-sysmacros.patch deleted file mode 100644 index d794836c0..000000000 --- a/buildroot/package/squashfs/0001-include-sysmacros.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 968aa53dd6d2c0831a9af01873441767c06b88d0 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Wed, 1 Aug 2018 12:17:10 +0200 -Subject: [PATCH] mksquashfs/unsquashfs: fix compilation with glibc 2.25+ -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From glibc 2.25 release notes: -https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html -"* The inclusion of by is deprecated. - This means that in a future release, the macros “major”, “minor”, and - “makedev” will only be available from ." - -See glibc bug https://sourceware.org/bugzilla/show_bug.cgi?id=19239 . - -Fetch from: https://github.com/plougher/squashfs-tools/pull/52.patch -Signed-off-by: Richard Kunze ---- - squashfs-tools/mksquashfs.c | 1 + - squashfs-tools/unsquashfs.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index d696a51..8d57c3e 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c -index a57f85c..a492b27 100644 ---- a/squashfs-tools/unsquashfs.c -+++ b/squashfs-tools/unsquashfs.c -@@ -33,6 +33,7 @@ - #include "fnmatch_compat.h" - - #include -+#include - #include - #include - #include diff --git a/buildroot/package/squashfs/Config.in b/buildroot/package/squashfs/Config.in index f5ae5d9be..60b243d98 100644 --- a/buildroot/package/squashfs/Config.in +++ b/buildroot/package/squashfs/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_SQUASHFS help Tools to generate SquashFS filesystems. - http://squashfs.sourceforge.net/ + https://github.com/plougher/squashfs-tools if BR2_PACKAGE_SQUASHFS diff --git a/buildroot/package/squashfs/Config.in.host b/buildroot/package/squashfs/Config.in.host index b353374dd..aa25b3765 100644 --- a/buildroot/package/squashfs/Config.in.host +++ b/buildroot/package/squashfs/Config.in.host @@ -3,4 +3,4 @@ config BR2_PACKAGE_HOST_SQUASHFS help Tools to generate SquashFS filesystems. - http://squashfs.sourceforge.net/ + https://github.com/plougher/squashfs-tools diff --git a/buildroot/package/squashfs/squashfs.hash b/buildroot/package/squashfs/squashfs.hash index 4464e62c0..1f08b530a 100644 --- a/buildroot/package/squashfs/squashfs.hash +++ b/buildroot/package/squashfs/squashfs.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 bd0aa3011320b8ebee68aa406060de277bef16daf81bad5b9f70cbea6db1a779 squashfs-e38956b92f738518c29734399629e7cdb33072d3.tar.gz +sha256 a7fa4845e9908523c38d4acf92f8a41fdfcd19def41bd5090d7ad767a6dc75c3 squashfs-4.4.tar.gz # License files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/squashfs/squashfs.mk b/buildroot/package/squashfs/squashfs.mk index 7467342c4..15707e198 100644 --- a/buildroot/package/squashfs/squashfs.mk +++ b/buildroot/package/squashfs/squashfs.mk @@ -4,9 +4,8 @@ # ################################################################################ -SQUASHFS_VERSION = e38956b92f738518c29734399629e7cdb33072d3 -SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git -SQUASHFS_SITE_METHOD = git +SQUASHFS_VERSION = 4.4 +SQUASHFS_SITE = $(call github,plougher,squashfs-tools,$(SQUASHFS_VERSION)) SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 diff --git a/buildroot/package/squeezelite/0001-Makefile-allow-passing-CFLAGS-and-LDFLAGS.patch b/buildroot/package/squeezelite/0001-Makefile-allow-passing-CFLAGS-and-LDFLAGS.patch deleted file mode 100644 index 2f002a80b..000000000 --- a/buildroot/package/squeezelite/0001-Makefile-allow-passing-CFLAGS-and-LDFLAGS.patch +++ /dev/null @@ -1,54 +0,0 @@ -From a0f2e79d1373967dac9f3df4c500a71cd1b96b2b Mon Sep 17 00:00:00 2001 -From: Hiroshi Kawashima -Date: Sun, 7 Feb 2016 18:04:53 +0100 -Subject: [PATCH] Makefile: allow passing CFLAGS and LDFLAGS - -This patch is applied to squeezelite Makefile to add override -directive for CFLAGS and LDFLAGS assignment. -This enables adding flags to CFLAGS and LDFLAGS in Makefile. - -Signed-off-by: Hiroshi Kawashima ---- - Makefile | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index dca2abd..286c725 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,6 @@ - # Cross compile support - create a Makefile which defines these three variables and then includes this Makefile... -+override CFLAGS += $(OPTS) -+override LDFLAGS += -lasound -lpthread -lm -lrt - CFLAGS ?= -Wall -fPIC -O2 $(OPTS) - LDFLAGS ?= -lasound -lpthread -lm -lrt - EXECUTABLE ?= squeezelite -@@ -52,20 +54,20 @@ endif - - # add optional link options - ifneq (,$(findstring $(OPT_LINKALL), $(CFLAGS))) -- LDFLAGS += $(LINKALL) -+ override LDFLAGS += $(LINKALL) - ifneq (,$(findstring $(OPT_FF), $(CFLAGS))) -- LDFLAGS += $(LINKALL_FF) -+ override LDFLAGS += $(LINKALL_FF) - endif - ifneq (,$(findstring $(OPT_RESAMPLE), $(CFLAGS))) -- LDFLAGS += $(LINKALL_RESAMPLE) -+ override LDFLAGS += $(LINKALL_RESAMPLE) - endif - ifneq (,$(findstring $(OPT_IR), $(CFLAGS))) -- LDFLAGS += $(LINKALL_IR) -+ override LDFLAGS += $(LINKALL_IR) - endif - else - # if not LINKALL and linux add LINK_LINUX - ifeq ($(UNAME), Linux) -- LDFLAGS += $(LINK_LINUX) -+ override LDFLAGS += $(LINK_LINUX) - endif - endif - --- -2.6.4 - diff --git a/buildroot/package/squeezelite/0002-output_alsa-use-mallopt-only-on-glibc.patch b/buildroot/package/squeezelite/0002-output_alsa-use-mallopt-only-on-glibc.patch deleted file mode 100644 index 6962b7b8f..000000000 --- a/buildroot/package/squeezelite/0002-output_alsa-use-mallopt-only-on-glibc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 903922a7bcf06e04d9830b47bba6d65ed37304c1 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Feb 2016 18:05:56 +0100 -Subject: [PATCH] output_alsa: use mallopt() only on glibc - -The musl C library does not provide the glibc specific mallopt() -functionality, so use it only when __GLIBC__ is defined. - -uClibc pretends to be glibc by defining __GLIBC__, but it implements -mallopt(), so it works fine. - -Signed-off-by: Thomas Petazzoni ---- - output_alsa.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/output_alsa.c b/output_alsa.c -index aa01560..44c9fc7 100644 ---- a/output_alsa.c -+++ b/output_alsa.c -@@ -862,8 +862,10 @@ void output_init_alsa(log_level level, const char *device, unsigned output_buf_s - LOG_INFO("memory locked"); - } - -+#ifdef __GLIBC__ - mallopt(M_TRIM_THRESHOLD, -1); - mallopt(M_MMAP_MAX, 0); -+#endif - - touch_memory(silencebuf, MAX_SILENCE_FRAMES * BYTES_PER_FRAME); - touch_memory(outputbuf->buf, outputbuf->size); --- -2.6.4 - diff --git a/buildroot/package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch b/buildroot/package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch deleted file mode 100644 index 74d8f1be5..000000000 --- a/buildroot/package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch +++ /dev/null @@ -1,65 +0,0 @@ -From cce6a0378ac319b87d2545d73f593d440bf686f5 Mon Sep 17 00:00:00 2001 -From: Andreas Cadhalpun -Date: Sat, 18 Aug 2018 13:25:23 +0200 -Subject: [PATCH] Replace deprecated FFmpeg API - -Fixes compilation with ffmpeg >= 2.9. - -Downloaded from Debian: -https://sources.debian.org/src/squeezelite/1.8-4.1/debian/patches/ffmpeg_2.9.patch/ - -Signed-off-by: Bernd Kuhls ---- - ffmpeg.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/ffmpeg.c b/ffmpeg.c -index 279f31d..bc9136c 100644 ---- a/ffmpeg.c -+++ b/ffmpeg.c -@@ -52,8 +52,8 @@ struct ff_s { - unsigned (* avcodec_version)(void); - AVCodec * (* avcodec_find_decoder)(int); - int attribute_align_arg (* avcodec_open2)(AVCodecContext *, const AVCodec *, AVDictionary **); -- AVFrame * (* avcodec_alloc_frame)(void); -- void (* avcodec_free_frame)(AVFrame **); -+ AVFrame * (* av_frame_alloc)(void); -+ void (* av_frame_free)(AVFrame **); - int attribute_align_arg (* avcodec_decode_audio4)(AVCodecContext *, AVFrame *, int *, const AVPacket *); - // ffmpeg symbols to be dynamically loaded from libavformat - unsigned (* avformat_version)(void); -@@ -324,7 +324,7 @@ static decode_state ff_decode(void) { - - AVCODEC(ff, open2, ff->codecC, codec, NULL); - -- ff->frame = AVCODEC(ff, alloc_frame); -+ ff->frame = AV(ff, frame_alloc); - - ff->avpkt = AV(ff, malloc, sizeof(AVPacket)); - if (ff->avpkt == NULL) { -@@ -520,9 +520,9 @@ static void _free_ff_data(void) { - if (ff->frame) { - // ffmpeg version dependant free function - #if !LINKALL -- ff->avcodec_free_frame ? AVCODEC(ff, free_frame, &ff->frame) : AV(ff, freep, &ff->frame); -+ ff->av_frame_free ? AV(ff, frame_free, &ff->frame) : AV(ff, freep, &ff->frame); - #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,28,0) -- AVCODEC(ff, free_frame, &ff->frame); -+ AV(ff, frame_free, &ff->frame); - #else - AV(ff, freep, &ff->frame); - #endif -@@ -607,8 +607,8 @@ static bool load_ff() { - ff->avcodec_version = dlsym(handle_codec, "avcodec_version"); - ff->avcodec_find_decoder = dlsym(handle_codec, "avcodec_find_decoder"); - ff->avcodec_open2 = dlsym(handle_codec, "avcodec_open2"); -- ff->avcodec_alloc_frame = dlsym(handle_codec, "avcodec_alloc_frame"); -- ff->avcodec_free_frame = dlsym(handle_codec, "avcodec_free_frame"); -+ ff->av_frame_alloc = dlsym(handle_codec, "av_frame_alloc"); -+ ff->av_frame_free = dlsym(handle_codec, "av_frame_free"); - ff->avcodec_decode_audio4 = dlsym(handle_codec, "avcodec_decode_audio4"); - ff->av_init_packet = dlsym(handle_codec, "av_init_packet"); - ff->av_free_packet = dlsym(handle_codec, "av_free_packet"); --- -2.18.0 - diff --git a/buildroot/package/squeezelite/0004-Fix-FTBFS-with-FFmpeg-4.0.patch b/buildroot/package/squeezelite/0004-Fix-FTBFS-with-FFmpeg-4.0.patch deleted file mode 100644 index 25a5db3ca..000000000 --- a/buildroot/package/squeezelite/0004-Fix-FTBFS-with-FFmpeg-4.0.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4ad37284447e768d641768c7c8a69c4640c83181 Mon Sep 17 00:00:00 2001 -From: James Cowgill -Date: Sat, 18 Aug 2018 13:26:59 +0200 -Subject: [PATCH] Fix FTBFS with FFmpeg 4.0 - -Bug-Debian: https://bugs.debian.org/888335 - -Downloaded from Debian: -https://sources.debian.org/src/squeezelite/1.8-4.1/debian/patches/ffmpeg4.0.patch/ - -Signed-off-by: Bernd Kuhls ---- - ffmpeg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ffmpeg.c b/ffmpeg.c -index bc9136c..d51b08e 100644 ---- a/ffmpeg.c -+++ b/ffmpeg.c -@@ -264,7 +264,7 @@ static decode_state ff_decode(void) { - ff->mmsh_bytes_left = ff->mmsh_bytes_pad = ff->mmsh_packet_len = 0; - - if (!ff->readbuf) { -- ff->readbuf = AV(ff, malloc, READ_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); -+ ff->readbuf = AV(ff, malloc, READ_SIZE + AV_INPUT_BUFFER_PADDING_SIZE); - } - - avio = AVIO(ff, alloc_context, ff->readbuf, READ_SIZE, 0, NULL, _read_data, NULL, NULL); --- -2.18.0 - diff --git a/buildroot/package/squeezelite/Config.in b/buildroot/package/squeezelite/Config.in index 63b918302..a03475914 100644 --- a/buildroot/package/squeezelite/Config.in +++ b/buildroot/package/squeezelite/Config.in @@ -9,12 +9,11 @@ config BR2_PACKAGE_SQUEEZELITE select BR2_PACKAGE_FLAC select BR2_PACKAGE_LIBMAD select BR2_PACKAGE_LIBVORBIS - select BR2_PACKAGE_FAAD2 select BR2_PACKAGE_MPG123 help Logitech Media Server client - https://code.google.com/p/squeezelite/ + https://github.com/ralph-irving/squeezelite/ if BR2_PACKAGE_SQUEEZELITE @@ -27,6 +26,14 @@ config BR2_PACKAGE_SQUEEZELITE_FFMPEG config BR2_PACKAGE_SQUEEZELITE_DSD bool "Enable DSD decoding" +config BR2_PACKAGE_SQUEEZELITE_LIRC + bool "Enable lirc support" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIRC_TOOLS + +comment "lirc support needs a toolchain with C++" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_SQUEEZELITE_RESAMPLE bool "Enable resampling support" select BR2_PACKAGE_LIBSOXR diff --git a/buildroot/package/squeezelite/squeezelite.hash b/buildroot/package/squeezelite/squeezelite.hash index d56f5da66..0b21d861b 100644 --- a/buildroot/package/squeezelite/squeezelite.hash +++ b/buildroot/package/squeezelite/squeezelite.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0c844e7714d3f15325629c59ee75e6309763116e61a6b73486b502e2e5cce5fd squeezelite-v1.8.tar.gz -sha256 3e4379e1f34b8c5da00e545cfe94369b94a57745902c5d12be43b6332c34c04e LICENSE.txt +sha256 7f0342f4943d3c3498d930060f5a1e8d63ccb7282b9c21f964926e310449d592 squeezelite-71c012ad9ba102feb95823b7b9dc17e5305689c7.tar.gz +sha256 dc01c3da33fea11ed918f9e437b88baa59c70401aab0dad747e33dd9e8035706 LICENSE.txt diff --git a/buildroot/package/squeezelite/squeezelite.mk b/buildroot/package/squeezelite/squeezelite.mk index 3b23b103c..2ed3d8b76 100644 --- a/buildroot/package/squeezelite/squeezelite.mk +++ b/buildroot/package/squeezelite/squeezelite.mk @@ -4,13 +4,19 @@ # ################################################################################ -SQUEEZELITE_VERSION = v1.8 -SQUEEZELITE_SITE = $(call github,robadenshi,squeezelite,$(SQUEEZELITE_VERSION)) +SQUEEZELITE_VERSION = 71c012ad9ba102feb95823b7b9dc17e5305689c7 +SQUEEZELITE_SITE = $(call github,ralph-irving,squeezelite,$(SQUEEZELITE_VERSION)) SQUEEZELITE_LICENSE = GPL-3.0 SQUEEZELITE_LICENSE_FILES = LICENSE.txt -SQUEEZELITE_DEPENDENCIES = alsa-lib flac libmad libvorbis faad2 mpg123 +SQUEEZELITE_DEPENDENCIES = alsa-lib flac libmad libvorbis mpg123 SQUEEZELITE_MAKE_OPTS = -DLINKALL +ifeq ($(BR2_PACKAGE_FAAD2),y) +SQUEEZELITE_DEPENDENCIES += faad2 +else +SQUEEZELITE_MAKE_OPTS += -DNO_FAAD +endif + ifeq ($(BR2_PACKAGE_SQUEEZELITE_FFMPEG),y) SQUEEZELITE_DEPENDENCIES += ffmpeg SQUEEZELITE_MAKE_OPTS += -DFFMPEG @@ -20,6 +26,11 @@ ifeq ($(BR2_PACKAGE_SQUEEZELITE_DSD),y) SQUEEZELITE_MAKE_OPTS += -DDSD endif +ifeq ($(BR2_PACKAGE_SQUEEZELITE_LIRC),y) +SQUEEZELITE_DEPENDENCIES += lirc-tools +SQUEEZELITE_MAKE_OPTS += -DIR +endif + ifeq ($(BR2_PACKAGE_SQUEEZELITE_RESAMPLE),y) SQUEEZELITE_DEPENDENCIES += libsoxr SQUEEZELITE_MAKE_OPTS += -DRESAMPLE @@ -29,6 +40,11 @@ ifeq ($(BR2_PACKAGE_SQUEEZELITE_VISEXPORT),y) SQUEEZELITE_MAKE_OPTS += -DVISEXPORT endif +ifeq ($(BR2_PACKAGE_WIRINGPI),y) +SQUEEZELITE_DEPENDENCIES += wiringpi +SQUEEZELITE_MAKE_OPTS += -DRPI +endif + define SQUEEZELITE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ OPTS="$(SQUEEZELITE_MAKE_OPTS)" -C $(@D) all diff --git a/buildroot/package/squid/0001-acinclude-os-deps.m4-fix-cross-compilation.patch b/buildroot/package/squid/0001-acinclude-os-deps.m4-fix-cross-compilation.patch deleted file mode 100644 index 4c4fd5c8d..000000000 --- a/buildroot/package/squid/0001-acinclude-os-deps.m4-fix-cross-compilation.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5dbaf8eebc5b66230e0131b09651c7e40bf0e9de Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 20 Aug 2019 21:41:16 +0200 -Subject: [PATCH] acinclude/os-deps.m4: fix cross-compilation - -Do not check check file descriptor maximum value through AC_RUN_IFELSE -when cross-compiling as this will raise an error - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/squid-cache/squid/pull/464] ---- - acinclude/os-deps.m4 | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/acinclude/os-deps.m4 b/acinclude/os-deps.m4 -index b50717517..ec10a54c6 100644 ---- a/acinclude/os-deps.m4 -+++ b/acinclude/os-deps.m4 -@@ -169,7 +169,9 @@ AC_MSG_CHECKING(Maximum number of filedescriptors we can open) - SQUID_STATE_SAVE(maxfd) - dnl FreeBSD pthreads break dup2(). - AS_CASE([$host_os],[freebsd],[ LDFLAGS=`echo $LDFLAGS | sed -e "s/-pthread//"` ]) -- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ dnl AC_RUN_IFELSE can't be run when cross-compiling -+ AS_CASE([$cross_compiling],[no],[ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include -@@ -231,7 +233,8 @@ int main(int argc, char **argv) { - fprintf (fp, "%d\n", i & ~0x3F); - return 0; - } -- ]])],[squid_filedescriptors_limit=`cat conftestval`],[],[]) -+ ]])],[squid_filedescriptors_limit=`cat conftestval`],[],[]) -+ ]) - dnl Microsoft MSVCRT.DLL supports 2048 maximum FDs - AS_CASE(["$host_os"],[mingw|mingw32],[squid_filedescriptors_limit="2048"]) - AC_MSG_RESULT($squid_filedescriptors_limit) --- -2.20.1 - diff --git a/buildroot/package/squid/squid.hash b/buildroot/package/squid/squid.hash index ff694da6a..765e67cf3 100644 --- a/buildroot/package/squid/squid.hash +++ b/buildroot/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v4/squid-4.8.tar.xz.asc -md5 08e018f2d8db4911ee90591284fa1ca5 squid-4.8.tar.xz -sha1 4ff1390eee3ec20cefa5565cbb56e1a89a12bfc1 squid-4.8.tar.xz +# From http://www.squid-cache.org/Versions/v4/squid-4.10.tar.xz.asc +md5 af7ac6e70f9bd03ae4fcec0c9b99c38a squid-4.10.tar.xz +sha1 b8b267771550bb8c7f2b2968b305118090e7217a squid-4.10.tar.xz # Locally calculated -sha256 78cdb324d93341d36d09d5f791060f6e8aaa5ff3179f7c949cd910d023a86210 squid-4.8.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 98f0100afd8a42ea5f6b81eb98b0e4b36d7a54beab1c73d2f1705ab49b025f1f squid-4.10.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/squid/squid.mk b/buildroot/package/squid/squid.mk index 0d09968bd..aeaec425e 100644 --- a/buildroot/package/squid/squid.mk +++ b/buildroot/package/squid/squid.mk @@ -4,15 +4,13 @@ # ################################################################################ -SQUID_VERSION = 4.8 +SQUID_VERSION = 4.10 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v4 SQUID_LICENSE = GPL-2.0+ SQUID_LICENSE_FILES = COPYING SQUID_DEPENDENCIES = libcap host-libcap libxml2 host-pkgconf \ $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) -# We're patching acinclude/os-deps.m4 -SQUID_AUTORECONF = YES SQUID_CONF_ENV = \ ac_cv_epoll_works=yes \ ac_cv_func_setresuid=yes \ @@ -85,9 +83,6 @@ endef define SQUID_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/tools/systemd/squid.service \ $(TARGET_DIR)/usr/lib/systemd/system/squid.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../..//usr/lib/systemd/system/squid.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/squid.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/sredird/sredird.hash b/buildroot/package/sredird/sredird.hash index 63a419fc8..1181627a4 100644 --- a/buildroot/package/sredird/sredird.hash +++ b/buildroot/package/sredird/sredird.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 640c47dcd84b3b90640165a38eb336a675fdab06c14c09cae2f4a604cae560d3 sredird-2.2.2.tar.gz +sha256 640c47dcd84b3b90640165a38eb336a675fdab06c14c09cae2f4a604cae560d3 sredird-2.2.2.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/sshfs/sshfs.hash b/buildroot/package/sshfs/sshfs.hash index 09ae5d1cf..a8878e693 100644 --- a/buildroot/package/sshfs/sshfs.hash +++ b/buildroot/package/sshfs/sshfs.hash @@ -1,2 +1,3 @@ # Locally calculated after checking pgp signature -sha256 7f689174d02e6b7e2631306fda4fb8e6b4483102d1bce82b3cdafba33369ad22 sshfs-2.8.tar.gz +sha256 7f689174d02e6b7e2631306fda4fb8e6b4483102d1bce82b3cdafba33369ad22 sshfs-2.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/sshguard/Config.in b/buildroot/package/sshguard/Config.in new file mode 100644 index 000000000..7454c0a93 --- /dev/null +++ b/buildroot/package/sshguard/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_SSHGUARD + bool "sshguard" + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_IPTABLES # runtime + help + sshguard protects hosts from brute-force attacks against SSH + and other services. It aggregates system logs and blocks + repeat offenders using one of several firewall backends, + including iptables, ipfw, and pf. + + https://www.sshguard.net + +comment "sshguard needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/sshguard/S49sshguard b/buildroot/package/sshguard/S49sshguard new file mode 100644 index 000000000..94776415a --- /dev/null +++ b/buildroot/package/sshguard/S49sshguard @@ -0,0 +1,49 @@ +#!/bin/sh + +DAEMON="sshguard" +PIDFILE="/var/run/$DAEMON.pid" + +start() { + printf 'Starting %s: ' "$DAEMON" + iptables -L sshguard > /dev/null 2>&1 || \ + (iptables -N sshguard && iptables -A INPUT -j sshguard) + start-stop-daemon -S -q -b -p /run/sshguard.pid \ + -x /usr/sbin/sshguard -- -i /run/sshguard.pid + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/sshguard/sshguard.hash b/buildroot/package/sshguard/sshguard.hash new file mode 100644 index 000000000..beb77a4d6 --- /dev/null +++ b/buildroot/package/sshguard/sshguard.hash @@ -0,0 +1,4 @@ +# sha256 from https://sourceforge.net/projects/sshguard/files/sshguard/2.4.0/sshguard-2.4.0.sha256 +sha256 065ca4091b3a96802714b560dbbc3d9f0e67574e99e2b6e8857aa1027d17d6c0 sshguard-2.4.0.tar.gz +# Locally calculated +sha256 c3ae64f12153a1bc55bc234d09f40a08ab0e0149fffc972c0b7f02d5a12c1a5c COPYING diff --git a/buildroot/package/sshguard/sshguard.mk b/buildroot/package/sshguard/sshguard.mk new file mode 100644 index 000000000..ceff52069 --- /dev/null +++ b/buildroot/package/sshguard/sshguard.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# sshguard +# +################################################################################ + +SSHGUARD_VERSION = 2.4.0 +SSHGUARD_SITE = https://sourceforge.net/projects/sshguard/files/sshguard/$(SSHGUARD_VERSION) +SSHGUARD_LICENSE = ISC, Public Domain (fnv hash), BSD-3-Clause (SimCList) +SSHGUARD_LICENSE_FILES = COPYING + +define SSHGUARD_INSTALL_CONFIG + $(INSTALL) -D -m 0644 $(@D)/examples/sshguard.conf.sample \ + $(TARGET_DIR)/etc/sshguard.conf + $(SED) '/^#BACKEND/c\BACKEND="/usr/libexec/sshg-fw-iptables"' \ + -e '/^#FILES/c\FILES="/var/log/messages"' $(TARGET_DIR)/etc/sshguard.conf +endef +SSHGUARD_POST_INSTALL_TARGET_HOOKS += SSHGUARD_INSTALL_CONFIG + +define SSHGUARD_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/sshguard/S49sshguard \ + $(TARGET_DIR)/etc/init.d/S49sshguard +endef + +define SSHGUARD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/examples/sshguard.service \ + $(TARGET_DIR)/usr/lib/systemd/system/sshguard.service +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/sshpass/sshpass.hash b/buildroot/package/sshpass/sshpass.hash index f6e0611c2..9635a9180 100644 --- a/buildroot/package/sshpass/sshpass.hash +++ b/buildroot/package/sshpass/sshpass.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 c6324fcee608b99a58f9870157dfa754837f8c48be3df0f5e2f3accf145dee60 sshpass-1.06.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/sslh/sslh.hash b/buildroot/package/sslh/sslh.hash index 757005dd3..c25b37b8a 100644 --- a/buildroot/package/sslh/sslh.hash +++ b/buildroot/package/sslh/sslh.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1601a5b377dcafc6b47d2fbb8d4d25cceb83053a4adcc5874d501a2d5a7745ad sslh-v1.18.tar.gz +sha256 a7f49b0a1cfcb7bb9d97f5ffa932bff11c5f65d9a9bd8fe1812481dee5855116 sslh-v1.20.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/sslh/sslh.mk b/buildroot/package/sslh/sslh.mk index 3a9223b23..ba91f8c4d 100644 --- a/buildroot/package/sslh/sslh.mk +++ b/buildroot/package/sslh/sslh.mk @@ -4,19 +4,44 @@ # ################################################################################ -SSLH_VERSION = v1.18 +SSLH_VERSION = 1.20 +SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz SSLH_SITE = http://www.rutschle.net/tech/sslh SSLH_LICENSE = GPL-2.0+ SSLH_LICENSE_FILES = COPYING SSLH_DEPENDENCIES = libconfig +SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +SSLH_DEPENDENCIES += libcap +SSLH_MAKE_OPTS += USELIBCAP=1 +else +SSLH_MAKE_OPTS += USELIBCAP= +endif + +ifeq ($(BR2_PACKAGE_PCRE),y) +SSLH_DEPENDENCIES += pcre +SSLH_MAKE_OPTS += USELIBPCRE=1 +else +SSLH_MAKE_OPTS += USELIBPCRE= +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +SSLH_DEPENDENCIES += systemd +SSLH_MAKE_OPTS += USESYSTEMD=1 +else +SSLH_MAKE_OPTS += USESYSTEMD= +endif + define SSLH_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(SSLH_MAKE_OPTS) -C $(@D) endef define SSLH_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) $(SSLH_MAKE_OPTS) -C $(@D) \ + DESTDIR=$(TARGET_DIR) install endef define SSLH_INSTALL_INIT_SYSV diff --git a/buildroot/package/start-stop-daemon/start-stop-daemon.hash b/buildroot/package/start-stop-daemon/start-stop-daemon.hash index 7ce6cc366..e5d1d9112 100644 --- a/buildroot/package/start-stop-daemon/start-stop-daemon.hash +++ b/buildroot/package/start-stop-daemon/start-stop-daemon.hash @@ -1,2 +1,4 @@ # From http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_1.18.10.dsc -sha256 025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5 dpkg_1.18.10.tar.xz +sha256 025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5 dpkg_1.18.10.tar.xz +# Locally computed +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/startup-notification/startup-notification.hash b/buildroot/package/startup-notification/startup-notification.hash index cadbf9843..474c8bd92 100644 --- a/buildroot/package/startup-notification/startup-notification.hash +++ b/buildroot/package/startup-notification/startup-notification.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c2fa09f9a49d8b319e79638e49e967c682df8726006e03059b1ffca5ab82099c startup-notification-0.9.tar.gz +sha256 c2fa09f9a49d8b319e79638e49e967c682df8726006e03059b1ffca5ab82099c startup-notification-0.9.tar.gz +sha256 29935974beae046f50da806b5f4e54532401dd7bcfbc696a0b645f4cbcce9dbb COPYING diff --git a/buildroot/package/statserial/statserial.hash b/buildroot/package/statserial/statserial.hash index 3cdb17d6c..ca96b864d 100644 --- a/buildroot/package/statserial/statserial.hash +++ b/buildroot/package/statserial/statserial.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 40cf3bd506852942aa98f468c90ed4ea66dbd343b93efacd40d617b55caf3967 statserial-1.1.tar.gz +sha256 40cf3bd506852942aa98f468c90ed4ea66dbd343b93efacd40d617b55caf3967 statserial-1.1.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch b/buildroot/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch deleted file mode 100644 index ffbc83187..000000000 --- a/buildroot/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 36d5c8bc3592b4dffbec222a179c3956787a0694 Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Sat, 9 Sep 2017 15:04:58 -0300 -Subject: [PATCH] Fix error when building with uClibc-ng -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The uClibc-ng C library defines a type called R0 that conflits with a -global variable called R0 from PaddleReader.cxx. - -src/emucore/tia/PaddleReader.cxx:25:3: error: ‘constexpr const double R0’ redeclared as different kind of symbol - R0 = 1.5e3, - ^ -/home/sprado/workspace/build/buildroot/build/stella_uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:42:3: note: previous declaration ‘ R0’ - R0 = 0, - ^~ - -So let's redefine R0 as a private member of the PaddleReader class. - -Signed-off-by: Sergio Prado ---- - src/emucore/tia/PaddleReader.cxx | 1 - - src/emucore/tia/PaddleReader.hxx | 2 ++ - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/emucore/tia/PaddleReader.cxx b/src/emucore/tia/PaddleReader.cxx -index 69c828ea6c5c..27ff828200ee 100644 ---- a/src/emucore/tia/PaddleReader.cxx -+++ b/src/emucore/tia/PaddleReader.cxx -@@ -22,7 +22,6 @@ - static constexpr double - C = 68e-9, - RPOT = 1e6, -- R0 = 1.5e3, - USUPP = 5; - - static constexpr double TRIPPOINT_LINES = 379; -diff --git a/src/emucore/tia/PaddleReader.hxx b/src/emucore/tia/PaddleReader.hxx -index 00238a4fe5b5..0032e6efd015 100644 ---- a/src/emucore/tia/PaddleReader.hxx -+++ b/src/emucore/tia/PaddleReader.hxx -@@ -65,6 +65,8 @@ class PaddleReader : public Serializable - - bool myIsDumped; - -+ static constexpr double R0 = 1.5e3; -+ - private: - PaddleReader(const PaddleReader&) = delete; - PaddleReader(PaddleReader&&) = delete; --- -1.9.1 - diff --git a/buildroot/package/stella/0003-undef-PAGE_SIZE.patch b/buildroot/package/stella/0003-undef-PAGE_SIZE.patch new file mode 100644 index 000000000..f5c60fa3b --- /dev/null +++ b/buildroot/package/stella/0003-undef-PAGE_SIZE.patch @@ -0,0 +1,53 @@ +From d14065257b24a9e4a722d1fa1125f26f6599006d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 9 Mar 2019 20:47:27 +0100 +Subject: [PATCH] undef PAGE_SIZE + +PAGE_SIZE is sometimes already defined by the toolchain so undef it: + +/home/naourr/work/instance-3/output/host/bin/x86_64-linux-g++ -MMD -MF "src/debugger/.deps/CpuDebug.d" -MQ "src/debugger/CpuDebug.o" -MP -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -x c++ -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++14 -fomit-frame-pointer -D_GLIBCXX_USE_CXX11_ABI=1 -DUNIX -DBSPF_UNIX -DWINDOWED_SUPPORT -DSOUND_SUPPORT -DDEBUGGER_SUPPORT -DJOYSTICK_SUPPORT -DCHEATCODE_SUPPORT -Isrc/emucore -Isrc/common -Isrc/common/tv_filters -Isrc/gui -Isrc/emucore/tia -Isrc/emucore/tia/frame-manager -I/home/naourr/work/instance-3/output/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/include/SDL2 -D_REENTRANT -Isrc/unix -Isrc/debugger -Isrc/debugger/gui -Isrc/yacc -Isrc/cheat -c src/debugger/CpuDebug.cxx -o src/debugger/CpuDebug.o +In file included from /home/naourr/work/instance-3/output/host/x86_64-buildroot-linux-musl/sysroot/usr/include/limits.h:8:0, + from /home/naourr/work/instance-3/output/host/opt/ext-toolchain/x86_64-buildroot-linux-musl/include/c++/7.4.0/climits:42, + from src/common/bspf.hxx:28, + from src/debugger/CartDebug.cxx:18: +src/emucore/System.hxx:64:29: error: expected unqualified-id before numeric constant + static constexpr uInt16 PAGE_SIZE = (1 << PAGE_SHIFT); + +Fixes: + - http://autobuild.buildroot.org/results/22a9b009749af2a0862750a1fb2b2dc7167cd589 + +Signed-off-by: Fabrice Fontaine +--- + src/emucore/MT24LC256.hxx | 2 ++ + src/emucore/System.hxx | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/emucore/MT24LC256.hxx b/src/emucore/MT24LC256.hxx +index fc5d6a49..bb7468b4 100644 +--- a/src/emucore/MT24LC256.hxx ++++ b/src/emucore/MT24LC256.hxx +@@ -23,6 +23,8 @@ class System; + #include "Control.hxx" + #include "bspf.hxx" + ++#undef PAGE_SIZE ++ + /** + Emulates a Microchip Technology Inc. 24LC256, a 32KB Serial Electrically + Erasable PROM accessed using the I2C protocol. Thanks to J. Payson +diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx +index e31202df..85a54f28 100644 +--- a/src/emucore/System.hxx ++++ b/src/emucore/System.hxx +@@ -30,6 +30,8 @@ class NullDevice; + #include "Random.hxx" + #include "Serializable.hxx" + ++#undef PAGE_SIZE ++ + /** + This class represents a system consisting of a 6502 microprocessor + and a set of devices. The devices are mapped into an addressing +-- +2.20.1 + diff --git a/buildroot/package/stella/Config.in b/buildroot/package/stella/Config.in index 639b9e4ae..709da9815 100644 --- a/buildroot/package/stella/Config.in +++ b/buildroot/package/stella/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_STELLA depends on !BR2_STATIC_LIBS # sdl2 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr select BR2_PACKAGE_SDL2 select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_ZLIB @@ -12,7 +13,10 @@ config BR2_PACKAGE_STELLA https://stella-emu.github.io/ -comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 4.9" +comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 5" depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + +comment "stella needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/stella/stella.hash b/buildroot/package/stella/stella.hash index ef17ff75a..395ee18d3 100644 --- a/buildroot/package/stella/stella.hash +++ b/buildroot/package/stella/stella.hash @@ -1,2 +1,4 @@ # Locally computed: -sha256 74ee708b68340b65519a04a22c61921cdcf69a1d308600c212414b28e9e689ac stella-5.0.2-src.tar.xz +sha256 bcbd82294f97d00457fdb727e9b08ff73b685dc7f77704cea1eceb58d8967387 stella-6.0.2-src.tar.xz +sha256 062e708b8b88ea911b5c08000f1c4a5588235aa0c303bc893b5d92fb45cafd04 Copyright.txt +sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/buildroot/package/stella/stella.mk b/buildroot/package/stella/stella.mk index 158a51109..1295b7527 100644 --- a/buildroot/package/stella/stella.mk +++ b/buildroot/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 5.0.2 +STELLA_VERSION = 6.0.2 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+ diff --git a/buildroot/package/stellarium/Config.in b/buildroot/package/stellarium/Config.in new file mode 100644 index 000000000..5922162d4 --- /dev/null +++ b/buildroot/package/stellarium/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_STELLARIUM + bool "stellarium" + depends on BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_HAS_LIBGL # does not support OpenGL ES + select BR2_PACKAGE_QT5BASE_CONCURRENT + select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_NETWORK + select BR2_PACKAGE_QT5BASE_OPENGL + select BR2_PACKAGE_QT5BASE_PRINTSUPPORT + select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5LOCATION + select BR2_PACKAGE_QT5MULTIMEDIA + select BR2_PACKAGE_ZLIB + help + Stellarium is a free open source planetarium for your + computer. It shows a realistic sky in 3D, just like what + you see with the naked eye, binoculars or a telescope. + + https://stellarium.org + +comment "stellarium needs Qt5 and an OpenGL provider" + depends on !BR2_PACKAGE_QT5 || !BR2_PACKAGE_HAS_LIBGL diff --git a/buildroot/package/stellarium/stellarium.hash b/buildroot/package/stellarium/stellarium.hash new file mode 100644 index 000000000..ea1256df1 --- /dev/null +++ b/buildroot/package/stellarium/stellarium.hash @@ -0,0 +1,6 @@ +# From https://github.com/Stellarium/stellarium/releases +md5 2de84da8a2256f3239174e3ad8f83a5b stellarium-0.19.3.tar.gz +sha1 a82cfa21c8dcfbd0a0cf4e30c4ea017ceb2f87a5 stellarium-0.19.3.tar.gz +# Locally computed +sha256 176e15d8d18340cf8c8cfed14f364cbda345d94e77cc97589c163c45d9cb225d stellarium-0.19.3.tar.gz +sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/buildroot/package/stellarium/stellarium.mk b/buildroot/package/stellarium/stellarium.mk new file mode 100644 index 000000000..ff1eb2701 --- /dev/null +++ b/buildroot/package/stellarium/stellarium.mk @@ -0,0 +1,42 @@ +################################################################################ +# +# stellarium +# +################################################################################ + +STELLARIUM_VERSION = 0.19.3 +STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) +STELLARIUM_LICENSE = GPL-2.0+ +STELLARIUM_LICENSE_FILES = COPYING +STELLARIUM_DEPENDENCIES = \ + qt5base \ + qt5location \ + qt5multimedia \ + zlib +STELLARIUM_CONF_OPTS = \ + -DENABLE_MEDIA=ON \ + -DENABLE_NLS=OFF \ + -DUSE_SYSTEM_ZLIB=ON + +ifeq ($(BR2_PACKAGE_QT5SCRIPT),y) +STELLARIUM_DEPENDENCIES += qt5script +STELLARIUM_CONF_OPTS += -DENABLE_SCRIPTING=ON +else +STELLARIUM_CONF_OPTS += -DENABLE_SCRIPTING=OFF +endif + +ifeq ($(BR2_PACKAGE_QT5SERIALPORT),y) +STELLARIUM_DEPENDENCIES += qt5serialport +ifeq ($(BR2_PACKAGE_GPSD),y) +STELLARIUM_DEPENDENCIES += gpsd +endif +STELLARIUM_CONF_OPTS += \ + -DENABLE_GPS=ON \ + -DUSE_PLUGIN_TELESCOPECONTROL=ON +else +STELLARIUM_CONF_OPTS += \ + -DENABLE_GPS=OFF \ + -DUSE_PLUGIN_TELESCOPECONTROL=OFF +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/stm32flash/stm32flash.hash b/buildroot/package/stm32flash/stm32flash.hash new file mode 100644 index 000000000..3adcb96d3 --- /dev/null +++ b/buildroot/package/stm32flash/stm32flash.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 58788826b80f16f2084632299340f9a3155b326936210e5f7a58f9dbd1b18bdd stm32flash-3cebf121f7b32b9edfcb0d49f0fb43ccf33e5650.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt diff --git a/buildroot/package/stm32flash/stm32flash.mk b/buildroot/package/stm32flash/stm32flash.mk index c41fc76d0..a8ae9b01d 100644 --- a/buildroot/package/stm32flash/stm32flash.mk +++ b/buildroot/package/stm32flash/stm32flash.mk @@ -4,7 +4,7 @@ # ################################################################################ -STM32FLASH_VERSION = 4ac0566f188f39eace0223d966d349cd2f2c5895 +STM32FLASH_VERSION = 3cebf121f7b32b9edfcb0d49f0fb43ccf33e5650 STM32FLASH_SITE = git://git.code.sf.net/p/stm32flash/code STM32FLASH_LICENSE = GPL-2.0+ STM32FLASH_LICENSE_FILES = gpl-2.0.txt diff --git a/buildroot/package/strace/0001-Fix-build-for-no-MMU-targets.patch b/buildroot/package/strace/0001-Fix-build-for-no-MMU-targets.patch deleted file mode 100644 index 1464fb697..000000000 --- a/buildroot/package/strace/0001-Fix-build-for-no-MMU-targets.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1b657bf8e2f4bf6f80b969b220900003d7ecbce6 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 8 Jan 2019 18:28:37 +0200 -Subject: [PATCH] Fix build for no-MMU targets - -Commit 7488ce9e23f1 ("Check whether PTRACE_GET_SYSCALL_INFO is supported -by the kernel") added a fork() call in test_ptrace_get_syscall_info() -which is included in the main strace executable code. Although the -test_ptrace_get_syscall_info() routine is not called on no-MMU targets, -the compiler can't optimize it out because it is a global symbol. So -build for no-MMU targets currently fails: - -strace-ptrace_syscall_info.o: In function `test_ptrace_get_syscall_info': -ptrace_syscall_info.c:(.text+0x1c): undefined reference to `fork' - -Make the test_ptrace_get_syscall_info() definition depend on HAVE_FORK -to fix that. - -Signed-off-by: Baruch Siach ---- -Upstream status: -https://lists.strace.io/pipermail/strace-devel/2019-January/008596.html - - ptrace_syscall_info.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ptrace_syscall_info.c b/ptrace_syscall_info.c -index 55eafddf7f71..cc6ce149649e 100644 ---- a/ptrace_syscall_info.c -+++ b/ptrace_syscall_info.c -@@ -40,6 +40,7 @@ static const unsigned int expected_seccomp_size = - * Test that PTRACE_GET_SYSCALL_INFO API is supported by the kernel, and - * that the semantics implemented in the kernel matches our expectations. - */ -+#ifdef HAVE_FORK - bool - test_ptrace_get_syscall_info(void) - { -@@ -255,6 +256,7 @@ done: - - return ptrace_get_syscall_info_supported; - } -+#endif /* HAVE_FORK */ - - void - print_ptrace_syscall_info(struct tcb *tcp, kernel_ulong_t addr, --- -2.20.1 - diff --git a/buildroot/package/strace/0001-filter_seccomp-fix-no-MMU-build.patch b/buildroot/package/strace/0001-filter_seccomp-fix-no-MMU-build.patch new file mode 100644 index 000000000..27f6d1490 --- /dev/null +++ b/buildroot/package/strace/0001-filter_seccomp-fix-no-MMU-build.patch @@ -0,0 +1,46 @@ +From fb4fdb83be36ff5e71426d2bdea81d035cdbd0b8 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Mon, 13 Jan 2020 14:54:15 +0200 +Subject: [PATCH] filter_seccomp: fix no-MMU build + +Move the declaration of filter_generators out of HAVE_FORK ifdef to fix +build for no-MMU targets: + +filter_seccomp.c: In function ‘check_seccomp_filter_properties’: +filter_seccomp.c:608:42: error: ‘filter_generators’ undeclared (first use in this function); did you mean ‘linear_filter_generator’? + for (unsigned int i = 0; i < ARRAY_SIZE(filter_generators); ++i) { + ^~~~~~~~~~~~~~~~~ + +Signed-off-by: Baruch Siach +--- +Upstream status: https://lists.strace.io/pipermail/strace-devel/2020-January/thread.html + + + filter_seccomp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/filter_seccomp.c b/filter_seccomp.c +index 91f6bc42bce3..da1abc713dfc 100644 +--- a/filter_seccomp.c ++++ b/filter_seccomp.c +@@ -68,8 +68,6 @@ static const struct audit_arch_t audit_arch_vec[SUPPORTED_PERSONALITIES] = { + # endif + }; + +-# ifdef HAVE_FORK +- + typedef unsigned short (*filter_generator_t)(struct sock_filter *, + bool *overflow); + static unsigned short linear_filter_generator(struct sock_filter *, +@@ -92,6 +90,8 @@ static struct sock_fprog bpf_prog = { + .filter = NULL, + }; + ++# ifdef HAVE_FORK ++ + static void ATTRIBUTE_NORETURN + check_seccomp_order_do_child(void) + { +-- +2.24.1 + diff --git a/buildroot/package/strace/0002-Fix-build-for-mips-targets.patch b/buildroot/package/strace/0002-Fix-build-for-mips-targets.patch deleted file mode 100644 index 430d4071b..000000000 --- a/buildroot/package/strace/0002-Fix-build-for-mips-targets.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8150854b5dd030a47f601931daf827ca33bc9bd9 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 8 Jan 2019 19:52:21 +0200 -Subject: [PATCH] Fix build for mips targets - -Commit 917c2ccf3a67 ("Refactor stack pointers") removed -linux/mips/arch_regs.h that defines mips_REG_* macros and struct -mips_regs. These symbols are referenced in mips code. Restore -arch_regs.h to fix the build failure: - -syscall.c: In function 'decode_syscall_subcall': -syscall.c:370:7: error: 'mips_REG_SP' undeclared (first use in this function) - mips_REG_SP + MAX_ARGS * sizeof(tcp->u_arg[0]), - ^~~~~~~~~~~ - -[ baruch: drop the Makefile.in hunk to avoid autoreconf ] -Signed-off-by: Baruch Siach ---- -Upstream status: -https://lists.strace.io/pipermail/strace-devel/2019-January/008598.html - - linux/mips/arch_regs.c | 4 +--- - linux/mips/arch_regs.h | 18 ++++++++++++++++++ - 3 files changed, 20 insertions(+), 3 deletions(-) - create mode 100644 linux/mips/arch_regs.h - -diff --git a/linux/mips/arch_regs.c b/linux/mips/arch_regs.c -index 0874e31efea4..3ed841ee7c1a 100644 ---- a/linux/mips/arch_regs.c -+++ b/linux/mips/arch_regs.c -@@ -5,9 +5,7 @@ - * SPDX-License-Identifier: LGPL-2.1-or-later - */ - --static struct { -- uint64_t uregs[38]; --} mips_regs; -+struct mips_regs mips_regs; /* not static */ - - #define REG_V0 2 - #define REG_A0 4 -diff --git a/linux/mips/arch_regs.h b/linux/mips/arch_regs.h -new file mode 100644 -index 000000000000..6372badce646 ---- /dev/null -+++ b/linux/mips/arch_regs.h -@@ -0,0 +1,18 @@ -+struct mips_regs { -+ uint64_t uregs[38]; -+}; -+ -+extern struct mips_regs mips_regs; -+ -+#define REG_V0 2 -+#define REG_A0 4 -+ -+#define mips_REG_V0 mips_regs.uregs[REG_V0] -+#define mips_REG_A0 mips_regs.uregs[REG_A0 + 0] -+#define mips_REG_A1 mips_regs.uregs[REG_A0 + 1] -+#define mips_REG_A2 mips_regs.uregs[REG_A0 + 2] -+#define mips_REG_A3 mips_regs.uregs[REG_A0 + 3] -+#define mips_REG_A4 mips_regs.uregs[REG_A0 + 4] -+#define mips_REG_A5 mips_regs.uregs[REG_A0 + 5] -+#define mips_REG_SP mips_regs.uregs[29] -+#define mips_REG_EPC mips_regs.uregs[34] --- -2.20.1 - diff --git a/buildroot/package/strace/Config.in b/buildroot/package/strace/Config.in index c7649e578..5b33dad39 100644 --- a/buildroot/package/strace/Config.in +++ b/buildroot/package/strace/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_STRACE bool "strace" # needs at least kernel headers 4.0 on nios2 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 || !BR2_nios2 + depends on !BR2_nds32 && !BR2_RISCV_32 help A useful diagnostic, instructional, and debugging tool. Allows you to track what system calls a program makes diff --git a/buildroot/package/strace/strace.hash b/buildroot/package/strace/strace.hash index fe58f2391..dfc2143d6 100644 --- a/buildroot/package/strace/strace.hash +++ b/buildroot/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/4.26/strace-4.26.tar.xz -sha256 7c4d2ffeef4f7d1cdc71062ca78d1130eb52f947c2fca82f59f6a1183bfa1e1c strace-4.26.tar.xz -sha256 ba6d645dfe0f5e13bf1f117f0595e90076b845fc9aaa1d5778699792bb2d70b2 COPYING +# https://strace.io/files/5.4/strace-5.4.tar.xz.asc +sha256 f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741 strace-5.4.tar.xz +sha256 739b2725197137a04ab48ee6b19da3fdf7e497249e0dedd9f51c11a570401ede COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/buildroot/package/strace/strace.mk b/buildroot/package/strace/strace.mk index afcd5e71f..5ad249b13 100644 --- a/buildroot/package/strace/strace.mk +++ b/buildroot/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 4.26 +STRACE_VERSION = 5.4 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch b/buildroot/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch deleted file mode 100644 index 3d656f315..000000000 --- a/buildroot/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 818ed67f67c487d519bb55ed5656cff2dd58375e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 4 Dec 2018 21:41:12 +0100 -Subject: [PATCH] stress-ng.h: fix include on semaphore.h - -semaphore.h is available only if HAVE_LIB_PTHREAD and -HAVE_SEM_POSIX are defined - -Fixes: - - http://autobuild.buildroot.org/results/1c95898b2833683a22bbe2ff8471fa08d94210e1 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/ColinIanKing/stress-ng/commit/9b861e679f9de32e4c68437453756f93e13c01fb] ---- - stress-ng.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/stress-ng.h b/stress-ng.h -index 0485dc1c..1bf2e207 100644 ---- a/stress-ng.h -+++ b/stress-ng.h -@@ -53,7 +53,9 @@ - #include - #include - #include -+#if defined(HAVE_LIB_PTHREAD) && (HAVE_SEM_POSIX) - #include -+#endif - #include - - #if defined(__GNUC__) && defined(__linux__) --- -2.14.1 - diff --git a/buildroot/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch b/buildroot/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch deleted file mode 100644 index 8c1bf6025..000000000 --- a/buildroot/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 748ac7e88833472211ccce82563beb5050528e00 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 4 Dec 2018 21:52:49 +0100 -Subject: [PATCH] stress-stackmmap: needs swapcontext - -Fixes: - - http://autobuild.buildroot.org/results/f2d3b06afa6e31527a71c03671c8f08eb3f46c36 - -Signed-off-by: Fabrice Fontaine ---- - stress-stackmmap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/stress-stackmmap.c b/stress-stackmmap.c -index c2f4c31d..eb31d084 100644 ---- a/stress-stackmmap.c -+++ b/stress-stackmmap.c -@@ -24,7 +24,7 @@ - */ - #include "stress-ng.h" - --#if defined(__linux__) -+#if defined(HAVE_SWAPCONTEXT) - - #include - --- -2.14.1 - diff --git a/buildroot/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch b/buildroot/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch deleted file mode 100644 index 931aaff2b..000000000 --- a/buildroot/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 291070801245da26e4841c321910b55016ca23c0 Mon Sep 17 00:00:00 2001 -From: Vadim Kochan -Date: Tue, 1 Jan 2019 17:24:54 +0200 -Subject: [PATCH] test/test-bsd-wchar: Explicitly include stdio.h - -libbsd's wchar requires FILE for some it's functions, for some -reason it is not included by wchar automatically and the test fails. So -include it explicitly. - -Signed-off-by: Vadim Kochan ---- - test/test-bsd-wchar.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/test/test-bsd-wchar.c b/test/test-bsd-wchar.c -index 4f7c7ca..6125968 100644 ---- a/test/test-bsd-wchar.c -+++ b/test/test-bsd-wchar.c -@@ -22,6 +22,7 @@ - * functionality. - * - */ -+#include - #include - - int main(void) --- -2.14.1 - diff --git a/buildroot/package/stress-ng/Config.in b/buildroot/package/stress-ng/Config.in index fe92a7eb4..4fcfa3554 100644 --- a/buildroot/package/stress-ng/Config.in +++ b/buildroot/package/stress-ng/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_STRESS_NG depends on !BR2_TOOLCHAIN_USES_MUSL # perf.c needs PERF_COUNT_HW_REF_CPU_CYCLES depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 - depends on !BR2_microblaze # keyutils # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 and ARC depends on !BR2_nios2 depends on !BR2_arc @@ -21,7 +20,7 @@ config BR2_PACKAGE_STRESS_NG http://kernel.ubuntu.com/~cking/stress-ng/ comment "stress-ng needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.3" - depends on !BR2_microblaze && !BR2_nios2 && !BR2_arc + depends on !BR2_nios2 && !BR2_arc depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 \ || BR2_TOOLCHAIN_USES_MUSL diff --git a/buildroot/package/stress-ng/stress-ng.hash b/buildroot/package/stress-ng/stress-ng.hash index c7c6ec0fe..a2b9b9ef9 100644 --- a/buildroot/package/stress-ng/stress-ng.hash +++ b/buildroot/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ed888f5192297855f3ce39b4591b1decc9c580c9753f2cc9c86449f50d23aeb0 stress-ng-0.09.47.tar.xz +sha256 85ae86587f605225cc736e1ddba6cc5fd129dfbba0f7d94df755e2e6ac5230e6 stress-ng-0.10.07.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/stress-ng/stress-ng.mk b/buildroot/package/stress-ng/stress-ng.mk index 42b27e3cd..55e3d297b 100644 --- a/buildroot/package/stress-ng/stress-ng.mk +++ b/buildroot/package/stress-ng/stress-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRESS_NG_VERSION = 0.09.47 +STRESS_NG_VERSION = 0.10.07 STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng STRESS_NG_LICENSE = GPL-2.0+ diff --git a/buildroot/package/stress/stress.hash b/buildroot/package/stress/stress.hash index 24cf0431b..8d14d053f 100644 --- a/buildroot/package/stress/stress.hash +++ b/buildroot/package/stress/stress.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b stress-1.0.4.tar.gz +sha256 057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b stress-1.0.4.tar.gz +# Locally computed +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/stunnel/stunnel.hash b/buildroot/package/stunnel/stunnel.hash index 999a4500e..b741b0e81 100644 --- a/buildroot/package/stunnel/stunnel.hash +++ b/buildroot/package/stunnel/stunnel.hash @@ -1,5 +1,5 @@ -# From https://www.stunnel.org/downloads/stunnel-5.53.tar.gz.sha256 -sha256 80439896ee14269eb70bc8bc669433c7d619018a62c9f9c5c760a24515302585 stunnel-5.53.tar.gz +# From https://www.stunnel.org/downloads/stunnel-5.56.tar.gz.sha256 +sha256 7384bfb356b9a89ddfee70b5ca494d187605bb516b4fff597e167f97e2236b22 stunnel-5.56.tar.gz # Locally calculated -sha256 81d0b7244f44ef81dd0b299cf681037c5a42d468b8533e53aff6d1ac84c97dc8 COPYING -sha256 1ee2b290e92c211b08df10e9fcaf32596cdb22b8eae731b18c2c074a4a83eebe COPYRIGHT.GPL +sha256 f46e2613769e23e23348b6eb667dc85309da2252c8cc2016db92ad93d743aea4 COPYING.md +sha256 62f171d4d8b6726df61f18a6bbc0a70f79c4bc2134d837d35c81fc6289a2d84d COPYRIGHT.md diff --git a/buildroot/package/stunnel/stunnel.mk b/buildroot/package/stunnel/stunnel.mk index adfa0748a..f8265c4cf 100644 --- a/buildroot/package/stunnel/stunnel.mk +++ b/buildroot/package/stunnel/stunnel.mk @@ -5,7 +5,7 @@ ################################################################################ STUNNEL_VERSION_MAJOR = 5 -STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).53 +STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).56 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x STUNNEL_DEPENDENCIES = host-pkgconf openssl STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \ @@ -14,7 +14,7 @@ STUNNEL_CONF_ENV = \ ax_cv_check_cflags___fstack_protector=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) \ LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` STUNNEL_LICENSE = GPL-2.0+ -STUNNEL_LICENSE_FILES = COPYING COPYRIGHT.GPL +STUNNEL_LICENSE_FILES = COPYING.md COPYRIGHT.md ifeq ($(BR2_INIT_SYSTEMD),y) STUNNEL_DEPENDENCIES += systemd diff --git a/buildroot/package/subversion/0002-disable-macos-specific-features.patch b/buildroot/package/subversion/0002-disable-macos-specific-features.patch deleted file mode 100644 index b960ca293..000000000 --- a/buildroot/package/subversion/0002-disable-macos-specific-features.patch +++ /dev/null @@ -1,23 +0,0 @@ -Disable Mac OS specific features - -We only support Linux so we don't need them. Also, they cause a build -failure when cross compiling: - -checking for Mach-O dynamic module iteration functions -error: cannot run test program while cross compiling - -Signed-off-by: Vicente Olivert Riera - -diff -Nrup a/configure.ac b/configure.ac ---- a/configure.ac 2015-09-28 10:33:39.175048493 +0100 -+++ b/configure.ac 2015-09-28 10:47:53.921428143 +0100 -@@ -467,9 +467,6 @@ fi - - dnl Mac OS specific features ------------------- - --SVN_LIB_MACHO_ITERATE --SVN_LIB_MACOS_PLIST --SVN_LIB_MACOS_KEYCHAIN - - dnl APR_HAS_DSO ------------------- - diff --git a/buildroot/package/subversion/0002-workaround-ac-run-ifelse.patch b/buildroot/package/subversion/0002-workaround-ac-run-ifelse.patch new file mode 100644 index 000000000..4f229dc49 --- /dev/null +++ b/buildroot/package/subversion/0002-workaround-ac-run-ifelse.patch @@ -0,0 +1,23 @@ +build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE + +The SVN_LIB_MACHO_ITERATE macro contains an AC_RUN_IFELSE test that +doesn't work when cross-compiling. However, this macro is related to +testing Mac OS X APIs, so in the context of Buildroot, we don't care, +and the test program is not even going to build. So we simply +workaround this by turning the test into an AC_COMPILE_IFELSE. + +Signed-off-by: Thomas Petazzoni + +Index: b/build/ac-macros/macosx.m4 +=================================================================== +--- a/build/ac-macros/macosx.m4 ++++ b/build/ac-macros/macosx.m4 +@@ -24,7 +24,7 @@ + AC_DEFUN(SVN_LIB_MACHO_ITERATE, + [ + AC_MSG_CHECKING([for Mach-O dynamic module iteration functions]) +- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + ]],[[ diff --git a/buildroot/package/subversion/Config.in b/buildroot/package/subversion/Config.in index ecac51814..43e7dcca3 100644 --- a/buildroot/package/subversion/Config.in +++ b/buildroot/package/subversion/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_SUBVERSION select BR2_PACKAGE_APR select BR2_PACKAGE_APR_UTIL select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LZ4 + select BR2_PACKAGE_UTF8PROC select BR2_PACKAGE_ZLIB select BR2_PACKAGE_SQLITE help diff --git a/buildroot/package/subversion/subversion.hash b/buildroot/package/subversion/subversion.hash index 7f94631f8..581834f98 100644 --- a/buildroot/package/subversion/subversion.hash +++ b/buildroot/package/subversion/subversion.hash @@ -1,5 +1,5 @@ -# From https://www.apache.org/dist/subversion/subversion-1.9.10.tar.bz2.sha512 -sha512 08a5c6c0233cc1dbd992180d2077eb1c67725682c457d3f67ebb6d22db0f6b64002a699ab828d435b708340ce6fb07bb1f03d11daefb887053c427ed75ad2de7 subversion-1.9.12.tar.bz2 +# From https://www.apache.org/dist/subversion/subversion-1.12.2.tar.bz2.sha512 +sha512 b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136 subversion-1.12.2.tar.bz2 # Locally calculated -sha256 3202942c1aba495fd17390618dedc1d3542815c5bc11958da7fd98c985abc11a LICENSE +sha256 484aff0cfbb81155a10f903ed756e27e9fc65578c245a295bae295c4bb51eaad LICENSE diff --git a/buildroot/package/subversion/subversion.mk b/buildroot/package/subversion/subversion.mk index 1013f1fc5..2044a6420 100644 --- a/buildroot/package/subversion/subversion.mk +++ b/buildroot/package/subversion/subversion.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUBVERSION_VERSION = 1.9.12 +SUBVERSION_VERSION = 1.12.2 SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 SUBVERSION_SITE = http://mirror.catn.com/pub/apache/subversion SUBVERSION_LICENSE = Apache-2.0 @@ -14,6 +14,8 @@ SUBVERSION_DEPENDENCIES = \ apr \ apr-util \ expat \ + lz4 \ + utf8proc \ zlib \ sqlite \ $(TARGET_NLS_DEPENDENCIES) @@ -22,6 +24,8 @@ SUBVERSION_CONF_OPTS = \ --with-expat=$(STAGING_DIR)/usr/include:$(STAGING_DIR)/usr/lib: \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ + --with-lz4=$(STAGING_DIR)/usr \ + --with-utf8proc=$(STAGING_DIR)/usr \ --with-zlib=$(STAGING_DIR)/usr \ --without-serf \ --without-apxs \ diff --git a/buildroot/package/sudo/sudo.hash b/buildroot/package/sudo/sudo.hash index 179595298..fff1aa234 100644 --- a/buildroot/package/sudo/sudo.hash +++ b/buildroot/package/sudo/sudo.hash @@ -1,4 +1,4 @@ # From: http://www.sudo.ws/download.html -sha256 9129fa745a08caff0ce2042d2162b38eb9bf73bf43fcb248ac8b3a750c1f13a1 sudo-1.8.28.tar.gz +sha256 7ea8d97a3cee4c844e0887ea7a1bd80eb54cc98fd77966776cb1a80653ad454f sudo-1.8.31.tar.gz # Locally calculated -sha256 e0e7990185834e9f08f3e922905d7bfaf998d13be668c6026d2586b1718210ba doc/LICENSE +sha256 be099fd0ee954224f392dde163aef6d6359c58a5afa1ebb1bd55058318add789 doc/LICENSE diff --git a/buildroot/package/sudo/sudo.mk b/buildroot/package/sudo/sudo.mk index cf8b63b1d..a4def4368 100644 --- a/buildroot/package/sudo/sudo.mk +++ b/buildroot/package/sudo/sudo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUDO_VERSION = 1.8.28 +SUDO_VERSION = 1.8.31 SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause SUDO_LICENSE_FILES = doc/LICENSE @@ -64,4 +64,19 @@ define SUDO_PERMISSIONS /usr/bin/sudo f 4755 0 0 - - - - - endef +define SUDO_REMOVE_DIST_EXAMPLES + $(RM) $(TARGET_DIR)/etc/sudoers.dist + rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/etc/sudoers.d +endef +SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_REMOVE_DIST_EXAMPLES + +define SUDO_USERS + - - sudo -1 - - - - +endef + +define SUDO_ENABLE_SUDO_GROUP_RULE + $(SED) '/^# \%sudo\tALL=(ALL) ALL/s/^# //' $(TARGET_DIR)/etc/sudoers +endef +SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_ENABLE_SUDO_GROUP_RULE + $(eval $(autotools-package)) diff --git a/buildroot/package/sunwait/Config.in b/buildroot/package/sunwait/Config.in new file mode 100644 index 000000000..e141c778a --- /dev/null +++ b/buildroot/package/sunwait/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_SUNWAIT + bool "sunwait" + depends on BR2_INSTALL_LIBSTDCPP + help + Sunwait calculates sunrise or sunset times with civil, + nautical, astronomical and custom twilights. + + https://github.com/risacher/sunwait + +comment "sunwait needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/sunwait/sunwait.hash b/buildroot/package/sunwait/sunwait.hash new file mode 100644 index 000000000..8396fa27d --- /dev/null +++ b/buildroot/package/sunwait/sunwait.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 ef26ed05882d5286a64a37c4044f99b877cc54f58a46f0e37ca60c93398df910 sunwait-7326b53e5406c7ebd552ae6dc0fc659252a18e7f.tar.gz +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSE diff --git a/buildroot/package/sunwait/sunwait.mk b/buildroot/package/sunwait/sunwait.mk new file mode 100644 index 000000000..4b27e8267 --- /dev/null +++ b/buildroot/package/sunwait/sunwait.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# sunwait +# +################################################################################ + +SUNWAIT_VERSION = 7326b53e5406c7ebd552ae6dc0fc659252a18e7f +SUNWAIT_SITE = $(call github,risacher,sunwait,$(SUNWAIT_VERSION)) +SUNWAIT_LICENSE = GPL-3.0 +SUNWAIT_LICENSE_FILES = LICENSE + +SUNWAIT_MAKE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + C=$(TARGET_CXX) \ + CFLAGS="$(TARGET_CFLAGS) -c" \ + LDFLAGS="$(TARGET_LDFLAGS) -lm" + +define SUNWAIT_BUILD_CMDS + $(MAKE) $(SUNWAIT_MAKE_OPTS) -C $(@D) all +endef + +define SUNWAIT_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/sunwait $(TARGET_DIR)/usr/bin/sunwait +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash index f2b18926d..7c01d07d2 100644 --- a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash +++ b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c5f787cc498cc3e156efa70acc3fbf8dc636fba0f677aac66bdded2fda4a529d sunxi-mali-mainline-driver-e28c274f85c65ebec82cdf0f8d021895e105d917.tar.gz +sha256 98abeb8ff2e7e824ec89c7be9984ff298db1f35e48d79092238799ff5a239e91 sunxi-mali-mainline-driver-ec654ee9caeb0c4348caacd0cf5eb2730d1d70e2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index a77ee91f7..0edcdee4d 100644 --- a/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/buildroot/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_MALI_MAINLINE_DRIVER_VERSION = e28c274f85c65ebec82cdf0f8d021895e105d917 +SUNXI_MALI_MAINLINE_DRIVER_VERSION = ec654ee9caeb0c4348caacd0cf5eb2730d1d70e2 SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux SUNXI_MALI_MAINLINE_DRIVER_LICENSE = GPL-2.0 diff --git a/buildroot/package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch b/buildroot/package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch deleted file mode 100644 index a9370b009..000000000 --- a/buildroot/package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 058d5e8cd90d117535b5d314fd9e15c70028ff20 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Mon, 21 Apr 2014 19:31:23 +0200 -Subject: [PATCH] Add missing GLchar definitions. - -The GLES and GLES2 header files provided by sunxi-mali do not define the -type "GLchar" and use "char" instead in the prototype of some functions. - -This issue has been reported upstream some time ago, but the pull -request has not been merged yet. (See -https://github.com/linux-sunxi/sunxi-mali/pull/8). - -Signed-off-by: Eric Le Bihan ---- - include/GLES/gl.h | 1 + - include/GLES2/gl2.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/include/GLES/gl.h b/include/GLES/gl.h -index 858f394..a6bb591 100644 ---- a/include/GLES/gl.h -+++ b/include/GLES/gl.h -@@ -29,6 +29,7 @@ typedef float GLfloat; - typedef float GLclampf; - typedef signed int GLfixed; - typedef signed int GLclampx; -+typedef char GLchar; - - typedef int * GLintptr; - typedef int * GLsizeiptr; -diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h -index 59e376c..90d96bb 100644 ---- a/include/GLES2/gl2.h -+++ b/include/GLES2/gl2.h -@@ -32,6 +32,7 @@ typedef unsigned int GLuint; - typedef khronos_float_t GLfloat; - typedef khronos_float_t GLclampf; - typedef khronos_int32_t GLfixed; -+typedef char GLchar; - - /* GL types for handling large vertex buffer objects */ - typedef khronos_intptr_t GLintptr; --- -1.9.0 - diff --git a/buildroot/package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch b/buildroot/package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch deleted file mode 100644 index 1c8f7ee21..000000000 --- a/buildroot/package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch +++ /dev/null @@ -1,18 +0,0 @@ -linking of test app needs libUMP - -Signed-off-by: Francois Perrad - -diff --git a/test/Makefile b/test/Makefile -index 700416e..92085cb 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -5,7 +5,7 @@ - all: test - - test: ../config.mk test.c -- $(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2 -+ $(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2 -lUMP - - clean: - rm -f test - diff --git a/buildroot/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch b/buildroot/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch deleted file mode 100644 index 62e1b1782..000000000 --- a/buildroot/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 5bf4d4f9c759fdb3c0db61a781042223236169c6 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 5 Jun 2017 12:40:16 +0200 -Subject: [PATCH] fix conflicting data types between GLES2/gl2.h and GLES/gl.h - -When OpenGL ES 1.1 and OpenGL ES 2.0 are used at the same time, the -build fail since GLintptr and GLsizeiptr data type are not the same in -GLES2/gl2.h and GLES/gl.h. - -Also sync the data type of GLbyte, GLubyte, GLfloat, GLclampf and -GLfixed. - -Fixes: -http://autobuild.buildroot.net/results/258/25898b45cefde9661d8ac87dd84bc883bb5283d1 - -Signed-off-by: Romain Naour ---- - include/GLES/gl.h | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/include/GLES/gl.h b/include/GLES/gl.h -index a6bb591..799408b 100644 ---- a/include/GLES/gl.h -+++ b/include/GLES/gl.h -@@ -18,22 +18,21 @@ typedef void GLvoid; - typedef unsigned int GLenum; - typedef unsigned char GLboolean; - typedef unsigned int GLbitfield; --typedef signed char GLbyte; -+typedef khronos_int8_t GLbyte; - typedef short GLshort; - typedef int GLint; - typedef int GLsizei; --typedef unsigned char GLubyte; -+typedef khronos_uint8_t GLubyte; - typedef unsigned short GLushort; - typedef unsigned int GLuint; --typedef float GLfloat; --typedef float GLclampf; --typedef signed int GLfixed; -+typedef khronos_float_t GLfloat; -+typedef khronos_float_t GLclampf; -+typedef khronos_int32_t GLfixed; - typedef signed int GLclampx; - typedef char GLchar; - --typedef int * GLintptr; --typedef int * GLsizeiptr; -- -+typedef khronos_intptr_t GLintptr; -+typedef khronos_ssize_t GLsizeiptr; - - /*************************************************************/ - --- -2.9.4 - diff --git a/buildroot/package/sunxi-mali/Config.in b/buildroot/package/sunxi-mali/Config.in deleted file mode 100644 index 554ee6845..000000000 --- a/buildroot/package/sunxi-mali/Config.in +++ /dev/null @@ -1,59 +0,0 @@ -config BR2_PACKAGE_SUNXI_MALI - bool "sunxi-mali" - depends on BR2_arm - # libump package only provide libUMP.so.3 which is used by - # libMali for r3p0 and r3p1 Mali kernel module. This version - # is only available for ARM EABIhf. - # libMali for r2p4 Mali kernel module (available for ARM EABI) - # requires libUMP.so.2. - depends on BR2_ARM_EABIHF # libUMP.so.3 only - depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_LIBUMP - help - Install the ARM Mali drivers for sunxi based systems (i.e - systems based on ARM Allwinner SoCs). This driver requires - either the sunxi-kernel with the ARM Mali driver enabled or - the installation of the ARM Mali drivers as an external - module. - - http://github.com/linux-sunxi/sunxi-mali - -if BR2_PACKAGE_SUNXI_MALI - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "sunxi-mali" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "sunxi-mali" - -config BR2_PACKAGE_SUNXI_MALI_DBG - bool "install malitest and maliver tools" - help - Install 3D triangle demo malitest application and the - maliver application which describes the kernel module - version. - -choice - prompt "Version" - default BR2_PACKAGE_SUNXI_MALI_R3P0 - help - Select the version of the kernel module. For the - sunxi-kernel, the appropriate version number is r3p0. For - other kernels, use the maliver application to determine the - appropriate version. - -config BR2_PACKAGE_SUNXI_MALI_R3P0 - bool "r3p0" - -config BR2_PACKAGE_SUNXI_MALI_R3P1 - bool "r3p1" - -endchoice - -endif - -comment "sunxi-mali needs an EABIhf glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/buildroot/package/sunxi-mali/S80mali b/buildroot/package/sunxi-mali/S80mali deleted file mode 100644 index ecfbab97b..000000000 --- a/buildroot/package/sunxi-mali/S80mali +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -e - -install_driver() { - DRIVER=$1 - OPTS=$2 - - modprobe $DRIVER $OPTS - maj=$(awk "\$2==\"${DRIVER}\" { print \$1; }" /proc/devices) - - rm -f /dev/${DRIVER} - - mknod /dev/${DRIVER} c $maj 0 - chmod 600 /dev/${DRIVER} -} - -start() { - echo "mali: starting driver" - - BITSPERPIXEL="$(fbset | awk '/geom/ {print $6}')" - YRES="$(fbset | awk '/geom/ {print $3}')" - # Set RGBA ordering to something the drivers like - if [ "$BITSPERPIXEL" = "32" ] ; then - fbset -rgba 8/16,8/8,8/0,8/24 - fi - # Try to enable triple buffering when there's enough VRAM - fbset -vyres $(( YRES*3 )) - - install_driver mali - install_driver ump -} - -stop() { - echo "mali: stopping driver" - - rmmod ump - rmmod mali -} - -case "$1" in -start) - start -;; -stop) - stop -;; -restart) - stop - start -;; -*) - echo "mali: Please use start, stop, or restart." - exit 1 -;; -esac diff --git a/buildroot/package/sunxi-mali/egl.pc b/buildroot/package/sunxi-mali/egl.pc deleted file mode 100644 index 2823209a7..000000000 --- a/buildroot/package/sunxi-mali/egl.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr/ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: egl -Description: ARM Mali implementation of EGL -Version: 1.4 -Requires: -Libs: -L${libdir} -lEGL -lGLESv2 -lUMP -Cflags: -I${includedir} - diff --git a/buildroot/package/sunxi-mali/glesv2.pc b/buildroot/package/sunxi-mali/glesv2.pc deleted file mode 100644 index 4702d1394..000000000 --- a/buildroot/package/sunxi-mali/glesv2.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: glesv2 -Description: ARM Mali implementation of OpenGL ESv2 -Version: 2.0 -Requires: -Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -lUMP -Cflags: -I${includedir} - diff --git a/buildroot/package/sunxi-mali/sunxi-mali.hash b/buildroot/package/sunxi-mali/sunxi-mali.hash deleted file mode 100644 index 31b5990de..000000000 --- a/buildroot/package/sunxi-mali/sunxi-mali.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 c5f58b2c0533a74f491634ddbd80d888781f4ea29ecc5c24bd7300c02bef1145 sunxi-mali-d343311efc8db166d8371b28494f0f27b6a5872.tar.gz diff --git a/buildroot/package/sunxi-mali/sunxi-mali.mk b/buildroot/package/sunxi-mali/sunxi-mali.mk deleted file mode 100644 index 90b580f5f..000000000 --- a/buildroot/package/sunxi-mali/sunxi-mali.mk +++ /dev/null @@ -1,73 +0,0 @@ -################################################################################ -# -# sunxi-mali -# -################################################################################ - -# last sha1 character dropped to ensure unique filename -SUNXI_MALI_VERSION = d343311efc8db166d8371b28494f0f27b6a5872 -SUNXI_MALI_SITE = https://github.com/linux-sunxi/sunxi-mali -SUNXI_MALI_SITE_METHOD = git - -# Get the sunxi-mali-proprietary libraries -SUNXI_MALI_GIT_SUBMODULES = YES - -SUNXI_MALI_INSTALL_STAGING = YES -SUNXI_MALI_DEPENDENCIES = libump -SUNXI_MALI_PROVIDES = libegl libgles - -# The options below must be provided in the environment. Providing these -# through options overrides the value and prevents the makefiles from -# appending to these variables. This is used throughout the sunxi-mali build -# system. -# -# Furthermore, the -lm -dl -lpthread options are included due to a possible bug -# in the way the linaro 2013.06 toolchain handles shared libraries. -SUNXI_MALI_MAKE_ENV = \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS) -lm -ldl -lpthread" \ - $(TARGET_MAKE_ENV) - -SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer \ - ABI=armhf - -ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P0),y) -SUNXI_MALI_MAKE_OPTS += VERSION=r3p0 -endif -ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P1),y) -SUNXI_MALI_MAKE_OPTS += VERSION=r3p1 -endif - -define SUNXI_MALI_BUILD_CMDS - $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) $(SUNXI_MALI_MAKE_OPTS) all - $(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/version/version \ - $(@D)/version/version.c -endef - -define SUNXI_MALI_INSTALL_STAGING_CMDS - $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) \ - $(SUNXI_MALI_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install - # test must be built after install because it depends on headers that are - # generated during the install above. - $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) $(SUNXI_MALI_MAKE_OPTS) test - $(INSTALL) -D -m 0644 package/sunxi-mali/egl.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc - $(INSTALL) -D -m 0644 package/sunxi-mali/glesv2.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc -endef - -define SUNXI_MALI_INSTALL_TARGET_CMDS - $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D)/lib \ - $(SUNXI_MALI_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install - $(if $(BR2_PACKAGE_SUNXI_MALI_DBG), - $(INSTALL) -m 755 $(@D)/version/version $(TARGET_DIR)/usr/bin/maliver; \ - $(INSTALL) -m 755 $(@D)/test/test $(TARGET_DIR)/usr/bin/malitest - ) -endef - -define SUNXI_MALI_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/sunxi-mali/S80mali \ - $(TARGET_DIR)/etc/init.d/S80mali -endef - -$(eval $(generic-package)) diff --git a/buildroot/package/sunxi-tools/sunxi-tools.hash b/buildroot/package/sunxi-tools/sunxi-tools.hash index efb2b54d9..2de26c418 100644 --- a/buildroot/package/sunxi-tools/sunxi-tools.hash +++ b/buildroot/package/sunxi-tools/sunxi-tools.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 da5d762608517b4b2e9bd392bd9a63afae3973d9c8264cbcfb757ddac8120d1b sunxi-tools-v1.4.1.tar.gz +sha256 da5d762608517b4b2e9bd392bd9a63afae3973d9c8264cbcfb757ddac8120d1b sunxi-tools-1.4.1.tar.gz +sha256 2b0d4dda4bf8034e1506507a67f80f982131137afe62bf144d248f9faea31da4 LICENSE.md diff --git a/buildroot/package/sunxi-tools/sunxi-tools.mk b/buildroot/package/sunxi-tools/sunxi-tools.mk index ee590fb95..35254263c 100644 --- a/buildroot/package/sunxi-tools/sunxi-tools.mk +++ b/buildroot/package/sunxi-tools/sunxi-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -SUNXI_TOOLS_VERSION = v1.4.1 -SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,$(SUNXI_TOOLS_VERSION)) +SUNXI_TOOLS_VERSION = 1.4.1 +SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,v$(SUNXI_TOOLS_VERSION)) SUNXI_TOOLS_LICENSE = GPL-2.0+ SUNXI_TOOLS_LICENSE_FILES = LICENSE.md HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf diff --git a/buildroot/package/supertux/supertux.hash b/buildroot/package/supertux/supertux.hash index 23e2645da..2b3ca799d 100644 --- a/buildroot/package/supertux/supertux.hash +++ b/buildroot/package/supertux/supertux.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 c4c3e5fa6f90e87b8c5ad6b22a179e9a9839bf997e7f219e22bbcd1c97223ac0 SuperTux-v0.6.0-Source.tar.gz +sha256 c4c3e5fa6f90e87b8c5ad6b22a179e9a9839bf997e7f219e22bbcd1c97223ac0 SuperTux-v0.6.0-Source.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.txt +sha256 35c61f69239ff2f55fe0fa5dee5bad6bff311a07c47fa049552e0973a47c07bb data/AUTHORS diff --git a/buildroot/package/supertuxkart/0001-Fix-3091.patch b/buildroot/package/supertuxkart/0001-Fix-3091.patch deleted file mode 100644 index dae2a37ce..000000000 --- a/buildroot/package/supertuxkart/0001-Fix-3091.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 813b08bc73e4e93714b972ee56c64b4771735e01 Mon Sep 17 00:00:00 2001 -From: Benau -Date: Sun, 14 Jan 2018 10:19:37 +0800 -Subject: [PATCH] Fix #3091 - -Signed-off-by: Fabrice Fontaine - #define CPU_MMX_SUPPORT (1) - #endif --#if __SSE__ || _M_X64 || _M_IX86_FP >= 1 || CPU_ENABLE_SSE -+#if __SSE__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 1 ) ) || CPU_ENABLE_SSE - #include - #define CPU_SSE_SUPPORT (1) - #endif --#if __SSE2__ || _M_X64 || _M_IX86_FP >= 2 || CPU_ENABLE_SSE2 -+#if __SSE2__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 2 ) ) || CPU_ENABLE_SSE2 - #include - #define CPU_SSE2_SUPPORT (1) - #endif -@@ -95,23 +95,23 @@ - #define CPU_POPCNT_SUPPORT (1) - #endif - #if __LZCNT__ || CPU_ENABLE_LZCNT -- #include -+ #include - #define CPU_LZCNT_SUPPORT (1) - #endif - #if __F16C__ || CPU_ENABLE_F16C -- #include -+ #include - #define CPU_F16C_SUPPORT (1) - #endif - #if __BMI__ || CPU_ENABLE_BMI -- #include -+ #include - #define CPU_BMI_SUPPORT (1) - #endif - #if __BMI2__ || CPU_ENABLE_BMI2 -- #include -+ #include - #define CPU_BMI2_SUPPORT (1) - #endif - #if __TBM__ || CPU_ENABLE_TBM -- #include -+ #include - #define CPU_TBM_SUPPORT (1) - #endif - diff --git a/buildroot/package/supertuxkart/Config.in b/buildroot/package/supertuxkart/Config.in index 51759160e..fcb27445d 100644 --- a/buildroot/package/supertuxkart/Config.in +++ b/buildroot/package/supertuxkart/Config.in @@ -10,12 +10,18 @@ config BR2_PACKAGE_SUPERTUXKART depends on BR2_PACKAGE_XORG7 depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_ENET + select BR2_PACKAGE_HARFBUZZ select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBFRIBIDI + select BR2_PACKAGE_LIBGLEW select BR2_PACKAGE_LIBGLU select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBSQUISH select BR2_PACKAGE_LIBVORBIS + select BR2_PACKAGE_NETTLE if !BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENAL select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_ZLIB diff --git a/buildroot/package/supertuxkart/supertuxkart.hash b/buildroot/package/supertuxkart/supertuxkart.hash index 4bba3f2c2..9654ad24a 100644 --- a/buildroot/package/supertuxkart/supertuxkart.hash +++ b/buildroot/package/supertuxkart/supertuxkart.hash @@ -1,5 +1,8 @@ # Locally computed -sha256 d8014e7106ba84f98b5ec5f146249dcffc284fc4083f8f237ff420b9e2219cb0 supertuxkart-0.9.3-src.tar.xz -# From https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.3/ -sha1 2650ba20976472f10122a8600cc239507a9b6f24 supertuxkart-0.9.3-src.tar.xz -md5 8de5455b8fdbb92679e302b76c9041cf supertuxkart-0.9.3-src.tar.xz +sha256 e9b02b0b11ab68aacaec38306903feffe59a501224805cd3645cebf10e880ae8 supertuxkart-1.1-src.tar.xz +# From https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/1.1/ +sha1 68be26f4b15d30dede26563cbcc6de999036c5e0 supertuxkart-1.1-src.tar.xz +md5 731569c58428f32a0e46943fad7ba1e3 supertuxkart-1.1-src.tar.xz + +# Locally computed +sha256 d27207a5213f746aac53893e9ecc18456e9595d3ffa662bd1ec9eb10787c214a COPYING diff --git a/buildroot/package/supertuxkart/supertuxkart.mk b/buildroot/package/supertuxkart/supertuxkart.mk index 37756213f..4427ddd1e 100644 --- a/buildroot/package/supertuxkart/supertuxkart.mk +++ b/buildroot/package/supertuxkart/supertuxkart.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUPERTUXKART_VERSION = 0.9.3 +SUPERTUXKART_VERSION = 1.1 SUPERTUXKART_SOURCE = supertuxkart-$(SUPERTUXKART_VERSION)-src.tar.xz SUPERTUXKART_SITE = http://downloads.sourceforge.net/project/supertuxkart/SuperTuxKart/$(SUPERTUXKART_VERSION) @@ -15,13 +15,19 @@ SUPERTUXKART_LICENSE = GPL-3.0+ SUPERTUXKART_LICENSE_FILES = COPYING SUPERTUXKART_DEPENDENCIES = \ + host-pkgconf \ freetype \ + enet \ + harfbuzz \ jpeg \ libcurl \ + libfribidi \ libgl \ + libglew \ libglu \ libogg \ libpng \ + libsquish \ libvorbis \ openal \ xlib_libXrandr \ @@ -31,21 +37,33 @@ SUPERTUXKART_DEPENDENCIES = \ # the only user of the bundled libraries, turn off shared libraries entirely. # Disable In-game recorder (there is no libopenglrecorder package) SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_RECORDER=OFF - -ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) -SUPERTUXKART_DEPENDENCIES += libfribidi -SUPERTUXKART_CONF_OPTS += -DUSE_FRIBIDI=ON -else -SUPERTUXKART_CONF_OPTS += -DUSE_FRIBIDI=OFF -endif + -DBUILD_RECORDER=OFF \ + -DUSE_SYSTEM_GLEW=ON \ + -DUSE_SYSTEM_ENET=ON \ + -DUSE_SYSTEM_SQUISH=ON ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) SUPERTUXKART_DEPENDENCIES += bluez5_utils -SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=ON +SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=ON -DUSE_SYSTEM_WIIUSE=ON else # Wiimote support relies on bluez5. SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=OFF endif +# Prefer openssl (the default) over nettle. +ifeq ($(BR2_PACKAGE_OPENSSL),y) +SUPERTUXKART_DEPENDENCIES += openssl +SUPERTUXKART_CONF_OPTS += -DUSE_CRYPTO_OPENSSL=ON +else +SUPERTUXKART_DEPENDENCIES += nettle +SUPERTUXKART_CONF_OPTS += -DUSE_CRYPTO_OPENSSL=OFF +endif + +ifeq ($(BR2_PACKAGE_SQLITE),y) +SUPERTUXKART_DEPENDENCIES += sqlite +SUPERTUXKART_CONF_OPTS += -DUSE_SQLITE3=ON +else +SUPERTUXKART_CONF_OPTS += -DUSE_SQLITE3=OFF +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/supervisor/Config.in b/buildroot/package/supervisor/Config.in index 2ab0e048f..623c3a836 100644 --- a/buildroot/package/supervisor/Config.in +++ b/buildroot/package/supervisor/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_SUPERVISOR bool "supervisor" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MELD3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime dependency help @@ -9,5 +9,6 @@ config BR2_PACKAGE_SUPERVISOR http://supervisord.org/ -comment "supervisor needs the python interpreter" +comment "supervisor needs a python interpreter" depends on !BR2_PACKAGE_PYTHON + depends on !BR2_PACKAGE_PYTHON3 diff --git a/buildroot/package/supervisor/supervisor.hash b/buildroot/package/supervisor/supervisor.hash index 0ebc663be..98a03aa1b 100644 --- a/buildroot/package/supervisor/supervisor.hash +++ b/buildroot/package/supervisor/supervisor.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 82f75089f719a7a3ca87f35c89a03c20fd3c0912552c96eb6fa40274ced6604e supervisor-3.1.4.tar.gz -sha256 a85a622378c6a892ead1ce5d0488e446e106bf014d3b763fdbc1ad1ae38ee491 COPYRIGHT.txt -sha256 27ba0b2357ed6974d755ed53232c5ab8595622b3111bb91682708ea188cc3696 LICENSES.txt +sha256 2dc86fe0476e945e61483d614ceb2cf4f93b95282eb243bdf792621994360383 supervisor-4.1.0.tar.gz +sha256 7b8dbd54ab1543b07b2fc5f6f5ab50d89d26c1c4952af93a579d8c52c56b8de4 COPYRIGHT.txt +sha256 4c35fda9f70bb7883fd94e5a4d5addd88ad1a6d5d15e21c9d17c4d96fdc5e369 LICENSES.txt diff --git a/buildroot/package/supervisor/supervisor.mk b/buildroot/package/supervisor/supervisor.mk index 9b93b449a..424f46a7c 100644 --- a/buildroot/package/supervisor/supervisor.mk +++ b/buildroot/package/supervisor/supervisor.mk @@ -4,9 +4,9 @@ # ################################################################################ -SUPERVISOR_VERSION = 3.1.4 -SUPERVISOR_SITE = https://pypi.python.org/packages/12/50/cd330d1a0daffbbe54803cb0c4c1ada892b5d66db08befac385122858eee -SUPERVISOR_LICENSE = BSD-like, rdflib (http_client.py), PSF (medusa), ZPL-2.1 +SUPERVISOR_VERSION = 4.1.0 +SUPERVISOR_SITE = https://files.pythonhosted.org/packages/de/87/ee1ad8fa533a4b5f2c7623f4a2b585d3c1947af7bed8e65bc7772274320e +SUPERVISOR_LICENSE = BSD-like, rdflib (http_client.py), PSF (medusa) SUPERVISOR_LICENSE_FILES = COPYRIGHT.txt LICENSES.txt SUPERVISOR_SETUP_TYPE = setuptools @@ -26,9 +26,6 @@ endef define SUPERVISOR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/supervisor/supervisord.service \ $(TARGET_DIR)/usr/lib/systemd/system/supervisord.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/supervisord.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/supervisord.service endef $(eval $(python-package)) diff --git a/buildroot/package/suricata/0001-configure.ac-fix-static-build-with-pcap.patch b/buildroot/package/suricata/0001-configure.ac-fix-static-build-with-pcap.patch new file mode 100644 index 000000000..331255062 --- /dev/null +++ b/buildroot/package/suricata/0001-configure.ac-fix-static-build-with-pcap.patch @@ -0,0 +1,29 @@ +From 2660123b0c16d7f6a49747711be676c4119561c9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 24 Apr 2019 20:35:20 +0200 +Subject: [PATCH] configure.ac: fix static build with pcap + +pcap can depends on nl-3 so use pkg-config to find these dependencies +otherwise all AC_CHECK_LIB calls will fail when building statically + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index ee59c9d8e..5ec341231 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1331,6 +1331,7 @@ + AC_CHECK_HEADERS([pcap.h pcap/pcap.h pcap/bpf.h]) + + LIBPCAP="" ++ PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}"],[]) + AC_CHECK_LIB(${PCAP_LIB_NAME}, pcap_open_live,, LIBPCAP="no") + if test "$LIBPCAP" = "no"; then + echo +-- +2.20.1 + diff --git a/buildroot/package/suricata/0002-configure.ac-fix-disable-geoip.patch b/buildroot/package/suricata/0002-configure.ac-fix-disable-geoip.patch new file mode 100644 index 000000000..7dae57a87 --- /dev/null +++ b/buildroot/package/suricata/0002-configure.ac-fix-disable-geoip.patch @@ -0,0 +1,33 @@ +From 4e8b006cdd30e43f3ab11296710170488fd5b5de Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 6 Oct 2019 09:53:23 +0200 +Subject: [PATCH] configure.ac: fix --disable-geoip + +$enableval should be used to know if the user has passed --enable-geoip +or --disable-geoip + +Fixes: + - http://autobuild.buildroot.org/results/a7a34f760ae5fe0922fdb720b8234dbcd85ed222 + +Signed-off-by: Fabrice Fontaine +Upstream status: https://github.com/OISF/suricata/pull/4278 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3df576d54..fa671024d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2143,7 +2143,7 @@ + # libmaxminddb + AC_ARG_ENABLE(geoip, + AS_HELP_STRING([--enable-geoip],[Enable GeoIP support]), +- [ enable_geoip="yes"], ++ [ enable_geoip="$enableval"], + [ enable_geoip="no"]) + AC_ARG_ENABLE(libgeoip, + AS_HELP_STRING([--disable-libgeoip], [Disable libgeoip support]), +-- +2.23.0 + diff --git a/buildroot/package/suricata/0003-python-ensure-proper-shabang-on-python-scripts.patch b/buildroot/package/suricata/0003-python-ensure-proper-shabang-on-python-scripts.patch new file mode 100644 index 000000000..4be591be3 --- /dev/null +++ b/buildroot/package/suricata/0003-python-ensure-proper-shabang-on-python-scripts.patch @@ -0,0 +1,45 @@ +From 44fe2328b715db25134ee095526d2fa47e6cd834 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 1 Jan 2020 15:25:57 +0100 +Subject: [PATCH] python: ensure proper shabang on python scripts + +When instlling python scripts, distutils would use the python used to +run setup.py as shabang for the scripts it installs. + +However, when cross-compiling, this is most often not correct. + +Instead, using '/usr/bin/env python' is guaranteed to find the proper +python in the PATH, so we need to instruct setyup.py to use that as the +executable. + +[yann.morin.1998@free.fr: + - author did not provide their SoB, but it's simple enough to + not require it for once + - provide proper commit log +] +Signed-off-by: Yann E. MORIN +--- + python/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/python/Makefile.am b/python/Makefile.am +index 59d195f29..a41604f72 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -6,11 +6,11 @@ EXTRA_DIST = setup.py \ + if HAVE_PYTHON + all-local: + cd $(srcdir) && \ +- $(HAVE_PYTHON) setup.py build --build-base $(abs_builddir) ++ $(HAVE_PYTHON) setup.py build -e "/usr/bin/env python" --build-base $(abs_builddir) + + install-exec-local: + cd $(srcdir) && \ +- $(HAVE_PYTHON) setup.py build --build-base $(abs_builddir) \ ++ $(HAVE_PYTHON) setup.py build -e "/usr/bin/env python" --build-base $(abs_builddir) \ + install --prefix $(DESTDIR)$(prefix) + + uninstall-local: +-- +2.20.1 + diff --git a/buildroot/package/suricata/0004-stream-reject-broken-ACK-packets.patch b/buildroot/package/suricata/0004-stream-reject-broken-ACK-packets.patch new file mode 100644 index 000000000..9670d7315 --- /dev/null +++ b/buildroot/package/suricata/0004-stream-reject-broken-ACK-packets.patch @@ -0,0 +1,40 @@ +From 1c63d3905852f746ccde7e2585600b2199cefb4b Mon Sep 17 00:00:00 2001 +From: Victor Julien +Date: Thu, 21 Nov 2019 16:10:21 +0100 +Subject: [PATCH] stream: reject broken ACK packets + +Fix evasion posibility by rejecting packets with a broken ACK field. +These packets have a non-0 ACK field, but do not have a ACK flag set. + +Bug #3324. + +Reported-by: Nicolas Adba +(cherry picked from commit fa692df37a796c3330c81988d15ef1a219afc006) +[Retrieved from: +https://github.com/OISF/suricata/commit/1c63d3905852f746ccde7e2585600b2199cefb4b] +Signed-off-by: Fabrice Fontaine +--- + src/stream-tcp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/stream-tcp.c b/src/stream-tcp.c +index 35e489acba..8653d670c6 100644 +--- a/src/stream-tcp.c ++++ b/src/stream-tcp.c +@@ -4759,6 +4759,7 @@ int StreamTcpPacket (ThreadVars *tv, Packet *p, StreamTcpThread *stt, + /* broken TCP http://ask.wireshark.org/questions/3183/acknowledgment-number-broken-tcp-the-acknowledge-field-is-nonzero-while-the-ack-flag-is-not-set */ + if (!(p->tcph->th_flags & TH_ACK) && TCP_GET_ACK(p) != 0) { + StreamTcpSetEvent(p, STREAM_PKT_BROKEN_ACK); ++ goto error; + } + + /* If we are on IPS mode, and got a drop action triggered from +@@ -6883,7 +6884,7 @@ static int StreamTcpTest10 (void) + + tcph.th_win = htons(5480); + tcph.th_seq = htonl(10); +- tcph.th_ack = htonl(11); ++ tcph.th_ack = 0; + tcph.th_flags = TH_SYN; + p->tcph = &tcph; + diff --git a/buildroot/package/suricata/Config.in b/buildroot/package/suricata/Config.in new file mode 100644 index 000000000..2add34956 --- /dev/null +++ b/buildroot/package/suricata/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_SURICATA + bool "suricata" + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBHTP + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBYAML + select BR2_PACKAGE_PCRE + help + Suricata is a free and open source, mature, fast and robust + network threat detection engine. + + The Suricata engine is capable of real time intrusion + detection (IDS), inline intrusion prevention (IPS), network + security monitoring (NSM) and offline pcap processing. + + https://suricata-ids.org + +comment "suricata needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/suricata/S99suricata b/buildroot/package/suricata/S99suricata new file mode 100644 index 000000000..7c2b96652 --- /dev/null +++ b/buildroot/package/suricata/S99suricata @@ -0,0 +1,64 @@ +#!/bin/sh + +DAEMON=suricata +PIDFILE=/var/run/$DAEMON.pid + +SURICATA_ARGS="-c /etc/suricata/suricata.yaml -i eth0" + +SURICATA_RELOAD=0 + +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + mkdir -p /var/log/suricata + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ + -- $SURICATA_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +# SIGUSR2 makes suricata reload rules +reload() { + printf 'Reloading %s: ' "$DAEMON" + start-stop-daemon -K -s "$SURICATA_RELOAD" -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +case "$1" in + start|stop|restart|reload) + "$1";; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/suricata/suricata.hash b/buildroot/package/suricata/suricata.hash new file mode 100644 index 000000000..dc52999a9 --- /dev/null +++ b/buildroot/package/suricata/suricata.hash @@ -0,0 +1,6 @@ +# Locally computed: +sha256 cee5f6535cd7fe63fddceab62eb3bc66a63fc464466c88ec7a41b7a1331ac74b suricata-4.1.5.tar.gz + +# Hash for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/suricata/suricata.mk b/buildroot/package/suricata/suricata.mk new file mode 100644 index 000000000..48a6205ee --- /dev/null +++ b/buildroot/package/suricata/suricata.mk @@ -0,0 +1,140 @@ +################################################################################ +# +# suricata +# +################################################################################ + +SURICATA_VERSION = 4.1.5 +SURICATA_SITE = https://www.openinfosecfoundation.org/download +SURICATA_LICENSE = GPL-2.0 +SURICATA_LICENSE_FILES = COPYING LICENSE +# We're patching configure.ac +SURICATA_AUTORECONF = YES + +# 0004-stream-reject-broken-ACK-packets.patch +SURICATA_IGNORE_CVES += CVE-2019-18792 + +SURICATA_DEPENDENCIES = \ + host-pkgconf \ + $(if $(BR2_PACKAGE_JANSSON),jansson) \ + $(if $(BR2_PACKAGE_LIBCAP_NG),libcap-ng) \ + $(if $(BR2_PACKAGE_LIBEVENT),libevent) \ + libhtp \ + $(if $(BR2_PACKAGE_LIBNFNETLINK),libnfnetlink) \ + libpcap \ + libyaml \ + $(if $(BR2_PACKAGE_LZ4),lz4) \ + pcre \ + $(if $(BR2_PACKAGE_XZ),xz) + +SURICATA_CONF_ENV = ac_cv_path_HAVE_SPHINXBUILD=no + +SURICATA_CONF_OPTS = \ + --disable-gccprotect \ + --disable-pie \ + --disable-rust \ + --disable-suricata-update \ + --enable-non-bundled-htp + +# install: install binaries +# install-conf: install initial configuration files +# install-full: install binaries, configuration and rules (rules will be +# download through wget/curl) +SURICATA_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install install-conf + +ifeq ($(BR2_PACKAGE_FILE),y) +SURICATA_DEPENDENCIES += file +SURICATA_CONF_OPTS += --enable-libmagic +else +SURICATA_CONF_OPTS += --disable-libmagic +endif + +# --disable-libgeoip disables libgeoip when --enable-geoip is requested. +# This allows libmaxminddb to be picked up instead of libgeoip when both are +# installed on the system. +ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) +SURICATA_DEPENDENCIES += libmaxminddb +SURICATA_CONF_OPTS += \ + --enable-geoip \ + --disable-libgeoip +else ifeq ($(BR2_PACKAGE_GEOIP),y) +SURICATA_DEPENDENCIES += geoip +SURICATA_CONF_OPTS += \ + --enable-geoip \ + --enable-libgeoip +else +SURICATA_CONF_OPTS += --disable-geoip +endif + +ifeq ($(BR2_PACKAGE_HIREDIS),y) +SURICATA_DEPENDENCIES += hiredis +SURICATA_CONF_OPTS += --enable-hiredis +else +SURICATA_CONF_OPTS += --disable-hiredis +endif + +ifeq ($(BR2_PACKAGE_LIBNET),y) +SURICATA_DEPENDENCIES += libnet +SURICATA_CONF_OPTS += --with-libnet-includes=$(STAGING_DIR)/usr/include +endif + +ifeq ($(BR2_PACKAGE_LIBNETFILTER_LOG),y) +SURICATA_DEPENDENCIES += libnetfilter_log +SURICATA_CONF_OPTS += --enable-nflog +else +SURICATA_CONF_OPTS += --disable-nflog +endif + +ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y) +SURICATA_DEPENDENCIES += libnetfilter_queue +SURICATA_CONF_OPTS += --enable-nfqueue +else +SURICATA_CONF_OPTS += --disable-nfqueue +endif + +ifeq ($(BR2_PACKAGE_LIBNSPR),y) +SURICATA_DEPENDENCIES += libnspr +SURICATA_CONF_OPTS += --enable-nspr +else +SURICATA_CONF_OPTS += --disable-nspr +endif + +ifeq ($(BR2_PACKAGE_LIBNSS),y) +SURICATA_DEPENDENCIES += libnss +SURICATA_CONF_OPTS += --enable-nss +else +SURICATA_CONF_OPTS += --disable-nss +endif + +ifeq ($(BR2_PACKAGE_LUA),y) +SURICATA_CONF_OPTS += --enable-lua +SURICATA_DEPENDENCIES += lua +else +SURICATA_CONF_OPTS += --disable-lua +endif + +ifeq ($(BR2_PACKAGE_LUAJIT),y) +SURICATA_CONF_OPTS += --enable-luajit +SURICATA_DEPENDENCIES += luajit +else +SURICATA_CONF_OPTS += --disable-luajit +endif + +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +SURICATA_CONF_OPTS += --enable-python +SURICATA_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +else +SURICATA_CONF_OPTS += --disable-python +endif + +define SURICATA_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/suricata/S99suricata \ + $(TARGET_DIR)/etc/init.d/S99suricata +endef + +define SURICATA_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/suricata/suricata.service \ + $(TARGET_DIR)/usr/lib/systemd/system/suricata.service +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/suricata/suricata.service b/buildroot/package/suricata/suricata.service new file mode 100644 index 000000000..f5cd46ac4 --- /dev/null +++ b/buildroot/package/suricata/suricata.service @@ -0,0 +1,14 @@ +[Unit] +Description=Suricata Intrusion Detection Service +After=network.target + +[Service] +EnvironmentFile=-/etc/default/suricata +ExecStartPre=/bin/rm -f /var/run/suricata.pid +ExecStartPre=/usr/bin/mkdir -p /var/log/suricata +ExecStart=/usr/bin/suricata -c /etc/suricata/suricata.yaml -i eth0 --pidfile /var/run/suricata.pid +ExecReload=/bin/kill -USR2 $MAINPID +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/buildroot/package/swig/0001-Add-Node-7.x-aka-V8-5.2-support.patch b/buildroot/package/swig/0001-Add-Node-7.x-aka-V8-5.2-support.patch deleted file mode 100644 index 7f3002d47..000000000 --- a/buildroot/package/swig/0001-Add-Node-7.x-aka-V8-5.2-support.patch +++ /dev/null @@ -1,328 +0,0 @@ -From f08d7a63a92a3ba89d97bdfcc206e1e1c4804c0f Mon Sep 17 00:00:00 2001 -From: Patrick Schneider -Date: Thu, 13 Apr 2017 15:02:53 +0200 -Subject: [PATCH 1/2] Add Node 7.x aka V8 5.2+ support - -* Use WeakCallbackInfo instead of WeakCallbackData -* Use GetPrivate instead of GetHiddenValue -* Adopted new signature for SetWeak to support destructor calling -* SetAccessor deprecation fixed -* Proper version checks where applicable - -Signed-off-by: Yegor Yefremov ---- - Lib/javascript/v8/javascriptcode.swg | 27 +++++++++++++++++----- - Lib/javascript/v8/javascripthelpers.swg | 29 +++++++++++++++++++++--- - Lib/javascript/v8/javascriptinit.swg | 16 +++++++++++-- - Lib/javascript/v8/javascriptrun.swg | 40 ++++++++++++++++++++++++++++----- - 4 files changed, 95 insertions(+), 17 deletions(-) - -diff --git a/Lib/javascript/v8/javascriptcode.swg b/Lib/javascript/v8/javascriptcode.swg -index fb7d55c..b8c5089 100644 ---- a/Lib/javascript/v8/javascriptcode.swg -+++ b/Lib/javascript/v8/javascriptcode.swg -@@ -133,10 +133,13 @@ static void $jswrapper(v8::Isolate *isolate, v8::Persistent object, v - SWIGV8_Proxy *proxy = static_cast(parameter); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - static void $jswrapper(v8::Isolate *isolate, v8::Persistent *object, SWIGV8_Proxy *proxy) { --#else -+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - static void $jswrapper(const v8::WeakCallbackData &data) { - v8::Local object = data.GetValue(); - SWIGV8_Proxy *proxy = data.GetParameter(); -+#else -+ static void $jswrapper(const v8::WeakCallbackInfo &data) { -+ SWIGV8_Proxy *proxy = data.GetParameter(); - #endif - - if(proxy->swigCMemOwn && proxy->swigCObject) { -@@ -147,7 +150,9 @@ static void $jswrapper(const v8::WeakCallbackData &dat - } - delete proxy; - -+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - object.Clear(); -+#endif - - #if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710) - object.Dispose(); -@@ -155,7 +160,7 @@ static void $jswrapper(const v8::WeakCallbackData &dat - object.Dispose(isolate); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032100) - object->Dispose(isolate); --#else -+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - object->Dispose(); - #endif - } -@@ -177,10 +182,13 @@ static void $jswrapper(v8::Isolate *isolate, v8::Persistent object, v - SWIGV8_Proxy *proxy = static_cast(parameter); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - static void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object> *object, SWIGV8_Proxy *proxy) { --#else -+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - static void $jswrapper(const v8::WeakCallbackData &data) { - v8::Local object = data.GetValue(); - SWIGV8_Proxy *proxy = data.GetParameter(); -+#else -+static void $jswrapper(const v8::WeakCallbackInfo &data) { -+ SWIGV8_Proxy *proxy = data.GetParameter(); - #endif - - if(proxy->swigCMemOwn && proxy->swigCObject) { -@@ -197,7 +205,7 @@ static void $jswrapper(const v8::WeakCallbackData &dat - object->Dispose(isolate); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - object->Dispose(); --#else -+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - object.Clear(); - #endif - } -@@ -211,7 +219,11 @@ static void $jswrapper(const v8::WeakCallbackData &dat - * ----------------------------------------------------------------------------- */ - %fragment("js_getter", "templates") - %{ -+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - static SwigV8ReturnValue $jswrapper(v8::Local property, const SwigV8PropertyCallbackInfo &info) { -+#else -+static SwigV8ReturnValue $jswrapper(v8::Local property, const SwigV8PropertyCallbackInfo &info) { -+#endif - SWIGV8_HANDLESCOPE(); - - v8::Handle jsresult; -@@ -233,8 +245,11 @@ fail: - * ----------------------------------------------------------------------------- */ - %fragment("js_setter", "templates") - %{ --static void $jswrapper(v8::Local property, v8::Local value, -- const SwigV8PropertyCallbackInfoVoid &info) { -+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+static void $jswrapper(v8::Local property, v8::Local value, const SwigV8PropertyCallbackInfoVoid &info) { -+#else -+static void $jswrapper(v8::Local property, v8::Local value, const SwigV8PropertyCallbackInfoVoid &info) { -+#endif - SWIGV8_HANDLESCOPE(); - - $jslocals -diff --git a/Lib/javascript/v8/javascripthelpers.swg b/Lib/javascript/v8/javascripthelpers.swg -index 091467d..7461079 100644 ---- a/Lib/javascript/v8/javascripthelpers.swg -+++ b/Lib/javascript/v8/javascripthelpers.swg -@@ -6,11 +6,16 @@ typedef v8::InvocationCallback SwigV8FunctionCallback; - typedef v8::AccessorGetter SwigV8AccessorGetterCallback; - typedef v8::AccessorSetter SwigV8AccessorSetterCallback; - typedef v8::AccessorInfo SwigV8PropertyCallbackInfoVoid; --#else -+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - typedef v8::FunctionCallback SwigV8FunctionCallback; - typedef v8::AccessorGetterCallback SwigV8AccessorGetterCallback; - typedef v8::AccessorSetterCallback SwigV8AccessorSetterCallback; - typedef v8::PropertyCallbackInfo SwigV8PropertyCallbackInfoVoid; -+#else -+typedef v8::FunctionCallback SwigV8FunctionCallback; -+typedef v8::AccessorNameGetterCallback SwigV8AccessorGetterCallback; -+typedef v8::AccessorNameSetterCallback SwigV8AccessorSetterCallback; -+typedef v8::PropertyCallbackInfo SwigV8PropertyCallbackInfoVoid; - #endif - - /** -@@ -65,18 +70,36 @@ SWIGRUNTIME void SWIGV8_AddStaticFunction(v8::Handle obj, const char - */ - SWIGRUNTIME void SWIGV8_AddStaticVariable(v8::Handle obj, const char* symbol, - SwigV8AccessorGetterCallback getter, SwigV8AccessorSetterCallback setter) { -+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - obj->SetAccessor(SWIGV8_SYMBOL_NEW(symbol), getter, setter); -+#else -+ obj->SetAccessor(SWIGV8_CURRENT_CONTEXT(), SWIGV8_SYMBOL_NEW(symbol), getter, setter); -+#endif - } - --SWIGRUNTIME void JS_veto_set_variable(v8::Local property, v8::Local value, -- const SwigV8PropertyCallbackInfoVoid& info) -+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+SWIGRUNTIME void JS_veto_set_variable(v8::Local property, v8::Local value, const SwigV8PropertyCallbackInfoVoid& info) -+#else -+SWIGRUNTIME void JS_veto_set_variable(v8::Local property, v8::Local value, const SwigV8PropertyCallbackInfoVoid& info) -+#endif - { - char buffer[256]; - char msg[512]; - int res; - -+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - property->WriteUtf8(buffer, 256); - res = sprintf(msg, "Tried to write read-only variable: %s.", buffer); -+#else -+ v8::Local sproperty; -+ if (property->ToString(SWIGV8_CURRENT_CONTEXT()).ToLocal(&sproperty)) { -+ sproperty->WriteUtf8(buffer, 256); -+ res = sprintf(msg, "Tried to write read-only variable: %s.", buffer); -+ } -+ else { -+ res = -1; -+ } -+#endif - - if(res<0) { - SWIG_exception(SWIG_ERROR, "Tried to write read-only variable."); -diff --git a/Lib/javascript/v8/javascriptinit.swg b/Lib/javascript/v8/javascriptinit.swg -index 34befa7..86008d9 100644 ---- a/Lib/javascript/v8/javascriptinit.swg -+++ b/Lib/javascript/v8/javascriptinit.swg -@@ -7,15 +7,27 @@ SWIG_V8_SetModule(void *, swig_module_info *swig_module) { - v8::Local global_obj = SWIGV8_CURRENT_CONTEXT()->Global(); - v8::Local mod = SWIGV8_EXTERNAL_NEW(swig_module); - assert(!mod.IsEmpty()); -+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - global_obj->SetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data"), mod); -+#else -+ v8::Local privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("swig_module_info_data")); -+ global_obj->SetPrivate(SWIGV8_CURRENT_CONTEXT(), privateKey, mod); -+#endif - } - - SWIGRUNTIME swig_module_info * - SWIG_V8_GetModule(void *) { - v8::Local global_obj = SWIGV8_CURRENT_CONTEXT()->Global(); -+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - v8::Local moduleinfo = global_obj->GetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data")); -+#else -+ v8::Local privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("swig_module_info_data")); -+ v8::Local moduleinfo; -+ if (!global_obj->GetPrivate(SWIGV8_CURRENT_CONTEXT(), privateKey).ToLocal(&moduleinfo)) -+ return 0; -+#endif - -- if (moduleinfo.IsEmpty()) -+ if (moduleinfo.IsEmpty() || moduleinfo->IsNull() || moduleinfo->IsUndefined()) - { - // It's not yet loaded - return 0; -@@ -23,7 +35,7 @@ SWIG_V8_GetModule(void *) { - - v8::Local moduleinfo_extern = v8::Local::Cast(moduleinfo); - -- if (moduleinfo_extern.IsEmpty()) -+ if (moduleinfo_extern.IsEmpty() || moduleinfo_extern->IsNull() || moduleinfo_extern->IsUndefined()) - { - // Something's not right - return 0; -diff --git a/Lib/javascript/v8/javascriptrun.swg b/Lib/javascript/v8/javascriptrun.swg -index 5ac52a5..30002c0 100644 ---- a/Lib/javascript/v8/javascriptrun.swg -+++ b/Lib/javascript/v8/javascriptrun.swg -@@ -193,8 +193,10 @@ public: - void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Value> object, void *parameter); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy); --#else -+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - void (*dtor) (const v8::WeakCallbackData &data); -+#else -+ void (*dtor) (const v8::WeakCallbackInfo &data); - #endif - }; - -@@ -241,9 +243,12 @@ SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Val - SWIGV8_Proxy *proxy = static_cast(parameter); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) { --#else -+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(const v8::WeakCallbackData &data) { - SWIGV8_Proxy *proxy = data.GetParameter(); -+#else -+SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(const v8::WeakCallbackInfo &data) { -+ SWIGV8_Proxy *proxy = data.GetParameter(); - #endif - - delete proxy; -@@ -312,12 +317,18 @@ SWIGRUNTIME void SWIGV8_SetPrivateData(v8::Handle obj, void *ptr, sw - } else { - cdata->handle.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor); - } --#else -+#elifif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) { - cdata->handle.SetWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor); - } else { - cdata->handle.SetWeak(cdata, SWIGV8_Proxy_DefaultDtor); - } -+#else -+ if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) { -+ cdata->handle.SetWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor, v8::WeakCallbackType::kParameter); -+ } else { -+ cdata->handle.SetWeak(cdata, SWIGV8_Proxy_DefaultDtor, v8::WeakCallbackType::kParameter); -+ } - #endif - - #if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710) -@@ -470,7 +481,14 @@ int SwigV8Packed_Check(v8::Handle valRef) { - - v8::Handle objRef = valRef->ToObject(); - if(objRef->InternalFieldCount() < 1) return false; -+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - v8::Handle flag = objRef->GetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__")); -+#else -+ v8::Local privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("__swig__packed_data__")); -+ v8::Local flag; -+ if (!objRef->GetPrivate(SWIGV8_CURRENT_CONTEXT(), privateKey).ToLocal(&flag)) -+ return false; -+#endif - return (flag->IsBoolean() && flag->BooleanValue()); - } - -@@ -519,10 +537,13 @@ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persist - SwigV8PackedData *cdata = static_cast(parameter); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persistent *object, SwigV8PackedData *cdata) { --#else -+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackData &data) { - v8::Local object = data.GetValue(); - SwigV8PackedData *cdata = data.GetParameter(); -+#else -+SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackInfo &data) { -+ SwigV8PackedData *cdata = data.GetParameter(); - #endif - - delete cdata; -@@ -537,7 +558,7 @@ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackDataDispose(isolate); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - object->Dispose(); --#else -+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - object.Clear(); - #endif - } -@@ -550,7 +571,12 @@ v8::Handle SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf - // v8::Handle obj = SWIGV8_OBJECT_NEW(); - v8::Local obj = SWIGV8_OBJECT_NEW(); - -+#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - obj->SetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__"), SWIGV8_BOOLEAN_NEW(true)); -+#else -+ v8::Local privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("__swig__packed_data__")); -+ obj->SetPrivate(SWIGV8_CURRENT_CONTEXT(), privateKey, SWIGV8_BOOLEAN_NEW(true)); -+#endif - - #if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031511) - obj->SetPointerInInternalField(0, cdata); -@@ -573,9 +599,11 @@ v8::Handle SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf - cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, _wrap_SwigV8PackedData_delete); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - cdata->handle.MakeWeak(cdata, _wrap_SwigV8PackedData_delete); --#else -+#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) - cdata->handle.SetWeak(cdata, _wrap_SwigV8PackedData_delete); - // v8::V8::SetWeak(&cdata->handle, cdata, _wrap_SwigV8PackedData_delete); -+#else -+ cdata->handle.SetWeak(cdata, _wrap_SwigV8PackedData_delete, v8::WeakCallbackType::kParameter); - #endif - - #if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710) --- -2.1.4 - diff --git a/buildroot/package/swig/0002-Remove-warnings-on-Node-6.x-aka-V8-5.0-and-5.1.patch b/buildroot/package/swig/0002-Remove-warnings-on-Node-6.x-aka-V8-5.0-and-5.1.patch deleted file mode 100644 index 672422045..000000000 --- a/buildroot/package/swig/0002-Remove-warnings-on-Node-6.x-aka-V8-5.0-and-5.1.patch +++ /dev/null @@ -1,222 +0,0 @@ -From 9ce8d7e7c99e75163318428aeff6e60d398fcdca Mon Sep 17 00:00:00 2001 -From: Patrick Schneider -Date: Thu, 13 Apr 2017 19:39:44 +0200 -Subject: [PATCH 2/2] Remove warnings on Node 6.x aka V8 5.0 and 5.1 - -The proposed changes targetted at 5.2 (or 5.4 to be more precise, since there is no Node release with V8 5.2 or 5.3) work for lower versions as well and bust the deprecation warnings there. - -Signed-off-by: Yegor Yefremov ---- - Lib/javascript/v8/javascriptcode.swg | 14 +++++++------- - Lib/javascript/v8/javascripthelpers.swg | 8 ++++---- - Lib/javascript/v8/javascriptinit.swg | 4 ++-- - Lib/javascript/v8/javascriptrun.swg | 16 ++++++++-------- - 4 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/Lib/javascript/v8/javascriptcode.swg b/Lib/javascript/v8/javascriptcode.swg -index b8c5089..c4aaf3d 100644 ---- a/Lib/javascript/v8/javascriptcode.swg -+++ b/Lib/javascript/v8/javascriptcode.swg -@@ -133,7 +133,7 @@ static void $jswrapper(v8::Isolate *isolate, v8::Persistent object, v - SWIGV8_Proxy *proxy = static_cast(parameter); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - static void $jswrapper(v8::Isolate *isolate, v8::Persistent *object, SWIGV8_Proxy *proxy) { --#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#elif (V8_MAJOR_VERSION-0) < 5 - static void $jswrapper(const v8::WeakCallbackData &data) { - v8::Local object = data.GetValue(); - SWIGV8_Proxy *proxy = data.GetParameter(); -@@ -150,7 +150,7 @@ static void $jswrapper(const v8::WeakCallbackData &dat - } - delete proxy; - --#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#if (V8_MAJOR_VERSION-0) < 5 - object.Clear(); - #endif - -@@ -160,7 +160,7 @@ static void $jswrapper(const v8::WeakCallbackData &dat - object.Dispose(isolate); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032100) - object->Dispose(isolate); --#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#elif (V8_MAJOR_VERSION-0) < 5 - object->Dispose(); - #endif - } -@@ -182,7 +182,7 @@ static void $jswrapper(v8::Isolate *isolate, v8::Persistent object, v - SWIGV8_Proxy *proxy = static_cast(parameter); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - static void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object> *object, SWIGV8_Proxy *proxy) { --#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#elif (V8_MAJOR_VERSION-0) < 5 - static void $jswrapper(const v8::WeakCallbackData &data) { - v8::Local object = data.GetValue(); - SWIGV8_Proxy *proxy = data.GetParameter(); -@@ -205,7 +205,7 @@ static void $jswrapper(const v8::WeakCallbackInfo &data) { - object->Dispose(isolate); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - object->Dispose(); --#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#elif (V8_MAJOR_VERSION-0) < 5 - object.Clear(); - #endif - } -@@ -219,7 +219,7 @@ static void $jswrapper(const v8::WeakCallbackInfo &data) { - * ----------------------------------------------------------------------------- */ - %fragment("js_getter", "templates") - %{ --#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#if (V8_MAJOR_VERSION-0) < 5 - static SwigV8ReturnValue $jswrapper(v8::Local property, const SwigV8PropertyCallbackInfo &info) { - #else - static SwigV8ReturnValue $jswrapper(v8::Local property, const SwigV8PropertyCallbackInfo &info) { -@@ -245,7 +245,7 @@ fail: - * ----------------------------------------------------------------------------- */ - %fragment("js_setter", "templates") - %{ --#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#if (V8_MAJOR_VERSION-0) < 5 - static void $jswrapper(v8::Local property, v8::Local value, const SwigV8PropertyCallbackInfoVoid &info) { - #else - static void $jswrapper(v8::Local property, v8::Local value, const SwigV8PropertyCallbackInfoVoid &info) { -diff --git a/Lib/javascript/v8/javascripthelpers.swg b/Lib/javascript/v8/javascripthelpers.swg -index 7461079..7b8a5ec 100644 ---- a/Lib/javascript/v8/javascripthelpers.swg -+++ b/Lib/javascript/v8/javascripthelpers.swg -@@ -6,7 +6,7 @@ typedef v8::InvocationCallback SwigV8FunctionCallback; - typedef v8::AccessorGetter SwigV8AccessorGetterCallback; - typedef v8::AccessorSetter SwigV8AccessorSetterCallback; - typedef v8::AccessorInfo SwigV8PropertyCallbackInfoVoid; --#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#elif (V8_MAJOR_VERSION-0) < 5 - typedef v8::FunctionCallback SwigV8FunctionCallback; - typedef v8::AccessorGetterCallback SwigV8AccessorGetterCallback; - typedef v8::AccessorSetterCallback SwigV8AccessorSetterCallback; -@@ -70,14 +70,14 @@ SWIGRUNTIME void SWIGV8_AddStaticFunction(v8::Handle obj, const char - */ - SWIGRUNTIME void SWIGV8_AddStaticVariable(v8::Handle obj, const char* symbol, - SwigV8AccessorGetterCallback getter, SwigV8AccessorSetterCallback setter) { --#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#if (V8_MAJOR_VERSION-0) < 5 - obj->SetAccessor(SWIGV8_SYMBOL_NEW(symbol), getter, setter); - #else - obj->SetAccessor(SWIGV8_CURRENT_CONTEXT(), SWIGV8_SYMBOL_NEW(symbol), getter, setter); - #endif - } - --#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#if (V8_MAJOR_VERSION-0) < 5 - SWIGRUNTIME void JS_veto_set_variable(v8::Local property, v8::Local value, const SwigV8PropertyCallbackInfoVoid& info) - #else - SWIGRUNTIME void JS_veto_set_variable(v8::Local property, v8::Local value, const SwigV8PropertyCallbackInfoVoid& info) -@@ -87,7 +87,7 @@ SWIGRUNTIME void JS_veto_set_variable(v8::Local property, v8::LocalWriteUtf8(buffer, 256); - res = sprintf(msg, "Tried to write read-only variable: %s.", buffer); - #else -diff --git a/Lib/javascript/v8/javascriptinit.swg b/Lib/javascript/v8/javascriptinit.swg -index 86008d9..e83f478 100644 ---- a/Lib/javascript/v8/javascriptinit.swg -+++ b/Lib/javascript/v8/javascriptinit.swg -@@ -7,7 +7,7 @@ SWIG_V8_SetModule(void *, swig_module_info *swig_module) { - v8::Local global_obj = SWIGV8_CURRENT_CONTEXT()->Global(); - v8::Local mod = SWIGV8_EXTERNAL_NEW(swig_module); - assert(!mod.IsEmpty()); --#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#if (V8_MAJOR_VERSION-0) < 5 - global_obj->SetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data"), mod); - #else - v8::Local privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("swig_module_info_data")); -@@ -18,7 +18,7 @@ SWIG_V8_SetModule(void *, swig_module_info *swig_module) { - SWIGRUNTIME swig_module_info * - SWIG_V8_GetModule(void *) { - v8::Local global_obj = SWIGV8_CURRENT_CONTEXT()->Global(); --#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#if (V8_MAJOR_VERSION-0) < 5 - v8::Local moduleinfo = global_obj->GetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data")); - #else - v8::Local privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("swig_module_info_data")); -diff --git a/Lib/javascript/v8/javascriptrun.swg b/Lib/javascript/v8/javascriptrun.swg -index 30002c0..0af9f4e 100644 ---- a/Lib/javascript/v8/javascriptrun.swg -+++ b/Lib/javascript/v8/javascriptrun.swg -@@ -193,7 +193,7 @@ public: - void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Value> object, void *parameter); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy); --#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#elif (V8_MAJOR_VERSION-0) < 5 - void (*dtor) (const v8::WeakCallbackData &data); - #else - void (*dtor) (const v8::WeakCallbackInfo &data); -@@ -243,7 +243,7 @@ SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Val - SWIGV8_Proxy *proxy = static_cast(parameter); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) { --#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#elif (V8_MAJOR_VERSION-0) < 5 - SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(const v8::WeakCallbackData &data) { - SWIGV8_Proxy *proxy = data.GetParameter(); - #else -@@ -317,7 +317,7 @@ SWIGRUNTIME void SWIGV8_SetPrivateData(v8::Handle obj, void *ptr, sw - } else { - cdata->handle.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor); - } --#elifif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#elif (V8_MAJOR_VERSION-0) < 5 - if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) { - cdata->handle.SetWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor); - } else { -@@ -481,7 +481,7 @@ int SwigV8Packed_Check(v8::Handle valRef) { - - v8::Handle objRef = valRef->ToObject(); - if(objRef->InternalFieldCount() < 1) return false; --#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#if (V8_MAJOR_VERSION-0) < 5 - v8::Handle flag = objRef->GetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__")); - #else - v8::Local privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("__swig__packed_data__")); -@@ -537,7 +537,7 @@ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persist - SwigV8PackedData *cdata = static_cast(parameter); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persistent *object, SwigV8PackedData *cdata) { --#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#elif (V8_MAJOR_VERSION-0) < 5 - SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackData &data) { - v8::Local object = data.GetValue(); - SwigV8PackedData *cdata = data.GetParameter(); -@@ -558,7 +558,7 @@ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackInfoDispose(isolate); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - object->Dispose(); --#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#elif (V8_MAJOR_VERSION-0) < 5 - object.Clear(); - #endif - } -@@ -571,7 +571,7 @@ v8::Handle SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf - // v8::Handle obj = SWIGV8_OBJECT_NEW(); - v8::Local obj = SWIGV8_OBJECT_NEW(); - --#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#if (V8_MAJOR_VERSION-0) < 5 - obj->SetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__"), SWIGV8_BOOLEAN_NEW(true)); - #else - v8::Local privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("__swig__packed_data__")); -@@ -599,7 +599,7 @@ v8::Handle SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf - cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, _wrap_SwigV8PackedData_delete); - #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION) - cdata->handle.MakeWeak(cdata, _wrap_SwigV8PackedData_delete); --#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2) -+#elif (V8_MAJOR_VERSION-0) < 5 - cdata->handle.SetWeak(cdata, _wrap_SwigV8PackedData_delete); - // v8::V8::SetWeak(&cdata->handle, cdata, _wrap_SwigV8PackedData_delete); - #else --- -2.1.4 - diff --git a/buildroot/package/swig/swig.hash b/buildroot/package/swig/swig.hash index 77c93a96d..fdc57129b 100644 --- a/buildroot/package/swig/swig.hash +++ b/buildroot/package/swig/swig.hash @@ -1,2 +1,5 @@ # Locally computed: -sha256 7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d swig-3.0.12.tar.gz +sha256 7a00b4d0d53ad97a14316135e2d702091cd5f193bb58bcfcd8bc59d41e7887a9 swig-4.0.1.tar.gz +sha256 f53abaeed775018d519a1b9615f0ca17894772bd9ca21c2a156bf340ac41c13e LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-GPL +sha256 7f50d942373a871211c5efee03f3db2f9efd1cff1002b0ef8e3748baa611a5c2 LICENSE-UNIVERSITIES diff --git a/buildroot/package/swig/swig.mk b/buildroot/package/swig/swig.mk index 157d3a39a..5881a0e42 100644 --- a/buildroot/package/swig/swig.mk +++ b/buildroot/package/swig/swig.mk @@ -4,12 +4,12 @@ # ################################################################################ -SWIG_VERSION_MAJOR = 3.0 -SWIG_VERSION = $(SWIG_VERSION_MAJOR).12 +SWIG_VERSION_MAJOR = 4.0 +SWIG_VERSION = $(SWIG_VERSION_MAJOR).1 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION) -HOST_SWIG_DEPENDENCIES = host-bison +HOST_SWIG_DEPENDENCIES = host-bison host-pcre HOST_SWIG_CONF_OPTS = \ - --without-pcre \ + --with-pcre \ --disable-ccache \ --without-octave SWIG_LICENSE = GPL-3.0+, BSD-2-Clause, BSD-3-Clause @@ -27,6 +27,7 @@ SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES define HOST_SWIG_INSTALL_SYMLINK ln -fs swig $(HOST_DIR)/bin/swig$(SWIG_VERSION_MAJOR) + ln -fs swig $(HOST_DIR)/bin/swig3.0 endef HOST_SWIG_POST_INSTALL_HOOKS += HOST_SWIG_INSTALL_SYMLINK diff --git a/buildroot/package/swupdate/0001-Makefile-fix-static-build.patch b/buildroot/package/swupdate/0001-Makefile-fix-static-build.patch deleted file mode 100644 index 56901f987..000000000 --- a/buildroot/package/swupdate/0001-Makefile-fix-static-build.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 15a324f8c67548f219256a5a75ba8123cc5bdac6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 4 Mar 2019 21:51:36 +0100 -Subject: [PATCH] Makefile: fix static build - -Don't build and install lua_swupdate.so if HAVE_LUA isn't set to y -otherwise build will fail if the toolchain only suports building static -libraries - -Fixes: - - http://autobuild.buildroot.org/results/c11c4d26983e0347d96f3dda62e6d72b031967bb - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/sbabic/swupdate/pull/49] ---- - Makefile | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index cfeb9a6..cac99b5 100644 ---- a/Makefile -+++ b/Makefile -@@ -369,11 +369,15 @@ tools-bins := $(patsubst $(tools-y)/%.c,$(tools-y)/%,$(wildcard $(tools-y)/*.c)) - tools-bins-unstr:= $(patsubst %,%_unstripped,$(tools-bins)) - tools-all := $(tools-objs) - -+ifeq ($(HAVE_LUA),y) -+lua_swupdate := lua_swupdate.so -+endif -+ - shared-dirs := $(shareds-y) - shared-libs := $(patsubst %,%/built-in.o, $(shareds-y)) - shared-all := $(shared-libs) - --all: swupdate ${tools-bins} lua_swupdate.so -+all: swupdate ${tools-bins} ${lua_swupdate} - - # Do modpost on a prelinked vmlinux. The finally linked vmlinux has - # relevant sections renamed as per the linker script. -@@ -434,7 +438,6 @@ install: all - install -d ${DESTDIR}/usr/bin - install -d ${DESTDIR}/usr/include - install -d ${DESTDIR}/usr/lib -- install -d ${DESTDIR}/usr/lib/lua/$(LUAVER) - install -m 755 swupdate ${DESTDIR}/usr/bin - for i in ${tools-bins};do \ - install -m 755 $$i ${DESTDIR}/usr/bin; \ -@@ -443,7 +446,10 @@ install: all - install -m 0644 include/swupdate_status.h ${DESTDIR}/usr/include - install -m 0644 include/progress_ipc.h ${DESTDIR}/usr/include - install -m 0755 ipc/lib.a ${DESTDIR}/usr/lib/libswupdate.a -- install -m 0755 lua_swupdate.so $(DESTDIR)/usr/lib/lua/$(LUAVER) -+ if [ $(HAVE_LUA) = y ]; then \ -+ install -d ${DESTDIR}/usr/lib/lua/$(LUAVER); \ -+ install -m 0755 ${lua_swupdate} $(DESTDIR)/usr/lib/lua/$(LUAVER); \ -+ fi - - PHONY += run-tests - tests: \ --- -2.14.1 - diff --git a/buildroot/package/swupdate/Config.in b/buildroot/package/swupdate/Config.in index 3d1beae6b..c0081032b 100644 --- a/buildroot/package/swupdate/Config.in +++ b/buildroot/package/swupdate/Config.in @@ -24,16 +24,29 @@ config BR2_PACKAGE_SWUPDATE want to have Lua support. * Select BR2_PACKAGE_LIBCURL if you want to use the download feature. - * Select BR2_PACKAGE_OPENSSL is you want to add encryption - support. + * Select BR2_PACKAGE_OPENSSL or BR2_PACKAGE_MBEDTLS if you + want to add encryption support. * Select BR2_PACKAGE_MTD if you want to use swupdate with UBI partitions. * Select BR2_PACKAGE_ZLIB if you want to deal with gzip compressed archives. + * Select BR2_PACKAGE_ZSTD if you want to deal with zstd + compressed archives. * Select BR2_PACKAGE_UBOOT_TOOLS and BR2_PACKAGE_ZLIB to add support for setting the U-Boot environment. * Select BR2_PACKAGE_ZEROMQ to add support for using a remote handler. + * Select BR2_PACKAGE_LIBRSYNC to add support for using + rdiff handler. + * Select BR2_PACKAGE_LIBUBOOTENV to add support for setting + the U-Boot environment with the new API. + * Select BR2_PACKAGE_LIBGPIOD to add support for + microcontroller firmware update. + * Select BR2_PACKAGE_EFIBOOTMGR to add support for EFI Boot + Guard. + * Select BR2_PACKAGE_LIBCURL, BR2_PACKAGE_JSON_C, + BR2_PACKAGE_LIBWEBSOCKETS, and BR2_PACKAGE_LIBURIPARSER + to add support for the SWU forwarder. https://sbabic.github.io/swupdate diff --git a/buildroot/package/swupdate/swupdate.config b/buildroot/package/swupdate/swupdate.config index 730ebe500..9d255c8ee 100644 --- a/buildroot/package/swupdate/swupdate.config +++ b/buildroot/package/swupdate/swupdate.config @@ -53,27 +53,28 @@ CONFIG_EXTRA_LDLIBS="" # # EFI Boot Guard needs libebgenv and libz # +CONFIG_BOOTLOADER_NONE=y +# CONFIG_BOOTLOADER_GRUB is not set # # U-Boot support needs libubootenv, libz # -CONFIG_BOOTLOADER_NONE=y -# CONFIG_BOOTLOADER_GRUB is not set +CONFIG_SSL_IMPL_NONE=y # # Image downloading support needs libcurl # # -# Hash verification needs libssl +# Hash checking needs an SSL implementation # # -# Image verification (signed images) needs libssl +# Image signature verification needs an SSL implementation # # -# Image encryption needs libssl +# Image encryption needs an SSL implementation # # CONFIG_SURICATTA is not set CONFIG_WEBSERVER=y @@ -103,6 +104,7 @@ CONFIG_PARSERROOT="" # ubivol support needs libubi # CONFIG_RAW=y +# CONFIG_RDIFFHANDLER is not set # CONFIG_SHELLSCRIPTHANDLER is not set # @@ -120,4 +122,12 @@ CONFIG_RAW=y # # SWU forwarder requires libcurl # + +# +# swuforward handler needs json-c and curl +# # CONFIG_BOOTLOADERHANDLER is not set + +# +# Microcontroller handler depends on libgpiod +# diff --git a/buildroot/package/swupdate/swupdate.hash b/buildroot/package/swupdate/swupdate.hash index 138bd6d30..3de8d25f4 100644 --- a/buildroot/package/swupdate/swupdate.hash +++ b/buildroot/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a65884ca18523cde1b0744d952d6f91462dbd4ad07941305f5684c6d4ec833dc swupdate-2018.11.tar.gz +sha256 31b2561c9c91ab1e8b6f73704f9a3560816961c2cade4f5d5fc15f55c77ec819 swupdate-2019.11.tar.gz sha256 43492b377cf2fb67942d1dd231146bd4e6578646ad13ef289297c9dd75cbc478 Licenses/Exceptions sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt diff --git a/buildroot/package/swupdate/swupdate.mk b/buildroot/package/swupdate/swupdate.mk index 78f23ec23..2b51edb66 100644 --- a/buildroot/package/swupdate/swupdate.mk +++ b/buildroot/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2018.11 +SWUPDATE_VERSION = 2019.11 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0+ with OpenSSL exception, LGPL-2.1+, MIT SWUPDATE_LICENSE_FILES = Licenses/Exceptions Licenses/gpl-2.0.txt \ @@ -17,6 +17,13 @@ SWUPDATE_MAKE_ENV = CC="$(TARGET_CC)" LD="$(TARGET_CC)" # swupdate bundles its own version of mongoose (version 6.11) +ifeq ($(BR2_PACKAGE_EFIBOOTMGR),y) +SWUPDATE_DEPENDENCIES += efibootmgr +SWUPDATE_MAKE_ENV += HAVE_LIBEBGENV=y +else +SWUPDATE_MAKE_ENV += HAVE_LIBEBGENV=n +endif + ifeq ($(BR2_PACKAGE_JSON_C),y) SWUPDATE_DEPENDENCIES += json-c SWUPDATE_MAKE_ENV += HAVE_JSON_C=y @@ -45,6 +52,27 @@ else SWUPDATE_MAKE_ENV += HAVE_LIBCURL=n endif +ifeq ($(BR2_PACKAGE_LIBGPIOD),y) +SWUPDATE_DEPENDENCIES += libgpiod +SWUPDATE_MAKE_ENV += HAVE_LIBGPIOD=y +else +SWUPDATE_MAKE_ENV += HAVE_LIBGPIOD=n +endif + +ifeq ($(BR2_PACKAGE_LIBURIPARSER),y) +SWUPDATE_DEPENDENCIES += liburiparser +SWUPDATE_MAKE_ENV += HAVE_URIPARSER=y +else +SWUPDATE_MAKE_ENV += HAVE_URIPARSER=n +endif + +ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS),y) +SWUPDATE_DEPENDENCIES += libwebsockets +SWUPDATE_MAKE_ENV += HAVE_LIBWEBSOCKETS=y +else +SWUPDATE_MAKE_ENV += HAVE_LIBWEBSOCKETS=n +endif + ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER):$(BR2_STATIC_LIBS),y:) SWUPDATE_DEPENDENCIES += luainterpreter host-pkgconf # defines the base name for the pkg-config file ("lua" or "luajit") @@ -65,18 +93,33 @@ SWUPDATE_MAKE_ENV += HAVE_LIBMTD=n SWUPDATE_MAKE_ENV += HAVE_LIBUBI=n endif +# OpenSSL or mbedTLS ifeq ($(BR2_PACKAGE_OPENSSL),y) SWUPDATE_DEPENDENCIES += openssl SWUPDATE_MAKE_ENV += HAVE_LIBSSL=y SWUPDATE_MAKE_ENV += HAVE_LIBCRYPTO=y +SWUPDATE_MAKE_ENV += HAVE_MBEDTLS=n else SWUPDATE_MAKE_ENV += HAVE_LIBSSL=n SWUPDATE_MAKE_ENV += HAVE_LIBCRYPTO=n +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +SWUPDATE_DEPENDENCIES += mbedtls +SWUPDATE_MAKE_ENV += HAVE_MBEDTLS=y +else +SWUPDATE_MAKE_ENV += HAVE_MBEDTLS=n +endif +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +SWUPDATE_DEPENDENCIES += systemd endif ifeq ($(BR2_PACKAGE_UBOOT_TOOLS),y) SWUPDATE_DEPENDENCIES += uboot-tools SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=y +else ifeq ($(BR2_PACKAGE_LIBUBOOTENV),y) +SWUPDATE_DEPENDENCIES += libubootenv +SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=y else SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=n endif @@ -95,6 +138,17 @@ else SWUPDATE_MAKE_ENV += HAVE_ZLIB=n endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +SWUPDATE_DEPENDENCIES += zstd +SWUPDATE_MAKE_ENV += HAVE_ZSTD=y +else +SWUPDATE_MAKE_ENV += HAVE_ZSTD=n +endif + +ifeq ($(BR2_PACKAGE_LIBRSYNC),y) +SWUPDATE_DEPENDENCIES += librsync +endif + SWUPDATE_BUILD_CONFIG = $(@D)/.config SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) @@ -106,25 +160,18 @@ define SWUPDATE_PREFER_STATIC endef endif -define SWUPDATE_SET_BUILD_OPTIONS - $(call KCONFIG_SET_OPT,CONFIG_CROSS_COMPILE,"$(TARGET_CROSS)", \ - $(SWUPDATE_BUILD_CONFIG)) - $(call KCONFIG_SET_OPT,CONFIG_SYSROOT,"$(STAGING_DIR)", \ - $(SWUPDATE_BUILD_CONFIG)) - $(call KCONFIG_SET_OPT,CONFIG_EXTRA_CFLAGS,"$(TARGET_CFLAGS)", \ - $(SWUPDATE_BUILD_CONFIG)) - $(call KCONFIG_SET_OPT,CONFIG_EXTRA_LDFLAGS,"$(TARGET_LDFLAGS)", \ - $(SWUPDATE_BUILD_CONFIG)) -endef +SWUPDATE_MAKE_OPTS = \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ + CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" define SWUPDATE_KCONFIG_FIXUP_CMDS $(SWUPDATE_PREFER_STATIC) - $(SWUPDATE_SET_BUILD_OPTIONS) $(SWUPDATE_SET_LUA_VERSION) endef define SWUPDATE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) $(SWUPDATE_MAKE_OPTS) -C $(@D) endef define SWUPDATE_INSTALL_TARGET_CMDS diff --git a/buildroot/package/synergy/synergy.hash b/buildroot/package/synergy/synergy.hash index 664855fa3..8a053cf94 100644 --- a/buildroot/package/synergy/synergy.hash +++ b/buildroot/package/synergy/synergy.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 06d1cb1d43251b0b624212652e9c0ab2657d124ac4f7e7d0c7f3e448c953c2a8 synergy-v2.0.12-beta.tar.gz +sha256 06d1cb1d43251b0b624212652e9c0ab2657d124ac4f7e7d0c7f3e448c953c2a8 synergy-2.0.12-beta.tar.gz sha256 4921009cd76e7d38a8e873c362b25dbaf032c320bbb36a40dec775ddbdcbe1d8 LICENSE diff --git a/buildroot/package/synergy/synergy.mk b/buildroot/package/synergy/synergy.mk index 46c4fbb1e..63c6e5cbc 100644 --- a/buildroot/package/synergy/synergy.mk +++ b/buildroot/package/synergy/synergy.mk @@ -4,8 +4,8 @@ # ################################################################################ -SYNERGY_VERSION = v2.0.12-beta -SYNERGY_SITE = $(call github,symless,synergy-core,$(SYNERGY_VERSION)) +SYNERGY_VERSION = 2.0.12-beta +SYNERGY_SITE = $(call github,symless,synergy-core,v$(SYNERGY_VERSION)) SYNERGY_LICENSE = GPL-2.0 SYNERGY_LICENSE_FILES = LICENSE SYNERGY_DEPENDENCIES = xlib_libX11 xlib_libXtst diff --git a/buildroot/package/sysdig/Config.in b/buildroot/package/sysdig/Config.in index 672c44d21..0a1b3f893 100644 --- a/buildroot/package/sysdig/Config.in +++ b/buildroot/package/sysdig/Config.in @@ -7,15 +7,15 @@ config BR2_PACKAGE_SYSDIG depends on !BR2_STATIC_LIBS # luajit, elfutils depends on BR2_USE_WCHAR # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LUAJIT + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_JQ select BR2_PACKAGE_JSONCPP + select BR2_PACKAGE_LIBB64 select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LUAJIT select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_JQ - select BR2_PACKAGE_LIBB64 - select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_ZLIB help Sysdig is open source, system-level exploration: capture system state and activity from a running Linux @@ -23,7 +23,7 @@ config BR2_PACKAGE_SYSDIG Think of it as strace + tcpdump + lsof + awesome sauce. With a little Lua cherry on top. - http://sysdig.org + https://github.com/draios/sysdig/wiki comment "sysdig needs a glibc or uclibc toolchain w/ C++, gcc >= 4.8, dynamic library and a Linux kernel to be built" depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ diff --git a/buildroot/package/sysdig/sysdig.mk b/buildroot/package/sysdig/sysdig.mk index 9ac990e3e..c604032cf 100644 --- a/buildroot/package/sysdig/sysdig.mk +++ b/buildroot/package/sysdig/sysdig.mk @@ -8,10 +8,7 @@ SYSDIG_VERSION = 0.23.1 SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION)) SYSDIG_LICENSE = GPL-2.0 SYSDIG_LICENSE_FILES = COPYING -SYSDIG_CONF_OPTS = -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_ZLIB=OFF \ - -DUSE_BUNDLED_JSONCPP=OFF -DENABLE_DKMS=OFF -DUSE_BUNDLED_CURL=OFF \ - -DUSE_BUNDLED_NCURSES=OFF -DUSE_BUNDLED_OPENSSL=OFF \ - -DUSE_BUNDLED_JQ=OFF -DUSE_BUNDLED_B64=OFF +SYSDIG_CONF_OPTS = -DENABLE_DKMS=OFF -DUSE_BUNDLED_DEPS=OFF SYSDIG_DEPENDENCIES = zlib luajit jsoncpp libcurl ncurses openssl jq libb64 elfutils SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/buildroot/package/sysklogd/0001-Replace-deprecated-union-wait-with-int.patch b/buildroot/package/sysklogd/0001-Replace-deprecated-union-wait-with-int.patch deleted file mode 100644 index d3fc0dc18..000000000 --- a/buildroot/package/sysklogd/0001-Replace-deprecated-union-wait-with-int.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 76685540a7882926c54bc0d1a8945b7a6abffe40 Mon Sep 17 00:00:00 2001 -From: Ryan Coe -Date: Fri, 7 Oct 2016 19:42:40 -0700 -Subject: [PATCH] Replace deprecated union wait with int - -This is needed for compatibility with glibc >= 2.24. - -Signed-off-by: Ryan Coe ---- - syslogd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/syslogd.c b/syslogd.c -index ea73ea5..ace96c8 100644 ---- a/syslogd.c -+++ b/syslogd.c -@@ -2094,7 +2094,7 @@ void reapchild() - (void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */ - wait ((int *)0); - #else -- union wait status; -+ int status; - - while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0) - ; --- -2.7.4 - diff --git a/buildroot/package/sysklogd/0002-Fix-improper-header-includes.patch b/buildroot/package/sysklogd/0002-Fix-improper-header-includes.patch deleted file mode 100644 index 3518ef027..000000000 --- a/buildroot/package/sysklogd/0002-Fix-improper-header-includes.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 7a043f619a91fbb998863c08e3e5e94a4747b11d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 28 Nov 2016 23:07:36 +0100 -Subject: [PATCH] Fix improper header includes - -When building with the musl C library, a number of warnings indicate -that sysklogd is directly including headers that are considered internal -to the C library: - - - Instead of including , should be included. - - - Instead of including , should be included. - - - Instead of includeing , should be included. - -Signed-off-by: Thomas Petazzoni ---- - klogd.c | 2 +- - ksym_mod.c | 2 +- - syslog.c | 2 +- - syslogd.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/klogd.c b/klogd.c -index 6cc80ed..a173353 100644 ---- a/klogd.c -+++ b/klogd.c -@@ -260,7 +260,7 @@ - #include - #include - #include --#include -+#include - #include - #if !defined(__GLIBC__) - #include -diff --git a/ksym_mod.c b/ksym_mod.c -index 68cd6b6..2e69d65 100644 ---- a/ksym_mod.c -+++ b/ksym_mod.c -@@ -113,7 +113,7 @@ - #include - #include - #include --#include -+#include - #include - #include "module.h" - #if !defined(__GLIBC__) -diff --git a/syslog.c b/syslog.c -index bdb3ff2..f96b43c 100644 ---- a/syslog.c -+++ b/syslog.c -@@ -55,7 +55,7 @@ static char sccsid[] = "@(#)syslog.c 5.28 (Berkeley) 6/27/90"; - #include - #include - #include --#include -+#include - #include - #if 0 - #include "syslog.h" -diff --git a/syslogd.c b/syslogd.c -index ace96c8..b5e8054 100644 ---- a/syslogd.c -+++ b/syslogd.c -@@ -521,7 +521,7 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88"; - #define SYSLOG_NAMES - #include - #include --#include -+#include - #include - #include - #include --- -2.7.4 - diff --git a/buildroot/package/sysklogd/0003-Remove-include-of-linux-time.h.patch b/buildroot/package/sysklogd/0003-Remove-include-of-linux-time.h.patch deleted file mode 100644 index 374d89bd0..000000000 --- a/buildroot/package/sysklogd/0003-Remove-include-of-linux-time.h.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f4926a61ba2d3766255dd996bf0315bc8fa0c528 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 28 Nov 2016 23:09:03 +0100 -Subject: [PATCH] Remove include of - -klogd.c and ksym_mod.c currently include if GLIBC is not -defined. Unfortunately, this breaks badly with the musl C library: this -C library is not glibc so it doesn't define GLIBC, but it does have a -definition of "struct timespec" in its header file, which conflict with -the one provided by the Linux kernel headers. - -So, this commit simply gets rid of this header inclusion. - -Signed-off-by: Thomas Petazzoni ---- - klogd.c | 3 --- - ksym_mod.c | 3 --- - 2 files changed, 6 deletions(-) - -diff --git a/klogd.c b/klogd.c -index a173353..6505d96 100644 ---- a/klogd.c -+++ b/klogd.c -@@ -262,9 +262,6 @@ - #include - #include - #include --#if !defined(__GLIBC__) --#include --#endif /* __GLIBC__ */ - #include - #include - #include -diff --git a/ksym_mod.c b/ksym_mod.c -index 2e69d65..6e26da1 100644 ---- a/ksym_mod.c -+++ b/ksym_mod.c -@@ -116,9 +116,6 @@ - #include - #include - #include "module.h" --#if !defined(__GLIBC__) --#include --#endif /* __GLIBC__ */ - #include - #include - #include --- -2.7.4 - diff --git a/buildroot/package/sysklogd/0004-Remove-bogus-hand-written-klogctl-syscall-implementa.patch b/buildroot/package/sysklogd/0004-Remove-bogus-hand-written-klogctl-syscall-implementa.patch deleted file mode 100644 index 548f16071..000000000 --- a/buildroot/package/sysklogd/0004-Remove-bogus-hand-written-klogctl-syscall-implementa.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fe92a7a8197241f7d6b28ea3c8214bb6d2c7fda4 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 28 Nov 2016 23:10:55 +0100 -Subject: [PATCH] Remove bogus hand-written klogctl() syscall implementation - -The way the hand-written klogctl() syscall is written cannot compile, as -_syscall3() is just a function provided by the C library, so calling it -outside of a function doesn't build. - -Since the musl C library provides a klogctl() function, we don't need -this hand-written system call anyway. - -Signed-off-by: Thomas Petazzoni ---- - klogd.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/klogd.c b/klogd.c -index 6505d96..9219671 100644 ---- a/klogd.c -+++ b/klogd.c -@@ -274,13 +274,8 @@ - - #define __LIBRARY__ - #include --#if !defined(__GLIBC__) --# define __NR_ksyslog __NR_syslog --_syscall3(int,ksyslog,int, type, char *, buf, int, len); --#else - #include - #define ksyslog klogctl --#endif - - #define LOG_BUFFER_SIZE 4096 - #define LOG_LINE_LENGTH 1000 --- -2.7.4 - diff --git a/buildroot/package/sysklogd/0005-Add-missing-headers-for-open-flags.patch b/buildroot/package/sysklogd/0005-Add-missing-headers-for-open-flags.patch deleted file mode 100644 index 1a7ad8486..000000000 --- a/buildroot/package/sysklogd/0005-Add-missing-headers-for-open-flags.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0dff338a704f4ad11a2b78871e1f2a0b8030b4d2 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 28 Nov 2016 23:12:37 +0100 -Subject: [PATCH] Add missing headers for open() flags - -Both pidfile.c and syslog.c use open() and its flags, but forgets to -include all relevant headers, causing build failures with the musl C -library. - -Signed-off-by: Thomas Petazzoni ---- - pidfile.c | 2 ++ - syslog.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/pidfile.c b/pidfile.c -index e0959a0..14de56f 100644 ---- a/pidfile.c -+++ b/pidfile.c -@@ -26,8 +26,10 @@ - - #include - #include -+#include - #include - #include -+#include - #include - #include - #include -diff --git a/syslog.c b/syslog.c -index f96b43c..d09e7aa 100644 ---- a/syslog.c -+++ b/syslog.c -@@ -57,6 +57,8 @@ static char sccsid[] = "@(#)syslog.c 5.28 (Berkeley) 6/27/90"; - #include - #include - #include -+#include -+#include - #if 0 - #include "syslog.h" - #include "pathnames.h" --- -2.7.4 - diff --git a/buildroot/package/sysklogd/0006-syslogd.c-rename-dprintf-to-mydprintf.patch b/buildroot/package/sysklogd/0006-syslogd.c-rename-dprintf-to-mydprintf.patch deleted file mode 100644 index a1fb5331e..000000000 --- a/buildroot/package/sysklogd/0006-syslogd.c-rename-dprintf-to-mydprintf.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 68213f6902d291d2ba1626fd950fd7d4a1329d33 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 28 Nov 2016 23:13:08 +0100 -Subject: [PATCH] syslogd.c: rename dprintf() to mydprintf() - -There is an existing kludge in syslogd.c to rename all dprintf() -function calls and its definition to mydprintf(). This kludge is only -applied when the glibc C library is used (i.e when GLIBC is defined), -because glibc also provides a dprintf() function, with a different -signature and behavior. - -However, the musl C library also provides the dprintf() function (with -the same signature as the one in glibc, obviously), but does not define -the GLIBC macro, causing a conflicting definition of dprintf. - -This commit fixes that by having the rename kludge used unconditionally. - -Signed-off-by: Thomas Petazzoni ---- - syslogd.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/syslogd.c b/syslogd.c -index b5e8054..22a9ed5 100644 ---- a/syslogd.c -+++ b/syslogd.c -@@ -818,9 +818,7 @@ void doexit(int sig); - void init(); - void cfline(char *line, register struct filed *f); - int decode(char *name, struct code *codetab); --#if defined(__GLIBC__) - #define dprintf mydprintf --#endif /* __GLIBC__ */ - static void dprintf(char *, ...); - static void allocate_log(void); - void sighup_handler(); --- -2.7.4 - diff --git a/buildroot/package/sysklogd/Config.in b/buildroot/package/sysklogd/Config.in index 4188fb827..fda58e020 100644 --- a/buildroot/package/sysklogd/Config.in +++ b/buildroot/package/sysklogd/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_SYSKLOGD help System log daemons syslogd and klogd. - http://www.infodrom.org/projects/sysklogd/ + https://github.com/troglobit/sysklogd/ diff --git a/buildroot/package/sysklogd/klogd.service b/buildroot/package/sysklogd/klogd.service index c66795b44..b5dbb93d7 100644 --- a/buildroot/package/sysklogd/klogd.service +++ b/buildroot/package/sysklogd/klogd.service @@ -2,7 +2,7 @@ Description=Kernel Log Daemon [Service] -ExecStart=/usr/sbin/klogd -n +ExecStart=/sbin/klogd -n StandardOutput=null Restart=on-failure diff --git a/buildroot/package/sysklogd/sysklogd.hash b/buildroot/package/sysklogd/sysklogd.hash index dd5b89a88..6f7ab6ece 100644 --- a/buildroot/package/sysklogd/sysklogd.hash +++ b/buildroot/package/sysklogd/sysklogd.hash @@ -1,2 +1,3 @@ -# Locally calculated from download (no sig, hash) -sha256 5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201 sysklogd-1.5.1.tar.gz +# Locally calculated +sha256 1e9e18564c5bba474954d55ea6e2a0e3dc1bc145d8973c5fd098b088a9be9ceb sysklogd-1.6.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/buildroot/package/sysklogd/sysklogd.mk b/buildroot/package/sysklogd/sysklogd.mk index 976438c11..7a25d0eb6 100644 --- a/buildroot/package/sysklogd/sysklogd.mk +++ b/buildroot/package/sysklogd/sysklogd.mk @@ -4,24 +4,21 @@ # ################################################################################ -SYSKLOGD_VERSION = 1.5.1 -SYSKLOGD_SITE = http://www.infodrom.org/projects/sysklogd/download +SYSKLOGD_VERSION = 1.6 +SYSKLOGD_SITE = $(call github,troglobit,sysklogd,v$(SYSKLOGD_VERSION)) SYSKLOGD_LICENSE = GPL-2.0+ SYSKLOGD_LICENSE_FILES = COPYING +# From git +SYSKLOGD_AUTORECONF = YES +SYSKLOGD_CONF_OPTS = --exec-prefix=/ -# Override SKFLAGS which is used as CFLAGS. -define SYSKLOGD_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) SKFLAGS="$(TARGET_CFLAGS) -DSYSV" \ - -C $(@D) -endef - -define SYSKLOGD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0500 $(@D)/syslogd $(TARGET_DIR)/sbin/syslogd - $(INSTALL) -D -m 0500 $(@D)/klogd $(TARGET_DIR)/sbin/klogd +define SYSKLOGD_INSTALL_SAMPLE_CONFIG $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \ $(TARGET_DIR)/etc/syslog.conf endef +SYSKLOGD_POST_INSTALL_TARGET_HOOKS += SYSKLOGD_INSTALL_SAMPLE_CONFIG + define SYSKLOGD_INSTALL_INIT_SYSV $(INSTALL) -m 755 -D package/sysklogd/S01syslogd \ $(TARGET_DIR)/etc/init.d/S01syslogd @@ -34,11 +31,6 @@ define SYSKLOGD_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/syslogd.service $(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/klogd.service \ $(TARGET_DIR)/usr/lib/systemd/system/klogd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/syslogd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/syslogd.service - ln -sf ../../../usr/lib/systemd/system/syslogd.service \ - $(TARGET_DIR)/etc/systemd/system/syslog.service endef -$(eval $(generic-package)) +$(eval $(autotools-package)) diff --git a/buildroot/package/sysklogd/syslogd.service b/buildroot/package/sysklogd/syslogd.service index 70e4cff27..adaac679f 100644 --- a/buildroot/package/sysklogd/syslogd.service +++ b/buildroot/package/sysklogd/syslogd.service @@ -4,7 +4,7 @@ Requires=syslog.socket Wants=klogd.service [Service] -ExecStart=/usr/sbin/syslogd -m 0 -n +ExecStart=/sbin/syslogd -m 0 -n StandardOutput=null Restart=on-failure diff --git a/buildroot/package/syslog-ng/0002-build-make-dlsym-optional.patch b/buildroot/package/syslog-ng/0002-build-make-dlsym-optional.patch deleted file mode 100644 index bb29e1ed7..000000000 --- a/buildroot/package/syslog-ng/0002-build-make-dlsym-optional.patch +++ /dev/null @@ -1,160 +0,0 @@ -From d85121c0dc700cad4bd9735b0ee1dab9addf9dd7 Mon Sep 17 00:00:00 2001 -From: Kokan -Date: Thu, 17 Jan 2019 18:44:41 +0100 -Subject: [PATCH] build: make dlsym optional - -In case of static uClibc-ng lib, the does not exists. - -The signal-handler.c solves an issue in case of program src/dst -and Java destination. That combination is really rare if not impossible. - -This patch simply disables own sigaction if is not present. - -Signed-off-by: Kokan - -Downloaded from upstream commit -https://github.com/balabit/syslog-ng/commit/d85121c0dc700cad4bd9735b0ee1dab9addf9dd7 - -Signed-off-by: Chris Packham ---- - CMakeLists.txt | 1 + - configure.ac | 1 + - lib/CMakeLists.txt | 1 - - lib/Makefile.am | 1 - - lib/signal-handler.c | 8 ++++---- - lib/signal-handler.h | 31 ------------------------------- - syslog-ng-config.h.in | 1 + - 7 files changed, 7 insertions(+), 37 deletions(-) - delete mode 100644 lib/signal-handler.h - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c847a547b..dee691388 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,6 +106,7 @@ check_symbol_exists("getrandom" "sys/random.h" SYSLOG_NG_HAVE_GETRANDOM) - - check_include_files(utmp.h SYSLOG_NG_HAVE_UTMP_H) - check_include_files(utmpx.h SYSLOG_NG_HAVE_UTMPX_H) -+check_include_files(dlfcn.h SYSLOG_NG_HAVE_DLFCN_H) - - check_struct_has_member("struct utmpx" "ut_type" "utmpx.h" UTMPX_HAS_UT_TYPE LANGUAGE C) - check_struct_has_member("struct utmp" "ut_type" "utmp.h" UTMP_HAS_UT_TYPE LANGUAGE C) -diff --git a/configure.ac b/configure.ac -index 6bdd8d252..6ef0ad2b4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -627,6 +627,7 @@ dnl *************************************************************************** - - AC_HEADER_STDC - AC_CHECK_HEADER(dmalloc.h) -+AC_CHECK_HEADER(dlfcn.h) - AC_CHECK_HEADERS(strings.h \ - getopt.h \ - stropts.h \ -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index be2da32a4..5268712e9 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -91,7 +91,6 @@ set (LIB_HEADERS - logthrdestdrv.h - logwriter.h - mainloop.h -- signal-handler.h - mainloop-call.h - mainloop-worker.h - mainloop-io-worker.h -diff --git a/lib/Makefile.am b/lib/Makefile.am -index ec1928795..5f9e93d79 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -129,7 +129,6 @@ pkginclude_HEADERS += \ - lib/logthrdestdrv.h \ - lib/logwriter.h \ - lib/mainloop.h \ -- lib/signal-handler.h \ - lib/mainloop-call.h \ - lib/mainloop-worker.h \ - lib/mainloop-io-worker.h \ -diff --git a/lib/signal-handler.c b/lib/signal-handler.c -index 5657ba182..8f52f675b 100644 ---- a/lib/signal-handler.c -+++ b/lib/signal-handler.c -@@ -21,14 +21,15 @@ - * COPYING for details. - * - */ --#include "signal-handler.h" - - #include "syslog-ng.h" - #include "children.h" - --#ifndef _WIN32 -+#include -+ -+#if SYSLOG_NG_HAVE_DLFCN_H -+ - #include --#endif - - static const struct sigaction *sgchld_handler; - -@@ -41,7 +42,6 @@ trigger_sigchld_handler_chain(int signum) - } - } - --#ifndef _WIN32 - static int - call_original_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact) - { -diff --git a/lib/signal-handler.h b/lib/signal-handler.h -deleted file mode 100644 -index 36e5ac293..000000000 ---- a/lib/signal-handler.h -+++ /dev/null -@@ -1,31 +0,0 @@ --/* -- * Copyright (c) 2018 Balabit -- * Copyright (c) 2018 Kokan -- * -- * This library 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. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public -- * License along with this library; if not, write to the Free Software -- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -- * -- * As an additional exemption you are allowed to compile & link against the -- * OpenSSL libraries as published by the OpenSSL project. See the file -- * COPYING for details. -- * -- */ --#ifndef SIGNAL_HANDLER_H_INCLUDED --#define SIGNAL_HANDLER_H_INCLUDED -- --#include -- --void trigger_sigchld_handler_chain(int); -- --#endif -diff --git a/syslog-ng-config.h.in b/syslog-ng-config.h.in -index 9e372f103..d8208eedd 100644 ---- a/syslog-ng-config.h.in -+++ b/syslog-ng-config.h.in -@@ -38,6 +38,7 @@ - #cmakedefine SYSLOG_NG_PATH_XSDDIR "@SYSLOG_NG_PATH_XSDDIR@" - #cmakedefine SYSLOG_NG_HAVE_GETUTENT @SYSLOG_NG_HAVE_GETUTENT@ - #cmakedefine SYSLOG_NG_HAVE_GETUTXENT @SYSLOG_NG_HAVE_GETUTXENT@ -+#cmakedefine SYSLOG_NG_HAVE_DLFCN_H @SYSLOG_NG_HAVE_DLFCN_H@ - #cmakedefine SYSLOG_NG_HAVE_UTMPX_H @SYSLOG_NG_HAVE_UTMPX_H@ - #cmakedefine SYSLOG_NG_HAVE_UTMP_H @SYSLOG_NG_HAVE_UTMP_H@ - #cmakedefine SYSLOG_NG_HAVE_MODERN_UTMP @SYSLOG_NG_HAVE_MODERN_UTMP@ --- -2.20.1 - diff --git a/buildroot/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch b/buildroot/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch new file mode 100644 index 000000000..f5b2a39bb --- /dev/null +++ b/buildroot/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch @@ -0,0 +1,41 @@ +From 39ab118a7e79b223941b50b372c8ed51f0e21f4b Mon Sep 17 00:00:00 2001 +From: Thomas De Schampheleire +Date: Mon, 16 Mar 2020 15:41:03 +0100 +Subject: [PATCH] configure.ac: fix --with-netsnmp + +The option '--with-net-snmp' did not work, because later checks were using +the variable '$with_netsnmp' rather than '$with_net_snmp'. + +There are two possible solutions: +- make the option '--with-netsnmp' +- change the internal variables + +Taking into account that latest upstream has moved away from autotools and +towards cmake, we opt for the first option that has the least amount of +changes. + +Signed-off-by: Thomas De Schampheleire +Upstream-status: not applicable (latest upstream moved to cmake) + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index bfc85c32d..392ab8bf3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -148,8 +148,8 @@ AC_ARG_WITH(libnet, + , + [with_libnet=""]) + +-AC_ARG_WITH(net-snmp, +- [ --with-net-snmp=path use path to net-snmp-config script], ++AC_ARG_WITH(netsnmp, ++ [ --with-netsnmp=path use path to net-snmp-config script], + , + [with_netsnmp=""]) + +-- +2.24.1 + diff --git a/buildroot/package/syslog-ng/0003-look-for-pthread-atfork-also-in-libc-nonshared.patch b/buildroot/package/syslog-ng/0003-look-for-pthread-atfork-also-in-libc-nonshared.patch deleted file mode 100644 index 0f8454af9..000000000 --- a/buildroot/package/syslog-ng/0003-look-for-pthread-atfork-also-in-libc-nonshared.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a844abca43349739c36a4cdb7ea6f3bce560bd7f Mon Sep 17 00:00:00 2001 -From: Rolf Eike Beer -Date: Thu, 8 Nov 2018 08:14:46 +0100 -Subject: [PATCH] look for pthread_atfork() also in lib c_nonshared - -Newer versions of glibc do not have pthread_nonshared anymore, instead the -symbol is in c_nonshared. This fixes a crash on start on those platforms -(namely with syslog-ng). - -Signed-off-by: Rolf Eike Beer -[ThomasDS: backport from https://github.com/buytenh/ivykis/pull/16, at this -moment not yet merged upstream. -See also: -- https://github.com/buytenh/ivykis/issues/15 -- https://github.com/balabit/syslog-ng/issues/2263 -] -Signed-off-by: Thomas De Schampheleire - ---- - configure.ac | 2 ++ - src/pthr.h | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/ivykis/configure.ac b/lib/ivykis/configure.ac -index e9b10c0..56440d1 100644 ---- a/lib/ivykis/configure.ac -+++ b/lib/ivykis/configure.ac -@@ -88,6 +88,8 @@ esac - # link in libpthread_nonshared.a if it is available. - # - AC_CHECK_LIB([pthread_nonshared], [pthread_atfork]) -+# the lib is gone in glibc 2.28, things are now in c_nonshared -+AC_CHECK_LIB([c_nonshared], [pthread_atfork]) - - # Checks for header files. - AC_CHECK_HEADERS([process.h]) -diff --git a/lib/ivykis/src/pthr.h b/lib/ivykis/src/pthr.h -index a41eaf3..32c1af2 100644 ---- a/lib/ivykis/src/pthr.h -+++ b/lib/ivykis/src/pthr.h -@@ -42,7 +42,7 @@ static inline int pthreads_available(void) - * symbol because that causes it to be undefined even if you link - * libpthread_nonshared.a in explicitly. - */ --#ifndef HAVE_LIBPTHREAD_NONSHARED -+#if !defined(HAVE_LIBPTHREAD_NONSHARED) && !defined(HAVE_LIBC_NONSHARED) - #pragma weak pthread_atfork - #endif - diff --git a/buildroot/package/syslog-ng/Config.in b/buildroot/package/syslog-ng/Config.in index 6b3ad6752..30ad54a4b 100644 --- a/buildroot/package/syslog-ng/Config.in +++ b/buildroot/package/syslog-ng/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_SYSLOG_NG depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_EVENTLOG select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PCRE select BR2_PACKAGE_OPENSSL diff --git a/buildroot/package/syslog-ng/syslog-ng.conf b/buildroot/package/syslog-ng/syslog-ng.conf index 9a56a1302..e8b9f1fba 100644 --- a/buildroot/package/syslog-ng/syslog-ng.conf +++ b/buildroot/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.19 +@version: 3.24 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/buildroot/package/syslog-ng/syslog-ng.hash b/buildroot/package/syslog-ng/syslog-ng.hash index 1f83e39ff..62bc48a7a 100644 --- a/buildroot/package/syslog-ng/syslog-ng.hash +++ b/buildroot/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 5cf931a9d7bead0e6d9a2c65eee8f6005a005878f59aa280f3c4294257ed5178 syslog-ng-3.19.1.tar.gz +sha256 d4d0a0357b452be96b69d6f741129275530d8f0451e35adc408ad5635059fa3d syslog-ng-3.24.1.tar.gz sha256 835219c8ca76156e6337236d1bcb8e617c0b1c2783b4a8bc478e18a86743d607 COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/buildroot/package/syslog-ng/syslog-ng.mk b/buildroot/package/syslog-ng/syslog-ng.mk index 4ac25a675..ed8f0c712 100644 --- a/buildroot/package/syslog-ng/syslog-ng.mk +++ b/buildroot/package/syslog-ng/syslog-ng.mk @@ -6,12 +6,12 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 3.19.1 +SYSLOG_NG_VERSION = 3.24.1 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \ - eventlog libglib2 openssl pcre + libglib2 openssl pcre # We're patching configure.ac SYSLOG_NG_AUTORECONF = YES SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \ @@ -97,6 +97,14 @@ else SYSLOG_NG_CONF_OPTS += --disable-systemd endif +ifeq ($(BR2_PACKAGE_NETSNMP),y) +SYSLOG_NG_DEPENDENCIES += netsnmp +SYSLOG_NG_CONF_OPTS += --enable-snmp-dest +SYSLOG_NG_CONF_OPTS += --with-netsnmp="$(STAGING_DIR)/usr/bin" +else +SYSLOG_NG_CONF_OPTS += --disable-snmp-dest +endif + define SYSLOG_NG_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/syslog-ng/S01syslog-ng \ $(TARGET_DIR)/etc/init.d/S01syslog-ng @@ -105,11 +113,9 @@ endef # By default syslog-ng installs a .service that requires a config file at # /etc/default, so provide one with the default values. define SYSLOG_NG_INSTALL_INIT_SYSTEMD - $(INSTALL) -m 0644 -D package/syslog-ng/syslog-ng@default \ - $(TARGET_DIR)/etc/default/syslog-ng@default - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/syslog-ng@.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/syslog-ng@default.service + mkdir $(TARGET_DIR)/usr/lib/systemd/system/syslog-ng@.service.d + printf '[Install]\nDefaultInstance=default\n' \ + >$(TARGET_DIR)/usr/lib/systemd/system/syslog-ng@.service.d/buildroot-default-instance.conf endef # By default syslog-ng installs a number of sample configuration diff --git a/buildroot/package/sysprof/sysprof.hash b/buildroot/package/sysprof/sysprof.hash index 8541ecc1a..4ce206be0 100644 --- a/buildroot/package/sysprof/sysprof.hash +++ b/buildroot/package/sysprof/sysprof.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 baf03c6fc01a845c705873e6fc7927aa89539dcda6963f9ec4c8eb4c086a64f1 sysprof-1.2.0.tar.gz +sha256 baf03c6fc01a845c705873e6fc7927aa89539dcda6963f9ec4c8eb4c086a64f1 sysprof-1.2.0.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/sysprof/sysprof.mk b/buildroot/package/sysprof/sysprof.mk index 033194a53..9823416e3 100644 --- a/buildroot/package/sysprof/sysprof.mk +++ b/buildroot/package/sysprof/sysprof.mk @@ -14,10 +14,4 @@ ifeq ($(BR2_PACKAGE_SYSPROF_GUI),y) SYSPROF_DEPENDENCIES += libgtk2 libglade gdk-pixbuf endif -define SYSPROF_CREATE_M4_DIR - mkdir -p $(@D)/m4 -endef - -SYSPROF_POST_PATCH_HOOKS += SYSPROF_CREATE_M4_DIR - $(eval $(autotools-package)) diff --git a/buildroot/package/sysrepo/0001-sysrepo-plugind-CHANGE-create-plugins-dir-if-it-does.patch b/buildroot/package/sysrepo/0001-sysrepo-plugind-CHANGE-create-plugins-dir-if-it-does.patch new file mode 100644 index 000000000..31d27f508 --- /dev/null +++ b/buildroot/package/sysrepo/0001-sysrepo-plugind-CHANGE-create-plugins-dir-if-it-does.patch @@ -0,0 +1,41 @@ +From 28c27e2001b709a9cae1db0aba2185ec86ba0454 Mon Sep 17 00:00:00 2001 +From: Michal Vasko +Date: Thu, 19 Dec 2019 14:01:00 +0100 +Subject: [PATCH 1/9] sysrepo-plugind CHANGE create plugins dir if it does not + exist + +Fixes #1719 + +[Patch from https://github.com/sysrepo/sysrepo/commit/28c27e2001b709a9cae1db0aba2185ec86ba0454] + +Signed-off-by: Heiko Thiery +--- + src/executables/sysrepo-plugind.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/executables/sysrepo-plugind.c b/src/executables/sysrepo-plugind.c +index 6b11bad6..ddb41c26 100644 +--- a/src/executables/sysrepo-plugind.c ++++ b/src/executables/sysrepo-plugind.c +@@ -225,6 +225,18 @@ load_plugins(struct srpd_plugin_s **plugins, int *plugin_count) + plugins_dir = SRPD_PLUGINS_PATH; + } + ++ /* create the directory if it does not exist */ ++ if (access(plugins_dir, F_OK) == -1) { ++ if (errno != ENOENT) { ++ error_print(0, "Checking plugins dir existence failed (%s).", strerror(errno)); ++ return -1; ++ } ++ if (mkdir(plugins_dir, 00777) == -1) { ++ error_print(0, "Creating plugins dir \"%s\" failed (%s).", plugins_dir, strerror(errno)); ++ return -1; ++ } ++ } ++ + dir = opendir(plugins_dir); + if (!dir) { + error_print(0, "Opening \"%s\" directory failed (%s).", plugins_dir, strerror(errno)); +-- +2.20.1 + diff --git a/buildroot/package/sysrepo/0002-sysrpeo-plugind-BUGFIX-create-plugins-dir-recursivel.patch b/buildroot/package/sysrepo/0002-sysrpeo-plugind-BUGFIX-create-plugins-dir-recursivel.patch new file mode 100644 index 000000000..9b9734f22 --- /dev/null +++ b/buildroot/package/sysrepo/0002-sysrpeo-plugind-BUGFIX-create-plugins-dir-recursivel.patch @@ -0,0 +1,65 @@ +From 353faffe13852c4204f158b5d4301405bd222c44 Mon Sep 17 00:00:00 2001 +From: Michal Vasko +Date: Fri, 20 Dec 2019 13:40:35 +0100 +Subject: [PATCH 9/9] sysrpeo-plugind BUGFIX create plugins dir recursively + +Refs #1719 + +[Patch from https://github.com/sysrepo/sysrepo/commit/353faffe13852c4204f158b5d4301405bd222c44] + +Signed-off-by: Heiko Thiery +--- + src/executables/sysrepo-plugind.c | 30 +++++++++++++++++++++++++++++- + 1 file changed, 29 insertions(+), 1 deletion(-) + +diff --git a/src/executables/sysrepo-plugind.c b/src/executables/sysrepo-plugind.c +index ddb41c26..ca22140e 100644 +--- a/src/executables/sysrepo-plugind.c ++++ b/src/executables/sysrepo-plugind.c +@@ -206,6 +206,34 @@ daemon_init(int debug, sr_log_level_t log_level) + sr_log_syslog("sysrepo-plugind", log_level); + } + ++/* from src/common.c */ ++int ++sr_mkpath(const char *path, mode_t mode) ++{ ++ char *p, *dup; ++ ++ dup = strdup(path); ++ for (p = strchr(dup + 1, '/'); p; p = strchr(p + 1, '/')) { ++ *p = '\0'; ++ if (mkdir(dup, mode) == -1) { ++ if (errno != EEXIST) { ++ *p = '/'; ++ return -1; ++ } ++ } ++ *p = '/'; ++ } ++ free(dup); ++ ++ if (mkdir(path, mode) == -1) { ++ if (errno != EEXIST) { ++ return -1; ++ } ++ } ++ ++ return 0; ++} ++ + static int + load_plugins(struct srpd_plugin_s **plugins, int *plugin_count) + { +@@ -231,7 +259,7 @@ load_plugins(struct srpd_plugin_s **plugins, int *plugin_count) + error_print(0, "Checking plugins dir existence failed (%s).", strerror(errno)); + return -1; + } +- if (mkdir(plugins_dir, 00777) == -1) { ++ if (sr_mkpath(plugins_dir, 00777) == -1) { + error_print(0, "Creating plugins dir \"%s\" failed (%s).", plugins_dir, strerror(errno)); + return -1; + } +-- +2.20.1 + diff --git a/buildroot/package/sysrepo/Config.in b/buildroot/package/sysrepo/Config.in new file mode 100644 index 000000000..31f817faa --- /dev/null +++ b/buildroot/package/sysrepo/Config.in @@ -0,0 +1,34 @@ +config BR2_PACKAGE_SYSREPO + bool "sysrepo" + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # host-protobuf + select BR2_PACKAGE_LIBAVL + select BR2_PACKAGE_LIBEV + select BR2_PACKAGE_LIBYANG + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE_UCP + select BR2_PACKAGE_PROTOBUF_C + help + Sysrepo is an YANG-based configuration and operational state + data store for Unix/Linux applications. + + https://github.com/sysrepo + +if BR2_PACKAGE_SYSREPO + +config BR2_PACKAGE_SYSREPO_EXAMPLES + bool "enable examples" + help + Enable sysrepo examples. + +endif + +comment "sysrepo needs a toolchain w/ C++, NPTL, dynamic library, gcc >= 4.8" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" diff --git a/buildroot/package/sysrepo/S51sysrepo-plugind b/buildroot/package/sysrepo/S51sysrepo-plugind new file mode 100644 index 000000000..74b68396b --- /dev/null +++ b/buildroot/package/sysrepo/S51sysrepo-plugind @@ -0,0 +1,53 @@ +#!/bin/sh + +DAEMON="sysrepo-plugind" +PIDFILE="/var/run/$DAEMON.pid" + +SYSREPO_PLUGIND_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ + -- $SYSREPO_PLUGIND_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p $PIDFILE + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +reload() { + # we do not support real reload .. just restart + restart +} + +case "$1" in + start|stop|restart|reload) + "$1";; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/buildroot/package/sysrepo/sysrepo.hash b/buildroot/package/sysrepo/sysrepo.hash new file mode 100644 index 000000000..ff2e1166b --- /dev/null +++ b/buildroot/package/sysrepo/sysrepo.hash @@ -0,0 +1,2 @@ +sha256 be405a33b1713d1114f3c092a6349b25a2de2a0f43a15dc6984c029f70230b3b sysrepo-1.3.21.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/buildroot/package/sysrepo/sysrepo.mk b/buildroot/package/sysrepo/sysrepo.mk new file mode 100644 index 000000000..5f87ac38a --- /dev/null +++ b/buildroot/package/sysrepo/sysrepo.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# sysrepo +# +################################################################################ + +SYSREPO_VERSION = 1.3.21 +SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) +SYSREPO_INSTALL_STAGING = YES +SYSREPO_LICENSE = Apache-2.0 +SYSREPO_LICENSE_FILES = LICENSE +SYSREPO_DEPENDENCIES = libev libavl libyang pcre protobuf-c host-sysrepo +HOST_SYSREPO_DEPENDENCIES = host-libev host-libavl host-libyang host-pcre host-protobuf-c + +SYSREPO_CONF_OPTS = \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +SYSREPO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +define SYSREPO_INSTALL_INIT_SYSV + $(INSTALL) -m 755 -D package/sysrepo/S51sysrepo-plugind \ + $(TARGET_DIR)/etc/init.d/S51sysrepo-plugind +endef + +HOST_SYSREPO_CONF_OPTS = \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_EXAMPLES=OFF \ + -DREPO_PATH=$(TARGET_DIR)/etc/sysrepo + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/buildroot/package/systemd-bootchart/systemd-bootchart.hash b/buildroot/package/systemd-bootchart/systemd-bootchart.hash index 40643dbca..808588324 100644 --- a/buildroot/package/systemd-bootchart/systemd-bootchart.hash +++ b/buildroot/package/systemd-bootchart/systemd-bootchart.hash @@ -1,2 +1,3 @@ # sha256 locally computed -sha256 f4cb17b21928e36ec27de5c5294dea6ec1de4acd7ee6c56d6ecc75319cbcaefa systemd-bootchart-233.tar.xz +sha256 f4cb17b21928e36ec27de5c5294dea6ec1de4acd7ee6c56d6ecc75319cbcaefa systemd-bootchart-233.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/buildroot/package/systemd-bootchart/systemd-bootchart.mk b/buildroot/package/systemd-bootchart/systemd-bootchart.mk index 62bc79539..bcc3dbe22 100644 --- a/buildroot/package/systemd-bootchart/systemd-bootchart.mk +++ b/buildroot/package/systemd-bootchart/systemd-bootchart.mk @@ -16,10 +16,4 @@ SYSTEMD_BOOTCHART_DEPENDENCIES = systemd SYSTEMD_BOOTCHART_CONF_OPTS = --disable-man -define SYSTEMD_BOOTCHART_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -sf ../../../../lib/systemd/system/systemd-bootchart.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/systemd-bootchart.service -endef - $(eval $(autotools-package)) diff --git a/buildroot/package/systemd/0001-fix-getty-unit.patch b/buildroot/package/systemd/0001-fix-getty-unit.patch deleted file mode 100644 index a12569f49..000000000 --- a/buildroot/package/systemd/0001-fix-getty-unit.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 69e440f9b7a0e9a43ef582d4bb521722b448a7c2 Mon Sep 17 00:00:00 2001 -From: Maxime Ripard -Date: Mon, 31 Jul 2017 10:08:46 -0400 -Subject: [PATCH] fix-getty-unit -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Prefer getty to agetty in console setup systemd units - -Signed-off-by: Maxime Ripard -Signed-off-by: Eric Le Bihan -[aduskett@gmail.com: Update for systemd v237] -Signed-off-by: Adam Duskett -[Jérémy: replace additional usage of agetty by getty.] -Signed-off-by: Jérémy Rosen ---- - units/console-getty.service.m4 | 2 +- - units/container-getty@.service.m4 | 2 +- - units/getty@.service.m4 | 5 +---- - units/serial-getty@.service.m4 | 2 +- - 4 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/units/console-getty.service.m4 b/units/console-getty.service.m4 -index 3c553240a..fd5ad9456 100644 ---- a/units/console-getty.service.m4 -+++ b/units/console-getty.service.m4 -@@ -23,7 +23,7 @@ ConditionPathExists=/dev/console - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM -+ExecStart=-/sbin/getty -L console 115200 vt100 - Type=idle - Restart=always - UtmpIdentifier=cons -diff --git a/units/container-getty@.service.m4 b/units/container-getty@.service.m4 -index 087ab7f9b..30f7b66fe 100644 ---- a/units/container-getty@.service.m4 -+++ b/units/container-getty@.service.m4 -@@ -28,7 +28,7 @@ Before=rescue.service - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM -+ExecStart=-/sbin/getty -L %I 115200 vt100 - Type=idle - Restart=always - RestartSec=0 -diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 -index 80e793bb7..385758c61 100644 ---- a/units/getty@.service.m4 -+++ b/units/getty@.service.m4 -@@ -35,10 +35,7 @@ ConditionPathExists=/dev/tty0 - - [Service] - # the VT is cleared by TTYVTDisallocate --# The '-o' option value tells agetty to replace 'login' arguments with an --# option to preserve environment (-p), followed by '--' for safety, and then --# the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM -+ExecStart=-/sbin/getty -L %I 115200 vt100 - Type=idle - Restart=always - RestartSec=0 -diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 -index 757b86ab2..3d60efdb6 100644 ---- a/units/serial-getty@.service.m4 -+++ b/units/serial-getty@.service.m4 -@@ -33,7 +33,7 @@ Before=rescue.service - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,38400,9600 %I $TERM -+ExecStart=-/sbin/getty -L %I 115200 vt100 - Type=idle - Restart=always - UtmpIdentifier=%I --- -2.14.4 - diff --git a/buildroot/package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch b/buildroot/package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch new file mode 100644 index 000000000..e74df10e9 --- /dev/null +++ b/buildroot/package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch @@ -0,0 +1,39 @@ +From 806e2011a0ea684b10a07b74c4ee0f817437e8c6 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 1 Mar 2020 15:19:01 +0100 +Subject: [PATCH] random-seed: add missing header for GRND_NONBLOCK + +GRND_NONBLOCK has been introduced with the 3.17 kernel version [1] +while adding getrandom(2) system call. + +The header missing_random.h is needed for random-seed.c when building +with old toolchain, such Sourcery CodeBench ARM 2014.05. + +Fixes: +https://gitlab.com/buildroot.org/buildroot/-/jobs/454255917 + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?id=c6e9d6f38894798696f23c8084ca7edbf16ee895 + +Upstream status: +https://github.com/systemd/systemd/pull/14988 + +Signed-off-by: Romain Naour +--- + src/random-seed/random-seed.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c +index 2fcbcb281a..596bff98f1 100644 +--- a/src/random-seed/random-seed.c ++++ b/src/random-seed/random-seed.c +@@ -19,6 +19,7 @@ + #include "io-util.h" + #include "log.h" + #include "main-func.h" ++#include "missing_random.h" + #include "missing_syscall.h" + #include "mkdir.h" + #include "parse-util.h" +-- +2.24.1 + diff --git a/buildroot/package/systemd/0002-install-don-t-use-ln-relative.patch b/buildroot/package/systemd/0002-install-don-t-use-ln-relative.patch deleted file mode 100644 index 793320778..000000000 --- a/buildroot/package/systemd/0002-install-don-t-use-ln-relative.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 7f4a12d25bbb5859d266f32f7a3d794bb62c354e Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Sun, 31 Dec 2017 12:46:04 -0500 -Subject: [PATCH] install: don't use ln --relative - -Oldish enterprise-class distributions have too old versions of -coreutils, with ln not supporting --relative. - -So we fake it. - -ln --relative would create minimalist relative paths, but they are not -trivial to generate. Instead, we always create paths relative to the -root, i.e.: - - ln -s --relative /usr/bin/foo /usr/sbin/foo - -would create: /usr/sbin/foo -> ../bin/foo -while we do : /usr/sbin/foo -> ../../usr/bin/foo - -Signed-off-by: "Yann E. MORIN" -[aduskett@gmail.com: Added meson.build section and dirname wrapper in add-wants] -[aduskett@gmail.com: Update for systemd v237] -Signed-off-by: Adam Duskett -[tpiepho@impinj.com: Fix add-wants wrapper] -Signed-off-by: Trent Piepho ---- - meson.build | 2 +- - tools/meson-make-symlink.sh | 3 ++- - units/meson-add-wants.sh | 6 ++++-- - 3 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index 04331dd41..359042c04 100644 ---- a/meson.build -+++ b/meson.build -@@ -628,7 +628,7 @@ endforeach - conf.set_quoted('TELINIT', get_option('telinit-path')) - - if run_command('ln', '--relative', '--help').returncode() != 0 -- error('ln does not support --relative (added in coreutils 8.16)') -+ message('ln does not support --relative (added in coreutils 8.16)') - endif - - ############################################################ -diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh -index 501cd43d4..25e7f89fd 100755 ---- a/tools/meson-make-symlink.sh -+++ b/tools/meson-make-symlink.sh -@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")" - if [ "$(dirname $1)" = . ]; then - ln -vfs -T "$1" "${DESTDIR:-}$2" - else -- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" -+ dds="$( dirname "$2" |sed -r -e 's:/+[^/]+:../:g; s:/$::' )" -+ ln -vfs -T "${dds}$1" "${DESTDIR:-}$2" - fi -diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh -index 70f7172ae..bb8155075 100755 ---- a/units/meson-add-wants.sh -+++ b/units/meson-add-wants.sh -@@ -14,7 +14,7 @@ case "$target" in - ;; - esac - --unitpath="${DESTDIR:-}${unitdir}/${unit}" -+unitpath="${unitdir}/${unit}" - - case "$target" in - */) -@@ -25,4 +25,6 @@ case "$target" in - ;; - esac - --ln -vfs --relative "$unitpath" "$dir" -+[ ! -d "${dir}" ] && linkdir=`dirname "${dir}"` || linkdir="${dir}" -+dds="$(printf "%s" "${linkdir#${DESTDIR:-}}" |sed -r -e 's:/+[^/]+:../:g; s:/$::')" -+ln -vfs "$dds$unitpath" "$dir" --- -2.14.4 - diff --git a/buildroot/package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch b/buildroot/package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch deleted file mode 100644 index 70d816fae..000000000 --- a/buildroot/package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 180a940333c84495015bd5b24d41c1dbfff509f2 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 27 Dec 2018 09:16:20 +0800 -Subject: [PATCH] meson: use cross compilation compatible c++ check - -[james.hilliard1@gmail.com: backport from upstream commit -46e63a2a3ed46ce97430ce38e4cc0798c57900eb] -Signed-off-by: James Hilliard ---- - meson.build | 4 +--- - src/systemd/meson.build | 3 +-- - src/test/meson.build | 2 +- - 3 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index b338886..1964b1a 100644 ---- a/meson.build -+++ b/meson.build -@@ -287,10 +287,8 @@ want_tests = get_option('tests') - slow_tests = want_tests != 'false' and get_option('slow-tests') - install_tests = get_option('install-tests') - --cxx = find_program('c++', required : fuzzer_build) --if cxx.found() -+if add_languages('cpp', required : fuzzer_build) - # Used only for tests -- add_languages('cpp') - cxx_cmd = ' '.join(meson.get_compiler('cpp').cmd_array()) - else - cxx_cmd = '' -diff --git a/src/systemd/meson.build b/src/systemd/meson.build -index e0c967e..75c48b0 100644 ---- a/src/systemd/meson.build -+++ b/src/systemd/meson.build -@@ -52,8 +52,7 @@ if cc.has_argument('-std=iso9899:2017') - opts += [['c', '-std=iso9899:2017']] - endif - --cxx = find_program('c++', required : false) --if cxx.found() -+if add_languages('cpp', required : false) - opts += [['c++'], - ['c++', '-std=c++98'], - ['c++', '-std=c++11']] -diff --git a/src/test/meson.build b/src/test/meson.build -index ea049a6..d9d87e0 100644 ---- a/src/test/meson.build -+++ b/src/test/meson.build -@@ -957,7 +957,7 @@ tests += [ - - ] - --if cxx.found() -+if cxx_cmd != '' - tests += [ - [['src/libsystemd/sd-bus/test-bus-vtable-cc.cc'], - [], --- -2.7.4 - diff --git a/buildroot/package/systemd/0004-capability-fix-build-without-PR_CAP_AMBIENT.patch b/buildroot/package/systemd/0004-capability-fix-build-without-PR_CAP_AMBIENT.patch deleted file mode 100644 index 7b240d1b1..000000000 --- a/buildroot/package/systemd/0004-capability-fix-build-without-PR_CAP_AMBIENT.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 822809d0afd0f984750a61b2391059411afa4333 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 11 Jan 2019 16:07:00 +0100 -Subject: [PATCH] capability: fix build without PR_CAP_AMBIENT - -systemd fails to build on kernel without PR_CAP_AMBIENT (< 4.3) since -https://github.com/systemd/systemd/commit/2a03bb3e65327c73008f1db485ffc75c432dc6b2 - -To fix this error, include missing_prctl.h in all files using -PR_CAP_AMBIENT - -Fixes: - - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/systemd/systemd/pull/11400] ---- - src/basic/capability-util.c | 1 + - src/test/test-capability.c | 1 + - src/test/test-execute.c | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c -index a3f3ca9f5..b944ee6ea 100644 ---- a/src/basic/capability-util.c -+++ b/src/basic/capability-util.c -@@ -13,6 +13,7 @@ - #include "fileio.h" - #include "log.h" - #include "macro.h" -+#include "missing_prctl.h" - #include "parse-util.h" - #include "user-util.h" - #include "util.h" -diff --git a/src/test/test-capability.c b/src/test/test-capability.c -index dae85f2f9..3db05878a 100644 ---- a/src/test/test-capability.c -+++ b/src/test/test-capability.c -@@ -13,6 +13,7 @@ - #include "fd-util.h" - #include "fileio.h" - #include "macro.h" -+#include "missing_prctl.h" - #include "parse-util.h" - #include "tests.h" - #include "util.h" -diff --git a/src/test/test-execute.c b/src/test/test-execute.c -index 2115061ad..cea68b8cf 100644 ---- a/src/test/test-execute.c -+++ b/src/test/test-execute.c -@@ -13,6 +13,7 @@ - #include "fs-util.h" - #include "macro.h" - #include "manager.h" -+#include "missing_prctl.h" - #include "mkdir.h" - #include "path-util.h" - #include "rm-rf.h" --- -2.14.1 - diff --git a/buildroot/package/systemd/0005-basic-tmpfile-util.c-fix-build-without-O_TMPFILE.patch b/buildroot/package/systemd/0005-basic-tmpfile-util.c-fix-build-without-O_TMPFILE.patch deleted file mode 100644 index 300fc544f..000000000 --- a/buildroot/package/systemd/0005-basic-tmpfile-util.c-fix-build-without-O_TMPFILE.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b1ca50178b97b3b827b0420ec7bdf9cb1d6fec56 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 11 Jan 2019 16:36:06 +0100 -Subject: [PATCH] basic/tmpfile-util.c: fix build without O_TMPFILE - -systemd fails to build on kernel without O_TMPFILE (< 3.11) since -https://github.com/systemd/systemd/commit/dea72eda9cdbfeedd24cbe8c734ad0639bf96cde - -To fix this error, include missing_fcntl.h - -Fixes: - - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/systemd/systemd/pull/11400] ---- - src/basic/tmpfile-util.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/basic/tmpfile-util.c b/src/basic/tmpfile-util.c -index 669eb2666..bc92d6a6d 100644 ---- a/src/basic/tmpfile-util.c -+++ b/src/basic/tmpfile-util.c -@@ -8,6 +8,7 @@ - #include "hexdecoct.h" - #include "macro.h" - #include "memfd-util.h" -+#include "missing_fcntl.h" - #include "missing_syscall.h" - #include "path-util.h" - #include "process-util.h" --- -2.14.1 - diff --git a/buildroot/package/systemd/0006-missing_if_link.h-add-IFLA_BOND_MODE.patch b/buildroot/package/systemd/0006-missing_if_link.h-add-IFLA_BOND_MODE.patch deleted file mode 100644 index ace29be6a..000000000 --- a/buildroot/package/systemd/0006-missing_if_link.h-add-IFLA_BOND_MODE.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9ab48a9b3bfadca4fbe055ddb4f6fc677ee4ae85 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 11 Jan 2019 17:08:48 +0100 -Subject: [PATCH] missing_if_link.h: add IFLA_BOND_MODE - -systemd fails to build on kernel without IFLA_BOND_MODE (< 3.13) since -https://github.com/systemd/systemd/commit/9714c020fc4cda1823c2a77e3fd08aefa7d78b25 - -So put back IFLA_BOND_MODE definition - -Fixes: - - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/systemd/systemd/pull/11400] ---- - meson.build | 1 + - src/basic/missing_if_link.h | 3 +++ - 2 files changed, 4 insertions(+) - -diff --git a/meson.build b/meson.build -index 623c1ad6b..011e44980 100644 ---- a/meson.build -+++ b/meson.build -@@ -476,6 +476,7 @@ foreach decl : [['ETHTOOL_LINK_MODE_10baseT_Half_BIT', 'linux/ethtool.h'], - ['IFLA_TARGET_NETNSID', 'linux/if_link.h'], - ['IFLA_NEW_IFINDEX', 'linux/if_link.h'], - ['IFLA_MAX_MTU', 'linux/if_link.h'], -+ ['IFLA_BOND_MODE', 'linux/if_link.h'], - ['IFLA_BOND_ACTIVE_SLAVE', 'linux/if_link.h'], - ['IFLA_BOND_AD_INFO', 'linux/if_link.h'], - ['IFLA_BOND_AD_ACTOR_SYSTEM', 'linux/if_link.h'], -diff --git a/src/basic/missing_if_link.h b/src/basic/missing_if_link.h -index 07675426b..761797f56 100644 ---- a/src/basic/missing_if_link.h -+++ b/src/basic/missing_if_link.h -@@ -110,6 +110,9 @@ enum ipvlan_mode { - #define IFLA_MAX 51 - #endif - -+#if !HAVE_IFLA_BOND_MODE /* linux@90af231106c0b8d223c27d35464af95cb3d9cacf (3.13) */ -+#define IFLA_BOND_MODE 1 -+#endif - #if !HAVE_IFLA_BOND_ACTIVE_SLAVE /* linux@ec76aa49855f6d6fea5e01de179fb57dd47c619d (3.13) */ - #define IFLA_BOND_ACTIVE_SLAVE 2 - #endif --- -2.14.1 - diff --git a/buildroot/package/systemd/0007-missing_syscall.h-include-errno.h.patch b/buildroot/package/systemd/0007-missing_syscall.h-include-errno.h.patch deleted file mode 100644 index eb5d9eacb..000000000 --- a/buildroot/package/systemd/0007-missing_syscall.h-include-errno.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 985d15d636b4d2c7086dbd305369c02756cdbe19 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 11 Jan 2019 17:24:21 +0100 -Subject: [PATCH] missing_syscall.h: include errno.h - -This include is needed for errno and ENOSYS - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/systemd/systemd/pull/11400] ---- - src/basic/missing_syscall.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index d5d4b26ac..d1aa32218 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -3,6 +3,7 @@ - - /* Missing glibc definitions to access certain kernel APIs */ - -+#include - #include - #include - #include --- -2.14.1 - diff --git a/buildroot/package/systemd/0008-lockfile-util.c-fix-build-without-F_OFD_SETLK.patch b/buildroot/package/systemd/0008-lockfile-util.c-fix-build-without-F_OFD_SETLK.patch deleted file mode 100644 index 1a1542c70..000000000 --- a/buildroot/package/systemd/0008-lockfile-util.c-fix-build-without-F_OFD_SETLK.patch +++ /dev/null @@ -1,34 +0,0 @@ -From badb5dafa9efc89384d9d2bea5648f7b017204d7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 11 Jan 2019 17:30:32 +0100 -Subject: [PATCH] lockfile-util.c: fix build without F_OFD_SETLK - -systemd fails to build on kernel without F_OFD_SETLK since -https://github.com/systemd/systemd/commit/9714c020fc4cda1823c2a77e3fd08aefa7d78b25 - -So put include missing_fcntl.h - -Fixes: - - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/systemd/systemd/pull/11400] ---- - src/shared/lockfile-util.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/shared/lockfile-util.c b/src/shared/lockfile-util.c -index 4bae23b24..260c2088d 100644 ---- a/src/shared/lockfile-util.c -+++ b/src/shared/lockfile-util.c -@@ -12,6 +12,7 @@ - #include "fs-util.h" - #include "lockfile-util.h" - #include "macro.h" -+#include "missing_fcntl.h" - #include "path-util.h" - - int make_lock_file(const char *p, int operation, LockFile *ret) { --- -2.14.1 - diff --git a/buildroot/package/systemd/0009-journald-do-not-store-the-iovec-entry-for-process-co.patch b/buildroot/package/systemd/0009-journald-do-not-store-the-iovec-entry-for-process-co.patch deleted file mode 100644 index dbf9bb51c..000000000 --- a/buildroot/package/systemd/0009-journald-do-not-store-the-iovec-entry-for-process-co.patch +++ /dev/null @@ -1,205 +0,0 @@ -From 084eeb865ca63887098e0945fb4e93c852b91b0f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 5 Dec 2018 18:38:39 +0100 -Subject: [PATCH] journald: do not store the iovec entry for process - commandline on stack - -This fixes a crash where we would read the commandline, whose length is under -control of the sending program, and then crash when trying to create a stack -allocation for it. - -CVE-2018-16864 -https://bugzilla.redhat.com/show_bug.cgi?id=1653855 - -The message actually doesn't get written to disk, because -journal_file_append_entry() returns -E2BIG. - -[james.hilliard1@gmail.com: backport from upstream commit -084eeb865ca63887098e0945fb4e93c852b91b0f] -Signed-off-by: James Hilliard ---- - src/basic/io-util.c | 10 ++++++++++ - src/basic/io-util.h | 2 ++ - src/coredump/coredump.c | 31 +++++++++++-------------------- - src/journal/journald-server.c | 25 +++++++++++++++---------- - 4 files changed, 38 insertions(+), 30 deletions(-) - -diff --git a/src/basic/io-util.c b/src/basic/io-util.c -index 1f64cc9..575398f 100644 ---- a/src/basic/io-util.c -+++ b/src/basic/io-util.c -@@ -8,6 +8,7 @@ - #include - - #include "io-util.h" -+#include "string-util.h" - #include "time-util.h" - - int flush_fd(int fd) { -@@ -252,3 +253,12 @@ ssize_t sparse_write(int fd, const void *p, size_t sz, size_t run_length) { - - return q - (const uint8_t*) p; - } -+ -+char* set_iovec_string_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value) { -+ char *x; -+ -+ x = strappend(field, value); -+ if (x) -+ iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(x); -+ return x; -+} -diff --git a/src/basic/io-util.h b/src/basic/io-util.h -index ed189b5..792a64a 100644 ---- a/src/basic/io-util.h -+++ b/src/basic/io-util.h -@@ -71,3 +71,5 @@ static inline bool FILE_SIZE_VALID_OR_INFINITY(uint64_t l) { - #define IOVEC_MAKE(base, len) (struct iovec) IOVEC_INIT(base, len) - #define IOVEC_INIT_STRING(string) IOVEC_INIT((char*) string, strlen(string)) - #define IOVEC_MAKE_STRING(string) (struct iovec) IOVEC_INIT_STRING(string) -+ -+char* set_iovec_string_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value); -diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c -index 20c1fb0..db2cf64 100644 ---- a/src/coredump/coredump.c -+++ b/src/coredump/coredump.c -@@ -1063,19 +1063,10 @@ static int send_iovec(const struct iovec iovec[], size_t n_iovec, int input_fd) - return 0; - } - --static char* set_iovec_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value) { -- char *x; -- -- x = strappend(field, value); -- if (x) -- iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(x); -- return x; --} -- - static char* set_iovec_field_free(struct iovec *iovec, size_t *n_iovec, const char *field, char *value) { - char *x; - -- x = set_iovec_field(iovec, n_iovec, field, value); -+ x = set_iovec_string_field(iovec, n_iovec, field, value); - free(value); - return x; - } -@@ -1125,36 +1116,36 @@ static int gather_pid_metadata( - disable_coredumps(); - } - -- set_iovec_field(iovec, n_iovec, "COREDUMP_UNIT=", context[CONTEXT_UNIT]); -+ set_iovec_string_field(iovec, n_iovec, "COREDUMP_UNIT=", context[CONTEXT_UNIT]); - } - - if (cg_pid_get_user_unit(pid, &t) >= 0) - set_iovec_field_free(iovec, n_iovec, "COREDUMP_USER_UNIT=", t); - - /* The next few are mandatory */ -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_PID=", context[CONTEXT_PID])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_PID=", context[CONTEXT_PID])) - return log_oom(); - -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_UID=", context[CONTEXT_UID])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_UID=", context[CONTEXT_UID])) - return log_oom(); - -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_GID=", context[CONTEXT_GID])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_GID=", context[CONTEXT_GID])) - return log_oom(); - -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_SIGNAL=", context[CONTEXT_SIGNAL])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_SIGNAL=", context[CONTEXT_SIGNAL])) - return log_oom(); - -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_RLIMIT=", context[CONTEXT_RLIMIT])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_RLIMIT=", context[CONTEXT_RLIMIT])) - return log_oom(); - -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_HOSTNAME=", context[CONTEXT_HOSTNAME])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_HOSTNAME=", context[CONTEXT_HOSTNAME])) - return log_oom(); - -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_COMM=", context[CONTEXT_COMM])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_COMM=", context[CONTEXT_COMM])) - return log_oom(); - - if (context[CONTEXT_EXE] && -- !set_iovec_field(iovec, n_iovec, "COREDUMP_EXE=", context[CONTEXT_EXE])) -+ !set_iovec_string_field(iovec, n_iovec, "COREDUMP_EXE=", context[CONTEXT_EXE])) - return log_oom(); - - if (sd_pid_get_session(pid, &t) >= 0) -@@ -1222,7 +1213,7 @@ static int gather_pid_metadata( - iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(t); - - if (safe_atoi(context[CONTEXT_SIGNAL], &signo) >= 0 && SIGNAL_VALID(signo)) -- set_iovec_field(iovec, n_iovec, "COREDUMP_SIGNAL_NAME=SIG", signal_to_string(signo)); -+ set_iovec_string_field(iovec, n_iovec, "COREDUMP_SIGNAL_NAME=SIG", signal_to_string(signo)); - - return 0; /* we successfully acquired all metadata */ - } -diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index f096725..2a960eb 100644 ---- a/src/journal/journald-server.c -+++ b/src/journal/journald-server.c -@@ -905,6 +905,7 @@ static void dispatch_message_real( - pid_t object_pid) { - - char source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)]; -+ _cleanup_free_ char *cmdline1 = NULL, *cmdline2 = NULL; - uid_t journal_uid; - ClientContext *o; - -@@ -921,20 +922,23 @@ static void dispatch_message_real( - IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->uid, uid_t, uid_is_valid, UID_FMT, "_UID"); - IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->gid, gid_t, gid_is_valid, GID_FMT, "_GID"); - -- IOVEC_ADD_STRING_FIELD(iovec, n, c->comm, "_COMM"); -- IOVEC_ADD_STRING_FIELD(iovec, n, c->exe, "_EXE"); -- IOVEC_ADD_STRING_FIELD(iovec, n, c->cmdline, "_CMDLINE"); -- IOVEC_ADD_STRING_FIELD(iovec, n, c->capeff, "_CAP_EFFECTIVE"); -+ IOVEC_ADD_STRING_FIELD(iovec, n, c->comm, "_COMM"); /* At most TASK_COMM_LENGTH (16 bytes) */ -+ IOVEC_ADD_STRING_FIELD(iovec, n, c->exe, "_EXE"); /* A path, so at most PATH_MAX (4096 bytes) */ - -- IOVEC_ADD_SIZED_FIELD(iovec, n, c->label, c->label_size, "_SELINUX_CONTEXT"); -+ if (c->cmdline) -+ /* At most _SC_ARG_MAX (2MB usually), which is too much to put on stack. -+ * Let's use a heap allocation for this one. */ -+ cmdline1 = set_iovec_string_field(iovec, &n, "_CMDLINE=", c->cmdline); - -+ IOVEC_ADD_STRING_FIELD(iovec, n, c->capeff, "_CAP_EFFECTIVE"); /* Read from /proc/.../status */ -+ IOVEC_ADD_SIZED_FIELD(iovec, n, c->label, c->label_size, "_SELINUX_CONTEXT"); - IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->auditid, uint32_t, audit_session_is_valid, "%" PRIu32, "_AUDIT_SESSION"); - IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->loginuid, uid_t, uid_is_valid, UID_FMT, "_AUDIT_LOGINUID"); - -- IOVEC_ADD_STRING_FIELD(iovec, n, c->cgroup, "_SYSTEMD_CGROUP"); -+ IOVEC_ADD_STRING_FIELD(iovec, n, c->cgroup, "_SYSTEMD_CGROUP"); /* A path */ - IOVEC_ADD_STRING_FIELD(iovec, n, c->session, "_SYSTEMD_SESSION"); - IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->owner_uid, uid_t, uid_is_valid, UID_FMT, "_SYSTEMD_OWNER_UID"); -- IOVEC_ADD_STRING_FIELD(iovec, n, c->unit, "_SYSTEMD_UNIT"); -+ IOVEC_ADD_STRING_FIELD(iovec, n, c->unit, "_SYSTEMD_UNIT"); /* Unit names are bounded by UNIT_NAME_MAX */ - IOVEC_ADD_STRING_FIELD(iovec, n, c->user_unit, "_SYSTEMD_USER_UNIT"); - IOVEC_ADD_STRING_FIELD(iovec, n, c->slice, "_SYSTEMD_SLICE"); - IOVEC_ADD_STRING_FIELD(iovec, n, c->user_slice, "_SYSTEMD_USER_SLICE"); -@@ -955,13 +959,14 @@ static void dispatch_message_real( - IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->uid, uid_t, uid_is_valid, UID_FMT, "OBJECT_UID"); - IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->gid, gid_t, gid_is_valid, GID_FMT, "OBJECT_GID"); - -+ /* See above for size limits, only ->cmdline may be large, so use a heap allocation for it. */ - IOVEC_ADD_STRING_FIELD(iovec, n, o->comm, "OBJECT_COMM"); - IOVEC_ADD_STRING_FIELD(iovec, n, o->exe, "OBJECT_EXE"); -- IOVEC_ADD_STRING_FIELD(iovec, n, o->cmdline, "OBJECT_CMDLINE"); -- IOVEC_ADD_STRING_FIELD(iovec, n, o->capeff, "OBJECT_CAP_EFFECTIVE"); -+ if (o->cmdline) -+ cmdline2 = set_iovec_string_field(iovec, &n, "OBJECT_CMDLINE=", o->cmdline); - -+ IOVEC_ADD_STRING_FIELD(iovec, n, o->capeff, "OBJECT_CAP_EFFECTIVE"); - IOVEC_ADD_SIZED_FIELD(iovec, n, o->label, o->label_size, "OBJECT_SELINUX_CONTEXT"); -- - IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->auditid, uint32_t, audit_session_is_valid, "%" PRIu32, "OBJECT_AUDIT_SESSION"); - IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->loginuid, uid_t, uid_is_valid, UID_FMT, "OBJECT_AUDIT_LOGINUID"); - --- -2.7.4 - diff --git a/buildroot/package/systemd/0010-journald-set-a-limit-on-the-number-of-fields-1k.patch b/buildroot/package/systemd/0010-journald-set-a-limit-on-the-number-of-fields-1k.patch deleted file mode 100644 index df1ed806a..000000000 --- a/buildroot/package/systemd/0010-journald-set-a-limit-on-the-number-of-fields-1k.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 052c57f132f04a3cf4148f87561618da1a6908b4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 5 Dec 2018 22:45:02 +0100 -Subject: [PATCH] journald: set a limit on the number of fields (1k) - -We allocate a iovec entry for each field, so with many short entries, -our memory usage and processing time can be large, even with a relatively -small message size. Let's refuse overly long entries. - -CVE-2018-16865 -https://bugzilla.redhat.com/show_bug.cgi?id=1653861 - -What from I can see, the problem is not from an alloca, despite what the CVE -description says, but from the attack multiplication that comes from creating -many very small iovecs: (void* + size_t) for each three bytes of input message. - -[james.hilliard1@gmail.com: backport from upstream commit -052c57f132f04a3cf4148f87561618da1a6908b4] -Signed-off-by: James Hilliard ---- - src/journal/journald-native.c | 5 +++++ - src/shared/journal-importer.h | 3 +++ - 2 files changed, 8 insertions(+) - -diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c -index e86178e..d0fee2a 100644 ---- a/src/journal/journald-native.c -+++ b/src/journal/journald-native.c -@@ -141,6 +141,11 @@ static int server_process_entry( - } - - /* A property follows */ -+ if (n > ENTRY_FIELD_COUNT_MAX) { -+ log_debug("Received an entry that has more than " STRINGIFY(ENTRY_FIELD_COUNT_MAX) " fields, ignoring entry."); -+ r = 1; -+ goto finish; -+ } - - /* n existing properties, 1 new, +1 for _TRANSPORT */ - if (!GREEDY_REALLOC(iovec, m, -diff --git a/src/shared/journal-importer.h b/src/shared/journal-importer.h -index 53354b7..7914c0c 100644 ---- a/src/shared/journal-importer.h -+++ b/src/shared/journal-importer.h -@@ -21,6 +21,9 @@ - #endif - #define LINE_CHUNK 8*1024u - -+/* The maximum number of fields in an entry */ -+#define ENTRY_FIELD_COUNT_MAX 1024 -+ - struct iovec_wrapper { - struct iovec *iovec; - size_t size_bytes; --- -2.7.4 - diff --git a/buildroot/package/systemd/0011-journal-remote-verify-entry-length-from-header.patch b/buildroot/package/systemd/0011-journal-remote-verify-entry-length-from-header.patch deleted file mode 100644 index 7b74a31d3..000000000 --- a/buildroot/package/systemd/0011-journal-remote-verify-entry-length-from-header.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 7fdb237f5473cb8fc2129e57e8a0039526dcb4fd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 7 Dec 2018 12:47:14 +0100 -Subject: [PATCH] journal-remote: verify entry length from header -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Calling mhd_respond(), which ulimately calls MHD_queue_response() is -ineffective at point, becuase MHD_queue_response() immediately returns -MHD_NO signifying an error, because the connection is in state -MHD_CONNECTION_CONTINUE_SENT. - -As Christian Grothoff kindly explained: -> You are likely calling MHD_queue_repsonse() too late: once you are -> receiving upload_data, HTTP forces you to process it all. At this time, -> MHD has already sent "100 continue" and cannot take it back (hence you -> get MHD_NO!). -> -> In your request handler, the first time when you are called for a -> connection (and when hence *upload_data_size == 0 and upload_data == -> NULL) you must check the content-length header and react (with -> MHD_queue_response) based on this (to prevent MHD from automatically -> generating 100 continue). - -If we ever encounter this kind of error, print a warning and immediately -abort the connection. (The alternative would be to keep reading the data, -but ignore it, and return an error after we get to the end of data. -That is possible, but of course puts additional load on both the -sender and reciever, and doesn't seem important enough just to return -a good error message.) - -Note that sending of the error does not work (the connection is always aborted -when MHD_queue_response is used with MHD_RESPMEM_MUST_FREE, as in this case) -with libµhttpd 0.59, but works with 0.61: -https://src.fedoraproject.org/rpms/libmicrohttpd/pull-request/1 - -[james.hilliard1@gmail.com: backport from upstream commit -7fdb237f5473cb8fc2129e57e8a0039526dcb4fd] -Signed-off-by: James Hilliard ---- - src/journal-remote/journal-remote-main.c | 34 ++++++++++++++++++++++---------- - 1 file changed, 24 insertions(+), 10 deletions(-) - -diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c -index e1748cb..8543dba 100644 ---- a/src/journal-remote/journal-remote-main.c -+++ b/src/journal-remote/journal-remote-main.c -@@ -221,16 +221,14 @@ static int process_http_upload( - journal_remote_server_global->seal); - if (r == -EAGAIN) - break; -- else if (r < 0) { -- log_warning("Failed to process data for connection %p", connection); -+ if (r < 0) { - if (r == -E2BIG) -- return mhd_respondf(connection, -- r, MHD_HTTP_PAYLOAD_TOO_LARGE, -- "Entry is too large, maximum is " STRINGIFY(DATA_SIZE_MAX) " bytes."); -+ log_warning_errno(r, "Entry is too above maximum of %u, aborting connection %p.", -+ DATA_SIZE_MAX, connection); - else -- return mhd_respondf(connection, -- r, MHD_HTTP_UNPROCESSABLE_ENTITY, -- "Processing failed: %m."); -+ log_warning_errno(r, "Failed to process data, aborting connection %p: %m", -+ connection); -+ return MHD_NO; - } - } - -@@ -264,6 +262,7 @@ static int request_handler( - const char *header; - int r, code, fd; - _cleanup_free_ char *hostname = NULL; -+ size_t len; - - assert(connection); - assert(connection_cls); -@@ -283,12 +282,27 @@ static int request_handler( - if (!streq(url, "/upload")) - return mhd_respond(connection, MHD_HTTP_NOT_FOUND, "Not found."); - -- header = MHD_lookup_connection_value(connection, -- MHD_HEADER_KIND, "Content-Type"); -+ header = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, "Content-Type"); - if (!header || !streq(header, "application/vnd.fdo.journal")) - return mhd_respond(connection, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE, - "Content-Type: application/vnd.fdo.journal is required."); - -+ header = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, "Content-Length"); -+ if (!header) -+ return mhd_respond(connection, MHD_HTTP_LENGTH_REQUIRED, -+ "Content-Length header is required."); -+ r = safe_atozu(header, &len); -+ if (r < 0) -+ return mhd_respondf(connection, r, MHD_HTTP_LENGTH_REQUIRED, -+ "Content-Length: %s cannot be parsed: %m", header); -+ -+ if (len > ENTRY_SIZE_MAX) -+ /* When serialized, an entry of maximum size might be slightly larger, -+ * so this does not correspond exactly to the limit in journald. Oh well. -+ */ -+ return mhd_respondf(connection, 0, MHD_HTTP_PAYLOAD_TOO_LARGE, -+ "Payload larger than maximum size of %u bytes", ENTRY_SIZE_MAX); -+ - { - const union MHD_ConnectionInfo *ci; - --- -2.7.4 - diff --git a/buildroot/package/systemd/0012-journal-remote-set-a-limit-on-the-number-of-fields-i.patch b/buildroot/package/systemd/0012-journal-remote-set-a-limit-on-the-number-of-fields-i.patch deleted file mode 100644 index e0aae98d9..000000000 --- a/buildroot/package/systemd/0012-journal-remote-set-a-limit-on-the-number-of-fields-i.patch +++ /dev/null @@ -1,81 +0,0 @@ -From ef4d6abe7c7fab6cbff975b32e76b09feee56074 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 7 Dec 2018 10:48:10 +0100 -Subject: [PATCH] journal-remote: set a limit on the number of fields in a - message - -Existing use of E2BIG is replaced with ENOBUFS (entry too long), and E2BIG is -reused for the new error condition (too many fields). - -This matches the change done for systemd-journald, hence forming the second -part of the fix for CVE-2018-16865 -(https://bugzilla.redhat.com/show_bug.cgi?id=1653861). - -[james.hilliard1@gmail.com: backport from upstream commit -ef4d6abe7c7fab6cbff975b32e76b09feee56074] -Signed-off-by: James Hilliard ---- - src/journal-remote/journal-remote-main.c | 7 +++++-- - src/journal-remote/journal-remote.c | 3 +++ - src/shared/journal-importer.c | 5 ++++- - 3 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c -index 8543dba..802c3ea 100644 ---- a/src/journal-remote/journal-remote-main.c -+++ b/src/journal-remote/journal-remote-main.c -@@ -222,9 +222,12 @@ static int process_http_upload( - if (r == -EAGAIN) - break; - if (r < 0) { -- if (r == -E2BIG) -- log_warning_errno(r, "Entry is too above maximum of %u, aborting connection %p.", -+ if (r == -ENOBUFS) -+ log_warning_errno(r, "Entry is above the maximum of %u, aborting connection %p.", - DATA_SIZE_MAX, connection); -+ else if (r == -E2BIG) -+ log_warning_errno(r, "Entry with more fields than the maximum of %u, aborting connection %p.", -+ ENTRY_FIELD_COUNT_MAX, connection); - else - log_warning_errno(r, "Failed to process data, aborting connection %p: %m", - connection); -diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c -index 3c0916c..1da32c5 100644 ---- a/src/journal-remote/journal-remote.c -+++ b/src/journal-remote/journal-remote.c -@@ -407,6 +407,9 @@ int journal_remote_handle_raw_source( - log_debug("%zu active sources remaining", s->active); - return 0; - } else if (r == -E2BIG) { -+ log_notice("Entry with too many fields, skipped"); -+ return 1; -+ } else if (r == -ENOBUFS) { - log_notice("Entry too big, skipped"); - return 1; - } else if (r == -EAGAIN) { -diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c -index b0e6192..8638cd3 100644 ---- a/src/shared/journal-importer.c -+++ b/src/shared/journal-importer.c -@@ -23,6 +23,9 @@ enum { - }; - - static int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) { -+ if (iovw->count >= ENTRY_FIELD_COUNT_MAX) -+ return -E2BIG; -+ - if (!GREEDY_REALLOC(iovw->iovec, iovw->size_bytes, iovw->count + 1)) - return log_oom(); - -@@ -97,7 +100,7 @@ static int get_line(JournalImporter *imp, char **line, size_t *size) { - - imp->scanned = imp->filled; - if (imp->scanned >= DATA_SIZE_MAX) -- return log_error_errno(SYNTHETIC_ERRNO(E2BIG), -+ return log_error_errno(SYNTHETIC_ERRNO(ENOBUFS), - "Entry is bigger than %u bytes.", - DATA_SIZE_MAX); - --- -2.7.4 - diff --git a/buildroot/package/systemd/0013-Pass-separate-dev_t-var-to-device_path_parse_major_minor.patch b/buildroot/package/systemd/0013-Pass-separate-dev_t-var-to-device_path_parse_major_minor.patch deleted file mode 100644 index eb7e0a270..000000000 --- a/buildroot/package/systemd/0013-Pass-separate-dev_t-var-to-device_path_parse_major_minor.patch +++ /dev/null @@ -1,116 +0,0 @@ -From f5855697aa19fb92637e72ab02e4623abe77f288 Mon Sep 17 00:00:00 2001 -From: YunQiang Su -Date: Tue, 25 Dec 2018 19:01:17 +0800 -Subject: [PATCH] Pass separate dev_t var to device_path_parse_major_minor - -MIPS/O32's st_rdev member of struct stat is unsigned long, which -is 32bit, while dev_t is defined as 64bit, which make some problems -in device_path_parse_major_minor. - -Don't pass st.st_rdev, st_mode to device_path_parse_major_minor, -while pass 2 seperate variables. The result of stat is alos copied -out into these 2 variables. Fixes: #11247 - -[Retrieved from: -https://github.com/systemd/systemd/commit/f5855697aa19fb92637e72ab02e4623abe77f288] -Signed-off-by: Fabrice Fontaine ---- - src/core/cgroup.c | 35 ++++++++++++++++++++++------------- - 1 file changed, 22 insertions(+), 13 deletions(-) - -diff --git a/src/core/cgroup.c b/src/core/cgroup.c -index 7b817dc225e..ed2f331b33e 100644 ---- a/src/core/cgroup.c -+++ b/src/core/cgroup.c -@@ -396,26 +396,31 @@ static void cgroup_xattr_apply(Unit *u) { - } - - static int lookup_block_device(const char *p, dev_t *ret) { -- struct stat st = {}; -+ dev_t rdev, dev = 0; -+ mode_t mode; - int r; - - assert(p); - assert(ret); - -- r = device_path_parse_major_minor(p, &st.st_mode, &st.st_rdev); -+ r = device_path_parse_major_minor(p, &mode, &rdev); - if (r == -ENODEV) { /* not a parsable device node, need to go to disk */ -+ struct stat st; - if (stat(p, &st) < 0) - return log_warning_errno(errno, "Couldn't stat device '%s': %m", p); -+ rdev = (dev_t)st.st_rdev; -+ dev = (dev_t)st.st_dev; -+ mode = st.st_mode; - } else if (r < 0) - return log_warning_errno(r, "Failed to parse major/minor from path '%s': %m", p); - -- if (S_ISCHR(st.st_mode)) { -+ if (S_ISCHR(mode)) { - log_warning("Device node '%s' is a character device, but block device needed.", p); - return -ENOTBLK; -- } else if (S_ISBLK(st.st_mode)) -- *ret = st.st_rdev; -- else if (major(st.st_dev) != 0) -- *ret = st.st_dev; /* If this is not a device node then use the block device this file is stored on */ -+ } else if (S_ISBLK(mode)) -+ *ret = rdev; -+ else if (major(dev) != 0) -+ *ret = dev; /* If this is not a device node then use the block device this file is stored on */ - else { - /* If this is btrfs, getting the backing block device is a bit harder */ - r = btrfs_get_block_device(p, ret); -@@ -436,7 +441,8 @@ static int lookup_block_device(const char *p, dev_t *ret) { - } - - static int whitelist_device(BPFProgram *prog, const char *path, const char *node, const char *acc) { -- struct stat st = {}; -+ dev_t rdev; -+ mode_t mode; - int r; - - assert(path); -@@ -445,11 +451,12 @@ static int whitelist_device(BPFProgram *prog, const char *path, const char *node - /* Some special handling for /dev/block/%u:%u, /dev/char/%u:%u, /run/systemd/inaccessible/chr and - * /run/systemd/inaccessible/blk paths. Instead of stat()ing these we parse out the major/minor directly. This - * means clients can use these path without the device node actually around */ -- r = device_path_parse_major_minor(node, &st.st_mode, &st.st_rdev); -+ r = device_path_parse_major_minor(node, &mode, &rdev); - if (r < 0) { - if (r != -ENODEV) - return log_warning_errno(r, "Couldn't parse major/minor from device path '%s': %m", node); - -+ struct stat st; - if (stat(node, &st) < 0) - return log_warning_errno(errno, "Couldn't stat device %s: %m", node); - -@@ -457,22 +464,24 @@ static int whitelist_device(BPFProgram *prog, const char *path, const char *node - log_warning("%s is not a device.", node); - return -ENODEV; - } -+ rdev = (dev_t) st.st_rdev; -+ mode = st.st_mode; - } - - if (cg_all_unified() > 0) { - if (!prog) - return 0; - -- return cgroup_bpf_whitelist_device(prog, S_ISCHR(st.st_mode) ? BPF_DEVCG_DEV_CHAR : BPF_DEVCG_DEV_BLOCK, -- major(st.st_rdev), minor(st.st_rdev), acc); -+ return cgroup_bpf_whitelist_device(prog, S_ISCHR(mode) ? BPF_DEVCG_DEV_CHAR : BPF_DEVCG_DEV_BLOCK, -+ major(rdev), minor(rdev), acc); - - } else { - char buf[2+DECIMAL_STR_MAX(dev_t)*2+2+4]; - - sprintf(buf, - "%c %u:%u %s", -- S_ISCHR(st.st_mode) ? 'c' : 'b', -- major(st.st_rdev), minor(st.st_rdev), -+ S_ISCHR(mode) ? 'c' : 'b', -+ major(rdev), minor(rdev), - acc); - - /* Changing the devices list of a populated cgroup might result in EINVAL, hence ignore EINVAL here. */ diff --git a/buildroot/package/systemd/0014-networkd-brvlan.c-fix-build-without-BRIDGE_VLAN_INFO.patch b/buildroot/package/systemd/0014-networkd-brvlan.c-fix-build-without-BRIDGE_VLAN_INFO.patch deleted file mode 100644 index 7a91aac51..000000000 --- a/buildroot/package/systemd/0014-networkd-brvlan.c-fix-build-without-BRIDGE_VLAN_INFO.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7bd188b1e628d11011cc6c98456e2e4ed72c645b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 Feb 2019 17:32:46 +0100 -Subject: [PATCH] networkd-brvlan.c: fix build without - BRIDGE_VLAN_INFO_RANGE_END - -systemd fails to build on kernel without BRIDGE_VLAN_INFO_RANGE_END -since 9714c02 - -So put include missing_if_bridge.h - -Fixes: - - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69 - -Signed-off-by: Fabrice Fontaine ---- - src/network/networkd-brvlan.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c -index 8f9103f14..8377623da 100644 ---- a/src/network/networkd-brvlan.c -+++ b/src/network/networkd-brvlan.c -@@ -9,6 +9,7 @@ - - #include "alloc-util.h" - #include "conf-parser.h" -+#include "missing_if_bridge.h" - #include "netlink-util.h" - #include "networkd-brvlan.h" - #include "networkd-link.h" --- -2.14.1 - diff --git a/buildroot/package/systemd/0015-networkd-ndisc.c-fix-build-without-IFA_F_NOPREFIXROU.patch b/buildroot/package/systemd/0015-networkd-ndisc.c-fix-build-without-IFA_F_NOPREFIXROU.patch deleted file mode 100644 index 6351f05eb..000000000 --- a/buildroot/package/systemd/0015-networkd-ndisc.c-fix-build-without-IFA_F_NOPREFIXROU.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d909e4af6ac61f6777d429a0c84ab5b3d1907c6d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 Feb 2019 18:28:16 +0100 -Subject: [PATCH] networkd-ndisc.c: fix build without IFA_F_NOPREFIXROUTE - -systemd fails to build on kernel without IFA_F_NOPREFIXROUTE -since 9714c02 - -So put include missing_network.h - -Fixes: - - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69 - -Signed-off-by: Fabrice Fontaine ---- - src/network/networkd-ndisc.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c -index 80bfd2cba..e5b8d1155 100644 ---- a/src/network/networkd-ndisc.c -+++ b/src/network/networkd-ndisc.c -@@ -8,6 +8,7 @@ - - #include "sd-ndisc.h" - -+#include "missing_network.h" - #include "networkd-ndisc.h" - #include "networkd-route.h" - #include "strv.h" --- -2.14.1 - diff --git a/buildroot/package/systemd/0016-networkd-address.c-fix-build-without-IFA_F_NOPREFIXR.patch b/buildroot/package/systemd/0016-networkd-address.c-fix-build-without-IFA_F_NOPREFIXR.patch deleted file mode 100644 index 33d3328a8..000000000 --- a/buildroot/package/systemd/0016-networkd-address.c-fix-build-without-IFA_F_NOPREFIXR.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 081aea25022a987d349394ada2d6a959bf3ce4cd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 Feb 2019 18:33:39 +0100 -Subject: [PATCH] networkd-address.c: fix build without IFA_F_NOPREFIXROUTE - -systemd fails to build on kernel without IFA_F_NOPREFIXROUTE -since 9714c02 - -So put include missing_network.h - -Fixes: - - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69 - -Signed-off-by: Fabrice Fontaine ---- - src/network/networkd-address.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c -index fa7f9b8d7..3cdbd9e37 100644 ---- a/src/network/networkd-address.c -+++ b/src/network/networkd-address.c -@@ -5,6 +5,7 @@ - #include "alloc-util.h" - #include "conf-parser.h" - #include "firewall-util.h" -+#include "missing_network.h" - #include "netlink-util.h" - #include "networkd-address.h" - #include "networkd-manager.h" --- -2.14.1 - diff --git a/buildroot/package/systemd/0017-networkd-dhcp6.c-fix-build-without-IFA_F_NOPREFIXROU.patch b/buildroot/package/systemd/0017-networkd-dhcp6.c-fix-build-without-IFA_F_NOPREFIXROU.patch deleted file mode 100644 index 2b7ae1898..000000000 --- a/buildroot/package/systemd/0017-networkd-dhcp6.c-fix-build-without-IFA_F_NOPREFIXROU.patch +++ /dev/null @@ -1,33 +0,0 @@ -From aeed8332afa88728ed914b2917ce758d9c2218a4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 Feb 2019 18:38:10 +0100 -Subject: [PATCH] networkd-dhcp6.c: fix build without IFA_F_NOPREFIXROUTE - -systemd fails to build on kernel without IFA_F_NOPREFIXROUTE -since 9714c02 - -So put include missing_network.h - -Fixes: - - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69 - -Signed-off-by: Fabrice Fontaine ---- - src/network/networkd-dhcp6.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c -index f9df26d75..c1fba03f9 100644 ---- a/src/network/networkd-dhcp6.c -+++ b/src/network/networkd-dhcp6.c -@@ -11,6 +11,7 @@ - - #include "hashmap.h" - #include "hostname-util.h" -+#include "missing_network.h" - #include "network-internal.h" - #include "networkd-link.h" - #include "networkd-manager.h" --- -2.14.1 - diff --git a/buildroot/package/systemd/0018-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch b/buildroot/package/systemd/0018-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch deleted file mode 100644 index 2de3b71b5..000000000 --- a/buildroot/package/systemd/0018-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch +++ /dev/null @@ -1,53 +0,0 @@ -From febef5e18558c114f4fb7c94f6c8ed3520c50cdf Mon Sep 17 00:00:00 2001 -From: Riccardo Schirone -Date: Mon, 4 Feb 2019 14:29:09 +0100 -Subject: [PATCH] Refuse dbus message paths longer than BUS_PATH_SIZE_MAX - limit. - -Even though the dbus specification does not enforce any length limit on the -path of a dbus message, having to analyze too long strings in PID1 may be -time-consuming and it may have security impacts. - -In any case, the limit is set so high that real-life applications should not -have a problem with it. - -(cherry picked from commit 61397a60d98e368a5720b37e83f3169e3eb511c4) -Signed-off-by: Baruch Siach ---- -Upstream status: commit 61397a60d98 - - src/libsystemd/sd-bus/bus-internal.c | 2 +- - src/libsystemd/sd-bus/bus-internal.h | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c -index 40acae213381..598b7f110c73 100644 ---- a/src/libsystemd/sd-bus/bus-internal.c -+++ b/src/libsystemd/sd-bus/bus-internal.c -@@ -43,7 +43,7 @@ bool object_path_is_valid(const char *p) { - if (slash) - return false; - -- return true; -+ return (q - p) <= BUS_PATH_SIZE_MAX; - } - - char* object_path_startswith(const char *a, const char *b) { -diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h -index f208b294d8f1..a8d61bf72a4e 100644 ---- a/src/libsystemd/sd-bus/bus-internal.h -+++ b/src/libsystemd/sd-bus/bus-internal.h -@@ -332,6 +332,10 @@ struct sd_bus { - - #define BUS_MESSAGE_SIZE_MAX (128*1024*1024) - #define BUS_AUTH_SIZE_MAX (64*1024) -+/* Note that the D-Bus specification states that bus paths shall have no size limit. We enforce here one -+ * anyway, since truly unbounded strings are a security problem. The limit we pick is relatively large however, -+ * to not clash unnecessarily with real-life applications. */ -+#define BUS_PATH_SIZE_MAX (64*1024) - - #define BUS_CONTAINER_DEPTH 128 - --- -2.20.1 - diff --git a/buildroot/package/systemd/0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch b/buildroot/package/systemd/0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch deleted file mode 100644 index bd09e6020..000000000 --- a/buildroot/package/systemd/0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 9e3f5a77226d5320270c92df001f6c79be735af3 Mon Sep 17 00:00:00 2001 -From: Riccardo Schirone -Date: Mon, 4 Feb 2019 14:29:28 +0100 -Subject: [PATCH] Allocate temporary strings to hold dbus paths on the heap - -Paths are limited to BUS_PATH_SIZE_MAX but the maximum size is anyway too big -to be allocated on the stack, so let's switch to the heap where there is a -clear way to understand if the allocation fails. - -(cherry picked from commit f519a19bcd5afe674a9b8fc462cd77d8bad403c1) -[baruch: backport to v240] -Signed-off-by: Baruch Siach ---- -Upstream status: commit f519a19bcd5 - - src/libsystemd/sd-bus/bus-objects.c | 68 +++++++++++++++++++++++------ - 1 file changed, 54 insertions(+), 14 deletions(-) - -diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c -index d0538104ae25..54b977418e03 100644 ---- a/src/libsystemd/sd-bus/bus-objects.c -+++ b/src/libsystemd/sd-bus/bus-objects.c -@@ -1133,7 +1133,8 @@ static int object_manager_serialize_path_and_fallbacks( - const char *path, - sd_bus_error *error) { - -- char *prefix; -+ _cleanup_free_ char *prefix = NULL; -+ size_t pl; - int r; - - assert(bus); -@@ -1149,7 +1150,12 @@ static int object_manager_serialize_path_and_fallbacks( - return 0; - - /* Second, add fallback vtables registered for any of the prefixes */ -- prefix = alloca(strlen(path) + 1); -+ pl = strlen(path); -+ assert(pl <= BUS_PATH_SIZE_MAX); -+ prefix = new(char, pl + 1); -+ if (!prefix) -+ return -ENOMEM; -+ - OBJECT_PATH_FOREACH_PREFIX(prefix, path) { - r = object_manager_serialize_path(bus, reply, prefix, path, true, error); - if (r < 0) -@@ -1345,6 +1351,7 @@ static int object_find_and_run( - } - - int bus_process_object(sd_bus *bus, sd_bus_message *m) { -+ _cleanup_free_ char *prefix = NULL; - int r; - size_t pl; - bool found_object = false; -@@ -1369,9 +1376,12 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) { - assert(m->member); - - pl = strlen(m->path); -- do { -- char prefix[pl+1]; -+ assert(pl <= BUS_PATH_SIZE_MAX); -+ prefix = new(char, pl + 1); -+ if (!prefix) -+ return -ENOMEM; - -+ do { - bus->nodes_modified = false; - - r = object_find_and_run(bus, m, m->path, false, &found_object); -@@ -1498,9 +1508,15 @@ static int bus_find_parent_object_manager(sd_bus *bus, struct node **out, const - - n = hashmap_get(bus->nodes, path); - if (!n) { -- char *prefix; -+ _cleanup_free_ char *prefix = NULL; -+ size_t pl; -+ -+ pl = strlen(path); -+ assert(pl <= BUS_PATH_SIZE_MAX); -+ prefix = new(char, pl + 1); -+ if (!prefix) -+ return -ENOMEM; - -- prefix = alloca(strlen(path) + 1); - OBJECT_PATH_FOREACH_PREFIX(prefix, path) { - n = hashmap_get(bus->nodes, prefix); - if (n) -@@ -2083,8 +2099,9 @@ _public_ int sd_bus_emit_properties_changed_strv( - const char *interface, - char **names) { - -+ _cleanup_free_ char *prefix = NULL; - bool found_interface = false; -- char *prefix; -+ size_t pl; - int r; - - assert_return(bus, -EINVAL); -@@ -2105,6 +2122,12 @@ _public_ int sd_bus_emit_properties_changed_strv( - - BUS_DONT_DESTROY(bus); - -+ pl = strlen(path); -+ assert(pl <= BUS_PATH_SIZE_MAX); -+ prefix = new(char, pl + 1); -+ if (!prefix) -+ return -ENOMEM; -+ - do { - bus->nodes_modified = false; - -@@ -2114,7 +2137,6 @@ _public_ int sd_bus_emit_properties_changed_strv( - if (bus->nodes_modified) - continue; - -- prefix = alloca(strlen(path) + 1); - OBJECT_PATH_FOREACH_PREFIX(prefix, path) { - r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, &found_interface, names); - if (r != 0) -@@ -2246,7 +2268,8 @@ static int object_added_append_all_prefix( - - static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *path) { - _cleanup_set_free_ Set *s = NULL; -- char *prefix; -+ _cleanup_free_ char *prefix = NULL; -+ size_t pl; - int r; - - assert(bus); -@@ -2291,7 +2314,12 @@ static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *p - if (bus->nodes_modified) - return 0; - -- prefix = alloca(strlen(path) + 1); -+ pl = strlen(path); -+ assert(pl <= BUS_PATH_SIZE_MAX); -+ prefix = new(char, pl + 1); -+ if (!prefix) -+ return -ENOMEM; -+ - OBJECT_PATH_FOREACH_PREFIX(prefix, path) { - r = object_added_append_all_prefix(bus, m, s, prefix, path, true); - if (r < 0) -@@ -2430,7 +2458,8 @@ static int object_removed_append_all_prefix( - - static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char *path) { - _cleanup_set_free_ Set *s = NULL; -- char *prefix; -+ _cleanup_free_ char *prefix = NULL; -+ size_t pl; - int r; - - assert(bus); -@@ -2462,7 +2491,12 @@ static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char - if (bus->nodes_modified) - return 0; - -- prefix = alloca(strlen(path) + 1); -+ pl = strlen(path); -+ assert(pl <= BUS_PATH_SIZE_MAX); -+ prefix = new(char, pl + 1); -+ if (!prefix) -+ return -ENOMEM; -+ - OBJECT_PATH_FOREACH_PREFIX(prefix, path) { - r = object_removed_append_all_prefix(bus, m, s, prefix, path, true); - if (r < 0) -@@ -2612,7 +2646,8 @@ static int interfaces_added_append_one( - const char *path, - const char *interface) { - -- char *prefix; -+ _cleanup_free_ char *prefix = NULL; -+ size_t pl; - int r; - - assert(bus); -@@ -2626,7 +2661,12 @@ static int interfaces_added_append_one( - if (bus->nodes_modified) - return 0; - -- prefix = alloca(strlen(path) + 1); -+ pl = strlen(path); -+ assert(pl <= BUS_PATH_SIZE_MAX); -+ prefix = new(char, pl + 1); -+ if (!prefix) -+ return -ENOMEM; -+ - OBJECT_PATH_FOREACH_PREFIX(prefix, path) { - r = interfaces_added_append_one_prefix(bus, m, prefix, path, interface, true); - if (r != 0) --- -2.20.1 - diff --git a/buildroot/package/systemd/0020-basic-process-util-limit-command-line-lengths-to-_SC.patch b/buildroot/package/systemd/0020-basic-process-util-limit-command-line-lengths-to-_SC.patch deleted file mode 100644 index 90a1b57a6..000000000 --- a/buildroot/package/systemd/0020-basic-process-util-limit-command-line-lengths-to-_SC.patch +++ /dev/null @@ -1,160 +0,0 @@ -From 2d5d2e0cc5171c6795d2a485841474345d9e30ab Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 5 Dec 2018 18:48:23 +0100 -Subject: [PATCH] basic/process-util: limit command line lengths to _SC_ARG_MAX - -This affects systemd-journald and systemd-coredump. - -Example entry: -$ journalctl -o export -n1 'MESSAGE=Something logged' -__CURSOR=s=976542d120c649f494471be317829ef9;i=34e;b=4871e4c474574ce4a462dfe3f1c37f06;m=c7d0c37dd2;t=57c4ac58f3b98;x=67598e942bd23dc0 -__REALTIME_TIMESTAMP=1544035467475864 -__MONOTONIC_TIMESTAMP=858200964562 -_BOOT_ID=4871e4c474574ce4a462dfe3f1c37f06 -PRIORITY=6 -_UID=1000 -_GID=1000 -_CAP_EFFECTIVE=0 -_SELINUX_CONTEXT=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 -_AUDIT_SESSION=1 -_AUDIT_LOGINUID=1000 -_SYSTEMD_OWNER_UID=1000 -_SYSTEMD_UNIT=user@1000.service -_SYSTEMD_SLICE=user-1000.slice -_SYSTEMD_USER_SLICE=-.slice -_SYSTEMD_INVOCATION_ID=1c4a469986d448719cb0f9141a10810e -_MACHINE_ID=08a5690a2eed47cf92ac0a5d2e3cf6b0 -_HOSTNAME=krowka -_TRANSPORT=syslog -SYSLOG_FACILITY=17 -SYSLOG_IDENTIFIER=syslog-caller -MESSAGE=Something logged -_COMM=poc -_EXE=/home/zbyszek/src/systemd-work3/poc -_SYSTEMD_CGROUP=/user.slice/user-1000.slice/user@1000.service/gnome-terminal-server.service -_SYSTEMD_USER_UNIT=gnome-terminal-server.service -SYSLOG_PID=4108 -SYSLOG_TIMESTAMP=Dec 5 19:44:27 -_PID=4108 -_CMDLINE=./poc AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA> -_SOURCE_REALTIME_TIMESTAMP=1544035467475848 - -$ journalctl -o export -n1 'MESSAGE=Something logged' --output-fields=_CMDLINE|wc - 6 2053 2097410 - -2MB might be hard for some clients to use meaningfully, but OTOH, it is -important to log the full commandline sometimes. For example, when the program -is crashing, the exact argument list is useful. - -Signed-off-by: Jonah Petri ---- - src/basic/process-util.c | 73 +++++++++++++++++------------------------------- - 1 file changed, 25 insertions(+), 48 deletions(-) - -diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index 448503409b..31fdbd9346 100644 ---- a/src/basic/process-util.c -+++ b/src/basic/process-util.c -@@ -129,6 +129,13 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char * - - (void) __fsetlocking(f, FSETLOCKING_BYCALLER); - -+ if (max_length == 0) { -+ /* This is supposed to be a safety guard against runaway command lines. */ -+ long l = sysconf(_SC_ARG_MAX); -+ assert(l > 0); -+ max_length = l; -+ } -+ - if (max_length == 1) { - - /* If there's only room for one byte, return the empty string */ -@@ -139,32 +146,6 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char * - *line = ans; - return 0; - -- } else if (max_length == 0) { -- size_t len = 0, allocated = 0; -- -- while ((c = getc(f)) != EOF) { -- -- if (!GREEDY_REALLOC(ans, allocated, len+3)) { -- free(ans); -- return -ENOMEM; -- } -- -- if (isprint(c)) { -- if (space) { -- ans[len++] = ' '; -- space = false; -- } -- -- ans[len++] = c; -- } else if (len > 0) -- space = true; -- } -- -- if (len > 0) -- ans[len] = '\0'; -- else -- ans = mfree(ans); -- - } else { - bool dotdotdot = false; - size_t left; -@@ -236,34 +217,30 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char * - if (h < 0) - return h; - -- if (max_length == 0) -- ans = strjoin("[", t, "]"); -- else { -- size_t l; -+ size_t l = strlen(t); - -- l = strlen(t); -- -- if (l + 3 <= max_length) -- ans = strjoin("[", t, "]"); -- else if (max_length <= 6) { -+ if (l + 3 <= max_length) { -+ ans = strjoin("[", t, "]"); -+ if (!ans) -+ return -ENOMEM; - -- ans = new(char, max_length); -- if (!ans) -- return -ENOMEM; -+ } else if (max_length <= 6) { -+ ans = new(char, max_length); -+ if (!ans) -+ return -ENOMEM; - -- memcpy(ans, "[...]", max_length-1); -- ans[max_length-1] = 0; -- } else { -- t[max_length - 6] = 0; -+ memcpy(ans, "[...]", max_length-1); -+ ans[max_length-1] = 0; -+ } else { -+ t[max_length - 6] = 0; - -- /* Chop off final spaces */ -- delete_trailing_chars(t, WHITESPACE); -+ /* Chop off final spaces */ -+ delete_trailing_chars(t, WHITESPACE); - -- ans = strjoin("[", t, "...]"); -- } -+ ans = strjoin("[", t, "...]"); -+ if (!ans) -+ return -ENOMEM; - } -- if (!ans) -- return -ENOMEM; - } - - *line = ans; --- -2.14.3 - diff --git a/buildroot/package/systemd/0021-process-util-don-t-use-overly-large-buffer-to-store-.patch b/buildroot/package/systemd/0021-process-util-don-t-use-overly-large-buffer-to-store-.patch deleted file mode 100644 index d599cfe5e..000000000 --- a/buildroot/package/systemd/0021-process-util-don-t-use-overly-large-buffer-to-store-.patch +++ /dev/null @@ -1,71 +0,0 @@ -From eb1ec489eef8a32918bbfc56a268c9d10464584d Mon Sep 17 00:00:00 2001 -From: Michal Sekletar -Date: Tue, 22 Jan 2019 14:29:50 +0100 -Subject: [PATCH] process-util: don't use overly large buffer to store process command line - -Allocate new string as a return value and free our "scratch pad" -buffer that is potentially much larger than needed (up to -_SC_ARG_MAX). - -Fixes #11502 - -Signed-off-by: Jonah Petri ---- - src/basic/process-util.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index 31fdbd9346..78ce43b944 100644 ---- a/src/basic/process-util.c -+++ b/src/basic/process-util.c -@@ -102,7 +102,8 @@ int get_process_comm(pid_t pid, char **ret) { - int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line) { - _cleanup_fclose_ FILE *f = NULL; - bool space = false; -- char *k, *ans = NULL; -+ char *k; -+ _cleanup_free_ char *ans = NULL; - const char *p; - int c; - -@@ -143,7 +144,7 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char * - if (!ans) - return -ENOMEM; - -- *line = ans; -+ *line = TAKE_PTR(ans); - return 0; - - } else { -@@ -208,7 +209,7 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char * - _cleanup_free_ char *t = NULL; - int h; - -- free(ans); -+ ans = mfree(ans); - - if (!comm_fallback) - return -ENOENT; -@@ -241,9 +242,18 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char * - if (!ans) - return -ENOMEM; - } -+ -+ *line = TAKE_PTR(ans); -+ return 0; - } - -- *line = ans; -+ k = realloc(ans, strlen(ans) + 1); -+ if (!k) -+ return -ENOMEM; -+ -+ ans = NULL; -+ *line = k; -+ - return 0; - } - --- -2.14.3 - diff --git a/buildroot/package/systemd/80-buildroot.preset b/buildroot/package/systemd/80-buildroot.preset new file mode 100644 index 000000000..778dab38d --- /dev/null +++ b/buildroot/package/systemd/80-buildroot.preset @@ -0,0 +1,2 @@ +# Higher priority than systemd presets +# This file is currently empty, but is available for demonstration and future use diff --git a/buildroot/package/systemd/Config.in b/buildroot/package/systemd/Config.in index aa763cd12..c727082a1 100644 --- a/buildroot/package/systemd/Config.in +++ b/buildroot/package/systemd/Config.in @@ -1,11 +1,17 @@ config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS bool - # see src/shared/architecture.h - default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_powerpc || BR2_powerpc64 || \ - BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || \ - BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64 || \ - BR2_aarch64 || BR2_m68k || BR2_arc + # see src/basic/architecture.h + default y if BR2_arc + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_m68k + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_nios2 + default y if BR2_riscv + default y if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb + default y if BR2_sparc || BR2_sparc64 menuconfig BR2_PACKAGE_SYSTEMD bool "systemd" @@ -20,6 +26,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_BINARIES + select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_UTIL_LINUX_NOLOGIN select BR2_PACKAGE_UTIL_LINUX_FSCK @@ -28,6 +35,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_KMOD_TOOLS select BR2_TARGET_TZ_INFO select BR2_NEEDS_HOST_UTF8_LOCALE + select BR2_PACKAGE_HOST_SYSTEMD # for systemctl preset-all, during target-finalize help systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides @@ -77,6 +85,34 @@ if BR2_PACKAGE_SYSTEMD config BR2_PACKAGE_PROVIDES_UDEV default "systemd" +config BR2_PACKAGE_SYSTEMD_BOOT + bool "systemd-boot" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_GNU_EFI + help + systemd-boot is a simple UEFI boot manager which executes + configured EFI images. The default entry is selected by a + configured pattern (glob) or an on-screen menu. + + systemd-boot operates on the EFI System Partition (ESP) + only. Configuration file fragments, kernels, initrds, other + EFI images need to reside on the ESP. Linux kernels need to + be built with CONFIG_EFI_STUB to be able to be directly + executed as an EFI image. + + See the Grub2 help text for details on preparing an EFI + capable disk image using systemd-boot: the instructions are + exactly the same, except that the systemd-boot configuration + files will be located in /loader/ inside the EFI partition. + + https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/ + +config BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH + string + default "ia32" if BR2_i386 + default "x64" if BR2_x86_64 + depends on BR2_PACKAGE_SYSTEMD_BOOT + config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY bool "HTTP server for journal events" select BR2_PACKAGE_LIBMICROHTTPD @@ -87,6 +123,20 @@ config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY http://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.service.html +config BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE + bool "enable systemd-journal-remote" + depends on BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY + select BR2_PACKAGE_LIBCURL + help + systemd-journal-remote is a command to receive serialized + journal events and store them to journal files. Input + streams are in the Journal Export Format[1], i.e. like the + output from journalctl --output=export. For transport over + the network, this serialized stream is usually carried over + an HTTPS connection. + + https://www.freedesktop.org/software/systemd/man/systemd-journal-remote.service.html + config BR2_PACKAGE_SYSTEMD_BACKLIGHT bool "enable backlight support" help @@ -112,6 +162,16 @@ config BR2_PACKAGE_SYSTEMD_COREDUMP http://www.freedesktop.org/software/systemd/man/systemd-coredump.html +config BR2_PACKAGE_SYSTEMD_PSTORE + bool "enable pstore support" + default y + help + When this features is enabled, additional tools and services + are built to support archiving contents of the persistent + storage filesytem. + + https://www.freedesktop.org/software/systemd/man/systemd-pstore.html + config BR2_PACKAGE_SYSTEMD_FIRSTBOOT bool "enable firstboot support" help @@ -140,7 +200,6 @@ config BR2_PACKAGE_SYSTEMD_HOSTNAMED config BR2_PACKAGE_SYSTEMD_HWDB bool "enable hwdb installation" default y - select BR2_PACKAGE_HOST_EUDEV # for udevadm, during target-finalize help Enables hardware database installation to /usr/lib/udev/hwdb.d @@ -216,7 +275,12 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD config BR2_PACKAGE_SYSTEMD_POLKIT bool "enable polkit support" - depends on BR2_TOOLCHAIN_USES_GLIBC # polkit + depends on BR2_HOST_GCC_AT_LEAST_4_9 # polkit + depends on BR2_INSTALL_LIBSTDCPP # polkit + depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS # polkit + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # polkit + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # polkit + depends on BR2_USE_WCHAR # libglib2 select BR2_PACKAGE_POLKIT help If enabled, systemd is built with polkit support and policy @@ -226,8 +290,13 @@ config BR2_PACKAGE_SYSTEMD_POLKIT http://wiki.freedesktop.org/www/Software/polkit/ -comment "polkit support needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC +comment "polkit support needs a toolchain with C++, wchar, NPTL, gcc >= 4.9" + depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + !BR2_HOST_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_USE_WCHAR config BR2_PACKAGE_SYSTEMD_QUOTACHECK bool "enable quotacheck tools" diff --git a/buildroot/package/systemd/Config.in.host b/buildroot/package/systemd/Config.in.host new file mode 100644 index 000000000..219f24239 --- /dev/null +++ b/buildroot/package/systemd/Config.in.host @@ -0,0 +1,3 @@ +# Select this if you need host systemd tools (e.g. systemctl) +config BR2_PACKAGE_HOST_SYSTEMD + bool diff --git a/buildroot/package/systemd/boot-files/buildroot.conf b/buildroot/package/systemd/boot-files/buildroot.conf new file mode 100644 index 000000000..16d4d85f4 --- /dev/null +++ b/buildroot/package/systemd/boot-files/buildroot.conf @@ -0,0 +1,3 @@ +title Buildroot +linux /bzImage +options root=/dev/sda2 rootwait console=tty1 diff --git a/buildroot/package/systemd/boot-files/loader.conf b/buildroot/package/systemd/boot-files/loader.conf new file mode 100644 index 000000000..93b77b8f9 --- /dev/null +++ b/buildroot/package/systemd/boot-files/loader.conf @@ -0,0 +1,2 @@ +timeout 3 +default buildroot diff --git a/buildroot/package/systemd/systemd.hash b/buildroot/package/systemd/systemd.hash index 9c1a512ce..4ab514d67 100644 --- a/buildroot/package/systemd/systemd.hash +++ b/buildroot/package/systemd/systemd.hash @@ -1,5 +1,6 @@ # sha256 locally computed -sha256 8f15aec1ac926e13a21a04d0ca3fe371f7004951448142a6f8952075c5b5f0b5 systemd-240.tar.gz +sha256 e6b463733da5eb37075352a64112d030b8612935a54e5b3468279a4f15a4cec4 systemd-244.3.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 -sha256 a693f8f654fdf016e2aefe6b30aa6e1211728b8269ab325408a152c6c9b6ebe8 README +sha256 f7299f5f5e8bdffd347dce1bed888b1cea6ddaf27de521c307265098bcbeae92 README +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 tools/chromiumos/LICENSE diff --git a/buildroot/package/systemd/systemd.mk b/buildroot/package/systemd/systemd.mk index 6f0e451b5..ca2174e5f 100644 --- a/buildroot/package/systemd/systemd.mk +++ b/buildroot/package/systemd/systemd.mk @@ -4,18 +4,19 @@ # ################################################################################ -SYSTEMD_VERSION = 240 -SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) -SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README) -SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README +SYSTEMD_VERSION = 244.3 +SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) +SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos) +SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE SYSTEMD_INSTALL_STAGING = YES SYSTEMD_DEPENDENCIES = \ + $(BR2_COREUTILS_HOST_DEPENDENCY) \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ host-gperf \ - host-intltool \ kmod \ libcap \ - util-linux + util-linux \ + $(TARGET_NLS_DEPENDENCIES) SYSTEMD_PROVIDES = udev @@ -24,10 +25,9 @@ SYSTEMD_CONF_OPTS += \ -Dblkid=true \ -Dman=false \ -Dima=false \ - -Defi=false \ - -Dgnu-efi=false \ -Dldconfig=false \ -Ddefault-dnssec=no \ + -Ddefault-hierarchy=hybrid \ -Dtests=false \ -Dsplit-bin=true \ -Dsplit-usr=false \ @@ -179,6 +179,12 @@ else SYSTEMD_CONF_OPTS += -Dmicrohttpd=false -Dqrencode=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y) +SYSTEMD_CONF_OPTS += -Dremote=true +else +SYSTEMD_CONF_OPTS += -Dremote=false +endif + ifeq ($(BR2_PACKAGE_LIBSELINUX),y) SYSTEMD_DEPENDENCIES += libselinux SYSTEMD_CONF_OPTS += -Dselinux=true @@ -188,6 +194,14 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true +define SYSTEMD_BUILD_HWDB + $(HOST_DIR)/bin/udevadm hwdb --update --root $(TARGET_DIR) +endef +SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_BUILD_HWDB +define SYSTEMD_RM_HWDB_SRV + rm -rf $(TARGET_DIR)/$(HOST_EUDEV_SYSCONFDIR)/udev/hwdb.d/ +endef +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_HWDB_SRV else SYSTEMD_CONF_OPTS += -Dhwdb=false endif @@ -295,6 +309,12 @@ else SYSTEMD_CONF_OPTS += -Dcoredump=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_PSTORE),y) +SYSTEMD_CONF_OPTS += -Dpstore=true +else +SYSTEMD_CONF_OPTS += -Dpstore=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_POLKIT),y) SYSTEMD_CONF_OPTS += -Dpolkit=true SYSTEMD_DEPENDENCIES += polkit @@ -305,16 +325,12 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - Network Manager -define SYSTEMD_INSTALL_RESOLVCONF_HOOK - ln -sf ../run/systemd/resolve/resolv.conf \ - $(TARGET_DIR)/etc/resolv.conf -endef SYSTEMD_NETWORKD_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) ifneq ($(SYSTEMD_NETWORKD_DHCP_IFACE),) define SYSTEMD_INSTALL_NETWORK_CONFS sed s/SYSTEMD_NETWORKD_DHCP_IFACE/$(SYSTEMD_NETWORKD_DHCP_IFACE)/ \ - package/systemd/dhcp.network > \ - $(TARGET_DIR)/etc/systemd/network/dhcp.network + $(SYSTEMD_PKGDIR)/dhcp.network > \ + $(TARGET_DIR)/etc/systemd/network/$(SYSTEMD_NETWORKD_DHCP_IFACE).network endef endif else @@ -322,6 +338,10 @@ SYSTEMD_CONF_OPTS += -Dnetworkd=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y) +define SYSTEMD_INSTALL_RESOLVCONF_HOOK + ln -sf ../run/systemd/resolve/resolv.conf \ + $(TARGET_DIR)/etc/resolv.conf +endef SYSTEMD_CONF_OPTS += -Dresolve=true SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager else @@ -331,11 +351,6 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) SYSTEMD_CONF_OPTS += -Dtimesyncd=true SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - Network Time Synchronization -define SYSTEMD_INSTALL_SERVICE_TIMESYNC - mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -sf ../../../../lib/systemd/system/systemd-timesyncd.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service -endef else SYSTEMD_CONF_OPTS += -Dtimesyncd=false endif @@ -352,19 +367,42 @@ else SYSTEMD_CONF_OPTS += -Dhibernate=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_BOOT),y) +SYSTEMD_INSTALL_IMAGES = YES +SYSTEMD_DEPENDENCIES += gnu-efi +SYSTEMD_CONF_OPTS += \ + -Defi=true \ + -Dgnu-efi=true \ + -Defi-cc=$(TARGET_CC) \ + -Defi-ld=$(TARGET_LD) \ + -Defi-libdir=$(STAGING_DIR)/usr/lib \ + -Defi-ldsdir=$(STAGING_DIR)/usr/lib \ + -Defi-includedir=$(STAGING_DIR)/usr/include/efi + +SYSTEMD_BOOT_EFI_ARCH = $(call qstrip,$(BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH)) +define SYSTEMD_INSTALL_BOOT_FILES + $(INSTALL) -D -m 0644 $(@D)/build/src/boot/efi/systemd-boot$(SYSTEMD_BOOT_EFI_ARCH).efi \ + $(BINARIES_DIR)/efi-part/EFI/BOOT/boot$(SYSTEMD_BOOT_EFI_ARCH).efi + echo "boot$(SYSTEMD_BOOT_EFI_ARCH).efi" > \ + $(BINARIES_DIR)/efi-part/startup.nsh + $(INSTALL) -D -m 0644 $(SYSTEMD_PKGDIR)/boot-files/loader.conf \ + $(BINARIES_DIR)/efi-part/loader/loader.conf + $(INSTALL) -D -m 0644 $(SYSTEMD_PKGDIR)/boot-files/buildroot.conf \ + $(BINARIES_DIR)/efi-part/loader/entries/buildroot.conf +endef + +else +SYSTEMD_CONF_OPTS += -Defi=false -Dgnu-efi=false +endif # BR2_PACKAGE_SYSTEMD_BOOT == y + SYSTEMD_FALLBACK_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME)) ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),) SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME) endif define SYSTEMD_INSTALL_INIT_HOOK - ln -fs ../lib/systemd/systemd $(TARGET_DIR)/sbin/init - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/halt - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/poweroff - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/reboot - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/shutdown - ln -fs ../../../lib/systemd/system/multi-user.target \ - $(TARGET_DIR)/etc/systemd/system/default.target + ln -fs multi-user.target \ + $(TARGET_DIR)/usr/lib/systemd/system/default.target endef define SYSTEMD_INSTALL_MACHINEID_HOOK @@ -376,6 +414,10 @@ SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ SYSTEMD_INSTALL_MACHINEID_HOOK \ SYSTEMD_INSTALL_RESOLVCONF_HOOK +define SYSTEMD_INSTALL_IMAGES_CMDS + $(SYSTEMD_INSTALL_BOOT_FILES) +endef + define SYSTEMD_USERS - - input -1 * - - - Input device group - - systemd-journal -1 * - - - Journal @@ -391,29 +433,43 @@ define SYSTEMD_USERS $(SYSTEMD_TIMESYNCD_USER) endef -define SYSTEMD_DISABLE_SERVICE_TTY1 - rm -f $(TARGET_DIR)/etc/systemd/system/getty.target.wants/getty@tty1.service -endef - ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # systemd needs getty.service for VTs and serial-getty.service for serial ttys # note that console-getty.service should be used on /dev/console as it should not have dependencies # also patch the file to use the correct baud-rate, the default baudrate is 115200 so look for that +# +# systemd defaults to only have getty@tty.service enabled +# * DefaultInstance=tty1 in getty@service +# * no DefaultInstance in serial-getty@.service +# * WantedBy=getty.target in console-getty.service +# * console-getty is not enabled because of 90-systemd.preset +# We want "systemctl preset-all" to do the right thing, even when run on the target after boot +# * remove the default instance of getty@.service via a drop-in in /usr/lib +# * set a new DefaultInstance for getty@.service instead, if needed +# * set a new DefaultInstance for serial-getty@.service, if needed +# * override the systemd-provided preset for console-getty.service if needed define SYSTEMD_INSTALL_SERVICE_TTY + mkdir $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d; \ + printf '[Install]\nDefaultInstance=\n' \ + >$(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf; \ if [ $(BR2_TARGET_GENERIC_GETTY_PORT) = "console" ]; \ then \ TARGET="console-getty.service"; \ - LINK_NAME="console-getty.service"; \ + printf 'enable console-getty.service\n' \ + >$(TARGET_DIR)/usr/lib/systemd/system-preset/81-buildroot-tty.preset; \ elif echo $(BR2_TARGET_GENERIC_GETTY_PORT) | egrep -q 'tty[0-9]*$$'; \ then \ TARGET="getty@.service"; \ - LINK_NAME="getty@$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)).service"; \ + printf '[Install]\nDefaultInstance=%s\n' \ + $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) \ + >$(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf; \ else \ TARGET="serial-getty@.service"; \ - LINK_NAME="serial-getty@$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)).service"; \ + mkdir $(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d;\ + printf '[Install]\nDefaultInstance=%s\n' \ + $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) \ + >$(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d/buildroot-console.conf;\ fi; \ - ln -fs ../../../../lib/systemd/system/$${TARGET} \ - $(TARGET_DIR)/etc/systemd/system/getty.target.wants/$${LINK_NAME}; \ if [ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE)) -gt 0 ] ; \ then \ $(SED) 's,115200,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),' $(TARGET_DIR)/lib/systemd/system/$${TARGET}; \ @@ -421,14 +477,113 @@ define SYSTEMD_INSTALL_SERVICE_TTY endef endif +define SYSTEMD_INSTALL_PRESET + $(INSTALL) -D -m 644 $(SYSTEMD_PKGDIR)/80-buildroot.preset $(TARGET_DIR)/usr/lib/systemd/system-preset/80-buildroot.preset +endef + define SYSTEMD_INSTALL_INIT_SYSTEMD - $(SYSTEMD_DISABLE_SERVICE_TTY1) + $(SYSTEMD_INSTALL_PRESET) $(SYSTEMD_INSTALL_SERVICE_TTY) - $(SYSTEMD_INSTALL_SERVICE_TIMESYNC) $(SYSTEMD_INSTALL_NETWORK_CONFS) endef +define SYSTEMD_PRESET_ALL + $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all +endef +SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_PRESET_ALL + SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) +# We need a very minimal host variant, so we disable as much as possible. +HOST_SYSTEMD_CONF_OPTS = \ + -Dsplit-bin=true \ + -Dsplit-usr=false \ + --prefix=/usr \ + --libdir=lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + -Dutmp=false \ + -Dhibernate=false \ + -Dldconfig=false \ + -Dresolve=false \ + -Defi=false \ + -Dtpm=false \ + -Denvironment-d=false \ + -Dbinfmt=false \ + -Dcoredump=false \ + -Dpstore=false \ + -Dlogind=false \ + -Dhostnamed=false \ + -Dlocaled=false \ + -Dmachined=false \ + -Dportabled=false \ + -Dnetworkd=false \ + -Dtimedated=false \ + -Dtimesyncd=false \ + -Dremote=false \ + -Dcreate-log-dirs=false \ + -Dnss-myhostname=false \ + -Dnss-mymachines=false \ + -Dnss-resolve=false \ + -Dnss-systemd=false \ + -Dfirstboot=false \ + -Drandomseed=false \ + -Dbacklight=false \ + -Dvconsole=false \ + -Dquotacheck=false \ + -Dsysusers=false \ + -Dtmpfiles=false \ + -Dimportd=false \ + -Dhwdb=false \ + -Drfkill=false \ + -Dman=false \ + -Dhtml=false \ + -Dsmack=false \ + -Dpolkit=false \ + -Dblkid=false \ + -Didn=false \ + -Dadm-group=false \ + -Dwheel-group=false \ + -Dzlib=false \ + -Dgshadow=false \ + -Dima=false \ + -Dtests=false \ + -Dglib=false \ + -Dacl=false \ + -Dsysvinit-path='' + +HOST_SYSTEMD_DEPENDENCIES = \ + $(BR2_COREUTILS_HOST_DEPENDENCY) \ + host-util-linux \ + host-patchelf \ + host-libcap \ + host-gperf + +# Fix RPATH After installation +# * systemd provides a install_rpath instruction to meson because the binaries +# need to link with libsystemd which is not in a standard path +# * meson can only replace the RPATH, not append to it +# * the original rpath is thus lost. +# * the original path had been tweaked by buildroot via LDFLAGS to add +# $(HOST_DIR)/lib +# * thus re-tweak rpath after the installation for all binaries that need it +HOST_SYSTEMD_HOST_TOOLS = \ + systemd-analyze \ + systemd-machine-id-setup \ + systemd-mount \ + systemd-nspawn \ + systemctl \ + udevadm + +HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) + +define HOST_SYSTEMD_FIX_RPATH + $(foreach f,$(HOST_SYSTEMD_HOST_TOOLS), \ + $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $(HOST_DIR)/bin/$(f) + ) +endef +HOST_SYSTEMD_POST_INSTALL_HOOKS += HOST_SYSTEMD_FIX_RPATH + $(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/buildroot/package/sysvinit/sysvinit.hash b/buildroot/package/sysvinit/sysvinit.hash index 2161fb38b..c1d9f9446 100644 --- a/buildroot/package/sysvinit/sysvinit.hash +++ b/buildroot/package/sysvinit/sysvinit.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 114cffc8ef514a38b9916de2050bb6d73b43dff7afd05aee6b09d2f6cea7664e sysvinit-2.90.tar.xz +sha256 2a2e26b72aa235a23ab1c8471005f890309ce1196c83fbc9413c57b9ab62b587 sysvinit-2.96.tar.xz # Hash for license files: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/sysvinit/sysvinit.mk b/buildroot/package/sysvinit/sysvinit.mk index 98aa5a417..c778a9cde 100644 --- a/buildroot/package/sysvinit/sysvinit.mk +++ b/buildroot/package/sysvinit/sysvinit.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSVINIT_VERSION = 2.90 +SYSVINIT_VERSION = 2.96 SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VERSION).tar.xz SYSVINIT_SITE = http://download.savannah.nongnu.org/releases/sysvinit SYSVINIT_LICENSE = GPL-2.0+ @@ -36,8 +36,13 @@ define SYSVINIT_SET_GETTY $(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(shell echo $(SYSTEM_GETTY_PORT) | tail -c+4)::respawn:/sbin/getty -L $(SYSTEM_GETTY_OPTIONS) $(SYSTEM_GETTY_PORT) $(SYSTEM_GETTY_BAUDRATE) $(SYSTEM_GETTY_TERM) #~' \ $(TARGET_DIR)/etc/inittab endef -SYSVINIT_TARGET_FINALIZE_HOOKS += SYSVINIT_SET_GETTY +else +define SYSVINIT_SET_GETTY + $(SED) '/# GENERIC_SERIAL$$/s~^.*#~# S0:1:respawn:/sbin/getty -L ttyS0 115200 vt100 #~' \ + $(TARGET_DIR)/etc/inittab +endef endif # BR2_TARGET_GENERIC_GETTY +SYSVINIT_TARGET_FINALIZE_HOOKS += SYSVINIT_SET_GETTY SYSVINIT_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB diff --git a/buildroot/package/taglib/0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch b/buildroot/package/taglib/0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch new file mode 100644 index 000000000..c7ca9500d --- /dev/null +++ b/buildroot/package/taglib/0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch @@ -0,0 +1,33 @@ +From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001 +From: "Stephen F. Booth" +Date: Sun, 23 Jul 2017 10:11:09 -0400 +Subject: [PATCH] Don't assume TDRC is an instance of TextIdentificationFrame + +If TDRC is encrypted, FrameFactory::createFrame() returns UnknownFrame +which causes problems in rebuildAggregateFrames() when it is assumed +that TDRC is a TextIdentificationFrame +[Retrieved from: +https://github.com/taglib/taglib/pull/831/commits/eb9ded1206f18f2c319157337edea2533a40bea6] +Signed-off-by: Fabrice Fontaine +--- + taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp +index 759a9b7be..9347ab869 100644 +--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp ++++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp +@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const + tag->frameList("TDAT").size() == 1) + { + TextIdentificationFrame *tdrc = +- static_cast(tag->frameList("TDRC").front()); ++ dynamic_cast(tag->frameList("TDRC").front()); + UnknownFrame *tdat = static_cast(tag->frameList("TDAT").front()); + +- if(tdrc->fieldList().size() == 1 && ++ if(tdrc && ++ tdrc->fieldList().size() == 1 && + tdrc->fieldList().front().size() == 4 && + tdat->data().size() >= 5) + { diff --git a/buildroot/package/taglib/0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch b/buildroot/package/taglib/0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch new file mode 100644 index 000000000..b245659c2 --- /dev/null +++ b/buildroot/package/taglib/0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch @@ -0,0 +1,45 @@ +From 2c4ae870ec086f2ddd21a47861a3709c36faac45 Mon Sep 17 00:00:00 2001 +From: Scott Gayou +Date: Tue, 9 Oct 2018 18:46:55 -0500 +Subject: [PATCH] Fixed OOB read when loading invalid ogg flac file. (#868) + (#869) + +CVE-2018-11439 is caused by a failure to check the minimum length +of a ogg flac header. This header is detailed in full at: +https://xiph.org/flac/ogg_mapping.html. Added more strict checking +for entire header. +[Retrieved from: +https://github.com/taglib/taglib/commit/2c4ae870ec086f2ddd21a47861a3709c36faac45] +Signed-off-by: Fabrice Fontaine +--- + taglib/ogg/flac/oggflacfile.cpp | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/taglib/ogg/flac/oggflacfile.cpp b/taglib/ogg/flac/oggflacfile.cpp +index 53d04508a..07ea9dccc 100644 +--- a/taglib/ogg/flac/oggflacfile.cpp ++++ b/taglib/ogg/flac/oggflacfile.cpp +@@ -231,11 +231,21 @@ void Ogg::FLAC::File::scan() + + if(!metadataHeader.startsWith("fLaC")) { + // FLAC 1.1.2+ ++ // See https://xiph.org/flac/ogg_mapping.html for the header specification. ++ if(metadataHeader.size() < 13) ++ return; ++ ++ if(metadataHeader[0] != 0x7f) ++ return; ++ + if(metadataHeader.mid(1, 4) != "FLAC") + return; + +- if(metadataHeader[5] != 1) +- return; // not version 1 ++ if(metadataHeader[5] != 1 && metadataHeader[6] != 0) ++ return; // not version 1.0 ++ ++ if(metadataHeader.mid(9, 4) != "fLaC") ++ return; + + metadataHeader = metadataHeader.mid(13); + } diff --git a/buildroot/package/taglib/taglib.hash b/buildroot/package/taglib/taglib.hash index 7a5c5cf98..4b99e86d6 100644 --- a/buildroot/package/taglib/taglib.hash +++ b/buildroot/package/taglib/taglib.hash @@ -1,2 +1,4 @@ # Locally calculated sha256 b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b taglib-1.11.1.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING.MPL diff --git a/buildroot/package/taglib/taglib.mk b/buildroot/package/taglib/taglib.mk index 6f36347e6..9381e1667 100644 --- a/buildroot/package/taglib/taglib.mk +++ b/buildroot/package/taglib/taglib.mk @@ -10,6 +10,12 @@ TAGLIB_INSTALL_STAGING = YES TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1 TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL +# 0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch +TAGLIB_IGNORE_CVES += CVE-2017-12678 + +# 0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch +TAGLIB_IGNORE_CVES += CVE-2018-11439 + ifeq ($(BR2_PACKAGE_ZLIB),y) TAGLIB_DEPENDENCIES += zlib endif diff --git a/buildroot/package/tar/tar.hash b/buildroot/package/tar/tar.hash index e5634566e..90beb2609 100644 --- a/buildroot/package/tar/tar.hash +++ b/buildroot/package/tar/tar.hash @@ -1,3 +1,4 @@ # Locally calculated after checking signature -sha256 402dcfd0022fd7a1f2c5611f5c61af1cd84910a760a44a688e18ddbff4e9f024 tar-1.29.tar.xz +sha256 d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8 tar-1.32.tar.xz sha256 9173f222464dd3676118408840da5990527062b5c7daf6487bed7c396c45bfb1 tar-1.29.cpio.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/tar/tar.mk b/buildroot/package/tar/tar.mk index 6f609d7a0..9e0a40e56 100644 --- a/buildroot/package/tar/tar.mk +++ b/buildroot/package/tar/tar.mk @@ -4,7 +4,7 @@ # ################################################################################ -TAR_VERSION = 1.29 +TAR_VERSION = 1.32 TAR_SOURCE = tar-$(TAR_VERSION).tar.xz TAR_SITE = $(BR2_GNU_MIRROR)/tar # busybox installs in /bin, so we need tar to install as well in /bin @@ -29,15 +29,20 @@ endif $(eval $(autotools-package)) +# host-tar is used to create the archives in the VCS download backends and tar +# 1.30 and forward have changed the archive format. So archives generated with +# earlier versions are not bit-for-bit reproducible and the hashes would not +# match. Hence host-tar must be kept at version 1.29. +HOST_TAR_VERSION = 1.29 # host-tar: use cpio.gz instead of tar.gz to prevent chicken-egg problem # of needing tar to build tar. -HOST_TAR_SOURCE = tar-$(TAR_VERSION).cpio.gz +HOST_TAR_SOURCE = tar-$(HOST_TAR_VERSION).cpio.gz define HOST_TAR_EXTRACT_CMDS mkdir -p $(@D) cd $(@D) && \ $(call suitable-extractor,$(HOST_TAR_SOURCE)) $(TAR_DL_DIR)/$(HOST_TAR_SOURCE) | cpio -i --preserve-modification-time - mv $(@D)/tar-$(TAR_VERSION)/* $(@D) - rmdir $(@D)/tar-$(TAR_VERSION) + mv $(@D)/tar-$(HOST_TAR_VERSION)/* $(@D) + rmdir $(@D)/tar-$(HOST_TAR_VERSION) endef HOST_TAR_CONF_OPTS = --without-selinux diff --git a/buildroot/package/targetcli-fb/targetcli-fb.hash b/buildroot/package/targetcli-fb/targetcli-fb.hash index 50cb3e3f6..207c38e04 100644 --- a/buildroot/package/targetcli-fb/targetcli-fb.hash +++ b/buildroot/package/targetcli-fb/targetcli-fb.hash @@ -1,2 +1,3 @@ # locally computed -sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-v2.1.fb41.tar.gz +sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-2.1.fb41.tar.gz +sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/buildroot/package/targetcli-fb/targetcli-fb.mk b/buildroot/package/targetcli-fb/targetcli-fb.mk index 405759256..75643446d 100644 --- a/buildroot/package/targetcli-fb/targetcli-fb.mk +++ b/buildroot/package/targetcli-fb/targetcli-fb.mk @@ -6,8 +6,8 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = v2.1.fb41 -TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,$(TARGETCLI_FB_VERSION)) +TARGETCLI_FB_VERSION = 2.1.fb41 +TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING TARGETCLI_FB_SETUP_TYPE = setuptools diff --git a/buildroot/package/taskd/taskd.hash b/buildroot/package/taskd/taskd.hash index 41d37bbad..63bb87c1b 100644 --- a/buildroot/package/taskd/taskd.hash +++ b/buildroot/package/taskd/taskd.hash @@ -1,4 +1,5 @@ # From http://taskwarrior.org/download/ sha1 ded339deeee65277e4712f71a9159502f8b20b52 taskd-1.1.0.tar.gz # Locally calculated -sha256 7b8488e687971ae56729ff4e2e5209ff8806cf8cd57718bfd7e521be130621b4 taskd-1.1.0.tar.gz +sha256 7b8488e687971ae56729ff4e2e5209ff8806cf8cd57718bfd7e521be130621b4 taskd-1.1.0.tar.gz +sha256 84d1a8c2e6e306864ff350857a36b6c74756e61e2eae6822cf2fa88212720f68 COPYING diff --git a/buildroot/package/tcf-agent/tcf-agent.mk b/buildroot/package/tcf-agent/tcf-agent.mk index 5a0a991b1..2b8a61b66 100644 --- a/buildroot/package/tcf-agent/tcf-agent.mk +++ b/buildroot/package/tcf-agent/tcf-agent.mk @@ -24,9 +24,6 @@ TCF_AGENT_CONF_OPTS = \ define TCF_AGENT_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/tcf-agent/tcf-agent.service \ $(TARGET_DIR)/usr/lib/systemd/system/tcf-agent.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/tcf-agent.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/tcf-agent.service endef define TCF_AGENT_INSTALL_INIT_SYSV diff --git a/buildroot/package/tcl/0001-dont-build-compat.patch b/buildroot/package/tcl/0001-dont-build-compat.patch index 85c5c57df..c0d5d85da 100644 --- a/buildroot/package/tcl/0001-dont-build-compat.patch +++ b/buildroot/package/tcl/0001-dont-build-compat.patch @@ -7,20 +7,13 @@ anything buildroot is using as a standard C library will be good enough to not have broken behavior. Signed-off-by: Andrew Ruder +[Fabrice: Update for 8.6.9] +Signed-off-by: Fabrice Fontaine --- diff --git a/unix/tcl.m4 b/unix/tcl.m4 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 -@@ -2466,7 +2466,7 @@ AC_DEFUN([SC_BUGGY_STRTOD], [ - } - exit(0); - }], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy, -- tcl_cv_strtod_buggy=buggy)]) -+ tcl_cv_strtod_buggy=ok)]) - if test "$tcl_cv_strtod_buggy" = buggy; then - AC_LIBOBJ([fixstrtod]) - USE_COMPAT=1 @@ -2725,7 +2725,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ if test ["$tcl_ok"] = 1; then AC_CACHE_CHECK([proper ]$1[ implementation], [tcl_cv_]$1[_unbroken], diff --git a/buildroot/package/tcl/tcl.hash b/buildroot/package/tcl/tcl.hash index 359b5433c..913190b95 100644 --- a/buildroot/package/tcl/tcl.hash +++ b/buildroot/package/tcl/tcl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a265409781e4b3edcc4ef822533071b34c3dc6790b893963809b9fe221befe07 tcl8.6.6-src.tar.gz +sha256 ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e tcl8.6.9-src.tar.gz sha256 c0a69a2bfd757361ec7e6143973b103c90409316b49e9c88db26ad6388e79f16 license.terms diff --git a/buildroot/package/tcl/tcl.mk b/buildroot/package/tcl/tcl.mk index b9fb7afbc..6d750b3cd 100644 --- a/buildroot/package/tcl/tcl.mk +++ b/buildroot/package/tcl/tcl.mk @@ -5,7 +5,7 @@ ################################################################################ TCL_VERSION_MAJOR = 8.6 -TCL_VERSION = $(TCL_VERSION_MAJOR).6 +TCL_VERSION = $(TCL_VERSION_MAJOR).9 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION) TCL_LICENSE = TCL diff --git a/buildroot/package/tclap/tclap.hash b/buildroot/package/tclap/tclap.hash index 55d475fc8..2b2097be9 100644 --- a/buildroot/package/tclap/tclap.hash +++ b/buildroot/package/tclap/tclap.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 9f9f0fe3719e8a89d79b6ca30cf2d16620fba3db5b9610f9b51dd2cd033deebb tclap-1.2.1.tar.gz +sha256 f5013be7fcaafc69ba0ce2d1710f693f61e9c336b6292ae4f57554f59fde5837 tclap-1.2.2.tar.gz +sha256 cd81a61d47aeb1ed63036ca260baee37719923bbd7ebd988ec4edae128f3b6eb COPYING diff --git a/buildroot/package/tclap/tclap.mk b/buildroot/package/tclap/tclap.mk index 807f24798..63dea67ac 100644 --- a/buildroot/package/tclap/tclap.mk +++ b/buildroot/package/tclap/tclap.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCLAP_VERSION = 1.2.1 +TCLAP_VERSION = 1.2.2 TCLAP_SITE = http://downloads.sourceforge.net/project/tclap TCLAP_LICENSE = MIT TCLAP_LICENSE_FILES = COPYING diff --git a/buildroot/package/tcpdump/tcpdump.mk b/buildroot/package/tcpdump/tcpdump.mk index 72bf6f870..01a46b9b5 100644 --- a/buildroot/package/tcpdump/tcpdump.mk +++ b/buildroot/package/tcpdump/tcpdump.mk @@ -16,7 +16,7 @@ TCPDUMP_CONF_OPTS = \ --without-crypto \ --with-system-libpcap \ $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb) -TCPDUMP_DEPENDENCIES = zlib libpcap +TCPDUMP_DEPENDENCIES = libpcap ifeq ($(BR2_STATIC_LIBS),y) TCPDUMP_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" diff --git a/buildroot/package/tcping/Config.in b/buildroot/package/tcping/Config.in index e72df096c..c963e681d 100644 --- a/buildroot/package/tcping/Config.in +++ b/buildroot/package/tcping/Config.in @@ -11,4 +11,4 @@ config BR2_PACKAGE_TCPING desired port is reachable and then start connection establishment. - http://linuxco.de/tcping/tcping.html + https://github.com/mkirchner/tcping diff --git a/buildroot/package/tcping/tcping.hash b/buildroot/package/tcping/tcping.hash index de42775cc..49f6e5ba0 100644 --- a/buildroot/package/tcping/tcping.hash +++ b/buildroot/package/tcping/tcping.hash @@ -1,2 +1,3 @@ -# Locally calculated after checking pgp signature -sha256 1ad52e904094d12b225ac4a0bc75297555e931c11a1501445faa548ff5ecdbd0 tcping-1.3.5.tar.gz +# Locally calculated +sha256 a731f0e48ff931d7b2a0e896e4db40867043740fe901dd225780f2164fdbdcf3 tcping-1.3.6.tar.gz +sha256 4a35620e27ddb8de27898e4206c8f93633d877c1e128e98e95a035f760d94428 LICENSE diff --git a/buildroot/package/tcping/tcping.mk b/buildroot/package/tcping/tcping.mk index 7edf45ebb..5eaf702ef 100644 --- a/buildroot/package/tcping/tcping.mk +++ b/buildroot/package/tcping/tcping.mk @@ -4,9 +4,9 @@ # ################################################################################ -TCPING_VERSION = 1.3.5 -TCPING_SITE = http://linuxco.de/tcping -TCPING_LICENSE = GPL-3.0+ +TCPING_VERSION = 1.3.6 +TCPING_SITE = $(call github,mkirchner,tcping,$(TCPING_VERSION)) +TCPING_LICENSE = MIT TCPING_LICENSE_FILES = LICENSE define TCPING_BUILD_CMDS diff --git a/buildroot/package/tegrarcm/0001-Don-t-assume-cryptopp-is-system-wide-installed.patch b/buildroot/package/tegrarcm/0001-Don-t-assume-cryptopp-is-system-wide-installed.patch deleted file mode 100644 index 3c738d86a..000000000 --- a/buildroot/package/tegrarcm/0001-Don-t-assume-cryptopp-is-system-wide-installed.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5ea6b3859ebe16ff47856b58262b14463e119c13 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 19 Apr 2016 22:14:42 +0200 -Subject: [PATCH] Don't assume cryptopp is system-wide installed - -The current build system adds "-isystem /usr/include/$(CRYPTOLIB)" to -AM_CPPFLAGS, but this is wrong because cryptopp might not be installed -in this location. Instead, the build system should simply include - or and rely on the compiler include -path. - -The tricky part is that it can be or . To -solve this, we use a solution similar to the one used in -https://github.com/bingmann/crypto-speedtest/blob/master/m4/cryptopp.m4 -and -https://github.com/bingmann/crypto-speedtest/blob/master/src/speedtest_cryptopp.cpp: -the configure script fills in a variable called -CRYPTOLIB_HEADER_PREFIX, and we use that in the C++ code to include -the right header file. - -It is worth mentioning that doing #include - doesn't work, and we have to use an -intermediate #define'd constant to overcome this C preprocessor -limitation. - -Signed-off-by: Thomas Petazzoni -Submitted upstream at https://github.com/NVIDIA/tegrarcm/pull/2 ---- - configure.ac | 1 + - src/Makefile.am | 2 +- - src/aes-cmac.cpp | 28 +++++++++++++++++----------- - 3 files changed, 19 insertions(+), 12 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 943654f..620e158 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,6 +33,7 @@ AC_LINK_IFELSE( - [AC_MSG_ERROR([libcrypto++/libcryptopp is not installed.])])] - ) - AC_SUBST(CRYPTOLIB) -+AC_DEFINE_UNQUOTED([CRYPTOLIB_HEADER_PREFIX], [$CRYPTOLIB], [Location of cryptolib header]) - LDFLAGS=$SAVED_LDFLAGS - AC_LANG(C) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 3dad0e6..35a606f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,5 +1,5 @@ - AM_CFLAGS = -Wall -std=c99 --AM_CPPFLAGS = -isystem /usr/include/$(CRYPTOLIB) $(LIBUSB_CFLAGS) -+AM_CPPFLAGS = $(LIBUSB_CFLAGS) - - bin_PROGRAMS = tegrarcm - tegrarcm_SOURCES = \ -diff --git a/src/aes-cmac.cpp b/src/aes-cmac.cpp -index 24c89f8..da8be5a 100644 ---- a/src/aes-cmac.cpp -+++ b/src/aes-cmac.cpp -@@ -26,6 +26,9 @@ - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -+ -+#include "config.h" -+ - #include - using std::cout; - using std::cerr; -@@ -40,26 +43,29 @@ using std::string; - #include - using std::exit; - --#include "cryptlib.h" --using CryptoPP::Exception; -+#define CRYPTOPP_INCLUDE_CRYPTLIB -+#define CRYPTOPP_INCLUDE_CMAC -+#define CRYPTOPP_INCLUDE_AES -+#define CRYPTOPP_INCLUDE_HEX -+#define CRYPTOPP_INCLUDE_FILTERS -+#define CRYPTOPP_INCLUDE_SECBLOCK - --#include "cmac.h" --using CryptoPP::CMAC; -+#include CRYPTOPP_INCLUDE_CRYPTLIB -+#include CRYPTOPP_INCLUDE_CMAC -+#include CRYPTOPP_INCLUDE_AES -+#include CRYPTOPP_INCLUDE_HEX -+#include CRYPTOPP_INCLUDE_FILTERS -+#include CRYPTOPP_INCLUDE_SECBLOCK - --#include "aes.h" -+using CryptoPP::Exception; -+using CryptoPP::CMAC; - using CryptoPP::AES; -- --#include "hex.h" - using CryptoPP::HexEncoder; - using CryptoPP::HexDecoder; -- --#include "filters.h" - using CryptoPP::StringSink; - using CryptoPP::StringSource; - using CryptoPP::HashFilter; - using CryptoPP::HashVerificationFilter; -- --#include "secblock.h" - using CryptoPP::SecByteBlock; - - extern "C" int cmac_hash(const unsigned char *msg, int len, unsigned char *cmac_buf) --- -2.6.4 - diff --git a/buildroot/package/tegrarcm/tegrarcm.hash b/buildroot/package/tegrarcm/tegrarcm.hash index 4194a4cd2..38ff28093 100644 --- a/buildroot/package/tegrarcm/tegrarcm.hash +++ b/buildroot/package/tegrarcm/tegrarcm.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 538cb0af237ab33e070d3aeb6cc828cd7ef453753ba2ccc21b87ed43faac51bd tegrarcm-v1.7.tar.gz +sha256 08329ee0247499b28ec37b0cc639f35443792dfb9bc4a8a182eea63dae6f64ea tegrarcm-1.8.tar.gz +sha256 5f20d276321cb37346d911712a813cb7ce4c8e3a570bffc919bec820eeef13f6 LICENSE diff --git a/buildroot/package/tegrarcm/tegrarcm.mk b/buildroot/package/tegrarcm/tegrarcm.mk index ad4c317b3..3ec5ea942 100644 --- a/buildroot/package/tegrarcm/tegrarcm.mk +++ b/buildroot/package/tegrarcm/tegrarcm.mk @@ -4,8 +4,8 @@ # ################################################################################ -TEGRARCM_VERSION = v1.7 -TEGRARCM_SITE = $(call github,NVIDIA,tegrarcm,$(TEGRARCM_VERSION)) +TEGRARCM_VERSION = 1.8 +TEGRARCM_SITE = $(call github,NVIDIA,tegrarcm,v$(TEGRARCM_VERSION)) TEGRARCM_LICENSE = BSD-3-Clause / NVIDIA Software License (src/miniloader) TEGRARCM_LICENSE_FILES = LICENSE TEGRARCM_AUTORECONF = YES diff --git a/buildroot/package/tekui/tekui.hash b/buildroot/package/tekui/tekui.hash index 07de2ed6d..f82e7503f 100644 --- a/buildroot/package/tekui/tekui.hash +++ b/buildroot/package/tekui/tekui.hash @@ -1,2 +1,3 @@ # Locally computed sha256 28abfaacc0f2ddae962afbbca862a7fb619c33a99a497be9edd746091013dd7f tekui-1.12.tgz +sha256 92cdb348af49efe4c769ccbaeb34a23be084ddda408eace8f1a3a2c5dd4aad14 COPYRIGHT diff --git a/buildroot/package/terminology/terminology.hash b/buildroot/package/terminology/terminology.hash index 1e0a85cd2..ed386fb7b 100644 --- a/buildroot/package/terminology/terminology.hash +++ b/buildroot/package/terminology/terminology.hash @@ -1,3 +1,3 @@ -# From https://sourceforge.net/p/enlightenment/mailman/message/36497308/ -sha256 b5171181da42cc5f384238f71e43302c2c760938f6a8ab931647ccdad4ef94cd terminology-1.3.2.tar.xz -sha256 605988548c7a52562d6f64d936a579b53f690e62ca92261b6a440bf9023ff521 COPYING +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.6.0.tar.xz.sha256sum +sha256 b95cb05653afe0dad77fc038a8d5276c02a9c08d64ac97ddf0cee8087d27bd77 terminology-1.6.0.tar.xz +sha256 a907d434f4691990ed8f2826ff7546672e9934a26c798351da12ed544dadc628 COPYING diff --git a/buildroot/package/terminology/terminology.mk b/buildroot/package/terminology/terminology.mk index c53f6829d..add80825a 100644 --- a/buildroot/package/terminology/terminology.mk +++ b/buildroot/package/terminology/terminology.mk @@ -4,7 +4,7 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.3.2 +TERMINOLOGY_VERSION = 1.6.0 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause diff --git a/buildroot/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch b/buildroot/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch new file mode 100644 index 000000000..0b0bb1a89 --- /dev/null +++ b/buildroot/package/tesseract-ocr/0001-Fix-timeval-structure-build-failure.patch @@ -0,0 +1,27 @@ +From ea1e1ddfc0af9966a0c613a93087bc3e0a5979a7 Mon Sep 17 00:00:00 2001 +From: Gilles Talis +Date: Fri, 19 Jul 2019 18:52:03 +0200 +Subject: [PATCH] Fix timeval structure build failure + +timeval structure definition requires to be included + +Signed-off-by: Gilles Talis +--- + src/ccutil/ocrclass.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h +index d39a6dd..2a01118 100644 +--- a/src/ccutil/ocrclass.h ++++ b/src/ccutil/ocrclass.h +@@ -28,6 +28,7 @@ + + #include + #include ++#include + #ifdef _WIN32 + #include // for timeval + #endif +-- +2.7.4 + diff --git a/buildroot/package/tesseract-ocr/tesseract-ocr.hash b/buildroot/package/tesseract-ocr/tesseract-ocr.hash index d95375884..808ea174e 100644 --- a/buildroot/package/tesseract-ocr/tesseract-ocr.hash +++ b/buildroot/package/tesseract-ocr/tesseract-ocr.hash @@ -1,6 +1,6 @@ # locally computed -sha256 a1f5422ca49a32e5f35c54dee5112b11b99928fc9f4ee6695cdc6768d69f61dd tesseract-ocr-4.0.0.tar.gz -sha256 d770c1ac1235bc018530701da1ce453367f7952a3075d12b9029f81a26c05f13 COPYING +sha256 2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb tesseract-ocr-4.1.1.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata sha256 896b3b4956503ab9daa10285db330881b2d74b70d889b79262cc534b9ec699a4 deu.traineddata diff --git a/buildroot/package/tesseract-ocr/tesseract-ocr.mk b/buildroot/package/tesseract-ocr/tesseract-ocr.mk index 74b344961..fc083c27f 100644 --- a/buildroot/package/tesseract-ocr/tesseract-ocr.mk +++ b/buildroot/package/tesseract-ocr/tesseract-ocr.mk @@ -4,11 +4,11 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 4.0.0 +TESSERACT_OCR_VERSION = 4.1.1 TESSERACT_OCR_DATA_VERSION = 4.0.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0 -TESSERACT_OCR_LICENSE_FILES = COPYING +TESSERACT_OCR_LICENSE_FILES = LICENSE # Source from github, no configure script provided TESSERACT_OCR_AUTORECONF = YES @@ -53,13 +53,6 @@ TESSERACT_OCR_EXTRA_DOWNLOADS = \ $(addprefix https://github.com/tesseract-ocr/tessdata/raw/$(TESSERACT_OCR_DATA_VERSION)/,\ $(TESSERACT_OCR_DATA_FILES)) -define TESSERACT_OCR_PRECONFIGURE - # Autoreconf step fails due to missing m4 directory - mkdir -p $(@D)/m4 -endef - -TESSERACT_OCR_PRE_CONFIGURE_HOOKS += TESSERACT_OCR_PRECONFIGURE - # Language data files installation define TESSERACT_OCR_INSTALL_LANG_DATA $(foreach langfile,$(TESSERACT_OCR_DATA_FILES), \ diff --git a/buildroot/package/thermald/Config.in b/buildroot/package/thermald/Config.in new file mode 100644 index 000000000..f32a4b274 --- /dev/null +++ b/buildroot/package/thermald/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_THERMALD + bool "thermald" + depends on BR2_i386 || BR2_x86_64 # needs + depends on BR2_USE_MMU # uses fork() + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2, dbus + depends on BR2_USE_WCHAR # dbus-glib -> glib2 + select BR2_PACKAGE_DBUS + select BR2_PACKAGE_DBUS_GLIB + select BR2_PACKAGE_LIBXML2 + help + Thermal Daemon is a Linux daemon for monitoring and + controlling platform temperatures. Once the system temperature + reaches a certain threshold, the Linux daemon activates + various cooling methods to try to cool the system. + + https://01.org/linux-thermal-daemon + +comment "thermald needs a toolchain w/ C++, wchar, threads" + depends on BR2_i386 || BR2_x86_64 + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP diff --git a/buildroot/package/thermald/thermald.hash b/buildroot/package/thermald/thermald.hash new file mode 100644 index 000000000..34094ac8c --- /dev/null +++ b/buildroot/package/thermald/thermald.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 aaf5ffdc12344eef2417b41b433094bb30e4ebf321f0140b090f97bfcf24ea1f thermald-1.9.1.tar.gz +sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING diff --git a/buildroot/package/thermald/thermald.mk b/buildroot/package/thermald/thermald.mk new file mode 100644 index 000000000..98e9c361e --- /dev/null +++ b/buildroot/package/thermald/thermald.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# thermald +# +################################################################################ + +THERMALD_VERSION = 1.9.1 +THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION)) +# fetched from Github, with no configure script +THERMALD_AUTORECONF = YES +THERMALD_DEPENDENCIES = dbus dbus-glib libxml2 $(TARGET_NLS_DEPENDENCIES) +# tools are GPL-3.0+ but are not added to the target +THERMALD_LICENSE = GPL-2.0+ +THERMALD_LICENSE_FILES = COPYING +THERMALD_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) + +ifeq ($(BR2_INIT_SYSTEMD),y) +THERMALD_DEPENDENCIES += systemd +THERMALD_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/thrift/thrift.mk b/buildroot/package/thrift/thrift.mk index 6014bbfcd..4260fe7e1 100644 --- a/buildroot/package/thrift/thrift.mk +++ b/buildroot/package/thrift/thrift.mk @@ -19,6 +19,7 @@ THRIFT_COMMON_CONF_OPTS = -DBUILD_TUTORIALS=OFF \ -DBUILD_TESTING=OFF \ -DWITH_PYTHON=OFF \ -DWITH_JAVA=OFF \ + -DWITH_QT4=OFF \ -DWITH_QT5=OFF THRIFT_CONF_OPTS = $(THRIFT_COMMON_CONF_OPTS) -DBUILD_COMPILER=OFF diff --git a/buildroot/package/thttpd/thttpd.mk b/buildroot/package/thttpd/thttpd.mk index 6cf86e4b9..fe96f7df6 100644 --- a/buildroot/package/thttpd/thttpd.mk +++ b/buildroot/package/thttpd/thttpd.mk @@ -36,9 +36,6 @@ endef define THTTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/thttpd/thttpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/thttpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ - ln -fs ../../../../usr/lib/systemd/system/thttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/thttpd.service endef $(eval $(autotools-package)) diff --git a/buildroot/package/ti-cgt-pru/Config.in.host b/buildroot/package/ti-cgt-pru/Config.in.host index a36633705..eab3cd72d 100644 --- a/buildroot/package/ti-cgt-pru/Config.in.host +++ b/buildroot/package/ti-cgt-pru/Config.in.host @@ -7,6 +7,7 @@ config BR2_PACKAGE_HOST_TI_CGT_PRU_ARCH_SUPPORTS config BR2_PACKAGE_HOST_TI_CGT_PRU bool "host ti-cgt-pru" depends on BR2_PACKAGE_HOST_TI_CGT_PRU_ARCH_SUPPORTS + select BR2_HOSTARCH_NEEDS_IA32_LIBS help This package provides the Code Generation Tools for the PRU unit found on some TI processors e.g. AM3358. diff --git a/buildroot/package/ti-cgt-pru/ti-cgt-pru.hash b/buildroot/package/ti-cgt-pru/ti-cgt-pru.hash index 1975d8d1e..4dee32183 100644 --- a/buildroot/package/ti-cgt-pru/ti-cgt-pru.hash +++ b/buildroot/package/ti-cgt-pru/ti-cgt-pru.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 7dc37fd689d1d506bf410d2a00af658b93a58d4bc10ac32c2210129dab617377 ti_cgt_pru_2.2.1_linux_installer_x86.bin -sha256 eb646f4f8b14351110992b40ba24d12803bcc150a76e7298705f51088b0a09cc PRU_Code_Generation_Tools_2.2.x_manifest.html -sha256 6b98f9262abd1ae9a3731e6feee02a56b6e290542dea119eeeeaf88bf802aabc pru_rts_2_2_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx +sha256 1f1405167214f2c0ef848591b17a7799fdcd9f55f11bc90db9ace3490d426215 ti_cgt_pru_2.3.3_linux_installer_x86.bin +sha256 913cb4ab564f874b7c9a11726a16c4ccdc7ecc60be2738201281a1e28dc93641 PRU_Code_Generation_Tools_2.3.x_manifest.html +sha256 5e198df9782c63cedc8363f0e298b241a9a8084398a925f6e1003dbcb60801cb pru_rts_2_3_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx diff --git a/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk b/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk index 3665d2cec..8bf907cc9 100644 --- a/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk +++ b/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk @@ -4,13 +4,13 @@ # ################################################################################ -TI_CGT_PRU_VERSION = 2.2.1 +TI_CGT_PRU_VERSION = 2.3.3 TI_CGT_PRU_SOURCE = ti_cgt_pru_$(TI_CGT_PRU_VERSION)_linux_installer_x86.bin TI_CGT_PRU_SITE = http://downloads.ti.com/codegen/esd/cgt_public_sw/PRU/$(TI_CGT_PRU_VERSION) TI_CGT_PRU_LICENSE = TI Technology and Software Publicly Available License (compiler + PRU library), \ BSL-1.0 (compiler), BSD-2-Clause, BSD-3-Clause, MIT, AFL-3.0, Hewlett-Packard (PRU library) -TI_CGT_PRU_LICENSE_FILES = PRU_Code_Generation_Tools_2.2.x_manifest.html \ - pru_rts_2_2_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx +TI_CGT_PRU_LICENSE_FILES = PRU_Code_Generation_Tools_2.3.x_manifest.html \ + pru_rts_2_3_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx define HOST_TI_CGT_PRU_EXTRACT_CMDS chmod +x $(HOST_TI_CGT_PRU_DL_DIR)/$(TI_CGT_PRU_SOURCE) diff --git a/buildroot/package/ti-gfx/esrev.sh b/buildroot/package/ti-gfx/esrev.sh index 6220d4477..8109334b7 100644 --- a/buildroot/package/ti-gfx/esrev.sh +++ b/buildroot/package/ti-gfx/esrev.sh @@ -48,7 +48,8 @@ case $CPUTYPE in devmem 0x48180900 w 0x2 devmem 0x48180920 w 0x2 - ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:6: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')" + ES_REVISION="$(devmem 0x56000014 | sed -e s:0x00010205:6: \ + -e s:0x00010201:3: -e s:0x00010003:2:)" ;; *) echo Unable to determine SGX hardware diff --git a/buildroot/package/ti-gfx/ti-gfx.hash b/buildroot/package/ti-gfx/ti-gfx.hash index d97b559d7..39462e48e 100644 --- a/buildroot/package/ti-gfx/ti-gfx.hash +++ b/buildroot/package/ti-gfx/ti-gfx.hash @@ -1,3 +1,4 @@ # Locally computed: sha256 54641222cdb49b03f996cbd6412de227198d9e084f5647d706bbf4217e8cdb07 Graphics_SDK_setuplinux_hardfp_5_01_01_02.bin sha256 99dae9d33790c87860e828505ac07c5b864ef65d8372b39117704db6b78494ff Graphics_SDK_setuplinux_softfp_5_01_00_01.bin +sha256 74cc0f8a7806f685de6fd6c9f6d8453667078db4f2f3b29ab0b244e587bd7265 TSPA.txt diff --git a/buildroot/package/ti-gfx/ti-gfx.mk b/buildroot/package/ti-gfx/ti-gfx.mk index 9fad55378..272857277 100644 --- a/buildroot/package/ti-gfx/ti-gfx.mk +++ b/buildroot/package/ti-gfx/ti-gfx.mk @@ -196,9 +196,6 @@ define TI_GFX_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/scripts/ti-gfx $(INSTALL) -D -m 644 package/ti-gfx/ti-gfx.service \ $(TARGET_DIR)/usr/lib/systemd/system/ti-gfx.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/ti-gfx.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ti-gfx.service endef define TI_GFX_INSTALL_TARGET_CMDS diff --git a/buildroot/package/ti-sgx-demos/Config.in b/buildroot/package/ti-sgx-demos/Config.in index ea06fdb3a..ec7b8e603 100644 --- a/buildroot/package/ti-sgx-demos/Config.in +++ b/buildroot/package/ti-sgx-demos/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_TI_SGX_DEMOS Technologies are availabe as binaries only. The binaries are compiled for the TI SGX implementation. - http://git.ti.com/graphics/img-pvr-sdk + https://git.ti.com/cgit/graphics/img-pvr-sdk diff --git a/buildroot/package/ti-sgx-demos/ti-sgx-demos.hash b/buildroot/package/ti-sgx-demos/ti-sgx-demos.hash index 43acf9102..31044e9e3 100644 --- a/buildroot/package/ti-sgx-demos/ti-sgx-demos.hash +++ b/buildroot/package/ti-sgx-demos/ti-sgx-demos.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 9d1d4da2c2b35303e239f99eb4003b8b206078a682aa083d5fb831ee4197f3bf ti-sgx-demos-f24650bc8243b25c23d6a0a502ed79fc472ac424.tar.gz +sha256 1324115da376bc8108923c596a3c4d8df24a968395461df11e0b715764a942d4 ti-sgx-demos-bb8b74cdd1323e76697b3eb2258f863b15fee287.tar.gz +sha256 052741ea66a4a48e0ef8cab259d2dc136e7cf52fda694af8d1fe9bd28abe333b LegalNotice.txt diff --git a/buildroot/package/ti-sgx-demos/ti-sgx-demos.mk b/buildroot/package/ti-sgx-demos/ti-sgx-demos.mk index 80af79b98..8599e88e9 100644 --- a/buildroot/package/ti-sgx-demos/ti-sgx-demos.mk +++ b/buildroot/package/ti-sgx-demos/ti-sgx-demos.mk @@ -4,14 +4,15 @@ # ################################################################################ -# This correpsonds to SDK 02.00.00.00 -TI_SGX_DEMOS_VERSION = f24650bc8243b25c23d6a0a502ed79fc472ac424 -TI_SGX_DEMOS_SITE = git://git.ti.com/graphics/img-pvr-sdk.git +# This correpsonds to SDK 06.00.00.07 plus one pull request +TI_SGX_DEMOS_VERSION = bb8b74cdd1323e76697b3eb2258f863b15fee287 +TI_SGX_DEMOS_SITE = http://git.ti.com/git/graphics/img-pvr-sdk.git +TI_SGX_DEMOS_SITE_METHOD = git TI_SGX_DEMOS_LICENSE = Imagination Technologies License Agreement TI_SGX_DEMOS_LICENSE_FILES = LegalNotice.txt define TI_SGX_DEMOS_INSTALL_TARGET_CMDS - cp -dpfr $(@D)/targetfs/Examples/Advanced/OGLES* \ + cp -dpfr $(@D)/targetfs/arm/Examples/Advanced/Wayland/OGLES* \ $(TARGET_DIR)/usr/bin/ endef diff --git a/buildroot/package/ti-sgx-km/Config.in b/buildroot/package/ti-sgx-km/Config.in index 348efdeb8..964889ff4 100644 --- a/buildroot/package/ti-sgx-km/Config.in +++ b/buildroot/package/ti-sgx-km/Config.in @@ -8,46 +8,10 @@ config BR2_PACKAGE_TI_SGX_KM select BR2_LINUX_NEEDS_MODULES help Kernel modules for TI CPUs with SGX GPU. - This package supports AM335x, AM437x, AM4430 and AM5430. + This package supports AM335x only. It builds the kernel module and the user space binaries. For older CPUs or kernels use the ti-gfx package. Note: it needs a TI specific kernel to build properly. - http://git.ti.com/graphics/omap5-sgx-ddk-linux - -if BR2_PACKAGE_TI_SGX_KM - -choice - prompt "Target" - default BR2_PACKAGE_TI_SGX_KM_AM335X if BR2_PACKAGE_TI_SGX_AM335X # legacy - default BR2_PACKAGE_TI_SGX_KM_AM437X if BR2_PACKAGE_TI_SGX_AM437X # legacy - default BR2_PACKAGE_TI_SGX_KM_AM4430 if BR2_PACKAGE_TI_SGX_AM4430 # legacy - default BR2_PACKAGE_TI_SGX_KM_AM5430 if BR2_PACKAGE_TI_SGX_AM5430 # legacy - default BR2_PACKAGE_TI_SGX_KM_AM335X - help - Select the SOC for which you would like to install drivers. - -config BR2_PACKAGE_TI_SGX_KM_AM335X - bool "AM335x" - help - AM335x CPU - -config BR2_PACKAGE_TI_SGX_KM_AM437X - bool "AM437x" - help - AM437x CPU - -config BR2_PACKAGE_TI_SGX_KM_AM4430 - bool "AM4430" - help - AM4430 CPU - -config BR2_PACKAGE_TI_SGX_KM_AM5430 - bool "AM5430" - help - AM5430 CPU - -endchoice - -endif + https://git.ti.com/cgit/graphics/omap5-sgx-ddk-linux diff --git a/buildroot/package/ti-sgx-km/ti-sgx-km.hash b/buildroot/package/ti-sgx-km/ti-sgx-km.hash index 7f7e0acd4..1fd07d746 100644 --- a/buildroot/package/ti-sgx-km/ti-sgx-km.hash +++ b/buildroot/package/ti-sgx-km/ti-sgx-km.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 47728ff8fc48827116cc042efa777a22a83dd4bd17c494e2a53b8c204ca59624 ti-sgx-km-2b7523d07a13ab704a24a7664749551f4a13ed32.tar.gz +sha256 f1505f38f9e82f958673bb1755e65090bdbc513a68d41640561d9d491bc4b0e3 ti-sgx-km-4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d.tar.gz +sha256 e9d660547691b2a9232850fd43aac16d40fd063023166fd27162020c30dc2bd4 eurasia_km/GPL-COPYING diff --git a/buildroot/package/ti-sgx-km/ti-sgx-km.mk b/buildroot/package/ti-sgx-km/ti-sgx-km.mk index 0e1bc3390..ae294c300 100644 --- a/buildroot/package/ti-sgx-km/ti-sgx-km.mk +++ b/buildroot/package/ti-sgx-km/ti-sgx-km.mk @@ -4,30 +4,23 @@ # ################################################################################ -# This correpsonds to SDK 02.00.00.00 -TI_SGX_KM_VERSION = 2b7523d07a13ab704a24a7664749551f4a13ed32 -TI_SGX_KM_SITE = git://git.ti.com/graphics/omap5-sgx-ddk-linux.git +# This correpsonds to SDK 06.00.00.07 +TI_SGX_KM_VERSION = 4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d +TI_SGX_KM_SITE = http://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git +TI_SGX_KM_SITE_METHOD = git TI_SGX_KM_LICENSE = GPL-2.0 -TI_SGX_KM_LICENSE_FILES = GPL-COPYING +TI_SGX_KM_LICENSE_FILES = eurasia_km/GPL-COPYING TI_SGX_KM_DEPENDENCIES = linux TI_SGX_KM_MAKE_OPTS = \ $(LINUX_MAKE_FLAGS) \ KERNELDIR=$(LINUX_DIR) \ - PVR_NULLDRM=1 + TARGET_PRODUCT=$(TI_SGX_KM_PLATFORM_NAME) -ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM335X),y) -TI_SGX_KM_PLATFORM_NAME = omap335x -else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM437X),y) -TI_SGX_KM_PLATFORM_NAME = omap437x -else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM4430),y) -TI_SGX_KM_PLATFORM_NAME = omap4430 -else ifeq ($(BR2_PACKAGE_TI_SGX_KM_5430),y) -TI_SGX_KM_PLATFORM_NAME = omap5430 -endif +TI_SGX_KM_PLATFORM_NAME = ti335x -TI_SGX_KM_SUBDIR = eurasia_km/eurasiacon/build/linux2/$(TI_SGX_KM_PLATFORM_NAME)_linux +TI_SGX_KM_SUBDIR = eurasia_km/eurasiacon/build/linux2/omap_linux define TI_SGX_KM_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TI_SGX_KM_MAKE_OPTS) \ diff --git a/buildroot/package/ti-sgx-libgbm/0001-Add-missing-sys-sysmacros.h-include.patch b/buildroot/package/ti-sgx-libgbm/0001-Add-missing-sys-sysmacros.h-include.patch new file mode 100644 index 000000000..2863c93be --- /dev/null +++ b/buildroot/package/ti-sgx-libgbm/0001-Add-missing-sys-sysmacros.h-include.patch @@ -0,0 +1,25 @@ +From e3a3f3655956265eb4f3b866d445a9d19e613594 Mon Sep 17 00:00:00 2001 +From: Lothar Felten +Date: Thu, 14 Nov 2019 23:37:07 -0300 +Subject: [PATCH] Add missing sys/sysmacros.h include + +Signed-off-by: Lothar Felten +--- + gbm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gbm.c b/gbm.c +index 7bc5880..e360da7 100644 +--- a/gbm.c ++++ b/gbm.c +@@ -36,6 +36,7 @@ + + #include + #include ++#include + #include + #include + +-- +2.18.1 + diff --git a/buildroot/package/ti-sgx-libgbm/Config.in b/buildroot/package/ti-sgx-libgbm/Config.in new file mode 100644 index 000000000..2c679e204 --- /dev/null +++ b/buildroot/package/ti-sgx-libgbm/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TI_SGX_LIBGBM + bool "ti-sgx-libgbm" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_LIBDRM + help + TI SGX libgbm variant. + + https://git.ti.com/cgit/glsdk/libgbm + +comment "ti-sgx-libgbm needs udev and a toolchain w/ threads" + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.hash b/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.hash new file mode 100644 index 000000000..32af5ad5a --- /dev/null +++ b/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 85e3eafcd06caccd8c4cea3081b1406ae51c07e19541ac19b9c33a5b41fec82d ti-sgx-libgbm-c5ddc6a37bb78ac753b317b17d890d1f7338dea6.tar.gz +sha256 58fe00de76ae5d533e1c562950e1848682c03155a653d76870cf0a3c59be8b4c gbm.h diff --git a/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.mk b/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.mk new file mode 100644 index 000000000..00a0716e2 --- /dev/null +++ b/buildroot/package/ti-sgx-libgbm/ti-sgx-libgbm.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# ti-sgx-libgbm +# +################################################################################ + +# This correpsonds to SDK 06.00.00.07 +TI_SGX_LIBGBM_VERSION = c5ddc6a37bb78ac753b317b17d890d1f7338dea6 +TI_SGX_LIBGBM_SITE = http://git.ti.com/git/glsdk/libgbm.git +TI_SGX_LIBGBM_SITE_METHOD = git +TI_SGX_LIBGBM_LICENSE = MIT +TI_SGX_LIBGBM_LICENSE_FILES = gbm.h +TI_SGX_LIBGBM_INSTALL_STAGING = YES +TI_SGX_LIBGBM_AUTORECONF = YES + +TI_SGX_LIBGBM_DEPENDENCIES = libdrm udev + +define TI_SGX_LIBGBM_INSTALL_TARGET_OPTS + PREFIX=/usr \ + STRIP=/bin/true \ + DESTDIR=$(TARGET_DIR) \ + install +endef + +define TI_SGX_LIBGBM_INSTALL_STAGING_OPTS + PREFIX=/usr \ + STRIP=/bin/true \ + DESTDIR=$(STAGING_DIR) \ + install +endef + +$(eval $(autotools-package)) diff --git a/buildroot/package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch b/buildroot/package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch new file mode 100644 index 000000000..7509d4ef9 --- /dev/null +++ b/buildroot/package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch @@ -0,0 +1,39 @@ +From afb92e4b1cd05388f519868215d0e8a4672ebb0e Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sun, 10 Nov 2019 22:44:44 -0300 +Subject: [PATCH] Makefile: do not install init script + +Use a custom one, made for Buildroot, instead. + +Signed-off-by: Carlos Santos +--- + Makefile | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 649111a..19016f3 100755 +--- a/Makefile ++++ b/Makefile +@@ -3,7 +3,6 @@ TARGET_PRODUCT ?= jacinto6evm + SRCDIR = ./targetfs/${TARGET_PRODUCT} + + prefix = /usr +-etcdir = /etc + bindir = ${prefix}/bin + incdir = ${prefix}/include + libdir = ${prefix}/lib +@@ -11,11 +10,9 @@ libdir = ${prefix}/lib + all: + + install: +- mkdir -p ${DESTDIR}${etcdir} + mkdir -p ${DESTDIR}${bindir} + mkdir -p ${DESTDIR}${incdir} + mkdir -p ${DESTDIR}${libdir} +- cp -ar ${SRCDIR}/etc/* ${DESTDIR}${etcdir} + cp -ar ${SRCDIR}/bin/* ${DESTDIR}${bindir} + cp -ar ${SRCDIR}/include/* ${DESTDIR}${incdir} + cp -ar ${SRCDIR}/lib/* ${DESTDIR}${libdir} +-- +2.18.1 + diff --git a/buildroot/package/ti-sgx-um/Config.in b/buildroot/package/ti-sgx-um/Config.in index 8e1e4fb27..ee87d46aa 100644 --- a/buildroot/package/ti-sgx-um/Config.in +++ b/buildroot/package/ti-sgx-um/Config.in @@ -1,13 +1,15 @@ comment "ti-sgx-um needs the ti-sgx-km driver" depends on !BR2_PACKAGE_TI_SGX_KM -comment "ti-sgx-um needs a glibc toolchain w/ threads" - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS +comment "ti-sgx-um needs udev and a glibc toolchain w/ threads" + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC \ + || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_TI_SGX_UM bool "ti-sgx-um" depends on BR2_PACKAGE_TI_SGX_KM depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + depends on BR2_PACKAGE_HAS_UDEV # ti-sgx-libgbm # pre-built binaries depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBDRM @@ -15,12 +17,15 @@ config BR2_PACKAGE_TI_SGX_UM select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_POWERVR + select BR2_PACKAGE_TI_SGX_LIBGBM + select BR2_PACKAGE_LIBFFI + select BR2_PACKAGE_WAYLAND help Graphics libraries for TI CPUs with SGX5xx GPU. This package supports AM335x, AM437x, AM4430 and AM5430. For older CPUs or kernels use the ti-gfx package. - http://git.ti.com/graphics/omap5-sgx-ddk-um-linux + https://git.ti.com/cgit/graphics/omap5-sgx-ddk-um-linux if BR2_PACKAGE_TI_SGX_UM diff --git a/buildroot/package/ti-sgx-um/S80ti-sgx b/buildroot/package/ti-sgx-um/S80ti-sgx index 8cae52fd6..2630a0576 100644 --- a/buildroot/package/ti-sgx-um/S80ti-sgx +++ b/buildroot/package/ti-sgx-um/S80ti-sgx @@ -1,14 +1,56 @@ #!/bin/sh + +pvrsrvkm_ko="/lib/modules/$(/bin/uname -r)/extra/pvrsrvkm.ko" + +pvr_loaded() { + /sbin/lsmod | /bin/grep -q '^\' +} + +pvr_load() { + /sbin/insmod "$pvrsrvkm_ko" > /dev/null 2>&1 +} + +start() { + printf 'Loading pvrsrvkm module: ' + pvr_loaded || pvr_load + status=$? + if [ "$status" -eq 0 ]; then + printf 'Starting PowerVR services: ' + /usr/bin/pvrsrvctl --start --no-module > /dev/null 2>&1 + status=$? + fi + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Starting PowerVR services: ' + /usr/bin/pvrsrvctl --stop > /dev/null 2>&1 + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + case "$1" in - start) - printf "Initializing SGX graphics driver " - /usr/bin/pvrsrvinit - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - ;; - *) - echo "Usage: $0 {start|stop}" - exit 1 - ;; + start|stop|restart) + "$1";; + reload) + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac diff --git a/buildroot/package/ti-sgx-um/powervr.ini b/buildroot/package/ti-sgx-um/powervr.ini deleted file mode 100644 index fc92d45d5..000000000 --- a/buildroot/package/ti-sgx-um/powervr.ini +++ /dev/null @@ -1,6 +0,0 @@ -[default] -#defaul library without double buffering: -WindowSystem=libpvrDRMWSEGL_FRONT.so -#alternative library, slower but with double buffering -#WindowSystem=libpvrDRMWSEGL.so -DisableHWTQTextureUpload=1 diff --git a/buildroot/package/ti-sgx-um/ti-sgx-um.hash b/buildroot/package/ti-sgx-um/ti-sgx-um.hash index a6a056646..ff54ecbd6 100644 --- a/buildroot/package/ti-sgx-um/ti-sgx-um.hash +++ b/buildroot/package/ti-sgx-um/ti-sgx-um.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 c17f23d255cff8fe72fc3f5cae3d7550e387af07d036954b4f08e573379406d0 ti-sgx-um-e15f1543bab4de9e8927a2c4934addf3fd16ffcb.tar.gz +sha256 cb1373a6335af3d3741c6b11cf217afc8bdbe182642229df359c38e3ccfc5866 ti-sgx-um-2a2e5bb090ced870d73ed4edbc54793e952cc6d8.tar.gz +sha256 368c306246c9130b5c90a6fef2f80085f70b6225b3f552654a288c0f39fc1531 TI-Linux-Graphics-DDK-UM-Manifest.doc diff --git a/buildroot/package/ti-sgx-um/ti-sgx-um.mk b/buildroot/package/ti-sgx-um/ti-sgx-um.mk index d5c50a016..0e26d057c 100644 --- a/buildroot/package/ti-sgx-um/ti-sgx-um.mk +++ b/buildroot/package/ti-sgx-um/ti-sgx-um.mk @@ -4,28 +4,26 @@ # ################################################################################ -# This correpsonds to SDK 02.00.00.00 -TI_SGX_UM_VERSION = e15f1543bab4de9e8927a2c4934addf3fd16ffcb -TI_SGX_UM_SITE = git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git +# This correpsonds to SDK 06.00.00.07 plus one pull request +TI_SGX_UM_VERSION = 2a2e5bb090ced870d73ed4edbc54793e952cc6d8 +TI_SGX_UM_SITE = http://git.ti.com/git/graphics/omap5-sgx-ddk-um-linux.git +TI_SGX_UM_SITE_METHOD = git TI_SGX_UM_LICENSE = TI TSPA License -TI_SGX_UM_LICENSE_FILES = OMAP5-Linux-Graphics-DDK-UM-Manifest.doc +TI_SGX_UM_LICENSE_FILES = TI-Linux-Graphics-DDK-UM-Manifest.doc TI_SGX_UM_INSTALL_STAGING = YES +TI_SGX_UM_TARGET=ti335x # ti-sgx-um is a egl/gles provider only if libdrm is installed -TI_SGX_UM_DEPENDENCIES = libdrm +TI_SGX_UM_DEPENDENCIES = libdrm wayland define TI_SGX_UM_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(STAGING_DIR) \ + TARGET_PRODUCT=$(TI_SGX_UM_TARGET) install endef define TI_SGX_UM_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(TARGET_DIR) install -endef - -# libs use the following file for configuration -define TI_SGX_UM_INSTALL_CONF - $(INSTALL) -D -m 0644 package/ti-sgx-um/powervr.ini \ - $(TARGET_DIR)/etc/powervr.ini + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(TARGET_DIR) \ + TARGET_PRODUCT=$(TI_SGX_UM_TARGET) install endef TI_SGX_UM_POST_INSTALL_TARGET_HOOKS += TI_SGX_UM_INSTALL_CONF diff --git a/buildroot/package/ti-uim/ti-uim.hash b/buildroot/package/ti-uim/ti-uim.hash index ea64540ba..9c29b7464 100644 --- a/buildroot/package/ti-uim/ti-uim.hash +++ b/buildroot/package/ti-uim/ti-uim.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 da8a66968f4bf99366ab2b63baf358d937a6b1a5636ef6179c3aa7c852cbd1b2 ti-uim-a0236bc252e6484835ce266ae4a50b361f6a902d.tar.gz +sha256 da8a66968f4bf99366ab2b63baf358d937a6b1a5636ef6179c3aa7c852cbd1b2 ti-uim-a0236bc252e6484835ce266ae4a50b361f6a902d.tar.gz +sha256 4e39276507524f938459b05d061ae77562f3f85926fe73027cfcac259cb03d0e uim.h diff --git a/buildroot/package/ti-utils/ti-utils.hash b/buildroot/package/ti-utils/ti-utils.hash index 899172e95..0548427fc 100644 --- a/buildroot/package/ti-utils/ti-utils.hash +++ b/buildroot/package/ti-utils/ti-utils.hash @@ -1,2 +1,3 @@ # locally computed sha256 d05d4e3ad3599fca7854109938aebd24bbab72ac7d69dd053260f735a36613f9 ti-utils-06dbdb2727354b5f3ad7c723897f40051fddee49.tar.gz +sha256 363cef40b276a7a91ebcff3f78626d9cfe5e5a51927c725236007259403d5fc4 COPYING diff --git a/buildroot/package/time/time.hash b/buildroot/package/time/time.hash index b843534a5..cea57dc25 100644 --- a/buildroot/package/time/time.hash +++ b/buildroot/package/time/time.hash @@ -1,3 +1,5 @@ -# Locally calculated +# From https://lists.gnu.org/archive/html/info-gnu/2018-03/msg00004.html +sha1 75068c26abbed3ad3980685bae21d7202d288317 time-1.9.tar.gz sha256 fbacf0c81e62429df3e33bda4cee38756604f18e01d977338e23306a3e3b521e time-1.9.tar.gz +# Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/tinc/tinc.hash b/buildroot/package/tinc/tinc.hash index 0daeb324e..5bd7aa2b1 100644 --- a/buildroot/package/tinc/tinc.hash +++ b/buildroot/package/tinc/tinc.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 18c83b147cc3e2133a7ac2543eeb014d52070de01c7474287d3ccecc9b16895e tinc-1.0.35.tar.gz -sha256 3a112fd37b47d624e89b130d0e158bb8d14ec5bc9ecf5f18b448d2c07626e43d COPYING +sha256 40f73bb3facc480effe0e771442a706ff0488edea7a5f2505d4ccb2aa8163108 tinc-1.0.36.tar.gz +sha256 3b37ffbf3459f2aceeef169aa65ee8b111ac1f8ba24a2a1b90b079678a9c7faa COPYING sha256 9bf76a8aa304d807df20bf3d221c21d259764be63e39b58f299b80ba3ac14b5b COPYING.README diff --git a/buildroot/package/tinc/tinc.mk b/buildroot/package/tinc/tinc.mk index ae7ce97bf..56a26e9a5 100644 --- a/buildroot/package/tinc/tinc.mk +++ b/buildroot/package/tinc/tinc.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINC_VERSION = 1.0.35 +TINC_VERSION = 1.0.36 TINC_SITE = http://www.tinc-vpn.org/packages TINC_DEPENDENCIES = lzo openssl zlib TINC_LICENSE = GPL-2.0+ with OpenSSL exception diff --git a/buildroot/package/tini/tini.hash b/buildroot/package/tini/tini.hash index 34f919f06..7c548183b 100644 --- a/buildroot/package/tini/tini.hash +++ b/buildroot/package/tini/tini.hash @@ -1,3 +1,3 @@ # Locally computed sha256 e5f46bca81266bdd511cf08018d66866870531794569c04f9b45f50dd23c28b0 LICENSE -sha256 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2 tini-v0.18.0.tar.gz +sha256 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2 tini-0.18.0.tar.gz diff --git a/buildroot/package/tini/tini.mk b/buildroot/package/tini/tini.mk index b6d7d80b2..986e612a8 100644 --- a/buildroot/package/tini/tini.mk +++ b/buildroot/package/tini/tini.mk @@ -4,15 +4,15 @@ # ################################################################################ -TINI_VERSION = v0.18.0 -TINI_SITE = $(call github,krallin,tini,$(TINI_VERSION)) +TINI_VERSION = 0.18.0 +TINI_SITE = $(call github,krallin,tini,v$(TINI_VERSION)) TINI_LICENSE = MIT TINI_LICENSE_FILES = LICENSE TINI_CFLAGS = $(TARGET_CFLAGS) \ + -static \ -DTINI_VERSION=\"$(TINI_VERSION)\" \ -DTINI_GIT=\"\" -TINI_CFLAGS += -static ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y) TINI_CFLAGS += -DTINI_MINIMAL diff --git a/buildroot/package/tinyalsa/tinyalsa.hash b/buildroot/package/tinyalsa/tinyalsa.hash index f9be664ca..d078bab59 100644 --- a/buildroot/package/tinyalsa/tinyalsa.hash +++ b/buildroot/package/tinyalsa/tinyalsa.hash @@ -1,2 +1,3 @@ # locally computed -sha256 d92b438cea348ae316c4b2cbf367b4f01ed821a947e6a34d813624e9e3c936c1 tinyalsa-1.1.1.tar.gz +sha256 d92b438cea348ae316c4b2cbf367b4f01ed821a947e6a34d813624e9e3c936c1 tinyalsa-1.1.1.tar.gz +sha256 ca2b89a68c33fba3c8bcaec96f32907e2ede0eb33688ae61d29ec49732158f6d NOTICE diff --git a/buildroot/package/tinycbor/0001-fix-undefined-encode_half-in-json2cbor.patch b/buildroot/package/tinycbor/0001-fix-undefined-encode_half-in-json2cbor.patch deleted file mode 100644 index 0547758bd..000000000 --- a/buildroot/package/tinycbor/0001-fix-undefined-encode_half-in-json2cbor.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 77325101e41c149507c071c64a8dc9a21bf469d6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 20 Sep 2018 19:23:54 +0200 -Subject: [PATCH] fix undefined encode_half in json2cbor - -encode_half has been moved from compilersupport_p.h to cborinternal_p.h -in commit bfc40dcf909f1998d7760c2bc0e1409979d3c8cb so include this file -in json2cbor to avoid the following build failure: - -/home/buildroot/autobuild/run/instance-0/output/host/bin/microblazeel-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./src -std=gnu99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -c -o tools/json2cbor/json2cbor.o tools/json2cbor/json2cbor.c -tools/json2cbor/json2cbor.c: In function 'decode_json_with_metadata': -tools/json2cbor/json2cbor.c:295:50: warning: implicit declaration of function 'encode_half' [-Wimplicit-function-declaration] - (half = encode_half(v), cbor_encode_half_float(encoder, &half)); - ^~~~~~~~~~~ -/home/buildroot/autobuild/run/instance-0/output/host/bin/microblazeel-linux-gcc -o bin/json2cbor tools/json2cbor/json2cbor.o lib/libtinycbor.so -lcjson -lm -tools/json2cbor/json2cbor.o: In function `decode_json_with_metadata': -(.text+0xe54): undefined reference to `encode_half' -collect2: error: ld returned 1 exit status -Makefile:151: recipe for target 'bin/json2cbor' failed - -Fixes: - - http://autobuild.buildroot.net/results/afd8d24f2a4e501264abff618cf421d4bd088ebf - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/intel/tinycbor/pull/139] ---- - tools/json2cbor/json2cbor.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/json2cbor/json2cbor.c b/tools/json2cbor/json2cbor.c -index 008a7de..c13a751 100644 ---- a/tools/json2cbor/json2cbor.c -+++ b/tools/json2cbor/json2cbor.c -@@ -25,6 +25,7 @@ - #define _POSIX_C_SOURCE 200809L - #define _GNU_SOURCE - #include "cbor.h" -+#include "cborinternal_p.h" - #include "compilersupport_p.h" - - #include --- -2.17.1 - diff --git a/buildroot/package/tinycbor/tinycbor.hash b/buildroot/package/tinycbor/tinycbor.hash index 6a7282dcb..8ff706bb6 100644 --- a/buildroot/package/tinycbor/tinycbor.hash +++ b/buildroot/package/tinycbor/tinycbor.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dfa2a4550eb145a5f62ffff39e36accf2704987922c194e8e845124175c00441 tinycbor-v0.5.2.tar.gz +sha256 956eb4b670ea4969eaee67395b5bb6437b153960385b77357d6692e979d1b12d tinycbor-0.5.3.tar.gz sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e LICENSE diff --git a/buildroot/package/tinycbor/tinycbor.mk b/buildroot/package/tinycbor/tinycbor.mk index 40a828d54..ef095ea67 100644 --- a/buildroot/package/tinycbor/tinycbor.mk +++ b/buildroot/package/tinycbor/tinycbor.mk @@ -4,8 +4,8 @@ # ################################################################################ -TINYCBOR_VERSION = v0.5.2 -TINYCBOR_SITE = $(call github,intel,tinycbor,$(TINYCBOR_VERSION)) +TINYCBOR_VERSION = 0.5.3 +TINYCBOR_SITE = $(call github,intel,tinycbor,v$(TINYCBOR_VERSION)) TINYCBOR_LICENSE = MIT TINYCBOR_LICENSE_FILES = LICENSE diff --git a/buildroot/package/tinyhttpd/tinyhttpd.hash b/buildroot/package/tinyhttpd/tinyhttpd.hash index 73255d565..fc8ff4ee2 100644 --- a/buildroot/package/tinyhttpd/tinyhttpd.hash +++ b/buildroot/package/tinyhttpd/tinyhttpd.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 56609b82869c80ba71b2a2af166a0bcaffe21e7412f4594e04b9a5abf733435a tinyhttpd-0.1.0.tar.gz +sha256 4289e6d4f7ba72672dbd45ab78a8e02babf3d6e0577eeac5b2ef6926da6f4a87 README diff --git a/buildroot/package/tinyhttpd/tinyhttpd.mk b/buildroot/package/tinyhttpd/tinyhttpd.mk index 058f6bd18..6b3ba5f30 100644 --- a/buildroot/package/tinyhttpd/tinyhttpd.mk +++ b/buildroot/package/tinyhttpd/tinyhttpd.mk @@ -27,9 +27,6 @@ endef define TINYHTTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/tinyhttpd/tinyhttpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/tinyhttpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/tinyhttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/tinyhttpd.service endef $(eval $(generic-package)) diff --git a/buildroot/package/tinymembench/tinymembench.hash b/buildroot/package/tinymembench/tinymembench.hash index 59ca70dcb..c0b767e93 100644 --- a/buildroot/package/tinymembench/tinymembench.hash +++ b/buildroot/package/tinymembench/tinymembench.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e37a2682065b2778f2fa7f22bd59472f5ca2191be48503952ae020b8f023f23d tinymembench-v0.4.tar.gz +sha256 e37a2682065b2778f2fa7f22bd59472f5ca2191be48503952ae020b8f023f23d tinymembench-0.4.tar.gz sha256 8ba473aced4630aee2808efe17b53e904a9d68a9b3361de491717f9a4e75da39 LICENSE diff --git a/buildroot/package/tinymembench/tinymembench.mk b/buildroot/package/tinymembench/tinymembench.mk index b2ccc749f..016d680ce 100644 --- a/buildroot/package/tinymembench/tinymembench.mk +++ b/buildroot/package/tinymembench/tinymembench.mk @@ -4,8 +4,8 @@ # ################################################################################ -TINYMEMBENCH_VERSION = v0.4 -TINYMEMBENCH_SITE = $(call github,ssvb,tinymembench,$(TINYMEMBENCH_VERSION)) +TINYMEMBENCH_VERSION = 0.4 +TINYMEMBENCH_SITE = $(call github,ssvb,tinymembench,v$(TINYMEMBENCH_VERSION)) TINYMEMBENCH_LICENSE = MIT TINYMEMBENCH_LICENSE_FILES = LICENSE diff --git a/buildroot/package/tinyssh/Config.in b/buildroot/package/tinyssh/Config.in new file mode 100644 index 000000000..da19d2d45 --- /dev/null +++ b/buildroot/package/tinyssh/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_TINYSSH + bool "tinyssh" + depends on BR2_USE_MMU # fork() + help + TinySSH is a minimalistic SSH server which implements only + a subset of SSHv2 features. + + https://tinyssh.org diff --git a/buildroot/package/tinyssh/tinyssh.hash b/buildroot/package/tinyssh/tinyssh.hash new file mode 100644 index 000000000..99ee4afaf --- /dev/null +++ b/buildroot/package/tinyssh/tinyssh.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 65a7dc785861a09399419a1e7c42cddf66f32dc233a33277327b11f1bd8a772c tinyssh-7e2b4025bf3a2dae4c6617e3eb39df4bcde37454.tar.gz +sha256 b5dc19477e29f4111e1c16cd89ec0782f5a07b1a30e3bdb7c155425b81b12c46 LICENCE diff --git a/buildroot/package/tinyssh/tinyssh.mk b/buildroot/package/tinyssh/tinyssh.mk new file mode 100644 index 000000000..6f22be6c5 --- /dev/null +++ b/buildroot/package/tinyssh/tinyssh.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# tinyssh +# +################################################################################ + +TINYSSH_VERSION = 7e2b4025bf3a2dae4c6617e3eb39df4bcde37454 +TINYSSH_SITE = $(call github,janmojzis,tinyssh,$(TINYSSH_VERSION)) +TINYSSH_LICENSE = Public Domain, CC0-1.0 +TINYSSH_LICENSE_FILES = LICENCE + +define TINYSSH_BUILD_CMDS + $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" $(MAKE) -C $(@D) cross-compile +endef + +define TINYSSH_INSTALL_TARGET_CMDS + $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/tinyxml/tinyxml.hash b/buildroot/package/tinyxml/tinyxml.hash index 6aa37d9de..650a3b227 100644 --- a/buildroot/package/tinyxml/tinyxml.hash +++ b/buildroot/package/tinyxml/tinyxml.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 8164c9ad48b9028667768a584d62f7760cfbfb90d0dd6214ad174403058da10c tinyxml-2.6.2_2.tar.gz +sha256 a65b8363834ccbe31ab7b49dcba723ed204622df30326793e0121435624c1a8d README diff --git a/buildroot/package/tinyxml2/tinyxml2.hash b/buildroot/package/tinyxml2/tinyxml2.hash index 5f3854646..bb0f8108f 100644 --- a/buildroot/package/tinyxml2/tinyxml2.hash +++ b/buildroot/package/tinyxml2/tinyxml2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cdf0c2179ae7a7931dba52463741cf59024198bbf9673bf08415bcb46344110f tinyxml2-6.2.0.tar.gz -sha256 8b2ab0b6ffb86798a2512f45fcf50a3b04b3516782d2e3fb30ebf55dc18c7cce readme.md +sha256 68ebd396a4220d5a9b5a621c6e9c66349c5cfdf5efaea3f16e3bb92e45f4e2a3 tinyxml2-7.1.0.tar.gz +sha256 beed3466425970b9d970e573947f1fe7d3cbe41ed7e2c39b0daf45f7de053c43 readme.md diff --git a/buildroot/package/tinyxml2/tinyxml2.mk b/buildroot/package/tinyxml2/tinyxml2.mk index 9439c5cb8..67f626428 100644 --- a/buildroot/package/tinyxml2/tinyxml2.mk +++ b/buildroot/package/tinyxml2/tinyxml2.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYXML2_VERSION = 6.2.0 +TINYXML2_VERSION = 7.1.0 TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION)) TINYXML2_LICENSE = Zlib TINYXML2_LICENSE_FILES = readme.md diff --git a/buildroot/package/tio/Config.in b/buildroot/package/tio/Config.in new file mode 100644 index 000000000..6c748c5d1 --- /dev/null +++ b/buildroot/package/tio/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_TIO + bool "tio" + help + "tio" is a simple TTY terminal application which features a + straightforward commandline interface to easily connect to + TTY devices for basic input/output. + + https://tio.github.io/ diff --git a/buildroot/package/tio/tio.hash b/buildroot/package/tio/tio.hash new file mode 100644 index 000000000..3053bd1bf --- /dev/null +++ b/buildroot/package/tio/tio.hash @@ -0,0 +1,5 @@ +# Locally computed: +sha256 a8f5ed6994cacb96780baa416b19e5a6d7d67e8c162a8ea4fd9eccd64984ae44 tio-1.32.tar.xz + +# Hash for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/tio/tio.mk b/buildroot/package/tio/tio.mk new file mode 100644 index 000000000..31f1dfb5a --- /dev/null +++ b/buildroot/package/tio/tio.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# tio +# +################################################################################ + +TIO_VERSION = 1.32 +TIO_SOURCE = tio-$(TIO_VERSION).tar.xz +TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION) +TIO_LICENSE = GPL-2.0+ +TIO_LICENSE_FILES = COPYING + +$(eval $(autotools-package)) diff --git a/buildroot/package/tmux/tmux.hash b/buildroot/package/tmux/tmux.hash index 306dc52c3..e27fca253 100644 --- a/buildroot/package/tmux/tmux.hash +++ b/buildroot/package/tmux/tmux.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7f6bf335634fafecff878d78de389562ea7f73a7367f268b66d37ea13617a2ba tmux-2.8.tar.gz +sha256 839d167a4517a6bffa6b6074e89a9a8630547b2dea2086f1fad15af12ab23b25 tmux-2.9a.tar.gz sha256 ce75f1345a76c93bd0f413d1b93ff1baa0669f34a7242779a00c1b862b4f813a COPYING diff --git a/buildroot/package/tmux/tmux.mk b/buildroot/package/tmux/tmux.mk index 8b7a96e89..169c9bb83 100644 --- a/buildroot/package/tmux/tmux.mk +++ b/buildroot/package/tmux/tmux.mk @@ -4,7 +4,7 @@ # ################################################################################ -TMUX_VERSION = 2.8 +TMUX_VERSION = 2.9a TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING diff --git a/buildroot/package/tor/tor.hash b/buildroot/package/tor/tor.hash index 5b07981d9..e55f3ea3c 100644 --- a/buildroot/package/tor/tor.hash +++ b/buildroot/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d5c56603942a8927670f50a4a469fb909e29d3571fdd013389d567e57abc0b47 tor-0.3.5.8.tar.gz -sha256 b4248f32f009d4f5cccb704b351e31a16590e0dd5fda2856382cc854d81f6234 LICENSE +sha256 06a1d835ddf382f6bca40a62e8fb40b71b2f73d56f0d53523c8bd5caf9b3026d tor-0.4.2.7.tar.gz +sha256 ae2afe6cd3fd9d512afbaa1ef218757eb00aa6b6aa5e2dfc2774b6837e373fa1 LICENSE diff --git a/buildroot/package/tor/tor.mk b/buildroot/package/tor/tor.mk index fe951fb26..09f780d3f 100644 --- a/buildroot/package/tor/tor.mk +++ b/buildroot/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.3.5.8 +TOR_VERSION = 0.4.2.7 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE @@ -30,6 +30,13 @@ ifeq ($(BR2_PACKAGE_LIBCAP),y) TOR_DEPENDENCIES += libcap endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +TOR_CONF_OPTS += --enable-systemd +TOR_DEPENDENCIES += host-pkgconf systemd +else +TOR_CONF_OPTS += --disable-systemd +endif + ifeq ($(BR2_PACKAGE_XZ),y) TOR_CONF_OPTS += --enable-lzma TOR_DEPENDENCIES += host-pkgconf xz @@ -37,6 +44,13 @@ else TOR_CONF_OPTS += --disable-lzma endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +TOR_CONF_OPTS += --enable-zstd +TOR_DEPENDENCIES += host-pkgconf zstd +else +TOR_CONF_OPTS += --disable-zstd +endif + ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_i386)$(BR2_x86_64)$(BR2_PACKAGE_LIBSECCOMP),yy) TOR_CONF_OPTS += --enable-seccomp TOR_DEPENDENCIES += libseccomp diff --git a/buildroot/package/tpm2-abrmd/Config.in b/buildroot/package/tpm2-abrmd/Config.in index db0ea6611..4931641af 100644 --- a/buildroot/package/tpm2-abrmd/Config.in +++ b/buildroot/package/tpm2-abrmd/Config.in @@ -1,10 +1,9 @@ config BR2_PACKAGE_TPM2_ABRMD bool "tpm2-abrmd" depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 - depends on BR2_USE_MMU # dbus, libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # tpm2-tss - select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_TPM2_TSS help diff --git a/buildroot/package/tpm2-abrmd/tpm2-abrmd.hash b/buildroot/package/tpm2-abrmd/tpm2-abrmd.hash index 61a75c0d1..cff3266bc 100644 --- a/buildroot/package/tpm2-abrmd/tpm2-abrmd.hash +++ b/buildroot/package/tpm2-abrmd/tpm2-abrmd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ff0ed283b0300cd784d6bf2b042e167020f8443602974e53b924e9fd98a4b515 tpm2-abrmd-2.0.3.tar.gz +sha256 63cb59be1fd21e6ae233c37a0aa4a59883a4885a7bfd2c7e69979c5048518d50 tpm2-abrmd-2.3.0.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/buildroot/package/tpm2-abrmd/tpm2-abrmd.mk b/buildroot/package/tpm2-abrmd/tpm2-abrmd.mk index 31f19f5d0..e92fda252 100644 --- a/buildroot/package/tpm2-abrmd/tpm2-abrmd.mk +++ b/buildroot/package/tpm2-abrmd/tpm2-abrmd.mk @@ -4,25 +4,20 @@ # ################################################################################ -TPM2_ABRMD_VERSION = 2.0.3 +TPM2_ABRMD_VERSION = 2.3.0 TPM2_ABRMD_SITE = https://github.com/tpm2-software/tpm2-abrmd/releases/download/$(TPM2_ABRMD_VERSION) TPM2_ABRMD_LICENSE = BSD-2-Clause TPM2_ABRMD_LICENSE_FILES = LICENSE TPM2_ABRMD_INSTALL_STAGING = YES -TPM2_ABRMD_DEPENDENCIES = dbus libglib2 tpm2-tss host-pkgconf - -# -fstack-protector-all and FORTIFY_SOURCE=2 is used by -# default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options -# in the toolchain wrapper and CFLAGS are used instead -TPM2_ABRMD_CONF_ENV = \ - ax_cv_check_cflags___________Werror_______fstack_protector_all=no \ - ax_cv_check_ccppflags___________Werror_______U_FORTIFY_SOURCE=no \ - ax_cv_check_ccppflags___________Werror_______D_FORTIFY_SOURCE_2=no - -TPM2_ABRMD_CONF_OPTS += \ +TPM2_ABRMD_DEPENDENCIES = libglib2 tpm2-tss host-pkgconf +TPM2_ABRMD_CONF_OPTS = \ + --disable-defaultflags \ --with-systemdsystemunitdir=$(if $(BR2_INIT_SYSTEMD),/usr/lib/systemd/system,no) \ --with-udevrulesdir=$(if $(BR2_PACKAGE_HAS_UDEV),/usr/lib/udev/rules.d,no) +# uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used +TPM2_ABRMD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" + define TPM2_ABRMD_INSTALL_INIT_SYSTEMD $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) \ install-systemdpresetDATA install-systemdsystemunitDATA diff --git a/buildroot/package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch b/buildroot/package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch deleted file mode 100644 index 327f5e403..000000000 --- a/buildroot/package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 295cd8f7fb8e1a1ad8f64d981e99969a364d941e Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Sat, 24 Mar 2018 22:46:46 -0300 -Subject: [PATCH] tpm2_certify: fix "'type' may be used uninitialized" warning - -get_key_type does not assign a value to 'type' on error conditions, -which makes the compiler believe that it will be used uninitialized in -the LOG_ERR call, in set_scheme. In practice this will never happen -because set_scheme returns immediately if get_key_type retuns false but -the compiler does not understand that logic and fails because warnings -are treated as errors. - -Adapted for version 3.1.3 from the change submitted upstream: - - https://github.com/tpm2-software/tpm2-tools/pull/954 - -Signed-off-by: Carlos Santos ---- - tools/tpm2_certify.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/tpm2_certify.c b/tools/tpm2_certify.c -index 0575072..e562586 100644 ---- a/tools/tpm2_certify.c -+++ b/tools/tpm2_certify.c -@@ -98,6 +98,7 @@ static bool get_key_type(TSS2_SYS_CONTEXT *sapi_context, TPMI_DH_OBJECT object_h - &out_public, &name, &qualified_name, &sessions_data_out)); - if (rval != TPM2_RC_SUCCESS) { - LOG_ERR("TPM2_ReadPublic failed. Error Code: 0x%x", rval); -+ *type = TPM2_ALG_ERROR; - return false; - } - --- -2.19.1 - diff --git a/buildroot/package/tpm2-tools/tpm2-tools.hash b/buildroot/package/tpm2-tools/tpm2-tools.hash index d2bd31cde..16059627a 100644 --- a/buildroot/package/tpm2-tools/tpm2-tools.hash +++ b/buildroot/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2f515200e9a7958ee13015150f7958c8a332eb071c2564c33f81ebe32c4f6033 tpm2-tools-3.1.4.tar.gz -sha256 3d6b149c8b042bd5f3db678d587fbe55230d071ca084bd38dcae451679c6dd45 LICENSE +sha256 40b9263d8b949bd2bc03a3cd60fa242e27116727467f9bbdd0b5f2539a25a7b1 tpm2-tools-4.1.1.tar.gz +sha256 e10dce74279166bf7bc463eb6e462c2025bceb3e50cadfe865d92c1c3dc0bb21 LICENSE diff --git a/buildroot/package/tpm2-tools/tpm2-tools.mk b/buildroot/package/tpm2-tools/tpm2-tools.mk index e7423db67..4ebca0f90 100644 --- a/buildroot/package/tpm2-tools/tpm2-tools.mk +++ b/buildroot/package/tpm2-tools/tpm2-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 3.1.4 +TPM2_TOOLS_VERSION = 4.1.1 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = LICENSE @@ -15,4 +15,7 @@ TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf # in the toolchain wrapper and CFLAGS are used instead TPM2_TOOLS_CONF_OPTS = --disable-hardening +# do not build man pages +TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' + $(eval $(autotools-package)) diff --git a/buildroot/package/tpm2-totp/Config.in b/buildroot/package/tpm2-totp/Config.in new file mode 100644 index 000000000..dcadf5a5f --- /dev/null +++ b/buildroot/package/tpm2-totp/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_TPM2_TOTP + bool "tpm2-totp" + depends on !BR2_STATIC_LIBS # tpm2-tss + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # glibc < 2.20 + select BR2_PACKAGE_LIBQRENCODE + select BR2_PACKAGE_TPM2_TSS + help + This is a reimplementation of Matthew Garrett's tpmtotp + software for TPM 2.0 using the tpm2-tss software stack. Its + purpose is to attest the trustworthiness of a device against + a human using time-based one-time passwords (TOTP), + facilitating the Trusted Platform Module (TPM) to bind the + TOTP secret to the known trustworthy system state. In + addition to the original tpmtotp, given the new capabilities + of in-TPM hmac calculation, the tpm2-totp's secret HMAC keys + do not have to be exported from the TPM to the CPU's RAM on + boot anymore. + + https://github.com/tpm2-software/tpm2-totp + +comment "tpm2-totp needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM diff --git a/buildroot/package/tpm2-totp/tpm2-totp.hash b/buildroot/package/tpm2-totp/tpm2-totp.hash new file mode 100644 index 000000000..a3fcb394c --- /dev/null +++ b/buildroot/package/tpm2-totp/tpm2-totp.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 0b2b63cc7ea74f5a6952f2cd689896c08f6b94ee6865f48af609f9a8ac247dc1 tpm2-totp-0.2.1.tar.gz +sha256 67bc21a0bff2b0890307cfaa883bd3f5337f461eb6d8a612a015cea6d704e9ed LICENSE diff --git a/buildroot/package/tpm2-totp/tpm2-totp.mk b/buildroot/package/tpm2-totp/tpm2-totp.mk new file mode 100644 index 000000000..250a016a5 --- /dev/null +++ b/buildroot/package/tpm2-totp/tpm2-totp.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# tpm2-totp +# +################################################################################ + +TPM2_TOTP_VERSION = 0.2.1 +TPM2_TOTP_SITE = https://github.com/tpm2-software/tpm2-totp/releases/download/v$(TPM2_TOTP_VERSION) +TPM2_TOTP_LICENSE = BSD-3-Clause +TPM2_TOTP_LICENSE_FILES = LICENSE +TPM2_TOTP_DEPENDENCIES = libqrencode tpm2-tss host-pkgconf +TPM2_TOTP_CONF_OPTS = \ + --disable-defaultflags \ + --disable-doxygen-doc \ + --disable-plymouth \ + --without-initramfstoolsdir \ + --without-mkinitcpiodir + +# uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used +TPM2_TOTP_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" + +# do not build man pages +TPM2_TOTP_CONF_ENV += ac_cv_path_PANDOC='' + +$(eval $(autotools-package)) diff --git a/buildroot/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch b/buildroot/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch new file mode 100644 index 000000000..b2a9cb4f7 --- /dev/null +++ b/buildroot/package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch @@ -0,0 +1,44 @@ +From 158d0bc3a2a7a93090cc12c5b0dd3c27e6f44d61 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Mon, 23 Dec 2019 08:02:19 -0300 +Subject: [PATCH] Temporary fix for build without C++ + +C++ is required only for the fuzzing tests but AC_PROG_CXX is included +by configure.ac even when fuzzing is not enabled (which we don't do on +Buildroot). + +The patch applied upstream had issues and was reverted[1]. Use a local +patch to solve the problem temporaryly. + +Fixes: + http://autobuild.buildroot.net/results/13f5e37b47b255da4158bec34e5459136f7e60d4 + http://autobuild.buildroot.net/results/1c26db2509c79e00c0de1165945277eaa57b149f + http://autobuild.buildroot.net/results/b7b6b7b7aca79e847b442cbd2305427d91fe5d70 + http://autobuild.buildroot.net/results/1cd5a82a0e799aa5027e2e2c03b246332cc3a15d + http://autobuild.buildroot.net/results/d7ec878907f714377c83e9a496e97cbf9382d787 + http://autobuild.buildroot.net/results/1c7f0c1b3ce4871cd87bd6059b1f0a6dc4e74a9c + http://autobuild.buildroot.net/results/196b81d580325607c8da90beeb79e1f6b8ab8b47 + http://autobuild.buildroot.net/results/f90f7b4ac710b56686635f8ae27059c11b963e47 + +1. https://github.com/tpm2-software/tpm2-tss/commit/60c26e4c4faba6ba12469485653e17092b510840 + +Signed-off-by: Carlos Santos +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index cd50451d..a3bd7144 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,7 +25,6 @@ AC_CANONICAL_HOST + AX_IS_RELEASE(dash-version) + AX_CHECK_ENABLE_DEBUG([info]) + +-AC_PROG_CXX + AC_PROG_CC + AC_PROG_LN_S + AC_USE_SYSTEM_EXTENSIONS +-- +2.18.1 + diff --git a/buildroot/package/tpm2-tss/0001-tpm2b-types.c-fix-maybe-uninitialized-error.patch b/buildroot/package/tpm2-tss/0001-tpm2b-types.c-fix-maybe-uninitialized-error.patch deleted file mode 100644 index 712583571..000000000 --- a/buildroot/package/tpm2-tss/0001-tpm2b-types.c-fix-maybe-uninitialized-error.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 815f2bcbdfe5d9aff2cd3acbbb105daf1f5e9d7f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 7 Feb 2019 09:58:07 +0100 -Subject: [PATCH] tpm2b-types.c: fix maybe-uninitialized error - -src/tss2-mu/tpm2b-types.c: In function 'Tss2_MU_TPM2B_ECC_POINT_Marshal': -src/tss2-mu/tpm2b-types.c:201:24: error: 'ptr' may be used uninitialized in this function [-Werror=maybe-uninitialized] - *(UINT16 *)ptr = HOST_TO_BE_16(buffer + local_offset - ptr - 2); \ - ^ -src/tss2-mu/tpm2b-types.c:152:12: note: 'ptr' was declared here - UINT8 *ptr; \ - -Fixes: - - http://autobuild.buildroot.org/results/8d7b6dad6602fe67338abc696bc4752dda8e9717 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/tpm2-software/tpm2-tss/pull/1265] ---- - src/tss2-mu/tpm2b-types.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tss2-mu/tpm2b-types.c b/src/tss2-mu/tpm2b-types.c -index 9c1003ab..7632febb 100644 ---- a/src/tss2-mu/tpm2b-types.c -+++ b/src/tss2-mu/tpm2b-types.c -@@ -150,7 +150,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ - size_t buffer_size, size_t *offset) \ - { \ - size_t local_offset = 0; \ -- UINT8 *ptr; \ -+ UINT8 *ptr = NULL; \ - TSS2_RC rc; \ - \ - if (src == NULL) { \ --- -2.14.1 - diff --git a/buildroot/package/tpm2-tss/tpm2-tss.hash b/buildroot/package/tpm2-tss/tpm2-tss.hash index 9368357c7..3b778d4f1 100644 --- a/buildroot/package/tpm2-tss/tpm2-tss.hash +++ b/buildroot/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 bddfa4ab2ceb6394bcacf7db5d6419cbfabdb22702b6df75c59e60dd5f3fafb5 tpm2-tss-2.1.3.tar.gz -sha256 f7da3c2da12cec3348bb7ee9e2a9e651a241450b2efb67da29d5a75ef2da058a LICENSE +sha256 9d8c8866829e3ff5e1649ecd82498cb1329e0691139458e53b69e6061febe3d3 tpm2-tss-2.3.3.tar.gz +sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/buildroot/package/tpm2-tss/tpm2-tss.mk b/buildroot/package/tpm2-tss/tpm2-tss.mk index e02abb446..470020857 100644 --- a/buildroot/package/tpm2-tss/tpm2-tss.mk +++ b/buildroot/package/tpm2-tss/tpm2-tss.mk @@ -4,20 +4,26 @@ # ################################################################################ -TPM2_TSS_VERSION = 2.1.3 +TPM2_TSS_VERSION = 2.3.3 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE TPM2_TSS_INSTALL_STAGING = YES TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf -TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc +TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc --disable-defaultflags +# 0001-configure-Only-use-CXX-when-fuzzing.patch +TPM2_TSS_AUTORECONF = YES -# -fstack-protector-all and FORTIFY_SOURCE=2 is used by -# default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options -# in the toolchain wrapper and CFLAGS are used instead -TPM2_TSS_CONF_ENV = \ - ax_cv_check_cflags___________Wall__Werror_______fstack_protector_all=no \ - ax_cv_check_ccppflags___________Wall__Werror_______U_FORTIFY_SOURCE=no \ - ax_cv_check_ccppflags___________Wall__Werror_______D_FORTIFY_SOURCE_2=no +# uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used +TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" + +# The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am +# with content from a fuzz testing run rather than an empty file, +# confusing autoreconf with +# 0001-configure-Only-use-CXX-when-fuzzing.patch +define TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM + truncate -s 0 $(@D)/Makefile-fuzz-generated.am +endef +TPM2_TSS_POST_PATCH_HOOKS += TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM $(eval $(autotools-package)) diff --git a/buildroot/package/transmission/transmission.mk b/buildroot/package/transmission/transmission.mk index 00652e7f4..8fbda5eea 100644 --- a/buildroot/package/transmission/transmission.mk +++ b/buildroot/package/transmission/transmission.mk @@ -66,9 +66,6 @@ endef define TRANSMISSION_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/daemon/transmission-daemon.service \ $(TARGET_DIR)/usr/lib/systemd/system/transmission-daemon.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/transmission-daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/transmission-daemon.service endef else diff --git a/buildroot/package/tree/tree.hash b/buildroot/package/tree/tree.hash index ab79df8e2..6bffaa5ec 100644 --- a/buildroot/package/tree/tree.hash +++ b/buildroot/package/tree/tree.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12 tree-1.7.0.tgz +sha256 715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2 tree-1.8.0.tgz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/buildroot/package/tree/tree.mk b/buildroot/package/tree/tree.mk index 34b6c60ad..b6c63c024 100644 --- a/buildroot/package/tree/tree.mk +++ b/buildroot/package/tree/tree.mk @@ -4,7 +4,7 @@ # ################################################################################ -TREE_VERSION = 1.7.0 +TREE_VERSION = 1.8.0 TREE_SOURCE = tree-$(TREE_VERSION).tgz TREE_SITE = http://mama.indstate.edu/users/ice/tree/src TREE_LICENSE = GPL-2.0+ diff --git a/buildroot/package/triggerhappy/triggerhappy.hash b/buildroot/package/triggerhappy/triggerhappy.hash index 5a1d76721..ab736cada 100644 --- a/buildroot/package/triggerhappy/triggerhappy.hash +++ b/buildroot/package/triggerhappy/triggerhappy.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 1b3221963b9adca26eacc5442d8c2422cf2072f8adde1dbd691a69b37a583fb1 triggerhappy-b822888066129350e51ad79f1cf307fa38dae4f7.tar.gz +sha256 1b3221963b9adca26eacc5442d8c2422cf2072f8adde1dbd691a69b37a583fb1 triggerhappy-b822888066129350e51ad79f1cf307fa38dae4f7.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/triggerhappy/triggerhappy.mk b/buildroot/package/triggerhappy/triggerhappy.mk index 7c4bf4047..f83a55780 100644 --- a/buildroot/package/triggerhappy/triggerhappy.mk +++ b/buildroot/package/triggerhappy/triggerhappy.mk @@ -41,9 +41,6 @@ endef define TRIGGERHAPPY_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/triggerhappy/triggerhappy.service \ $(TARGET_DIR)/usr/lib/systemd/system/triggerhappy.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/triggerhappy.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/triggerhappy.service endef $(eval $(generic-package)) diff --git a/buildroot/package/trinity/0001-compat-handle-removed-autofs-macros.patch b/buildroot/package/trinity/0001-compat-handle-removed-autofs-macros.patch deleted file mode 100644 index e3c6ee3b5..000000000 --- a/buildroot/package/trinity/0001-compat-handle-removed-autofs-macros.patch +++ /dev/null @@ -1,61 +0,0 @@ -From e4f31d5a1ce65974c2a6b2e6e1a2b16fffc51518 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby -Date: Tue, 28 Nov 2017 10:15:22 +0100 -Subject: [PATCH] compat: handle removed autofs macros - -In file included from ioctls/autofs.c:4:0: -ioctls/autofs.c:241:8: error: 'AUTOFS_IOC_EXPIRE_INDIRECT' undeclared here (not in a function); did you mean 'AUTOFS_IOC_EXPIRE_CMD'? - IOCTL(AUTOFS_IOC_EXPIRE_INDIRECT), - ^ -include/ioctls.h:53:15: note: in definition of macro 'IOCTL' - { .request = _request, .name = #_request, } - ^~~~~~~~ -ioctls/autofs.c:242:8: error: 'AUTOFS_IOC_EXPIRE_DIRECT' undeclared here (not in a function); did you mean 'AUTOFS_IOC_EXPIRE_INDIRECT'? - IOCTL(AUTOFS_IOC_EXPIRE_DIRECT), - ^ -include/ioctls.h:53:15: note: in definition of macro 'IOCTL' - { .request = _request, .name = #_request, } - ^~~~~~~~ - -Define them as AUTOFS_IOC_EXPIRE_MULTI as they used to be. - -Signed-off-by: Jiri Slaby -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit e4f31d5a1ce - - include/compat.h | 8 ++++++++ - ioctls/autofs.c | 1 + - 2 files changed, 9 insertions(+) - -diff --git a/include/compat.h b/include/compat.h -index 10065ceca5f6..fc9a1b95ac4c 100644 ---- a/include/compat.h -+++ b/include/compat.h -@@ -1209,3 +1209,11 @@ struct kvm_get_htab_fd { - #ifndef SO_IP_SET - #define SO_IP_SET 83 - #endif -+ -+/* linux/auto_fs4.h */ -+#ifndef AUTOFS_IOC_EXPIRE_INDIRECT -+#define AUTOFS_IOC_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI -+#endif -+#ifndef AUTOFS_IOC_EXPIRE_DIRECT -+#define AUTOFS_IOC_EXPIRE_DIRECT AUTOFS_IOC_EXPIRE_MULTI -+#endif -diff --git a/ioctls/autofs.c b/ioctls/autofs.c -index 04a3eb811326..a39ccccc056b 100644 ---- a/ioctls/autofs.c -+++ b/ioctls/autofs.c -@@ -8,6 +8,7 @@ - #include "shm.h" - #include "syscall.h" - #include "utils.h" -+#include "compat.h" - - /* include/linux/auto_dev-ioctl.h */ - /* --- -2.15.0 - diff --git a/buildroot/package/trinity/0002-memfd-fix-build-with-glibc-2.27.patch b/buildroot/package/trinity/0002-memfd-fix-build-with-glibc-2.27.patch deleted file mode 100644 index 9ea363468..000000000 --- a/buildroot/package/trinity/0002-memfd-fix-build-with-glibc-2.27.patch +++ /dev/null @@ -1,87 +0,0 @@ -From c93bb184ce996c4d77eefbae2ab0bf74f396ec45 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 13 Mar 2018 06:53:06 +0200 -Subject: [PATCH] memfd: fix build with glibc 2.27 - -glibc 2.27 added a wrapper for memfd_create(). This causes build -failure: - -fds/memfd.c:19:12: error: static declaration of 'memfd_create' follows non-static declaration - static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag) - ^~~~~~~~~~~~ - -Don't use the local definition when the libc provides one. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/kernelslacker/trinity/pull/23 - - configure | 23 +++++++++++++++++++++++ - fds/memfd.c | 3 +++ - 2 files changed, 26 insertions(+) - -diff --git a/configure b/configure -index dc0a87d8c1ad..c0166af33048 100755 ---- a/configure -+++ b/configure -@@ -288,6 +288,29 @@ else - echo "#define USE_BTRFS 1" >> $CONFIGH - fi - -+############################################################################################# -+# Does glibc provide memfd_create() syscall wrapper -+# -+echo -n "[*] Checking if glibc provides memfd_create.. " -+rm -f "$TMP" || exit 1 -+ -+cat >"$TMP.c" << EOF -+#include -+ -+void main() -+{ -+ memfd_create(); -+} -+EOF -+ -+${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log" -+if [ ! -x "$TMP" ]; then -+ echo $RED "[NO]" $COL_RESET -+else -+ echo $GREEN "[YES]" $COL_RESET -+ echo "#define USE_MEMFD_CREATE 1" >> $CONFIGH -+fi -+ - ############################################################################################# - - check_header linux/caif/caif_socket.h USE_CAIF -diff --git a/fds/memfd.c b/fds/memfd.c -index 210678e4571c..aaaac2f78f54 100644 ---- a/fds/memfd.c -+++ b/fds/memfd.c -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - - #include "fd.h" - #include "memfd.h" -@@ -16,6 +17,7 @@ - #include "trinity.h" - #include "udp.h" - -+#ifndef USE_MEMFD_CREATE - static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag) - { - #ifdef SYS_memfd_create -@@ -24,6 +26,7 @@ static int memfd_create(__unused__ const char *uname, __unused__ unsigned int fl - return -ENOSYS; - #endif - } -+#endif - - static void memfd_destructor(struct object *obj) - { --- -2.16.1 - diff --git a/buildroot/package/trinity/0003-configure-fix-build-with-kernel-headers-v4.17.patch b/buildroot/package/trinity/0003-configure-fix-build-with-kernel-headers-v4.17.patch deleted file mode 100644 index 89aa4219c..000000000 --- a/buildroot/package/trinity/0003-configure-fix-build-with-kernel-headers-v4.17.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 5431126ac94bf81743852493a041e80e82918741 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 8 Jun 2018 06:05:26 +0300 -Subject: [PATCH] configure: fix build with kernel headers v4.17+ - -Kernel v4.17 removed the linux/irda.h header. Skip the irda test when -this header is missing. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/kernelslacker/trinity/pull/25 - - configure | 1 + - net/proto-irda.c | 6 +++++- - net/protocols.c | 2 ++ - 3 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index c0166af33048..944c8cf77d1b 100755 ---- a/configure -+++ b/configure -@@ -316,6 +316,7 @@ fi - check_header linux/caif/caif_socket.h USE_CAIF - check_header linux/fsmap.h USE_FSMAP - check_header linux/if_alg.h USE_IF_ALG -+check_header linux/irda.h USE_IRDA - check_header linux/rds.h USE_RDS - check_header linux/vfio.h USE_VFIO - check_header drm/drm.h USE_DRM -diff --git a/net/proto-irda.c b/net/proto-irda.c -index 02d51bcd2ee0..264e36dfa040 100644 ---- a/net/proto-irda.c -+++ b/net/proto-irda.c -@@ -4,13 +4,15 @@ - #include - /* old irda.h does not include something which defines sa_family_t */ - #include --#include - #include - #include "net.h" - #include "random.h" - #include "utils.h" // RAND_ARRAY - #include "compat.h" - -+#ifdef USE_IRDA -+#include -+ - static void irda_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen) - { - struct sockaddr_irda *irda; -@@ -53,3 +55,5 @@ const struct netproto proto_irda = { - .valid_triplets = irda_triplets, - .nr_triplets = ARRAY_SIZE(irda_triplets), - }; -+ -+#endif -diff --git a/net/protocols.c b/net/protocols.c -index 90a60affedca..87acf85c707f 100644 ---- a/net/protocols.c -+++ b/net/protocols.c -@@ -26,7 +26,9 @@ const struct protoptr net_protocols[TRINITY_PF_MAX] = { - #ifdef USE_RDS - [PF_RDS] = { .proto = &proto_rds }, - #endif -+#ifdef USE_IRDA - [PF_IRDA] = { .proto = &proto_irda }, -+#endif - [PF_LLC] = { .proto = &proto_llc }, - [PF_CAN] = { .proto = &proto_can }, - [PF_TIPC] = { .proto = &proto_tipc }, --- -2.17.1 - diff --git a/buildroot/package/trinity/0004-Check-if-VIDIOC_RESERVED-is-defined.patch b/buildroot/package/trinity/0004-Check-if-VIDIOC_RESERVED-is-defined.patch deleted file mode 100644 index 54f8bea63..000000000 --- a/buildroot/package/trinity/0004-Check-if-VIDIOC_RESERVED-is-defined.patch +++ /dev/null @@ -1,56 +0,0 @@ -From a5f32b9714613404e9f4699aaaad720f2bb033b4 Mon Sep 17 00:00:00 2001 -From: Vinson Lee -Date: Thu, 23 Aug 2018 22:28:49 +0000 -Subject: [PATCH] Check if VIDIOC_RESERVED is defined. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -VIDIOC_RESERVED was removed in Linux 4.19. - -commit ea8532daee31bc72abfbc9ca7a43cbec0f6c05af -Author: Mauro Carvalho Chehab -Date: Wed May 30 11:07:05 2018 -0400 - - media: videodev2: get rid of VIDIOC_RESERVED - - While this ioctl is there at least since Kernel 2.6.12-rc2, it - was never used by any upstream driver. - - Get rid of it. - - Signed-off-by: Mauro Carvalho Chehab - -This patch fixes this build error. - - CC ioctls/videodev2.o -In file included from ioctls/videodev2.c:4: -ioctls/videodev2.c:8:8: error: ‘VIDIOC_RESERVED’ undeclared here (not in a function); did you mean ‘VIDIOC_G_STD’? - IOCTL(VIDIOC_RESERVED), - ^~~~~~~~~~~~~~~ -include/ioctls.h:53:15: note: in definition of macro ‘IOCTL’ - { .request = _request, .name = #_request, } - ^~~~~~~~ - -Signed-off-by: Vinson Lee -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/kernelslacker/trinity/commit/a5f32b9714613404e9f4699aaaad720f2bb033b4] ---- - ioctls/videodev2.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ioctls/videodev2.c b/ioctls/videodev2.c -index f7183f29..67089abf 100644 ---- a/ioctls/videodev2.c -+++ b/ioctls/videodev2.c -@@ -5,7 +5,9 @@ - - static const struct ioctl videodev2_ioctls[] = { - IOCTL(VIDIOC_QUERYCAP), -+#ifdef VIDIOC_RESERVED - IOCTL(VIDIOC_RESERVED), -+#endif - IOCTL(VIDIOC_ENUM_FMT), - IOCTL(VIDIOC_G_FMT), - IOCTL(VIDIOC_S_FMT), diff --git a/buildroot/package/trinity/0005-proto-rds-include-libc-network-headers-first.patch b/buildroot/package/trinity/0005-proto-rds-include-libc-network-headers-first.patch deleted file mode 100644 index 438bbfb56..000000000 --- a/buildroot/package/trinity/0005-proto-rds-include-libc-network-headers-first.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 350c05e5c0d7af5941a9c17f2f86e1c6297d7475 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Wed, 12 Dec 2018 20:52:50 +0200 -Subject: [PATCH] proto-rds: include libc network headers first - -To avoid collisions between libc networking headers and header kernels -the libc headers must appear first in the list of headers. This fixes a -build issue with kernel headers v4.19: - -In file included from include/net.h:5:0, - from net/proto-rds.c:6: -.../sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr' - struct in6_addr { - ^~~~~~~~ -In file included from .../sysroot/usr/include/linux/rds.h:40:0, - from net/proto-rds.c:4: -.../sysroot/usr/include/linux/in6.h:33:8: note: originally defined here - struct in6_addr { - ^~~~~~~~ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/kernelslacker/trinity/pull/29 - - net/proto-rds.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/net/proto-rds.c b/net/proto-rds.c -index c8ff22f886c3..06e36e82d990 100644 ---- a/net/proto-rds.c -+++ b/net/proto-rds.c -@@ -1,12 +1,12 @@ - #ifdef USE_RDS - #include - #include --#include - #include - #include "net.h" - #include "compat.h" - #include "random.h" - #include "utils.h" // RAND_ARRAY -+#include - - static void rds_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen) - { --- -2.19.2 - diff --git a/buildroot/package/trinity/trinity.hash b/buildroot/package/trinity/trinity.hash index 200065333..f7522514e 100644 --- a/buildroot/package/trinity/trinity.hash +++ b/buildroot/package/trinity/trinity.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8cadc4221660b7accc4728311ce1a130ac9b9d1f3b04e35508ba0cc80d9c3f94 trinity-1.8.tar.xz +sha256 7e0da953c2cc6fb3907d1f37d35f61836433fb50e97117a72eef113abb783dc6 trinity-1.9.tar.xz sha256 35e3fc68c89fd7b8f72fd910b521cb3292f859e9181f3c26bd0df84d144bc1d4 COPYING diff --git a/buildroot/package/trinity/trinity.mk b/buildroot/package/trinity/trinity.mk index b75c46943..adf7d1455 100644 --- a/buildroot/package/trinity/trinity.mk +++ b/buildroot/package/trinity/trinity.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRINITY_VERSION = 1.8 +TRINITY_VERSION = 1.9 TRINITY_SITE = http://codemonkey.org.uk/projects/trinity TRINITY_SOURCE = trinity-$(TRINITY_VERSION).tar.xz TRINITY_LICENSE = GPL-2.0 diff --git a/buildroot/package/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/buildroot/package/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 000000000..70a3f25f5 --- /dev/null +++ b/buildroot/package/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,386 @@ +From 09eeff8c90a82e7aa9ff215320d558c1147982f6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 30 Nov 2019 19:59:29 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Signed-off-by: Khem Raj +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/libts/tslib/commit/a7a39a67f9a7f7fab9765d412ab42869a5c5c858] +--- + plugins/input-raw.c | 59 +++++++++++++++++++++++++++------------- + tools/ts_uinput.c | 66 ++++++++++++++++++++++++++++++--------------- + 2 files changed, 85 insertions(+), 40 deletions(-) + +diff --git a/plugins/input-raw.c b/plugins/input-raw.c +index 64f0156..f030836 100644 +--- a/plugins/input-raw.c ++++ b/plugins/input-raw.c +@@ -40,6 +40,11 @@ + # include + #endif + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #ifndef EV_SYN /* 2.4 kernel headers */ + # define EV_SYN 0x00 + #endif +@@ -384,7 +389,8 @@ static int ts_input_read(struct tslib_module_info *inf, + samp->y = i->current_y; + samp->pressure = i->current_p; + } +- samp->tv = ev.time; ++ samp->tv.tv_sec = ev.input_event_sec; ++ samp->tv.tv_usec = ev.input_event_usec; + #ifdef DEBUG + fprintf(stderr, + "RAW---------------------> %d %d %d %ld.%ld\n", +@@ -519,7 +525,8 @@ static int ts_input_read(struct tslib_module_info *inf, + samp->pressure = i->current_p = ev.value; + break; + } +- samp->tv = ev.time; ++ samp->tv.tv_sec = ev.input_event_sec; ++ samp->tv.tv_usec = ev.input_event_usec; + #ifdef DEBUG + fprintf(stderr, + "RAW---------------------------> %d %d %d\n", +@@ -536,7 +543,8 @@ static int ts_input_read(struct tslib_module_info *inf, + samp->x = 0; + samp->y = 0; + samp->pressure = 0; +- samp->tv = ev.time; ++ samp->tv.tv_sec = ev.input_event_sec; ++ samp->tv.tv_usec = ev.input_event_usec; + samp++; + total++; + } +@@ -651,7 +659,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + switch (i->ev[it].code) { + case BTN_TOUCH: + i->buf[total][i->slot].pen_down = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + if (i->ev[it].value == 0) + pen_up = 1; +@@ -751,7 +760,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + // fall through + case ABS_MT_POSITION_X: + i->buf[total][i->slot].x = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_Y: +@@ -760,7 +770,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + // fall through + case ABS_MT_POSITION_Y: + i->buf[total][i->slot].y = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_PRESSURE: +@@ -769,12 +780,14 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + // fall through + case ABS_MT_PRESSURE: + i->buf[total][i->slot].pressure = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_MT_TOOL_X: + i->buf[total][i->slot].tool_x = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + /* for future use + * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL; +@@ -782,7 +795,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + break; + case ABS_MT_TOOL_Y: + i->buf[total][i->slot].tool_y = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + /* for future use + * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL; +@@ -790,7 +804,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + break; + case ABS_MT_TOOL_TYPE: + i->buf[total][i->slot].tool_type = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + /* for future use + * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL; +@@ -798,12 +813,14 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + break; + case ABS_MT_ORIENTATION: + i->buf[total][i->slot].orientation = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_MT_DISTANCE: + i->buf[total][i->slot].distance = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + + if (i->special_device == EGALAX_VERSION_210) { +@@ -816,34 +833,40 @@ static int ts_input_read_mt(struct tslib_module_info *inf, + break; + case ABS_MT_BLOB_ID: + i->buf[total][i->slot].blob_id = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_MT_TOUCH_MAJOR: + i->buf[total][i->slot].touch_major = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + if (i->ev[it].value == 0) + i->buf[total][i->slot].pressure = 0; + break; + case ABS_MT_WIDTH_MAJOR: + i->buf[total][i->slot].width_major = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_MT_TOUCH_MINOR: + i->buf[total][i->slot].touch_minor = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_MT_WIDTH_MINOR: + i->buf[total][i->slot].width_minor = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + break; + case ABS_MT_TRACKING_ID: + i->buf[total][i->slot].tracking_id = i->ev[it].value; +- i->buf[total][i->slot].tv = i->ev[it].time; ++ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec; ++ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec; + i->buf[total][i->slot].valid |= TSLIB_MT_VALID; + if (i->ev[it].value == -1) + i->buf[total][i->slot].pressure = 0; +diff --git a/tools/ts_uinput.c b/tools/ts_uinput.c +index 6ca4c3d..1832a07 100644 +--- a/tools/ts_uinput.c ++++ b/tools/ts_uinput.c +@@ -170,14 +170,16 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, + continue; + + if (s[j][i].pen_down == 1) { +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_KEY; + data->ev[c].code = BTN_TOUCH; + data->ev[c].value = s[j][i].pen_down; + c++; + } + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_SLOT; + data->ev[c].value = s[j][i].slot; +@@ -190,111 +192,129 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, + * we should use slot 1 and so on. + */ + if (i == 0) { +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_X; + data->ev[c].value = s[j][i].x; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_Y; + data->ev[c].value = s[j][i].y; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_PRESSURE; + data->ev[c].value = s[j][i].pressure; + c++; + } + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_POSITION_X; + data->ev[c].value = s[j][i].x; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_POSITION_Y; + data->ev[c].value = s[j][i].y; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_PRESSURE; + data->ev[c].value = s[j][i].pressure; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_TOUCH_MAJOR; + data->ev[c].value = s[j][i].touch_major; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_WIDTH_MAJOR; + data->ev[c].value = s[j][i].width_major; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_TOUCH_MINOR; + data->ev[c].value = s[j][i].touch_minor; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_WIDTH_MINOR; + data->ev[c].value = s[j][i].width_minor; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_TOOL_TYPE; + data->ev[c].value = s[j][i].tool_type; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_TOOL_X; + data->ev[c].value = s[j][i].tool_x; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_TOOL_Y; + data->ev[c].value = s[j][i].tool_y; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_ORIENTATION; + data->ev[c].value = s[j][i].orientation; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_DISTANCE; + data->ev[c].value = s[j][i].distance; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_BLOB_ID; + data->ev[c].value = s[j][i].blob_id; + c++; + +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_ABS; + data->ev[c].code = ABS_MT_TRACKING_ID; + data->ev[c].value = s[j][i].tracking_id; + c++; + + if (data->mt_type_a == 1) { +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_SYN; + data->ev[c].code = SYN_MT_REPORT; + data->ev[c].value = 0; +@@ -302,7 +322,8 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, + } + + if (s[j][i].pen_down == 0) { +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_KEY; + data->ev[c].code = BTN_TOUCH; + data->ev[c].value = s[j][i].pen_down; +@@ -312,7 +333,8 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s, + } + + if (c > 0) { +- data->ev[c].time = s[j][i].tv; ++ data->ev[c].input_event_sec = s[j][i].tv.tv_sec; ++ data->ev[c].input_event_usec = s[j][i].tv.tv_usec; + data->ev[c].type = EV_SYN; + data->ev[c].code = SYN_REPORT; + data->ev[c].value = 0; diff --git a/buildroot/package/tslib/0002-Fix-build-error-with-input_event_sec-for-old-kernel.patch b/buildroot/package/tslib/0002-Fix-build-error-with-input_event_sec-for-old-kernel.patch new file mode 100644 index 000000000..5dca3a009 --- /dev/null +++ b/buildroot/package/tslib/0002-Fix-build-error-with-input_event_sec-for-old-kernel.patch @@ -0,0 +1,28 @@ +From 050bf24c16e95f63a76e13156346a072035d45b4 Mon Sep 17 00:00:00 2001 +From: Evan Harvey +Date: Thu, 19 Mar 2020 01:32:03 -0700 +Subject: [PATCH] Fix build error with input_event_sec for old kernel + +[Retrieved from: +https://github.com/libts/tslib/commit/050bf24c16e95f63a76e13156346a072035d45b4] +Signed-off-by: Fabrice Fontaine +--- + tools/ts_uinput.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/tools/ts_uinput.c b/tools/ts_uinput.c +index 1832a07..9c40bb3 100644 +--- a/tools/ts_uinput.c ++++ b/tools/ts_uinput.c +@@ -51,6 +51,11 @@ + #include + #endif + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #define RESET "\033[0m" + #define RED "\033[31m" + #define GREEN "\033[32m" diff --git a/buildroot/package/tslib/tslib.hash b/buildroot/package/tslib/tslib.hash index b250783fd..521e6c94b 100644 --- a/buildroot/package/tslib/tslib.hash +++ b/buildroot/package/tslib/tslib.hash @@ -1,5 +1,5 @@ -# https://github.com/libts/tslib/releases/download/1.20/tslib-1.20.tar.xz.sha256 -sha256 fda8c088e348b40cc68269460d562778aa4ad8f8c2281f147b09f305ba714777 tslib-1.20.tar.xz +# https://github.com/libts/tslib/releases/download/1.21/tslib-1.21.tar.xz.sha256 +sha256 d2a57b823ea59e53a3b130eef05dfed1190b857854f886eec764e1ca1957cf56 tslib-1.21.tar.xz # Locally computed sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING diff --git a/buildroot/package/tslib/tslib.mk b/buildroot/package/tslib/tslib.mk index 6d6e85033..3a1b7a218 100644 --- a/buildroot/package/tslib/tslib.mk +++ b/buildroot/package/tslib/tslib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TSLIB_VERSION = 1.20 +TSLIB_VERSION = 1.21 TSLIB_SITE = https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION) TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) @@ -28,7 +28,8 @@ TSLIB_CONF_OPTS += \ --enable-debounce=static \ --enable-skip=static \ --enable-lowpass=static \ - --enable-invert=static + --enable-invert=static \ + --enable-evthres=static endif $(eval $(autotools-package)) diff --git a/buildroot/package/tunctl/tunctl.hash b/buildroot/package/tunctl/tunctl.hash index d3aaeecef..59a58cdb9 100644 --- a/buildroot/package/tunctl/tunctl.hash +++ b/buildroot/package/tunctl/tunctl.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 aa2a6c4cc6bfacb11e0d9f62334a6638a0d435475c61230116f00b6af8b14fff tunctl-1.5.tar.gz +sha256 aa2a6c4cc6bfacb11e0d9f62334a6638a0d435475c61230116f00b6af8b14fff tunctl-1.5.tar.gz +sha256 bcd12b6749dbd86c051cc2ef9e838096741602d4db213cc866b1da6cfeda5f16 tunctl.c diff --git a/buildroot/package/turbolua/turbolua.hash b/buildroot/package/turbolua/turbolua.hash index c2a604449..b095f5aaa 100644 --- a/buildroot/package/turbolua/turbolua.hash +++ b/buildroot/package/turbolua/turbolua.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 a2c30534706fb475545b17a017c63479e93e5e9bf1f5ed88c0db22bb4ea7b4b1 turbolua-v2.1.2.tar.gz +sha256 4dbfbe4919118977c2ca40a4da81054ffe407d09f38bf5420eec5ae1449299d3 turbolua-2.1.3.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/turbolua/turbolua.mk b/buildroot/package/turbolua/turbolua.mk index 49a5559ef..a85256a3e 100644 --- a/buildroot/package/turbolua/turbolua.mk +++ b/buildroot/package/turbolua/turbolua.mk @@ -4,8 +4,8 @@ # ################################################################################ -TURBOLUA_VERSION = v2.1.2 -TURBOLUA_SITE = $(call github,kernelsauce,turbo,$(TURBOLUA_VERSION)) +TURBOLUA_VERSION = 2.1.3 +TURBOLUA_SITE = $(call github,kernelsauce,turbo,v$(TURBOLUA_VERSION)) TURBOLUA_DEPENDENCIES = luajit TURBOLUA_LICENSE = Apache-2.0 TURBOLUA_LICENSE_FILES = LICENSE diff --git a/buildroot/package/tvheadend/0001-no-check_config.patch b/buildroot/package/tvheadend/0001-no-check_config.patch index 361ebcd41..9261e5fff 100644 --- a/buildroot/package/tvheadend/0001-no-check_config.patch +++ b/buildroot/package/tvheadend/0001-no-check_config.patch @@ -12,7 +12,7 @@ Signed-off-by: "Yann E. MORIN" diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile --- tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile 2014-03-09 14:47:43.780025330 +0100 +++ tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile 2014-03-09 14:48:40.836539093 +0100 -@@ -566,7 +566,7 @@ +@@ -708,7 +708,7 @@ $(ROOTDIR)/configure $(CONFIGURE_ARGS) # Binary diff --git a/buildroot/package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch b/buildroot/package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch deleted file mode 100644 index 385c94b36..000000000 --- a/buildroot/package/tvheadend/0002-Makefile-fix-pie-linking-according-to-disable-pie.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5cbf08213222cb507d365e6cbda87277f0b8f31e Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Fri, 14 Jun 2019 14:25:08 +0200 -Subject: [PATCH] Makefile: fix -pie linking according to --disable-pie - -Only compilation follows './configure --disable-pie', linking instead -doesn't, because '-pie' flag is passed to LDFLAGS uncoditionally. - -So add '-pie' flag only if CONFIG_PIE=yes. - -Signed-off-by: Giulio Benetti ---- - Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 41783b546..4e5a947a3 100644 ---- a/Makefile -+++ b/Makefile -@@ -62,7 +62,10 @@ LDFLAGS += -ldl -lm - else - LDFLAGS += -ldl -lpthread -lm - endif --LDFLAGS += -pie -Wl,-z,now -+ifeq ($(CONFIG_PIE),yes) -+LDFLAGS += -pie -+endif -+LDFLAGS += -Wl,-z,now - ifeq ($(CONFIG_LIBICONV),yes) - LDFLAGS += -liconv - endif --- -2.17.1 - diff --git a/buildroot/package/tvheadend/Config.in b/buildroot/package/tvheadend/Config.in index 5db644400..909d955c0 100644 --- a/buildroot/package/tvheadend/Config.in +++ b/buildroot/package/tvheadend/Config.in @@ -1,12 +1,10 @@ comment "tvheadend needs a toolchain w/ NPTL, headers >= 3.2, dynamic library" - depends on !BR2_microblazeel depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_4 config BR2_PACKAGE_TVHEADEND bool "tvheadend" - depends on !BR2_microblazeel # assertion failure in binutils depends on !BR2_STATIC_LIBS # dladdr() depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 diff --git a/buildroot/package/tvheadend/tvheadend.hash b/buildroot/package/tvheadend/tvheadend.hash index 43178b874..92dc92182 100644 --- a/buildroot/package/tvheadend/tvheadend.hash +++ b/buildroot/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 92c5f2cdda085b81fc50025afeb3ece74f60fae2b26f40a7dd07e227b0db2d9f tvheadend-17dff3e5ffbd67174b6c0d7b49f5488e19ec1ead.tar.gz +sha256 0c2cc2ee09d21b34f2d72d971557a843b20a9e7da3d6550c4ce2fbe37c35ba13 tvheadend-221c29b40b1e53ae09a69d9458442dd4fea665f5.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/buildroot/package/tvheadend/tvheadend.mk b/buildroot/package/tvheadend/tvheadend.mk index b192a33d4..df7fd7fd9 100644 --- a/buildroot/package/tvheadend/tvheadend.mk +++ b/buildroot/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = 17dff3e5ffbd67174b6c0d7b49f5488e19ec1ead +TVHEADEND_VERSION = 221c29b40b1e53ae09a69d9458442dd4fea665f5 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md diff --git a/buildroot/package/twolame/0001-Fix-static-linking-with-libmagic.patch b/buildroot/package/twolame/0001-Fix-static-linking-with-libmagic.patch deleted file mode 100644 index 094d7e997..000000000 --- a/buildroot/package/twolame/0001-Fix-static-linking-with-libmagic.patch +++ /dev/null @@ -1,228 +0,0 @@ -From 484275de103b2214cb8ff3868a2562e2c61ce0e1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 8 Nov 2018 20:57:08 +0100 -Subject: [PATCH] Fix static linking with libmagic - -libmagic (from file package) already provides the buffer_init function -so to avoid a build failure for applications wanting to statically link -with twolame and libmagic (for example sox), rename buffer_init into -bitbuffer_init (also rename buffer_deinit into bitbuffer_deinit and -buffer_sstell into bitbuffer_sstell for consistency) - -Fixes: - - http://autobuild.buildroot.org/results/b3fc62e7f372fe595966e84091c11ccdb4cfa77c - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/njh/twolame/pull/81] ---- - libtwolame/bitbuffer.c | 4 ++-- - libtwolame/bitbuffer.h | 6 +++--- - libtwolame/energy.c | 2 +- - libtwolame/twolame.c | 32 ++++++++++++++++---------------- - 4 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/libtwolame/bitbuffer.c b/libtwolame/bitbuffer.c -index 38a632b..5b2fc4b 100644 ---- a/libtwolame/bitbuffer.c -+++ b/libtwolame/bitbuffer.c -@@ -33,7 +33,7 @@ - - - /*create bit buffer*/ --bit_stream *buffer_init(unsigned char *buffer, int buffer_size) -+bit_stream *bitbuffer_init(unsigned char *buffer, int buffer_size) - { - bit_stream *bs = (bit_stream *) TWOLAME_MALLOC(sizeof(bit_stream)); - -@@ -49,7 +49,7 @@ bit_stream *buffer_init(unsigned char *buffer, int buffer_size) - } - - /* Dellocate bit buffer */ --void buffer_deinit(bit_stream ** bs) -+void bitbuffer_deinit(bit_stream ** bs) - { - - if (bs == NULL || *bs == NULL) -diff --git a/libtwolame/bitbuffer.h b/libtwolame/bitbuffer.h -index 0201347..f377c8f 100644 ---- a/libtwolame/bitbuffer.h -+++ b/libtwolame/bitbuffer.h -@@ -39,11 +39,11 @@ typedef struct bit_stream_struc { - } bit_stream; - - --bit_stream *buffer_init(unsigned char *buffer, int buffer_size); --void buffer_deinit(bit_stream ** bs); -+bit_stream *bitbuffer_init(unsigned char *buffer, int buffer_size); -+void bitbuffer_deinit(bit_stream ** bs); - - /*return the current bit stream length (in bits)*/ --#define buffer_sstell(bs) (bs->totbit) -+#define bitbuffer_sstell(bs) (bs->totbit) - - #endif - -diff --git a/libtwolame/energy.c b/libtwolame/energy.c -index 219bd2c..312d8ae 100644 ---- a/libtwolame/energy.c -+++ b/libtwolame/energy.c -@@ -73,7 +73,7 @@ void do_energy_levels(twolame_options * glopts, bit_stream * bs) - unsigned char rhibyte, rlobyte, lhibyte, llobyte; - - // Get the position (in butes) of the end of the mpeg audio frame -- int frameEnd = buffer_sstell(bs) / 8; -+ int frameEnd = bitbuffer_sstell(bs) / 8; - - - // find the maximum in the left and right channels -diff --git a/libtwolame/twolame.c b/libtwolame/twolame.c -index fa4bcc0..d3b8450 100644 ---- a/libtwolame/twolame.c -+++ b/libtwolame/twolame.c -@@ -442,7 +442,7 @@ static int encode_frame(twolame_options * glopts, bit_stream * bs) - glopts->num_crc_bits = 0; - - // Store the number of bits initially in the bit buffer -- initial_bits = buffer_sstell(bs); -+ initial_bits = bitbuffer_sstell(bs); - - adb = available_bits(glopts); - -@@ -580,7 +580,7 @@ static int encode_frame(twolame_options * glopts, bit_stream * bs) - - - // Calulate the number of bits in this frame -- frameBits = buffer_sstell(bs) - initial_bits; -+ frameBits = bitbuffer_sstell(bs) - initial_bits; - if (frameBits % 8) { /* a program failure */ - fprintf(stderr, "Sent %ld bits = %ld slots plus %ld\n", frameBits, frameBits / 8, - frameBits % 8); -@@ -630,7 +630,7 @@ int twolame_encode_buffer(twolame_options * glopts, - - // now would be a great time to validate the size of the buffer. - // samples/1152 * sizeof(frame) < mp2buffer_size -- mybs = buffer_init(mp2buffer, mp2buffer_size); -+ mybs = bitbuffer_init(mp2buffer, mp2buffer_size); - - - // Use up all the samples in in_buffer -@@ -658,7 +658,7 @@ int twolame_encode_buffer(twolame_options * glopts, - if (glopts->samples_in_buffer >= TWOLAME_SAMPLES_PER_FRAME) { - int bytes = encode_frame(glopts, mybs); - if (bytes <= 0) { -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - return bytes; - } - mp2_size += bytes; -@@ -667,7 +667,7 @@ int twolame_encode_buffer(twolame_options * glopts, - } - - // free up the bit stream buffer structure -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - - return (mp2_size); - } -@@ -687,7 +687,7 @@ int twolame_encode_buffer_interleaved(twolame_options * glopts, - - // now would be a great time to validate the size of the buffer. - // samples/1152 * sizeof(frame) < mp2buffer_size -- mybs = buffer_init(mp2buffer, mp2buffer_size); -+ mybs = bitbuffer_init(mp2buffer, mp2buffer_size); - - // Use up all the samples in in_buffer - while (num_samples) { -@@ -714,7 +714,7 @@ int twolame_encode_buffer_interleaved(twolame_options * glopts, - if (glopts->samples_in_buffer >= TWOLAME_SAMPLES_PER_FRAME) { - int bytes = encode_frame(glopts, mybs); - if (bytes <= 0) { -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - return bytes; - } - mp2_size += bytes; -@@ -723,7 +723,7 @@ int twolame_encode_buffer_interleaved(twolame_options * glopts, - } - - // free up the bit stream buffer structure -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - - - return (mp2_size); -@@ -771,7 +771,7 @@ int twolame_encode_buffer_float32(twolame_options * glopts, - - // now would be a great time to validate the size of the buffer. - // samples/1152 * sizeof(frame) < mp2buffer_size -- mybs = buffer_init(mp2buffer, mp2buffer_size); -+ mybs = bitbuffer_init(mp2buffer, mp2buffer_size); - - - // Use up all the samples in in_buffer -@@ -800,7 +800,7 @@ int twolame_encode_buffer_float32(twolame_options * glopts, - if (glopts->samples_in_buffer >= TWOLAME_SAMPLES_PER_FRAME) { - int bytes = encode_frame(glopts, mybs); - if (bytes <= 0) { -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - return bytes; - } - mp2_size += bytes; -@@ -809,7 +809,7 @@ int twolame_encode_buffer_float32(twolame_options * glopts, - } - - // free up the bit stream buffer structure -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - - return (mp2_size); - } -@@ -829,7 +829,7 @@ int twolame_encode_buffer_float32_interleaved(twolame_options * glopts, - - // now would be a great time to validate the size of the buffer. - // samples/1152 * sizeof(frame) < mp2buffer_size -- mybs = buffer_init(mp2buffer, mp2buffer_size); -+ mybs = bitbuffer_init(mp2buffer, mp2buffer_size); - - // Use up all the samples in in_buffer - while (num_samples) { -@@ -857,7 +857,7 @@ int twolame_encode_buffer_float32_interleaved(twolame_options * glopts, - if (glopts->samples_in_buffer >= TWOLAME_SAMPLES_PER_FRAME) { - int bytes = encode_frame(glopts, mybs); - if (bytes <= 0) { -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - return bytes; - } - mp2_size += bytes; -@@ -866,7 +866,7 @@ int twolame_encode_buffer_float32_interleaved(twolame_options * glopts, - } - - // free up the bit stream buffer structure -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - - - return (mp2_size); -@@ -885,7 +885,7 @@ int twolame_encode_flush(twolame_options * glopts, unsigned char *mp2buffer, int - return 0; - } - // Create bit stream structure -- mybs = buffer_init(mp2buffer, mp2buffer_size); -+ mybs = bitbuffer_init(mp2buffer, mp2buffer_size); - - // Pad out the PCM buffers with 0 and encode the frame - for (i = glopts->samples_in_buffer; i < TWOLAME_SAMPLES_PER_FRAME; i++) { -@@ -897,7 +897,7 @@ int twolame_encode_flush(twolame_options * glopts, unsigned char *mp2buffer, int - glopts->samples_in_buffer = 0; - - // free up the bit stream buffer structure -- buffer_deinit(&mybs); -+ bitbuffer_deinit(&mybs); - - return mp2_size; - } --- -2.17.1 - diff --git a/buildroot/package/twolame/Config.in b/buildroot/package/twolame/Config.in index 95b148b81..588afa482 100644 --- a/buildroot/package/twolame/Config.in +++ b/buildroot/package/twolame/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_TWOLAME bool "twolame" - select BR2_PACKAGE_LIBSNDFILE help TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on tooLAME by Mike Cheng, which in turn is based upon diff --git a/buildroot/package/twolame/twolame.hash b/buildroot/package/twolame/twolame.hash index 647655bd1..74941ae30 100644 --- a/buildroot/package/twolame/twolame.hash +++ b/buildroot/package/twolame/twolame.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 98f332f48951f47f23f70fd0379463aff7d7fb26f07e1e24e42ddef22cc6112a twolame-0.3.13.tar.gz +sha256 cc35424f6019a88c6f52570b63e1baf50f62963a3eac52a03a800bb070d7c87d twolame-0.4.0.tar.gz +sha256 257a842724705950b07da76ce0e22ffa80ec77b3e9dfc6702522ac342409da0f COPYING diff --git a/buildroot/package/twolame/twolame.mk b/buildroot/package/twolame/twolame.mk index d5628d1b0..b1abf077b 100644 --- a/buildroot/package/twolame/twolame.mk +++ b/buildroot/package/twolame/twolame.mk @@ -4,11 +4,17 @@ # ################################################################################ -TWOLAME_VERSION = 0.3.13 +TWOLAME_VERSION = 0.4.0 TWOLAME_SITE = http://downloads.sourceforge.net/project/twolame/twolame/$(TWOLAME_VERSION) -TWOLAME_DEPENDENCIES = host-pkgconf libsndfile TWOLAME_INSTALL_STAGING = YES TWOLAME_LICENSE = LGPL-2.1+ TWOLAME_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +TWOLAME_DEPENDENCIES += host-pkgconf libsndfile +TWOLAME_CONF_OPTS += --enable-sndfile +else +TWOLAME_CONF_OPTS += --disable-sndfile +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/tzdata/tzdata.hash b/buildroot/package/tzdata/tzdata.hash index 6a0ea17ce..e2338f13f 100644 --- a/buildroot/package/tzdata/tzdata.hash +++ b/buildroot/package/tzdata/tzdata.hash @@ -1,2 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2018-May/000050.html -sha512 d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae tzdata2018e.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2019-September/000057.html +sha512 2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565 tzdata2019c.tar.gz +# Locally computed: +sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/buildroot/package/tzdata/tzdata.mk b/buildroot/package/tzdata/tzdata.mk index 75fa5eb67..b656bc7f7 100644 --- a/buildroot/package/tzdata/tzdata.mk +++ b/buildroot/package/tzdata/tzdata.mk @@ -4,13 +4,14 @@ # ################################################################################ -TZDATA_VERSION = 2018e +TZDATA_VERSION = 2019c TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz -TZDATA_SITE = http://www.iana.org/time-zones/repository/releases +TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 TZDATA_DEPENDENCIES = host-tzdata HOST_TZDATA_DEPENDENCIES = host-zic TZDATA_LICENSE = Public domain +HOST_TZDATA_LICENSE_FILES = LICENSE # Take care when re-ordering this list since this might break zone # dependencies diff --git a/buildroot/package/uacme/Config.in b/buildroot/package/uacme/Config.in new file mode 100644 index 000000000..ea9babfda --- /dev/null +++ b/buildroot/package/uacme/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_UACME + bool "uacme" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_GNUTLS || BR2_PACKAGE_MBEDTLS) + select BR2_PACKAGE_LIBCURL + help + uacme is a client for the ACMEv2 protocol described in + RFC8555, written in plain C code with minimal dependencies + (libcurl and either of GnuTLS, OpenSSL or mbedTLS). The + ACMEv2 protocol allows a Certificate Authority + (https://letsencrypt.org is a popular one) and an applicant + to automate the process of verification and certificate + issuance. + + https://github.com/ndilieto/uacme diff --git a/buildroot/package/uacme/uacme.hash b/buildroot/package/uacme/uacme.hash new file mode 100644 index 000000000..b8d631d50 --- /dev/null +++ b/buildroot/package/uacme/uacme.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 c80bbee3c2ac3a64f70abe23be3b7768039785863170ac062625407a0b61e635 uacme-1.0.21.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/uacme/uacme.mk b/buildroot/package/uacme/uacme.mk new file mode 100644 index 000000000..5813399c5 --- /dev/null +++ b/buildroot/package/uacme/uacme.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# uacme +# +################################################################################ + +UACME_VERSION = 1.0.21 +# Released versions are on branch upstream/latest, tagged as +# upstream/X.Y.Z Do not use vX.Y.Z tags from master, as they do not +# include .tarball-version +UACME_SITE = $(call github,ndilieto,uacme,upstream/$(UACME_VERSION)) +UACME_LICENSE = GPL-3.0+ +UACME_LICENSE_FILES = COPYING +UACME_DEPENDENCIES = libcurl + +UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +UACME_CONF_OPTS += --with-gnutls +UACME_DEPENDENCIES += gnutls +else ifeq ($(BR2_PACKAGE_MBEDTLS),y) +UACME_CONF_OPTS += --with-mbedtls +UACME_DEPENDENCIES += mbedtls +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +UACME_CONF_OPTS += --with-openssl +UACME_DEPENDENCIES += openssl +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/uboot-tools/0001-drop-configh-from-tools.patch b/buildroot/package/uboot-tools/0001-drop-configh-from-tools.patch index f19cebee4..59e5686ed 100644 --- a/buildroot/package/uboot-tools/0001-drop-configh-from-tools.patch +++ b/buildroot/package/uboot-tools/0001-drop-configh-from-tools.patch @@ -1,4 +1,4 @@ -From 216832de3bc3e6ef093305c6d07f464f7606f2d6 Mon Sep 17 00:00:00 2001 +From ab8b54cfc9d3fddba297c343a2d8dea9dbe20017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 4 Aug 2015 22:13:20 +0200 Subject: [PATCH] drop configh from tools @@ -16,16 +16,18 @@ Signed-off-by: Jörg Krause [Romain: update for version 2017.05 after commit 9d80b49a671c9922931adcd823aab0ed319a42d1] Signed-off-by: Romain Naour +[Pierre-Jean: update for version 2019.04] +Signed-off-by: Pierre-Jean Texier --- tools/env/fw_env_private.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tools/env/fw_env_private.h b/tools/env/fw_env_private.h -index 0c27da0..e550463 100644 +index 86be16d..3c62ac4 100644 --- a/tools/env/fw_env_private.h +++ b/tools/env/fw_env_private.h -@@ -5,17 +5,6 @@ - * SPDX-License-Identifier: GPL-2.0+ +@@ -4,17 +4,6 @@ + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -/* Pull in the current config to define the default environment */ diff --git a/buildroot/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch b/buildroot/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch index c201bf749..a376afbc7 100644 --- a/buildroot/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch +++ b/buildroot/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch @@ -1,4 +1,4 @@ -From b8110293d70c4f43035dfd6a0904d342be6a08e0 Mon Sep 17 00:00:00 2001 +From 460646b3c4c1718860915c38586ee8d2fbda38e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 1 Feb 2015 21:53:47 +0100 Subject: [PATCH] tools only in no dot config targets @@ -25,18 +25,18 @@ Signed-off-by: Fabio Estevam 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 1cf15ce..75e85eb 100644 +index 6aa08964ff..fcec83d183 100644 --- a/Makefile +++ b/Makefile -@@ -425,7 +425,7 @@ timestamp_h := include/generated/timestamp_autogenerated.h +@@ -486,7 +486,7 @@ defaultenv_h := include/generated/defaultenv_autogenerated.h no-dot-config-targets := clean clobber mrproper distclean \ help %docs check% coccicheck \ -- ubootversion backup tests -+ ubootversion backup tests tools-only +- ubootversion backup tests check qcheck ++ ubootversion backup tests tools-only check qcheck config-targets := 0 mixed-targets := 0 -- -2.7.4 +2.20.1 diff --git a/buildroot/package/uboot-tools/0003-Make-FIT-support-really-optional.patch b/buildroot/package/uboot-tools/0003-Make-FIT-support-really-optional.patch deleted file mode 100644 index 8853198b4..000000000 --- a/buildroot/package/uboot-tools/0003-Make-FIT-support-really-optional.patch +++ /dev/null @@ -1,96 +0,0 @@ -From d9d7d7cf8b27516d45c66daa1bf0a18c878c4e33 Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Sun, 8 May 2016 11:11:39 -0300 -Subject: [PATCH] Make FIT support really optional - -Due to some mistakes in the source code, it was not possible to really -turn FIT support off. This commit fixes the problem by means of the -following changes: - -- Enclose "bootm_host_load_image" and "bootm_host_load_images" between - checks for CONFIG_FIT_SIGNATURE, in common/bootm.c. - -- Enclose the declaration of "bootm_host_load_images" between checks for - CONFIG_FIT_SIGNATURE, in common/bootm.h. - -- Condition the compilation and linking of fit_common.o fit_image.o - image-host.o common/image-fit.o to CONFIG_FIT=y, in tools/Makefile. - -Signed-off-by: Carlos Santos -[fabio: adapt for 2016.07] -Signed-off-by: Fabio Estevam -[Ricardo: fix conditional compilation and linking of the files mentioned above -for 2016.07] -Signed-off-by: Ricardo Martincoski ---- - common/bootm.c | 2 ++ - include/bootm.h | 2 ++ - tools/Makefile | 6 ++---- - 3 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/common/bootm.c b/common/bootm.c -index 2431019..7e1adc8 100644 ---- a/common/bootm.c -+++ b/common/bootm.c -@@ -901,6 +901,7 @@ void memmove_wd(void *to, void *from, size_t len, ulong chunksz) - memmove(to, from, len); - } - -+#if defined(CONFIG_FIT_SIGNATURE) - static int bootm_host_load_image(const void *fit, int req_image_type) - { - const char *fit_uname_config = NULL; -@@ -965,5 +966,6 @@ int bootm_host_load_images(const void *fit, int cfg_noffset) - /* Return the first error we found */ - return err; - } -+#endif - - #endif /* ndef USE_HOSTCC */ -diff --git a/include/bootm.h b/include/bootm.h -index 4981377..94d62a1 100644 ---- a/include/bootm.h -+++ b/include/bootm.h -@@ -41,7 +41,9 @@ void lynxkdi_boot(image_header_t *hdr); - - boot_os_fn *bootm_os_get_boot_func(int os); - -+#if defined(CONFIG_FIT_SIGNATURE) - int bootm_host_load_images(const void *fit, int cfg_noffset); -+#endif - - int boot_selected_os(int argc, char * const argv[], int state, - bootm_headers_t *images, boot_os_fn *boot_fn); -diff --git a/tools/Makefile b/tools/Makefile -index f72294a..ccf5120 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -54,6 +54,7 @@ mkenvimage-objs := mkenvimage.o os_support.o lib/crc32.o - hostprogs-y += dumpimage mkimage - hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info fit_check_sign - -+FIT_OBJS-$(CONFIG_FIT) := fit_common.o fit_image.o image-host.o common/image-fit.o - FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) := common/image-sig.o - # Flattened device tree objects - LIBFDT_OBJS := $(addprefix lib/libfdt/, \ -@@ -68,16 +69,13 @@ ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o rkspi.o - # common objs for dumpimage and mkimage - dumpimage-mkimage-objs := aisimage.o \ - atmelimage.o \ -+ $(FIT_OBJS-y) \ - $(FIT_SIG_OBJS-y) \ - common/bootm.o \ - lib/crc32.o \ - default_image.o \ - lib/fdtdec_common.o \ - lib/fdtdec.o \ -- fit_common.o \ -- fit_image.o \ -- common/image-fit.o \ -- image-host.o \ - common/image.o \ - imagetool.o \ - imximage.o \ --- -2.9.1 - diff --git a/buildroot/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch b/buildroot/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch new file mode 100644 index 000000000..09ee40bec --- /dev/null +++ b/buildroot/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch @@ -0,0 +1,36 @@ +From 0552a8ffdfbb9807fcef4498011907caa5de2ace Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Thu, 9 Jan 2020 15:11:32 +0100 +Subject: [PATCH] drop autoconf.h from tools +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We need to build u-boot tools without a board configuration for the target. + +imximage uses the DCD address from Kconfig to display this information +to the user. The default value for all i.MX platforms is 0x00910000, +except for i.MX7ULP, which has a DCD address of 0x2f010000. + +The default value printed before version 2020.01 was 0x00910000. + +Signed-off-by: Jörg Krause +--- + tools/imximage.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tools/imximage.c b/tools/imximage.c +index d7edd3c52f..f8d21fa06a 100644 +--- a/tools/imximage.c ++++ b/tools/imximage.c +@@ -11,7 +11,6 @@ + #include "imagetool.h" + #include + #include "imximage.h" +-#include + + #define UNDEFINED 0xFFFFFFFF + +-- +2.25.0 + diff --git a/buildroot/package/uboot-tools/Config.in b/buildroot/package/uboot-tools/Config.in index 63a058e85..681f87b45 100644 --- a/buildroot/package/uboot-tools/Config.in +++ b/buildroot/package/uboot-tools/Config.in @@ -47,6 +47,15 @@ config BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT libcrypto, and possibly GPL/OpenSSL licensing incompatibility issues. +config BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN + bool "fit_check_sign" + depends on BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT + help + Install the fit_check_sign tool on the target system + + The fit_check_sign tool from Das U-Boot bootloader, which + allows FIT image signature validation on target system. + endif config BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE diff --git a/buildroot/package/uboot-tools/uboot-tools.hash b/buildroot/package/uboot-tools/uboot-tools.hash index 97d0bd0b5..6c17ef02b 100644 --- a/buildroot/package/uboot-tools/uboot-tools.hash +++ b/buildroot/package/uboot-tools/uboot-tools.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 9f10df88bc91b35642e461217f73256bbaeeca9ae2db8db56197ba5e89e1f6d4 u-boot-2018.07.tar.bz2 +sha256 aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1 u-boot-2020.01.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/buildroot/package/uboot-tools/uboot-tools.mk b/buildroot/package/uboot-tools/uboot-tools.mk index 5ac7b1c29..8cafc084e 100644 --- a/buildroot/package/uboot-tools/uboot-tools.mk +++ b/buildroot/package/uboot-tools/uboot-tools.mk @@ -4,13 +4,17 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2018.07 +UBOOT_TOOLS_VERSION = 2020.01 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+ UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt UBOOT_TOOLS_INSTALL_STAGING = YES +# u-boot 2020.01+ needs make 4.0+ +UBOOT_TOOLS_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) +HOST_UBOOT_TOOLS_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) + define UBOOT_TOOLS_CONFIGURE_CMDS mkdir -p $(@D)/include/config touch $(@D)/include/config/auto.conf @@ -28,14 +32,20 @@ UBOOT_TOOLS_DEPENDENCIES += dtc endif ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),y) -UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y +UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 UBOOT_TOOLS_DEPENDENCIES += openssl host-pkgconf endif +ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN),y) +define UBOOT_TOOLS_INSTALL_FIT_CHECK_SIGN + $(INSTALL) -m 0755 -D $(@D)/tools/fit_check_sign $(TARGET_DIR)/usr/bin/fit_check_sign +endef +endif + define UBOOT_TOOLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \ + $(TARGET_MAKE_ENV) $(BR2_MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \ CROSS_BUILD_TOOLS=y tools-only - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \ + $(TARGET_MAKE_ENV) $(BR2_MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \ envtools no-dot-config-targets=envtools endef @@ -74,6 +84,7 @@ define UBOOT_TOOLS_INSTALL_TARGET_CMDS $(UBOOT_TOOLS_INSTALL_MKENVIMAGE) $(UBOOT_TOOLS_INSTALL_FWPRINTENV) $(UBOOT_TOOLS_INSTALL_DUMPIMAGE) + $(UBOOT_TOOLS_INSTALL_FIT_CHECK_SIGN) endef define HOST_UBOOT_TOOLS_CONFIGURE_CMDS @@ -91,12 +102,12 @@ HOST_UBOOT_TOOLS_DEPENDENCIES += host-dtc endif ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),y) -HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y +HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 HOST_UBOOT_TOOLS_DEPENDENCIES += host-openssl endif define HOST_UBOOT_TOOLS_BUILD_CMDS - $(MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) tools-only + $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) tools-only endef define HOST_UBOOT_TOOLS_INSTALL_CMDS diff --git a/buildroot/package/ubus/ubus.hash b/buildroot/package/ubus/ubus.hash index 08297348e..bda58bc30 100644 --- a/buildroot/package/ubus/ubus.hash +++ b/buildroot/package/ubus/ubus.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 93ef2612853641ca8d16d07527115c72ed03f8eaa1c727a01b069a4e814247c0 ubus-34c6e818e431cc53478a0f7c7c1eca07d194d692.tar.gz +sha256 f53187f011575f6ec6c529136fd4658d67e674227c80b7b72c99b3654454ae7f ubusd_acl.h diff --git a/buildroot/package/uccp420wlan/uccp420wlan.hash b/buildroot/package/uccp420wlan/uccp420wlan.hash index 41f60a467..905fa4299 100644 --- a/buildroot/package/uccp420wlan/uccp420wlan.hash +++ b/buildroot/package/uccp420wlan/uccp420wlan.hash @@ -1,2 +1,4 @@ # locally computed hash -sha256 1d4de62fc842dbab739708cf0d9ebce270fcdf63c1c13ac676cbc253acdaa3bb uccp420wlan-v6.9.1.tar.gz +sha256 1d4de62fc842dbab739708cf0d9ebce270fcdf63c1c13ac676cbc253acdaa3bb uccp420wlan-6.9.1.tar.gz +sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING +sha256 9ac431585fddfe624b08cf7464876a5e96061047ff26a9e926da3d89d21a2a73 firmware/LICENSE.imagination diff --git a/buildroot/package/uccp420wlan/uccp420wlan.mk b/buildroot/package/uccp420wlan/uccp420wlan.mk index bd89e0700..7256b9277 100644 --- a/buildroot/package/uccp420wlan/uccp420wlan.mk +++ b/buildroot/package/uccp420wlan/uccp420wlan.mk @@ -4,8 +4,8 @@ # ################################################################################ -UCCP420WLAN_VERSION = v6.9.1 -UCCP420WLAN_SITE = $(call github,CreatorDev,uccp420wlan,$(UCCP420WLAN_VERSION)) +UCCP420WLAN_VERSION = 6.9.1 +UCCP420WLAN_SITE = $(call github,CreatorDev,uccp420wlan,v$(UCCP420WLAN_VERSION)) UCCP420WLAN_LICENSE = GPL-2.0 (kernel module), proprietary (firmware blob) UCCP420WLAN_LICENSE_FILES = COPYING firmware/LICENSE.imagination diff --git a/buildroot/package/ucl/ucl.hash b/buildroot/package/ucl/ucl.hash index 6b1f41ed1..0252f6929 100644 --- a/buildroot/package/ucl/ucl.hash +++ b/buildroot/package/ucl/ucl.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 ucl-1.03.tar.gz +sha256 b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 ucl-1.03.tar.gz +sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/buildroot/package/uclibc-ng-test/0003-test-misc-test-nftw.c-fix-build-with-latest-glibc.patch b/buildroot/package/uclibc-ng-test/0003-test-misc-test-nftw.c-fix-build-with-latest-glibc.patch new file mode 100644 index 000000000..2c45aeee6 --- /dev/null +++ b/buildroot/package/uclibc-ng-test/0003-test-misc-test-nftw.c-fix-build-with-latest-glibc.patch @@ -0,0 +1,42 @@ +From de742f52d46d82db1fe1b0f3255043d48843901d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 29 Oct 2019 11:14:35 +0100 +Subject: [PATCH] test/misc/test-nftw.c: fix build with latest glibc + +Fix the following error with latest glibc: + +In function 'open', + inlined from 'do_test' at tst-nftw.c:38:10, + inlined from 'main' at ../test-skeleton.c:318:12: +/home/mark/buildroot-test/instance-0/output/host/riscv32-buildroot-linux-gnu/sysroot/usr/include/bits/fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments + __open_missing_mode (); + ^~~~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.net/results/f370abcc8dc12975d96a46c34db978554f8c21db + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/wbx-github/uclibc-ng-test/pull/1] +--- + test/misc/tst-nftw.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/misc/tst-nftw.c b/test/misc/tst-nftw.c +index 970dfc2..7a08c78 100644 +--- a/test/misc/tst-nftw.c ++++ b/test/misc/tst-nftw.c +@@ -35,9 +35,9 @@ do_test(void) + perror("Creating path"); + if ((mkdir(subpath, 0700)) < 0) + perror("Creating subpath"); +- if ((open(filepath, O_CREAT)) < 0) ++ if ((open(filepath, O_CREAT, 0600)) < 0) + perror("Opening filepath"); +- if ((open(filesubpath, O_CREAT)) < 0) ++ if ((open(filesubpath, O_CREAT, 0600)) < 0) + perror("Opening filesubpath"); + + if (nftw(path, process_one_entry, 100, (FTW_CHDIR|FTW_DEPTH|FTW_PHYS)) < 0) +-- +2.23.0 + diff --git a/buildroot/package/uclibc-ng-test/0004-test-nptl-tst-mqueue4.c-fix-build-with-latest-glibc.patch b/buildroot/package/uclibc-ng-test/0004-test-nptl-tst-mqueue4.c-fix-build-with-latest-glibc.patch new file mode 100644 index 000000000..374427d96 --- /dev/null +++ b/buildroot/package/uclibc-ng-test/0004-test-nptl-tst-mqueue4.c-fix-build-with-latest-glibc.patch @@ -0,0 +1,48 @@ +From 04052336f84a84811dd03bfed4cfcb4fe7b424cc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 29 Oct 2019 11:21:47 +0100 +Subject: [PATCH] test/nptl/tst-mqueue4.c: fix build with latest glibc + +Fix the following error with latest glibc: + +In file included from /home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot/usr/include/mqueue.h:93:0, + from tst-mqueue4.c:22: +In function 'mq_open', + inlined from 'do_test' at tst-mqueue4.c:174:6: +/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot/usr/include/bits/mqueue2.h:41:5: error: call to '__mq_open_wrong_number_of_args' declared with attribute error: mq_open can be called either with 2 or 4 arguments + __mq_open_wrong_number_of_args (); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.net/results/f370abcc8dc12975d96a46c34db978554f8c21db + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/wbx-github/uclibc-ng-test/pull/1] +--- + test/nptl/tst-mqueue4.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/nptl/tst-mqueue4.c b/test/nptl/tst-mqueue4.c +index 87ef0c3..1fbecc5 100644 +--- a/test/nptl/tst-mqueue4.c ++++ b/test/nptl/tst-mqueue4.c +@@ -171,14 +171,14 @@ do_test (void) + result = 1; + } + +- q2 = mq_open (name, O_RDONLY, 0600); ++ q2 = mq_open (name, O_RDONLY, 0600, &attr); + if (q2 == (mqd_t) -1) + { + printf ("mq_open without O_CREAT failed with %m\n"); + result = 1; + } + +- mqd_t q3 = mq_open (name, O_RDONLY, 0600); ++ mqd_t q3 = mq_open (name, O_RDONLY, 0600, &attr); + if (q3 == (mqd_t) -1) + { + printf ("mq_open without O_CREAT failed with %m\n"); +-- +2.23.0 + diff --git a/buildroot/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch b/buildroot/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch new file mode 100644 index 000000000..5557a9c1e --- /dev/null +++ b/buildroot/package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch @@ -0,0 +1,72 @@ +From d1a3ca7ca56630fddde7311a0474eed4a21335a7 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Mon, 3 Feb 2020 13:57:32 -0800 +Subject: [PATCH] include/ctype.h: drop is*_l macro definitions + +ctype locale-specific macro definitions are broken because they result +in dereference of pointer to structure of incomplete type. +Drop these macros since they are optional and let applications use +functions with the same names. + +This change fixes parted-3.3 build with uClibc-ng: + http://autobuild.buildroot.net/results/b7ba1210d5aa184b133f0171da621d2b0083ec39/build-end.log + +Signed-off-by: Max Filippov +--- + include/ctype.h | 33 --------------------------------- + 1 file changed, 33 deletions(-) + +diff --git a/include/ctype.h b/include/ctype.h +index ecd5e730886a..e934cf3321a6 100644 +--- a/include/ctype.h ++++ b/include/ctype.h +@@ -350,46 +350,13 @@ libc_hidden_proto(tolower_l) + /* Return the uppercase version of C. */ + extern int toupper_l (int __c, __locale_t __l) __THROW; + +-# if __GNUC__ >= 2 && defined __OPTIMIZE__ && !defined __cplusplus +-# define tolower_l(c, locale) __tobody(c, tolower_l, (locale)->__ctype_tolower, (c, locale)) +-# define toupper_l(c, locale) __tobody(c, toupper_l, (locale)->__ctype_toupper, (c, locale)) +-# endif /* Optimizing gcc */ +- +- +-# define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type) + # ifndef __NO_CTYPE +-# define __isalnum_l(c,l) __isctype_l((c), _ISalnum, (l)) +-# define __isalpha_l(c,l) __isctype_l((c), _ISalpha, (l)) +-# define __iscntrl_l(c,l) __isctype_l((c), _IScntrl, (l)) +-# define __isdigit_l(c,l) __isctype_l((c), _ISdigit, (l)) +-# define __islower_l(c,l) __isctype_l((c), _ISlower, (l)) +-# define __isgraph_l(c,l) __isctype_l((c), _ISgraph, (l)) +-# define __isprint_l(c,l) __isctype_l((c), _ISprint, (l)) +-# define __ispunct_l(c,l) __isctype_l((c), _ISpunct, (l)) +-# define __isspace_l(c,l) __isctype_l((c), _ISspace, (l)) +-# define __isupper_l(c,l) __isctype_l((c), _ISupper, (l)) +-# define __isxdigit_l(c,l) __isctype_l((c), _ISxdigit, (l)) +-# define __isblank_l(c,l) __isctype_l((c), _ISblank, (l)) +- + # if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \ + && defined __UCLIBC_SUSV4_LEGACY__ + # define __isascii_l(c,l) ((l), __isascii (c)) + # define __toascii_l(c,l) ((l), __toascii (c)) + # endif + +-# define isalnum_l(c,l) __isalnum_l ((c), (l)) +-# define isalpha_l(c,l) __isalpha_l ((c), (l)) +-# define iscntrl_l(c,l) __iscntrl_l ((c), (l)) +-# define isdigit_l(c,l) __isdigit_l ((c), (l)) +-# define islower_l(c,l) __islower_l ((c), (l)) +-# define isgraph_l(c,l) __isgraph_l ((c), (l)) +-# define isprint_l(c,l) __isprint_l ((c), (l)) +-# define ispunct_l(c,l) __ispunct_l ((c), (l)) +-# define isspace_l(c,l) __isspace_l ((c), (l)) +-# define isupper_l(c,l) __isupper_l ((c), (l)) +-# define isxdigit_l(c,l) __isxdigit_l ((c), (l)) +-# define isblank_l(c,l) __isblank_l ((c), (l)) +- + # if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \ + && defined __UCLIBC_SUSV4_LEGACY__ + # define isascii_l(c,l) __isascii_l ((c), (l)) +-- +2.20.1 + diff --git a/buildroot/package/uclibc/0001-statfs.h-sync-generic-header-with-glibc.patch b/buildroot/package/uclibc/0001-statfs.h-sync-generic-header-with-glibc.patch deleted file mode 100644 index b8753ed87..000000000 --- a/buildroot/package/uclibc/0001-statfs.h-sync-generic-header-with-glibc.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 8a73a967e18c55199785bae0f22dc94d9b2f8985 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Tue, 27 Nov 2018 15:41:37 +0100 -Subject: [PATCH] statfs.h: sync generic header with glibc - -Fix issues with aarch64 and df with mismatching header between kernel -and libc. - -Signed-off-by: Waldemar Brodkorb ---- - .../linux/common-generic/bits/statfs.h | 84 +++++++++---------- - libc/sysdeps/linux/common/fstatfs.c | 9 -- - libc/sysdeps/linux/common/statfs.c | 10 --- - 3 files changed, 40 insertions(+), 63 deletions(-) - -diff --git a/libc/sysdeps/linux/common-generic/bits/statfs.h b/libc/sysdeps/linux/common-generic/bits/statfs.h -index a2767b49a..23519a57e 100644 ---- a/libc/sysdeps/linux/common-generic/bits/statfs.h -+++ b/libc/sysdeps/linux/common-generic/bits/statfs.h -@@ -11,65 +11,61 @@ - #include - #include - #include -+#include - -+/* 64-bit libc uses the kernel's 'struct statfs', accessed via the -+ statfs() syscall; 32-bit libc uses the kernel's 'struct statfs64' -+ and accesses it via the statfs64() syscall. All the various -+ APIs offered by libc use the kernel shape for their struct statfs -+ structure; the only difference is that 32-bit programs not -+ using __USE_FILE_OFFSET64 only see the low 32 bits of some -+ of the fields (the __fsblkcnt_t and __fsfilcnt_t fields). */ -+ -+#if defined __USE_FILE_OFFSET64 -+# define __field64(type, type64, name) type64 name -+#elif __WORDSIZE == 64 -+# define __field64(type, type64, name) type name -+#elif __BYTE_ORDER == __LITTLE_ENDIAN -+# define __field64(type, type64, name) \ -+ type name __attribute__((__aligned__ (__alignof__ (type64)))); int __##name##_pad -+#else -+# define __field64(type, type64, name) \ -+ int __##name##_pad __attribute__((__aligned__ (__alignof__ (type64)))); type name -+#endif - - struct statfs - { -- __U32_TYPE f_type; -- __U32_TYPE f_bsize; --#ifndef __USE_FILE_OFFSET64 --# if __BYTE_ORDER == __LITTLE_ENDIAN -- __U32_TYPE f_blocks; -- __U32_TYPE __pad1; -- __U32_TYPE f_bfree; -- __U32_TYPE __pad2; -- __U32_TYPE f_bavail; -- __U32_TYPE __pad3; -- __U32_TYPE f_files; -- __U32_TYPE __pad4; -- __U32_TYPE f_ffree; -- __U32_TYPE __pad5; --# else -- __U32_TYPE __pad1; -- __U32_TYPE f_blocks; -- __U32_TYPE __pad2; -- __U32_TYPE f_bfree; -- __U32_TYPE __pad3; -- __U32_TYPE f_bavail; -- __U32_TYPE __pad4; -- __U32_TYPE f_files; -- __U32_TYPE __pad5; -- __U32_TYPE f_ffree; --# endif /* __LITTLE_ENDIAN */ --#else -- __U64_TYPE f_blocks; -- __U64_TYPE f_bfree; -- __U64_TYPE f_bavail; -- __U64_TYPE f_files; -- __U64_TYPE f_ffree; --#endif /* __USE_FILE_OFFSET64 */ -+ __SWORD_TYPE f_type; -+ __SWORD_TYPE f_bsize; -+ __field64(__fsblkcnt_t, __fsblkcnt64_t, f_blocks); -+ __field64(__fsblkcnt_t, __fsblkcnt64_t, f_bfree); -+ __field64(__fsblkcnt_t, __fsblkcnt64_t, f_bavail); -+ __field64(__fsfilcnt_t, __fsfilcnt64_t, f_files); -+ __field64(__fsfilcnt_t, __fsfilcnt64_t, f_ffree); - __fsid_t f_fsid; -- __U32_TYPE f_namelen; -- __U32_TYPE f_frsize; -- __U32_TYPE f_flags; -- __U32_TYPE f_spare[4]; -- } __ARCH_64BIT_ALIGNMENT__; -+ __SWORD_TYPE f_namelen; -+ __SWORD_TYPE f_frsize; -+ __SWORD_TYPE f_flags; -+ __SWORD_TYPE f_spare[4]; -+ }; -+ -+#undef __field64 - - #ifdef __USE_LARGEFILE64 - struct statfs64 - { -- __U32_TYPE f_type; -- __U32_TYPE f_bsize; -+ __SWORD_TYPE f_type; -+ __SWORD_TYPE f_bsize; - __U64_TYPE f_blocks; - __U64_TYPE f_bfree; - __U64_TYPE f_bavail; - __U64_TYPE f_files; - __U64_TYPE f_ffree; - __fsid_t f_fsid; -- __U32_TYPE f_namelen; -- __U32_TYPE f_frsize; -- __U32_TYPE f_flags; -- __U32_TYPE f_spare[4]; -+ __SWORD_TYPE f_namelen; -+ __SWORD_TYPE f_frsize; -+ __SWORD_TYPE f_flags; -+ __SWORD_TYPE f_spare[4]; - }; - #endif - -diff --git a/libc/sysdeps/linux/common/fstatfs.c b/libc/sysdeps/linux/common/fstatfs.c -index fcb0820eb..0b2709ce3 100644 ---- a/libc/sysdeps/linux/common/fstatfs.c -+++ b/libc/sysdeps/linux/common/fstatfs.c -@@ -30,15 +30,6 @@ _syscall2(int, __libc_fstatfs, int, fd, struct statfs *, buf) - int __libc_fstatfs (int __fildes, struct statfs *__buf) - { - int err = INLINE_SYSCALL(fstatfs64, 3, __fildes, sizeof(*__buf), __buf); -- -- if (err == 0) { -- /* Did we overflow? */ -- if (__buf->__pad1 || __buf->__pad2 || __buf->__pad3 || -- __buf->__pad4 || __buf->__pad5) { -- __set_errno(EOVERFLOW); -- return -1; -- } -- } - return err; - }; - /* Redefined fstatfs because we need it for backwards compatibility */ -diff --git a/libc/sysdeps/linux/common/statfs.c b/libc/sysdeps/linux/common/statfs.c -index ab9ec0e56..2990ff3e2 100644 ---- a/libc/sysdeps/linux/common/statfs.c -+++ b/libc/sysdeps/linux/common/statfs.c -@@ -18,16 +18,6 @@ extern __typeof(statfs) __libc_statfs attribute_hidden; - int __libc_statfs(const char *path, struct statfs *buf) - { - int err = INLINE_SYSCALL(statfs64, 3, path, sizeof(*buf), buf); -- -- if (err == 0) { -- /* Did we overflow? */ -- if (buf->__pad1 || buf->__pad2 || buf->__pad3 || -- buf->__pad4 || buf->__pad5) { -- __set_errno(EOVERFLOW); -- return -1; -- } -- } -- - return err; - } - # if defined __UCLIBC_LINUX_SPECIFIC__ || defined __UCLIBC_HAS_THREADS_NATIVE__ --- -2.19.1 - diff --git a/buildroot/package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch b/buildroot/package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch new file mode 100644 index 000000000..a0e115c76 --- /dev/null +++ b/buildroot/package/uclibc/0002-include-ctype.h-restore-__isctype_l-definition.patch @@ -0,0 +1,32 @@ +From 7a9a3e4b36955e8530756823d3443f6822562c56 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Sun, 9 Feb 2020 22:29:53 +0100 +Subject: [PATCH] include/ctype.h: restore __isctype_l definition + +Recent is*_l fix broke uclibc build because removed __isctype_l +definition was used in libc/misc/ctype/ctype.c. Restore it. + +Fixes: d1a3ca7ca566 ("include/ctype.h: drop is*_l macro definitions") +Signed-off-by: Max Filippov +--- +Upstream status: +https://mailman.uclibc-ng.org/pipermail/devel/2020-February/001940.html +--- + include/ctype.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/ctype.h b/include/ctype.h +index e934cf332..05f21c553 100644 +--- a/include/ctype.h ++++ b/include/ctype.h +@@ -350,6 +350,7 @@ libc_hidden_proto(tolower_l) + /* Return the uppercase version of C. */ + extern int toupper_l (int __c, __locale_t __l) __THROW; + ++# define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type) + # ifndef __NO_CTYPE + # if (defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN) \ + && defined __UCLIBC_SUSV4_LEGACY__ +-- +2.20.1 + diff --git a/buildroot/package/uclibc/0002-xtensa-add-custom-bits-poll.h.patch b/buildroot/package/uclibc/0002-xtensa-add-custom-bits-poll.h.patch deleted file mode 100644 index 030938bbc..000000000 --- a/buildroot/package/uclibc/0002-xtensa-add-custom-bits-poll.h.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 0cae9700a4a421dc22c80d205fbae4d01fdd1356 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 12 Dec 2018 06:58:01 -0800 -Subject: [PATCH] xtensa: add custom bits/poll.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Definitions of POLLWRNORM, POLLWRBAND and POLLREMOVE in xtensa linux -kernel are non-standard. Provide bits/poll.h with correct values for -these constants. - -This fixes the following strace build errors: - - In file included from xlat/pollflags.h:4:0, - from poll.c:34: - ./static_assert.h:40:24: error: static assertion failed: "POLLWRBAND != 0x0100" - # define static_assert _Static_assert - ^ - xlat/pollflags.h:75:1: note: in expansion of macro ‘static_assert’ - static_assert((POLLWRBAND) == (0x0100), "POLLWRBAND != 0x0100"); - ^~~~~~~~~~~~~ - ./static_assert.h:40:24: error: static assertion failed: "POLLREMOVE != 0x0800" - # define static_assert _Static_assert - ^ - xlat/pollflags.h:117:1: note: in expansion of macro ‘static_assert’ - static_assert((POLLREMOVE) == (0x0800), "POLLREMOVE != 0x0800"); - ^~~~~~~~~~~~~ - -Signed-off-by: Max Filippov ---- - libc/sysdeps/linux/xtensa/bits/poll.h | 49 +++++++++++++++++++++++++++++++++++ - 1 file changed, 49 insertions(+) - create mode 100644 libc/sysdeps/linux/xtensa/bits/poll.h - -diff --git a/libc/sysdeps/linux/xtensa/bits/poll.h b/libc/sysdeps/linux/xtensa/bits/poll.h -new file mode 100644 -index 000000000000..4588cc326006 ---- /dev/null -+++ b/libc/sysdeps/linux/xtensa/bits/poll.h -@@ -0,0 +1,49 @@ -+/* Copyright (C) 1997, 2001, 2006 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library 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. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#ifndef _SYS_POLL_H -+# error "Never use directly; include instead." -+#endif -+ -+/* Event types that can be polled for. These bits may be set in `events' -+ to indicate the interesting event types; they will appear in `revents' -+ to indicate the status of the file descriptor. */ -+#define POLLIN 0x001 /* There is data to read. */ -+#define POLLPRI 0x002 /* There is urgent data to read. */ -+#define POLLOUT 0x004 /* Writing now will not block. */ -+ -+#ifdef __USE_XOPEN -+/* These values are defined in XPG4.2. */ -+# define POLLRDNORM 0x040 /* Normal data may be read. */ -+# define POLLRDBAND 0x080 /* Priority data may be read. */ -+# define POLLWRNORM POLLOUT /* Writing now will not block. */ -+# define POLLWRBAND 0x100 /* Priority data may be written. */ -+#endif -+ -+#ifdef __USE_GNU -+/* These are extensions for Linux. */ -+# define POLLMSG 0x400 -+# define POLLREMOVE 0x800 -+# define POLLRDHUP 0x2000 -+#endif -+ -+/* Event types always implicitly polled for. These bits need not be set in -+ `events', but they will appear in `revents' to indicate the status of -+ the file descriptor. */ -+#define POLLERR 0x008 /* Error condition. */ -+#define POLLHUP 0x010 /* Hung up. */ -+#define POLLNVAL 0x020 /* Invalid polling request. */ --- -2.11.0 - diff --git a/buildroot/package/uclibc/0003-preadv-pwritev-fix-offset-argument-type.patch b/buildroot/package/uclibc/0003-preadv-pwritev-fix-offset-argument-type.patch deleted file mode 100644 index ccc262b9c..000000000 --- a/buildroot/package/uclibc/0003-preadv-pwritev-fix-offset-argument-type.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 1077d5bebffacfd4b09896ed890fb45a5b3c6dc6 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 10 May 2019 07:13:19 -0700 -Subject: [PATCH] preadv/pwritev: fix offset argument type - -preadv/pwritev don't provide separate version for 64-bit wide off_t, -and default to 32-bit wide off_t, which results in a mismatch between -declaration and definition for user programs built with --D_FILE_OFFSET_BITS=64. -Make offset argument of both functions __off64_t. -This fixes test misc/tst-preadvwritev on xtensa. - -Backported from: 423e49023eeb ("preadv/pwritev: fix offset argument type") -Signed-off-by: Max Filippov ---- - include/sys/uio.h | 4 ++-- - libc/sysdeps/linux/common/preadv.c | 2 +- - libc/sysdeps/linux/common/pwritev.c | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/sys/uio.h b/include/sys/uio.h -index aa766f9b1187..330426fec492 100644 ---- a/include/sys/uio.h -+++ b/include/sys/uio.h -@@ -59,7 +59,7 @@ extern ssize_t writev (int __fd, const struct iovec *__iovec, int __count); - This function is a cancellation point and therefore not marked with - __THROW. */ - extern ssize_t preadv (int __fd, const struct iovec *__iovec, int __count, -- off_t __offset) __wur; -+ __off64_t __offset) __wur; - - /* Write data pointed by the buffers described by IOVEC, which is a - vector of COUNT 'struct iovec's, to file descriptor FD at the given -@@ -71,7 +71,7 @@ extern ssize_t preadv (int __fd, const struct iovec *__iovec, int __count, - This function is a cancellation point and therefore not marked with - __THROW. */ - extern ssize_t pwritev (int __fd, const struct iovec *__iovec, int __count, -- off_t __offset) __wur; -+ __off64_t __offset) __wur; - #endif /* Use misc. */ - - __END_DECLS -diff --git a/libc/sysdeps/linux/common/preadv.c b/libc/sysdeps/linux/common/preadv.c -index fd9dde4b999c..6a07d5df87e0 100644 ---- a/libc/sysdeps/linux/common/preadv.c -+++ b/libc/sysdeps/linux/common/preadv.c -@@ -21,7 +21,7 @@ - - #ifdef __NR_preadv - ssize_t --preadv (int fd, const struct iovec *vector, int count, off_t offset) -+preadv (int fd, const struct iovec *vector, int count, __off64_t offset) - { - unsigned long pos_l, pos_h; - -diff --git a/libc/sysdeps/linux/common/pwritev.c b/libc/sysdeps/linux/common/pwritev.c -index bef5bcf69b46..f07c40e6de3c 100644 ---- a/libc/sysdeps/linux/common/pwritev.c -+++ b/libc/sysdeps/linux/common/pwritev.c -@@ -21,7 +21,7 @@ - - #ifdef __NR_pwritev - ssize_t --pwritev (int fd, const struct iovec *vector, int count, off_t offset) -+pwritev (int fd, const struct iovec *vector, int count, __off64_t offset) - { - unsigned long pos_l, pos_h; - --- -2.11.0 - diff --git a/buildroot/package/uclibc/0004-sparc-remove-asm-constraint.patch b/buildroot/package/uclibc/0004-sparc-remove-asm-constraint.patch deleted file mode 100644 index 2fbe8cda5..000000000 --- a/buildroot/package/uclibc/0004-sparc-remove-asm-constraint.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 75a1a2a9fec8a310a18ff7d63ead95f3a0d1b11b Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 24 May 2019 12:42:04 +0200 -Subject: [PATCH] sparc: remove asm constraint - -uClibc-ng don't build with gcc 9.1 [1] due to a new check that -"catch illegal asm constraint usage" [2]. -gcc 9.1 print this error: -"invalid hard register usage between earlyclobber operand and input operand" -The asm constraint is present in uClibc since it support sparc (back in 2002)[3]. -Note: There is no such constraint is Glibc counterpart code [4]. -[1] https://gitlab.com/kubu93/toolchains-builder/-/jobs/205435757 -[2] https://github.com/gcc-mirror/gcc/commit/b782636f28f5c378897c238081d28d7a4a6ca578 -[3] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=3b6d086531102b6d09ce852feb1e370d5dca3ce9 -[4] -+https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/sparc/sysdep.h;h=981b2a26b7a91093f821c97876 -+e55bc4be2d9f8a;hb=HEAD - -(cherry picked from commit c2eaf6c30d930b65a8bcf5f912ef8873a6f4eb20) -Signed-off-by: Romain Naour ---- - libc/sysdeps/linux/sparc/bits/syscalls.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libc/sysdeps/linux/sparc/bits/syscalls.h b/libc/sysdeps/linux/sparc/bits/syscalls.h -index 75af7a157..28edc0568 100644 ---- a/libc/sysdeps/linux/sparc/bits/syscalls.h -+++ b/libc/sysdeps/linux/sparc/bits/syscalls.h -@@ -33,7 +33,7 @@ - register long __g1 __asm__("g1") = sys_num; \ - LOAD_ARGS_##nr(args) \ - __asm__ __volatile__( __SYSCALL_STRING \ -- : "=r" (__res), "=&r" (__o0) \ -+ : "=r" (__res), "=r" (__o0) \ - : "1" (__o0) ASM_ARGS_##nr, "r" (__g1) \ - : __SYSCALL_CLOBBERS ); \ - } \ --- -2.21.0 - diff --git a/buildroot/package/uclibc/0005-PowerPC-sync-with-termios-fix-from-glibc.patch b/buildroot/package/uclibc/0005-PowerPC-sync-with-termios-fix-from-glibc.patch deleted file mode 100644 index f933d43dc..000000000 --- a/buildroot/package/uclibc/0005-PowerPC-sync-with-termios-fix-from-glibc.patch +++ /dev/null @@ -1,172 +0,0 @@ -From 67b3b894517893e94b9eed46f38c5d631b87a200 Mon Sep 17 00:00:00 2001 -From: Adhemerval Zanella -Date: Tue, 20 Aug 2019 23:16:18 +0300 -Subject: [PATCH] PowerPC: Fix termios definitions - -This patch fixes the incorrect guard by __USE_MISC of struct winsize and -struct termio in powerpc termios header. Current states leads to build -failures if the program defines _XOPEN_SOURCE, but not _DEFAULT_SOURCE -or either _BSD_SOURCE or _SVID_SOURCE. Without any definition, -__USE_MISC will not be defined and neither the struct definitions. - -This patch copies the default Linux ioctl-types.h by adjusting only the -character control field (c_cc) size in struct termio. - -Signed-off-by: Vadim Kochan -[Vadim: adopted for uclibc ] ---- - libc/sysdeps/linux/powerpc/bits/ioctl-types.h | 74 ++++++++++++++++++- - libc/sysdeps/linux/powerpc/bits/termios.h | 48 ------------ - 2 files changed, 73 insertions(+), 49 deletions(-) - -diff --git a/libc/sysdeps/linux/powerpc/bits/ioctl-types.h b/libc/sysdeps/linux/powerpc/bits/ioctl-types.h -index 87b8265af..926061fa8 100644 ---- a/libc/sysdeps/linux/powerpc/bits/ioctl-types.h -+++ b/libc/sysdeps/linux/powerpc/bits/ioctl-types.h -@@ -1,5 +1,77 @@ -+/* Structure types for pre-termios terminal ioctls. Linux/powerpc version. -+ Copyright (C) 2014-2019 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library 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. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ - #ifndef _SYS_IOCTL_H - # error "Never use directly; include instead." - #endif - --#include -+/* Get definition of constants for use with `ioctl'. */ -+#include -+ -+ -+struct winsize -+ { -+ unsigned short int ws_row; -+ unsigned short int ws_col; -+ unsigned short int ws_xpixel; -+ unsigned short int ws_ypixel; -+ }; -+ -+#define NCC 10 -+struct termio -+ { -+ unsigned short int c_iflag; /* input mode flags */ -+ unsigned short int c_oflag; /* output mode flags */ -+ unsigned short int c_cflag; /* control mode flags */ -+ unsigned short int c_lflag; /* local mode flags */ -+ unsigned char c_line; /* line discipline */ -+ unsigned char c_cc[NCC]; /* control characters */ -+}; -+ -+/* modem lines */ -+#define TIOCM_LE 0x001 -+#define TIOCM_DTR 0x002 -+#define TIOCM_RTS 0x004 -+#define TIOCM_ST 0x008 -+#define TIOCM_SR 0x010 -+#define TIOCM_CTS 0x020 -+#define TIOCM_CAR 0x040 -+#define TIOCM_RNG 0x080 -+#define TIOCM_DSR 0x100 -+#define TIOCM_CD TIOCM_CAR -+#define TIOCM_RI TIOCM_RNG -+ -+/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ -+ -+/* line disciplines */ -+#define N_TTY 0 -+#define N_SLIP 1 -+#define N_MOUSE 2 -+#define N_PPP 3 -+#define N_STRIP 4 -+#define N_AX25 5 -+#define N_X25 6 /* X.25 async */ -+#define N_6PACK 7 -+#define N_MASC 8 /* Mobitex module */ -+#define N_R3964 9 /* Simatic R3964 module */ -+#define N_PROFIBUS_FDL 10 /* Profibus */ -+#define N_IRDA 11 /* Linux IR */ -+#define N_SMSBLOCK 12 /* SMS block mode */ -+#define N_HDLC 13 /* synchronous HDLC */ -+#define N_SYNC_PPP 14 /* synchronous PPP */ -+#define N_HCI 15 /* Bluetooth HCI UART */ -diff --git a/libc/sysdeps/linux/powerpc/bits/termios.h b/libc/sysdeps/linux/powerpc/bits/termios.h -index ffd99a5e2..83380685f 100644 ---- a/libc/sysdeps/linux/powerpc/bits/termios.h -+++ b/libc/sysdeps/linux/powerpc/bits/termios.h -@@ -256,23 +256,6 @@ struct ltchars { - #define TIOCPKT_NOSTOP 16 - #define TIOCPKT_DOSTOP 32 - --struct winsize { -- unsigned short ws_row; -- unsigned short ws_col; -- unsigned short ws_xpixel; -- unsigned short ws_ypixel; --}; -- --#define NCC 10 --struct termio { -- unsigned short c_iflag; /* input mode flags */ -- unsigned short c_oflag; /* output mode flags */ -- unsigned short c_cflag; /* control mode flags */ -- unsigned short c_lflag; /* local mode flags */ -- unsigned char c_line; /* line discipline */ -- unsigned char c_cc[NCC]; /* control characters */ --}; -- - /* c_cc characters */ - #define _VINTR 0 - #define _VQUIT 1 -@@ -285,36 +268,5 @@ struct termio { - #define _VEOL2 8 - #define _VSWTC 9 - --/* modem lines */ --#define TIOCM_LE 0x001 --#define TIOCM_DTR 0x002 --#define TIOCM_RTS 0x004 --#define TIOCM_ST 0x008 --#define TIOCM_SR 0x010 --#define TIOCM_CTS 0x020 --#define TIOCM_CAR 0x040 --#define TIOCM_RNG 0x080 --#define TIOCM_DSR 0x100 --#define TIOCM_CD TIOCM_CAR --#define TIOCM_RI TIOCM_RNG -- - /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ - #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ -- --/* line disciplines */ --#define N_TTY 0 --#define N_SLIP 1 --#define N_MOUSE 2 --#define N_PPP 3 --#define N_STRIP 4 --#define N_AX25 5 --#define N_X25 6 /* X.25 async */ --#define N_6PACK 7 --#define N_MASC 8 /* Mobitex module */ --#define N_R3964 9 /* Simatic R3964 module */ --#define N_PROFIBUS_FDL 10 /* Profibus */ --#define N_IRDA 11 /* Linux IR */ --#define N_SMSBLOCK 12 /* SMS block mode */ --#define N_HDLC 13 /* synchronous HDLC */ --#define N_SYNC_PPP 14 /* synchronous PPP */ --#define N_HCI 15 /* Bluetooth HCI UART */ --- -2.22.0 - diff --git a/buildroot/package/uclibc/uclibc.hash b/buildroot/package/uclibc/uclibc.hash index d1cbdb6c7..c1f161fa1 100644 --- a/buildroot/package/uclibc/uclibc.hash +++ b/buildroot/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.31/uClibc-ng-1.0.31.tar.xz.sha256 -sha256 2215d7377118434d1697fd575f10d7a6be3f29e460d6b0e1ee9f6f5306288060 uClibc-ng-1.0.31.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.32/uClibc-ng-1.0.32.tar.xz.sha256 +sha256 891b5e4573855e4c11e51d3a518f89a82e490d9aa73280c05ce3e4d7e739a370 uClibc-ng-1.0.32.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/buildroot/package/uclibc/uclibc.mk b/buildroot/package/uclibc/uclibc.mk index afc4872b6..2af666c20 100644 --- a/buildroot/package/uclibc/uclibc.mk +++ b/buildroot/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.31 +UCLIBC_VERSION = 1.0.32 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ @@ -388,7 +388,6 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(UCLIBC_X86_TYPE_CONFIG) $(UCLIBC_DEBUG_CONFIG) $(UCLIBC_ENDIAN_CONFIG) - $(UCLIBC_LARGEFILE_CONFIG) $(UCLIBC_IPV6_CONFIG) $(UCLIBC_FLOAT_CONFIG) $(UCLIBC_SSP_CONFIG) diff --git a/buildroot/package/udftools/0001-pktsetup-pktsetup.c-do-not-include-bits-types.h.patch b/buildroot/package/udftools/0001-pktsetup-pktsetup.c-do-not-include-bits-types.h.patch deleted file mode 100644 index 4d842821a..000000000 --- a/buildroot/package/udftools/0001-pktsetup-pktsetup.c-do-not-include-bits-types.h.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8da4dde42cc25294819ad078432d85437e4a12ee Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 22 Apr 2018 15:05:46 +0200 -Subject: [PATCH] pktsetup/pktsetup.c: do not include - -This header is not a standard header, and is for example not provided -by the musl C library. - -This change has been tested by building udftools against glibc, uClibc -and musl. - -Signed-off-by: Thomas Petazzoni -Upstream-status: https://github.com/pali/udftools/pull/16 ---- - pktsetup/pktsetup.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/pktsetup/pktsetup.c b/pktsetup/pktsetup.c -index 8b3df51..81ed142 100644 ---- a/pktsetup/pktsetup.c -+++ b/pktsetup/pktsetup.c -@@ -27,7 +27,6 @@ - #include - #include - #include --#include - #include - #include - #include --- -2.14.3 - diff --git a/buildroot/package/udftools/0002-configure.ac-detect-readline-via-pkg-config-when-pos.patch b/buildroot/package/udftools/0002-configure.ac-detect-readline-via-pkg-config-when-pos.patch deleted file mode 100644 index f73db99ca..000000000 --- a/buildroot/package/udftools/0002-configure.ac-detect-readline-via-pkg-config-when-pos.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bdacf0101fea1dad2c89996b27cb4b9caee9109c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 22 Apr 2018 22:28:09 +0200 -Subject: [PATCH] configure.ac: detect readline via pkg-config when possible - -pkg-config automatically handles static linking situations, where for -example readline is linked against ncurses, and therefore -lncurses -needs to be passed in addition to -lreadline. - -This proposal uses pkg-config when available. If pkg-config is not -found, or readline is not found via pkg-config, we fallback to the -existing AC_CHECK_LIB(). This AC_CHECK_LIB() test is modified to set -READLINE_LIBS, like PKG_CHECK_MODULES() does. The Makefile.am -consequently uses READLINE_LIBS instead of hardcoding -lreadline. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 14 ++++++++++++-- - wrudf/Makefile.am | 2 +- - 2 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 95fbba3..62b1caa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9,8 +9,18 @@ AC_PROG_CC - AC_DISABLE_SHARED - AM_PROG_LIBTOOL - --dnl Checks for libraries. --AC_CHECK_LIB(readline, readline, [ ], AC_MSG_ERROR([cannot find -lreadline.])) -+PKG_PROG_PKG_CONFIG -+ -+dnl Checks for libraries, by using pkg-config when available -+if test -n "${PKG_CONFIG}" ; then -+ PKG_CHECK_MODULES([READLINE], [readline], [readline_found=yes], [readline_found=no]) -+fi -+ -+if test "${readline_found}" != "yes" ; then -+ AC_CHECK_LIB(readline, readline, -+ [AC_SUBST([READLINE_LIBS], [-lreadline])], -+ AC_MSG_ERROR([cannot find -lreadline.])) -+fi - - dnl Checks for header files. - AC_HEADER_STDC -diff --git a/wrudf/Makefile.am b/wrudf/Makefile.am -index fe1c269..e3ab85b 100644 ---- a/wrudf/Makefile.am -+++ b/wrudf/Makefile.am -@@ -1,5 +1,5 @@ - bin_PROGRAMS = wrudf --wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -+wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la $(READLINE_LIBS) - wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h - - AM_CPPFLAGS = -I$(top_srcdir)/include -D_GNU_SOURCE -DDEBUG --- -2.14.3 - diff --git a/buildroot/package/udftools/0003-Include-sys-sysmacros-h-to-prevent-build-breakage-with-glibc-2-25.patch b/buildroot/package/udftools/0003-Include-sys-sysmacros-h-to-prevent-build-breakage-with-glibc-2-25.patch deleted file mode 100644 index ac56715d6..000000000 --- a/buildroot/package/udftools/0003-Include-sys-sysmacros-h-to-prevent-build-breakage-with-glibc-2-25.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cca194f17fe2892c929acab2f1d5016ad38aa305 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Tue, 2 Jan 2018 15:10:34 +0100 -Subject: [PATCH] Include to prevent build breakage with - >=glibc-2.25 - -libtool: link: x86_64-pc-linux-gnu-gcc -march=native -mtune=native -O2 --pipe -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -Wl,--as-needed -o -mkudffs main.o mkudffs.o defaults.o file.o options.o -../libudffs/.libs/libudffs.a -main.o: In function `is_whole_disk': -main.c:(.text+0x2ce): undefined reference to `major' -main.c:(.text+0x2dd): undefined reference to `minor' -main.o: In function `main': -main.c:(.text.startup+0x72f): undefined reference to `minor' -main.c:(.text.startup+0x741): undefined reference to `major' -collect2: error: ld returned 1 exit status -make[1]: *** [Makefile:378: mkudffs] Error 1 - -Signed-off-by: Fabrice Fontaine -[Retrieved from -https://github.com/pali/udftools/commit/cca194f17fe2892c929acab2f1d5016ad38aa305] ---- - mkudffs/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mkudffs/main.c b/mkudffs/main.c -index 066afac..3e306ac 100644 ---- a/mkudffs/main.c -+++ b/mkudffs/main.c -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - - #include "mkudffs.h" - #include "defaults.h" diff --git a/buildroot/package/udftools/udftools.hash b/buildroot/package/udftools/udftools.hash index 837a51572..630a3427e 100644 --- a/buildroot/package/udftools/udftools.hash +++ b/buildroot/package/udftools/udftools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 67fe428d452901215cfad8049d250540c97114b1a20dd63277b91c2c4fae8292 udftools-2.0.tar.gz +sha256 d67ce203d71d828619d6d3791ab33eefab4bc506e0ee73355ab6c2f91d52448e udftools-2.2.tar.gz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/buildroot/package/udftools/udftools.mk b/buildroot/package/udftools/udftools.mk index e5bf59137..db7c13cc7 100644 --- a/buildroot/package/udftools/udftools.mk +++ b/buildroot/package/udftools/udftools.mk @@ -4,11 +4,10 @@ # ################################################################################ -UDFTOOLS_VERSION = 2.0 +UDFTOOLS_VERSION = 2.2 UDFTOOLS_SITE = https://github.com/pali/udftools/releases/download/$(UDFTOOLS_VERSION) UDFTOOLS_LICENSE = GPL-2.0+ UDFTOOLS_LICENSE_FILES = COPYING -UDFTOOLS_AUTORECONF = YES UDFTOOLS_DEPENDENCIES = readline host-pkgconf $(eval $(autotools-package)) diff --git a/buildroot/package/udisks/Config.in b/buildroot/package/udisks/Config.in index c1e5538fb..04a632dd8 100644 --- a/buildroot/package/udisks/Config.in +++ b/buildroot/package/udisks/Config.in @@ -1,11 +1,16 @@ config BR2_PACKAGE_UDISKS bool "udisks" + depends on BR2_ENABLE_LOCALE # parted + depends on BR2_HOST_GCC_AT_LEAST_4_9 # spidermonkey + depends on BR2_INSTALL_LIBSTDCPP # spidermonkey depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2 - depends on BR2_TOOLCHAIN_USES_GLIBC # polkit, lvm2 + depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS # spidermonkey + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # spidermonkey + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # polkit depends on BR2_USE_MMU # lvm2 - depends on !BR2_STATIC_LIBS # lvm2 depends on BR2_USE_WCHAR # dbus-glib -> glib2 + depends on !BR2_TOOLCHAIN_USES_UCLIBC # polkit, lvm2, parted + depends on !BR2_STATIC_LIBS # lvm2, spidermonkey select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_SG3_UTILS @@ -30,17 +35,28 @@ if BR2_PACKAGE_UDISKS config BR2_PACKAGE_UDISKS_LVM2 bool "lvm2 support" + # The lvm app library can't compile against musl + depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LVM2_APP_LIBRARY help Enable LVM2 support +comment "lvm2 support needs a glibc toolchain" + depends on !BR2_TOOLCHAIN_USES_GLIBC + endif comment "udisks needs udev /dev management" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV -comment "udisks needs a glibc toolchain w/ wchar, threads, dynamic library" +comment "udisks needs a glibc or musl toolchain with locale, C++, wchar, dynamic library, NPTL, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS + depends on !BR2_ENABLE_LOCALE || BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_INSTALL_LIBSTDCPP || \ + BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + !BR2_HOST_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_USE_WCHAR diff --git a/buildroot/package/udisks/udisks.hash b/buildroot/package/udisks/udisks.hash index 7ad4326b1..b40161e32 100644 --- a/buildroot/package/udisks/udisks.hash +++ b/buildroot/package/udisks/udisks.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 udisks-1.0.5.tar.gz +sha256 7d30f41a79a9b453b4972a6d7e3425ff104b39232891bde8ba659f1adb21f771 COPYING diff --git a/buildroot/package/udpcast/udpcast.hash b/buildroot/package/udpcast/udpcast.hash index 133e1db80..a70aa7198 100644 --- a/buildroot/package/udpcast/udpcast.hash +++ b/buildroot/package/udpcast/udpcast.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 ce9090ef80b6035a744a9b5ac335e61c99baa92c39ff53277266fbfcb836445a udpcast-20120424.tar.gz +sha256 ce9090ef80b6035a744a9b5ac335e61c99baa92c39ff53277266fbfcb836445a udpcast-20120424.tar.gz +sha256 422befd3503b1f39a6027017f639874c1f274e37ec60ba3174894646b584ccbc COPYING diff --git a/buildroot/package/udpxy/udpxy.hash b/buildroot/package/udpxy/udpxy.hash index 4042a41dd..8455fcdb1 100644 --- a/buildroot/package/udpxy/udpxy.hash +++ b/buildroot/package/udpxy/udpxy.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 6ce33b1d14a1aeab4bd2566aca112e41943df4d002a7678d9a715108e6b714bd udpxy.1.0.23-9-prod.tar.gz +sha256 6ce33b1d14a1aeab4bd2566aca112e41943df4d002a7678d9a715108e6b714bd udpxy.1.0.23-9-prod.tar.gz +sha256 60ead3913246c7cd930fe653c0053aba1af2cd9f82b266befdbbd6e0b8ecb750 README diff --git a/buildroot/package/uftp/Config.in b/buildroot/package/uftp/Config.in new file mode 100644 index 000000000..b88fb03ae --- /dev/null +++ b/buildroot/package/uftp/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_UFTP + bool "uftp" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + help + Encrypted UDP based FTP with multicast. + + http://uftp-multicast.sourceforge.net/ + +comment "uftp needs a toolchain w/ threads, wchar" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/buildroot/package/uftp/uftp.hash b/buildroot/package/uftp/uftp.hash new file mode 100644 index 000000000..149743001 --- /dev/null +++ b/buildroot/package/uftp/uftp.hash @@ -0,0 +1,3 @@ +# Locally computed sha256 +sha256 91ba8aae80c7c9ccaf04600b628cbeca4699ed48268fe43d2bf539a41083f292 uftp-4.10.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.txt diff --git a/buildroot/package/uftp/uftp.mk b/buildroot/package/uftp/uftp.mk new file mode 100644 index 000000000..cfef1f9e3 --- /dev/null +++ b/buildroot/package/uftp/uftp.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# uftp +# +################################################################################ + +UFTP_VERSION = 4.10 +UFTP_SITE = http://sourceforge.net/projects/uftp-multicast/files/source-tar +UFTP_LICENSE = GPL-3.0+ +UFTP_LICENSE_FILES = LICENSE.txt + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +UFTP_DEPENDENCIES += host-pkgconf openssl +UFTP_MAKE_OPTS += CRYPT_LIB="`$(PKG_CONFIG_HOST_BINARY) --libs libcrypto`" +else +UFTP_MAKE_OPTS += NO_ENCRYPTION=1 +endif + +define UFTP_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(UFTP_MAKE_OPTS) +endef + +define UFTP_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(UFTP_MAKE_OPTS) \ + DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/uhttpd/uhttpd.hash b/buildroot/package/uhttpd/uhttpd.hash index 7e09f1808..e8bdb0bb6 100644 --- a/buildroot/package/uhttpd/uhttpd.hash +++ b/buildroot/package/uhttpd/uhttpd.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 9325c95c9bb1c51bf135700a65738884fa9cd548ff8166c8b61fdbf99825cd6d uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82.tar.gz +sha256 9325c95c9bb1c51bf135700a65738884fa9cd548ff8166c8b61fdbf99825cd6d uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82.tar.gz +sha256 2a61a8a690e7646a4bfe4261bf77c49f47588db5fc234b3cc66809dcc0cb3985 uhttpd.h diff --git a/buildroot/package/uhubctl/uhubctl.hash b/buildroot/package/uhubctl/uhubctl.hash index 3724f3fbf..255f7aa11 100644 --- a/buildroot/package/uhubctl/uhubctl.hash +++ b/buildroot/package/uhubctl/uhubctl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4c31278b2c03e5be5a696c3088bc86cf2557a70e00f697799c163aba18e3c40e uhubctl-v2.0.0.tar.gz -sha256 3260a6cd23e2677be1fa0815785cd5fa499d363a033f58cc299e12220662d486 LICENSE +sha256 227fdd541067b84eaa0e15cdc171458a56de7591f7a1deaff3e6d42d2809450b uhubctl-2.1.0.tar.gz +sha256 05d376f74b3b539e2758d2b8a4bef5b15e567350d19c8581b5344bf4ce84414a LICENSE diff --git a/buildroot/package/uhubctl/uhubctl.mk b/buildroot/package/uhubctl/uhubctl.mk index 3d2adb347..da217a7bd 100644 --- a/buildroot/package/uhubctl/uhubctl.mk +++ b/buildroot/package/uhubctl/uhubctl.mk @@ -4,8 +4,8 @@ # ################################################################################ -UHUBCTL_VERSION = v2.0.0 -UHUBCTL_SITE = $(call github,mvp,uhubctl,$(UHUBCTL_VERSION)) +UHUBCTL_VERSION = 2.1.0 +UHUBCTL_SITE = $(call github,mvp,uhubctl,v$(UHUBCTL_VERSION)) UHUBCTL_LICENSE = GPL-2.0 UHUBCTL_LICENSE_FILES = LICENSE UHUBCTL_DEPENDENCIES = libusb diff --git a/buildroot/package/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch b/buildroot/package/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch deleted file mode 100644 index c7b284a0a..000000000 --- a/buildroot/package/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 8a6ddd1cb2b55c234f1a97f7e5d996f24f46b6f8 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 17:43:23 +0200 -Subject: [PATCH] ulogd: Use /dev/null as dummy logfile when logging to - syslog - -Fixes compilation error with musl libc: - -ulogd.c:86:13: error: storage size of 'syslog_dummy' isn't known - static FILE syslog_dummy; - -Signed-off-by: Felix Janda -[Rahul Bedarkar: Backported from https://git.netfilter.org/ulogd2/commit/?id=8a6ddd1cb2b55c234f1a97f7e5d996f24f46b6f8] -Signed-off-by: Rahul Bedarkar ---- - src/ulogd.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/ulogd.c b/src/ulogd.c -index e7cde39..958c30a 100644 ---- a/src/ulogd.c -+++ b/src/ulogd.c -@@ -83,7 +83,7 @@ static char *ulogd_logfile = NULL; - static const char *ulogd_configfile = ULOGD_CONFIGFILE; - static const char *ulogd_pidfile = NULL; - static int ulogd_pidfile_fd = -1; --static FILE syslog_dummy; -+static FILE *syslog_dummy; - - static int info_mode = 0; - -@@ -427,7 +427,7 @@ void __ulogd_log(int level, char *file, int line, const char *format, ...) - if (level < loglevel_ce.u.value) - return; - -- if (logfile == &syslog_dummy) { -+ if (logfile == syslog_dummy) { - /* FIXME: this omits the 'file' string */ - va_start(ap, format); - vsyslog(ulogd2syslog_level(level), format, ap); -@@ -950,7 +950,7 @@ static int logfile_open(const char *name) - logfile = stdout; - } else if (!strcmp(name, "syslog")) { - openlog("ulogd", LOG_PID, LOG_DAEMON); -- logfile = &syslog_dummy; -+ logfile = syslog_dummy = fopen("/dev/null", "w"); - } else { - logfile = fopen(ulogd_logfile, "a"); - if (!logfile) { -@@ -1240,7 +1240,7 @@ static void sigterm_handler(int signal) - unload_plugins(); - #endif - -- if (logfile != NULL && logfile != stdout && logfile != &syslog_dummy) { -+ if (logfile != NULL && logfile != stdout) { - fclose(logfile); - logfile = NULL; - } -@@ -1262,7 +1262,7 @@ static void signal_handler(int signal) - switch (signal) { - case SIGHUP: - /* reopen logfile */ -- if (logfile != stdout && logfile != &syslog_dummy) { -+ if (logfile != stdout && logfile != syslog_dummy) { - fclose(logfile); - logfile = fopen(ulogd_logfile, "a"); - if (!logfile) { --- -2.6.2 - diff --git a/buildroot/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch b/buildroot/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch new file mode 100644 index 000000000..af6e13648 --- /dev/null +++ b/buildroot/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch @@ -0,0 +1,32 @@ +From 675e762091380590f78ff07a94a25caa459b786b Mon Sep 17 00:00:00 2001 +From: Cameron Norman +Date: Sat, 27 Oct 2018 13:05:45 -0700 +Subject: ulogd: fix build with musl libc + +The attached patch fixes building ulogd2 with musl libc. It is being +used on Void Linux right now. + +Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1278 +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Fabrice Fontaine +[Retrrieved from: +https://git.netfilter.org/ulogd2/commit/?id=675e762091380590f78ff07a94a25caa459b786b] +--- + src/ulogd.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ulogd.c b/src/ulogd.c +index b8bc57c..9cd64e8 100644 +--- a/src/ulogd.c ++++ b/src/ulogd.c +@@ -65,6 +65,7 @@ + #include + #include + #include ++#include + #include + #include + #ifdef DEBUG +-- +cgit v1.2.1 + diff --git a/buildroot/package/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch b/buildroot/package/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch deleted file mode 100644 index 0fbef834e..000000000 --- a/buildroot/package/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 89263555143e3c0125320ca565b41805f27460c9 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 15:44:32 +0200 -Subject: [PATCH] Define _GNU_SOURCE to get members of tcphdr - -The source uses linux names for members of tcphdr. For example -"source" instead of "th_sport", ... musl libc's headers need -_GNU_SOURCE defined in order to expose these. - -Signed-off-by: Felix Janda -[Rahul Bedarkar: Backported from https://git.netfilter.org/ulogd2/commit/?id=89263555143e3c0125320ca565b41805f27460c9] -Signed-off-by: Rahul Bedarkar ---- - filter/raw2packet/ulogd_raw2packet_BASE.c | 1 + - filter/ulogd_filter_PWSNIFF.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c -index c9d5227..ad894fc 100644 ---- a/filter/raw2packet/ulogd_raw2packet_BASE.c -+++ b/filter/raw2packet/ulogd_raw2packet_BASE.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#define _GNU_SOURCE - #include - #include - #include -diff --git a/filter/ulogd_filter_PWSNIFF.c b/filter/ulogd_filter_PWSNIFF.c -index 5169eee..a3e2b42 100644 ---- a/filter/ulogd_filter_PWSNIFF.c -+++ b/filter/ulogd_filter_PWSNIFF.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#define _GNU_SOURCE - #include - #include - --- -2.6.2 - diff --git a/buildroot/package/ulogd/0003-Use-stdint-types-everywhere.patch b/buildroot/package/ulogd/0003-Use-stdint-types-everywhere.patch deleted file mode 100644 index 66408d6d0..000000000 --- a/buildroot/package/ulogd/0003-Use-stdint-types-everywhere.patch +++ /dev/null @@ -1,792 +0,0 @@ -From c9337b31f756cae85299c8275b21088ce02885e2 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Wed, 24 Jun 2015 19:53:34 +0200 -Subject: [PATCH] Use stdint types everywhere - -Signed-off-by: Felix Janda -[Rahul Bedarkar: - - backported from https://git.netfilter.org/ulogd2/commit/?id=c9337b31f756cae85299c8275b21088ce02885e2 - - remove hunk for output/ulogd_output_IPFIX.c as file doesn't exist in version we use] -Signed-off-by: Rahul Bedarkar ---- - filter/raw2packet/ulogd_raw2packet_BASE.c | 35 +++++++++++++------------- - filter/ulogd_filter_HWHDR.c | 6 ++--- - filter/ulogd_filter_IP2HBIN.c | 4 +-- - filter/ulogd_filter_IP2STR.c | 2 +- - filter/ulogd_filter_MARK.c | 4 +-- - filter/ulogd_filter_PWSNIFF.c | 4 +-- - include/libipulog/libipulog.h | 7 +++--- - include/ulogd/addr.h | 4 ++- - include/ulogd/conffile.h | 10 ++++---- - include/ulogd/ipfix_protocol.h | 38 +++++++++++++++------------- - include/ulogd/ulogd.h | 42 +++++++++++++++---------------- - input/packet/ulogd_inppkt_NFLOG.c | 16 ++++++------ - input/packet/ulogd_inppkt_UNIXSOCK.c | 34 ++++++++++++------------- - libipulog/libipulog.c | 8 +++--- - output/mysql/ulogd_output_MYSQL.c | 2 +- - output/ulogd_output_IPFIX.c | 20 +++++++-------- - src/addr.c | 4 +-- - util/db.c | 2 +- - util/printpkt.c | 6 ++--- - 19 files changed, 126 insertions(+), 122 deletions(-) - -diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c -index ad894fc..8a6180c 100644 ---- a/filter/raw2packet/ulogd_raw2packet_BASE.c -+++ b/filter/raw2packet/ulogd_raw2packet_BASE.c -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - enum input_keys { - INKEY_RAW_PCKT, -@@ -538,7 +539,7 @@ static struct ulogd_key iphdr_rets[] = { - ***********************************************************************/ - - static int _interp_tcp(struct ulogd_pluginstance *pi, struct tcphdr *tcph, -- u_int32_t len) -+ uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - -@@ -573,7 +574,7 @@ static int _interp_tcp(struct ulogd_pluginstance *pi, struct tcphdr *tcph, - ***********************************************************************/ - - static int _interp_udp(struct ulogd_pluginstance *pi, struct udphdr *udph, -- u_int32_t len) -+ uint32_t len) - - { - struct ulogd_key *ret = pi->output.keys; -@@ -602,7 +603,7 @@ typedef struct sctphdr { - } __attribute__((packed)) sctp_sctphdr_t; - - static int _interp_sctp(struct ulogd_pluginstance *pi, struct sctphdr *sctph, -- u_int32_t len) -+ uint32_t len) - - { - struct ulogd_key *ret = pi->output.keys; -@@ -625,7 +626,7 @@ static int _interp_sctp(struct ulogd_pluginstance *pi, struct sctphdr *sctph, - ***********************************************************************/ - - static int _interp_icmp(struct ulogd_pluginstance *pi, struct icmphdr *icmph, -- u_int32_t len) -+ uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - -@@ -663,7 +664,7 @@ static int _interp_icmp(struct ulogd_pluginstance *pi, struct icmphdr *icmph, - ***********************************************************************/ - - static int _interp_icmpv6(struct ulogd_pluginstance *pi, struct icmp6_hdr *icmph, -- u_int32_t len) -+ uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - -@@ -691,7 +692,7 @@ static int _interp_icmpv6(struct ulogd_pluginstance *pi, struct icmp6_hdr *icmph - * IPSEC HEADER - ***********************************************************************/ - static int _interp_ahesp(struct ulogd_pluginstance *pi, void *protoh, -- u_int32_t len) -+ uint32_t len) - { - #if 0 - struct ulogd_key *ret = pi->output.keys; -@@ -711,14 +712,14 @@ static int _interp_ahesp(struct ulogd_pluginstance *pi, void *protoh, - * IP HEADER - ***********************************************************************/ - --static int _interp_iphdr(struct ulogd_pluginstance *pi, u_int32_t len) -+static int _interp_iphdr(struct ulogd_pluginstance *pi, uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - struct iphdr *iph = - ikey_get_ptr(&pi->input.keys[INKEY_RAW_PCKT]); -- void *nexthdr = (u_int32_t *)iph + iph->ihl; -+ void *nexthdr = (uint32_t *)iph + iph->ihl; - -- if (len < sizeof(struct iphdr) || len <= (u_int32_t)(iph->ihl * 4)) -+ if (len < sizeof(struct iphdr) || len <= (uint32_t)(iph->ihl * 4)) - return ULOGD_IRET_OK; - len -= iph->ihl * 4; - -@@ -759,7 +760,7 @@ static int _interp_iphdr(struct ulogd_pluginstance *pi, u_int32_t len) - * IPv6 HEADER - ***********************************************************************/ - --static int ip6_ext_hdr(u_int8_t nexthdr) -+static int ip6_ext_hdr(uint8_t nexthdr) - { - switch (nexthdr) { - case IPPROTO_HOPOPTS: -@@ -774,12 +775,12 @@ static int ip6_ext_hdr(u_int8_t nexthdr) - } - } - --static int _interp_ipv6hdr(struct ulogd_pluginstance *pi, u_int32_t len) -+static int _interp_ipv6hdr(struct ulogd_pluginstance *pi, uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - struct ip6_hdr *ipv6h = ikey_get_ptr(&pi->input.keys[INKEY_RAW_PCKT]); - unsigned int ptr, hdrlen = 0; -- u_int8_t curhdr; -+ uint8_t curhdr; - int fragment = 0; - - if (len < sizeof(struct ip6_hdr)) -@@ -889,7 +890,7 @@ out: - /*********************************************************************** - * ARP HEADER - ***********************************************************************/ --static int _interp_arp(struct ulogd_pluginstance *pi, u_int32_t len) -+static int _interp_arp(struct ulogd_pluginstance *pi, uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - const struct ether_arp *arph = -@@ -914,9 +915,9 @@ static int _interp_arp(struct ulogd_pluginstance *pi, u_int32_t len) - * ETHER HEADER - ***********************************************************************/ - --static int _interp_bridge(struct ulogd_pluginstance *pi, u_int32_t len) -+static int _interp_bridge(struct ulogd_pluginstance *pi, uint32_t len) - { -- const u_int16_t proto = -+ const uint16_t proto = - ikey_get_u16(&pi->input.keys[INKEY_OOB_PROTOCOL]); - - switch (proto) { -@@ -938,8 +939,8 @@ static int _interp_bridge(struct ulogd_pluginstance *pi, u_int32_t len) - - static int _interp_pkt(struct ulogd_pluginstance *pi) - { -- u_int32_t len = ikey_get_u32(&pi->input.keys[INKEY_RAW_PCKTLEN]); -- u_int8_t family = ikey_get_u8(&pi->input.keys[INKEY_OOB_FAMILY]); -+ uint32_t len = ikey_get_u32(&pi->input.keys[INKEY_RAW_PCKTLEN]); -+ uint8_t family = ikey_get_u8(&pi->input.keys[INKEY_OOB_FAMILY]); - struct ulogd_key *ret = pi->output.keys; - - okey_set_u16(&ret[KEY_OOB_PROTOCOL], -diff --git a/filter/ulogd_filter_HWHDR.c b/filter/ulogd_filter_HWHDR.c -index 3b095c9..10c95c4 100644 ---- a/filter/ulogd_filter_HWHDR.c -+++ b/filter/ulogd_filter_HWHDR.c -@@ -143,10 +143,10 @@ static void *hwhdr_get_daddr(struct ulogd_key *inp) - return ikey_get_ptr(&inp[KEY_RAW_MAC]); - } - --static u_int16_t hwhdr_get_len(struct ulogd_key *inp) -+static uint16_t hwhdr_get_len(struct ulogd_key *inp) - { - void *len = ikey_get_ptr(&inp[KEY_RAW_MAC]) + 2 * ETH_ALEN; -- return ntohs(*(u_int16_t *) len); -+ return ntohs(*(uint16_t *) len); - } - static int parse_ethernet(struct ulogd_key *ret, struct ulogd_key *inp) - { -@@ -171,7 +171,7 @@ static int interp_mac2str(struct ulogd_pluginstance *pi) - { - struct ulogd_key *ret = pi->output.keys; - struct ulogd_key *inp = pi->input.keys; -- u_int16_t type = 0; -+ uint16_t type = 0; - - if (pp_is_valid(inp, KEY_OOB_PROTOCOL)) - okey_set_u16(&ret[KEY_MAC_PROTOCOL], -diff --git a/filter/ulogd_filter_IP2HBIN.c b/filter/ulogd_filter_IP2HBIN.c -index 4fd3ff1..087e824 100644 ---- a/filter/ulogd_filter_IP2HBIN.c -+++ b/filter/ulogd_filter_IP2HBIN.c -@@ -116,8 +116,8 @@ static int interp_ip2hbin(struct ulogd_pluginstance *pi) - { - struct ulogd_key *ret = pi->output.keys; - struct ulogd_key *inp = pi->input.keys; -- u_int8_t family = ikey_get_u8(&inp[KEY_OOB_FAMILY]); -- u_int8_t convfamily = family; -+ uint8_t family = ikey_get_u8(&inp[KEY_OOB_FAMILY]); -+ uint8_t convfamily = family; - int i; - - switch (family) { -diff --git a/filter/ulogd_filter_IP2STR.c b/filter/ulogd_filter_IP2STR.c -index 732e1ef..66324b0 100644 ---- a/filter/ulogd_filter_IP2STR.c -+++ b/filter/ulogd_filter_IP2STR.c -@@ -168,7 +168,7 @@ static int ip2str(struct ulogd_key *inp, int index, int oindex) - } - - switch (convfamily) { -- u_int32_t ip; -+ uint32_t ip; - case AF_INET6: - inet_ntop(AF_INET6, - ikey_get_u128(&inp[index]), -diff --git a/filter/ulogd_filter_MARK.c b/filter/ulogd_filter_MARK.c -index 7807f63..149725d 100644 ---- a/filter/ulogd_filter_MARK.c -+++ b/filter/ulogd_filter_MARK.c -@@ -73,14 +73,14 @@ static int interp_mark(struct ulogd_pluginstance *pi) - if (pp_is_valid(inp, KEY_CT_MARK)) { - if ((ikey_get_u32(&inp[KEY_CT_MARK]) & - pi->config_kset->ces[MARK_MASK].u.value) != -- (u_int32_t) pi->config_kset->ces[MARK_MARK].u.value -+ (uint32_t) pi->config_kset->ces[MARK_MARK].u.value - ) { - return ULOGD_IRET_STOP; - } - } else if (pp_is_valid(inp, KEY_OOB_MARK)) { - if ((ikey_get_u32(&inp[KEY_OOB_MARK]) & - pi->config_kset->ces[MARK_MASK].u.value) != -- (u_int32_t) pi->config_kset->ces[MARK_MARK].u.value -+ (uint32_t) pi->config_kset->ces[MARK_MARK].u.value - ) { - return ULOGD_IRET_STOP; - } -diff --git a/filter/ulogd_filter_PWSNIFF.c b/filter/ulogd_filter_PWSNIFF.c -index a3e2b42..934ff0e 100644 ---- a/filter/ulogd_filter_PWSNIFF.c -+++ b/filter/ulogd_filter_PWSNIFF.c -@@ -39,7 +39,7 @@ - #define PORT_POP3 110 - #define PORT_FTP 21 - --static u_int16_t pwsniff_ports[] = { -+static uint16_t pwsniff_ports[] = { - PORT_POP3, - PORT_FTP, - /* feel free to include any other ports here, provided that their -@@ -72,7 +72,7 @@ static int interp_pwsniff(struct ulogd_pluginstance *pi) - return ULOGD_IRET_STOP; - - iph = (struct iphdr *) pi->input.keys[0].u.value.ptr; -- protoh = (u_int32_t *)iph + iph->ihl; -+ protoh = (uint32_t *)iph + iph->ihl; - tcph = protoh; - tcplen = ntohs(iph->tot_len) - iph->ihl * 4; - -diff --git a/include/libipulog/libipulog.h b/include/libipulog/libipulog.h -index b3c9616..21b4315 100644 ---- a/include/libipulog/libipulog.h -+++ b/include/libipulog/libipulog.h -@@ -4,10 +4,9 @@ - #include - #include - #include --#include - #include - #include --#include -+#include - #include - #include - #include -@@ -20,9 +19,9 @@ - struct ipulog_handle; - extern int ipulog_errno; - --u_int32_t ipulog_group2gmask(u_int32_t group); -+uint32_t ipulog_group2gmask(uint32_t group); - --struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, u_int32_t rmem); -+struct ipulog_handle *ipulog_create_handle(uint32_t gmask, uint32_t rmem); - - void ipulog_destroy_handle(struct ipulog_handle *h); - -diff --git a/include/ulogd/addr.h b/include/ulogd/addr.h -index b4432e3..2259b6c 100644 ---- a/include/ulogd/addr.h -+++ b/include/ulogd/addr.h -@@ -8,7 +8,9 @@ - #ifndef _ADDR_H - #define _ADDR_H - --u_int32_t ulogd_bits2netmask(int bits); -+#include -+ -+uint32_t ulogd_bits2netmask(int bits); - void ulogd_ipv6_cidr2mask_host(uint8_t cidr, uint32_t *res); - void ulogd_ipv6_addr2addr_host(uint32_t *addr, uint32_t *res); - -diff --git a/include/ulogd/conffile.h b/include/ulogd/conffile.h -index 69a6f70..1f3d563 100644 ---- a/include/ulogd/conffile.h -+++ b/include/ulogd/conffile.h -@@ -7,7 +7,7 @@ - #ifndef _CONFFILE_H - #define _CONFFILE_H - --#include -+#include - - /* errors returned by config functions */ - enum { -@@ -45,10 +45,10 @@ enum { - - struct config_entry { - char key[CONFIG_KEY_LEN]; /* name of config directive */ -- u_int8_t type; /* type; see above */ -- u_int8_t options; /* options; see above */ -- u_int8_t hit; /* found? */ -- u_int8_t flag; /* tune setup of option */ -+ uint8_t type; /* type; see above */ -+ uint8_t options; /* options; see above */ -+ uint8_t hit; /* found? */ -+ uint8_t flag; /* tune setup of option */ - union { - char string[CONFIG_VAL_STRING_LEN]; - int value; -diff --git a/include/ulogd/ipfix_protocol.h b/include/ulogd/ipfix_protocol.h -index 5d7e46a..aef47f0 100644 ---- a/include/ulogd/ipfix_protocol.h -+++ b/include/ulogd/ipfix_protocol.h -@@ -1,6 +1,8 @@ - #ifndef _IPFIX_PROTOCOL_H - #define _IPFIX_PROTOCOL_H - -+#include -+ - /* This header file defines structures for the IPFIX protocol in accordance with - * draft-ietf-ipfix-protocol-19.txt */ - -@@ -11,29 +13,29 @@ - - /* Section 3.1 */ - struct ipfix_msg_hdr { -- u_int16_t version; -- u_int16_t length; -- u_int32_t export_time; -- u_int32_t seq; -- u_int32_t source_id; -+ uint16_t version; -+ uint16_t length; -+ uint32_t export_time; -+ uint32_t seq; -+ uint32_t source_id; - }; - - /* Section 3.4.1 */ - struct ipfix_templ_rec_hdr { -- u_int16_t templ_id; -- u_int16_t field_count; -+ uint16_t templ_id; -+ uint16_t field_count; - }; - - /* Section 3.2 */ - struct ipfix_ietf_field { -- u_int16_t type; -- u_int16_t length; -+ uint16_t type; -+ uint16_t length; - }; - - struct ipfix_vendor_field { -- u_int16_t type; -- u_int16_t length; -- u_int32_t enterprise_num; -+ uint16_t type; -+ uint16_t length; -+ uint32_t enterprise_num; - }; - - /* Information Element Identifiers as of draft-ietf-ipfix-info-11.txt */ -@@ -219,13 +221,13 @@ enum { - /* Information elements of the netfilter vendor id */ - enum { - IPFIX_NF_rawpacket = 1, /* pointer */ -- IPFIX_NF_rawpacket_length = 2, /* u_int32_t */ -+ IPFIX_NF_rawpacket_length = 2, /* uint32_t */ - IPFIX_NF_prefix = 3, /* string */ -- IPFIX_NF_mark = 4, /* u_int32_t */ -- IPFIX_NF_hook = 5, /* u_int8_t */ -- IPFIX_NF_conntrack_id = 6, /* u_int32_t */ -- IPFIX_NF_seq_local = 7, /* u_int32_t */ -- IPFIX_NF_seq_global = 8, /* u_int32_t */ -+ IPFIX_NF_mark = 4, /* uint32_t */ -+ IPFIX_NF_hook = 5, /* uint8_t */ -+ IPFIX_NF_conntrack_id = 6, /* uint32_t */ -+ IPFIX_NF_seq_local = 7, /* uint32_t */ -+ IPFIX_NF_seq_global = 8, /* uint32_t */ - }; - - #endif -diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h -index cf26a15..2e38195 100644 ---- a/include/ulogd/ulogd.h -+++ b/include/ulogd/ulogd.h -@@ -85,17 +85,17 @@ enum ulogd_dtype { - /* structure describing an input / output parameter of a plugin */ - struct ulogd_key { - /* length of the returned value (only for lengthed types */ -- u_int32_t len; -+ uint32_t len; - /* type of the returned value (ULOGD_DTYPE_...) */ -- u_int16_t type; -+ uint16_t type; - /* flags (i.e. free, ...) */ -- u_int16_t flags; -+ uint16_t flags; - /* name of this key */ - char name[ULOGD_MAX_KEYLEN+1]; - /* IETF IPFIX attribute ID */ - struct { -- u_int32_t vendor; -- u_int16_t field_id; -+ uint32_t vendor; -+ uint16_t field_id; - } ipfix; - - /* Store field name for Common Information Model */ -@@ -104,12 +104,12 @@ struct ulogd_key { - union { - /* and finally the returned value */ - union { -- u_int8_t b; -- u_int8_t ui8; -- u_int16_t ui16; -- u_int32_t ui32; -- u_int64_t ui64; -- u_int32_t ui128[4]; -+ uint8_t b; -+ uint8_t ui8; -+ uint16_t ui16; -+ uint32_t ui32; -+ uint64_t ui64; -+ uint32_t ui128[4]; - int8_t i8; - int16_t i16; - int32_t i32; -@@ -130,31 +130,31 @@ struct ulogd_keyset { - unsigned int type; - }; - --static inline void okey_set_b(struct ulogd_key *key, u_int8_t value) -+static inline void okey_set_b(struct ulogd_key *key, uint8_t value) - { - key->u.value.b = value; - key->flags |= ULOGD_RETF_VALID; - } - --static inline void okey_set_u8(struct ulogd_key *key, u_int8_t value) -+static inline void okey_set_u8(struct ulogd_key *key, uint8_t value) - { - key->u.value.ui8 = value; - key->flags |= ULOGD_RETF_VALID; - } - --static inline void okey_set_u16(struct ulogd_key *key, u_int16_t value) -+static inline void okey_set_u16(struct ulogd_key *key, uint16_t value) - { - key->u.value.ui16 = value; - key->flags |= ULOGD_RETF_VALID; - } - --static inline void okey_set_u32(struct ulogd_key *key, u_int32_t value) -+static inline void okey_set_u32(struct ulogd_key *key, uint32_t value) - { - key->u.value.ui32 = value; - key->flags |= ULOGD_RETF_VALID; - } - --static inline void okey_set_u64(struct ulogd_key *key, u_int64_t value) -+static inline void okey_set_u64(struct ulogd_key *key, uint64_t value) - { - key->u.value.ui64 = value; - key->flags |= ULOGD_RETF_VALID; -@@ -172,22 +172,22 @@ static inline void okey_set_ptr(struct ulogd_key *key, void *value) - key->flags |= ULOGD_RETF_VALID; - } - --static inline u_int8_t ikey_get_u8(struct ulogd_key *key) -+static inline uint8_t ikey_get_u8(struct ulogd_key *key) - { - return key->u.source->u.value.ui8; - } - --static inline u_int16_t ikey_get_u16(struct ulogd_key *key) -+static inline uint16_t ikey_get_u16(struct ulogd_key *key) - { - return key->u.source->u.value.ui16; - } - --static inline u_int32_t ikey_get_u32(struct ulogd_key *key) -+static inline uint32_t ikey_get_u32(struct ulogd_key *key) - { - return key->u.source->u.value.ui32; - } - --static inline u_int64_t ikey_get_u64(struct ulogd_key *key) -+static inline uint64_t ikey_get_u64(struct ulogd_key *key) - { - return key->u.source->u.value.ui64; - } -@@ -292,7 +292,7 @@ void ulogd_propagate_results(struct ulogd_pluginstance *pi); - void ulogd_register_plugin(struct ulogd_plugin *me); - - /* allocate a new ulogd_key */ --struct ulogd_key *alloc_ret(const u_int16_t type, const char*); -+struct ulogd_key *alloc_ret(const uint16_t type, const char*); - - /* write a message to the daemons' logfile */ - void __ulogd_log(int level, char *file, int line, const char *message, ...); -diff --git a/input/packet/ulogd_inppkt_NFLOG.c b/input/packet/ulogd_inppkt_NFLOG.c -index 6196626..a367959 100644 ---- a/input/packet/ulogd_inppkt_NFLOG.c -+++ b/input/packet/ulogd_inppkt_NFLOG.c -@@ -315,7 +315,7 @@ static struct ulogd_key output_keys[] = { - }; - - static inline int --interp_packet(struct ulogd_pluginstance *upi, u_int8_t pf_family, -+interp_packet(struct ulogd_pluginstance *upi, uint8_t pf_family, - struct nflog_data *ldata) - { - struct ulogd_key *ret = upi->output.keys; -@@ -326,12 +326,12 @@ interp_packet(struct ulogd_pluginstance *upi, u_int8_t pf_family, - int payload_len = nflog_get_payload(ldata, &payload); - char *prefix = nflog_get_prefix(ldata); - struct timeval ts; -- u_int32_t mark = nflog_get_nfmark(ldata); -- u_int32_t indev = nflog_get_indev(ldata); -- u_int32_t outdev = nflog_get_outdev(ldata); -- u_int32_t seq; -- u_int32_t uid; -- u_int32_t gid; -+ uint32_t mark = nflog_get_nfmark(ldata); -+ uint32_t indev = nflog_get_indev(ldata); -+ uint32_t outdev = nflog_get_outdev(ldata); -+ uint32_t seq; -+ uint32_t uid; -+ uint32_t gid; - - okey_set_u8(&ret[NFLOG_KEY_OOB_FAMILY], - pf_family); -@@ -493,7 +493,7 @@ static int configure(struct ulogd_pluginstance *upi, - return 0; - } - --static int become_system_logging(struct ulogd_pluginstance *upi, u_int8_t pf) -+static int become_system_logging(struct ulogd_pluginstance *upi, uint8_t pf) - { - struct nflog_input *ui = (struct nflog_input *) upi->private; - -diff --git a/input/packet/ulogd_inppkt_UNIXSOCK.c b/input/packet/ulogd_inppkt_UNIXSOCK.c -index e4009f3..39944bf 100644 ---- a/input/packet/ulogd_inppkt_UNIXSOCK.c -+++ b/input/packet/ulogd_inppkt_UNIXSOCK.c -@@ -336,10 +336,10 @@ enum ulogd2_option_type { - ULOGD2_OPT_PREFIX, /* log prefix (string) */ - ULOGD2_OPT_OOB_IN, /* input device (string) */ - ULOGD2_OPT_OOB_OUT, /* output device (string) */ -- ULOGD2_OPT_OOB_TIME_SEC, /* packet arrival time (u_int32_t) */ -+ ULOGD2_OPT_OOB_TIME_SEC, /* packet arrival time (uint32_t) */ - - ULOGD2_OPT_USER=200, /* user name (string) */ -- ULOGD2_OPT_USERID, /* user id (u_int32_t) */ -+ ULOGD2_OPT_USERID, /* user id (uint32_t) */ - ULOGD2_OPT_OSNAME, /* OS name (string) */ - ULOGD2_OPT_OSREL, /* OS release (string) */ - ULOGD2_OPT_OSVERS, /* OS version (string) */ -@@ -367,15 +367,15 @@ struct ulogd_unixsock_option_t { - #define USOCK_ALIGNTO 8 - #define USOCK_ALIGN(len) ( ((len)+USOCK_ALIGNTO-1) & ~(USOCK_ALIGNTO-1) ) - --static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_packet_t *pkt, u_int16_t total_len) -+static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_packet_t *pkt, uint16_t total_len) - { - char *data = NULL; - struct iphdr *ip; - struct ulogd_key *ret = upi->output.keys; -- u_int8_t oob_family; -- u_int16_t payload_len; -- u_int32_t option_number; -- u_int32_t option_length; -+ uint8_t oob_family; -+ uint16_t payload_len; -+ uint32_t option_number; -+ uint32_t option_length; - char *buf; - struct ulogd_unixsock_option_t *option; - int new_offset; -@@ -398,7 +398,7 @@ static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_p - okey_set_u32(&ret[UNIXSOCK_KEY_RAW_PCKTLEN], payload_len); - - /* options */ -- if (total_len > payload_len + sizeof(u_int16_t)) { -+ if (total_len > payload_len + sizeof(uint16_t)) { - /* option starts at the next aligned address after the payload */ - new_offset = USOCK_ALIGN(payload_len); - options_start = (void*)ip + new_offset; -@@ -431,13 +431,13 @@ static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_p - okey_set_ptr(&ret[UNIXSOCK_KEY_OOB_OUT], buf); - break; - case ULOGD2_OPT_OOB_TIME_SEC: -- okey_set_u32(&ret[UNIXSOCK_KEY_OOB_TIME_SEC], *(u_int32_t*)buf); -+ okey_set_u32(&ret[UNIXSOCK_KEY_OOB_TIME_SEC], *(uint32_t*)buf); - break; - case ULOGD2_OPT_USER: - okey_set_ptr(&ret[UNIXSOCK_KEY_NUFW_USER_NAME], buf); - break; - case ULOGD2_OPT_USERID: -- okey_set_u32(&ret[UNIXSOCK_KEY_NUFW_USER_ID], *(u_int32_t*)buf); -+ okey_set_u32(&ret[UNIXSOCK_KEY_NUFW_USER_ID], *(uint32_t*)buf); - break; - case ULOGD2_OPT_OSNAME: - okey_set_ptr(&ret[UNIXSOCK_KEY_NUFW_OS_NAME], buf); -@@ -452,7 +452,7 @@ static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_p - okey_set_ptr(&ret[UNIXSOCK_KEY_NUFW_APP_NAME], buf); - break; - case ULOGD2_OPT_STATE: -- okey_set_u8(&ret[UNIXSOCK_KEY_RAW_LABEL], *(u_int8_t*)buf); -+ okey_set_u8(&ret[UNIXSOCK_KEY_RAW_LABEL], *(uint8_t*)buf); - break; - default: - ulogd_log(ULOGD_NOTICE, -@@ -595,8 +595,8 @@ static int unixsock_instance_read_cb(int fd, unsigned int what, void *param) - struct ulogd_pluginstance *upi = param; - struct unixsock_input *ui = (struct unixsock_input*)upi->private; - int len; -- u_int16_t needed_len; -- u_int32_t packet_sig; -+ uint16_t needed_len; -+ uint32_t packet_sig; - struct ulogd_unixsock_packet_t *unixsock_packet; - - char buf[4096]; -@@ -642,7 +642,7 @@ static int unixsock_instance_read_cb(int fd, unsigned int what, void *param) - - needed_len = ntohs(unixsock_packet->total_size); - -- if (ui->unixsock_buf_avail >= needed_len + sizeof(u_int32_t)) { -+ if (ui->unixsock_buf_avail >= needed_len + sizeof(uint32_t)) { - ulogd_log(ULOGD_DEBUG, - " We have enough data (%d bytes required), handling packet\n", - needed_len); -@@ -651,11 +651,11 @@ static int unixsock_instance_read_cb(int fd, unsigned int what, void *param) - return -1; - } - /* consume data */ -- ui->unixsock_buf_avail -= (sizeof(u_int32_t) + needed_len); -+ ui->unixsock_buf_avail -= (sizeof(uint32_t) + needed_len); - if (ui->unixsock_buf_avail > 0) { - /* we need to shift data .. */ - memmove(ui->unixsock_buf, -- ui->unixsock_buf + (sizeof(u_int32_t) + needed_len) , -+ ui->unixsock_buf + (sizeof(uint32_t) + needed_len) , - ui->unixsock_buf_avail); - } else { - /* input buffer is empty, do not loop */ -@@ -664,7 +664,7 @@ static int unixsock_instance_read_cb(int fd, unsigned int what, void *param) - - } else { - ulogd_log(ULOGD_DEBUG, " We have %d bytes, but need %d. Requesting more\n", -- ui->unixsock_buf_avail, needed_len + sizeof(u_int32_t)); -+ ui->unixsock_buf_avail, needed_len + sizeof(uint32_t)); - return 0; - } - -diff --git a/libipulog/libipulog.c b/libipulog/libipulog.c -index ab28bb4..b49f7f2 100644 ---- a/libipulog/libipulog.c -+++ b/libipulog/libipulog.c -@@ -33,7 +33,7 @@ - struct ipulog_handle - { - int fd; -- u_int8_t blocking; -+ uint8_t blocking; - struct sockaddr_nl local; - struct sockaddr_nl peer; - struct nlmsghdr* last_nlhdr; -@@ -112,7 +112,7 @@ char *ipulog_strerror(int errcode) - } - - /* convert a netlink group (1-32) to a group_mask suitable for create_handle */ --u_int32_t ipulog_group2gmask(u_int32_t group) -+uint32_t ipulog_group2gmask(uint32_t group) - { - if (group < 1 || group > 32) - { -@@ -123,8 +123,8 @@ u_int32_t ipulog_group2gmask(u_int32_t group) - } - - /* create a ipulog handle for the reception of packets sent to gmask */ --struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, -- u_int32_t rcvbufsize) -+struct ipulog_handle *ipulog_create_handle(uint32_t gmask, -+ uint32_t rcvbufsize) - { - struct ipulog_handle *h; - int status; -diff --git a/output/mysql/ulogd_output_MYSQL.c b/output/mysql/ulogd_output_MYSQL.c -index 0a1ebfc..643320c 100644 ---- a/output/mysql/ulogd_output_MYSQL.c -+++ b/output/mysql/ulogd_output_MYSQL.c -@@ -174,7 +174,7 @@ static int open_db_mysql(struct ulogd_pluginstance *upi) - struct mysql_instance *mi = (struct mysql_instance *) upi->private; - unsigned int connect_timeout = timeout_ce(upi->config_kset).u.value; - char *server = host_ce(upi->config_kset).u.string; -- u_int16_t port = port_ce(upi->config_kset).u.value; -+ uint16_t port = port_ce(upi->config_kset).u.value; - char *user = user_ce(upi->config_kset).u.string; - char *pass = pass_ce(upi->config_kset).u.string; - char *db = db_ce(upi->config_kset).u.string; -diff --git a/src/addr.c b/src/addr.c -index 2672fab..41435dc 100644 ---- a/src/addr.c -+++ b/src/addr.c -@@ -22,9 +22,9 @@ - #include - #include - --u_int32_t ulogd_bits2netmask(int bits) -+uint32_t ulogd_bits2netmask(int bits) - { -- u_int32_t netmask, bm; -+ uint32_t netmask, bm; - - if (bits >= 32 || bits < 0) - return(~0); -diff --git a/util/db.c b/util/db.c -index 24966a5..c9aec41 100644 ---- a/util/db.c -+++ b/util/db.c -@@ -362,7 +362,7 @@ static void __format_query_db(struct ulogd_pluginstance *upi, char *start) - sprintf(stmt_ins, "%u,", res->u.value.ui16); - break; - case ULOGD_RET_IPADDR: -- /* fallthrough when logging IP as u_int32_t */ -+ /* fallthrough when logging IP as uint32_t */ - case ULOGD_RET_UINT32: - sprintf(stmt_ins, "%u,", res->u.value.ui32); - break; -diff --git a/util/printpkt.c b/util/printpkt.c -index eb6cfbf..69a47ca 100644 ---- a/util/printpkt.c -+++ b/util/printpkt.c -@@ -199,7 +199,7 @@ static int printpkt_ipv4(struct ulogd_key *res, char *buf) - { - char *buf_cur = buf; - char tmp[INET_ADDRSTRLEN]; -- u_int32_t paddr; -+ uint32_t paddr; - - if (pp_is_valid(res, KEY_IP_SADDR)) - buf_cur += sprintf(buf_cur, "SRC=%s ", -@@ -363,8 +363,8 @@ static int printpkt_ipv6(struct ulogd_key *res, char *buf) - int printpkt_arp(struct ulogd_key *res, char *buf) - { - char *buf_cur = buf; -- u_int16_t code = 0; -- u_int8_t *mac; -+ uint16_t code = 0; -+ uint8_t *mac; - - if (pp_is_valid(res, KEY_ARP_SPA)) - buf_cur += sprintf(buf_cur, "SRC=%s ", --- -2.6.2 - diff --git a/buildroot/package/ulogd/ulogd.hash b/buildroot/package/ulogd/ulogd.hash index 16186c18c..aef69262f 100644 --- a/buildroot/package/ulogd/ulogd.hash +++ b/buildroot/package/ulogd/ulogd.hash @@ -1,3 +1,7 @@ -# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.5.tar.bz2.{md5sum,sha1sum} -md5 f0f8fe1371fa28b5e06cb16aaa0111dd ulogd-2.0.5.tar.bz2 -sha1 828db7849d6788674ecf36b178f107c20e9ac1f0 ulogd-2.0.5.tar.bz2 +# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.7.tar.bz2.{md5sum,sha1sum} +md5 2bb2868cf51acbb90c35763c9f995f31 ulogd-2.0.7.tar.bz2 +sha1 f2d90469e2842e2bfbe19c55cf6d56ac107aa4b9 ulogd-2.0.7.tar.bz2 + +# Locally calculated +sha256 990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b ulogd-2.0.7.tar.bz2 +sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/buildroot/package/ulogd/ulogd.mk b/buildroot/package/ulogd/ulogd.mk index 5b0e55893..1b86c1277 100644 --- a/buildroot/package/ulogd/ulogd.mk +++ b/buildroot/package/ulogd/ulogd.mk @@ -4,10 +4,10 @@ # ################################################################################ -ULOGD_VERSION = 2.0.5 +ULOGD_VERSION = 2.0.7 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files -ULOGD_CONF_OPTS = --with-dbi=no --with-pgsql=no +ULOGD_CONF_OPTS = --without-dbi ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink @@ -20,13 +20,22 @@ ifeq ($(BR2_PACKAGE_MYSQL),y) ULOGD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr ULOGD_DEPENDENCIES += mysql else -ULOGD_CONF_OPTS += --with-mysql=no +ULOGD_CONF_OPTS += --without-mysql +endif +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +ULOGD_CONF_OPTS += --with-pgsql +ULOGD_DEPENDENCIES += postgresql +else +ULOGD_CONF_OPTS += --without-pgsql endif ifeq ($(BR2_PACKAGE_SQLITE),y) +ULOGD_CONF_OPTS += --with-sqlite ULOGD_DEPENDENCIES += sqlite +else +ULOGD_CONF_OPTS += --without-sqlite endif else -ULOGD_CONF_OPTS += --with-mysql=no --without-sqlite +ULOGD_CONF_OPTS += --without-mysql --without-pgsql --without-sqlite endif ifeq ($(BR2_PACKAGE_LIBPCAP),y) diff --git a/buildroot/package/umtprd/Config.in b/buildroot/package/umtprd/Config.in new file mode 100644 index 000000000..24bf11954 --- /dev/null +++ b/buildroot/package/umtprd/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_UMTPRD + bool "umtprd" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 + help + Lightweight USB MTP responder daemon for GNU/Linux + + https://github.com/viveris/uMTP-Responder + +comment "umtprd needs a toolchain w/ threads, headers >= 3.15" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 diff --git a/buildroot/package/umtprd/umtprd.hash b/buildroot/package/umtprd/umtprd.hash new file mode 100644 index 000000000..168b19e95 --- /dev/null +++ b/buildroot/package/umtprd/umtprd.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 e1301bdd89170cc2c679446c1cc5873feaacd061bf0ab547fc0a11670bae9163 umtprd-1.0.0.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/buildroot/package/umtprd/umtprd.mk b/buildroot/package/umtprd/umtprd.mk new file mode 100644 index 000000000..63faae43b --- /dev/null +++ b/buildroot/package/umtprd/umtprd.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# umtprd +# +################################################################################ + +UMTPRD_VERSION = 1.0.0 +UMTPRD_SITE = https://github.com/viveris/uMTP-Responder/archive +UMTPRD_LICENSE = GPL-3.0+ +UMTPRD_LICENSE_FILES = LICENSE + +define UMTPRD_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define UMTPRD_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/umtprd $(TARGET_DIR)/usr/sbin/umtprd +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/unionfs/unionfs.hash b/buildroot/package/unionfs/unionfs.hash index fcc1d58d6..f4310b023 100644 --- a/buildroot/package/unionfs/unionfs.hash +++ b/buildroot/package/unionfs/unionfs.hash @@ -1,3 +1,4 @@ # Locally computed -sha256 f24d7dd64c678cefacbebf2727b61e3127b8ecb6bb9176d7117dd31503455643 unionfs-2.0.tar.gz -sha256 976ca25b7706911f1a6e981c0fd236b607f497aa0b23d407825b0aad41f7c896 0001-include-asm-ioctl.h-for-_IOC_SIZE.patch +sha256 f24d7dd64c678cefacbebf2727b61e3127b8ecb6bb9176d7117dd31503455643 unionfs-2.0.tar.gz +sha256 976ca25b7706911f1a6e981c0fd236b607f497aa0b23d407825b0aad41f7c896 0001-include-asm-ioctl.h-for-_IOC_SIZE.patch +sha256 f56a5579d670e18e0667700bc599acbc0b8217ca1f76b2adb3dad7d2953c4049 LICENSE diff --git a/buildroot/package/unixodbc/unixodbc.hash b/buildroot/package/unixodbc/unixodbc.hash index 9d21a66e8..4d0ad191d 100644 --- a/buildroot/package/unixodbc/unixodbc.hash +++ b/buildroot/package/unixodbc/unixodbc.hash @@ -1,6 +1,6 @@ -# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.6.tar.gz.md5 -md5 a8629fd2953b04b4639d0a9d8a5cf9d1 unixODBC-2.3.6.tar.gz +# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.7.tar.gz.md5 +md5 274a711b0c77394e052db6493840c6f9 unixODBC-2.3.7.tar.gz # Locally computed -sha256 88b637f647c052ecc3861a3baa275c3b503b193b6a49ff8c28b2568656d14d69 unixODBC-2.3.6.tar.gz +sha256 45f169ba1f454a72b8fcbb82abd832630a3bf93baa84731cf2949f449e1e3e77 unixODBC-2.3.7.tar.gz sha256 a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8 COPYING sha256 1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4 exe/COPYING diff --git a/buildroot/package/unixodbc/unixodbc.mk b/buildroot/package/unixodbc/unixodbc.mk index 423f39521..2c936fe9d 100644 --- a/buildroot/package/unixodbc/unixodbc.mk +++ b/buildroot/package/unixodbc/unixodbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNIXODBC_VERSION = 2.3.6 +UNIXODBC_VERSION = 2.3.7 UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC UNIXODBC_INSTALL_STAGING = YES diff --git a/buildroot/package/unrar/unrar.hash b/buildroot/package/unrar/unrar.hash index 95acb8576..f688a4e36 100644 --- a/buildroot/package/unrar/unrar.hash +++ b/buildroot/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9335d2201870f2034007c04be80e00f1dc23932cb88b329d55c76134e6ba49fe unrarsrc-5.6.4.tar.gz +sha256 3591685c8f5bbcb0be09de3d0a0544adb88966b9cccb80986f6cd2b534fd91a6 unrarsrc-5.8.3.tar.gz sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/buildroot/package/unrar/unrar.mk b/buildroot/package/unrar/unrar.mk index 75e932990..cdaff2698 100644 --- a/buildroot/package/unrar/unrar.mk +++ b/buildroot/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 5.6.4 +UNRAR_VERSION = 5.8.3 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = http://www.rarlab.com/rar UNRAR_LICENSE = unrar diff --git a/buildroot/package/unzip/unzip.hash b/buildroot/package/unzip/unzip.hash index a10778a46..d05957d5e 100644 --- a/buildroot/package/unzip/unzip.hash +++ b/buildroot/package/unzip/unzip.hash @@ -1,5 +1,6 @@ # Locally computed: sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip60.tgz +sha256 7469b81d5d29ac4fd670f7c86ba0cb9fa34f137a2d4d5198437d92ddf918984b LICENSE sha256 66a364d75cea29363768ca6d43dd11b9913a59e42b8da16c4f63516c3e4ce7c1 07-increase-size-of-cfactorstr.patch sha256 3a8cfd2702d220c6c119eaf805b018b66460284e585e92adc8a572d190471724 08-allow-greater-hostver-values.patch sha256 0a1b23118b2f4a3ed097348ab33050d4f79b3863ab30e6d64ac382589834e3de 09-cve-2014-8139-crc-overflow.patch diff --git a/buildroot/package/upmpdcli/0001-Use-uint64_t-instead-of-u_int64_t.patch b/buildroot/package/upmpdcli/0001-Use-uint64_t-instead-of-u_int64_t.patch deleted file mode 100644 index 69e05827c..000000000 --- a/buildroot/package/upmpdcli/0001-Use-uint64_t-instead-of-u_int64_t.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 256394399f57ba6e3057ee2c981127a14e4623f8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Tue, 22 Jan 2019 09:07:56 +0100 -Subject: [PATCH] Use uint64_t instead of u_int64_t -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -`uintN_t` is standard C99 type available in ``, whereas `u_intN_t` -is defined `` - -As upmpdcli already uses the `uintN_t` type, replace the few existing -`u_intN_t` types, as it breaks build with the musl C library, which is -very strict, because of the missing ``: - -``` -src/mediaserver/cdplugins/netfetch.h:71:5: error: ‘u_int64_t’ does not name a type - u_int64_t datacount() { -``` - -Backported from: 256394399f57ba6e3057ee2c981127a14e4623f8 - -Signed-off-by: Jörg Krause ---- - src/mediaserver/cdplugins/netfetch.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/mediaserver/cdplugins/netfetch.h b/src/mediaserver/cdplugins/netfetch.h -index d7e9df4..d105e53 100644 ---- a/src/mediaserver/cdplugins/netfetch.h -+++ b/src/mediaserver/cdplugins/netfetch.h -@@ -68,7 +68,7 @@ public: - /// Reset after transfer done, for retrying for exemple. - virtual bool reset() = 0; - -- u_int64_t datacount() { -+ uint64_t datacount() { - return fetch_data_count; - } - -@@ -84,11 +84,11 @@ public: - buf1cb = f; - } - // Called when the network transfer is done -- void setEOFetchCB(std::function f) { -+ void setEOFetchCB(std::function f) { - eofcb = f; - } - // Called every time we get new data from the remote -- void setFetchBytesCB(std::function f) { -+ void setFetchBytesCB(std::function f) { - fbcb = f; - } - -@@ -98,11 +98,11 @@ protected: - std::string _url; - uint64_t startoffset; - int timeoutsecs{0}; -- u_int64_t fetch_data_count{0}; -+ uint64_t fetch_data_count{0}; - BufXChange *outqueue{nullptr}; - std::function buf1cb; -- std::function fbcb; -- std::function eofcb; -+ std::function fbcb; -+ std::function eofcb; - }; - - #endif /* _MEDIAFETCH_H_INCLUDED_ */ --- -2.20.1 - diff --git a/buildroot/package/upmpdcli/upmpdcli.hash b/buildroot/package/upmpdcli/upmpdcli.hash index cbd12fe29..33003a406 100644 --- a/buildroot/package/upmpdcli/upmpdcli.hash +++ b/buildroot/package/upmpdcli/upmpdcli.hash @@ -1,5 +1,5 @@ -# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.0.tar.gz.sha256: -sha256 28742910fa16b72f0c4e5b7dc561f59aa7f1a5fdd3e8e4f72f359d2e4af90d35 upmpdcli-1.4.0.tar.gz +# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.5.tar.gz.sha256: +sha256 af0c13b6ab8720d98451307010c33462e9a3f50178bae82c593fd2dd12e31b0e upmpdcli-1.4.5.tar.gz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/upmpdcli/upmpdcli.mk b/buildroot/package/upmpdcli/upmpdcli.mk index 22a5bf242..290cdcb1f 100644 --- a/buildroot/package/upmpdcli/upmpdcli.mk +++ b/buildroot/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 1.4.0 +UPMPDCLI_VERSION = 1.4.5 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = LGPL-2.1+ UPMPDCLI_LICENSE_FILES = COPYING @@ -27,9 +27,6 @@ endef define UPMPDCLI_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/systemd/upmpdcli.service \ $(TARGET_DIR)/usr/lib/systemd/system/upmpdcli.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/upmpdcli.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/upmpdcli.service endef define UPMPDCLI_INSTALL_CONF_FILE diff --git a/buildroot/package/upower/0001-daemon-fix-get_critical_action.patch b/buildroot/package/upower/0001-daemon-fix-get_critical_action.patch deleted file mode 100644 index 02fc55c48..000000000 --- a/buildroot/package/upower/0001-daemon-fix-get_critical_action.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Tue, 23 Feb 2016 09:51:07 +0100 -Subject: [PATCH] daemon: fix get_critical_action() - -Fix copy&paste error from e7e9156f that called the wrong _complete_ function -for up_daemon_get_critical_action(). - -https://bugs.freedesktop.org/show_bug.cgi?id=94262 - -[rebase on 0.99.4] -Signed-off-by: Romain Naour ---- - src/up-daemon.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/up-daemon.c b/src/up-daemon.c -index be14cbe..e95f904 100644 ---- a/src/up-daemon.c -+++ b/src/up-daemon.c -@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton, - GDBusMethodInvocation *invocation, - UpDaemon *daemon) - { -- up_exported_daemon_complete_get_display_device (skeleton, invocation, -- up_backend_get_critical_action (daemon->priv->backend)); -+ up_exported_daemon_complete_get_critical_action (skeleton, invocation, -+ up_backend_get_critical_action (daemon->priv->backend)); - return TRUE; - } - --- -2.9.3 - diff --git a/buildroot/package/upower/upower.hash b/buildroot/package/upower/upower.hash index 0df67b449..e69ad20cb 100644 --- a/buildroot/package/upower/upower.hash +++ b/buildroot/package/upower/upower.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 9ca325a6ccef505529b268ebbbd9becd0ce65a65f6ac7ee31e2e5b17648037b0 upower-0.99.4.tar.xz +sha256 64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef upower-0.99.11.tar.xz +sha256 c1753877db41d798d63369a825ad9225bbeb5e10a407be5fcd8de96182f1c50d COPYING diff --git a/buildroot/package/upower/upower.mk b/buildroot/package/upower/upower.mk index 79dc5e87f..8989ca9f5 100644 --- a/buildroot/package/upower/upower.mk +++ b/buildroot/package/upower/upower.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPOWER_VERSION = 0.99.4 +UPOWER_VERSION = 0.99.11 UPOWER_SOURCE = upower-$(UPOWER_VERSION).tar.xz UPOWER_SITE = https://upower.freedesktop.org/releases UPOWER_LICENSE = GPL-2.0+ @@ -14,7 +14,7 @@ UPOWER_LICENSE_FILES = COPYING UPOWER_INSTALL_STAGING = YES UPOWER_DEPENDENCIES = \ - host-intltool \ + $(TARGET_NLS_DEPENDENCIES) \ host-pkgconf \ libgudev \ libusb \ diff --git a/buildroot/package/upx/upx.hash b/buildroot/package/upx/upx.hash index bfcf9326f..cc7fb66c9 100644 --- a/buildroot/package/upx/upx.hash +++ b/buildroot/package/upx/upx.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 527ce757429841f51675352b1f9f6fc8ad97b18002080d7bf8672c466d8c6a3c upx-3.91-src.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/usb_modeswitch/0001-Makefile-allow-extra-configure-flags-to-be-passed-to.patch b/buildroot/package/usb_modeswitch/0001-Makefile-allow-extra-configure-flags-to-be-passed-to.patch deleted file mode 100644 index 9e1e681fa..000000000 --- a/buildroot/package/usb_modeswitch/0001-Makefile-allow-extra-configure-flags-to-be-passed-to.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1309df373c882f27f476130b06746a6d1e1a0f85 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Fri, 3 Nov 2017 23:21:44 +0100 -Subject: [PATCH] Makefile: allow extra configure flags to be passed to jimtcl - on the make command line - -E.G. to pass --host / --build for cross compilation. - -Signed-off-by: Peter Korsgaard ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a151e2a..94dabd9 100644 ---- a/Makefile -+++ b/Makefile -@@ -19,7 +19,7 @@ TCL ?= $(HOST_TCL) - else - TCL ?= /usr/bin/tclsh - endif --JIM_CONFIGURE_OPTS = --disable-lineedit \ -+override JIM_CONFIGURE_OPTS += --disable-lineedit \ - --with-out-jim-ext="stdlib posix load signal syslog" --prefix=/usr - - .PHONY: clean install install-common uninstall \ --- -2.11.0 - diff --git a/buildroot/package/usb_modeswitch/Config.in b/buildroot/package/usb_modeswitch/Config.in index f709a550c..579761c04 100644 --- a/buildroot/package/usb_modeswitch/Config.in +++ b/buildroot/package/usb_modeswitch/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_USB_MODESWITCH bool "usb_modeswitch" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + select BR2_PACKAGE_JIMTCL if !BR2_PACKAGE_TCL || BR2_PACKAGE_TCL_SHLIB_ONLY select BR2_PACKAGE_LIBUSB help Some USB devices such as 3G/4G broadband modems power-up diff --git a/buildroot/package/usb_modeswitch/usb_modeswitch.hash b/buildroot/package/usb_modeswitch/usb_modeswitch.hash index 3cbd370e2..4cbd5dbea 100644 --- a/buildroot/package/usb_modeswitch/usb_modeswitch.hash +++ b/buildroot/package/usb_modeswitch/usb_modeswitch.hash @@ -1,3 +1,5 @@ +# From http://www.draisberghof.de/usb_modeswitch/ +md5 be73dcc84025794081a1d4d4e5a75e4c usb-modeswitch-2.6.0.tar.bz2 # Locally calculated -sha256 abffac09c87eacd78e101545967dc25af7e989745b4276756d45dbf4008a2ea6 usb-modeswitch-2.5.2.tar.bz2 -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3 usb-modeswitch-2.6.0.tar.bz2 +sha256 6195429209313925c0eba6c0da4ee7a6cb4277b99e35c886913f80f91ec20b94 COPYING diff --git a/buildroot/package/usb_modeswitch/usb_modeswitch.mk b/buildroot/package/usb_modeswitch/usb_modeswitch.mk index 9832d3c80..7e9ed422b 100644 --- a/buildroot/package/usb_modeswitch/usb_modeswitch.mk +++ b/buildroot/package/usb_modeswitch/usb_modeswitch.mk @@ -4,35 +4,30 @@ # ################################################################################ -USB_MODESWITCH_VERSION = 2.5.2 +USB_MODESWITCH_VERSION = 2.6.0 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb -USB_MODESWITCH_LICENSE = GPL-2.0+ +USB_MODESWITCH_LICENSE = GPL-2.0+, BSD-2-Clause USB_MODESWITCH_LICENSE_FILES = COPYING -# Package does not build in parallel due to improper make rules -USB_MODESWITCH_MAKE = $(MAKE1) ifeq ($(BR2_PACKAGE_TCL)$(BR2_PACKAGE_TCL_SHLIB_ONLY),y) USB_MODESWITCH_DEPENDENCIES += tcl -USB_MODESWITCH_BUILD_TARGETS = script +USB_MODESWITCH_BUILD_TARGETS = all USB_MODESWITCH_INSTALL_TARGETS = install-script else -USB_MODESWITCH_BUILD_TARGETS = static -USB_MODESWITCH_INSTALL_TARGETS = install-static +USB_MODESWITCH_DEPENDENCIES += jimtcl +ifeq ($(BR2_STATIC_LIBS),y) +USB_MODESWITCH_BUILD_TARGETS = all-with-statlink-dispatcher +USB_MODESWITCH_INSTALL_TARGETS = install-statlink +else +USB_MODESWITCH_BUILD_TARGETS = all-with-dynlink-dispatcher +USB_MODESWITCH_INSTALL_TARGETS = install-dynlink +endif endif - -# build system of embedded jimtcl doesn't use autotools, but does use -# an old version of gnuconfig which doesn't know all the architectures -# supported by Buildroot, so update config.guess / config.sub like we -# do in pkg-autotools.mk -USB_MODESWITCH_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK define USB_MODESWITCH_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -Wall -I." \ - JIM_CONFIGURE_OPTS="--host=$(GNU_TARGET_NAME) --build=$(GNU_HOST_NAME)" \ -C $(@D) $(USB_MODESWITCH_BUILD_TARGETS) endef diff --git a/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.hash b/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.hash index f35fd69a8..922913b27 100644 --- a/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.hash +++ b/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.hash @@ -1,3 +1,5 @@ +# From http://www.draisberghof.de/usb_modeswitch/ +md5 e8fce7eb949cbe16c61fb71bade4cc17 usb-modeswitch-data-20191128.tar.bz2 # Locally calculated -sha256 ce413ef2a50e648e9c81bc3ea6110e7324a8bf981034fc9ec4467d3562563c2c usb-modeswitch-data-20170806.tar.bz2 +sha256 3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9 usb-modeswitch-data-20191128.tar.bz2 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.mk b/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.mk index 80ecd33d8..a3a98ad7e 100644 --- a/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.mk +++ b/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_DATA_VERSION = 20170806 +USB_MODESWITCH_DATA_VERSION = 20191128 USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2 USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch diff --git a/buildroot/package/usbmount/usbmount.hash b/buildroot/package/usbmount/usbmount.hash index 4a5c7f202..646546161 100644 --- a/buildroot/package/usbmount/usbmount.hash +++ b/buildroot/package/usbmount/usbmount.hash @@ -1,2 +1,4 @@ # From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/u/usbmount/usbmount_0.0.22.dsc -sha256 a2b8581534b6c92f0376d202639dbc28862d3834dac64c35bde752f84975527d usbmount_0.0.22.tar.gz +sha256 a2b8581534b6c92f0376d202639dbc28862d3834dac64c35bde752f84975527d usbmount_0.0.22.tar.gz +# Locally computed +sha256 797a416c87923338aa3ed05cce3cfdac6101f0142e72d5ab05c7bd76af5e527b debian/copyright diff --git a/buildroot/package/usbredir/usbredir.hash b/buildroot/package/usbredir/usbredir.hash index 9ba11771b..485315d28 100644 --- a/buildroot/package/usbredir/usbredir.hash +++ b/buildroot/package/usbredir/usbredir.hash @@ -1,2 +1,4 @@ # locally computed hash -sha256 407e9e27a1369f01264d5501ffbe88935ddd7d5de675f5835db05dc9c9ac56f3 usbredir-0.7.1.tar.bz2 +sha256 87bc9c5a81c982517a1bec70dc8d22e15ae197847643d58f20c0ced3c38c5e00 usbredir-0.8.0.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING.LIB diff --git a/buildroot/package/usbredir/usbredir.mk b/buildroot/package/usbredir/usbredir.mk index 02cd47cfb..8848670ea 100644 --- a/buildroot/package/usbredir/usbredir.mk +++ b/buildroot/package/usbredir/usbredir.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBREDIR_VERSION = 0.7.1 +USBREDIR_VERSION = 0.8.0 USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.bz2 USBREDIR_SITE = http://spice-space.org/download/usbredir USBREDIR_LICENSE = LGPL-2.1+ (libraries) @@ -14,7 +14,7 @@ USBREDIR_DEPENDENCIES = host-pkgconf libusb ifeq ($(BR2_PACKAGE_USBREDIR_SERVER),y) -USBREDIR_LICENSE := $(USBREDIR_LICENSE), GPL-2.0+ (program) +USBREDIR_LICENSE += , GPL-2.0+ (program) USBREDIR_LICENSE_FILES += COPYING else # BR2_PACKAGE_USBREDIR_SERVER != y diff --git a/buildroot/package/usbutils/0001-add-gpl-license-files.patch b/buildroot/package/usbutils/0001-add-gpl-license-files.patch deleted file mode 100644 index e6e335f14..000000000 --- a/buildroot/package/usbutils/0001-add-gpl-license-files.patch +++ /dev/null @@ -1,1030 +0,0 @@ -Add GPL-2.0 and GPL-3.0 license files - -This patch is equivalent to upstream commit 747db4bc75e1 (Makefile.am: add -files with licenses to archive). The license files are in upstream commit, but -missing from the tar archive. - -Signed-off-by: Baruch Siach ---- - -diff -Nuar usbutils-010.orig/LICENSES/GPL-2.0.txt usbutils-010/LICENSES/GPL-2.0.txt ---- usbutils-010.orig/LICENSES/GPL-2.0.txt 1970-01-01 02:00:00.000000000 +0200 -+++ usbutils-010/LICENSES/GPL-2.0.txt 2018-05-29 14:49:22.351783751 +0300 -@@ -0,0 +1,339 @@ -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 -+ -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ Everyone is permitted to copy and distribute verbatim copies -+ of this license document, but changing it is not allowed. -+ -+ Preamble -+ -+ The licenses for most software are designed to take away your -+freedom to share and change it. By contrast, the GNU General Public -+License is intended to guarantee your freedom to share and change free -+software--to make sure the software is free for all its users. This -+General Public License applies to most of the Free Software -+Foundation's software and to any other program whose authors commit to -+using it. (Some other Free Software Foundation software is covered by -+the GNU Lesser General Public License instead.) You can apply it to -+your programs, too. -+ -+ When we speak of free software, we are referring to freedom, not -+price. Our General Public Licenses are designed to make sure that you -+have the freedom to distribute copies of free software (and charge for -+this service if you wish), that you receive source code or can get it -+if you want it, that you can change the software or use pieces of it -+in new free programs; and that you know you can do these things. -+ -+ To protect your rights, we need to make restrictions that forbid -+anyone to deny you these rights or to ask you to surrender the rights. -+These restrictions translate to certain responsibilities for you if you -+distribute copies of the software, or if you modify it. -+ -+ For example, if you distribute copies of such a program, whether -+gratis or for a fee, you must give the recipients all the rights that -+you have. You must make sure that they, too, receive or can get the -+source code. And you must show them these terms so they know their -+rights. -+ -+ We protect your rights with two steps: (1) copyright the software, and -+(2) offer you this license which gives you legal permission to copy, -+distribute and/or modify the software. -+ -+ Also, for each author's protection and ours, we want to make certain -+that everyone understands that there is no warranty for this free -+software. If the software is modified by someone else and passed on, we -+want its recipients to know that what they have is not the original, so -+that any problems introduced by others will not reflect on the original -+authors' reputations. -+ -+ Finally, any free program is threatened constantly by software -+patents. We wish to avoid the danger that redistributors of a free -+program will individually obtain patent licenses, in effect making the -+program proprietary. To prevent this, we have made it clear that any -+patent must be licensed for everyone's free use or not licensed at all. -+ -+ The precise terms and conditions for copying, distribution and -+modification follow. -+ -+ GNU GENERAL PUBLIC LICENSE -+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -+ -+ 0. This License applies to any program or other work which contains -+a notice placed by the copyright holder saying it may be distributed -+under the terms of this General Public License. The "Program", below, -+refers to any such program or work, and a "work based on the Program" -+means either the Program or any derivative work under copyright law: -+that is to say, a work containing the Program or a portion of it, -+either verbatim or with modifications and/or translated into another -+language. (Hereinafter, translation is included without limitation in -+the term "modification".) Each licensee is addressed as "you". -+ -+Activities other than copying, distribution and modification are not -+covered by this License; they are outside its scope. The act of -+running the Program is not restricted, and the output from the Program -+is covered only if its contents constitute a work based on the -+Program (independent of having been made by running the Program). -+Whether that is true depends on what the Program does. -+ -+ 1. You may copy and distribute verbatim copies of the Program's -+source code as you receive it, in any medium, provided that you -+conspicuously and appropriately publish on each copy an appropriate -+copyright notice and disclaimer of warranty; keep intact all the -+notices that refer to this License and to the absence of any warranty; -+and give any other recipients of the Program a copy of this License -+along with the Program. -+ -+You may charge a fee for the physical act of transferring a copy, and -+you may at your option offer warranty protection in exchange for a fee. -+ -+ 2. You may modify your copy or copies of the Program or any portion -+of it, thus forming a work based on the Program, and copy and -+distribute such modifications or work under the terms of Section 1 -+above, provided that you also meet all of these conditions: -+ -+ a) You must cause the modified files to carry prominent notices -+ stating that you changed the files and the date of any change. -+ -+ b) You must cause any work that you distribute or publish, that in -+ whole or in part contains or is derived from the Program or any -+ part thereof, to be licensed as a whole at no charge to all third -+ parties under the terms of this License. -+ -+ c) If the modified program normally reads commands interactively -+ when run, you must cause it, when started running for such -+ interactive use in the most ordinary way, to print or display an -+ announcement including an appropriate copyright notice and a -+ notice that there is no warranty (or else, saying that you provide -+ a warranty) and that users may redistribute the program under -+ these conditions, and telling the user how to view a copy of this -+ License. (Exception: if the Program itself is interactive but -+ does not normally print such an announcement, your work based on -+ the Program is not required to print an announcement.) -+ -+These requirements apply to the modified work as a whole. If -+identifiable sections of that work are not derived from the Program, -+and can be reasonably considered independent and separate works in -+themselves, then this License, and its terms, do not apply to those -+sections when you distribute them as separate works. But when you -+distribute the same sections as part of a whole which is a work based -+on the Program, the distribution of the whole must be on the terms of -+this License, whose permissions for other licensees extend to the -+entire whole, and thus to each and every part regardless of who wrote it. -+ -+Thus, it is not the intent of this section to claim rights or contest -+your rights to work written entirely by you; rather, the intent is to -+exercise the right to control the distribution of derivative or -+collective works based on the Program. -+ -+In addition, mere aggregation of another work not based on the Program -+with the Program (or with a work based on the Program) on a volume of -+a storage or distribution medium does not bring the other work under -+the scope of this License. -+ -+ 3. You may copy and distribute the Program (or a work based on it, -+under Section 2) in object code or executable form under the terms of -+Sections 1 and 2 above provided that you also do one of the following: -+ -+ a) Accompany it with the complete corresponding machine-readable -+ source code, which must be distributed under the terms of Sections -+ 1 and 2 above on a medium customarily used for software interchange; or, -+ -+ b) Accompany it with a written offer, valid for at least three -+ years, to give any third party, for a charge no more than your -+ cost of physically performing source distribution, a complete -+ machine-readable copy of the corresponding source code, to be -+ distributed under the terms of Sections 1 and 2 above on a medium -+ customarily used for software interchange; or, -+ -+ c) Accompany it with the information you received as to the offer -+ to distribute corresponding source code. (This alternative is -+ allowed only for noncommercial distribution and only if you -+ received the program in object code or executable form with such -+ an offer, in accord with Subsection b above.) -+ -+The source code for a work means the preferred form of the work for -+making modifications to it. For an executable work, complete source -+code means all the source code for all modules it contains, plus any -+associated interface definition files, plus the scripts used to -+control compilation and installation of the executable. However, as a -+special exception, the source code distributed need not include -+anything that is normally distributed (in either source or binary -+form) with the major components (compiler, kernel, and so on) of the -+operating system on which the executable runs, unless that component -+itself accompanies the executable. -+ -+If distribution of executable or object code is made by offering -+access to copy from a designated place, then offering equivalent -+access to copy the source code from the same place counts as -+distribution of the source code, even though third parties are not -+compelled to copy the source along with the object code. -+ -+ 4. You may not copy, modify, sublicense, or distribute the Program -+except as expressly provided under this License. Any attempt -+otherwise to copy, modify, sublicense or distribute the Program is -+void, and will automatically terminate your rights under this License. -+However, parties who have received copies, or rights, from you under -+this License will not have their licenses terminated so long as such -+parties remain in full compliance. -+ -+ 5. You are not required to accept this License, since you have not -+signed it. However, nothing else grants you permission to modify or -+distribute the Program or its derivative works. These actions are -+prohibited by law if you do not accept this License. Therefore, by -+modifying or distributing the Program (or any work based on the -+Program), you indicate your acceptance of this License to do so, and -+all its terms and conditions for copying, distributing or modifying -+the Program or works based on it. -+ -+ 6. Each time you redistribute the Program (or any work based on the -+Program), the recipient automatically receives a license from the -+original licensor to copy, distribute or modify the Program subject to -+these terms and conditions. You may not impose any further -+restrictions on the recipients' exercise of the rights granted herein. -+You are not responsible for enforcing compliance by third parties to -+this License. -+ -+ 7. If, as a consequence of a court judgment or allegation of patent -+infringement or for any other reason (not limited to patent issues), -+conditions are imposed on you (whether by court order, agreement or -+otherwise) that contradict the conditions of this License, they do not -+excuse you from the conditions of this License. If you cannot -+distribute so as to satisfy simultaneously your obligations under this -+License and any other pertinent obligations, then as a consequence you -+may not distribute the Program at all. For example, if a patent -+license would not permit royalty-free redistribution of the Program by -+all those who receive copies directly or indirectly through you, then -+the only way you could satisfy both it and this License would be to -+refrain entirely from distribution of the Program. -+ -+If any portion of this section is held invalid or unenforceable under -+any particular circumstance, the balance of the section is intended to -+apply and the section as a whole is intended to apply in other -+circumstances. -+ -+It is not the purpose of this section to induce you to infringe any -+patents or other property right claims or to contest validity of any -+such claims; this section has the sole purpose of protecting the -+integrity of the free software distribution system, which is -+implemented by public license practices. Many people have made -+generous contributions to the wide range of software distributed -+through that system in reliance on consistent application of that -+system; it is up to the author/donor to decide if he or she is willing -+to distribute software through any other system and a licensee cannot -+impose that choice. -+ -+This section is intended to make thoroughly clear what is believed to -+be a consequence of the rest of this License. -+ -+ 8. If the distribution and/or use of the Program is restricted in -+certain countries either by patents or by copyrighted interfaces, the -+original copyright holder who places the Program under this License -+may add an explicit geographical distribution limitation excluding -+those countries, so that distribution is permitted only in or among -+countries not thus excluded. In such case, this License incorporates -+the limitation as if written in the body of this License. -+ -+ 9. The Free Software Foundation may publish revised and/or new versions -+of the General Public License from time to time. Such new versions will -+be similar in spirit to the present version, but may differ in detail to -+address new problems or concerns. -+ -+Each version is given a distinguishing version number. If the Program -+specifies a version number of this License which applies to it and "any -+later version", you have the option of following the terms and conditions -+either of that version or of any later version published by the Free -+Software Foundation. If the Program does not specify a version number of -+this License, you may choose any version ever published by the Free Software -+Foundation. -+ -+ 10. If you wish to incorporate parts of the Program into other free -+programs whose distribution conditions are different, write to the author -+to ask for permission. For software which is copyrighted by the Free -+Software Foundation, write to the Free Software Foundation; we sometimes -+make exceptions for this. Our decision will be guided by the two goals -+of preserving the free status of all derivatives of our free software and -+of promoting the sharing and reuse of software generally. -+ -+ NO WARRANTY -+ -+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -+REPAIR OR CORRECTION. -+ -+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -+POSSIBILITY OF SUCH DAMAGES. -+ -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs -+ -+ If you develop a new program, and you want it to be of the greatest -+possible use to the public, the best way to achieve this is to make it -+free software which everyone can redistribute and change under these terms. -+ -+ To do so, attach the following notices to the program. It is safest -+to attach them to the start of each source file to most effectively -+convey the exclusion of warranty; and each file should have at least -+the "copyright" line and a pointer to where the full notice is found. -+ -+ -+ Copyright (C) -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ -+Also add information on how to contact you by electronic and paper mail. -+ -+If the program is interactive, make it output a short notice like this -+when it starts in an interactive mode: -+ -+ Gnomovision version 69, Copyright (C) year name of author -+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -+ This is free software, and you are welcome to redistribute it -+ under certain conditions; type `show c' for details. -+ -+The hypothetical commands `show w' and `show c' should show the appropriate -+parts of the General Public License. Of course, the commands you use may -+be called something other than `show w' and `show c'; they could even be -+mouse-clicks or menu items--whatever suits your program. -+ -+You should also get your employer (if you work as a programmer) or your -+school, if any, to sign a "copyright disclaimer" for the program, if -+necessary. Here is a sample; alter the names: -+ -+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program -+ `Gnomovision' (which makes passes at compilers) written by James Hacker. -+ -+ , 1 April 1989 -+ Ty Coon, President of Vice -+ -+This General Public License does not permit incorporating your program into -+proprietary programs. If your program is a subroutine library, you may -+consider it more useful to permit linking proprietary applications with the -+library. If this is what you want to do, use the GNU Lesser General -+Public License instead of this License. -diff -Nuar usbutils-010.orig/LICENSES/GPL-3.0.txt usbutils-010/LICENSES/GPL-3.0.txt ---- usbutils-010.orig/LICENSES/GPL-3.0.txt 1970-01-01 02:00:00.000000000 +0200 -+++ usbutils-010/LICENSES/GPL-3.0.txt 2018-05-29 15:21:15.923738330 +0300 -@@ -0,0 +1,674 @@ -+ GNU GENERAL PUBLIC LICENSE -+ Version 3, 29 June 2007 -+ -+ Copyright (C) 2007 Free Software Foundation, Inc. -+ Everyone is permitted to copy and distribute verbatim copies -+ of this license document, but changing it is not allowed. -+ -+ Preamble -+ -+ The GNU General Public License is a free, copyleft license for -+software and other kinds of works. -+ -+ The licenses for most software and other practical works are designed -+to take away your freedom to share and change the works. By contrast, -+the GNU General Public License is intended to guarantee your freedom to -+share and change all versions of a program--to make sure it remains free -+software for all its users. We, the Free Software Foundation, use the -+GNU General Public License for most of our software; it applies also to -+any other work released this way by its authors. You can apply it to -+your programs, too. -+ -+ When we speak of free software, we are referring to freedom, not -+price. Our General Public Licenses are designed to make sure that you -+have the freedom to distribute copies of free software (and charge for -+them if you wish), that you receive source code or can get it if you -+want it, that you can change the software or use pieces of it in new -+free programs, and that you know you can do these things. -+ -+ To protect your rights, we need to prevent others from denying you -+these rights or asking you to surrender the rights. Therefore, you have -+certain responsibilities if you distribute copies of the software, or if -+you modify it: responsibilities to respect the freedom of others. -+ -+ For example, if you distribute copies of such a program, whether -+gratis or for a fee, you must pass on to the recipients the same -+freedoms that you received. You must make sure that they, too, receive -+or can get the source code. And you must show them these terms so they -+know their rights. -+ -+ Developers that use the GNU GPL protect your rights with two steps: -+(1) assert copyright on the software, and (2) offer you this License -+giving you legal permission to copy, distribute and/or modify it. -+ -+ For the developers' and authors' protection, the GPL clearly explains -+that there is no warranty for this free software. For both users' and -+authors' sake, the GPL requires that modified versions be marked as -+changed, so that their problems will not be attributed erroneously to -+authors of previous versions. -+ -+ Some devices are designed to deny users access to install or run -+modified versions of the software inside them, although the manufacturer -+can do so. This is fundamentally incompatible with the aim of -+protecting users' freedom to change the software. The systematic -+pattern of such abuse occurs in the area of products for individuals to -+use, which is precisely where it is most unacceptable. Therefore, we -+have designed this version of the GPL to prohibit the practice for those -+products. If such problems arise substantially in other domains, we -+stand ready to extend this provision to those domains in future versions -+of the GPL, as needed to protect the freedom of users. -+ -+ Finally, every program is threatened constantly by software patents. -+States should not allow patents to restrict development and use of -+software on general-purpose computers, but in those that do, we wish to -+avoid the special danger that patents applied to a free program could -+make it effectively proprietary. To prevent this, the GPL assures that -+patents cannot be used to render the program non-free. -+ -+ The precise terms and conditions for copying, distribution and -+modification follow. -+ -+ TERMS AND CONDITIONS -+ -+ 0. Definitions. -+ -+ "This License" refers to version 3 of the GNU General Public License. -+ -+ "Copyright" also means copyright-like laws that apply to other kinds of -+works, such as semiconductor masks. -+ -+ "The Program" refers to any copyrightable work licensed under this -+License. Each licensee is addressed as "you". "Licensees" and -+"recipients" may be individuals or organizations. -+ -+ To "modify" a work means to copy from or adapt all or part of the work -+in a fashion requiring copyright permission, other than the making of an -+exact copy. The resulting work is called a "modified version" of the -+earlier work or a work "based on" the earlier work. -+ -+ A "covered work" means either the unmodified Program or a work based -+on the Program. -+ -+ To "propagate" a work means to do anything with it that, without -+permission, would make you directly or secondarily liable for -+infringement under applicable copyright law, except executing it on a -+computer or modifying a private copy. Propagation includes copying, -+distribution (with or without modification), making available to the -+public, and in some countries other activities as well. -+ -+ To "convey" a work means any kind of propagation that enables other -+parties to make or receive copies. Mere interaction with a user through -+a computer network, with no transfer of a copy, is not conveying. -+ -+ An interactive user interface displays "Appropriate Legal Notices" -+to the extent that it includes a convenient and prominently visible -+feature that (1) displays an appropriate copyright notice, and (2) -+tells the user that there is no warranty for the work (except to the -+extent that warranties are provided), that licensees may convey the -+work under this License, and how to view a copy of this License. If -+the interface presents a list of user commands or options, such as a -+menu, a prominent item in the list meets this criterion. -+ -+ 1. Source Code. -+ -+ The "source code" for a work means the preferred form of the work -+for making modifications to it. "Object code" means any non-source -+form of a work. -+ -+ A "Standard Interface" means an interface that either is an official -+standard defined by a recognized standards body, or, in the case of -+interfaces specified for a particular programming language, one that -+is widely used among developers working in that language. -+ -+ The "System Libraries" of an executable work include anything, other -+than the work as a whole, that (a) is included in the normal form of -+packaging a Major Component, but which is not part of that Major -+Component, and (b) serves only to enable use of the work with that -+Major Component, or to implement a Standard Interface for which an -+implementation is available to the public in source code form. A -+"Major Component", in this context, means a major essential component -+(kernel, window system, and so on) of the specific operating system -+(if any) on which the executable work runs, or a compiler used to -+produce the work, or an object code interpreter used to run it. -+ -+ The "Corresponding Source" for a work in object code form means all -+the source code needed to generate, install, and (for an executable -+work) run the object code and to modify the work, including scripts to -+control those activities. However, it does not include the work's -+System Libraries, or general-purpose tools or generally available free -+programs which are used unmodified in performing those activities but -+which are not part of the work. For example, Corresponding Source -+includes interface definition files associated with source files for -+the work, and the source code for shared libraries and dynamically -+linked subprograms that the work is specifically designed to require, -+such as by intimate data communication or control flow between those -+subprograms and other parts of the work. -+ -+ The Corresponding Source need not include anything that users -+can regenerate automatically from other parts of the Corresponding -+Source. -+ -+ The Corresponding Source for a work in source code form is that -+same work. -+ -+ 2. Basic Permissions. -+ -+ All rights granted under this License are granted for the term of -+copyright on the Program, and are irrevocable provided the stated -+conditions are met. This License explicitly affirms your unlimited -+permission to run the unmodified Program. The output from running a -+covered work is covered by this License only if the output, given its -+content, constitutes a covered work. This License acknowledges your -+rights of fair use or other equivalent, as provided by copyright law. -+ -+ You may make, run and propagate covered works that you do not -+convey, without conditions so long as your license otherwise remains -+in force. You may convey covered works to others for the sole purpose -+of having them make modifications exclusively for you, or provide you -+with facilities for running those works, provided that you comply with -+the terms of this License in conveying all material for which you do -+not control copyright. Those thus making or running the covered works -+for you must do so exclusively on your behalf, under your direction -+and control, on terms that prohibit them from making any copies of -+your copyrighted material outside their relationship with you. -+ -+ Conveying under any other circumstances is permitted solely under -+the conditions stated below. Sublicensing is not allowed; section 10 -+makes it unnecessary. -+ -+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law. -+ -+ No covered work shall be deemed part of an effective technological -+measure under any applicable law fulfilling obligations under article -+11 of the WIPO copyright treaty adopted on 20 December 1996, or -+similar laws prohibiting or restricting circumvention of such -+measures. -+ -+ When you convey a covered work, you waive any legal power to forbid -+circumvention of technological measures to the extent such circumvention -+is effected by exercising rights under this License with respect to -+the covered work, and you disclaim any intention to limit operation or -+modification of the work as a means of enforcing, against the work's -+users, your or third parties' legal rights to forbid circumvention of -+technological measures. -+ -+ 4. Conveying Verbatim Copies. -+ -+ You may convey verbatim copies of the Program's source code as you -+receive it, in any medium, provided that you conspicuously and -+appropriately publish on each copy an appropriate copyright notice; -+keep intact all notices stating that this License and any -+non-permissive terms added in accord with section 7 apply to the code; -+keep intact all notices of the absence of any warranty; and give all -+recipients a copy of this License along with the Program. -+ -+ You may charge any price or no price for each copy that you convey, -+and you may offer support or warranty protection for a fee. -+ -+ 5. Conveying Modified Source Versions. -+ -+ You may convey a work based on the Program, or the modifications to -+produce it from the Program, in the form of source code under the -+terms of section 4, provided that you also meet all of these conditions: -+ -+ a) The work must carry prominent notices stating that you modified -+ it, and giving a relevant date. -+ -+ b) The work must carry prominent notices stating that it is -+ released under this License and any conditions added under section -+ 7. This requirement modifies the requirement in section 4 to -+ "keep intact all notices". -+ -+ c) You must license the entire work, as a whole, under this -+ License to anyone who comes into possession of a copy. This -+ License will therefore apply, along with any applicable section 7 -+ additional terms, to the whole of the work, and all its parts, -+ regardless of how they are packaged. This License gives no -+ permission to license the work in any other way, but it does not -+ invalidate such permission if you have separately received it. -+ -+ d) If the work has interactive user interfaces, each must display -+ Appropriate Legal Notices; however, if the Program has interactive -+ interfaces that do not display Appropriate Legal Notices, your -+ work need not make them do so. -+ -+ A compilation of a covered work with other separate and independent -+works, which are not by their nature extensions of the covered work, -+and which are not combined with it such as to form a larger program, -+in or on a volume of a storage or distribution medium, is called an -+"aggregate" if the compilation and its resulting copyright are not -+used to limit the access or legal rights of the compilation's users -+beyond what the individual works permit. Inclusion of a covered work -+in an aggregate does not cause this License to apply to the other -+parts of the aggregate. -+ -+ 6. Conveying Non-Source Forms. -+ -+ You may convey a covered work in object code form under the terms -+of sections 4 and 5, provided that you also convey the -+machine-readable Corresponding Source under the terms of this License, -+in one of these ways: -+ -+ a) Convey the object code in, or embodied in, a physical product -+ (including a physical distribution medium), accompanied by the -+ Corresponding Source fixed on a durable physical medium -+ customarily used for software interchange. -+ -+ b) Convey the object code in, or embodied in, a physical product -+ (including a physical distribution medium), accompanied by a -+ written offer, valid for at least three years and valid for as -+ long as you offer spare parts or customer support for that product -+ model, to give anyone who possesses the object code either (1) a -+ copy of the Corresponding Source for all the software in the -+ product that is covered by this License, on a durable physical -+ medium customarily used for software interchange, for a price no -+ more than your reasonable cost of physically performing this -+ conveying of source, or (2) access to copy the -+ Corresponding Source from a network server at no charge. -+ -+ c) Convey individual copies of the object code with a copy of the -+ written offer to provide the Corresponding Source. This -+ alternative is allowed only occasionally and noncommercially, and -+ only if you received the object code with such an offer, in accord -+ with subsection 6b. -+ -+ d) Convey the object code by offering access from a designated -+ place (gratis or for a charge), and offer equivalent access to the -+ Corresponding Source in the same way through the same place at no -+ further charge. You need not require recipients to copy the -+ Corresponding Source along with the object code. If the place to -+ copy the object code is a network server, the Corresponding Source -+ may be on a different server (operated by you or a third party) -+ that supports equivalent copying facilities, provided you maintain -+ clear directions next to the object code saying where to find the -+ Corresponding Source. Regardless of what server hosts the -+ Corresponding Source, you remain obligated to ensure that it is -+ available for as long as needed to satisfy these requirements. -+ -+ e) Convey the object code using peer-to-peer transmission, provided -+ you inform other peers where the object code and Corresponding -+ Source of the work are being offered to the general public at no -+ charge under subsection 6d. -+ -+ A separable portion of the object code, whose source code is excluded -+from the Corresponding Source as a System Library, need not be -+included in conveying the object code work. -+ -+ A "User Product" is either (1) a "consumer product", which means any -+tangible personal property which is normally used for personal, family, -+or household purposes, or (2) anything designed or sold for incorporation -+into a dwelling. In determining whether a product is a consumer product, -+doubtful cases shall be resolved in favor of coverage. For a particular -+product received by a particular user, "normally used" refers to a -+typical or common use of that class of product, regardless of the status -+of the particular user or of the way in which the particular user -+actually uses, or expects or is expected to use, the product. A product -+is a consumer product regardless of whether the product has substantial -+commercial, industrial or non-consumer uses, unless such uses represent -+the only significant mode of use of the product. -+ -+ "Installation Information" for a User Product means any methods, -+procedures, authorization keys, or other information required to install -+and execute modified versions of a covered work in that User Product from -+a modified version of its Corresponding Source. The information must -+suffice to ensure that the continued functioning of the modified object -+code is in no case prevented or interfered with solely because -+modification has been made. -+ -+ If you convey an object code work under this section in, or with, or -+specifically for use in, a User Product, and the conveying occurs as -+part of a transaction in which the right of possession and use of the -+User Product is transferred to the recipient in perpetuity or for a -+fixed term (regardless of how the transaction is characterized), the -+Corresponding Source conveyed under this section must be accompanied -+by the Installation Information. But this requirement does not apply -+if neither you nor any third party retains the ability to install -+modified object code on the User Product (for example, the work has -+been installed in ROM). -+ -+ The requirement to provide Installation Information does not include a -+requirement to continue to provide support service, warranty, or updates -+for a work that has been modified or installed by the recipient, or for -+the User Product in which it has been modified or installed. Access to a -+network may be denied when the modification itself materially and -+adversely affects the operation of the network or violates the rules and -+protocols for communication across the network. -+ -+ Corresponding Source conveyed, and Installation Information provided, -+in accord with this section must be in a format that is publicly -+documented (and with an implementation available to the public in -+source code form), and must require no special password or key for -+unpacking, reading or copying. -+ -+ 7. Additional Terms. -+ -+ "Additional permissions" are terms that supplement the terms of this -+License by making exceptions from one or more of its conditions. -+Additional permissions that are applicable to the entire Program shall -+be treated as though they were included in this License, to the extent -+that they are valid under applicable law. If additional permissions -+apply only to part of the Program, that part may be used separately -+under those permissions, but the entire Program remains governed by -+this License without regard to the additional permissions. -+ -+ When you convey a copy of a covered work, you may at your option -+remove any additional permissions from that copy, or from any part of -+it. (Additional permissions may be written to require their own -+removal in certain cases when you modify the work.) You may place -+additional permissions on material, added by you to a covered work, -+for which you have or can give appropriate copyright permission. -+ -+ Notwithstanding any other provision of this License, for material you -+add to a covered work, you may (if authorized by the copyright holders of -+that material) supplement the terms of this License with terms: -+ -+ a) Disclaiming warranty or limiting liability differently from the -+ terms of sections 15 and 16 of this License; or -+ -+ b) Requiring preservation of specified reasonable legal notices or -+ author attributions in that material or in the Appropriate Legal -+ Notices displayed by works containing it; or -+ -+ c) Prohibiting misrepresentation of the origin of that material, or -+ requiring that modified versions of such material be marked in -+ reasonable ways as different from the original version; or -+ -+ d) Limiting the use for publicity purposes of names of licensors or -+ authors of the material; or -+ -+ e) Declining to grant rights under trademark law for use of some -+ trade names, trademarks, or service marks; or -+ -+ f) Requiring indemnification of licensors and authors of that -+ material by anyone who conveys the material (or modified versions of -+ it) with contractual assumptions of liability to the recipient, for -+ any liability that these contractual assumptions directly impose on -+ those licensors and authors. -+ -+ All other non-permissive additional terms are considered "further -+restrictions" within the meaning of section 10. If the Program as you -+received it, or any part of it, contains a notice stating that it is -+governed by this License along with a term that is a further -+restriction, you may remove that term. If a license document contains -+a further restriction but permits relicensing or conveying under this -+License, you may add to a covered work material governed by the terms -+of that license document, provided that the further restriction does -+not survive such relicensing or conveying. -+ -+ If you add terms to a covered work in accord with this section, you -+must place, in the relevant source files, a statement of the -+additional terms that apply to those files, or a notice indicating -+where to find the applicable terms. -+ -+ Additional terms, permissive or non-permissive, may be stated in the -+form of a separately written license, or stated as exceptions; -+the above requirements apply either way. -+ -+ 8. Termination. -+ -+ You may not propagate or modify a covered work except as expressly -+provided under this License. Any attempt otherwise to propagate or -+modify it is void, and will automatically terminate your rights under -+this License (including any patent licenses granted under the third -+paragraph of section 11). -+ -+ However, if you cease all violation of this License, then your -+license from a particular copyright holder is reinstated (a) -+provisionally, unless and until the copyright holder explicitly and -+finally terminates your license, and (b) permanently, if the copyright -+holder fails to notify you of the violation by some reasonable means -+prior to 60 days after the cessation. -+ -+ Moreover, your license from a particular copyright holder is -+reinstated permanently if the copyright holder notifies you of the -+violation by some reasonable means, this is the first time you have -+received notice of violation of this License (for any work) from that -+copyright holder, and you cure the violation prior to 30 days after -+your receipt of the notice. -+ -+ Termination of your rights under this section does not terminate the -+licenses of parties who have received copies or rights from you under -+this License. If your rights have been terminated and not permanently -+reinstated, you do not qualify to receive new licenses for the same -+material under section 10. -+ -+ 9. Acceptance Not Required for Having Copies. -+ -+ You are not required to accept this License in order to receive or -+run a copy of the Program. Ancillary propagation of a covered work -+occurring solely as a consequence of using peer-to-peer transmission -+to receive a copy likewise does not require acceptance. However, -+nothing other than this License grants you permission to propagate or -+modify any covered work. These actions infringe copyright if you do -+not accept this License. Therefore, by modifying or propagating a -+covered work, you indicate your acceptance of this License to do so. -+ -+ 10. Automatic Licensing of Downstream Recipients. -+ -+ Each time you convey a covered work, the recipient automatically -+receives a license from the original licensors, to run, modify and -+propagate that work, subject to this License. You are not responsible -+for enforcing compliance by third parties with this License. -+ -+ An "entity transaction" is a transaction transferring control of an -+organization, or substantially all assets of one, or subdividing an -+organization, or merging organizations. If propagation of a covered -+work results from an entity transaction, each party to that -+transaction who receives a copy of the work also receives whatever -+licenses to the work the party's predecessor in interest had or could -+give under the previous paragraph, plus a right to possession of the -+Corresponding Source of the work from the predecessor in interest, if -+the predecessor has it or can get it with reasonable efforts. -+ -+ You may not impose any further restrictions on the exercise of the -+rights granted or affirmed under this License. For example, you may -+not impose a license fee, royalty, or other charge for exercise of -+rights granted under this License, and you may not initiate litigation -+(including a cross-claim or counterclaim in a lawsuit) alleging that -+any patent claim is infringed by making, using, selling, offering for -+sale, or importing the Program or any portion of it. -+ -+ 11. Patents. -+ -+ A "contributor" is a copyright holder who authorizes use under this -+License of the Program or a work on which the Program is based. The -+work thus licensed is called the contributor's "contributor version". -+ -+ A contributor's "essential patent claims" are all patent claims -+owned or controlled by the contributor, whether already acquired or -+hereafter acquired, that would be infringed by some manner, permitted -+by this License, of making, using, or selling its contributor version, -+but do not include claims that would be infringed only as a -+consequence of further modification of the contributor version. For -+purposes of this definition, "control" includes the right to grant -+patent sublicenses in a manner consistent with the requirements of -+this License. -+ -+ Each contributor grants you a non-exclusive, worldwide, royalty-free -+patent license under the contributor's essential patent claims, to -+make, use, sell, offer for sale, import and otherwise run, modify and -+propagate the contents of its contributor version. -+ -+ In the following three paragraphs, a "patent license" is any express -+agreement or commitment, however denominated, not to enforce a patent -+(such as an express permission to practice a patent or covenant not to -+sue for patent infringement). To "grant" such a patent license to a -+party means to make such an agreement or commitment not to enforce a -+patent against the party. -+ -+ If you convey a covered work, knowingly relying on a patent license, -+and the Corresponding Source of the work is not available for anyone -+to copy, free of charge and under the terms of this License, through a -+publicly available network server or other readily accessible means, -+then you must either (1) cause the Corresponding Source to be so -+available, or (2) arrange to deprive yourself of the benefit of the -+patent license for this particular work, or (3) arrange, in a manner -+consistent with the requirements of this License, to extend the patent -+license to downstream recipients. "Knowingly relying" means you have -+actual knowledge that, but for the patent license, your conveying the -+covered work in a country, or your recipient's use of the covered work -+in a country, would infringe one or more identifiable patents in that -+country that you have reason to believe are valid. -+ -+ If, pursuant to or in connection with a single transaction or -+arrangement, you convey, or propagate by procuring conveyance of, a -+covered work, and grant a patent license to some of the parties -+receiving the covered work authorizing them to use, propagate, modify -+or convey a specific copy of the covered work, then the patent license -+you grant is automatically extended to all recipients of the covered -+work and works based on it. -+ -+ A patent license is "discriminatory" if it does not include within -+the scope of its coverage, prohibits the exercise of, or is -+conditioned on the non-exercise of one or more of the rights that are -+specifically granted under this License. You may not convey a covered -+work if you are a party to an arrangement with a third party that is -+in the business of distributing software, under which you make payment -+to the third party based on the extent of your activity of conveying -+the work, and under which the third party grants, to any of the -+parties who would receive the covered work from you, a discriminatory -+patent license (a) in connection with copies of the covered work -+conveyed by you (or copies made from those copies), or (b) primarily -+for and in connection with specific products or compilations that -+contain the covered work, unless you entered into that arrangement, -+or that patent license was granted, prior to 28 March 2007. -+ -+ Nothing in this License shall be construed as excluding or limiting -+any implied license or other defenses to infringement that may -+otherwise be available to you under applicable patent law. -+ -+ 12. No Surrender of Others' Freedom. -+ -+ If conditions are imposed on you (whether by court order, agreement or -+otherwise) that contradict the conditions of this License, they do not -+excuse you from the conditions of this License. If you cannot convey a -+covered work so as to satisfy simultaneously your obligations under this -+License and any other pertinent obligations, then as a consequence you may -+not convey it at all. For example, if you agree to terms that obligate you -+to collect a royalty for further conveying from those to whom you convey -+the Program, the only way you could satisfy both those terms and this -+License would be to refrain entirely from conveying the Program. -+ -+ 13. Use with the GNU Affero General Public License. -+ -+ Notwithstanding any other provision of this License, you have -+permission to link or combine any covered work with a work licensed -+under version 3 of the GNU Affero General Public License into a single -+combined work, and to convey the resulting work. The terms of this -+License will continue to apply to the part which is the covered work, -+but the special requirements of the GNU Affero General Public License, -+section 13, concerning interaction through a network will apply to the -+combination as such. -+ -+ 14. Revised Versions of this License. -+ -+ The Free Software Foundation may publish revised and/or new versions of -+the GNU General Public License from time to time. Such new versions will -+be similar in spirit to the present version, but may differ in detail to -+address new problems or concerns. -+ -+ Each version is given a distinguishing version number. If the -+Program specifies that a certain numbered version of the GNU General -+Public License "or any later version" applies to it, you have the -+option of following the terms and conditions either of that numbered -+version or of any later version published by the Free Software -+Foundation. If the Program does not specify a version number of the -+GNU General Public License, you may choose any version ever published -+by the Free Software Foundation. -+ -+ If the Program specifies that a proxy can decide which future -+versions of the GNU General Public License can be used, that proxy's -+public statement of acceptance of a version permanently authorizes you -+to choose that version for the Program. -+ -+ Later license versions may give you additional or different -+permissions. However, no additional obligations are imposed on any -+author or copyright holder as a result of your choosing to follow a -+later version. -+ -+ 15. Disclaimer of Warranty. -+ -+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -+ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -+ -+ 16. Limitation of Liability. -+ -+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -+SUCH DAMAGES. -+ -+ 17. Interpretation of Sections 15 and 16. -+ -+ If the disclaimer of warranty and limitation of liability provided -+above cannot be given local legal effect according to their terms, -+reviewing courts shall apply local law that most closely approximates -+an absolute waiver of all civil liability in connection with the -+Program, unless a warranty or assumption of liability accompanies a -+copy of the Program in return for a fee. -+ -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs -+ -+ If you develop a new program, and you want it to be of the greatest -+possible use to the public, the best way to achieve this is to make it -+free software which everyone can redistribute and change under these terms. -+ -+ To do so, attach the following notices to the program. It is safest -+to attach them to the start of each source file to most effectively -+state the exclusion of warranty; and each file should have at least -+the "copyright" line and a pointer to where the full notice is found. -+ -+ -+ Copyright (C) -+ -+ This program is free software: you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation, either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . -+ -+Also add information on how to contact you by electronic and paper mail. -+ -+ If the program does terminal interaction, make it output a short -+notice like this when it starts in an interactive mode: -+ -+ Copyright (C) -+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -+ This is free software, and you are welcome to redistribute it -+ under certain conditions; type `show c' for details. -+ -+The hypothetical commands `show w' and `show c' should show the appropriate -+parts of the General Public License. Of course, your program's commands -+might be different; for a GUI interface, you would use an "about box". -+ -+ You should also get your employer (if you work as a programmer) or school, -+if any, to sign a "copyright disclaimer" for the program, if necessary. -+For more information on this, and how to apply and follow the GNU GPL, see -+. -+ -+ The GNU General Public License does not permit incorporating your program -+into proprietary programs. If your program is a subroutine library, you -+may consider it more useful to permit linking proprietary applications with -+the library. If this is what you want to do, use the GNU Lesser General -+Public License instead of this License. But first, please read -+. diff --git a/buildroot/package/usbutils/usbutils.hash b/buildroot/package/usbutils/usbutils.hash index 3bdb657f8..440491319 100644 --- a/buildroot/package/usbutils/usbutils.hash +++ b/buildroot/package/usbutils/usbutils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc -sha256 61c7364bb4986fb05e5067e4ac5585b1299b664c57f761caecd2e9e724794a19 usbutils-010.tar.xz +sha256 88634625f91840bc1993d2731cc081ee8d3b13d56069a95bdd6ac6ef0e063e46 usbutils-012.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0.txt sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0.txt diff --git a/buildroot/package/usbutils/usbutils.mk b/buildroot/package/usbutils/usbutils.mk index 4bd12f34f..2389386e5 100644 --- a/buildroot/package/usbutils/usbutils.mk +++ b/buildroot/package/usbutils/usbutils.mk @@ -4,12 +4,14 @@ # ################################################################################ -USBUTILS_VERSION = 010 +USBUTILS_VERSION = 012 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils USBUTILS_DEPENDENCIES = host-pkgconf libusb udev USBUTILS_LICENSE = GPL-2.0+ (utils) GPL-2.0 or GPL-3.0 (lsusb.py) USBUTILS_LICENSE_FILES = LICENSES/GPL-2.0.txt LICENSES/GPL-3.0.txt +# Missing configure script +USBUTILS_AUTORECONF = YES # Nice lsusb.py script only if there's python 3.x ifeq ($(BR2_PACKAGE_PYTHON3),) @@ -20,10 +22,4 @@ endef USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_PYTHON endif -define USBUTILS_TARGET_CLEANUP - rm -f $(TARGET_DIR)/usr/bin/usb-devices -endef - -USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_TARGET_CLEANUP - $(eval $(autotools-package)) diff --git a/buildroot/package/ushare/ushare.hash b/buildroot/package/ushare/ushare.hash index 77f0f0f85..03c675f09 100644 --- a/buildroot/package/ushare/ushare.hash +++ b/buildroot/package/ushare/ushare.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665 ushare-1.1a.tar.bz2 +sha256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665 ushare-1.1a.tar.bz2 +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/ussp-push/Config.in b/buildroot/package/ussp-push/Config.in index aefec85a2..276c8dca2 100644 --- a/buildroot/package/ussp-push/Config.in +++ b/buildroot/package/ussp-push/Config.in @@ -1,17 +1,21 @@ config BR2_PACKAGE_USSP_PUSH bool "ussp-push" - depends on !BR2_STATIC_LIBS # bluez_utils + depends on !BR2_STATIC_LIBS # bluez5_utils depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 depends on BR2_USE_MMU # dbus + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils select BR2_PACKAGE_OPENOBEX - select BR2_PACKAGE_BLUEZ_UTILS + select BR2_PACKAGE_BLUEZ5_UTILS help ussp-push is an OBEX object pusher for Linux, using the BlueZ BlueTooth stack. http://www.xmailserver.org/ussp-push.html -comment "ussp-push needs a toolchain w/ wchar, threads, dynamic library" +comment "ussp-push needs a toolchain w/ wchar, threads, dynamic library, headers >= 3.4" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 diff --git a/buildroot/package/ussp-push/ussp-push.mk b/buildroot/package/ussp-push/ussp-push.mk index 0c45c291a..c0479270a 100644 --- a/buildroot/package/ussp-push/ussp-push.mk +++ b/buildroot/package/ussp-push/ussp-push.mk @@ -9,6 +9,6 @@ USSP_PUSH_SITE = http://www.xmailserver.org USSP_PUSH_LICENSE = GPL-2.0+ USSP_PUSH_LICENSE_FILES = COPYING -USSP_PUSH_DEPENDENCIES = bluez_utils openobex +USSP_PUSH_DEPENDENCIES = bluez5_utils openobex $(eval $(autotools-package)) diff --git a/buildroot/package/ustr/Config.in b/buildroot/package/ustr/Config.in deleted file mode 100644 index 9d6561c34..000000000 --- a/buildroot/package/ustr/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_USTR - bool "ustr" - # unconditionally builds a shared library - depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # broken vsnprintf detection - help - A small, safe string library. - - http://www.and.org/ustr/ - -comment "ustr needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL diff --git a/buildroot/package/ustr/ustr.hash b/buildroot/package/ustr/ustr.hash deleted file mode 100644 index 878c60733..000000000 --- a/buildroot/package/ustr/ustr.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally computed -sha256 3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4 ustr-1.0.4.tar.bz2 -# From http://debian.gtisc.gatech.edu/debian/pool/main/u/ustr/ustr_1.0.4-6.dsc -sha256 75aa6be2c70eba632ac63078e55ecb4b5a45e6624501a8ed6d81b9a2014d149e ustr_1.0.4-6.debian.tar.xz diff --git a/buildroot/package/ustr/ustr.mk b/buildroot/package/ustr/ustr.mk deleted file mode 100644 index c99ada527..000000000 --- a/buildroot/package/ustr/ustr.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# ustr -# -################################################################################ - -# When bumping the version to a new upstream release, be sure to remove -# the ldconfig hack, below. -USTR_VERSION = 1.0.4 -USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2 -USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION) -USTR_LICENSE = BSD-2-Clause, MIT, LGPL-2.0+ -USTR_LICENSE_FILES = LICENSE LICENSE_BSD LICENSE_LGPL LICENSE_MIT -USTR_AUTORECONF = YES -USTR_PATCH = \ - http://snapshot.debian.org/archive/debian/20180131T223129Z/pool/main/u/ustr/ustr_$(USTR_VERSION)-6.debian.tar.xz - -USTR_INSTALL_STAGING = YES - -# ustr only builds the static library by default, but the default -# install rule will install both the static and the shared libraries, -# which means the shared one is build during the install step. :-( -# -# We can however instruct ustr to build both at build time, by adding -# 'all-shared' to the default 'all' rule. -USTR_MAKE_OPTS = all all-shared - -USTR_CONF_OPTS += LDCONFIG=/bin/true -HOST_USTR_CONF_OPTS += LDCONFIG=/bin/true - -# for some reason, ustr finds it useful to install its source code in -# /usr/share, which is totally useless on the target -define USTR_REMOVE_SOURCE_CODE - $(RM) -rf $(TARGET_DIR)/usr/share/ustr-$(USTR_VERSION) -endef -USTR_POST_INSTALL_TARGET_HOOKS += USTR_REMOVE_SOURCE_CODE - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/buildroot/package/utf8proc/Config.in b/buildroot/package/utf8proc/Config.in new file mode 100644 index 000000000..43b507389 --- /dev/null +++ b/buildroot/package/utf8proc/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_UTF8PROC + bool "utf8proc" + help + A clean C library for processing UTF-8 Unicode data. + + https://juliastrings.github.io/utf8proc diff --git a/buildroot/package/utf8proc/utf8proc.hash b/buildroot/package/utf8proc/utf8proc.hash new file mode 100644 index 000000000..da85a3c7c --- /dev/null +++ b/buildroot/package/utf8proc/utf8proc.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 b2e5d547c1d94762a6d03a7e05cea46092aab68636460ff8648f1295e2cdfbd7 utf8proc-2.4.0.tar.gz +sha256 6acb7a86aca74317c6b4dddc2eadeb53bededb95a94a48c3fcd517f4473a653d LICENSE.md diff --git a/buildroot/package/utf8proc/utf8proc.mk b/buildroot/package/utf8proc/utf8proc.mk new file mode 100644 index 000000000..2d60387e7 --- /dev/null +++ b/buildroot/package/utf8proc/utf8proc.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# utf8proc +# +################################################################################ + +UTF8PROC_VERSION = 2.4.0 +UTF8PROC_SITE = $(call github,JuliaStrings,utf8proc,v$(UTF8PROC_VERSION)) +UTF8PROC_LICENSE = MIT +UTF8PROC_LICENSE_FILES = LICENSE.md +UTF8PROC_INSTALL_STAGING = YES +UTF8PROC_SUPPORTS_IN_SOURCE_BUILD = NO + +$(eval $(cmake-package)) diff --git a/buildroot/package/util-linux/0001-rtcwake-use-poweroff-if-shutdown-is-not-found.patch b/buildroot/package/util-linux/0001-rtcwake-use-poweroff-if-shutdown-is-not-found.patch deleted file mode 100644 index b97be2ef0..000000000 --- a/buildroot/package/util-linux/0001-rtcwake-use-poweroff-if-shutdown-is-not-found.patch +++ /dev/null @@ -1,86 +0,0 @@ -From e1686b25acdedb34cc357f08f0dd3ca01c559dfd Mon Sep 17 00:00:00 2001 -From: Justin Chen -Date: Thu, 1 Nov 2018 11:10:38 -0700 -Subject: [PATCH] rtcwake: use poweroff if shutdown is not found - -Some systems do not have the shutdown command. Use poweroff as an -alternative. - -Signed-off-by: Justin Chen ---- - include/pathnames.h | 1 + - sys-utils/rtcwake.c | 39 +++++++++++++++++++++++++++------------ - 2 files changed, 28 insertions(+), 12 deletions(-) - -diff --git a/include/pathnames.h b/include/pathnames.h -index 3d5052e6f..ed8ea330d 100644 ---- a/include/pathnames.h -+++ b/include/pathnames.h -@@ -53,6 +53,7 @@ - # define _PATH_LOGIN "/bin/login" - #endif - #define _PATH_SHUTDOWN "/sbin/shutdown" -+#define _PATH_POWEROFF "/sbin/poweroff" - - #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d" - #define _PATH_TERMCOLORS_DIR "/etc/" _PATH_TERMCOLORS_DIRNAME -diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c -index b63c64627..029f00f9b 100644 ---- a/sys-utils/rtcwake.c -+++ b/sys-utils/rtcwake.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -582,18 +583,32 @@ int main(int argc, char **argv) - char *arg[5]; - int i = 0; - -- if (ctl.verbose) -- printf(_("suspend mode: off; executing %s\n"), -- _PATH_SHUTDOWN); -- arg[i++] = _PATH_SHUTDOWN; -- arg[i++] = "-h"; -- arg[i++] = "-P"; -- arg[i++] = "now"; -- arg[i] = NULL; -- if (!ctl.dryrun) { -- execv(arg[0], arg); -- warn(_("failed to execute %s"), _PATH_SHUTDOWN); -- rc = EXIT_FAILURE; -+ if (!access(_PATH_SHUTDOWN, X_OK)) { -+ arg[i++] = _PATH_SHUTDOWN; -+ arg[i++] = "-h"; -+ arg[i++] = "-P"; -+ arg[i++] = "now"; -+ arg[i] = NULL; -+ } else if (!access(_PATH_POWEROFF, X_OK)) { -+ arg[i++] = _PATH_POWEROFF; -+ arg[i] = NULL; -+ } else { -+ arg[i] = NULL; -+ } -+ -+ if (arg[0]) { -+ if (ctl.verbose) -+ printf(_("suspend mode: off; executing %s\n"), -+ arg[0]); -+ if (!ctl.dryrun) { -+ execv(arg[0], arg); -+ warn(_("failed to execute %s"), arg[0]); -+ rc = EX_EXEC_ENOENT; -+ } -+ } else { -+ /* Failed to find shutdown command */ -+ warn(_("failed to find shutdown command")); -+ rc = EX_EXEC_ENOENT; - } - break; - } --- -2.17.1 - diff --git a/buildroot/package/util-linux/0002-agetty-fix-output-of-escaped-characters.patch b/buildroot/package/util-linux/0002-agetty-fix-output-of-escaped-characters.patch deleted file mode 100644 index fcd973134..000000000 --- a/buildroot/package/util-linux/0002-agetty-fix-output-of-escaped-characters.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 73c5a3cc748b853936319e6cdc94159a6974db52 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Wed, 7 Nov 2018 13:55:06 +0100 -Subject: [PATCH] agetty: fix output of escaped characters - -Signed-off-by: Christian Hesse ---- - term-utils/agetty.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/term-utils/agetty.c b/term-utils/agetty.c -index 05a269abb..b9f08728e 100644 ---- a/term-utils/agetty.c -+++ b/term-utils/agetty.c -@@ -2755,7 +2755,7 @@ static void output_special_char(struct issue *ie, - break; - } - default: -- putchar(c); -+ putc(c, ie->output); - break; - } - } --- -2.17.1 - diff --git a/buildroot/package/util-linux/0003-blkdiscard-use-O_EXCL-add-force.patch b/buildroot/package/util-linux/0003-blkdiscard-use-O_EXCL-add-force.patch new file mode 100644 index 000000000..0ecb86702 --- /dev/null +++ b/buildroot/package/util-linux/0003-blkdiscard-use-O_EXCL-add-force.patch @@ -0,0 +1,86 @@ +From 34fed3ff1740aded9c2aae6b5d67a4eb696f738e Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 9 Jan 2020 11:03:51 +0100 +Subject: [PATCH] blkdiscard: use O_EXCL, add --force + +Let's make it more robust and safe. O_EXCL is an elegant way how to avoid +unwanted discard on mounted device. + +Addresses: https://github.com/karelzak/util-linux/issues/915 +Signed-off-by: Karel Zak +Signed-off-by: Carlos Santos +--- + sys-utils/blkdiscard.8 | 5 +++++ + sys-utils/blkdiscard.c | 11 ++++++++--- + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/sys-utils/blkdiscard.8 b/sys-utils/blkdiscard.8 +index 1f3a32be9..98c6f36a9 100644 +--- a/sys-utils/blkdiscard.8 ++++ b/sys-utils/blkdiscard.8 +@@ -36,6 +36,11 @@ MiB (=1024*1024), and so on for GiB, TiB, PiB, EiB, ZiB and YiB (the "iB" is + optional, e.g., "K" has the same meaning as "KiB") or the suffixes + KB (=1000), MB (=1000*1000), and so on for GB, TB, PB, EB, ZB and YB. + .TP ++.BR \-f , " \-\-force" ++Disable all checking. Since v2.36 the block device is open in exclusive mode (O_EXCL) ++by default to avoid collision with mounted filesystem or another kernel subsystem. ++The force option disables the exclusive access mode. ++.TP + .BR \-o , " \-\-offset \fIoffset" + Byte offset into the device from which to start discarding. The provided value + will be aligned to the device sector size. The default value is zero. +diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c +index f9ba5e468..589974f9c 100644 +--- a/sys-utils/blkdiscard.c ++++ b/sys-utils/blkdiscard.c +@@ -88,6 +88,7 @@ static void __attribute__((__noreturn__)) usage(void) + fputs(_("Discard the content of sectors on a device.\n"), out); + + fputs(USAGE_OPTIONS, out); ++ fputs(_(" -f, --force disable all checking\n"), out); + fputs(_(" -o, --offset offset in bytes to discard from\n"), out); + fputs(_(" -l, --length length of bytes to discard from the offset\n"), out); + fputs(_(" -p, --step size of the discard iterations within the offset\n"), out); +@@ -106,7 +107,7 @@ static void __attribute__((__noreturn__)) usage(void) + int main(int argc, char **argv) + { + char *path; +- int c, fd, verbose = 0, secsize; ++ int c, fd, verbose = 0, secsize, force = 0; + uint64_t end, blksize, step, range[2], stats[2]; + struct stat sb; + struct timeval now, last; +@@ -116,6 +117,7 @@ int main(int argc, char **argv) + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, 'V' }, + { "offset", required_argument, NULL, 'o' }, ++ { "force", no_argument, NULL, 'f' }, + { "length", required_argument, NULL, 'l' }, + { "step", required_argument, NULL, 'p' }, + { "secure", no_argument, NULL, 's' }, +@@ -133,8 +135,11 @@ int main(int argc, char **argv) + range[1] = ULLONG_MAX; + step = 0; + +- while ((c = getopt_long(argc, argv, "hVsvo:l:p:z", longopts, NULL)) != -1) { ++ while ((c = getopt_long(argc, argv, "hfVsvo:l:p:z", longopts, NULL)) != -1) { + switch(c) { ++ case 'f': ++ force = 1; ++ break; + case 'l': + range[1] = strtosize_or_err(optarg, + _("failed to parse length")); +@@ -176,7 +181,7 @@ int main(int argc, char **argv) + errtryhelp(EXIT_FAILURE); + } + +- fd = open(path, O_WRONLY); ++ fd = open(path, O_WRONLY | (force ? 0 : O_EXCL)); + if (fd < 0) + err(EXIT_FAILURE, _("cannot open %s"), path); + +-- +2.18.2 + diff --git a/buildroot/package/util-linux/0003-setarch-fix-obscure-sparc32bash-use-case.patch b/buildroot/package/util-linux/0003-setarch-fix-obscure-sparc32bash-use-case.patch deleted file mode 100644 index 70588b863..000000000 --- a/buildroot/package/util-linux/0003-setarch-fix-obscure-sparc32bash-use-case.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 3fa06e049012218d883d0e1251df86bafbc446bf Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 22 Nov 2018 11:03:35 +0100 -Subject: [PATCH] setarch: fix obscure sparc32bash use-case - -Reported-by: Carlos Santos -Signed-off-by: Karel Zak -Signed-off-by: Carlos Santos ---- - sys-utils/setarch.c | 28 ++++++++++++++++++---------- - 1 file changed, 18 insertions(+), 10 deletions(-) - -diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c -index a733f7b3c..7c0a63fbb 100644 ---- a/sys-utils/setarch.c -+++ b/sys-utils/setarch.c -@@ -268,6 +268,7 @@ int main(int argc, char *argv[]) - int c; - struct arch_domain *doms, *target; - unsigned long pers_value = 0; -+ char *shell = NULL, *shell_arg = NULL; - - /* Options without equivalent short options */ - enum { -@@ -310,14 +311,14 @@ int main(int argc, char *argv[]) - archwrapper = strcmp(program_invocation_short_name, "setarch") != 0; - if (archwrapper) { - arch = program_invocation_short_name; /* symlinks to setarch */ --#if defined(__sparc64__) || defined(__sparc__) -+ -+ /* Don't use ifdef sparc here, we get "Unrecognized architecture" -+ * error message later if necessary */ - if (strcmp(arch, "sparc32bash") == 0) { -- if (set_arch(arch, 0L, 0)) -- err(EXIT_FAILURE, _("Failed to set personality to %s"), arch); -- execl("/bin/bash", "", NULL); -- errexec("/bin/bash"); -+ shell = "/bin/bash"; -+ shell_arg = ""; -+ goto set_arch; - } --#endif - } else { - if (1 < argc && *argv[1] != '-') { - arch = argv[1]; -@@ -391,6 +392,7 @@ int main(int argc, char *argv[]) - argc -= optind; - argv += optind; - -+set_arch: - /* get execution domain (architecture) */ - if (arch) { - doms = init_arch_domains(); -@@ -422,17 +424,23 @@ int main(int argc, char *argv[]) - if (arch) - verify_arch_domain(target, arch); - -+ if (!argc) { -+ shell = "/bin/sh"; -+ shell_arg = "-sh"; -+ } - if (verbose) { -- printf(_("Execute command `%s'.\n"), argc ? argv[0] : "/bin/sh"); -+ printf(_("Execute command `%s'.\n"), shell ? shell : argv[0]); - /* flush all output streams before exec */ - fflush(NULL); - } - -- if (!argc) { -- execl("/bin/sh", "-sh", NULL); -- errexec("/bin/sh"); -+ /* Execute shell */ -+ if (shell) { -+ execl(shell, shell_arg, NULL); -+ errexec(shell); - } - -+ /* Execute on command line specified command */ - execvp(argv[0], argv); - errexec(argv[0]); - } --- -2.14.5 - diff --git a/buildroot/package/util-linux/0004-libfdisk-add-fdisk_set_disklabel_id_from_string.patch b/buildroot/package/util-linux/0004-libfdisk-add-fdisk_set_disklabel_id_from_string.patch new file mode 100644 index 000000000..eb28ae328 --- /dev/null +++ b/buildroot/package/util-linux/0004-libfdisk-add-fdisk_set_disklabel_id_from_string.patch @@ -0,0 +1,195 @@ +From e5f31446166de7212213c62a019945afb8e197ef Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 14 Jan 2020 11:43:24 +0100 +Subject: [PATCH] libfdisk: add fdisk_set_disklabel_id_from_string() + +We have fdisk_set_disklabel_id(), but it's old ask-API based function. +It's not comfortable if you want to avoid dialog or template. + +Addresses: https://github.com/karelzak/util-linux/issues/916 +Signed-off-by: Karel Zak +Signed-off-by: Carlos Santos +--- + libfdisk/docs/libfdisk-sections.txt | 1 + + libfdisk/src/dos.c | 29 ++++++++++++++++++----------- + libfdisk/src/fdiskP.h | 2 +- + libfdisk/src/gpt.c | 18 ++++++++++-------- + libfdisk/src/label.c | 19 ++++++++++++++++++- + libfdisk/src/libfdisk.h.in | 1 + + libfdisk/src/libfdisk.sym | 3 +++ + 7 files changed, 52 insertions(+), 21 deletions(-) + +diff --git a/libfdisk/docs/libfdisk-sections.txt b/libfdisk/docs/libfdisk-sections.txt +index f148da527..6675c1100 100644 +--- a/libfdisk/docs/libfdisk-sections.txt ++++ b/libfdisk/docs/libfdisk-sections.txt +@@ -81,6 +81,7 @@ fdisk_list_disklabel + fdisk_locate_disklabel + fdisk_reorder_partitions + fdisk_set_disklabel_id ++fdisk_set_disklabel_id_from_string + fdisk_set_partition_type + fdisk_toggle_partition_flag + fdisk_verify_disklabel +diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c +index 53713ec5f..98314dfa6 100644 +--- a/libfdisk/src/dos.c ++++ b/libfdisk/src/dos.c +@@ -707,12 +707,12 @@ static int dos_create_disklabel(struct fdisk_context *cxt) + return 0; + } + +-static int dos_set_disklabel_id(struct fdisk_context *cxt) ++static int dos_set_disklabel_id(struct fdisk_context *cxt, const char *str) + { +- char *end = NULL, *str = NULL; ++ char *str0 = str; + unsigned int id, old; + struct fdisk_dos_label *l; +- int rc; ++ int rc = 0; + + assert(cxt); + assert(cxt->label); +@@ -722,18 +722,25 @@ static int dos_set_disklabel_id(struct fdisk_context *cxt) + + l = self_label(cxt); + old = mbr_get_id(cxt->firstsector); +- rc = fdisk_ask_string(cxt, ++ ++ if (!str) ++ rc = fdisk_ask_string(cxt, + _("Enter the new disk identifier"), &str); +- if (rc) +- return rc; ++ if (!rc) { ++ char *end = NULL; + +- errno = 0; +- id = strtoul(str, &end, 0); +- if (errno || str == end || (end && *end)) { +- fdisk_warnx(cxt, _("Incorrect value.")); +- return -EINVAL; ++ errno = 0; ++ id = strtoul(str, &end, 0); ++ if (errno || str == end || (end && *end)) { ++ fdisk_warnx(cxt, _("Incorrect value.")); ++ rc = -EINVAL; ++ } + } + ++ if (!str0) ++ free(str); ++ if (rc) ++ return -EINVAL; + + mbr_set_id(cxt->firstsector, id); + l->non_pt_changed = 1; +diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h +index fefebae2a..0487466e3 100644 +--- a/libfdisk/src/fdiskP.h ++++ b/libfdisk/src/fdiskP.h +@@ -220,7 +220,7 @@ struct fdisk_label_operations { + /* get details from label */ + int (*get_item)(struct fdisk_context *cxt, struct fdisk_labelitem *item); + /* set disk label ID */ +- int (*set_id)(struct fdisk_context *cxt); ++ int (*set_id)(struct fdisk_context *cxt, const char *str); + + + /* new partition */ +diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c +index f50bb4441..9608053a2 100644 +--- a/libfdisk/src/gpt.c ++++ b/libfdisk/src/gpt.c +@@ -2502,11 +2502,11 @@ done: + return rc; + } + +-static int gpt_set_disklabel_id(struct fdisk_context *cxt) ++static int gpt_set_disklabel_id(struct fdisk_context *cxt, const char *str) + { + struct fdisk_gpt_label *gpt; + struct gpt_guid uuid; +- char *str, *old, *new; ++ char *old, *new; + int rc; + + assert(cxt); +@@ -2514,12 +2514,14 @@ static int gpt_set_disklabel_id(struct fdisk_context *cxt) + assert(fdisk_is_label(cxt, GPT)); + + gpt = self_label(cxt); +- if (fdisk_ask_string(cxt, +- _("Enter new disk UUID (in 8-4-4-4-12 format)"), &str)) +- return -EINVAL; +- +- rc = string_to_guid(str, &uuid); +- free(str); ++ if (!str) { ++ if (fdisk_ask_string(cxt, ++ _("Enter new disk UUID (in 8-4-4-4-12 format)"), &str)) ++ return -EINVAL; ++ rc = string_to_guid(str, &uuid); ++ free(str); ++ } else ++ rc = string_to_guid(str, &uuid); + + if (rc) { + fdisk_warnx(cxt, _("Failed to parse your UUID.")); +diff --git a/libfdisk/src/label.c b/libfdisk/src/label.c +index a18cdeaff..fd4555de2 100644 +--- a/libfdisk/src/label.c ++++ b/libfdisk/src/label.c +@@ -481,7 +481,24 @@ int fdisk_set_disklabel_id(struct fdisk_context *cxt) + return -ENOSYS; + + DBG(CXT, ul_debugobj(cxt, "setting %s disk ID", cxt->label->name)); +- return cxt->label->op->set_id(cxt); ++ return cxt->label->op->set_id(cxt, NULL); ++} ++ ++/** ++ * fdisk_set_disklabel_id_from_string ++ * @cxt: fdisk context ++ * ++ * Returns: 0 on success, otherwise, a corresponding error. ++ */ ++int fdisk_set_disklabel_id_from_string(struct fdisk_context *cxt, const char *str) ++{ ++ if (!cxt || !cxt->label || !str) ++ return -EINVAL; ++ if (!cxt->label->op->set_id) ++ return -ENOSYS; ++ ++ DBG(CXT, ul_debugobj(cxt, "setting %s disk ID from '%s'", cxt->label->name, str)); ++ return cxt->label->op->set_id(cxt, str); + } + + /** +diff --git a/libfdisk/src/libfdisk.h.in b/libfdisk/src/libfdisk.h.in +index 0669c0a7c..2ba34dc0a 100644 +--- a/libfdisk/src/libfdisk.h.in ++++ b/libfdisk/src/libfdisk.h.in +@@ -399,6 +399,7 @@ extern int fdisk_get_disklabel_item(struct fdisk_context *cxt, int id, struct fd + + extern int fdisk_get_disklabel_id(struct fdisk_context *cxt, char **id); + extern int fdisk_set_disklabel_id(struct fdisk_context *cxt); ++extern int fdisk_set_disklabel_id_from_string(struct fdisk_context *cxt, const char *str); + + extern int fdisk_get_partition(struct fdisk_context *cxt, size_t partno, struct fdisk_partition **pa); + extern int fdisk_set_partition(struct fdisk_context *cxt, size_t partno, struct fdisk_partition *pa); +diff --git a/libfdisk/src/libfdisk.sym b/libfdisk/src/libfdisk.sym +index 96fcadd71..eee2d6bda 100644 +--- a/libfdisk/src/libfdisk.sym ++++ b/libfdisk/src/libfdisk.sym +@@ -308,3 +308,6 @@ FDISK_2.35 { + fdisk_script_set_table; + fdisk_assign_device_by_fd; + } FDISK_2.33; ++FDISK_2.36 { ++ fdisk_set_disklabel_id_from_string; ++} FDISK_2.35; +-- +2.18.2 + diff --git a/buildroot/package/util-linux/0005-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch b/buildroot/package/util-linux/0005-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch new file mode 100644 index 000000000..fe435018f --- /dev/null +++ b/buildroot/package/util-linux/0005-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch @@ -0,0 +1,139 @@ +From 65e27d545cb54ac63536a8b6e7d5def180ddb5b7 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 14 Jan 2020 11:50:46 +0100 +Subject: [PATCH] sfdisk: add --disk-id to change disk UUID/ID + +Addresses: https://github.com/karelzak/util-linux/issues/916 +Signed-off-by: Karel Zak +Signed-off-by: Carlos Santos +--- + disk-utils/sfdisk.8 | 5 +++++ + disk-utils/sfdisk.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 59 insertions(+) + +diff --git a/disk-utils/sfdisk.8 b/disk-utils/sfdisk.8 +index 3ff5dd4e6..9ee71e81a 100644 +--- a/disk-utils/sfdisk.8 ++++ b/disk-utils/sfdisk.8 +@@ -152,6 +152,11 @@ or a GUID for GPT. For backward compatibility the options \fB\-c\fR and + Change the GPT partition UUID. If \fIuuid\fR is not specified, + then print the current partition UUID. + .TP ++.BR "\-\-disk\-id \fIdevice " [ \fIid ] ++Change the disk identifier. If \fIid\fR is not specified, ++then print the current identifier. The identifier is UUID for GPT ++or unsigned integer for MBR. ++.TP + .BR \-r , " \-\-reorder " \fIdevice + Renumber the partitions, ordering them by their start offset. + .TP +diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c +index bb6e1c6df..0db797b2d 100644 +--- a/disk-utils/sfdisk.c ++++ b/disk-utils/sfdisk.c +@@ -86,6 +86,7 @@ enum { + ACT_PARTUUID, + ACT_PARTLABEL, + ACT_PARTATTRS, ++ ACT_DISKID, + ACT_DELETE + }; + +@@ -1327,6 +1328,46 @@ static int command_partattrs(struct sfdisk *sf, int argc, char **argv) + return write_changes(sf); + } + ++/* ++ * sfdisk --disk-id [] ++ */ ++static int command_diskid(struct sfdisk *sf, int argc, char **argv) ++{ ++ const char *devname = NULL; ++ char *str = NULL; ++ ++ if (!argc) ++ errx(EXIT_FAILURE, _("no disk device specified")); ++ devname = argv[0]; ++ ++ if (argc == 2) ++ str = argv[1]; ++ else if (argc > 2) ++ errx(EXIT_FAILURE, _("unexpected arguments")); ++ ++ if (fdisk_assign_device(sf->cxt, devname, !str) != 0) ++ err(EXIT_FAILURE, _("cannot open %s"), devname); ++ ++ /* print */ ++ if (!str) { ++ fdisk_get_disklabel_id(sf->cxt, &str); ++ if (str) ++ printf("%s\n", str); ++ free(str); ++ fdisk_deassign_device(sf->cxt, 1); ++ return 0; ++ } ++ ++ /* change */ ++ if (sf->backup) ++ backup_partition_table(sf, devname); ++ ++ if (fdisk_set_disklabel_id_from_string(sf->cxt, str) != 0) ++ errx(EXIT_FAILURE, _("%s: failed to set disklabel ID"), devname); ++ ++ return write_changes(sf); ++} ++ + static void sfdisk_print_partition(struct sfdisk *sf, size_t n) + { + struct fdisk_partition *pa = NULL; +@@ -1941,6 +1982,9 @@ static void __attribute__((__noreturn__)) usage(void) + fputs(_(" --part-uuid [] print or change partition uuid\n"), out); + fputs(_(" --part-attrs [] print or change partition attributes\n"), out); + ++ fputs(USAGE_SEPARATOR, out); ++ fputs(_(" --disk-id [] print or change disk label ID (UUID)\n"), out); ++ + fputs(USAGE_SEPARATOR, out); + fputs(_(" device (usually disk) path\n"), out); + fputs(_(" partition number\n"), out); +@@ -2007,6 +2051,7 @@ int main(int argc, char *argv[]) + OPT_PARTLABEL, + OPT_PARTTYPE, + OPT_PARTATTRS, ++ OPT_DISKID, + OPT_BYTES, + OPT_COLOR, + OPT_MOVEDATA, +@@ -2052,6 +2097,8 @@ int main(int argc, char *argv[]) + { "part-type", no_argument, NULL, OPT_PARTTYPE }, + { "part-attrs", no_argument, NULL, OPT_PARTATTRS }, + ++ { "disk-id", no_argument, NULL, OPT_DISKID }, ++ + { "show-pt-geometry", no_argument, NULL, 'G' }, /* deprecated */ + { "unit", required_argument, NULL, 'u' }, /* deprecated */ + { "Linux", no_argument, NULL, 'L' }, /* deprecated */ +@@ -2192,6 +2239,9 @@ int main(int argc, char *argv[]) + case OPT_PARTATTRS: + sf->act = ACT_PARTATTRS; + break; ++ case OPT_DISKID: ++ sf->act = ACT_DISKID; ++ break; + case OPT_NOREREAD: + sf->noreread = 1; + break; +@@ -2296,6 +2346,10 @@ int main(int argc, char *argv[]) + rc = command_partattrs(sf, argc - optind, argv + optind); + break; + ++ case ACT_DISKID: ++ rc = command_diskid(sf, argc - optind, argv + optind); ++ break; ++ + case ACT_REORDER: + rc = command_reorder(sf, argc - optind, argv + optind); + break; +-- +2.18.2 + diff --git a/buildroot/package/util-linux/0006-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch b/buildroot/package/util-linux/0006-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch new file mode 100644 index 000000000..183b725a3 --- /dev/null +++ b/buildroot/package/util-linux/0006-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch @@ -0,0 +1,62 @@ +From 3cfde0370d3a8949df0c5bcf447cec6692910ed2 Mon Sep 17 00:00:00 2001 +From: Sami Kerola +Date: Sat, 15 Feb 2020 21:12:50 +0000 +Subject: [PATCH] kill: include sys/types.h before checking + SYS_pidfd_send_signal + +Including sys/types.h must happen before SYS_pidfd_send_signal is checked, +because that header defines variable in normal conditions. When sys/types.h +does not have SYS_pidfd_send_signal then fallback is defined in config.h +that is included by default, and has therefore worked fine before and after +this change. + +Signed-off-by: Sami Kerola +Signed-off-by: Carlos Santos +--- + include/pidfd-utils.h | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h +index 593346576..0baedd2c9 100644 +--- a/include/pidfd-utils.h ++++ b/include/pidfd-utils.h +@@ -1,26 +1,28 @@ + #ifndef UTIL_LINUX_PIDFD_UTILS + #define UTIL_LINUX_PIDFD_UTILS + +-#if defined(__linux__) && defined(SYS_pidfd_send_signal) +-# include ++#if defined(__linux__) + # include ++# if defined(SYS_pidfd_send_signal) ++# include + +-# ifndef HAVE_PIDFD_OPEN ++# ifndef HAVE_PIDFD_OPEN + static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, + unsigned int flags) + { + return syscall(SYS_pidfd_send_signal, pidfd, sig, info, flags); + } +-# endif ++# endif + +-# ifndef HAVE_PIDFD_SEND_SIGNAL ++# ifndef HAVE_PIDFD_SEND_SIGNAL + static inline int pidfd_open(pid_t pid, unsigned int flags) + { + return syscall(SYS_pidfd_open, pid, flags); + } +-# endif ++# endif + +-# define UL_HAVE_PIDFD 1 ++# define UL_HAVE_PIDFD 1 + +-#endif /* __linux__ && SYS_pidfd_send_signal */ ++# endif /* SYS_pidfd_send_signal */ ++#endif /* __linux__ */ + #endif /* UTIL_LINUX_PIDFD_UTILS */ +-- +2.18.2 + diff --git a/buildroot/package/util-linux/0007-include-cleanup-pidfd-inckudes.patch b/buildroot/package/util-linux/0007-include-cleanup-pidfd-inckudes.patch new file mode 100644 index 000000000..73f3118b0 --- /dev/null +++ b/buildroot/package/util-linux/0007-include-cleanup-pidfd-inckudes.patch @@ -0,0 +1,40 @@ +From 0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 10 Mar 2020 11:43:16 +0100 +Subject: [PATCH] include: cleanup pidfd inckudes + +Signed-off-by: Karel Zak +Signed-off-by: Carlos Santos +--- + include/pidfd-utils.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h +index 0baedd2c9..4a6c3a604 100644 +--- a/include/pidfd-utils.h ++++ b/include/pidfd-utils.h +@@ -3,10 +3,10 @@ + + #if defined(__linux__) + # include +-# if defined(SYS_pidfd_send_signal) ++# if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open) + # include + +-# ifndef HAVE_PIDFD_OPEN ++# ifndef HAVE_PIDFD_SEND_SIGNAL + static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, + unsigned int flags) + { +@@ -14,7 +14,7 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, + } + # endif + +-# ifndef HAVE_PIDFD_SEND_SIGNAL ++# ifndef HAVE_PIDFD_OPEN + static inline int pidfd_open(pid_t pid, unsigned int flags) + { + return syscall(SYS_pidfd_open, pid, flags); +-- +2.18.2 + diff --git a/buildroot/package/util-linux/Config.in b/buildroot/package/util-linux/Config.in index a5a137bfe..996f0cd7f 100644 --- a/buildroot/package/util-linux/Config.in +++ b/buildroot/package/util-linux/Config.in @@ -12,7 +12,6 @@ if BR2_PACKAGE_UTIL_LINUX config BR2_PACKAGE_UTIL_LINUX_LIBBLKID bool "libblkid" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_LIBUUID help Install libblkid. @@ -58,9 +57,9 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES flock, fsfreeze, fstrim, getopt, hexdump, ipcmk, isosize, ldattach, look, lsblk, lscpu, lsipc, lslocks, lsns, mcookie, mkfs, mkswap, namei, prlimit, readprofile, renice, rev, - rtcwake, script, scriptreplay, setarch, setsid, sfdisk, - swaplabel, swapoff, swapon, uuidgen, uuidparse, whereis, - wipefs + rtcwake, script, scriptlive, scriptreplay, setarch, setsid, + sfdisk, swaplabel, swapoff, swapon, uuidgen, uuidparse, + whereis, wipefs The setarch utility also installs architecture-specific symlinks like linux32, linux64, uname26, i386 and x86_64. @@ -135,6 +134,11 @@ config BR2_PACKAGE_UTIL_LINUX_FSCK help Check and repair a linux filesystem +config BR2_PACKAGE_UTIL_LINUX_HARDLINK + bool "hardlink" + help + Consolidate duplicate files via hardlinks + config BR2_PACKAGE_UTIL_LINUX_HWCLOCK bool "hwclock" help @@ -213,6 +217,7 @@ config BR2_PACKAGE_UTIL_LINUX_MESG config BR2_PACKAGE_UTIL_LINUX_MINIX bool "minix" + depends on BR2_USE_MMU # fork() help Minix filesystem support @@ -402,6 +407,18 @@ config BR2_PACKAGE_UTIL_LINUX_WALL help Send a message to everybody's terminal +config BR2_PACKAGE_UTIL_LINUX_WIPEFS + bool "wipefs" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + help + wipefs can erase filesystem, raid or partition-table + signatures (magic strings) from the specified device + to make the signatures invisible for libblkid. wipefs + does not erase the filesystem itself nor any other data + from the device. + config BR2_PACKAGE_UTIL_LINUX_WDCTL bool "wdctl" depends on BR2_USE_MMU # libsmartcols diff --git a/buildroot/package/util-linux/su.pam b/buildroot/package/util-linux/su.pam index 84b18605c..69b2a40c4 100644 --- a/buildroot/package/util-linux/su.pam +++ b/buildroot/package/util-linux/su.pam @@ -7,9 +7,9 @@ account required pam_unix.so password required pam_unix.so nullok -# session required pam_selinux.so close +session required pam_selinux.so close session required pam_limits.so session required pam_env.so session required pam_unix.so session optional pam_lastlog.so -# session required pam_selinux.so open +session required pam_selinux.so open diff --git a/buildroot/package/util-linux/util-linux.hash b/buildroot/package/util-linux/util-linux.hash index ed503a12e..f9a3d1e86 100644 --- a/buildroot/package/util-linux/util-linux.hash +++ b/buildroot/package/util-linux/util-linux.hash @@ -1,7 +1,7 @@ -# From https://www.kernel.org/pub/linux/utils/util-linux/v2.33/sha256sums.asc -sha256 f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a util-linux-2.33.tar.xz +# From https://www.kernel.org/pub/linux/utils/util-linux/v2.35/sha256sums.asc +sha256 d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9 util-linux-2.35.1.tar.xz # License files, locally calculated -sha256 4335620e8f478ee4dc4d26540448d39469091ef1d8e3fbbbb8bf753206ceac74 README.licensing +sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later diff --git a/buildroot/package/util-linux/util-linux.mk b/buildroot/package/util-linux/util-linux.mk index b17c0e9b7..b6ccaaa78 100644 --- a/buildroot/package/util-linux/util-linux.mk +++ b/buildroot/package/util-linux/util-linux.mk @@ -4,13 +4,15 @@ # ################################################################################ -UTIL_LINUX_VERSION_MAJOR = 2.33 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) +UTIL_LINUX_VERSION_MAJOR = 2.35 +UTIL_LINUX_VERSION_MINOR = 1 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).$(UTIL_LINUX_VERSION_MINOR) UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) -# README.licensing claims that some files are GPL-2.0 only, but this is not true. -# Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license. +# README.licensing claims that some files are GPL-2.0 only, but this is not +# true. Some files are GPL-3.0+ but only in tests and optionally in hwclock +# (but we disable that option). rfkill uses an ISC-style license. UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid), ISC (rfkill) UTIL_LINUX_LICENSE_FILES = README.licensing \ Documentation/licenses/COPYING.BSD-3-Clause \ @@ -18,11 +20,13 @@ UTIL_LINUX_LICENSE_FILES = README.licensing \ Documentation/licenses/COPYING.GPL-2.0-or-later \ Documentation/licenses/COPYING.ISC \ Documentation/licenses/COPYING.LGPL-2.1-or-later + UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) UTIL_LINUX_CONF_OPTS += \ --disable-rpath \ --disable-makeinstall-chown + UTIL_LINUX_LIBS = $(TARGET_NLS_LIBS) # system depends on util-linux so we enable systemd support @@ -34,7 +38,10 @@ UTIL_LINUX_CONF_OPTS += \ HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf # We also don't want the host-python dependency -HOST_UTIL_LINUX_CONF_OPTS = --without-python +HOST_UTIL_LINUX_CONF_OPTS = \ + --without-systemd \ + --with-systemdsystemunitdir=no \ + --without-python # Prevent the installation from attempting to move shared libraries from # ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are @@ -75,14 +82,14 @@ UTIL_LINUX_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS)" ifeq ($(BR2_PACKAGE_LIBSELINUX),y) UTIL_LINUX_DEPENDENCIES += libselinux UTIL_LINUX_CONF_OPTS += --with-selinux +else +UTIL_LINUX_CONF_OPTS += --without-selinux define UTIL_LINUX_SELINUX_PAMFILES_TWEAK $(foreach f,su su-l, - $(SED) 's/^# \(.*pam_selinux.so.*\)$$/\1/' \ + $(SED) '/^.*pam_selinux.so.*$$/d' \ $(TARGET_DIR)/etc/pam.d/$(f) ) endef -else -UTIL_LINUX_CONF_OPTS += --without-selinux endif # Used by cramfs utils @@ -91,6 +98,9 @@ UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) # Used by login-utils UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam) +# Used by hardlink +UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PCRE2),pcre2) + # Disable/Enable utilities UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_BINARIES),--enable-all-programs,--disable-all-programs) \ @@ -104,7 +114,8 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \ $(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \ $(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_HARDLINK),--enable-hardlink,--disable-hardlink) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock --disable-hwclock-gplv3,--disable-hwclock) \ $(if $(BR2_PACKAGE_UTIL_LINUX_IPCRM),--enable-ipcrm,--disable-ipcrm) \ $(if $(BR2_PACKAGE_UTIL_LINUX_IPCS),--enable-ipcs,--disable-ipcs) \ $(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \ @@ -149,6 +160,7 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_WIPEFS),--enable-wipefs,--disable-wipefs) \ $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \ $(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl) diff --git a/buildroot/package/uvw/Config.in b/buildroot/package/uvw/Config.in new file mode 100644 index 000000000..e5cfc541f --- /dev/null +++ b/buildroot/package/uvw/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_UVW + bool "uvw" + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on BR2_USE_MMU # libuv + depends on !BR2_STATIC_LIBS # libuv + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + select BR2_PACKAGE_LIBUV + help + Header-only, event based, tiny and easy to use + libuv wrapper in modern C++. + + https://github.com/skypjack/uvw + +comment "uvw needs a toolchain w/ NPTL, dynamic library, C++, gcc >= 7" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ + !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/buildroot/package/uvw/uvw.hash b/buildroot/package/uvw/uvw.hash new file mode 100644 index 000000000..c74db9b91 --- /dev/null +++ b/buildroot/package/uvw/uvw.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 578179ee76d010c5c9fb180a1b60e45e9f04968718d62c51ec0f71b43564bab9 uvw-2.3.1_libuv-v1.34.tar.gz +sha256 755b2f245af22830c15b60c54469c0d92fbed42009b0d0074cec4b3959905757 LICENSE diff --git a/buildroot/package/uvw/uvw.mk b/buildroot/package/uvw/uvw.mk new file mode 100644 index 000000000..71b23b2ac --- /dev/null +++ b/buildroot/package/uvw/uvw.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# uvw +# +################################################################################ + +UVW_VERSION = 2.3.1_libuv-v1.34 +UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) +UVW_INSTALL_STAGING = YES +UVW_INSTALL_TARGET = NO +UVW_SUPPORTS_IN_SOURCE_BUILD = NO +UVW_DEPENDENCIES = libuv +UVW_LICENSE = MIT +UVW_LICENSE_FILES = LICENSE + +# The following CMake variable disables a TRY_RUN call in the -pthread +# test which is not allowed when cross-compiling (for cmake < 3.10) +UVW_CONF_OPTS = -DTHREADS_PTHREAD_ARG=OFF + +$(eval $(cmake-package)) diff --git a/buildroot/package/ux500-firmware/ux500-firmware.hash b/buildroot/package/ux500-firmware/ux500-firmware.hash index 1028cc0e1..b77ed2047 100644 --- a/buildroot/package/ux500-firmware/ux500-firmware.hash +++ b/buildroot/package/ux500-firmware/ux500-firmware.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 81633274a9157c076e5e09b5addd81fbcef504b829fc801041cea50eea774bcd ux500-firmware_1.1.3-6linaro1.tar.gz +sha256 81633274a9157c076e5e09b5addd81fbcef504b829fc801041cea50eea774bcd ux500-firmware_1.1.3-6linaro1.tar.gz +sha256 b5bbc3fb3ff2f8e165b3bf60b25702d8970b3d7fe88b1c883f20615d550a7cb2 license.txt diff --git a/buildroot/package/v4l2grab/v4l2grab.hash b/buildroot/package/v4l2grab/v4l2grab.hash index a59c8af32..eba36b5c7 100644 --- a/buildroot/package/v4l2grab/v4l2grab.hash +++ b/buildroot/package/v4l2grab/v4l2grab.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 9a8d0d1ca5ac9fb9f66e00300bb3265d156cf1cb67eb30f6e6637c83b0b507a1 v4l2grab-f8d8844d52387b3db7b8736f5e86156d9374f781.tar.gz +sha256 9a8d0d1ca5ac9fb9f66e00300bb3265d156cf1cb67eb30f6e6637c83b0b507a1 v4l2grab-f8d8844d52387b3db7b8736f5e86156d9374f781.tar.gz +sha256 7fa0d45fe86fda646fada21ecfa7672e951b01c521aecd358f586facd65fb5b3 LICENSE.md diff --git a/buildroot/package/v4l2loopback/v4l2loopback.hash b/buildroot/package/v4l2loopback/v4l2loopback.hash index 0598be486..b9d65c821 100644 --- a/buildroot/package/v4l2loopback/v4l2loopback.hash +++ b/buildroot/package/v4l2loopback/v4l2loopback.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d2c27a69d982bf39d7330b92f084fd0388beef486879320ccf263e4716cd549 v4l2loopback-v0.12.2.tar.gz +sha256 3f6bb14b80865ec8df557c26fd2c5ba91d726580773a75a62aa2959864ef70ba v4l2loopback-0.12.3.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/v4l2loopback/v4l2loopback.mk b/buildroot/package/v4l2loopback/v4l2loopback.mk index 15c1ed610..8fa070498 100644 --- a/buildroot/package/v4l2loopback/v4l2loopback.mk +++ b/buildroot/package/v4l2loopback/v4l2loopback.mk @@ -4,8 +4,8 @@ # ################################################################################ -V4L2LOOPBACK_VERSION = v0.12.2 -V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,$(V4L2LOOPBACK_VERSION)) +V4L2LOOPBACK_VERSION = 0.12.3 +V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,v$(V4L2LOOPBACK_VERSION)) V4L2LOOPBACK_LICENSE = GPL-2.0+ V4L2LOOPBACK_LICENSE_FILES = COPYING diff --git a/buildroot/package/vala/vala-wrapper b/buildroot/package/vala/vala-wrapper index ae2f7ca67..84fc905b9 100644 --- a/buildroot/package/vala/vala-wrapper +++ b/buildroot/package/vala/vala-wrapper @@ -1,2 +1,2 @@ #!/bin/sh -$0-@VALA_VERSION@ --vapidir=${STAGING_DIR}/usr/share/vala/vapi --girdir=${STAGING_DIR}/usr/share/gir-1.0 $@ +$0-@VALA_VERSION@ --vapidir=${STAGING_DIR}/usr/share/vala/vapi --girdir=${STAGING_DIR}/usr/share/gir-1.0 "$@" diff --git a/buildroot/package/vala/vala.hash b/buildroot/package/vala/vala.hash index 48212b22a..7b3f0c9f7 100644 --- a/buildroot/package/vala/vala.hash +++ b/buildroot/package/vala/vala.hash @@ -1,2 +1,4 @@ # From https://download.gnome.org/sources/vala/0.34/vala-0.34.7.sha256sum -sha256 1b2cb14f377d4c41fa3a86d3d01b93017015ce91b6714a85f27346073b4034fa vala-0.34.7.tar.xz +sha256 1b2cb14f377d4c41fa3a86d3d01b93017015ce91b6714a85f27346073b4034fa vala-0.34.7.tar.xz +# Locally computed +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/buildroot/package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch b/buildroot/package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch deleted file mode 100644 index a5573d518..000000000 --- a/buildroot/package/valgrind/0003-configure.ac-disable-gcc-march-mips64r2-detection.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1fd5a3d2adf04bad6ae6e9eef9caead7d46d9307 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 8 Nov 2018 23:55:30 +0100 -Subject: [PATCH] configure.ac: disable gcc march mips64r2 detection - -Disable gcc march mips64r2 detection, compile flags already -set by buildroot, fixes [1]: - - error: '-mips64r2' conflicts with the other architecture options, which specify a mips64 processor - -[1] http://autobuild.buildroot.net/results/34f6e2352f1559f98c724fe5394db0035b42ddb1 - -Signed-off-by: Peter Seiderer -[Thomas: remove code instead of commenting it] -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 289514ff1..18cf97ffe 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1768,22 +1768,7 @@ case "${host_cpu}" in - AC_SUBST(FLAG_M32) - - -- # does this compiler support -march=mips64r2 (mips64r2 default) ? -- AC_MSG_CHECKING([if gcc accepts -march=mips64r2 -mabi=64]) -- -- safe_CFLAGS=$CFLAGS -- CFLAGS="$CFLAGS -march=mips64r2 -mabi=64 -Werror" -- -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ -- return 0; -- ]])], [ -- FLAG_M64="-march=mips64r2 -mabi=64" -- AC_MSG_RESULT([yes]) -- ], [ - FLAG_M64="" -- AC_MSG_RESULT([no]) -- ]) -- CFLAGS=$safe_CFLAGS - - AC_SUBST(FLAG_M64) - ;; --- -2.19.1 - diff --git a/buildroot/package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch b/buildroot/package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch new file mode 100644 index 000000000..da8c655f0 --- /dev/null +++ b/buildroot/package/valgrind/0003-mips-fix-mips32r6-and-mips64r6-compilation-issue.patch @@ -0,0 +1,51 @@ +From 50dd9600ab1ad8933704ee85289191d9c65ba444 Mon Sep 17 00:00:00 2001 +From: Petar Jovanovic +Date: Fri, 19 Apr 2019 14:04:26 +0000 +Subject: [PATCH] mips: fix mips32r6 and mips64r6 compilation issue + +Add missing variable declarations. +Modify local_sys_write_stderr to use movn if available, and use +seleqz/selnez instructions otherwise. + +Backported from upstream commit +50dd9600ab1ad8933704ee85289191d9c65ba444. + +Signed-off-by: Stefan Maksimovic +--- + VEX/priv/guest_mips_toIR.c | 1 + + coregrind/m_debuglog.c | 6 ++++++ + 2 files changed, 7 insertions(+) + +diff --git a/VEX/priv/guest_mips_toIR.c b/VEX/priv/guest_mips_toIR.c +index eb437ec..6e91329 100755 +--- a/VEX/priv/guest_mips_toIR.c ++++ b/VEX/priv/guest_mips_toIR.c +@@ -20241,6 +20241,7 @@ static UInt disInstr_MIPS_WRK_00(UInt cins, const VexArchInfo* archinfo, + #elif defined(__mips__) && ((defined(__mips_isa_rev) && __mips_isa_rev >= 6)) + + case 0x08: { /* BEQZALC, BEQC, BOVC */ ++ IRTemp t1, t2, t3, t4; + if (rs == 0) { /* BEQZALC */ + DIP("beqzalc r%u, %u", rt, imm); + +diff --git a/coregrind/m_debuglog.c b/coregrind/m_debuglog.c +index 456a711..289f275 100644 +--- a/coregrind/m_debuglog.c ++++ b/coregrind/m_debuglog.c +@@ -452,7 +452,13 @@ static UInt local_sys_write_stderr ( const HChar* buf, Int n ) + __asm__ volatile ( + "syscall \n\t" + "addiu $4, $0, -1 \n\t" ++ #if ((defined(__mips_isa_rev) && __mips_isa_rev >= 6)) ++ "selnez $4, $4, $7 \n\t" ++ "seleqz $2, $2, $7 \n\t" ++ "or $2, $2, $4 \n\t" ++ #else + "movn $2, $4, $7 \n\t" ++ #endif + : "+d" (v0), "+d" (a0), "+d" (a1), "+d" (a2) + : + : "$1", "$3", "$7", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", +-- +2.7.4 + diff --git a/buildroot/package/valgrind/Config.in b/buildroot/package/valgrind/Config.in index c09be8629..56e4af21f 100644 --- a/buildroot/package/valgrind/Config.in +++ b/buildroot/package/valgrind/Config.in @@ -2,12 +2,7 @@ config BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS bool default y if BR2_aarch64 default y if BR2_ARM_CPU_ARMV7A - # MIPS32 R6 is unsupported - default y if BR2_mips && !BR2_mips_32r6 - default y if BR2_mipsel && !BR2_mips_32r6 - # MIPS64 R6 is unsupported - default y if BR2_mips64 && !BR2_mips_64r6 - default y if BR2_mips64el && !BR2_mips_64r6 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le depends on !BR2_MIPS_SOFT_FLOAT diff --git a/buildroot/package/valgrind/valgrind.hash b/buildroot/package/valgrind/valgrind.hash index 87fb49685..3c7b98ef2 100644 --- a/buildroot/package/valgrind/valgrind.hash +++ b/buildroot/package/valgrind/valgrind.hash @@ -1,5 +1,5 @@ # From http://valgrind.org/downloads/current.html -md5 74175426afa280184b62591b58c671b3 valgrind-3.14.0.tar.bz2 +md5 46e5fbdcbc3502a5976a317a0860a975 valgrind-3.15.0.tar.bz2 # License files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/valgrind/valgrind.mk b/buildroot/package/valgrind/valgrind.mk index cae14f79b..41b262519 100644 --- a/buildroot/package/valgrind/valgrind.mk +++ b/buildroot/package/valgrind/valgrind.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALGRIND_VERSION = 3.14.0 +VALGRIND_VERSION = 3.15.0 VALGRIND_SITE = ftp://sourceware.org/pub/valgrind VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPL-2.0, GFDL-1.2 @@ -13,9 +13,6 @@ VALGRIND_CONF_OPTS = \ --disable-ubsan \ --without-mpicc VALGRIND_INSTALL_STAGING = YES -# Patch 0003-configure.ac-disable-gcc-march-mips64r2-detection.patch -# touches configure.ac -VALGRIND_AUTORECONF = YES # Valgrind must be compiled with no stack protection, so forcefully # pass -fno-stack-protector to override what Buildroot may have in diff --git a/buildroot/package/valijson/valijson.hash b/buildroot/package/valijson/valijson.hash index ffa128179..6f1100066 100644 --- a/buildroot/package/valijson/valijson.hash +++ b/buildroot/package/valijson/valijson.hash @@ -1,2 +1,3 @@ # Locally Computed: -sha256 d22c1f8fe27d43e5a27aad1d3cbe9f1318ec28ccfa913e615663ed2bd6a5d063 valijson-v0.1.tar.gz +sha256 77dbebb40dab2e834557c2fcc39122cdb2d0fe26bf591c2b3e0df5a316a45592 valijson-0.2.tar.gz +sha256 1a0f99926a2dbec30eba3db820236d9953fbe3048976923ac24980e655fbe991 LICENSE diff --git a/buildroot/package/valijson/valijson.mk b/buildroot/package/valijson/valijson.mk index e1b816ddd..31efeede3 100644 --- a/buildroot/package/valijson/valijson.mk +++ b/buildroot/package/valijson/valijson.mk @@ -4,13 +4,13 @@ # ################################################################################ -VALIJSON_VERSION = v0.1 -VALIJSON_SITE = $(call github,tristanpenman,valijson,$(VALIJSON_VERSION)) +VALIJSON_VERSION = 0.2 +VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO VALIJSON_DEPENDENCIES = boost -VALIJSON_CONF_OPTS = -DINSTALL_HEADERS=TRUE +VALIJSON_CONF_OPTS = -Dvalijson_INSTALL_HEADERS=TRUE -Dvalijson_BUILD_TESTS=FALSE $(eval $(cmake-package)) diff --git a/buildroot/package/vboot-utils/vboot-utils.hash b/buildroot/package/vboot-utils/vboot-utils.hash index 4ff6c3980..e2ddf7773 100644 --- a/buildroot/package/vboot-utils/vboot-utils.hash +++ b/buildroot/package/vboot-utils/vboot-utils.hash @@ -1,2 +1,3 @@ # Locally computed sha256 d95b64b1f1de4a3ffa5c2e446d7c8e92aa197aee10de24206b2ea2deb5a8b947 vboot-utils-bbdd62f9b030db7ad8eef789aaf58a7ff9a25656.tar.gz +sha256 cb9dc8e96aedf9120b6757a60387db10f3c1a8e3fd97bb9d0f11327be5a7ed4d LICENSE diff --git a/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash b/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash index 97cb4b42a..21c62fae1 100644 --- a/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash +++ b/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 f8170b4d6f983e7b5b5110e0432ff46355998e170f66459588170cc320717f7f vdr-plugin-vnsiserver-v1.5.2.tar.gz +sha256 d5989461541a91fe4de4ca9c396d4e7b2f4a8663fc9d6155d0830d2b143fce4d vdr-plugin-vnsiserver-1.8.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk b/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk index f41ad701d..9b49736d0 100644 --- a/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk +++ b/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk @@ -4,14 +4,19 @@ # ################################################################################ -VDR_PLUGIN_VNSISERVER_VERSION = v1.5.2 -VDR_PLUGIN_VNSISERVER_SITE = $(call github,FernetMenta,vdr-plugin-vnsiserver,$(VDR_PLUGIN_VNSISERVER_VERSION)) +VDR_PLUGIN_VNSISERVER_VERSION = 1.8.0 +VDR_PLUGIN_VNSISERVER_SITE = $(call github,FernetMenta,vdr-plugin-vnsiserver,v$(VDR_PLUGIN_VNSISERVER_VERSION)) VDR_PLUGIN_VNSISERVER_LICENSE = GPL-2.0+ VDR_PLUGIN_VNSISERVER_LICENSE_FILES = COPYING VDR_PLUGIN_VNSISERVER_DEPENDENCIES = vdr VDR_PLUGIN_VNSISERVER_CXXFLAGS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11 -fPIC" +VDR_PLUGIN_VNSISERVER_INSTALL_TARGETS = install-lib +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +VDR_PLUGIN_VNSISERVER_INSTALL_TARGETS += install-i18n +endif + define VDR_PLUGIN_VNSISERVER_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ $(VDR_PLUGIN_VNSISERVER_CXXFLAGS) @@ -19,8 +24,8 @@ endef define VDR_PLUGIN_VNSISERVER_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - install DESTDIR=$(TARGET_DIR) LIBDIR=/usr/lib/vdr \ - LOCDIR=/usr/share/locale + $(VDR_PLUGIN_VNSISERVER_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) \ + LIBDIR=/usr/lib/vdr LOCDIR=/usr/share/locale endef $(eval $(generic-package)) diff --git a/buildroot/package/vdr/0001-getloadavg.patch b/buildroot/package/vdr/0001-getloadavg.patch deleted file mode 100644 index 3937c83dd..000000000 --- a/buildroot/package/vdr/0001-getloadavg.patch +++ /dev/null @@ -1,55 +0,0 @@ -Fix compilation with uClibc - -Ported from -https://github.com/stschake/buildroot-grasshopper/blob/master/package/torsmo/torsmo-0.18-uclibc-getloadavg.patch - -Signed-off-by: Bernd Kuhls - -diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c ---- vdr-2.3.1.org/skinlcars.c 2015-09-01 12:07:07.000000000 +0200 -+++ vdr-2.3.1/skinlcars.c 2016-07-31 21:00:11.000000000 +0200 -@@ -1099,6 +1099,44 @@ - } - } - -+/* uclibc and dietlibc do not have this junk -ReneR */ -+#if defined (__UCLIBC__) || defined (__dietlibc__) -+static int getloadavg (double loadavg[], int nelem) -+{ -+ int fd; -+ -+ fd = open ("/proc/loadavg", O_RDONLY); -+ if (fd < 0) -+ return -1; -+ else -+ { -+ char buf[65], *p; -+ ssize_t nread; -+ int i; -+ -+ nread = read (fd, buf, sizeof buf - 1); -+ close (fd); -+ if (nread <= 0) -+ return -1; -+ buf[nread - 1] = '\0'; -+ -+ if (nelem > 3) -+ nelem = 3; -+ p = buf; -+ for (i = 0; i < nelem; ++i) -+ { -+ char *endp; -+ loadavg[i] = strtod (p, &endp); -+ if (endp == p) -+ return -1; -+ p = endp; -+ } -+ -+ return i; -+ } -+} -+#endif -+ - void cSkinLCARSDisplayMenu::DrawLoad(void) - { - if (yb04) { diff --git a/buildroot/package/vdr/0002-libjpeg.patch b/buildroot/package/vdr/0001-libjpeg.patch similarity index 100% rename from buildroot/package/vdr/0002-libjpeg.patch rename to buildroot/package/vdr/0001-libjpeg.patch diff --git a/buildroot/package/vdr/Config.in b/buildroot/package/vdr/Config.in index 65117f546..df602f26d 100644 --- a/buildroot/package/vdr/Config.in +++ b/buildroot/package/vdr/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_VDR depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 - depends on !BR2_TOOLCHAIN_USES_MUSL # _nl_msg_cat_cntr + depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR select BR2_PACKAGE_FONTCONFIG @@ -18,9 +18,9 @@ config BR2_PACKAGE_VDR http://www.tvdr.de -comment "vdr needs a glibc or uClibc toolchain w/ C++, dynamic library, NPTL, wchar, headers >= 3.9" +comment "vdr needs a glibc toolchain w/ C++, dynamic library, NPTL, wchar, headers >= 3.9" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - BR2_TOOLCHAIN_USES_MUSL || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_USES_GLIBC || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 diff --git a/buildroot/package/vdr/vdr.hash b/buildroot/package/vdr/vdr.hash index 2ced98d96..99f6ba822 100644 --- a/buildroot/package/vdr/vdr.hash +++ b/buildroot/package/vdr/vdr.hash @@ -1,4 +1,5 @@ -# From https://www.linuxtv.org/pipermail/vdr/2017-May/029263.html -md5 01fabef4d20ec01f11d53354d99a9642 vdr-2.3.5.tar.bz2 +# From https://www.linuxtv.org/pipermail/vdr/2019-June/029497.html +md5 b2897fe6b6e6711d512a69642b1b8ec1 vdr-2.4.1.tar.bz2 # Locally computed -sha256 323fd01e4f8daef24bbdcb906023d18c998a204a22de110d1cb0089532e818b5 vdr-2.3.5.tar.bz2 +sha256 25c3f835c4f3ff92cd2db10c004439ef22c2e895193c77fbe8cc7eac4858a1dc vdr-2.4.1.tar.bz2 +sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/buildroot/package/vdr/vdr.mk b/buildroot/package/vdr/vdr.mk index 242c5798d..83cdede30 100644 --- a/buildroot/package/vdr/vdr.mk +++ b/buildroot/package/vdr/vdr.mk @@ -4,9 +4,9 @@ # ################################################################################ -VDR_VERSION = 2.3.5 +VDR_VERSION = 2.4.1 VDR_SOURCE = vdr-$(VDR_VERSION).tar.bz2 -VDR_SITE = ftp://ftp.tvdr.de/vdr/Developer +VDR_SITE = ftp://ftp.tvdr.de/vdr VDR_LICENSE = GPL-2.0+ VDR_LICENSE_FILES = COPYING VDR_INSTALL_STAGING = YES diff --git a/buildroot/package/vim/vim.hash b/buildroot/package/vim/vim.hash index bfbd55d1a..6c68b1bc2 100644 --- a/buildroot/package/vim/vim.hash +++ b/buildroot/package/vim/vim.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 a6dab137949097fbe0b67aafedf4c24a3b0d9c41716db35f5beb4834924d7b00 vim-v8.1.0133.tar.gz +sha256 4b7359a58a75c29d4a8fc7fcbb2ccab1d1dc0ede1c4c689b27cc049c17920278 vim-8.1.1929.tar.gz +sha256 70ab7f93197b29d47bfe4371774c8d904f7842d4843c257d21c29b7ac38d6406 README.txt diff --git a/buildroot/package/vim/vim.mk b/buildroot/package/vim/vim.mk index ee0c8b61e..5cb4e1b4c 100644 --- a/buildroot/package/vim/vim.mk +++ b/buildroot/package/vim/vim.mk @@ -4,8 +4,8 @@ # ################################################################################ -VIM_VERSION = v8.1.0133 -VIM_SITE = $(call github,vim,vim,$(VIM_VERSION)) +VIM_VERSION = 8.1.1929 +VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src VIM_CONF_ENV = \ @@ -80,6 +80,13 @@ VIM_POST_INSTALL_TARGET_HOOKS += VIM_REMOVE_DOCS endif HOST_VIM_DEPENDENCIES = host-ncurses +HOST_VIM_CONF_OPTS = \ + --with-tlib=ncurses \ + --enable-gui=no \ + --without-x \ + --disable-acl \ + --disable-gpm \ + --disable-selinux $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/vlc/0010-modules-video_filter-opencv_example.cpp-fix-build-wi.patch b/buildroot/package/vlc/0010-modules-video_filter-opencv_example.cpp-fix-build-wi.patch new file mode 100644 index 000000000..952f9fdf5 --- /dev/null +++ b/buildroot/package/vlc/0010-modules-video_filter-opencv_example.cpp-fix-build-wi.patch @@ -0,0 +1,42 @@ +From 57b1e723b73da4c8d42c20d4e28040ec4c0edd85 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 28 Feb 2020 14:29:47 +0100 +Subject: [PATCH] modules/video_filter/opencv_example.cpp: fix build with + opencv 3.4.9 + +Use cvScalar instead of CV_RGB to avoid the following build failure with +opencv 3.4.9: + +In file included from /home/naourr/work/instance-2/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/opencv2/imgproc/imgproc.hpp:48, + from video_filter/opencv_example.cpp:46: +video_filter/opencv_example.cpp: In function 'picture_t* Filter(filter_t*, picture_t*)': +video_filter/opencv_example.cpp:200:46: error: could not convert 'cv::Scalar_((double)0, (double)0, (double)0, (double)0)' from 'cv::Scalar' {aka 'cv::Scalar_'} to 'CvScalar' + cvRectangle( p_img[0], pt1, pt2, CV_RGB(0,0,0), 3, 8, 0 ); + ^~~~~~ + +Indeed, CV_RGB is defined as cv::Scalar instead of cvScalar since +version 3.4.2 and +https://github.com/opencv/opencv/commit/7f9253ea0a9fe2635926379420002dbf0c3fce0f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://patches.videolan.org/patch/26655] +--- + modules/video_filter/opencv_example.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp +index 1334cd4c36..1a8d574f7a 100644 +--- a/modules/video_filter/opencv_example.cpp ++++ b/modules/video_filter/opencv_example.cpp +@@ -202,7 +202,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) + pt2.x = (r->x+r->width)*scale; + pt1.y = r->y*scale; + pt2.y = (r->y+r->height)*scale; +- cvRectangle( p_img[0], pt1, pt2, CV_RGB(0,0,0), 3, 8, 0 ); ++ cvRectangle( p_img[0], pt1, pt2, cvScalar(0,0,0,0), 3, 8, 0 ); + + *(CvRect*)(&(p_sys->event_info.p_region[i])) = *r; + p_sys->event_info.p_region[i].i_id = p_sys->i_id++; +-- +2.25.0 + diff --git a/buildroot/package/vlc/vlc.mk b/buildroot/package/vlc/vlc.mk index ae12e89b8..4b1cd68d8 100644 --- a/buildroot/package/vlc/vlc.mk +++ b/buildroot/package/vlc/vlc.mk @@ -55,7 +55,6 @@ VLC_CONF_OPTS += \ --disable-dsm \ --disable-dv1394 \ --disable-fluidlite \ - --disable-fluidsynth \ --disable-gme \ --disable-goom \ --disable-jack \ @@ -164,6 +163,13 @@ else VLC_CONF_OPTS += --disable-flac endif +ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y) +VLC_CONF_OPTS += --enable-fluidsynth +VLC_DEPENDENCIES += fluidsynth +else +VLC_CONF_OPTS += --disable-fluidsynth +endif + ifeq ($(BR2_PACKAGE_FREERDP),y) VLC_CONF_OPTS += --enable-freerdp VLC_DEPENDENCIES += freerdp diff --git a/buildroot/package/vmtouch/vmtouch.hash b/buildroot/package/vmtouch/vmtouch.hash index 2b98891d1..451bf5686 100644 --- a/buildroot/package/vmtouch/vmtouch.hash +++ b/buildroot/package/vmtouch/vmtouch.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 d57b7b3ae1146c4516429ab7d6db6f2122401db814ddd9cdaad10980e9c8428c vmtouch-v1.3.1.tar.gz +sha256 d57b7b3ae1146c4516429ab7d6db6f2122401db814ddd9cdaad10980e9c8428c vmtouch-1.3.1.tar.gz # Hash for license files: sha256 13258709ed29c17394e0a3ba8c8b9360af35b85231db514f11a0ba385cecd08e LICENSE diff --git a/buildroot/package/vmtouch/vmtouch.mk b/buildroot/package/vmtouch/vmtouch.mk index 856835acd..0aa7bfb44 100644 --- a/buildroot/package/vmtouch/vmtouch.mk +++ b/buildroot/package/vmtouch/vmtouch.mk @@ -4,8 +4,8 @@ # ################################################################################ -VMTOUCH_VERSION = v1.3.1 -VMTOUCH_SITE = $(call github,hoytech,vmtouch,$(VMTOUCH_VERSION)) +VMTOUCH_VERSION = 1.3.1 +VMTOUCH_SITE = $(call github,hoytech,vmtouch,v$(VMTOUCH_VERSION)) VMTOUCH_LICENSE = BSD-3-Clause VMTOUCH_LICENSE_FILES = LICENSE diff --git a/buildroot/package/vnstat/Config.in b/buildroot/package/vnstat/Config.in index bb68c1446..677ff575b 100644 --- a/buildroot/package/vnstat/Config.in +++ b/buildroot/package/vnstat/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_VNSTAT bool "vnstat" depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR # mbstowcs() + select BR2_PACKAGE_SQLITE help vnStat is a console-based network traffic monitor that keeps a log of network traffic for the selected interface(s). It uses diff --git a/buildroot/package/vnstat/vnstat.hash b/buildroot/package/vnstat/vnstat.hash index 1f515290c..94b4adc40 100644 --- a/buildroot/package/vnstat/vnstat.hash +++ b/buildroot/package/vnstat/vnstat.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 18e4c53576ca9e1ef2f0e063a6d83b0c44e3b1cf008560d658745df5c9aa7971 vnstat-1.17.tar.gz +sha256 a0955999abd56d5463d257ffdccc9b1e9ad9ea504de81e64ba4c197f1245abaa vnstat-2.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/vnstat/vnstat.mk b/buildroot/package/vnstat/vnstat.mk index 18fb31917..f0ef1cc69 100644 --- a/buildroot/package/vnstat/vnstat.mk +++ b/buildroot/package/vnstat/vnstat.mk @@ -4,17 +4,18 @@ # ################################################################################ -VNSTAT_VERSION = 1.17 +VNSTAT_VERSION = 2.4 VNSTAT_SITE = http://humdi.net/vnstat VNSTAT_LICENSE = GPL-2.0 VNSTAT_LICENSE_FILES = COPYING -VNSTAT_DEPENDENCIES = host-pkgconf +VNSTAT_DEPENDENCIES = host-pkgconf sqlite +VNSTAT_CONF_OPTS = --disable-extra-paths ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy) VNSTAT_DEPENDENCIES += gd -VNSTAT_CONF_OPTS = --enable-image-output +VNSTAT_CONF_OPTS += --enable-image-output else -VNSTAT_CONF_OPTS = --disable-image-output +VNSTAT_CONF_OPTS += --disable-image-output endif $(eval $(autotools-package)) diff --git a/buildroot/package/vo-aacenc/vo-aacenc.hash b/buildroot/package/vo-aacenc/vo-aacenc.hash index 822f8424a..f0d352f82 100644 --- a/buildroot/package/vo-aacenc/vo-aacenc.hash +++ b/buildroot/package/vo-aacenc/vo-aacenc.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 e51a7477a359f18df7c4f82d195dab4e14e7414cbd48cf79cc195fc446850f36 vo-aacenc-0.1.3.tar.gz +sha256 8b3f1762349248d444ab9acbafe73941254e36e1064954da56bb9ddbd5873ddb COPYING diff --git a/buildroot/package/vorbis-tools/0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch b/buildroot/package/vorbis-tools/0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch new file mode 100644 index 000000000..0e9cae061 --- /dev/null +++ b/buildroot/package/vorbis-tools/0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch @@ -0,0 +1,88 @@ +From 3bbabc06c4b35c84f6747ed850213161aca568c7 Mon Sep 17 00:00:00 2001 +From: Petter Reinholdtsen +Date: Tue, 22 Sep 2015 15:14:06 +0200 +Subject: [PATCH] oggenc: validate count of channels in the header + (CVE-2014-9638 & CVE-2014-9639) + +Author: Kamil Dudka +Origin: http://lists.xiph.org/pipermail/vorbis-dev/2015-February/020423.html +Bug: https://trac.xiph.org/ticket/2136 +Bug: https://trac.xiph.org/ticket/2137 +Bug-Debian: https://bugs.debian.org/776086 +Forwarded: not-needed +Reviewed-By: Petter Reinholdtsen +Last-Update: 2015-09-22 +Signed-off-by: Peter Korsgaard +--- + oggenc/audio.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/oggenc/audio.c b/oggenc/audio.c +index 4921fb9..535a704 100644 +--- a/oggenc/audio.c ++++ b/oggenc/audio.c +@@ -13,6 +13,7 @@ + #include + #endif + ++#include + #include + #include + #include +@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + aiff_fmt format; + aifffile *aiff = malloc(sizeof(aifffile)); + int i; ++ long channels; + + if(buf[11]=='C') + aifc=1; +@@ -277,11 +279,16 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + return 0; + } + +- format.channels = READ_U16_BE(buffer); ++ format.channels = channels = READ_U16_BE(buffer); + format.totalframes = READ_U32_BE(buffer+2); + format.samplesize = READ_U16_BE(buffer+6); + format.rate = (int)read_IEEE80(buffer+8); + ++ if(channels <= 0L || SHRT_MAX < channels) ++ { ++ fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n")); ++ return 0; ++ } + aiff->bigendian = 1; + + if(aifc) +@@ -416,6 +423,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) + wav_fmt format; + wavfile *wav = malloc(sizeof(wavfile)); + int i; ++ long channels; + + /* Ok. At this point, we know we have a WAV file. Now we have to detect + * whether we support the subtype, and we have to find the actual data +@@ -453,12 +461,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) + } + + format.format = READ_U16_LE(buf); +- format.channels = READ_U16_LE(buf+2); ++ format.channels = channels = READ_U16_LE(buf+2); + format.samplerate = READ_U32_LE(buf+4); + format.bytespersec = READ_U32_LE(buf+8); + format.align = READ_U16_LE(buf+12); + format.samplesize = READ_U16_LE(buf+14); + ++ if(channels <= 0L || SHRT_MAX < channels) ++ { ++ fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n")); ++ return 0; ++ } ++ + if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */ + { + if(len<40) +-- +2.20.1 + diff --git a/buildroot/package/vorbis-tools/0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch b/buildroot/package/vorbis-tools/0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch new file mode 100644 index 000000000..e245e1534 --- /dev/null +++ b/buildroot/package/vorbis-tools/0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch @@ -0,0 +1,55 @@ +From 514116d7bea89dad9f1deb7617b2277b5e9115cd Mon Sep 17 00:00:00 2001 +From: Gregory Maxwell +Date: Wed, 16 Apr 2014 23:55:10 +0000 +Subject: [PATCH] oggenc: fix crash on raw file close, reported by Hanno in + issue #2009. pointer to a non-static struct was escaping its scope. Also fix + a C99-ism. + +svn path=/trunk/vorbis-tools/; revision=19117 + +Fixes CVE-2014-9640 + +Signed-off-by: Peter Korsgaard +--- + oggenc/oggenc.c | 4 ++-- + oggenc/skeleton.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/oggenc/oggenc.c b/oggenc/oggenc.c +index 4a120f3..e7de0bb 100644 +--- a/oggenc/oggenc.c ++++ b/oggenc/oggenc.c +@@ -97,6 +97,8 @@ int main(int argc, char **argv) + .3,-1, + 0,0,0.f, + 0, 0, 0, 0, 0}; ++ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", ++ N_("RAW file reader")}; + + int i; + +@@ -239,8 +241,6 @@ int main(int argc, char **argv) + + if(opt.rawmode) + { +- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", +- N_("RAW file reader")}; + + enc_opts.rate=opt.raw_samplerate; + enc_opts.channels=opt.raw_channels; +diff --git a/oggenc/skeleton.h b/oggenc/skeleton.h +index cf87dc2..168b8b6 100644 +--- a/oggenc/skeleton.h ++++ b/oggenc/skeleton.h +@@ -41,7 +41,7 @@ typedef struct { + ogg_int64_t granule_rate_d; /* granule rate denominator */ + ogg_int64_t start_granule; /* start granule value */ + ogg_uint32_t preroll; /* preroll */ +- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */ ++ unsigned char granule_shift; /* 1 byte value holding the granule shift */ + char *message_header_fields; /* holds all the message header fields */ + /* current total size of the message header fields, for realloc purpose, initially zero */ + ogg_uint32_t current_header_size; +-- +2.20.1 + diff --git a/buildroot/package/vorbis-tools/vorbis-tools.hash b/buildroot/package/vorbis-tools/vorbis-tools.hash index 8f40eda9d..76122be13 100644 --- a/buildroot/package/vorbis-tools/vorbis-tools.hash +++ b/buildroot/package/vorbis-tools/vorbis-tools.hash @@ -1,2 +1,4 @@ # From http://downloads.xiph.org/releases/vorbis/SHA256SUMS -sha256 a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc vorbis-tools-1.4.0.tar.gz +sha256 a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc vorbis-tools-1.4.0.tar.gz +# Locally computed +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/vorbis-tools/vorbis-tools.mk b/buildroot/package/vorbis-tools/vorbis-tools.mk index 1bec1e2b9..407ea975e 100644 --- a/buildroot/package/vorbis-tools/vorbis-tools.mk +++ b/buildroot/package/vorbis-tools/vorbis-tools.mk @@ -10,6 +10,14 @@ VORBIS_TOOLS_LICENSE = GPL-2.0 VORBIS_TOOLS_LICENSE_FILES = COPYING VORBIS_TOOLS_DEPENDENCIES = libao libogg libvorbis libcurl VORBIS_TOOLS_CONF_OPTS = --program-transform-name='' + +# 0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch +VORBIS_TOOLS_IGNORE_CVES += CVE-2015-6749 +# 0002-oggenc-validate-count-of-channels-in-the-header-CVE-.patch +VORBIS_TOOLS_IGNORE_CVES += CVE-2014-9638 CVE-2014-9639 +# 0003-oggenc-fix-crash-on-raw-file-close-reported-by-Hanno.patch +VORBIS_TOOLS_IGNORE_CVES += CVE-2014-9640 + # ogg123 calls math functions but forgets to link with libm VORBIS_TOOLS_CONF_ENV = LIBS=-lm diff --git a/buildroot/package/vpnc/vpnc.hash b/buildroot/package/vpnc/vpnc.hash index 98a98472e..f512a7779 100644 --- a/buildroot/package/vpnc/vpnc.hash +++ b/buildroot/package/vpnc/vpnc.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 c10a5c2c0813198ca2404dd36db380cdb6395b46338123b341775095cf61521d vpnc-b1243d29e0c00312ead038b04a2cf5e2fa31d740.tar.gz +sha256 c10a5c2c0813198ca2404dd36db380cdb6395b46338123b341775095cf61521d vpnc-b1243d29e0c00312ead038b04a2cf5e2fa31d740.tar.gz +sha256 bf3ec1bd1dec31a6ab8980bfd04569f506432f35ee01e88a3910847784bc2de1 COPYING diff --git a/buildroot/package/vsftpd/vsftpd.hash b/buildroot/package/vsftpd/vsftpd.hash index a0cd55b6d..955cd3088 100644 --- a/buildroot/package/vsftpd/vsftpd.hash +++ b/buildroot/package/vsftpd/vsftpd.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7 vsftpd-3.0.3.tar.gz +sha256 9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7 vsftpd-3.0.3.tar.gz +# Locally computed +sha256 c9cf119e2f9dbcf187fb805ba5aded105db26a693803636fb7228c98460ffbf2 COPYING diff --git a/buildroot/package/vte/vte.mk b/buildroot/package/vte/vte.mk index 7332a1ae0..0d5db34b6 100644 --- a/buildroot/package/vte/vte.mk +++ b/buildroot/package/vte/vte.mk @@ -10,6 +10,13 @@ VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/0.48 VTE_DEPENDENCIES = host-intltool host-pkgconf libgtk3 libxml2 pcre2 VTE_LICENSE = LGPL-2.1+ VTE_LICENSE_FILES = COPYING -VTE_CONF_OPTS += --disable-introspection --without-gnutls --disable-vala +VTE_CONF_OPTS += --disable-introspection --disable-vala + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +VTE_CONF_OPTS += --with-gnutls +VTE_DEPENDENCIES += gnutls +else +VTE_CONF_OPTS += --without-gnutls +endif $(eval $(autotools-package)) diff --git a/buildroot/package/w_scan/w_scan.hash b/buildroot/package/w_scan/w_scan.hash index e04a08436..fcb0e611b 100644 --- a/buildroot/package/w_scan/w_scan.hash +++ b/buildroot/package/w_scan/w_scan.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe w_scan-20170107.tar.bz2 +sha256 38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe w_scan-20170107.tar.bz2 +sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/buildroot/package/waf/waf.hash b/buildroot/package/waf/waf.hash index 9d610b2c1..572562cf9 100644 --- a/buildroot/package/waf/waf.hash +++ b/buildroot/package/waf/waf.hash @@ -1,3 +1,3 @@ # Locally computed -sha1 33d170c738ed8c92dda2945b445272972f558244 waf-1.9.5 -sha256 101f14e0f47a6410c00b8feda094948516cd3989491c56eb8268907fcd164909 waf-1.9.5 +sha1 d857c29d49848e0fc42e69daa25e0ec2e732ac17 waf-2.0.19 +sha256 ba63c90a865a9bcf46926c4e6776f9a3f73d29f33d49b7f61f96bc37b7397cef waf-2.0.19 diff --git a/buildroot/package/waf/waf.mk b/buildroot/package/waf/waf.mk index 97bc2a896..ae3eb0f1e 100644 --- a/buildroot/package/waf/waf.mk +++ b/buildroot/package/waf/waf.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAF_VERSION = 1.9.5 +WAF_VERSION = 2.0.19 WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io diff --git a/buildroot/package/waffle/waffle.hash b/buildroot/package/waffle/waffle.hash index 5dfb976f2..f496927e3 100644 --- a/buildroot/package/waffle/waffle.hash +++ b/buildroot/package/waffle/waffle.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d662f6743f688dc5ea4b7d29f558eb54bd8f57350080f04a006693d22e5d1d5b waffle-v1.5.2.tar.gz +sha256 d662f6743f688dc5ea4b7d29f558eb54bd8f57350080f04a006693d22e5d1d5b waffle-1.5.2.tar.gz sha256 630844d1911c8a1b7b888a1de9097c4860b7e381362fd5aa64141d58ab7ecc9b LICENSE.txt diff --git a/buildroot/package/waffle/waffle.mk b/buildroot/package/waffle/waffle.mk index c6dd0d545..280e295cb 100644 --- a/buildroot/package/waffle/waffle.mk +++ b/buildroot/package/waffle/waffle.mk @@ -4,8 +4,8 @@ # ################################################################################ -WAFFLE_VERSION = v1.5.2 -WAFFLE_SITE = $(call github,waffle-gl,waffle,$(WAFFLE_VERSION)) +WAFFLE_VERSION = 1.5.2 +WAFFLE_SITE = $(call github,waffle-gl,waffle,v$(WAFFLE_VERSION)) WAFFLE_INSTALL_STAGING = YES WAFFLE_LICENSE = BSD-2-Clause WAFFLE_LICENSE_FILES = LICENSE.txt diff --git a/buildroot/package/wampcc/0001-Add-RISC-V-endian-detection.patch b/buildroot/package/wampcc/0001-Add-RISC-V-endian-detection.patch new file mode 100644 index 000000000..d23b44ee4 --- /dev/null +++ b/buildroot/package/wampcc/0001-Add-RISC-V-endian-detection.patch @@ -0,0 +1,46 @@ +From e94589ed36c4a311355efc46ba3f76523c546057 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 7 Aug 2019 16:17:16 +0200 +Subject: [PATCH] Add RISC-V endian detection + +3rdparty/msgpack-c/include/msgpack/predef/other/endian.h (which comes +from Boost) two ways of detecting the endianess: + + (1) It includes if BOOST_LIB_C_GNU is defined, and then + use __BYTE_ORDER to decide the endianness. + + (2) Otherwise, if (1) was not possible for some reason, it uses + architecture defines to decide the endianness. + +(1) works perfectly fine with glibc toolchains, because +BOOST_LIB_C_GNU is defined, but it doesn't work with musl. Due to +this, is not included, __BYTE_ORDER is not defined, and +method (1) does not work, causing build failures on musl toolchains +that don't have explicit handling by architecture name (method 2). + +So this commit fixes RISC-V musl build by adding support for the +__riscv architecture define, to determine that the endianness is +little endian. + +Signed-off-by: Thomas Petazzoni +--- + 3rdparty/msgpack-c/include/msgpack/predef/other/endian.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/3rdparty/msgpack-c/include/msgpack/predef/other/endian.h b/3rdparty/msgpack-c/include/msgpack/predef/other/endian.h +index 3c609fa..63a5722 100644 +--- a/3rdparty/msgpack-c/include/msgpack/predef/other/endian.h ++++ b/3rdparty/msgpack-c/include/msgpack/predef/other/endian.h +@@ -127,7 +127,8 @@ information and acquired knowledge: + defined(__AARCH64EL__) || \ + defined(_MIPSEL) || \ + defined(__MIPSEL) || \ +- defined(__MIPSEL__) ++ defined(__MIPSEL__) || \ ++ defined(__riscv) + # undef MSGPACK_ENDIAN_LITTLE_BYTE + # define MSGPACK_ENDIAN_LITTLE_BYTE MSGPACK_VERSION_NUMBER_AVAILABLE + # endif +-- +2.21.0 + diff --git a/buildroot/package/wampcc/wampcc.hash b/buildroot/package/wampcc/wampcc.hash index 162dcab0e..0e47ea699 100644 --- a/buildroot/package/wampcc/wampcc.hash +++ b/buildroot/package/wampcc/wampcc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b3c3633b4c6a74d7ac8a676a7ea30fbfde7ae19aa1fc37de3b8aa3a553b674a2 wampcc-v1.6.tar.gz +sha256 b3c3633b4c6a74d7ac8a676a7ea30fbfde7ae19aa1fc37de3b8aa3a553b674a2 wampcc-1.6.tar.gz sha256 bd185b1ec8a292d42b42346757ff6e198073e13c1e080e9ea548d34dd42d30d8 LICENSE diff --git a/buildroot/package/wampcc/wampcc.mk b/buildroot/package/wampcc/wampcc.mk index dcd65f49d..5e7ee0365 100644 --- a/buildroot/package/wampcc/wampcc.mk +++ b/buildroot/package/wampcc/wampcc.mk @@ -4,8 +4,8 @@ # ################################################################################ -WAMPCC_VERSION = v1.6 -WAMPCC_SITE = $(call github,darrenjs,wampcc,$(WAMPCC_VERSION)) +WAMPCC_VERSION = 1.6 +WAMPCC_SITE = $(call github,darrenjs,wampcc,v$(WAMPCC_VERSION)) WAMPCC_DEPENDENCIES = host-pkgconf libuv jansson openssl WAMPCC_INSTALL_STAGING = YES WAMPCC_LICENSE = MIT diff --git a/buildroot/package/wavemon/0001-Drop-on_exit-use-standard-atexit-instead.patch b/buildroot/package/wavemon/0001-Drop-on_exit-use-standard-atexit-instead.patch deleted file mode 100644 index 67292539c..000000000 --- a/buildroot/package/wavemon/0001-Drop-on_exit-use-standard-atexit-instead.patch +++ /dev/null @@ -1,73 +0,0 @@ -From f6e20c9c6e9b50963caaf5483248d329473a6815 Mon Sep 17 00:00:00 2001 -From: Gerrit Renker -Date: Mon, 21 Jan 2019 09:23:43 -0700 -Subject: [PATCH] Drop on_exit(), use standard atexit() instead -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -`on_exit()` is a GLIBC specific extension and not available in musl and uClibc. - -Portable applications should avoid this function, and use the standard -`atexit()` instead. - -Backported from:f6e20c9c6e9b50963caaf5483248d329473a6815 - -Signed-off-by: Jörg Krause ---- - iw_if.c | 10 ++++++---- - iw_if.h | 2 +- - iw_scan.c | 2 +- - 3 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/iw_if.c b/iw_if.c -index c0b0128..d8bacbc 100644 ---- a/iw_if.c -+++ b/iw_if.c -@@ -87,11 +87,13 @@ int if_set_down(const char *ifname) - return if_set_up_or_down(ifname, false); - } - --/** Exit handler to restore interface 'down' state on exit via on_exit(3). */ --void if_set_down_on_exit(int rc, void *arg) -+/** Exit handler to restore interface 'down' state on exit via atexit(3). */ -+void if_set_down_on_exit(void) - { -- if (if_set_down(arg) < 0) { -- err_msg("unable to restore %s interface state - set down manually", arg); -+ const char *ifname = conf_ifname(); -+ -+ if (ifname && if_set_down(ifname) < 0) { -+ err_msg("unable to restore %s interface state - set down manually", ifname); - } - } - -diff --git a/iw_if.h b/iw_if.h -index 50f5a47..e2199d3 100644 ---- a/iw_if.h -+++ b/iw_if.h -@@ -76,7 +76,7 @@ struct if_info { - }; - extern bool if_is_up(const char *ifname); - extern int if_set_up(const char *ifname); --extern void if_set_down_on_exit(int rc, void *arg); -+extern void if_set_down_on_exit(void); - extern void if_getinf(const char *ifname, struct if_info *info); - - /** -diff --git a/iw_scan.c b/iw_scan.c -index 18e9e06..e2b3067 100644 ---- a/iw_scan.c -+++ b/iw_scan.c -@@ -430,7 +430,7 @@ void *do_scan(void *sr_ptr) - - if (if_set_up(conf_ifname()) < 0) - err_sys("Can not bring up interface '%s'", conf_ifname()); -- if (on_exit(if_set_down_on_exit, (void *)conf_ifname()) < 0) -+ if (atexit(if_set_down_on_exit) < 0) - snprintf(sr->msg, sizeof(sr->msg), "Warning: unable to restore %s down state on exit", conf_ifname()); - break; - } --- -2.20.1 - diff --git a/buildroot/package/wavemon/wavemon.hash b/buildroot/package/wavemon/wavemon.hash index 798e2973c..455e64cba 100644 --- a/buildroot/package/wavemon/wavemon.hash +++ b/buildroot/package/wavemon/wavemon.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5823ef9459d6147a457b390b6744a77465584e93d37c2809fa7a0be557070166 wavemon-v0.9.0.tar.gz +sha256 5ebd5b79d3b7c546bc16b95161872c699a75e9acdfc6e3f02ec48dad10802067 wavemon-0.9.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/wavemon/wavemon.mk b/buildroot/package/wavemon/wavemon.mk index 864e0709d..3ae1141ec 100644 --- a/buildroot/package/wavemon/wavemon.mk +++ b/buildroot/package/wavemon/wavemon.mk @@ -4,8 +4,8 @@ # ################################################################################ -WAVEMON_VERSION = v0.9.0 -WAVEMON_SITE = $(call github,uoaerg,wavemon,$(WAVEMON_VERSION)) +WAVEMON_VERSION = 0.9.1 +WAVEMON_SITE = $(call github,uoaerg,wavemon,v$(WAVEMON_VERSION)) WAVEMON_LICENSE = GPL-3.0+ WAVEMON_LICENSE_FILES = COPYING WAVEMON_DEPENDENCIES = host-pkgconf libnl ncurses diff --git a/buildroot/package/wavpack/wavpack.mk b/buildroot/package/wavpack/wavpack.mk index 9246b9539..8cb7754b2 100644 --- a/buildroot/package/wavpack/wavpack.mk +++ b/buildroot/package/wavpack/wavpack.mk @@ -17,6 +17,13 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +WAVPACK_DEPENDENCIES += openssl +WAVPACK_CONF_OPTS += --enable-libcrypto +else +WAVPACK_CONF_OPTS += --disable-libcrypto +endif + # WavPack "autodetects" CPU type to enable ASM code. However, the assembly code # for ARM is written for ARMv7 only and building WavPack for an ARM-non-v7 # architecture will fail. We explicitly enable ASM for the supported diff --git a/buildroot/package/wayland-protocols/wayland-protocols.hash b/buildroot/package/wayland-protocols/wayland-protocols.hash index d62a433df..a27ff9e52 100644 --- a/buildroot/package/wayland-protocols/wayland-protocols.hash +++ b/buildroot/package/wayland-protocols/wayland-protocols.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2018-November/039662.html -md5 55ddd5fdb02b73b9de9559aaec267315 wayland-protocols-1.17.tar.xz -sha1 7d2569c838c776545e3eb1b1049b9c37178aae24 wayland-protocols-1.17.tar.xz -sha256 df1319cf9705643aea9fd16f9056f4e5b2471bd10c0cc3713d4a4cdc23d6812f wayland-protocols-1.17.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2019-July/040756.html +md5 af38f22d8e233c2f2e00ddc8dcc94694 wayland-protocols-1.18.tar.xz +sha1 aa2f132c082f3c790bd046283b3ef7ce3fb11370 wayland-protocols-1.18.tar.xz +sha256 3d73b7e7661763dc09d7d9107678400101ecff2b5b1e531674abfa81e04874b3 wayland-protocols-1.18.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/buildroot/package/wayland-protocols/wayland-protocols.mk b/buildroot/package/wayland-protocols/wayland-protocols.mk index 5ed4c3bc9..fbfa99558 100644 --- a/buildroot/package/wayland-protocols/wayland-protocols.mk +++ b/buildroot/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.17 +WAYLAND_PROTOCOLS_VERSION = 1.18 WAYLAND_PROTOCOLS_SITE = http://wayland.freedesktop.org/releases WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT diff --git a/buildroot/package/wayland/0001-configure-add-option-to-disable-tests.patch b/buildroot/package/wayland/0001-configure-add-option-to-disable-tests.patch index c6e4a4968..fdfbeb4bd 100644 --- a/buildroot/package/wayland/0001-configure-add-option-to-disable-tests.patch +++ b/buildroot/package/wayland/0001-configure-add-option-to-disable-tests.patch @@ -40,7 +40,7 @@ index 741db5ebf9d9..4862d42959f0 100644 @@ -287,6 +288,7 @@ os_wrappers_test_LDADD = libtest-runner.la exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c - exec_fd_leak_checker_LDADD = libtest-runner.la + exec_fd_leak_checker_LDADD = libtest-helpers.la +endif EXTRA_DIST += tests/scanner-test.sh \ diff --git a/buildroot/package/wayland/wayland.hash b/buildroot/package/wayland/wayland.hash index 3f2846091..877410188 100644 --- a/buildroot/package/wayland/wayland.hash +++ b/buildroot/package/wayland/wayland.hash @@ -1,5 +1,8 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2018-August/039358.html -md5 0c215e53de71d6fb26f7102cdc6432d3 wayland-1.16.0.tar.xz -sha1 24c63a5045c653dcfa24efd10fa7c7de89aca9ef wayland-1.16.0.tar.xz -sha256 4e72c2b56109ccfb6610d776e465f4ca0af2280c9c2f7d5cc23f0ed2548752f5 wayland-1.16.0.tar.xz -sha512 64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c wayland-1.16.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2019-March/040335.html +md5 d91f970aea11fd549eae023d06f91af3 wayland-1.17.0.tar.xz +sha1 4d9e08a7a4a07fa37a25d7aa3ef83f08edec0600 wayland-1.17.0.tar.xz +sha256 72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4 wayland-1.17.0.tar.xz +sha512 c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 wayland-1.17.0.tar.xz + +# Locally calculated +sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING diff --git a/buildroot/package/wayland/wayland.mk b/buildroot/package/wayland/wayland.mk index 6c2997be8..e325c6d75 100644 --- a/buildroot/package/wayland/wayland.mk +++ b/buildroot/package/wayland/wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_VERSION = 1.16.0 +WAYLAND_VERSION = 1.17.0 WAYLAND_SITE = http://wayland.freedesktop.org/releases WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT diff --git a/buildroot/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch b/buildroot/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch new file mode 100644 index 000000000..a7746c1f3 --- /dev/null +++ b/buildroot/package/waylandpp/0001-cmake-Make-target_link_options-optional.patch @@ -0,0 +1,37 @@ +From a39c0c115e19150551c01b04a5e903376633e771 Mon Sep 17 00:00:00 2001 +From: Nils Christopher Brause +Date: Fri, 22 Nov 2019 17:39:20 +0100 +Subject: [PATCH] [cmake] Make target_link_options optional, lowering the + required cmake version to 3.4. + +[Retrieved from: +https://github.com/NilsBrause/waylandpp/commit/a39c0c115e19150551c01b04a5e903376633e771] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 386f8d8..47a412c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ + # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-cmake_minimum_required(VERSION 3.13) ++cmake_minimum_required(VERSION 3.4) + project(waylandpp VERSION 0.2.7 LANGUAGES CXX) + + # packages +@@ -160,7 +160,9 @@ if(BUILD_LIBRARIES) + "include/wayland-client.hpp;include/wayland-util.hpp;${CMAKE_CURRENT_BINARY_DIR}/wayland-client-protocol.hpp;${CMAKE_CURRENT_BINARY_DIR}/wayland-version.hpp" + src/wayland-client.cpp src/wayland-util.cpp wayland-client-protocol.cpp wayland-client-protocol.hpp) + # Report undefined references only for the base library. +- target_link_options(wayland-client++ PRIVATE "-Wl,--no-undefined") ++ if(${CMAKE_VERSION} VERSION_GREATER "3.14.0") ++ target_link_options(wayland-client++ PRIVATE "-Wl,--no-undefined") ++ endif() + define_library(wayland-client-extra++ "${WAYLAND_CLIENT_CFLAGS}" "${WAYLAND_CLIENT_LIBRARIES}" + "${CMAKE_CURRENT_BINARY_DIR}/wayland-client-protocol-extra.hpp" + wayland-client-protocol-extra.cpp wayland-client-protocol-extra.hpp wayland-client-protocol.hpp) diff --git a/buildroot/package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch b/buildroot/package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch deleted file mode 100644 index ad5b84257..000000000 --- a/buildroot/package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 85b61589b0c73f6c6974862af678ed2f82806ac5 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Thu, 9 Aug 2018 21:44:46 +0200 -Subject: [PATCH] [scanner] Fix compiler error: missing to use - std::runtime_error - -Patch sent upstream as PR 50. - -Signed-off-by: Bernd Kuhls ---- - scanner/scanner.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp -index 9c97b7c..7019e0a 100644 ---- a/scanner/scanner.cpp -+++ b/scanner/scanner.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include "pugixml.hpp" - --- -2.18.0 - diff --git a/buildroot/package/waylandpp/waylandpp.hash b/buildroot/package/waylandpp/waylandpp.hash index 1b14814c4..39ea3e170 100644 --- a/buildroot/package/waylandpp/waylandpp.hash +++ b/buildroot/package/waylandpp/waylandpp.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 ebd4a8447bb65f288cad0e04538f6ec704e155213fc2b9cc1a851534c70aacac waylandpp-0.2.3.tar.gz -sha256 49aa6d728fd13226952c9e3a5a9cae46379b2a501010064760172b5ce7cd94bb LICENSE +sha256 fa31b659a6bb93b322e1068831c9a0135a4687d8ef9ceb2e7660c909ce10bfa6 waylandpp-0.2.7.tar.gz +sha256 8ff91f682a38f8a603b173222a60e8dc71754a79a522a316fb6b76ce138c542c LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 scanner/gpl-3.0.txt diff --git a/buildroot/package/waylandpp/waylandpp.mk b/buildroot/package/waylandpp/waylandpp.mk index ff17c35c1..8630b05bb 100644 --- a/buildroot/package/waylandpp/waylandpp.mk +++ b/buildroot/package/waylandpp/waylandpp.mk @@ -4,12 +4,13 @@ # ################################################################################ -WAYLANDPP_VERSION = 0.2.3 +WAYLANDPP_VERSION = 0.2.7 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 +# pugixml is needed only to build the host version of wayland-scanner++ +HOST_WAYLANDPP_DEPENDENCIES = host-pugixml host-pkgconf host-wayland WAYLANDPP_DEPENDENCIES = libegl host-pkgconf wayland host-waylandpp # host variant of wayland-scanner++ is needed for building the target diff --git a/buildroot/package/webkitgtk/Config.in b/buildroot/package/webkitgtk/Config.in index 9f0d4a776..86f58821a 100644 --- a/buildroot/package/webkitgtk/Config.in +++ b/buildroot/package/webkitgtk/Config.in @@ -12,19 +12,17 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8" +comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_6 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_USE_MMU config BR2_PACKAGE_WEBKITGTK bool "webkitgtk" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS @@ -57,9 +55,24 @@ config BR2_PACKAGE_WEBKITGTK if BR2_PACKAGE_WEBKITGTK +config BR2_PACKAGE_WEBKITGTK_SANDBOX + bool "sandboxing support" + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # libseccomp + select BR2_PACKAGE_BUBBLEWRAP # runtime + select BR2_PACKAGE_XDG_DBUS_PROXY # runtime + select BR2_PACKAGE_LIBSECCOMP + help + Enable sandboxing of the processes used for network operation, + disk access, and Web content rendering. + +comment "sandboxing support needs a toolchain w/ headers >= 3.12" + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + config BR2_PACKAGE_WEBKITGTK_HTTPS bool "HTTPS support" - depends on !BR2_STATIC_LIBS # gnutls -> libsoup + depends on !BR2_STATIC_LIBS # libsoup -> glib-networking, gnutls select BR2_PACKAGE_CA_CERTIFICATES # runtime select BR2_PACKAGE_LIBSOUP_SSL help @@ -95,8 +108,7 @@ if BR2_PACKAGE_WEBKITGTK_MULTIMEDIA config BR2_PACKAGE_WEBKITGTK_USE_GSTREAMER_GL bool "use gstreamer-gl" default y - depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL - select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL help Use the GStreamer GL elements for handling video content. This is recommended as it improves performance of video diff --git a/buildroot/package/webkitgtk/webkitgtk.hash b/buildroot/package/webkitgtk/webkitgtk.hash index 71642ad14..0dfbe9313 100644 --- a/buildroot/package/webkitgtk/webkitgtk.hash +++ b/buildroot/package/webkitgtk/webkitgtk.hash @@ -1,8 +1,8 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.26.2.tar.xz.sums -md5 65e06fe73ee166447894aaea95038e3b webkitgtk-2.26.2.tar.xz -sha1 5bd1ccb436c76fd1edb83afd5bec377de5655d45 webkitgtk-2.26.2.tar.xz -sha256 6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512 webkitgtk-2.26.2.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.26.4.tar.xz.sums +md5 60f881729f3b71244b7f6e58790073e0 webkitgtk-2.26.4.tar.xz +sha1 72f209c08ecc8ad4f0f6b767d4fa1be7a652df33 webkitgtk-2.26.4.tar.xz +sha256 4386900713dfadf9741177210b32623cab22562a79ffd0d446b66569934b113f webkitgtk-2.26.4.tar.xz # Hashes for license files: -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce Source/WebCore/LICENSE-LGPL-2.1 +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce Source/WebCore/LICENSE-LGPL-2.1 diff --git a/buildroot/package/webkitgtk/webkitgtk.mk b/buildroot/package/webkitgtk/webkitgtk.mk index 1273c1afe..cdb655655 100644 --- a/buildroot/package/webkitgtk/webkitgtk.mk +++ b/buildroot/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.26.2 +WEBKITGTK_VERSION = 2.26.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -17,19 +17,29 @@ WEBKITGTK_DEPENDENCIES = host-ruby host-python host-gperf \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ - -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ -DENABLE_GEOLOCATION=OFF \ -DENABLE_GTKDOC=OFF \ -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \ + -DSILENCE_CROSS_COMPILATION_NOTICES=ON \ -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ -DUSE_WOFF2=ON \ -DUSE_WPE_RENDERER=OFF +ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y) +WEBKITGTK_CONF_OPTS += \ + -DENABLE_BUBBLEWRAP_SANDBOX=ON \ + -DBWRAP_EXECUTABLE=/usr/bin/bwrap \ + -DDBUS_PROXY_EXECUTABLE=/usr/bin/xdg-dbus-proxy +WEBKITGTK_DEPENDENCIES += libseccomp +else +WEBKITGTK_CONF_OPTS += -DENABLE_BUBBLEWRAP_SANDBOX=OFF +endif + ifeq ($(BR2_PACKAGE_WEBKITGTK_MULTIMEDIA),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=ON \ @@ -90,9 +100,17 @@ endif ifeq ($(BR2_PACKAGE_WEBKITGTK_USE_GSTREAMER_GL),y) WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=ON -WEBKITGTK_DEPENDENCIES += gst1-plugins-bad else WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF endif +# JIT is not supported for MIPS r6, but the WebKit build system does not +# have a check for these processors. Disable JIT forcibly here and use +# the CLoop interpreter instead. +# +# Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=191258 +ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/webp/webp.hash b/buildroot/package/webp/webp.hash index ed4b127e5..a2d000026 100644 --- a/buildroot/package/webp/webp.hash +++ b/buildroot/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8c744a5422dbffa0d1f92e90b34186fb8ed44db93fbacb55abd751ac8808d922 libwebp-1.0.1.tar.gz +sha256 98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f50ef043 libwebp-1.1.0.tar.gz sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/buildroot/package/webp/webp.mk b/buildroot/package/webp/webp.mk index 1aa81a071..4a9455498 100644 --- a/buildroot/package/webp/webp.mk +++ b/buildroot/package/webp/webp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBP_VERSION = 1.0.1 +WEBP_VERSION = 1.1.0 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause diff --git a/buildroot/package/webrtc-audio-processing/0002-Proper-detection-of-cxxabi.h-and-execinfo.h.patch b/buildroot/package/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch similarity index 100% rename from buildroot/package/webrtc-audio-processing/0002-Proper-detection-of-cxxabi.h-and-execinfo.h.patch rename to buildroot/package/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch diff --git a/buildroot/package/webrtc-audio-processing/0001-configure.ac-fix-architecture-detection.patch b/buildroot/package/webrtc-audio-processing/0001-configure.ac-fix-architecture-detection.patch deleted file mode 100644 index d0ea4bd6b..000000000 --- a/buildroot/package/webrtc-audio-processing/0001-configure.ac-fix-architecture-detection.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 233413841882608c6d5b98b6ce89fcb8a292db82 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 6 Aug 2016 10:22:34 +0200 -Subject: [PATCH] configure.ac: fix architecture detection - -The current architecture detection, based on the "host_cpu" part of the -tuple does not work properly for a number of reason: - - - The code assumes that if host_cpu starts with "arm" then ARM - instructions are available, which is incorrect. Indeed, Cortex-M - platforms can run Linux, they are ARM platforms (so host_cpu = arm), - but they don't support ARM instructions: they support only the - Thumb-2 instruction set. - - - The armv7 case is also not very useful, as it is not standard at all - to pass armv7 as host_cpu even if the host system is actually ARMv7 - based. - - - For the same reason, the armv8 case is not very useful: armv8 is - never used as the host_cpu part of a tuple. - -So, this commit moves away from a host_cpu based logic, and instead -tests using AC_CHECK_DECLS() the built-in definitions of the compiler: - - - If we have __ARM_ARCH_ISA_ARM defined, then it's an ARM processor - that supports the ARM instruction set (this allows to exclude Thumb-2 - only processors). - - - If we have __ARM_ARCH_7A__, then we have an ARMv7-A processor, and - we can enable the corresponding optimizations - - - Same for __i386__ and __x86_64__. - -Signed-off-by: Thomas Petazzoni ---- -Submitted upstream, under a slightly different form so that it applies -on master: - - https://lists.freedesktop.org/archives/pulseaudio-discuss/2016-August/026600.html ---- - configure.ac | 27 +++++++++------------------ - 1 file changed, 9 insertions(+), 18 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6f9553b..836c6ad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,24 +55,15 @@ AS_CASE(["${host}"], - ) - AC_SUBST(PLATFORM_CFLAGS) - --AS_CASE(["${host_cpu}"], -- [i?86|x86_64], -- [ -- HAVE_X86=1 -- ], -- [armv7*|armv8*], -- [ -- HAVE_ARM=1 -- HAVE_ARMV7=1 -- ARCH_CFLAGS="-DWEBRTC_ARCH_ARM -DWEBRTC_ARCH_ARM_V7" -- ], -- [arm*], -- [ -- HAVE_ARM=1 -- ARCH_CFLAGS="-DWEBRTC_ARCH_ARM" -- ] -- # FIXME: Add MIPS support, see webrtc/BUILD.gn for defines --) -+# Testing __ARM_ARCH_ISA_ARM since the code contains ARM instructions, -+# which don't work on Thumb-2 only platforms (ARMv7-M). -+AC_CHECK_DECLS([__ARM_ARCH_ISA_ARM], -+ [HAVE_ARM=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_ARCH_ARM"]) -+AC_CHECK_DECLS([__ARM_ARCH_7A__], -+ [HAVE_ARMV7=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_ARCH_ARM_V7"]) -+AC_CHECK_DECLS([__i386__], [HAVE_X86=1]) -+AC_CHECK_DECLS([__x86_64__], [HAVE_X86=1]) -+ - AM_CONDITIONAL(HAVE_X86, [test "x${HAVE_X86}" = "x1"]) - AM_CONDITIONAL(HAVE_ARM, [test "x${HAVE_ARM}" = "x1"]) - AM_CONDITIONAL(HAVE_ARMV7, [test "x${HAVE_ARMV7}" = "x1"]) --- -2.7.4 - diff --git a/buildroot/package/webrtc-audio-processing/Config.in b/buildroot/package/webrtc-audio-processing/Config.in index 02715b080..64138269b 100644 --- a/buildroot/package/webrtc-audio-processing/Config.in +++ b/buildroot/package/webrtc-audio-processing/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS bool - default y if BR2_arm || BR2_i386 || BR2_x86_64 + default y if BR2_aarch64 || BR2_arm || BR2_i386 || BR2_x86_64 config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING bool "webrtc-audio-processing" diff --git a/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.hash b/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.hash index fe0711916..1376054f2 100644 --- a/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.hash +++ b/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 756e291d4f557d88cd50c4fe3b8454ec238362d22cedb3e6173240d90f0a80fa webrtc-audio-processing-0.3.tar.xz +sha256 a0fdd938fd85272d67e81572c5a4d9e200a0c104753cb3c209ded175ce3c5dbf webrtc-audio-processing-0.3.1.tar.xz +sha256 9b79539028e216e813e152d45f5c1ed5fdd0554426ad50270fb03134e7082dac COPYING diff --git a/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.mk b/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.mk index 668e20d73..ff84a802d 100644 --- a/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.mk +++ b/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.mk @@ -4,14 +4,14 @@ # ################################################################################ -WEBRTC_AUDIO_PROCESSING_VERSION = 0.3 +WEBRTC_AUDIO_PROCESSING_VERSION = 0.3.1 WEBRTC_AUDIO_PROCESSING_SOURCE = webrtc-audio-processing-$(WEBRTC_AUDIO_PROCESSING_VERSION).tar.xz WEBRTC_AUDIO_PROCESSING_SITE = http://freedesktop.org/software/pulseaudio/webrtc-audio-processing WEBRTC_AUDIO_PROCESSING_INSTALL_STAGING = YES WEBRTC_AUDIO_PROCESSING_LICENSE = BSD-3-Clause WEBRTC_AUDIO_PROCESSING_LICENSE_FILES = COPYING -# 0001-configure.ac-fix-architecture-detection.patch -# 0002-Proper-detection-of-cxxabi.h-and-execinfo.h.patch +WEBRTC_AUDIO_PROCESSING_DEPENDENCIES = host-pkgconf +# 0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch WEBRTC_AUDIO_PROCESSING_AUTORECONF = YES ifeq ($(BR2_SOFT_FLOAT),y) diff --git a/buildroot/package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch b/buildroot/package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch new file mode 100644 index 000000000..3b37834f5 --- /dev/null +++ b/buildroot/package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch @@ -0,0 +1,79 @@ +From c769c9238ad62178f506038178714a1c35aa2769 Mon Sep 17 00:00:00 2001 +From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> +Date: Tue, 16 Apr 2019 08:38:01 +0200 +Subject: [PATCH] Replace make_shared with new in some cases + +Replace make_shared for asio types that take a lib::ref as a parameter. +This should fix the ASIO change (boostorg/asio@59066d8) for 1.70, +while keeping it backwards compatible to older boost versions. + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/zaphoyd/websocketpp/pull/814/commits/c769c9238ad62178f506038178714a1c35aa2769] +--- + websocketpp/transport/asio/connection.hpp | 7 ++++--- + websocketpp/transport/asio/endpoint.hpp | 3 +-- + websocketpp/transport/asio/security/none.hpp | 3 +-- + websocketpp/transport/asio/security/tls.hpp | 3 +-- + 4 files changed, 7 insertions(+), 9 deletions(-) + +diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp +index 60f88a79..1ccda8f3 100644 +--- a/websocketpp/transport/asio/connection.hpp ++++ b/websocketpp/transport/asio/connection.hpp +@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_con_type { + * needed. + */ + timer_ptr set_timer(long duration, timer_handler callback) { +- timer_ptr new_timer = lib::make_shared( +- lib::ref(*m_io_service), +- lib::asio::milliseconds(duration) ++ timer_ptr new_timer( ++ new lib::asio::steady_timer( ++ *m_io_service, ++ lib::asio::milliseconds(duration)) + ); + + if (config::enable_multithreading) { +diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +index ddab2c74..4b719a97 100644 +--- a/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -195,8 +195,7 @@ class endpoint : public config::socket_type { + + m_io_service = ptr; + m_external_io_service = true; +- m_acceptor = lib::make_shared( +- lib::ref(*m_io_service)); ++ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); + + m_state = READY; + ec = lib::error_code(); +diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp +index 5c8293db..6c7d3524 100644 +--- a/websocketpp/transport/asio/security/none.hpp ++++ b/websocketpp/transport/asio/security/none.hpp +@@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this { + return socket::make_error_code(socket::error::invalid_state); + } + +- m_socket = lib::make_shared( +- lib::ref(*service)); ++ m_socket.reset(new lib::asio::ip::tcp::socket(*service)); + + if (m_socket_init_handler) { + m_socket_init_handler(m_hdl, *m_socket); +diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp +index c76fd9aa..04ac3790 100644 +--- a/websocketpp/transport/asio/security/tls.hpp ++++ b/websocketpp/transport/asio/security/tls.hpp +@@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this { + if (!m_context) { + return socket::make_error_code(socket::error::invalid_tls_context); + } +- m_socket = lib::make_shared( +- _WEBSOCKETPP_REF(*service),lib::ref(*m_context)); ++ m_socket.reset(new socket_type(*service, *m_context)); + + if (m_socket_init_handler) { + m_socket_init_handler(m_hdl, get_socket()); diff --git a/buildroot/package/websocketpp/0002-Fix-missed-entries-fix-testing.patch b/buildroot/package/websocketpp/0002-Fix-missed-entries-fix-testing.patch new file mode 100644 index 000000000..7a27065c7 --- /dev/null +++ b/buildroot/package/websocketpp/0002-Fix-missed-entries-fix-testing.patch @@ -0,0 +1,66 @@ +From f810ca2e800e9b55be41c5911cf1d1185fcd516b Mon Sep 17 00:00:00 2001 +From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> +Date: Wed, 17 Apr 2019 10:06:18 +0000 +Subject: [PATCH] Fix missed entries; fix testing + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/zaphoyd/websocketpp/pull/814/commits/f810ca2e800e9b55be41c5911cf1d1185fcd516b] +--- + CMakeLists.txt | 2 +- + websocketpp/transport/asio/connection.hpp | 3 +-- + websocketpp/transport/asio/endpoint.hpp | 7 ++----- + 3 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2786aba9..951de975 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) + endif () + + if (NOT Boost_USE_STATIC_LIBS) +- add_definitions (/DBOOST_TEST_DYN_LINK) ++ add_definitions (-DBOOST_TEST_DYN_LINK) + endif () + + set (Boost_FIND_REQUIRED TRUE) +diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp +index 1ccda8f3..57dda74a 100644 +--- a/websocketpp/transport/asio/connection.hpp ++++ b/websocketpp/transport/asio/connection.hpp +@@ -462,8 +462,7 @@ class connection : public config::socket_type::socket_con_type { + m_io_service = io_service; + + if (config::enable_multithreading) { +- m_strand = lib::make_shared( +- lib::ref(*io_service)); ++ m_strand.reset(new lib::asio::io_service::strand(*io_service)); + } + + lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, +diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +index 4b719a97..94509adb 100644 +--- a/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -687,9 +687,7 @@ class endpoint : public config::socket_type { + * @since 0.3.0 + */ + void start_perpetual() { +- m_work = lib::make_shared( +- lib::ref(*m_io_service) +- ); ++ m_work.reset(new lib::asio::io_service::work(*m_io_service)); + } + + /// Clears the endpoint's perpetual flag, allowing it to exit when empty +@@ -853,8 +851,7 @@ class endpoint : public config::socket_type { + + // Create a resolver + if (!m_resolver) { +- m_resolver = lib::make_shared( +- lib::ref(*m_io_service)); ++ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); + } + + tcon->set_uri(u); diff --git a/buildroot/package/weston-imx/Config.in b/buildroot/package/weston-imx/Config.in new file mode 100644 index 000000000..36ff7ae5a --- /dev/null +++ b/buildroot/package/weston-imx/Config.in @@ -0,0 +1,114 @@ +comment "weston-imx needs udev and a toolchain w/ locale, threads, dynamic library, headers >= 3.0" + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || BR2_STATIC_LIBS || \ + !BR2_ENABLE_LOCALE + depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL + depends on !BR2_PACKAGE_WESTON + +comment "weston-imx needs imx-gpu-viv with wyalnd output" + depends on (BR2_arm && BR2_ARM_EABIHF) || BR2_aarch64 # imx-gpu-viv + depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL + depends on !BR2_PACKAGE_WESTON + +config BR2_PACKAGE_WESTON_IMX + bool "weston-imx" + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL + depends on !BR2_PACKAGE_WESTON + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBDRM + # Runtime dependency + select BR2_PACKAGE_XKEYBOARD_CONFIG + # Make sure at least one compositor is selected. + select BR2_PACKAGE_WESTON_IMX_FBDEV if !BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR + help + Weston is the reference implementation of a Wayland + compositor, and a useful compositor in its own right. + Weston has various backends that lets it run on Linux kernel + modesetting and evdev input as well as under X11. + + http://wayland.freedesktop.org/ + +if BR2_PACKAGE_WESTON_IMX + +# Helper to make sure at least one compositor is selected. +config BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR + bool + +config BR2_PACKAGE_WESTON_IMX_DRM + bool "DRM compositor" + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + select BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR + +# Uses libgbm from mesa3d +comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL + +config BR2_PACKAGE_WESTON_IMX_FBDEV + bool "fbdev compositor" + +# FreeRDP needs threads and !static, already the case for weston +config BR2_PACKAGE_WESTON_IMX_RDP + bool "RDP compositor" + depends on BR2_USE_MMU # freerdp, libglib2 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_USE_WCHAR # freerdp + depends on BR2_INSTALL_LIBSTDCPP # freerdp + select BR2_PACKAGE_FREERDP + select BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR + help + This enables the RDP backend, which allows accessing weston + through the network with any RDP-compliant client. + + Please note that one must pass those options to weston for RDP + to be functional: + --rdp-tls-cert=/path/to/server.crt + --rdp-tls-key=/path/to/server.key + + By default, Buildroot installs such files in + /etc/freerdp/server/ so you may want to change them in a + post-build script or a rootfs overlay. + +comment "RDP compositor needs a toolchain w/ wchar, C++" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_WESTON_IMX_X11 + bool "X11 compositor" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_WESTON_IMX_HAS_COMPOSITOR + +comment "X11 compositor needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + +config BR2_PACKAGE_WESTON_IMX_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_LIBEPOXY + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXCURSOR + +comment "XWayland support needs libepoxy and X.org enabled" + depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY + +config BR2_PACKAGE_WESTON_IMX_DEMO_CLIENTS + bool "demo clients" + help + This enables the installation of Weston's demo clients. + +endif diff --git a/buildroot/package/weston-imx/weston-imx.hash b/buildroot/package/weston-imx/weston-imx.hash new file mode 100644 index 000000000..56885d71a --- /dev/null +++ b/buildroot/package/weston-imx/weston-imx.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 f39f7a24a01b023aa204ad47977a6476c17a307769f29d408621a05b5cbbcfc7 weston-imx-rel_imx_4.9.51_8mq_ga.tar.gz +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/buildroot/package/weston-imx/weston-imx.mk b/buildroot/package/weston-imx/weston-imx.mk new file mode 100644 index 000000000..e803fa3ee --- /dev/null +++ b/buildroot/package/weston-imx/weston-imx.mk @@ -0,0 +1,144 @@ +################################################################################ +# +# weston-imx +# +################################################################################ + +WESTON_IMX_VERSION = rel_imx_4.9.51_8mq_ga +WESTON_IMX_SITE = https://source.codeaurora.org/external/imx/weston-imx +WESTON_IMX_SITE_METHOD = git +WESTON_IMX_AUTORECONF = YES +WESTON_IMX_LICENSE = MIT +WESTON_IMX_LICENSE_FILES = COPYING + +WESTON_IMX_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ + libxkbcommon pixman libpng jpeg udev cairo libinput libdrm \ + $(if $(BR2_PACKAGE_WEBP),webp) + +WESTON_IMX_CONF_OPTS = \ + --with-dtddir=$(STAGING_DIR)/usr/share/wayland \ + --disable-headless-compositor \ + --disable-colord \ + --disable-devdocs \ + --disable-setuid-install + +WESTON_IMX_MAKE_OPTS = \ + WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols + +# Uses VIDIOC_EXPBUF, only available from 3.8+ +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),) +WESTON_IMX_CONF_OPTS += --disable-simple-dmabuf-v4l-client +endif + +ifeq ($(BR2_PACKAGE_DBUS),y) +WESTON_IMX_CONF_OPTS += --enable-dbus +WESTON_IMX_DEPENDENCIES += dbus +else +WESTON_IMX_CONF_OPTS += --disable-dbus +endif + +# weston-launch must be u+s root in order to work properly +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +define WESTON_IMX_PERMISSIONS + /usr/bin/weston-launch f 4755 0 0 - - - - - +endef +define WESTON_IMX_USERS + - - weston-launch -1 - - - - Weston launcher group +endef +WESTON_IMX_CONF_OPTS += --enable-weston-launch +WESTON_IMX_DEPENDENCIES += linux-pam +else +WESTON_IMX_CONF_OPTS += --disable-weston-launch +endif + +ifeq ($(BR2_PACKAGE_IMX_GPU_G2D),y) +WESTON_IMX_DEPENDENCIES += imx-gpu-g2d +# --enable-imxg2d actually disables it, so no CONF_OPTS +else +WESTON_IMX_CONF_OPTS += --disable-imxg2d +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) +WESTON_IMX_CONF_OPTS += --enable-egl +WESTON_IMX_DEPENDENCIES += libegl libgles +else +WESTON_IMX_CONF_OPTS += \ + --disable-egl \ + --disable-simple-dmabuf-drm-client \ + --disable-simple-egl-clients +endif + +ifeq ($(BR2_PACKAGE_WESTON_IMX_RDP),y) +WESTON_IMX_DEPENDENCIES += freerdp +WESTON_IMX_CONF_OPTS += --enable-rdp-compositor +else +WESTON_IMX_CONF_OPTS += --disable-rdp-compositor +endif + +ifeq ($(BR2_PACKAGE_WESTON_IMX_FBDEV),y) +WESTON_IMX_CONF_OPTS += \ + --enable-fbdev-compositor \ + WESTON_IMX_NATIVE_BACKEND=fbdev-backend.so +else +WESTON_IMX_CONF_OPTS += --disable-fbdev-compositor +endif + +ifeq ($(BR2_PACKAGE_WESTON_IMX_DRM),y) +WESTON_IMX_CONF_OPTS += \ + --enable-drm-compositor \ + WESTON_IMX_NATIVE_BACKEND=drm-backend.so +else +WESTON_IMX_CONF_OPTS += --disable-drm-compositor +endif + +ifeq ($(BR2_PACKAGE_WESTON_IMX_X11),y) +WESTON_IMX_CONF_OPTS += \ + --enable-x11-compositor \ + WESTON_IMX_NATIVE_BACKEND=x11-backend.so +WESTON_IMX_DEPENDENCIES += libxcb xlib_libX11 +else +WESTON_IMX_CONF_OPTS += --disable-x11-compositor +endif + +ifeq ($(BR2_PACKAGE_WESTON_IMX_XWAYLAND),y) +WESTON_IMX_CONF_OPTS += --enable-xwayland +WESTON_IMX_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor +else +WESTON_IMX_CONF_OPTS += --disable-xwayland +endif + +ifeq ($(BR2_PACKAGE_LIBVA),y) +WESTON_IMX_CONF_OPTS += --enable-vaapi-recorder +WESTON_IMX_DEPENDENCIES += libva +else +WESTON_IMX_CONF_OPTS += --disable-vaapi-recorder +endif + +ifeq ($(BR2_PACKAGE_LCMS2),y) +WESTON_IMX_CONF_OPTS += --enable-lcms +WESTON_IMX_DEPENDENCIES += lcms2 +else +WESTON_IMX_CONF_OPTS += --disable-lcms +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +WESTON_IMX_CONF_OPTS += --enable-systemd-login --enable-systemd-notify +WESTON_IMX_DEPENDENCIES += systemd +else +WESTON_IMX_CONF_OPTS += --disable-systemd-login --disable-systemd-notify +endif + +ifeq ($(BR2_PACKAGE_LIBXML2),y) +WESTON_IMX_CONF_OPTS += --enable-junit-xml +WESTON_IMX_DEPENDENCIES += libxml2 +else +WESTON_IMX_CONF_OPTS += --disable-junit-xml +endif + +ifeq ($(BR2_PACKAGE_WESTON_IMX_DEMO_CLIENTS),y) +WESTON_IMX_CONF_OPTS += --enable-demo-clients-install +else +WESTON_IMX_CONF_OPTS += --disable-demo-clients-install +endif + +$(eval $(autotools-package)) diff --git a/buildroot/package/weston/0001-os-compatibility-define-CLOCK_BOOTTIME-when-not-avai.patch b/buildroot/package/weston/0001-os-compatibility-define-CLOCK_BOOTTIME-when-not-avai.patch deleted file mode 100644 index a7f2a34a8..000000000 --- a/buildroot/package/weston/0001-os-compatibility-define-CLOCK_BOOTTIME-when-not-avai.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 66b71951f8ce66f02040f8814e1d89db34c34a87 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 22 Feb 2015 12:36:00 +0100 -Subject: [PATCH] os-compatibility: define CLOCK_BOOTTIME when not available - -CLOCK_BOOTTIME is supposed to be provided by the C library headers, -but uClibc 0.9.33.2 does not provide it. Instead of depending on an -uClibc patch, let's make Weston define it to the right value when not -already defined by the C library. - -Signed-off-by: Thomas Petazzoni ---- - shared/os-compatibility.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/shared/os-compatibility.h b/shared/os-compatibility.h -index 172bb7e..e369899 100644 ---- a/shared/os-compatibility.h -+++ b/shared/os-compatibility.h -@@ -26,6 +26,7 @@ - #include "config.h" - - #include -+#include - - #ifdef HAVE_EXECINFO_H - #include -@@ -37,6 +38,10 @@ backtrace(void **buffer, int size) - } - #endif - -+#ifndef CLOCK_BOOTTIME -+#define CLOCK_BOOTTIME 7 -+#endif -+ - int - os_socketpair_cloexec(int domain, int type, int protocol, int *sv); - --- -2.1.0 - diff --git a/buildroot/package/weston/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch b/buildroot/package/weston/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch new file mode 100644 index 000000000..33b1353fb --- /dev/null +++ b/buildroot/package/weston/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch @@ -0,0 +1,39 @@ +From 7b36f171d09354a2d3a48db0ae2d34d66aa4f1ae Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sat, 1 Feb 2020 20:02:29 -0700 +Subject: [PATCH] unconditionally include sys/mman.h in os-compatibility.c +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: +../shared/os-compatibility.c:273:25: error: ‘PROT_READ’ undeclared (first use in this function); did you mean ‘LOCK_READ’? + map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, file->fd, 0); + ^~~~~~~~~ + LOCK_READ + +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +7b36f171d09354a2d3a48db0ae2d34d66aa4f1ae] +--- + shared/os-compatibility.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c +index 5e1ce479..041c929f 100644 +--- a/shared/os-compatibility.c ++++ b/shared/os-compatibility.c +@@ -34,10 +34,7 @@ + #include + #include + #include +- +-#ifdef HAVE_MEMFD_CREATE + #include +-#endif + + #include "os-compatibility.h" + +-- +2.20.1 + diff --git a/buildroot/package/weston/0002-rdp-compositor-fix-compilation-with-FreeRDP-2.0-rc4.patch b/buildroot/package/weston/0002-rdp-compositor-fix-compilation-with-FreeRDP-2.0-rc4.patch deleted file mode 100644 index fe2303d42..000000000 --- a/buildroot/package/weston/0002-rdp-compositor-fix-compilation-with-FreeRDP-2.0-rc4.patch +++ /dev/null @@ -1,218 +0,0 @@ -From 7b7d9d316a9ce9b4f5f50ba766c2963b0fdcbaa5 Mon Sep 17 00:00:00 2001 -From: David Fort -Date: Tue, 4 Dec 2018 23:25:39 +0100 -Subject: [PATCH] rdp-compositor: fix compilation with FreeRDP 2.0-rc4 - -Some members have been removed from FreeRDP structs, so let's use local -variables. - -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: Yann E. MORIN - ---- - libweston/compositor-rdp.c | 86 +++++++++++++++++++------------------- - 1 file changed, 43 insertions(+), 43 deletions(-) - -diff --git a/libweston/compositor-rdp.c b/libweston/compositor-rdp.c -index 134e7298..871a0a3e 100644 ---- a/libweston/compositor-rdp.c -+++ b/libweston/compositor-rdp.c -@@ -67,19 +67,19 @@ - #endif - - #ifdef HAVE_SURFACE_BITS_BMP --#define SURFACE_BPP(cmd) cmd->bmp.bpp --#define SURFACE_CODECID(cmd) cmd->bmp.codecID --#define SURFACE_WIDTH(cmd) cmd->bmp.width --#define SURFACE_HEIGHT(cmd) cmd->bmp.height --#define SURFACE_BITMAP_DATA(cmd) cmd->bmp.bitmapData --#define SURFACE_BITMAP_DATA_LEN(cmd) cmd->bmp.bitmapDataLength -+#define SURFACE_BPP(cmd) cmd.bmp.bpp -+#define SURFACE_CODECID(cmd) cmd.bmp.codecID -+#define SURFACE_WIDTH(cmd) cmd.bmp.width -+#define SURFACE_HEIGHT(cmd) cmd.bmp.height -+#define SURFACE_BITMAP_DATA(cmd) cmd.bmp.bitmapData -+#define SURFACE_BITMAP_DATA_LEN(cmd) cmd.bmp.bitmapDataLength - #else --#define SURFACE_BPP(cmd) cmd->bpp --#define SURFACE_CODECID(cmd) cmd->codecID --#define SURFACE_WIDTH(cmd) cmd->width --#define SURFACE_HEIGHT(cmd) cmd->height --#define SURFACE_BITMAP_DATA(cmd) cmd->bitmapData --#define SURFACE_BITMAP_DATA_LEN(cmd) cmd->bitmapDataLength -+#define SURFACE_BPP(cmd) cmd.bpp -+#define SURFACE_CODECID(cmd) cmd.codecID -+#define SURFACE_WIDTH(cmd) cmd.width -+#define SURFACE_HEIGHT(cmd) cmd.height -+#define SURFACE_BITMAP_DATA(cmd) cmd.bitmapData -+#define SURFACE_BITMAP_DATA_LEN(cmd) cmd.bitmapDataLength - #endif - - #include -@@ -198,7 +198,7 @@ rdp_peer_refresh_rfx(pixman_region32_t *damage, pixman_image_t *image, freerdp_p - uint32_t *ptr; - RFX_RECT *rfxRect; - rdpUpdate *update = peer->update; -- SURFACE_BITS_COMMAND *cmd = &update->surface_bits_command; -+ SURFACE_BITS_COMMAND cmd; - RdpPeerContext *context = (RdpPeerContext *)peer->context; - - Stream_Clear(context->encode_stream); -@@ -208,14 +208,14 @@ rdp_peer_refresh_rfx(pixman_region32_t *damage, pixman_image_t *image, freerdp_p - height = (damage->extents.y2 - damage->extents.y1); - - #ifdef HAVE_SKIP_COMPRESSION -- cmd->skipCompression = TRUE; -+ cmd.skipCompression = TRUE; - #else -- memset(cmd, 0, sizeof(*cmd)); -+ memset(&cmd, 0, sizeof(*cmd)); - #endif -- cmd->destLeft = damage->extents.x1; -- cmd->destTop = damage->extents.y1; -- cmd->destRight = damage->extents.x2; -- cmd->destBottom = damage->extents.y2; -+ cmd.destLeft = damage->extents.x1; -+ cmd.destTop = damage->extents.y1; -+ cmd.destRight = damage->extents.x2; -+ cmd.destBottom = damage->extents.y2; - SURFACE_BPP(cmd) = 32; - SURFACE_CODECID(cmd) = peer->settings->RemoteFxCodecId; - SURFACE_WIDTH(cmd) = width; -@@ -245,7 +245,7 @@ rdp_peer_refresh_rfx(pixman_region32_t *damage, pixman_image_t *image, freerdp_p - SURFACE_BITMAP_DATA_LEN(cmd) = Stream_GetPosition(context->encode_stream); - SURFACE_BITMAP_DATA(cmd) = Stream_Buffer(context->encode_stream); - -- update->SurfaceBits(update->context, cmd); -+ update->SurfaceBits(update->context, &cmd); - } - - -@@ -255,7 +255,7 @@ rdp_peer_refresh_nsc(pixman_region32_t *damage, pixman_image_t *image, freerdp_p - int width, height; - uint32_t *ptr; - rdpUpdate *update = peer->update; -- SURFACE_BITS_COMMAND *cmd = &update->surface_bits_command; -+ SURFACE_BITS_COMMAND cmd; - RdpPeerContext *context = (RdpPeerContext *)peer->context; - - Stream_Clear(context->encode_stream); -@@ -265,15 +265,15 @@ rdp_peer_refresh_nsc(pixman_region32_t *damage, pixman_image_t *image, freerdp_p - height = (damage->extents.y2 - damage->extents.y1); - - #ifdef HAVE_SKIP_COMPRESSION -- cmd->skipCompression = TRUE; -+ cmd.skipCompression = TRUE; - #else - memset(cmd, 0, sizeof(*cmd)); - #endif - -- cmd->destLeft = damage->extents.x1; -- cmd->destTop = damage->extents.y1; -- cmd->destRight = damage->extents.x2; -- cmd->destBottom = damage->extents.y2; -+ cmd.destLeft = damage->extents.x1; -+ cmd.destTop = damage->extents.y1; -+ cmd.destRight = damage->extents.x2; -+ cmd.destBottom = damage->extents.y2; - SURFACE_BPP(cmd) = 32; - SURFACE_CODECID(cmd) = peer->settings->NSCodecId; - SURFACE_WIDTH(cmd) = width; -@@ -289,7 +289,7 @@ rdp_peer_refresh_nsc(pixman_region32_t *damage, pixman_image_t *image, freerdp_p - SURFACE_BITMAP_DATA_LEN(cmd) = Stream_GetPosition(context->encode_stream); - SURFACE_BITMAP_DATA(cmd) = Stream_Buffer(context->encode_stream); - -- update->SurfaceBits(update->context, cmd); -+ update->SurfaceBits(update->context, &cmd); - } - - static void -@@ -310,8 +310,8 @@ static void - rdp_peer_refresh_raw(pixman_region32_t *region, pixman_image_t *image, freerdp_peer *peer) - { - rdpUpdate *update = peer->update; -- SURFACE_BITS_COMMAND *cmd = &update->surface_bits_command; -- SURFACE_FRAME_MARKER *marker = &update->surface_frame_marker; -+ SURFACE_BITS_COMMAND cmd; -+ SURFACE_FRAME_MARKER marker; - pixman_box32_t *rect, subrect; - int nrects, i; - int heightIncrement, remainingHeight, top; -@@ -320,18 +320,18 @@ rdp_peer_refresh_raw(pixman_region32_t *region, pixman_image_t *image, freerdp_p - if (!nrects) - return; - -- marker->frameId++; -- marker->frameAction = SURFACECMD_FRAMEACTION_BEGIN; -- update->SurfaceFrameMarker(peer->context, marker); -+ marker.frameId++; -+ marker.frameAction = SURFACECMD_FRAMEACTION_BEGIN; -+ update->SurfaceFrameMarker(peer->context, &marker); - -- memset(cmd, 0, sizeof(*cmd)); -+ memset(&cmd, 0, sizeof(cmd)); - SURFACE_BPP(cmd) = 32; - SURFACE_CODECID(cmd) = 0; - - for (i = 0; i < nrects; i++, rect++) { - /*weston_log("rect(%d,%d, %d,%d)\n", rect->x1, rect->y1, rect->x2, rect->y2);*/ -- cmd->destLeft = rect->x1; -- cmd->destRight = rect->x2; -+ cmd.destLeft = rect->x1; -+ cmd.destRight = rect->x2; - SURFACE_WIDTH(cmd) = rect->x2 - rect->x1; - - heightIncrement = peer->settings->MultifragMaxRequestSize / (16 + SURFACE_WIDTH(cmd) * 4); -@@ -343,8 +343,8 @@ rdp_peer_refresh_raw(pixman_region32_t *region, pixman_image_t *image, freerdp_p - - while (remainingHeight) { - SURFACE_HEIGHT(cmd) = (remainingHeight > heightIncrement) ? heightIncrement : remainingHeight; -- cmd->destTop = top; -- cmd->destBottom = top + SURFACE_HEIGHT(cmd); -+ cmd.destTop = top; -+ cmd.destBottom = top + SURFACE_HEIGHT(cmd); - SURFACE_BITMAP_DATA_LEN(cmd) = SURFACE_WIDTH(cmd) * SURFACE_HEIGHT(cmd) * 4; - SURFACE_BITMAP_DATA(cmd) = (BYTE *)realloc(SURFACE_BITMAP_DATA(cmd), SURFACE_BITMAP_DATA_LEN(cmd)); - -@@ -353,15 +353,15 @@ rdp_peer_refresh_raw(pixman_region32_t *region, pixman_image_t *image, freerdp_p - pixman_image_flipped_subrect(&subrect, image, SURFACE_BITMAP_DATA(cmd)); - - /*weston_log("* sending (%d,%d, %d,%d)\n", subrect.x1, subrect.y1, subrect.x2, subrect.y2); */ -- update->SurfaceBits(peer->context, cmd); -+ update->SurfaceBits(peer->context, &cmd); - - remainingHeight -= SURFACE_HEIGHT(cmd); - top += SURFACE_HEIGHT(cmd); - } - } - -- marker->frameAction = SURFACECMD_FRAMEACTION_END; -- update->SurfaceFrameMarker(peer->context, marker); -+ marker.frameAction = SURFACECMD_FRAMEACTION_END; -+ update->SurfaceFrameMarker(peer->context, &marker); - } - - static void -@@ -956,7 +956,7 @@ xf_peer_activate(freerdp_peer* client) - pixman_box32_t box; - pixman_region32_t damage; - char seat_name[50]; -- -+ POINTER_SYSTEM_UPDATE pointer_system; - - peerCtx = (RdpPeerContext *)client->context; - b = peerCtx->rdpBackend; -@@ -1056,8 +1056,8 @@ xf_peer_activate(freerdp_peer* client) - - /* disable pointer on the client side */ - pointer = client->update->pointer; -- pointer->pointer_system.type = SYSPTR_NULL; -- pointer->PointerSystem(client->context, &pointer->pointer_system); -+ pointer_system.type = SYSPTR_NULL; -+ pointer->PointerSystem(client->context, &pointer_system); - - /* sends a full refresh */ - box.x1 = 0; --- -2.20.1 - diff --git a/buildroot/package/weston/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch b/buildroot/package/weston/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch new file mode 100644 index 000000000..c403ede4b --- /dev/null +++ b/buildroot/package/weston/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch @@ -0,0 +1,67 @@ +From f0d3a6149158f682230ae9a1e69289431974f635 Mon Sep 17 00:00:00 2001 +From: Sebastian Wick +Date: Wed, 5 Feb 2020 10:27:23 +0100 +Subject: [PATCH] shared: guard all the seal logic behind HAVE_MEMFD_CREATE + +The initial version of os_ro_anonymous_file missed two guards around the +seal logic which leads to a compilation error on older systems. + +Also make the check for a read-only file symmetric in +os_ro_anonymous_file_get_fd and os_ro_anonymous_file_put_fd. + +Signed-off-by: Sebastian Wick +[james.hilliard1@gmail.com: backport from upstream commit +f0d3a6149158f682230ae9a1e69289431974f635] +Signed-off-by: James Hilliard +--- + shared/os-compatibility.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c +index 041c929f..2e12b7cc 100644 +--- a/shared/os-compatibility.c ++++ b/shared/os-compatibility.c +@@ -340,6 +340,7 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file, + void *src, *dst; + int seals, fd; + ++#ifdef HAVE_MEMFD_CREATE + seals = fcntl(file->fd, F_GET_SEALS); + + /* file was sealed for read-only and we don't have to support MAP_SHARED +@@ -348,6 +349,7 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file, + if (seals != -1 && mapmode == RO_ANONYMOUS_FILE_MAPMODE_PRIVATE && + (seals & READONLY_SEALS) == READONLY_SEALS) + return file->fd; ++#endif + + /* for all other cases we create a new anonymous file that can be mapped + * with MAP_SHARED and copy the contents to it and return that instead +@@ -388,17 +390,18 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file, + int + os_ro_anonymous_file_put_fd(int fd) + { ++#ifdef HAVE_MEMFD_CREATE + int seals = fcntl(fd, F_GET_SEALS); + if (seals == -1 && errno != EINVAL) + return -1; + +- /* If the fd cannot be sealed seals is -1 at this point +- * or the file can be sealed but has not been sealed for writing. +- * In both cases we created a new anonymous file that we have to +- * close. ++ /* The only case in which we do NOT have to close the file is when the file ++ * was sealed for read-only + */ +- if (seals == -1 || !(seals & F_SEAL_WRITE)) +- close(fd); ++ if (seals != -1 && (seals & READONLY_SEALS) == READONLY_SEALS) ++ return 0; ++#endif + ++ close(fd); + return 0; + } +-- +2.20.1 + diff --git a/buildroot/package/weston/Config.in b/buildroot/package/weston/Config.in index f874b0cc6..bf783b70d 100644 --- a/buildroot/package/weston/Config.in +++ b/buildroot/package/weston/Config.in @@ -5,7 +5,6 @@ comment "weston needs udev and a toolchain w/ locale, threads, dynamic library, config BR2_PACKAGE_WESTON bool "weston" - depends on BR2_ENABLE_LOCALE # libinput depends on BR2_PACKAGE_HAS_UDEV depends on !BR2_STATIC_LIBS # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # wayland @@ -21,8 +20,6 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_LIBDRM # Runtime dependency select BR2_PACKAGE_XKEYBOARD_CONFIG - # Make sure at least one compositor is selected. - select BR2_PACKAGE_WESTON_FBDEV if !BR2_PACKAGE_WESTON_HAS_COMPOSITOR help Weston is the reference implementation of a Wayland compositor, and a useful compositor in its own right. @@ -33,14 +30,40 @@ config BR2_PACKAGE_WESTON if BR2_PACKAGE_WESTON -# Helper to make sure at least one compositor is selected. -config BR2_PACKAGE_WESTON_HAS_COMPOSITOR - bool +choice + prompt "default compositor" + +config BR2_PACKAGE_WESTON_DEFAULT_FBDEV + bool "fbdev" + select BR2_PACKAGE_WESTON_FBDEV + +config BR2_PACKAGE_WESTON_DEFAULT_DRM + bool "drm" + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + select BR2_PACKAGE_WESTON_DRM + +comment "drm backend needs mesa3d w/ EGL driver" + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL + +config BR2_PACKAGE_WESTON_DEFAULT_X11 + bool "X11" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_WESTON_X11 + +comment "X11 backend needs X.org" + depends on !BR2_PACKAGE_XORG7 + +endchoice + +config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR + string + default "fbdev" if BR2_PACKAGE_WESTON_DEFAULT_FBDEV + default "drm" if BR2_PACKAGE_WESTON_DEFAULT_DRM + default "x11" if BR2_PACKAGE_WESTON_DEFAULT_X11 config BR2_PACKAGE_WESTON_DRM bool "DRM compositor" depends on BR2_PACKAGE_MESA3D_OPENGL_EGL - select BR2_PACKAGE_WESTON_HAS_COMPOSITOR # Uses libgbm from mesa3d comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" @@ -57,7 +80,6 @@ config BR2_PACKAGE_WESTON_RDP depends on BR2_USE_WCHAR # freerdp depends on BR2_INSTALL_LIBSTDCPP # freerdp select BR2_PACKAGE_FREERDP - select BR2_PACKAGE_WESTON_HAS_COMPOSITOR help This enables the RDP backend, which allows accessing weston through the network with any RDP-compliant client. @@ -81,7 +103,6 @@ config BR2_PACKAGE_WESTON_X11 depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_WESTON_HAS_COMPOSITOR comment "X11 compositor needs X.org enabled" depends on !BR2_PACKAGE_XORG7 @@ -100,7 +121,22 @@ comment "XWayland support needs libepoxy and X.org enabled" config BR2_PACKAGE_WESTON_DEMO_CLIENTS bool "demo clients" + depends on BR2_USE_MMU # pango + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango + depends on BR2_INSTALL_LIBSTDCPP # pango + depends on BR2_TOOLCHAIN_HAS_THREADS # pango + depends on BR2_USE_WCHAR # pango + depends on BR2_PACKAGE_HAS_LIBGLES + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + select BR2_PACKAGE_PANGO help This enables the installation of Weston's demo clients. +comment "demo clients needs an OpenGL ES provider, an OpenEGL-capable Wayland backend and a toolchain w/ wchar, threads, C++" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGLES || \ + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND + endif diff --git a/buildroot/package/weston/weston.hash b/buildroot/package/weston/weston.hash index 799d371dc..07695fda8 100644 --- a/buildroot/package/weston/weston.hash +++ b/buildroot/package/weston/weston.hash @@ -1,7 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2018-August/039359.html -md5 752a04ce3c65af4884cfac4e57231bdb weston-5.0.0.tar.xz -sha1 56b42b1fbea9e120a8127736328e4c71ac781a57 weston-5.0.0.tar.xz -sha256 15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf weston-5.0.0.tar.xz -sha512 b6f97eca014ea47f3de0c5ddd89712f896cd66423d0eb499e1d88d35aab616cef1e735ebb8e0cefd8b60085314b6ec3d56b39d7c4776188bb56d58efc84a52cf weston-5.0.0.tar.xz -# locally computed -sha256 0f0de7b7b1f65870139c95dde7abc19ed305631ae7c5d37c386db40cde108632 weston-rel_imx_4.9.51_8mq_ga.tar.gz +# From https://lists.freedesktop.org/archives/wayland-devel/2020-January/041147.html +md5 53e4810d852df0601d01fd986a5b22b3 weston-8.0.0.tar.xz +sha1 80200a9c677d34c2de52230be444bd03ecd84229 weston-8.0.0.tar.xz +sha256 7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848 weston-8.0.0.tar.xz +sha512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c weston-8.0.0.tar.xz +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/buildroot/package/weston/weston.mk b/buildroot/package/weston/weston.mk index 7fbe39b98..b22e68594 100644 --- a/buildroot/package/weston/weston.mk +++ b/buildroot/package/weston/weston.mk @@ -4,43 +4,40 @@ # ################################################################################ -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y) -WESTON_VERSION = rel_imx_4.9.51_8mq_ga -WESTON_SITE = https://source.codeaurora.org/external/imx/weston-imx -WESTON_SITE_METHOD = git -WESTON_AUTORECONF = YES -else -WESTON_VERSION = 5.0.0 +WESTON_VERSION = 8.0.0 WESTON_SITE = http://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz -endif WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ - libxkbcommon pixman libpng jpeg udev cairo libinput libdrm \ - $(if $(BR2_PACKAGE_WEBP),webp) + libxkbcommon pixman libpng jpeg udev cairo libinput libdrm WESTON_CONF_OPTS = \ - --with-dtddir=$(STAGING_DIR)/usr/share/wayland \ - --disable-headless-compositor \ - --disable-colord \ - --disable-devdocs \ - --disable-setuid-install - -WESTON_MAKE_OPTS = \ - WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols + -Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \ + -Dbackend-headless=false \ + -Dcolor-management-colord=false \ + -Dremoting=false # Uses VIDIOC_EXPBUF, only available from 3.8+ -ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),) -WESTON_CONF_OPTS += --disable-simple-dmabuf-v4l-client +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),y) +WESTON_CONF_OPTS += -Dsimple-clients=dmabuf-v4l +else +WESTON_CONF_OPTS += -Dsimple-clients= endif -ifeq ($(BR2_PACKAGE_DBUS),y) -WESTON_CONF_OPTS += --enable-dbus -WESTON_DEPENDENCIES += dbus +ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_SYSTEMD),yy) +WESTON_CONF_OPTS += -Dlauncher-logind=true +WESTON_DEPENDENCIES += dbus systemd else -WESTON_CONF_OPTS += --disable-dbus +WESTON_CONF_OPTS += -Dlauncher-logind=false +endif + +ifeq ($(BR2_PACKAGE_WEBP),y) +WESTON_CONF_OPTS += -Dimage-webp=true +WESTON_DEPENDENCIES += webp +else +WESTON_CONF_OPTS += -Dimage-webp=false endif # weston-launch must be u+s root in order to work properly @@ -51,102 +48,96 @@ endef define WESTON_USERS - - weston-launch -1 - - - - Weston launcher group endef -WESTON_CONF_OPTS += --enable-weston-launch +WESTON_CONF_OPTS += -Dweston-launch=true WESTON_DEPENDENCIES += linux-pam else -WESTON_CONF_OPTS += --disable-weston-launch -endif - -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL),y) -ifeq ($(BR2_PACKAGE_IMX_GPU_G2D),y) -WESTON_DEPENDENCIES += imx-gpu-g2d -# --enable-imxg2d actually disables it, so no CONF_OPTS -else -WESTON_CONF_OPTS += --disable-imxg2d -endif +WESTON_CONF_OPTS += -Dweston-launch=false endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy) -WESTON_CONF_OPTS += --enable-egl +WESTON_CONF_OPTS += -Drenderer-gl=true WESTON_DEPENDENCIES += libegl libgles else WESTON_CONF_OPTS += \ - --disable-egl \ - --disable-simple-dmabuf-drm-client \ - --disable-simple-egl-clients + -Drenderer-gl=false endif ifeq ($(BR2_PACKAGE_WESTON_RDP),y) WESTON_DEPENDENCIES += freerdp -WESTON_CONF_OPTS += --enable-rdp-compositor +WESTON_CONF_OPTS += -Dbackend-rdp=true else -WESTON_CONF_OPTS += --disable-rdp-compositor +WESTON_CONF_OPTS += -Dbackend-rdp=false endif ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) -WESTON_CONF_OPTS += \ - --enable-fbdev-compositor \ - WESTON_NATIVE_BACKEND=fbdev-backend.so +WESTON_CONF_OPTS += -Dbackend-fbdev=true else -WESTON_CONF_OPTS += --disable-fbdev-compositor +WESTON_CONF_OPTS += -Dbackend-fbdev=false endif ifeq ($(BR2_PACKAGE_WESTON_DRM),y) -WESTON_CONF_OPTS += \ - --enable-drm-compositor \ - WESTON_NATIVE_BACKEND=drm-backend.so +WESTON_CONF_OPTS += -Dbackend-drm=true else -WESTON_CONF_OPTS += --disable-drm-compositor +WESTON_CONF_OPTS += -Dbackend-drm=false endif ifeq ($(BR2_PACKAGE_WESTON_X11),y) -WESTON_CONF_OPTS += \ - --enable-x11-compositor \ - WESTON_NATIVE_BACKEND=x11-backend.so +WESTON_CONF_OPTS += -Dbackend-x11=true WESTON_DEPENDENCIES += libxcb xlib_libX11 else -WESTON_CONF_OPTS += --disable-x11-compositor +WESTON_CONF_OPTS += -Dbackend-x11=false endif +# We're guaranteed to have at least one backend +WESTON_CONF_OPTS += -Dbackend-default=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR)) + ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) -WESTON_CONF_OPTS += --enable-xwayland +WESTON_CONF_OPTS += -Dxwayland=true WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor else -WESTON_CONF_OPTS += --disable-xwayland +WESTON_CONF_OPTS += -Dxwayland=false endif ifeq ($(BR2_PACKAGE_LIBVA),y) -WESTON_CONF_OPTS += --enable-vaapi-recorder +WESTON_CONF_OPTS += -Dbackend-drm-screencast-vaapi=true WESTON_DEPENDENCIES += libva else -WESTON_CONF_OPTS += --disable-vaapi-recorder +WESTON_CONF_OPTS += -Dbackend-drm-screencast-vaapi=false endif ifeq ($(BR2_PACKAGE_LCMS2),y) -WESTON_CONF_OPTS += --enable-lcms +WESTON_CONF_OPTS += -Dcolor-management-lcms=true WESTON_DEPENDENCIES += lcms2 else -WESTON_CONF_OPTS += --disable-lcms +WESTON_CONF_OPTS += -Dcolor-management-lcms=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) -WESTON_CONF_OPTS += --enable-systemd-login --enable-systemd-notify +WESTON_CONF_OPTS += -Dsystemd=true WESTON_DEPENDENCIES += systemd else -WESTON_CONF_OPTS += --disable-systemd-login --disable-systemd-notify +WESTON_CONF_OPTS += -Dsystemd=false endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -WESTON_CONF_OPTS += --enable-junit-xml +WESTON_CONF_OPTS += -Dtest-junit-xml=true WESTON_DEPENDENCIES += libxml2 else -WESTON_CONF_OPTS += --disable-junit-xml +WESTON_CONF_OPTS += -Dtest-junit-xml=false +endif + +ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy) +WESTON_CONF_OPTS += -Dpipewire=true +WESTON_DEPENDENCIES += pipewire +else +WESTON_CONF_OPTS += -Dpipewire=false endif ifeq ($(BR2_PACKAGE_WESTON_DEMO_CLIENTS),y) -WESTON_CONF_OPTS += --enable-demo-clients-install +WESTON_CONF_OPTS += -Ddemo-clients=true +WESTON_DEPENDENCIES += pango else -WESTON_CONF_OPTS += --disable-demo-clients-install +WESTON_CONF_OPTS += -Ddemo-clients=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/buildroot/package/wf111/Config.in b/buildroot/package/wf111/Config.in index 7b61ea195..8dd20a7cc 100644 --- a/buildroot/package/wf111/Config.in +++ b/buildroot/package/wf111/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_WF111 configuration entry that selects them, for example. - By enabling another random WiFi driver that select them. - https://www.silabs.com/products/wireless/wi-fi/wf111-bluegiga-module + https://www.silabs.com/wireless/wi-fi/bluegiga-legacy-modules/device.wf111 comment "wf111 needs a glibc toolchain" depends on BR2_LINUX_KERNEL diff --git a/buildroot/package/which/which.hash b/buildroot/package/which/which.hash index fe649ab01..edea4e5e3 100644 --- a/buildroot/package/which/which.hash +++ b/buildroot/package/which/which.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad which-2.21.tar.gz +sha256 f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad which-2.21.tar.gz +# Locally computed +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/whois/whois.hash b/buildroot/package/whois/whois.hash index 41ef935c1..b83ea68d2 100644 --- a/buildroot/package/whois/whois.hash +++ b/buildroot/package/whois/whois.hash @@ -1,5 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20181026T220636Z/pool/main/w/whois/whois_5.4.0.dsc -sha256 3775ae0cfaa6dd8d886e5233c4826225cddcb88c99c2a08130d14e15fe58e378 whois_5.4.0.tar.xz +# From http://snapshot.debian.org/archive/debian/20200123T155144Z/pool/main/w/whois/whois_5.5.5.dsc +sha256 c30e8a444482eadac157be42649833ef77c5ea9fb5cbcbabb6ee3f2254e5530d whois_5.5.5.tar.xz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/whois/whois.mk b/buildroot/package/whois/whois.mk index 712ad911d..417f5c76a 100644 --- a/buildroot/package/whois/whois.mk +++ b/buildroot/package/whois/whois.mk @@ -4,10 +4,13 @@ # ################################################################################ -WHOIS_VERSION = 5.4.0 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20181026T220636Z/pool/main/w/whois +WHOIS_VERSION = 5.5.5 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20200123T155144Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz -WHOIS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +WHOIS_DEPENDENCIES = \ + host-pkgconf \ + $(if $(BR2_PACKAGE_LIBIDN2),libidn2) \ + $(TARGET_NLS_DEPENDENCIES) WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV) WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ LIBS="$(WHOIS_EXTRA_LIBS)" @@ -21,11 +24,6 @@ WHOIS_EXTRA_LIBS += -liconv WHOIS_MAKE_ENV += HAVE_ICONV=1 endif -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WHOIS_DEPENDENCIES += libidn2 -WHOIS_MAKE_ENV += HAVE_LIBIDN2=1 -endif - ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) WHOIS_BUILD_TARGETS = WHOIS_INSTALL_TARGETS = install diff --git a/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash b/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash index 2cb6c880e..7adcc8603 100644 --- a/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash +++ b/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 b99700f6d504d76878de83ac50f18a0270b6edd0b52a0458c60fc606ed3332f0 wilink-bt-firmware-169b2df5b968f0ede32ea9044859942fc220c435.tar.gz +sha256 9e3c3e8aa19e6cf59a72f235391a095d6d953c325b669d8a7815e32616c232df wilink-bt-firmware-43fca73c6a98c63fcb98f82af5bf83761778e005.tar.gz +sha256 21fd99ce784dc33b39ec0b4a383a9a9b8dafea261d73ad4548683c4eecd87f37 LICENSE diff --git a/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.mk b/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.mk index 180a85e28..722c4655c 100644 --- a/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.mk +++ b/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.mk @@ -4,14 +4,15 @@ # ################################################################################ -WILINK_BT_FIRMWARE_VERSION = 169b2df5b968f0ede32ea9044859942fc220c435 -WILINK_BT_FIRMWARE_SITE = $(call github,TI-ECS,bt-firmware,$(WILINK_BT_FIRMWARE_VERSION)) +WILINK_BT_FIRMWARE_VERSION = 43fca73c6a98c63fcb98f82af5bf83761778e005 +WILINK_BT_FIRMWARE_SITE = git://git.ti.com/ti-bt/service-packs.git +WILINK_BT_FIRMWARE_SITE_METHOD = git WILINK_BT_FIRMWARE_LICENSE = PROPRIETARY -WILINK_BT_FIRMWARE_LICENSE_FILES = LICENCE +WILINK_BT_FIRMWARE_LICENSE_FILES = LICENSE define WILINK_BT_FIRMWARE_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/lib/firmware/ti-connectivity - cp $(@D)/TIInit_*.bts $(TARGET_DIR)/lib/firmware/ti-connectivity + cp $(@D)/initscripts/TIInit_*.bts $(TARGET_DIR)/lib/firmware/ti-connectivity endef $(eval $(generic-package)) diff --git a/buildroot/package/wine/wine.hash b/buildroot/package/wine/wine.hash index ba007142e..eeb30c9a9 100644 --- a/buildroot/package/wine/wine.hash +++ b/buildroot/package/wine/wine.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 d45a88edbe7db363e297cacedc94e66df3464504a01c2eccf04f518066a6fb0c wine-3.0.4.tar.xz +sha256 25026d9f98a5d62583b8a02c91b1adaca9a2ff000d54095bb274045379e00fda wine-4.0.3.tar.xz +# Locally calculated +sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB +sha256 d29132813288a9b6034a79c53b22dbb1b078c70cec5c9bb731ae574cf812aa54 LICENSE diff --git a/buildroot/package/wine/wine.mk b/buildroot/package/wine/wine.mk index 7e44e3c81..f315d9099 100644 --- a/buildroot/package/wine/wine.mk +++ b/buildroot/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 3.0.4 +WINE_VERSION = 4.0.3 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/3.0 +WINE_SITE = https://dl.winehq.org/wine/source/4.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_DEPENDENCIES = host-bison host-flex host-wine @@ -25,7 +25,9 @@ WINE_CONF_OPTS = \ --without-gsm \ --without-hal \ --without-opencl \ - --without-oss + --without-oss \ + --without-vkd3d \ + --without-vulkan # Wine uses a wrapper around gcc, and uses the value of --host to # construct the filename of the gcc to call. But for external @@ -193,7 +195,7 @@ else WINE_CONF_OPTS += --without-ldap endif -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d else @@ -222,6 +224,13 @@ else WINE_CONF_OPTS += --without-sane endif +ifeq ($(BR2_PACKAGE_SDL2),y) +WINE_CONF_OPTS += --with-sdl +WINE_DEPENDENCIES += sdl2 +else +WINE_CONF_OPTS += --without-sdl +endif + ifeq ($(BR2_PACKAGE_TIFF),y) WINE_CONF_OPTS += --with-tiff WINE_DEPENDENCIES += tiff @@ -356,6 +365,7 @@ HOST_WINE_CONF_OPTS += \ --without-glu \ --without-gnutls \ --without-gsm \ + --without-gssapi \ --without-gstreamer \ --without-hal \ --without-jpeg \ @@ -372,8 +382,11 @@ HOST_WINE_CONF_OPTS += \ --without-pulse \ --without-png \ --without-sane \ + --without-sdl \ --without-tiff \ --without-v4l \ + --without-vkd3d \ + --without-vulkan \ --without-x \ --without-xcomposite \ --without-xcursor \ diff --git a/buildroot/package/wipe/wipe.hash b/buildroot/package/wipe/wipe.hash index 9bde2014d..d607efde4 100644 --- a/buildroot/package/wipe/wipe.hash +++ b/buildroot/package/wipe/wipe.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 463916370f9b35bb34419c2c0ae3dc4c0a471db32e8595afa1d14c0337b61aa0 wipe-2.3.1.tar.bz2 +sha256 890cd89006bb57ce95b460e867c7bcc81d30cbc23067a9be4644bdac6882bc14 LICENSE diff --git a/buildroot/package/wireguard-linux-compat/Config.in b/buildroot/package/wireguard-linux-compat/Config.in new file mode 100644 index 000000000..4ee214be6 --- /dev/null +++ b/buildroot/package/wireguard-linux-compat/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_WIREGUARD_LINUX_COMPAT + bool "wireguard linux-compat" + depends on BR2_LINUX_KERNEL + # kernel module requires 3.10+ + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + help + WireGuard is an extremely simple yet fast and modern VPN + that utilizes state-of-the-art cryptography. It aims to be + faster, simpler, leaner, and more useful than IPSec, while + avoiding the massive headache. It intends to be considerably + more performant than OpenVPN. WireGuard is designed as a + general purpose VPN for running on embedded interfaces and + super computers alike, fit for many different + circumstances. + + Support for WireGuard is included in Linux 5.6+. This + package provides a backport of the kernel support for older + kernels. + + https://www.wireguard.com + +comment "wireguard-linux-compat needs a toolchain w/ headers >= 3.10" + depends on BR2_LINUX_KERNEL && !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 diff --git a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash new file mode 100644 index 000000000..a9675b518 --- /dev/null +++ b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash @@ -0,0 +1,4 @@ +# https://lists.zx2c4.com/pipermail/wireguard/2020-April/005237.html +sha256 7dfb4a8315e1d6ae406ff32d01c496175df558dd65968a19e5222d02c7cfb77a wireguard-linux-compat-1.0.20200401.tar.xz +# Locally calculated +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk new file mode 100644 index 000000000..d5a2341d7 --- /dev/null +++ b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# wireguard +# +################################################################################ + +WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200401 +WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot +WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz +WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0 +WIREGUARD_LINUX_COMPAT_LICENSE_FILES = COPYING +WIREGUARD_LINUX_COMPAT_MODULE_SUBDIRS = src + +$(eval $(kernel-module)) +$(eval $(generic-package)) diff --git a/buildroot/package/wireguard-tools/Config.in b/buildroot/package/wireguard-tools/Config.in new file mode 100644 index 000000000..130f4c48e --- /dev/null +++ b/buildroot/package/wireguard-tools/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_WIREGUARD_TOOLS + bool "wireguard tools" + # kernel module requires 3.10+, userspace makes no sense without it + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + help + WireGuard is an extremely simple yet fast and modern VPN + that utilizes state-of-the-art cryptography. It aims to be + faster, simpler, leaner, and more useful than IPSec, while + avoiding the massive headache. It intends to be considerably + more performant than OpenVPN. WireGuard is designed as a + general purpose VPN for running on embedded interfaces and + super computers alike, fit for many different + circumstances. + + This package provides the userspace tooling to configure + WireGuard tunnels. + + https://www.wireguard.com + +comment "wireguard-tools needs a toolchain w/ headers >= 3.10" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 diff --git a/buildroot/package/wireguard-tools/wireguard-tools.hash b/buildroot/package/wireguard-tools/wireguard-tools.hash new file mode 100644 index 000000000..475a7450a --- /dev/null +++ b/buildroot/package/wireguard-tools/wireguard-tools.hash @@ -0,0 +1,4 @@ +# https://lists.zx2c4.com/pipermail/wireguard/2020-March/005191.html +sha256 757ed31d4d48d5fd7853bfd9bfa6a3a1b53c24a94fe617439948784a2c0ed987 wireguard-tools-1.0.20200319.tar.xz +# Locally calculated +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/wireguard-tools/wireguard-tools.mk b/buildroot/package/wireguard-tools/wireguard-tools.mk new file mode 100644 index 000000000..fc2ec876b --- /dev/null +++ b/buildroot/package/wireguard-tools/wireguard-tools.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# wireguard-tools +# +################################################################################ + +WIREGUARD_TOOLS_VERSION = 1.0.20200319 +WIREGUARD_TOOLS_SITE = https://git.zx2c4.com/wireguard-tools/snapshot +WIREGUARD_TOOLS_SOURCE = wireguard-tools-$(WIREGUARD_TOOLS_VERSION).tar.xz +WIREGUARD_TOOLS_LICENSE = GPL-2.0 +WIREGUARD_TOOLS_LICENSE_FILES = COPYING + +ifeq ($(BR2_INIT_SYSTEMD),y) +WIREGUARD_TOOLS_MAKE_OPTS += WITH_SYSTEMDUNITS=yes +WIREGUARD_TOOLS_DEPENDENCIES += host-pkgconf +else +WIREGUARD_TOOLS_MAKE_OPTS += WITH_SYSTEMDUNITS=no +endif + +ifeq ($(BR2_PACKAGE_BASH),y) +WIREGUARD_TOOLS_MAKE_OPTS += WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes +else +WIREGUARD_TOOLS_MAKE_OPTS += WITH_BASHCOMPLETION=no WITH_WGQUICK=no +endif + +define WIREGUARD_TOOLS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(WIREGUARD_TOOLS_MAKE_OPTS) \ + -C $(@D)/src +endef + +define WIREGUARD_TOOLS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(WIREGUARD_TOOLS_MAKE_OPTS) \ + -C $(@D)/src install DESTDIR=$(TARGET_DIR) +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/wireguard/Config.in b/buildroot/package/wireguard/Config.in deleted file mode 100644 index fe92fd6cf..000000000 --- a/buildroot/package/wireguard/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_WIREGUARD - bool "wireguard" - # kernel module requires 3.10+, userspace makes no sense without it - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 - select BR2_PACKAGE_LIBMNL - help - WireGuard is an extremely simple yet fast and modern VPN - that utilizes state-of-the-art cryptography. It aims to be - faster, simpler, leaner, and more useful than IPSec, while - avoiding the massive headache. It intends to be considerably - more performant than OpenVPN. WireGuard is designed as a - general purpose VPN for running on embedded interfaces and - super computers alike, fit for many different - circumstances. Initially released for the Linux kernel, it - plans to be cross-platform and widely deployable. It is - currently under heavy development, but already it might be - regarded as the most secure, easiest to use, and simplest - VPN solution in the industry. - - https://www.wireguard.com - -comment "wireguard needs a toolchain w/ headers >= 3.10" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 diff --git a/buildroot/package/wireguard/wireguard.hash b/buildroot/package/wireguard/wireguard.hash deleted file mode 100644 index 8097aeb95..000000000 --- a/buildroot/package/wireguard/wireguard.hash +++ /dev/null @@ -1,4 +0,0 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2019-January/003805.html -sha256 5aba6f0c38e97faa0b155623ba594bb0e4bd5e29deacd8d5ed8bda8d8283b0e7 WireGuard-0.0.20191219.tar.xz -# Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/wireguard/wireguard.mk b/buildroot/package/wireguard/wireguard.mk deleted file mode 100644 index 500c7dbd2..000000000 --- a/buildroot/package/wireguard/wireguard.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# wireguard -# -################################################################################ - -WIREGUARD_VERSION = 0.0.20191219 -WIREGUARD_SITE = https://git.zx2c4.com/WireGuard/snapshot -WIREGUARD_SOURCE = WireGuard-$(WIREGUARD_VERSION).tar.xz -WIREGUARD_LICENSE = GPL-2.0 -WIREGUARD_LICENSE_FILES = COPYING -WIREGUARD_DEPENDENCIES = host-pkgconf libmnl - -ifeq ($(BR2_INIT_SYSTEMD),y) -WIREGUARD_MAKE_OPTS += WITH_SYSTEMDUNITS=yes -else -WIREGUARD_MAKE_OPTS += WITH_SYSTEMDUNITS=no -endif - -ifeq ($(BR2_PACKAGE_BASH),y) -WIREGUARD_MAKE_OPTS += WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes -else -WIREGUARD_MAKE_OPTS += WITH_BASHCOMPLETION=no WITH_WGQUICK=no -endif - -define WIREGUARD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(WIREGUARD_MAKE_OPTS) \ - -C $(@D)/src/tools -endef - -define WIREGUARD_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(WIREGUARD_MAKE_OPTS) \ - -C $(@D)/src/tools install DESTDIR=$(TARGET_DIR) -endef - -ifeq ($(BR2_LINUX_KERNEL),y) -WIREGUARD_MODULE_SUBDIRS = src -$(eval $(kernel-module)) -endif - -$(eval $(generic-package)) diff --git a/buildroot/package/wireless_tools/wireless_tools.hash b/buildroot/package/wireless_tools/wireless_tools.hash index 587c9772e..50a3f62b8 100644 --- a/buildroot/package/wireless_tools/wireless_tools.hash +++ b/buildroot/package/wireless_tools/wireless_tools.hash @@ -1,2 +1,3 @@ # locally computed hash sha256 abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63 wireless_tools.30.pre9.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/wireshark/0001-packet-gtp-c-remove-unneeded-named-structures.patch b/buildroot/package/wireshark/0001-packet-gtp-c-remove-unneeded-named-structures.patch deleted file mode 100644 index 0a894a282..000000000 --- a/buildroot/package/wireshark/0001-packet-gtp-c-remove-unneeded-named-structures.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 020e25b660250c97c8085e64cf85074ccfcdd06b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 5 Mar 2019 20:59:49 +0100 -Subject: [PATCH] packet-gtp.c: remove unneeded named structures - -In uclibc, _header is already in sigcontext.h: - -packet-gtp.c:2361:16: error: redefinition of 'struct _header' - typedef struct _header { - ^~~~~~~ -In file included from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/bits/sigcontext.h:30:0, - from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/signal.h:311, - from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36, - from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib.h:34, - from ../../epan/proto.h:28, - from ../../epan/packet.h:14, - from packet-gtp.c:43: -/home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/asm/sigcontext.h:173:8: note: originally defined here - struct _header { - -To fix this issue, transform _header and other named structures (with -the exception of gtp_conv_info_t) into unnamed structures - -Fixes: - - http://autobuild.buildroot.org/results/c41d42fe3489bc63c42e7ce7a9eccb1b4ca7b9b2 - -Change-Id: I78116233c2a8dd7c54723b7cb558254bd5143bd2 -Signed-off-by: Fabrice Fontaine -Reviewed-on: https://code.wireshark.org/review/32335 -Petri-Dish: Guy Harris -Tested-by: Petri Dish Buildbot -Reviewed-by: Guy Harris -[Retrieved from: -https://github.com/wireshark/wireshark/commit/020e25b660250c97c8085e64cf85074ccfcdd06b] ---- - epan/dissectors/packet-gtp.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c -index 4c40e7aa54..971197e4ae 100644 ---- a/epan/dissectors/packet-gtp.c -+++ b/epan/dissectors/packet-gtp.c -@@ -2170,7 +2170,7 @@ GHashTable* session_table; - /* Relation between -> frame */ - wmem_tree_t* frame_tree; - --typedef struct gtp_info { -+typedef struct { - guint32 teid; - guint32 frame; - } gtp_info_t; -@@ -2482,7 +2482,7 @@ static int decode_gtp_node_addr(tvbuff_t * tvb, int offset, packet_info * pinfo, - static int decode_gtp_priv_ext(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, session_args_t * args _U_); - static int decode_gtp_unknown(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, session_args_t * args _U_); - --typedef struct _gtp_opt { -+typedef struct { - int optcode; - int (*decode) (tvbuff_t *, int, packet_info *, proto_tree *, session_args_t *); - } gtp_opt_t; -@@ -2661,12 +2661,12 @@ id_to_str(tvbuff_t *tvb, gint offset) - /* Next definitions and function check_field_presence checks if given field - * in GTP packet is compliant with ETSI - */ --typedef struct _header { -+typedef struct { - guint8 code; - guint8 presence; - } ext_header; - --typedef struct _message { -+typedef struct { - guint8 code; - ext_header fields[32]; - } _gtp_mess_items; diff --git a/buildroot/package/wireshark/Config.in b/buildroot/package/wireshark/Config.in index 0cf14f2f8..e52edb9f6 100644 --- a/buildroot/package/wireshark/Config.in +++ b/buildroot/package/wireshark/Config.in @@ -1,12 +1,14 @@ config BR2_PACKAGE_WIRESHARK bool "wireshark" depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -> libgpg-error + depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork(), glib2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_SPEEXDSP help Network traffic sniffer and protocol decoder. @@ -14,22 +16,35 @@ config BR2_PACKAGE_WIRESHARK if BR2_PACKAGE_WIRESHARK -config BR2_PACKAGE_WIRESHARK_QT - bool - default y - depends on BR2_PACKAGE_QT5BASE_WIDGETS - depends on BR2_PACKAGE_QT5TOOLS - select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS - config BR2_PACKAGE_WIRESHARK_GUI - bool - default y if BR2_PACKAGE_LIBGTK2 - default y if BR2_PACKAGE_LIBGTK3 - default y if BR2_PACKAGE_WIRESHARK_QT + bool "Qt5 GUI" + default y + depends on BR2_INSTALL_LIBSTDCPP # qt5 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5 + depends on !BR2_arc # qt5 + depends on BR2_PACKAGE_HAS_UDEV # qt5 input + select BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_FONTCONFIG # runtime + select BR2_PACKAGE_QT5BASE_PNG # runtime + select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5MULTIMEDIA + select BR2_PACKAGE_QT5SVG + select BR2_PACKAGE_QT5TOOLS + select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS + help + Enable Qt5 GUI + +comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, gcc >= 4.8" + depends on !BR2_arc + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 endif # BR2_PACKAGE_WIRESHARK -comment "wireshark needs a toolchain w/ wchar, threads" +comment "wireshark needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/buildroot/package/wireshark/wireshark.hash b/buildroot/package/wireshark/wireshark.hash index 6474e166d..8b8261840 100644 --- a/buildroot/package/wireshark/wireshark.hash +++ b/buildroot/package/wireshark/wireshark.hash @@ -1,4 +1,6 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.6.11.txt -sha256 29751581c8549562957940e68f0b9410a499616c91c1768195bc02def13f5a85 wireshark-2.6.11.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.2.2.txt +sha1 9cc54a56e9c2ed77e1bc436d9ae2f7bba68d26f8 wireshark-3.2.2.tar.xz +sha256 5f5923ef4c3fee370ed0ca1bb324f37c246015eba4a7e74ab95d9208feeded79 wireshark-3.2.2.tar.xz + # Locally calculated -sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING +sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/buildroot/package/wireshark/wireshark.mk b/buildroot/package/wireshark/wireshark.mk index bf924cadd..ead6b164e 100644 --- a/buildroot/package/wireshark/wireshark.mk +++ b/buildroot/package/wireshark/wireshark.mk @@ -4,152 +4,172 @@ # ################################################################################ -WIRESHARK_VERSION = 2.6.11 +WIRESHARK_VERSION = 3.2.2 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license WIRESHARK_LICENSE_FILES = COPYING -WIRESHARK_DEPENDENCIES = host-pkgconf libgcrypt libpcap libglib2 -WIRESHARK_CONF_ENV = \ - LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config +WIRESHARK_DEPENDENCIES = host-pkgconf host-python3 libgcrypt libpcap libglib2 \ + speexdsp + +WIRESHARK_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + PATH="$(@D)/bin:$(BR_PATH)" WIRESHARK_CONF_OPTS = \ - --disable-guides \ - --enable-static=no \ - --with-libsmi=no \ - --with-pcap=yes + -DDISABLE_WERROR=ON \ + -DENABLE_PCAP=ON \ + -DENABLE_SMI=OFF -# wireshark GUI options -ifeq ($(BR2_PACKAGE_LIBGTK3),y) -WIRESHARK_CONF_OPTS += --with-gtk=3 -WIRESHARK_DEPENDENCIES += libgtk3 -else ifeq ($(BR2_PACKAGE_LIBGTK2),y) -WIRESHARK_CONF_OPTS += --with-gtk=2 -WIRESHARK_DEPENDENCIES += libgtk2 +# wireshark needs the host version of lemon during compilation. +# This binrary is provided by sqlite-src (which is different from +# sqlite-autotools that is currently packaged in buildroot) moreover wireshark +# adds several patches. +# So, instead of creating a separate host package and installing lemon to +# $(HOST_DIR), this binary is compiled on-the-fly +define WIRESHARK_BUILD_LEMON_TOOL + cd $(@D); \ + mkdir -p $(@D)/bin; \ + $(HOSTCC) $(HOST_CFLAGS) -o $(@D)/bin/lemon tools/lemon/lemon.c +endef + +WIRESHARK_PRE_BUILD_HOOKS += WIRESHARK_BUILD_LEMON_TOOL + +ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),y) +WIRESHARK_CONF_OPTS += -DBUILD_wireshark=ON +WIRESHARK_DEPENDENCIES += qt5base qt5multimedia qt5svg qt5tools else -WIRESHARK_CONF_OPTS += --with-gtk=no -endif - -# Qt4 needs accessibility, we don't support it -ifeq ($(BR2_PACKAGE_WIRESHARK_QT),y) -WIRESHARK_CONF_OPTS += --with-qt=5 -WIRESHARK_DEPENDENCIES += qt5base qt5tools -WIRESHARK_CONF_ENV += ac_cv_path_QTCHOOSER="" -# Seems it expects wrappers and passes a -qt=X parameter for version -WIRESHARK_MAKE_OPTS += \ - MOC="$(HOST_DIR)/bin/moc" \ - RCC="$(HOST_DIR)/bin/rcc" \ - UIC="$(HOST_DIR)/bin/uic" -else -WIRESHARK_CONF_OPTS += --with-qt=no -endif - -# No GUI at all -ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),) -WIRESHARK_CONF_OPTS += --disable-wireshark +WIRESHARK_CONF_OPTS += -DBUILD_wireshark=OFF endif ifeq ($(BR2_PACKAGE_BCG729),y) -WIRESHARK_CONF_OPTS += --with-bcg729=$(STAGING_DIR)/usr +WIRESHARK_CONF_OPTS += -DENABLE_BCG729=ON WIRESHARK_DEPENDENCIES += bcg729 else -WIRESHARK_CONF_OPTS += --without-bcg729 +WIRESHARK_CONF_OPTS += -DENABLE_BCG729=OFF +endif + +ifeq ($(BR2_PACKAGE_BROTLI),y) +WIRESHARK_CONF_OPTS += -DENABLE_BROTLI=ON +WIRESHARK_DEPENDENCIES += brotli +else +WIRESHARK_CONF_OPTS += -DENABLE_BROTLI=OFF endif ifeq ($(BR2_PACKAGE_C_ARES),y) -WIRESHARK_CONF_OPTS += --with-c-ares=$(STAGING_DIR)/usr +WIRESHARK_CONF_OPTS += -DENABLE_CARES=ON WIRESHARK_DEPENDENCIES += c-ares else -WIRESHARK_CONF_OPTS += --without-c-ares +WIRESHARK_CONF_OPTS += -DENABLE_CARES=OFF endif ifeq ($(BR2_PACKAGE_GNUTLS),y) -WIRESHARK_CONF_OPTS += --with-gnutls=yes +WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=ON WIRESHARK_DEPENDENCIES += gnutls else -WIRESHARK_CONF_OPTS += --with-gnutls=no +WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=OFF endif ifeq ($(BR2_PACKAGE_LIBKRB5),y) -WIRESHARK_CONF_OPTS += --with-krb5=$(STAGING_DIR)/usr +WIRESHARK_CONF_OPTS += -DENABLE_KERBEROS=ON WIRESHARK_DEPENDENCIES += libkrb5 else -WIRESHARK_CONF_OPTS += --without-krb5 +WIRESHARK_CONF_OPTS += -DENABLE_KERBEROS=OFF endif ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) -WIRESHARK_CONF_OPTS += --with-maxminddb=$(STAGING_DIR)/usr +WIRESHARK_CONF_OPTS += -DBUILD_mmdbresolve=ON WIRESHARK_DEPENDENCIES += libmaxminddb else -WIRESHARK_CONF_OPTS += --without-maxminddb +WIRESHARK_CONF_OPTS += -DBUILD_mmdbresolve=OFF endif ifeq ($(BR2_PACKAGE_LIBNL),y) -WIRESHARK_CONF_OPTS += --with-libnl +WIRESHARK_CONF_OPTS += -DENABLE_NETLINK=ON WIRESHARK_DEPENDENCIES += libnl else -WIRESHARK_CONF_OPTS += --without-libnl +WIRESHARK_CONF_OPTS += -DENABLE_NETLINK=OFF endif ifeq ($(BR2_PACKAGE_LIBSSH),y) -WIRESHARK_CONF_OPTS += --with-libssh=$(STAGING_DIR)/usr +WIRESHARK_CONF_OPTS += -DENABLE_LIBSSH=ON WIRESHARK_DEPENDENCIES += libssh else -WIRESHARK_CONF_OPTS += --without-libssh +WIRESHARK_CONF_OPTS += -DENABLE_LIBSSH=OFF endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -WIRESHARK_CONF_OPTS += --with-libxml2 +WIRESHARK_CONF_OPTS += -DENABLE_LIBXML2=ON WIRESHARK_DEPENDENCIES += libxml2 else -WIRESHARK_CONF_OPTS += --without-libxml2 +WIRESHARK_CONF_OPTS += -DENABLE_LIBXML2=OFF endif # no support for lua53 yet ifeq ($(BR2_PACKAGE_LUA_5_1),y) -WIRESHARK_CONF_OPTS += --with-lua +WIRESHARK_CONF_OPTS += -DENABLE_LUA=ON WIRESHARK_DEPENDENCIES += lua else -WIRESHARK_CONF_OPTS += --without-lua +WIRESHARK_CONF_OPTS += -DENABLE_LUA=OFF endif ifeq ($(BR2_PACKAGE_LZ4),y) -WIRESHARK_CONF_OPTS += --with-lz4=$(STAGING_DIR)/usr +WIRESHARK_CONF_OPTS += -DENABLE_LZ4=ON WIRESHARK_DEPENDENCIES += lz4 else -WIRESHARK_CONF_OPTS += --without-lz4 +WIRESHARK_CONF_OPTS += -DENABLE_LZ4=OFF endif ifeq ($(BR2_PACKAGE_NGHTTP2),y) -WIRESHARK_CONF_OPTS += --with-nghttp2=$(STAGING_DIR)/usr +WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=ON WIRESHARK_DEPENDENCIES += nghttp2 else -WIRESHARK_CONF_OPTS += --without-nghttp2 +WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=OFF endif ifeq ($(BR2_PACKAGE_SBC),y) -WIRESHARK_CONF_OPTS += --with-sbc=yes +WIRESHARK_CONF_OPTS += -DENABLE_SBC=ON WIRESHARK_DEPENDENCIES += sbc else -WIRESHARK_CONF_OPTS += --with-sbc=no +WIRESHARK_CONF_OPTS += -DENABLE_SBC=OFF endif ifeq ($(BR2_PACKAGE_SNAPPY),y) -WIRESHARK_CONF_OPTS += --with-snappy=$(STAGING_DIR)/usr +WIRESHARK_CONF_OPTS += -DENABLE_SNAPPY=ON WIRESHARK_DEPENDENCIES += snappy -ifeq ($(BR2_STATIC_LIBS),y) -WIRESHARK_CONF_ENV += LIBS=-lstdc++ -endif else -WIRESHARK_CONF_OPTS += --without-snappy +WIRESHARK_CONF_OPTS += -DENABLE_SNAPPY=OFF endif ifeq ($(BR2_PACKAGE_SPANDSP),y) -WIRESHARK_CONF_OPTS += --with-spandsp +WIRESHARK_CONF_OPTS += -DENABLE_SPANDSP=ON WIRESHARK_DEPENDENCIES += spandsp else -WIRESHARK_CONF_OPTS += --without-spandsp +WIRESHARK_CONF_OPTS += -DENABLE_SPANDSP=OFF +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +WIRESHARK_CONF_OPTS += -DBUILD_sdjournal=ON +WIRESHARK_DEPENDENCIES += systemd +else +WIRESHARK_CONF_OPTS += -DBUILD_sdjournal=OFF +endif + +# Disable plugins as some of them (like l16mono) can't be built +# statically. ENABLE_STATIC=ON actually means "disable shared library" +# and ENABLE_STATIC=OFF means "enable shared library". So for the +# BR2_SHARED_STATIC_LIBS=y case, we want ENABLE_STATIC=OFF even if +# that sounds counter-intuitive. +ifeq ($(BR2_STATIC_LIBS),y) +WIRESHARK_CONF_OPTS += \ + -DENABLE_PLUGINS=OFF \ + -DENABLE_STATIC=ON \ + -DUSE_STATIC=ON +else +WIRESHARK_CONF_OPTS += \ + -DENABLE_PLUGINS=ON \ + -DENABLE_STATIC=OFF \ + -DUSE_STATIC=OFF endif define WIRESHARK_REMOVE_DOCS @@ -159,4 +179,4 @@ endef WIRESHARK_POST_INSTALL_TARGET_HOOKS += WIRESHARK_REMOVE_DOCS -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/buildroot/package/wiringpi/wiringpi.hash b/buildroot/package/wiringpi/wiringpi.hash index 9c4fe22f5..83885e4b6 100644 --- a/buildroot/package/wiringpi/wiringpi.hash +++ b/buildroot/package/wiringpi/wiringpi.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 2455fc97d2b60ed169675dccbaabf55e1958c3c2499b246c96edfc8b036e9073 wiringpi-2.46.tar.gz +sha256 2455fc97d2b60ed169675dccbaabf55e1958c3c2499b246c96edfc8b036e9073 wiringpi-2.46.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER diff --git a/buildroot/package/wmctrl/wmctrl.hash b/buildroot/package/wmctrl/wmctrl.hash index a08c0e9e0..531f64a0d 100644 --- a/buildroot/package/wmctrl/wmctrl.hash +++ b/buildroot/package/wmctrl/wmctrl.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9 wmctrl-1.07.tar.gz +sha256 d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9 wmctrl-1.07.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/wolfssl/wolfssl.hash b/buildroot/package/wolfssl/wolfssl.hash index 1ff9fc61d..5509552ca 100644 --- a/buildroot/package/wolfssl/wolfssl.hash +++ b/buildroot/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 70e4fbeb91284a269b25a84fc526755c670475aee4034a6f237b1f754d108af3 v3.15.7-stable.tar.gz +sha256 6896f8ad6c44aff3e583006eeee839600848a0e37118ebbb7514eca9409ae08b wolfssl-4.3.0-stable.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/wolfssl/wolfssl.mk b/buildroot/package/wolfssl/wolfssl.mk index 42198cb81..8834a0f46 100644 --- a/buildroot/package/wolfssl/wolfssl.mk +++ b/buildroot/package/wolfssl/wolfssl.mk @@ -4,9 +4,8 @@ # ################################################################################ -WOLFSSL_VERSION = 3.15.7 -WOLFSSL_SITE = https://github.com/wolfSSL/wolfssl/archive -WOLFSSL_SOURCE = v$(WOLFSSL_VERSION)-stable.tar.gz +WOLFSSL_VERSION = 4.3.0-stable +WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)) WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0 diff --git a/buildroot/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/buildroot/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch new file mode 100644 index 000000000..959788c2e --- /dev/null +++ b/buildroot/package/wpa_supplicant/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch @@ -0,0 +1,77 @@ +From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Thu, 29 Aug 2019 11:52:04 +0300 +Subject: [PATCH] AP: Silently ignore management frame from unexpected source + address + +Do not process any received Management frames with unexpected/invalid SA +so that we do not add any state for unexpected STA addresses or end up +sending out frames to unexpected destination. This prevents unexpected +sequences where an unprotected frame might end up causing the AP to send +out a response to another device and that other device processing the +unexpected response. + +In particular, this prevents some potential denial of service cases +where the unexpected response frame from the AP might result in a +connected station dropping its association. + +Signed-off-by: Jouni Malinen + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch] +--- + src/ap/drv_callbacks.c | 13 +++++++++++++ + src/ap/ieee802_11.c | 12 ++++++++++++ + 2 files changed, 25 insertions(+) + +diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c +index 31587685fe3b..34ca379edc3d 100644 +--- a/src/ap/drv_callbacks.c ++++ b/src/ap/drv_callbacks.c +@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, + "hostapd_notif_assoc: Skip event with no address"); + return -1; + } ++ ++ if (is_multicast_ether_addr(addr) || ++ is_zero_ether_addr(addr) || ++ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { ++ /* Do not process any frames with unexpected/invalid SA so that ++ * we do not add any state for unexpected STA addresses or end ++ * up sending out frames to unexpected destination. */ ++ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR ++ " in received indication - ignore this indication silently", ++ __func__, MAC2STR(addr)); ++ return 0; ++ } ++ + random_add_randomness(addr, ETH_ALEN); + + hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, +diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c +index c85a28db44b7..e7065372e158 100644 +--- a/src/ap/ieee802_11.c ++++ b/src/ap/ieee802_11.c +@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, + fc = le_to_host16(mgmt->frame_control); + stype = WLAN_FC_GET_STYPE(fc); + ++ if (is_multicast_ether_addr(mgmt->sa) || ++ is_zero_ether_addr(mgmt->sa) || ++ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { ++ /* Do not process any frames with unexpected/invalid SA so that ++ * we do not add any state for unexpected STA addresses or end ++ * up sending out frames to unexpected destination. */ ++ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR ++ " in received frame - ignore this frame silently", ++ MAC2STR(mgmt->sa)); ++ return 0; ++ } ++ + if (stype == WLAN_FC_STYPE_BEACON) { + handle_beacon(hapd, mgmt, len, fi); + return 1; +-- +2.20.1 + diff --git a/buildroot/package/wpa_supplicant/0001-wpa_supplicant-2.7-fix-undefined-remove-ie.patch b/buildroot/package/wpa_supplicant/0001-wpa_supplicant-2.7-fix-undefined-remove-ie.patch deleted file mode 100644 index eb00d9c15..000000000 --- a/buildroot/package/wpa_supplicant/0001-wpa_supplicant-2.7-fix-undefined-remove-ie.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f2973fa39d6109f0f34969e91551a98dc340d537 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Mon, 3 Dec 2018 12:00:26 +0200 -Subject: FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y - -remove_ie() was defined within an ifdef CONFIG_FILS block while it is -now needed even without CONFIG_FILS=y. Remove the CONFIG_FILS condition -there. - -Fixes 8c41734e5de1 ("FT: Fix Reassociation Request IEs during FT protocol") -Signed-off-by: Jouni Malinen - -Downloaded from upstream commit -http://w1.fi/cgit/hostap/commit/?id=f2973fa39d6109f0f34969e91551a98dc340d537 - -Signed-off-by: Bernd Kuhls ---- - wpa_supplicant/sme.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c -index 39c8069..f77f751 100644 ---- a/wpa_supplicant/sme.c -+++ b/wpa_supplicant/sme.c -@@ -1386,7 +1386,6 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data) - } - - --#ifdef CONFIG_FILS - #ifdef CONFIG_IEEE80211R - static void remove_ie(u8 *buf, size_t *len, u8 eid) - { -@@ -1401,7 +1400,6 @@ static void remove_ie(u8 *buf, size_t *len, u8 eid) - } - } - #endif /* CONFIG_IEEE80211R */ --#endif /* CONFIG_FILS */ - - - void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode, --- -cgit v0.12 - diff --git a/buildroot/package/wpa_supplicant/50-wpa_supplicant.preset b/buildroot/package/wpa_supplicant/50-wpa_supplicant.preset new file mode 100644 index 000000000..9af8562c0 --- /dev/null +++ b/buildroot/package/wpa_supplicant/50-wpa_supplicant.preset @@ -0,0 +1,4 @@ +disable wpa_supplicant@.service +disable wpa_supplicant-nl80211@.service +disable wpa_supplicant-wired@.service + diff --git a/buildroot/package/wpa_supplicant/Config.in b/buildroot/package/wpa_supplicant/Config.in index 58a074fae..cba7fa07e 100644 --- a/buildroot/package/wpa_supplicant/Config.in +++ b/buildroot/package/wpa_supplicant/Config.in @@ -81,6 +81,13 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WPS help Enable support for Wi-Fi Protected Setup (WPS). +config BR2_PACKAGE_WPA_SUPPLICANT_WPA3 + bool "Enable WPA3 support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + help + Enable WPA3 support including OWE, SAE, DPP + config BR2_PACKAGE_WPA_SUPPLICANT_CLI bool "Install wpa_cli binary" help @@ -100,23 +107,19 @@ config BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE help Install wpa_passphrase command line utility. -config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD - bool "Enable support for old DBus control interface" - depends on BR2_PACKAGE_DBUS +config BR2_PACKAGE_WPA_SUPPLICANT_DBUS + bool "Enable support for the DBus control interface" + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus + select BR2_PACKAGE_DBUS help - Enable support for old DBus control interface - (fi.epitest.hostap.WPASupplicant). + Enable support for the DBus control interface. -config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW - bool "Enable support for new DBus control interface" - depends on BR2_PACKAGE_DBUS - help - Enable support for new DBus control interface - (fi.w1.wpa_supplicant1). +comment "dbus support needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION bool "Introspection support" - depends on BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW + depends on BR2_PACKAGE_WPA_SUPPLICANT_DBUS help Add introspection support for new DBus control interface. diff --git a/buildroot/package/wpa_supplicant/wpa_supplicant.hash b/buildroot/package/wpa_supplicant/wpa_supplicant.hash index 2da15f7f5..ff5a2edb3 100644 --- a/buildroot/package/wpa_supplicant/wpa_supplicant.hash +++ b/buildroot/package/wpa_supplicant/wpa_supplicant.hash @@ -1,19 +1,3 @@ # Locally calculated -sha256 76ea6b06b7a2ea8e6d9eb1a9166166f1656e6d48c7508914f592100c95c73074 wpa_supplicant-2.7.tar.gz -sha256 86979655f1c5a9578acbf83e8acdf69a36dcc0966a8819f3b6918530ad3e0c67 0001-OpenSSL-Use-constant-time-operations-for-private-big.patch -sha256 5663da175ecc344c90bea8c95ab831ad47a8002ccbb834f6c091705b92e90e71 0002-Add-helper-functions-for-constant-time-operations.patch -sha256 e5a6bc9f587351d4495740239ceb0a64958a59b3e875722dcaeb4c93fa517f64 0003-OpenSSL-Use-constant-time-selection-for-crypto_bignu.patch -sha256 aa5b722bebbaf175ff89a3653c3d048afe0d0f866989fca6b4c8e882a864392a 0004-EAP-pwd-Use-constant-time-and-memory-access-for-find.patch -sha256 bad9eeaeb118f88303a7a718820b3ba03d705e99b6183b3c44556bedf99db423 0005-SAE-Minimize-timing-differences-in-PWE-derivation.patch -sha256 ae7be450f652f6f77ad868856ab61ba6cb6d7e768585cf5f9f9f674a66e05b40 0006-SAE-Avoid-branches-in-is_quadratic_residue_blind.patch -sha256 86b731c787ca58ac001d20fb769b136e2ca76bf81a8465a8e72c50573cfc4b09 0007-SAE-Mask-timing-of-MODP-groups-22-23-24.patch -sha256 ff7305005217a34818dae247886b9fb1b1db781ab31fb5eac9ebdd9cb0d1edfe 0008-SAE-Use-const_time-selection-for-PWE-in-FFC.patch -sha256 707057cc0e60fe763350f82135dbe407bc289a4958879c8ff1e9413243a1caa4 0009-SAE-Use-constant-time-operations-in-sae_test_pwd_see.patch -sha256 82d8ae4fabfe3674bcb5412befe3a74e40d6485906589c219be72e4fd1e70baa 0010-SAE-Fix-confirm-message-validation-in-error-cases.patch -sha256 ff8d6d92ad4b01987be63cdaf67a24d2eba5b3cd654f37664a8a198e501c0e3b 0011-EAP-pwd-server-Verify-received-scalar-and-element.patch -sha256 d5ebf4e5a810e9a0c035f9268195c542273998ea70fd58697ee25965094062cc 0012-EAP-pwd-server-Detect-reflection-attacks.patch -sha256 7156656498f03b24a0b69a26a59d17a9fcc8e76761f1dabe6d13b4176ffd2ef8 0013-EAP-pwd-client-Verify-received-scalar-and-element.patch -sha256 69926854ec2a79dada290f79f04202764c5d6400d232e3a567ebe633a02c1c66 0014-EAP-pwd-Check-element-x-y-coordinates-explicitly.patch -sha256 cba82a051a39c48872250b2e85ca8ebc628cfe75a9ccec29f3e994abd4156152 0001-EAP-pwd-server-Fix-reassembly-buffer-handling.patch -sha256 dc0e015463e1fd1f230795e1a49ddd1b9d00e726cd9f38846d0f4892d7978162 0003-EAP-pwd-peer-Fix-reassembly-buffer-handling.patch -sha256 76eeecd8fc291a71f29189ea20e6a34387b8048a959cbc6a65c41b98194643a2 README +sha256 fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 wpa_supplicant-2.9.tar.gz +sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README diff --git a/buildroot/package/wpa_supplicant/wpa_supplicant.mk b/buildroot/package/wpa_supplicant/wpa_supplicant.mk index a518ecc21..8e7b9c3a6 100644 --- a/buildroot/package/wpa_supplicant/wpa_supplicant.mk +++ b/buildroot/package/wpa_supplicant/wpa_supplicant.mk @@ -4,25 +4,8 @@ # ################################################################################ -WPA_SUPPLICANT_VERSION = 2.7 +WPA_SUPPLICANT_VERSION = 2.9 WPA_SUPPLICANT_SITE = http://w1.fi/releases -WPA_SUPPLICANT_PATCH = \ - https://w1.fi/security/2019-1/0001-OpenSSL-Use-constant-time-operations-for-private-big.patch \ - https://w1.fi/security/2019-1/0002-Add-helper-functions-for-constant-time-operations.patch \ - https://w1.fi/security/2019-1/0003-OpenSSL-Use-constant-time-selection-for-crypto_bignu.patch \ - https://w1.fi/security/2019-2/0004-EAP-pwd-Use-constant-time-and-memory-access-for-find.patch \ - https://w1.fi/security/2019-1/0005-SAE-Minimize-timing-differences-in-PWE-derivation.patch \ - https://w1.fi/security/2019-1/0006-SAE-Avoid-branches-in-is_quadratic_residue_blind.patch \ - https://w1.fi/security/2019-1/0007-SAE-Mask-timing-of-MODP-groups-22-23-24.patch \ - https://w1.fi/security/2019-1/0008-SAE-Use-const_time-selection-for-PWE-in-FFC.patch \ - https://w1.fi/security/2019-1/0009-SAE-Use-constant-time-operations-in-sae_test_pwd_see.patch \ - https://w1.fi/security/2019-3/0010-SAE-Fix-confirm-message-validation-in-error-cases.patch \ - https://w1.fi/security/2019-4/0011-EAP-pwd-server-Verify-received-scalar-and-element.patch \ - https://w1.fi/security/2019-4/0012-EAP-pwd-server-Detect-reflection-attacks.patch \ - https://w1.fi/security/2019-4/0013-EAP-pwd-client-Verify-received-scalar-and-element.patch \ - https://w1.fi/security/2019-4/0014-EAP-pwd-Check-element-x-y-coordinates-explicitly.patch \ - https://w1.fi/security/2019-5/0001-EAP-pwd-server-Fix-reassembly-buffer-handling.patch \ - https://w1.fi/security/2019-5/0003-EAP-pwd-peer-Fix-reassembly-buffer-handling.patch WPA_SUPPLICANT_LICENSE = BSD-3-Clause WPA_SUPPLICANT_LICENSE_FILES = README WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config @@ -32,6 +15,9 @@ WPA_SUPPLICANT_DBUS_NEW_SERVICE = fi.w1.wpa_supplicant1 WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) +# 0001-AP-Silently-ignore-management-frame-from-unexpected-.patch +WPA_SUPPLICANT_IGNORE_CVES += CVE-2019-16275 + # install the wpa_client library WPA_SUPPLICANT_INSTALL_STAGING = YES @@ -84,10 +70,16 @@ ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT),y) WPA_SUPPLICANT_CONFIG_ENABLE += \ CONFIG_AP \ CONFIG_P2P +else +WPA_SUPPLICANT_CONFIG_DISABLE += \ + CONFIG_AP \ + CONFIG_P2P endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY),y) WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_WIFI_DISPLAY +else +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_WIFI_DISPLAY endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING),y) @@ -105,6 +97,18 @@ ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPS),y) WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_WPS endif +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA3),y) +WPA_SUPPLICANT_CONFIG_ENABLE += \ + CONFIG_DPP \ + CONFIG_SAE \ + CONFIG_OWE +else +WPA_SUPPLICANT_CONFIG_DISABLE += \ + CONFIG_DPP \ + CONFIG_SAE \ + CONFIG_OWE +endif + # Try to use openssl if it's already available ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf libopenssl @@ -115,34 +119,24 @@ WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_PWD WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/' endif -ifeq ($(BR2_PACKAGE_DBUS),y) +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS),y) WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus WPA_SUPPLICANT_MAKE_ENV = \ PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS= -define WPA_SUPPLICANT_INSTALL_DBUS_OLD - $(INSTALL) -m 0644 -D \ - $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_OLD_SERVICE).service \ - $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_OLD_SERVICE).service -endef -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW),y) WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_NEW define WPA_SUPPLICANT_INSTALL_DBUS_NEW $(INSTALL) -m 0644 -D \ $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service \ $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service endef -endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION),y) WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_INTRO endif +else +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_CTRL_IFACE_DBUS_NEW endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG),y) @@ -236,6 +230,8 @@ define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-nl80211@.service $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant-wired@.service \ $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-wired@.service + $(INSTALL) -D -m 644 $(WPA_SUPPLICANT_PKGDIR)/50-wpa_supplicant.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-wpa_supplicant.preset endef $(eval $(generic-package)) diff --git a/buildroot/package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch b/buildroot/package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch deleted file mode 100644 index 8b881ad3a..000000000 --- a/buildroot/package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch +++ /dev/null @@ -1,49 +0,0 @@ -From bb522bd584f05e6658d5dba97f48ca018f46394c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 6 May 2017 14:36:08 +0200 -Subject: [PATCH] src/nl_extras.h: fix compatibility with libnl 3.3.0 - -nl_extras.h defines a set of nla_set_s*() functions if not provided by -libnl. They are provided by libnl since version 3.2.26. The test -(LIBNL_VER_MIC <= 26) was working fine while libnl was in the 3.2.x -series, but now that they have incremented the minor version, the -micro version was reset to 0, with the latest libnl version being -3.3.0. - -Due to this, the condition (LIBNL_VER_MIC <= 26) is true, and we get -redefinition errors because nl_extras.h redefines functions already -provided by libnl. - -This commit improves the condition so that nl_extras.h provides the -missing functions only if the minor version is < 2, or if minor is 2 -and micro is < 26. - -Signed-off-by: Thomas Petazzoni ---- - src/nl_extras.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/nl_extras.h b/src/nl_extras.h -index c4d1d14..37844f9 100644 ---- a/src/nl_extras.h -+++ b/src/nl_extras.h -@@ -1,7 +1,7 @@ - #ifndef __NL_EXTRAS_H - #define __NL_EXTRAS_H - --#if LIBNL_VER_MIC <= 26 -+#if (LIBNL_VER_MIN < 2) || (LIBNL_VER_MIN == 2) && (LIBNL_VER_MIC <= 26) - - #ifndef NLA_S8 - -@@ -45,6 +45,6 @@ static inline int32_t nla_get_s32(struct nlattr *nla) - - #endif /* NLA_S64 */ - --#endif /* LIBNL_VER_MIC */ -+#endif /* LIBNL_VER_* */ - - #endif /* __NL_EXTRAS_H */ --- -2.7.4 - diff --git a/buildroot/package/wpan-tools/wpan-tools.hash b/buildroot/package/wpan-tools/wpan-tools.hash index cfad89aa0..c9f0df2c1 100644 --- a/buildroot/package/wpan-tools/wpan-tools.hash +++ b/buildroot/package/wpan-tools/wpan-tools.hash @@ -1,4 +1,3 @@ -# From http://wpan.cakelab.org/releases/md5sum -md5 91f0b640ff66910e977fab6525625624 wpan-tools-0.7.tar.xz -# Calculated based on the hash above -sha256 c16de9d7861c2d9b6a4436a0fac730f9f545ee290b92bc770c538ec6a3f22309 wpan-tools-0.7.tar.xz +# Locally calculated +sha256 3e509d9ed838df1247cc9a0c6ca483cb356ae778851817bd7410044687b655e2 wpan-tools-0.9.tar.gz +sha256 fe8e595c24d821a60885eb259619df5e5e3976c48465fde0be29fcd78530798f COPYING diff --git a/buildroot/package/wpan-tools/wpan-tools.mk b/buildroot/package/wpan-tools/wpan-tools.mk index d5e43a92c..d8898a729 100644 --- a/buildroot/package/wpan-tools/wpan-tools.mk +++ b/buildroot/package/wpan-tools/wpan-tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -WPAN_TOOLS_VERSION = 0.7 -WPAN_TOOLS_SOURCE = wpan-tools-$(WPAN_TOOLS_VERSION).tar.xz -WPAN_TOOLS_SITE = http://wpan.cakelab.org/releases +WPAN_TOOLS_VERSION = 0.9 +WPAN_TOOLS_SITE = $(call github,linux-wpan,wpan-tools,wpan-tools-$(WPAN_TOOLS_VERSION)) WPAN_TOOLS_DEPENDENCIES = host-pkgconf libnl WPAN_TOOLS_LICENSE = ISC WPAN_TOOLS_LICENSE_FILES = COPYING +# From git +WPAN_TOOLS_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/buildroot/package/wpebackend-fdo/Config.in b/buildroot/package/wpebackend-fdo/Config.in new file mode 100644 index 000000000..161e4c9a7 --- /dev/null +++ b/buildroot/package/wpebackend-fdo/Config.in @@ -0,0 +1,19 @@ +comment "wpebackend-fdo needs a toolchain w/ C++, wchar, threads, dynamic library and an OpenEGL-capable Wayland backend" + depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +config BR2_PACKAGE_WPEBACKEND_FDO + bool "wpebackend-fdo" + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBWPE + select BR2_PACKAGE_WAYLAND + help + WPEBackend interface using freedesktop.org API. + + https://wpewebkit.org/ diff --git a/buildroot/package/wpebackend-fdo/wpebackend-fdo.hash b/buildroot/package/wpebackend-fdo/wpebackend-fdo.hash new file mode 100644 index 000000000..fbeed390e --- /dev/null +++ b/buildroot/package/wpebackend-fdo/wpebackend-fdo.hash @@ -0,0 +1,7 @@ +# From https://wpewebkit.org/releases/wpebackend-fdo-1.4.1.tar.xz.sums +md5 c6362491a4a38ddac42b66f140e1cff2 wpebackend-fdo-1.4.1.tar.xz +sha1 9217c8a5511bc53544b42cb23390256580ac4b0c wpebackend-fdo-1.4.1.tar.xz +sha256 6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d wpebackend-fdo-1.4.1.tar.xz + +# Hashes for license files: +sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk b/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk new file mode 100644 index 000000000..4a7c569d9 --- /dev/null +++ b/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# wpebackend-fdo +# +################################################################################ + +WPEBACKEND_FDO_VERSION = 1.4.1 +WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases +WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz +WPEBACKEND_FDO_INSTALL_STAGING = YES +WPEBACKEND_FDO_LICENSE = BSD-2-Clause +WPEBACKEND_FDO_LICENSE_FILES = COPYING +WPEBACKEND_FDO_DEPENDENCIES = libglib2 libwpe wayland + +$(eval $(cmake-package)) diff --git a/buildroot/package/wpewebkit/0001-Fix-build-with-musl.patch b/buildroot/package/wpewebkit/0001-Fix-build-with-musl.patch new file mode 100644 index 000000000..a436adf6c --- /dev/null +++ b/buildroot/package/wpewebkit/0001-Fix-build-with-musl.patch @@ -0,0 +1,79 @@ +From cc3c27a7e997ef157ed469127f185a7bb6eb1feb Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 27 May 2019 23:51:32 +0200 +Subject: [PATCH] Fix build with musl + +Signed-off-by: Khem Raj +[Retrieved (and slightly updated) from: +https://github.com/WebPlatformForEmbedded/meta-wpe/blob/master/recipes-wpe/wpewebkit/wpewebkit/0001-Fix-build-with-musl.patch] +Signed-off-by: Fabrice Fontaine +--- + Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- + Source/WTF/wtf/Platform.h | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h +index bf0bdc7a51a..78d2ec81838 100644 +--- a/Source/JavaScriptCore/runtime/MachineContext.h ++++ b/Source/JavaScriptCore/runtime/MachineContext.h +@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) ++#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) + + #if CPU(X86) + return reinterpret_cast((uintptr_t&) machineContext.gregs[REG_ESP]); +@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) ++#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) ++#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) ++#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) + #error Unknown Architecture + #endif + +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) ++#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index e2a3388993f..95fe7c593cf 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -683,7 +683,7 @@ + #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 + #endif + +-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) ++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) + #define HAVE_MACHINE_CONTEXT 1 + #endif + +-- +2.20.1 + diff --git a/buildroot/package/wpewebkit/Config.in b/buildroot/package/wpewebkit/Config.in new file mode 100644 index 000000000..f3029976f --- /dev/null +++ b/buildroot/package/wpewebkit/Config.in @@ -0,0 +1,125 @@ +config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + bool + # ARM needs BLX, so v5t+, BE completely untested so disabled + default y if BR2_arm && !BR2_ARM_CPU_ARMV4 + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + # Disabled on MIPS big endian due to sigbus + default y if BR2_mipsel || BR2_mips64el + # Disabled on PowerPC pending runtime testing + # Disabled on SuperH because of segfault + depends on BR2_USE_MMU # libglib2 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt + +comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7" + depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on !BR2_BINFMT_FLAT + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + +comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" + depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on !BR2_BINFMT_FLAT + depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL \ + || !BR2_PACKAGE_HAS_LIBEGL_WAYLAND + +config BR2_PACKAGE_WPEWEBKIT + bool "wpewebkit" + depends on !BR2_STATIC_LIBS # wayland + depends on !BR2_BINFMT_FLAT # icu + depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_USE_WCHAR # icu, libsoup + depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy + depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wpebackend-fdo + depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_HARFBUZZ + select BR2_PACKAGE_ICU + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBEPOXY + select BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBSOUP + select BR2_PACKAGE_LIBTASN1 + select BR2_PACKAGE_LIBXSLT + select BR2_PACKAGE_OPENJPEG + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_WEBP + select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WPEBACKEND_FDO + help + WPE (Web Platform for Embedded) port of the WebKit engine, + to allow embedders to create simple and performant systems + based on Web platform technologies. + + https://wpewebkit.org/ + +if BR2_PACKAGE_WPEWEBKIT + +config BR2_PACKAGE_WPEWEBKIT_SANDBOX + bool "sandboxing support" + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # libseccomp + select BR2_PACKAGE_BUBBLEWRAP # runtime + select BR2_PACKAGE_XDG_DBUS_PROXY # runtime + select BR2_PACKAGE_LIBSECCOMP + help + Enable sandboxing of the processes used for network operation, + disk asccess, and Web content rendering. + +comment "sandboxing supports needs a toolchain w/ headers >= 3.12" + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + +config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA + bool "multimedia support" + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BAD + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME + select BR2_PACKAGE_GST1_PLUGINS_GOOD + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX + select BR2_PACKAGE_GST1_LIBAV + help + This option pulls in all of the required dependencies + to enable multimedia (video/audio) support. + +if BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA + +config BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL + bool "use gstreamer-gl" + default y + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL + help + Use the GStreamer GL elements for handling video content. + This is recommended as it improves performance of video + playback. In some target configurations incorrect rendering + might be produced, and disabling this option may help. + +endif + +config BR2_PACKAGE_WPEWEBKIT_WEBDRIVER + bool "WebDriver support" + help + Enable support for WebDriver. This will build and install the + WebKitWebDriver program in the target. + +endif diff --git a/buildroot/package/wpewebkit/wpewebkit.hash b/buildroot/package/wpewebkit/wpewebkit.hash new file mode 100644 index 000000000..fd7826491 --- /dev/null +++ b/buildroot/package/wpewebkit/wpewebkit.hash @@ -0,0 +1,8 @@ +# From https://wpewebkit.org/releases/wpewebkit-2.26.4.tar.xz.sums +md5 4cd2883ec9da38a0ffe413bb75239874 wpewebkit-2.26.4.tar.xz +sha1 337f78ee237fe98c7e6e728d8fc0508069b007be wpewebkit-2.26.4.tar.xz +sha256 0c292182864b63b725491f1a69b55c03e0e75f6db0875389caff31fe9c0d3ae9 wpewebkit-2.26.4.tar.xz + +# Hashes for license files: +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce Source/WebCore/LICENSE-LGPL-2.1 diff --git a/buildroot/package/wpewebkit/wpewebkit.mk b/buildroot/package/wpewebkit/wpewebkit.mk new file mode 100644 index 000000000..6591c7a0d --- /dev/null +++ b/buildroot/package/wpewebkit/wpewebkit.mk @@ -0,0 +1,75 @@ +################################################################################ +# +# wpewebkit +# +################################################################################ + +WPEWEBKIT_VERSION = 2.26.4 +WPEWEBKIT_SITE = http://www.wpewebkit.org/releases +WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz +WPEWEBKIT_INSTALL_STAGING = YES +WPEWEBKIT_LICENSE = LGPL-2.1+, BSD-2-Clause +WPEWEBKIT_LICENSE_FILES = \ + Source/WebCore/LICENSE-APPLE \ + Source/WebCore/LICENSE-LGPL-2.1 +WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \ + harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ + libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo + +WPEWEBKIT_CONF_OPTS = \ + -DPORT=WPE \ + -DENABLE_ACCESSIBILITY=OFF \ + -DENABLE_API_TESTS=OFF \ + -DENABLE_MINIBROWSER=OFF \ + -DSILENCE_CROSS_COMPILATION_NOTICES=ON + +ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) +WPEWEBKIT_CONF_OPTS += \ + -DENABLE_BUBBLEWRAP_SANDBOX=ON \ + -DBWRAP_EXECUTABLE=/usr/bin/bwrap \ + -DDBUS_PROXY_EXECUTABLE=/usr/bin/xdg-dbus-proxy +WPEWEBKIT_DEPENDENCIES += libseccomp +else +WPEWEBKIT_CONF_OPTS += -DENABLE_BUBBLEWRAP_SANDBOX=OFF +endif + +ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y) +WPEWEBKIT_CONF_OPTS += \ + -DENABLE_VIDEO=ON \ + -DENABLE_WEB_AUDIO=ON +WPEWEBKIT_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base gst1-plugins-good +else +WPEWEBKIT_CONF_OPTS += \ + -DENABLE_VIDEO=OFF \ + -DENABLE_WEB_AUDIO=OFF +endif + +ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL),y) +WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=ON +else +WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF +endif + +ifeq ($(BR2_PACKAGE_WPEWEBKIT_WEBDRIVER),y) +WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=ON +else +WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=OFF +endif + +ifeq ($(BR2_PACKAGE_WOFF2),y) +WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=ON +WPEWEBKIT_DEPENDENCIES += woff2 +else +WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF +endif + +# JIT is not supported for MIPS r6, but the WebKit build system does not +# have a check for these processors. Disable JIT forcibly here and use +# the CLoop interpreter instead. +# +# Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=191258 +ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON +endif + +$(eval $(cmake-package)) diff --git a/buildroot/package/x11r7/Config.in b/buildroot/package/x11r7/Config.in index f1396bbf0..b891fb42c 100644 --- a/buildroot/package/x11r7/Config.in +++ b/buildroot/package/x11r7/Config.in @@ -69,7 +69,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xapp_ico/Config.in source package/x11r7/xapp_listres/Config.in source package/x11r7/xapp_luit/Config.in - source package/x11r7/xapp_mkfontdir/Config.in source package/x11r7/xapp_mkfontscale/Config.in source package/x11r7/xapp_oclock/Config.in source package/x11r7/xapp_rgb/Config.in diff --git a/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash b/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash index 65973a500..614d54382 100644 --- a/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash +++ b/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash @@ -3,3 +3,6 @@ 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 + +# Locally calculated +sha256 a437fb5272ba507c2977b2ef623bb391270f521b2a20271ed044785f4eaa5dbc COPYING diff --git a/buildroot/package/x11r7/xapp_beforelight/xapp_beforelight.hash b/buildroot/package/x11r7/xapp_beforelight/xapp_beforelight.hash index 3586b3684..00aff7577 100644 --- a/buildroot/package/x11r7/xapp_beforelight/xapp_beforelight.hash +++ b/buildroot/package/x11r7/xapp_beforelight/xapp_beforelight.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2013-January/002131.html -sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 +sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 +# Locally computed +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.hash b/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.hash index cd6436208..f632bce3c 100644 --- a/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.hash +++ b/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002518.html -sha256 806cdeb80f5466ba9121e8cc6c6af82d3e4b32ef1a57bc5a76c15887640ec35d bitmap-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002941.html +md5 b94172053ffa282bd88274f1e6a677f1 bitmap-1.0.9.tar.bz2 +sha1 26ba3130b14a2db81b427f2353ac21301c5d2527 bitmap-1.0.9.tar.bz2 +sha256 e0f3afad5272d796f54c33fa1b5bd1fb3f62843a54b28c87196d06a35123e5f5 bitmap-1.0.9.tar.bz2 +sha512 873c626c72a0f4025fe8c8aeedbf3fe4ee5657fb487ad7410406a20da518c0358041dc45c2549926cc10e1d031977073b9d1ddb32830fdce95b716a52fe44456 bitmap-1.0.9.tar.bz2 +# Locally computed +sha256 03be44611edac06827bd13c0815a67ecd37ffe8fb1b9e210d6545d79bec89a3a COPYING diff --git a/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.mk index 1ee2880ad..6bc0dbde0 100644 --- a/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.mk +++ b/buildroot/package/x11r7/xapp_bitmap/xapp_bitmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_BITMAP_VERSION = 1.0.8 +XAPP_BITMAP_VERSION = 1.0.9 XAPP_BITMAP_SOURCE = bitmap-$(XAPP_BITMAP_VERSION).tar.bz2 XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_BITMAP_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash b/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash index e76c5c885..7a13a01a1 100644 --- a/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash +++ b/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2008-May/000543.html -sha1 a609fba513947e5267c924f85774c0e44a076a7d fonttosfnt-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-January/003035.html +md5 bf8086aa878f0d1bb7715e5865183cc4 fonttosfnt-1.1.0.tar.bz2 +sha1 0e0ea8c92941bf9126b87fae5bb723c8e1035ae2 fonttosfnt-1.1.0.tar.bz2 +sha256 7283fd477e3de75cce40b91b5012953e30b862975555d4482435e2ee7b0f46dc fonttosfnt-1.1.0.tar.bz2 +sha512 f4fb9814c23bfd6f83771959444d2c37eb4ba32edee43c37cf21f0181be80c6e278307641b0f4dae4ee5d10db3289e95194f99757ea4bbca343fff15498e7173 fonttosfnt-1.1.0.tar.bz2 +# Locally computed +sha256 f83378580cb7909a98b52bf5cd6a29f4894d76318c5c5312dd3f17a3e92beef1 COPYING diff --git a/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk index 1571a3baf..ab1d95577 100644 --- a/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk +++ b/buildroot/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_FONTTOSFNT_VERSION = 1.0.4 +XAPP_FONTTOSFNT_VERSION = 1.1.0 XAPP_FONTTOSFNT_SOURCE = fonttosfnt-$(XAPP_FONTTOSFNT_VERSION).tar.bz2 XAPP_FONTTOSFNT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_FONTTOSFNT_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash b/buildroot/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash index d1d2b65aa..1a7985f9a 100644 --- a/buildroot/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash +++ b/buildroot/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2014-December/002510.html -sha256 f1ed55093356b78daec2678d22f52d42ec11fe88575562d734396962e626d7f6 fslsfonts-1.0.5.tar.bz2 +sha256 f1ed55093356b78daec2678d22f52d42ec11fe88575562d734396962e626d7f6 fslsfonts-1.0.5.tar.bz2 +# Locally computed +sha256 fbdfcafb5755565ad688bf3f7f808109d358040ec83ed3de496155105451fdf4 COPYING diff --git a/buildroot/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash b/buildroot/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash index d12e8e5c4..a2f1425af 100644 --- a/buildroot/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash +++ b/buildroot/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2014-December/002511.html -sha256 66cf550326c993e7043f260a8ec4a533a3bf9d8f0e7397a6fe9cca803732e92e fstobdf-1.0.6.tar.bz2 +sha256 66cf550326c993e7043f260a8ec4a533a3bf9d8f0e7397a6fe9cca803732e92e fstobdf-1.0.6.tar.bz2 +# Locally computed +sha256 b76125d919ac2bfbff96955dec98b90729633b2df5fbfa2ad3f2e4376164febb COPYING diff --git a/buildroot/package/x11r7/xapp_luit/xapp_luit.hash b/buildroot/package/x11r7/xapp_luit/xapp_luit.hash index 4763b0d91..55537b7f1 100644 --- a/buildroot/package/x11r7/xapp_luit/xapp_luit.hash +++ b/buildroot/package/x11r7/xapp_luit/xapp_luit.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2012-March/001894.html -sha256 30b0e787cb07a0f504b70f1d6123930522111ce9d4276f6683a69b322b49c636 luit-1.1.1.tar.bz2 +sha256 30b0e787cb07a0f504b70f1d6123930522111ce9d4276f6683a69b322b49c636 luit-1.1.1.tar.bz2 +# Locally computed +sha256 20b6a1481d9dafeaa471e2ac497ecc651428e8369cc935b5bd9d0e5b77d78081 COPYING diff --git a/buildroot/package/x11r7/xapp_mkfontdir/Config.in b/buildroot/package/x11r7/xapp_mkfontdir/Config.in deleted file mode 100644 index 155772d13..000000000 --- a/buildroot/package/x11r7/xapp_mkfontdir/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_MKFONTDIR - bool "mkfontdir" - select BR2_PACKAGE_XAPP_MKFONTSCALE - help - create an index of X font files in a directory diff --git a/buildroot/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.hash b/buildroot/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.hash deleted file mode 100644 index 7a218b98c..000000000 --- a/buildroot/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-February/001818.html -sha256 56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530 mkfontdir-1.0.7.tar.bz2 diff --git a/buildroot/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/buildroot/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk deleted file mode 100644 index f2227bdfd..000000000 --- a/buildroot/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xapp_mkfontdir -# -################################################################################ - -XAPP_MKFONTDIR_VERSION = 1.0.7 -XAPP_MKFONTDIR_SOURCE = mkfontdir-$(XAPP_MKFONTDIR_VERSION).tar.bz2 -XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_MKFONTDIR_LICENSE = MIT -XAPP_MKFONTDIR_LICENSE_FILES = COPYING -XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale -HOST_XAPP_MKFONTDIR_DEPENDENCIES = host-xapp_mkfontscale - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/buildroot/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash b/buildroot/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash index b0776a412..cbcdb1700 100644 --- a/buildroot/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash +++ b/buildroot/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002855.html -md5 987c438e79f5ddb84a9c5726a1610819 mkfontscale-1.1.3.tar.bz2 -sha1 2fdbd7c6cc5b0678f2c5d10d2350a809d576e9e5 mkfontscale-1.1.3.tar.bz2 -sha256 1e98df69ee5f4542d711e140e1d93e2c3f2775407ccbb7849110d52b91782a6a mkfontscale-1.1.3.tar.bz2 -sha512 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62 mkfontscale-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002988.html +md5 215940de158b1a3d8b3f8b442c606e2f mkfontscale-1.2.1.tar.bz2 +sha1 fb9d0458a4476a237609b676f9cebcc64b0a8a85 mkfontscale-1.2.1.tar.bz2 +sha256 ca0495eb974a179dd742bfa6199d561bda1c8da4a0c5a667f21fd82aaab6bac7 mkfontscale-1.2.1.tar.bz2 +sha512 4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c mkfontscale-1.2.1.tar.bz2 # Locally computed -sha256 90f0a1bfee2ed42c63473ded631c0463bf38b3d193733ccfc35394c713a0701d COPYING +sha256 80df6f5b759f7775042313e4586506db60f26fd15b98b532cf518bd8cf1e8488 COPYING diff --git a/buildroot/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/buildroot/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk index a07d2f4fb..11d9cc952 100644 --- a/buildroot/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk +++ b/buildroot/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_MKFONTSCALE_VERSION = 1.1.3 +XAPP_MKFONTSCALE_VERSION = 1.2.1 XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_MKFONTSCALE_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_rgb/xapp_rgb.hash b/buildroot/package/x11r7/xapp_rgb/xapp_rgb.hash index 2b67bfc8e..ce05454ce 100644 --- a/buildroot/package/x11r7/xapp_rgb/xapp_rgb.hash +++ b/buildroot/package/x11r7/xapp_rgb/xapp_rgb.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2014-November/002494.html -sha256 bbca7c6aa59939b9f6a0fb9fff15dfd62176420ffd4ae30c8d92a6a125fbe6b0 rgb-1.0.6.tar.bz2 +sha256 bbca7c6aa59939b9f6a0fb9fff15dfd62176420ffd4ae30c8d92a6a125fbe6b0 rgb-1.0.6.tar.bz2 +# Locally computed +sha256 1d08eb3384f5dedc7735bcfae1aa58cb64643ca9389edce3312b1c3cefbfdaa7 COPYING diff --git a/buildroot/package/x11r7/xapp_rstart/xapp_rstart.hash b/buildroot/package/x11r7/xapp_rstart/xapp_rstart.hash index 47b735302..e87424cb4 100644 --- a/buildroot/package/x11r7/xapp_rstart/xapp_rstart.hash +++ b/buildroot/package/x11r7/xapp_rstart/xapp_rstart.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2013-February/002168.html -sha256 29134e9fdffc8d6ac6904c293b392ba6a493ce571fbd2015485b19a8e4d0ffeb rstart-1.0.5.tar.bz2 +sha256 29134e9fdffc8d6ac6904c293b392ba6a493ce571fbd2015485b19a8e4d0ffeb rstart-1.0.5.tar.bz2 +# Locally computed +sha256 7561fa083e87cd511669d8725ebe89dde6cd4f72cdea35b817262dc6ad6fbe9a COPYING diff --git a/buildroot/package/x11r7/xapp_scripts/xapp_scripts.hash b/buildroot/package/x11r7/xapp_scripts/xapp_scripts.hash index 79a43180c..cc561eb2d 100644 --- a/buildroot/package/x11r7/xapp_scripts/xapp_scripts.hash +++ b/buildroot/package/x11r7/xapp_scripts/xapp_scripts.hash @@ -1,2 +1,3 @@ # locally computed sha256 1b154b4359302ca499818c45396325aef9ff364d6ff4ce5c3769e4803994a136 scripts-1.0.1.tar.bz2 +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/buildroot/package/x11r7/xapp_sessreg/0001-missing_path_wtmpx.patch b/buildroot/package/x11r7/xapp_sessreg/0001-missing_path_wtmpx.patch deleted file mode 100644 index 0be242c0b..000000000 --- a/buildroot/package/x11r7/xapp_sessreg/0001-missing_path_wtmpx.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix missing defines _PATH_WTMPX/_PATH_UTMPX in musl - -Downloaded from -https://cgit.gentoo.org/proj/musl.git/tree/x11-apps/sessreg/files/sessreg-1.1.0-missing_path_wtmpx.patch - -Signed-off-by: Bernd Kuhls - -diff -Naur sessreg-1.1.0.orig/sessreg.h sessreg-1.1.0/sessreg.h ---- sessreg-1.1.0.orig/sessreg.h 2015-01-20 05:00:27.000000000 +0000 -+++ sessreg-1.1.0/sessreg.h 2016-02-23 11:54:42.057000000 +0000 -@@ -103,6 +103,13 @@ - # define TTYS_FILE "/etc/ttys" - #endif - -+#ifndef _PATH_WTMPX -+# define _PATH_WTMPX "/var/log/wtmp" -+#endif -+#ifndef _PATH_UTMPX -+# define _PATH_UTMPX "/var/log/utmp" -+#endif -+ - #ifndef WTMPX_FILE - # define WTMPX_FILE _PATH_WTMPX - #endif diff --git a/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.hash b/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.hash index 47495b23d..12a7d3689 100644 --- a/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.hash +++ b/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-February/002778.html -sha256 78a76ae3f3f6a26547a34630d1b740f42344848b5fb6d7c9c7f7da255e35a6e1 sessreg-1.1.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-June/002994.html +md5 92be564d4be7d8aa7b5024057b715210 sessreg-1.1.2.tar.bz2 +sha1 169c1ff9fb152b4b4ca0cfbd3e1aee33af042016 sessreg-1.1.2.tar.bz2 +sha256 dfcb9e954273ace63879aec053c7880466f8755752a35aa9ced3fa5f04fd2c33 sessreg-1.1.2.tar.bz2 +sha512 7e3c2bdcadb7133aace463b58d8c6108d315ec95d2a42509073eeddc7f02644092a4b3168bd3b426c041736a016291092e0bf8368acd620dbeff96d53d12f98c sessreg-1.1.2.tar.bz2 +# Locally computed +sha256 ac8f5cc696e6c473aea4caaf18650316dc8912fcf0f370cae1df5f395cea8631 COPYING diff --git a/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.mk index 46935aed9..7f488e242 100644 --- a/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.mk +++ b/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_SESSREG_VERSION = 1.1.1 +XAPP_SESSREG_VERSION = 1.1.2 XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2 XAPP_SESSREG_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SESSREG_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash b/buildroot/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash index bdc5f1cc7..4f963593c 100644 --- a/buildroot/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash +++ b/buildroot/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002563.html -sha256 a9ddb3963f263ba13f0ea105d8c45a531832140530217cc559587bb94f02d3e1 setxkbmap-1.3.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-July/003007.html +md5 93e736c98fb75856ee8227a0c49a128d setxkbmap-1.3.2.tar.bz2 +sha1 44783734bc58fca93165a20da0bb3eca1ccb9ad9 setxkbmap-1.3.2.tar.bz2 +sha256 8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5 setxkbmap-1.3.2.tar.bz2 +sha512 bfa8015dee0d8d3fdbbd89afbd71c8606ce168d6edca8521d5ed05a00fecbea39bc4bfcce84b71458bdeb34c60bd80a5df27e0691ccee3966443ecdc937faf38 setxkbmap-1.3.2.tar.bz2 +# Locally computed +sha256 afb8ce58340b6a6b85b73e256425263ce46f5a427279785e275991cb660cce82 COPYING diff --git a/buildroot/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/buildroot/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk index b923d60f5..8b6974759 100644 --- a/buildroot/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk +++ b/buildroot/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_SETXKBMAP_VERSION = 1.3.1 +XAPP_SETXKBMAP_VERSION = 1.3.2 XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.bz2 -XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_SETXKBMAP_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SETXKBMAP_LICENSE = MIT XAPP_SETXKBMAP_LICENSE_FILES = COPYING XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile diff --git a/buildroot/package/x11r7/xapp_showfont/xapp_showfont.hash b/buildroot/package/x11r7/xapp_showfont/xapp_showfont.hash index 0fff9ce01..ff35e9c9e 100644 --- a/buildroot/package/x11r7/xapp_showfont/xapp_showfont.hash +++ b/buildroot/package/x11r7/xapp_showfont/xapp_showfont.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2014-December/002513.html -sha256 e9735c1c530b8a52edfab7415cc0fd7f8d2889095114f4cb689a27476461ac89 showfont-1.0.5.tar.bz2 +sha256 e9735c1c530b8a52edfab7415cc0fd7f8d2889095114f4cb689a27476461ac89 showfont-1.0.5.tar.bz2 +# Locally computed +sha256 c32217021e0507207e2ee6da3fcee3d9e32816003a7153b3357c08cdc97934a8 COPYING diff --git a/buildroot/package/x11r7/xapp_smproxy/xapp_smproxy.hash b/buildroot/package/x11r7/xapp_smproxy/xapp_smproxy.hash index 7bb7bdb3d..db9dd27af 100644 --- a/buildroot/package/x11r7/xapp_smproxy/xapp_smproxy.hash +++ b/buildroot/package/x11r7/xapp_smproxy/xapp_smproxy.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2015-April/002564.html -sha256 6cf19155a2752237f36dbf8bc4184465ea190d2652f887faccb4e2a6ebf77266 smproxy-1.0.6.tar.bz2 +sha256 6cf19155a2752237f36dbf8bc4184465ea190d2652f887faccb4e2a6ebf77266 smproxy-1.0.6.tar.bz2 +# Locally computed +sha256 92dce6d8a1fcc0c6b5e56dc44e431e7f73bfa2ed5e83295662aa314067a671d8 COPYING diff --git a/buildroot/package/x11r7/xapp_viewres/xapp_viewres.hash b/buildroot/package/x11r7/xapp_viewres/xapp_viewres.hash index 539bb431e..9b40c0a53 100644 --- a/buildroot/package/x11r7/xapp_viewres/xapp_viewres.hash +++ b/buildroot/package/x11r7/xapp_viewres/xapp_viewres.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002849.html -md5 08def461f135832136624855763b20fa viewres-1.0.5.tar.bz2 -sha1 d03832456dde6c2a91086e6563d52fd936425948 viewres-1.0.5.tar.bz2 -sha256 5ed818e84c39bcf26dadc885c9860432b85843caad3621e26d99edea660ae3d7 viewres-1.0.5.tar.bz2 -sha512 fe573e9b5ae679b65eee95733cbea20c86c92089c3a2dadfe977bc9c54d1f58c5e5f4663e51a1cf206543a43592b3a3c266da1769279f08be85c66b0aa5b0f7f viewres-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-August/003020.html +md5 38e6568271d8098327706c5cf855dbc7 viewres-1.0.6.tar.bz2 +sha1 f1d12e5b4e1180916edb44234599a486b025b480 viewres-1.0.6.tar.bz2 +sha256 11c15db02066c1d5fc3febf9b185d16c1112f87e37c4b101a484dcefffb80934 viewres-1.0.6.tar.bz2 +sha512 3f4cfc61608bc6c9b35ef66ceb473661ca01946d3306d54040d32803e8e0eec506a0ce37ea22bfe514544a6ba9645fd30f39b20c063aff696b3c0fda3fe95dff viewres-1.0.6.tar.bz2 # Locally computed sha256 aefb540c54bc95c68702cd2ae668c559e63cc1a84f55ae5c0e78547e7d75d2d5 COPYING diff --git a/buildroot/package/x11r7/xapp_viewres/xapp_viewres.mk b/buildroot/package/x11r7/xapp_viewres/xapp_viewres.mk index e32de0f73..2e05a6e7d 100644 --- a/buildroot/package/x11r7/xapp_viewres/xapp_viewres.mk +++ b/buildroot/package/x11r7/xapp_viewres/xapp_viewres.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_VIEWRES_VERSION = 1.0.5 +XAPP_VIEWRES_VERSION = 1.0.6 XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.bz2 XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_VIEWRES_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_x11perf/xapp_x11perf.hash b/buildroot/package/x11r7/xapp_x11perf/xapp_x11perf.hash index 8580993fd..b472c21b1 100644 --- a/buildroot/package/x11r7/xapp_x11perf/xapp_x11perf.hash +++ b/buildroot/package/x11r7/xapp_x11perf/xapp_x11perf.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002566.html -sha256 e87098dec1947572d70c62697a7b70bde1ab5668237d4660080eade6bc096751 x11perf-1.6.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002983.html +md5 e96b56756990c56c24d2d02c2964456b x11perf-1.6.1.tar.bz2 +sha1 c54ebef80b6cb565397fe2e3069e0d7470027e5a x11perf-1.6.1.tar.bz2 +sha256 1c7e0b8ffc2794b4ccf11e04d551823abe0ea47b4f7db0637390db6fbe817c34 x11perf-1.6.1.tar.bz2 +sha512 b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b x11perf-1.6.1.tar.bz2 +# Locally computed +sha256 f467ff659142e2eb4cb7275c48c789d249af398b09a405d3e181dcc339b3b922 COPYING diff --git a/buildroot/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/buildroot/package/x11r7/xapp_x11perf/xapp_x11perf.mk index 8cba79d97..ec10590b7 100644 --- a/buildroot/package/x11r7/xapp_x11perf/xapp_x11perf.mk +++ b/buildroot/package/x11r7/xapp_x11perf/xapp_x11perf.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_X11PERF_VERSION = 1.6.0 +XAPP_X11PERF_VERSION = 1.6.1 XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2 XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_X11PERF_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xauth/xapp_xauth.hash b/buildroot/package/x11r7/xapp_xauth/xapp_xauth.hash index f6987c1c0..0251c083a 100644 --- a/buildroot/package/x11r7/xapp_xauth/xapp_xauth.hash +++ b/buildroot/package/x11r7/xapp_xauth/xapp_xauth.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002772.html -sha256 5afe42ce3cdf4f60520d1658d2b17face45c74050f39af45dccdc95e73fafc4d xauth-1.0.10.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-July/003005.html +md5 e50587c1bb832aafd1a19d91a0890a0b xauth-1.1.tar.bz2 +sha1 16180e36d75a23cb182cb91e78f24273f1a63967 xauth-1.1.tar.bz2 +sha256 6d1dd1b79dd185107c5b0fdd22d1d791ad749ad6e288d0cdf80964c4ffa7530c xauth-1.1.tar.bz2 +sha512 b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c xauth-1.1.tar.bz2 +# Locally computed +sha256 dcdf5fa36a652efbe61a21def1301739b0010334ae3f049f1cff433221a8c7a5 COPYING diff --git a/buildroot/package/x11r7/xapp_xauth/xapp_xauth.mk b/buildroot/package/x11r7/xapp_xauth/xapp_xauth.mk index 80ac6a42d..cd900f005 100644 --- a/buildroot/package/x11r7/xapp_xauth/xapp_xauth.mk +++ b/buildroot/package/x11r7/xapp_xauth/xapp_xauth.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XAUTH_VERSION = 1.0.10 +XAPP_XAUTH_VERSION = 1.1 XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XAUTH_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash b/buildroot/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash index b2aa76060..12d20525c 100644 --- a/buildroot/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash +++ b/buildroot/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002862.html -md5 d50cf135af04436b9456a5ab7dcf7971 xbacklight-1.2.2.tar.bz2 -sha1 8cc84c4b2e23e99bfa72239847af4b42ae89669e xbacklight-1.2.2.tar.bz2 -sha256 615a1d13e429ed5a0300b2f4508bc199d7cf21b6b9f088a9d8188d3bc957bf5e xbacklight-1.2.2.tar.bz2 -sha512 4dca70ef8e3494b19ea126c46395807cddc007b2b09a133810daeb77ae27fa36ac4eec7813828248fc195abe27f59700cfa58ee65ef3a020a51f73e5107678ec xbacklight-1.2.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-July/003008.html +md5 5b6405973db69c0443be2fba8e1a8ab7 xbacklight-1.2.3.tar.bz2 +sha1 f0a6163738143ec23542b459aef567309a119e0c xbacklight-1.2.3.tar.bz2 +sha256 3a27f324777ae99fee476cfb2f064576fb8cba4eb77f97cda37adda1c1d39ade xbacklight-1.2.3.tar.bz2 +sha512 717c87ce24634892fc4ac54fc59dcc0a5bc8f206aaf1d13410f95f7e4fe6e3dbc7ff8d951bcd8ea8c5e955357a00fea6ceadd4559e60b1a632e40f71290e12c7 xbacklight-1.2.3.tar.bz2 # Locally computed sha256 c9fbf1f272215babef31808c1235de8e4f7641ca5edfc4fc615b6556054b2b04 COPYING diff --git a/buildroot/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/buildroot/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk index a2907bb28..d52d562ce 100644 --- a/buildroot/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk +++ b/buildroot/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XBACKLIGHT_VERSION = 1.2.2 +XAPP_XBACKLIGHT_VERSION = 1.2.3 XAPP_XBACKLIGHT_SOURCE = xbacklight-$(XAPP_XBACKLIGHT_VERSION).tar.bz2 -XAPP_XBACKLIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XBACKLIGHT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XBACKLIGHT_LICENSE = MIT XAPP_XBACKLIGHT_LICENSE_FILES = COPYING XAPP_XBACKLIGHT_DEPENDENCIES = xlib_libX11 xlib_libXrandr xlib_libXrender xcb-util diff --git a/buildroot/package/x11r7/xapp_xbiff/xapp_xbiff.hash b/buildroot/package/x11r7/xapp_xbiff/xapp_xbiff.hash index 26bf0ae48..9c646785d 100644 --- a/buildroot/package/x11r7/xapp_xbiff/xapp_xbiff.hash +++ b/buildroot/package/x11r7/xapp_xbiff/xapp_xbiff.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2011-January/001595.html -sha1 17337a951264f0f96f6d03893f9dfd9cf8f12a5a xbiff-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-July/003009.html +md5 66dd3ebd6351b1911b831b89b2dba8ec xbiff-1.0.4.tar.bz2 +sha1 193c0a2be1f7f374bb9d32217a198c92a63619e8 xbiff-1.0.4.tar.bz2 +sha256 e1e1a39628a5678585008ef7fb1ff2864edaaa0e062989c2331f8c74e0fec971 xbiff-1.0.4.tar.bz2 +sha512 0fb920a08640ec59f23d8a8a47bd244565dfbaff7a21c38a8a2abe1edb5eacabc970b5dbdc409163fc444fde5b75a2dc4e0114312938efec5b77228f3bf785ac xbiff-1.0.4.tar.bz2 +# Locally computed +sha256 9b840f2e1900889124cc999f3158da2b6b07bf6d0d77bdbb01ce65d2e702dc83 COPYING diff --git a/buildroot/package/x11r7/xapp_xbiff/xapp_xbiff.mk b/buildroot/package/x11r7/xapp_xbiff/xapp_xbiff.mk index 73e0350af..2c3975c16 100644 --- a/buildroot/package/x11r7/xapp_xbiff/xapp_xbiff.mk +++ b/buildroot/package/x11r7/xapp_xbiff/xapp_xbiff.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XBIFF_VERSION = 1.0.3 +XAPP_XBIFF_VERSION = 1.0.4 XAPP_XBIFF_SOURCE = xbiff-$(XAPP_XBIFF_VERSION).tar.bz2 -XAPP_XBIFF_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XBIFF_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XBIFF_LICENSE = MIT XAPP_XBIFF_LICENSE_FILES = COPYING XAPP_XBIFF_DEPENDENCIES = xlib_libXaw xdata_xbitmaps diff --git a/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.hash b/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.hash index e7967558f..d7fac37ea 100644 --- a/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.hash +++ b/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002523.html -sha256 2f73c7160c09dc32586ea07daa408ac897c0a16eaa98cad9f9e4ee98cd9057d8 xcalc-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-June/002996.html +md5 3b566e47c76356cecaa71eb431767ae1 xcalc-1.1.0.tar.bz2 +sha1 0537f7ee56558cf80133c6b49c4757c1166aaeb6 xcalc-1.1.0.tar.bz2 +sha256 d5d746954465afc3da1f355d721882806568fb04b4d059c027702c0d16a3b5eb xcalc-1.1.0.tar.bz2 +sha512 877aab7bb08f409a21c26b841f4d91eb6993914ed0d26512e47d6b3d2b3e0b231158901415a106cfb45de43f03f253bf2a8733f986538d4ee810afe0e54f98d5 xcalc-1.1.0.tar.bz2 +# Locally computed +sha256 8dd69dbec37866a41d3040c5c478aca46e0b50c30319f178064d5e2ed9d3f912 COPYING diff --git a/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.mk index 9445af75e..b917d9e98 100644 --- a/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.mk +++ b/buildroot/package/x11r7/xapp_xcalc/xapp_xcalc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XCALC_VERSION = 1.0.6 +XAPP_XCALC_VERSION = 1.1.0 XAPP_XCALC_SOURCE = xcalc-$(XAPP_XCALC_VERSION).tar.bz2 -XAPP_XCALC_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XCALC_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XCALC_LICENSE = MIT XAPP_XCALC_LICENSE_FILES = COPYING XAPP_XCALC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec install-data diff --git a/buildroot/package/x11r7/xapp_xclipboard/xapp_xclipboard.hash b/buildroot/package/x11r7/xapp_xclipboard/xapp_xclipboard.hash index 682c1f35d..ef45b9289 100644 --- a/buildroot/package/x11r7/xapp_xclipboard/xapp_xclipboard.hash +++ b/buildroot/package/x11r7/xapp_xclipboard/xapp_xclipboard.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2013-September/002299.html -sha256 9c0e0a1f4f1d49f73c6cf3ccd27b5ca0e18afc63679f1a1ee466b1d82446ebb5 xclipboard-1.1.3.tar.bz2 +sha256 9c0e0a1f4f1d49f73c6cf3ccd27b5ca0e18afc63679f1a1ee466b1d82446ebb5 xclipboard-1.1.3.tar.bz2 +# Locally computed +sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING diff --git a/buildroot/package/x11r7/xapp_xclock/xapp_xclock.hash b/buildroot/package/x11r7/xapp_xclock/xapp_xclock.hash index 1469077c1..881b40154 100644 --- a/buildroot/package/x11r7/xapp_xclock/xapp_xclock.hash +++ b/buildroot/package/x11r7/xapp_xclock/xapp_xclock.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002310.html -sha256 23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0 xclock-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-July/003010.html +md5 437522a96f424f68fc64ed34ece9b211 xclock-1.0.9.tar.bz2 +sha1 774c711cf7ee3f601f7209bbb01ce3f0d5ddbde6 xclock-1.0.9.tar.bz2 +sha256 cf461fb2c6f2ac42c54d8429ee2010fdb9a1442a370adfbfe8a7bfaf33c123bb xclock-1.0.9.tar.bz2 +sha512 fcbac0b4ab1cea4ae0751ce1c0c6302048e5d98d459873c7580e4ca786ec49fa27f73e5831bdfe135abb5cfeabe886456276e9d01351ea7905c606f40f84522d xclock-1.0.9.tar.bz2 +# Locally computed +sha256 ee1f19f46801ef00e70498603e74df644d0b93fc82f06b55ce64c3a2c9f16e71 COPYING diff --git a/buildroot/package/x11r7/xapp_xclock/xapp_xclock.mk b/buildroot/package/x11r7/xapp_xclock/xapp_xclock.mk index 6f8044ef6..77cc7011d 100644 --- a/buildroot/package/x11r7/xapp_xclock/xapp_xclock.mk +++ b/buildroot/package/x11r7/xapp_xclock/xapp_xclock.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XCLOCK_VERSION = 1.0.7 +XAPP_XCLOCK_VERSION = 1.0.9 XAPP_XCLOCK_SOURCE = xclock-$(XAPP_XCLOCK_VERSION).tar.bz2 -XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XCLOCK_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XCLOCK_LICENSE = MIT XAPP_XCLOCK_LICENSE_FILES = COPYING XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile diff --git a/buildroot/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash b/buildroot/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash index cc5bbcd07..75a07f36a 100644 --- a/buildroot/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash +++ b/buildroot/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2015-April/002567.html -sha256 e5585361bb8b6a05bb814a8d0e444ee93e0f00180881d3070aff4571e97f67c6 xcmsdb-1.0.5.tar.bz2 +sha256 e5585361bb8b6a05bb814a8d0e444ee93e0f00180881d3070aff4571e97f67c6 xcmsdb-1.0.5.tar.bz2 +# Locally computed +sha256 c3bd4ac91beb08fee5272b17a3ddee8d2791cc5eaee5bce5271042a45fa4fa6a COPYING diff --git a/buildroot/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash b/buildroot/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash index 34c13c19d..b893d0180 100644 --- a/buildroot/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash +++ b/buildroot/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002568.html -sha256 c8049b1a2531313be7469ba9b198d334f0b91cc01efc2b20b9afcb117e4d6892 xcompmgr-1.1.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002989.html +md5 ef8c7d4140c11efb8de4141b3968208c xcompmgr-1.1.8.tar.bz2 +sha1 7bb28329b4bb687763df2d2c1723cb6ecb20945a xcompmgr-1.1.8.tar.bz2 +sha256 0b89daf4f060fa3fa83cca862c45d531fef7121b5d06552c1d73d396ad9a7243 xcompmgr-1.1.8.tar.bz2 +sha512 ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d xcompmgr-1.1.8.tar.bz2 +# Locally computed +sha256 c843545f72771b3ff95eb88defc2e3ed8f9a1802d9bb6c32c196bb5eec3d3a5d COPYING diff --git a/buildroot/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk b/buildroot/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk index 918c1e50a..24ebad7bd 100644 --- a/buildroot/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk +++ b/buildroot/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XCOMPMGR_VERSION = 1.1.7 +XAPP_XCOMPMGR_VERSION = 1.1.8 XAPP_XCOMPMGR_SOURCE = xcompmgr-$(XAPP_XCOMPMGR_VERSION).tar.bz2 XAPP_XCOMPMGR_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XCOMPMGR_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xconsole/xapp_xconsole.hash b/buildroot/package/x11r7/xapp_xconsole/xapp_xconsole.hash index 364cdbe40..5d6c2ac82 100644 --- a/buildroot/package/x11r7/xapp_xconsole/xapp_xconsole.hash +++ b/buildroot/package/x11r7/xapp_xconsole/xapp_xconsole.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2017-January/002774.html -sha256 d1144882df207378381bc83927906559defbf7b83a01d52c50ad44234c5851e0 xconsole-1.0.7.tar.bz2 +sha256 d1144882df207378381bc83927906559defbf7b83a01d52c50ad44234c5851e0 xconsole-1.0.7.tar.bz2 +# Locally computed +sha256 a29ea5dbcde7ba1695c95949be6303d1ca1de0b7786a38b60f33eccf03506f9d COPYING diff --git a/buildroot/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash b/buildroot/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash index 8fbe8b00e..88b843821 100644 --- a/buildroot/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash +++ b/buildroot/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2010-October/001514.html sha1 281bee72116311e2d8393ae53ea832e9d267eded xdbedizzy-1.1.0.tar.bz2 +# Locally computed +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/buildroot/package/x11r7/xapp_xditview/xapp_xditview.hash b/buildroot/package/x11r7/xapp_xditview/xapp_xditview.hash index c8c1a0cb5..0eb3a13ff 100644 --- a/buildroot/package/x11r7/xapp_xditview/xapp_xditview.hash +++ b/buildroot/package/x11r7/xapp_xditview/xapp_xditview.hash @@ -1,2 +1,7 @@ # From http://lists.x.org/archives/xorg-announce/2015-April/002570.html -sha256 307f8df1bc3e90a7fba74dfe16840891c365abc027fbd556027eb057e5d1ff73 xditview-1.0.4.tar.bz2 +md5 3a909116a3b2abe3845215cf49e09fa5 xditview-1.0.5.tar.bz2 +sha1 f06f65bca31168c86bcebd7f92dbbda08817a5cc xditview-1.0.5.tar.bz2 +sha256 eecb1ed51ab4edc7f454476d1248cfb7799a17c5679b3dd834e8b4658331c04b xditview-1.0.5.tar.bz2 +sha512 e20c903f38394b496111267e142d84d11e69a3b89f91869652d1f2ee5c997a13f90bfa2966651b42cd3979a330b348a6e397cc6a74c45b1f3f91643e7c06765d xditview-1.0.5.tar.bz2 +# Locally computed +sha256 023d879308a49249181f78bbb567e93c45138ad847fe969d191e4802e7a1a005 COPYING diff --git a/buildroot/package/x11r7/xapp_xditview/xapp_xditview.mk b/buildroot/package/x11r7/xapp_xditview/xapp_xditview.mk index e8d72770e..388710034 100644 --- a/buildroot/package/x11r7/xapp_xditview/xapp_xditview.mk +++ b/buildroot/package/x11r7/xapp_xditview/xapp_xditview.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XDITVIEW_VERSION = 1.0.4 +XAPP_XDITVIEW_VERSION = 1.0.5 XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.bz2 XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XDITVIEW_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash b/buildroot/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash index 7f9c4f548..eb02eaeda 100644 --- a/buildroot/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash +++ b/buildroot/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2015-April/002569.html -sha256 30238ed915619e06ceb41721e5f747d67320555cc38d459e954839c189ccaf51 xdpyinfo-1.3.2.tar.bz2 +sha256 30238ed915619e06ceb41721e5f747d67320555cc38d459e954839c189ccaf51 xdpyinfo-1.3.2.tar.bz2 +# Locally computed +sha256 49733ead65fdfa1da0d176f9b965cc08dae74d73d66c9606488d52f6fc036abf COPYING diff --git a/buildroot/package/x11r7/xapp_xedit/xapp_xedit.hash b/buildroot/package/x11r7/xapp_xedit/xapp_xedit.hash index 5aedfb74c..e521e0082 100644 --- a/buildroot/package/x11r7/xapp_xedit/xapp_xedit.hash +++ b/buildroot/package/x11r7/xapp_xedit/xapp_xedit.hash @@ -1,3 +1,5 @@ # From http://lists.x.org/archives/xorg-announce/2015-February/002535.html sha1 f37b5d0f8ec461955f0419dbb1890d8cf63d179d xedit-1.2.2.tar.bz2 sha256 69aa42885dfc06332ca22eb01cc7187e49206e6d65b74113a8ee4cc345fc2927 xedit-1.2.2.tar.bz2 +# Locally computed +sha256 6d3e4092277ea08fc6b3180dba061120ea53ee965afb84fce16f8ab3d35bb47a COPYING diff --git a/buildroot/package/x11r7/xapp_xev/xapp_xev.hash b/buildroot/package/x11r7/xapp_xev/xapp_xev.hash index 4008ebafa..160e09e4f 100644 --- a/buildroot/package/x11r7/xapp_xev/xapp_xev.hash +++ b/buildroot/package/x11r7/xapp_xev/xapp_xev.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002572.html -sha256 d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f xev-1.2.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002948.html +md5 eec82a5d4b599736f0fa637e96136746 xev-1.2.3.tar.bz2 +sha1 3a294934b9e150abc3cccc4182a40ed9b5ea9871 xev-1.2.3.tar.bz2 +sha256 66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09 xev-1.2.3.tar.bz2 +sha512 47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e xev-1.2.3.tar.bz2 +# Locally computed +sha256 9b840f2e1900889124cc999f3158da2b6b07bf6d0d77bdbb01ce65d2e702dc83 COPYING diff --git a/buildroot/package/x11r7/xapp_xev/xapp_xev.mk b/buildroot/package/x11r7/xapp_xev/xapp_xev.mk index 2a798db55..137a6f205 100644 --- a/buildroot/package/x11r7/xapp_xev/xapp_xev.mk +++ b/buildroot/package/x11r7/xapp_xev/xapp_xev.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XEV_VERSION = 1.2.2 +XAPP_XEV_VERSION = 1.2.3 XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2 XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XEV_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xf86dga/xapp_xf86dga.hash b/buildroot/package/x11r7/xapp_xf86dga/xapp_xf86dga.hash index b0c803e9c..1a82db9ff 100644 --- a/buildroot/package/x11r7/xapp_xf86dga/xapp_xf86dga.hash +++ b/buildroot/package/x11r7/xapp_xf86dga/xapp_xf86dga.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2010-October/001515.html sha1 030659e3728f5f7142e1cf727f147aceeabe4b9e xf86dga-1.0.3.tar.bz2 +# Locally computed +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/buildroot/package/x11r7/xapp_xfd/xapp_xfd.hash b/buildroot/package/x11r7/xapp_xfd/xapp_xfd.hash index 7b6824bec..d1f5c4543 100644 --- a/buildroot/package/x11r7/xapp_xfd/xapp_xfd.hash +++ b/buildroot/package/x11r7/xapp_xfd/xapp_xfd.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-July/002268.html -sha256 c1a32222fbb891e46f9a82ebab005bc5e54ce006a2586195ec9ea7ab308e2759 xfd-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002968.html +md5 f9c9f2b101a96d4b50c2a4ab9b5ab5b1 xfd-1.1.3.tar.bz2 +sha1 ca6dbe2027b205992a52c6bb717a43508f12a8c4 xfd-1.1.3.tar.bz2 +sha256 192f938ba5830e84cc807d8ead2ad9655b43eaed6500c830f3e083aad10ed958 xfd-1.1.3.tar.bz2 +sha512 68e2d4ce5e24215353b6f3231191d69639c4dd90a703e03ccf152bbfe4012da071c387ba289f918fb0336a3be9ee49dc05cbec7273fa85f5e476ead7e10795f0 xfd-1.1.3.tar.bz2 +# Locally computed +sha256 57ae10f24fc110dafb3b8d7735cf26b1905ff74e716745b2520e4ccd7751095c COPYING diff --git a/buildroot/package/x11r7/xapp_xfd/xapp_xfd.mk b/buildroot/package/x11r7/xapp_xfd/xapp_xfd.mk index 89b3f299f..149e24b79 100644 --- a/buildroot/package/x11r7/xapp_xfd/xapp_xfd.mk +++ b/buildroot/package/x11r7/xapp_xfd/xapp_xfd.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XFD_VERSION = 1.1.2 +XAPP_XFD_VERSION = 1.1.3 XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2 XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XFD_LICENSE = MIT @@ -18,4 +18,11 @@ XAPP_XFD_DEPENDENCIES = \ XAPP_XFD_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults XAPP_XFD_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y) +XAPP_XFD_CONF_OPTS += --with-xkb +XAPP_XFD_DEPENDENCIES += xlib_libxkbfile +else +XAPP_XFD_CONF_OPTS += --without-xkb +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.hash b/buildroot/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.hash index 9263e4630..55091ad20 100644 --- a/buildroot/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.hash +++ b/buildroot/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2015-April/002573.html -sha256 5626bda27c7faa5cbe289a17f8552538fff08a96d542b85efdda1804ccf8a01f xfindproxy-1.0.4.tar.bz2 +sha256 5626bda27c7faa5cbe289a17f8552538fff08a96d542b85efdda1804ccf8a01f xfindproxy-1.0.4.tar.bz2 +# Locally computed +sha256 373984cd13212f3e2fbbcdf88694fd1f5a3658ed9184a6ac44f686fc2e8620f2 COPYING diff --git a/buildroot/package/x11r7/xapp_xfs/xapp_xfs.hash b/buildroot/package/x11r7/xapp_xfs/xapp_xfs.hash index 27577ba2b..22ec25a1b 100644 --- a/buildroot/package/x11r7/xapp_xfs/xapp_xfs.hash +++ b/buildroot/package/x11r7/xapp_xfs/xapp_xfs.hash @@ -3,3 +3,5 @@ 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 +# Locally computed +sha256 0314ea37f40eff3c9ffe44b3924b2a768422f006a754e8286bfd1c73203d225e COPYING diff --git a/buildroot/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash b/buildroot/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash index b1bcc0bc8..67480a51a 100644 --- a/buildroot/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash +++ b/buildroot/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002512.html -sha256 d38f4b6db4038f52ba1a09123ef497993194288454c0c13d16debe246f120d8f xfsinfo-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002949.html +md5 0060d6151427d9e570e54fc52a88e7d7 xfsinfo-1.0.6.tar.bz2 +sha1 cbfe7470179f1ab5eecf992226dc1b28902c6b4c xfsinfo-1.0.6.tar.bz2 +sha256 8a3e8b9b9ae6ed571989d04e1846d39b9043e28f7623b500ebe1d47762c9b1d6 xfsinfo-1.0.6.tar.bz2 +sha512 901fc3817d7c95f2ba75ed0c51de91abd8efa67bbb93ad6b7d66e56a2f721af9db364e92f9ef2e719835fd48e934a5ea7402e5565c0ccd9b6b82633e869dc57b xfsinfo-1.0.6.tar.bz2 +# Locally computed +sha256 bae01fa08f30f21f9cfb75e8339d081b34e5e03d12677177f85a55b0ca41d0db COPYING diff --git a/buildroot/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/buildroot/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk index 38d01e494..bef9787ff 100644 --- a/buildroot/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk +++ b/buildroot/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XFSINFO_VERSION = 1.0.5 +XAPP_XFSINFO_VERSION = 1.0.6 XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.bz2 XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XFSINFO_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xgamma/xapp_xgamma.hash b/buildroot/package/x11r7/xapp_xgamma/xapp_xgamma.hash index 30480aadd..0031450c4 100644 --- a/buildroot/package/x11r7/xapp_xgamma/xapp_xgamma.hash +++ b/buildroot/package/x11r7/xapp_xgamma/xapp_xgamma.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2015-April/002574.html -sha256 0ef1c35b5c18b1b22317f455c8df13c0a471a8efad63c89c98ae3ce8c2b222d3 xgamma-1.0.6.tar.bz2 +sha256 0ef1c35b5c18b1b22317f455c8df13c0a471a8efad63c89c98ae3ce8c2b222d3 xgamma-1.0.6.tar.bz2 +# Locally computed +sha256 78d354d348feaaab8d67a220e84137ec24fece04af4dface2e67132c72e216a2 COPYING diff --git a/buildroot/package/x11r7/xapp_xgc/xapp_xgc.hash b/buildroot/package/x11r7/xapp_xgc/xapp_xgc.hash index 7972a6fd3..50e1362b6 100644 --- a/buildroot/package/x11r7/xapp_xgc/xapp_xgc.hash +++ b/buildroot/package/x11r7/xapp_xgc/xapp_xgc.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2015-April/002575.html -sha256 14828d9bda358ad57efc0206bc416ee33ba542091edb186485cca5389adc2f5e xgc-1.0.5.tar.bz2 +sha256 14828d9bda358ad57efc0206bc416ee33ba542091edb186485cca5389adc2f5e xgc-1.0.5.tar.bz2 +# Locally computed +sha256 13ebeb3e59e406064d46e94a707ed5ec5d8d2bf840971265dd46db0850d22d02 COPYING diff --git a/buildroot/package/x11r7/xapp_xhost/xapp_xhost.hash b/buildroot/package/x11r7/xapp_xhost/xapp_xhost.hash index b714eb65c..0c3879441 100644 --- a/buildroot/package/x11r7/xapp_xhost/xapp_xhost.hash +++ b/buildroot/package/x11r7/xapp_xhost/xapp_xhost.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002576.html -sha256 93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a xhost-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002950.html +md5 a48c72954ae6665e0616f6653636da8c xhost-1.0.8.tar.bz2 +sha1 971670858a464d4f8eeb6f4e182f9fcd94149790 xhost-1.0.8.tar.bz2 +sha256 a2dc3c579e13674947395ef8ccc1b3763f89012a216c2cc6277096489aadc396 xhost-1.0.8.tar.bz2 +sha512 55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b xhost-1.0.8.tar.bz2 +# Locally computed +sha256 7e69bed6fcfff05ecf454d7e4b29cd265172385833f1978f04b638f92f2cfecf COPYING diff --git a/buildroot/package/x11r7/xapp_xhost/xapp_xhost.mk b/buildroot/package/x11r7/xapp_xhost/xapp_xhost.mk index a4bb16bae..e9fb15521 100644 --- a/buildroot/package/x11r7/xapp_xhost/xapp_xhost.mk +++ b/buildroot/package/x11r7/xapp_xhost/xapp_xhost.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XHOST_VERSION = 1.0.7 +XAPP_XHOST_VERSION = 1.0.8 XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2 XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XHOST_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xinit/xapp_xinit.hash b/buildroot/package/x11r7/xapp_xinit/xapp_xinit.hash index 58ee1ecb1..076bd6475 100644 --- a/buildroot/package/x11r7/xapp_xinit/xapp_xinit.hash +++ b/buildroot/package/x11r7/xapp_xinit/xapp_xinit.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002863.html -md5 2da154b2f80ca9637b1a17b13af0880c xinit-1.4.0.tar.bz2 -sha1 fcdca692b09a45f546016fff78718d1cf7e7852f xinit-1.4.0.tar.bz2 -sha256 230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef xinit-1.4.0.tar.bz2 -sha512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e xinit-1.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002962.html +md5 6d506ab2efc17a08e87778654e099d37 xinit-1.4.1.tar.bz2 +sha1 d874a2eecf2c30291e327851b151fdab8183260c xinit-1.4.1.tar.bz2 +sha256 de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9 xinit-1.4.1.tar.bz2 +sha512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340 xinit-1.4.1.tar.bz2 # Locally computed sha256 c47001aa217d4ae7787121d80634db4bdba564e49a0ecab8d48b1bdc4edee1c7 COPYING diff --git a/buildroot/package/x11r7/xapp_xinit/xapp_xinit.mk b/buildroot/package/x11r7/xapp_xinit/xapp_xinit.mk index d911a4595..86a4d9267 100644 --- a/buildroot/package/x11r7/xapp_xinit/xapp_xinit.mk +++ b/buildroot/package/x11r7/xapp_xinit/xapp_xinit.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XINIT_VERSION = 1.4.0 +XAPP_XINIT_VERSION = 1.4.1 XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2 XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11 diff --git a/buildroot/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.hash b/buildroot/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.hash index c2d439fed..b8fcaed03 100644 --- a/buildroot/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.hash +++ b/buildroot/package/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.hash @@ -1,2 +1,3 @@ # locally computed sha256 baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971 xinput_calibrator-0.7.5.tar.gz +sha256 ba6f260bba7d9640cfedfde3a6ae1790583ab8b9ee7c547233ecc0a214d1a6d3 COPYING diff --git a/buildroot/package/x11r7/xapp_xinput/xapp_xinput.hash b/buildroot/package/x11r7/xapp_xinput/xapp_xinput.hash index 724b2e263..456a58c70 100644 --- a/buildroot/package/x11r7/xapp_xinput/xapp_xinput.hash +++ b/buildroot/package/x11r7/xapp_xinput/xapp_xinput.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-October/002643.html -sha256 3694d29b4180952fbf13c6d4e59541310cbb11eef5bf888ff3d8b7f4e3aee5c4 xinput-1.6.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-July/003013.html +md5 ac6b7432726008b2f50eba82b0e2dbe4 xinput-1.6.3.tar.bz2 +sha1 92ea7dfb3d8465921b0dca85da7d5b01cedae6c8 xinput-1.6.3.tar.bz2 +sha256 35a281dd3b9b22ea85e39869bb7670ba78955d5fec17c6ef7165d61e5aeb66ed xinput-1.6.3.tar.bz2 +sha512 cb2fef866ac5a71dbca3e23b4ecadaca38e65dc1b30f8bb024bad92486554fafc472706619a1af04c746a4f53ce6aea827d694b9f4f0c7d0d46bb1da81984076 xinput-1.6.3.tar.bz2 +# Locally computed +sha256 bbd35c7a8e8c5cb073935e84b29b0c53f7131a4ef1ce737dc2be5616941e07e1 COPYING diff --git a/buildroot/package/x11r7/xapp_xinput/xapp_xinput.mk b/buildroot/package/x11r7/xapp_xinput/xapp_xinput.mk index aaa7a8081..0d6c0deff 100644 --- a/buildroot/package/x11r7/xapp_xinput/xapp_xinput.mk +++ b/buildroot/package/x11r7/xapp_xinput/xapp_xinput.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XINPUT_VERSION = 1.6.2 +XAPP_XINPUT_VERSION = 1.6.3 XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2 -XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XINPUT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XINPUT_LICENSE = MIT XAPP_XINPUT_LICENSE_FILES = COPYING XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi xlib_libXrandr xlib_libXinerama diff --git a/buildroot/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash b/buildroot/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash index b350d295d..c3cf2f32b 100644 --- a/buildroot/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash +++ b/buildroot/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2015-April/002577.html -sha256 2430a2e5302a4cb4a5530c1df8cb3721a149bbf8eb377a2898921a145197f96a xkbevd-1.1.4.tar.bz2 +sha256 2430a2e5302a4cb4a5530c1df8cb3721a149bbf8eb377a2898921a145197f96a xkbevd-1.1.4.tar.bz2 +# Locally computed +sha256 38c6dbf8f88b1c920561ff3a4d1ffdb85c069c664f5f8b64a9adb477ef347b7c COPYING diff --git a/buildroot/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash b/buildroot/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash index 9ec83b659..c7e0747f0 100644 --- a/buildroot/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash +++ b/buildroot/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002578.html -sha256 0b3faab8fefad03dfb7e866f634cf859822801de6b5fc6cf5e0a62857ed93e12 xkbprint-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-November/003030.html +md5 9c34da77363dc3d0f616980da87244bf xkbprint-1.0.5.tar.bz2 +sha1 e707caffb3c680b3a869a776aa3f80caeac9e9c3 xkbprint-1.0.5.tar.bz2 +sha256 5b58fe834f0822f06d63d283fac404098c6d3f6acce61888b81016f1c41023fa xkbprint-1.0.5.tar.bz2 +sha512 ac3870352f3a595b5b8a8cb64f39e9bea81b17572c73cfbf72482477a2f576d0ffcdcf735cb3c66b8a88a7fe0f7aece6738cbac87df5641e44fae1ab9b97111f xkbprint-1.0.5.tar.bz2 +# Locally computed +sha256 79b32f28f7f5063054a564e1fdeee56f82a525b6516303704a1f70e55fe7197e COPYING diff --git a/buildroot/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/buildroot/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk index 5f2300f8b..8643cb427 100644 --- a/buildroot/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk +++ b/buildroot/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XKBPRINT_VERSION = 1.0.4 +XAPP_XKBPRINT_VERSION = 1.0.5 XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.bz2 XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XKBPRINT_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash b/buildroot/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash index 666030460..2f8dbc7c1 100644 --- a/buildroot/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash +++ b/buildroot/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2013-February/002162.html -sha256 d2a18ab90275e8bca028773c44264d2266dab70853db4321bdbc18da75148130 xkbutils-1.0.4.tar.bz2 +sha256 d2a18ab90275e8bca028773c44264d2266dab70853db4321bdbc18da75148130 xkbutils-1.0.4.tar.bz2 +# Locally computed +sha256 3d67b53c085de6d475705b60855b9277afac5d4c4ec531d0ffd1ef0d00571594 COPYING diff --git a/buildroot/package/x11r7/xapp_xlogo/xapp_xlogo.hash b/buildroot/package/x11r7/xapp_xlogo/xapp_xlogo.hash index 861cd596a..a4aada48c 100644 --- a/buildroot/package/x11r7/xapp_xlogo/xapp_xlogo.hash +++ b/buildroot/package/x11r7/xapp_xlogo/xapp_xlogo.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2012-March/001905.html -sha256 17af6f4fb73e7310e087fbfe5d773bab2b0d6f37a894ae5ee32de4693af6ba92 xlogo-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002963.html +md5 e9d21de1dc8c8b9f854509a26a985cd7 xlogo-1.0.5.tar.bz2 +sha1 f025a0ad30c45cbec1c2f3b1610bff94fb4e9f33 xlogo-1.0.5.tar.bz2 +sha256 633d7a3aa5df61e4e643b740e5799664741ab1a0ba40593e54fcd15dc30f378e xlogo-1.0.5.tar.bz2 +sha512 0d78e269b0be3c5de71de7f362b896bfd9934ecd9d0361b3302399b1269e029c4a9f35418d792121a1edc34405d753f9d69c996cc3a69ac717f2b0d1f736406b xlogo-1.0.5.tar.bz2 +# Locally computed +sha256 972b454b6c0da17cec61225ab9dfd4afc69fd8e7e4c629497197c6f79adc6fb0 COPYING diff --git a/buildroot/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/buildroot/package/x11r7/xapp_xlogo/xapp_xlogo.mk index 380acfc40..455469e16 100644 --- a/buildroot/package/x11r7/xapp_xlogo/xapp_xlogo.mk +++ b/buildroot/package/x11r7/xapp_xlogo/xapp_xlogo.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XLOGO_VERSION = 1.0.4 +XAPP_XLOGO_VERSION = 1.0.5 XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2 XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XLOGO_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash b/buildroot/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash index 58d0737b9..de7eabe3b 100644 --- a/buildroot/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash +++ b/buildroot/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002579.html -sha256 47e5dc7c3dbda6db2cf8c00cedac1722835c1550aa21cfdbc9ba83906694dea4 xlsatoms-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002951.html +md5 61671fee12535347db24ec3a715032a7 xlsatoms-1.1.3.tar.bz2 +sha1 9fdb1e8df6bb08529a812ac90f63d500bf5174cc xlsatoms-1.1.3.tar.bz2 +sha256 57868f958c263976727881f3078e55b86b4a109dc578d2b92f5c6d690850a382 xlsatoms-1.1.3.tar.bz2 +sha512 c267ccfdc5a83e834bfb5c3b144e22642badcadef4eb146eeec2df6fe6f85e9379500ae4219912c70fa2e535036a1a96cf496381f5d814e79af075e03c975f30 xlsatoms-1.1.3.tar.bz2 +# Locally computed +sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING diff --git a/buildroot/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/buildroot/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk index d6d933801..a3230fc2d 100644 --- a/buildroot/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk +++ b/buildroot/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XLSATOMS_VERSION = 1.1.2 +XAPP_XLSATOMS_VERSION = 1.1.3 XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2 XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XLSATOMS_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xmag/xapp_xmag.hash b/buildroot/package/x11r7/xapp_xmag/xapp_xmag.hash index ccfeb32b6..55a9d479d 100644 --- a/buildroot/package/x11r7/xapp_xmag/xapp_xmag.hash +++ b/buildroot/package/x11r7/xapp_xmag/xapp_xmag.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2015-April/002581.html -sha256 87a2bc23b251e2d8f8370d3283a4d6c8dac98a30cb5749a04336cdb55c14e161 xmag-1.0.6.tar.bz2 +sha256 87a2bc23b251e2d8f8370d3283a4d6c8dac98a30cb5749a04336cdb55c14e161 xmag-1.0.6.tar.bz2 +# Locally computed +sha256 ef8744e617719339c4934579f8558ee4a5aec4396bebd6af02562b63a7c16d27 COPYING diff --git a/buildroot/package/x11r7/xapp_xman/xapp_xman.hash b/buildroot/package/x11r7/xapp_xman/xapp_xman.hash index 00a4d85bb..e4a93d170 100644 --- a/buildroot/package/x11r7/xapp_xman/xapp_xman.hash +++ b/buildroot/package/x11r7/xapp_xman/xapp_xman.hash @@ -1,3 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-March/002541.html -sha1 b64516dab2b1c407b28ce3822a98b93178e29f02 xman-1.1.4.tar.bz2 -sha256 b3fa9d2e3f3745c529eb0b6ee4f0e00d936457d11e5221b2efad06ff7c84df29 xman-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-July/003011.html +md5 629436867b202098967636b17c8d303c xman-1.1.5.tar.bz2 +sha1 ec76dbd010f68974e05dfe8bc4b91731a3b7285b xman-1.1.5.tar.bz2 +sha256 4e3c2c7497e9734a6d3c8e1b6a364612892bb31e9f33076c9fdae7177ab60978 xman-1.1.5.tar.bz2 +sha512 f6b2be424a79f298bf1a81edce4172572195c9efc9454e5b7b7046f344ed08154c77ccaa763ccdf3f1a30b64aa4802783bf813ee637437ccb1fba434fc5d4400 xman-1.1.5.tar.bz2 +# Locally computed +sha256 4c3d6d6fc5661c64285931a0871728f3745d962d877477235dc66e4043db3d36 COPYING diff --git a/buildroot/package/x11r7/xapp_xman/xapp_xman.mk b/buildroot/package/x11r7/xapp_xman/xapp_xman.mk index 0d744cc39..f8abfe577 100644 --- a/buildroot/package/x11r7/xapp_xman/xapp_xman.mk +++ b/buildroot/package/x11r7/xapp_xman/xapp_xman.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XMAN_VERSION = 1.1.4 +XAPP_XMAN_VERSION = 1.1.5 XAPP_XMAN_SOURCE = xman-$(XAPP_XMAN_VERSION).tar.bz2 -XAPP_XMAN_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XMAN_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XMAN_LICENSE = MIT XAPP_XMAN_LICENSE_FILES = COPYING XAPP_XMAN_DEPENDENCIES = xlib_libXaw diff --git a/buildroot/package/x11r7/xapp_xmh/xapp_xmh.hash b/buildroot/package/x11r7/xapp_xmh/xapp_xmh.hash index 0358b3d95..1dadc3458 100644 --- a/buildroot/package/x11r7/xapp_xmh/xapp_xmh.hash +++ b/buildroot/package/x11r7/xapp_xmh/xapp_xmh.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2015-April/002582.html -sha256 b92f4f912a5fb6346d52cc2b639aea087b347f3b2e4e1a4fc7a165b1345f5689 xmh-1.0.3.tar.bz2 +sha256 b92f4f912a5fb6346d52cc2b639aea087b347f3b2e4e1a4fc7a165b1345f5689 xmh-1.0.3.tar.bz2 +# Locally computed +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/buildroot/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash b/buildroot/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash index aad981522..4925ec00a 100644 --- a/buildroot/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash +++ b/buildroot/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002583.html -sha256 b7b0e5cc5f10d0fb6d2d6ea4f00c77e8ac0e847cc5a73be94cd86139ac4ac478 xmodmap-1.0.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002952.html +md5 51f1d30a525e9903280ffeea2744b1f6 xmodmap-1.0.10.tar.bz2 +sha1 69e041f8a8c501bd1feb68805a0880633a685bc8 xmodmap-1.0.10.tar.bz2 +sha256 473f0941d7439d501bb895ff358832b936ec34c749b9704c37a15e11c318487c xmodmap-1.0.10.tar.bz2 +sha512 324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04 xmodmap-1.0.10.tar.bz2 +# Locally computed +sha256 c149563cf2cb0ecfb1148b6eb8f604c62bed43452a0d0fbafb97286a97840f5c COPYING diff --git a/buildroot/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/buildroot/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk index 670bf9f41..f3a458b7b 100644 --- a/buildroot/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk +++ b/buildroot/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XMODMAP_VERSION = 1.0.9 +XAPP_XMODMAP_VERSION = 1.0.10 XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2 XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XMODMAP_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xmore/xapp_xmore.hash b/buildroot/package/x11r7/xapp_xmore/xapp_xmore.hash index f2b7d1a69..cd777831f 100644 --- a/buildroot/package/x11r7/xapp_xmore/xapp_xmore.hash +++ b/buildroot/package/x11r7/xapp_xmore/xapp_xmore.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2010-July/001360.html -sha1 7db4e5feb82d5d05038722d3af00d28e103bed18 xmore-1.0.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002964.html +md5 8e1279352192e4142740c21db58f9be9 xmore-1.0.3.tar.bz2 +sha1 b57b92afd783d28c4c505e0c95556939f24c3ec9 xmore-1.0.3.tar.bz2 +sha256 644a1e0d5182d7708d413722d0579a587dc56b9a8cb60640df076d302e09251b xmore-1.0.3.tar.bz2 +sha512 e3e44831cd87a54bb585f80ef0d87f69dc35f6c834a73241aad9f6e2b0999b53c51a0a3f915a94ae4d6dc9bdfb9f60b6576f0bdcec441443abd98efa6c51b1d3 xmore-1.0.3.tar.bz2 +# Locally computed +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/buildroot/package/x11r7/xapp_xmore/xapp_xmore.mk b/buildroot/package/x11r7/xapp_xmore/xapp_xmore.mk index b0b0edf23..f8a3ba8c1 100644 --- a/buildroot/package/x11r7/xapp_xmore/xapp_xmore.mk +++ b/buildroot/package/x11r7/xapp_xmore/xapp_xmore.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XMORE_VERSION = 1.0.2 +XAPP_XMORE_VERSION = 1.0.3 XAPP_XMORE_SOURCE = xmore-$(XAPP_XMORE_VERSION).tar.bz2 XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XMORE_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xprop/xapp_xprop.hash b/buildroot/package/x11r7/xapp_xprop/xapp_xprop.hash index a57d375b8..f513e12c2 100644 --- a/buildroot/package/x11r7/xapp_xprop/xapp_xprop.hash +++ b/buildroot/package/x11r7/xapp_xprop/xapp_xprop.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002870.html -md5 4becb3ddc4674d741487189e4ce3d0b6 xprop-1.2.3.tar.bz2 -sha1 77062c08a23cfca76824b7e8f9860678255d6b1a xprop-1.2.3.tar.bz2 -sha256 d22afb28c86d85fff10a50156a7d0fa930c80ae865d70b26d805fd28a17a521b xprop-1.2.3.tar.bz2 -sha512 ad7987fec11ae19b7adc3b0f683fc393e95155f3b6c753d1d8744aedcfb360452eee5735a4c380152b286905931515f3e1a28676b5531001eb8dd93b7249916a xprop-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002969.html +md5 cc369c28383a5d7144e7197ee7d30bfa xprop-1.2.4.tar.bz2 +sha1 0549a927d01930218f1d0089d0157eb9538b34a5 xprop-1.2.4.tar.bz2 +sha256 8c77fb096e46c60032b7e2bde9492c3ffcc18734f50b395085a5f10bfd3cf753 xprop-1.2.4.tar.bz2 +sha512 6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7 xprop-1.2.4.tar.bz2 # Locally computed sha256 f19ff982936cca133b9593a6561c3817512207e0b4c951d0e4eb5956d30d4415 COPYING diff --git a/buildroot/package/x11r7/xapp_xprop/xapp_xprop.mk b/buildroot/package/x11r7/xapp_xprop/xapp_xprop.mk index d8063d94c..a0ad4302c 100644 --- a/buildroot/package/x11r7/xapp_xprop/xapp_xprop.mk +++ b/buildroot/package/x11r7/xapp_xprop/xapp_xprop.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XPROP_VERSION = 1.2.3 +XAPP_XPROP_VERSION = 1.2.4 XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2 XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XPROP_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xrandr/xapp_xrandr.hash b/buildroot/package/x11r7/xapp_xrandr/xapp_xrandr.hash index b1db30dcd..408b070dd 100644 --- a/buildroot/package/x11r7/xapp_xrandr/xapp_xrandr.hash +++ b/buildroot/package/x11r7/xapp_xrandr/xapp_xrandr.hash @@ -1,2 +1,7 @@ -# From https://lists.freedesktop.org/archives/xorg-announce/2016-February/002677.html -sha256 c1cfd4e1d4d708c031d60801e527abc9b6d34b85f2ffa2cadd21f75ff38151cd xrandr-1.5.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-August/003018.html +md5 fe40f7a4fd39dd3a02248d3e0b1972e4 xrandr-1.5.1.tar.xz +sha1 9f72957e0d2a26ece509336ea7e1529cc9ea881e xrandr-1.5.1.tar.xz +sha256 7bc76daf9d72f8aff885efad04ce06b90488a1a169d118dea8a2b661832e8762 xrandr-1.5.1.tar.xz +sha512 3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922 xrandr-1.5.1.tar.xz +# Locally computed +sha256 0dd9a3d62c48dd7b87790029e39fb5e11756d33fded3bc1644e11585c87b2038 COPYING diff --git a/buildroot/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/buildroot/package/x11r7/xapp_xrandr/xapp_xrandr.mk index 583a501e4..8586c6feb 100644 --- a/buildroot/package/x11r7/xapp_xrandr/xapp_xrandr.mk +++ b/buildroot/package/x11r7/xapp_xrandr/xapp_xrandr.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XRANDR_VERSION = 1.5.0 -XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.bz2 +XAPP_XRANDR_VERSION = 1.5.1 +XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.xz XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XRANDR_LICENSE = MIT XAPP_XRANDR_LICENSE_FILES = COPYING diff --git a/buildroot/package/x11r7/xapp_xrdb/xapp_xrdb.hash b/buildroot/package/x11r7/xapp_xrdb/xapp_xrdb.hash index c72986172..b8a6896ca 100644 --- a/buildroot/package/x11r7/xapp_xrdb/xapp_xrdb.hash +++ b/buildroot/package/x11r7/xapp_xrdb/xapp_xrdb.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002871.html -md5 96f9423eab4d0641c70848d665737d2e xrdb-1.1.1.tar.bz2 -sha1 0d6b1cae357574d565d6e6bc10f6ccf073e1b9dd xrdb-1.1.1.tar.bz2 -sha256 2d23ade7cdbb487996bf77cbb32cbe9bdb34d004748a53de7a4a97660d2217b7 xrdb-1.1.1.tar.bz2 -sha512 20c342004ef911fc4d3ef4ac3ac15d1c30bb946b8156f3a6916c242e470be0cb63261563462fd1e2e07b1a7cc527b8cacf5f913e31b02196629a95043cf8d13f xrdb-1.1.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002953.html +md5 34ae801ef994d192c70fcce2bdb2a1b2 xrdb-1.2.0.tar.bz2 +sha1 79596928246288a217abdec0e4a2315ec9b07963 xrdb-1.2.0.tar.bz2 +sha256 f23a65cfa1f7126040d68b6cf1e4567523edac10f8dc06f23d840d330c7c6946 xrdb-1.2.0.tar.bz2 +sha512 14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef xrdb-1.2.0.tar.bz2 # Locally computed sha256 ca1b3e2f9f37c35876b69a9c1c5a7860fae59b7ba87a1d2dc541b722e29b1ecc COPYING diff --git a/buildroot/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/buildroot/package/x11r7/xapp_xrdb/xapp_xrdb.mk index 4b84c64a9..b445805d1 100644 --- a/buildroot/package/x11r7/xapp_xrdb/xapp_xrdb.mk +++ b/buildroot/package/x11r7/xapp_xrdb/xapp_xrdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XRDB_VERSION = 1.1.1 +XAPP_XRDB_VERSION = 1.2.0 XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2 XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XRDB_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xsetmode/xapp_xsetmode.hash b/buildroot/package/x11r7/xapp_xsetmode/xapp_xsetmode.hash index c393ad4df..5d4e16458 100644 --- a/buildroot/package/x11r7/xapp_xsetmode/xapp_xsetmode.hash +++ b/buildroot/package/x11r7/xapp_xsetmode/xapp_xsetmode.hash @@ -1,2 +1,3 @@ # locally computed sha256 988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa xsetmode-1.0.0.tar.bz2 +sha256 8f22998f14924220f0f530660811d24e5371a8d7672287c9d22f1eafb7256863 COPYING diff --git a/buildroot/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash b/buildroot/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash index 6e6a37e90..8167f3d17 100644 --- a/buildroot/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash +++ b/buildroot/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash @@ -1,2 +1,6 @@ +# From https://lists.freedesktop.org/archives/xorg-announce/2006-November/000150.html +md5 9e5bcbeda4aaf02bfa095e41d30baee4 xsetpointer-1.0.1.tar.bz2 +sha1 a8b01c6f27625a6f6943f9be17b1e5511f69d710 xsetpointer-1.0.1.tar.bz2 # locally computed -sha256 7d65f450420b4f764dcf38e4ccee9d608b5a5874706e716cb861bfe2586b7d4a xsetpointer-1.0.0.tar.bz2 +sha256 495d88871eb5081e98bbae55f813f73cb3ce4145d6ca3e8f2826800166c04571 xsetpointer-1.0.1.tar.bz2 +sha256 8f22998f14924220f0f530660811d24e5371a8d7672287c9d22f1eafb7256863 COPYING diff --git a/buildroot/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/buildroot/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk index a34b7e637..21630eb7a 100644 --- a/buildroot/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk +++ b/buildroot/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XSETPOINTER_VERSION = 1.0.0 +XAPP_XSETPOINTER_VERSION = 1.0.1 XAPP_XSETPOINTER_SOURCE = xsetpointer-$(XAPP_XSETPOINTER_VERSION).tar.bz2 XAPP_XSETPOINTER_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XSETPOINTER_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash b/buildroot/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash index 6d8b35fae..fc067850b 100644 --- a/buildroot/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash +++ b/buildroot/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-February/002164.html -sha256 f648e2b0cf16aa29856de998e2c7204be39dc1f8daeda9464d32288e0b580fc1 xstdcmap-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002954.html +md5 da67142c128d18386ff145882e0afc66 xstdcmap-1.0.4.tar.bz2 +sha1 a5eff72ba31625e5b11506add800140019a39636 xstdcmap-1.0.4.tar.bz2 +sha256 06898b3f1eaad0b205ff3c75bdefa3207868b889d4cb37b32b8267b2bbfe6f8b xstdcmap-1.0.4.tar.bz2 +sha512 2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f xstdcmap-1.0.4.tar.bz2 +# Locally computed +sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING diff --git a/buildroot/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/buildroot/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk index a4d6dc34f..dd5b0ee34 100644 --- a/buildroot/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk +++ b/buildroot/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XSTDCMAP_VERSION = 1.0.3 +XAPP_XSTDCMAP_VERSION = 1.0.4 XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.bz2 XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XSTDCMAP_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/buildroot/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash index 5c9e25484..ecf7d0330 100644 --- a/buildroot/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash +++ b/buildroot/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2013-January/002129.html -sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 +sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 +# Locally computed +sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/buildroot/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash b/buildroot/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash index 2077730fc..405fc36ea 100644 --- a/buildroot/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash +++ b/buildroot/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002596.html -sha256 9fba8b68daf53863e66d5004fa9c703fcecf69db4d151ea2d3d885d621e6e5eb xvinfo-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002955.html +md5 b13afec137b9b331814a9824ab03ec80 xvinfo-1.1.4.tar.bz2 +sha1 136a70a72b23c81f4fe8f4c8cb7073316be16b44 xvinfo-1.1.4.tar.bz2 +sha256 0353220d6606077ba42363db65f50410759f9815352f77adc799e2adfa76e73f xvinfo-1.1.4.tar.bz2 +sha512 85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e xvinfo-1.1.4.tar.bz2 +# Locally computed +sha256 7725b0484faa1832534814ecb577f5a86acc74f1bcce25f92c55dfc1b693717d COPYING diff --git a/buildroot/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/buildroot/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk index 5b05a6323..7b3b97f07 100644 --- a/buildroot/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk +++ b/buildroot/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XVINFO_VERSION = 1.1.3 +XAPP_XVINFO_VERSION = 1.1.4 XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.bz2 XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XVINFO_LICENSE = MIT diff --git a/buildroot/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash b/buildroot/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash index e3882584c..163d5cc40 100644 --- a/buildroot/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash +++ b/buildroot/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002877.html -md5 9a505b91ae7160bbdec360968d060c83 xwininfo-1.1.4.tar.bz2 -sha1 7364e79d1de7bb612dd98c336c649648c6c081ca xwininfo-1.1.4.tar.bz2 -sha256 839498aa46b496492a5c65cd42cd2e86e0da88149b0672e90cb91648f8cd5b01 xwininfo-1.1.4.tar.bz2 -sha512 d3ab103a0a311e08d1eabc4346750c21eb7d2fbcdc27cab0989a2624b9cd488911614fcf9832603353450114b1231a8f8262cab16e090a0d458d83ec7b6b959b xwininfo-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-July/003012.html +md5 26d46f7ef0588d3392da3ad5802be420 xwininfo-1.1.5.tar.bz2 +sha1 9f67b1eb07c5824d437bf577cf6198962af1aeb7 xwininfo-1.1.5.tar.bz2 +sha256 7a405441dfc476666c744f5fcd1bc8a75abf8b5b1d85db7b88b370982365080e xwininfo-1.1.5.tar.bz2 +sha512 a3268bbeeeeafac94e589fdd47554a965910d40df7cc3d9c36c7c24fa4f5dd49615484d5916ccb41efca9cd4cf9d8981a4c60953b921220b3f4f57f9cce0e1a6 xwininfo-1.1.5.tar.bz2 # Locally computed sha256 443d675237c023a47e4886506b72796afbb2633394812027f91d6e8fa433b2af COPYING diff --git a/buildroot/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/buildroot/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk index 7da881a9f..9652487aa 100644 --- a/buildroot/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk +++ b/buildroot/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XWININFO_VERSION = 1.1.4 +XAPP_XWININFO_VERSION = 1.1.5 XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2 -XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XWININFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XWININFO_LICENSE = MIT XAPP_XWININFO_LICENSE_FILES = COPYING XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu diff --git a/buildroot/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash b/buildroot/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash index 36f2258dc..1964624dc 100644 --- a/buildroot/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash +++ b/buildroot/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2016-May/002691.html sha1 26562eb6d4151307f7b6a53453d360ecfc0563ac xcb-util-cursor-0.1.3.tar.bz2 +# Locally computed +sha256 0dde91ae1d443105dc9e13cbaed6674c36683b7095836ad9ddfce26be270aad5 COPYING diff --git a/buildroot/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash b/buildroot/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash index 1a1ad3e8a..19ed9d464 100644 --- a/buildroot/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash +++ b/buildroot/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2014-June/002446.html -sha256 c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b xcb-util-renderutil-0.3.9.tar.bz2 +sha256 c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b xcb-util-renderutil-0.3.9.tar.bz2 +# Locally computed +sha256 271169dd66674e9c396697af0b4822d1c59ccd2342b7740864d667a02963068b COPYING diff --git a/buildroot/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.hash b/buildroot/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.hash index 19f0de2ea..52d230762 100644 --- a/buildroot/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.hash +++ b/buildroot/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.hash @@ -1,2 +1,3 @@ # locally computed sha256 b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4 xcursor-transparent-theme-0.1.1.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash b/buildroot/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash index 6a8c99599..dd8d2ad26 100644 --- a/buildroot/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash +++ b/buildroot/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002882.html -md5 34a93df23e4aa9ee2832a4af33da3ceb xcursor-themes-1.0.5.tar.bz2 -sha1 6caae6cdb441003a42305f964c32bac21c34626f xcursor-themes-1.0.5.tar.bz2 -sha256 ae8381d39096598f7fe93fbd3ab079d93347a989f29e017f399ffcd20c8e1272 xcursor-themes-1.0.5.tar.bz2 -sha512 f41e1de0d5deafba33106dcad81576d1888fca052a962c202f2221104aa2d8236b066d8d8fc3dcfbdc166db63f84e60980dfc54059b20a26c7415de71ed07a5b xcursor-themes-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002945.html +md5 aea14eabf40528ec4db18f1cfcf5c458 xcursor-themes-1.0.6.tar.bz2 +sha1 b56fd5bf5b1ada0532a85c27db0d296e392168c5 xcursor-themes-1.0.6.tar.bz2 +sha256 ee1ec574741293abcf66ac14ce7e74add7ac6be7deb8b38179ef010d22354999 xcursor-themes-1.0.6.tar.bz2 +sha512 2ad3586a5571a5ddc0001187362b54b839644916164834213af98e58698044aec4392dd6e1e42f1794fda85c8fedf259b09214a9636bd0e71a1629c710f198d3 xcursor-themes-1.0.6.tar.bz2 # Locally computed sha256 e437aed89c3440a9fe7e19968a3f2eeb97041ef6c9616837a3fd42d0874fc0e6 COPYING diff --git a/buildroot/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/buildroot/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk index 048291008..c3c5f388e 100644 --- a/buildroot/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +++ b/buildroot/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDATA_XCURSOR_THEMES_VERSION = 1.0.5 +XDATA_XCURSOR_THEMES_VERSION = 1.0.6 XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2 XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data XDATA_XCURSOR_THEMES_LICENSE = MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash b/buildroot/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash index bf9a2cd25..eb4cb6599 100644 --- a/buildroot/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash +++ b/buildroot/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002767.html -sha256 9edaa6205baf6d2922cc4db3d8e54a7e7773b5f733b0ae90f6be7725f983b70d xf86-input-evdev-2.10.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-May/002898.html +md5 e8bd1edc6751f92e425cae7eba3c61eb xf86-input-evdev-2.10.6.tar.bz2 +sha1 660de292d5a40e2b8f385965c6a4e149c981ba59 xf86-input-evdev-2.10.6.tar.bz2 +sha256 8726073e81861bc7b2321e76272cbdbd33c7e1a121535a9827977265b9033ec0 xf86-input-evdev-2.10.6.tar.bz2 +sha512 560b0a6491d50a46913a5890a35c0367e59f550670993493bd9712d712a9747ddaa6fe5086daabf2fcafa24b0159383787eb273da4a2a60c089bfc0a77ad2ad1 xf86-input-evdev-2.10.6.tar.bz2 +# Locally computed +sha256 f6b9b4732932434cad03b29cb3151d20edcf7d6e5681f40ee3c47f03dbd92dc9 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/buildroot/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk index ded7fa77f..28923cb2a 100644 --- a/buildroot/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk +++ b/buildroot/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.10.5 +XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.10.6 XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VERSION).tar.bz2 XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_EVDEV_LICENSE = MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash b/buildroot/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash index feec2d377..d2384d6c1 100644 --- a/buildroot/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash +++ b/buildroot/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2016-November/002742.html -sha256 9e7669ecf0f23b8e5dc39d5397cf28296f692aa4c0e4255f5e02816612c18eab xf86-input-joystick-1.6.3.tar.bz2 +sha256 9e7669ecf0f23b8e5dc39d5397cf28296f692aa4c0e4255f5e02816612c18eab xf86-input-joystick-1.6.3.tar.bz2 +# Locally calculated +sha256 460cf612147407317a3911ce03a215707d8d6d5f3e604a53fefa6e54974ad07e COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash b/buildroot/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash index eccfa74dc..66e2c3ed9 100644 --- a/buildroot/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash +++ b/buildroot/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2016-November/002739.html -sha256 f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388 xf86-input-keyboard-1.9.0.tar.bz2 +sha256 f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388 xf86-input-keyboard-1.9.0.tar.bz2 +# Locally calculated +sha256 b91b17c53724c79685e3025a38028b7d48c966fdd239e0efe2d98874d3c139a0 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-input-libinput/Config.in b/buildroot/package/x11r7/xdriver_xf86-input-libinput/Config.in index 0cfbfc664..f66196a52 100644 --- a/buildroot/package/x11r7/xdriver_xf86-input-libinput/Config.in +++ b/buildroot/package/x11r7/xdriver_xf86-input-libinput/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_LIBINPUT bool "xf86-input-libinput" - depends on BR2_ENABLE_LOCALE # libinput depends on BR2_PACKAGE_HAS_UDEV # libinput select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_XORGPROTO @@ -9,5 +8,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_LIBINPUT around libinput, so while it does provide all features that libinput supports it does little beyond. -comment "xf86-input-libinput needs udev /dev management and a toolchain w/ locale" - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_ENABLE_LOCALE +comment "xf86-input-libinput needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV diff --git a/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index c6f2577bd..c33893efe 100644 --- a/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-October/002923.html -md5 9d2fb3d6b452d568a275908b856de0e2 xf86-input-libinput-0.28.1.tar.bz2 -sha1 f72f298c23fa993857ff1a9a06754f2f5962b376 xf86-input-libinput-0.28.1.tar.bz2 -sha256 9ada448e076c0078a84b48e5298fa8ce317565f9b342b74c20429214a707d98b xf86-input-libinput-0.28.1.tar.bz2 -sha512 2b8cabfbc3490edbe928771ed9d62a0d4a423bc1373fc6cf9d3a6b5937e17ddc48ebb1b70f1191e507024e4b8220c137495cbba825292b51e50709daa7d31623 xf86-input-libinput-0.28.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-August/003017.html +md5 d600e8e2e30747b8ce49ec5294ff0ab6 xf86-input-libinput-0.29.0.tar.bz2 +sha1 efa9dbe08ee827949aff0bd752f8270237247c56 xf86-input-libinput-0.29.0.tar.bz2 +sha256 c28b56a21754b972db31798e6a4cf4dc9d69208d08f8fe41701a94def5e94bee xf86-input-libinput-0.29.0.tar.bz2 +sha512 f19ef2e9e0c1336d8e0b17853e1fe0c66ecf50e7b10b10b6c5cbafc99323694597821e15e8e358419ef3c68d1009967fd2ec3760800c85adbb71ac3ecc99954b xf86-input-libinput-0.29.0.tar.bz2 # Locally computed sha256 b808a8a077995380c6064bec41616f98546b0b2e79bb7f3d0247d290e275b396 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index 83de5c961..220850055 100644 --- a/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.28.1 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.29.0 XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash b/buildroot/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash index 2c31600b0..b482a1db3 100644 --- a/buildroot/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash +++ b/buildroot/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002744.html -sha256 afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a xf86-input-synaptics-1.9.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2018-May/002899.html +md5 cfb79d3c975151f9bbf30b727c260cb9 xf86-input-synaptics-1.9.1.tar.bz2 +sha1 07eeef716820105cae959bbc3aa103e2fcfd0084 xf86-input-synaptics-1.9.1.tar.bz2 +sha256 7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576 xf86-input-synaptics-1.9.1.tar.bz2 +sha512 978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f xf86-input-synaptics-1.9.1.tar.bz2 +# Locally computed +sha256 e14dc9a27158cadaeea8bcc2c70069762f05adb29030a444336bfde268751dc7 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/buildroot/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk index 0708110e9..c8ef98f8e 100644 --- a/buildroot/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk +++ b/buildroot/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.9.0 +XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.9.1 XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.bz2 XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE = MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash b/buildroot/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash index 302b1cd45..fd6221fa2 100644 --- a/buildroot/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash +++ b/buildroot/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2015-June/002616.html -sha256 0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319 xf86-input-vmmouse-13.1.0.tar.bz2 +sha256 0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319 xf86-input-vmmouse-13.1.0.tar.bz2 +# Locally calculated +sha256 804737a1582428fdde4e2bfd1e9f3ca07971fc3bdce20ba2d06cc2bba6c84a9e COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash b/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash index 999f97181..4bbfb0de7 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-September/002918.html -md5 5d75f5993cda5e013cd851c5947ec450 xf86-video-amdgpu-18.1.0.tar.bz2 -sha1 d3097af7da3b56396721e214f348e7ceb5f3a358 xf86-video-amdgpu-18.1.0.tar.bz2 -sha256 e11f25bb51d718b8ea938ad2b8095323c0ab16f4ddffd92091d80f9a445a9672 xf86-video-amdgpu-18.1.0.tar.bz2 -sha512 371f1a9f6cd2ce3b7117361222d196950c5efa01d957783c79a37c19a2273ce33d133fa51bb68432b8535aad61cb14fbb61d173a167d318b2533eb2507b7a903 xf86-video-amdgpu-18.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-October/003026.html +md5 55ad19b858e186a2cf4e91ed832c05e7 xf86-video-amdgpu-19.1.0.tar.bz2 +sha1 044a97ea2f36dd3d2d4844bb503dd4e2b2854d56 xf86-video-amdgpu-19.1.0.tar.bz2 +sha256 4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d xf86-video-amdgpu-19.1.0.tar.bz2 +sha512 ccdaa2378492da1a2f3d18fedacd1318c4708da534a8a959276a82730d5420619d83ad1ec8d7835c55655fe56123cd9bffb44e6223c5a97033c01f598af4a173 xf86-video-amdgpu-19.1.0.tar.bz2 # Locally computed sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index 6a8266d0b..e7196956a 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 18.1.0 +XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 19.1.0 XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_AMDGPU_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash b/buildroot/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash index 30953ef7f..2e2e95367 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2012-July/002007.html -sha256 c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e xf86-video-ark-0.7.5.tar.bz2 +sha256 c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e xf86-video-ark-0.7.5.tar.bz2 +# Locally calculated +sha256 8ba9850fb0ecd9033bb1d25c1be85625cb53ca56ce76b71f78f4a034f7310bda COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash b/buildroot/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash index cf877d5b3..2988db98a 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash @@ -1,2 +1,4 @@ # Locally computed -sha256 1edbbc55d47d3fd71dec99b15c2483e22738c642623a0fb86ef4a81a9067a2de xf86-video-ast-1.1.5.tar.bz2 +sha256 1edbbc55d47d3fd71dec99b15c2483e22738c642623a0fb86ef4a81a9067a2de xf86-video-ast-1.1.5.tar.bz2 +# Locally calculated +sha256 1cdd3d57e2fdcbd21b8a7b788ffbe6f809216a9bdd36b2225cff6c4b4404a170 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash b/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash index e9581cb08..c6f8c53ef 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-September/002919.html -md5 7910883fff7f4a462efac0fe059ed7e3 xf86-video-ati-18.1.0.tar.bz2 -sha1 87beb7d09f5b722570adda9a5a1822cbd19e7059 xf86-video-ati-18.1.0.tar.bz2 -sha256 6c335f423c1dc3d904550d41cb871ca4130ba7037dda67d82e3f1555e1bfb9ac xf86-video-ati-18.1.0.tar.bz2 -sha512 7a58c9a6cb4876bd2ff37d837372b4e360e81fec7de6a6c7a48d70a5338d62745f734f5d4207f30aa368ff2d9ef44f5f1ef36afd73802a618998c16fe395ed53 xf86-video-ati-18.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-October/003027.html +md5 6e49d3c2839582af415ceded76e626e6 xf86-video-ati-19.1.0.tar.bz2 +sha1 aea1d11c05531b03f2eb67c6785cddf6d7f30e5f xf86-video-ati-19.1.0.tar.bz2 +sha256 659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49 xf86-video-ati-19.1.0.tar.bz2 +sha512 73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6 xf86-video-ati-19.1.0.tar.bz2 # Locally computed sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index e89929d29..f7aeba8ba 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ATI_VERSION = 18.1.0 +XDRIVER_XF86_VIDEO_ATI_VERSION = 19.1.0 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash b/buildroot/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash index 86ef09e21..0600bce16 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2015-May/002600.html -sha256 edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab xf86-video-cirrus-1.5.3.tar.bz2 +sha256 edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab xf86-video-cirrus-1.5.3.tar.bz2 +# Locally calculated +sha256 a113cf02dcfa523593727790a17172080ac87d8de16e766bda4cbbe73dd8dc62 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash b/buildroot/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash index f26ddd4b5..3eac3840e 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2016-December/002751.html sha256 3712bb869307233491e4c570732d6073c0dc3d99adfdb9977396a3fdf84e95b9 xf86-video-dummy-0.3.8.tar.bz2 +# Locally calculated +sha256 e29aa81e74563d14e5633963107c030e74e8352ea7dafee1a9d7e19b7d0e887b COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash b/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash index d0cbc0903..dd3a9c389 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2013-September/002324.html sha256 dcc3d85f378022180e437a9ec00a59b6cb7680ff79c40394d695060af2374699 xf86-video-fbdev-0.5.0.tar.bz2 +# Locally calculated +sha256 e437aed89c3440a9fe7e19968a3f2eeb97041ef6c9616837a3fd42d0874fc0e6 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.hash b/buildroot/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.hash index 037021628..4b3cf8dd2 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.hash @@ -1,2 +1,3 @@ # locally computed sha256 10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f xdriver_xf86-video-fbturbo-0.4.0.tar.gz +sha256 8333e3fa5b0f8d8aceca2f060d4eceeb6033cefed2301b03c3e92f6e3ebbffce COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk b/buildroot/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk index 58a70416d..049a2b5be 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk +++ b/buildroot/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk @@ -21,10 +21,6 @@ else XDRIVER_XF86_VIDEO_FBTURBO_CONF_OPTS += --disable-pciaccess endif -ifeq ($(BR2_PACKAGE_LIBUMP),y) -XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += libump -endif - define XDRIVER_XF86_VIDEO_FBTURBO_INSTALL_CONF_FILE $(INSTALL) -m 0644 -D $(@D)/xorg.conf $(TARGET_DIR)/etc/X11/xorg.conf endef diff --git a/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash b/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash index 8c567cbb3..07e4abf80 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2016-December/002750.html -sha256 c6694c21ee3d9560f6e925925ef1d3818b1988e899b6a0592dbae597c87ac97e xf86-video-geode-2.11.19.tar.bz2 +sha256 c6694c21ee3d9560f6e925925ef1d3818b1988e899b6a0592dbae597c87ac97e xf86-video-geode-2.11.19.tar.bz2 +# Locally calculated +sha256 3994ef7cee54f0935a4b57b1c34efd904da567931dd9e1a2d9390d22c8332ea2 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash b/buildroot/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash index f4e42bf4c..40474ebc7 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2017-January/002759.html -sha256 852833ab2ea9ce519195dfd061a6c7aa5945a093cdc19546d1e9e69df7d577d2 xf86-video-glint-1.2.9.tar.bz2 +sha256 852833ab2ea9ce519195dfd061a6c7aa5945a093cdc19546d1e9e69df7d577d2 xf86-video-glint-1.2.9.tar.bz2 +# Locally calculated +sha256 6ca8e1a7e1d491f3618d3f14df1be64dbc8adefae7bbaf11d4920240dfb12f6e COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash index be41cb091..e5d46c86f 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash @@ -1 +1,3 @@ +# Locally calculated sha256 61b3a7a22f80d1cbc797c329615e1699f3906c9261de7eabcf0de2bf2399de55 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga.tar.gz +sha256 9d3e373f0440cc0c58853e963636a7c1ffda9308ec5f30ebe9adfb9c16a8a1e4 COPYING-MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash index 2443dc288..ff816c7bb 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 685a1b3e1b486f4fb02dd14adc33b8ce215bb96ed8e26787ee8b7bda4c0d6cce xdriver_xf86-video-intel-33ee0c3b21ea279e08d0863fcb2e874f0974b00e.tar.gz +sha256 b074366aad25cae38bb455792ac3110d52bcb0e4a183766c37ee12cbe56d7f8c xdriver_xf86-video-intel-f66d39544bb8339130c96d282a80f87ca1606caf.tar.gz sha256 5808e89f4b9a30afc59f335bfa8219ecf2dacb89a81d16b322bc6d92993a48fa COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index bd315c8d9..fb74eb6ad 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 33ee0c3b21ea279e08d0863fcb2e874f0974b00e +XDRIVER_XF86_VIDEO_INTEL_VERSION = f66d39544bb8339130c96d282a80f87ca1606caf XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash b/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash index 5b69e4e29..b70728f9b 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash @@ -1,4 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-April/002796.html -md5 717203cb87029cddcbccf7398f9ad8c3 xf86-video-nouveau-1.0.15.tar.bz2 -sha1 ed699a59ea509550f60019eef1e092ed0ccdea08 xf86-video-nouveau-1.0.15.tar.bz2 -sha256 aede10fd395610a328697adca3434fb14e9afbd79911d6c8545cfa2c0e541d4c xf86-video-nouveau-1.0.15.tar.bz2 +# From https://lists.freedesktop.org/archives/nouveau/2019-January/032053.html +md5 ecd9be89d853301167e3d564c49f7a8e xf86-video-nouveau-1.0.16.tar.bz2 +sha1 a2d19439ceed315079207a62c6888a12e8489995 xf86-video-nouveau-1.0.16.tar.bz2 +sha256 304060806415579cdb5c1f71f1c54d11cacb431b5552b170decbc883ed43bf06 xf86-video-nouveau-1.0.16.tar.bz2 +sha512 41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0 xf86-video-nouveau-1.0.16.tar.bz2 +# Locally computed +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk b/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk index 41b6fd6d4..d85cbfe4a 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk +++ b/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.15 +XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.16 XDRIVER_XF86_VIDEO_NOUVEAU_SOURCE = xf86-video-nouveau-$(XDRIVER_XF86_VIDEO_NOUVEAU_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_NOUVEAU_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE = MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash b/buildroot/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash index fe91307a6..e1835687a 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2017-January/002761.html -sha256 1f98649e6ff0e8214b9d5dcac661f1d004be8e73823d8247b9c7025fd81db32d xf86-video-nv-2.1.21.tar.bz2 +sha256 1f98649e6ff0e8214b9d5dcac661f1d004be8e73823d8247b9c7025fd81db32d xf86-video-nv-2.1.21.tar.bz2 +# Locally calculated +sha256 10d10e1ec37594d481c3de8dda22a40b731ebd43be7ccd462baaa7394738a9f3 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash b/buildroot/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash index 2d29fae3a..57cc9aca9 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash @@ -1,2 +1,6 @@ -# From https://lists.freedesktop.org/archives/openchrome-devel/2016-July/002890.html -sha1 9c7ad349de6dd350252ccda8da56fa1e2a6afa32 xf86-video-openchrome-0.5.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-March/002781.html +md5 c87f164739729b00f7e1a9934420c22d xf86-video-openchrome-0.6.0.tar.bz2 +sha1 2077181ded4d86e9cbe6d3e9b1245339692e848d xf86-video-openchrome-0.6.0.tar.bz2 +sha256 da2975c6379358de52c1257710c67eb59139a7f0a1cd28d00cc64cc3e1c02f75 xf86-video-openchrome-0.6.0.tar.bz2 +# Locally computed +sha256 1fde58bce5cff8c32e9a0a80bfa3e60213a2767954e30a367127d5afa2884ca2 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/buildroot/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk index 0a669e186..db9e11f6d 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk +++ b/buildroot/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.5.0 +XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.6.0 XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_OPENCHROME_SITE = http://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE = MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash b/buildroot/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash index 7a0982108..fdf0cc434 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2016-December/002753.html -sha256 b18682e04503c6326f7bf7190f3ee50a3d4d69758a2a3cc9af102a6b3f114c92 xf86-video-qxl-0.1.5.tar.bz2 +sha256 b18682e04503c6326f7bf7190f3ee50a3d4d69758a2a3cc9af102a6b3f114c92 xf86-video-qxl-0.1.5.tar.bz2 +# Locally calculated +sha256 83f3bf7be3fbf5e66174b8184bd837a6b44264f8e340126ea4d9e9ce956a1866 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash b/buildroot/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash index 4f155359a..661c8749f 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2017-January/002760.html -sha256 2c93c4db1f71e725dda0caee5821253129d4b52d7aa0fd720593e7769bceec86 xf86-video-savage-2.3.9.tar.bz2 +sha256 2c93c4db1f71e725dda0caee5821253129d4b52d7aa0fd720593e7769bceec86 xf86-video-savage-2.3.9.tar.bz2 +# Locally calculated +sha256 611f4020815e3d5011a39a58f0958262715cd3becd9cb1ef14cc166fd84ec5a6 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash b/buildroot/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash index 819698c61..dc9a35036 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2017-January/002763.html sha256 d0f3c691e71108d27a061beb62bf78b36ec35bd755905692734dd68cfb3359bc xf86-video-siliconmotion-1.7.9.tar.bz2 +# Locally calculated +sha256 e1e3ce7ce1f63fff96444206e09c8490ad7a4af7457c81ea6cdee4f1fee1f960 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-sis/0001-cross.patch b/buildroot/package/x11r7/xdriver_xf86-video-sis/0001-cross.patch deleted file mode 100644 index 9e06480d4..000000000 --- a/buildroot/package/x11r7/xdriver_xf86-video-sis/0001-cross.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xf86-video-sis-0.9.3/configure.ac.orig 2007-06-10 21:00:29.000000000 +0200 -+++ xf86-video-sis-0.9.3/configure.ac 2007-06-10 21:00:45.000000000 +0200 -@@ -71,12 +71,18 @@ - AC_HEADER_STDC - - if test "$DRI" != no; then -+ if test "$cross_compiling" = "no" ; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/buildroot/package/x11r7/xdriver_xf86-video-sis/0002-Remove-reference-to-virtualFrom.patch b/buildroot/package/x11r7/xdriver_xf86-video-sis/0002-Remove-reference-to-virtualFrom.patch deleted file mode 100644 index c9e05efb7..000000000 --- a/buildroot/package/x11r7/xdriver_xf86-video-sis/0002-Remove-reference-to-virtualFrom.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4b1356a2b7fd06e9a05d134caa4033681c939737 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 16 Feb 2017 11:21:27 -0500 -Subject: [PATCH] Remove reference to ->virtualFrom - -The core will print this information as well anyway. - -Signed-off-by: Adam Jackson - -Downloaded from upstream commit -https://cgit.freedesktop.org/xorg/driver/xf86-video-sis/commit/?id=4b1356a2b7fd06e9a05d134caa4033681c939737 - -Signed-off-by: Bernd Kuhls ---- - src/sis_driver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sis_driver.c b/src/sis_driver.c -index 8f06164..513f68b 100644 ---- a/src/sis_driver.c -+++ b/src/sis_driver.c -@@ -2738,7 +2738,7 @@ SiSPrintModes(ScrnInfoPtr pScrn) - float hsync, refresh = 0.0; - char *desc, *desc2, *prefix, *uprefix, *output; - -- xf86DrvMsg(pScrn->scrnIndex, pScrn->virtualFrom, "Virtual size is %dx%d " -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Virtual size is %dx%d " - "(pitch %d)\n", pScrn->virtualX, pScrn->virtualY, - pScrn->displayWidth); - --- -2.17.1 - diff --git a/buildroot/package/x11r7/xdriver_xf86-video-sis/0003-xi.patch b/buildroot/package/x11r7/xdriver_xf86-video-sis/0003-xi.patch deleted file mode 100644 index 790524816..000000000 --- a/buildroot/package/x11r7/xdriver_xf86-video-sis/0003-xi.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fetch from: -https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/xf86-video-sis&id=7aaa7a9786ce5654df877311909244e0a6c42fd1 - -Signed-off-by: Bernd Kuhls - ---- xf86-video-sis-0.10.7/src/sis_driver.c 2013-03-10 13:57:50.000000000 +0100 -+++ xf86-video-sis-0.10.7/src/sis_driver.c.new 2013-03-10 13:54:48.645203559 +0100 -@@ -9378,7 +9378,15 @@ - } - if(doit) { - sigstate = xf86BlockSIGIO(); --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18 -+ { -+ double dx = x, dy = y; -+ miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy, -+ NULL, NULL); -+ x = (int)dx; -+ y = (int)dy; -+ } -+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 - { - double dx = x, dy = y; - miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy); diff --git a/buildroot/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash b/buildroot/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash index 98ea8b1e4..f67095270 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002756.html -sha256 5226b7407c601afa32d6cbf155f9182da95d92cdc89c1f83471e1927e552c10d xf86-video-sis-0.10.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-December/003033.html +md5 b8ec9c21758043b1480f11baec296f5d xf86-video-sis-0.12.0.tar.bz2 +sha1 d22f0d0081e222a62f9e788f5e73246c6d339f80 xf86-video-sis-0.12.0.tar.bz2 +sha256 119d3f17d53c862ec4bf891ed696a6f1d32cdf8bd11d944a9f0ad24625333a5b xf86-video-sis-0.12.0.tar.bz2 +sha512 5aa101e5217f15667f2c94f7a76f4afcf47717b61f5d206ce65efe35dc3f674ca294f98ca8586971c6467f31decdd94d8255ebfc7dc220fac0179afc61995952 xf86-video-sis-0.12.0.tar.bz2 +# Locally computed +sha256 e7958f9497a4daa3ae5aeaf885e4565520af2c540b6e4e04b52bf95d41d56c39 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/buildroot/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk index af80e15da..f96b0a9d0 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk +++ b/buildroot/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk @@ -4,12 +4,11 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.9 +XDRIVER_XF86_VIDEO_SIS_VERSION = 0.12.0 XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_SIS_LICENSE = MIT XDRIVER_XF86_VIDEO_SIS_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xorgproto ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) diff --git a/buildroot/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash b/buildroot/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash index 84885596f..5e9a88fbd 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002755.html -sha256 4cf48ee14ead52b23493c3dce5032496fd68bf1d000170bb138730497e212a42 xf86-video-tdfx-1.4.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002944.html +md5 4697f0cc69ff1ff90bc770863c158d29 xf86-video-tdfx-1.5.0.tar.bz2 +sha1 8042dd0c2bc5a396b2cfeb5418b03059a089be25 xf86-video-tdfx-1.5.0.tar.bz2 +sha256 2f4580e1f66901dd578d6e1f73df8150fd4b8480eb0c9653d4c5d8e0f8e78561 xf86-video-tdfx-1.5.0.tar.bz2 +sha512 eca3359c7db56183a1cfcce7295e41ccc349005ee1cbcf75209f1e4e8e04e887ba511712ef35efc11c940713c8327b0b8ab8b6c86facf02062b3e84c0b1af5ff xf86-video-tdfx-1.5.0.tar.bz2 +# Locally computed +sha256 5bb3d3baff0b7bbef885215ca9c12a5be1a42c848c96601b699637557fbb41ec COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/buildroot/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 6511eec7a..8975334f9 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/buildroot/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.7 +XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.5.0 XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_TDFX_LICENSE = MIT diff --git a/buildroot/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash b/buildroot/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash index a32fdc75a..4f8c10965 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2012-July/002025.html -sha256 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131 xf86-video-tga-1.2.2.tar.bz2 +sha256 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131 xf86-video-tga-1.2.2.tar.bz2 +# Locally calculated +sha256 92e36c6b7c99c8335e5823d53686e58ebd82ee8051a6360f60c8c0fb05745954 COPYING diff --git a/buildroot/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/buildroot/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash index 04a559ac5..8f47bac20 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash +++ b/buildroot/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2017-January/002762.html sha256 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f xf86-video-trident-1.3.8.tar.bz2 +# Locally calculated +sha256 4f065198c49eac1513b915bc4478152c21119f31a97919a6ea8f3e1d10133d15 COPYING diff --git a/buildroot/package/x11r7/xfont_encodings/xfont_encodings.hash b/buildroot/package/x11r7/xfont_encodings/xfont_encodings.hash index 56c1ad273..30dc92760 100644 --- a/buildroot/package/x11r7/xfont_encodings/xfont_encodings.hash +++ b/buildroot/package/x11r7/xfont_encodings/xfont_encodings.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2010-October/001466.html -sha1 24ace2470403f85a0d393769204029bd8247992a encodings-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-June/002998.html +md5 bbae4f247b88ccde0e85ed6a403da22a encodings-1.0.5.tar.bz2 +sha1 7ffec76dba1cfd5040c5b43ccfae930c83ddf92e encodings-1.0.5.tar.bz2 +sha256 bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31 encodings-1.0.5.tar.bz2 +sha512 920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008 encodings-1.0.5.tar.bz2 +# Locally computed +sha256 13b4a0f9431f0fdd6ee36ed386e0b7d1eb429c5cb88df73353896078cbb5a137 COPYING diff --git a/buildroot/package/x11r7/xfont_encodings/xfont_encodings.mk b/buildroot/package/x11r7/xfont_encodings/xfont_encodings.mk index 9c5c9f30b..06d997381 100644 --- a/buildroot/package/x11r7/xfont_encodings/xfont_encodings.mk +++ b/buildroot/package/x11r7/xfont_encodings/xfont_encodings.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_ENCODINGS_VERSION = 1.0.4 +XFONT_ENCODINGS_VERSION = 1.0.5 XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2 -XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_ENCODINGS_SITE = https://xorg.freedesktop.org/releases/individual/font XFONT_ENCODINGS_LICENSE = Public Domain XFONT_ENCODINGS_LICENSE_FILES = COPYING diff --git a/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash b/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash index 04809f5dd..514c90915 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash +++ b/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash @@ -1,2 +1,3 @@ # locally computed sha256 b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054 font-adobe-100dpi-1.0.3.tar.bz2 +sha256 bf6d862672b4fcc86f3f38bc138ad44e52d52207dd8689b8d3701630fc331194 COPYING diff --git a/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk index 9f0183868..bc05a2165 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +++ b/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk @@ -12,6 +12,6 @@ XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash b/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash index abd48d6bb..41ac96fc4 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash +++ b/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash @@ -1,2 +1,3 @@ # locally computed sha256 c6024a1e4a1e65f413f994dd08b734efd393ce0a502eb465deb77b9a36db4d09 font-adobe-75dpi-1.0.3.tar.bz2 +sha256 bf6d862672b4fcc86f3f38bc138ad44e52d52207dd8689b8d3701630fc331194 COPYING diff --git a/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk index 1a8af2bd5..f77c1706c 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +++ b/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk @@ -12,6 +12,6 @@ XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash b/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash index f20f4a717..81498788b 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash +++ b/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash @@ -1,2 +1,3 @@ # locally computed sha256 d16f5e3f227cc6dd07a160a71f443559682dbc35f1c056a5385085aaec4fada5 font-adobe-utopia-100dpi-1.0.4.tar.bz2 +sha256 234c2a8109afa8034c787dbf69696a9bdd374914aadf937d2a103831d95c1867 COPYING diff --git a/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk index 4ff89f6b1..1c157dd4c 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +++ b/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk @@ -12,6 +12,6 @@ XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.hash b/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.hash index 1a60af619..0b6e1af63 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.hash +++ b/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.hash @@ -1,2 +1,3 @@ # locally computed sha256 8732719c61f3661c8bad63804ebfd54fc7de21ab848e9a26a19b1778ef8b5c94 font-adobe-utopia-75dpi-1.0.4.tar.bz2 +sha256 234c2a8109afa8034c787dbf69696a9bdd374914aadf937d2a103831d95c1867 COPYING diff --git a/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk index 61005f79b..cd60b34fc 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +++ b/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk @@ -12,6 +12,6 @@ XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash b/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash index 4da2a4ff8..514dd2829 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash +++ b/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash @@ -1,2 +1,3 @@ # locally computed sha256 979435105f897a70f8993fa02c8362160b0513366c2ab896965416f96dbb8077 font-adobe-utopia-type1-1.0.4.tar.bz2 +sha256 234c2a8109afa8034c787dbf69696a9bdd374914aadf937d2a103831d95c1867 COPYING diff --git a/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk index 9264eaf43..9ec8f800b 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk +++ b/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk @@ -12,6 +12,6 @@ XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.hash b/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.hash index 7f1efe8e0..ae679a0ad 100644 --- a/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.hash +++ b/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.hash @@ -1,2 +1,3 @@ # locally computed sha256 8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a font-alias-1.0.3.tar.bz2 +sha256 bdba5452fc080c0f1a56d66978ac4150d1d1a00a9cc0248bba4f0b76c80ad47e COPYING diff --git a/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk index f6b3008aa..8a37da44c 100644 --- a/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk +++ b/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk @@ -12,6 +12,6 @@ XFONT_FONT_ALIAS_LICENSE_FILES = COPYING XFONT_FONT_ALIAS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ALIAS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash b/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash index 03950039d..3c565450f 100644 --- a/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash +++ b/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash @@ -1,2 +1,3 @@ # locally computed sha256 505d9b12a7093389e67a925dfda6346bde26d114c67f0cdca7aeda6e5d3344f4 font-arabic-misc-1.0.3.tar.bz2 +sha256 192b677a887c20f9671cc357cd5ea7bae586003d61c1f8f6e164e8f5530abf57 COPYING diff --git a/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk index 0043a00c4..e8f6f3d2e 100644 --- a/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +++ b/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk @@ -12,6 +12,6 @@ XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash b/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash index 3a9d4c78b..154d6eb2f 100644 --- a/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash +++ b/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash @@ -1,2 +1,3 @@ # locally computed sha256 23c07162708e4b79eb33095c8bfa62c783717a9431254bbf44863734ea239481 font-bh-100dpi-1.0.3.tar.bz2 +sha256 888fd79d2c7e6332559d661c62f7a50f92fc5842e6ff0e0bd4c59b0083dabce9 COPYING diff --git a/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk index 919727278..d1176d54e 100644 --- a/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +++ b/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk @@ -12,6 +12,6 @@ XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash b/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash index ee24538e6..0648e26dd 100644 --- a/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash +++ b/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash @@ -1,2 +1,3 @@ # locally computed sha256 3486aa51ac92c646a448fe899c5c3dae0024b1fef724d5100d52640d1cac721c font-bh-75dpi-1.0.3.tar.bz2 +sha256 888fd79d2c7e6332559d661c62f7a50f92fc5842e6ff0e0bd4c59b0083dabce9 COPYING diff --git a/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk index 62bee4202..5b05f5f79 100644 --- a/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +++ b/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk @@ -12,6 +12,6 @@ XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash index 6e9c7e3c7..439d5d260 100644 --- a/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash +++ b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash @@ -1,2 +1,3 @@ # locally computed sha256 62a83363c2536095fda49d260d21e0847675676e4e3415054064cbdffa641fbb font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 +sha256 9428a98add4fada4c98e031ae0f29d27f8b15a2c8c6e8830591a4c18ea26a6cd COPYING diff --git a/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk index 0f039a1d4..4afec6ce6 100644 --- a/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +++ b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk @@ -12,6 +12,6 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash index 374b8f6f0..ed8d8514d 100644 --- a/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash +++ b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash @@ -1,2 +1,3 @@ # locally computed sha256 4ac16afbe205480cc5572e2977ea63488c543d05be0ea8e5a94c845a6eebcb31 font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 +sha256 9428a98add4fada4c98e031ae0f29d27f8b15a2c8c6e8830591a4c18ea26a6cd COPYING diff --git a/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk index 892f9eeab..7a36c1105 100644 --- a/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +++ b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk @@ -12,6 +12,6 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash b/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash index 8df8e4b93..05063726b 100644 --- a/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash +++ b/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2010-November/001537.html sha1 f42ebd527096011040a312e0f9cdf78d64177419 font-bh-ttf-1.0.3.tar.bz2 +# Locally computed +sha256 27d47d50006773f1c0bd97661252ae27bb8cfd6951f253bd9d3ef81ed1243934 COPYING diff --git a/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk index f4fcde9c2..e3ed2a6f0 100644 --- a/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk +++ b/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk @@ -12,6 +12,6 @@ XFONT_FONT_BH_TTF_LICENSE_FILES = COPYING XFONT_FONT_BH_TTF_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_TTF_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash b/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash index 89303dbc9..cb0387d9e 100644 --- a/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash +++ b/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash @@ -1,2 +1,3 @@ # locally computed sha256 761455a297486f3927a85d919b5c948d1d324181d4bea6c95d542504b68a63c1 font-bh-type1-1.0.3.tar.bz2 +sha256 27d47d50006773f1c0bd97661252ae27bb8cfd6951f253bd9d3ef81ed1243934 COPYING diff --git a/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk index f5e6e8924..244c91ffb 100644 --- a/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk +++ b/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk @@ -12,6 +12,6 @@ XFONT_FONT_BH_TYPE1_LICENSE_FILES = COPYING XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash b/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash index 09186ae57..1cef17d4c 100644 --- a/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash +++ b/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash @@ -1,2 +1,3 @@ # locally computed sha256 ebe0d7444e3d7c8da7642055ac2206f0190ee060700d99cd876f8fc9964cb6ce font-bitstream-100dpi-1.0.3.tar.bz2 +sha256 6faf32f092c2b92f3f99e0d63db9d802b11b4dd5aa0ce991f107a398d7f1ae80 COPYING diff --git a/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk index 931058f77..9812ddc1b 100644 --- a/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +++ b/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk @@ -12,6 +12,6 @@ XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash b/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash index 7ec889406..9973f1f45 100644 --- a/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash +++ b/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash @@ -1,2 +1,3 @@ # locally computed sha256 ba3f5e4610c07bd5859881660753ec6d75d179f26fc967aa776dbb3d5d5cf48e font-bitstream-75dpi-1.0.3.tar.bz2 +sha256 6faf32f092c2b92f3f99e0d63db9d802b11b4dd5aa0ce991f107a398d7f1ae80 COPYING diff --git a/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk index 9e7752434..91dfeb2ac 100644 --- a/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +++ b/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk @@ -12,6 +12,6 @@ XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash b/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash index 7e958b349..81bb8fc79 100644 --- a/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash +++ b/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash @@ -1,2 +1,3 @@ # locally computed sha256 c6ea0569adad2c577f140328dc3302e729cb1b1ea90cd0025caf380625f8a688 font-bitstream-type1-1.0.3.tar.bz2 +sha256 ecad5afdbd1308634896744a4c962361e9eca73e7d9969bb3aad94533c66d046 COPYING diff --git a/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk index a4d4f73cc..640ce8632 100644 --- a/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk +++ b/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk @@ -12,6 +12,6 @@ XFONT_FONT_BITSTREAM_TYPE1_LICENSE_FILES = COPYING XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash b/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash index 7fc295fdc..893ba5718 100644 --- a/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash +++ b/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash @@ -1,2 +1,3 @@ # locally computed sha256 6e8631936157677c77ba032b5c7b1fb3cb2ee872dbcea0444f12cd602cd9212a font-cronyx-cyrillic-1.0.3.tar.bz2 +sha256 857fa9f8d12bd7ce7fb235393d775dd5e0b5130fac7a88fdea9156d75b609402 COPYING diff --git a/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk index 83ded01ef..28329a36b 100644 --- a/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +++ b/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk @@ -12,6 +12,6 @@ XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash b/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash index 90a032b7c..04565f8b0 100644 --- a/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash +++ b/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash @@ -1,2 +1,3 @@ # locally computed sha256 17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635 font-cursor-misc-1.0.3.tar.bz2 +sha256 c22415fb2144d7298e995dbeee2eb120822d653c61ae43c64fa0fda2cc3ca3a0 COPYING diff --git a/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk index 00867a6f2..9e8852aee 100644 --- a/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +++ b/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk @@ -12,6 +12,6 @@ XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk index f33088eb5..f591b8b80 100644 --- a/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +++ b/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk @@ -11,6 +11,6 @@ XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash b/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash index 50c6136bf..34873fe3b 100644 --- a/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash +++ b/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash @@ -1,2 +1,3 @@ # locally computed sha256 e19ddf8b5f8de914d81675358fdfe37762e9ce524887cc983adef34f2850ff7b font-dec-misc-1.0.3.tar.bz2 +sha256 bf4d44be4b5eb66c53bf5f7eb2d9d4817fb937788b37ed6ceda1876fdb964817 COPYING diff --git a/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk index fd7e28656..10d24c6c5 100644 --- a/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +++ b/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk @@ -12,6 +12,6 @@ XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash b/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash index 11aa89087..c5e8f4e4a 100644 --- a/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash +++ b/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash @@ -1,2 +1,3 @@ # locally computed sha256 fddb28d3db5a07f4b4ca15388488a9680a10e1367a18f358f903b2a608a5d2df font-ibm-type1-1.0.3.tar.bz2 +sha256 fc0fd4df7ac7ac7f9b1ff3a221f28c52edea4506dc4c84f1869a3f4281360ca1 COPYING diff --git a/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk index 045a6bfe2..4d34998af 100644 --- a/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk +++ b/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk @@ -12,6 +12,6 @@ XFONT_FONT_IBM_TYPE1_LICENSE_FILES = COPYING XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash b/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash index 35324d435..bc4a9e5b1 100644 --- a/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash +++ b/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash @@ -1,2 +1,3 @@ # locally computed sha256 5824ab4b485951107dd245b8f7717d2822f1a6dbf6cea98f1ac7f49905c0a867 font-isas-misc-1.0.3.tar.bz2 +sha256 32d5d082b8186051bbe75ea9cbedc646830217ca931b1b7a1e534a828c94e839 COPYING diff --git a/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk index 7ca1388e1..721f93d80 100644 --- a/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +++ b/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk @@ -12,6 +12,6 @@ XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk index 12cf8c863..1736aed17 100644 --- a/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +++ b/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk @@ -11,6 +11,6 @@ XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash b/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash index 223ca0f86..ce0899b65 100644 --- a/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash +++ b/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash @@ -1,2 +1,3 @@ # locally computed sha256 9a3381c10f32d9511f0ad4179df395914c50779103c16cddf7017f5220ed8db6 font-micro-misc-1.0.3.tar.bz2 +sha256 1711d038bca0efb51b5114e902412019d1c21531882866b1a6908c6386268cfb COPYING diff --git a/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk index ea119b63b..60105427d 100644 --- a/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +++ b/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk @@ -12,6 +12,6 @@ XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash b/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash index 162711228..5eb407f4c 100644 --- a/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash +++ b/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash @@ -1,2 +1,3 @@ # locally computed sha256 e40fe3e3323c62b738550795457ad555c70c008aa91b5912dfd46f8e745f5e60 font-misc-cyrillic-1.0.3.tar.bz2 +sha256 8765722448e0ca6ce113d0406554c40224f74abfc005f4b2ef927567349f1529 COPYING diff --git a/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk index d72f98858..226397208 100644 --- a/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +++ b/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk @@ -12,6 +12,6 @@ XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash b/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash index c75816a85..f806bf089 100644 --- a/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash +++ b/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash @@ -1,2 +1,3 @@ # locally computed sha256 53cb1fd83afdbe7939c0eac34003676ee0e6023216892d98054db90b703c98a5 font-misc-ethiopic-1.0.3.tar.bz2 +sha256 94835f274f1ddad34f8fd3a06b2c493222a68e4094f4097000d101f22ee0d0d5 COPYING diff --git a/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk index 8214040f9..6f345df52 100644 --- a/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk +++ b/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk @@ -12,6 +12,6 @@ XFONT_FONT_MISC_ETHIOPIC_LICENSE_FILES = COPYING XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash b/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash index 7a7ca92ea..92046c851 100644 --- a/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash +++ b/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash @@ -1,2 +1,3 @@ # locally computed sha256 3721323f13855cf7ca609115a1f7b182491e9b2b9c6e01eb1a2c7f8edd480791 font-misc-meltho-1.0.3.tar.bz2 +sha256 6a02b45e4877b9df8c1bdaa21e1e8fba86d85e3be4c90f2791183a501e0cbd25 COPYING diff --git a/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk index 1b801df60..ac4a71b70 100644 --- a/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk +++ b/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk @@ -12,6 +12,6 @@ XFONT_FONT_MISC_MELTHO_LICENSE_FILES = COPYING XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash b/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash index fc4ae5871..781742420 100644 --- a/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash +++ b/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash @@ -1,2 +1,3 @@ # locally computed sha256 b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794 font-misc-misc-1.1.2.tar.bz2 +sha256 1711d038bca0efb51b5114e902412019d1c21531882866b1a6908c6386268cfb COPYING diff --git a/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk index f9e1ba648..dd62f0502 100644 --- a/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +++ b/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk @@ -12,6 +12,6 @@ XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash b/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash index 45a6fc1be..f6e8e9aa7 100644 --- a/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash +++ b/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash @@ -1,2 +1,3 @@ # locally computed sha256 bd5f7adb34367c197773a9801df5bce7b019664941900b2a31fbfe1ff2830f8f font-mutt-misc-1.0.3.tar.bz2 +sha256 81d42a6eeaf3ac2fcc1e1408fb6e2039d1162ca85d4abaf75e3daddcb250e4ff COPYING diff --git a/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk index 1312e379c..475fc68b2 100644 --- a/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +++ b/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk @@ -12,6 +12,6 @@ XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash b/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash index 6da0963d4..107493b26 100644 --- a/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash +++ b/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash @@ -1,2 +1,3 @@ # locally computed sha256 e444028656e0767e2eddc6d9aca462b16a2be75a47244dbc199b2c44eca87e5a font-schumacher-misc-1.1.2.tar.bz2 +sha256 4e2b9933887950acad3a780dce91c71770c8887f132bcd0c2ba6146cdc372407 COPYING diff --git a/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk index 65256ad97..b50ed5768 100644 --- a/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +++ b/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk @@ -12,6 +12,6 @@ XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash b/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash index 0de78d897..e8d3fa160 100644 --- a/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash +++ b/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash @@ -1,2 +1,4 @@ # From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 824231e8dffe15299454e47259f29d98001c9cf8ad3d6b5171399e4d71705e79 font-screen-cyrillic-1.0.4.tar.bz2 +sha256 824231e8dffe15299454e47259f29d98001c9cf8ad3d6b5171399e4d71705e79 font-screen-cyrillic-1.0.4.tar.bz2 +# Locally computed +sha256 5234cbcbdcc9865ce2b576b5f67e77e40ccdc1aa01e6528bea5a17784934b894 COPYING diff --git a/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk index 5687fd66c..dd444594e 100644 --- a/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +++ b/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk @@ -12,6 +12,6 @@ XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash b/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash index aef4b6fe4..80261ff31 100644 --- a/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash +++ b/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash @@ -1,2 +1,4 @@ # From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 2043a326ba347c9da5ca1e9bc363e2521c3ea40b43b1f9662d333efd4867cff5 font-sony-misc-1.0.3.tar.bz2 +sha256 2043a326ba347c9da5ca1e9bc363e2521c3ea40b43b1f9662d333efd4867cff5 font-sony-misc-1.0.3.tar.bz2 +# Locally computed +sha256 8233ff7d7bc8b5b46cbba3f6cd0069d2ef875bd1b1e0090ca4145282aa096739 COPYING diff --git a/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk index f13fca5da..ae4444e59 100644 --- a/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +++ b/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk @@ -12,6 +12,6 @@ XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash b/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash index 9d3697814..8b195c9f9 100644 --- a/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash +++ b/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash @@ -1,2 +1,4 @@ # From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 481f4fcbbf7005658b080b3cf342c8c76de752e77f47958b2b383de73266d2e0 font-sun-misc-1.0.3.tar.bz2 +sha256 481f4fcbbf7005658b080b3cf342c8c76de752e77f47958b2b383de73266d2e0 font-sun-misc-1.0.3.tar.bz2 +# Locally computed +sha256 dd6da1d39832ab2878c3304405c1c7883c6da292ffde262fca1785239534c40f COPYING diff --git a/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk index 4b1a06c0a..c1e2dac72 100644 --- a/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +++ b/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk @@ -12,6 +12,6 @@ XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash b/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash index 89fbda9ac..283f6f9f2 100644 --- a/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash +++ b/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash @@ -1,2 +1,4 @@ # From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 abd13b63d02fcaec488686c23683e5cf640b43bd32f8ca22eeae6f84df0a36a0 font-winitzki-cyrillic-1.0.3.tar.bz2 +sha256 abd13b63d02fcaec488686c23683e5cf640b43bd32f8ca22eeae6f84df0a36a0 font-winitzki-cyrillic-1.0.3.tar.bz2 +# Locally computed +sha256 ca60a2aa1133e39e8c72a01af06cf0c927f5ddfe70d469d1535231100618095d COPYING diff --git a/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk index f8945227e..8e83d4466 100644 --- a/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +++ b/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk @@ -12,6 +12,6 @@ XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash b/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash index 38be53bf5..640f56636 100644 --- a/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash +++ b/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash @@ -1,2 +1,4 @@ # From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 caebf42aec7be7f3bd40e0f232d6f34881b853dc84acfcdf7458358701fbe34a font-xfree86-type1-1.0.4.tar.bz2 +sha256 caebf42aec7be7f3bd40e0f232d6f34881b853dc84acfcdf7458358701fbe34a font-xfree86-type1-1.0.4.tar.bz2 +# Locally computed +sha256 51e6bc6513b3fa94512d8dd570240498c878605f25292c3883d92fdfca18d0c6 COPYING diff --git a/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk index 5aced6309..a26fbc894 100644 --- a/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk +++ b/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk @@ -12,6 +12,6 @@ XFONT_FONT_XFREE86_TYPE1_LICENSE_FILES = COPYING XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf +XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash index 56ea0e525..ae94bb490 100644 --- a/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,7 +1,3 @@ -# From https://lists.x.org/archives/xorg-announce/2018-February/002833.html -md5 875cbd09ab8394277fd16070326abbae xkeyboard-config-2.23.1.tar.bz2 -sha1 184c9ce35f4fa44188acbf549f80d36407697ac3 xkeyboard-config-2.23.1.tar.bz2 -sha256 2a4bbc05fea22151b7a7c8ac2655d549aa9b0486bedc7f5a68c72716343b02f3 xkeyboard-config-2.23.1.tar.bz2 -sha512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba xkeyboard-config-2.23.1.tar.bz2 # Locally computed +sha256 69adb25b0fc64e4075f8ec0eab8d869892419f474f91fb69db1713de2062bdce xkeyboard-config-2.28.tar.bz2 sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING diff --git a/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk index 9a8838dde..d8e243423 100644 --- a/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -4,7 +4,7 @@ # ################################################################################ -XKEYBOARD_CONFIG_VERSION = 2.23.1 +XKEYBOARD_CONFIG_VERSION = 2.28 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config XKEYBOARD_CONFIG_LICENSE = MIT @@ -14,6 +14,6 @@ XKEYBOARD_CONFIG_LICENSE_FILES = COPYING XKEYBOARD_CONFIG_INSTALL_STAGING = YES XKEYBOARD_CONFIG_CONF_OPTS = --disable-runtime-deps -XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp +XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-xapp_xkbcomp $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xlib_libFS/xlib_libFS.hash b/buildroot/package/x11r7/xlib_libFS/xlib_libFS.hash index 786d147b3..c6f168576 100644 --- a/buildroot/package/x11r7/xlib_libFS/xlib_libFS.hash +++ b/buildroot/package/x11r7/xlib_libFS/xlib_libFS.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002588.html -sha256 2e9d4c07026a7401d4fa4ffae86e6ac7fec83f50f3268fa85f52718e479dc4f3 libFS-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002970.html +md5 4e1196275aa743d6ebd3d3d5ec1dff9c libFS-1.0.8.tar.bz2 +sha1 70173cc15a7a55defb7b22b00a9387901acad634 libFS-1.0.8.tar.bz2 +sha256 c8e13727149b2ddfe40912027459b2522042e3844c5cd228c3300fe5eef6bd0f libFS-1.0.8.tar.bz2 +sha512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f libFS-1.0.8.tar.bz2 +# Locally computed +sha256 5386724e7475b89394dd836b954a6688f875efab99e43e8eb7e8775f5b99a341 COPYING diff --git a/buildroot/package/x11r7/xlib_libFS/xlib_libFS.mk b/buildroot/package/x11r7/xlib_libFS/xlib_libFS.mk index 56f2dc3cb..9cc93e0fe 100644 --- a/buildroot/package/x11r7/xlib_libFS/xlib_libFS.mk +++ b/buildroot/package/x11r7/xlib_libFS/xlib_libFS.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBFS_VERSION = 1.0.7 +XLIB_LIBFS_VERSION = 1.0.8 XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2 XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBFS_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash b/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash index 5dac4f114..defaa4c98 100644 --- a/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-October/002921.html -md5 034fdd6cc5393974d88aec6f5bc96162 libX11-1.6.7.tar.bz2 -sha1 5076f7853713d7db958a05f6fd1c18f7e111a0ad libX11-1.6.7.tar.bz2 -sha256 910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348 libX11-1.6.7.tar.bz2 -sha512 edd2273b9dadbbf90ad8d7b5715db29eb120a5a22ad2595f697e56532cc24b84e358580c00548fa6be8e9d26601a2b2cdab32272c59266709534317abbd05cd5 libX11-1.6.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-October/003025.html +md5 55adbfb6d4370ecac5e70598c4e7eed2 libX11-1.6.9.tar.bz2 +sha1 62456536411f2540fbd4a3f59ed8af94967124c2 libX11-1.6.9.tar.bz2 +sha256 9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1 libX11-1.6.9.tar.bz2 +sha512 fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31 libX11-1.6.9.tar.bz2 # Locally computed sha256 2daec087a88e7c9b8082557cdeebad5bbb8155a4137472f0b22e269cd99d0c1e COPYING diff --git a/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk b/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk index 87929c42e..18949c604 100644 --- a/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.6.7 +XLIB_LIBX11_VERSION = 1.6.9 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT @@ -29,7 +29,6 @@ HOST_XLIB_LIBX11_DEPENDENCIES = \ XLIB_LIBX11_CONF_OPTS = \ --disable-malloc0returnsnull \ - --with-xcb \ --disable-specs \ --without-perl @@ -37,17 +36,5 @@ HOST_XLIB_LIBX11_CONF_OPTS = \ --disable-specs \ --without-perl -# src/util/makekeys is executed at build time to generate ks_tables.h, so -# it should get compiled for the host. The libX11 makefile unfortunately -# doesn't have X11_CFLAGS_FOR_BUILD so this doesn't work. For buildroot, -# we know the X11 includes are in $(HOST_DIR)/include, which are already -# in the CFLAGS_FOR_BUILD, so we can just remove the X11_CFLAGS -define XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS - $(SED) '/X11_CFLAGS/d' $(@D)/src/util/Makefile* -endef - -XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS -HOST_XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS - $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/x11r7/xlib_libXau/xlib_libXau.hash b/buildroot/package/x11r7/xlib_libXau/xlib_libXau.hash index b6c8de73c..a78d7f0fe 100644 --- a/buildroot/package/x11r7/xlib_libXau/xlib_libXau.hash +++ b/buildroot/package/x11r7/xlib_libXau/xlib_libXau.hash @@ -1,2 +1,7 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-May/055728.html -sha256 fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2 libXau-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002942.html +md5 c5f16288f2da9f071b29111d68797480 libXau-1.0.9.tar.bz2 +sha1 ef9b1ad00f958c8b6e30a1bbc11fdfac311c9733 libXau-1.0.9.tar.bz2 +sha256 ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec libXau-1.0.9.tar.bz2 +sha512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562 libXau-1.0.9.tar.bz2 +# Locally computed +sha256 56abe29bb1d9806a9e04fa9f80fed2c0f18027594df3f098148d814aef6bddfa COPYING diff --git a/buildroot/package/x11r7/xlib_libXau/xlib_libXau.mk b/buildroot/package/x11r7/xlib_libXau/xlib_libXau.mk index 0fc78e706..bac10818f 100644 --- a/buildroot/package/x11r7/xlib_libXau/xlib_libXau.mk +++ b/buildroot/package/x11r7/xlib_libXau/xlib_libXau.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXAU_VERSION = 1.0.8 +XLIB_LIBXAU_VERSION = 1.0.9 XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2 XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXAU_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.hash b/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.hash index a948e8fd9..159e007bc 100644 --- a/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.hash +++ b/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.hash @@ -1,2 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2015-April/002591.html sha256 8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd libXaw-1.0.13.tar.bz2 +# Locally calculated +sha256 9f5adb26952f93b3e4650285b94ec6c61a27aab5a21088bfb6694001be1b360d COPYING diff --git a/buildroot/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash b/buildroot/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash index b0c3211f1..37e9c7211 100644 --- a/buildroot/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash +++ b/buildroot/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash @@ -1,2 +1,7 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-January/055221.html -sha256 ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178 libXcomposite-0.4.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002971.html +md5 3fa0841ea89024719b20cd702a9b54e0 libXcomposite-0.4.5.tar.bz2 +sha1 902631efb55a798c81086e5ff90b60349839db40 libXcomposite-0.4.5.tar.bz2 +sha256 b3218a2c15bab8035d16810df5b8251ffc7132ff3aa70651a1fba0bfe9634e8f libXcomposite-0.4.5.tar.bz2 +sha512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5 libXcomposite-0.4.5.tar.bz2 +# Locally computed +sha256 efa0219ed8485ac555c1a3fb82daf34539b2e0dcf4dadc99c01f1e39c69a4a68 COPYING diff --git a/buildroot/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/buildroot/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk index e84b52e3f..80e94fe37 100644 --- a/buildroot/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk +++ b/buildroot/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXCOMPOSITE_VERSION = 0.4.4 +XLIB_LIBXCOMPOSITE_VERSION = 0.4.5 XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.bz2 XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXCOMPOSITE_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash b/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash index 7da9eb8c4..3a12253d4 100644 --- a/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash +++ b/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash @@ -1,5 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-November/002823.html -md5 58fe3514e1e7135cf364101e714d1a14 libXcursor-1.1.15.tar.bz2 -sha1 3e19f991f244b7fa31566adce7ead078424296cf libXcursor-1.1.15.tar.bz2 -sha256 294e670dd37cd23995e69aae626629d4a2dfe5708851bbc13d032401b7a3df6b libXcursor-1.1.15.tar.bz2 -sha512 53ad0fa2afd7b4cf1108b560e44ea71abdf5c55a18df243d7123942513589c927f5c105395f790d8769959e0129db54264e6aac7efd51a5f1aec270379b1f2f5 libXcursor-1.1.15.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002972.html +md5 9b9be0e289130fb820aedf67705fc549 libXcursor-1.2.0.tar.bz2 +sha1 cca0b34955d3c2f657f05a2a2c40f75353ddd912 libXcursor-1.2.0.tar.bz2 +sha256 3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782 libXcursor-1.2.0.tar.bz2 +sha512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03 libXcursor-1.2.0.tar.bz2 +# Locally computed +sha256 1f1588aff23eec0cb6bb9cfe02f8a75abbe43faf3d9b1eff54b7fbc42774b3ad COPYING diff --git a/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk index 6ee76039e..9bbd460c9 100644 --- a/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk +++ b/buildroot/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXCURSOR_VERSION = 1.1.15 +XLIB_LIBXCURSOR_VERSION = 1.2.0 XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.bz2 XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXCURSOR_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash b/buildroot/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash index 343cbf4a6..120d3e026 100644 --- a/buildroot/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash +++ b/buildroot/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash @@ -1,2 +1,7 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-January/055220.html -sha256 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad libXdamage-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002973.html +md5 e3f554267a7a04b042dc1f6352bd6d99 libXdamage-1.1.5.tar.bz2 +sha1 719ae6ab8c1b972c6386b654976c479255af5572 libXdamage-1.1.5.tar.bz2 +sha256 b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45 libXdamage-1.1.5.tar.bz2 +sha512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124 libXdamage-1.1.5.tar.bz2 +# Locally computed +sha256 33effe928634be12e668465c3935c5570ff2787b970b15d9243d69df42302c57 COPYING diff --git a/buildroot/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/buildroot/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk index d52b4e0e2..cc5493ff6 100644 --- a/buildroot/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk +++ b/buildroot/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXDAMAGE_VERSION = 1.1.4 +XLIB_LIBXDAMAGE_VERSION = 1.1.5 XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.bz2 XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXDAMAGE_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libXext/xlib_libXext.hash b/buildroot/package/x11r7/xlib_libXext/xlib_libXext.hash index 45b754448..45810d5d1 100644 --- a/buildroot/package/x11r7/xlib_libXext/xlib_libXext.hash +++ b/buildroot/package/x11r7/xlib_libXext/xlib_libXext.hash @@ -1,2 +1,7 @@ -# From http://lists.freedesktop.org/pipermail/xorg/2014-July/056771.html -sha256 b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35 libXext-1.3.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002975.html +md5 f5b48bb76ba327cd2a8dc7a383532a95 libXext-1.3.4.tar.bz2 +sha1 14e2451162e8766173b5b14c73e94a22b1fcab55 libXext-1.3.4.tar.bz2 +sha256 59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b libXext-1.3.4.tar.bz2 +sha512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a libXext-1.3.4.tar.bz2 +# Locally computed +sha256 80767ac915f2f0f94de9efb15f0197a59b6f1e609cae85059f8703272dc3e146 COPYING diff --git a/buildroot/package/x11r7/xlib_libXext/xlib_libXext.mk b/buildroot/package/x11r7/xlib_libXext/xlib_libXext.mk index 02fee222b..c63a3b23c 100644 --- a/buildroot/package/x11r7/xlib_libXext/xlib_libXext.mk +++ b/buildroot/package/x11r7/xlib_libXext/xlib_libXext.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXEXT_VERSION = 1.3.3 +XLIB_LIBXEXT_VERSION = 1.3.4 XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2 XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXEXT_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash b/buildroot/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash index d96e5c6a7..d655be4f7 100644 --- a/buildroot/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash +++ b/buildroot/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash @@ -1,2 +1,5 @@ # From https://lists.x.org/archives/xorg-announce/2016-October/002722.html sha256 de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6 libXfixes-5.0.3.tar.bz2 + +# Locally calculated +sha256 d64e671ffeb483d4543f98c842788ab34c77427e27d83d6b082065a4438d4885 COPYING diff --git a/buildroot/package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch b/buildroot/package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch new file mode 100644 index 000000000..51e7225be --- /dev/null +++ b/buildroot/package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch @@ -0,0 +1,30 @@ +From 5fceeeb0d1cdccdb2870f65444f2965344f3b8b9 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 19 Oct 2019 09:32:41 +0200 +Subject: [PATCH] configure: define HAVE_LIBBSD when libbsd was found + +Patch sent upstream: +https://gitlab.freedesktop.org/xorg/lib/libxfont/merge_requests/6 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index f507c28..cc7ca91 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,6 +53,9 @@ AC_CHECK_HEADERS([endian.h poll.h sys/poll.h]) + # Checks for library functions. + AC_CHECK_FUNCS([poll readlink]) + AC_SEARCH_LIBS([strlcat], [bsd]) ++if test "$ac_cv_search_strlcat" = "-lbsd"; then ++ AC_DEFINE(HAVE_LIBBSD,1,[Has libbsd]) ++fi + AC_CONFIG_LIBOBJ_DIR([src/util]) + AC_REPLACE_FUNCS([reallocarray strlcat strlcpy]) + +-- +2.20.1 + diff --git a/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash index 1816b4bf6..634affdfd 100644 --- a/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash +++ b/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash @@ -1,5 +1,8 @@ -# From https://lists.x.org/archives/xorg-announce/2017-November/002824.html -md5 b7ca87dfafeb5205b28a1e91ac3efe85 libXfont2-2.0.3.tar.bz2 -sha1 1110f1ad4061d9e8131ecb941757480e3e32bca0 libXfont2-2.0.3.tar.bz2 -sha256 0e8ab7fd737ccdfe87e1f02b55f221f0bd4503a1c5f28be4ed6a54586bac9c4e libXfont2-2.0.3.tar.bz2 -sha512 648b664e2aa58cbc7366a1b05873aa06bd4a38060f64085783043388244af8ceced77b29a22c3ac8b6d34cd226e093bbbcc785ea1748ea65720fe7ea05b4b44b libXfont2-2.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-September/003022.html +md5 00516bed7ec1453d56974560379fff2f libXfont2-2.0.4.tar.bz2 +sha1 9e00ae7589315656435efaf330128facad7c4a57 libXfont2-2.0.4.tar.bz2 +sha256 6d151b3368e5035efede4b6264c0fdc6662c1c99dbc2de425e3480cababc69e6 libXfont2-2.0.4.tar.bz2 +sha512 7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106 libXfont2-2.0.4.tar.bz2 + +# Locally calculated +sha256 97e413bb4962bbb5773085cd5405502bf1d4eadeaf98ff5be015eacacc840462 COPYING diff --git a/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk index 65adf665b..611b8af54 100644 --- a/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk +++ b/buildroot/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk @@ -4,12 +4,14 @@ # ################################################################################ -XLIB_LIBXFONT2_VERSION = 2.0.3 +XLIB_LIBXFONT2_VERSION = 2.0.4 XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2 XLIB_LIBXFONT2_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFONT2_LICENSE = MIT XLIB_LIBXFONT2_LICENSE_FILES = COPYING XLIB_LIBXFONT2_INSTALL_STAGING = YES +# 0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch +XLIB_LIBXFONT2_AUTORECONF = YES XLIB_LIBXFONT2_DEPENDENCIES = \ freetype \ xlib_libfontenc \ @@ -17,6 +19,10 @@ XLIB_LIBXFONT2_DEPENDENCIES = \ xorgproto \ xfont_encodings +ifeq ($(BR2_PACKAGE_LIBBSD),y) +XLIB_LIBXFONT2_DEPENDENCIES += libbsd +endif + HOST_XLIB_LIBXFONT2_DEPENDENCIES = \ host-freetype \ host-xlib_libfontenc \ diff --git a/buildroot/package/x11r7/xlib_libXft/xlib_libXft.hash b/buildroot/package/x11r7/xlib_libXft/xlib_libXft.hash index 6eacf06ef..bd0838b4d 100644 --- a/buildroot/package/x11r7/xlib_libXft/xlib_libXft.hash +++ b/buildroot/package/x11r7/xlib_libXft/xlib_libXft.hash @@ -1,2 +1,7 @@ -# From http://lists.freedesktop.org/pipermail/xorg/2014-June/056668.html -sha256 f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c libXft-2.3.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002976.html +md5 4a433c24627b4ff60a4dd403a0990796 libXft-2.3.3.tar.bz2 +sha1 48f543fe495f545df1794fa36a0a708558ae298c libXft-2.3.3.tar.bz2 +sha256 225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216 libXft-2.3.3.tar.bz2 +sha512 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8 libXft-2.3.3.tar.bz2 +# Locally computed +sha256 7cda22286b1379b9b73df695f72cbad36595e65b039a5fbc5c89b69ecc44438c COPYING diff --git a/buildroot/package/x11r7/xlib_libXft/xlib_libXft.mk b/buildroot/package/x11r7/xlib_libXft/xlib_libXft.mk index 9c5757e65..489cfe4c5 100644 --- a/buildroot/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/buildroot/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXFT_VERSION = 2.3.2 +XLIB_LIBXFT_VERSION = 2.3.3 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2 XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFT_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libXi/xlib_libXi.hash b/buildroot/package/x11r7/xlib_libXi/xlib_libXi.hash index 9f2c3e30b..123563132 100644 --- a/buildroot/package/x11r7/xlib_libXi/xlib_libXi.hash +++ b/buildroot/package/x11r7/xlib_libXi/xlib_libXi.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002768.html -sha256 c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45 libXi-1.7.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-June/002999.html +md5 62c4af0839072024b4b1c8cbe84216c7 libXi-1.7.10.tar.bz2 +sha1 79052e50ea07ce2431f8988a60553d9091d46207 libXi-1.7.10.tar.bz2 +sha256 36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061 libXi-1.7.10.tar.bz2 +sha512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218 libXi-1.7.10.tar.bz2 +# Locally computed +sha256 9392174bc86e291369fd2f61f3ed325962735a5f5c585ce8d7ebd365e2a5639f COPYING diff --git a/buildroot/package/x11r7/xlib_libXi/xlib_libXi.mk b/buildroot/package/x11r7/xlib_libXi/xlib_libXi.mk index 283373891..de7f3a7d3 100644 --- a/buildroot/package/x11r7/xlib_libXi/xlib_libXi.mk +++ b/buildroot/package/x11r7/xlib_libXi/xlib_libXi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXI_VERSION = 1.7.9 +XLIB_LIBXI_VERSION = 1.7.10 XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 -XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXI_SITE = https://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXI_LICENSE = MIT XLIB_LIBXI_LICENSE_FILES = COPYING XLIB_LIBXI_INSTALL_STAGING = YES diff --git a/buildroot/package/x11r7/xlib_libXmu/xlib_libXmu.hash b/buildroot/package/x11r7/xlib_libXmu/xlib_libXmu.hash index 2c96d960b..8cad2389b 100644 --- a/buildroot/package/x11r7/xlib_libXmu/xlib_libXmu.hash +++ b/buildroot/package/x11r7/xlib_libXmu/xlib_libXmu.hash @@ -1,2 +1,7 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-September/056009.html -sha256 756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b libXmu-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002978.html +md5 ac774cff8b493f566088a255dbf91201 libXmu-1.1.3.tar.bz2 +sha1 7ff54ce38379fb795aebed38f6be404ee0dfeec6 libXmu-1.1.3.tar.bz2 +sha256 9c343225e7c3dc0904f2122b562278da5fed639b1b5e880d25111561bac5b731 libXmu-1.1.3.tar.bz2 +sha512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762 libXmu-1.1.3.tar.bz2 +# Locally computed +sha256 e65a4a8bbf8b0dfd2439d6bc6d86df03e2b8e693b757593b25149e099aeb8ec4 COPYING diff --git a/buildroot/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/buildroot/package/x11r7/xlib_libXmu/xlib_libXmu.mk index b3f3db3e5..3218e0ec3 100644 --- a/buildroot/package/x11r7/xlib_libXmu/xlib_libXmu.mk +++ b/buildroot/package/x11r7/xlib_libXmu/xlib_libXmu.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXMU_VERSION = 1.1.2 +XLIB_LIBXMU_VERSION = 1.1.3 XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2 XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXMU_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libXpm/0001-fork-check.patch b/buildroot/package/x11r7/xlib_libXpm/0001-fork-check.patch deleted file mode 100644 index fb4fb7d13..000000000 --- a/buildroot/package/x11r7/xlib_libXpm/0001-fork-check.patch +++ /dev/null @@ -1,21 +0,0 @@ -Allow usage when fork() is not available - -When fork() is not available, we need to define NO_ZPIPE so that -libXpm doesn't try to fork/exec to use a pipe to uncompress compressed -.xpm files. There is obviously a loss of functionality, but loading -uncompressed .xpm files should continue to work. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -22,6 +22,7 @@ - - # Checks for library functions - AC_CHECK_FUNCS([strlcat]) -+AC_CHECK_FUNC([fork],[], AC_DEFINE(NO_ZPIPE)) - - # Obtain compiler/linker options for dependencies - PKG_CHECK_MODULES(XPM, xproto x11) diff --git a/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.hash index d94a90268..c3aa695c5 100644 --- a/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,2 +1,8 @@ -# From https://lists.x.org/archives/xorg-announce/2016-December/002752.html -sha256 fd6a6de3da48de8d1bb738ab6be4ad67f7cb0986c39bd3f7d51dd24f7854bdec libXpm-3.5.12.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-December/003034.html +md5 6f0ecf8d103d528cfc803aa475137afa libXpm-3.5.13.tar.bz2 +sha1 38b1a2728adb49f4e255aba1530f51789815ffc4 libXpm-3.5.13.tar.bz2 +sha256 9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25 libXpm-3.5.13.tar.bz2 +sha512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5 libXpm-3.5.13.tar.bz2 +# Locally calculated +sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING +sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 391493a4b..455fb10bf 100644 --- a/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,14 +4,12 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.12 +XLIB_LIBXPM_VERSION = 3.5.13 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2 XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXPM_LICENSE = MIT -XLIB_LIBXPM_LICENSE_FILES = COPYING +XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT XLIB_LIBXPM_INSTALL_STAGING = YES -# we patch configure.ac -XLIB_LIBXPM_AUTORECONF = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) diff --git a/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash b/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash index 84a50cb5d..ed5366953 100644 --- a/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash +++ b/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002724.html -sha256 1ff9e7fa0e4adea912b16a5f0cfa7c1d35b0dcda0e216831f7715c8a3abcf51a libXrandr-1.5.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002979.html +md5 18f3b20d522f45e4dadd34afb5bea048 libXrandr-1.5.2.tar.bz2 +sha1 7a1f6df239341b76fd59ebbe101d6f180adb43bb libXrandr-1.5.2.tar.bz2 +sha256 8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023 libXrandr-1.5.2.tar.bz2 +sha512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87 libXrandr-1.5.2.tar.bz2 +# Locally computed +sha256 73777e5be1cef2827d843e4b186803f050c66db472cf8076d88e2b5f71696e67 COPYING diff --git a/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk index 1bfd78f73..23a0d974d 100644 --- a/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk +++ b/buildroot/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXRANDR_VERSION = 1.5.1 +XLIB_LIBXRANDR_VERSION = 1.5.2 XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2 XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXRANDR_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libXrender/xlib_libXrender.hash b/buildroot/package/x11r7/xlib_libXrender/xlib_libXrender.hash index bbc5b898b..96981ad50 100644 --- a/buildroot/package/x11r7/xlib_libXrender/xlib_libXrender.hash +++ b/buildroot/package/x11r7/xlib_libXrender/xlib_libXrender.hash @@ -1,2 +1,5 @@ # From https://lists.x.org/archives/xorg-announce/2016-October/002725.html sha256 c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949 libXrender-0.9.10.tar.bz2 + +# Locally calculated +sha256 bbe1db89c48816c48248796adac91defd8fbde1141b145f01511781ab87f29a1 COPYING diff --git a/buildroot/package/x11r7/xlib_libXres/xlib_libXres.hash b/buildroot/package/x11r7/xlib_libXres/xlib_libXres.hash index 12a03518a..ee4823c1a 100644 --- a/buildroot/package/x11r7/xlib_libXres/xlib_libXres.hash +++ b/buildroot/package/x11r7/xlib_libXres/xlib_libXres.hash @@ -3,3 +3,6 @@ md5 5d6d443d1abc8e1f6fc1c57fb27729bb libXres-1.2.0.tar.bz2 sha1 b6996ab05460a3b7311f02da23ddf117a5442fd9 libXres-1.2.0.tar.bz2 sha256 ff75c1643488e64a7cfbced27486f0f944801319c84c18d3bd3da6bf28c812d4 libXres-1.2.0.tar.bz2 sha512 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172 libXres-1.2.0.tar.bz2 + +# Locally calculated +sha256 0d7300168f85833ea2564835f66a61e036ede90b33e76c06a7b4078096fedbcc COPYING diff --git a/buildroot/package/x11r7/xlib_libXt/0001-util-don-t-link-makestrs-with-target-cflags.patch b/buildroot/package/x11r7/xlib_libXt/0001-util-don-t-link-makestrs-with-target-cflags.patch deleted file mode 100644 index ccc684fc7..000000000 --- a/buildroot/package/x11r7/xlib_libXt/0001-util-don-t-link-makestrs-with-target-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3f064076c783914cafdff028db303681dae4291d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 15 Nov 2012 18:31:53 +0100 -Subject: [PATCH] libXt: util: don't link makestrs with target cflags - -The line: - -AM_CFLAGS = $(XT_CFLAGS) - -in util/Makefile.am is wrong because it adds target cflags to the -compilation of makestrs, which is built for the build machine, which -leads to build failures when cross-compiling. - -Signed-off-by: Thomas Petazzoni ---- - util/Makefile.am | 1 - - util/makestrs.c | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/util/Makefile.am b/util/Makefile.am -index dedfa6b..cc6f3fc 100644 ---- a/util/Makefile.am -+++ b/util/Makefile.am -@@ -10,7 +10,6 @@ EXTRA_DIST = \ - StrDefs.ht \ - string.list - --AM_CFLAGS = $(XT_CFLAGS) - makestrs_SOURCES = makestrs.c - - --- -1.7.9.5 diff --git a/buildroot/package/x11r7/xlib_libXt/xlib_libXt.hash b/buildroot/package/x11r7/xlib_libXt/xlib_libXt.hash index 751c37098..7f457fb9b 100644 --- a/buildroot/package/x11r7/xlib_libXt/xlib_libXt.hash +++ b/buildroot/package/x11r7/xlib_libXt/xlib_libXt.hash @@ -1,2 +1,8 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002594.html -sha256 46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a libXt-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg/2019-June/059825.html +md5 a9019421d3ee8b4937b6afd9025f018a libXt-1.2.0.tar.bz2 +sha1 f6b5ed799bc2e8d721e5407a09c2a8f570963f1b libXt-1.2.0.tar.bz2 +sha256 b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831 libXt-1.2.0.tar.bz2 +sha512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1 libXt-1.2.0.tar.bz2 + +# Locally calculated +sha256 a2866ccc0b1745149e4a2258d934314d40cbb43bd8318c6fa597f233995b0a81 COPYING diff --git a/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk b/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk index 946fd517a..01251c091 100644 --- a/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk +++ b/buildroot/package/x11r7/xlib_libXt/xlib_libXt.mk @@ -4,14 +4,13 @@ # ################################################################################ -XLIB_LIBXT_VERSION = 1.1.5 +XLIB_LIBXT_VERSION = 1.2.0 XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXT_LICENSE = MIT XLIB_LIBXT_LICENSE_FILES = COPYING XLIB_LIBXT_INSTALL_STAGING = YES XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xorgproto xcb-proto libxcb host-xorgproto -XLIB_LIBXT_CONF_OPTS = --disable-malloc0returnsnull --disable-install-makestrs -XLIB_LIBXT_AUTORECONF = YES +XLIB_LIBXT_CONF_OPTS = --disable-malloc0returnsnull $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xlib_libXtst/xlib_libXtst.hash b/buildroot/package/x11r7/xlib_libXtst/xlib_libXtst.hash index 7e55a75e2..f64a01856 100644 --- a/buildroot/package/x11r7/xlib_libXtst/xlib_libXtst.hash +++ b/buildroot/package/x11r7/xlib_libXtst/xlib_libXtst.hash @@ -1,2 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2016-October/002726.html -sha256 4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204 libXtst-1.2.3.tar.bz2 +sha256 4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204 libXtst-1.2.3.tar.bz2 +# Locally computed +sha256 940190489c7a0e5ae3d83fc4fcbd79e0cd1b765bf1a4efd408293c1ee0332ceb COPYING diff --git a/buildroot/package/x11r7/xlib_libXv/xlib_libXv.hash b/buildroot/package/x11r7/xlib_libXv/xlib_libXv.hash index 4cb26eac7..ccc672701 100644 --- a/buildroot/package/x11r7/xlib_libXv/xlib_libXv.hash +++ b/buildroot/package/x11r7/xlib_libXv/xlib_libXv.hash @@ -1,2 +1,5 @@ # From https://lists.x.org/archives/xorg-announce/2016-October/002727.html sha256 d26c13eac99ac4504c532e8e76a1c8e4bd526471eb8a0a4ff2a88db60cb0b088 libXv-1.0.11.tar.bz2 + +# Locally calculated +sha256 4fac4d581d00f11c459d68b7cb970f3d4e5a5bbfb53784d85f59a90076280301 COPYING diff --git a/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash b/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash index 380c81198..be4ba751a 100644 --- a/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash +++ b/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash @@ -1,2 +1,8 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002728.html -sha256 e501a079b5dfaef0897c56152770c77e05e362065cec58910289aa567277ee2e libXvMC-1.0.10.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-September/003023.html +md5 3569ff7f3e26864d986d6a21147eaa58 libXvMC-1.0.12.tar.bz2 +sha1 4871f92a83faa86aff5c630a2d6016c67bf11b97 libXvMC-1.0.12.tar.bz2 +sha256 6b3da7977b3f7eaf4f0ac6470ab1e562298d82c4e79077765787963ab7966dcd libXvMC-1.0.12.tar.bz2 +sha512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955 libXvMC-1.0.12.tar.bz2 + +# Locally computed +sha256 b7c709df281675a07eb60a71c5fa2599d1ef538eb79ae7ad6e774b10e4a804c4 COPYING diff --git a/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk index c970182fe..02959c230 100644 --- a/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk +++ b/buildroot/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXVMC_VERSION = 1.0.10 +XLIB_LIBXVMC_VERSION = 1.0.12 XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2 XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXVMC_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash b/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash index 29560b7e8..f0172c346 100644 --- a/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash +++ b/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002235.html -sha256 8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e libXxf86dga-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002982.html +md5 0ddeafc13b33086357cfa96fae41ee8e libXxf86dga-1.1.5.tar.bz2 +sha1 332ba80d1b3d06473f7bbfe1612e7c5b58fbdf69 libXxf86dga-1.1.5.tar.bz2 +sha256 2b98bc5f506c6140d4eddd3990842d30f5dae733b64f198a504f07461bdb7203 libXxf86dga-1.1.5.tar.bz2 +sha512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89 libXxf86dga-1.1.5.tar.bz2 +# Locally computed +sha256 dd27933ebc5c063128b158b085e4c442a36b0e6f704cf753116da119610191da COPYING diff --git a/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk index 59ebd2b41..62fe06c1a 100644 --- a/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk +++ b/buildroot/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXXF86DGA_VERSION = 1.1.4 +XLIB_LIBXXF86DGA_VERSION = 1.1.5 XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2 XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXXF86DGA_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash b/buildroot/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash index cece6b56d..b55c55c84 100644 --- a/buildroot/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash +++ b/buildroot/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash @@ -1,3 +1,6 @@ # From http://lists.x.org/archives/xorg-announce/2015-February/002539.html sha1 78ef18ca2be157131899e01c62679e247409a13f libXxf86vm-1.1.4.tar.bz2 sha256 afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57 libXxf86vm-1.1.4.tar.bz2 + +# Locally calculated +sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash b/buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash index 251a1d686..de05fd27d 100644 --- a/buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash +++ b/buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002589.html -sha256 70588930e6fc9542ff38e0884778fbc6e6febf21adbab92fd8f524fe60aefd21 libfontenc-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002956.html +md5 6447db6a689fb530c218f0f8328c3abc libfontenc-1.1.4.tar.bz2 +sha1 d4f232b0b07487b984e13422ce4130b61a8b9edb libfontenc-1.1.4.tar.bz2 +sha256 2cfcce810ddd48f2e5dc658d28c1808e86dcf303eaff16728b9aa3dbc0092079 libfontenc-1.1.4.tar.bz2 +sha512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582 libfontenc-1.1.4.tar.bz2 +# Locally computed +sha256 a4dda7a643b517794bfa23dc9605da030055df38ac8a5b9e1905e690975a59c4 COPYING diff --git a/buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk index cb84ae4ee..a55b90d68 100644 --- a/buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk +++ b/buildroot/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBFONTENC_VERSION = 1.1.3 +XLIB_LIBFONTENC_VERSION = 1.1.4 XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2 XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBFONTENC_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash b/buildroot/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash index 759b2aef8..03e61bdc5 100644 --- a/buildroot/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash +++ b/buildroot/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002592.html -sha256 51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a libxkbfile-1.0.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002977.html +md5 dd7e1e946def674e78c0efbc5c7d5b3b libxkbfile-1.1.0.tar.bz2 +sha1 487f314b6dbc17e93d0fe1e3741392156a9ca895 libxkbfile-1.1.0.tar.bz2 +sha256 758dbdaa20add2db4902df0b1b7c936564b7376c02a0acd1f2a331bd334b38c7 libxkbfile-1.1.0.tar.bz2 +sha512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826 libxkbfile-1.1.0.tar.bz2 +# Locally computed +sha256 e1b3fdad8037ab3f986ef9caaa7c8da47d8d55875e680c7d6011f6c07363ea7c COPYING diff --git a/buildroot/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/buildroot/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk index 97755fae8..6b6849665 100644 --- a/buildroot/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk +++ b/buildroot/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXKBFILE_VERSION = 1.0.9 +XLIB_LIBXKBFILE_VERSION = 1.1.0 XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2 XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXKBFILE_LICENSE = MIT diff --git a/buildroot/package/x11r7/xlib_xtrans/xlib_xtrans.hash b/buildroot/package/x11r7/xlib_xtrans/xlib_xtrans.hash index 26c69a0c8..4e212c0f9 100644 --- a/buildroot/package/x11r7/xlib_xtrans/xlib_xtrans.hash +++ b/buildroot/package/x11r7/xlib_xtrans/xlib_xtrans.hash @@ -1,3 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2014-September/002481.html -sha1 2d3ae1839d841f568bc481c6116af7d2a9f9ba59 xtrans-1.3.5.tar.bz2 -sha256 adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301 xtrans-1.3.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002980.html +md5 ce2fb8100c6647ee81451ebe388b17ad xtrans-1.4.0.tar.bz2 +sha1 7c490026efb450798e02b040c05eba5212291c08 xtrans-1.4.0.tar.bz2 +sha256 377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773 xtrans-1.4.0.tar.bz2 +sha512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214 xtrans-1.4.0.tar.bz2 +# Locally computed +sha256 a9c96c832e00774266b492d4d41556f12a64f039ba3ef645c4b8c6010fcb8f2a COPYING diff --git a/buildroot/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/buildroot/package/x11r7/xlib_xtrans/xlib_xtrans.mk index 40f613cc3..88c9b57a5 100644 --- a/buildroot/package/x11r7/xlib_xtrans/xlib_xtrans.mk +++ b/buildroot/package/x11r7/xlib_xtrans/xlib_xtrans.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_XTRANS_VERSION = 1.3.5 +XLIB_XTRANS_VERSION = 1.4.0 XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2 XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_XTRANS_LICENSE = MIT diff --git a/buildroot/package/x11r7/xorgproto/xorgproto.hash b/buildroot/package/x11r7/xorgproto/xorgproto.hash index c4e779575..17613db00 100644 --- a/buildroot/package/x11r7/xorgproto/xorgproto.hash +++ b/buildroot/package/x11r7/xorgproto/xorgproto.hash @@ -1,8 +1,8 @@ -# From https://lists.x.org/archives/xorg-announce/2018-February/002841.html -md5 81557ca47ee66a4e54590fcdadd28114 xorgproto-2018.4.tar.bz2 -sha1 2e4a3db312e1ce81e15515dfcac52ba0aa5a920c xorgproto-2018.4.tar.bz2 -sha256 fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0 xorgproto-2018.4.tar.bz2 -sha512 2db682d10280ca58cdc04d8eb9fef30c111d4cd379de9fec86cff317865b859a576de5426447be9231d24be9762cc1d684c57383a99ad499398e8b7d62b1c03c xorgproto-2018.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-October/003029.html +md5 a02dcaff48b4141b949ac99dfc344d86 xorgproto-2019.2.tar.bz2 +sha1 2dedbe3e4daccf0c3d675759ed82161a3e4cf1b5 xorgproto-2019.2.tar.bz2 +sha256 46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e xorgproto-2019.2.tar.bz2 +sha512 cbfdf6bb3d58d4d4e7788c9ed779402352715e9899f65594fbc527b3178f1dc5e03cebc8ba5a863b3c196a1a0f2026c2d0438207ca19f81f3c8b7da0c0667904 xorgproto-2019.2.tar.bz2 # Locally computed sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto sha256 dabc025f93129a0eb2d17f37c719dbe5ecbcb5bc8f7bc7f4ce89fe04576cc0c2 COPYING-bigreqsproto @@ -19,7 +19,6 @@ sha256 823deb4673d3f26aa8c90e704888299648f00be3262f9363eaeecedcd65b936d COPYING sha256 5e083a2ace0215a6084c877c023a6079952ba803d692488203ba4269196debe3 COPYING-inputproto sha256 d397a67d4b28e897bc5fce79b2b917df9905b54f961fc3ad1f49c7fe3803f92c COPYING-kbproto sha256 7a5dd5d4c989c167da50f15879959f42bbda960e06d0a0aea7197f61fe1dc846 COPYING-lg3dproto -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING-panoramixproto sha256 8442b5f22f2fb13017a4302a906e7dedc899267b41f613558970941120170128 COPYING-pmproto sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-presentproto sha256 6b890b118261694865988378dbba876bcd9caa1a421c5c0d626116948bc0ae35 COPYING-printproto diff --git a/buildroot/package/x11r7/xorgproto/xorgproto.mk b/buildroot/package/x11r7/xorgproto/xorgproto.mk index 3f7d25b06..979286b3c 100644 --- a/buildroot/package/x11r7/xorgproto/xorgproto.mk +++ b/buildroot/package/x11r7/xorgproto/xorgproto.mk @@ -4,9 +4,9 @@ # ################################################################################ -XORGPROTO_VERSION = 2018.4 +XORGPROTO_VERSION = 2019.2 XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.bz2 -XORGPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto +XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XORGPROTO_LICENSE = MIT XORGPROTO_LICENSE_FILES = \ COPYING-applewmproto \ @@ -24,7 +24,6 @@ XORGPROTO_LICENSE_FILES = \ COPYING-inputproto \ COPYING-kbproto \ COPYING-lg3dproto \ - COPYING-panoramixproto \ COPYING-pmproto \ COPYING-presentproto \ COPYING-printproto \ @@ -48,6 +47,8 @@ XORGPROTO_LICENSE_FILES = \ COPYING-xineramaproto XORGPROTO_INSTALL_STAGING = YES XORGPROTO_INSTALL_TARGET = NO +# xproxymngproto is needed by xfindproxy +XORGPROTO_CONF_OPTS += --enable-legacy $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.6/0001-modesettings-needs-dri2.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.8/0001-modesettings-needs-dri2.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/1.20.6/0001-modesettings-needs-dri2.patch rename to buildroot/package/x11r7/xserver_xorg-server/1.20.8/0001-modesettings-needs-dri2.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.6/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.8/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/1.20.6/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch rename to buildroot/package/x11r7/xserver_xorg-server/1.20.8/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.6/0003-Remove-check-for-useSIGIO-option.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.8/0003-Remove-check-for-useSIGIO-option.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/1.20.6/0003-Remove-check-for-useSIGIO-option.patch rename to buildroot/package/x11r7/xserver_xorg-server/1.20.8/0003-Remove-check-for-useSIGIO-option.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.6/0004-include-misc.h-fix-uClibc-build.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.8/0004-include-misc.h-fix-uClibc-build.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/1.20.6/0004-include-misc.h-fix-uClibc-build.patch rename to buildroot/package/x11r7/xserver_xorg-server/1.20.8/0004-include-misc.h-fix-uClibc-build.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.6/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.8/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/1.20.6/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch rename to buildroot/package/x11r7/xserver_xorg-server/1.20.8/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/1.20.6/0006-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch b/buildroot/package/x11r7/xserver_xorg-server/1.20.8/0006-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch similarity index 100% rename from buildroot/package/x11r7/xserver_xorg-server/1.20.6/0006-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch rename to buildroot/package/x11r7/xserver_xorg-server/1.20.8/0006-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch diff --git a/buildroot/package/x11r7/xserver_xorg-server/Config.in b/buildroot/package/x11r7/xserver_xorg-server/Config.in index 982b9bcb4..79968ea97 100644 --- a/buildroot/package/x11r7/xserver_xorg-server/Config.in +++ b/buildroot/package/x11r7/xserver_xorg-server/Config.in @@ -61,7 +61,7 @@ choice bool "X Window System server version" config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 - bool "1.20.6" + bool "1.20.8" select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24 select BR2_PACKAGE_XLIB_LIBXFONT2 @@ -79,7 +79,7 @@ endchoice config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION string - default "1.20.6" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 + default "1.20.8" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 diff --git a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index cd1b56016..f7b1bc14b 100644 --- a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -3,11 +3,9 @@ sha1 7a95765e56b124758fcd7b609589e65b8870880b x sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 -# From https://lists.x.org/archives/xorg-announce/2019-November/003032.html -md5 a98170084f2c8fed480d2ff601f8a14b xorg-server-1.20.6.tar.bz2 -sha1 59473e72136113f3a35b1ab5a5cfcbcad955b660 xorg-server-1.20.6.tar.bz2 -sha256 6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1 xorg-server-1.20.6.tar.bz2 -sha512 9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6 xorg-server-1.20.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-March/003041.html +sha256 d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146 xorg-server-1.20.8.tar.bz2 +sha512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805 xorg-server-1.20.8.tar.bz2 # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index a33cb2507..8ccc04224 100644 --- a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -120,9 +120,9 @@ else # modular XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev endif -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx -XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d +XSERVER_XORG_SERVER_DEPENDENCIES += libgl else XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx endif diff --git a/buildroot/package/x11r7/xutil_makedepend/xutil_makedepend.hash b/buildroot/package/x11r7/xutil_makedepend/xutil_makedepend.hash index 596551155..179860616 100644 --- a/buildroot/package/x11r7/xutil_makedepend/xutil_makedepend.hash +++ b/buildroot/package/x11r7/xutil_makedepend/xutil_makedepend.hash @@ -1,2 +1,7 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/2007 -sha256 f7a80575f3724ac3d9b19eaeab802892ece7e4b0061dd6425b4b789353e25425 makedepend-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002985.html +md5 b2ca7f2f21f1c04a88b6a254c19c9b68 makedepend-1.0.6.tar.bz2 +sha1 3f321f7b570ec98f1fabc441267d29347a2e1456 makedepend-1.0.6.tar.bz2 +sha256 d558a52e8017d984ee59596a9582c8d699a1962391b632bec3bb6804bf4d501c makedepend-1.0.6.tar.bz2 +sha512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42 makedepend-1.0.6.tar.bz2 +# Locally computed +sha256 0530078db78c47ae978dc2bd77f4f427e6cd97df868672c95b1ef284113c8cb7 COPYING diff --git a/buildroot/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/buildroot/package/x11r7/xutil_makedepend/xutil_makedepend.mk index a50320ba9..18f8eb1f6 100644 --- a/buildroot/package/x11r7/xutil_makedepend/xutil_makedepend.mk +++ b/buildroot/package/x11r7/xutil_makedepend/xutil_makedepend.mk @@ -4,7 +4,7 @@ # ################################################################################ -XUTIL_MAKEDEPEND_VERSION = 1.0.5 +XUTIL_MAKEDEPEND_VERSION = 1.0.6 XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.bz2 XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util XUTIL_MAKEDEPEND_LICENSE = MIT diff --git a/buildroot/package/x264/x264.hash b/buildroot/package/x264/x264.hash index da4ff5945..0cbdc03a9 100644 --- a/buildroot/package/x264/x264.hash +++ b/buildroot/package/x264/x264.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 94a67986dcb2c659752df767e81fd59a494fb7fb5c9d4fc8aff4f004353a42df x264-snapshot-20181002-2245.tar.bz2 +sha256 88bbb8f7453497be4ee85cbc6f7d27c02822c4a3744b5ae6042c9c0159ad0747 x264-snapshot-20190623-2245.tar.bz2 sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/x264/x264.mk b/buildroot/package/x264/x264.mk index d529871a8..f3654d46b 100644 --- a/buildroot/package/x264/x264.mk +++ b/buildroot/package/x264/x264.mk @@ -4,7 +4,7 @@ # ################################################################################ -X264_VERSION = 20181002-2245 +X264_VERSION = 20190623-2245 X264_SITE = http://download.videolan.org/x264/snapshots X264_SOURCE = x264-snapshot-$(X264_VERSION).tar.bz2 X264_LICENSE = GPL-2.0+ diff --git a/buildroot/package/x265/0003-arm-asm-primitives.patch b/buildroot/package/x265/0002-arm-asm-primitives.patch similarity index 100% rename from buildroot/package/x265/0003-arm-asm-primitives.patch rename to buildroot/package/x265/0002-arm-asm-primitives.patch diff --git a/buildroot/package/x265/0002-fix-build-error-on-ppc64le.patch b/buildroot/package/x265/0002-fix-build-error-on-ppc64le.patch deleted file mode 100644 index ca034477e..000000000 --- a/buildroot/package/x265/0002-fix-build-error-on-ppc64le.patch +++ /dev/null @@ -1,23 +0,0 @@ -# HG changeset patch -# User Jayashree -# Date 1527224165 -19800 -# Node ID 4504219210793536d921ee4e0b3058698c630bf4 -# Parent cc2c5e46f3c87d27e3602af30b06ba6a0fbe2704 -Fix build error on on ppc64le - -Signed-off-by: Baruch Siach - -Upstream status: commit 450421921 - -diff --git a/source/common/param.cpp b/source/common/param.cpp ---- a/source/common/param.cpp -+++ b/source/common/param.cpp -@@ -633,7 +633,7 @@ - if (bValueWasNull) - p->cpuid = atobool(value); - else -- p->cpuid = parseCpuName(value, bError); -+ p->cpuid = parseCpuName(value, bError, false); - #endif - } - OPT("fps") diff --git a/buildroot/package/x265/x265.hash b/buildroot/package/x265/x265.hash index 61e618119..4e9524d13 100644 --- a/buildroot/package/x265/x265.hash +++ b/buildroot/package/x265/x265.hash @@ -1,3 +1,5 @@ +# From https://mailman.videolan.org/pipermail/x265-devel/2019-October/012721.html +md5 94808045a34d88a857e5eaf3f68f4bca x265_3.2.1.tar.gz # Locally generated -sha256 6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863 x265_2.8.tar.gz +sha256 fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc x265_3.2.1.tar.gz sha256 d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49 COPYING diff --git a/buildroot/package/x265/x265.mk b/buildroot/package/x265/x265.mk index fe317d09d..5082d0ca2 100644 --- a/buildroot/package/x265/x265.mk +++ b/buildroot/package/x265/x265.mk @@ -4,7 +4,7 @@ # ################################################################################ -X265_VERSION = 2.8 +X265_VERSION = 3.2.1 X265_SOURCE = x265_$(X265_VERSION).tar.gz X265_SITE = https://bitbucket.org/multicoreware/x265/downloads X265_LICENSE = GPL-2.0+ diff --git a/buildroot/package/xapian/xapian.hash b/buildroot/package/xapian/xapian.hash index 4e4140227..e4f8dfa23 100644 --- a/buildroot/package/xapian/xapian.hash +++ b/buildroot/package/xapian/xapian.hash @@ -1,3 +1,5 @@ +# From https://lists.xapian.org/pipermail/xapian-discuss/2019-November/009774.html +sha256 975a7ac018c9d34a15cc94a3ecc883204403469f748907e5c4c64d0aec2e4949 xapian-core-1.4.14.tar.xz + # locally computed -sha256 cde9c39d014f04c09b59d9c21551db9794c10617dc69ab4c9826352a533df5cc xapian-core-1.4.9.tar.xz sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/buildroot/package/xapian/xapian.mk b/buildroot/package/xapian/xapian.mk index df039d444..57aba5e03 100644 --- a/buildroot/package/xapian/xapian.mk +++ b/buildroot/package/xapian/xapian.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.9 +XAPIAN_VERSION = 1.4.14 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ diff --git a/buildroot/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch b/buildroot/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch new file mode 100644 index 000000000..e531f5892 --- /dev/null +++ b/buildroot/package/xdg-dbus-proxy/0001-Fix-musl-compilation-by-adding-TEMP_FAILURE_RETRY.patch @@ -0,0 +1,36 @@ +From 645c45f0334bb1d6e31b5927cece5e446f129cbb Mon Sep 17 00:00:00 2001 +From: Danilo Spinella +Date: Sat, 7 Dec 2019 00:05:21 +0100 +Subject: [PATCH] Fix musl compilation by adding TEMP_FAILURE_RETRY + +Fetch from: https://github.com/flatpak/xdg-dbus-proxy/pull/13 +Upstream-Status: Accepted +Signed-off-by: Adrian Perez de Castro + +--- + dbus-proxy.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/dbus-proxy.c b/dbus-proxy.c +index 163df21..4b07931 100644 +--- a/dbus-proxy.c ++++ b/dbus-proxy.c +@@ -30,6 +30,15 @@ + #include + + #include "flatpak-proxy.h" ++// Taken from glibc unistd.h ++#ifndef TEMP_FAILURE_RETRY ++# define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif + + static const char *argv0; + static GList *proxies; +-- +2.24.1 + diff --git a/buildroot/package/xdg-dbus-proxy/Config.in b/buildroot/package/xdg-dbus-proxy/Config.in new file mode 100644 index 000000000..94c144fad --- /dev/null +++ b/buildroot/package/xdg-dbus-proxy/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_XDG_DBUS_PROXY + bool "xdg-dbus-proxy" + depends on BR2_USE_WCHAR # libglib2 -> gettext + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_LIBGLIB2 + help + Filtering proxy for D-Bus connections. + + https://github.com/flatpak/xdg-dbus-proxy + +comment "xdg-dbus-proxy needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/xdg-dbus-proxy/xdg-dbus-proxy.hash b/buildroot/package/xdg-dbus-proxy/xdg-dbus-proxy.hash new file mode 100644 index 000000000..37bda7843 --- /dev/null +++ b/buildroot/package/xdg-dbus-proxy/xdg-dbus-proxy.hash @@ -0,0 +1,5 @@ +# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.2 +sha256 1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c1000c520f xdg-dbus-proxy-0.1.2.tar.xz + +# Hash for license files: +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/xdg-dbus-proxy/xdg-dbus-proxy.mk b/buildroot/package/xdg-dbus-proxy/xdg-dbus-proxy.mk new file mode 100644 index 000000000..1b056c36f --- /dev/null +++ b/buildroot/package/xdg-dbus-proxy/xdg-dbus-proxy.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# bubblewrap +# +################################################################################ + +XDG_DBUS_PROXY_VERSION = 0.1.2 +XDG_DBUS_PROXY_SITE = https://github.com/flatpak/xdg-dbus-proxy/releases/download/$(XDG_DBUS_PROXY_VERSION) +XDG_DBUS_PROXY_SOURCE = xdg-dbus-proxy-$(XDG_DBUS_PROXY_VERSION).tar.xz +XDG_DBUS_PROXY_DEPENDENCIES = host-pkgconf libglib2 + +XDG_DBUS_PROXY_LICENSE = LGPL-2.1+ +XDG_DBUS_PROXY_LICENSE_FILES = COPYING + +XDG_DBUS_PROXY_CONF_OPTS = --disable-man + +$(eval $(autotools-package)) diff --git a/buildroot/package/xdotool/xdotool.hash b/buildroot/package/xdotool/xdotool.hash index f8adcd595..b0d5a7582 100644 --- a/buildroot/package/xdotool/xdotool.hash +++ b/buildroot/package/xdotool/xdotool.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 b097ef0e3897d1a24e3f45f0faed58329742d3d9434b9b46eb97eb1040f999bf xdotool-v3.20150503.1.tar.gz +sha256 ddafca1239075c203769c17a5a184587731e56fbe0438c09d08f8af1704e117a xdotool-3.20160805.1.tar.gz +sha256 129d156c35b1cb19350f3716129173c8c89e019c0497d9df073db5b801becef2 COPYRIGHT diff --git a/buildroot/package/xdotool/xdotool.mk b/buildroot/package/xdotool/xdotool.mk index c18885c50..5c5603bd6 100644 --- a/buildroot/package/xdotool/xdotool.mk +++ b/buildroot/package/xdotool/xdotool.mk @@ -4,8 +4,8 @@ # ################################################################################ -XDOTOOL_VERSION = v3.20150503.1 -XDOTOOL_SITE = $(call github,jordansissel,xdotool,$(XDOTOOL_VERSION)) +XDOTOOL_VERSION = 3.20160805.1 +XDOTOOL_SITE = $(call github,jordansissel,xdotool,v$(XDOTOOL_VERSION)) XDOTOOL_LICENSE = BSD-3-Clause XDOTOOL_LICENSE_FILES = COPYRIGHT XDOTOOL_DEPENDENCIES = xlib_libXtst xlib_libXinerama libxkbcommon xlib_libX11 diff --git a/buildroot/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch b/buildroot/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch index 0d4e581af..fb316739b 100644 --- a/buildroot/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch +++ b/buildroot/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch @@ -1,4 +1,4 @@ -From 2a310549aaeaba05f640ade43488bb893101ce4a Mon Sep 17 00:00:00 2001 +From 8aea14bbd20b04b8fffaf35138ebdcbd39e433a3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 29 Oct 2016 16:35:26 +0200 Subject: [PATCH] xen/Rules.mk: fix build with CFLAGS from environment @@ -19,18 +19,18 @@ Signed-off-by: "Yann E. MORIN" 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Rules.mk b/xen/Rules.mk -index a9fda71..09ccbfa 100644 +index 3090ea7828..d535bf9e2f 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk -@@ -49,7 +49,7 @@ ALL_OBJS-$(CONFIG_CRYPTO) += $(BASEDIR)/crypto/built_in.o - CFLAGS += -nostdinc -fno-builtin -fno-common - CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith - CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h +@@ -61,7 +61,7 @@ CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith + $(call cc-option-add,CFLAGS,CC,-Wvla) + CFLAGS += -pipe -D__XEN__ -include $(BASEDIR)/include/xen/config.h + CFLAGS-$(CONFIG_DEBUG_INFO) += -g -CFLAGS += '-D__OBJECT_FILE__="$@"' +CFLAGS += -U__OBJECT_FILE__ '-D__OBJECT_FILE__="$@"' ifneq ($(clang),y) # Clang doesn't understand this command line argument, and doesn't appear to -- -2.7.4 +2.22.0 diff --git a/buildroot/package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch b/buildroot/package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch deleted file mode 100644 index db2bbe836..000000000 --- a/buildroot/package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c8993743d611ed23ebded3168ac3ac6ff3e5d2fa Mon Sep 17 00:00:00 2001 -From: Christopher Clark -Date: Thu, 16 Aug 2018 13:22:41 -0700 -Subject: [PATCH] libxl/arm: Fix build on arm64 + acpi w/ gcc 8.2 - -Add zero-padding to #defined ACPI table strings that are copied. -Provides sufficient characters to satisfy the length required to -fully populate the destination and prevent array-bounds warnings. -Add BUILD_BUG_ON sizeof checks for compile-time length checking. - -Signed-off-by: Christopher Clark -Reviewed-by: Stefano Stabellini -Acked-by: Wei Liu ---- - tools/libxl/libxl_arm_acpi.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c -index 636f724039..eeca1def06 100644 ---- a/tools/libxl/libxl_arm_acpi.c -+++ b/tools/libxl/libxl_arm_acpi.c -@@ -48,9 +48,9 @@ extern const unsigned char dsdt_anycpu_arm[]; - _hidden - extern const int dsdt_anycpu_arm_len; - --#define ACPI_OEM_ID "Xen" --#define ACPI_OEM_TABLE_ID "ARM" --#define ACPI_ASL_COMPILER_ID "XL" -+#define ACPI_OEM_ID "Xen\0\0" -+#define ACPI_OEM_TABLE_ID "ARM\0\0\0\0" -+#define ACPI_ASL_COMPILER_ID "XL\0" - - enum { - RSDP, --- -2.17.1 - diff --git a/buildroot/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch b/buildroot/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch deleted file mode 100644 index 9c51c554c..000000000 --- a/buildroot/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch +++ /dev/null @@ -1,79 +0,0 @@ -From e75c9dc85fdeeeda0b98d8cd8d784e0508c3ffb8 Mon Sep 17 00:00:00 2001 -From: Wei Liu -Date: Thu, 26 Jul 2018 15:58:54 +0100 -Subject: [PATCH] xenpmd: make 32 bit gcc 8.1 non-debug build work - -32 bit gcc 8.1 non-debug build yields: - -xenpmd.c:354:23: error: '%02x' directive output may be truncated writing between 2 and 8 bytes into a region of size 3 [-Werror=format-truncation=] - snprintf(val, 3, "%02x", - ^~~~ -xenpmd.c:354:22: note: directive argument in the range [40, 2147483778] - snprintf(val, 3, "%02x", - ^~~~~~ -xenpmd.c:354:5: note: 'snprintf' output between 3 and 9 bytes into a destination of size 3 - snprintf(val, 3, "%02x", - ^~~~~~~~~~~~~~~~~~~~~~~~ - (unsigned int)(9*4 + - ~~~~~~~~~~~~~~~~~~~~ - strlen(info->model_number) + - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - strlen(info->serial_number) + - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - strlen(info->battery_type) + - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - strlen(info->oem_info) + 4)); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -All info->* used in calculation are 32 bytes long, and the parsing -code makes sure they are null-terminated, so the end result of the -expression won't exceed 255, which should be able to be fit into 3 -bytes in hexadecimal format. - -Add an assertion to make gcc happy. - -Signed-off-by: Wei Liu -Acked-by: Ian Jackson -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/xen-project/xen/commit/e75c9dc85fdeeeda0b98d8cd8d784e0508c3ffb8] ---- - tools/xenpmd/xenpmd.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c -index 56412a9a81c..1c801caa712 100644 ---- a/tools/xenpmd/xenpmd.c -+++ b/tools/xenpmd/xenpmd.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - /* #define RUN_STANDALONE */ - #define RUN_IN_SIMULATE_MODE -@@ -345,18 +346,17 @@ void write_ulong_lsb_first(char *temp_val, unsigned long val) - void write_battery_info_to_xenstore(struct battery_info *info) - { - char val[1024], string_info[256]; -+ unsigned int len; - - xs_mkdir(xs, XBT_NULL, "/pm"); - - memset(val, 0, 1024); - memset(string_info, 0, 256); - /* write 9 dwords (so 9*4) + length of 4 strings + 4 null terminators */ -- snprintf(val, 3, "%02x", -- (unsigned int)(9*4 + -- strlen(info->model_number) + -- strlen(info->serial_number) + -- strlen(info->battery_type) + -- strlen(info->oem_info) + 4)); -+ len = 9 * 4 + strlen(info->model_number) + strlen(info->serial_number) + -+ strlen(info->battery_type) + strlen(info->oem_info) + 4; -+ assert(len < 255); -+ snprintf(val, 3, "%02x", len); - write_ulong_lsb_first(val+2, info->present); - write_ulong_lsb_first(val+10, info->design_capacity); - write_ulong_lsb_first(val+18, info->last_full_capacity); diff --git a/buildroot/package/xen/xen.hash b/buildroot/package/xen/xen.hash index d4232f592..422492465 100644 --- a/buildroot/package/xen/xen.hash +++ b/buildroot/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f9217f5a7cc240a06f3a03db8c29605d69a64d98330c426611ba5c2ee08b5d8 xen-4.11.2.tar.gz -sha256 dba0d79260259c013c52e5d4daeaea564a2fbb9ff7fc6778c377a401ec3898de COPYING +sha256 c69ae21b2ddeaf25532a81a448fcc6a218bc56f93c8907b2d416b2d4339c0afe xen-4.13.0.tar.gz +sha256 36b91794c6d4a678137c70c41e384c03b552c7efba82c0d73e6be842e41ab3d3 COPYING diff --git a/buildroot/package/xen/xen.mk b/buildroot/package/xen/xen.mk index bd8a39f63..fa49f5996 100644 --- a/buildroot/package/xen/xen.mk +++ b/buildroot/package/xen/xen.mk @@ -4,11 +4,11 @@ # ################################################################################ -XEN_VERSION = 4.11.2 +XEN_VERSION = 4.13.0 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING -XEN_DEPENDENCIES = host-acpica host-python +XEN_DEPENDENCIES = host-acpica host-python3 # Calculate XEN_ARCH ifeq ($(ARCH),aarch64) @@ -21,11 +21,12 @@ XEN_CONF_OPTS = \ --disable-ocamltools \ --with-initddir=/etc/init.d -XEN_CONF_ENV = PYTHON=$(HOST_DIR)/bin/python2 +XEN_CONF_ENV = PYTHON=$(HOST_DIR)/bin/python3 XEN_MAKE_ENV = \ XEN_TARGET_ARCH=$(XEN_ARCH) \ CROSS_COMPILE=$(TARGET_CROSS) \ HOST_EXTRACFLAGS="-Wno-error" \ + XEN_HAS_CHECKPOLICY=n \ $(TARGET_CONFIGURE_OPTS) ifeq ($(BR2_PACKAGE_XEN_HYPERVISOR),y) diff --git a/buildroot/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch b/buildroot/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch deleted file mode 100644 index f91a31daa..000000000 --- a/buildroot/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch +++ /dev/null @@ -1,91 +0,0 @@ -From cdc63fe259c70a8a5304aa07087650ebf4ee6b5d Mon Sep 17 00:00:00 2001 -From: Philippe Gerum -Date: Wed, 24 Oct 2018 11:28:49 +0200 -Subject: [PATCH] demos/posix: prevent unterminated destination buffer with - strncpy() - -GCC 8.x introduced -Wstringop-truncation to help detecting likely -unwanted outcomes of strncpy(dst, src, n), such as omitting the NUL -character into the destination buffer whenever n < sizeof(src). - -Fix unsafe strncpy() calls when we do expect a null-terminated -destination buffer. - -Signed-off-by: Philippe Gerum -[Retrieved from -https://gitlab.denx.de/Xenomai/xenomai/commit/cdc63fe259c70a8a5304aa07087650ebf4ee6b5d] -Signed-off-by: Fabrice Fontaine ---- - demo/posix/cobalt/can-rtt.c | 4 ++-- - demo/posix/cobalt/eth_p_all.c | 3 ++- - demo/posix/cyclictest/cyclictest.c | 4 ++-- - 3 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/demo/posix/cobalt/can-rtt.c b/demo/posix/cobalt/can-rtt.c -index 61cad05e5..dd212d804 100644 ---- a/demo/posix/cobalt/can-rtt.c -+++ b/demo/posix/cobalt/can-rtt.c -@@ -248,7 +248,7 @@ int main(int argc, char *argv[]) - return -1; - } - -- strncpy(ifr.ifr_name, rxdev, IFNAMSIZ); -+ namecpy(ifr.ifr_name, rxdev); - printf("RX rxsock=%d, ifr_name=%s\n", rxsock, ifr.ifr_name); - - if (ioctl(rxsock, SIOCGIFINDEX, &ifr) < 0) { -@@ -282,7 +282,7 @@ int main(int argc, char *argv[]) - goto failure1; - } - -- strncpy(ifr.ifr_name, txdev, IFNAMSIZ); -+ namecpy(ifr.ifr_name, txdev); - printf("TX txsock=%d, ifr_name=%s\n", txsock, ifr.ifr_name); - - if (ioctl(txsock, SIOCGIFINDEX, &ifr) < 0) { -diff --git a/demo/posix/cobalt/eth_p_all.c b/demo/posix/cobalt/eth_p_all.c -index 6ac12ab3e..91aef9fbd 100644 ---- a/demo/posix/cobalt/eth_p_all.c -+++ b/demo/posix/cobalt/eth_p_all.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - char buffer[10*1024]; - int sock; -@@ -72,7 +73,7 @@ int main(int argc, char *argv[]) - if (argc > 1) { - struct ifreq ifr; - -- strncpy(ifr.ifr_name, argv[1], IFNAMSIZ); -+ namecpy(ifr.ifr_name, argv[1]); - if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0) { - perror("cannot get interface index"); - close(sock); -diff --git a/demo/posix/cyclictest/cyclictest.c b/demo/posix/cyclictest/cyclictest.c -index ebe5461db..76983bd02 100644 ---- a/demo/posix/cyclictest/cyclictest.c -+++ b/demo/posix/cyclictest/cyclictest.c -@@ -1353,7 +1353,7 @@ static void process_options (int argc, char *argv[], int max_cpus) - case 'F': - case OPT_FIFO: - use_fifo = 1; -- strncpy(fifopath, optarg, strlen(optarg)); -+ strncpy(fifopath, optarg, sizeof(fifopath) - 1); - break; - - case 'H': -@@ -1458,7 +1458,7 @@ static void process_options (int argc, char *argv[], int max_cpus) - case 'T': - case OPT_TRACER: - tracetype = CUSTOM; -- strncpy(tracer, optarg, sizeof(tracer)); -+ strncpy(tracer, optarg, sizeof(tracer) - 1); - break; - case 'u': - case OPT_UNBUFFERED: --- -2.18.1 - diff --git a/buildroot/package/xenomai/Config.in b/buildroot/package/xenomai/Config.in index 83ba8ca16..0cb0b343d 100644 --- a/buildroot/package/xenomai/Config.in +++ b/buildroot/package/xenomai/Config.in @@ -170,11 +170,6 @@ config BR2_PACKAGE_XENOMAI_RTAI_SKIN help This option allows to install the RTAI Xenomai skin -config BR2_PACKAGE_XENOMAI_SMOKEY_SKIN - bool "Smokey skin" - help - This option allows to install the Smokey Xenomai skin - config BR2_PACKAGE_XENOMAI_UITRON_SKIN bool "uITRON skin" help diff --git a/buildroot/package/xenomai/xenomai.hash b/buildroot/package/xenomai/xenomai.hash index c36badb6b..7a07f0615 100644 --- a/buildroot/package/xenomai/xenomai.hash +++ b/buildroot/package/xenomai/xenomai.hash @@ -1,2 +1,17 @@ # Locally computed; -sha256 2c0dd3f0e36e4a10f97e0028989bb873e80f4d1ce212ac55fd3b28857c464f94 xenomai-3.0.6.tar.bz2 +sha256 080f893d6ab8e3065285fbb482695477a0502b9490dccd1f744cebaac94691e5 xenomai-3.0.10.tar.bz2 +sha256 d37ebe86bf618942dad958927c44403f9b02fbebb3071a4a08408ccbdab5290f debian/copyright +sha256 f3380321da72ff509bf6939aa80e6d02fd22268f5c705137b34c205b39bc63a0 include/COPYING +sha256 d6b6d8ed1b12309085caf1cf775ea4acdad3288c7f7d993c2502bd19c87e4764 kernel/cobalt/COPYING +sha256 d6b6d8ed1b12309085caf1cf775ea4acdad3288c7f7d993c2502bd19c87e4764 kernel/cobalt/posix/COPYING +sha256 9c90501baa30534ffed6b39eef413bd1727170ef691fd9768dc8644c3042df54 kernel/cobalt/rtdm/COPYING +sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/alchemy/COPYING +sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/analogy/COPYING +sha256 0519083691511d71408f8c9a2794fa2f6ad13a5eec00717f4572b54d18d6f9da lib/boilerplate/iniparser/LICENSE +sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/boilerplate/COPYING +sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/cobalt/COPYING +sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/copperplate/COPYING +sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/psos/COPYING +sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/smokey/COPYING +sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/trank/COPYING +sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 lib/vxworks/COPYING diff --git a/buildroot/package/xenomai/xenomai.mk b/buildroot/package/xenomai/xenomai.mk index 98f550af6..5f389ac85 100644 --- a/buildroot/package/xenomai/xenomai.mk +++ b/buildroot/package/xenomai/xenomai.mk @@ -6,7 +6,7 @@ XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION)) ifeq ($(XENOMAI_VERSION),) -XENOMAI_VERSION = 3.0.6 +XENOMAI_VERSION = 3.0.10 else BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) endif @@ -62,6 +62,9 @@ define XENOMAI_REMOVE_UNNEEDED_FILES for i in xeno xeno-config xeno-info wrap-link.sh ; do \ rm -f $(TARGET_DIR)/usr/bin/$$i ; \ done + for i in cobalt modechk ; do \ + rm -f $(TARGET_DIR)/usr/lib/$$i.wrappers ; \ + done for i in autotune corectl hdb rtnet nomaccfg rtcfg rtifconfig \ rtiwconfig rtping rtroute tdmacfg rtps slackspot version; do \ rm -f $(TARGET_DIR)/usr/sbin/$$i ; \ @@ -73,7 +76,7 @@ XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UNNEEDED_FILES ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),) define XENOMAI_REMOVE_TESTSUITE rm -rf $(TARGET_DIR)/usr/share/xenomai/ - for i in clocktest gpiotest latency spitest switchtest \ + for i in clocktest gpiotest latency smokey spitest switchtest \ xeno-test-run-wrapper dohell xeno-test-run xeno-test ; do \ rm -f $(TARGET_DIR)/usr/bin/$$i ; \ done @@ -109,28 +112,22 @@ endef XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_ANALOGY endif -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,alchemy) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_POSIX_SKIN),,posix) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_PSOS_SKIN),,psos) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_RTAI_SKIN),,rtai) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_SMOKEY_SKIN),,smokey) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_UITRON_SKIN),,uitron) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,alchemy) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_POSIX_SKIN),,posix) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_PSOS_SKIN),,psos) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_RTAI_SKIN),,rtai) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_TESTSUITE),,smokey) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_UITRON_SKIN),,uitron) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks) +XENOMAI_REMOVE_LIBS_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx) -define XENOMAI_REMOVE_SKINS - for i in $(XENOMAI_REMOVE_SKIN_LIST) ; do \ +define XENOMAI_REMOVE_LIBS + for i in $(XENOMAI_REMOVE_LIBS_LIST) ; do \ rm -f $(TARGET_DIR)/usr/lib/lib$$i.* ; \ - if [ $$i == "posix" ] ; then \ - rm -f $(TARGET_DIR)/usr/lib/posix.wrappers ; \ - fi ; \ - if [ $$i == "smokey" ] ; then \ - rm -f $(TARGET_DIR)/usr/bin/smokey* ; \ - fi ; \ done endef -XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_SKINS +XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_LIBS define XENOMAI_DEVICES /dev/rtheap c 666 0 0 10 254 0 0 - diff --git a/buildroot/package/xfsprogs/xfsprogs.hash b/buildroot/package/xfsprogs/xfsprogs.hash index 839f4add2..629d6fcf9 100644 --- a/buildroot/package/xfsprogs/xfsprogs.hash +++ b/buildroot/package/xfsprogs/xfsprogs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 397dc96f51aeeff73d021d3418d3172377b2685f2740ca60525096c070aa3df1 xfsprogs-4.18.0.tar.xz +sha256 7b500e148cebd08f99e37cf744c7843817b37e7be2a32c4dc57d6ea16e3019ae xfsprogs-5.2.1.tar.xz # Hash for license files sha256 7ae50a5344af14d6231aff6814632a220b3127da4099aea2c6070fd79c407c1a LICENSES/GPL-2.0 diff --git a/buildroot/package/xfsprogs/xfsprogs.mk b/buildroot/package/xfsprogs/xfsprogs.mk index bbb888707..43c921aa1 100644 --- a/buildroot/package/xfsprogs/xfsprogs.mk +++ b/buildroot/package/xfsprogs/xfsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFSPROGS_VERSION = 4.18.0 +XFSPROGS_VERSION = 5.2.1 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) diff --git a/buildroot/package/xinetd/xinetd.hash b/buildroot/package/xinetd/xinetd.hash index 051436613..1b7ee09b0 100644 --- a/buildroot/package/xinetd/xinetd.hash +++ b/buildroot/package/xinetd/xinetd.hash @@ -1,2 +1,3 @@ # locally computed -sha256 620b25f4ab4d72fdf32b13797156ea40df2049f1c07e640177e5fec544e9a94c xinetd-xinetd-2-3-15.tar.gz +sha256 620b25f4ab4d72fdf32b13797156ea40df2049f1c07e640177e5fec544e9a94c xinetd-2-3-15.tar.gz +sha256 2f3dd19831b1837f7360f80a7700a130c04a59e387d4359299d6df712308bbed COPYRIGHT diff --git a/buildroot/package/xinetd/xinetd.mk b/buildroot/package/xinetd/xinetd.mk index 98185122c..a2ba10df7 100644 --- a/buildroot/package/xinetd/xinetd.mk +++ b/buildroot/package/xinetd/xinetd.mk @@ -4,8 +4,8 @@ # ################################################################################ -XINETD_VERSION = xinetd-2-3-15 -XINETD_SITE = $(call github,xinetd-org,xinetd,$(XINETD_VERSION)) +XINETD_VERSION = 2-3-15 +XINETD_SITE = $(call github,xinetd-org,xinetd,xinetd-$(XINETD_VERSION)) XINETD_LICENSE = xinetd license XINETD_LICENSE_FILES = COPYRIGHT diff --git a/buildroot/package/xl2tp/0001-legacy.patch b/buildroot/package/xl2tp/0001-legacy.patch deleted file mode 100644 index 5279fd707..000000000 --- a/buildroot/package/xl2tp/0001-legacy.patch +++ /dev/null @@ -1,17 +0,0 @@ -Replace SUSV3-specific functions index, bcopy, bzero and bcmp by their -POSIX variants. - ---- l2tpd-0.70-pre20031121.oorig/osport.h 2004-07-08 22:47:52.000000000 +0200 -+++ l2tpd-0.70-pre20031121/osport.h 2006-12-28 15:32:50.000000000 +0100 -@@ -37,4 +37,11 @@ - - #endif /* defined(SOLARIS) */ - -+#if defined __UCLIBC__ && !defined UCLIBC_SUSV3_LEGACY_MACROS -+# define index(x, y) strchr(x, y) -+# define bcopy(S1, S2, LEN) ((void)memmove(S2, S1, LEN)) -+# define bzero(S1, LEN) ((void)memset(S1, 0, LEN)) -+# define bcmp(S1,S2,LEN) ((memcmp(S2, S1, LEN)==0)?0:1) -+#endif /* defined __UCLIBC__ && !defined UCLIBC_SUSV3_LEGACY_MACROS */ -+ - #endif /* _OSPORT_H_ */ diff --git a/buildroot/package/xl2tp/xl2tp.hash b/buildroot/package/xl2tp/xl2tp.hash index 9cc76e9d2..8cf652283 100644 --- a/buildroot/package/xl2tp/xl2tp.hash +++ b/buildroot/package/xl2tp/xl2tp.hash @@ -1,3 +1,3 @@ # locally computed -sha256 6f0ac50a76500d5cc56a67451b61e5f561b3309357176b39deabb1705e8745fd xl2tp-v1.3.12.tar.gz +sha256 0d149bf9d2f7d838806e6a36fd7a676d03bf246d2b7869e16c945330e13b922e xl2tp-1.3.15.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/xl2tp/xl2tp.mk b/buildroot/package/xl2tp/xl2tp.mk index 63c798d88..b40eb2fd1 100644 --- a/buildroot/package/xl2tp/xl2tp.mk +++ b/buildroot/package/xl2tp/xl2tp.mk @@ -4,8 +4,8 @@ # ################################################################################ -XL2TP_VERSION = v1.3.12 -XL2TP_SITE = $(call github,xelerance,xl2tpd,$(XL2TP_VERSION)) +XL2TP_VERSION = 1.3.15 +XL2TP_SITE = $(call github,xelerance,xl2tpd,v$(XL2TP_VERSION)) XL2TP_DEPENDENCIES = libpcap XL2TP_LICENSE = GPL-2.0 XL2TP_LICENSE_FILES = LICENSE diff --git a/buildroot/package/xmlstarlet/xmlstarlet.hash b/buildroot/package/xmlstarlet/xmlstarlet.hash index ca9aecfec..719115095 100644 --- a/buildroot/package/xmlstarlet/xmlstarlet.hash +++ b/buildroot/package/xmlstarlet/xmlstarlet.hash @@ -1,3 +1,5 @@ # From https://sourceforge.net/projects/xmlstar/files/xmlstarlet/1.6.1/ sha1 87bb104f546caca71b9540807c5b2738944cb219 xmlstarlet-1.6.1.tar.gz md5 f3c5dfa3b1a2ee06cd57c255cc8b70a0 xmlstarlet-1.6.1.tar.gz +# Locally computed +sha256 6641cc5b00c1651fa22175f34efd01695e64a348b1ba07048538276f44866862 COPYING diff --git a/buildroot/package/xorriso/0001-use-sys-xattr.h.patch b/buildroot/package/xorriso/0001-use-sys-xattr.h.patch deleted file mode 100644 index 5ae1aae72..000000000 --- a/buildroot/package/xorriso/0001-use-sys-xattr.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -Use system - -The one from attr is no longer installed with latest version. - -Signed-off-by: "Yann E. MORIN" - ---- -Upstream status: alternate, more complex patch pending... - -diff -durN xorriso-1.4.6.orig/configure.ac xorriso-1.4.6/configure.ac ---- xorriso-1.4.6.orig/configure.ac 2016-09-16 15:51:33.000000000 +0200 -+++ xorriso-1.4.6/configure.ac 2018-05-06 23:45:38.377153069 +0200 -@@ -264,7 +264,7 @@ - dnl Check whether there is the header for Linux xattr. - dnl If not, erase this macro which would enable use of listxattr and others - XATTR_DEF="-DLibisofs_with_aaip_xattR" -- AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= , -+ AC_CHECK_HEADER(sys/xattr.h, AC_CHECK_LIB(c, listxattr, X= , - XATTR_DEF= ), XATTR_DEF= ) - fi - elif test x"$LIBBURNIA_SUPP_FATTR" = xextattr -diff -durN xorriso-1.4.6.orig/libisofs/aaip-os-linux.c xorriso-1.4.6/libisofs/aaip-os-linux.c ---- xorriso-1.4.6.orig/libisofs/aaip-os-linux.c 2016-09-16 15:51:34.000000000 +0200 -+++ xorriso-1.4.6/libisofs/aaip-os-linux.c 2018-05-06 23:47:25.764941583 +0200 -@@ -30,7 +30,7 @@ - #endif - - #ifdef Libisofs_with_aaip_xattR --#include -+#include - #endif - - diff --git a/buildroot/package/xorriso/xorriso.hash b/buildroot/package/xorriso/xorriso.hash index f1ee9d67a..b594b9143 100644 --- a/buildroot/package/xorriso/xorriso.hash +++ b/buildroot/package/xorriso/xorriso.hash @@ -1,2 +1,4 @@ # Locally computed -sha256 526f728c7eee6f8c4b69fbf391789e6c80806197c2861cf5922cf7cfe1035784 xorriso-1.4.6.tar.gz +sha256 a93fa7ae5bb1902198cddfec25201388156932f36f2f5da829bf4fcae9a6062b xorriso-1.5.0.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 72e99e72cd68f226415e5d898f3b38e24ae7991ed038ed72d789fff5b060f028 COPYRIGHT diff --git a/buildroot/package/xorriso/xorriso.mk b/buildroot/package/xorriso/xorriso.mk index de431c3ab..56bf39f76 100644 --- a/buildroot/package/xorriso/xorriso.mk +++ b/buildroot/package/xorriso/xorriso.mk @@ -4,26 +4,15 @@ # ################################################################################ -XORRISO_VERSION = 1.4.6 +XORRISO_VERSION = 1.5.0 XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso XORRISO_LICENSE = GPL-3.0+ XORRISO_LICENSE_FILES = COPYING COPYRIGHT -# 0001-use-sys-xattr.h.patch -XORRISO_DEPENDENCIES = host-pkgconf -HOST_XORRISO_DEPENDENCIES = host-pkgconf -XORRISO_AUTORECONF = YES - -# Make autoreconf happy -define XORRISO_NEWS - touch $(@D)/NEWS -endef -XORRISO_POST_PATCH_HOOKS += XORRISO_NEWS -HOST_XORRISO_POST_PATCH_HOOKS += XORRISO_NEWS - # Disable everything until we actually need those features, and add the correct # host libraries HOST_XORRISO_CONF_OPTS = \ + --disable-xattr-h-pref-attr \ --disable-zlib \ --disable-bzip2 \ --disable-libcdio \ @@ -35,6 +24,10 @@ HOST_XORRISO_CONF_OPTS = \ # http://lists.gnu.org/archive/html/bug-xorriso/2017-04/msg00004.html XORRISO_CONF_OPTS = --disable-libcdio +# we need sys/xattr.h +XORRISO_CONF_OPTS += \ + --disable-xattr-h-pref-attr + ifeq ($(BR2_PACKAGE_LIBICONV),y) XORRISO_DEPENDENCIES += libiconv endif diff --git a/buildroot/package/xr819-xradio/xr819-xradio.hash b/buildroot/package/xr819-xradio/xr819-xradio.hash index 341747c5b..393780fb3 100644 --- a/buildroot/package/xr819-xradio/xr819-xradio.hash +++ b/buildroot/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 7b78fc61d13a428a0d8a3d8dcffaa604d23b5a17c6e8e86d2e5e8372dcd17672 xr819-xradio-33f4b1c25eff0d9db7cbac19f36b130da9857f37.tar.gz +sha256 2f61f2db78d46440819af2d8191f9b5ed2bb3e5404b739f68fb0af7917d0d222 xr819-xradio-aa01ba77b9360dd734b50f5b937960a50c5a0825.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/buildroot/package/xr819-xradio/xr819-xradio.mk b/buildroot/package/xr819-xradio/xr819-xradio.mk index edf423bc3..ae3e4fbd3 100644 --- a/buildroot/package/xr819-xradio/xr819-xradio.mk +++ b/buildroot/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 33f4b1c25eff0d9db7cbac19f36b130da9857f37 +XR819_XRADIO_VERSION = aa01ba77b9360dd734b50f5b937960a50c5a0825 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE diff --git a/buildroot/package/xscreensaver/0001-fix-cross-compile-ansi-c-bailout.patch b/buildroot/package/xscreensaver/0001-fix-cross-compile-ansi-c-bailout.patch deleted file mode 100644 index 6da9419e0..000000000 --- a/buildroot/package/xscreensaver/0001-fix-cross-compile-ansi-c-bailout.patch +++ /dev/null @@ -1,19 +0,0 @@ -The configure bails out when cross-compiling, because it is over-cautious -about ANSI support in the C compiler. Work around this by disabling the -bail-out code. - -[Peter: updated for 5.32] -Signed-off-by: Simon Dawson -Signed-off-by: Peter Korsgaard - -diff -Nurp a/configure b/configure ---- a/configure 2013-07-16 10:23:32.000000000 +0100 -+++ b/configure 2013-09-22 14:50:07.186953454 +0100 -@@ -4374,7 +4374,6 @@ $as_echo "Solaris: adding -D__EXTENSIONS - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler works on ANSI C" >&5 - $as_echo_n "checking whether the compiler works on ANSI C... " >&6; } - if test "$cross_compiling" = yes; then : -- as_fn_error $? "Couldn't build even a trivial ANSI C program: check CC." "$LINENO" 5 - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ diff --git a/buildroot/package/xscreensaver/Config.in b/buildroot/package/xscreensaver/Config.in index efb8d1a6b..c1d6a03f5 100644 --- a/buildroot/package/xscreensaver/Config.in +++ b/buildroot/package/xscreensaver/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_USE_WCHAR # libgtk2 -> glib2 depends on BR2_USE_MMU # libgtk2 -> glib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBGLADE select BR2_PACKAGE_JPEG @@ -22,9 +23,10 @@ config BR2_PACKAGE_XSCREENSAVER http://www.jwz.org/xscreensaver/ -comment "xscreensaver needs a toolchain w/ wchar, C++, threads" +comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.8" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_USE_WCHAR diff --git a/buildroot/package/xscreensaver/xscreensaver.hash b/buildroot/package/xscreensaver/xscreensaver.hash index 48bc2b1eb..e33413c76 100644 --- a/buildroot/package/xscreensaver/xscreensaver.hash +++ b/buildroot/package/xscreensaver/xscreensaver.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 6b8b5238047f1613d99149bb02d5ed3384675f3ce74a0a8ba25290bd61abc06c xscreensaver-5.36.tar.gz +sha256 158f381d687e8360a6debb0d3af0148d279e853666244f02d628a5a482bce194 xscreensaver-5.43.tar.gz +sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h +sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h diff --git a/buildroot/package/xscreensaver/xscreensaver.mk b/buildroot/package/xscreensaver/xscreensaver.mk index 34b116387..642d65f0c 100644 --- a/buildroot/package/xscreensaver/xscreensaver.mk +++ b/buildroot/package/xscreensaver/xscreensaver.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSCREENSAVER_VERSION = 5.36 +XSCREENSAVER_VERSION = 5.43 XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. diff --git a/buildroot/package/xtables-addons/xtables-addons.hash b/buildroot/package/xtables-addons/xtables-addons.hash index 9aa9c0e53..fea496d99 100644 --- a/buildroot/package/xtables-addons/xtables-addons.hash +++ b/buildroot/package/xtables-addons/xtables-addons.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/xtables-addons/files/Xtables-addons/ -sha1 70ace437ec84d9ec1970505cecf270ed0cbd273e xtables-addons-2.12.tar.xz -# Calculated based on the hash above -sha256 c4865aa1c64c5ff173ff7b5d69425466c71f0f9b5eb5299c52c68bdcd46fa63b xtables-addons-2.12.tar.xz +# Locally calculated +sha256 189ff57a0b8960969bd99141a6c79c345efa67e4461f450e2f162c9bd3d17da6 xtables-addons-3.5.tar.xz +sha256 045ee3fcfe5d6edb95483cf49e2446ff8cab4bb79411018b18354138b70c5eb5 xtables-addons-3.7.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/buildroot/package/xtables-addons/xtables-addons.mk b/buildroot/package/xtables-addons/xtables-addons.mk index 5c3be1605..1a74b80f4 100644 --- a/buildroot/package/xtables-addons/xtables-addons.mk +++ b/buildroot/package/xtables-addons/xtables-addons.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTABLES_ADDONS_VERSION = 2.12 +XTABLES_ADDONS_VERSION = 3.7 XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz XTABLES_ADDONS_SITE = http://downloads.sourceforge.net/project/xtables-addons/Xtables-addons XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf diff --git a/buildroot/package/xterm/xterm.hash b/buildroot/package/xterm/xterm.hash index bbd0e1100..57d5a72b9 100644 --- a/buildroot/package/xterm/xterm.hash +++ b/buildroot/package/xterm/xterm.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 66fb2f6c35b342148f549c276b12a3aa3fb408e27ab6360ddec513e14376150b xterm-327.tgz +sha256 39a6a3d3724f9a0a068f8cc353ab0c82831f0a43abb24470d933af299658475f xterm-349.tgz +# Locally calculated +sha256 b0d302c6d67f63122bbe8d622dd8a66cfadccc32853f606b7558103609201993 COPYING diff --git a/buildroot/package/xterm/xterm.mk b/buildroot/package/xterm/xterm.mk index 201280fd4..8cbfa070e 100644 --- a/buildroot/package/xterm/xterm.mk +++ b/buildroot/package/xterm/xterm.mk @@ -4,12 +4,12 @@ # ################################################################################ -XTERM_VERSION = 327 +XTERM_VERSION = 349 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf XTERM_LICENSE = MIT -XTERM_LICENSE_FILES = version.c +XTERM_LICENSE_FILES = COPYING XTERM_CONF_OPTS = --enable-256-color \ --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib diff --git a/buildroot/package/xvisor/0001-MAKEFILE-Unconditionally-disable-SSP.patch b/buildroot/package/xvisor/0001-MAKEFILE-Unconditionally-disable-SSP.patch new file mode 100644 index 000000000..ffa486d7d --- /dev/null +++ b/buildroot/package/xvisor/0001-MAKEFILE-Unconditionally-disable-SSP.patch @@ -0,0 +1,35 @@ +From f04d1b73a9060e8f09cf1173f89daab73d6c0a18 Mon Sep 17 00:00:00 2001 +From: Eric Le Bihan +Date: Sat, 9 Nov 2019 17:13:46 +0100 +Subject: [PATCH] [MAKEFILE] Unconditionally disable SSP + +Though -nostdlib is passed in $(cflags), -fno-stack-protector must also be +passed to avoid linking errors related to undefined references to +'__stack_chk_guard' and '__stack_chk_fail' if toolchain enforces +-fstack-protector. + +Signed-off-by: Eric Le Bihan +[yann.morin.1998@free.fr: + - applied upstream: https://github.com/avpatel/xvisor-next/commit/6edd4a8bf16c42aac8bea9e0a61e8b3b47e2aa7c +] +Signed-off-by: Yann E. MORIN +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index d6bcf519..de8e1043 100644 +--- a/Makefile ++++ b/Makefile +@@ -137,7 +137,7 @@ cppflags+=$(cpu-cppflags) + cppflags+=$(board-cppflags) + cppflags+=$(libs-cppflags-y) + cc=$(CROSS_COMPILE)gcc +-cflags=-g -Wall -nostdlib --sysroot=$(drivers_dir)/include -fno-builtin -D__VMM__ ++cflags=-g -Wall -nostdlib --sysroot=$(drivers_dir)/include -fno-builtin -D__VMM__ -fno-stack-protector + cflags+=$(board-cflags) + cflags+=$(cpu-cflags) + cflags+=$(libs-cflags-y) +-- +2.21.0 + diff --git a/buildroot/package/xvisor/0001-x86-Fix-build-break-with-newer-GCC-7-x.patch b/buildroot/package/xvisor/0001-x86-Fix-build-break-with-newer-GCC-7-x.patch deleted file mode 100644 index 668f9df71..000000000 --- a/buildroot/package/xvisor/0001-x86-Fix-build-break-with-newer-GCC-7-x.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 48b056d958e0d9ae5758b9c927b48a2e1d98cbcd Mon Sep 17 00:00:00 2001 -From: Himanshu Chauhan -Date: Mon, 4 Dec 2017 18:29:09 +0530 -Subject: [PATCH] [x86] Fix build break with newer GCC (7.x) - -add -no-pie to C and LD flags. GCC 7.x for some reason -doesn't like to mix 32-bit and 64-bit code and wants -such code to be compiled with fPIC. Disable PIE from -does the trick. - -Signed-off-by: Himanshu Chauhan -[Retrieved from: -https://github.com/xvisor/xvisor/commit/48b056d958e0d9ae5758b9c927b48a2e1d98cbcd] -Signed-off-by: Fabrice Fontaine ---- - arch/x86/cpu/x86_64/objects.mk | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/cpu/x86_64/objects.mk b/arch/x86/cpu/x86_64/objects.mk -index a3bed4641..1d6d5a2fb 100644 ---- a/arch/x86/cpu/x86_64/objects.mk -+++ b/arch/x86/cpu/x86_64/objects.mk -@@ -21,8 +21,9 @@ - # @author Himanshu Chauhan (hschauhan@nulltrace.org) - # @brief list of x86_64 object files. - # */ --cpu-cflags +=-finline-functions -O0 -mcmodel=large --cpu-cppflags +=-DCPU_TEXT_LMA=${CONFIG_VAPOOL_ALIGN_MB} -+cpu-cflags +=-finline-functions -O0 -mcmodel=large -no-pie -+cpu-cppflags +=-DCPU_TEXT_LMA=${CONFIG_VAPOOL_ALIGN_MB} -no-pie -+cpu-ldflags += -no-pie - - cpu-objs-y+= start.o - diff --git a/buildroot/package/xvisor/xvisor.hash b/buildroot/package/xvisor/xvisor.hash index c170fdb9f..dee1ef1d0 100644 --- a/buildroot/package/xvisor/xvisor.hash +++ b/buildroot/package/xvisor/xvisor.hash @@ -1,2 +1,3 @@ # Locally generated -sha256 29b3b830380dde4f596611abd34487fb753e120ce462dbb0056f3025b88ef14f xvisor-0.2.9.tar.gz +sha256 a0c9537bd7fb06084c3da663f71bf6f2b1709e34b3b2fca2473c8db1cdd3de1d xvisor-0.2.11.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/xvisor/xvisor.mk b/buildroot/package/xvisor/xvisor.mk index f75175a45..6094370cc 100644 --- a/buildroot/package/xvisor/xvisor.mk +++ b/buildroot/package/xvisor/xvisor.mk @@ -4,7 +4,8 @@ # ################################################################################ -XVISOR_VERSION = 0.2.9 +XVISOR_VERSION = 0.2.11 +XVISOR_SOURCE = xvisor-$(XVISOR_VERSION).tar.xz XVISOR_SITE = http://www.xhypervisor.org/tarball XVISOR_LICENSE = GPL-2.0+ XVISOR_LICENSE_FILES = COPYING diff --git a/buildroot/package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch b/buildroot/package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch new file mode 100644 index 000000000..b275760de --- /dev/null +++ b/buildroot/package/xvkbd/0001-Makefile-am-fix-install-data-hook.patch @@ -0,0 +1,27 @@ +Makefile.am: fix install-data-hook + +- Prefix $(appdefaultdir) and $(datarootdir) with $(DESTDIR) to allow + cross-compilation +- Create $(DESTDIR)$(appdefaultdir) if it doesn't exist + +Upstream status: sent to Tom Sato + +diff -Nuar xvkbd-4.0-orig/Makefile.am xvkbd-4.0/Makefile.am +--- xvkbd-4.0-orig/Makefile.am 2019-10-06 11:27:13.692243604 +0200 ++++ xvkbd-4.0/Makefile.am 2019-10-06 11:35:15.872263440 +0200 +@@ -17,11 +17,12 @@ + [ which ad2c > /dev/null ] || ad2c XVkbd-common.ad > XVkbd-common.h + + install-data-hook: ++ [ -d $(DESTDIR)$(appdefaultdir) ] || mkdir $(DESTDIR)$(appdefaultdir) + for file in *.ad; do \ +- $(INSTALL_DATA) $$file $(appdefaultdir)/$${file%.ad}; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(appdefaultdir)/$${file%.ad}; \ + done +- [ -d $(datarootdir)/xvkbd/ ] || mkdir $(datarootdir)/xvkbd/ +- $(INSTALL_DATA) words.english $(datarootdir)/xvkbd/words.english ++ [ -d $(DESTDIR)$(datarootdir)/xvkbd/ ] || mkdir $(DESTDIR)$(datarootdir)/xvkbd/ ++ $(INSTALL_DATA) words.english $(DESTDIR)$(datarootdir)/xvkbd/words.english + + EXTRA_DIST = XVkbd-common.h *.ad *.xbm xvkbd.man README ChangeLog Imakefile words.english + diff --git a/buildroot/package/xvkbd/0001-makefile.patch b/buildroot/package/xvkbd/0001-makefile.patch deleted file mode 100644 index a8f657738..000000000 --- a/buildroot/package/xvkbd/0001-makefile.patch +++ /dev/null @@ -1,2400 +0,0 @@ ---- a/Makefile 2008-03-04 06:14:55.425005441 -0500 -+++ b/Makefile 2008-03-05 08:40:50.000000000 -0500 -@@ -0,0 +1,2397 @@ -+# Makefile generated by imake - do not edit! -+# $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $ -+ -+# ---------------------------------------------------------------------- -+# Makefile generated from "Imake.tmpl" and -+# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ -+# $XdotOrg: util/cf/Imake.tmpl,v 1.17 2006/04/15 15:55:25 herrb Exp $ -+# -+# -+# -+# -+# $XFree86: xc/config/cf/Imake.tmpl,v 3.155 2003/12/24 18:58:41 dickey Exp $ -+# ---------------------------------------------------------------------- -+ -+all:: -+ -+.SUFFIXES: .i -+ -+# $XdotOrg: util/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $ -+# $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ -+ -+# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ -+ -+# Keep cpp from replacing path elements containing i486/i586/i686 -+ -+# ----------------------------------------------------------------------- -+# site-specific configuration parameters that need to come before -+# the platform-specific parameters - edit site.def to change -+ -+# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -+ -+# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ -+ -+# $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ -+ -+# ---------------------------------------------------------------------- -+# platform-specific configuration parameters - edit linux.cf to change -+ -+# $XdotOrg: util/cf/linux.cf,v 1.31 2005/10/21 19:10:27 ajax Exp $ -+# platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -+ -+# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $ -+ -+# operating system: Linux 2.6.23.8-63.fc8 i686 [ELF] (2.6.23) -+# libc: (6.7.0) -+# binutils: (217) -+ -+# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -+# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ -+ -+# $XdotOrg: util/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $ -+ -+# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ -+ -+XORG_VERSION_CURRENT = (((6) * 10000000) + ((8) * 100000) + ((99) * 1000) + 903) -+RELEASE_VERSION = RELEASE-1 -+ -+AFB_DEFS = -DUSE_AFB -+ -+DRIVERSDKDIR = $(USRLIBDIR)/Server -+DRIVERSDKMODULEDIR = $(USRLIBDIR)/Server/modules -+DRIVERSDKINCLUDEDIR = $(USRLIBDIR)/Server/include -+ -+ XF86SRC = $(SERVERSRC)/hw/xfree86 -+ XF86COMSRC = $(XF86SRC)/common -+ XF86PARSERSRC = $(XF86SRC)/parser -+ XF86OSSRC = $(XF86SRC)/os-support -+ XF86DRIVERSRC = $(XF86SRC)/drivers -+ DRIVERSRC = $(XF86DRIVERSRC) -+ -+ XFREE86DOCDIR = $(DOCDIR) -+ XFREE86PSDOCDIR = $(DOCPSDIR) -+ XFREE86PDFDOCDIR = $(DOCPDFDIR) -+ XFREE86HTMLDOCDIR = $(DOCHTMLDIR) -+XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese -+ -+# $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -+ -+# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $ -+ -+# ---------------------------------------------------------------------- -+# site-specific configuration parameters that go after -+# the platform-specific parameters - edit site.def to change -+ -+# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -+ -+# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ -+ -+# --------------------------------------------------------------------- -+# Imake rules for building libraries, programs, scripts, and data files -+# rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -+# rules: $XdotOrg: util/cf/Imake.rules,v 1.11 2005/11/08 06:33:24 jkj Exp $ -+# -+# -+# -+# -+# rules: $XFree86: xc/config/cf/Imake.rules,v 3.128 2003/11/15 03:25:17 dawes Exp $ -+ -+.PHONY: all interfaces install install.man install.lib install.sdk depend includes cleandir -+ -+ _NULLCMD_ = @ echo -n -+ -+X_BYTE_ORDER = X_LITTLE_ENDIAN -+ -+GLIDE2INCDIR = -+ -+GLIDE3INCDIR = -+ -+GLIDE3LIBNAME = -+ -+TKLIBNAME = -+ -+TKLIBDIR = -+ -+TCLLIBNAME = -+ -+TCLIBDIR = -+ -+ PATHSEP = / -+ SHELL = /bin/sh -e -+ -+ TOP = . -+ CURRENT_DIR = . -+ -+ IMAKE = imake -+ DEPEND = gccmakedep -+ MKDIRHIER = mkdir -p -+ REVPATH = revpath -+ EXPORTLISTGEN = -+ RMAN = RmanCmd -+ RMANBASENAME = rman -+ RMANOPTIONS = RmanOptions -+ CONFIGSRC = $(TOP)/config -+ IMAKESRC = $(CONFIGSRC)/imake -+ DEPENDSRC = $(CONFIGSRC)/util -+ -+ INCROOT = /usr/include -+ USRLIBDIR = /usr/lib -+ VARDIR = /var -+ VARLIBDIR = $(VARDIR)/lib -+ SYSTEMUSRLIBDIR = /usr/lib -+ SYSTEMUSRINCDIR = /usr/include -+ SHLIBDIR = /usr/lib -+ LINTLIBDIR = $(USRLIBDIR)/lint -+ MANPATH = /usr/share/man -+ MANSOURCEPATH = $(MANPATH)/man -+ MANDIR = $(MANSOURCEPATH)1 -+ LIBMANDIR = $(MANSOURCEPATH)3 -+ FILEMANDIR = $(MANSOURCEPATH)5 -+ MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSUFFIX) -+ DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSUFFIX) -+ LOGDIRECTORY = $(VARDIR)/log -+ -+ VARRUNDIR = $(VARDIR)/run -+ -+ VARDBDIR = $(VARDIR)/lib -+ -+ AR = ar clq -+ -+# Nice try but useless: make will inherit BOOTSTRAPCFLAGS -+# from top Makefile -+ BOOTSTRAPCFLAGS = -+ -+ CC = gcc -m32 -+ AS = gcc -m32 -c -x assembler -+ -+.SUFFIXES: .cc -+ -+ CXX = c++ -m32 -+ -+ CXXFILT = c++filt -+ -+ CXXLIB = -lstdc++ -+ -+ CXXDEBUGFLAGS = -O2 -fno-strength-reduce -fno-strict-aliasing -+CXXDEPENDINCLUDES = -+ CXXEXTRA_DEFINES = -+CXXEXTRA_INCLUDES = -+ CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(CXXPROJECT_DEFINES) -+ CXXOPTIONS = -+ CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) -+ CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) -+ CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) -+ -+ COMPRESS = compress -+ GZIPCMD = gzip -+ -+ CPP = cpp $(STD_CPP_DEFINES) -+ RAWCPP = cpp -undef $(STD_CPP_OPTIONS) -+ PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES) -+ -+ INSTALL = install -+ INSTALLFLAGS = -c -+ -+ LD = gcc -m32 -nostdlib -+ -+ LEX = flex -l -+ M4 = m4 -+ M4FLAGS = -+ LEXLIB = -lfl -+ YACC = bison -y -+ CCYACC = bison -y -+ -+ LINT = lint -+ -+ LINTLIBFLAG = -C -+ LINTOPTS = -axz -+ LN = ln -s -+ MAKE = make -+ MV = mv -f -+ CP = cp -+ -+ RANLIB = ranlib -+ -+ RANLIBINSTFLAGS = -+ -+ RM = rm -f -+ PERL = perl -+ PERLOPTS = -+ PERLENVSETUP = env LC_ALL=C -+ MANSUFFIX = 1x -+ LIBMANSUFFIX = 3x -+ FILEMANSUFFIX = 5x -+ MISCMANSUFFIX = 7 -+ DRIVERMANSUFFIX = 4 -+ ADMINMANSUFFIX = 8 -+ MANSRCSUFFIX = man -+ MANNEWSUFFIX = _man -+ MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__appmansuffix__=$(MANSUFFIX) -D__filemansuffix__=$(FILEMANSUFFIX) -D__libmansuffix__=$(LIBMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX) -D__adminmansuffix__=$(ADMINMANSUFFIX) -D__projectroot__=$(PROJECTROOT) -D__xconfigfile__=$(XCONFIGFILE) -D__xconfigdir__=$(XCONFIGDIR) -D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) $(XORGMANDEFS) $(VENDORMANDEFS) -+ -+ COMPRESSMANCMD = gzip -n -+ -+ TROFF = groff -Tps -+ NROFF = nroff -+ -+ MSMACROS = -ms -+ MANMACROS = -man -+ TBL = tbl -+ EQN = eqn -+ NEQN = neqn -+ COL = col -+ COLFLAGS = -b -+ -+ MODCC = gcc -m32 -+ -+ MODCPP = cpp -+ MODCFLAGS = $(CFLAGS) -+ MODAS = gcc -m32 -c -x assembler -+ MODASFLAGS = -+ -+ MODLD = gcc -m32 -nostdlib -+ -+ MODLDFLAGS = -+MODLDCOMBINEFLAGS = -r -+ MODAR = ar clq -+ -+ MODRANLIB = ranlib -+ -+ STD_INCLUDES = -+ STD_CPP_OPTIONS = -traditional -+ STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(PROJECT_DEFINES) -+ STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(PROJECT_DEFINES) -+ EXTRA_LOAD_FLAGS = -+ EXTRA_LDOPTIONS = -+ EXTRA_LIBRARIES = -+ TAGS = ctags -+ -+ PARALLELMFLAGS = -+ -+ SHAREDCODEDEF = -+ SHLIBDEF = -+ -+ SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS) -+ -+ NOSTDLIB = -nostdlib -+ POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic -+ -+ PICFLAGS = -fPIC -+ -+ CXXPICFLAGS = -fPIC -+ -+ PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO -+ -+ INSTPGMFLAGS = -+ -+ INSTBINFLAGS = -m 0755 -+ INSTUIDFLAGS = -m 4711 -+ INSTLIBFLAGS = -m 0644 -+ INSTINCFLAGS = -m 0444 -+ INSTMANFLAGS = -m 0444 -+ INSTDATFLAGS = -m 0444 -+ INSTKMEMFLAGS = -m 4711 -+ -+ PROJECTROOT = /usr -+ -+ CDEBUGFLAGS = -O2 -fno-strength-reduce -fno-strict-aliasing -+ CCOPTIONS = -+ -+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) -+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) -+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) -+ LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS) -+ LDPOSTLIB = -+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) -+ CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) -+ -+ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) -+ -+ CCLINK = $(CC) -+ -+ CXXLINK = $(CXX) -+ -+ LDSTRIPFLAGS = -x -+ LDCOMBINEFLAGS = -r -+ DEPENDFLAGS = -+ DEPEND_DEFINES = -+ -+# Not sure this belongs here -+ TKLIBDIR = -+ TKINCDIR = -+ TKLIBNAME = -+ TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) -+ TCLLIBDIR = -+ TCLINCDIR = -+ TCLLIBNAME = -+ TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) -+ -+ MACROFILE = linux.cf -+ RM_CMD = $(RM) -+ -+ IMAKE_DEFINES = -+ IMAKE_WARNINGS = -Wundef -+ -+ IRULESRC = $(CONFIGDIR) -+ IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -+ -+ ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES) -+ -+# $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ -+ -+# $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ -+ -+# ---------------------------------------------------------------------- -+# X Window System Build Parameters and Rules -+# $XdotOrg: util/cf/X11.tmpl,v 1.54 2006/04/15 15:55:25 herrb Exp $ -+# $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ -+# -+# -+# -+# -+# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ -+ -+XORGRELSTRING = `echo 6 8 99 903 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` -+ XORGMANNAME = X Version 11 -+ -+STICKY_DEFINES = -DHAS_STICKY_DIR_BIT -+ -+FCHOWN_DEFINES = -DHAS_FCHOWN -+ -+# ----------------------------------------------------------------------- -+# X Window System make variables; these need to be coordinated with rules -+ -+ XTOP = $(TOP) -+ BINDIR = /usr/bin -+ BUILDINCROOT = $(TOP)/exports -+ BUILDINCDIR = $(BUILDINCROOT)/include -+ BUILDINCTOP = ../.. -+ BUILDLIBDIR = $(TOP)/exports/lib -+ BUILDLIBTOP = ../.. -+ BUILDBINDIR = $(TOP)/exports/bin -+ BUILDBINTOP = ../.. -+ BUILDMODULEDIR = $(BUILDLIBDIR)/modules -+ BUILDI18NDIR = $(BUILDLIBDIR)/locale -+ BUILDMODULETOP = $(BUILDLIBTOP)/.. -+ XBUILDINCROOT = $(XTOP)/exports -+ XBUILDINCDIR = $(XBUILDINCROOT)/include/X11 -+ XBUILDINCTOP = ../../.. -+ XBUILDBINDIR = $(XBUILDINCROOT)/bin -+ INCDIR = $(INCROOT) -+ ADMDIR = /usr/adm -+ LIBDIR = /usr/lib/X11 -+ SHAREDIR = /usr/share/X11 -+ LIBEXECDIR = /usr/libexec -+ MODULEDIR = $(USRLIBDIR)/modules -+ TOP_X_INCLUDES = -+ XBINDIR = $(PROJECTROOT)/bin -+ -+ INSTSRCDIR = /usr/src -+ -+ ETCX11DIR = /etc/X11 -+ -+ CONFDIR = $(ETCX11DIR) -+ -+ DOCDIR = $(LIBDIR)/doc -+ DOCHTMLDIR = $(DOCDIR)/html -+ DOCPSDIR = $(DOCDIR)/PostScript -+ DOCPDFDIR = $(DOCDIR)/PDF -+ FONTDIR = $(LIBDIR)/fonts -+ ENCODINGSDIR = $(LIBDIR)/fonts/encodings -+ XINITDIR = $(LIBDIR)/xinit -+ XDMDIR = $(LIBDIR)/xdm -+ XDMVARDIR = $(VARLIBDIR)/xdm -+ TWMDIR = $(LIBDIR)/twm -+ XSMDIR = $(LIBDIR)/xsm -+ NLSDIR = $(LIBDIR)/nls -+ XLOCALEDIR = $(LIBDIR)/locale -+ LBXPROXYDIR = $(LIBDIR)/lbxproxy -+ PROXYMANAGERDIR = $(LIBDIR)/proxymngr -+ XPRINTDIR = $(LIBDIR)/xserver -+ XAPPLOADDIR = /usr/share/X11/app-defaults -+ FONTCFLAGS = -t -+ -+ INSTAPPFLAGS = $(INSTDATFLAGS) -+ -+ RGB = $(XBINDIR)/rgb -+ FONTC = $(XBINDIR)/bdftopcf -+ MKFONTSCALE = $(XBINDIR)/mkfontscale -+ MKFONTDIR = $(XBINDIR)/mkfontdir -+ MKHTMLINDEX = $(XBINDIR)/mkhtmlindex -+ UCS2ANY = $(XBINDIR)/ucs2any -+ BDFTRUNCATE = $(XBINDIR)/bdftruncate -+ UCSMAPPREFIX = $(FONTDIR)/util/map- -+ XCURSORGEN = $(XBINDIR)/xcursorgen -+ -+ HTMLINDEXCMD = HtmlIndexCmd -+ -+ DOCUTILSRC = $(XTOP)/doc/util -+ CLIENTSRC = $(TOP)/clients -+ DEMOSRC = $(TOP)/demos -+ XDOCMACROS = $(DOCUTILSRC)/macros.t -+ XIDXMACROS = $(DOCUTILSRC)/indexmacros.t -+ PROGRAMSRC = $(TOP)/programs -+ LIBSRC = $(XTOP)/lib -+ FONTSRC = $(XTOP)/fonts -+ ENCODINGSSRC = $(FONTSRC)/encodings -+ INCLUDESRC = $(BUILDINCROOT)/include -+ XINCLUDESRC = $(INCLUDESRC)/X11 -+ SERVERSRC = $(XTOP)/programs/Xserver -+ CONTRIBSRC = $(XTOP)/../contrib -+ UNSUPPORTEDSRC = $(XTOP)/unsupported -+ DOCSRC = $(XTOP)/doc -+ RGBSRC = $(XTOP)/programs/rgb -+ BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf -+ MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir -+ FONTSERVERSRC = $(PROGRAMSRC)/xfs -+ FONTINCSRC = $(XTOP)/include/fonts -+ EXTINCSRC = $(XTOP)/include/extensions -+ FTSOURCEDIR = FreeTypeSrcDir -+ DRMSRCDIR = $(TOP)/extras/drm -+ MESASRCDIR = $(TOP)/extras/Mesa -+ OGLSAMPLESRCDIR = $(TOP)/extras/ogl-sample -+ PSWRAPSRC = $(XTOP)/config/pswrap -+ TRANSCOMMSRC = $(LIBSRC)/xtrans -+ TRANS_INCLUDES = -I$(TRANSCOMMSRC) -+ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) -DIPv6 -+XTRANS_FAILDEFINES = -DFAIL_HARD -+ -+ VENDORMANNAME = X.Org -+ VENDORMANVERSION = `echo 6 8 99 903 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` -+ XORGMANDEFS = -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" -+ VENDORMANDEFS = -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)" -+ VENDORNAME = The X.Org Foundation -+ VENDORNAMESHORT = X.Org -+ -+ VENDORWEBSUPPORT = http://wiki.X.Org -+ -+VENDORSUPPORTDEFS = -D__VENDORDWEBSUPPORT__='"$(VENDORWEBSUPPORT)"' -+ -+ XKBDEFRULES = xorg -+ XKBDEFRULESDEFS = -D__XKBDEFRULES__='"$(XKBDEFRULES)"' -+ -+ XCONFIGFILE = xorg.conf -+ XCONFIGDIR = $(LIBDIR) -+ XLOGFILE = Xorg -+ XSERVERNAME = Xorg -+ -+ XENVLIBDIR = $(USRLIBDIR) -+ CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR) XLOCALEDIR=$(BUILDLIBDIR)/locale -+ -+# $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -+# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ -+ -+ XLIBSRC = $(LIBSRC)/X11 -+ -+SOXLIBREV = 6.2 -+DEPXONLYLIB = -+XONLYLIB = -lX11 -+ -+LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln -+ -+ DEPXLIBONLY = $(DEPXONLYLIB) -+ XLIBONLY = $(XONLYLIB) -+ LINTXONLYLIB = $(LINTXONLY) -+ -+ XEXTLIBSRC = $(LIBSRC)/Xext -+ -+SOXEXTREV = 6.4 -+DEPEXTENSIONLIB = -+EXTENSIONLIB = -lXext -+ -+LINTEXTENSION = $(LINTLIBDIR)/llib-lXext.ln -+ -+LINTEXTENSIONLIB = $(LINTEXTENSION) -+ DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) -+ XLIB = $(EXTENSIONLIB) $(XONLYLIB) -+ LINTXLIB = $(LINTXONLYLIB) -+ -+ XSSLIBSRC = $(LIBSRC)/Xss -+ -+SOXSSREV = 1.0 -+DEPXSSLIB = -+XSSLIB = -lXss -+ -+LINTXSS = $(LINTLIBDIR)/llib-lXss.ln -+ -+ XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -+ -+SOXXF86MISCREV = 1.1 -+DEPXXF86MISCLIB = -+XXF86MISCLIB = -lXxf86misc -+ -+LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln -+ -+ XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -+ -+SOXXF86VMREV = 1.0 -+DEPXXF86VMLIB = -+XXF86VMLIB = -lXxf86vm -+ -+LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln -+ -+ XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -+ -+SOXXF86DGAREV = 1.0 -+DEPXXF86DGALIB = -+XXF86DGALIB = -lXxf86dga -+ -+LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln -+ -+ XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush -+ -+SOXXF86RUSHREV = 1.0 -+DEPXXF86RUSHLIB = -+XXF86RUSHLIB = -lXxf86rush -+ -+LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln -+ -+ XVLIBSRC = $(LIBSRC)/Xv -+ -+SOXVREV = 1.0 -+DEPXVLIB = -+XVLIB = -lXv -+ -+LINTXV = $(LINTLIBDIR)/llib-lXv.ln -+ -+ XVMCLIBSRC = $(LIBSRC)/XvMC -+ -+SOXVMCREV = 1.0 -+DEPXVMCLIB = -+XVMCLIB = -lXvMC -+ -+LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln -+ -+ XINERAMALIBSRC = $(LIBSRC)/Xinerama -+ -+SOXINERAMAREV = 1.0 -+DEPXINERAMALIB = -+XINERAMALIB = -lXinerama -+ -+LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln -+ -+ XRESLIBSRC = $(LIBSRC)/XRes -+ -+SOXRESREV = 1.0 -+DEPXRESLIB = -+XRESLIB = -lXRes -+ -+LINTXRES = $(LINTLIBDIR)/llib-lXRes.ln -+ -+ DMXLIBSRC = $(LIBSRC)/dmx -+ -+DEPDMXLIB = $(USRLIBDIR)/libdmx.a -+DMXLIB = -ldmx -+ -+LINTDMX = $(LINTLIBDIR)/llib-ldmx.ln -+ -+ DPSLIBSRC = $(LIBSRC)/dps -+ -+DEPDPSLIB = $(USRLIBDIR)/libdps.a -+DPSLIB = -ldps -+ -+LINTDPS = $(LINTLIBDIR)/llib-ldps.ln -+ -+ DPSTKLIBSRC = $(LIBSRC)/dpstk -+ -+DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a -+DPSTKLIB = -ldpstk -+ -+LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln -+ -+ PSRESLIBSRC = $(LIBSRC)/psres -+ -+DEPPSRESLIB = $(USRLIBDIR)/libpsres.a -+PSRESLIB = -lpsres -+ -+LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln -+ -+ GLULIBSRC = $(LIBSRC)/GLU -+ -+SOGLUREV = 1.3 -+DEPGLULIB = -+GLULIB = -lGLU -+ -+LINTGLU = $(LINTLIBDIR)/llib-lGLU.ln -+ -+ GLXLIBSRC = $(LIBSRC)/GL -+ -+SOGLREV = 1.2 -+DEPGLXLIB = -+GLXLIB = -lGL -+ -+LINTGLX = $(LINTLIBDIR)/llib-lGL.ln -+ -+ GLWIDGETSRC = $(LIBSRC)/GLw -+ -+SOGLWREV = 1.0 -+DEPGLWLIB = -+GLWLIB = -lGLw -+ -+LINTGLW = $(LINTLIBDIR)/llib-lGLw.ln -+ -+ XRENDERLIBSRC = $(LIBSRC)/Xrender -+ -+SOXRENDERREV = 1.2.2 -+DEPXRENDERLIB = -+XRENDERLIB = -lXrender -+ -+LINTXRENDER = $(LINTLIBDIR)/llib-lXrender.ln -+ -+ XRANDRLIBSRC = $(LIBSRC)/Xrandr -+ -+SOXRANDRREV = 2.0 -+DEPXRANDRLIB = -+XRANDRLIB = -lXrandr -+ -+LINTXRANDR = $(LINTLIBDIR)/llib-lXrandr.ln -+ -+ XFIXESLIBSRC = $(LIBSRC)/Xfixes -+ -+SOXFIXESREV = 3.0 -+DEPXFIXESLIB = -+XFIXESLIB = -lXfixes -+ -+LINTXFIXES = $(LINTLIBDIR)/llib-lXfixes.ln -+ -+ XDAMAGELIBSRC = $(LIBSRC)/Xdamage -+ -+SOXDAMAGEREV = 1.0 -+DEPXDAMAGELIB = -+XDAMAGELIB = -lXdamage -+ -+LINTXDAMAGE = $(LINTLIBDIR)/llib-lXdamage.ln -+ -+XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite -+ -+SOXCOMPOSITEREV = 1.0 -+DEPXCOMPOSITELIB = -+XCOMPOSITELIB = -lXcomposite -+ -+LINTXCOMPOSITE = $(LINTLIBDIR)/llib-lXcomposite.ln -+ -+XEVIELIBSRC = $(LIBSRC)/Xevie -+ -+SOXEVIEREV = 1.0 -+DEPXEVIELIB = -+XEVIELIB = -lXevie -+ -+LINTXEVIE = $(LINTLIBDIR)/llib-lXevie.ln -+ -+ XCURSORLIBSRC = $(LIBSRC)/Xcursor -+ -+SOXCURSORREV = 1.0.2 -+DEPXCURSORLIB = -+XCURSORLIB = -lXcursor -+ -+LINTXCURSOR = $(LINTLIBDIR)/llib-lXcursor.ln -+ -+ APPLEWMLIBSRC = $(LIBSRC)/apple -+ -+DEPAPPLEWMLIB = $(USRLIBDIR)/libAppleWM.a -+APPLEWMLIB = -lAppleWM -+ -+LINTAPPLEWM = $(LINTLIBDIR)/llib-lAppleWM.ln -+ -+ WINDOWSWMLIBSRC = $(LIBSRC)/windows -+ -+DEPWINDOWSWMLIB = $(USRLIBDIR)/libWindowsWM.a -+WINDOWSWMLIB = -lWindowsWM -+ -+LINTWINDOWSWM = $(LINTLIBDIR)/llib-lWindowsWM.ln -+ -+ XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache -+ -+SOXFONTCACHEREV = 1.2 -+DEPXFONTCACHELIB = -+XFONTCACHELIB = -lXfontcache -+ -+LINTXFONTCACHE = $(LINTLIBDIR)/llib-lXfontcache.ln -+ -+ XAUTHSRC = $(LIBSRC)/Xau -+ -+SOXAUTHREV = 6.0 -+DEPXAUTHLIB = -+XAUTHLIB = -lXau -+ -+LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln -+ -+ XDMCPLIBSRC = $(LIBSRC)/Xdmcp -+ -+SOXDMCPREV = 6.0 -+DEPXDMCPLIB = -+XDMCPLIB = -lXdmcp -+ -+LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln -+ -+ XMUSRC = $(LIBSRC)/Xmu -+ -+SOXMUREV = 6.2 -+DEPXMULIB = -+XMULIB = -lXmu -+ -+LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln -+ -+ XMUUSRC = $(LIBSRC)/Xmuu -+ -+SOXMUUREV = 1.0 -+DEPXMUULIB = -+XMUULIB = -lXmuu -+ -+LINTXMUU = $(LINTLIBDIR)/llib-lXmuu.ln -+ -+ OLDXLIBSRC = $(LIBSRC)/oldX -+ -+DEPOLDXLIB = $(USRLIBDIR)/liboldX.a -+OLDXLIB = -loldX -+ -+LINTOLDX = $(LINTLIBDIR)/llib-loldX.ln -+ -+ XPLIBSRC = $(LIBSRC)/Xp -+ -+SOXPREV = 6.2 -+DEPXPLIB = -+XPLIB = -lXp -+ -+LINTXP = $(LINTLIBDIR)/llib-lXp.ln -+ -+ TOOLKITSRC = $(LIBSRC)/Xt -+ -+SOXTREV = 6.0 -+DEPXTOOLONLYLIB = -+XTOOLONLYLIB = -lXt -+ -+LINTXTOOLONLY = $(LINTLIBDIR)/llib-lXt.ln -+ -+ DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) -+ XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) -+ LINTXTOOLLIB = $(LINTXTOOLONLYLIB) -+ -+ XALIBSRC = $(LIBSRC)/Xa -+ -+SOXAREV = 1.0 -+DEPXALIB = -+XALIB = -lXa -+ -+LINTXA = $(LINTLIBDIR)/llib-lXa.ln -+ -+ AWIDGETSRC = $(LIBSRC)/Xaw -+ -+SOXAWREV = 8.0 -+DEPXAWLIB = -+XAWLIB = -lXaw -+ -+LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln -+ -+ AWIDGET7SRC = $(LIBSRC)/Xaw7 -+ -+SOXAW7REV = 7.0 -+DEPXAW7LIB = -+XAW7LIB = -lXaw -+ -+LINTXAW7 = $(LINTLIBDIR)/llib-lXaw.ln -+ -+ AWIDGET6SRC = $(LIBSRC)/Xaw6 -+ -+SOXAW6REV = 6.1 -+DEPXAW6LIB = -+XAW6LIB = -lXaw -+ -+LINTXAW6 = $(LINTLIBDIR)/llib-lXaw.ln -+ -+ XILIBSRC = $(LIBSRC)/Xi -+ -+SOXINPUTREV = 6.0 -+DEPXILIB = -+XILIB = -lXi -+ -+LINTXI = $(LINTLIBDIR)/llib-lXi.ln -+ -+ XTESTLIBSRC = $(LIBSRC)/Xtst -+ -+SOXTESTREV = 6.1 -+DEPXTESTLIB = -+XTESTLIB = -lXtst -+ -+LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln -+ -+DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a -+XBSDLIB = -lXbsd -+ -+LINTXBSD = $(LINTLIBDIR)/llib-lXbsd.ln -+ -+ ICESRC = $(LIBSRC)/ICE -+ -+SOICEREV = 6.4 -+DEPICELIB = -+ICELIB = -lICE -+ -+LINTICE = $(LINTLIBDIR)/llib-lICE.ln -+ -+ SMSRC = $(LIBSRC)/SM -+ -+SOSMREV = 6.0 -+DEPSMLIB = -+SMLIB = -lSM -+ -+LINTSM = $(LINTLIBDIR)/llib-lSM.ln -+ -+ XKEYSRC = $(LIBSRC)/Xkey -+ -+SOXKEYREV = 6.0 -+DEPXKEYLIB = -+XKEYLIB = -lXkey -+ -+LINTXKEY = $(LINTLIBDIR)/llib-lXkey.ln -+ -+ FSLIBSRC = $(LIBSRC)/FS -+ -+SOFSREV = 6.0 -+DEPFSLIB = -+FSLIB = -lFS -+ -+LINTFS = $(LINTLIBDIR)/llib-lFS.ln -+ -+ FONTLIBSRC = $(LIBSRC)/font -+ -+SOFONTREV = 1.5 -+DEPFONTLIB = -+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont -+ -+LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln -+# -+SOFONTREV = 1.5 -+DEPXFONTLIB = -+XFONTLIB = -lXfont -+ -+LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln -+ -+ FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs -+ -+DEPFONTSTUBLIB = $(USRLIBDIR)/libfntstubs.a -+FONTSTUBLIB = -lfntstubs -+ -+LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln -+ DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) -+ FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) -+ -+ FONTENCLIBSRC = $(LIBSRC)/fontenc -+ -+SOFONTENCREV = 1.0 -+DEPXFONTENCLIB = -+XFONTENCLIB = -lfontenc -+ -+LINTXFONTENC = $(LINTLIBDIR)/llib-lfontenc.ln -+ -+ XPMLIBSRC = $(LIBSRC)/Xpm -+ -+SOXPMREV = 4.11 -+DEPXPMLIB = -+XPMLIB = -lXpm -+ -+LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln -+ -+FREETYPE2DIR = /usr -+FREETYPE2LIBDIR = /usr/lib -+FREETYPE2INCDIR = /usr/include -+ -+FREETYPE2LIB = -lfreetype -+ -+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config -+ -+FREETYPE2DEFINES = -DFREETYPE2 -+ -+ EXPATLIBSRC = $(LIBSRC)/expat -+ -+SOEXPATREV = 0.4 -+DEPEXPATLIB = -+EXPATLIB = -lexpat -+ -+LINTEXPAT = $(LINTLIBDIR)/llib-lexpat.ln -+ -+EXPATDIR = /usr -+EXPATLIBDIR = /usr/lib -+EXPATINCDIR = /usr/include -+ -+EXPATINCLUDES = -+ -+EXPATLIB = -lexpat -+ -+EXPATDEFINES = -DEXPAT -+ -+ XFT1LIBSRC = $(LIBSRC)/Xft1 -+ -+SOXFT1REV = 1.1 -+DEPXFT1LIB = -+XFT1LIB = -lXft -+ -+LINTXFT1 = $(LINTLIBDIR)/llib-lXft.ln -+ -+ XFTLIBSRC = $(LIBSRC)/Xft -+ -+SOXFTREV = 2.1.2 -+DEPXFTLIB = -+XFTLIB = -lXft -+ -+LINTXFT = $(LINTLIBDIR)/llib-lXft.ln -+ -+ FONTCONFIGLIBSRC = $(LIBSRC)/fontconfig -+ -+SOFONTCONFIGREV = 1.0.4 -+DEPFONTCONFIGLIB = -+FONTCONFIGLIB = -lfontconfig -+ -+LINTFONTCONFIG = $(LINTLIBDIR)/llib-lfontconfig.ln -+ -+FONTCONFIGINCDIR=$(INCDIR) -+ -+FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR) -+ -+FCCACHE = $(BINDIR)/fc-cache -+ -+FONTCONFIGDEFINES = -DFONTCONFIG -+ -+XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -+ -+LIBPNGINCDIR = /usr/include -+ -+LIBPNGINC= -+ -+LIBPNGDIR = /usr -+LIBPNGLIBDIR = /usr/lib -+LIBPNGINCDIR = /usr/include -+ -+LIBPNGLIB = -lpng -+ -+ XKBFILELIBSRC = $(LIBSRC)/xkbfile -+ -+SOXKBFILEREV = 1.0 -+DEPXKBFILELIB = -+XKBFILELIB = -lxkbfile -+ -+LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln -+ -+ XKBCOMPCMD = $(XBINDIR)/xkbcomp -+ -+ XKBUILIBSRC = $(LIBSRC)/xkbui -+ -+SOXKBUIREV = 1.0 -+DEPXKBUILIB = -+XKBUILIB = -lxkbui -+ -+LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln -+ -+EXTRAXAWREQS = -+ -+EXTRAXAWCLIENTDEPLIBS = -+ -+EXTRAXAWCLIENTLIBS = -+ -+ XTRAPLIBSRC = $(LIBSRC)/XTrap -+ -+SOXTRAPREV = 6.4 -+DEPXTRAPLIB = -+XTRAPLIB = -lXTrap -+ -+LINTXTRAP = $(LINTLIBDIR)/llib-lXTrap.ln -+ -+ DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) -+ -+ DEPLIBS1 = $(DEPLIBS) -+ DEPLIBS2 = $(DEPLIBS) -+ DEPLIBS3 = $(DEPLIBS) -+ DEPLIBS4 = $(DEPLIBS) -+ DEPLIBS5 = $(DEPLIBS) -+ DEPLIBS6 = $(DEPLIBS) -+ DEPLIBS7 = $(DEPLIBS) -+ DEPLIBS8 = $(DEPLIBS) -+ DEPLIBS9 = $(DEPLIBS) -+ DEPLIBS10 = $(DEPLIBS) -+ -+ FCPRELOADPATTERN = libfontconfig.so.? -+ -+ XFTPRELOADPATTERN = libXft.so.? -+ XRENDERPRELOADPATTERN = libXrender.so.? -+ XFONTPRELOADPATTERN = libXfont*.so.? -+ -+XMULIBONLY = -lXmu -+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) -+ -+ CONFIGDIR = /usr/share/X11/config -+ -+ USRLIBDIRPATH = $(USRLIBDIR) -+ LDPRELIBS = -L$(USRLIBDIR) $(INSTALLED_LIBS) -+ LDPOSTLIBS = -+ TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES) -+ PROJECT_DEFINES = -+ VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"' -+ -+CXXPROJECT_DEFINES = -+ -+# ---------------------------------------------------------------------- -+# start of Imakefile -+ -+# Remove the next line if you want genuine Xaw instead of Xaw3d -+ -+# Remove the next line if you don't want to enable XTEST support -+ -+# Remove the next line if you want to disable internationalization -+ -+SRCS = xvkbd.c findwidget.c -+OBJS = xvkbd.o findwidget.o -+DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXPMLIB) $(EXTRAXAWCLIENTDEPLIBS) $(DEPXLIB) -+SYS_LIBRARIES = $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) -+ -+D_XTEST = -DUSE_XTEST -+SYS_LIBRARIES = $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) -lXtst -+ -+D_I18N = -DUSE_I18N -+ -+DEFINES = $(D_XAW3D) $(D_XTEST) $(D_I18N) -+ -+xvkbd.o: xvkbd.c resources.h XVkbd-common.h -+ $(RM) $@ -+ $(CC) -c $(CFLAGS) $*.c -+ -+ PROGRAM = xvkbd -+ -+all:: xvkbd -+ -+xvkbd: $(OBJS) $(DEPLIBS) -+ $(RM) $@ -+ $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) -+ -+install:: xvkbd -+ @if [ -d $(DESTDIR)$(BINDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(BINDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(BINDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) xvkbd $(DESTDIR)$(BINDIR)/xvkbd -+ -+all:: xvkbd.$(MANNEWSUFFIX) -+ -+xvkbd.$(MANNEWSUFFIX): xvkbd.$(MANSRCSUFFIX) -+ $(RM) $@ -+ if test -z "$(PREPROCESSMANPAGES)" ; then \ -+ cd `dirname xvkbd` && \ -+ $(LN) `basename xvkbd.$(MANSRCSUFFIX)` `basename $@`; \ -+ else \ -+ $(RAWCPP) $(MANDEFS) $(EXTRAMANDEFS) \ -+ < xvkbd.$(MANSRCSUFFIX) | sed -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^#line *[0-9][0-9]* *.*$$/d' -e '/^[ ]*XCOMM$$/s/XCOMM/#/' -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' -e '/^[ ]*XHASH/s/XHASH/#/' -e '/\@\@$$/s/\@\@$$/\\/' >$@; \ -+ fi -+ -+cleandir:: -+ $(RM) xvkbd.$(MANNEWSUFFIX) -+ -+install.man:: xvkbd.$(MANNEWSUFFIX) -+ @if [ -d $(DESTDIR)$(MANDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(MANDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(MANDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) xvkbd.$(MANNEWSUFFIX) $(DESTDIR)$(MANDIR)/xvkbd.$(MANSUFFIX) -+ -+depend:: -+ $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS) -+ -+lint: -+ $(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS) -+lint1: -+ $(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS) -+ -+cleandir:: -+ $(RM) xvkbd -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-belgian.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-belgian.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-belgian -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-common.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-common.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-common -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-danish.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-danish.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-danish -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-fitaly.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-fitaly.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-fitaly -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-french.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-french.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-french -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-french2.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-french2.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-french2 -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-german.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-german.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-german -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-greek.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-greek.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-greek -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-hebrew.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-hebrew.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-hebrew -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-icelandic.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-icelandic.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-icelandic -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-italian.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-italian.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-italian -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-jisx6002.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-jisx6002.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-jisx6002 -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-jisx6004.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-jisx6004.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-jisx6004 -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-korean.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-korean.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-korean -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-latin1.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-latin1.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-latin1 -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-norwegian.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-norwegian.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-norwegian -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-portuguese.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-portuguese.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-portuguese -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-slovene.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-slovene.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-slovene -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-small.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-small.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-small -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-spanish.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-spanish.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-spanish -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-swedish.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-swedish.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-swedish -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-swissgerman.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-swissgerman.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-swissgerman -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-turkish.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-turkish.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-turkish -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-uk.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-uk.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-uk -+ -+# ============================ -+# These rules are only for me -+ -+_distclean: cleandir -+ -rm Makefile -+ -+XVkbd-common.h: XVkbd-common.ad -+ -which ad2c > /dev/null && ad2c XVkbd-common.ad > XVkbd-common.h -+ -+HTML = $(HOME)/public_html/homepage3.nifty.com/xvkbd/index.html -+_readme: -+ -[ -f $(HTML) ] && html2man $(HTML) > xvkbd.man -+ ( echo ".pl 10000"; echo ".ll 75"; echo ".hy 0"; echo ".ad l" ) | cat - xvkbd.man | groff -Tascii -man | sed 's/.//g' | head -9000 | cat -s | tail +3 > README -+ -+# ============================ -+ -+# ---------------------------------------------------------------------- -+# common rules for all Makefiles - do not edit -+ -+.c.i: -+ $(RM) $@ -+ $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@ -+ -+.SUFFIXES: .ii -+ -+.cc.ii: -+ $(RM) $@ -+ $(CC) -E $(CFLAGS) $(_NOOP_) $*.cc > $@ -+ -+.SUFFIXES: .s -+ -+.c.s: -+ $(RM) $@ -+ $(CC) -S $(CFLAGS) $(_NOOP_) $*.c -+ -+.cc.s: -+ $(RM) $@ -+ $(CC) -S $(CFLAGS) $(_NOOP_) $*.cc -+ -+emptyrule:: -+ -+cleandir:: -+ $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* -+ -+Makefile:: -+ -@if [ -f Makefile ]; then set -x; \ -+ $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \ -+ else exit 0; fi -+ $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) -+ -+tags:: -+ $(TAGS) -w *.[ch] -+ $(TAGS) -xw *.[ch] > TAGS -+ -+man_keywords:: -+ -+html_index:: -+ -+clean:: cleandir -+ -+distclean:: cleandir -+ -+# ---------------------------------------------------------------------- -+# empty rules for directories that do not have SUBDIRS - do not edit -+ -+install:: -+ @echo "install in $(CURRENT_DIR) done" -+ -+install.man:: -+ @echo "install.man in $(CURRENT_DIR) done" -+ -+install.sdk:: -+ @echo "install.sdk in $(CURRENT_DIR) done" -+ -+Makefiles:: -+ -+includes:: -+ -+depend:: -+ -+distclean:: -+ $(RM) Makefile Makefile.dep -+ -+# ---------------------------------------------------------------------- -+# dependencies generated by makedepend -+ diff --git a/buildroot/package/xvkbd/xvkbd.hash b/buildroot/package/xvkbd/xvkbd.hash index 18148e5e0..dd6ed79b9 100644 --- a/buildroot/package/xvkbd/xvkbd.hash +++ b/buildroot/package/xvkbd/xvkbd.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 895f768269820e7c0379b0daac3687bda0c670d192ebb7e61e5613a5939ec90b xvkbd-3.7.tar.gz +sha256 eb54e440badc40299ba9a8f27fcea740cd3501310e8955651af7ade517a3ac82 xvkbd-4.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 af0d9b39a91d2779e9758d8dacc24d466bea124c1d401687bddc48543516cd68 README diff --git a/buildroot/package/xvkbd/xvkbd.mk b/buildroot/package/xvkbd/xvkbd.mk index 132d7e1f0..1d056c1c4 100644 --- a/buildroot/package/xvkbd/xvkbd.mk +++ b/buildroot/package/xvkbd/xvkbd.mk @@ -4,21 +4,12 @@ # ################################################################################ -XVKBD_VERSION = 3.7 +XVKBD_VERSION = 4.0 XVKBD_SITE = http://t-sato.in.coocan.jp/xvkbd XVKBD_LICENSE = GPL-2.0+ -XVKBD_LICENSE_FILES = README - -# Passing USRLIBDIR ensures that the stupid Makefile doesn't add -# /usr/lib to the library search path. -define XVKBD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - USRLIBDIR="$(STAGING_DIR)/usr/lib" -endef - -define XVKBD_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef +XVKBD_LICENSE_FILES = COPYING README +# We're patching Makefile.am +XVKBD_AUTORECONF = YES XVKBD_DEPENDENCIES = \ xlib_libICE \ @@ -31,4 +22,4 @@ XVKBD_DEPENDENCIES = \ xlib_libXt \ xlib_libXtst -$(eval $(generic-package)) +$(eval $(autotools-package)) diff --git a/buildroot/package/xxhash/xxhash.hash b/buildroot/package/xxhash/xxhash.hash index 8a00a427f..097694364 100644 --- a/buildroot/package/xxhash/xxhash.hash +++ b/buildroot/package/xxhash/xxhash.hash @@ -1,4 +1,3 @@ # locally computed -sha256 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95 xxhash-v0.6.5.tar.gz -sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 LICENSE -sha256 8e449f232e2cd984e1d286711653960b4a9a555d90b4dc05fe4f0d7a1838fe1b xxhsum.c +sha256 7e93d28e81c3e95ff07674a400001d0cdf23b7842d49b211e5582d00d8e3ac3e xxhash-0.7.2.tar.gz +sha256 94df5da58df6c83bcc2fc0c84aaad71a0b0fe94625060d6cac000121dda37730 LICENSE diff --git a/buildroot/package/xxhash/xxhash.mk b/buildroot/package/xxhash/xxhash.mk index 9bb259a28..bd51c9bd1 100644 --- a/buildroot/package/xxhash/xxhash.mk +++ b/buildroot/package/xxhash/xxhash.mk @@ -4,10 +4,10 @@ # ################################################################################ -XXHASH_VERSION = v0.6.5 -XXHASH_SITE = $(call github,Cyan4973,xxHash,$(XXHASH_VERSION)) -XXHASH_LICENSE = BSD-2-Clause, GPL-2.0+ -XXHASH_LICENSE_FILES = LICENSE xxhsum.c +XXHASH_VERSION = 0.7.2 +XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION)) +XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) +XXHASH_LICENSE_FILES = LICENSE define XXHASH_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) xxhsum diff --git a/buildroot/package/xz/Config.in b/buildroot/package/xz/Config.in index 70c726695..687bd5548 100644 --- a/buildroot/package/xz/Config.in +++ b/buildroot/package/xz/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_XZ invoked via appropriate symlinks will emulate the behavior of the commands in the lzma package. - http://tukaani.org/xz/ + https://tukaani.org/xz/ diff --git a/buildroot/package/xz/xz.hash b/buildroot/package/xz/xz.hash index 28018c76c..69d1db2f4 100644 --- a/buildroot/package/xz/xz.hash +++ b/buildroot/package/xz/xz.hash @@ -1,8 +1,8 @@ # Locally calculated after checking pgp signature -sha256 fd9ca16de1052aac899ad3495ad20dfa906c27b4a5070102a2ec35ca3a4740c1 xz-5.2.3.tar.bz2 +sha256 3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf xz-5.2.4.tar.bz2 -# Hash for license files -sha256 c4f8e14fafe458d84808a4cd8b69f94673ebe2bf8fc992291629a69ac12218f8 COPYING +# Hash for license files +sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPLv3 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/buildroot/package/xz/xz.mk b/buildroot/package/xz/xz.mk index 6a0dc2581..dbf874e9b 100644 --- a/buildroot/package/xz/xz.mk +++ b/buildroot/package/xz/xz.mk @@ -4,9 +4,9 @@ # ################################################################################ -XZ_VERSION = 5.2.3 +XZ_VERSION = 5.2.4 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 -XZ_SITE = http://tukaani.org/xz +XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ diff --git a/buildroot/package/yad/yad.hash b/buildroot/package/yad/yad.hash index 18392829e..1eee499c7 100644 --- a/buildroot/package/yad/yad.hash +++ b/buildroot/package/yad/yad.hash @@ -1,3 +1,6 @@ # From http://sourceforge.net/projects/yad-dialog/files/ -md5 4e24888712be1e95fd3cea815f19c6cb yad-0.33.1.tar.xz -sha1 b39977128678ca67bf4649929510f729c9cf1e67 yad-0.33.1.tar.xz +md5 82d458a2e1695dd0709f71ad26109812 yad-0.40.0.tar.xz +sha1 4376eb42f8e38972124dc81e534cbdc9088109fb yad-0.40.0.tar.xz + +# Hash for license file +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/yad/yad.mk b/buildroot/package/yad/yad.mk index 01bf334a7..15788efac 100644 --- a/buildroot/package/yad/yad.mk +++ b/buildroot/package/yad/yad.mk @@ -4,7 +4,7 @@ # ################################################################################ -YAD_VERSION = 0.33.1 +YAD_VERSION = 0.40.0 YAD_SOURCE = yad-$(YAD_VERSION).tar.xz YAD_SITE = http://sourceforge.net/projects/yad-dialog/files YAD_LICENSE = GPL-3.0 diff --git a/buildroot/package/yaffs2utils/yaffs2utils.hash b/buildroot/package/yaffs2utils/yaffs2utils.hash index 4e5846e06..547b55c54 100644 --- a/buildroot/package/yaffs2utils/yaffs2utils.hash +++ b/buildroot/package/yaffs2utils/yaffs2utils.hash @@ -1,2 +1,3 @@ # locally computed sha256 9b0912bf683eb839b6e57c9255c83894c3b700d16489a49d319c54c1abf8f6d7 0.2.9.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/yajl/yajl.hash b/buildroot/package/yajl/yajl.hash index ed4a0502f..47b0986cd 100644 --- a/buildroot/package/yajl/yajl.hash +++ b/buildroot/package/yajl/yajl.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a yajl-2.1.0.tar.gz +sha256 3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a yajl-2.1.0.tar.gz +sha256 054bf2c11686c5442850b1da58ad592e3d1d2a236a362e67279b957f8e662f5a COPYING diff --git a/buildroot/package/yaml-cpp/yaml-cpp.hash b/buildroot/package/yaml-cpp/yaml-cpp.hash index b2c021410..2f7a6fc63 100644 --- a/buildroot/package/yaml-cpp/yaml-cpp.hash +++ b/buildroot/package/yaml-cpp/yaml-cpp.hash @@ -1,3 +1,3 @@ # locally computed -sha256 e4d8560e163c3d875fd5d9e5542b5fd5bec810febdcba61481fe5fc4e6b1fd05 yaml-cpp-0.6.2.tar.gz +sha256 77ea1b90b3718aa0c324207cb29418f5bced2354c2e483a9523d98c3460af1ed yaml-cpp-0.6.3.tar.gz sha256 aa6fcc27be034e41e21dd832f9175bfe694a48491d9e14ff0fa278e19ad14f1b LICENSE diff --git a/buildroot/package/yaml-cpp/yaml-cpp.mk b/buildroot/package/yaml-cpp/yaml-cpp.mk index 97021ea42..906e554ed 100644 --- a/buildroot/package/yaml-cpp/yaml-cpp.mk +++ b/buildroot/package/yaml-cpp/yaml-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -YAML_CPP_VERSION = 0.6.2 +YAML_CPP_VERSION = 0.6.3 YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,yaml-cpp-$(YAML_CPP_VERSION)) YAML_CPP_INSTALL_STAGING = YES YAML_CPP_LICENSE = MIT diff --git a/buildroot/package/yasm/yasm.hash b/buildroot/package/yasm/yasm.hash index 016c15b90..c343d32d0 100644 --- a/buildroot/package/yasm/yasm.hash +++ b/buildroot/package/yasm/yasm.hash @@ -1,2 +1,7 @@ # Locally computed: -sha256 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f yasm-1.3.0.tar.gz +sha256 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f yasm-1.3.0.tar.gz +sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 COPYING +sha256 a84b45f23040624681ca6974ff48d8ef6b477a1cb51e4a1c842e49d00c231e0d BSD.txt +sha256 b7fd9b73ea99602016a326e0b62e6646060d18febdd065ceca8bb482208c3d88 Artistic.txt +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 GNU_GPL-2.0 +sha256 1faefae1fe8838a2e48864df7d1376e421a50c551c5ae2f60c9f2093206e18a9 GNU_LGPL-2.0 diff --git a/buildroot/package/ympd/Config.in b/buildroot/package/ympd/Config.in index 39b3a86d0..0a1c2b2fa 100644 --- a/buildroot/package/ympd/Config.in +++ b/buildroot/package/ympd/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_YMPD ympd, a standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS + https://www.ympd.org/ + comment "ympd needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/ympd/ympd.hash b/buildroot/package/ympd/ympd.hash index 6d45d6386..1157267c9 100644 --- a/buildroot/package/ympd/ympd.hash +++ b/buildroot/package/ympd/ympd.hash @@ -1,3 +1,3 @@ # locally computed -sha256 d9f68920cd93d1cfa971e1d7b9162a2b1724909bc9753c1338cecb3688d234d5 ympd-v1.3.0.tar.gz +sha256 d9f68920cd93d1cfa971e1d7b9162a2b1724909bc9753c1338cecb3688d234d5 ympd-1.3.0.tar.gz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE diff --git a/buildroot/package/ympd/ympd.mk b/buildroot/package/ympd/ympd.mk index 6c0f3224c..027dc1ca0 100644 --- a/buildroot/package/ympd/ympd.mk +++ b/buildroot/package/ympd/ympd.mk @@ -4,8 +4,8 @@ # ################################################################################ -YMPD_VERSION = v1.3.0 -YMPD_SITE = $(call github,notandy,ympd,$(YMPD_VERSION)) +YMPD_VERSION = 1.3.0 +YMPD_SITE = $(call github,notandy,ympd,v$(YMPD_VERSION)) YMPD_LICENSE = GPL-2.0 YMPD_LICENSE_FILES = LICENSE YMPD_DEPENDENCIES = libmpdclient diff --git a/buildroot/package/ytree/0001-fix-musl.patch b/buildroot/package/ytree/0001-fix-musl.patch new file mode 100644 index 000000000..0a2474466 --- /dev/null +++ b/buildroot/package/ytree/0001-fix-musl.patch @@ -0,0 +1,26 @@ +Fix musl build + +Fixes + + match.c.text+0x9c): undefined reference to `re_comp' + match.c.text+0xca): undefined reference to `re_exec' + +by forcing to use the 'modern' regex methods implementation instead of +the obsolete re_comp/re_exec ([1]) one? + +[1] http://man7.org/linux/man-pages/man3/re_comp.3.html + +Signed-off-by: Bernd Kuhls + +diff -uNr ytree-1.99pl2.orig/match.c ytree-1.99pl2/match.c +--- ytree-1.99pl2.orig/match.c 2019-09-29 12:37:57.000000000 +0200 ++++ ytree-1.99pl2/match.c 2019-10-01 19:46:56.193815327 +0200 +@@ -10,7 +10,7 @@ + #include "ytree.h" + + #if defined( sun ) || defined( linux ) || defined( __NeXT__ ) || defined( OSF1 ) || defined( __OpenBSD__ ) || defined(__NetBSD__) || defined( __FreeBSD__ ) || defined( __GNU__ ) +-#define HAS_REGEX ++#define HAS_REGCOMP + #endif + + #ifdef linux diff --git a/buildroot/package/ytree/Config.in b/buildroot/package/ytree/Config.in new file mode 100644 index 000000000..3ac9283a5 --- /dev/null +++ b/buildroot/package/ytree/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_YTREE + bool "ytree" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_NCURSES + help + Ytree - a (curses-based) file manager similar to DOS Xtree(tm) + + https://www.han.de/~werner/ytree.html diff --git a/buildroot/package/ytree/ytree.hash b/buildroot/package/ytree/ytree.hash new file mode 100644 index 000000000..34ec8fefd --- /dev/null +++ b/buildroot/package/ytree/ytree.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 da8ecaf8e15f8b0d3077ea88da8db9cd607f72ed2a51e91a24d6ef3ff017c6bf ytree-2.00.tar.gz +sha256 eb6bf7204569b4fe8eaf9d4dffc57e44047c5efb5deba1b2d99069ddbc99d031 COPYING diff --git a/buildroot/package/ytree/ytree.mk b/buildroot/package/ytree/ytree.mk new file mode 100644 index 000000000..5a90264f4 --- /dev/null +++ b/buildroot/package/ytree/ytree.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# ytree +# +################################################################################ + +YTREE_VERSION = 2.00 +YTREE_SITE = https://www.han.de/~werner +YTREE_LICENSE = GPL-2.0+ +YTREE_LICENSE_FILES = COPYING +YTREE_DEPENDENCIES = ncurses + +YTREE_CFLAGS = -DCOLOR_SUPPORT $(TARGET_CFLAGS) +YTREE_LDFLAGS = -lncurses $(TARGET_LDFLAGS) + +ifeq ($(BR2_PACKAGE_READLINE),y) +YTREE_DEPENDENCIES += host-pkgconf readline +YTREE_CFLAGS += -DREADLINE_SUPPORT +YTREE_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs readline` +endif + +define YTREE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(YTREE_CFLAGS)" LDFLAGS="$(YTREE_LDFLAGS)" +endef + +define YTREE_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install +endef + +$(eval $(generic-package)) diff --git a/buildroot/package/zbar/Config.in b/buildroot/package/zbar/Config.in index e850c1f02..0f4d11574 100644 --- a/buildroot/package/zbar/Config.in +++ b/buildroot/package/zbar/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_ZBAR depends on BR2_TOOLCHAIN_HAS_THREADS # libv4l depends on BR2_USE_MMU # libv4l depends on BR2_INSTALL_LIBSTDCPP # libv4l - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # v4l2_query_ext_ctrl + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libv4l select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBV4L help @@ -11,7 +11,7 @@ config BR2_PACKAGE_ZBAR https://git.linuxtv.org/zbar.git/about/ -comment "zbar needs a toolchain w/ threads, C++ and headers >= 3.17" +comment "zbar needs a toolchain w/ threads, C++ and headers >= 3.0" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/buildroot/package/zbar/zbar.hash b/buildroot/package/zbar/zbar.hash index 6735bc67d..eae5b7ebf 100644 --- a/buildroot/package/zbar/zbar.hash +++ b/buildroot/package/zbar/zbar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 94c71c6110c705f07ba5ba2803583d09b3853e8773169c86bdcf831443156aaa zbar-57d601e82089f2f31de9e1683c3834f237421f5d.tar.gz -sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 LICENSE +sha256 e99fb8f3be85a76fe24784ad67fecb2da3a02b1e432696b05eefe212d448ad2e zbar-0.23.tar.bz2 +sha256 44260f9252c7fe38ba8dfb645330504f4a375e3a5e9dd7d5d6b9f04adb4952f1 LICENSE.md diff --git a/buildroot/package/zbar/zbar.mk b/buildroot/package/zbar/zbar.mk index c3f0797c5..0550f3e23 100644 --- a/buildroot/package/zbar/zbar.mk +++ b/buildroot/package/zbar/zbar.mk @@ -4,12 +4,12 @@ # ################################################################################ -ZBAR_VERSION = 57d601e82089f2f31de9e1683c3834f237421f5d -ZBAR_SITE = git://linuxtv.org/zbar.git +ZBAR_VERSION = 0.23 +ZBAR_SOURCE = zbar-$(ZBAR_VERSION).tar.bz2 +ZBAR_SITE = https://www.linuxtv.org/downloads/zbar ZBAR_LICENSE = LGPL-2.1+ -ZBAR_LICENSE_FILES = LICENSE +ZBAR_LICENSE_FILES = LICENSE.md ZBAR_INSTALL_STAGING = YES -ZBAR_AUTORECONF = YES ZBAR_DEPENDENCIES = libv4l jpeg # add host-gettext for AM_ICONV macro ZBAR_DEPENDENCIES += host-gettext @@ -21,8 +21,15 @@ ZBAR_CONF_OPTS = \ --without-qt \ --without-qt5 \ --without-gtk \ - --without-python2 \ + --without-python \ --without-x \ --without-java +ifeq ($(BR2_PACKAGE_DBUS),y) +ZBAR_DEPENDENCIES += dbus +ZBAR_CONF_OPTS += --with-dbus +else +ZBAR_CONF_OPTS += --without-dbus +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/zd1211-firmware/Config.in b/buildroot/package/zd1211-firmware/Config.in index 4469533b0..807c26f53 100644 --- a/buildroot/package/zd1211-firmware/Config.in +++ b/buildroot/package/zd1211-firmware/Config.in @@ -2,3 +2,5 @@ config BR2_PACKAGE_ZD1211_FIRMWARE bool "zd1211-firmware" help Firmware for the ZyDAS ZD1211 / Atheros AR5007UG wifi devices. + + https://sourceforge.net/projects/zd1211/ diff --git a/buildroot/package/zd1211-firmware/zd1211-firmware.hash b/buildroot/package/zd1211-firmware/zd1211-firmware.hash index d26858b2d..2b59b8ac2 100644 --- a/buildroot/package/zd1211-firmware/zd1211-firmware.hash +++ b/buildroot/package/zd1211-firmware/zd1211-firmware.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1 zd1211-firmware-1.4.tar.bz2 +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/buildroot/package/zeromq/0001-acinclude.m4-add-latomic-to-PKGCFG_LIBS_PRIVATE.patch b/buildroot/package/zeromq/0001-acinclude.m4-add-latomic-to-PKGCFG_LIBS_PRIVATE.patch new file mode 100644 index 000000000..49f753b27 --- /dev/null +++ b/buildroot/package/zeromq/0001-acinclude.m4-add-latomic-to-PKGCFG_LIBS_PRIVATE.patch @@ -0,0 +1,36 @@ +From d59dcbcaebd91ca30a0f866403c383177a4843f8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 12 Jan 2020 10:10:15 +0100 +Subject: [PATCH] acinclude.m4: add -latomic to PKGCFG_LIBS_PRIVATE + +Add -latomic to PKGCFG_LIBS_PRIVATE so applications linking statically +with libzmq (such czmq) will know that they have to link with -latomic +and the following build failure will be avoided: + + CCLD src/czmq_selftest +/home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/7.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/run/instance-3/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libzmq.a(src_libzmq_la-ctx.o): in function `zmq::ctx_t::create_socket(int)': +ctx.cpp:(.text+0x1710): undefined reference to `__atomic_fetch_add_4' + +Fixes: + - http://autobuild.buildroot.org/results/4a12f1ede260cd956a0b5ccb4eec6ca8b44cb04f + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/zeromq/libzmq/commit/d59dcbcaebd91ca30a0f866403c383177a4843f8] +--- + acinclude.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 8c042ca50..387a3d2a1 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -691,7 +691,7 @@ int main (int, char **) + return t; + } + ])], +- [AC_MSG_RESULT(yes) ; libzmq_cv_has_atomic_instrisics="yes" ; $1], ++ [AC_MSG_RESULT(yes) ; libzmq_cv_has_atomic_instrisics="yes" PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -latomic" ; $1], + [AC_MSG_RESULT(no) ; libzmq_cv_has_atomic_instrisics="no" LIBS=$save_LIBS ; $2]) + fi + }]) diff --git a/buildroot/package/zeromq/zeromq.mk b/buildroot/package/zeromq/zeromq.mk index 2c2e3e45b..04f7e7d3f 100644 --- a/buildroot/package/zeromq/zeromq.mk +++ b/buildroot/package/zeromq/zeromq.mk @@ -11,6 +11,8 @@ ZEROMQ_DEPENDENCIES = util-linux ZEROMQ_CONF_OPTS = --without-documentation ZEROMQ_LICENSE = LGPL-3.0+ with exceptions ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER +# We're patching acinclude.m4 +ZEROMQ_AUTORECONF = YES # Assume these flags are always available. It is true, at least for # SOCK_CLOEXEC, since linux v2.6.27. diff --git a/buildroot/package/zic/zic.hash b/buildroot/package/zic/zic.hash index 6b7994731..cb6300e85 100644 --- a/buildroot/package/zic/zic.hash +++ b/buildroot/package/zic/zic.hash @@ -1,2 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2018-May/000050.html -sha512 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717 tzcode2018e.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2019-September/000057.html +sha512 61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b tzcode2019c.tar.gz +# Locally computed: +sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/buildroot/package/zic/zic.mk b/buildroot/package/zic/zic.mk index 224b7ab40..baa647915 100644 --- a/buildroot/package/zic/zic.mk +++ b/buildroot/package/zic/zic.mk @@ -4,11 +4,12 @@ # ################################################################################ -ZIC_VERSION = 2018e +ZIC_VERSION = 2019c ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz -ZIC_SITE = http://www.iana.org/time-zones/repository/releases +ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 ZIC_LICENSE = Public domain +ZIC_LICENSE_FILES = LICENSE define HOST_ZIC_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) zic diff --git a/buildroot/package/zip/zip.hash b/buildroot/package/zip/zip.hash index 782ae5ec9..5e1b3353a 100644 --- a/buildroot/package/zip/zip.hash +++ b/buildroot/package/zip/zip.hash @@ -1,2 +1,3 @@ # Locally calculated from download (no sig, hash) sha256 f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 zip30.tgz +sha256 8ecd6c1bab449127eb665cef1561e73a8bce52e217375f6f466939e137b1e110 LICENSE diff --git a/buildroot/package/zip/zip.mk b/buildroot/package/zip/zip.mk index 0bd3d3c11..ca52c74fb 100644 --- a/buildroot/package/zip/zip.mk +++ b/buildroot/package/zip/zip.mk @@ -4,8 +4,9 @@ # ################################################################################ -ZIP_VERSION = 30 -ZIP_SOURCE = zip$(ZIP_VERSION).tgz +ZIP_VERSION = 3.0 +# The version is really 3.0, but the tarball is named zip30.tgz +ZIP_SOURCE = zip$(subst .,,$(ZIP_VERSION)).tgz ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src ZIP_LICENSE = Info-ZIP ZIP_LICENSE_FILES = LICENSE diff --git a/buildroot/package/zlog/0001-fix-compiling-on-Buildroot.patch b/buildroot/package/zlog/0001-fix-compiling-on-Buildroot.patch deleted file mode 100644 index 32aa7d6db..000000000 --- a/buildroot/package/zlog/0001-fix-compiling-on-Buildroot.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a9f6a55bdb29a2bebc96a68ab53077906c25a9df Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Wed, 22 Jan 2014 15:04:42 +0100 -Subject: [PATCH] Fix compiling on Buildroot - -Buildroot always specifies -D_LARGEFILE_SOURCE, -D_LARGEFILE64_SOURCE, --D_FILE_OFFSET_BITS=64, so define them only if they are not already -defined. - -Signed-off-by: Yegor Yefremov ---- - src/fmacros.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/fmacros.h b/src/fmacros.h -index fa37948..059dfeb 100644 ---- a/src/fmacros.h -+++ b/src/fmacros.h -@@ -14,7 +14,11 @@ - #define _XOPEN_SOURCE - #endif - -+#ifndef _LARGEFILE_SOURCE - #define _LARGEFILE_SOURCE -+#endif -+#ifndef _FILE_OFFSET_BITS - #define _FILE_OFFSET_BITS 64 -+#endif - - #endif --- -1.7.7 diff --git a/buildroot/package/zlog/0002-compile-Remove-Werror-and-avoid-build-failures-becau.patch b/buildroot/package/zlog/0002-compile-Remove-Werror-and-avoid-build-failures-becau.patch deleted file mode 100644 index 0f1b91238..000000000 --- a/buildroot/package/zlog/0002-compile-Remove-Werror-and-avoid-build-failures-becau.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4a08c9e07fa8b7a1d6a76b927ea97e3eaa784845 Mon Sep 17 00:00:00 2001 -From: Ezequiel Garcia -Date: Sun, 26 Oct 2014 16:16:25 -0300 -Subject: [PATCH] compile: Remove -Werror and avoid build failures because of - warnings - -Using -Werror on production is a bad idea, as otherwise harmless warnings -get treated as errors breaking builds. This is currently the case with -Nios-II architecture toolchain, warning about a deprecated macro: - -../usr/nios2-buildroot-linux-gnu/sysroot/usr/include/features.h:148:3: -error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp] - # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" - -Instead of trying to fix the macro, let's fix the real issue here, -and remove -Werror. - -Signed-off-by: Ezequiel Garcia ---- - src/makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/makefile b/src/makefile -index 294dc08..4ac4c43 100644 ---- a/src/makefile -+++ b/src/makefile -@@ -32,7 +32,7 @@ ZLOG_MINOR=2 - # Fallback to gcc when $CC is not in $PATH. - CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') - OPTIMIZATION?=-O2 --WARNINGS=-Wall -Werror -Wstrict-prototypes -fwrapv -+WARNINGS=-Wall -Wstrict-prototypes -fwrapv - DEBUG?= -g -ggdb - REAL_CFLAGS=$(OPTIMIZATION) -fPIC -pthread $(CFLAGS) $(WARNINGS) $(DEBUG) - REAL_LDFLAGS=$(LDFLAGS) -pthread --- -2.1.0 - diff --git a/buildroot/package/zlog/zlog.hash b/buildroot/package/zlog/zlog.hash index 1de23c9a7..b9f254056 100644 --- a/buildroot/package/zlog/zlog.hash +++ b/buildroot/package/zlog/zlog.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 d3afb1f0ce67df29f759da74235949370ac2818faf242f3f674cb48f9f4c57d3 zlog-6ddb9bbf3ff0123e701bf60996f351576ebe9c00.tar.gz +sha256 05a6533e32f313eeaf134a761481a5cbc586c5dc85ba9ee6771c7458daaeb031 zlog-1.2.14.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/zlog/zlog.mk b/buildroot/package/zlog/zlog.mk index 8e005e434..d9aeae7c7 100644 --- a/buildroot/package/zlog/zlog.mk +++ b/buildroot/package/zlog/zlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLOG_VERSION = 6ddb9bbf3ff0123e701bf60996f351576ebe9c00 +ZLOG_VERSION = 1.2.14 ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) ZLOG_LICENSE = LGPL-2.1 ZLOG_LICENSE_FILES = COPYING diff --git a/buildroot/package/zmqpp/zmqpp.mk b/buildroot/package/zmqpp/zmqpp.mk index ea6b50e82..3cd19d644 100644 --- a/buildroot/package/zmqpp/zmqpp.mk +++ b/buildroot/package/zmqpp/zmqpp.mk @@ -12,15 +12,14 @@ ZMQPP_LICENSE = MPL-2.0 ZMQPP_LICENSE_FILES = LICENSE ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread -ZMQPP_CONFIG = $(if $(BR2_ENABLE_DEBUG),debug,release) # gcc bug internal compiler error: in merge_overlapping_regs, at # regrename.c:304. This bug is fixed since gcc 6. # By setting CONFIG to empty, all optimizations such as -funroll-loops -# -ffast-math -finline-functions -fomit-frame-pointer are disabled -ifeq ($(BR2_or1k):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:) -# check-package OverriddenVariable -ZMQPP_CONFIG = +# -ffast-math -finline-functions -fomit-frame-pointer are disabled, +# so only set CONFIG for the non-affected cases. +ifneq ($(BR2_or1k):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:) +ZMQPP_CONFIG = $(if $(BR2_ENABLE_DEBUG),debug,release) endif ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) diff --git a/buildroot/package/znc/znc.hash b/buildroot/package/znc/znc.hash index 216d105f2..f704e388c 100644 --- a/buildroot/package/znc/znc.hash +++ b/buildroot/package/znc/znc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b1a32921a8e6d79ee6c5900c8d07293026966db7c05aaac48984231befc49b71 znc-1.7.4.tar.gz +sha256 a8941e1385c8654287a4428018d93459482e9d5eeedf86bef7b020ddc5f24721 znc-1.7.5.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/znc/znc.mk b/buildroot/package/znc/znc.mk index 24795886a..3932c9802 100644 --- a/buildroot/package/znc/znc.mk +++ b/buildroot/package/znc/znc.mk @@ -4,40 +4,50 @@ # ################################################################################ -ZNC_VERSION = 1.7.4 +ZNC_VERSION = 1.7.5 ZNC_SITE = http://znc.in/releases/archive ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE ZNC_DEPENDENCIES = host-pkgconf -ZNC_CONF_OPTS = --disable-perl +ZNC_CONF_OPTS = -DWANT_CYRUS=OFF -DWANT_I18N=OFF -DWANT_PERL=OFF + +# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to +# disable a try_run() call in the FindThreads tests, which caused a +# build failure when cross-compiling. +ZNC_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF ifeq ($(BR2_PACKAGE_ICU),y) ZNC_DEPENDENCIES += icu -ZNC_CONF_OPTS += --enable-charset +ZNC_CONF_OPTS += -DWANT_ICU=ON else -ZNC_CONF_OPTS += --disable-charset +ZNC_CONF_OPTS += -DWANT_ICU=OFF endif ifeq ($(BR2_PACKAGE_OPENSSL),y) ZNC_DEPENDENCIES += openssl -ZNC_CONF_OPTS += --enable-openssl +ZNC_CONF_OPTS += -DWANT_OPENSSL=ON else -ZNC_CONF_OPTS += --disable-openssl +ZNC_CONF_OPTS += -DWANT_OPENSSL=OFF endif ifeq ($(BR2_PACKAGE_ZLIB),y) ZNC_DEPENDENCIES += zlib -ZNC_CONF_OPTS += --enable-zlib +ZNC_CONF_OPTS += -DWANT_ZLIB=ON else -ZNC_CONF_OPTS += --disable-zlib +ZNC_CONF_OPTS += -DWANT_ZLIB=OFF endif # python support depends on icu ifeq ($(BR2_PACKAGE_ICU)$(BR2_PACKAGE_PYTHON3),yy) ZNC_DEPENDENCIES += python3 host-swig -ZNC_CONF_OPTS += --enable-python=python3 +ZNC_CONF_OPTS += \ + -DWANT_PYTHON=ON \ + -DWANT_PYTHON_VERSION=python3 \ + -DWANT_SWIG=ON else -ZNC_CONF_OPTS += --disable-python +ZNC_CONF_OPTS += \ + -DWANT_PYTHON=OFF \ + -DWANT_SWIG=OFF endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/buildroot/package/zsh/zsh.hash b/buildroot/package/zsh/zsh.hash index 4363e48af..2df409c94 100644 --- a/buildroot/package/zsh/zsh.hash +++ b/buildroot/package/zsh/zsh.hash @@ -1,7 +1,7 @@ # From http://www.zsh.org/pub/MD5SUM -md5 540673bf823d2e13806ac0395caa8345 zsh-5.6.2.tar.xz +md5 e02a5428620b3dd268800c7843b3dd4d zsh-5.8.tar.xz # Calculated based on the hash above and after checking signature -# http://www.zsh.org/pub/zsh-5.6.2.tar.xz.asc -sha256 a50bd66c0557e8eca3b8fa24e85d0de533e775d7a22df042da90488623752e9e zsh-5.6.2.tar.xz +# http://www.zsh.org/pub/zsh-5.8.tar.xz.asc +sha256 dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27 zsh-5.8.tar.xz # Locally calculated -sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE +sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE diff --git a/buildroot/package/zsh/zsh.mk b/buildroot/package/zsh/zsh.mk index 31c940500..c3d9e5215 100644 --- a/buildroot/package/zsh/zsh.mk +++ b/buildroot/package/zsh/zsh.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSH_VERSION = 5.6.2 +ZSH_VERSION = 5.8 ZSH_SITE = http://www.zsh.org/pub ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses diff --git a/buildroot/package/zstd/zstd.hash b/buildroot/package/zstd/zstd.hash index 95b227098..8a6926131 100644 --- a/buildroot/package/zstd/zstd.hash +++ b/buildroot/package/zstd/zstd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 d6e1559e4cdb7c4226767d4ddc990bff5f9aab77085ff0d0490c828b025e2eea zstd-v1.3.5.tar.gz +sha256 5eda3502ecc285c3c92ee0cc8cd002234dee39d539b3f692997a0e80de1d33de zstd-1.4.3.tar.gz # License files (locally computed as well) sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE diff --git a/buildroot/package/zstd/zstd.mk b/buildroot/package/zstd/zstd.mk index a1a11f9ab..765fa6dd5 100644 --- a/buildroot/package/zstd/zstd.mk +++ b/buildroot/package/zstd/zstd.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZSTD_VERSION = v1.3.5 -ZSTD_SITE = $(call github,facebook,zstd,$(ZSTD_VERSION)) +ZSTD_VERSION = 1.4.3 +ZSTD_SITE = $(call github,facebook,zstd,v$(ZSTD_VERSION)) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 ZSTD_LICENSE_FILES = LICENSE COPYING diff --git a/buildroot/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch b/buildroot/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch new file mode 100644 index 000000000..90b232038 --- /dev/null +++ b/buildroot/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch @@ -0,0 +1,43 @@ +From 9e5dfa57f3b998bc3049bfa893b20e81dea656df Mon Sep 17 00:00:00 2001 +From: Yuri +Date: Sat, 20 Apr 2019 07:28:26 -0700 +Subject: [PATCH] Link library with OpenCV, not only the executable, make libs + PRIVATE. + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/86] +--- + CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 738f4e1..efe3aee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,10 +60,12 @@ include_directories(core/src) + add_library(libzxing ${LIBZXING_FILES}) + set_target_properties(libzxing PROPERTIES PREFIX "") + ++set(libzxing_LIBS "") ++ + find_package(Iconv) + if(ICONV_FOUND) + include_directories(${ICONV_INCLUDE_DIR}) +- target_link_libraries(libzxing ${ICONV_LIBRARIES}) ++ set(libzxing_LIBS ${libzxing_LIBS} ${ICONV_LIBRARIES}) + else() + add_definitions(-DNO_ICONV=1) + endif() +@@ -75,9 +77,12 @@ if(OpenCV_FOUND) + "./opencv-cli/src/*.h" + ) + add_executable(zxing-cv ${OPENCV_ZXING_FILES}) ++ set(libzxing_LIBS ${libzxing_LIBS} ${OpenCV_LIBRARIES}) + target_link_libraries(zxing-cv libzxing ${OpenCV_LIBRARIES}) + endif() + ++target_link_libraries(libzxing PRIVATE ${libzxing_LIBS}) ++ + # Add cli executable. + file(GLOB_RECURSE ZXING_FILES + "./cli/src/*.cpp" diff --git a/buildroot/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch b/buildroot/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch new file mode 100644 index 000000000..31753d7c2 --- /dev/null +++ b/buildroot/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch @@ -0,0 +1,39 @@ +From fe740316af970f57ec511cdeafb512510e4842a9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 9 Nov 2019 17:21:13 +0100 +Subject: [PATCH] CMakeLists.txt: add BUILD_OPENCV option + +Add BUILD_OPENCV option to allow the user to disable OpenCV. It is +especially useful as opencv library can be built without highgui support + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/90] +--- + CMakeLists.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 738f4e1..12913cd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.0) + project(zxing) + + option(BUILD_TESTING "Enable generation of test targets" OFF) ++option(BUILD_OPENCV "Enable OpenCV classes and OpenCV cli executable" ON) + + set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH}) + +@@ -44,8 +45,10 @@ else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + endif() + +-# OpenCV classes +-find_package(OpenCV) ++if (BUILD_OPENCV) ++ # OpenCV classes ++ find_package(OpenCV) ++endif() + if(OpenCV_FOUND) + list(APPEND LIBZXING_FILES + opencv/src/zxing/MatSource.cpp diff --git a/buildroot/package/zxing-cpp/zxing-cpp.hash b/buildroot/package/zxing-cpp/zxing-cpp.hash index 4625fbf61..f12349bbd 100644 --- a/buildroot/package/zxing-cpp/zxing-cpp.hash +++ b/buildroot/package/zxing-cpp/zxing-cpp.hash @@ -1,2 +1,5 @@ # Locally calculated -sha256 643c931a35c363109cd38c5a1526505b75f57c0634907cb7b6bc24f6f48eb32b zxing-cpp-0db7f855135222becff193671faae79c083424b6.tar.gz +sha256 4c2b8601d0e3377143c1a0bbab220146af9fa5a5e29e8fbef42862fe3d38f8e6 zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10.tar.gz + +# License files +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 COPYING diff --git a/buildroot/package/zxing-cpp/zxing-cpp.mk b/buildroot/package/zxing-cpp/zxing-cpp.mk index 7113ae2b0..c138c925b 100644 --- a/buildroot/package/zxing-cpp/zxing-cpp.mk +++ b/buildroot/package/zxing-cpp/zxing-cpp.mk @@ -4,15 +4,23 @@ # ################################################################################ -ZXING_CPP_VERSION = 0db7f855135222becff193671faae79c083424b6 +ZXING_CPP_VERSION = e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10 ZXING_CPP_SITE = $(call github,glassechidna,zxing-cpp,$(ZXING_CPP_VERSION)) ZXING_CPP_LICENSE = Apache-2.0 ZXING_CPP_LICENSE_FILES = COPYING ZXING_CPP_INSTALL_STAGING = YES ZXING_CPP_SUPPORTS_IN_SOURCE_BUILD = NO +ZXING_CPP_CONF_OPTS = -DBUILD_TESTING=OFF ifeq ($(BR2_PACKAGE_LIBICONV),y) ZXING_CPP_DEPENDENCIES += libiconv endif +ifeq ($(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),y) +ZXING_CPP_DEPENDENCIES += opencv +ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON +else +ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/zynq-boot-bin/zynq-boot-bin.mk b/buildroot/package/zynq-boot-bin/zynq-boot-bin.mk index c56203fb6..deba5f409 100644 --- a/buildroot/package/zynq-boot-bin/zynq-boot-bin.mk +++ b/buildroot/package/zynq-boot-bin/zynq-boot-bin.mk @@ -4,9 +4,9 @@ # ################################################################################ -ZYNQ_BOOT_BIN_VERSION = xilinx-v2015.1 +ZYNQ_BOOT_BIN_VERSION = 2015.1 ZYNQ_BOOT_BIN_SOURCE = zynq-boot-bin.py -ZYNQ_BOOT_BIN_SITE = https://raw.githubusercontent.com/Xilinx/u-boot-xlnx/$(ZYNQ_BOOT_BIN_VERSION)/tools +ZYNQ_BOOT_BIN_SITE = https://raw.githubusercontent.com/Xilinx/u-boot-xlnx/xilinx-v$(ZYNQ_BOOT_BIN_VERSION)/tools ZYNQ_BOOT_BIN_LICENSE = GPL-3.0+ HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python diff --git a/buildroot/package/zyre/zyre.hash b/buildroot/package/zyre/zyre.hash index 8cc860232..289341f49 100644 --- a/buildroot/package/zyre/zyre.hash +++ b/buildroot/package/zyre/zyre.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 b978a999947ddb6722d956db2427869b313225e50518c4fbbf960a68109e3e91 zyre-v2.0.0.tar.gz +sha256 b978a999947ddb6722d956db2427869b313225e50518c4fbbf960a68109e3e91 zyre-2.0.0.tar.gz +sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 LICENSE diff --git a/buildroot/package/zyre/zyre.mk b/buildroot/package/zyre/zyre.mk index 82a0f517c..21224d6bb 100644 --- a/buildroot/package/zyre/zyre.mk +++ b/buildroot/package/zyre/zyre.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZYRE_VERSION = v2.0.0 -ZYRE_SITE = $(call github,zeromq,zyre,$(ZYRE_VERSION)) +ZYRE_VERSION = 2.0.0 +ZYRE_SITE = $(call github,zeromq,zyre,v$(ZYRE_VERSION)) ZYRE_LICENSE = MPL-2.0 ZYRE_LICENSE_FILES = LICENSE ZYRE_INSTALL_STAGING = YES diff --git a/buildroot/package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch b/buildroot/package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch new file mode 100644 index 000000000..1c352236a --- /dev/null +++ b/buildroot/package/zziplib/0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch @@ -0,0 +1,74 @@ +From 9411bde3e4a70a81ff3ffd256b71927b2d90dcbb Mon Sep 17 00:00:00 2001 +From: jmoellers +Date: Fri, 7 Sep 2018 11:32:04 +0200 +Subject: [PATCH] Avoid memory leak from __zzip_parse_root_directory(). + +[Retrieved (and slightly updated to remove test.zip) from: +https://github.com/gdraheim/zziplib/commit/9411bde3e4a70a81ff3ffd256b71927b2d90dcbb] +Signed-off-by: Fabrice Fontaine +--- + test/test.zip | Bin 1361 -> 1361 bytes + zzip/zip.c | 36 ++++++++++++++++++++++++++++++++++-- + 2 files changed, 34 insertions(+), 2 deletions(-) + +diff --git a/zzip/zip.c b/zzip/zip.c +index 88b833b..a685280 100644 +--- a/zzip/zip.c ++++ b/zzip/zip.c +@@ -475,9 +475,15 @@ __zzip_parse_root_directory(int fd, + } else + { + if (io->fd.seeks(fd, zz_rootseek + zz_offset, SEEK_SET) < 0) ++ { ++ free(hdr0); + return ZZIP_DIR_SEEK; ++ } + if (io->fd.read(fd, &dirent, sizeof(dirent)) < __sizeof(dirent)) ++ { ++ free(hdr0); + return ZZIP_DIR_READ; ++ } + d = &dirent; + } + +@@ -577,12 +583,38 @@ __zzip_parse_root_directory(int fd, + + if (hdr_return) + *hdr_return = hdr0; ++ else ++ { ++ /* If it is not assigned to *hdr_return, it will never be free()'d */ ++ free(hdr0); ++ /* Make sure we don't free it again in case of error */ ++ hdr0 = NULL; ++ } + } /* else zero (sane) entries */ + # ifndef ZZIP_ALLOW_MODULO_ENTRIES +- return (entries != zz_entries ? ZZIP_CORRUPTED : 0); ++ if (entries != zz_entries) ++ { ++ /* If it was assigned to *hdr_return, undo assignment */ ++ if (p_reclen && hdr_return) ++ *hdr_return = NULL; ++ /* Free it, if it was not already free()'d */ ++ if (hdr0 != NULL) ++ free(hdr0); ++ return ZZIP_CORRUPTED; ++ } + # else +- return ((entries & (unsigned)0xFFFF) != zz_entries ? ZZIP_CORRUPTED : 0); ++ if (((entries & (unsigned)0xFFFF) != zz_entries) ++ { ++ /* If it was assigned to *hdr_return, undo assignment */ ++ if (p_reclen && hdr_return) ++ *hdr_return = NULL; ++ /* Free it, if it was not already free()'d */ ++ if (hdr0 != NULL) ++ free(hdr0); ++ return ZZIP_CORRUPTED; ++ } + # endif ++ return 0; + } + + /* ------------------------- high-level interface ------------------------- */ diff --git a/buildroot/package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch b/buildroot/package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch new file mode 100644 index 000000000..b0e8858f6 --- /dev/null +++ b/buildroot/package/zziplib/0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch @@ -0,0 +1,53 @@ +From d2e5d5c53212e54a97ad64b793a4389193fec687 Mon Sep 17 00:00:00 2001 +From: jmoellers +Date: Fri, 7 Sep 2018 11:49:28 +0200 +Subject: [PATCH] Avoid memory leak from __zzip_parse_root_directory(). + +[Retrieved from: +https://github.com/gdraheim/zziplib/commit/d2e5d5c53212e54a97ad64b793a4389193fec687] +Signed-off-by: Fabrice Fontaine +--- + zzip/zip.c | 25 ++----------------------- + 1 file changed, 2 insertions(+), 23 deletions(-) + +diff --git a/zzip/zip.c b/zzip/zip.c +index a685280..51a1a4d 100644 +--- a/zzip/zip.c ++++ b/zzip/zip.c +@@ -587,34 +587,13 @@ __zzip_parse_root_directory(int fd, + { + /* If it is not assigned to *hdr_return, it will never be free()'d */ + free(hdr0); +- /* Make sure we don't free it again in case of error */ +- hdr0 = NULL; + } + } /* else zero (sane) entries */ + # ifndef ZZIP_ALLOW_MODULO_ENTRIES +- if (entries != zz_entries) +- { +- /* If it was assigned to *hdr_return, undo assignment */ +- if (p_reclen && hdr_return) +- *hdr_return = NULL; +- /* Free it, if it was not already free()'d */ +- if (hdr0 != NULL) +- free(hdr0); +- return ZZIP_CORRUPTED; +- } ++ return (entries != zz_entries) ? ZZIP_CORRUPTED : 0; + # else +- if (((entries & (unsigned)0xFFFF) != zz_entries) +- { +- /* If it was assigned to *hdr_return, undo assignment */ +- if (p_reclen && hdr_return) +- *hdr_return = NULL; +- /* Free it, if it was not already free()'d */ +- if (hdr0 != NULL) +- free(hdr0); +- return ZZIP_CORRUPTED; +- } ++ return ((entries & (unsigned)0xFFFF) != zz_entries) ? ZZIP_CORRUPTED : 0; + # endif +- return 0; + } + + /* ------------------------- high-level interface ------------------------- */ diff --git a/buildroot/package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch b/buildroot/package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch new file mode 100644 index 000000000..b0506f0cf --- /dev/null +++ b/buildroot/package/zziplib/0003-One-more-free-to-avoid-memory-leak.patch @@ -0,0 +1,25 @@ +From 0e1dadb05c1473b9df2d7b8f298dab801778ef99 Mon Sep 17 00:00:00 2001 +From: jmoellers +Date: Fri, 7 Sep 2018 13:55:35 +0200 +Subject: [PATCH] One more free() to avoid memory leak. + +[Retrieved from: +https://github.com/gdraheim/zziplib/commit/0e1dadb05c1473b9df2d7b8f298dab801778ef99] +Signed-off-by: Fabrice Fontaine +--- + zzip/zip.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/zzip/zip.c b/zzip/zip.c +index 51a1a4d..bc6c080 100644 +--- a/zzip/zip.c ++++ b/zzip/zip.c +@@ -589,6 +589,8 @@ __zzip_parse_root_directory(int fd, + free(hdr0); + } + } /* else zero (sane) entries */ ++ else ++ free(hdr0); + # ifndef ZZIP_ALLOW_MODULO_ENTRIES + return (entries != zz_entries) ? ZZIP_CORRUPTED : 0; + # else diff --git a/buildroot/package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch b/buildroot/package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch new file mode 100644 index 000000000..1554fff99 --- /dev/null +++ b/buildroot/package/zziplib/0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch @@ -0,0 +1,344 @@ +From 81dfa6b3e08f6934885ba5c98939587d6850d08e Mon Sep 17 00:00:00 2001 +From: Josef Moellers +Date: Thu, 4 Oct 2018 14:21:48 +0200 +Subject: [PATCH] Fix issue #62: Remove any "../" components from pathnames of + extracted files. [CVE-2018-17828] + +[Retrieved from: +https://github.com/gdraheim/zziplib/commit/81dfa6b3e08f6934885ba5c98939587d6850d08e] +Signed-off-by: Fabrice Fontaine +--- + bins/unzzipcat-big.c | 57 +++++++++++++++++++++++++++++++++++++++++++- + bins/unzzipcat-mem.c | 57 +++++++++++++++++++++++++++++++++++++++++++- + bins/unzzipcat-mix.c | 57 +++++++++++++++++++++++++++++++++++++++++++- + bins/unzzipcat-zip.c | 57 +++++++++++++++++++++++++++++++++++++++++++- + 4 files changed, 224 insertions(+), 4 deletions(-) + +diff --git a/bins/unzzipcat-big.c b/bins/unzzipcat-big.c +index 982d262..88c4d65 100644 +--- a/bins/unzzipcat-big.c ++++ b/bins/unzzipcat-big.c +@@ -53,6 +53,48 @@ static void unzzip_cat_file(FILE* disk, char* name, FILE* out) + } + } + ++/* ++ * NAME: remove_dotdotslash ++ * PURPOSE: To remove any "../" components from the given pathname ++ * ARGUMENTS: path: path name with maybe "../" components ++ * RETURNS: Nothing, "path" is modified in-place ++ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! ++ * Also, "path" is not used after creating it. ++ * So modifying "path" in-place is safe to do. ++ */ ++static inline void ++remove_dotdotslash(char *path) ++{ ++ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ ++ char *dotdotslash; ++ int warned = 0; ++ ++ dotdotslash = path; ++ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) ++ { ++ /* ++ * Remove only if at the beginning of the pathname ("../path/name") ++ * or when preceded by a slash ("path/../name"), ++ * otherwise not ("path../name..")! ++ */ ++ if (dotdotslash == path || dotdotslash[-1] == '/') ++ { ++ char *src, *dst; ++ if (!warned) ++ { ++ /* Note: the first time through the pathname is still intact */ ++ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); ++ warned = 1; ++ } ++ /* We cannot use strcpy(), as there "The strings may not overlap" */ ++ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) ++ ; ++ } ++ else ++ dotdotslash +=3; /* skip this instance to prevent infinite loop */ ++ } ++} ++ + static void makedirs(const char* name) + { + char* p = strrchr(name, '/'); +@@ -70,6 +112,16 @@ static void makedirs(const char* name) + + static FILE* create_fopen(char* name, char* mode, int subdirs) + { ++ char *name_stripped; ++ FILE *fp; ++ int mustfree = 0; ++ ++ if ((name_stripped = strdup(name)) != NULL) ++ { ++ remove_dotdotslash(name_stripped); ++ name = name_stripped; ++ mustfree = 1; ++ } + if (subdirs) + { + char* p = strrchr(name, '/'); +@@ -79,7 +131,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) + free (dir_name); + } + } +- return fopen(name, mode); ++ fp = fopen(name, mode); ++ if (mustfree) ++ free(name_stripped); ++ return fp; + } + + +diff --git a/bins/unzzipcat-mem.c b/bins/unzzipcat-mem.c +index 9bc966b..793bde8 100644 +--- a/bins/unzzipcat-mem.c ++++ b/bins/unzzipcat-mem.c +@@ -58,6 +58,48 @@ static void unzzip_mem_disk_cat_file(ZZIP_MEM_DISK* disk, char* name, FILE* out) + } + } + ++/* ++ * NAME: remove_dotdotslash ++ * PURPOSE: To remove any "../" components from the given pathname ++ * ARGUMENTS: path: path name with maybe "../" components ++ * RETURNS: Nothing, "path" is modified in-place ++ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! ++ * Also, "path" is not used after creating it. ++ * So modifying "path" in-place is safe to do. ++ */ ++static inline void ++remove_dotdotslash(char *path) ++{ ++ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ ++ char *dotdotslash; ++ int warned = 0; ++ ++ dotdotslash = path; ++ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) ++ { ++ /* ++ * Remove only if at the beginning of the pathname ("../path/name") ++ * or when preceded by a slash ("path/../name"), ++ * otherwise not ("path../name..")! ++ */ ++ if (dotdotslash == path || dotdotslash[-1] == '/') ++ { ++ char *src, *dst; ++ if (!warned) ++ { ++ /* Note: the first time through the pathname is still intact */ ++ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); ++ warned = 1; ++ } ++ /* We cannot use strcpy(), as there "The strings may not overlap" */ ++ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) ++ ; ++ } ++ else ++ dotdotslash +=3; /* skip this instance to prevent infinite loop */ ++ } ++} ++ + static void makedirs(const char* name) + { + char* p = strrchr(name, '/'); +@@ -75,6 +117,16 @@ static void makedirs(const char* name) + + static FILE* create_fopen(char* name, char* mode, int subdirs) + { ++ char *name_stripped; ++ FILE *fp; ++ int mustfree = 0; ++ ++ if ((name_stripped = strdup(name)) != NULL) ++ { ++ remove_dotdotslash(name_stripped); ++ name = name_stripped; ++ mustfree = 1; ++ } + if (subdirs) + { + char* p = strrchr(name, '/'); +@@ -84,7 +136,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) + free (dir_name); + } + } +- return fopen(name, mode); ++ fp = fopen(name, mode); ++ if (mustfree) ++ free(name_stripped); ++ return fp; + } + + static int unzzip_cat (int argc, char ** argv, int extract) +diff --git a/bins/unzzipcat-mix.c b/bins/unzzipcat-mix.c +index 91c2f00..73b6ed6 100644 +--- a/bins/unzzipcat-mix.c ++++ b/bins/unzzipcat-mix.c +@@ -69,6 +69,48 @@ static void unzzip_cat_file(ZZIP_DIR* disk, char* name, FILE* out) + } + } + ++/* ++ * NAME: remove_dotdotslash ++ * PURPOSE: To remove any "../" components from the given pathname ++ * ARGUMENTS: path: path name with maybe "../" components ++ * RETURNS: Nothing, "path" is modified in-place ++ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! ++ * Also, "path" is not used after creating it. ++ * So modifying "path" in-place is safe to do. ++ */ ++static inline void ++remove_dotdotslash(char *path) ++{ ++ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ ++ char *dotdotslash; ++ int warned = 0; ++ ++ dotdotslash = path; ++ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) ++ { ++ /* ++ * Remove only if at the beginning of the pathname ("../path/name") ++ * or when preceded by a slash ("path/../name"), ++ * otherwise not ("path../name..")! ++ */ ++ if (dotdotslash == path || dotdotslash[-1] == '/') ++ { ++ char *src, *dst; ++ if (!warned) ++ { ++ /* Note: the first time through the pathname is still intact */ ++ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); ++ warned = 1; ++ } ++ /* We cannot use strcpy(), as there "The strings may not overlap" */ ++ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) ++ ; ++ } ++ else ++ dotdotslash +=3; /* skip this instance to prevent infinite loop */ ++ } ++} ++ + static void makedirs(const char* name) + { + char* p = strrchr(name, '/'); +@@ -86,6 +128,16 @@ static void makedirs(const char* name) + + static FILE* create_fopen(char* name, char* mode, int subdirs) + { ++ char *name_stripped; ++ FILE *fp; ++ int mustfree = 0; ++ ++ if ((name_stripped = strdup(name)) != NULL) ++ { ++ remove_dotdotslash(name_stripped); ++ name = name_stripped; ++ mustfree = 1; ++ } + if (subdirs) + { + char* p = strrchr(name, '/'); +@@ -95,7 +147,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) + free (dir_name); + } + } +- return fopen(name, mode); ++ fp = fopen(name, mode); ++ if (mustfree) ++ free(name_stripped); ++ return fp; + } + + static int unzzip_cat (int argc, char ** argv, int extract) +diff --git a/bins/unzzipcat-zip.c b/bins/unzzipcat-zip.c +index 2810f85..7f7f3fa 100644 +--- a/bins/unzzipcat-zip.c ++++ b/bins/unzzipcat-zip.c +@@ -69,6 +69,48 @@ static void unzzip_cat_file(ZZIP_DIR* disk, char* name, FILE* out) + } + } + ++/* ++ * NAME: remove_dotdotslash ++ * PURPOSE: To remove any "../" components from the given pathname ++ * ARGUMENTS: path: path name with maybe "../" components ++ * RETURNS: Nothing, "path" is modified in-place ++ * NOTE: removing "../" from the path ALWAYS shortens the path, never adds to it! ++ * Also, "path" is not used after creating it. ++ * So modifying "path" in-place is safe to do. ++ */ ++static inline void ++remove_dotdotslash(char *path) ++{ ++ /* Note: removing "../" from the path ALWAYS shortens the path, never adds to it! */ ++ char *dotdotslash; ++ int warned = 0; ++ ++ dotdotslash = path; ++ while ((dotdotslash = strstr(dotdotslash, "../")) != NULL) ++ { ++ /* ++ * Remove only if at the beginning of the pathname ("../path/name") ++ * or when preceded by a slash ("path/../name"), ++ * otherwise not ("path../name..")! ++ */ ++ if (dotdotslash == path || dotdotslash[-1] == '/') ++ { ++ char *src, *dst; ++ if (!warned) ++ { ++ /* Note: the first time through the pathname is still intact */ ++ fprintf(stderr, "Removing \"../\" path component(s) in %s\n", path); ++ warned = 1; ++ } ++ /* We cannot use strcpy(), as there "The strings may not overlap" */ ++ for (src = dotdotslash+3, dst=dotdotslash; (*dst = *src) != '\0'; src++, dst++) ++ ; ++ } ++ else ++ dotdotslash +=3; /* skip this instance to prevent infinite loop */ ++ } ++} ++ + static void makedirs(const char* name) + { + char* p = strrchr(name, '/'); +@@ -86,6 +128,16 @@ static void makedirs(const char* name) + + static FILE* create_fopen(char* name, char* mode, int subdirs) + { ++ char *name_stripped; ++ FILE *fp; ++ int mustfree = 0; ++ ++ if ((name_stripped = strdup(name)) != NULL) ++ { ++ remove_dotdotslash(name_stripped); ++ name = name_stripped; ++ mustfree = 1; ++ } + if (subdirs) + { + char* p = strrchr(name, '/'); +@@ -95,7 +147,10 @@ static FILE* create_fopen(char* name, char* mode, int subdirs) + free (dir_name); + } + } +- return fopen(name, mode); ++ fp = fopen(name, mode); ++ if (mustfree) ++ free(name_stripped); ++ return fp; + } + + static int unzzip_cat (int argc, char ** argv, int extract) diff --git a/buildroot/package/zziplib/Config.in b/buildroot/package/zziplib/Config.in new file mode 100644 index 000000000..6b55572a4 --- /dev/null +++ b/buildroot/package/zziplib/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_ZZIPLIB + bool "zziplib" + select BR2_PACKAGE_ZLIB + help + The zziplib provides read access to zipped files in a + zip-archive, using compression based solely on free algorithms + provided by zlib. It also provides a functionality to overlay + the archive filesystem with the filesystem of the operating + system environment. + + http://zziplib.sourceforge.net diff --git a/buildroot/package/zziplib/zziplib.hash b/buildroot/package/zziplib/zziplib.hash new file mode 100644 index 000000000..88f618b7b --- /dev/null +++ b/buildroot/package/zziplib/zziplib.hash @@ -0,0 +1,5 @@ +# sha256 locally computed +sha256 846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544 zziplib-0.13.69.tar.gz +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 docs/COPYING.LIB +sha256 c2aa7d58cebd24cb877bbf11d6b13a4bb7cd08b9d7db5d3037ca06c46bf4cfd8 docs/COPYING.MPL +sha256 1c6da11efe8c43ee853fe5b21501dd72b81831ae84d58ea376bddc0620a5c361 docs/copying.htm diff --git a/buildroot/package/zziplib/zziplib.mk b/buildroot/package/zziplib/zziplib.mk new file mode 100644 index 000000000..967cda033 --- /dev/null +++ b/buildroot/package/zziplib/zziplib.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# zziplib +# +################################################################################ + +ZZIPLIB_VERSION = 0.13.69 +ZZIPLIB_SITE = $(call github,gdraheim,zziplib,v$(ZZIPLIB_VERSION)) +ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1 +ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm +ZZIPLIB_INSTALL_STAGING = YES + +# 0001-Avoid-memory-leak-from-__zzip_parse_root_directory.patch +# 0002-Avoid-memory-leak-from-__zzip_parse_root_directory-2.patch +# 0003-One-more-free-to-avoid-memory-leak.patch +ZZIPLIB_IGNORE_CVES += CVE-2018-16548 + +# 0004-Fix-issue-62-Remove-any-components-from-pathnames-of-extracte.patch +ZZIPLIB_IGNORE_CVES += CVE-2018-17828 + +ZZIPLIB_DEPENDENCIES = host-pkgconf host-python zlib + +# zziplib is not python3 friendly, so force the python interpreter +ZZIPLIB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2 + +$(eval $(autotools-package)) diff --git a/buildroot/support/config-fragments/autobuild/andes-nds32.config b/buildroot/support/config-fragments/autobuild/andes-nds32.config new file mode 100644 index 000000000..541677e00 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/andes-nds32.config @@ -0,0 +1,3 @@ +BR2_nds32=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y diff --git a/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config b/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config index 048c27d6c..961ff7157 100644 --- a/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config @@ -2,8 +2,8 @@ BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-aarch64-glibc-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-aarch64-glibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config b/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config index 0832ddd30..22aa667ea 100644 --- a/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config +++ b/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config @@ -3,8 +3,8 @@ BR2_archs38=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arcle-hs38-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arcle-hs38-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/buildroot/support/config-fragments/autobuild/br-arm-basic.config b/buildroot/support/config-fragments/autobuild/br-arm-basic.config index c576b248b..edac17648 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-basic.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-basic.config @@ -2,7 +2,7 @@ BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config index 63fb66983..4b17df50f 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-glibc-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_8=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_20=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-glibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_9=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config index 3a1499e32..40349a5c3 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-musl-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-musl-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config b/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config index 36f164773..caa2269e5 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config @@ -3,9 +3,9 @@ BR2_cortex_m4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-m4-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-m4-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set diff --git a/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config b/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config index a777d24e6..97e1e8180 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config @@ -3,9 +3,9 @@ BR2_arm1176jzf_s=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-arm-full-static.config b/buildroot/support/config-fragments/autobuild/br-arm-full-static.config index 2e41e0b34..4797ccd2f 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-full-static.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-full-static.config @@ -3,8 +3,8 @@ BR2_STATIC_LIBS=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/buildroot/support/config-fragments/autobuild/br-arm-full.config b/buildroot/support/config-fragments/autobuild/br-arm-full.config index 7462706a0..f12b76e5e 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-full.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-full.config @@ -2,8 +2,8 @@ BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_5=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config b/buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config index 6b2566eed..7c9b465a8 100644 --- a/buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config @@ -1,4 +1,6 @@ BR2_arm=y BR2_cortex_a8=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_BINUTILS_VERSION_2_32_X=y +BR2_GCC_VERSION_9_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config b/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config index fa91cfefe..077e1d84b 100644 --- a/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config +++ b/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config @@ -2,8 +2,8 @@ BR2_x86_pentium_mmx=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y # BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set diff --git a/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config b/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config index bf0d4165c..1fe960ba8 100644 --- a/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config +++ b/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config @@ -2,8 +2,8 @@ BR2_x86_pentium4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config b/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config index f75cf3ac5..25a2a2188 100644 --- a/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config +++ b/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config @@ -2,9 +2,9 @@ BR2_m68k=y BR2_m68k_cf5208=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-5208-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-5208-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set diff --git a/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config b/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config index 1bb6aeb8b..8803fa1db 100644 --- a/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config +++ b/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config @@ -1,9 +1,9 @@ BR2_m68k=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-68040-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-68040-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set diff --git a/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config b/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config index 035cb72e8..5dc5e842f 100644 --- a/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config +++ b/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config @@ -1,8 +1,8 @@ BR2_microblazeel=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-microblaze-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-microblaze-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config b/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config index 7454a4da2..69cb93c1f 100644 --- a/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config @@ -4,8 +4,8 @@ BR2_mips_32r6=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips32r6-el-hf-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips32r6-el-hf-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config b/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config index 3f2e5d9ba..cdd3029b2 100644 --- a/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config +++ b/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config @@ -3,8 +3,8 @@ BR2_MIPS_NABI64=y # BR2_MIPS_SOFT_FLOAT is not set BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2019.02-rc1.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2019.11.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_5=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config b/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config index b47b43416..f722b6582 100644 --- a/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config @@ -5,8 +5,8 @@ BR2_MIPS_NABI64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config b/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config index 6cf919b1e..9c46809d8 100644 --- a/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config +++ b/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config @@ -2,9 +2,9 @@ BR2_mipsel=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mipsel-o32-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mipsel-o32-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config b/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config index e25ea65a3..2f93714fc 100644 --- a/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config @@ -2,9 +2,8 @@ BR2_nios2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-nios2-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-nios2-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config b/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config index a346c83e4..b3cf2d08a 100644 --- a/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config +++ b/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config @@ -1,9 +1,9 @@ BR2_or1k=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-openrisc-full-2018.02-925-gd4158df.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-openrisc-full-2019.11.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_5=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config b/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config index 0f19616ab..b8a568e43 100644 --- a/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config +++ b/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config @@ -3,8 +3,8 @@ BR2_powerpc_603e=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config b/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config index 1673adbc0..dc7c7d35f 100644 --- a/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config +++ b/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config @@ -3,9 +3,9 @@ BR2_powerpc_e500mc=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-e500mc-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-e500mc-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config b/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config index fb5159341..e7ff1a471 100644 --- a/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config @@ -2,8 +2,8 @@ BR2_powerpc64=y BR2_powerpc_power7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config b/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config index 964a13e2b..97c7ebdb6 100644 --- a/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config @@ -2,8 +2,8 @@ BR2_powerpc64le=y BR2_powerpc_power8=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64le-power8-glibc-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64le-power8-glibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-riscv32.config b/buildroot/support/config-fragments/autobuild/br-riscv32.config index 9565a0b70..f8901edf2 100644 --- a/buildroot/support/config-fragments/autobuild/br-riscv32.config +++ b/buildroot/support/config-fragments/autobuild/br-riscv32.config @@ -2,7 +2,8 @@ BR2_riscv=y BR2_RISCV_32=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv32-2019.02-rc1.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv32-glibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-riscv64-internal-musl.config b/buildroot/support/config-fragments/autobuild/br-riscv64-internal-musl.config new file mode 100644 index 000000000..89e7afb27 --- /dev/null +++ b/buildroot/support/config-fragments/autobuild/br-riscv64-internal-musl.config @@ -0,0 +1,3 @@ +BR2_riscv=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-riscv64.config b/buildroot/support/config-fragments/autobuild/br-riscv64.config index 61912cfd7..f98675d8d 100644 --- a/buildroot/support/config-fragments/autobuild/br-riscv64.config +++ b/buildroot/support/config-fragments/autobuild/br-riscv64.config @@ -1,7 +1,8 @@ BR2_riscv=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv64-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv64-glibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-sh4-full.config b/buildroot/support/config-fragments/autobuild/br-sh4-full.config index 3651fb6ee..5e358bb82 100644 --- a/buildroot/support/config-fragments/autobuild/br-sh4-full.config +++ b/buildroot/support/config-fragments/autobuild/br-sh4-full.config @@ -2,9 +2,9 @@ BR2_sh=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sh4-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sh4-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config b/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config index d6b8d69e6..74b4bf27e 100644 --- a/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config +++ b/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config @@ -1,8 +1,8 @@ BR2_sparc=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc-uclibc-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc-uclibc-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config b/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config index a4d1cc668..75c31ad5c 100644 --- a/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config +++ b/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config @@ -1,8 +1,8 @@ BR2_sparc64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config b/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config index 29ac6891f..8bab1deb1 100644 --- a/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config +++ b/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config @@ -3,9 +3,9 @@ BR2_x86_core2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-core2-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-core2-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config b/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config index 595d968f3..c67a52474 100644 --- a/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config +++ b/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config @@ -3,8 +3,8 @@ BR2_x86_atom=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-musl-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-musl-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/br-xtensa-full.config b/buildroot/support/config-fragments/autobuild/br-xtensa-full.config index bd531abbf..3d57b99c3 100644 --- a/buildroot/support/config-fragments/autobuild/br-xtensa-full.config +++ b/buildroot/support/config-fragments/autobuild/br-xtensa-full.config @@ -1,9 +1,9 @@ BR2_xtensa=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-xtensa-full-2019.02-rc1.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-xtensa-full-2019.11.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_8=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/buildroot/support/config-fragments/autobuild/toolchain-configs.csv b/buildroot/support/config-fragments/autobuild/toolchain-configs.csv index 60ce1a978..9b41e2173 100644 --- a/buildroot/support/config-fragments/autobuild/toolchain-configs.csv +++ b/buildroot/support/config-fragments/autobuild/toolchain-configs.csv @@ -22,6 +22,7 @@ support/config-fragments/autobuild/br-arm-full-static.config,x86_64 support/config-fragments/autobuild/sourcery-arm.config,x86 # Toolchains used by test-pkg only when the '-a' option is passed: +support/config-fragments/autobuild/andes-nds32.config,x86 support/config-fragments/autobuild/arm-aarch64.config,x86_64 support/config-fragments/autobuild/br-aarch64-glibc.config,x86_64 support/config-fragments/autobuild/br-arc-full-internal.config,any @@ -52,6 +53,7 @@ support/config-fragments/autobuild/br-powerpc-e500mc-full.config,x86_64 support/config-fragments/autobuild/br-powerpc-internal-full.config,any support/config-fragments/autobuild/br-riscv32.config,x86_64 support/config-fragments/autobuild/br-riscv64.config,x86_64 +support/config-fragments/autobuild/br-riscv64-internal-musl.config,any support/config-fragments/autobuild/br-sh4-full.config,x86_64 support/config-fragments/autobuild/br-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/br-sparc64-glibc.config,x86_64 diff --git a/buildroot/support/dependencies/check-host-cmake.mk b/buildroot/support/dependencies/check-host-cmake.mk index 5604713de..01f38da37 100644 --- a/buildroot/support/dependencies/check-host-cmake.mk +++ b/buildroot/support/dependencies/check-host-cmake.mk @@ -1,9 +1,9 @@ -# Set this to either 3.8 or higher, depending on the highest minimum +# Set this to either 3.10 or higher, depending on the highest minimum # version required by any of the packages bundled in Buildroot. If a # package is bumped or a new one added, and it requires a higher # version, our cmake infra will catch it and build its own. # -BR2_CMAKE_VERSION_MIN = 3.8 +BR2_CMAKE_VERSION_MIN = 3.10 BR2_CMAKE_CANDIDATES ?= cmake cmake3 BR2_CMAKE ?= $(call suitable-host-package,cmake,\ diff --git a/buildroot/support/dependencies/check-host-coreutils.mk b/buildroot/support/dependencies/check-host-coreutils.mk new file mode 100644 index 000000000..87a3f446e --- /dev/null +++ b/buildroot/support/dependencies/check-host-coreutils.mk @@ -0,0 +1,6 @@ +# Check whether the host's coreutils are up to date enough +# to provide 'ln --relative' and 'realpath'. + +ifeq (,$(call suitable-host-package,coreutils)) +BR2_COREUTILS_HOST_DEPENDENCY = host-coreutils +endif diff --git a/buildroot/support/dependencies/check-host-coreutils.sh b/buildroot/support/dependencies/check-host-coreutils.sh new file mode 100755 index 000000000..4d36d7493 --- /dev/null +++ b/buildroot/support/dependencies/check-host-coreutils.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# Exit on the first error +set -e + +# Does ln supports the --relative/-r option? +ln --relative --help >/dev/null 2>&1 + +# Does realpath exist? +realpath --help >/dev/null 2>&1 + +echo OK diff --git a/buildroot/support/dependencies/check-host-lzip.mk b/buildroot/support/dependencies/check-host-lzip.mk index cdd784058..98a4f4238 100644 --- a/buildroot/support/dependencies/check-host-lzip.mk +++ b/buildroot/support/dependencies/check-host-lzip.mk @@ -1,5 +1,4 @@ ifeq (,$(call suitable-host-package,lzip,$(LZCAT))) BR2_LZIP_HOST_DEPENDENCY = host-lzip -EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .lz LZCAT = $(HOST_DIR)/bin/lzip -d -c endif diff --git a/buildroot/support/dependencies/check-host-python3.mk b/buildroot/support/dependencies/check-host-python3.mk new file mode 100644 index 000000000..50ed933a4 --- /dev/null +++ b/buildroot/support/dependencies/check-host-python3.mk @@ -0,0 +1,8 @@ +# Since version 2.29, glibc requires python 3.4 or later to build the GNU C Library. +# https://www.sourceware.org/ml/libc-alpha/2019-01/msg00723.html + +BR2_PYTHON3_VERSION_MIN = 3.4 + +ifeq (,$(call suitable-host-package,python3,$(BR2_PYTHON3_VERSION_MIN) python3 python)) +BR2_PYTHON3_HOST_DEPENDENCY = host-python3 +endif diff --git a/buildroot/support/dependencies/check-host-python3.sh b/buildroot/support/dependencies/check-host-python3.sh new file mode 100755 index 000000000..17cafd288 --- /dev/null +++ b/buildroot/support/dependencies/check-host-python3.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +# prevent shift error +[ $# -lt 2 ] && exit 1 + +version_min="$(echo ${1} | awk '{ split($1, v, "."); print v[1] v[2] }')" + +shift + +# The host python interpreter is already checked by dependencies.sh but +# it only check if the version is at least 2.7. +# We want to check the version number of the python3 interpreter even +# if Buildroot is able to use any version but some packages may require +# a more recent version. + +for candidate in "${@}" ; do + python3=`which $candidate 2>/dev/null` + if [ ! -x "$python3" ]; then + continue + fi + version=`$python3 -V 2>&1 | awk '{ split($2, v, "."); print v[1] v[2] }'` + + if [ $version -lt $version_min ]; then + # no suitable python3 found + continue + fi + + # suitable python3 found + echo $python3 + break +done diff --git a/buildroot/support/dependencies/check-host-xzcat.mk b/buildroot/support/dependencies/check-host-xzcat.mk index e5d72f95d..9a78a8f38 100644 --- a/buildroot/support/dependencies/check-host-xzcat.mk +++ b/buildroot/support/dependencies/check-host-xzcat.mk @@ -3,6 +3,5 @@ ifeq (,$(call suitable-host-package,xzcat,$(XZCAT))) BR2_XZCAT_HOST_DEPENDENCY = host-xz -EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .xz .lzma XZCAT = $(HOST_DIR)/bin/xzcat endif diff --git a/buildroot/support/dependencies/dependencies.sh b/buildroot/support/dependencies/dependencies.sh index be60257d1..98469bd70 100755 --- a/buildroot/support/dependencies/dependencies.sh +++ b/buildroot/support/dependencies/dependencies.sh @@ -37,8 +37,7 @@ case ":${PATH:-unset}:" in ;; (*" "*) printf "\n" - # Break the '\n' sequence, or a \n is printed (which is not what we want). - printf "Your PATH contains a newline (%sn) character.\n" "\\" + printf "Your PATH contains a newline (\\\n) character.\n" printf "This doesn't work. Fix you PATH.\n" exit 1 ;; @@ -113,9 +112,9 @@ if [ -z "$COMPILER_VERSION" ] ; then fi; COMPILER_MAJOR=$(echo $COMPILER_VERSION | sed -e "s/\..*//g") COMPILER_MINOR=$(echo $COMPILER_VERSION | sed -e "s/^$COMPILER_MAJOR\.//g" -e "s/\..*//g") -if [ $COMPILER_MAJOR -lt 3 -o $COMPILER_MAJOR -eq 2 -a $COMPILER_MINOR -lt 95 ] ; then +if [ $COMPILER_MAJOR -lt 4 -o $COMPILER_MAJOR -eq 4 -a $COMPILER_MINOR -lt 8 ] ; then echo - echo "You have gcc '$COMPILER_VERSION' installed. gcc >= 2.95 is required" + echo "You have gcc '$COMPILER_VERSION' installed. gcc >= 4.8 is required" exit 1; fi; @@ -141,9 +140,9 @@ fi if [ -n "$CXXCOMPILER_VERSION" ] ; then CXXCOMPILER_MAJOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/\..*//g") CXXCOMPILER_MINOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/^$CXXCOMPILER_MAJOR\.//g" -e "s/\..*//g") - if [ $CXXCOMPILER_MAJOR -lt 3 -o $CXXCOMPILER_MAJOR -eq 2 -a $CXXCOMPILER_MINOR -lt 95 ] ; then + if [ $CXXCOMPILER_MAJOR -lt 4 -o $CXXCOMPILER_MAJOR -eq 4 -a $CXXCOMPILER_MINOR -lt 8 ] ; then echo - echo "You have g++ '$CXXCOMPILER_VERSION' installed. g++ >= 2.95 is required" + echo "You have g++ '$CXXCOMPILER_VERSION' installed. g++ >= 4.8 is required" exit 1 fi fi @@ -161,7 +160,7 @@ fi # Check that a few mandatory programs are installed missing_progs="no" -for prog in patch perl tar wget cpio python unzip rsync bc ${DL_TOOLS} ; do +for prog in patch perl tar wget cpio unzip rsync bc ${DL_TOOLS} ; do if ! which $prog > /dev/null ; then echo "You must install '$prog' on your build machine"; missing_progs="yes" @@ -181,14 +180,6 @@ if test "${missing_progs}" = "yes" ; then exit 1 fi -# Check that the python version is at least 2.7 -PYTHON_VERSION=$(python -V 2>&1 |awk '{ split($2, v, "."); print v[1] v[2] }') -if [ $PYTHON_VERSION -lt 27 ]; then - echo - echo "You have '$(python -V 2>&1)' installed. Python >= 2.7 is required" - exit 1; -fi - if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then if ! which locale > /dev/null ; then echo @@ -213,14 +204,6 @@ if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then fi fi -if grep -q ^BR2_NEEDS_HOST_JAVAC=y $BR2_CONFIG ; then - check_prog_host "javac" -fi - -if grep -q ^BR2_NEEDS_HOST_JAR=y $BR2_CONFIG ; then - check_prog_host "jar" -fi - if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BR2_CONFIG ; then if test ! -f /lib/ld-linux.so.2 ; then echo @@ -294,8 +277,3 @@ if [ -n "$missing_perl_modules" ] ; then echo exit 1 fi - -if ! python -c "import argparse" > /dev/null 2>&1 ; then - echo "Your Python installation is not complete enough: argparse module is missing" - exit 1 -fi diff --git a/buildroot/support/docker/Dockerfile b/buildroot/support/docker/Dockerfile index 36cd3b28a..03acde85d 100644 --- a/buildroot/support/docker/Dockerfile +++ b/buildroot/support/docker/Dockerfile @@ -39,6 +39,9 @@ RUN apt-get install -y --no-install-recommends \ python-flake8 \ python-nose2 \ python-pexpect \ + python3 \ + python3-nose2 \ + python3-pexpect \ qemu-system-arm \ qemu-system-x86 \ rsync \ diff --git a/buildroot/support/download/svn b/buildroot/support/download/svn index 542b25c0a..012f286dd 100755 --- a/buildroot/support/download/svn +++ b/buildroot/support/download/svn @@ -38,4 +38,26 @@ _svn() { _svn export ${verbose} "${@}" "'${uri}@${rev}'" "'${basename}'" -tar czf "${output}" "${basename}" +# Get the date of the revision, to generate reproducible archives. +# The output format is YYYY-MM-DDTHH:MM:SS.mmmuuuZ (i.e. always in the +# UTC timezone), which we can feed as-is to the --mtime option for tar. +# In case there is a redirection (e.g. http -> https), just keep the +# last line (svn outputs everything on stdout) +date="$( _svn info --show-item last-changed-date "'${uri}@${rev}'" |tail -n 1 )" + +# Generate the archive, sort with the C locale so that it is reproducible. +# We do not want the .svn dir; we keep other .svn files, in case they are the +# only files in their directory. +find "${basename}" -not -type d \ + -and -not -path "./.svn/*" >"${output}.list" +LC_ALL=C sort <"${output}.list" >"${output}.list.sorted" + +# Create GNU-format tarballs, since that's the format of the tarballs on +# sources.buildroot.org and used in the *.hash files +tar cf - --transform="s#^\./#${basename}/#" \ + --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \ + -T "${output}.list.sorted" >"${output}.tar" +gzip -6 -n <"${output}.tar" >"${output}" + +rm -f "${output}.list" +rm -f "${output}.list.sorted" diff --git a/buildroot/support/gnuconfig/README.buildroot b/buildroot/support/gnuconfig/README.buildroot index a71ed9301..7ba2a332a 100644 --- a/buildroot/support/gnuconfig/README.buildroot +++ b/buildroot/support/gnuconfig/README.buildroot @@ -10,7 +10,7 @@ If for some reason your package does not use the autotools-package infrastructure, you can request the config.guess and/or config.sub files of your package to be updated by using: - $(call CONFIG_UPDATE,directory-of-your-package-sources) +_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK --- UPDATE --- GNU config is now managed in git, so to update: diff --git a/buildroot/support/gnuconfig/config.guess b/buildroot/support/gnuconfig/config.guess index c4bd827a7..b40e17b13 100755 --- a/buildroot/support/gnuconfig/config.guess +++ b/buildroot/support/gnuconfig/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2019 Free Software Foundation, Inc. -timestamp='2016-05-15' +timestamp='2019-05-28' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ timestamp='2016-05-15' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,7 +27,7 @@ timestamp='2016-05-15' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -39,7 +39,7 @@ Usage: $0 [OPTION] Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2019 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -84,8 +84,6 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' 1 2 15 - # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -96,34 +94,38 @@ trap 'exit 1' 1 2 15 # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 + +set_cc_for_build() { + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$driver" + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi @@ -132,14 +134,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. LIBC=gnu - eval $set_cc_for_build - cat <<-EOF > $dummy.c + set_cc_for_build + cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc @@ -149,13 +151,20 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -169,30 +178,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine="${arch}${endian}"-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -208,10 +217,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release @@ -219,46 +228,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "$machine-${os}${release}${abi-}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; + *:MidnightBSD:*:*) + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix + echo "$UNAME_MACHINE"-unknown-sortix exit ;; + *:Redox:*:*) + echo "$UNAME_MACHINE"-unknown-redox + exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -310,28 +328,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -343,7 +352,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos @@ -370,19 +379,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build + set_cc_for_build SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. @@ -395,13 +404,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in @@ -410,25 +419,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -439,44 +448,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -485,23 +494,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -527,17 +536,17 @@ EOF AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -554,7 +563,7 @@ EOF echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id @@ -566,14 +575,14 @@ EOF if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -584,7 +593,7 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else @@ -598,7 +607,7 @@ EOF exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -607,18 +616,18 @@ EOF IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -633,28 +642,28 @@ EOF echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in + case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in + case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if [ "$HP_ARCH" = "" ]; then + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -687,13 +696,13 @@ EOF exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = hppa2.0w ] + if [ "$HP_ARCH" = hppa2.0w ] then - eval $set_cc_for_build + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -712,15 +721,15 @@ EOF HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -745,11 +754,11 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -758,7 +767,7 @@ EOF *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -766,9 +775,9 @@ EOF exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -793,127 +802,120 @@ EOF echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" + exit ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + else + echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + fi exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case "$UNAME_PROCESSOR" in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + echo "$UNAME_MACHINE"-pc-mingw32 exit ;; *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin + echo x86_64-pc-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + *:Minix:*:*) + echo "$UNAME_MACHINE"-unknown-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -927,134 +929,168 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; k1om:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + IS_GLIBC=0 + test x"${LIBC}" = xgnu && IS_GLIBC=1 + sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel + #undef mips64 + #undef mips64el + #if ${IS_GLIBC} && defined(_ABI64) + LIBCABI=gnuabi64 + #else + #if ${IS_GLIBC} && defined(_ABIN32) + LIBCABI=gnuabin32 + #else + LIBCABI=${LIBC} + #endif + #endif + + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa64r6 + #else + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa32r6 + #else + #if defined(__mips64) + CPU=mips64 + #else + CPU=mips + #endif + #endif + #endif + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + MIPS_ENDIAN=el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + MIPS_ENDIAN= #else - CPU= + MIPS_ENDIAN= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`" + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; + mips64el:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-unknown-linux-"$LIBC" + exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1068,34 +1104,34 @@ EOF # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) @@ -1105,12 +1141,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1120,9 +1156,9 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1142,9 +1178,9 @@ EOF exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1164,9 +1200,9 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1175,28 +1211,28 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1207,7 +1243,7 @@ EOF *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi @@ -1227,23 +1263,23 @@ EOF exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1262,49 +1298,56 @@ EOF echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" exit ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux${UNAME_RELEASE} + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + set_cc_for_build + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1315,7 +1358,7 @@ EOF # that Apple uses in portable devices. UNAME_PROCESSOR=x86_64 fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` @@ -1323,19 +1366,25 @@ EOF UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + NEO-*:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + echo nse-tandem-nsk"$UNAME_RELEASE" exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + NSR-*:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1344,18 +1393,19 @@ EOF echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. + # shellcheck disable=SC2154 if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1376,14 +1426,14 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1392,32 +1442,184 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" exit ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos + echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx exit ;; amd64:Isilon\ OneFS:*:*) echo x86_64-unknown-onefs exit ;; + *:Unleashed:*:*) + echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE" + exit ;; +esac + +# No uname command or uname output not recognized. +set_cc_for_build +cat > "$dummy.c" < +#include +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#include +#if defined(_SIZE_T_) || defined(SIGLOST) +#include +#endif +#endif +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); +#endif + +#if defined (vax) +#if !defined (ultrix) +#include +#if defined (BSD) +#if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +#else +#if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#endif +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#else +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname un; + uname (&un); + printf ("vax-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("mips-dec-ultrix\n"); exit (0); +#endif +#endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. +test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } + +echo "$0: unable to guess system type" >&2 + +case "$UNAME_MACHINE:$UNAME_SYSTEM" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 </dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/buildroot/support/gnuconfig/config.sub b/buildroot/support/gnuconfig/config.sub index 45dd0a7d0..5b158ac41 100755 --- a/buildroot/support/gnuconfig/config.sub +++ b/buildroot/support/gnuconfig/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2019 Free Software Foundation, Inc. -timestamp='2016-05-10' +timestamp='2019-05-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ timestamp='2016-05-10' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,7 +33,7 @@ timestamp='2016-05-10' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -67,7 +67,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2019 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -89,12 +89,12 @@ while test $# -gt 0 ; do - ) # Use stdin as input. break ;; -* ) - echo "$me: invalid option $1$help" + echo "$me: invalid option $1$help" >&2 exit 1 ;; *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -110,1236 +110,1167 @@ case $# in exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac +# Split fields of configuration type +# shellcheck disable=SC2162 +IFS="-" read field1 field2 field3 field4 <&2 + exit 1 ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 + *-*-*-*) + basic_machine=$field1-$field2 + os=$field3-$field4 ;; - -bluegene*) - os=-cnk + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ + | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova*) + basic_machine=$field1 + os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + os=linux-android + ;; + *) + basic_machine=$field1-$field2 + os=$field3 + ;; + esac ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 + *-*) + # A lone config we happen to match not fitting any pattern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + os= + ;; + *) + basic_machine=$field1 + os=$field2 + ;; + esac + ;; + esac ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + os=bsd + ;; + a29khif) + basic_machine=a29k-amd + os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=scout + ;; + alliant) + basic_machine=fx80-alliant + os= + ;; + altos | altos3068) + basic_machine=m68k-altos + os= + ;; + am29k) + basic_machine=a29k-none + os=bsd + ;; + amdahl) + basic_machine=580-amdahl + os=sysv + ;; + amiga) + basic_machine=m68k-unknown + os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=bsd + ;; + aros) + basic_machine=i386-pc + os=aros + ;; + aux) + basic_machine=m68k-apple + os=aux + ;; + balance) + basic_machine=ns32k-sequent + os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=linux + ;; + cegcc) + basic_machine=arm-unknown + os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=bsd + ;; + convex-c2) + basic_machine=c2-convex + os=bsd + ;; + convex-c32) + basic_machine=c32-convex + os=bsd + ;; + convex-c34) + basic_machine=c34-convex + os=bsd + ;; + convex-c38) + basic_machine=c38-convex + os=bsd + ;; + cray) + basic_machine=j90-cray + os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + os= + ;; + da30) + basic_machine=m68k-da30 + os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + os= + ;; + delta88) + basic_machine=m88k-motorola + os=sysv3 + ;; + dicos) + basic_machine=i686-pc + os=dicos + ;; + djgpp) + basic_machine=i586-pc + os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=ose + ;; + gmicro) + basic_machine=tron-gmicro + os=sysv + ;; + go32) + basic_machine=i386-pc + os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=hms + ;; + harris) + basic_machine=m88k-harris + os=sysv3 + ;; + hp300) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=hpux + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=proelf + ;; + i386mach) + basic_machine=i386-mach + os=mach + ;; + vsta) + basic_machine=i386-pc + os=vsta + ;; + isi68 | isi) + basic_machine=m68k-isi + os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + os=sysv + ;; + merlin) + basic_machine=ns32k-utek + os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + os=coff + ;; + morphos) + basic_machine=powerpc-unknown + os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=moxiebox + ;; + msdos) + basic_machine=i386-pc + os=msdos + ;; + msys) + basic_machine=i686-pc + os=msys + ;; + mvs) + basic_machine=i370-ibm + os=mvs + ;; + nacl) + basic_machine=le32-unknown + os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=newsos + ;; + news1000) + basic_machine=m68030-sony + os=newsos + ;; + necv70) + basic_machine=v70-nec + os=sysv + ;; + nh3000) + basic_machine=m68k-harris + os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=cxux + ;; + nindy960) + basic_machine=i960-intel + os=nindy + ;; + mon960) + basic_machine=i960-intel + os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=ose + ;; + os68k) + basic_machine=m68k-none + os=os68k + ;; + paragon) + basic_machine=i860-intel + os=osf + ;; + parisc) + basic_machine=hppa-unknown + os=linux + ;; + pw32) + basic_machine=i586-unknown + os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=rdos + ;; + rdos32) + basic_machine=i386-pc + os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=coff + ;; + sa29200) + basic_machine=a29k-amd + os=udi + ;; + sei) + basic_machine=mips-sei + os=seiux + ;; + sequent) + basic_machine=i386-sequent + os= + ;; + sps7) + basic_machine=m68k-bull + os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + os= + ;; + stratus) + basic_machine=i860-stratus + os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + os= + ;; + sun2os3) + basic_machine=m68000-sun + os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + os= + ;; + sun3os3) + basic_machine=m68k-sun + os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + os= + ;; + sun4os3) + basic_machine=sparc-sun + os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + os= + ;; + sv1) + basic_machine=sv1-cray + os=unicos + ;; + symmetry) + basic_machine=i386-sequent + os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=unicos + ;; + t90) + basic_machine=t90-cray + os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + os=tpf + ;; + udi29k) + basic_machine=a29k-amd + os=udi + ;; + ultra3) + basic_machine=a29k-nyu + os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=none + ;; + vaxv) + basic_machine=vax-dec + os=sysv + ;; + vms) + basic_machine=vax-dec + os=vms + ;; + vxworks960) + basic_machine=i960-wrs + os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=vxworks + ;; + xbox) + basic_machine=i686-pc + os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + os=unicos + ;; + *) + basic_machine=$1 + os= + ;; + esac ;; esac -# Decode aliases for certain CPU-COMPANY combinations. +# Decode 1-component or ad-hoc basic machines case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | csky \ - | ba \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond ;; - c54x) - basic_machine=tic54x-unknown + op50n) + cpu=hppa1.1 + vendor=oki ;; - c55x) - basic_machine=tic55x-unknown + op60c) + cpu=hppa1.1 + vendor=oki ;; - c6x) - basic_machine=tic6x-unknown + ibm*) + cpu=i370 + vendor=ibm + ;; + orion105) + cpu=clipper + vendor=highlevel + ;; + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple + ;; + pmac | pmac-mpw) + cpu=powerpc + vendor=apple + ;; + + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + cpu=m68000 + vendor=att + ;; + 3b*) + cpu=we32k + vendor=att + ;; + bluegene*) + cpu=powerpc + vendor=ibm + os=cnk + ;; + decsystem10* | dec10*) + cpu=pdp10 + vendor=dec + os=tops10 + ;; + decsystem20* | dec20*) + cpu=pdp10 + vendor=dec + os=tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + cpu=m68k + vendor=motorola + ;; + dpx2*) + cpu=m68k + vendor=bull + os=sysv3 + ;; + encore | umax | mmax) + cpu=ns32k + vendor=encore + ;; + elxsi) + cpu=elxsi + vendor=elxsi + os=${os:-bsd} + ;; + fx2800) + cpu=i860 + vendor=alliant + ;; + genix) + cpu=ns32k + vendor=ns + ;; + h3050r* | hiux*) + cpu=hppa1.1 + vendor=hitachi + os=hiuxwe2 + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + cpu=hppa1.0 + vendor=hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + cpu=m68000 + vendor=hp + ;; + hp9k3[2-9][0-9]) + cpu=m68k + vendor=hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + cpu=hppa1.0 + vendor=hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + cpu=hppa1.1 + vendor=hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + cpu=hppa1.1 + vendor=hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + cpu=hppa1.1 + vendor=hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + cpu=hppa1.1 + vendor=hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + cpu=hppa1.0 + vendor=hp + ;; + i*86v32) + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv32 + ;; + i*86v4*) + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv4 + ;; + i*86v) + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=sysv + ;; + i*86sol2) + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + os=solaris2 + ;; + j90 | j90-cray) + cpu=j90 + vendor=cray + os=${os:-unicos} + ;; + iris | iris4d) + cpu=mips + vendor=sgi + case $os in + irix*) + ;; + *) + os=irix4 + ;; + esac + ;; + miniframe) + cpu=m68000 + vendor=convergent + ;; + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + os=mint + ;; + news-3600 | risc-news) + cpu=mips + vendor=sony + os=newsos + ;; + next | m*-next) + cpu=m68k + vendor=next + case $os in + openstep*) + ;; + nextstep*) + ;; + ns2*) + os=nextstep2 + ;; + *) + os=nextstep3 + ;; + esac + ;; + np1) + cpu=np1 + vendor=gould + ;; + op50n-* | op60c-*) + cpu=hppa1.1 + vendor=oki + os=proelf + ;; + pa-hitachi) + cpu=hppa1.1 + vendor=hitachi + os=hiuxwe2 + ;; + pbd) + cpu=sparc + vendor=tti + ;; + pbb) + cpu=m68k + vendor=tti + ;; + pc532) + cpu=ns32k + vendor=pc532 + ;; + pn) + cpu=pn + vendor=gould + ;; + power) + cpu=power + vendor=ibm + ;; + ps2) + cpu=i386 + vendor=ibm + ;; + rm[46]00) + cpu=mips + vendor=siemens + ;; + rtpc | rtpc-*) + cpu=romp + vendor=ibm + ;; + sde) + cpu=mipsisa32 + vendor=sde + os=${os:-elf} + ;; + simso-wrs) + cpu=sparclite + vendor=wrs + os=vxworks + ;; + tower | tower-32) + cpu=m68k + vendor=ncr + ;; + vpp*|vx|vx-*) + cpu=f301 + vendor=fujitsu + ;; + w65) + cpu=w65 + vendor=wdc + ;; + w89k-*) + cpu=hppa1.1 + vendor=winbond + os=proelf + ;; + none) + cpu=none + vendor=none ;; leon|leon[3-9]) - basic_machine=sparc-$basic_machine + cpu=sparc + vendor=$basic_machine ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` ;; - strongarm | thumb | xscale) - basic_machine=arm-unknown + *-*) + # shellcheck disable=SC2162 + IFS="-" read cpu vendor <&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | csky-* \ - | ba-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ - | riscv32-* | riscv64-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - asmjs) - basic_machine=asmjs-unknown - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 + cpu=$basic_machine + vendor=pc ;; + # These rules are duplicated from below for sake of the special case above; + # i.e. things that normalized to x86 arches should also default to "pc" pc98) - basic_machine=i386-pc + cpu=i386 + vendor=pc ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + x64 | amd64) + cpu=x86_64 + vendor=pc ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc + # Recognize the basic CPU types without company name. + *) + cpu=$basic_machine + vendor=unknown ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc +esac + +unset -v basic_machine + +# Decode basic machines in the full and proper CPU-Company form. +case $cpu-$vendor in + # Here we handle the default manufacturer of certain CPU types in canonical form. It is in + # some cases the only manufacturer, in others, it is the most popular. + craynv-unknown) + vendor=cray + os=${os:-unicosmp} ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc + c90-unknown | c90-cray) + vendor=cray + os=${os:-unicos} ;; - pentium4) - basic_machine=i786-pc + fx80-unknown) + vendor=alliant ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + romp-unknown) + vendor=ibm ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + mmix-unknown) + vendor=knuth ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + microblaze-unknown | microblazeel-unknown) + vendor=xilinx ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + rs6000-unknown) + vendor=ibm ;; - pn) - basic_machine=pn-gould + vax-unknown) + vendor=dec ;; - power) basic_machine=power-ibm + pdp11-unknown) + vendor=dec ;; - ppc | ppcbe) basic_machine=powerpc-unknown + we32k-unknown) + vendor=att ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + cydra-unknown) + vendor=cydrome ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown + i370-ibm*) + vendor=ibm ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + orion-unknown) + vendor=highlevel ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tile*) - basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none + xps-unknown | xps100-unknown) + cpu=xps100 + vendor=honeywell ;; -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond + # Here we normalize CPU types with a missing or matching vendor + dpx20-unknown | dpx20-bull) + cpu=rs6000 + vendor=bull + os=${os:-bosx} ;; - op50n) - basic_machine=hppa1.1-oki + + # Here we normalize CPU types irrespective of the vendor + amd64-*) + cpu=x86_64 ;; - op60c) - basic_machine=hppa1.1-oki + blackfin-*) + cpu=bfin + os=linux ;; - romp) - basic_machine=romp-ibm + c54x-*) + cpu=tic54x ;; - mmix) - basic_machine=mmix-knuth + c55x-*) + cpu=tic55x ;; - rs6000) - basic_machine=rs6000-ibm + c6x-*) + cpu=tic6x ;; - vax) - basic_machine=vax-dec + e500v[12]-*) + cpu=powerpc + os=$os"spe" ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown + mips3*-*) + cpu=mips64 ;; - pdp11) - basic_machine=pdp11-dec + ms1-*) + cpu=mt ;; - we32k) - basic_machine=we32k-att + m68knommu-*) + cpu=m68k + os=linux ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown + m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) + cpu=s12z ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun + openrisc-*) + cpu=or32 ;; - cydra) - basic_machine=cydra-cydrome + parisc-*) + cpu=hppa + os=linux ;; - orion) - basic_machine=orion-highlevel + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + cpu=i586 ;; - orion105) - basic_machine=clipper-highlevel + pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) + cpu=i686 ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + cpu=i686 ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple + pentium4-*) + cpu=i786 ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. + pc98-*) + cpu=i386 ;; + ppc-* | ppcbe-*) + cpu=powerpc + ;; + ppcle-* | powerpclittle-*) + cpu=powerpcle + ;; + ppc64-*) + cpu=powerpc64 + ;; + ppc64le-* | powerpc64little-*) + cpu=powerpc64le + ;; + sb1-*) + cpu=mipsisa64sb1 + ;; + sb1el-*) + cpu=mipsisa64sb1el + ;; + sh5e[lb]-*) + cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'` + ;; + spur-*) + cpu=spur + ;; + strongarm-* | thumb-*) + cpu=arm + ;; + tx39-*) + cpu=mipstx39 + ;; + tx39el-*) + cpu=mipstx39el + ;; + x64-*) + cpu=x86_64 + ;; + xscale-* | xscalee[bl]-*) + cpu=`echo "$cpu" | sed 's/^xscale/arm/'` + ;; + + # Recognize the canonical CPU Types that limit and/or modify the + # company names they are paired with. + cr16-*) + os=${os:-elf} + ;; + crisv32-* | etraxfs*-*) + cpu=crisv32 + vendor=axis + ;; + cris-* | etrax*-*) + cpu=cris + vendor=axis + ;; + crx-*) + os=${os:-elf} + ;; + neo-tandem) + cpu=neo + vendor=tandem + ;; + nse-tandem) + cpu=nse + vendor=tandem + ;; + nsr-tandem) + cpu=nsr + vendor=tandem + ;; + nsv-tandem) + cpu=nsv + vendor=tandem + ;; + nsx-tandem) + cpu=nsx + vendor=tandem + ;; + s390-*) + cpu=s390 + vendor=ibm + ;; + s390x-*) + cpu=s390x + vendor=ibm + ;; + tile*-*) + os=${os:-linux-gnu} + ;; + *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 + # Recognize the canonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | amdgcn \ + | arc | arceb \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bpf | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64eb | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k | nvptx \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | picochip \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv64 \ + | rl78 | romp | rs6000 | rx \ + | score \ + | sh | shl \ + | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | visium \ + | w65 \ + | wasm32 | wasm64 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1347,200 +1278,246 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if [ x$os != x ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + # First match some system type aliases that might get confused + # with valid system types. + # solaris* is a basic system type, with this one exception. + auroraux) + os=auroraux ;; - -solaris1 | -solaris1.*) + bluegene*) + os=cnk + ;; + solaris1 | solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; - -solaris) - os=-solaris2 + solaris) + os=solaris2 ;; - -svr4*) - os=-sysv4 + unixware*) + os=sysv4.2uw ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) + gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # es1800 is here to avoid being matched by es* (a different OS) + es1800*) + os=ose + ;; + # Some version numbers need modification + chorusos*) + os=chorusos + ;; + isc) + os=isc2.2 + ;; + sco6) + os=sco5v6 + ;; + sco5) + os=sco3.2v5 + ;; + sco4) + os=sco3.2v4 + ;; + sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + ;; + sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + scout) + # Don't match below + ;; + sco*) + os=sco3.2v2 + ;; + psos*) + os=psos + ;; + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* | -sortix* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix*) + # Each alternative MUST end in a * to match a version number. + # sysv* is not here because it comes later, after sysvr4. + gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | kopensolaris* | plan9* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | knetbsd* | mirbsd* | netbsd* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* \ + | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ + | linux-newlib* | linux-musl* | linux-uclibc* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* \ + | morphos* | superux* | rtmk* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*) # Remember, each alternative MUST END IN *, to match a version number. ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) + qnx*) + case $cpu in + x86 | i*86) ;; *) - os=-nto$os + os=nto-$os ;; esac ;; - -nto-qnx*) + hiux*) + os=hiuxwe2 ;; - -nto*) + nto-qnx*) + ;; + nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + sim | xray | os68k* | v88r* \ + | windows* | osx | abug | netware* | os9* \ + | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + linux-dietlibc) + os=linux-dietlibc ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) + linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + lynx*178) + os=lynxos178 ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + lynx*5) + os=lynxos5 ;; - -opened*) - os=-openedition + lynx*) + os=lynxos ;; - -os400*) - os=-os400 + mac*) + os=`echo "$os" | sed -e 's|mac|macos|'` ;; - -wince*) - os=-wince + opened*) + os=openedition ;; - -osfrose*) - os=-osfrose + os400*) + os=os400 ;; - -osf*) - os=-osf + sunos5*) + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - -utek*) - os=-bsd + sunos6*) + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - -dynix*) - os=-bsd + wince*) + os=wince ;; - -acis*) - os=-aos + utek*) + os=bsd ;; - -atheos*) - os=-atheos + dynix*) + os=bsd ;; - -syllable*) - os=-syllable + acis*) + os=aos ;; - -386bsd) - os=-bsd + atheos*) + os=atheos ;; - -ctix* | -uts*) - os=-sysv + syllable*) + os=syllable ;; - -nova*) - os=-rtmk-nova + 386bsd) + os=bsd ;; - -ns2 ) - os=-nextstep2 + ctix* | uts*) + os=sysv ;; - -nsk*) - os=-nsk + nova*) + os=rtmk-nova + ;; + ns2) + os=nextstep2 + ;; + nsk*) + os=nsk ;; # Preserve the version number of sinix5. - -sinix5.*) + sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; - -sinix*) - os=-sysv4 + sinix*) + os=sysv4 ;; - -tpf*) - os=-tpf + tpf*) + os=tpf ;; - -triton*) - os=-sysv3 + triton*) + os=sysv3 ;; - -oss*) - os=-sysv3 + oss*) + os=sysv3 ;; - -svr4) - os=-sysv4 + svr4*) + os=sysv4 ;; - -svr3) - os=-sysv3 + svr3) + os=sysv3 ;; - -sysvr4) - os=-sysv4 + sysvr4) + os=sysv4 ;; - # This must come after -sysvr4. - -sysv*) + # This must come after sysvr4. + sysv*) ;; - -ose*) - os=-ose + ose*) + os=ose ;; - -es1800*) - os=-ose + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + os=mint ;; - -xenix) - os=-xenix + zvmoe) + os=zvmoe ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + dicos*) + os=dicos ;; - -aros*) - os=-aros + pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $cpu in + arm*) + os=eabi + ;; + *) + os=elf + ;; + esac ;; - -zvmoe) - os=-zvmoe + nacl*) ;; - -dicos*) - os=-dicos + ios) ;; - -nacl*) + none) ;; - -ios) - ;; - -none) + *-eabi) ;; *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1556,261 +1533,265 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +case $cpu-$vendor in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + os=linux ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 + ;; + pru-*) + os=elf ;; *-be) - os=-beos - ;; - *-haiku) - os=-haiku + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs + os=luna ;; *-next) - os=-nextstep3 + os=nextstep + ;; + *-sequent) + os=ptx + ;; + *-crds) + os=unos + ;; + *-ns) + os=genix + ;; + i370-*) + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac fi # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) +case $vendor in + unknown) case $os in - -riscix*) + riscix*) vendor=acorn ;; - -sunos*) + sunos*) vendor=sun ;; - -cnk*|-aix*) + cnk*|-aix*) vendor=ibm ;; - -beos*) + beos*) vendor=be ;; - -hpux*) + hpux*) vendor=hp ;; - -mpeix*) + mpeix*) vendor=hp ;; - -hiux*) + hiux*) vendor=hitachi ;; - -unos*) + unos*) vendor=crds ;; - -dgux*) + dgux*) vendor=dg ;; - -luna*) + luna*) vendor=omron ;; - -genix*) + genix*) vendor=ns ;; - -mvs* | -opened*) + clix*) + vendor=intergraph + ;; + mvs* | opened*) vendor=ibm ;; - -os400*) + os400*) vendor=ibm ;; - -ptx*) + ptx*) vendor=sequent ;; - -tpf*) + tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + vxsim* | vxworks* | windiss*) vendor=wrs ;; - -aux*) + aux*) vendor=apple ;; - -hms*) + hms*) vendor=hitachi ;; - -mpw* | -macos*) + mpw* | macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) vendor=atari ;; - -vos*) + vos*) vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$cpu-$vendor-$os" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/buildroot/support/legal-info/README.header b/buildroot/support/legal-info/README.header index d3bdf71bc..55996b530 100644 --- a/buildroot/support/legal-info/README.header +++ b/buildroot/support/legal-info/README.header @@ -14,18 +14,22 @@ This material is composed of the following items. compiled programs. Note: this may have not been saved due to technical limitations, you may need to collect it manually. - * The original source code for all packages; this has been saved in the - sources/ subdirectory (except for the non-redistributable packages, which - have not been saved). Patches that were applied are also saved, along - with a file named 'series' that lists the patches in the order they were - applied. Patches are under the same license as the files that they modify - in the original package. + * The original source code for target packages in the 'sources/' + subdirectory and for host packages in the 'host-sources/' subdirectory + (except for the non-redistributable packages, which have not been + saved). Patches that were applied are also saved, along with a file + named 'series' that lists the patches in the order they were + applied. Patches are under the same license as the files that they + modify in the original package. Note: Buildroot applies additional patches to Libtool scripts of autotools-based packages. These patches can be found under support/libtool in the Buildroot source and, due to technical limitations, are not saved with the package sources. You may need to collect them manually. - * A manifest file listing the configured packages and related information. - * The license text of the packages; they have been saved in the licenses/ - subdirectory. + * Two manifest files listing the configured packages and related + information: 'manifest.csv' for target packages and 'host-manifest.csv' + for host packages. + * The license text of the packages, in the 'licenses/' and + 'host-licenses/' subdirectories for target and host packages + respectively. diff --git a/buildroot/support/misc/Vagrantfile b/buildroot/support/misc/Vagrantfile index 6168f0581..bbb66a5c2 100644 --- a/buildroot/support/misc/Vagrantfile +++ b/buildroot/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2019.02' +RELEASE='2020.02' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/buildroot/support/misc/utils.mk b/buildroot/support/misc/utils.mk index c44319338..2f00ccfdb 100644 --- a/buildroot/support/misc/utils.mk +++ b/buildroot/support/misc/utils.mk @@ -14,6 +14,20 @@ comma := , empty := space := $(empty) $(empty) +# make 4.3: +# https://lwn.net/Articles/810071/ +# Number signs (#) appearing inside a macro reference or function invocation +# no longer introduce comments and should not be escaped with backslashes: +# thus a call such as: +# foo := $(shell echo '#') +# is legal. Previously the number sign needed to be escaped, for example: +# foo := $(shell echo '\#') +# Now this latter will resolve to "\#". If you want to write makefiles +# portable to both versions, assign the number sign to a variable: +# H := \# +# foo := $(shell echo '$H') +SHARP_SIGN := \# + # Case conversion macros. This is inspired by the 'up' macro from gmsl # (http://gmsl.sf.net). It is optimised very heavily because these macros # are used a lot. It is about 5 times faster than forking a shell and tr. @@ -70,6 +84,10 @@ finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2))) # notfirstword(wordlist): returns all but the first word in wordlist notfirstword = $(wordlist 2,$(words $(1)),$(1)) +# build a comma-separated list of quoted items, from a space-separated +# list of unquoted items: a b c d --> "a", "b", "c", "d" +make-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,"%",$(strip $(1)))) + # Needed for the foreach loops to loop over the list of hooks, so that # each hook call is properly separated by a newline. define sep diff --git a/buildroot/support/scripts/br2-external b/buildroot/support/scripts/br2-external index 00cb57d1e..171526f8c 100755 --- a/buildroot/support/scripts/br2-external +++ b/buildroot/support/scripts/br2-external @@ -14,14 +14,11 @@ MANUAL_URL='https://buildroot.org/manual.html\#br2-external-converting' main() { local OPT OPTARG - local br2_ext ofile ofmt + local br2_ext outputdir - while getopts :hkmo: OPT; do + while getopts :d: OPT; do case "${OPT}" in - h) help; exit 0;; - o) ofile="${OPTARG}";; - k) ofmt="kconfig";; - m) ofmt="mk";; + d) outputdir="${OPTARG}";; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; esac @@ -29,23 +26,18 @@ main() { # Forget options; keep only positional args shift $((OPTIND-1)) - case "${ofmt}" in - mk|kconfig) - ;; - *) error "no output format specified (-m/-k)\n";; - esac - if [ -z "${ofile}" ]; then - error "no output file specified (-o)\n" + if [ -z "${outputdir}" ]; then + error "no output directory specified (-d)\n" fi - exec >"${ofile}" - # Trap any unexpected error to generate a meaningful error message trap "error 'unexpected error while generating ${ofile}\n'" ERR do_validate ${@//:/ } - do_${ofmt} + mkdir -p "${outputdir}" + do_mk "${outputdir}" + do_kconfig "${outputdir}" } # Validates the br2-external trees passed as arguments. Makes each of @@ -119,103 +111,121 @@ do_validate_one() { # Generate the .mk snippet that defines makefile variables # for the br2-external tree do_mk() { - local br2_name br2_ext + local outputdir="${1}" + local br2_name br2_desc br2_ext - printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' - printf '\n' - - printf 'BR2_EXTERNAL ?=' - for br2_name in "${BR2_EXT_NAMES[@]}"; do - eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" - printf ' %s' "${br2_ext}" - done - printf '\n' - - printf 'BR2_EXTERNAL_NAMES = \n' - printf 'BR2_EXTERNAL_DIRS = \n' - printf 'BR2_EXTERNAL_MKS = \n' - - if [ ${#BR2_EXT_NAMES[@]} -eq 0 ]; then + { + printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' printf '\n' - printf '# No br2-external tree defined.\n' - return - fi - for br2_name in "${BR2_EXT_NAMES[@]}"; do - eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\"" - eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" + printf 'BR2_EXTERNAL ?=' + for br2_name in "${BR2_EXT_NAMES[@]}"; do + eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" + printf ' %s' "${br2_ext}" + done printf '\n' - printf 'BR2_EXTERNAL_NAMES += %s\n' "${br2_name}" - printf 'BR2_EXTERNAL_DIRS += %s\n' "${br2_ext}" - printf 'BR2_EXTERNAL_MKS += %s/external.mk\n' "${br2_ext}" - printf 'export BR2_EXTERNAL_%s_PATH = %s\n' "${br2_name}" "${br2_ext}" - printf 'export BR2_EXTERNAL_%s_DESC = %s\n' "${br2_name}" "${br2_desc}" - done + + printf 'BR2_EXTERNAL_NAMES = \n' + printf 'BR2_EXTERNAL_DIRS = \n' + printf 'BR2_EXTERNAL_MKS = \n' + + if [ ${#BR2_EXT_NAMES[@]} -eq 0 ]; then + printf '\n' + printf '# No br2-external tree defined.\n' + return + fi + + for br2_name in "${BR2_EXT_NAMES[@]}"; do + eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\"" + eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" + printf '\n' + printf 'BR2_EXTERNAL_NAMES += %s\n' "${br2_name}" + printf 'BR2_EXTERNAL_DIRS += %s\n' "${br2_ext}" + printf 'BR2_EXTERNAL_MKS += %s/external.mk\n' "${br2_ext}" + printf 'export BR2_EXTERNAL_%s_PATH = %s\n' "${br2_name}" "${br2_ext}" + printf 'export BR2_EXTERNAL_%s_DESC = %s\n' "${br2_name}" "${br2_desc}" + done + } >"${outputdir}/.br2-external.mk" } -# Generate the kconfig snippet for the br2-external tree. +# Generate the kconfig snippets for the br2-external tree. do_kconfig() { - local br2_name br2_ext + local outputdir="${1}" + local br2_name br2_desc br2_ext br2 + local -a items - printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' - printf '\n' + items=( + paths + menus + toolchains + jpeg + openssl + ) + for br2 in "${items[@]}"; do + { + printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' + printf '\n' + if [ ${#BR2_EXT_NAMES[@]} -eq 0 ]; then + printf '# No br2-external tree defined.\n' + fi + } >"${outputdir}/.br2-external.in.${br2}" + done if [ ${#BR2_EXT_NAMES[@]} -eq 0 ]; then - printf '# No br2-external tree defined.\n' return fi - printf 'menu "External options"\n' - printf '\n' + printf 'menu "External options"\n\n' >>"${outputdir}/.br2-external.in.menus" for br2_name in "${BR2_EXT_NAMES[@]}"; do eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\"" eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" - if [ ${#BR2_EXT_NAMES[@]} -gt 1 ]; then - printf 'menu "%s"\n' "${br2_desc}" - fi - printf 'comment "%s (in %s)"\n' "${br2_desc}" "${br2_ext}" - printf 'config BR2_EXTERNAL_%s_PATH\n' "${br2_name}" - printf '\tstring\n' - printf '\tdefault "%s"\n' "${br2_ext}" - printf 'source "%s/Config.in"\n' "${br2_ext}" - if [ ${#BR2_EXT_NAMES[@]} -gt 1 ]; then - printf 'endmenu # %s\n' "${br2_name}" - fi - printf '\n' + + { + printf 'config BR2_EXTERNAL_%s_PATH\n' "${br2_name}" + printf '\tstring\n' + printf '\tdefault "%s"\n' "${br2_ext}" + printf '\n' + } >>"${outputdir}/.br2-external.in.paths" + + { + if [ ${#BR2_EXT_NAMES[@]} -gt 1 ]; then + printf 'menu "%s"\n' "${br2_desc}" + fi + printf 'comment "%s (in %s)"\n' "${br2_desc}" "${br2_ext}" + printf 'source "%s/Config.in"\n' "${br2_ext}" + if [ ${#BR2_EXT_NAMES[@]} -gt 1 ]; then + printf 'endmenu # %s\n' "${br2_name}" + fi + printf '\n' + } >>"${outputdir}/.br2-external.in.menus" + + if [ -f "${br2_ext}/provides/toolchains.in" ]; then + printf 'comment "Toolchains from: %s"\n' "${br2_desc}" + printf 'source "%s/provides/toolchains.in"\n' "${br2_ext}" + printf '\n' + else + printf '# No toolchain from: %s\n\n' "${br2_desc}" + fi >>"${outputdir}/.br2-external.in.toolchains" + + if [ -f "${br2_ext}/provides/jpeg.in" ]; then + printf 'comment "jpeg from: %s"\n' "${br2_desc}" + printf 'source "%s/provides/jpeg.in"\n' "${br2_ext}" + printf '\n' + else + printf '# No jpeg from: %s\n\n' "${br2_desc}" + fi >>"${outputdir}/.br2-external.in.jpeg" + + if [ -f "${br2_ext}/provides/openssl.in" ]; then + printf 'comment "openssl from: %s"\n' "${br2_desc}" + printf 'source "%s/provides/openssl.in"\n' "${br2_ext}" + printf '\n' + else + printf '# No openssl from: %s\n\n' "${br2_desc}" + fi >>"${outputdir}/.br2-external.in.openssl" done - printf "endmenu # User-provided options\n" -} - -help() { - cat <<-_EOF_ - Usage: - ${my_name} <-m|-k> -o FILE PATH - - With -m, ${my_name} generates the makefile fragment that defines - variables related to the br2-external trees passed as positional - arguments. - - With -k, ${my_name} generates the kconfig snippet to include the - configuration options specified in the br2-external trees passed - as positional arguments. - - Using -k and -m together is not possible. The last one wins. - - Options: - -m Generate the makefile fragment. - - -k Generate the kconfig snippet. - - -o FILE - FILE in which to generate the kconfig snippet or makefile - fragment. - - Returns: - 0 If no error - !0 If any error - _EOF_ + printf 'endmenu\n' >>"${outputdir}/.br2-external.in.menus" } error() { local fmt="${1}"; shift; printf "BR2_EXTERNAL_ERROR = ${fmt}" "${@}"; exit 1; } diff --git a/buildroot/support/scripts/brpkgutil.py b/buildroot/support/scripts/brpkgutil.py index e70d52535..73d8fbe93 100644 --- a/buildroot/support/scripts/brpkgutil.py +++ b/buildroot/support/scripts/brpkgutil.py @@ -1,67 +1,50 @@ # Copyright (C) 2010-2013 Thomas Petazzoni +# Copyright (C) 2019 Yann E. MORIN +import json import logging -import sys +import os import subprocess +from collections import defaultdict -# Execute the "make -show-version" command to get the version of a given -# list of packages, and return the version formatted as a Python dictionary. -def get_version(pkgs): - logging.info("Getting version for %s" % pkgs) - cmd = ["make", "-s", "--no-print-directory"] - for pkg in pkgs: - cmd.append("%s-show-version" % pkg) - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True) - output = p.communicate()[0] - if p.returncode != 0: - logging.error("Error getting version %s" % pkgs) - sys.exit(1) - output = output.split("\n") - if len(output) != len(pkgs) + 1: - logging.error("Error getting version") - sys.exit(1) - version = {} - for i in range(0, len(pkgs)): - pkg = pkgs[i] - version[pkg] = output[i] - return version +# This function returns a tuple of four dictionaries, all using package +# names as keys: +# - a dictionary which values are the lists of packages that are the +# dependencies of the package used as key; +# - a dictionary which values are the lists of packages that are the +# reverse dependencies of the package used as key; +# - a dictionary which values are the type of the package used as key; +# - a dictionary which values are the version of the package used as key, +# 'virtual' for a virtual package, or the empty string for a rootfs. +def get_dependency_tree(): + logging.info("Getting dependency tree...") - -def _get_depends(pkgs, rule): - logging.info("Getting dependencies for %s" % pkgs) - cmd = ["make", "-s", "--no-print-directory"] - for pkg in pkgs: - cmd.append("%s-%s" % (pkg, rule)) - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True) - output = p.communicate()[0] - if p.returncode != 0: - logging.error("Error getting dependencies %s\n" % pkgs) - sys.exit(1) - output = output.split("\n") - if len(output) != len(pkgs) + 1: - logging.error("Error getting dependencies") - sys.exit(1) deps = {} - for i in range(0, len(pkgs)): - pkg = pkgs[i] - pkg_deps = output[i].split(" ") - if pkg_deps == ['']: - deps[pkg] = [] - else: - deps[pkg] = pkg_deps - return deps + rdeps = defaultdict(list) + types = {} + versions = {} + # Special case for the 'all' top-level fake package + deps['all'] = [] + types['all'] = 'target' + versions['all'] = '' -# Execute the "make -show-depends" command to get the list of -# dependencies of a given list of packages, and return the list of -# dependencies formatted as a Python dictionary. -def get_depends(pkgs): - return _get_depends(pkgs, 'show-depends') + cmd = ["make", "-s", "--no-print-directory", "show-info"] + with open(os.devnull, 'wb') as devnull: + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=devnull, + universal_newlines=True) + pkg_list = json.loads(p.communicate()[0]) + for pkg in pkg_list: + deps['all'].append(pkg) + types[pkg] = pkg_list[pkg]["type"] + deps[pkg] = pkg_list[pkg].get("dependencies", []) + for p in deps[pkg]: + rdeps[p].append(pkg) + versions[pkg] = \ + None if pkg_list[pkg]["type"] == "rootfs" \ + else "virtual" if pkg_list[pkg]["virtual"] \ + else pkg_list[pkg]["version"] -# Execute the "make -show-rdepends" command to get the list of -# reverse dependencies of a given list of packages, and return the -# list of dependencies formatted as a Python dictionary. -def get_rdepends(pkgs): - return _get_depends(pkgs, 'show-rdepends') + return (deps, rdeps, types, versions) diff --git a/buildroot/support/scripts/check-host-rpath b/buildroot/support/scripts/check-host-rpath index c8939569e..9a3866982 100755 --- a/buildroot/support/scripts/check-host-rpath +++ b/buildroot/support/scripts/check-host-rpath @@ -11,6 +11,7 @@ export LC_ALL=C main() { local pkg="${1}" local hostdir="${2}" + local perpackagedir="${3}" local file ret # Remove duplicate and trailing '/' for proper match @@ -20,7 +21,7 @@ main() { while read file; do is_elf "${file}" || continue elf_needs_rpath "${file}" "${hostdir}" || continue - check_elf_has_rpath "${file}" "${hostdir}" && continue + check_elf_has_rpath "${file}" "${hostdir}" "${perpackagedir}" && continue if [ ${ret} -eq 0 ]; then ret=1 printf "***\n" @@ -44,6 +45,15 @@ is_elf() { # needs such an RPATH if at least of the libraries used by the ELF # executable is available in the host library directory. This function # returns 0 when a RPATH is needed, 1 otherwise. +# +# With per-package directory support, ${hostdir} will point to the +# current package per-package host directory, and this is where this +# function will check if the libraries needed by the executable are +# located (or not). In practice, the ELF executable RPATH may point to +# another package per-package host directory, but that is fine because +# if such an executable is within the current package per-package host +# directory, its libraries will also have been copied into the current +# package per-package host directory. elf_needs_rpath() { local file="${1}" local hostdir="${2}" @@ -62,13 +72,19 @@ elf_needs_rpath() { # This function checks whether at least one of the RPATH of the given # ELF executable (first argument) properly points to the host library # directory (second argument), either through an absolute RPATH or a -# relative RPATH. Having such a RPATH will make sure the ELF -# executable will find at runtime the shared libraries it depends -# on. This function returns 0 when a proper RPATH was found, or 1 -# otherwise. +# relative RPATH. In the context of per-package directory support, +# ${hostdir} (second argument) points to the current package host +# directory. However, it is perfectly valid for an ELF binary to have +# a RPATH pointing to another package per-package host directory, +# which is why such RPATH is also accepted (the per-package directory +# gets passed as third argument). Having a RPATH pointing to the host +# directory will make sure the ELF executable will find at runtime the +# shared libraries it depends on. This function returns 0 when a +# proper RPATH was found, or 1 otherwise. check_elf_has_rpath() { local file="${1}" local hostdir="${2}" + local perpackagedir="${3}" local rpath dir while read rpath; do @@ -77,6 +93,12 @@ check_elf_has_rpath() { dir="$( sed -r -e 's:/+:/:g; s:/$::;' <<<"${dir}" )" [ "${dir}" = "${hostdir}/lib" ] && return 0 [ "${dir}" = "\$ORIGIN/../lib" ] && return 0 + # This check is done even for builds where + # BR2_PER_PACKAGE_DIRECTORIES is disabled. In this case, + # PER_PACKAGE_DIR and therefore ${perpackagedir} points to + # a non-existent directory, and this check will always be + # false. + [[ ${dir} =~ ${perpackagedir}/[^/]+/host/lib ]] && return 0 done done < <( readelf -d "${file}" \ |sed -r -e '/.* \(R(UN)?PATH\) +Library r(un)?path: \[(.+)\]$/!d' \ diff --git a/buildroot/support/scripts/check-kernel-headers.sh b/buildroot/support/scripts/check-kernel-headers.sh index a8b94f6a0..4e6dce548 100755 --- a/buildroot/support/scripts/check-kernel-headers.sh +++ b/buildroot/support/scripts/check-kernel-headers.sh @@ -1,14 +1,39 @@ #!/bin/sh +# This script (and the embedded C code) will check that the actual +# headers version match the user told us they were: +# +# - if both versions are the same, all is well. +# +# - if the actual headers are older than the user told us, this is +# an error. +# +# - if the actual headers are more recent than the user told us, and +# we are doing a strict check, then this is an error. +# +# - if the actual headers are more recent than the user told us, and +# we are doing a loose check, then a warning is printed, but this is +# not an error. + BUILDDIR="${1}" SYSROOT="${2}" # Make sure we have enough version components HDR_VER="${3}.0.0" +CHECK="${4}" # 'strict' or 'loose' HDR_M="${HDR_VER%%.*}" HDR_V="${HDR_VER#*.}" HDR_m="${HDR_V%%.*}" +# Exit on any error, so we don't try to run an unexisting program if the +# compilation fails. +set -e + +# Set the clean-up trap in advance to prevent a race condition in which we +# create the file but get a SIGTERM before setting it. Notice that we don't +# need to care about EXEC being empty, since 'rm -f ""' does nothing. +trap 'rm -f "${EXEC}"' EXIT + EXEC="$(mktemp -p "${BUILDDIR}" -t .check-headers.XXXXXX)" # We do not want to account for the patch-level, since headers are @@ -19,13 +44,18 @@ ${HOSTCC} -imacros "${SYSROOT}/usr/include/linux/version.h" \ -x c -o "${EXEC}" - <<_EOF_ #include #include +#include int main(int argc __attribute__((unused)), char** argv __attribute__((unused))) { - if((LINUX_VERSION_CODE & ~0xFF) - != KERNEL_VERSION(${HDR_M},${HDR_m},0)) - { + int l = LINUX_VERSION_CODE & ~0xFF; + int h = KERNEL_VERSION(${HDR_M},${HDR_m},0); + + if ((l >= h) && !strcmp("${CHECK}", "loose")) + return 0; + + if (l != h) { printf("Incorrect selection of kernel headers: "); printf("expected %d.%d.x, got %d.%d.x\n", ${HDR_M}, ${HDR_m}, ((LINUX_VERSION_CODE>>16) & 0xFF), @@ -37,6 +67,3 @@ int main(int argc __attribute__((unused)), _EOF_ "${EXEC}" -ret=${?} -rm -f "${EXEC}" -exit ${ret} diff --git a/buildroot/support/scripts/check-uniq-files b/buildroot/support/scripts/check-uniq-files deleted file mode 100755 index fbc6b5d6e..000000000 --- a/buildroot/support/scripts/check-uniq-files +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env python - -import sys -import argparse -from collections import defaultdict - -warn = 'Warning: {0} file "{1}" is touched by more than one package: {2}\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], 'rb') as pkg_file_list: - for line in pkg_file_list.readlines(): - pkg, _, file = line.rstrip(b'\n').partition(b',') - file_to_pkg[file].append(pkg) - - for file in file_to_pkg: - if len(file_to_pkg[file]) > 1: - # If possible, try to decode the binary strings with - # the default user's locale - try: - sys.stderr.write(warn.format(args.type, file.decode(), - [p.decode() for p in file_to_pkg[file]])) - except UnicodeDecodeError: - # ... but fallback to just dumping them raw if they - # contain non-representable chars - sys.stderr.write(warn.format(args.type, file, - file_to_pkg[file])) - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/buildroot/support/scripts/fix-rpath b/buildroot/support/scripts/fix-rpath index fa138ca15..3e67e770e 100755 --- a/buildroot/support/scripts/fix-rpath +++ b/buildroot/support/scripts/fix-rpath @@ -127,14 +127,29 @@ main() { while read file ; do # check if it's an ELF file - if ${PATCHELF} --print-rpath "${file}" > /dev/null 2>&1; then - # make files writable if necessary - changed=$(chmod -c u+w "${file}") - # call patchelf to sanitize the rpath - ${PATCHELF} --make-rpath-relative "${rootdir}" ${sanitize_extra_args[@]} "${file}" - # restore the original permission - test "${changed}" != "" && chmod u-w "${file}" + rpath=$(${PATCHELF} --print-rpath "${file}" 2>&1) + if test $? -ne 0 ; then + continue fi + + # make files writable if necessary + changed=$(chmod -c u+w "${file}") + + # With per-package directory support, most RPATH of host + # binaries will point to per-package directories. This won't + # work with the --make-rpath-relative ${rootdir} invocation as + # the per-package host directory is not within ${rootdir}. So, + # we rewrite all RPATHs pointing to per-package directories so + # that they point to the global host directry. + changed_rpath=$(echo ${rpath} | sed "s@${PER_PACKAGE_DIR}/[^/]\+/host@${HOST_DIR}@") + if test "${rpath}" != "${changed_rpath}" ; then + ${PATCHELF} --set-rpath ${changed_rpath} "${file}" + fi + + # call patchelf to sanitize the rpath + ${PATCHELF} --make-rpath-relative "${rootdir}" ${sanitize_extra_args[@]} "${file}" + # restore the original permission + test "${changed}" != "" && chmod u-w "${file}" done < <(find "${rootdir}" ${find_args[@]}) # Restore patched patchelf utility diff --git a/buildroot/support/scripts/genimage.sh b/buildroot/support/scripts/genimage.sh index 039b3fef1..2796e19eb 100755 --- a/buildroot/support/scripts/genimage.sh +++ b/buildroot/support/scripts/genimage.sh @@ -30,10 +30,18 @@ done [ -n "${GENIMAGE_CFG}" ] || die "Missing argument" +# Pass an empty rootpath. genimage makes a full copy of the given rootpath to +# ${GENIMAGE_TMP}/root so passing TARGET_DIR would be a waste of time and disk +# space. We don't rely on genimage to build the rootfs image, just to insert a +# pre-built one in the disk image. + +trap 'rm -rf "${ROOTPATH_TMP}"' EXIT +ROOTPATH_TMP="$(mktemp -d)" + rm -rf "${GENIMAGE_TMP}" genimage \ - --rootpath "${TARGET_DIR}" \ + --rootpath "${ROOTPATH_TMP}" \ --tmppath "${GENIMAGE_TMP}" \ --inputpath "${BINARIES_DIR}" \ --outputpath "${BINARIES_DIR}" \ diff --git a/buildroot/support/scripts/graph-depends b/buildroot/support/scripts/graph-depends index d2b100f38..d42bebce9 100755 --- a/buildroot/support/scripts/graph-depends +++ b/buildroot/support/scripts/graph-depends @@ -20,10 +20,10 @@ # configuration. # # Copyright (C) 2010-2013 Thomas Petazzoni +# Copyright (C) 2019 Yann E. MORIN import logging import sys -import subprocess import argparse from fnmatch import fnmatch @@ -36,63 +36,6 @@ MODE_PKG = 2 # draw dependency graph for a given package allpkgs = [] -# Execute the "make show-targets" command to get the list of the main -# Buildroot PACKAGES and return it formatted as a Python list. This -# list is used as the starting point for full dependency graphs -def get_targets(): - logging.info("Getting targets") - cmd = ["make", "-s", "--no-print-directory", "show-targets"] - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True) - output = p.communicate()[0].strip() - if p.returncode != 0: - return None - if output == '': - return [] - return output.split(' ') - - -# Recursive function that builds the tree of dependencies for a given -# list of packages. The dependencies are built in a list called -# 'dependencies', which contains tuples of the form (pkg1 -> -# pkg2_on_which_pkg1_depends, pkg3 -> pkg4_on_which_pkg3_depends) and -# the function finally returns this list. -def get_all_depends(pkgs, get_depends_func): - dependencies = [] - - # Filter the packages for which we already have the dependencies - filtered_pkgs = [] - for pkg in pkgs: - if pkg in allpkgs: - continue - filtered_pkgs.append(pkg) - allpkgs.append(pkg) - - if len(filtered_pkgs) == 0: - return [] - - depends = get_depends_func(filtered_pkgs) - - deps = set() - for pkg in filtered_pkgs: - pkg_deps = depends[pkg] - - # This package has no dependency. - if pkg_deps == []: - continue - - # Add dependencies to the list of dependencies - for dep in pkg_deps: - dependencies.append((pkg, dep)) - deps.add(dep) - - if len(deps) != 0: - newdeps = get_all_depends(deps, get_depends_func) - if newdeps is not None: - dependencies += newdeps - - return dependencies - - # The Graphviz "dot" utility doesn't like dashes in node names. So for # node names, we strip all dashes. Also, nodes can't start with a number, # so we prepend an underscore. @@ -172,7 +115,7 @@ def remove_transitive_deps(pkg, deps): # List of dependencies that all/many packages have, and that we want # to trim when generating the dependency graph. -MANDATORY_DEPS = ['toolchain', 'skeleton'] +MANDATORY_DEPS = ['toolchain', 'skeleton', 'host-skeleton', 'host-tar', 'host-gzip', 'host-ccache'] # This function removes the dependency on some 'mandatory' package, like the @@ -181,6 +124,12 @@ def remove_mandatory_deps(pkg, deps): return [p for p in deps[pkg] if p not in MANDATORY_DEPS] +# This function returns all dependencies of pkg that are part of the +# mandatory dependencies: +def get_mandatory_deps(pkg, deps): + return [p for p in deps[pkg] if p in MANDATORY_DEPS] + + # This function will check that there is no loop in the dependency chain # As a side effect, it builds up the dependency cache. def check_circular_deps(deps): @@ -210,10 +159,17 @@ def check_circular_deps(deps): # This functions trims down the dependency list of all packages. # It applies in sequence all the dependency-elimination methods. -def remove_extra_deps(deps, rootpkg, transitive): - for pkg in list(deps.keys()): - if not pkg == rootpkg: - deps[pkg] = remove_mandatory_deps(pkg, deps) +def remove_extra_deps(deps, rootpkg, transitive, arrow_dir): + # For the direct dependencies, find and eliminate mandatory + # deps, and add them to the root package. Don't do it for a + # reverse graph, because mandatory deps are only direct deps. + if arrow_dir == "forward": + for pkg in list(deps.keys()): + if not pkg == rootpkg: + for d in get_mandatory_deps(pkg, deps): + if d not in deps[rootpkg]: + deps[rootpkg].append(d) + deps[pkg] = remove_mandatory_deps(pkg, deps) for pkg in list(deps.keys()): if not transitive or pkg == rootpkg: deps[pkg] = remove_transitive_deps(pkg, deps) @@ -221,7 +177,7 @@ def remove_extra_deps(deps, rootpkg, transitive): # Print the attributes of a node: label and fill-color -def print_attrs(outfile, pkg, version, depth, colors): +def print_attrs(outfile, pkg, pkg_type, pkg_version, depth, colors): name = pkg_node_name(pkg) if pkg == 'all': label = 'ALL' @@ -230,13 +186,11 @@ def print_attrs(outfile, pkg, version, depth, colors): if depth == 0: color = colors[0] else: - if pkg.startswith('host') \ - or pkg.startswith('toolchain') \ - or pkg.startswith('rootfs'): + if pkg_type == "host": color = colors[2] else: color = colors[1] - if version == "virtual": + if pkg_version == "virtual": outfile.write("%s [label = <%s>]\n" % (name, label)) else: outfile.write("%s [label = \"%s\"]\n" % (name, label)) @@ -247,13 +201,13 @@ done_deps = [] # Print the dependency graph of a package -def print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, +def print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, arrow_dir, draw_graph, depth, max_depth, pkg, colors): if pkg in done_deps: return done_deps.append(pkg) if draw_graph: - print_attrs(outfile, pkg, dict_version.get(pkg), depth, colors) + print_attrs(outfile, pkg, dict_types[pkg], dict_versions[pkg], depth, colors) elif depth != 0: outfile.write("%s " % pkg) if pkg not in dict_deps: @@ -261,17 +215,15 @@ def print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, for p in stop_list: if fnmatch(pkg, p): return - if dict_version.get(pkg) == "virtual" and "virtual" in stop_list: + if dict_versions[pkg] == "virtual" and "virtual" in stop_list: return - if pkg.startswith("host-") and "host" in stop_list: + if dict_types[pkg] == "host" and "host" in stop_list: return if max_depth == 0 or depth < max_depth: for d in dict_deps[pkg]: - if dict_version.get(d) == "virtual" \ - and "virtual" in exclude_list: + if dict_versions[d] == "virtual" and "virtual" in exclude_list: continue - if d.startswith("host-") \ - and "host" in exclude_list: + if dict_types[d] == "host" and "host" in exclude_list: continue add = True for p in exclude_list: @@ -281,7 +233,7 @@ def print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, if add: if draw_graph: outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(pkg), pkg_node_name(d), arrow_dir)) - print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, + print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, arrow_dir, draw_graph, depth + 1, max_depth, d, colors) @@ -302,6 +254,8 @@ def parse_args(): "'host' to stop on host packages.") parser.add_argument("--exclude", "-x", metavar="PACKAGE", dest="exclude_list", action="append", help="Like --stop-on, but do not add PACKAGE to the graph.") + parser.add_argument("--exclude-mandatory", "-X", action="store_true", + help="Like if -x was passed for all mandatory dependencies.") parser.add_argument("--colors", "-c", metavar="COLOR_LIST", dest="colors", default="lightblue,grey,gainsboro", help="Comma-separated list of the three colors to use" + @@ -341,6 +295,7 @@ def main(): if args.package is None: mode = MODE_FULL + rootpkg = 'all' else: mode = MODE_PKG rootpkg = args.package @@ -355,14 +310,15 @@ def main(): else: exclude_list = args.exclude_list + if args.exclude_mandatory: + exclude_list += MANDATORY_DEPS + if args.direct: - get_depends_func = brpkgutil.get_depends arrow_dir = "forward" else: if mode == MODE_FULL: logging.error("--reverse needs a package") sys.exit(1) - get_depends_func = brpkgutil.get_rdepends arrow_dir = "back" draw_graph = not args.flat_list @@ -375,46 +331,20 @@ def main(): logging.error("Error: incorrect color list '%s'" % args.colors) sys.exit(1) - # In full mode, start with the result of get_targets() to get the main - # targets and then use get_all_depends() for all targets - if mode == MODE_FULL: - targets = get_targets() - dependencies = [] - allpkgs.append('all') - filtered_targets = [] - for tg in targets: - dependencies.append(('all', tg)) - filtered_targets.append(tg) - deps = get_all_depends(filtered_targets, get_depends_func) - if deps is not None: - dependencies += deps - rootpkg = 'all' - - # In pkg mode, start directly with get_all_depends() on the requested - # package - elif mode == MODE_PKG: - dependencies = get_all_depends([rootpkg], get_depends_func) - - # Make the dependencies a dictionnary { 'pkg':[dep1, dep2, ...] } - dict_deps = {} - for dep in dependencies: - if dep[0] not in dict_deps: - dict_deps[dep[0]] = [] - dict_deps[dep[0]].append(dep[1]) + deps, rdeps, dict_types, dict_versions = brpkgutil.get_dependency_tree() + dict_deps = deps if args.direct else rdeps check_circular_deps(dict_deps) if check_only: sys.exit(0) - dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive) - dict_version = brpkgutil.get_version([pkg for pkg in allpkgs - if pkg != "all" and not pkg.startswith("root")]) + dict_deps = remove_extra_deps(dict_deps, rootpkg, args.transitive, arrow_dir) # Start printing the graph data if draw_graph: outfile.write("digraph G {\n") - print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, + print_pkg_deps(outfile, dict_deps, dict_types, dict_versions, stop_list, exclude_list, arrow_dir, draw_graph, 0, args.depth, rootpkg, colors) if draw_graph: diff --git a/buildroot/support/scripts/pkg-stats b/buildroot/support/scripts/pkg-stats index b0be7d919..8a67e509e 100755 --- a/buildroot/support/scripts/pkg-stats +++ b/buildroot/support/scripts/pkg-stats @@ -23,14 +23,21 @@ import os from collections import defaultdict import re import subprocess -import sys import requests # URL checking import json +import ijson import certifi +import distutils.version +import time +import gzip from urllib3 import HTTPSConnectionPool from urllib3.exceptions import HTTPError from multiprocessing import Pool +NVD_START_YEAR = 2002 +NVD_JSON_VERSION = "1.0" +NVD_BASE_URL = "https://nvd.nist.gov/feeds/json/cve/" + NVD_JSON_VERSION + INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)") URL_RE = re.compile(r"\s*https?://\S*\s*$") @@ -39,11 +46,16 @@ RM_API_STATUS_FOUND_BY_DISTRO = 2 RM_API_STATUS_FOUND_BY_PATTERN = 3 RM_API_STATUS_NOT_FOUND = 4 +# Used to make multiple requests to the same host. It is global +# because it's used by sub-processes. +http_pool = None + class Package: all_licenses = list() all_license_files = list() all_versions = dict() + all_ignored_cves = dict() def __init__(self, name, path): self.name = name @@ -58,6 +70,7 @@ class Package: self.url = None self.url_status = None self.url_worker = None + self.cves = list() self.latest_version = (RM_API_STATUS_ERROR, None, None) def pkgvar(self): @@ -144,11 +157,17 @@ class Package: o = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[1] lines = o.splitlines() for line in lines: - m = re.match("^([0-9]*) warnings generated", line) + m = re.match("^([0-9]*) warnings generated", line.decode()) if m: self.warnings = int(m.group(1)) return + def is_cve_ignored(self, cve): + """ + Tells if the CVE is ignored by the package + """ + return cve in self.all_ignored_cves.get(self.pkgvar(), []) + def __eq__(self, other): return self.path == other.path @@ -160,6 +179,113 @@ class Package: (self.name, self.path, self.has_license, self.has_license_files, self.has_hash, self.patch_count) +class CVE: + """An accessor class for CVE Items in NVD files""" + def __init__(self, nvd_cve): + """Initialize a CVE from its NVD JSON representation""" + self.nvd_cve = nvd_cve + + @staticmethod + def download_nvd_year(nvd_path, year): + metaf = "nvdcve-%s-%s.meta" % (NVD_JSON_VERSION, year) + path_metaf = os.path.join(nvd_path, metaf) + jsonf_gz = "nvdcve-%s-%s.json.gz" % (NVD_JSON_VERSION, year) + path_jsonf_gz = os.path.join(nvd_path, jsonf_gz) + + # If the database file is less than a day old, we assume the NVD data + # locally available is recent enough. + if os.path.exists(path_jsonf_gz) and os.stat(path_jsonf_gz).st_mtime >= time.time() - 86400: + return path_jsonf_gz + + # If not, we download the meta file + url = "%s/%s" % (NVD_BASE_URL, metaf) + print("Getting %s" % url) + page_meta = requests.get(url) + page_meta.raise_for_status() + + # If the meta file already existed, we compare the existing + # one with the data newly downloaded. If they are different, + # we need to re-download the database. + # If the database does not exist locally, we need to redownload it in + # any case. + if os.path.exists(path_metaf) and os.path.exists(path_jsonf_gz): + meta_known = open(path_metaf, "r").read() + if page_meta.text == meta_known: + return path_jsonf_gz + + # Grab the compressed JSON NVD, and write files to disk + url = "%s/%s" % (NVD_BASE_URL, jsonf_gz) + print("Getting %s" % url) + page_json = requests.get(url) + page_json.raise_for_status() + open(path_jsonf_gz, "wb").write(page_json.content) + open(path_metaf, "w").write(page_meta.text) + return path_jsonf_gz + + @classmethod + def read_nvd_dir(cls, nvd_dir): + """ + Iterate over all the CVEs contained in NIST Vulnerability Database + feeds since NVD_START_YEAR. If the files are missing or outdated in + nvd_dir, a fresh copy will be downloaded, and kept in .json.gz + """ + for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): + filename = CVE.download_nvd_year(nvd_dir, year) + try: + content = ijson.items(gzip.GzipFile(filename), 'CVE_Items.item') + except: + print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) + raise + for cve in content: + yield cls(cve['cve']) + + def each_product(self): + """Iterate over each product section of this cve""" + for vendor in self.nvd_cve['affects']['vendor']['vendor_data']: + for product in vendor['product']['product_data']: + yield product + + @property + def identifier(self): + """The CVE unique identifier""" + return self.nvd_cve['CVE_data_meta']['ID'] + + @property + def pkg_names(self): + """The set of package names referred by this CVE definition""" + return set(p['product_name'] for p in self.each_product()) + + def affects(self, br_pkg): + """ + True if the Buildroot Package object passed as argument is affected + by this CVE. + """ + if br_pkg.is_cve_ignored(self.identifier): + return False + + for product in self.each_product(): + if product['product_name'] != br_pkg.name: + continue + + for v in product['version']['version_data']: + if v["version_affected"] == "=": + if br_pkg.current_version == v["version_value"]: + return True + elif v["version_affected"] == "<=": + pkg_version = distutils.version.LooseVersion(br_pkg.current_version) + if not hasattr(pkg_version, "version"): + print("Cannot parse package '%s' version '%s'" % (br_pkg.name, br_pkg.current_version)) + continue + cve_affected_version = distutils.version.LooseVersion(v["version_value"]) + if not hasattr(cve_affected_version, "version"): + print("Cannot parse CVE affected version '%s'" % v["version_value"]) + continue + return pkg_version <= cve_affected_version + else: + print("version_affected: %s" % v['version_affected']) + return False + + def get_pkglist(npackages, package_list): """ Builds the list of Buildroot packages, returning a list of Package @@ -222,70 +348,45 @@ def get_pkglist(npackages, package_list): def package_init_make_info(): - # Licenses - o = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", - "-s", "printvars", "VARS=%_LICENSE"]) - for l in o.splitlines(): - # Get variable name and value - pkgvar, value = l.split("=") - - # If present, strip HOST_ from variable name - if pkgvar.startswith("HOST_"): - pkgvar = pkgvar[5:] - - # Strip _LICENSE - pkgvar = pkgvar[:-8] - - # If value is "unknown", no license details available - if value == "unknown": - continue - Package.all_licenses.append(pkgvar) - - # License files - o = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", - "-s", "printvars", "VARS=%_LICENSE_FILES"]) - for l in o.splitlines(): - # Get variable name and value - pkgvar, value = l.split("=") - - # If present, strip HOST_ from variable name - if pkgvar.startswith("HOST_"): - pkgvar = pkgvar[5:] - - if pkgvar.endswith("_MANIFEST_LICENSE_FILES"): - continue - - # Strip _LICENSE_FILES - pkgvar = pkgvar[:-14] - - Package.all_license_files.append(pkgvar) - - # Version - o = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", - "-s", "printvars", "VARS=%_VERSION"]) + # Fetch all variables at once + variables = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", "-s", "printvars", + "VARS=%_LICENSE %_LICENSE_FILES %_VERSION %_IGNORE_CVES"]) + variable_list = variables.decode().splitlines() # We process first the host package VERSION, and then the target # package VERSION. This means that if a package exists in both - # target and host variants, with different version numbers - # (unlikely), we'll report the target version number. - version_list = o.splitlines() - version_list = [x for x in version_list if x.startswith("HOST_")] + \ - [x for x in version_list if not x.startswith("HOST_")] - for l in version_list: + # target and host variants, with different values (eg. version + # numbers (unlikely)), we'll report the target one. + variable_list = [x[5:] for x in variable_list if x.startswith("HOST_")] + \ + [x for x in variable_list if not x.startswith("HOST_")] + + for l in variable_list: # Get variable name and value pkgvar, value = l.split("=") - # If present, strip HOST_ from variable name - if pkgvar.startswith("HOST_"): - pkgvar = pkgvar[5:] + # Strip the suffix according to the variable + if pkgvar.endswith("_LICENSE"): + # If value is "unknown", no license details available + if value == "unknown": + continue + pkgvar = pkgvar[:-8] + Package.all_licenses.append(pkgvar) - if pkgvar.endswith("_DL_VERSION"): - continue + elif pkgvar.endswith("_LICENSE_FILES"): + if pkgvar.endswith("_MANIFEST_LICENSE_FILES"): + continue + pkgvar = pkgvar[:-14] + Package.all_license_files.append(pkgvar) - # Strip _VERSION - pkgvar = pkgvar[:-8] + elif pkgvar.endswith("_VERSION"): + if pkgvar.endswith("_DL_VERSION"): + continue + pkgvar = pkgvar[:-8] + Package.all_versions[pkgvar] = value - Package.all_versions[pkgvar] = value + elif pkgvar.endswith("_IGNORE_CVES"): + pkgvar = pkgvar[:-12] + Package.all_ignored_cves[pkgvar] = value.split() def check_url_status_worker(url, url_status): @@ -301,11 +402,13 @@ def check_url_status_worker(url, url_status): def check_package_urls(packages): - Package.pool = Pool(processes=64) + pool = Pool(processes=64) for pkg in packages: - pkg.url_worker = pkg.pool.apply_async(check_url_status_worker, (pkg.url, pkg.url_status)) + pkg.url_worker = pool.apply_async(check_url_status_worker, (pkg.url, pkg.url_status)) for pkg in packages: pkg.url_status = pkg.url_worker.get(timeout=3600) + del pkg.url_worker + pool.terminate() def release_monitoring_get_latest_version_by_distro(pool, name): @@ -346,6 +449,15 @@ def release_monitoring_get_latest_version_by_guess(pool, name): return (RM_API_STATUS_NOT_FOUND, None, None) +def check_package_latest_version_worker(name): + """Wrapper to try both by name then by guess""" + print(name) + res = release_monitoring_get_latest_version_by_distro(http_pool, name) + if res[0] == RM_API_STATUS_NOT_FOUND: + res = release_monitoring_get_latest_version_by_guess(http_pool, name) + return res + + def check_package_latest_version(packages): """ Fills in the .latest_version field of all Package objects @@ -361,18 +473,26 @@ def check_package_latest_version(packages): - id: string containing the id of the project corresponding to this package, as known by release-monitoring.org """ - pool = HTTPSConnectionPool('release-monitoring.org', port=443, - cert_reqs='CERT_REQUIRED', ca_certs=certifi.where(), - timeout=30) - count = 0 - for pkg in packages: - v = release_monitoring_get_latest_version_by_distro(pool, pkg.name) - if v[0] == RM_API_STATUS_NOT_FOUND: - v = release_monitoring_get_latest_version_by_guess(pool, pkg.name) + global http_pool + http_pool = HTTPSConnectionPool('release-monitoring.org', port=443, + cert_reqs='CERT_REQUIRED', ca_certs=certifi.where(), + timeout=30) + worker_pool = Pool(processes=64) + results = worker_pool.map(check_package_latest_version_worker, (pkg.name for pkg in packages)) + for pkg, r in zip(packages, results): + pkg.latest_version = r + worker_pool.terminate() + del http_pool - pkg.latest_version = v - print("[%d/%d] Package %s" % (count, len(packages), pkg.name)) - count += 1 + +def check_package_cves(nvd_path, packages): + if not os.path.isdir(nvd_path): + os.makedirs(nvd_path) + + for cve in CVE.read_nvd_dir(nvd_path): + for pkg_name in cve.pkg_names: + if pkg_name in packages and cve.affects(packages[pkg_name]): + packages[pkg_name].cves.append(cve.identifier) def calculate_stats(packages): @@ -410,6 +530,9 @@ def calculate_stats(packages): else: stats["version-not-uptodate"] += 1 stats["patches"] += pkg.patch_count + stats["total-cves"] += len(pkg.cves) + if len(pkg.cves) != 0: + stats["pkg-cves"] += 1 return stats @@ -621,6 +744,17 @@ def dump_html_pkg(f, pkg): f.write(" %s\n" % (" ".join(td_class), url_str)) + # CVEs + td_class = ["centered"] + if len(pkg.cves) == 0: + td_class.append("correct") + else: + td_class.append("wrong") + f.write(" \n" % " ".join(td_class)) + for cve in pkg.cves: + f.write(" %s
        \n" % (cve, cve)) + f.write(" \n") + f.write(" \n") @@ -638,6 +772,7 @@ def dump_html_all_pkgs(f, packages): Latest version Warnings Upstream URL +CVEs """) for pkg in sorted(packages): @@ -676,46 +811,85 @@ def dump_html_stats(f, stats): stats["version-not-uptodate"]) f.write("Packages with no known upstream version%s\n" % stats["version-unknown"]) + f.write("Packages affected by CVEs%s\n" % + stats["pkg-cves"]) + f.write("Total number of CVEs affecting all packages%s\n" % + stats["total-cves"]) f.write("\n") -def dump_gen_info(f): +def dump_html_gen_info(f, date, commit): # Updated on Mon Feb 19 08:12:08 CET 2018, Git commit aa77030b8f5e41f1c53eb1c1ad664b8c814ba032 - o = subprocess.check_output(["git", "log", "master", "-n", "1", "--pretty=format:%H"]) - git_commit = o.splitlines()[0] - f.write("

        Updated on %s, git commit %s

        \n" % - (str(datetime.datetime.utcnow()), git_commit)) + f.write("

        Updated on %s, git commit %s

        \n" % (str(date), commit)) -def dump_html(packages, stats, output): +def dump_html(packages, stats, date, commit, output): with open(output, 'w') as f: f.write(html_header) dump_html_all_pkgs(f, packages) dump_html_stats(f, stats) - dump_gen_info(f) + dump_html_gen_info(f, date, commit) f.write(html_footer) +def dump_json(packages, stats, date, commit, output): + # Format packages as a dictionnary instead of a list + # Exclude local field that does not contains real date + excluded_fields = ['url_worker', 'name'] + pkgs = { + pkg.name: { + k: v + for k, v in pkg.__dict__.items() + if k not in excluded_fields + } for pkg in packages + } + # Aggregate infrastructures into a single dict entry + statistics = { + k: v + for k, v in stats.items() + if not k.startswith('infra-') + } + statistics['infra'] = {k[6:]: v for k, v in stats.items() if k.startswith('infra-')} + # The actual structure to dump, add commit and date to it + final = {'packages': pkgs, + 'stats': statistics, + 'commit': commit, + 'date': str(date)} + + with open(output, 'w') as f: + json.dump(final, f, indent=2, separators=(',', ': ')) + f.write('\n') + + def parse_args(): parser = argparse.ArgumentParser() - parser.add_argument('-o', dest='output', action='store', required=True, + output = parser.add_argument_group('output', 'Output file(s)') + output.add_argument('--html', dest='html', action='store', help='HTML output file') - parser.add_argument('-n', dest='npackages', type=int, action='store', - help='Number of packages') - parser.add_argument('-p', dest='packages', action='store', - help='List of packages (comma separated)') - return parser.parse_args() + output.add_argument('--json', dest='json', action='store', + help='JSON output file') + packages = parser.add_mutually_exclusive_group() + packages.add_argument('-n', dest='npackages', type=int, action='store', + help='Number of packages') + packages.add_argument('-p', dest='packages', action='store', + help='List of packages (comma separated)') + parser.add_argument('--nvd-path', dest='nvd_path', + help='Path to the local NVD database') + args = parser.parse_args() + if not args.html and not args.json: + parser.error('at least one of --html or --json (or both) is required') + return args def __main__(): args = parse_args() - if args.npackages and args.packages: - print("ERROR: -n and -p are mutually exclusive") - sys.exit(1) if args.packages: package_list = args.packages.split(",") else: package_list = None + date = datetime.datetime.utcnow() + commit = subprocess.check_output(['git', 'rev-parse', + 'HEAD']).splitlines()[0].decode() print("Build package list ...") packages = get_pkglist(args.npackages, package_list) print("Getting package make info ...") @@ -733,10 +907,17 @@ def __main__(): check_package_urls(packages) print("Getting latest versions ...") check_package_latest_version(packages) + if args.nvd_path: + print("Checking packages CVEs") + check_package_cves(args.nvd_path, {p.name: p for p in packages}) print("Calculate stats") stats = calculate_stats(packages) - print("Write HTML") - dump_html(packages, stats, args.output) + if args.html: + print("Write HTML") + dump_html(packages, stats, date, commit, args.html) + if args.json: + print("Write JSON") + dump_json(packages, stats, date, commit, args.json) __main__() diff --git a/buildroot/support/scripts/size-stats b/buildroot/support/scripts/size-stats index deea92e27..dea3a6007 100755 --- a/buildroot/support/scripts/size-stats +++ b/buildroot/support/scripts/size-stats @@ -22,6 +22,7 @@ import os.path import argparse import csv import collections +import math try: import matplotlib @@ -32,8 +33,13 @@ except ImportError: sys.stderr.write("You need python-matplotlib to generate the size graph\n") exit(1) -colors = ['#e60004', '#009836', '#2e1d86', '#ffed00', - '#0068b5', '#f28e00', '#940084', '#97c000'] + +class Config: + biggest_first = False + iec = False + size_limit = 0.01 + colors = ['#e60004', '#f28e00', '#ffed00', '#940084', + '#2e1d86', '#0068b5', '#009836', '#97c000'] # @@ -66,8 +72,8 @@ def add_file(filesdict, relpath, abspath, pkg): # def build_package_dict(builddir): filesdict = {} - with open(os.path.join(builddir, "build", "packages-file-list.txt")) as filelistf: - for l in filelistf.readlines(): + with open(os.path.join(builddir, "build", "packages-file-list.txt")) as f: + for l in f.readlines(): pkg, fpath = l.split(",", 1) # remove the initial './' in each file path fpath = fpath.strip()[2:] @@ -127,23 +133,46 @@ def build_package_size(filesdict, builddir): # outputf: output file for the graph # def draw_graph(pkgsize, outputf): + def size2string(sz): + if Config.iec: + divider = 1024.0 + prefixes = ['', 'Ki', 'Mi', 'Gi', 'Ti'] + else: + divider = 1000.0 + prefixes = ['', 'k', 'M', 'G', 'T'] + while sz > divider and len(prefixes) > 1: + prefixes = prefixes[1:] + sz = sz/divider + # precision is made so that there are always at least three meaningful + # digits displayed (e.g. '3.14' and '10.4', not just '3' and '10') + precision = int(2-math.floor(math.log10(sz))) if sz < 1000 else 0 + return '{:.{prec}f} {}B'.format(sz, prefixes[0], prec=precision) + total = sum(pkgsize.values()) labels = [] values = [] other_value = 0 - for (p, sz) in sorted(pkgsize.items(), key=lambda x: x[1]): - if sz < (total * 0.01): + unknown_value = 0 + for (p, sz) in sorted(pkgsize.items(), key=lambda x: x[1], + reverse=Config.biggest_first): + if sz < (total * Config.size_limit): other_value += sz + elif p == "unknown": + unknown_value = sz else: - labels.append("%s (%d kB)" % (p, sz / 1000.)) + labels.append("%s (%s)" % (p, size2string(sz))) values.append(sz) - labels.append("Other (%d kB)" % (other_value / 1000.)) - values.append(other_value) + if unknown_value != 0: + labels.append("Unknown (%s)" % (size2string(unknown_value))) + values.append(unknown_value) + if other_value != 0: + labels.append("Other (%s)" % (size2string(other_value))) + values.append(other_value) plt.figure() patches, texts, autotexts = plt.pie(values, labels=labels, autopct='%1.1f%%', shadow=True, - colors=colors) + colors=Config.colors) # Reduce text size proptease = fm.FontProperties() proptease.set_size('xx-small') @@ -151,7 +180,8 @@ def draw_graph(pkgsize, outputf): plt.setp(texts, fontproperties=proptease) plt.suptitle("Filesystem size per package", fontsize=18, y=.97) - plt.title("Total filesystem size: %d kB" % (total / 1000.), fontsize=10, y=.96) + plt.title("Total filesystem size: %s" % (size2string(total)), fontsize=10, + y=.96) plt.savefig(outputf) @@ -209,32 +239,70 @@ def gen_packages_csv(pkgsizes, outputf): total = sum(pkgsizes.values()) with open(outputf, 'w') as csvfile: wr = csv.writer(csvfile, delimiter=',', quoting=csv.QUOTE_MINIMAL) - wr.writerow(["Package name", "Package size", "Package size in system (%)"]) + wr.writerow(["Package name", "Package size", + "Package size in system (%)"]) for (pkg, size) in pkgsizes.items(): wr.writerow([pkg, size, "%.1f" % (float(size) / total * 100)]) -parser = argparse.ArgumentParser(description='Draw size statistics graphs') +# +# Our special action for --iec, --binary, --si, --decimal +# +class PrefixAction(argparse.Action): + def __init__(self, option_strings, dest, **kwargs): + for key in ["type", "nargs"]: + if key in kwargs: + raise ValueError('"{}" not allowed'.format(key)) + super(PrefixAction, self).__init__(option_strings, dest, nargs=0, + type=bool, **kwargs) -parser.add_argument("--builddir", '-i', metavar="BUILDDIR", required=True, - help="Buildroot output directory") -parser.add_argument("--graph", '-g', metavar="GRAPH", - help="Graph output file (.pdf or .png extension)") -parser.add_argument("--file-size-csv", '-f', metavar="FILE_SIZE_CSV", - help="CSV output file with file size statistics") -parser.add_argument("--package-size-csv", '-p', metavar="PKG_SIZE_CSV", - help="CSV output file with package size statistics") -args = parser.parse_args() + def __call__(self, parser, namespace, values, option_string=None): + setattr(namespace, self.dest, option_string in ["--iec", "--binary"]) -# Find out which package installed what files -pkgdict = build_package_dict(args.builddir) -# Collect the size installed by each package -pkgsize = build_package_size(pkgdict, args.builddir) +def main(): + parser = argparse.ArgumentParser(description='Draw size statistics graphs') -if args.graph: - draw_graph(pkgsize, args.graph) -if args.file_size_csv: - gen_files_csv(pkgdict, pkgsize, args.file_size_csv) -if args.package_size_csv: - gen_packages_csv(pkgsize, args.package_size_csv) + parser.add_argument("--builddir", '-i', metavar="BUILDDIR", required=True, + help="Buildroot output directory") + parser.add_argument("--graph", '-g', metavar="GRAPH", + help="Graph output file (.pdf or .png extension)") + parser.add_argument("--file-size-csv", '-f', metavar="FILE_SIZE_CSV", + help="CSV output file with file size statistics") + parser.add_argument("--package-size-csv", '-p', metavar="PKG_SIZE_CSV", + help="CSV output file with package size statistics") + parser.add_argument("--biggest-first", action='store_true', + help="Sort packages in decreasing size order, " + + "rather than in increasing size order") + parser.add_argument("--iec", "--binary", "--si", "--decimal", + action=PrefixAction, + help="Use IEC (binary, powers of 1024) or SI (decimal, " + "powers of 1000, the default) prefixes") + parser.add_argument("--size-limit", "-l", type=float, + help='Under this size ratio, files are accounted to ' + + 'the generic "Other" package. Default: 0.01 (1%%)') + args = parser.parse_args() + + Config.biggest_first = args.biggest_first + Config.iec = args.iec + if args.size_limit is not None: + if args.size_limit < 0.0 or args.size_limit > 1.0: + parser.error("--size-limit must be in [0.0..1.0]") + Config.size_limit = args.size_limit + + # Find out which package installed what files + pkgdict = build_package_dict(args.builddir) + + # Collect the size installed by each package + pkgsize = build_package_size(pkgdict, args.builddir) + + if args.graph: + draw_graph(pkgsize, args.graph) + if args.file_size_csv: + gen_files_csv(pkgdict, pkgsize, args.file_size_csv) + if args.package_size_csv: + gen_packages_csv(pkgsize, args.package_size_csv) + + +if __name__ == "__main__": + main() diff --git a/buildroot/support/testing/conf/binfmt-misc-kernel-fragment.config b/buildroot/support/testing/conf/binfmt-misc-kernel-fragment.config new file mode 100644 index 000000000..7c992ff71 --- /dev/null +++ b/buildroot/support/testing/conf/binfmt-misc-kernel-fragment.config @@ -0,0 +1,2 @@ +# Needed for binfmt_misc service: "Arbitrary Executable File Formats File System" +CONFIG_BINFMT_MISC=y diff --git a/buildroot/support/testing/infra/__init__.py b/buildroot/support/testing/infra/__init__.py index e229e9085..6392aa679 100644 --- a/buildroot/support/testing/infra/__init__.py +++ b/buildroot/support/testing/infra/__init__.py @@ -3,9 +3,11 @@ import re import sys import tempfile import subprocess -from urllib2 import urlopen, HTTPError, URLError +from urllib.request import urlopen +from urllib.error import HTTPError, URLError ARTIFACTS_URL = "http://autobuild.buildroot.net/artefacts/" +BASE_DIR = os.path.realpath(os.path.join(os.path.dirname(__file__), "../../..")) def open_log_file(builddir, stage, logtofile=True): @@ -21,8 +23,13 @@ def open_log_file(builddir, stage, logtofile=True): return fhandle +def basepath(relpath=""): + """Return the absolute path for a file or directory relative to the Buildroot top directory.""" + return os.path.join(BASE_DIR, relpath) + + def filepath(relpath): - return os.path.join(os.getcwd(), "support/testing", relpath) + return os.path.join(BASE_DIR, "support/testing", relpath) def download(dldir, filename): @@ -38,7 +45,7 @@ def download(dldir, filename): try: url_fh = urlopen(os.path.join(ARTIFACTS_URL, filename)) - with open(tmpfile, "w+") as tmpfile_fh: + with open(tmpfile, "w+b") as tmpfile_fh: tmpfile_fh.write(url_fh.read()) except (HTTPError, URLError) as err: os.unlink(tmpfile) @@ -49,6 +56,16 @@ def download(dldir, filename): return finalpath +def run_cmd_on_host(builddir, cmd): + """Call subprocess.check_output and return the text output.""" + out = subprocess.check_output(cmd, + stderr=open(os.devnull, "w"), + cwd=builddir, + env={"LANG": "C"}, + universal_newlines=True) + return out + + def get_elf_arch_tag(builddir, prefix, fpath, tag): """ Runs the cross readelf on 'fpath', then extracts the value of tag 'tag'. @@ -60,7 +77,7 @@ def get_elf_arch_tag(builddir, prefix, fpath, tag): """ cmd = ["host/bin/{}-readelf".format(prefix), "-A", os.path.join("target", fpath)] - out = subprocess.check_output(cmd, cwd=builddir, env={"LANG": "C"}) + out = run_cmd_on_host(builddir, cmd) regexp = re.compile("^ {}: (.*)$".format(tag)) for line in out.splitlines(): m = regexp.match(line) @@ -87,7 +104,7 @@ def get_elf_prog_interpreter(builddir, prefix, fpath): """ cmd = ["host/bin/{}-readelf".format(prefix), "-l", os.path.join("target", fpath)] - out = subprocess.check_output(cmd, cwd=builddir, env={"LANG": "C"}) + out = run_cmd_on_host(builddir, cmd) regexp = re.compile("^ *\[Requesting program interpreter: (.*)\]$") for line in out.splitlines(): m = regexp.match(line) diff --git a/buildroot/support/testing/infra/basetest.py b/buildroot/support/testing/infra/basetest.py index a176bc328..5dc603444 100644 --- a/buildroot/support/testing/infra/basetest.py +++ b/buildroot/support/testing/infra/basetest.py @@ -84,3 +84,9 @@ class BRTest(BRConfigTest): if self.emulator: self.emulator.stop() super(BRTest, self).tearDown() + + # Run the given 'cmd' with a 'timeout' on the target and + # assert that the command succeeded + def assertRunOk(self, cmd, timeout=-1): + _, exit_code = self.emulator.run(cmd, timeout) + self.assertEqual(exit_code, 0) diff --git a/buildroot/support/testing/infra/builder.py b/buildroot/support/testing/infra/builder.py index 018747555..88f01d15c 100644 --- a/buildroot/support/testing/infra/builder.py +++ b/buildroot/support/testing/infra/builder.py @@ -43,7 +43,7 @@ class Builder(object): cmd += ["olddefconfig"] ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, - env=env) + cwd=infra.basepath(), env=env) if ret != 0: raise SystemError("Cannot olddefconfig") diff --git a/buildroot/support/testing/infra/emulator.py b/buildroot/support/testing/infra/emulator.py index 093a643a8..5611ec96e 100644 --- a/buildroot/support/testing/infra/emulator.py +++ b/buildroot/support/testing/infra/emulator.py @@ -76,6 +76,7 @@ class Emulator(object): self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd)) self.qemu = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:], timeout=5 * self.timeout_multiplier, + encoding='utf-8', env={"QEMU_AUDIO_DRV": "none"}) # We want only stdout into the log to avoid double echo self.qemu.logfile_read = self.logfile diff --git a/buildroot/support/testing/run-tests b/buildroot/support/testing/run-tests index 813b92704..022209b41 100755 --- a/buildroot/support/testing/run-tests +++ b/buildroot/support/testing/run-tests @@ -1,9 +1,10 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 import argparse -import sys -import os -import nose2 import multiprocessing +import os +import sys + +import nose2 from infra.basetest import BRConfigTest @@ -70,7 +71,7 @@ def main(): BRConfigTest.outputdir = os.path.abspath(args.output) - if args.all is False and len(args.testname) == 0: + if args.all is False and not args.testname: print("No test selected") print("") parser.print_help() @@ -112,7 +113,7 @@ def main(): "-s", test_dir, "-c", os.path.join(test_dir, "conf/unittest.cfg")] - if len(args.testname) != 0: + if args.testname: nose2_args += args.testname nose2.discover(argv=nose2_args) diff --git a/buildroot/support/testing/tests/boot/test_atf.py b/buildroot/support/testing/tests/boot/test_atf.py index bb3701bae..21c3ec314 100644 --- a/buildroot/support/testing/tests/boot/test_atf.py +++ b/buildroot/support/testing/tests/boot/test_atf.py @@ -69,7 +69,6 @@ class TestATFMarvell(infra.basetest.BRTest): BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" BR2_TARGET_BINARIES_MARVELL=y - BR2_TARGET_BINARIES_MARVELL_8040=y BR2_TARGET_MV_DDR_MARVELL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040" diff --git a/buildroot/support/testing/tests/core/test_hardening.py b/buildroot/support/testing/tests/core/test_hardening.py index 82e0f3d8f..edfb3315d 100644 --- a/buildroot/support/testing/tests/core/test_hardening.py +++ b/buildroot/support/testing/tests/core/test_hardening.py @@ -1,5 +1,4 @@ import os -import subprocess import json import infra.basetest @@ -26,13 +25,11 @@ class TestHardeningBase(infra.basetest.BRTest): def checksec_run(self, target_file): filepath = os.path.join(self.builddir, "target", target_file) - cmd = ["host/bin/checksec", "--output", "json", "--file", filepath] + cmd = ["host/bin/checksec", "--format=json", + "--file={}".format(filepath)] # Checksec is being used for elf file analysis only. There are no # assumptions of target/run-time checks as part of this testing. - ret = subprocess.check_output(cmd, - stderr=open(os.devnull, "w"), - cwd=self.builddir, - env={"LANG": "C"}) + ret = infra.run_cmd_on_host(self.builddir, cmd) return json.loads(ret) @@ -45,8 +42,9 @@ class TestRelro(TestHardeningBase): def test_run(self): for f in self.checksec_files: out = self.checksec_run(f) - self.assertEqual(out["file"]["relro"], "full") - self.assertEqual(out["file"]["pie"], "yes") + filepath = os.path.join(self.builddir, "target", f) + self.assertEqual(out[filepath]["relro"], "full") + self.assertEqual(out[filepath]["pie"], "yes") class TestRelroPartial(TestHardeningBase): @@ -58,8 +56,9 @@ class TestRelroPartial(TestHardeningBase): def test_run(self): for f in self.checksec_files: out = self.checksec_run(f) - self.assertEqual(out["file"]["relro"], "partial") - self.assertEqual(out["file"]["pie"], "no") + filepath = os.path.join(self.builddir, "target", f) + self.assertEqual(out[filepath]["relro"], "partial") + self.assertEqual(out[filepath]["pie"], "no") class TestSspNone(TestHardeningBase): @@ -71,7 +70,8 @@ class TestSspNone(TestHardeningBase): def test_run(self): for f in self.checksec_files: out = self.checksec_run(f) - self.assertEqual(out["file"]["canary"], "no") + filepath = os.path.join(self.builddir, "target", f) + self.assertEqual(out[filepath]["canary"], "no") class TestSspStrong(TestHardeningBase): @@ -83,7 +83,8 @@ class TestSspStrong(TestHardeningBase): def test_run(self): for f in self.checksec_files: out = self.checksec_run(f) - self.assertEqual(out["file"]["canary"], "yes") + filepath = os.path.join(self.builddir, "target", f) + self.assertEqual(out[filepath]["canary"], "yes") class TestFortifyNone(TestHardeningBase): @@ -95,7 +96,8 @@ class TestFortifyNone(TestHardeningBase): def test_run(self): for f in self.checksec_files: out = self.checksec_run(f) - self.assertEqual(out["file"]["fortified"], "0") + filepath = os.path.join(self.builddir, "target", f) + self.assertEqual(out[filepath]["fortified"], "0") class TestFortifyConserv(TestHardeningBase): @@ -107,4 +109,5 @@ class TestFortifyConserv(TestHardeningBase): def test_run(self): for f in self.checksec_files: out = self.checksec_run(f) - self.assertNotEqual(out["file"]["fortified"], "0") + filepath = os.path.join(self.builddir, "target", f) + self.assertNotEqual(out[filepath]["fortified"], "0") diff --git a/buildroot/support/testing/tests/core/test_post_scripts.py b/buildroot/support/testing/tests/core/test_post_scripts.py index 40a36b790..bc61f4af5 100644 --- a/buildroot/support/testing/tests/core/test_post_scripts.py +++ b/buildroot/support/testing/tests/core/test_post_scripts.py @@ -20,7 +20,7 @@ class TestPostScripts(infra.basetest.BRTest): def check_post_log_file(self, f, what, target_dir): lines = {} - with open(os.path.join(self.builddir, "build", f), 'rb') as csvfile: + with open(os.path.join(self.builddir, "build", f), newline='') as csvfile: r = csv.reader(csvfile, delimiter=',') for row in r: lines[row[0]] = row[1] diff --git a/buildroot/support/testing/tests/core/test_root_password.py b/buildroot/support/testing/tests/core/test_root_password.py new file mode 100644 index 000000000..aefcd3605 --- /dev/null +++ b/buildroot/support/testing/tests/core/test_root_password.py @@ -0,0 +1,36 @@ +import os +import infra.basetest +from crypt import crypt + + +class TestRootPassword(infra.basetest.BRTest): + password = "foo" + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ENABLE_ROOT_LOGIN=y + BR2_TARGET_GENERIC_ROOT_PASSWD="{}" + """.format(password) + + def test_run(self): + # 1. Test by looking hash in the /etc/shadow + shadow = os.path.join(self.builddir, "target", "etc", "shadow") + with open(shadow, "r") as f: + users = f.readlines() + for user in users: + s = user.split(":") + n, h = s[0], s[1] + if n == "root": + # Fail if the account is disabled or no password is required + self.assertTrue(h not in ["", "*"]) + # Fail if the hash isn't right + self.assertEqual(crypt(self.password, h), h) + + # 2. Test by attempting to login + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + try: + self.emulator.boot(arch="armv7", kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login(self.password) + except SystemError: + self.fail("Unable to login with the password") diff --git a/buildroot/support/testing/tests/download/gitremote.py b/buildroot/support/testing/tests/download/gitremote.py index 3b35456dd..7df252d03 100644 --- a/buildroot/support/testing/tests/download/gitremote.py +++ b/buildroot/support/testing/tests/download/gitremote.py @@ -32,7 +32,8 @@ class GitRemote(object): for port in range(GIT_REMOTE_PORT_INITIAL, GIT_REMOTE_PORT_LAST + 1): cmd = daemon_cmd + ["--port={port}".format(port=port)] self.logfile.write("> starting git remote with '{}'\n".format(" ".join(cmd))) - self.daemon = pexpect.spawn(cmd[0], cmd[1:], logfile=self.logfile) + self.daemon = pexpect.spawn(cmd[0], cmd[1:], logfile=self.logfile, + encoding='utf-8') ret = self.daemon.expect(["Ready to rumble", "Address already in use"]) if ret == 0: diff --git a/buildroot/support/testing/tests/download/test_git.py b/buildroot/support/testing/tests/download/test_git.py index 245555729..ec5b8f3fd 100644 --- a/buildroot/support/testing/tests/download/test_git.py +++ b/buildroot/support/testing/tests/download/test_git.py @@ -1,7 +1,7 @@ import os import shutil -from gitremote import GitRemote +from tests.download.gitremote import GitRemote import infra diff --git a/buildroot/support/testing/tests/fs/test_ext.py b/buildroot/support/testing/tests/fs/test_ext.py index f5f9e9fdf..16b308cf6 100644 --- a/buildroot/support/testing/tests/fs/test_ext.py +++ b/buildroot/support/testing/tests/fs/test_ext.py @@ -1,5 +1,4 @@ import os -import subprocess import infra.basetest @@ -15,10 +14,7 @@ CHECK_FS_TYPE_CMD = "mount | grep '/dev/root on / type {}'" def dumpe2fs_run(builddir, image): cmd = ["host/sbin/dumpe2fs", os.path.join("images", image)] - ret = subprocess.check_output(cmd, - stderr=open(os.devnull, "w"), - cwd=builddir, - env={"LANG": "C"}) + ret = infra.run_cmd_on_host(builddir, cmd) return ret.strip().splitlines() diff --git a/buildroot/support/testing/tests/fs/test_f2fs.py b/buildroot/support/testing/tests/fs/test_f2fs.py index 819c619a3..950d4cf25 100644 --- a/buildroot/support/testing/tests/fs/test_f2fs.py +++ b/buildroot/support/testing/tests/fs/test_f2fs.py @@ -1,5 +1,4 @@ import os -import subprocess import infra.basetest @@ -29,9 +28,7 @@ class TestF2FS(infra.basetest.BRTest): def test_run(self): img = os.path.join(self.builddir, "images", "rootfs.f2fs") - out = subprocess.check_output(["host/sbin/dump.f2fs", img], - cwd=self.builddir, - env={"LANG": "C"}) + out = infra.run_cmd_on_host(self.builddir, ["host/sbin/dump.f2fs", img]) out = out.splitlines() prop = dumpf2fs_getprop(out, "Info: total sectors") self.assertEqual(prop, "262144 (128 MB)") diff --git a/buildroot/support/testing/tests/fs/test_jffs2.py b/buildroot/support/testing/tests/fs/test_jffs2.py index 2ff509918..f5066ff01 100644 --- a/buildroot/support/testing/tests/fs/test_jffs2.py +++ b/buildroot/support/testing/tests/fs/test_jffs2.py @@ -1,5 +1,4 @@ import os -import subprocess import infra.basetest @@ -30,9 +29,8 @@ class TestJffs2(infra.basetest.BRTest): def test_run(self): img = os.path.join(self.builddir, "images", "rootfs.jffs2") - out = subprocess.check_output(["host/sbin/jffs2dump", "-c", img], - cwd=self.builddir, - env={"LANG": "C"}) + cmd = ["host/sbin/jffs2dump", "-c", img] + out = infra.run_cmd_on_host(self.builddir, cmd) out = out.splitlines() self.assertTrue(jffs2dump_find_file(out, "busybox")) diff --git a/buildroot/support/testing/tests/fs/test_squashfs.py b/buildroot/support/testing/tests/fs/test_squashfs.py index 066c05434..234f4944b 100644 --- a/buildroot/support/testing/tests/fs/test_squashfs.py +++ b/buildroot/support/testing/tests/fs/test_squashfs.py @@ -15,9 +15,7 @@ class TestSquashfs(infra.basetest.BRTest): def test_run(self): unsquashfs_cmd = ["host/bin/unsquashfs", "-s", "images/rootfs.squashfs"] - out = subprocess.check_output(unsquashfs_cmd, - cwd=self.builddir, - env={"LANG": "C"}) + out = infra.run_cmd_on_host(self.builddir, unsquashfs_cmd) out = out.splitlines() self.assertEqual(out[0], "Found a valid SQUASHFS 4:0 superblock on images/rootfs.squashfs.") diff --git a/buildroot/support/testing/tests/fs/test_ubi.py b/buildroot/support/testing/tests/fs/test_ubi.py index 015d82f76..7321f83da 100644 --- a/buildroot/support/testing/tests/fs/test_ubi.py +++ b/buildroot/support/testing/tests/fs/test_ubi.py @@ -21,10 +21,9 @@ class TestUbi(infra.basetest.BRTest): # To be investigated. def test_run(self): img = os.path.join(self.builddir, "images", "rootfs.ubi") - out = subprocess.check_output(["file", img], - cwd=self.builddir, - env={"LANG": "C"}) + out = infra.run_cmd_on_host(self.builddir, ["file", img]) out = out.splitlines() + self.assertIn("UBI image, version 1", out[0]) subprocess.call(["truncate", "-s 128M", img]) diff --git a/buildroot/support/testing/tests/init/test_systemd.py b/buildroot/support/testing/tests/init/test_systemd.py index a324ba856..0ac18cb62 100644 --- a/buildroot/support/testing/tests/init/test_systemd.py +++ b/buildroot/support/testing/tests/init/test_systemd.py @@ -13,10 +13,11 @@ class InitSystemSystemdBase(InitSystemBase): BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" # BR2_TARGET_ROOTFS_TAR is not set - """ + """.format(infra.filepath("conf/binfmt-misc-kernel-fragment.config")) def check_init(self): super(InitSystemSystemdBase, self).check_init("/lib/systemd/systemd") diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/Config.in b/buildroot/support/testing/tests/package/br2-external/openjdk/Config.in new file mode 100644 index 000000000..2588b3405 --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/Config.in @@ -0,0 +1,2 @@ +source "$BR2_EXTERNAL_OPENJDK_PATH/package/openjdk-hello-world/Config.in" +source "$BR2_EXTERNAL_OPENJDK_PATH/package/openjdk-jni-test/Config.in" diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/external.desc b/buildroot/support/testing/tests/package/br2-external/openjdk/external.desc new file mode 100644 index 000000000..f28ba5060 --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/external.desc @@ -0,0 +1 @@ +name: OPENJDK diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/external.mk b/buildroot/support/testing/tests/package/br2-external/openjdk/external.mk new file mode 100644 index 000000000..54c24e8c6 --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_OPENJDK_PATH)/package/*/*.mk)) diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in new file mode 100644 index 000000000..c37346a48 --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_OPENJDK_HELLO_WORLD + bool "openjdk hello world" + depends on BR2_PACKAGE_OPENJDK + help + Simple class for testing openjdk diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java new file mode 100644 index 000000000..37489e44c --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java @@ -0,0 +1,7 @@ +public class HelloWorld +{ + public static void main(String[] args) + { + System.out.println("Hello, World"); + } +} diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk new file mode 100644 index 000000000..998117b8e --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# openjdk hello world +# +################################################################################ + +OPENJDK_HELLO_WORLD_DEPENDENCIES = openjdk + +define OPENJDK_HELLO_WORLD_BUILD_CMDS + $(INSTALL) -D $(OPENJDK_HELLO_WORLD_PKGDIR)/HelloWorld.java $(@D)/HelloWorld.java + $(HOST_DIR)/bin/javac $(@D)/HelloWorld.java +endef + +define OPENJDK_HELLO_WORLD_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/HelloWorld.class $(TARGET_DIR)/usr/bin/HelloWorld.class +endef + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/Config.in b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/Config.in new file mode 100644 index 000000000..22cd0c0aa --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_OPENJDK_JNI_TEST + bool "openjdk JNI test" + depends on BR2_PACKAGE_OPENJDK + help + Tests openjdk JNI support diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniHelper.java b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniHelper.java new file mode 100644 index 000000000..9e2a0387e --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniHelper.java @@ -0,0 +1,9 @@ +public class JniHelper +{ + public void HelloManagedWorld() + { + stringMember = "Hello, Managed World"; + } + + public String stringMember = "Set from Java"; +} diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniTest.java b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniTest.java new file mode 100644 index 000000000..3d6c17b74 --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniTest.java @@ -0,0 +1,92 @@ +public class JniTest +{ + private static void Test( + String name, + Object actual, + Object expected, + String actualAsString, + String expectedAsString) + { + if (!actual.equals(expected)) + { + System.out.println(String.format( + "Test: %s failed\nExpected: \"%s\", Actual: \"%s\"", + name, + expected, + actual)); + JniTest.exitCode = -1; + } + else + { + System.out.println(String.format("Test: %s passed", name)); + } + } + + private static void Test( + String name, + String actual, + String expected) + { + JniTest.Test(name, actual, expected, actual, expected); + } + + public static void main(String[] args) + { + var actualVersion = JniWrapper.get_jni_version(); + var expectedVersion = 0x000A0000; + JniTest.Test( + "Get JNI Version", + actualVersion, + expectedVersion, + String.format("0x%08X", actualVersion), + String.format("0x%08X", expectedVersion)); + + JniTest.Test( + "Read Native String Constant", + JniWrapper.read_constant_string(), + "Hello from C"); + + JniTest.Test( + "Write Java String to Native Library", + JniWrapper.write_string("Hello from Java"), + "Hello from Java"); + + JniTest.Test( + "Write Java Char Array to Native Library", + JniWrapper.write_char_array("Hello from Java".toCharArray()), + "Hello from Java"); + + var helper = new JniHelper(); + JniTest.Test( + "Write String Member to Native Library", + JniWrapper.write_string_member(helper), + "Set from Java"); + + JniWrapper.set_string_member(helper); + JniTest.Test( + "Set String Member from Native Library", + helper.stringMember, + "Set from C"); + + JniWrapper.execute_java_function(helper); + JniTest.Test( + "Execeute Java Function from Native Library", + helper.stringMember, + "Hello, Managed World"); + + helper = JniWrapper.instantiate_java_class(); + JniTest.Test( + "Instantiate Java Class", + helper.stringMember, + "Instantiated from C"); + + JniTest.Test( + "Call Native Library to Set System Time", + JniWrapper.set_and_write_time_in_seconds(1000), + "1000"); + + System.exit(exitCode); + } + + public static int exitCode = 0; +} diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.c b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.c new file mode 100644 index 000000000..0dde4e0c2 --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.c @@ -0,0 +1,50 @@ +#include "JniWrapper.h" +#include "jni_helper.h" + +// Proxies the generated function calls to the jni_helper + +JNIEXPORT jint JNICALL Java_JniWrapper_get_1jni_1version + (JNIEnv* env, jclass class) +{ + return get_jni_version(env); +} +JNIEXPORT jstring JNICALL Java_JniWrapper_read_1constant_1string + (JNIEnv* env, jclass class) +{ + return read_constant_jstring(env); +} +JNIEXPORT jstring JNICALL Java_JniWrapper_write_1string + (JNIEnv* env, jclass class, jstring string) +{ + return write_jstring(env, string); +} +JNIEXPORT jstring JNICALL Java_JniWrapper_write_1char_1array + (JNIEnv* env, jclass class, jcharArray chars) +{ + return write_jchar_array(env, chars); +} +JNIEXPORT jstring JNICALL Java_JniWrapper_write_1string_1member + (JNIEnv* env, jclass class, jobject helper) +{ + return write_string_member(env, helper); +} +JNIEXPORT void JNICALL Java_JniWrapper_set_1string_1member + (JNIEnv* env, jclass class, jobject helper) +{ + set_string_member(env, helper); +} +JNIEXPORT void JNICALL Java_JniWrapper_execute_1java_1function + (JNIEnv* env, jclass class, jobject helper) +{ + execute_java_function(env, helper); +} +JNIEXPORT jobject JNICALL Java_JniWrapper_instantiate_1java_1class + (JNIEnv* env, jclass class) +{ + return instantiate_java_class(env); +} +JNIEXPORT jstring JNICALL Java_JniWrapper_set_1and_1write_1time_1in_1seconds + (JNIEnv* env, jclass class, jint seconds) +{ + return set_and_write_time_in_seconds(env, seconds); +} diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.java b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.java new file mode 100644 index 000000000..d11e99bf0 --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/JniWrapper.java @@ -0,0 +1,17 @@ +public class JniWrapper +{ + static + { + System.loadLibrary("jni_native"); + } + + public static native int get_jni_version(); + public static native String read_constant_string(); + public static native String write_string(String string); + public static native String write_char_array(char[] string); + public static native String write_string_member(JniHelper helper); + public static native void set_string_member(JniHelper helper); + public static native void execute_java_function(JniHelper helper); + public static native JniHelper instantiate_java_class(); + public static native String set_and_write_time_in_seconds(int seconds); +} diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.c b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.c new file mode 100644 index 000000000..e6e2eec8b --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.c @@ -0,0 +1,94 @@ +#include "jni_helper.h" +#include "native.h" + +// Handles Java/C interop + +jint get_jni_version(JNIEnv* env) +{ + return (*env)->GetVersion(env); +} +jstring read_constant_jstring(JNIEnv* env) +{ + return (*env)->NewStringUTF(env, read_constant_string()); +} +static jstring read_internal_string_as_jstring(JNIEnv* env) +{ + return (*env)->NewStringUTF(env, read_internal_string()); +} +jstring write_jstring(JNIEnv* env, jstring string) +{ + const char* utf8_string = (*env)->GetStringUTFChars(env, string, NULL); + write_internal_string(utf8_string); + + (*env)->ReleaseStringUTFChars(env, string, utf8_string); + return read_internal_string_as_jstring(env); +} +jstring write_jchar_array(JNIEnv* env, jcharArray chars) +{ + jsize length = (*env)->GetArrayLength(env, chars); + jchar* body = (*env)->GetCharArrayElements(env, chars, NULL); + jstring input = (*env)->NewString(env, body, length); + jstring output = write_jstring(env, input); + + (*env)->ReleaseCharArrayElements(env, chars, body, JNI_ABORT); + return output; +} +static jfieldID get_string_member_field(JNIEnv* env, jobject helper) +{ + jclass class = (*env)->GetObjectClass(env, helper); + return (*env)->GetFieldID(env, class, "stringMember", "Ljava/lang/String;"); +} +jstring write_string_member(JNIEnv* env, jobject helper) +{ + jfieldID fieldID = get_string_member_field(env, helper); + jstring string = (*env)->GetObjectField(env, helper, fieldID); + + return write_jstring(env, string); +} +static void set_string_member_helper(JNIEnv* env, jobject helper, const char* utf8_string) +{ + jfieldID fieldID = get_string_member_field(env, helper); + jstring string = (*env)->NewStringUTF(env, utf8_string); + (*env)->SetObjectField(env, helper, fieldID, string); +} +void set_string_member(JNIEnv* env, jobject helper) +{ + char stringBuffer[256]; + write_external_string(stringBuffer, 256); + set_string_member_helper(env, helper, stringBuffer); +} + +typedef struct +{ + JNIEnv* env; + jobject object; + jmethodID methodID; +} method_parameters; +static void call_void_java_method(void* context) +{ + method_parameters* parameters = (method_parameters*)context; + (*parameters->env)->CallVoidMethod(parameters->env, parameters->object, parameters->methodID); +} +void execute_java_function(JNIEnv* env, jobject helper) +{ + jclass class = (*env)->GetObjectClass(env, helper); + jmethodID methodID = (*env)->GetMethodID(env, class, "HelloManagedWorld", "()V"); + + method_parameters parameters = {env, helper, methodID}; + execute_function(call_void_java_method, (void*)¶meters); +} +jobject instantiate_java_class(JNIEnv* env) +{ + jclass class = (*env)->FindClass(env, "JniHelper"); + jmethodID methodID = (*env)->GetMethodID(env, class, "", "()V"); + + jobject object =(*env)->NewObject(env, class, methodID); + set_string_member_helper(env, object, "Instantiated from C"); + return object; +} +jstring set_and_write_time_in_seconds(JNIEnv* env, jint seconds) +{ + set_time_in_seconds((int)seconds); + write_internal_time_in_seconds(); + return read_internal_string_as_jstring(env); +} diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.h b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.h new file mode 100644 index 000000000..4c9aab3b7 --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/jni_helper.h @@ -0,0 +1,13 @@ +#pragma once + +#include + +jint get_jni_version(JNIEnv* env); +jstring read_constant_jstring(JNIEnv* env); +jstring write_jstring(JNIEnv* env, jstring string); +jstring write_jchar_array(JNIEnv* env, jcharArray chars); +jstring write_string_member(JNIEnv* env, jobject helper); +void set_string_member(JNIEnv* env, jobject helper); +void execute_java_function(JNIEnv* env, jobject helper); +jobject instantiate_java_class(JNIEnv* env); +jstring set_and_write_time_in_seconds(JNIEnv* env, jint seconds); diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.c b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.c new file mode 100644 index 000000000..ed87e345a --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.c @@ -0,0 +1,39 @@ +#include "native.h" +#include +#include + +// Pure native functions + +#define CHAR_BUFFER_SIZE 256 +static char buffer[CHAR_BUFFER_SIZE]; + +const char* read_constant_string() +{ + return "Hello from C"; +} +const char* read_internal_string() +{ + return buffer; +} +void write_internal_string(const char* string) +{ + snprintf(buffer, CHAR_BUFFER_SIZE, "%s", string); +} +void write_external_string(char* string, size_t maxLength) +{ + snprintf(string, maxLength, "Set from C"); +} +void execute_function(void(*function)(void*), void* context) +{ + function(context); +} +void set_time_in_seconds(int seconds) +{ + time_t timeToSet = seconds; + stime(&timeToSet); +} +void write_internal_time_in_seconds() +{ + time_t systemTime = time(NULL); + snprintf(buffer, CHAR_BUFFER_SIZE, "%u", systemTime); +} diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.h b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.h new file mode 100644 index 000000000..a25f1779d --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/native.h @@ -0,0 +1,11 @@ +#pragma once + +#include + +const char* read_constant_string(); +const char* read_internal_string(); +void write_internal_string(const char* string); +void write_external_string(char* string, size_t maxLength); +void execute_function(void(*function)(void*), void* context); +void set_time_in_seconds(int seconds); +void write_internal_time_in_seconds(); diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk new file mode 100644 index 000000000..f279e5cd7 --- /dev/null +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# openjdk jni test +# +################################################################################ + +OPENJDK_JNI_TEST_DEPENDENCIES = openjdk + +JNI_INCLUDE_PATH = $(BUILD_DIR)/openjdk-$(OPENJDK_VERSION)/build/linux-aarch64-server-release/jdk/include + +define OPENJDK_JNI_TEST_BUILD_CMDS + # Compile Java classes and generate native headers + $(HOST_DIR)/bin/javac -d $(@D) -h $(@D) \ + $(OPENJDK_JNI_TEST_PKGDIR)/JniTest.java \ + $(OPENJDK_JNI_TEST_PKGDIR)/JniWrapper.java \ + $(OPENJDK_JNI_TEST_PKGDIR)/JniHelper.java + + # Compile shared library + $(TARGET_MAKE_ENV) $(TARGET_CC) -shared -fPIC \ + -I$(JNI_INCLUDE_PATH) -I$(JNI_INCLUDE_PATH)/linux -I$(@D) \ + -o $(@D)/libjni_native.so \ + $(OPENJDK_JNI_TEST_PKGDIR)/JniWrapper.c \ + $(OPENJDK_JNI_TEST_PKGDIR)/jni_helper.c \ + $(OPENJDK_JNI_TEST_PKGDIR)/native.c +endef + +define OPENJDK_JNI_TEST_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/JniTest.class $(TARGET_DIR)/usr/bin/JniTest.class + $(INSTALL) -D -m 755 $(@D)/JniWrapper.class $(TARGET_DIR)/usr/bin/JniWrapper.class + $(INSTALL) -D -m 755 $(@D)/JniHelper.class $(TARGET_DIR)/usr/bin/JniHelper.class + $(INSTALL) -D -m 755 $(@D)/libjni_native.so $(TARGET_DIR)/usr/lib/libjni_native.so +endef + +$(eval $(generic-package)) diff --git a/buildroot/support/testing/tests/package/sample_libftdi1.py b/buildroot/support/testing/tests/package/sample_libftdi1.py new file mode 100644 index 000000000..2da6124b4 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_libftdi1.py @@ -0,0 +1 @@ +import ftdi1 # noqa diff --git a/buildroot/support/testing/tests/package/sample_python_avro.py b/buildroot/support/testing/tests/package/sample_python_avro.py new file mode 100644 index 000000000..79d2dcdb2 --- /dev/null +++ b/buildroot/support/testing/tests/package/sample_python_avro.py @@ -0,0 +1,23 @@ +from io import BytesIO +from avro.schema import Parse +from avro.io import DatumReader, BinaryDecoder + +schema = Parse("""{ +"namespace": "org.buildroot.package.python_avro", +"type": "record", +"name": "Developer", +"fields": [ + {"name": "email", "type": "string"}, + {"name": "maintainer_of", "type": "string"} +] +}""") + +example = b' /tmp/iperf3.serv.log 2>&1 diff --git a/buildroot/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal-iperf3.conf b/buildroot/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal-iperf3.conf new file mode 100644 index 000000000..41cc5311d --- /dev/null +++ b/buildroot/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal-iperf3.conf @@ -0,0 +1,4 @@ +lxc.include = /usr/share/lxc/config/minimal.conf +lxc.hook.version = 1 +lxc.hook.start-host = ip a add 192.168.1.1/24 dev lxc0 +lxc.init.cmd = tini -g iperf3.sh diff --git a/buildroot/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal.conf b/buildroot/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal.conf new file mode 100644 index 000000000..731982150 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_lxc/rootfs-overlay/usr/share/lxc/config/minimal.conf @@ -0,0 +1,6 @@ +lxc.autodev = 0 +lxc.net.0.type = veth +lxc.net.0.veth.pair = lxc0 +lxc.net.0.name = eth0 +lxc.net.0.flags = up +lxc.net.0.ipv4.address = 192.168.1.2/24 diff --git a/buildroot/support/testing/tests/package/test_lzlib.py b/buildroot/support/testing/tests/package/test_lzlib.py new file mode 100644 index 000000000..84e767913 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_lzlib.py @@ -0,0 +1,14 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaLzlib(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_LZLIB=y + """ + + def test_run(self): + self.login() + self.module_test("zlib") + self.module_test("gzip") diff --git a/buildroot/support/testing/tests/package/test_openjdk.py b/buildroot/support/testing/tests/package/test_openjdk.py new file mode 100644 index 000000000..3a1d1a9b0 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_openjdk.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestOpenJdk(infra.basetest.BRTest): + br2_external = [infra.filepath("tests/package/br2-external/openjdk")] + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + BR2_PACKAGE_XORG7=y + BR2_PACKAGE_OPENJDK=y + BR2_PACKAGE_OPENJDK_HELLO_WORLD=y + BR2_PACKAGE_OPENJDK_JNI_TEST=y + """ + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) + self.emulator.login() + + def test_run(self): + self.login() + + cmd = "java -cp /usr/bin HelloWorld" + output, exit_code = self.emulator.run(cmd, 120) + print(output) + self.assertEqual(exit_code, 0) + self.assertEqual(output, ["Hello, World"]) + + cmd = "java -cp /usr/bin JniTest" + output, exit_code = self.emulator.run(cmd, 120) + print(output) + self.assertEqual(exit_code, 0) diff --git a/buildroot/support/testing/tests/package/test_opkg.py b/buildroot/support/testing/tests/package/test_opkg.py new file mode 100644 index 000000000..aa9370822 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_opkg.py @@ -0,0 +1,65 @@ +import os + +import infra.basetest + + +class TestOpkg(infra.basetest.BRTest): + # The snmpd service is used as an example for this test of a set of files + # that can be archived up and deployed/removed to test opkg + # + # The post build script uses an ipk-build template and assembles the test + # package. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_NETSNMP=y + # BR2_PACKAGE_NETSNMP_CLIENTS is not set + # BR2_PACKAGE_NETSNMP_ENABLE_MIBS is not set + BR2_PACKAGE_OPKG=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_HOST_OPKG_UTILS=y + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + """.format(infra.filepath("tests/package/test_opkg/post-build.sh")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # This test sequence tests the install and removal of a running + # service and configuration files. It also exercises the postinst + # and prerm scripting provided in the package archive. + + cmd = "opkg install example-snmpd-package_1.0_arm.ipk" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + + cmd = "opkg list-installed | grep example-snmpd-package" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + + # Check that postinst script ran to start the services + cmd = "ps aux | grep [s]nmpd" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + + # If successful, the prerm script ran to stop the service prior to + # the removal of the service scripting and files + cmd = "opkg remove example-snmpd-package" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + + # Verify after package removal that the services is not + # running, but let's give it some time to really stop + # (otherwise a [snmpd] process might show up in the ps output) + cmd = "sleep 1 && ps aux | grep [s]nmpd" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 1) + + # This folder for configs is provided by the package install and + # should no longer be present after package removal + cmd = "ls /etc/snmp" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 1) diff --git a/buildroot/support/testing/tests/package/test_opkg/post-build.sh b/buildroot/support/testing/tests/package/test_opkg/post-build.sh new file mode 100755 index 000000000..1a6981b5d --- /dev/null +++ b/buildroot/support/testing/tests/package/test_opkg/post-build.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env bash + +IPK_BUILD=${BUILD_DIR}/ipk-build + +# Pull the files for the snmpd service out of the target to create a install archive +# and setup a basic configuration so that the startup script works. +mkdir -p ${IPK_BUILD}/CONTROL \ + ${IPK_BUILD}/etc/init.d/ \ + ${IPK_BUILD}/usr/sbin \ + ${IPK_BUILD}/etc/snmp \ + ${IPK_BUILD}/etc/default +mv -f ${TARGET_DIR}/etc/init.d/S59snmpd ${IPK_BUILD}/etc/init.d/ +mv -f ${TARGET_DIR}/usr/sbin/snmpd ${IPK_BUILD}/usr/sbin/ +echo "agentuser nobody" > ${IPK_BUILD}/etc/snmp/snmpd.conf +echo "SNMPDRUN=yes" > ${IPK_BUILD}/etc/default/snmpd + +# build the control file +cat <${IPK_BUILD}/CONTROL/control +Package: example-snmpd-package +Version: 1.0 +Architecture: arm +Maintainer: user@domain.tld +Section: extras +Priority: optional +Source: http://example.com +Description: This is an example IPK package for installing snmpd +EOM + +# preinst script is not created to run before the install for this test example + +# postinst script is ran after install completes to start the services +cat <${IPK_BUILD}/CONTROL/postinst +#!/bin/sh +/etc/init.d/S59snmpd start +EOM +chmod +x ${IPK_BUILD}/CONTROL/postinst + +# prerm script is ran before removal so that the services isn't in use +cat <${IPK_BUILD}/CONTROL/prerm +#!/bin/sh +/etc/init.d/S59snmpd stop +EOM +chmod +x ${IPK_BUILD}/CONTROL/prerm + +# build the archive from template and pkg files +${HOST_DIR}/bin/opkg-build -Z gzip ${IPK_BUILD} ${TARGET_DIR}/root/ +rm -fr ${IPK_BUILD} diff --git a/buildroot/support/testing/tests/package/test_perl_class_load.py b/buildroot/support/testing/tests/package/test_perl_class_load.py index fbcd904aa..042297002 100644 --- a/buildroot/support/testing/tests/package/test_perl_class_load.py +++ b/buildroot/support/testing/tests/package/test_perl_class_load.py @@ -25,4 +25,5 @@ class TestPerlClassLoad(TestPerlBase): def test_run(self): self.login() + self.module_test("Params::Util") self.module_test("Class::Load") diff --git a/buildroot/support/testing/tests/package/test_perl_libwww_perl.py b/buildroot/support/testing/tests/package/test_perl_libwww_perl.py index af9f7c7ed..7b30e4b94 100644 --- a/buildroot/support/testing/tests/package/test_perl_libwww_perl.py +++ b/buildroot/support/testing/tests/package/test_perl_libwww_perl.py @@ -36,6 +36,7 @@ class TestPerllibwwwperl(TestPerlBase): self.module_test("LWP::UserAgent") self.module_test("LWP::Authen::Basic") self.module_test("LWP::Authen::Digest") + self.module_test("HTML::Parser") self.module_test("HTTP::Message") self.module_test("HTTP::Daemon") self.module_test("WWW::RobotRules") diff --git a/buildroot/support/testing/tests/package/test_perl_mail_dkim.py b/buildroot/support/testing/tests/package/test_perl_mail_dkim.py index 7affce82b..cd9e75795 100644 --- a/buildroot/support/testing/tests/package/test_perl_mail_dkim.py +++ b/buildroot/support/testing/tests/package/test_perl_mail_dkim.py @@ -25,4 +25,6 @@ class TestPerlMailDKIM(TestPerlBase): def test_run(self): self.login() + self.module_test("Crypt::OpenSSL::Random") + self.module_test("Crypt::OpenSSL::RSA") self.module_test("Mail::DKIM") diff --git a/buildroot/support/testing/tests/package/test_perl_x10.py b/buildroot/support/testing/tests/package/test_perl_x10.py index 84feb74e6..b587804a9 100644 --- a/buildroot/support/testing/tests/package/test_perl_x10.py +++ b/buildroot/support/testing/tests/package/test_perl_x10.py @@ -19,4 +19,5 @@ class TestPerlX10(TestPerlBase): def test_run(self): self.login() + self.module_test("Device::SerialPort") self.module_test("X10") diff --git a/buildroot/support/testing/tests/package/test_python_avro.py b/buildroot/support/testing/tests/package/test_python_avro.py new file mode 100644 index 000000000..6eee2760d --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_avro.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonAvro(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_AVRO=y + """ + sample_scripts = ["tests/package/sample_python_avro.py"] diff --git a/buildroot/support/testing/tests/package/test_python_can.py b/buildroot/support/testing/tests/package/test_python_can.py new file mode 100644 index 000000000..d509d05db --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_can.py @@ -0,0 +1,23 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Can(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_CAN=y + """ + sample_scripts = ["tests/package/sample_python_can.py"] + timeout = 40 + + +class TestPythonPy3Can(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_CAN=y + """ + sample_scripts = ["tests/package/sample_python_can.py"] + timeout = 40 diff --git a/buildroot/support/testing/tests/package/test_python_crossbar.py b/buildroot/support/testing/tests/package/test_python_crossbar.py index 2d7b739b5..d7843ddd8 100644 --- a/buildroot/support/testing/tests/package/test_python_crossbar.py +++ b/buildroot/support/testing/tests/package/test_python_crossbar.py @@ -3,12 +3,10 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy3Crossbar(TestPythonPackageBase): __test__ = True - # use haveged to generate enough entropy so crossbar -> pynacl -> libsodium don't hang waiting for /dev/random config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CROSSBAR=y - BR2_PACKAGE_HAVEGED=y """ sample_scripts = ["tests/package/sample_python_crossbar.py"] timeout = 60 diff --git a/buildroot/support/testing/tests/package/test_python_django.py b/buildroot/support/testing/tests/package/test_python_django.py new file mode 100644 index 000000000..6b31833a0 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_django.py @@ -0,0 +1,33 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonDjango(TestPythonPackageBase): + config = TestPythonPackageBase.config + sample_scripts = ["tests/package/sample_python_django.py"] + + def run_sample_scripts(self): + cmd = "cd /opt && /usr/bin/django-admin startproject testsite" + self.assertRunOk(cmd, timeout=30) + + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py migrate" + output, exit_code = self.emulator.run(cmd, timeout=30) + self.assertIn("Operations to perform:", output[0]) + self.assertEqual(exit_code, 0) + + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " + # give some time to setup the server + cmd += "sleep 30" + self.assertRunOk(cmd, timeout=35) + + cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" + self.assertRunOk(cmd) + + +class TestPythonPy3Django(TestPythonDjango): + __test__ = True + config = TestPythonDjango.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DJANGO=y + BR2_PACKAGE_PYTHON3_SQLITE=y + """ diff --git a/buildroot/support/testing/tests/package/test_python_gitdb2.py b/buildroot/support/testing/tests/package/test_python_gitdb2.py new file mode 100644 index 000000000..fc55f2082 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_gitdb2.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Gitdb2(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_GITDB2=y + """ + sample_scripts = ["tests/package/sample_python_gitdb2.py"] + + +class TestPythonPy3Gitdb2(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_GITDB2=y + """ + sample_scripts = ["tests/package/sample_python_gitdb2.py"] diff --git a/buildroot/support/testing/tests/package/test_python_gobject.py b/buildroot/support/testing/tests/package/test_python_gobject.py new file mode 100644 index 000000000..0a59447ad --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_gobject.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Gobject(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_GOBJECT=y + """ + sample_scripts = ["tests/package/sample_python_gobject.py"] diff --git a/buildroot/support/testing/tests/package/test_python_pynacl.py b/buildroot/support/testing/tests/package/test_python_pynacl.py index 729a88755..f4dd54940 100644 --- a/buildroot/support/testing/tests/package/test_python_pynacl.py +++ b/buildroot/support/testing/tests/package/test_python_pynacl.py @@ -3,12 +3,10 @@ from tests.package.test_python import TestPythonPackageBase class TestPythonPy2Pynacl(TestPythonPackageBase): __test__ = True - # use haveged to generate enough entropy so pynacl -> libsodium don't hang waiting for /dev/random config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON=y BR2_PACKAGE_PYTHON_PYNACL=y - BR2_PACKAGE_HAVEGED=y """ sample_scripts = ["tests/package/sample_python_pynacl.py"] timeout = 10 @@ -16,12 +14,10 @@ class TestPythonPy2Pynacl(TestPythonPackageBase): class TestPythonPy3Pynacl(TestPythonPackageBase): __test__ = True - # use haveged to generate enough entropy so pynacl -> libsodium don't hang waiting for /dev/random config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_PYNACL=y - BR2_PACKAGE_HAVEGED=y """ sample_scripts = ["tests/package/sample_python_pynacl.py"] timeout = 10 diff --git a/buildroot/support/testing/tests/package/test_python_smmap2.py b/buildroot/support/testing/tests/package/test_python_smmap2.py new file mode 100644 index 000000000..07c0e6621 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_python_smmap2.py @@ -0,0 +1,21 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy2Smmap2(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON=y + BR2_PACKAGE_PYTHON_SMMAP2=y + """ + sample_scripts = ["tests/package/sample_python_smmap2.py"] + + +class TestPythonPy3Smmap2(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_SMMAP2=y + """ + sample_scripts = ["tests/package/sample_python_smmap2.py"] diff --git a/buildroot/support/testing/tests/package/test_python_treq.py b/buildroot/support/testing/tests/package/test_python_treq.py index 7108b9569..e24ae845b 100644 --- a/buildroot/support/testing/tests/package/test_python_treq.py +++ b/buildroot/support/testing/tests/package/test_python_treq.py @@ -7,7 +7,8 @@ class TestPythonTreq(TestPythonPackageBase): def run_sample_scripts(self): cmd = self.interpreter + " sample_python_treq.py" output, exit_code = self.emulator.run(cmd, timeout=20) - self.assertIn("Connection refused", output[0]) + refuse_msgs = [1 for l in output if "Connection refused" in l] + self.assertGreater(sum(refuse_msgs), 0) self.assertEqual(exit_code, 0) diff --git a/buildroot/support/testing/tests/package/test_rings.py b/buildroot/support/testing/tests/package/test_rings.py new file mode 100644 index 000000000..be9765f18 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_rings.py @@ -0,0 +1,25 @@ +from tests.package.test_lua import TestLuaBase + + +class TestLuaRings(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUA=y + BR2_PACKAGE_RINGS=y + """ + + def test_run(self): + self.login() + self.module_test("rings") + + +class TestLuajitRings(TestLuaBase): + config = TestLuaBase.config + \ + """ + BR2_PACKAGE_LUAJIT=y + BR2_PACKAGE_RINGS=y + """ + + def test_run(self): + self.login() + self.module_test("rings") diff --git a/buildroot/support/testing/tests/package/test_syslog_ng.py b/buildroot/support/testing/tests/package/test_syslog_ng.py index 0155ef14e..3fb0be5fb 100644 --- a/buildroot/support/testing/tests/package/test_syslog_ng.py +++ b/buildroot/support/testing/tests/package/test_syslog_ng.py @@ -9,26 +9,30 @@ class TestSyslogNg(infra.basetest.BRTest): BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_SYSLOG_NG=y BR2_TARGET_ROOTFS_CPIO=y - BR2_TARGET_ROOTFS_TAR is not set + # BR2_TARGET_ROOTFS_TAR is not set """ def test_run(self): cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") - self.emulator.boot(arch="armv5", kernel="builtin", options=["-initrd", cpio_file]) + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) self.emulator.login() - cmd = "grep syslog-ng /var/log/messages | grep starting" + cmd = "grep 'syslog-ng starting' /var/log/messages" _, exit_code = self.emulator.run(cmd) self.assertEqual(exit_code, 0) - cmd = "logger my-message;" - cmd += "sleep 1;" + cmd = "logger my-message && " + cmd += "sleep 1 && " cmd += "grep my-message /var/log/messages" _, exit_code = self.emulator.run(cmd) self.assertEqual(exit_code, 0) - cmd = "syslog-ng-ctl reload;" - cmd += "sleep 1;" - cmd += "grep syslog-ng /var/log/messages | grep -i warning" + cmd = "syslog-ng-ctl reload && " + cmd += "sleep 1" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + cmd = "grep -i 'syslog-ng.*warning' /var/log/messages" _, exit_code = self.emulator.run(cmd) self.assertEqual(exit_code, 1) diff --git a/buildroot/support/testing/tests/package/test_tmux.py b/buildroot/support/testing/tests/package/test_tmux.py new file mode 100644 index 000000000..7eb23cac9 --- /dev/null +++ b/buildroot/support/testing/tests/package/test_tmux.py @@ -0,0 +1,42 @@ +import os + +import infra.basetest + + +class TestTmux(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_GENERATE_LOCALE="en_US.UTF-8" + BR2_PACKAGE_TMUX=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + cmd = "tmux -V" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + + cmd = "tmux -C
        lib or lib64->lib as appropriate. -# MIPS64/n32 requires lib32 even though it's a 64-bit arch. +# MIPS64/n32 requires lib32 even though it's a 64-bit arch. However, since gcc +# 5.1.0 internal compiler paths in sysroot are relative to lib64, so we must +# create both. # $(1): base dir (either staging or target) -ifeq ($(BR2_ARCH_IS_64)$(BR2_MIPS_NABI32),y) +ifeq ($(BR2_MIPS_NABI32),y) +define SYSTEM_LIB_SYMLINK + ln -snf lib $(1)/lib64 + ln -snf lib $(1)/usr/lib64 + ln -snf lib $(1)/lib32 + ln -snf lib $(1)/usr/lib32 +endef +else ifeq ($(BR2_ARCH_IS_64),y) define SYSTEM_LIB_SYMLINK ln -snf lib $(1)/lib64 ln -snf lib $(1)/usr/lib64 diff --git a/buildroot/toolchain/Config.in b/buildroot/toolchain/Config.in index e227d923a..bff572805 100644 --- a/buildroot/toolchain/Config.in +++ b/buildroot/toolchain/Config.in @@ -113,6 +113,13 @@ config BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK depends on !BR2_or1k depends on !BR2_xtensa +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63261. This bug no +# longer exists in gcc 8.x. +config BR2_TOOLCHAIN_HAS_GCC_BUG_63261 + bool + default y if BR2_microblaze + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 + # Prior to gcc 7.x, exception_ptr, nested_exception and future from # libstdc++ would only be provided on architectures that support # always lock-free atomic ints. See @@ -145,6 +152,20 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_85862 default y if BR2_microblaze depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90620 +# ICE: in do_output_reload, at reload1.c:7978 on microblaze. +# It's still not fixed in gcc 9.x +config BR2_TOOLCHAIN_HAS_GCC_BUG_90620 + bool + default y if BR2_microblaze + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93847 +# ICE: compiler error: Segmentation fault on Nios II. This bug +# no longer exists in gcc 9.x. +config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 + bool + default y if BR2_nios2 && !BR2_TOOLCHAIN_GCC_AT_LEAST_9 + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool @@ -157,6 +178,9 @@ config BR2_ENABLE_LOCALE config BR2_INSTALL_LIBSTDCPP bool +config BR2_TOOLCHAIN_HAS_DLANG + bool + config BR2_TOOLCHAIN_HAS_FORTRAN bool @@ -172,9 +196,16 @@ config BR2_TOOLCHAIN_HAS_THREADS_NPTL config BR2_TOOLCHAIN_HAS_SSP bool +config BR2_TOOLCHAIN_HAS_SSP_STRONG + bool + default y if BR2_TOOLCHAIN_HAS_SSP && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + config BR2_TOOLCHAIN_HAS_UCONTEXT bool +config BR2_TOOLCHAIN_HAS_OPENMP + bool + config BR2_TOOLCHAIN_SUPPORTS_PIE bool @@ -201,6 +232,20 @@ config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST Note: the full set of gconv libs are ~8MiB (on ARM). +config BR2_TOOLCHAIN_EXTRA_LIBS + string "Extra toolchain libraries to be copied to target" + default BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS if BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS != "" # legacy + depends on !BR2_STATIC_LIBS + help + If your toolchain provides extra libraries that need to be + copied to the target filesystem, enter them here, separated + by spaces. The library should not include a suffix or any + type of pre/post wildcard. + + Examples where this can be useful is for adding debug + libraries to the target like the GCC libsanitizer. + e.g. "libasan liblsan libtsan libubsan" + # This boolean is true if the toolchain provides a built-in full # featured gettext implementation (glibc), and false if only a stub # gettext implementation is provided (uclibc, musl) @@ -404,15 +449,43 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 + select BR2_TOOLCHAIN_HEADERS_LATEST + +# This should be selected by the latest version, above, to indicate that +# Buildroot does not know of more recent headers than the ones selected. +# This allows using toolchains with headers more recent than Buildroot +# knows about, while still enforcing strict check for older headers. +config BR2_TOOLCHAIN_HEADERS_LATEST + bool + # 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 "5.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + default "5.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + default "5.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 + default "5.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + default "5.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + default "5.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 default "4.20" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 default "4.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 default "4.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 @@ -499,10 +572,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_8 bool select BR2_TOOLCHAIN_GCC_AT_LEAST_7 +config BR2_TOOLCHAIN_GCC_AT_LEAST_9 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_8 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_GCC_AT_LEAST string + default "9" if BR2_TOOLCHAIN_GCC_AT_LEAST_9 default "8" if BR2_TOOLCHAIN_GCC_AT_LEAST_8 default "7" if BR2_TOOLCHAIN_GCC_AT_LEAST_7 default "6" if BR2_TOOLCHAIN_GCC_AT_LEAST_6 diff --git a/buildroot/toolchain/helpers.mk b/buildroot/toolchain/helpers.mk index 3c30a8268..44d0c83d1 100644 --- a/buildroot/toolchain/helpers.mk +++ b/buildroot/toolchain/helpers.mk @@ -119,12 +119,12 @@ copy_toolchain_sysroot = \ done ; \ for link in $$(find $(STAGING_DIR) -type l); do \ target=$$(readlink $${link}) ; \ - if [ "$${target}" == "$${target\#/}" ] ; then \ + if [ "$${target}" == "$${target$(SHARP_SIGN)/}" ] ; then \ continue ; \ fi ; \ - relpath="$(call relpath_prefix,$${target\#/})" ; \ - echo "Fixing symlink $${link} from $${target} to $${relpath}$${target\#/}" ; \ - ln -sf $${relpath}$${target\#/} $${link} ; \ + relpath="$(call relpath_prefix,$${target$(SHARP_SIGN)/})" ; \ + echo "Fixing symlink $${link} from $${target} to $${relpath}$${target$(SHARP_SIGN)/}" ; \ + ln -sf $${relpath}$${target$(SHARP_SIGN)/} $${link} ; \ done ; \ relpath="$(call relpath_prefix,$${ARCH_LIB_DIR})" ; \ if [ "$${relpath}" != "" ]; then \ @@ -161,9 +161,13 @@ copy_toolchain_sysroot = \ # $1: build directory # $2: sysroot directory # $3: kernel version string, in the form: X.Y +# $4: test to do for the latest kernel version, 'strict' or 'loose' +# always 'strict' if this is not the latest version. # check_kernel_headers_version = \ - if ! support/scripts/check-kernel-headers.sh $(1) $(2) $(3); then \ + if ! support/scripts/check-kernel-headers.sh $(1) $(2) $(3) \ + $(if $(BR2_TOOLCHAIN_HEADERS_LATEST),$(4),strict); \ + then \ exit 1; \ fi @@ -342,6 +346,24 @@ check_cplusplus = \ exit 1 ; \ fi +# +# +# Check that the external toolchain supports D language +# +# $1: cross-gdc path +# +check_dlang = \ + __CROSS_GDC=$(strip $1) ; \ + __o=$(BUILD_DIR)/.br-toolchain-test-dlang.tmp ; \ + printf 'import std.stdio;\nvoid main() { writeln("Hello World!"); }\n' | \ + $${__CROSS_GDC} -x d -o $${__o} - ; \ + if test $$? -ne 0 ; then \ + rm -f $${__o}* ; \ + echo "D language support is selected but is not available in external toolchain" ; \ + exit 1 ; \ + fi ; \ + rm -f $${__o}* \ + # # # Check that the external toolchain supports Fortran @@ -360,6 +382,24 @@ check_fortran = \ fi ; \ rm -f $${__o}* \ +# +# +# Check that the external toolchain supports OpenMP +# +# $1: cross-gcc path +# +check_openmp = \ + __CROSS_CC=$(strip $1) ; \ + __o=$(BUILD_DIR)/.br-toolchain-test-openmp.tmp ; \ + printf '\#include \nint main(void) { return omp_get_thread_num(); }' | \ + $${__CROSS_CC} -fopenmp -x c -o $${__o} - ; \ + if test $$? -ne 0 ; then \ + rm -f $${__o}* ; \ + echo "OpenMP support is selected but is not available in external toolchain"; \ + exit 1 ; \ + fi ; \ + rm -f $${__o}* \ + # # Check that the cross-compiler given in the configuration exists # @@ -416,6 +456,7 @@ check_unusable_toolchain = \ # Check if the toolchain has SSP (stack smashing protector) support # # $1: cross-gcc path +# $2: gcc ssp option # check_toolchain_ssp = \ __CROSS_CC=$(strip $1) ; \ @@ -428,6 +469,13 @@ check_toolchain_ssp = \ echo "SSP support not available in this toolchain, please disable BR2_TOOLCHAIN_EXTERNAL_HAS_SSP" ; \ exit 1 ; \ fi ; \ + __SSP_OPTION=$(2); \ + if [ -n "$${__SSP_OPTION}" ] ; then \ + if ! echo 'void main(){}' | $${__CROSS_CC} -Werror $${__SSP_OPTION} -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 ; then \ + echo "SSP option $${__SSP_OPTION} not available in this toolchain, please select another SSP level" ; \ + exit 1 ; \ + fi; \ + fi; \ rm -f $(BUILD_DIR)/.br-toolchain-test.tmp* # diff --git a/buildroot/toolchain/toolchain-buildroot/Config.in b/buildroot/toolchain/toolchain-buildroot/Config.in index d8e39fdce..a980f766a 100644 --- a/buildroot/toolchain/toolchain-buildroot/Config.in +++ b/buildroot/toolchain/toolchain-buildroot/Config.in @@ -48,7 +48,7 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ BR2_riscv || BR2_sh || BR2_sparc64 || \ BR2_x86_64 || BR2_microblaze || BR2_nios2 || \ - (BR2_arcle && BR2_ARC_ATOMIC_EXT) + (BR2_arc && BR2_ARC_ATOMIC_EXT) || BR2_csky depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 @@ -84,7 +84,7 @@ config BR2_TOOLCHAIN_BUILDROOT_MUSL 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 + BR2_powerpc64le || BR2_RISCV_64 || 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. diff --git a/buildroot/toolchain/toolchain-external/Config.in b/buildroot/toolchain/toolchain-external/Config.in index 1f14f0350..128bea257 100644 --- a/buildroot/toolchain/toolchain-external/Config.in +++ b/buildroot/toolchain/toolchain-external/Config.in @@ -23,6 +23,9 @@ source "toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config # ARC source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in" +# Andes +source "toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in" + # ARM (use ARM toolchain by default) source "toolchain/toolchain-external/toolchain-external-arm-arm/Config.in" source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in" @@ -44,9 +47,12 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Confi # Kept last, so it remains the non-default choice, unless there isn't # any available toolchain profile for the currently selected -# architecture. +# architecture, but before toolchains from br2-external trees. source "toolchain/toolchain-external/toolchain-external-custom/Config.in" +# Toolchains from br2-external trees, if any +source "$BR2_BASE_DIR/.br2-external.in.toolchains" + endchoice choice @@ -124,6 +130,9 @@ source "toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config # ARC source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options" +# Andes +source "toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in.options" + # ARM source "toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options" source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options" diff --git a/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk b/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk index df0b68677..8667d7ddf 100644 --- a/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -93,6 +93,7 @@ TOOLCHAIN_EXTERNAL_SUFFIX = \ TOOLCHAIN_EXTERNAL_CROSS = $(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)- TOOLCHAIN_EXTERNAL_CC = $(TOOLCHAIN_EXTERNAL_CROSS)gcc$(TOOLCHAIN_EXTERNAL_SUFFIX) TOOLCHAIN_EXTERNAL_CXX = $(TOOLCHAIN_EXTERNAL_CROSS)g++$(TOOLCHAIN_EXTERNAL_SUFFIX) +TOOLCHAIN_EXTERNAL_GDC = $(TOOLCHAIN_EXTERNAL_CROSS)gdc$(TOOLCHAIN_EXTERNAL_SUFFIX) TOOLCHAIN_EXTERNAL_FC = $(TOOLCHAIN_EXTERNAL_CROSS)gfortran$(TOOLCHAIN_EXTERNAL_SUFFIX) TOOLCHAIN_EXTERNAL_READELF = $(TOOLCHAIN_EXTERNAL_CROSS)readelf @@ -112,7 +113,7 @@ endif # Definitions of the list of libraries that should be copied to the target. # -TOOLCHAIN_EXTERNAL_LIBS += ld*.so* libgcc_s.so.* libatomic.so.* +TOOLCHAIN_EXTERNAL_LIBS += ld*.so.* libgcc_s.so.* libatomic.so.* ifneq ($(BR2_SSP_NONE),y) TOOLCHAIN_EXTERNAL_LIBS += libssp.so.* @@ -148,7 +149,15 @@ TOOLCHAIN_EXTERNAL_LIBS += libquadmath.so* endif endif -TOOLCHAIN_EXTERNAL_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS)) +ifeq ($(BR2_TOOLCHAIN_HAS_OPENMP),y) +TOOLCHAIN_EXTERNAL_LIBS += libgomp.so.* +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_DLANG),y) +TOOLCHAIN_EXTERNAL_LIBS += libgdruntime.so* libgphobos.so* +endif + +TOOLCHAIN_EXTERNAL_LIBS += $(addsuffix .so*,$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_LIBS))) # @@ -258,7 +267,7 @@ define TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER *-ar|*-ranlib|*-nm) \ ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%..%') .; \ ;; \ - *cc|*cc-*|*++|*++-*|*cpp|*-gfortran) \ + *cc|*cc-*|*++|*++-*|*cpp|*-gfortran|*-gdc) \ ln -sf toolchain-wrapper $$base; \ ;; \ *gdb|*gdbtui) \ @@ -331,7 +340,7 @@ endef # # And variations on these. define toolchain_find_sysroot -$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:(usr/)?lib(32|64)?([^/]*)?/([^/]*/)?libc\.a::') +$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:/(usr/)?lib(32|64)?([^/]*)?/([^/]*/)?libc\.a:/:') endef # Returns the lib subdirectory for the given compiler + flags (i.e @@ -531,9 +540,10 @@ define $(2)_CONFIGURE_CMDS $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC)) $$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \ $$(call check_kernel_headers_version,\ - $$(BUILD_DIR)\ + $$(BUILD_DIR),\ $$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC)),\ - $$(call qstrip,$$(BR2_TOOLCHAIN_HEADERS_AT_LEAST))); \ + $$(call qstrip,$$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)),\ + $$(if $$(BR2_TOOLCHAIN_EXTERNAL_CUSTOM),loose,strict)); \ $$(call check_gcc_version,$$(TOOLCHAIN_EXTERNAL_CC),\ $$(call qstrip,$$(BR2_TOOLCHAIN_GCC_AT_LEAST))); \ if test "$$(BR2_arm)" = "y" ; then \ @@ -543,9 +553,15 @@ define $(2)_CONFIGURE_CMDS if test "$$(BR2_INSTALL_LIBSTDCPP)" = "y" ; then \ $$(call check_cplusplus,$$(TOOLCHAIN_EXTERNAL_CXX)) ; \ fi ; \ + if test "$$(BR2_TOOLCHAIN_HAS_DLANG)" = "y" ; then \ + $$(call check_dlang,$$(TOOLCHAIN_EXTERNAL_GDC)) ; \ + fi ; \ if test "$$(BR2_TOOLCHAIN_HAS_FORTRAN)" = "y" ; then \ $$(call check_fortran,$$(TOOLCHAIN_EXTERNAL_FC)) ; \ fi ; \ + if test "$$(BR2_TOOLCHAIN_HAS_OPENMP)" = "y" ; then \ + $$(call check_openmp,$$(TOOLCHAIN_EXTERNAL_CC)) ; \ + fi ; \ if test "$$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)" = "y" ; then \ $$(call check_uclibc,$$$${SYSROOT_DIR}) ; \ elif test "$$(BR2_TOOLCHAIN_EXTERNAL_MUSL)" = "y" ; then \ @@ -554,7 +570,7 @@ define $(2)_CONFIGURE_CMDS else \ $$(call check_glibc,$$$${SYSROOT_DIR}) ; \ fi - $$(Q)$$(call check_toolchain_ssp,$$(TOOLCHAIN_EXTERNAL_CC)) + $$(Q)$$(call check_toolchain_ssp,$$(TOOLCHAIN_EXTERNAL_CC),$(BR2_SSP_OPTION)) endef $(2)_TOOLCHAIN_WRAPPER_ARGS += $$(TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS) diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in new file mode 100644 index 000000000..9c937b8c4 --- /dev/null +++ b/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in @@ -0,0 +1,15 @@ +config BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32 + bool "Andes nds32" + depends on BR2_nds32 + depends on !BR2_STATIC_LIBS + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_GCC_AT_LEAST_8 + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_TOOLCHAIN_HAS_SSP + help + nds32 toolchain for the nds32 architecture. It uses GCC + 8.2.1, GDB 8.1.1, glibc 2.28, Binutils 2.30. It generates + code that runs on ae3xx platform diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in.options new file mode 100644 index 000000000..7d11ae209 --- /dev/null +++ b/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32 + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "nds32le-linux" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-andes-nds32" + +endif diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.hash b/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.hash new file mode 100644 index 000000000..4314bb1f5 --- /dev/null +++ b/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.hash @@ -0,0 +1,2 @@ +# From https://github.com/vincentzwc/prebuilt-nds32-toolchain/releases/download/20180521/nds32le-linux-glibc-v3-upstream.tar.gz +sha256 6050601df85ad93a4c211c1d57ed3773edb62aa505f7e07d7d555652e83af2cc nds32le-linux-glibc-v3-upstream.tar.gz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.mk b/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.mk new file mode 100644 index 000000000..fa29490b4 --- /dev/null +++ b/buildroot/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.mk @@ -0,0 +1,10 @@ +################################################################################ +# +# toolchain-external-andes-nds32 +# +################################################################################ + +TOOLCHAIN_EXTERNAL_ANDES_NDS32_SITE = https://github.com/vincentzwc/prebuilt-nds32-toolchain/releases/download/20180521 +TOOLCHAIN_EXTERNAL_ANDES_NDS32_SOURCE = nds32le-linux-glibc-v3-upstream.tar.gz + +$(eval $(toolchain-external-package)) diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in index d992be019..ea63687c5 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE - bool "Arm AArch64 BE 2018.11" + bool "Arm AArch64 BE 2019.12" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" depends on !BR2_STATIC_LIBS @@ -8,8 +8,9 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_8 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP help Arm toolchain for the AArch64 Big Endian architecture. diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in.options index add4adad2..745af8a29 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in.options +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in.options @@ -1,7 +1,7 @@ if BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "aarch64_be-linux-gnu" + default "aarch64_be-none-linux-gnu" config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL default "toolchain-external-arm-aarch64-be" diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash index 580e10dd7..a82c2ba48 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.11/gcc-arm-8.2-2018.11-x86_64-aarch64_be-linux-gnu.tar.xz.asc -md5 ab9a31ebe529b0a0cae78e610a9ffa0b gcc-arm-8.2-2018.11-x86_64-aarch64_be-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64_be-none-linux-gnu.tar.xz.asc +md5 f9885977e7f949f35bc0820f4bf99ab2 gcc-arm-9.2-2019.12-x86_64-aarch64_be-none-linux-gnu.tar.xz # locally calculated -sha256 36df73194804ac52053edf469c7ace73fb4b243a8306dadfb7b95c4f485abde4 gcc-arm-8.2-2018.11-x86_64-aarch64_be-linux-gnu.tar.xz +sha256 55fc54a63567a35fb8280dfef91d50c0b5ad65aaea267f34fe7647b02d912f56 gcc-arm-9.2-2019.12-x86_64-aarch64_be-none-linux-gnu.tar.xz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk index a41d9cadf..e06f12299 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 2018.11 -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION) +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 2019.12 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = gcc-arm-8.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = gcc-arm-9.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-none-linux-gnu.tar.xz $(eval $(toolchain-external-package)) diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in index fbb5e025e..52dcb2825 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 - bool "Arm AArch64 2018.11" + bool "Arm AArch64 2019.12" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" depends on !BR2_STATIC_LIBS @@ -8,8 +8,9 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_8 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP help Arm toolchain for the AArch64 architecture. diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in.options index 19b75805c..dcc38a6a8 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in.options +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in.options @@ -1,7 +1,7 @@ if BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "aarch64-linux-gnu" + default "aarch64-none-linux-gnu" config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL default "toolchain-external-arm-aarch64" diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash index cda90f751..edc30a280 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.11/gcc-arm-8.2-2018.11-x86_64-aarch64-linux-gnu.tar.xz.asc -md5 319ca548ff05b0ec1008988a7e5ab619 gcc-arm-8.2-2018.11-x86_64-aarch64-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz.asc +md5 23ecc1dc528253c43e43365c6d923ec3 gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz # locally calculated -sha256 0142366da2f30feb1c366997cbdaa02286c8f1aa527c0fc177ee5ce8e77970fc gcc-arm-8.2-2018.11-x86_64-aarch64-linux-gnu.tar.xz +sha256 8dfe681531f0bd04fb9c53cf3c0a3368c616aa85d48938eebe2b516376e06a66 gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk index 0398bd129..51a81ec98 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 2018.11 -TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION) +TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 2019.12 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = gcc-arm-8.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = gcc-arm-9.2-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-none-linux-gnu.tar.xz $(eval $(toolchain-external-package)) diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in index 044973788..4748ab53a 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in @@ -4,7 +4,7 @@ comment "Arm toolchains available for Cortex-A + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM - bool "Arm ARM 2018.11" + bool "Arm ARM 2019.12" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_HOSTARCH = "x86_64" @@ -15,11 +15,12 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_8 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP help - Arm toolchain for the ARM architecture. It uses GCC 8.2.1, - GDB 8.1.1, glibc 2.28, Binutils 2.30. It generates code that + Arm toolchain for the ARM architecture. It uses GCC 9.2.1, + GDB 8.3.0, glibc 2.30, Binutils 2.33.1. It generates code that runs on all Cortex-A profile devices, but tuned for the Cortex-A9. The code generated uses the hard floating point calling convention, and uses the VFPv3-D16 FPU instructions. diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options index 16e7d6ff3..f2ce0f454 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options @@ -1,7 +1,7 @@ if BR2_TOOLCHAIN_EXTERNAL_ARM_ARM config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "arm-linux-gnueabihf" + default "arm-none-linux-gnueabihf" config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL default "toolchain-external-arm-arm" diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash index cd7f52654..0a28cf0d5 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.11/gcc-arm-8.2-2018.11-x86_64-arm-linux-gnueabihf.tar.xz.asc -md5 59ccf965837ed1c5ba59e5ad4b688b21 gcc-arm-8.2-2018.11-x86_64-arm-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz.asc +md5 ae539d09dadacf7f22fcd6f54870e5ad gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz # locally calculated -sha256 3f9bc7a68f744a5edc7caebff5f3f2c3bc1ff9d8ac8b05f7680a0071461deede gcc-arm-8.2-2018.11-x86_64-arm-linux-gnueabihf.tar.xz +sha256 51bbaf22a4d3e7a393264c4ef1e45566701c516274dde19c4892c911caa85617 gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk index 0c21affd7..798573a47 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk @@ -4,9 +4,9 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 2018.11 -TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION) +TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 2019.12 +TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = gcc-arm-8.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-x86_64-arm-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = gcc-arm-9.2-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-x86_64-arm-none-linux-gnueabihf.tar.xz $(eval $(toolchain-external-package)) diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in index be6e56a2c..2341d0883 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in @@ -9,6 +9,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP help Codescape IMG GNU Linux Toolchain 2018.09 for the MIPS architecture, from MIPS Tech LLC. It uses gcc 6.3.0, diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index 15d628476..c58c55119 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -10,6 +10,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP help Codescape MTI GNU Linux Toolchain 2018.09 for the MIPS architecture, from MIPS Tech LLC. It uses gcc 6.3.0, diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in index 9187333b9..c8ec970a4 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in @@ -8,6 +8,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_INSTALL_LIBSTDCPP select BR2_HOSTARCH_NEEDS_IA32_LIBS select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in index 734f0e4c7..1a3bdc939 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in @@ -11,6 +11,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_INSTALL_LIBSTDCPP select BR2_HOSTARCH_NEEDS_IA32_LIBS select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 81c48a11b..8c38dd9fc 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -27,74 +27,60 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX choice bool "External toolchain gcc version" - default BR2_TOOLCHAIN_EXTERNAL_GCC_8 if BR2_ARCH_NEEDS_GCC_AT_LEAST_8 - default BR2_TOOLCHAIN_EXTERNAL_GCC_7 if BR2_ARCH_NEEDS_GCC_AT_LEAST_7 - default BR2_TOOLCHAIN_EXTERNAL_GCC_6 if BR2_ARCH_NEEDS_GCC_AT_LEAST_6 - default BR2_TOOLCHAIN_EXTERNAL_GCC_5 if BR2_ARCH_NEEDS_GCC_AT_LEAST_5 - 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 toolchain. +config BR2_TOOLCHAIN_EXTERNAL_GCC_9 + bool "9.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + config BR2_TOOLCHAIN_EXTERNAL_GCC_8 bool "8.x" select BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_TOOLCHAIN_EXTERNAL_GCC_7 bool "7.x" - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_7 config BR2_TOOLCHAIN_EXTERNAL_GCC_6 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. @@ -106,6 +92,9 @@ config BR2_TOOLCHAIN_EXTERNAL_GCC_OLD endchoice +comment "GCC older than 4.8 is not tested by Buildroot. Use at your own risk." + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + choice bool "External toolchain kernel headers series" default BR2_TOOLCHAIN_EXTERNAL_HEADERS_REALLY_OLD @@ -123,10 +112,29 @@ choice m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF + If your toolchain uses headers newer than the latest version + in the choice, then select the latest version. + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4 - bool "5.4.x" + bool "5.4.x or later" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3 + bool "5.3.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_2 + bool "5.2.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_1 + bool "5.1.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_0 + bool "5.0.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_20 bool "4.20.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 @@ -296,6 +304,9 @@ config BR2_TOOLCHAIN_EXTERNAL_HEADERS_REALLY_OLD endchoice +comment "Kernel headers older than 3.13 is not tested by Buildroot. Use at your own risk." + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + choice prompt "External toolchain C library" default BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC @@ -394,11 +405,23 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP default y if BR2_TOOLCHAIN_EXTERNAL_MUSL select BR2_TOOLCHAIN_HAS_SSP help - Selection this option if your external toolchain has Stack + Select this option if your external toolchain has Stack Smashing Protection support enabled. If you don't know, leave the default value, Buildroot will tell you if it's correct or not. +config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP_STRONG + bool "Toolchain has SSP strong support?" + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 && BR2_TOOLCHAIN_EXTERNAL_GLIBC + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 && BR2_TOOLCHAIN_EXTERNAL_MUSL + depends on BR2_TOOLCHAIN_EXTERNAL_HAS_SSP + select BR2_TOOLCHAIN_HAS_SSP_STRONG + help + Select this option if your external toolchain has strong + Stack Smashing Protection support enabled. If you don't + know, leave the default value, Buildroot will tell you if + it's correct or not. + config BR2_TOOLCHAIN_EXTERNAL_INET_RPC bool "Toolchain has RPC support?" default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC @@ -417,6 +440,13 @@ config BR2_TOOLCHAIN_EXTERNAL_CXX support. If you don't know, leave the default value, Buildroot will tell you if it's correct or not. +config BR2_TOOLCHAIN_EXTERNAL_DLANG + bool "Toolchain has D support?" + select BR2_TOOLCHAIN_HAS_DLANG + help + Select this option if your external toolchain has D + support. + config BR2_TOOLCHAIN_EXTERNAL_FORTRAN bool "Toolchain has Fortran support?" select BR2_TOOLCHAIN_HAS_FORTRAN @@ -425,12 +455,12 @@ config BR2_TOOLCHAIN_EXTERNAL_FORTRAN support. If you don't know, leave the default value, Buildroot will tell you if it's correct or not. -config BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS - string "Extra toolchain libraries to be copied to target" +config BR2_TOOLCHAIN_EXTERNAL_OPENMP + bool "Toolchain has OpenMP support?" + select BR2_TOOLCHAIN_HAS_OPENMP help - If your external toolchain provides extra libraries that - need to be copied to the target filesystem, enter them - here, separated by spaces. They will be copied to the - target's /lib directory. + Select this option if your external toolchain has OpenMP + support. If you don't know, leave the default value, + Buildroot will tell you if it's correct or not. endif diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in index 9e7d2a623..bac90374c 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in @@ -10,6 +10,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 select BR2_TOOLCHAIN_GCC_AT_LEAST_7 select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP help Toolchain for the AArch64 Big Endian architecture, from http://www.linaro.org/engineering/armv8/ diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in index aabf2cffe..824eb76c7 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in @@ -10,6 +10,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 select BR2_TOOLCHAIN_GCC_AT_LEAST_7 select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP help Toolchain for the AArch64 architecture, from http://www.linaro.org/engineering/armv8/ diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in index e880d5dbb..beb38609c 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in @@ -17,6 +17,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 select BR2_TOOLCHAIN_GCC_AT_LEAST_7 select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP help Linaro toolchain for the ARM architecture. It uses Linaro GCC 2018.05 (based on gcc 7.3.1), Linaro GDB 2018.05 (based on diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in index ebc6edefb..aa21e4486 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in @@ -13,6 +13,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 select BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index 5cb0ce2a3..c3483f331 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -1,7 +1,6 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC - bool "Synopsys ARC 2018.09 toolchain" + bool "Synopsys ARC 2019.09 toolchain" depends on BR2_arc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 depends on BR2_HOSTARCH = "x86_64" select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP @@ -12,7 +11,7 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_8 + select BR2_TOOLCHAIN_GCC_AT_LEAST_9 help Toolchain for the ARC cores, from https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash index 20eac19ca..3ce6bbcb1 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash +++ b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash @@ -1,5 +1,5 @@ -# From https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/tag/arc-2018.09-release -sha256 324b422eec3b9b36ea64c9e13167a4467fc13ab230eff34f2fa785039b460c16 arc_gnu_2018.09_prebuilt_uclibc_le_arc700_linux_install.tar.gz -sha256 b0299ad9be0c300237789e5bf8e45d72bf040aab00c3718fbdb4160b75d2ed8f arc_gnu_2018.09_prebuilt_uclibc_be_arc700_linux_install.tar.gz -sha256 d1a4c039416b3da4d94ea066f861cc96ec60afec9c2bab1b2e937555b5e05238 arc_gnu_2018.09_prebuilt_uclibc_le_archs_linux_install.tar.gz -sha256 a519ed3686dc8e3c5f86646988d38647aa039f4af3204d9b7e84efa26cd37221 arc_gnu_2018.09_prebuilt_uclibc_be_archs_linux_install.tar.gz +# From https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/tag/arc-2019.09-release +sha256 f7cbf68ef251943db7baf63535e0ec98dafbdf5d925017b4e1d4fc64d9b38a26 arc_gnu_2019.09_prebuilt_uclibc_le_arc700_linux_install.tar.gz +sha256 ac09f0a21f9d50146a5e542f4a6abc93e5a1dcb0a1372cb5c3ba86bbefaaec7d arc_gnu_2019.09_prebuilt_uclibc_be_arc700_linux_install.tar.gz +sha256 245ca49fe8ea2456617541b18bb96e52e6c0dc619f00e293fcaad519fc436c35 arc_gnu_2019.09_prebuilt_uclibc_le_archs_linux_install.tar.gz +sha256 6f039a0158c03af398ada31fae96009e47f0d7b7f7d52e12eb419492fc3f27e7 arc_gnu_2019.09_prebuilt_uclibc_be_archs_linux_install.tar.gz diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk index e3ff17ff7..c8f141e45 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk +++ b/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2018.09 +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2019.09 TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SITE = https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION)-release ifeq ($(BR2_arc750d)$(BR2_arc770d),y) diff --git a/buildroot/toolchain/toolchain-wrapper.c b/buildroot/toolchain/toolchain-wrapper.c index e9c5cd9d3..8cfc963cc 100644 --- a/buildroot/toolchain/toolchain-wrapper.c +++ b/buildroot/toolchain/toolchain-wrapper.c @@ -98,15 +98,6 @@ static char *predef_args[] = { #if defined(BR_MIPS_TARGET_BIG_ENDIAN) || defined(BR_ARC_TARGET_BIG_ENDIAN) "-EB", #endif -#ifdef BR_SSP_REGULAR - "-fstack-protector", -#endif -#ifdef BR_SSP_STRONG - "-fstack-protector-strong", -#endif -#ifdef BR_SSP_ALL - "-fstack-protector-all", -#endif #ifdef BR_ADDITIONAL_CFLAGS BR_ADDITIONAL_CFLAGS #endif @@ -249,7 +240,24 @@ int main(int argc, char **argv) char *env_debug; char *paranoid_wrapper; int paranoid; - int ret, i, count = 0, debug, found_shared = 0; + int ret, i, count = 0, debug = 0, found_shared = 0; + + /* Debug the wrapper to see arguments it was called with. + * If environment variable BR2_DEBUG_WRAPPER is: + * unset, empty, or 0: do not trace + * set to 1 : trace all arguments on a single line + * set to 2 : trace one argument per line + */ + if ((env_debug = getenv("BR2_DEBUG_WRAPPER"))) { + debug = atoi(env_debug); + } + if (debug > 0) { + fprintf(stderr, "Toolchain wrapper was called with:"); + for (i = 0; i < argc; i++) + fprintf(stderr, "%s'%s'", + (debug == 2) ? "\n " : " ", argv[i]); + fprintf(stderr, "\n"); + } /* Calculate the relative paths */ basename = strrchr(progpath, '/'); @@ -376,7 +384,7 @@ int main(int argc, char **argv) *cur++ = "-Wno-builtin-macro-redefined"; } -#ifdef BR2_RELRO_FULL +#ifdef BR2_PIC_PIE /* Patterned after Fedora/Gentoo hardening approaches. * https://fedoraproject.org/wiki/Changes/Harden_All_Packages * https://wiki.gentoo.org/wiki/Hardened/Toolchain#Position_Independent_Executables_.28PIEs.29 @@ -426,7 +434,7 @@ int main(int argc, char **argv) /* Both args below can be set at compile/link time * and are ignored correctly when not used */ - if(i == argc) + if (i == argc) *cur++ = "-fPIE"; if (!found_shared) @@ -492,29 +500,21 @@ int main(int argc, char **argv) exec_args++; #endif - /* Debug the wrapper to see actual arguments passed to - * the compiler: - * unset, empty, or 0: do not trace - * set to 1 : trace all arguments on a single line - * set to 2 : trace one argument per line - */ - if ((env_debug = getenv("BR2_DEBUG_WRAPPER"))) { - debug = atoi(env_debug); - if (debug > 0) { - fprintf(stderr, "Toolchain wrapper executing:"); + /* Debug the wrapper to see final arguments passed to the real compiler. */ + if (debug > 0) { + fprintf(stderr, "Toolchain wrapper executing:"); #ifdef BR_CCACHE_HASH - fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", - (debug == 2) ? "\n " : " "); + fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", + (debug == 2) ? "\n " : " "); #endif #ifdef BR_CCACHE_BASEDIR - fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", - (debug == 2) ? "\n " : " "); + fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", + (debug == 2) ? "\n " : " "); #endif - for (i = 0; exec_args[i]; i++) - fprintf(stderr, "%s'%s'", - (debug == 2) ? "\n " : " ", exec_args[i]); - fprintf(stderr, "\n"); - } + for (i = 0; exec_args[i]; i++) + fprintf(stderr, "%s'%s'", + (debug == 2) ? "\n " : " ", exec_args[i]); + fprintf(stderr, "\n"); } #ifdef BR_CCACHE_HASH diff --git a/buildroot/toolchain/toolchain-wrapper.mk b/buildroot/toolchain/toolchain-wrapper.mk index 613f5f6c5..09dda1789 100644 --- a/buildroot/toolchain/toolchain-wrapper.mk +++ b/buildroot/toolchain/toolchain-wrapper.mk @@ -16,11 +16,24 @@ endif TOOLCHAIN_WRAPPER_ARGS = $($(PKG)_TOOLCHAIN_WRAPPER_ARGS) TOOLCHAIN_WRAPPER_ARGS += -DBR_SYSROOT='"$(STAGING_SUBDIR)"' +TOOLCHAIN_WRAPPER_OPTS = \ + $(ARCH_TOOLCHAIN_WRAPPER_OPTS) \ + $(call qstrip,$(BR2_SSP_OPTION)) \ + $(call qstrip,$(BR2_TARGET_OPTIMIZATION)) + +ifeq ($(BR2_REPRODUCIBLE),y) +TOOLCHAIN_WRAPPER_OPTS += -Wl,--build-id=none +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y) +TOOLCHAIN_WRAPPER_OPTS += -ffile-prefix-map=$(BASE_DIR)=buildroot +else +TOOLCHAIN_WRAPPER_OPTS += -D__FILE__=\"\" -D__BASE_FILE__=\"\" -Wno-builtin-macro-redefined +endif +endif + # We create a list like '"-mfoo", "-mbar", "-mbarfoo"' so that each flag is a # separate argument when used in execv() by the toolchain wrapper. -TOOLCHAIN_WRAPPER_OPTS = \ - $(foreach f,$(call qstrip,$(BR2_TARGET_OPTIMIZATION)),"$(f)"$(comma)) -TOOLCHAIN_WRAPPER_ARGS += -DBR_ADDITIONAL_CFLAGS='$(TOOLCHAIN_WRAPPER_OPTS)' +TOOLCHAIN_WRAPPER_ARGS += \ + -DBR_ADDITIONAL_CFLAGS='$(foreach f,$(TOOLCHAIN_WRAPPER_OPTS),"$(f)"$(comma))' ifeq ($(BR2_CCACHE),y) TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE @@ -45,20 +58,16 @@ ifeq ($(BR2_CCACHE_USE_BASEDIR),y) TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"' endif +ifeq ($(BR2_PIC_PIE),y) +TOOLCHAIN_WRAPPER_ARGS += -DBR2_PIC_PIE +endif + ifeq ($(BR2_RELRO_PARTIAL),y) TOOLCHAIN_WRAPPER_ARGS += -DBR2_RELRO_PARTIAL else ifeq ($(BR2_RELRO_FULL),y) TOOLCHAIN_WRAPPER_ARGS += -DBR2_RELRO_FULL endif -ifeq ($(BR2_SSP_REGULAR),y) -TOOLCHAIN_WRAPPER_ARGS += -DBR_SSP_REGULAR -else ifeq ($(BR2_SSP_STRONG),y) -TOOLCHAIN_WRAPPER_ARGS += -DBR_SSP_STRONG -else ifeq ($(BR2_SSP_ALL),y) -TOOLCHAIN_WRAPPER_ARGS += -DBR_SSP_ALL -endif - define TOOLCHAIN_WRAPPER_BUILD $(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_WRAPPER_ARGS) \ -s -Wl,--hash-style=$(TOOLCHAIN_WRAPPER_HASH_STYLE) \ diff --git a/buildroot/toolchain/toolchain/toolchain.mk b/buildroot/toolchain/toolchain/toolchain.mk index 17fb62147..0afb12c03 100644 --- a/buildroot/toolchain/toolchain/toolchain.mk +++ b/buildroot/toolchain/toolchain/toolchain.mk @@ -11,6 +11,7 @@ TOOLCHAIN_DEPENDENCIES += toolchain-external endif TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO +TOOLCHAIN_INSTALL_STAGING = YES # Apply a hack that Rick Felker suggested[1] to avoid conflicts between libc # headers and kernel headers. This is needed for kernel headers older than @@ -34,7 +35,6 @@ define TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK $(STAGING_DIR)/usr/include/linux/libc-compat.h endef TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK -TOOLCHAIN_INSTALL_STAGING = YES endif # Install default nsswitch.conf file if the skeleton doesn't provide it diff --git a/buildroot/utils/check-package b/buildroot/utils/check-package index f09aaeea0..52317e02f 100755 --- a/buildroot/utils/check-package +++ b/buildroot/utils/check-package @@ -73,6 +73,10 @@ def get_lib_from_filename(fname): return None if DO_NOT_CHECK_INTREE.match(fname): return None + else: + if os.path.basename(fname) == "external.mk" and \ + os.path.exists(fname[:-2] + "desc"): + return None if CONFIG_IN_FILENAME.search(fname): return checkpackagelib.lib_config if fname.endswith(".hash"): diff --git a/buildroot/utils/checkpackagelib/lib.py b/buildroot/utils/checkpackagelib/lib.py index 6afe1aabc..457b3c317 100644 --- a/buildroot/utils/checkpackagelib/lib.py +++ b/buildroot/utils/checkpackagelib/lib.py @@ -52,3 +52,17 @@ class TrailingSpace(_CheckFunction): return ["{}:{}: line contains trailing whitespace" .format(self.filename, lineno), text] + + +class Utf8Characters(_CheckFunction): + def is_ascii(self, s): + try: + return all(ord(c) < 128 for c in s) + except TypeError: + return False + + def check_line(self, lineno, text): + if not self.is_ascii(text): + return ["{}:{}: line contains UTF-8 characters" + .format(self.filename, lineno), + text] diff --git a/buildroot/utils/checkpackagelib/lib_config.py b/buildroot/utils/checkpackagelib/lib_config.py index 89d44da57..55c8589d7 100644 --- a/buildroot/utils/checkpackagelib/lib_config.py +++ b/buildroot/utils/checkpackagelib/lib_config.py @@ -60,6 +60,97 @@ class AttributesOrder(_CheckFunction): text] +class CommentsMenusPackagesOrder(_CheckFunction): + def before(self): + self.level = 0 + self.menu_of_packages = ["The top level menu"] + self.new_package = "" + self.package = [""] + self.print_package_warning = [True] + self.state = "" + + def get_level(self): + return len(self.state.split('-')) - 1 + + def initialize_package_level_elements(self, text): + try: + self.menu_of_packages[self.level] = text[:-1] + self.package[self.level] = "" + self.print_package_warning[self.level] = True + except IndexError: + self.menu_of_packages.append(text[:-1]) + self.package.append("") + self.print_package_warning.append(True) + + def initialize_level_elements(self, text): + self.level = self.get_level() + self.initialize_package_level_elements(text) + + def check_line(self, lineno, text): + # We only want to force sorting for the top-level menus + if self.filename not in ["fs/Config.in", + "package/Config.in", + "package/Config.in.host", + "package/kodi/Config.in"]: + return + + source_line = re.match(r'^\s*source ".*/([^/]*)/Config.in(.host)?"', text) + + if text.startswith("comment "): + if not self.state.endswith("-comment"): + self.state += "-comment" + + self.initialize_level_elements(text) + + elif text.startswith("if "): + self.state += "-if" + + self.initialize_level_elements(text) + + elif text.startswith("menu "): + if self.state.endswith("-comment"): + self.state = self.state[:-8] + + self.state += "-menu" + + self.initialize_level_elements(text) + + elif text.startswith("endif") or text.startswith("endmenu"): + if self.state.endswith("-comment"): + self.state = self.state[:-8] + + if text.startswith("endif"): + self.state = self.state[:-3] + + elif text.startswith("endmenu"): + self.state = self.state[:-5] + + self.level = self.get_level() + + elif source_line: + self.new_package = source_line.group(1) + + # We order _ before A, so replace it with . + new_package_ord = self.new_package.replace('_', '.') + + if self.package[self.level] != "" and \ + self.print_package_warning[self.level] and \ + new_package_ord < self.package[self.level]: + self.print_package_warning[self.level] = False + prefix = "{}:{}: ".format(self.filename, lineno) + spaces = " " * len(prefix) + return ["{prefix}Packages in: {menu},\n" + "{spaces}are not alphabetically ordered;\n" + "{spaces}correct order: '-', '_', digits, capitals, lowercase;\n" + "{spaces}first incorrect package: {package}" + .format(prefix=prefix, spaces=spaces, + menu=self.menu_of_packages[self.level], + package=self.new_package), + text] + + self.package[self.level] = new_package_ord + + class HelpText(_CheckFunction): HELP_TEXT_FORMAT = re.compile("^\t .{,62}$") URL_ONLY = re.compile("^(http|https|git)://\S*$") diff --git a/buildroot/utils/checkpackagelib/lib_mk.py b/buildroot/utils/checkpackagelib/lib_mk.py index 00efeb7fb..a0caf8463 100644 --- a/buildroot/utils/checkpackagelib/lib_mk.py +++ b/buildroot/utils/checkpackagelib/lib_mk.py @@ -4,6 +4,7 @@ # menu options using "make menuconfig" and by running "make" with appropriate # packages enabled. +import os import re from checkpackagelib.base import _CheckFunction @@ -11,6 +12,7 @@ from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 from checkpackagelib.lib import EmptyLastLine # noqa: F401 from checkpackagelib.lib import NewlineAtEof # noqa: F401 from checkpackagelib.lib import TrailingSpace # noqa: F401 +from checkpackagelib.lib import Utf8Characters # noqa: F401 # used in more than one check start_conditional = ["ifdef", "ifeq", "ifndef", "ifneq"] @@ -124,7 +126,9 @@ class OverriddenVariable(_CheckFunction): self.conditionally_set.append(variable) return if self.CONCATENATING.search(text): - return + return ["{}:{}: immediate assignment to append to variable {}" + .format(self.filename, lineno, variable), + text] if self.USUALLY_OVERRIDDEN.search(text): return if assignment in self.OVERRIDING_ASSIGNMENTS: @@ -164,10 +168,9 @@ class PackageHeader(_CheckFunction): class RemoveDefaultPackageSourceVariable(_CheckFunction): packages_that_may_contain_default_source = ["binutils", "gcc", "gdb"] - PACKAGE_NAME = re.compile("/([^/]+)\.mk") def before(self): - package = self.PACKAGE_NAME.search(self.filename).group(1) + package, _ = os.path.splitext(os.path.basename(self.filename)) package_upper = package.replace("-", "_").upper() self.package = package self.FIND_SOURCE = re.compile( @@ -222,6 +225,7 @@ class TypoInPackageVariable(_CheckFunction): ALLOWED = re.compile("|".join([ "ACLOCAL_DIR", "ACLOCAL_HOST_DIR", + "ACLOCAL_PATH", "BR_CCACHE_INITIAL_SETUP", "BR_LIBC", "BR_NO_CHECK_HASH_FOR", @@ -237,11 +241,10 @@ class TypoInPackageVariable(_CheckFunction): "TARGET_FINALIZE_HOOKS", "TARGETS_ROOTFS", "XTENSA_CORE_NAME"])) - PACKAGE_NAME = re.compile("/([^/]+)\.mk") VARIABLE = re.compile("^([A-Z0-9_]+_[A-Z0-9_]+)\s*(\+|)=") def before(self): - package = self.PACKAGE_NAME.search(self.filename).group(1) + package, _ = os.path.splitext(os.path.basename(self.filename)) package = package.replace("-", "_").upper() # linux tools do not use LINUX_TOOL_ prefix for variables package = package.replace("LINUX_TOOL_", "") diff --git a/buildroot/utils/checkpackagelib/lib_patch.py b/buildroot/utils/checkpackagelib/lib_patch.py index 453b782e6..438353ad3 100644 --- a/buildroot/utils/checkpackagelib/lib_patch.py +++ b/buildroot/utils/checkpackagelib/lib_patch.py @@ -3,6 +3,7 @@ # functions don't need to check for things already checked by running # "make package-dirclean package-patch". +import os import re from checkpackagelib.base import _CheckFunction @@ -10,10 +11,10 @@ from checkpackagelib.lib import NewlineAtEof # noqa: F401 class ApplyOrder(_CheckFunction): - APPLY_ORDER = re.compile("/\d{1,4}-[^/]*$") + APPLY_ORDER = re.compile("\d{1,4}-[^/]*$") def before(self): - if not self.APPLY_ORDER.search(self.filename): + if not self.APPLY_ORDER.match(os.path.basename(self.filename)): return ["{}:0: use name -.patch " "({}#_providing_patches)" .format(self.filename, self.url_to_manual)] diff --git a/buildroot/utils/genrandconfig b/buildroot/utils/genrandconfig index 5f7aed021..63ff32cbf 100755 --- a/buildroot/utils/genrandconfig +++ b/buildroot/utils/genrandconfig @@ -41,7 +41,7 @@ def urlopen_closing(uri): class SystemInfo: DEFAULT_NEEDED_PROGS = ["make", "git", "gcc", "timeout"] - DEFAULT_OPTIONAL_PROGS = ["bzr", "java", "javac", "jar"] + DEFAULT_OPTIONAL_PROGS = ["bzr", "java", "javac", "jar", "diffoscope"] def __init__(self): self.needed_progs = list(self.__class__.DEFAULT_NEEDED_PROGS) @@ -190,7 +190,7 @@ def is_toolchain_usable(configfile, config): return True -def fixup_config(configfile): +def fixup_config(sysinfo, configfile): """Finalize the configuration and reject any problematic combinations This function returns 'True' when the configuration has been @@ -199,7 +199,6 @@ def fixup_config(configfile): generated). """ - sysinfo = SystemInfo() with open(configfile) as configf: configlines = configf.readlines() @@ -207,13 +206,6 @@ def fixup_config(configfile): if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not sysinfo.has("java"): return False - if "BR2_NEEDS_HOST_JAVAC=y\n" in configlines and not sysinfo.has("javac"): - return False - if "BR2_NEEDS_HOST_JAR=y\n" in configlines and not sysinfo.has("jar"): - return False - # python-nfc needs bzr - if 'BR2_PACKAGE_PYTHON_NFC=y\n' in configlines and not sysinfo.has("bzr"): - return False # The ctng toolchain is affected by PR58854 if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ BR2_TOOLCHAIN_EXTERNAL_URL + 'armv5-ctng-linux-gnueabi.tar.xz"\n' in configlines: @@ -256,6 +248,9 @@ def fixup_config(configfile): if 'BR2_ARM_CPU_ARMV7M=y\n' in configlines and \ 'BR2_PACKAGE_LIBFFI=y\n' in configlines: return False + if 'BR2_nds32=y\n' in configlines and \ + 'BR2_PACKAGE_LIBFFI=y\n' in configlines: + return False if 'BR2_PACKAGE_SUNXI_BOARDS=y\n' in configlines: configlines.remove('BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE=""\n') configlines.append('BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a10/hackberry.fex"\n') @@ -320,6 +315,8 @@ def gen_config(args): packages. """ + sysinfo = SystemInfo() + # Select a random toolchain configuration configs = get_toolchain_configs(args.toolchains_csv, args.buildrootdir) @@ -337,6 +334,10 @@ def gen_config(args): # Allow hosts with old certificates to download over https configlines.append("BR2_WGET=\"wget --passive-ftp -nd -t 3 --no-check-certificate\"\n") + # Per-package folder + if randint(0, 15) == 0: + configlines.append("BR2_PER_PACKAGE_DIRECTORIES=y\n") + # Amend the configuration with a few things. if randint(0, 20) == 0: configlines.append("BR2_ENABLE_DEBUG=y\n") @@ -352,6 +353,30 @@ def gen_config(args): configlines.append("BR2_PACKAGE_PYTHON_PY_ONLY=y\n") if randint(0, 5) == 0: configlines.append("BR2_OPTIMIZE_2=y\n") + if randint(0, 4) == 0: + configlines.append("BR2_SYSTEM_ENABLE_NLS=y\n") + if randint(0, 4) == 0: + configlines.append("BR2_PIC_PIE=y\n") + if randint(0, 4) == 0: + configlines.append("BR2_RELRO_FULL=y\n") + elif randint(0, 4) == 0: + configlines.append("BR2_RELRO_PARTIAL=y\n") + if randint(0, 4) == 0: + configlines.append("BR2_SSP_ALL=y\n") + elif randint(0, 4) == 0: + configlines.append("BR2_SSP_REGULAR=y\n") + elif randint(0, 4) == 0: + configlines.append("BR2_SSP_STRONG=y\n") + if randint(0, 4) == 0: + configlines.append("BR2_FORTIFY_SOURCE_2=y\n") + elif randint(0, 4) == 0: + configlines.append("BR2_FORTIFY_SOURCE_1=y\n") + + # Randomly enable BR2_REPRODUCIBLE 10% of times + # also enable tar filesystem images for testing + if sysinfo.has("diffoscope") and randint(0, 10) == 0: + configlines.append("BR2_REPRODUCIBLE=y\n") + configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") # Write out the configuration file if not os.path.exists(args.outputdir): @@ -384,7 +409,7 @@ def gen_config(args): "KCONFIG_PROBABILITY=%d" % randint(1, 30), "randpackageconfig"]) - if fixup_config(configfile): + if fixup_config(sysinfo, configfile): break subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, diff --git a/buildroot/utils/getdeveloperlib.py b/buildroot/utils/getdeveloperlib.py index 35c618f79..239ffa340 100644 --- a/buildroot/utils/getdeveloperlib.py +++ b/buildroot/utils/getdeveloperlib.py @@ -4,6 +4,7 @@ import re import glob import subprocess import sys +import unittest # # Patch parsing functions @@ -78,6 +79,36 @@ def analyze_patches(patches): return (allfiles, allinfras) +# +# Unit-test parsing functions +# + +def get_all_test_cases(suite): + """Generate all test-cases from a given test-suite. + :return: (test.module, test.name)""" + if issubclass(type(suite), unittest.TestSuite): + for test in suite: + for res in get_all_test_cases(test): + yield res + else: + yield (suite.__module__, suite.__class__.__name__) + + +def list_unittests(path): + """Use the unittest module to retreive all test cases from a given + directory""" + loader = unittest.TestLoader() + suite = loader.discover(path) + tests = {} + for module, test in get_all_test_cases(suite): + module_path = os.path.join(path, *module.split('.')) + tests.setdefault(module_path, []).append('%s.%s' % (module, test)) + return tests + + +unittests = {} + + # # DEVELOPERS file parsing functions # @@ -89,6 +120,8 @@ class Developer: self.packages = parse_developer_packages(files) self.architectures = parse_developer_architectures(files) self.infras = parse_developer_infras(files) + self.runtime_tests = parse_developer_runtime_tests(files) + self.defconfigs = parse_developer_defconfigs(files) def hasfile(self, f): f = os.path.abspath(f) @@ -97,6 +130,26 @@ class Developer: return True return False + def __repr__(self): + name = '\'' + self.name.split(' <')[0][:20] + '\'' + things = [] + if len(self.files): + things.append('{} files'.format(len(self.files))) + if len(self.packages): + things.append('{} pkgs'.format(len(self.packages))) + if len(self.architectures): + things.append('{} archs'.format(len(self.architectures))) + if len(self.infras): + things.append('{} infras'.format(len(self.infras))) + if len(self.runtime_tests): + things.append('{} tests'.format(len(self.runtime_tests))) + if len(self.defconfigs): + things.append('{} defconfigs'.format(len(self.defconfigs))) + if things: + return 'Developer <{} ({})>'.format(name, ', '.join(things)) + else: + return 'Developer <' + name + '>' + def parse_developer_packages(fnames): """Given a list of file patterns, travel through the Buildroot source @@ -154,12 +207,43 @@ def parse_developer_infras(fnames): return infras +def parse_developer_defconfigs(fnames): + """Given a list of file names, returns the config names + corresponding to defconfigs.""" + return {os.path.basename(fname[:-10]) + for fname in fnames + if fname.endswith('_defconfig')} + + +def parse_developer_runtime_tests(fnames): + """Given a list of file names, returns the runtime tests + corresponding to the file.""" + all_files = [] + # List all files recursively + for fname in fnames: + if os.path.isdir(fname): + for root, _dirs, files in os.walk(fname): + all_files += [os.path.join(root, f) for f in files] + else: + all_files.append(fname) + + # Get all runtime tests + runtimes = set() + for f in all_files: + name = os.path.splitext(f)[0] + if name in unittests: + runtimes |= set(unittests[name]) + return runtimes + + def parse_developers(basepath=None): """Parse the DEVELOPERS file and return a list of Developer objects.""" developers = [] linen = 0 if basepath is None: basepath = os.getcwd() + global unittests + unittests = list_unittests(os.path.join(basepath, 'support/testing')) with open(os.path.join(basepath, "DEVELOPERS"), "r") as f: files = [] name = None diff --git a/buildroot/utils/scancpan b/buildroot/utils/scancpan index 8073ad197..dbd8dab6d 100755 --- a/buildroot/utils/scancpan +++ b/buildroot/utils/scancpan @@ -479,6 +479,7 @@ use Fatal qw(open close); use Getopt::Long; use Pod::Usage; use File::Basename; +use File::Path qw(make_path); use Module::CoreList; use HTTP::Tiny; use Safe; @@ -487,9 +488,9 @@ use Digest::SHA qw(sha256_hex); use Text::Wrap; $Text::Wrap::columns = 62; -# Below, 5.028 should be aligned with the version of perl actually +# Below, 5.030 should be aligned with the version of perl actually # bundled in Buildroot: -die <<"MSG" if $] < 5.028; +die <<"MSG" if $] < 5.030; This script needs a host perl with the same major version as Buildroot target perl. Your current host perl is: @@ -497,7 +498,7 @@ Your current host perl is: version $] You may install a local one by running: - perlbrew install perl-5.28.0 + perlbrew install perl-5.30.0 MSG my ($help, $man, $quiet, $force, $recommend, $test, $host); @@ -565,7 +566,8 @@ sub find_license_files { my @license_files; foreach (split /\n/, $manifest) { next if m|/|; - push @license_files, $_ if m/(ARTISTIC|COPYING|COPYRIGHT|LICENSE)/i; + s|\s+.*$||; + push @license_files, $_ if m/(ARTISTIC|COPYING|COPYRIGHT|LICENSE|LICENCE)/i; } if (scalar @license_files == 0 && $manifest =~ m/(README)[\n\s]/i) { @license_files = ($1); @@ -609,6 +611,9 @@ sub fetch { unless ($dist{$name} && !$top) { say qq{fetch ${name}} unless $quiet; my $result = $mcpan->release( distribution => $name ); + my $main_module = $result->{main_module}; + push @info, qq{[$name] $main_module is a core module} + if $top && Module::CoreList::is_core( $main_module, undef, $] ); $dist{$name} = $result; $license_files{$name} = {}; eval { @@ -715,9 +720,10 @@ while (my ($distname, $dist) = each %dist) { my $mkname = $dirname . q{/} . $fsname . q{.mk}; my $hashname = $dirname . q{/} . $fsname . q{.hash}; my $brname = brname( $fsname ); - my $testname = q{support/testing/tests/package/test_} . lc $brname . q{.py}; + my $testdir = q{support/testing/tests/package}; + my $testname = $testdir . q{/test_} . lc $brname . q{.py}; unless (-d $dirname) { - mkdir $dirname; + make_path $dirname; $new_pkgs = 1; } if ($need_target{$distname} && ($force || !-f $cfgname)) { @@ -815,6 +821,7 @@ while (my ($distname, $dist) = each %dist) { my $mark = $is_xs{$distname} ? q{ XS} : q{}; my @indirect = (get_indirect_dependencies( $distname )); say qq{write ${testname}} unless $quiet; + make_path $testdir unless -d $testdir; open my $fh, q{>}, $testname; say {$fh} qq{from tests.package.test_perl import TestPerlBase}; say {$fh} qq{}; @@ -845,6 +852,14 @@ while (my ($distname, $dist) = each %dist) { say {$fh} qq{}; say {$fh} qq{ def test_run(self):}; say {$fh} qq{ self.login()}; + foreach my $dep (sort grep { $is_xs{$_} } @indirect) { + $dep =~ s|-|::|g; + say {$fh} qq{ self.module_test("${dep}")}; + } + foreach my $dep (sort grep { $is_xs{$_} } @{$deps_runtime{$distname}}) { + $dep =~ s|-|::|g; + say {$fh} qq{ self.module_test("${dep}")}; + } say {$fh} qq{ self.module_test("${modname}")}; close $fh; } @@ -949,7 +964,7 @@ in order to work with the right CoreList data. =head1 LICENSE -Copyright (C) 2013-2018 by Francois Perrad +Copyright (C) 2013-2019 by Francois Perrad This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/buildroot/utils/scanpypi b/buildroot/utils/scanpypi index abb190a53..387755bbb 100755 --- a/buildroot/utils/scanpypi +++ b/buildroot/utils/scanpypi @@ -461,6 +461,7 @@ class BuildrootPackage(): ' likely wrong, please change it if need be'.format( license=', '.join(licenses))) licenses = [self.metadata['info']['license']] + licenses = set(licenses) license_line = '{name}_LICENSE = {license}\n'.format( name=self.mk_name, license=', '.join(licenses)) @@ -473,6 +474,7 @@ class BuildrootPackage(): license_names.append(match.license.id) else: license_names.append("FIXME: license id couldn't be detected") + license_names = set(license_names) if len(license_names) > 0: license_line = ('{name}_LICENSE =' @@ -610,6 +612,7 @@ class BuildrootPackage(): bool_line = '\tbool "{name}"\n'.format(name=self.buildroot_name) lines.append(bool_line) if self.pkg_req: + self.pkg_req.sort() for dep in self.pkg_req: dep_line = '\tselect BR2_PACKAGE_{req} # runtime\n'.format( req=dep.upper().replace('-', '_')) diff --git a/scripts/enter.sh b/scripts/enter.sh index 59a53c402..cc6c619c2 100755 --- a/scripts/enter.sh +++ b/scripts/enter.sh @@ -1,12 +1,12 @@ -#!/bin/bash -BUILDER_UID="$(id -u)" -BUILDER_GID="$(id -g)" -CACHE_DIR="${CACHE_DIR:-$HOME/hassos-cache}" - -sudo mkdir -p "${CACHE_DIR}" -sudo chown -R "${BUILDER_UID}:${BUILDER_GID}" "${CACHE_DIR}" -sudo docker build -t hassos:local . -sudo docker run -it --rm --privileged \ - -v "$(pwd):/build" -v "${CACHE_DIR}:/cache" \ - -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \ - hassos:local bash +#!/bin/bash +BUILDER_UID="$(id -u)" +BUILDER_GID="$(id -g)" +CACHE_DIR="${CACHE_DIR:-$HOME/hassos-cache}" + +sudo mkdir -p "${CACHE_DIR}" +sudo chown -R "${BUILDER_UID}:${BUILDER_GID}" "${CACHE_DIR}" +sudo docker build -t hassos:local . +sudo docker run -it --rm --privileged \ + -v "$(pwd):/build" -v "${CACHE_DIR}:/cache" \ + -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \ + hassos:local bash